diff options
author | Ilpo Ruotsalainen <ilpo.ruotsalainen@oath.com> | 2018-11-27 13:15:35 +0100 |
---|---|---|
committer | Ilpo Ruotsalainen <ilpo.ruotsalainen@oath.com> | 2018-11-28 15:54:45 +0100 |
commit | be26331d4c261bae81adc73b8552237923bc0e75 (patch) | |
tree | 45012f30f8095b8bf8f74ec02e29269d4ad61c89 /abi-check-plugin/src/main | |
parent | d4f8dd3bc91b079012704031228300034d721b56 (diff) |
Rename ClassFileTree.Class to ClassFile.
Better describes the usage of the class.
Diffstat (limited to 'abi-check-plugin/src/main')
-rw-r--r-- | abi-check-plugin/src/main/java/com/yahoo/abicheck/classtree/ClassFileTree.java | 18 | ||||
-rw-r--r-- | abi-check-plugin/src/main/java/com/yahoo/abicheck/mojo/AbiCheck.java | 6 |
2 files changed, 12 insertions, 12 deletions
diff --git a/abi-check-plugin/src/main/java/com/yahoo/abicheck/classtree/ClassFileTree.java b/abi-check-plugin/src/main/java/com/yahoo/abicheck/classtree/ClassFileTree.java index 8a2e6d609de..c046ca195ae 100644 --- a/abi-check-plugin/src/main/java/com/yahoo/abicheck/classtree/ClassFileTree.java +++ b/abi-check-plugin/src/main/java/com/yahoo/abicheck/classtree/ClassFileTree.java @@ -32,7 +32,7 @@ public abstract class ClassFileTree implements AutoCloseable { for (String part : parts) { pkg = pkg.getOrCreateSubPackage(part); } - pkg.addClass(new Class(pkg, className) { + pkg.addClass(new ClassFile(pkg, className) { @Override public InputStream getInputStream() throws IOException { @@ -57,12 +57,12 @@ public abstract class ClassFileTree implements AutoCloseable { public abstract Collection<Package> getRootPackages(); - public static abstract class Class { + public static abstract class ClassFile { private final Package parent; private final String name; - private Class(Package parent, String name) { + private ClassFile(Package parent, String name) { this.parent = parent; this.name = name; } @@ -75,7 +75,7 @@ public abstract class ClassFileTree implements AutoCloseable { @Override public String toString() { - return "Class(" + parent.getFullyQualifiedName() + "." + name + ")"; + return "ClassFile(" + parent.getFullyQualifiedName() + "." + name + ")"; } } @@ -84,7 +84,7 @@ public abstract class ClassFileTree implements AutoCloseable { private final Package parent; private final String name; private final Map<String, Package> subPackages = new HashMap<>(); - private final Set<Class> classes = new HashSet<>(); + private final Set<ClassFile> classFiles = new HashSet<>(); private Package(Package parent, String name) { this.parent = parent; @@ -95,8 +95,8 @@ public abstract class ClassFileTree implements AutoCloseable { return subPackages.computeIfAbsent(name, n -> new Package(this, n)); } - private void addClass(Class klazz) { - classes.add(klazz); + private void addClass(ClassFile klazz) { + classFiles.add(klazz); } public String getFullyQualifiedName() { @@ -111,8 +111,8 @@ public abstract class ClassFileTree implements AutoCloseable { return subPackages.values(); } - public Collection<Class> getClasses() { - return classes; + public Collection<ClassFile> getClassFiles() { + return classFiles; } @Override diff --git a/abi-check-plugin/src/main/java/com/yahoo/abicheck/mojo/AbiCheck.java b/abi-check-plugin/src/main/java/com/yahoo/abicheck/mojo/AbiCheck.java index d1707f4bf28..e1bb97e264b 100644 --- a/abi-check-plugin/src/main/java/com/yahoo/abicheck/mojo/AbiCheck.java +++ b/abi-check-plugin/src/main/java/com/yahoo/abicheck/mojo/AbiCheck.java @@ -5,7 +5,7 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; import com.yahoo.abicheck.classtree.ClassFileTree; -import com.yahoo.abicheck.classtree.ClassFileTree.Class; +import com.yahoo.abicheck.classtree.ClassFileTree.ClassFile; import com.yahoo.abicheck.classtree.ClassFileTree.Package; import com.yahoo.abicheck.collector.AnnotationCollector; import com.yahoo.abicheck.collector.PublicSignatureCollector; @@ -158,7 +158,7 @@ public class AbiCheck extends AbstractMojo { } private boolean isPublicAbiPackage(ClassFileTree.Package pkg) throws IOException { - Optional<Class> pkgInfo = pkg.getClasses().stream() + Optional<ClassFile> pkgInfo = pkg.getClassFiles().stream() .filter(klazz -> klazz.getName().equals(PACKAGE_INFO_CLASS_FILE_NAME)).findFirst(); if (!pkgInfo.isPresent()) { return false; @@ -176,7 +176,7 @@ public class AbiCheck extends AbstractMojo { Map<String, JavaClassSignature> signatures = new LinkedHashMap<>(); if (isPublicAbiPackage(pkg)) { PublicSignatureCollector collector = new PublicSignatureCollector(); - for (ClassFileTree.Class klazz : pkg.getClasses()) { + for (ClassFile klazz : pkg.getClassFiles()) { try (InputStream is = klazz.getInputStream()) { new ClassReader(is).accept(collector, 0); } |