Merge pull request #884 from hcoles/duplicate_classes

Remove duplicate classes
hcoles · Apr 20, 2021 · 4e6bb87 · 4e6bb87
2 parents 83d62d6 + b937ba0
commit 4e6bb87
Show file tree

Hide file tree

Showing 19 changed files with 30 additions and 835 deletions.
diff --git a/...va/org/pitest/classinfo/HashFunction.java → ...va/org/pitest/classinfo/HashFunction.java b/...va/org/pitest/classinfo/HashFunction.java → ...va/org/pitest/classinfo/HashFunction.java
diff --git a/...java/org/pitest/classinfo/Repository.java → ...java/org/pitest/classinfo/Repository.java b/...java/org/pitest/classinfo/Repository.java → ...java/org/pitest/classinfo/Repository.java
@@ -108,3 +108,19 @@ private ClassPointer resolveClass(final String clazz) {
   }
 
 }
+
+class DeferredClassPointer implements ClassPointer {
+  private final Repository repository;
+  private final ClassName  name;
+
+  DeferredClassPointer(final Repository repository, final ClassName name) {
+    this.repository = repository;
+    this.name = name;
+  }
+
+  @Override
+  public Optional<ClassInfo> fetch() {
+    return this.repository.fetchClass(this.name);
+  }
+
+}
diff --git a/...java/org/pitest/classpath/CodeSource.java → ...java/org/pitest/classpath/CodeSource.java b/...java/org/pitest/classpath/CodeSource.java → ...java/org/pitest/classpath/CodeSource.java
@@ -9,6 +9,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.pitest.classinfo.ClassByteArraySource;
 import org.pitest.classinfo.ClassInfo;
 import org.pitest.classinfo.ClassInfoSource;
 import org.pitest.classinfo.ClassName;
@@ -21,7 +22,7 @@
 /**
  * Provides access to code and tests on the classpath
  */
-public class CodeSource implements ClassInfoSource {
+public class CodeSource implements ClassInfoSource, ClassByteArraySource {
 
   private final ProjectClassPaths   classPath;
   private final Repository          classRepository;
@@ -75,7 +76,6 @@ public Collection<ClassInfo> getClassInfo(final Collection<ClassName> classes) {
         .collect(Collectors.toList());
   }
 
-  // not used but keep to allow plugins to query bytecode
   public Optional<byte[]> fetchClassBytes(final ClassName clazz) {
     return this.classRepository.querySource(clazz);
   }
@@ -90,4 +90,8 @@ private Function<ClassName, Stream<ClassInfo>> nameToClassInfo() {
         .andThen(Streams::fromOptional);
   }
 
+  @Override
+  public Optional<byte[]> getBytes(String clazz) {
+    return fetchClassBytes(ClassName.fromString(clazz));
+  }
 }
diff --git a/pitest-entry/src/test/java/org/pitest/classinfo/ClassInfoMother.java b/pitest-entry/src/test/java/org/pitest/classinfo/ClassInfoMother.java
diff --git a/pitest-entry/src/test/java/org/pitest/classinfo/ClassInfoTest.java b/pitest-entry/src/test/java/org/pitest/classinfo/ClassInfoTest.java
diff --git a/.../org/pitest/classpath/CodeSourceTest.java → .../org/pitest/classpath/CodeSourceTest.java b/.../org/pitest/classpath/CodeSourceTest.java → .../org/pitest/classpath/CodeSourceTest.java
diff --git a/pitest/src/main/java/org/pitest/classinfo/AddlerHash.java b/pitest/src/main/java/org/pitest/classinfo/AddlerHash.java
diff --git a/pitest/src/main/java/org/pitest/classinfo/ClassInfoSource.java b/pitest/src/main/java/org/pitest/classinfo/ClassInfoSource.java
diff --git a/pitest/src/main/java/org/pitest/classinfo/ClassPointer.java b/pitest/src/main/java/org/pitest/classinfo/ClassPointer.java
@@ -35,18 +35,4 @@ public Optional<ClassInfo> fetch() {
 
 }
 
-class DeferredClassPointer implements ClassPointer {
-  private final Repository repository;
-  private final ClassName  name;
 
-  DeferredClassPointer(final Repository repository, final ClassName name) {
-    this.repository = repository;
-    this.name = name;
-  }
-
-  @Override
-  public Optional<ClassInfo> fetch() {
-    return this.repository.fetchClass(this.name);
-  }
-
-}
diff --git a/pitest/src/main/java/org/pitest/classinfo/NameToClassInfo.java b/pitest/src/main/java/org/pitest/classinfo/NameToClassInfo.java
diff --git a/pitest/src/main/java/org/pitest/classinfo/TestToClassMapper.java b/pitest/src/main/java/org/pitest/classinfo/TestToClassMapper.java
diff --git a/pitest/src/main/java/org/pitest/coverage/analysis/LineMapper.java b/pitest/src/main/java/org/pitest/coverage/analysis/LineMapper.java
@@ -8,8 +8,8 @@
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.tree.ClassNode;
 import org.objectweb.asm.tree.MethodNode;
+import org.pitest.classinfo.ClassByteArraySource;
 import org.pitest.classinfo.ClassName;
-import org.pitest.classpath.CodeSource;
 import org.pitest.coverage.BlockLocation;
 import org.pitest.coverage.LineMap;
 import java.util.Optional;
@@ -18,9 +18,9 @@
 
 public class LineMapper implements LineMap {
 
-  private final CodeSource source;
+  private final ClassByteArraySource source;
 
-  public LineMapper(final CodeSource source) {
+  public LineMapper(final ClassByteArraySource source) {
     this.source = source;
   }
 
@@ -29,7 +29,7 @@ public Map<BlockLocation, Set<Integer>> mapLines(final ClassName clazz) {
 
     final Map<BlockLocation, Set<Integer>> map = new HashMap<>();
 
-    final Optional<byte[]> maybeBytes = this.source.fetchClassBytes(clazz);
+    final Optional<byte[]> maybeBytes = this.source.getBytes(clazz.asInternalName());
     // classes generated at runtime eg by mocking frameworks
     // will be instrumented but not available on the classpath
     if (maybeBytes.isPresent()) {