Task 135 fix sonarqube issues

bundles/org.pitest.pitclipse.core/src/org/pitest/pitclipse/core/PitCoreActivator.java

@@ -16,26 +16,6 @@
 
 package org.pitest.pitclipse.core;
 
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ui.preferences.ScopedPreferenceStore;
-import org.osgi.framework.BundleContext;
-import org.pitest.pitclipse.runner.config.PitConfiguration;
-import org.pitest.pitclipse.runner.config.PitExecutionMode;
-
-import java.io.File;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import static com.google.common.io.Files.createParentDirs;
-import static com.google.common.io.Files.createTempDir;
 import static org.eclipse.core.runtime.FileLocator.getBundleFile;
 import static org.pitest.pitclipse.core.preferences.PitPreferences.AVOID_CALLS_TO;
 import static org.pitest.pitclipse.core.preferences.PitPreferences.EXCLUDED_CLASSES;
@@ -46,6 +26,27 @@
 import static org.pitest.pitclipse.core.preferences.PitPreferences.RUN_IN_PARALLEL;
 import static org.pitest.pitclipse.core.preferences.PitPreferences.TIMEOUT;
 import static org.pitest.pitclipse.core.preferences.PitPreferences.TIMEOUT_FACTOR;
+import static org.pitest.pitclipse.runner.util.PitFileUtils.createParentDirs;
+
+import java.io.File;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Plugin;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.ui.preferences.ScopedPreferenceStore;
+import org.osgi.framework.BundleContext;
+import org.pitest.pitclipse.runner.config.PitConfiguration;
+import org.pitest.pitclipse.runner.config.PitExecutionMode;
 
 /**
  * The activator class controls the plug-in life cycle
@@ -118,7 +119,7 @@ public void start(BundleContext context) throws Exception { // NOPMD - Base
                                                                 // class defines
                                                                 // signature
         super.start(context);
-        plugin = this;
+        plugin = this; // NOSONAR typical in Eclipse
         setActivator(this);
         setupStateDirectories();
 
@@ -173,7 +174,7 @@ private void setupHistoryFile() {
         } catch (IOException e) {
             // Cannot write to workspace.
             // Probably shouldn't happen but lets use a temp file instead
-            historyFile = new File(createTempDir(), STATE_FILE);
+            historyFile = new File(createTemporaryDirectory(), STATE_FILE);
         }
     }
 
@@ -186,10 +187,17 @@ private void setupResultDir() {
         } catch (IOException e) {
             // Cannot write to workspace.
             // Probably shouldn't happen but lets use a temp dir instead
-            resultDir = createTempDir();
+            resultDir = createTemporaryDirectory();
         }
     }
 
+    private File createTemporaryDirectory() {
+        try {
+            return Files.createTempDirectory(null).toFile();
+        } catch (IOException e1) {
+            throw new IllegalStateException("Cannot create temporary directory", e1);
+        }
+    }
 
     private static void setActivator(PitCoreActivator pitActivator) {
         plugin = pitActivator;
@@ -222,19 +230,19 @@ public static PitCoreActivator getDefault() {
     }
 
     public static void log(String msg) {
-        log(Status.INFO, msg, null);
+        log(IStatus.INFO, msg, null);
     }
 
     private static void log(int status, String msg, Throwable t) {
-        getDefault().getLog().log(new Status(status, PLUGIN_ID, Status.OK, msg, t));
+        getDefault().getLog().log(new Status(status, PLUGIN_ID, IStatus.OK, msg, t));
     }
 
     public static void warn(String msg) {
         warn(msg, null);
     }
 
     public static void warn(String msg, Throwable t) {
-        log(Status.WARNING, msg, t);
+        log(IStatus.WARNING, msg, t);
     }
 
     public File emptyResultDir() {

bundles/org.pitest.pitclipse.launch.ui/src/org/pitest/pitclipse/launch/ui/LaunchShortcut.java

@@ -37,11 +37,7 @@ final class LaunchShortcut {
 
     static <T> Optional<T> forEditorInputDo(IEditorInput i, Function<ITypeRoot, Optional<T>> onFound, Supplier<Optional<T>> notFound) {
         Optional<ITypeRoot> element = Optional.ofNullable(getEditorInputTypeRoot(i));
-        if (element.isPresent()) {
-            return element.map(onFound).get();
-        } else {
-            return notFound.get();
-        }
+        return element.map(onFound).orElseGet(notFound);
     }
 
     static Function<ITypeRoot, Optional<IResource>> getCorrespondingResource() {

bundles/org.pitest.pitclipse.launch.ui/src/org/pitest/pitclipse/launch/ui/PitArgumentsTab.java

@@ -71,6 +71,7 @@ public final class PitArgumentsTab extends AbstractLaunchConfigurationTab {
     private Text excludedMethodsText;
     private Text avoidCallsTo;
 
+    @Override
     public void initializeFrom(ILaunchConfiguration config) {
         projectText.setText(getAttributeFromConfig(config, ATTR_PROJECT_NAME, ""));
         String testClass = getAttributeFromConfig(config, ATTR_MAIN_TYPE_NAME, "");
@@ -95,14 +96,14 @@ public void initializeFrom(ILaunchConfiguration config) {
     private void initialiseWithPreferenceDefaults(ILaunchConfiguration config) {
         PitConfiguration preferences = PitCoreActivator.getDefault()
                 .getConfiguration();
-        runInParallel.setSelection(Boolean
-                .valueOf(getBooleanAttributeFromConfig(config,
+        runInParallel.setSelection(
+                getBooleanAttributeFromConfig(config,
                         ATTR_TEST_IN_PARALLEL,
-                        preferences.isParallelExecution())));
-        incrementalAnalysis.setSelection(Boolean
-                .valueOf(getBooleanAttributeFromConfig(config,
+                        preferences.isParallelExecution()));
+        incrementalAnalysis.setSelection(
+                getBooleanAttributeFromConfig(config,
                         ATTR_TEST_INCREMENTALLY,
-                        preferences.isIncrementalAnalysis())));
+                        preferences.isIncrementalAnalysis()));
         excludedClassesText.setText(getAttributeFromConfig(config,
                 ATTR_EXCLUDE_CLASSES, preferences.getExcludedClasses()));
         excludedMethodsText.setText(getAttributeFromConfig(config,
@@ -111,6 +112,7 @@ private void initialiseWithPreferenceDefaults(ILaunchConfiguration config) {
                 ATTR_AVOID_CALLS_TO, preferences.getExcludedMethods()));
     }
 
+    @Override
     public void createControl(Composite parent) {
         Composite comp = new Composite(parent, SWT.NONE);
         setControl(comp);
@@ -234,10 +236,12 @@ private Button createNewCheckBox(Font font, Composite comp, String label) {
         return checkBox;
     }
 
+    @Override
     public String getName() {
         return "PIT";
     }
 
+    @Override
     public void performApply(ILaunchConfigurationWorkingCopy workingCopy) {
         workingCopy.setAttribute(ATTR_PROJECT_NAME, projectText.getText()
                 .trim());
@@ -264,6 +268,7 @@ public void performApply(ILaunchConfigurationWorkingCopy workingCopy) {
         }
     }
 
+    @Override
     public void setDefaults(ILaunchConfigurationWorkingCopy workingCopy) {
         /*
          * IJavaElement javaElement = getContext(); if (javaElement != null) {
@@ -325,6 +330,7 @@ public void widgetSelected(SelectionEvent e) {
     }
 
     private final class UpdateOnModifyListener implements ModifyListener {
+        @Override
         public void modifyText(ModifyEvent evt) {
             updateLaunchConfigurationDialog();
         }

bundles/org.pitest.pitclipse.launch.ui/src/org/pitest/pitclipse/launch/ui/PitLaunchShortcut.java

@@ -121,9 +121,9 @@ private void launch(Object[] elements, String mode) {
             else {
                 showNoTestsFoundDialog();
             }
-        } catch (InterruptedException e) {
+        } catch (InterruptedException e) { // NOSONAR
             // OK, silently move on
-        } catch (CoreException e) {
+        } catch (CoreException e) { // NOSONAR
             // OK, silently move on
         }
     }
@@ -134,7 +134,7 @@ private void showNoTestsFoundDialog() {
 
     private void performLaunch(IJavaElement element, String mode) throws InterruptedException, CoreException {
         ILaunchConfigurationWorkingCopy tmp = createLaunchConfiguration(element);
-        Optional<ILaunchConfiguration> existingConfig = findExistingLaunchConfiguration(tmp, mode);
+        Optional<ILaunchConfiguration> existingConfig = findExistingLaunchConfiguration(tmp);
         ILaunchConfiguration config = existingConfig.orElse(tmp.doSave());
         DebugUITools.launch(config, mode);
     }
@@ -154,13 +154,11 @@ private ILaunchManager getLaunchManager() {
      * 
      * @param configList
      *            list of {@link ILaunchConfiguration}s
-     * @param mode
-     *            launch mode
      * @return ILaunchConfiguration
      * @throws InterruptedException
      *             if cancelled by the user
      */
-    private ILaunchConfiguration chooseConfiguration(List<ILaunchConfiguration> configList, String mode) throws InterruptedException {
+    private ILaunchConfiguration chooseConfiguration(List<ILaunchConfiguration> configList) throws InterruptedException {
         IDebugModelPresentation labelProvider = DebugUITools.newDebugModelPresentation();
         ElementListSelectionDialog dialog = new ElementListSelectionDialog(getShell(), labelProvider);
         dialog.setElements(configList.toArray());
@@ -195,31 +193,23 @@ protected ILaunchConfigurationWorkingCopy createLaunchConfiguration(IJavaElement
         switch (element.getElementType()) {
             case JAVA_PROJECT:
             case PACKAGE_FRAGMENT_ROOT:
-            case PACKAGE_FRAGMENT: {
+            case PACKAGE_FRAGMENT:
                 String name = getTextLabel(element, ALL_FULLY_QUALIFIED);
                 containerHandleId = element.getHandleIdentifier();
                 mainTypeQualifiedName = EMPTY_STRING;
                 testName = name.substring(name.lastIndexOf(IPath.SEPARATOR) + 1);
-            }
                 break;
-            case TYPE: {
+            case TYPE:
                 containerHandleId = EMPTY_STRING;
-                mainTypeQualifiedName = ((IType) element).getFullyQualifiedName('.'); // don't
-                                                                                      // replace,
-                                                                                      // fix
-                                                                                      // for
-                                                                                      // binary
-                                                                                      // inner
-                                                                                      // types
+                // don't replace, fix for binary inner types
+                mainTypeQualifiedName = ((IType) element).getFullyQualifiedName('.');
                 testName = element.getElementName();
-            }
                 break;
-            case METHOD: {
+            case METHOD:
                 IMethod method = (IMethod) element;
                 containerHandleId = EMPTY_STRING;
                 mainTypeQualifiedName = method.getDeclaringType().getFullyQualifiedName('.');
                 testName = method.getDeclaringType().getElementName() + '.' + method.getElementName();
-            }
                 break;
             default:
                 throw new IllegalArgumentException("Invalid element type to create a launch configuration: " + element.getClass().getName()); //$NON-NLS-1$
@@ -269,7 +259,7 @@ private static boolean hasSameAttributes(ILaunchConfiguration config1, ILaunchCo
         return false;
     }
 
-    private Optional<ILaunchConfiguration> findExistingLaunchConfiguration(ILaunchConfigurationWorkingCopy temporary, String mode) throws InterruptedException,
+    private Optional<ILaunchConfiguration> findExistingLaunchConfiguration(ILaunchConfigurationWorkingCopy temporary) throws InterruptedException,
             CoreException {
         List<ILaunchConfiguration> candidateConfigs = findExistingLaunchConfigurations(temporary);
 
@@ -287,7 +277,7 @@ private Optional<ILaunchConfiguration> findExistingLaunchConfiguration(ILaunchCo
             // cancelled the dialog, in which case this method returns null,
             // since cancelling the dialog should also cancel launching
             // anything.
-            ILaunchConfiguration config = chooseConfiguration(candidateConfigs, mode);
+            ILaunchConfiguration config = chooseConfiguration(candidateConfigs);
             if (config != null) {
                 return Optional.ofNullable(config);
             }
@@ -329,7 +319,7 @@ public ILaunchConfiguration[] getLaunchConfigurations(ISelection selection) {
                 return toArrayOfILaunchConfiguration(configs);
             }
         }
-        return null;
+        return null; // NOSONAR Eclipse code relies on returned null array
     }
 
     /**

bundles/org.pitest.pitclipse.launch.ui/src/org/pitest/pitclipse/launch/ui/PitMigrationDelegate.java

@@ -27,6 +27,7 @@
 import org.eclipse.jdt.core.IJavaModel;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.JavaModelException;
 
 import static org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME;
 import static org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME;
@@ -67,14 +68,7 @@ private static IResource getResource(ILaunchConfiguration config)
         if (projName != null && Path.ROOT.isValidSegment(projName)) {
             IJavaProject javaProject = getJavaModel().getJavaProject(projName);
             if (javaProject.exists()) {
-                if (typeName != null && typeName.length() > 0) {
-                    element = javaProject.findType(typeName);
-                } else if (container != null && container.length() > 0) {
-                    element = JavaCore.create(container);
-                }
-                if (element == null) {
-                    element = javaProject;
-                }
+                element = getJavaProject(typeName, container, javaProject);
             } else {
                 IProject project = javaProject.getProject();
                 if (project.exists() && !project.isOpen()) {
@@ -89,6 +83,20 @@ private static IResource getResource(ILaunchConfiguration config)
         return resource;
     }
 
+    private static IJavaElement getJavaProject(String typeName, String container,
+            IJavaProject javaProject) throws JavaModelException {
+        IJavaElement element = null;
+        if (typeName != null && typeName.length() > 0) {
+            element = javaProject.findType(typeName);
+        } else if (container != null && container.length() > 0) {
+            element = JavaCore.create(container);
+        }
+        if (element == null) {
+            element = javaProject;
+        }
+        return element;
+    }
+
     /*
      * Convenience method to get access to the java model.
      */

bundles/org.pitest.pitclipse.launch/src/org/pitest/pitclipse/launch/AbstractPitLaunchDelegate.java

@@ -44,7 +44,7 @@
 import org.pitest.pitclipse.launch.config.SourceDirFinder;
 import org.pitest.pitclipse.runner.PitOptions;
 import org.pitest.pitclipse.runner.PitOptions.PitOptionsBuilder;
-import org.pitest.pitclipse.runner.PitRunner;
+import org.pitest.pitclipse.runner.PitRunnerMain;
 import org.pitest.pitclipse.runner.config.PitConfiguration;
 import org.pitest.pitclipse.runner.io.SocketProvider;
 
@@ -53,20 +53,20 @@
 /**
  * <p>Abstract launch configuration used to execute PIT in a background VM.</p>
  * 
- * <p>Pitest is executed by calling {@link PitRunner#main(String[])}.</p>
+ * <p>Pitest is executed by calling {@link PitRunnerMain#main(String[])}.</p>
  * 
  * <p>Right after the VM has been launched, contributions to the {@code results}
  * extension points are notified thanks to {@link ExtensionPointHandler}.</p>
  */
 public abstract class AbstractPitLaunchDelegate extends JavaLaunchDelegate {
 
     private static final String EXTENSION_POINT_ID = "org.pitest.pitclipse.core.executePit";
-    private static final String PIT_RUNNER = PitRunner.class.getCanonicalName();
+    private static final String PIT_RUNNER_MAIN = PitRunnerMain.class.getCanonicalName();
     private int portNumber;
     private final PitConfiguration pitConfiguration;
     private boolean projectUsesJunit5 = false;
 
-    public AbstractPitLaunchDelegate(PitConfiguration pitConfiguration) {
+    protected AbstractPitLaunchDelegate(PitConfiguration pitConfiguration) {
         this.pitConfiguration = pitConfiguration;
     }
 
@@ -76,7 +76,7 @@ protected void generatePortNumber() {
 
     @Override
     public String getMainTypeName(ILaunchConfiguration launchConfig) throws CoreException {
-        return PIT_RUNNER;
+        return PIT_RUNNER_MAIN;
     }
 
     @Override

bundles/org.pitest.pitclipse.launch/src/org/pitest/pitclipse/launch/config/LaunchConfigurationWrapper.java

@@ -76,7 +76,7 @@ public IJavaProject getProject() throws CoreException {
         return getProject(launchConfig.getAttribute(ATTR_PROJECT_NAME, ""));
     }
 
-    private IJavaProject getProject(String projectName) throws CoreException {
+    private IJavaProject getProject(String projectName) {
         IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
         for (IProject project : root.getProjects()) {
             if (projectName.equals(project.getName())) {