Code inspection fixes

hcoles · Jan 15, 2021 · 6bae7b3 · 6bae7b3
1 parent 9a749fc
commit 6bae7b3
Show file tree

Hide file tree

Showing 31 changed files with 117 additions and 169 deletions.
diff --git a/pitest/src/main/java/org/pitest/boot/HotSwapAgent.java b/pitest/src/main/java/org/pitest/boot/HotSwapAgent.java
@@ -34,7 +34,7 @@ public static void addTransformer(final ClassFileTransformer transformer) {
   }
 
   public static void agentmain(final String agentArguments, // NO_UCD
-      final Instrumentation inst) throws Exception {
+      final Instrumentation inst) {
     instrumentation = inst;
   }
 

diff --git a/pitest/src/main/java/org/pitest/bytecode/NullVisitor.java b/pitest/src/main/java/org/pitest/bytecode/NullVisitor.java
@@ -173,7 +173,7 @@ public void visitTypeInsn(final int arg0, final String arg1) {
     public void visitVarInsn(final int arg0, final int arg1) {
     }
 
-  };
+  }
 
   @Override
   public void visit(final int arg0, final int arg1, final String arg2,

diff --git a/pitest/src/main/java/org/pitest/classinfo/CachingByteArraySource.java b/pitest/src/main/java/org/pitest/classinfo/CachingByteArraySource.java
@@ -40,4 +40,4 @@ class FixedSizeHashMap<K,V> extends LinkedHashMap<K,V> {
   protected boolean removeEldestEntry(Map.Entry <K,V> eldest) {
     return size() > this.maxsize;
 }
-};
+}
diff --git a/pitest/src/main/java/org/pitest/classpath/ClassPath.java b/pitest/src/main/java/org/pitest/classpath/ClassPath.java
@@ -15,6 +15,12 @@
 
 package org.pitest.classpath;
 
+import org.pitest.functional.FCollection;
+import org.pitest.util.Log;
+import org.pitest.util.ManifestUtils;
+import org.pitest.util.PitError;
+import org.pitest.util.StreamUtil;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -31,12 +37,6 @@
 import java.util.logging.Logger;
 import java.util.zip.ZipException;
 
-import org.pitest.functional.FCollection;
-import org.pitest.util.Log;
-import org.pitest.util.ManifestUtils;
-import org.pitest.util.PitError;
-import org.pitest.util.StreamUtil;
-
 public class ClassPath {
 
   private static final Logger         LOG = Log.getLogger();
@@ -106,11 +106,7 @@ public byte[] getClassData(final String classname) throws IOException {
   }
 
   public URL findResource(final String name) {
-    try {
       return this.root.getResource(name);
-    } catch (final IOException exception) {
-      return null;
-    }
   }
 
   public static Collection<String> getClassPathElementsAsPaths() {

diff --git a/pitest/src/main/java/org/pitest/classpath/CompoundClassPathRoot.java b/pitest/src/main/java/org/pitest/classpath/CompoundClassPathRoot.java
@@ -1,16 +1,15 @@
 package org.pitest.classpath;
 
+import org.pitest.functional.FCollection;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
-
-import org.pitest.functional.FCollection;
 import java.util.Optional;
 
 public class CompoundClassPathRoot implements ClassPathRoot,
@@ -43,7 +42,7 @@ public Collection<String> classNames() {
   }
 
   @Override
-  public URL getResource(String name) throws MalformedURLException {
+  public URL getResource(String name) {
     try {
       return findRootForResource(name);
     } catch (final IOException exception) {

diff --git a/pitest/src/main/java/org/pitest/classpath/OtherClassLoaderClassPathRoot.java b/pitest/src/main/java/org/pitest/classpath/OtherClassLoaderClassPathRoot.java
@@ -14,12 +14,9 @@
  */
 package org.pitest.classpath;
 
-import java.io.IOException;
 import java.io.InputStream;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Collection;
-
 import java.util.Optional;
 
 public class OtherClassLoaderClassPathRoot implements ClassPathRoot {
@@ -36,13 +33,13 @@ public Collection<String> classNames() {
   }
 
   @Override
-  public InputStream getData(final String name) throws IOException {
+  public InputStream getData(final String name) {
     // TODO will this work for archives? Need to consider remote hetrogenous os
     return this.loader.getResourceAsStream(name.replace(".", "/") + ".class");
   }
 
   @Override
-  public URL getResource(final String name) throws MalformedURLException {
+  public URL getResource(final String name) {
     return this.loader.getResource(name);
   }
 

diff --git a/pitest/src/main/java/org/pitest/coverage/CoverageTransformer.java b/pitest/src/main/java/org/pitest/coverage/CoverageTransformer.java
@@ -1,20 +1,18 @@
 package org.pitest.coverage;
 
-import java.lang.instrument.ClassFileTransformer;
-import java.lang.instrument.IllegalClassFormatException;
-import java.security.ProtectionDomain;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Predicate;
-
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
 import org.pitest.bytecode.FrameOptions;
 import org.pitest.classinfo.ComputeClassWriter;
 import org.pitest.classpath.ClassloaderByteArraySource;
-
 import sun.pitest.CodeCoverageStore;
 
+import java.lang.instrument.ClassFileTransformer;
+import java.security.ProtectionDomain;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Predicate;
+
 public class CoverageTransformer implements ClassFileTransformer {
 
   private final Predicate<String>   filter;
@@ -27,8 +25,7 @@ public CoverageTransformer(final Predicate<String> filter) {
   @Override
   public byte[] transform(final ClassLoader loader, final String className,
       final Class<?> classBeingRedefined,
-      final ProtectionDomain protectionDomain, final byte[] classfileBuffer)
-          throws IllegalClassFormatException {
+      final ProtectionDomain protectionDomain, final byte[] classfileBuffer) {
     final boolean include = shouldInclude(className);
     if (include) {
       try {

diff --git a/pitest/src/main/java/org/pitest/coverage/analysis/ControlFlowAnalyser.java b/pitest/src/main/java/org/pitest/coverage/analysis/ControlFlowAnalyser.java
@@ -1,18 +1,5 @@
 package org.pitest.coverage.analysis;
 
-import static org.objectweb.asm.Opcodes.ARETURN;
-import static org.objectweb.asm.Opcodes.ATHROW;
-import static org.objectweb.asm.Opcodes.DRETURN;
-import static org.objectweb.asm.Opcodes.FRETURN;
-import static org.objectweb.asm.Opcodes.IRETURN;
-import static org.objectweb.asm.Opcodes.LRETURN;
-import static org.objectweb.asm.Opcodes.RETURN;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.FrameNode;
 import org.objectweb.asm.tree.InsnList;
@@ -24,6 +11,19 @@
 import org.objectweb.asm.tree.TableSwitchInsnNode;
 import org.objectweb.asm.tree.TryCatchBlockNode;
 
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static org.objectweb.asm.Opcodes.ARETURN;
+import static org.objectweb.asm.Opcodes.ATHROW;
+import static org.objectweb.asm.Opcodes.DRETURN;
+import static org.objectweb.asm.Opcodes.FRETURN;
+import static org.objectweb.asm.Opcodes.IRETURN;
+import static org.objectweb.asm.Opcodes.LRETURN;
+import static org.objectweb.asm.Opcodes.RETURN;
+
 public class ControlFlowAnalyser {
 
   private static final int LIKELY_NUMBER_OF_LINES_PER_BLOCK = 7;
@@ -33,16 +33,6 @@ public static List<Block> analyze(final MethodNode mn) {
 
     final Set<LabelNode> jumpTargets = findJumpTargets(mn.instructions);
 
-    /*
-     * Some projects/libraries have gigantic static initializer methods
-     * that load up huge constant arrays. These methods are nearly at the
-     * size limit - and adding a probe at each store blows it up.
-     *
-     * So, for methods with many instructions, we'll ignore array stores
-     * as ending a block.
-     */
-    final boolean ignoreArrayStores = mn.instructions.size() > 10000;
-
     // not managed to construct bytecode to show need for this
     // as try catch blocks usually have jumps at their boundaries anyway.
     // so possibly useless, but here for now. Because fear.
@@ -70,7 +60,7 @@ public static List<Block> analyze(final MethodNode mn) {
         blocks.add(new Block(blockStart, i - 1, blockLines));
         blockStart = i;
         blockLines = smallSet();
-      } else if (endsBlock(ins, ignoreArrayStores)) {
+      } else if (endsBlock(ins)) {
         if (blockLines.isEmpty() && blocks.size() > 0 && !blocks
             .get(blocks.size() - 1).getLines().isEmpty()) {
           blockLines.addAll(blocks.get(blocks.size() - 1).getLines());
@@ -112,21 +102,13 @@ private static void addtryCatchBoundaries(final MethodNode mn,
     }
   }
 
-  private static boolean endsBlock(final AbstractInsnNode ins,
-      final boolean ignoreArrayStores) {
+  private static boolean endsBlock(final AbstractInsnNode ins) {
     return (ins instanceof JumpInsnNode) || isReturn(ins)
-        || isMightThrowException(ins, ignoreArrayStores);
+        || isMightThrowException(ins);
   }
 
-  private static boolean isMightThrowException(final AbstractInsnNode ins,
-      final boolean ignoreArrayStores) {
-    switch (ins.getType()) {
-    case AbstractInsnNode.METHOD_INSN:
-      return true;
-    default:
-      return false;
-    }
-
+  private static boolean isMightThrowException(final AbstractInsnNode ins) {
+    return ins.getType() == AbstractInsnNode.METHOD_INSN;
   }
 
   private static boolean isReturn(final AbstractInsnNode ins) {

diff --git a/pitest/src/main/java/org/pitest/coverage/execute/CoverageMinion.java b/pitest/src/main/java/org/pitest/coverage/execute/CoverageMinion.java
@@ -126,8 +126,7 @@ private static Predicate<String> convertToJVMClassFilter(
   }
 
   private static List<TestUnit> getTestsFromParent(
-      final SafeDataInputStream dis, final CoverageOptions paramsFromParent)
-      throws IOException {
+      final SafeDataInputStream dis, final CoverageOptions paramsFromParent) {
     final List<ClassName> classes = receiveTestClassesFromParent(dis);
     Collections.sort(classes); // ensure classes loaded in a consistent order
 

diff --git a/pitest/src/main/java/org/pitest/dependency/DependencyExtractor.java b/pitest/src/main/java/org/pitest/dependency/DependencyExtractor.java
@@ -138,7 +138,7 @@ private static Comparator<DependencyAccess> equalDestinationComparator() {
   }
 
   private List<DependencyAccess> extract(final String clazz,
-      final Predicate<DependencyAccess> filter) throws IOException {
+      final Predicate<DependencyAccess> filter) {
     final Optional<byte[]> bytes = this.classToBytes.getBytes(clazz);
     if (!bytes.isPresent()) {
       LOG.warning("No bytes found for " + clazz);

diff --git a/pitest/src/main/java/org/pitest/functional/Streams.java b/pitest/src/main/java/org/pitest/functional/Streams.java
@@ -4,10 +4,6 @@
 
 public class Streams {
   public static <T> Stream<T> fromOptional(java.util.Optional<T> opt) {
-    if (opt.isPresent()) {
-      return Stream.of(opt.get());
-    } else {
-      return Stream.empty();
-    }
+    return opt.map(Stream::of).orElseGet(Stream::empty);
   }
 }
diff --git a/pitest/src/main/java/org/pitest/junit/TestInfo.java b/pitest/src/main/java/org/pitest/junit/TestInfo.java
@@ -14,12 +14,12 @@
  */
 package org.pitest.junit;
 
-import java.util.function.Predicate;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.pitest.classinfo.ClassInfo;
+
 import java.util.Optional;
+import java.util.function.Predicate;
 
 abstract class TestInfo {
 
@@ -37,10 +37,7 @@ private static boolean isATest(final ClassInfo clazz) {
   }
 
   private static boolean isATest(final Optional<ClassInfo> clazz) {
-    if (clazz.isPresent()) {
-      return isATest(clazz.get());
-    }
-    return false;
+    return clazz.filter(TestInfo::isATest).isPresent();
   }
 
   public static Predicate<ClassInfo> isATest() {

diff --git a/pitest/src/main/java/org/pitest/junit/adapter/AdaptingRunListener.java b/pitest/src/main/java/org/pitest/junit/adapter/AdaptingRunListener.java
@@ -19,7 +19,7 @@ class AdaptingRunListener extends RunListener {
   }
 
   @Override
-  public void testFailure(final Failure failure) throws Exception {
+  public void testFailure(final Failure failure) {
     this.rc.notifyEnd(this.description, failure.getException());
     this.failed = true;
   }
@@ -31,12 +31,12 @@ public void testAssumptionFailure(final Failure failure) {
   }
 
   @Override
-  public void testIgnored(final Description description) throws Exception {
+  public void testIgnored(final Description description) {
     this.rc.notifySkipped(this.description);
   }
 
   @Override
-  public void testStarted(final Description description) throws Exception {
+  public void testStarted(final Description description) {
     if (this.failed) {
       // If the JUnit test has been annotated with @BeforeClass or @AfterClass
       // need to force the exit after the first failure as tests will be run as
@@ -49,7 +49,7 @@ public void testStarted(final Description description) throws Exception {
   }
 
   @Override
-  public void testFinished(final Description description) throws Exception {
+  public void testFinished(final Description description) {
     if (!this.failed) {
       this.rc.notifyEnd(this.description);
     }

diff --git a/pitest/src/main/java/org/pitest/mutationtest/DetectionStatus.java b/pitest/src/main/java/org/pitest/mutationtest/DetectionStatus.java
@@ -108,4 +108,4 @@ public boolean isDetected() {
   public boolean hasCoverage() {
     return this != NO_COVERAGE;
   }
-};
+}
diff --git a/...src/main/java/org/pitest/mutationtest/engine/gregor/AvoidStringSwitchedMethodAdapter.java b/...src/main/java/org/pitest/mutationtest/engine/gregor/AvoidStringSwitchedMethodAdapter.java
@@ -38,12 +38,8 @@ public AvoidStringSwitchedMethodAdapter(final MutationContext context,
   @Override
   public void visitMethodInsn(final int opcode, final String owner,
       final String name, final String desc, boolean itf) {
-    if ((opcode == Opcodes.INVOKEVIRTUAL) && "java/lang/String".equals(owner)
-        && "hashCode".equals(name)) {
-      this.hashCodeWasLastCall = true;
-    } else {
-      this.hashCodeWasLastCall = false;
-    }
+    this.hashCodeWasLastCall = (opcode == Opcodes.INVOKEVIRTUAL) && "java/lang/String".equals(owner)
+            && "hashCode".equals(name);
     super.visitMethodInsn(opcode, owner, name, desc, itf);
   }