prefactor

Author: trask

instrumentation/runtime-telemetry/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/runtimetelemetry/JarDetails.java

@@ -54,17 +54,16 @@ class JarDetails {
           });
 
   private final URL url;
-  protected final JarFile jarFile;
   @Nullable private final Properties pom;
   @Nullable private final Manifest manifest;
   private final String sha1Checksum;
 
-  private JarDetails(URL url, JarFile jarFile) throws IOException {
+  private JarDetails(
+      URL url, @Nullable Properties pom, @Nullable Manifest manifest, String sha1Checksum) {
     this.url = url;
-    this.jarFile = jarFile;
-    this.pom = getPom();
-    this.manifest = getManifest();
-    this.sha1Checksum = computeDigest(SHA1.get());
+    this.pom = pom;
+    this.manifest = manifest;
+    this.sha1Checksum = sha1Checksum;
   }
 
   static JarDetails forUrl(URL url) throws IOException {
@@ -82,11 +81,17 @@ static JarDetails forUrl(URL url) throws IOException {
           if (jarEntry == null) {
             throw new IOException("Embedded jar entry not found: " + targetEntry);
           }
-          return new EmbeddedJarDetails(url, jarFile, jarEntry);
+          return new JarDetails(
+              url,
+              getPom(jarFile, jarEntry),
+              getManifest(jarFile, jarEntry),
+              computeDigest(jarFile, jarEntry, SHA1.get()));
         }
       }
     }
-    return new JarDetails(url, new JarFile(url.getFile()));
+    JarFile jarFile = new JarFile(url.getFile());
+    return new JarDetails(
+        url, getPom(jarFile), getManifest(jarFile), computeDigest(url, SHA1.get()));
   }
 
   /**
@@ -180,8 +185,15 @@ String computeSha1() {
     return sha1Checksum;
   }
 
-  private String computeDigest(MessageDigest md) throws IOException {
-    try (InputStream inputStream = getInputStream()) {
+  private static String computeDigest(URL url, MessageDigest md) throws IOException {
+    try (InputStream inputStream = url.openStream()) {
+      return computeDigest(inputStream, md);
+    }
+  }
+
+  private static String computeDigest(JarFile jarFile, JarEntry jarEntry, MessageDigest md)
+      throws IOException {
+    try (InputStream inputStream = jarFile.getInputStream(jarEntry)) {
       return computeDigest(inputStream, md);
     }
   }
@@ -196,29 +208,28 @@ private static String computeDigest(InputStream inputStream, MessageDigest md)
     return String.format(Locale.ROOT, "%040x", new BigInteger(1, digest));
   }
 
-  /**
-   * Returns An open input stream for the associated url. It is the caller's responsibility to close
-   * the stream on completion.
-   */
-  protected InputStream getInputStream() throws IOException {
-    return url.openStream();
-  }
-
   @Nullable
-  protected Manifest getManifest() {
+  private static Manifest getManifest(JarFile jarFile) {
     try {
       return jarFile.getManifest();
-    } catch (IOException e) {
+    } catch (IOException ignored) {
       return null;
     }
   }
 
+  @Nullable
+  private static Manifest getManifest(JarFile jarFile, JarEntry jarEntry) throws IOException {
+    try (JarInputStream jarInputStream = new JarInputStream(jarFile.getInputStream(jarEntry))) {
+      return jarInputStream.getManifest();
+    }
+  }
+
   /**
    * Returns the values from pom.properties if this file is found. If multiple pom.properties files
    * are found or there is an error reading the file, return null.
    */
   @Nullable
-  protected Properties getPom() throws IOException {
+  private static Properties getPom(JarFile jarFile) throws IOException {
     Properties pom = null;
     for (Enumeration<JarEntry> entries = jarFile.entries(); entries.hasMoreElements(); ) {
       JarEntry jarEntry = entries.nextElement();
@@ -238,51 +249,26 @@ protected Properties getPom() throws IOException {
     return pom;
   }
 
-  private static class EmbeddedJarDetails extends JarDetails {
-
-    private final JarEntry jarEntry;
-
-    private EmbeddedJarDetails(URL url, JarFile jarFile, JarEntry jarEntry) throws IOException {
-      super(url, jarFile);
-      this.jarEntry = jarEntry;
-    }
-
-    @Override
-    protected InputStream getInputStream() throws IOException {
-      return jarFile.getInputStream(jarEntry);
-    }
-
-    @Override
-    protected Manifest getManifest() {
-      try (JarInputStream jarFile = new JarInputStream(getInputStream())) {
-        return jarFile.getManifest();
-      } catch (IOException e) {
-        return null;
-      }
-    }
-
-    @Override
-    @Nullable
-    protected Properties getPom() throws IOException {
-      Properties pom = null;
-      // Need to navigate inside the embedded jar which can't be done via random access.
-      try (JarInputStream jarFile = new JarInputStream(getInputStream())) {
-        for (JarEntry entry = jarFile.getNextJarEntry();
-            entry != null;
-            entry = jarFile.getNextJarEntry()) {
-          if (entry.getName().startsWith("META-INF/maven")
-              && entry.getName().endsWith("pom.properties")) {
-            if (pom != null) {
-              // we've found multiple pom files. bail!
-              return null;
-            }
-            Properties props = new Properties();
-            props.load(jarFile);
-            pom = props;
+  @Nullable
+  private static Properties getPom(JarFile jarFile, JarEntry jarEntry) throws IOException {
+    Properties pom = null;
+    // Need to navigate inside the embedded jar which can't be done via random access.
+    try (JarInputStream jarInputStream = new JarInputStream(jarFile.getInputStream(jarEntry))) {
+      for (JarEntry entry = jarInputStream.getNextJarEntry();
+          entry != null;
+          entry = jarInputStream.getNextJarEntry()) {
+        if (entry.getName().startsWith("META-INF/maven")
+            && entry.getName().endsWith("pom.properties")) {
+          if (pom != null) {
+            // we've found multiple pom files. bail!
+            return null;
           }
+          Properties props = new Properties();
+          props.load(jarInputStream);
+          pom = props;
         }
-        return pom;
       }
+      return pom;
     }
   }
 }