diff options
Diffstat (limited to 'bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis')
-rw-r--r-- | bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/Analyze.java | 15 | ||||
-rw-r--r-- | bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/AnalyzeClassVisitor.java | 17 |
2 files changed, 23 insertions, 9 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 13a306a0c1c..d586f324f77 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 @@ -1,17 +1,18 @@ // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.container.plugin.classanalysis; +import org.apache.maven.artifact.versioning.ArtifactVersion; import org.objectweb.asm.AnnotationVisitor; import org.objectweb.asm.ClassReader; import org.objectweb.asm.Opcodes; import org.objectweb.asm.Type; import java.io.File; +import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.util.Optional; -import static com.yahoo.container.plugin.util.IO.withFileInputStream; /** * Main entry point for class analysis @@ -21,16 +22,20 @@ import static com.yahoo.container.plugin.util.IO.withFileInputStream; */ public class Analyze { public static ClassFileMetaData analyzeClass(File classFile) { + return analyzeClass(classFile, null); + } + + public static ClassFileMetaData analyzeClass(File classFile, ArtifactVersion artifactVersion) { try { - return withFileInputStream(classFile, Analyze::analyzeClass); - } catch (RuntimeException e) { + return analyzeClass(new FileInputStream(classFile), artifactVersion); + } catch (Exception e) { throw new RuntimeException("An error occurred when analyzing " + classFile.getPath(), e); } } - public static ClassFileMetaData analyzeClass(InputStream inputStream) { + public static ClassFileMetaData analyzeClass(InputStream inputStream, ArtifactVersion artifactVersion) { try { - AnalyzeClassVisitor visitor = new AnalyzeClassVisitor(); + AnalyzeClassVisitor visitor = new AnalyzeClassVisitor(artifactVersion); new ClassReader(inputStream).accept(visitor, ClassReader.SKIP_DEBUG); return visitor.result(); } catch (IOException e) { diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/AnalyzeClassVisitor.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/AnalyzeClassVisitor.java index 0225c43e4b8..e37a9caa7cc 100644 --- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/AnalyzeClassVisitor.java +++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/AnalyzeClassVisitor.java @@ -3,6 +3,7 @@ package com.yahoo.container.plugin.classanalysis; import com.yahoo.osgi.annotation.ExportPackage; import com.yahoo.osgi.annotation.Version; +import org.apache.maven.artifact.versioning.ArtifactVersion; import org.objectweb.asm.AnnotationVisitor; import org.objectweb.asm.Attribute; import org.objectweb.asm.ClassVisitor; @@ -27,8 +28,11 @@ class AnalyzeClassVisitor extends ClassVisitor implements ImportCollector { private Set<String> imports = new HashSet<>(); private Optional<ExportPackageAnnotation> exportPackageAnnotation = Optional.empty(); - AnalyzeClassVisitor() { + private final Optional<ArtifactVersion> defaultExportPackageVersion; + + AnalyzeClassVisitor(ArtifactVersion defaultExportPackageVersion) { super(Opcodes.ASM7); + this.defaultExportPackageVersion = Optional.ofNullable(defaultExportPackageVersion); } @Override @@ -99,9 +103,14 @@ class AnalyzeClassVisitor extends ClassVisitor implements ImportCollector { private AnnotationVisitor visitExportPackage() { return new AnnotationVisitor(Opcodes.ASM7) { - private int major = defaultVersionValue("major"); - private int minor = defaultVersionValue("minor"); - private int micro = defaultVersionValue("micro"); + private int major = defaultExportPackageVersion.map(ArtifactVersion::getMajorVersion) + .orElse(defaultVersionValue("major")); + private int minor = defaultExportPackageVersion.map(ArtifactVersion::getMinorVersion) + .orElse(defaultVersionValue("minor")); + private int micro = defaultExportPackageVersion.map(ArtifactVersion::getIncrementalVersion) + .orElse(defaultVersionValue("micro")); + + // Default qualifier is the empty string. private String qualifier = defaultVersionValue("qualifier"); @Override |