diff options
author | gjoranv <gjoranv@gmail.com> | 2019-10-23 12:11:12 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-23 12:11:12 +0200 |
commit | d9f4351623e616f8df85e73b45f9e42bd221fb6f (patch) | |
tree | a0053a7e0af5515386b3b75f0bb521d9a096a34e /bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/Analyze.java | |
parent | dfec83cec5f464b09b72fc48ff1a5e114523aded (diff) |
Revert "Gjoranv/artifact version for exports3"
Diffstat (limited to 'bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/Analyze.java')
-rw-r--r-- | bundle-plugin/src/main/java/com/yahoo/container/plugin/classanalysis/Analyze.java | 15 |
1 files changed, 5 insertions, 10 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 d586f324f77..13a306a0c1c 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,18 +1,17 @@ // 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 @@ -22,20 +21,16 @@ import java.util.Optional; */ public class Analyze { public static ClassFileMetaData analyzeClass(File classFile) { - return analyzeClass(classFile, null); - } - - public static ClassFileMetaData analyzeClass(File classFile, ArtifactVersion artifactVersion) { try { - return analyzeClass(new FileInputStream(classFile), artifactVersion); - } catch (Exception e) { + return withFileInputStream(classFile, Analyze::analyzeClass); + } catch (RuntimeException e) { throw new RuntimeException("An error occurred when analyzing " + classFile.getPath(), e); } } - public static ClassFileMetaData analyzeClass(InputStream inputStream, ArtifactVersion artifactVersion) { + public static ClassFileMetaData analyzeClass(InputStream inputStream) { try { - AnalyzeClassVisitor visitor = new AnalyzeClassVisitor(artifactVersion); + AnalyzeClassVisitor visitor = new AnalyzeClassVisitor(); new ClassReader(inputStream).accept(visitor, ClassReader.SKIP_DEBUG); return visitor.result(); } catch (IOException e) { |