Skip to content

Commit

Permalink
[internal] Apply formatting for scalafmt and google_java_format. (p…
Browse files Browse the repository at this point in the history 
…antsbuild#13952)

`scalafmt` and `google_java_format` were recently added, but were never applied to the repository (and weren't detected by the commit hooks because they only run on changed files).

[ci skip-rust]
  • Loading branch information
@stuhood
stuhood authored Dec 22, 2021
1 parent 71aa3e1 commit 269eaa9
Show file tree
Hide file tree
Showing 5 changed files with 254 additions and 227 deletions.
3 changes: 3 additions & 0 deletions .scalafmt.conf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
version = 3.2.1
runner.dialect = scala213
maxColumn = 100
320 changes: 162 additions & 158 deletions src/python/pants/backend/java/dependency_inference/PantsJavaParserLauncher.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;

import com.github.javaparser.StaticJavaParser;
import com.github.javaparser.ast.CompilationUnit;
import com.github.javaparser.ast.ImportDeclaration;
Expand All @@ -24,122 +23,117 @@
import com.github.javaparser.ast.type.ClassOrInterfaceType;
import com.github.javaparser.ast.type.Type;
import com.github.javaparser.ast.type.WildcardType;

import java.io.File;
import java.util.AbstractCollection;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Optional;
import java.util.function.Consumer;
import java.util.stream.Collectors;
import java.util.stream.Stream;

class Import {
Import(String name, boolean isStatic, boolean isAsterisk) {
this.name = name;
this.isStatic = isStatic;
this.isAsterisk = isAsterisk;
}

public static Import fromImportDeclaration(ImportDeclaration imp) {
return new Import(imp.getName().toString(), imp.isStatic(), imp.isAsterisk());
}

public final String name;
public final boolean isStatic;
public final boolean isAsterisk;
Import(String name, boolean isStatic, boolean isAsterisk) {
this.name = name;
this.isStatic = isStatic;
this.isAsterisk = isAsterisk;
}

public static Import fromImportDeclaration(ImportDeclaration imp) {
return new Import(imp.getName().toString(), imp.isStatic(), imp.isAsterisk());
}

public final String name;
public final boolean isStatic;
public final boolean isAsterisk;
}

class CompilationUnitAnalysis {
CompilationUnitAnalysis(
Optional<String> declaredPackage,
ArrayList<Import> imports,
ArrayList<String> topLevelTypes,
ArrayList<String> consumedTypes,
ArrayList<String> exportTypes
) {
this.declaredPackage = declaredPackage;
this.imports = imports;
this.topLevelTypes = topLevelTypes;
this.consumedTypes = consumedTypes;
this.exportTypes = exportTypes;
}

public final Optional<String> declaredPackage;
public final ArrayList<Import> imports;
public final ArrayList<String> topLevelTypes;
public final ArrayList<String> consumedTypes;
public final ArrayList<String> exportTypes;
CompilationUnitAnalysis(
Optional<String> declaredPackage,
ArrayList<Import> imports,
ArrayList<String> topLevelTypes,
ArrayList<String> consumedTypes,
ArrayList<String> exportTypes) {
this.declaredPackage = declaredPackage;
this.imports = imports;
this.topLevelTypes = topLevelTypes;
this.consumedTypes = consumedTypes;
this.exportTypes = exportTypes;
}

public final Optional<String> declaredPackage;
public final ArrayList<Import> imports;
public final ArrayList<String> topLevelTypes;
public final ArrayList<String> consumedTypes;
public final ArrayList<String> exportTypes;
}

/**
* TODO: The dependencies of this class are defined in two places:
* 1. `3rdparty/jvm` via import inference.
* 2. `java_parser_artifact_requirements`.
* See https://github.com/pantsbuild/pants/issues/13754.
* TODO: The dependencies of this class are defined in two places: 1. `3rdparty/jvm` via import
* inference. 2. `java_parser_artifact_requirements`. See
* https://github.com/pantsbuild/pants/issues/13754.
*/
public class PantsJavaParserLauncher {
// Unwrap a `Type` and return the identifiers representing the "consumed" types.
private static List<String> unwrapIdentifiersForType(Type type) {
if (type.isArrayType()) {
return unwrapIdentifiersForType(type.asArrayType().getComponentType());
} else if (type.isWildcardType()) {
WildcardType wildcardType = type.asWildcardType();
ArrayList<String> result = new ArrayList<>();
if (wildcardType.getExtendedType().isPresent()) {
result.addAll(unwrapIdentifiersForType(wildcardType.getExtendedType().get()));
}
if (wildcardType.getSuperType().isPresent()) {
result.addAll(unwrapIdentifiersForType(wildcardType.getSuperType().get()));
}
return result;
} else if (type.isClassOrInterfaceType()) {
ArrayList<String> result = new ArrayList<>();
ClassOrInterfaceType classType = type.asClassOrInterfaceType();
Optional<NodeList<Type>> typeArguments = classType.getTypeArguments();
if (typeArguments.isPresent()) {
for (Type argumentType : typeArguments.get()) {
result.addAll(unwrapIdentifiersForType(argumentType));
}
}
result.add(classType.getNameWithScope());
return result;
} else if (type.isIntersectionType()) {
ArrayList<String> result = new ArrayList<>();
for (Type elementType : type.asIntersectionType().getElements()) {
result.addAll(unwrapIdentifiersForType(elementType));
}
return result;
// Unwrap a `Type` and return the identifiers representing the "consumed" types.
private static List<String> unwrapIdentifiersForType(Type type) {
if (type.isArrayType()) {
return unwrapIdentifiersForType(type.asArrayType().getComponentType());
} else if (type.isWildcardType()) {
WildcardType wildcardType = type.asWildcardType();
ArrayList<String> result = new ArrayList<>();
if (wildcardType.getExtendedType().isPresent()) {
result.addAll(unwrapIdentifiersForType(wildcardType.getExtendedType().get()));
}
if (wildcardType.getSuperType().isPresent()) {
result.addAll(unwrapIdentifiersForType(wildcardType.getSuperType().get()));
}
return result;
} else if (type.isClassOrInterfaceType()) {
ArrayList<String> result = new ArrayList<>();
ClassOrInterfaceType classType = type.asClassOrInterfaceType();
Optional<NodeList<Type>> typeArguments = classType.getTypeArguments();
if (typeArguments.isPresent()) {
for (Type argumentType : typeArguments.get()) {
result.addAll(unwrapIdentifiersForType(argumentType));
}
}
result.add(classType.getNameWithScope());
return result;
} else if (type.isIntersectionType()) {
ArrayList<String> result = new ArrayList<>();
for (Type elementType : type.asIntersectionType().getElements()) {
result.addAll(unwrapIdentifiersForType(elementType));
}
return result;
}

// Not handled:
// - PrimitiveType
// - VarType (Java `var` keyword to be inferred by the compiler.
// Not handled:
// - PrimitiveType
// - VarType (Java `var` keyword to be inferred by the compiler.

return new ArrayList<>();
}
return new ArrayList<>();
}

public static void main(String[] args) throws Exception {
String analysisOutputPath = args[0];
String sourceToAnalyze = args[1];
public static void main(String[] args) throws Exception {
String analysisOutputPath = args[0];
String sourceToAnalyze = args[1];

CompilationUnit cu = StaticJavaParser.parse(new File(sourceToAnalyze));
CompilationUnit cu = StaticJavaParser.parse(new File(sourceToAnalyze));

// Get the source's declare package.
Optional<String> declaredPackage = cu.getPackageDeclaration()
.map(PackageDeclaration::getName)
.map(Name::toString);
// Get the source's declare package.
Optional<String> declaredPackage =
cu.getPackageDeclaration().map(PackageDeclaration::getName).map(Name::toString);

// Get the source's imports.
ArrayList<Import> imports = new ArrayList<Import>(
// Get the source's imports.
ArrayList<Import> imports =
new ArrayList<Import>(
cu.getImports().stream()
.map(Import::fromImportDeclaration)
.collect(Collectors.toList()));

// Get the source's top level types
ArrayList<String> topLevelTypes = new ArrayList<String>(
// Get the source's top level types
ArrayList<String> topLevelTypes =
new ArrayList<String>(
cu.getTypes().stream()
.filter(TypeDeclaration::isTopLevelType)
.map(TypeDeclaration::getFullyQualifiedName)
Expand All @@ -149,78 +143,88 @@ public static void main(String[] args) throws Exception {
.map(Optional::get)
.collect(Collectors.toList()));

HashSet<Type> candidateConsumedTypes = new HashSet<>();
HashSet<Type> candidateExportTypes = new HashSet<>();

Consumer<Type> consumed = (type) -> { candidateConsumedTypes.add(type); };
Consumer<Type> export = (type) -> { candidateConsumedTypes.add(type); candidateExportTypes.add(type); };

HashSet<String> consumedIdentifiers = new HashSet<>();
HashSet<String> exportIdentifiers = new HashSet<>();

cu.walk(new Consumer<Node>() {
@Override
public void accept(Node node) {
if (node instanceof NodeWithType) {
NodeWithType<?, ?> typedNode = (NodeWithType<?, ?>) node;
consumed.accept(typedNode.getType());
}
if (node instanceof VariableDeclarator) {
VariableDeclarator varDecl = (VariableDeclarator) node;
consumed.accept(varDecl.getType());
}
if (node instanceof MethodDeclaration) {
MethodDeclaration methodDecl = (MethodDeclaration) node;
export.accept(methodDecl.getType());
for (Parameter param : methodDecl.getParameters()) {
export.accept(param.getType());
}
methodDecl.getThrownExceptions().stream().forEach(consumed);
}
if (node instanceof ClassOrInterfaceDeclaration) {
ClassOrInterfaceDeclaration classOrIntfDecl = (ClassOrInterfaceDeclaration) node;
classOrIntfDecl.getExtendedTypes().stream().forEach(export);
classOrIntfDecl.getImplementedTypes().stream().forEach(export);
}
if (node instanceof AnnotationExpr) {
AnnotationExpr annoExpr = (AnnotationExpr) node;
consumedIdentifiers.add(annoExpr.getNameAsString());
}
if (node instanceof MethodCallExpr) {
MethodCallExpr methodCallExpr = (MethodCallExpr) node;
Optional<Expression> scopeExprOpt = methodCallExpr.getScope();
if (scopeExprOpt.isPresent()) {
Expression scope = scopeExprOpt.get();
if (scope instanceof NameExpr) {
NameExpr nameExpr = (NameExpr) scope;
consumedIdentifiers.add(nameExpr.getNameAsString());
}
}
}
if (node instanceof FieldAccessExpr) {
FieldAccessExpr fieldAccessExpr = (FieldAccessExpr) node;
Expression scope = fieldAccessExpr.getScope();
if (scope instanceof NameExpr) {
NameExpr nameExpr = (NameExpr) scope;
consumedIdentifiers.add(nameExpr.getNameAsString());
}
HashSet<Type> candidateConsumedTypes = new HashSet<>();
HashSet<Type> candidateExportTypes = new HashSet<>();

Consumer<Type> consumed =
(type) -> {
candidateConsumedTypes.add(type);
};
Consumer<Type> export =
(type) -> {
candidateConsumedTypes.add(type);
candidateExportTypes.add(type);
};

HashSet<String> consumedIdentifiers = new HashSet<>();
HashSet<String> exportIdentifiers = new HashSet<>();

cu.walk(
new Consumer<Node>() {
@Override
public void accept(Node node) {
if (node instanceof NodeWithType) {
NodeWithType<?, ?> typedNode = (NodeWithType<?, ?>) node;
consumed.accept(typedNode.getType());
}
if (node instanceof VariableDeclarator) {
VariableDeclarator varDecl = (VariableDeclarator) node;
consumed.accept(varDecl.getType());
}
if (node instanceof MethodDeclaration) {
MethodDeclaration methodDecl = (MethodDeclaration) node;
export.accept(methodDecl.getType());
for (Parameter param : methodDecl.getParameters()) {
export.accept(param.getType());
}
methodDecl.getThrownExceptions().stream().forEach(consumed);
}
if (node instanceof ClassOrInterfaceDeclaration) {
ClassOrInterfaceDeclaration classOrIntfDecl = (ClassOrInterfaceDeclaration) node;
classOrIntfDecl.getExtendedTypes().stream().forEach(export);
classOrIntfDecl.getImplementedTypes().stream().forEach(export);
}
if (node instanceof AnnotationExpr) {
AnnotationExpr annoExpr = (AnnotationExpr) node;
consumedIdentifiers.add(annoExpr.getNameAsString());
}
if (node instanceof MethodCallExpr) {
MethodCallExpr methodCallExpr = (MethodCallExpr) node;
Optional<Expression> scopeExprOpt = methodCallExpr.getScope();
if (scopeExprOpt.isPresent()) {
Expression scope = scopeExprOpt.get();
if (scope instanceof NameExpr) {
NameExpr nameExpr = (NameExpr) scope;
consumedIdentifiers.add(nameExpr.getNameAsString());
}
}
}
});

for (Type type : candidateConsumedTypes) {
List<String> identifiersForType = unwrapIdentifiersForType(type);
consumedIdentifiers.addAll(identifiersForType);
if (candidateExportTypes.contains(type)) {
exportIdentifiers.addAll(identifiersForType);
if (node instanceof FieldAccessExpr) {
FieldAccessExpr fieldAccessExpr = (FieldAccessExpr) node;
Expression scope = fieldAccessExpr.getScope();
if (scope instanceof NameExpr) {
NameExpr nameExpr = (NameExpr) scope;
consumedIdentifiers.add(nameExpr.getNameAsString());
}
}
}
}
});

ArrayList<String> consumedTypes = new ArrayList<>(consumedIdentifiers);
ArrayList<String> exportTypes = new ArrayList<>(exportIdentifiers);
CompilationUnitAnalysis analysis = new CompilationUnitAnalysis(declaredPackage, imports, topLevelTypes, consumedTypes, exportTypes);
ObjectMapper mapper = new ObjectMapper();
mapper.registerModule(new Jdk8Module());
mapper.writeValue(new File(analysisOutputPath), analysis);
for (Type type : candidateConsumedTypes) {
List<String> identifiersForType = unwrapIdentifiersForType(type);
consumedIdentifiers.addAll(identifiersForType);
if (candidateExportTypes.contains(type)) {
exportIdentifiers.addAll(identifiersForType);
}
}

ArrayList<String> consumedTypes = new ArrayList<>(consumedIdentifiers);
ArrayList<String> exportTypes = new ArrayList<>(exportIdentifiers);
CompilationUnitAnalysis analysis =
new CompilationUnitAnalysis(
declaredPackage, imports, topLevelTypes, consumedTypes, exportTypes);
ObjectMapper mapper = new ObjectMapper();
mapper.registerModule(new Jdk8Module());
mapper.writeValue(new File(analysisOutputPath), analysis);
}
}
Loading

0 comments on commit 269eaa9

Please sign in to comment.