diff options
author | gjoranv <gjoranv@gmail.com> | 2023-10-02 22:23:28 +0200 |
---|---|---|
committer | gjoranv <gjoranv@gmail.com> | 2023-10-02 22:23:28 +0200 |
commit | dfbb845b44926f8f8e77c8b3c984b33e41fa792c (patch) | |
tree | 8d9a0312a006c4d9539f2fd187f291b1b9d80c1c /bundle-plugin | |
parent | 39a9045c54a645fc58fce44817ef5b26531704df (diff) |
Non-functional: rearrange function parameters.
Diffstat (limited to 'bundle-plugin')
4 files changed, 10 insertions, 7 deletions
diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/Analyze.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/Analyze.java index 515562eb423..6c73314d9de 100644 --- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/Analyze.java +++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/Analyze.java @@ -29,18 +29,18 @@ public class Analyze { static ClassFileMetaData analyzeClass(File classFile) { - return analyzeClass(classFile, null, JdkVersionCheck.DISABLED); + return analyzeClass(classFile, JdkVersionCheck.DISABLED, null); } - public static ClassFileMetaData analyzeClass(File classFile, ArtifactVersion artifactVersion, JdkVersionCheck jdkVersionCheck) { + public static ClassFileMetaData analyzeClass(File classFile, JdkVersionCheck jdkVersionCheck, ArtifactVersion artifactVersion) { try { - return analyzeClass(new FileInputStream(classFile), artifactVersion, jdkVersionCheck); + return analyzeClass(new FileInputStream(classFile), jdkVersionCheck, artifactVersion); } catch (Exception e) { throw new RuntimeException("An error occurred when analyzing " + classFile.getPath(), e); } } - public static ClassFileMetaData analyzeClass(InputStream inputStream, ArtifactVersion artifactVersion, JdkVersionCheck jdkVersionCheck) { + public static ClassFileMetaData analyzeClass(InputStream inputStream, JdkVersionCheck jdkVersionCheck, ArtifactVersion artifactVersion) { try { AnalyzeClassVisitor visitor = new AnalyzeClassVisitor(artifactVersion, jdkVersionCheck); new ClassReader(inputStream).accept(visitor, ClassReader.SKIP_DEBUG); diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/AbstractGenerateOsgiManifestMojo.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/AbstractGenerateOsgiManifestMojo.java index 73fcb237d18..0eb81d08901 100644 --- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/AbstractGenerateOsgiManifestMojo.java +++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/AbstractGenerateOsgiManifestMojo.java @@ -2,6 +2,7 @@ package com.yahoo.container.plugin.mojo; import com.yahoo.container.plugin.classanalysis.Analyze; +import com.yahoo.container.plugin.classanalysis.Analyze.JdkVersionCheck; import com.yahoo.container.plugin.classanalysis.ClassFileMetaData; import com.yahoo.container.plugin.classanalysis.ExportPackageAnnotation; import com.yahoo.container.plugin.classanalysis.PackageTally; @@ -206,7 +207,7 @@ abstract class AbstractGenerateOsgiManifestMojo extends AbstractMojo { private static ClassFileMetaData analyzeClass(JarFile jarFile, JarEntry entry, ArtifactVersion version) throws MojoExecutionException { try { - return Analyze.analyzeClass(jarFile.getInputStream(entry), version, Analyze.JdkVersionCheck.DISABLED); + return Analyze.analyzeClass(jarFile.getInputStream(entry), JdkVersionCheck.DISABLED, version); } catch (Exception e) { throw new MojoExecutionException( String.format("While analyzing the class '%s' in jar file '%s'", entry.getName(), jarFile.getName()), e); diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java index 9b3313d71ce..cb48c0565aa 100644 --- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java +++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java @@ -3,6 +3,7 @@ package com.yahoo.container.plugin.mojo; import com.google.common.collect.Sets; import com.yahoo.container.plugin.classanalysis.Analyze; +import com.yahoo.container.plugin.classanalysis.Analyze.JdkVersionCheck; import com.yahoo.container.plugin.classanalysis.ClassFileMetaData; import com.yahoo.container.plugin.classanalysis.PackageTally; import com.yahoo.container.plugin.osgi.ExportPackages; @@ -337,7 +338,7 @@ public class GenerateOsgiManifestMojo extends AbstractGenerateOsgiManifestMojo { List<ClassFileMetaData> analyzedClasses = allDescendantFiles(outputDirectory) .filter(file -> file.getName().endsWith(".class")) - .map(classFile -> Analyze.analyzeClass(classFile, artifactVersionOrNull(bundleVersion), Analyze.JdkVersionCheck.ENABLED)) + .map(classFile -> Analyze.analyzeClass(classFile, JdkVersionCheck.ENABLED, artifactVersionOrNull(bundleVersion))) .toList(); return PackageTally.fromAnalyzedClassFiles(analyzedClasses); diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateTestBundleOsgiManifestMojo.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateTestBundleOsgiManifestMojo.java index f1452d5e563..8f32fd70081 100644 --- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateTestBundleOsgiManifestMojo.java +++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateTestBundleOsgiManifestMojo.java @@ -2,6 +2,7 @@ package com.yahoo.container.plugin.mojo; import com.yahoo.container.plugin.classanalysis.Analyze; +import com.yahoo.container.plugin.classanalysis.Analyze.JdkVersionCheck; import com.yahoo.container.plugin.classanalysis.ClassFileMetaData; import com.yahoo.container.plugin.classanalysis.PackageTally; import com.yahoo.container.plugin.osgi.ExportPackages.Export; @@ -77,7 +78,7 @@ public class GenerateTestBundleOsgiManifestMojo extends AbstractGenerateOsgiMani return Stream.concat(allDescendantFiles(new File(project.getBuild().getOutputDirectory())), allDescendantFiles(new File(project.getBuild().getTestOutputDirectory()))) .filter(file -> file.getName().endsWith(".class")) - .map(classFile -> Analyze.analyzeClass(classFile, null, Analyze.JdkVersionCheck.DISABLED)) + .map(classFile -> Analyze.analyzeClass(classFile, JdkVersionCheck.DISABLED, null)) .toList(); } |