From b962a40be7e76b53d14d5d4afdc60ecaf45c5a24 Mon Sep 17 00:00:00 2001 From: Alessandro Autiero Date: Tue, 12 Jul 2022 16:17:15 +0200 Subject: [PATCH] Applied mvn checkstyle fixes --- src/main/java/spoon/ContractVerifier.java | 2 - src/main/java/spoon/reflect/CtModelImpl.java | 6 ++- .../spoon/reflect/factory/ModuleFactory.java | 41 ++++++++++--------- .../spoon/reflect/factory/PackageFactory.java | 10 ++--- .../AllMethodsSameSignatureFunction.java | 2 +- .../SubInheritanceHierarchyFunction.java | 4 +- .../compiler/SnippetCompilationHelper.java | 2 +- .../compiler/jdt/JDTBasedSpoonCompiler.java | 4 +- .../spoon/support/gui/SpoonModelTree.java | 2 +- .../reflect/declaration/CtModuleImpl.java | 22 ++++++++-- .../support/util/internal/ElementNameMap.java | 6 +-- .../java/JavaReflectionTreeBuilder.java | 16 ++++---- .../java/JavaReflectionVisitorImpl.java | 25 +++++------ 13 files changed, 79 insertions(+), 63 deletions(-) diff --git a/src/main/java/spoon/ContractVerifier.java b/src/main/java/spoon/ContractVerifier.java index db5bc0a9701..2dd91d604bf 100644 --- a/src/main/java/spoon/ContractVerifier.java +++ b/src/main/java/spoon/ContractVerifier.java @@ -7,8 +7,6 @@ */ package spoon; - -import spoon.reflect.CtModelImpl; import spoon.reflect.code.CtArrayWrite; import spoon.reflect.code.CtAssignment; import spoon.reflect.code.CtExpression; diff --git a/src/main/java/spoon/reflect/CtModelImpl.java b/src/main/java/spoon/reflect/CtModelImpl.java index 8c33238b262..b66a64e4426 100644 --- a/src/main/java/spoon/reflect/CtModelImpl.java +++ b/src/main/java/spoon/reflect/CtModelImpl.java @@ -23,7 +23,9 @@ import spoon.support.reflect.declaration.CtModuleImpl; import spoon.support.util.internal.ElementNameMap; -import java.util.*; +import java.util.Collection; +import java.util.Collections; +import java.util.List; import java.util.stream.Collectors; public class CtModelImpl implements CtModel { @@ -126,7 +128,7 @@ public void updateModuleName(CtModule newModule, String oldName) { modules.updateKey(oldName, newModule.getSimpleName()); } - private static class Modules extends ElementNameMap{ + private static class Modules extends ElementNameMap { @Override protected CtElement getOwner() { return null; diff --git a/src/main/java/spoon/reflect/factory/ModuleFactory.java b/src/main/java/spoon/reflect/factory/ModuleFactory.java index e693fb85548..c27d2df6f70 100644 --- a/src/main/java/spoon/reflect/factory/ModuleFactory.java +++ b/src/main/java/spoon/reflect/factory/ModuleFactory.java @@ -9,6 +9,7 @@ import java.util.Collection; + import spoon.reflect.declaration.CtModule; import spoon.reflect.declaration.CtModuleRequirement; import spoon.reflect.declaration.CtPackageExport; @@ -19,30 +20,30 @@ import spoon.reflect.reference.CtTypeReference; public class ModuleFactory extends SubFactory { - public ModuleFactory(Factory factory) { - super(factory); - } + public ModuleFactory(Factory factory) { + super(factory); + } - public CtModule getUnnamedModule() { - return factory.getModel().getUnnamedModule(); - } + public CtModule getUnnamedModule() { + return factory.getModel().getUnnamedModule(); + } - public Collection getAllModules() { - return factory.getModel().getAllModules(); - } + public Collection getAllModules() { + return factory.getModel().getAllModules(); + } - public CtModule getModule(String moduleName) { + public CtModule getModule(String moduleName) { if (moduleName == null || moduleName.isEmpty()) { return getUnnamedModule(); } - return factory.getModel().getModule(moduleName); - } + return factory.getModel().getModule(moduleName); + } - public CtModule getOrCreate(String moduleName) { - if (moduleName == null || moduleName.isEmpty()) { - return getUnnamedModule(); - } + public CtModule getOrCreate(String moduleName) { + if (moduleName == null || moduleName.isEmpty()) { + return getUnnamedModule(); + } CtModule known = getModule(moduleName); if (known != null) { @@ -52,11 +53,11 @@ public CtModule getOrCreate(String moduleName) { CtModule fresh = factory.Core().createModule().setSimpleName(moduleName); factory.getModel().addModule(fresh); return fresh; - } + } - public CtModuleReference createReference(CtModule module) { - return createReference(module.getSimpleName()); - } + public CtModuleReference createReference(CtModule module) { + return createReference(module.getSimpleName()); + } public CtModuleReference createReference(String module) { return factory.Core().createModuleReference().setSimpleName(module); diff --git a/src/main/java/spoon/reflect/factory/PackageFactory.java b/src/main/java/spoon/reflect/factory/PackageFactory.java index bb5d6f185fe..b2812a13ed7 100644 --- a/src/main/java/spoon/reflect/factory/PackageFactory.java +++ b/src/main/java/spoon/reflect/factory/PackageFactory.java @@ -124,7 +124,7 @@ public CtPackage getOrCreate(String qualifiedName) { private CtModule findModuleByPackage(String qualifiedName) { String owner = getOwner(qualifiedName); CtModule known = packageModuleCache.get(owner); - if(known != null){ + if (known != null) { return known; } @@ -135,11 +135,11 @@ private CtModule findModuleByPackage(String qualifiedName) { private CtModule findCtModule(String qualifiedName) { List modules = findModules(qualifiedName); - if(modules.isEmpty()){ + if (modules.isEmpty()) { return factory.getModel().getUnnamedModule(); } - if(modules.size() != 1){ + if (modules.size() != 1) { throw new SpoonException( "Ambiguous package name detected. If you believe the code you analyzed is correct, please" + " file an issue and reference https://github.com/INRIA/spoon/issues/4051. " @@ -151,9 +151,9 @@ private CtModule findCtModule(String qualifiedName) { return factory.Module().getOrCreate(modules.get(0).getName()); } - private String getOwner(String qualifiedName){ + private String getOwner(String qualifiedName) { int index = qualifiedName.indexOf("."); - if(index == -1){ + if (index == -1) { return qualifiedName; } diff --git a/src/main/java/spoon/reflect/visitor/filter/AllMethodsSameSignatureFunction.java b/src/main/java/spoon/reflect/visitor/filter/AllMethodsSameSignatureFunction.java index 4e44b9ec4a9..da71df7317f 100644 --- a/src/main/java/spoon/reflect/visitor/filter/AllMethodsSameSignatureFunction.java +++ b/src/main/java/spoon/reflect/visitor/filter/AllMethodsSameSignatureFunction.java @@ -116,7 +116,7 @@ public boolean matches(CtLambda lambda) { CtType declaringType = targetMethod.getDeclaringType(); lambdaFilter.addImplementingInterface(declaringType); - for(CtModule ctModule : declaringType.getFactory().getModel().getAllModules()) { + for (CtModule ctModule : declaringType.getFactory().getModel().getAllModules()) { //search for all declarations and implementations of this method in sub and super classes and interfaces of all related hierarchies. class Context { boolean haveToSearchForSubtypes; diff --git a/src/main/java/spoon/reflect/visitor/filter/SubInheritanceHierarchyFunction.java b/src/main/java/spoon/reflect/visitor/filter/SubInheritanceHierarchyFunction.java index 7290be7c9ec..f9c99d8b67b 100644 --- a/src/main/java/spoon/reflect/visitor/filter/SubInheritanceHierarchyFunction.java +++ b/src/main/java/spoon/reflect/visitor/filter/SubInheritanceHierarchyFunction.java @@ -66,7 +66,7 @@ public SubInheritanceHierarchyFunction failOnClassNotFound(boolean failOnClassNo @Override public void apply(CtTypeInformation input, final CtConsumer outputConsumer) { Factory factory = ((CtElement) input).getFactory(); - for(CtModule ctModule : factory.getModel().getAllModules()) { + for (CtModule ctModule : factory.getModel().getAllModules()) { final SubInheritanceHierarchyResolver fnc = new SubInheritanceHierarchyResolver(ctModule.getRootPackage()) .failOnClassNotFound(failOnClassNotFound) .includingInterfaces(includingInterfaces); @@ -81,7 +81,7 @@ public void apply(CtTypeInformation input, final CtConsumer outputConsum fnc.forEachSubTypeInPackage((CtType typeInfo) -> { outputConsumer.accept(typeInfo); // Cannot terminate, because its support was removed. - // I think there are cases where it might be useful. + // I think there are cases where it might be useful. // fnc.terminate(); query.isTerminated(); }); diff --git a/src/main/java/spoon/support/compiler/SnippetCompilationHelper.java b/src/main/java/spoon/support/compiler/SnippetCompilationHelper.java index 821a8698d38..36d3f470de8 100644 --- a/src/main/java/spoon/support/compiler/SnippetCompilationHelper.java +++ b/src/main/java/spoon/support/compiler/SnippetCompilationHelper.java @@ -99,7 +99,7 @@ public static void compileAndReplaceSnippetsIn(CtType initialClass) { CtType newClass = f.Type().get(initialClass.getQualifiedName()); // we find the snippets that are now ASTs - for(CtModule ctModule : f.getModel().getAllModules()) { + for (CtModule ctModule : f.getModel().getAllModules()) { for (CtPath p : elements2before.keySet()) { elements2after.put(p, p.evaluateOn(ctModule.getRootPackage()).iterator().next()); } diff --git a/src/main/java/spoon/support/compiler/jdt/JDTBasedSpoonCompiler.java b/src/main/java/spoon/support/compiler/jdt/JDTBasedSpoonCompiler.java index b56fe79c51f..e2c8af5864f 100644 --- a/src/main/java/spoon/support/compiler/jdt/JDTBasedSpoonCompiler.java +++ b/src/main/java/spoon/support/compiler/jdt/JDTBasedSpoonCompiler.java @@ -182,7 +182,7 @@ public void instantiateAndProcess(List processors) { factory.getEnvironment().debugMessage("Loaded processor " + processorName + "."); } - for(CtModule ctModule : factory.getModel().getAllModules()){ + for (CtModule ctModule : factory.getModel().getAllModules()) { processing.process(ctModule.getRootPackage()); } } @@ -196,7 +196,7 @@ public void process(Collection> processors) { factory.getEnvironment().debugMessage("Loaded processor " + processorName + "."); } - for(CtModule ctModule : factory.getModel().getAllModules()){ + for (CtModule ctModule : factory.getModel().getAllModules()) { processing.process(ctModule.getRootPackage()); } } diff --git a/src/main/java/spoon/support/gui/SpoonModelTree.java b/src/main/java/spoon/support/gui/SpoonModelTree.java index e9396d3caaa..10868089b26 100644 --- a/src/main/java/spoon/support/gui/SpoonModelTree.java +++ b/src/main/java/spoon/support/gui/SpoonModelTree.java @@ -67,7 +67,7 @@ public class SpoonModelTree extends JFrame implements KeyListener, */ public SpoonModelTree(Factory factory) { SpoonTreeBuilder cst = new SpoonTreeBuilder(); - for(CtModule ctModule : factory.getModel().getAllModules()) { + for (CtModule ctModule : factory.getModel().getAllModules()) { cst.scan(ctModule.getRootPackage()); } diff --git a/src/main/java/spoon/support/reflect/declaration/CtModuleImpl.java b/src/main/java/spoon/support/reflect/declaration/CtModuleImpl.java index 056a1324c6d..7dc2f72f012 100644 --- a/src/main/java/spoon/support/reflect/declaration/CtModuleImpl.java +++ b/src/main/java/spoon/support/reflect/declaration/CtModuleImpl.java @@ -9,7 +9,17 @@ import spoon.reflect.CtModelImpl; import spoon.reflect.annotations.MetamodelPropertyField; -import spoon.reflect.declaration.*; +import spoon.reflect.declaration.CtElement; +import spoon.reflect.declaration.CtModule; +import spoon.reflect.declaration.CtModuleDirective; +import spoon.reflect.declaration.CtModuleRequirement; +import spoon.reflect.declaration.CtNamedElement; +import spoon.reflect.declaration.CtPackage; +import spoon.reflect.declaration.CtPackageExport; +import spoon.reflect.declaration.CtProvidedService; +import spoon.reflect.declaration.CtShadowable; +import spoon.reflect.declaration.CtUsedService; +import spoon.reflect.declaration.ParentNotInitializedException; import spoon.reflect.factory.Factory; import spoon.reflect.path.CtRole; import spoon.reflect.reference.CtModuleReference; @@ -18,7 +28,11 @@ import spoon.support.comparator.CtLineElementComparator; import spoon.support.util.SortedList; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.Set; import java.util.stream.Stream; public class CtModuleImpl extends CtNamedElementImpl implements CtModule { @@ -34,7 +48,7 @@ public class CtModuleImpl extends CtNamedElementImpl implements CtModule { @MetamodelPropertyField(role = CtRole.SUB_PACKAGE) private CtPackage rootPackage; - public CtModuleImpl(Factory factory){ + public CtModuleImpl(Factory factory) { this.setFactory(factory); this.moduleDirectives = CtElementImpl.emptyList(); this.rootPackage = new CtPackageImpl.RootPackage(this); @@ -51,7 +65,7 @@ public E setSimpleName(String simpleName) { super.setSimpleName(simpleName); CtModelImpl ctModel = (CtModelImpl) factory.getModel(); - if(ctModel != null) { + if (ctModel != null) { ctModel.updateModuleName(this, oldName); } diff --git a/src/main/java/spoon/support/util/internal/ElementNameMap.java b/src/main/java/spoon/support/util/internal/ElementNameMap.java index b8d398e11bd..c4c7daf8a57 100644 --- a/src/main/java/spoon/support/util/internal/ElementNameMap.java +++ b/src/main/java/spoon/support/util/internal/ElementNameMap.java @@ -69,7 +69,7 @@ public T put(String key, T e) { return null; } CtElement owner = getOwner(); - if(owner != null) { + if (owner != null) { linkToParent(owner, e); getModelChangeListener().onMapAdd(owner, getRole(), map, key, e); } @@ -87,7 +87,7 @@ public T remove(Object key) { return null; } - if(getOwner() != null) { + if (getOwner() != null) { getModelChangeListener().onMapDelete( getOwner(), getRole(), @@ -108,7 +108,7 @@ public void clear() { // Only an approximation as the concurrent map is only weakly consistent Map old = new LinkedHashMap<>(map); map.clear(); - if(getOwner() != null){ + if (getOwner() != null) { getModelChangeListener().onMapDeleteAll( getOwner(), getRole(), diff --git a/src/main/java/spoon/support/visitor/java/JavaReflectionTreeBuilder.java b/src/main/java/spoon/support/visitor/java/JavaReflectionTreeBuilder.java index cea9c24bb23..e5cef382b89 100644 --- a/src/main/java/spoon/support/visitor/java/JavaReflectionTreeBuilder.java +++ b/src/main/java/spoon/support/visitor/java/JavaReflectionTreeBuilder.java @@ -110,19 +110,19 @@ public > R scan(Class clazz) { } else { CtPackage ctPackage = clazz.getPackage() != null ? factory.Package().getOrCreate(clazz.getPackage().getName()) : factory.Package().getRootPackage(); - if(contexts.isEmpty()){ + if (contexts.isEmpty()) { contexts.add(new PackageRuntimeBuilderContext(ctPackage)); } if (clazz.isAnnotation()) { visitAnnotationClass((Class) clazz); - }else if (clazz.isInterface()) { + } else if (clazz.isInterface()) { visitInterface(clazz); - }else if (clazz.isEnum()) { + } else if (clazz.isEnum()) { visitEnum(clazz); - }else if (MethodHandleUtils.isRecord(clazz)) { + } else if (MethodHandleUtils.isRecord(clazz)) { visitRecord(clazz); - }else { + } else { visitClass(clazz); } exit(); @@ -143,7 +143,7 @@ public void visitModule(Module module) { CtModule fresh = know != null ? know : factory.Module().getOrCreate(module.getName()); ModuleDescriptor descriptor = module.getDescriptor(); - if(descriptor != null){ + if (descriptor != null) { createModuleData(fresh, descriptor); } @@ -183,11 +183,11 @@ private void createModuleData(CtModule fresh, ModuleDescriptor descriptor) { private CtModuleRequirement createRequires(ModuleDescriptor.Requires instruction) { CtModuleReference requiredModule = factory.Module().createReference(instruction.name()); Set modifiers = new HashSet<>(); - if(instruction.modifiers().contains(ModuleDescriptor.Requires.Modifier.STATIC)){ + if (instruction.modifiers().contains(ModuleDescriptor.Requires.Modifier.STATIC)) { modifiers.add(CtModuleRequirement.RequiresModifier.STATIC); } - if(instruction.modifiers().contains(ModuleDescriptor.Requires.Modifier.TRANSITIVE)){ + if (instruction.modifiers().contains(ModuleDescriptor.Requires.Modifier.TRANSITIVE)) { modifiers.add(CtModuleRequirement.RequiresModifier.TRANSITIVE); } diff --git a/src/main/java/spoon/support/visitor/java/JavaReflectionVisitorImpl.java b/src/main/java/spoon/support/visitor/java/JavaReflectionVisitorImpl.java index 40957ae7bcc..6807b2d655b 100644 --- a/src/main/java/spoon/support/visitor/java/JavaReflectionVisitorImpl.java +++ b/src/main/java/spoon/support/visitor/java/JavaReflectionVisitorImpl.java @@ -22,20 +22,21 @@ import java.lang.reflect.WildcardType; import java.util.ArrayList; import java.util.List; + import spoon.SpoonException; import spoon.reflect.path.CtRole; import spoon.support.visitor.java.reflect.RtMethod; import spoon.support.visitor.java.reflect.RtParameter; class JavaReflectionVisitorImpl implements JavaReflectionVisitor { - private static final Class recordClass = getRecordClass(); + private static final Class recordClass = getRecordClass(); - @Override - public void visitModule(Module module) { - for (Annotation annotation : module.getAnnotations()) { - visitAnnotation(annotation); - } - } + @Override + public void visitModule(Module module) { + for (Annotation annotation : module.getAnnotations()) { + visitAnnotation(annotation); + } + } @Override public void visitPackage(Package aPackage) { @@ -46,7 +47,7 @@ public void visitPackage(Package aPackage) { @Override public void visitClass(Class clazz) { - visitModule(clazz.getModule()); + visitModule(clazz.getModule()); if (clazz.getPackage() != null) { visitPackage(clazz.getPackage()); } @@ -132,7 +133,7 @@ protected final void visitType(Class aClass) { @Override public void visitInterface(Class clazz) { assert clazz.isInterface(); - visitModule(clazz.getModule()); + visitModule(clazz.getModule()); if (clazz.getPackage() != null) { visitPackage(clazz.getPackage()); } @@ -190,7 +191,7 @@ public void visitInterface(Class clazz) { @Override public void visitEnum(Class clazz) { assert clazz.isEnum(); - visitModule(clazz.getModule()); + visitModule(clazz.getModule()); if (clazz.getPackage() != null) { visitPackage(clazz.getPackage()); } @@ -264,7 +265,7 @@ public void visitEnum(Class clazz) { @Override public void visitAnnotationClass(Class clazz) { assert clazz.isAnnotation(); - visitModule(clazz.getModule()); + visitModule(clazz.getModule()); if (clazz.getPackage() != null) { visitPackage(clazz.getPackage()); } @@ -533,7 +534,7 @@ public void visitRecord(Class clazz) { } try { for (TypeVariable> generic : clazz.getTypeParameters()) { - visitTypeParameter(generic); + visitTypeParameter(generic); } } catch (NoClassDefFoundError ignore) { // partial classpath