Refactor: avoid the EnhancedClassReader type spreading through the co…

…debase
luontola · Aug 14, 2018 · ea49b21 · ea49b21
1 parent e5f6758
commit ea49b21
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 32 deletions.
diff --git a/retrolambda/src/main/java/net/orfjackal/retrolambda/ClassAnalyzer.java b/retrolambda/src/main/java/net/orfjackal/retrolambda/ClassAnalyzer.java
@@ -1,4 +1,4 @@
-// Copyright © 2013-2017 Esko Luontola and other Retrolambda contributors
+// Copyright © 2013-2018 Esko Luontola and other Retrolambda contributors
 // This software is released under the Apache License 2.0.
 // The license text is at http://www.apache.org/licenses/LICENSE-2.0
 
@@ -23,10 +23,10 @@ public class ClassAnalyzer {
     private final Map<MethodRef, MethodRef> renamedLambdaMethods = new HashMap<>();
 
     public void analyze(byte[] bytecode, boolean isJavacHacksEnabled) {
-        analyze(new EnhancedClassReader(bytecode, isJavacHacksEnabled));
+        analyze(EnhancedClassReader.create(bytecode, isJavacHacksEnabled));
     }
 
-    public void analyze(EnhancedClassReader cr) {
+    public void analyze(ClassReader cr) {
         ClassInfo c = new ClassInfo(cr);
         classes.put(c.type, c);
 
@@ -38,7 +38,7 @@ public void analyze(EnhancedClassReader cr) {
         analyzeClassOrInterface(c, cr);
     }
 
-    private void analyzeClass(ClassInfo c, EnhancedClassReader cr) {
+    private void analyzeClass(ClassInfo c, ClassReader cr) {
         cr.accept(new ClassVisitor(ASM5) {
             private String owner;
 
@@ -65,7 +65,7 @@ public MethodVisitor visitMethod(int access, String name, String desc, String si
         }, ClassReader.SKIP_CODE);
     }
 
-    private void analyzeInterface(ClassInfo c, EnhancedClassReader cr) {
+    private void analyzeInterface(ClassInfo c, ClassReader cr) {
         cr.accept(new ClassVisitor(ASM5) {
             private String owner;
             private String companion;
@@ -101,7 +101,7 @@ public MethodVisitor visitMethod(int access, String name, String desc, String si
         }, ClassReader.SKIP_CODE);
     }
 
-    private void analyzeClassOrInterface(ClassInfo c, EnhancedClassReader cr) {
+    private void analyzeClassOrInterface(ClassInfo c, ClassReader cr) {
         cr.accept(new ClassVisitor(ASM5) {
             private String owner;
 

diff --git a/retrolambda/src/main/java/net/orfjackal/retrolambda/Transformers.java b/retrolambda/src/main/java/net/orfjackal/retrolambda/Transformers.java
@@ -1,10 +1,9 @@
-// Copyright © 2013-2017 Esko Luontola and other Retrolambda contributors
+// Copyright © 2013-2018 Esko Luontola and other Retrolambda contributors
 // This software is released under the Apache License 2.0.
 // The license text is at http://www.apache.org/licenses/LICENSE-2.0
 
 package net.orfjackal.retrolambda;
 
-import net.orfjackal.retrolambda.ext.ow2asm.EnhancedClassReader;
 import net.orfjackal.retrolambda.interfaces.*;
 import net.orfjackal.retrolambda.lambdas.*;
 import net.orfjackal.retrolambda.requirenonnull.RequireNonNull;
@@ -27,7 +26,7 @@ public Transformers(int targetVersion, boolean defaultMethodsEnabled, ClassAnaly
         this.analyzer = analyzer;
     }
 
-    public byte[] backportLambdaClass(EnhancedClassReader reader) {
+    public byte[] backportLambdaClass(ClassReader reader) {
         return transform(reader, (next) -> {
             if (defaultMethodsEnabled) {
                 // Lambda classes are generated dynamically, so they were not
@@ -44,7 +43,7 @@ public byte[] backportLambdaClass(EnhancedClassReader reader) {
         });
     }
 
-    public byte[] backportClass(EnhancedClassReader reader) {
+    public byte[] backportClass(ClassReader reader) {
         return transform(reader, (next) -> {
             if (defaultMethodsEnabled) {
                 next = new UpdateRelocatedMethodInvocations(next, analyzer);
@@ -55,7 +54,7 @@ public byte[] backportClass(EnhancedClassReader reader) {
         });
     }
 
-    public List<byte[]> backportInterface(EnhancedClassReader reader) {
+    public List<byte[]> backportInterface(ClassReader reader) {
         // The lambdas must be backported only once, because bad things will happen if a lambda
         // is called by different class name in the interface and its companion class, and then
         // the wrong one of them is written to disk last.
@@ -104,7 +103,7 @@ private byte[] transform(ClassNode node, ClassVisitorChain chain) {
         return transform(node.name, node::accept, chain);
     }
 
-    private byte[] transform(EnhancedClassReader reader, ClassVisitorChain chain) {
+    private byte[] transform(ClassReader reader, ClassVisitorChain chain) {
         return transform(reader.getClassName(), cv -> reader.accept(cv, 0), chain);
     }
 

diff --git a/retrolambda/src/main/java/net/orfjackal/retrolambda/ext/ow2asm/EnhancedClassReader.java b/retrolambda/src/main/java/net/orfjackal/retrolambda/ext/ow2asm/EnhancedClassReader.java
@@ -1,4 +1,4 @@
-// Copyright © 2013-2015 Esko Luontola <www.orfjackal.net>
+// Copyright © 2013-2018 Esko Luontola and other Retrolambda contributors
 // This software is released under the Apache License 2.0.
 // The license text is at http://www.apache.org/licenses/LICENSE-2.0
 
@@ -8,20 +8,21 @@
 
 public class EnhancedClassReader extends ClassReader {
 
-    private final boolean isJavacHacksEnabled;
+    public static ClassReader create(byte[] bytecode, boolean isJavacHacksEnabled) {
+        if (isJavacHacksEnabled) {
+            return new EnhancedClassReader(bytecode);
+        } else {
+            return new ClassReader(bytecode);
+        }
+    }
 
-    public EnhancedClassReader(byte[] b, boolean isJavacHacksEnabled) {
+    private EnhancedClassReader(byte[] b) {
         super(b);
-        this.isJavacHacksEnabled = isJavacHacksEnabled;
     }
 
     @Override
     protected Label readLabel(int offset, Label[] labels) {
-        if (!isJavacHacksEnabled) {
-            return super.readLabel(offset, labels);
-        }
         // A workaround suggested by Evgeny Mandrikov. See more: https://gitlab.ow2.org/asm/asm/issues/317845
         return super.readLabel(Math.min(offset, labels.length - 1), labels);
     }
-
 }
diff --git a/retrolambda/src/main/java/net/orfjackal/retrolambda/files/OutputDirectory.java b/retrolambda/src/main/java/net/orfjackal/retrolambda/files/OutputDirectory.java
@@ -1,10 +1,11 @@
-// Copyright © 2013-2015 Esko Luontola <www.orfjackal.net>
+// Copyright © 2013-2018 Esko Luontola and other Retrolambda contributors
 // This software is released under the Apache License 2.0.
 // The license text is at http://www.apache.org/licenses/LICENSE-2.0
 
 package net.orfjackal.retrolambda.files;
 
 import net.orfjackal.retrolambda.ext.ow2asm.EnhancedClassReader;
+import org.objectweb.asm.ClassReader;
 
 import java.io.IOException;
 import java.nio.file.*;
@@ -21,7 +22,7 @@ public void writeClass(byte[] bytecode, boolean isJavacHacksEnabled) throws IOEx
         if (bytecode == null) {
             return;
         }
-        EnhancedClassReader cr = new EnhancedClassReader(bytecode, isJavacHacksEnabled);
+        ClassReader cr = EnhancedClassReader.create(bytecode, isJavacHacksEnabled);
         Path relativePath = outputDir.getFileSystem().getPath(cr.getClassName() + ".class");
         writeFile(relativePath, bytecode);
     }

diff --git a/retrolambda/src/main/java/net/orfjackal/retrolambda/interfaces/ClassInfo.java b/retrolambda/src/main/java/net/orfjackal/retrolambda/interfaces/ClassInfo.java
@@ -1,18 +1,17 @@
-// Copyright © 2013-2015 Esko Luontola <www.orfjackal.net>
+// Copyright © 2013-2018 Esko Luontola and other Retrolambda contributors
 // This software is released under the Apache License 2.0.
 // The license text is at http://www.apache.org/licenses/LICENSE-2.0
 
 package net.orfjackal.retrolambda.interfaces;
 
-import net.orfjackal.retrolambda.ext.ow2asm.EnhancedClassReader;
 import net.orfjackal.retrolambda.util.Flags;
 import org.objectweb.asm.*;
 
 import java.util.*;
 
 public class ClassInfo {
 
-    public final EnhancedClassReader reader;
+    public final ClassReader reader;
     private final int access;
     public final Type type;
     public final Type superclass;
@@ -27,7 +26,7 @@ public ClassInfo() {
         this.superclass = null;
     }
 
-    public ClassInfo(EnhancedClassReader cr) {
+    public ClassInfo(ClassReader cr) {
         this.reader = cr;
         this.access = cr.getAccess();
         this.type = Type.getObjectType(cr.getClassName());

diff --git a/retrolambda/src/main/java/net/orfjackal/retrolambda/lambdas/LambdaClassSaver.java b/retrolambda/src/main/java/net/orfjackal/retrolambda/lambdas/LambdaClassSaver.java
@@ -1,14 +1,13 @@
-// Copyright © 2013-2017 Esko Luontola and other Retrolambda contributors
+// Copyright © 2013-2018 Esko Luontola and other Retrolambda contributors
 // This software is released under the Apache License 2.0.
 // The license text is at http://www.apache.org/licenses/LICENSE-2.0
 
 package net.orfjackal.retrolambda.lambdas;
 
 import com.esotericsoftware.minlog.Log;
 import net.orfjackal.retrolambda.Transformers;
-import net.orfjackal.retrolambda.files.OutputDirectory;
-
 import net.orfjackal.retrolambda.ext.ow2asm.EnhancedClassReader;
+import net.orfjackal.retrolambda.files.OutputDirectory;
 
 import java.io.IOException;
 
@@ -32,7 +31,7 @@ public void saveIfLambda(String className, byte[] bytecode) {
 
     private void reifyLambdaClass(String className, byte[] bytecode) {
         Log.info("Saving lambda class: " + className);
-        bytecode = transformers.backportLambdaClass(new EnhancedClassReader(bytecode, isJavacHacksEnabled));
+        bytecode = transformers.backportLambdaClass(EnhancedClassReader.create(bytecode, isJavacHacksEnabled));
         try {
             saver.writeClass(bytecode, isJavacHacksEnabled);
         } catch (IOException e) {

diff --git a/retrolambda/src/main/java/net/orfjackal/retrolambda/lambdas/LambdaClassSaverAgent.java b/retrolambda/src/main/java/net/orfjackal/retrolambda/lambdas/LambdaClassSaverAgent.java
@@ -1,4 +1,4 @@
-// Copyright © 2013-2014 Esko Luontola <www.orfjackal.net>
+// Copyright © 2013-2018 Esko Luontola and other Retrolambda contributors
 // This software is released under the Apache License 2.0.
 // The license text is at http://www.apache.org/licenses/LICENSE-2.0
 
@@ -24,7 +24,7 @@ public byte[] transform(ClassLoader loader, String className, Class<?> classBein
         if (className == null) {
             // Since JDK 8 build b121 or so, lambda classes have a null class name,
             // but we can read it from the bytecode where the name still exists.
-            className = new EnhancedClassReader(classfileBuffer, isJavacHacksEnabled).getClassName();
+            className = EnhancedClassReader.create(classfileBuffer, isJavacHacksEnabled).getClassName();
         }
         if (lambdaClassSaver != null) {
             lambdaClassSaver.saveIfLambda(className, classfileBuffer);