Task 136 get rid of guava

bundles/org.pitest.pitclipse.core/META-INF/MANIFEST.MF

@@ -20,7 +20,5 @@ Export-Package: org.pitest.pitclipse.core,
  org.pitest.pitclipse.core.launch,
  org.pitest.pitclipse.core.preferences
 Automatic-Module-Name: org.pitest.pitclipse.core
-Import-Package: com.google.common.collect;version="21.0.0",
- com.google.common.io;version="21.0.0",
- org.eclipse.jface.preference,
+Import-Package: org.eclipse.jface.preference,
  org.eclipse.ui.preferences

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

@@ -131,7 +131,7 @@ public void start(BundleContext context) throws Exception { // NOPMD - Base
         addMavenJarToClasspath(pitestClasspath, ORG_PITEST, "pitest-entry.jar");
         addMavenJarToClasspath(pitestClasspath, ORG_PITEST, "pitest-command-line.jar");
         addMavenJarToClasspath(pitestClasspath, ORG_PITEST, "pitest-html-report.jar");
-        pitestClasspath.add(getBundleCanonicalPath("com.google.guava"));
+        // we don't need "com.google.guava" anymore
 
         if (Platform.getBundle(ORG_PITEST_PITCLIPSE_LISTENERS) != null) {
             addOurBundleToClasspath(pitestClasspath, ORG_PITEST_PITCLIPSE_LISTENERS);

bundles/org.pitest.pitclipse.core/src/org/pitest/pitclipse/core/extension/point/PitRuntimeOptions.java

@@ -16,12 +16,10 @@
 
 package org.pitest.pitclipse.core.extension.point;
 
-import com.google.common.collect.ImmutableList;
+import java.util.List;
 
 import org.pitest.pitclipse.runner.PitOptions;
 
-import java.util.List;
-
 /**
  * <p>Options used by a running PIT application.</p>
  * 
@@ -32,7 +30,7 @@ public class PitRuntimeOptions {
 
     private final int portNumber;
     private final PitOptions options;
-    private final ImmutableList<String> projects;
+    private final List<String> projects;
 
     /**
      * Creates a new object representing the options used by a running PIT application.
@@ -47,7 +45,7 @@ public class PitRuntimeOptions {
     public PitRuntimeOptions(int portNumber, PitOptions options, List<String> projects) {
         this.portNumber = portNumber;
         this.options = options;
-        this.projects = ImmutableList.copyOf(projects);
+        this.projects = projects;
     }
 
     /**

bundles/org.pitest.pitclipse.launch.ui/META-INF/MANIFEST.MF

@@ -18,6 +18,5 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.11.1,4.0.0)",
  org.eclipse.ui.workbench;bundle-version="[3.107.1,4.0.0)",
  org.eclipse.jdt.debug.ui;bundle-version="[3.7.101,4.0.0)",
  org.pitest.pitclipse.ui;bundle-version="2.1.2"
-Import-Package: com.google.common.collect;version="21.0.0",
- org.pitest.mutationtest.engine.gregor.config
+Import-Package: org.pitest.mutationtest.engine.gregor.config
 Export-Package: org.pitest.pitclipse.launch.ui

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

@@ -18,6 +18,7 @@
 
 import static org.eclipse.jdt.ui.JavaUI.getEditorInputTypeRoot;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Function;
@@ -30,8 +31,6 @@
 import org.eclipse.ui.IEditorInput;
 import org.pitest.pitclipse.ui.utils.PitclipseUiUtils;
 
-import com.google.common.collect.ImmutableList;
-
 final class LaunchShortcut {
 
     static <T> Optional<T> forEditorInputDo(IEditorInput i, Function<ITypeRoot, Optional<T>> onFound, Supplier<Optional<T>> notFound) {
@@ -52,8 +51,8 @@ static Optional<IJavaElement> asJavaElement(Object o) {
         return Optional.ofNullable(PitclipseUiUtils.tryToAdapt(o, IJavaElement.class));
     }
 
-    static ImmutableList<ILaunchConfiguration> emptyLaunchConfiguration() {
-        return ImmutableList.<ILaunchConfiguration>of();
+    static List<ILaunchConfiguration> emptyLaunchConfiguration() {
+        return Collections.emptyList();
     }
 
     static ILaunchConfiguration[] emptyList() {

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

@@ -43,6 +43,7 @@
 import static org.pitest.pitclipse.launch.ui.PitLaunchUiActivator.getActiveWorkbenchShell;
 import static org.pitest.pitclipse.launch.ui.PitMigrationDelegate.mapResources;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Function;
@@ -75,9 +76,6 @@
 import org.pitest.pitclipse.runner.config.PitConfiguration;
 import org.pitest.pitclipse.ui.utils.PitclipseUiUtils;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableList.Builder;
-
 /**
  * Allows to launch a PIT analyze from a contextual menu.
  */
@@ -275,13 +273,13 @@ private List<ILaunchConfiguration> findExistingLaunchConfigurations(ILaunchConfi
         ILaunchConfiguration[] configs = getLaunchManager().getLaunchConfigurations(configType);
         String[] attributeToCompare = getAttributeNamesToCompare();
 
-        Builder<ILaunchConfiguration> candidateConfigs = ImmutableList.builder();
+        List<ILaunchConfiguration> candidateConfigs = new ArrayList<>();
         for (ILaunchConfiguration config : configs) {
             if (hasSameAttributes(config, temporary, attributeToCompare)) {
                 candidateConfigs.add(config);
             }
         }
-        return candidateConfigs.build();
+        return candidateConfigs;
     }
 
     private List<ILaunchConfiguration> findExistingLaunchConfigurations(Object candidate) {

bundles/org.pitest.pitclipse.launch/META-INF/MANIFEST.MF

@@ -15,5 +15,3 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.11.1,4.0.0)",
  org.eclipse.jdt.junit.core
 Export-Package: org.pitest.pitclipse.launch,
  org.pitest.pitclipse.launch.config
-Import-Package: com.google.common.base;version="21.0.0",
- com.google.common.collect;version="21.0.0"

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

@@ -18,6 +18,8 @@
 
 import static org.pitest.pitclipse.core.PitCoreActivator.getDefault;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import org.eclipse.core.runtime.CoreException;
@@ -42,8 +44,6 @@
 import org.pitest.pitclipse.runner.config.PitConfiguration;
 import org.pitest.pitclipse.runner.io.SocketProvider;
 
-import com.google.common.collect.ImmutableList;
-
 /**
  * <p>Abstract launch configuration used to execute PIT in a background VM.</p>
  * 
@@ -75,15 +75,13 @@ public String getMainTypeName(ILaunchConfiguration launchConfig) throws CoreExce
 
     @Override
     public String[] getClasspath(ILaunchConfiguration launchConfig) throws CoreException {
-        ImmutableList.Builder<String> builder = ImmutableList.<String>builder()
-                .addAll(getDefault().getPitClasspath());
-        builder.addAll(ImmutableList.copyOf(super.getClasspath(launchConfig)));
+        List<String> newClasspath = new ArrayList<>(getDefault().getPitClasspath());
+        newClasspath.addAll(Arrays.asList(super.getClasspath(launchConfig)));
         if (projectUsesJunit5) {
             // Allow Pitest to detect Junit5 tests
-            builder.addAll(getDefault().getPitestJunit5PluginClasspath());
+            newClasspath.addAll(getDefault().getPitestJunit5PluginClasspath());
         }
-        List<String> newClasspath = builder.build();
-
+
         return newClasspath.toArray(new String[newClasspath.size()]);
     }
 
@@ -103,15 +101,14 @@ public void launch(ILaunchConfiguration configuration, String mode, ILaunch laun
 
         projectUsesJunit5 = isJUnit5InClasspathOf(configWrapper.getProject());
         PitOptionsBuilder optionsBuilder = configWrapper.getPitOptionsBuilder();
-        PitOptions options = optionsBuilder.withUseJUnit5(projectUsesJunit5)
-                                           .build();
+        PitOptions options = optionsBuilder.withUseJUnit5(projectUsesJunit5).build();
 
         super.launch(configuration, mode, launch, monitor);
 
         IExtensionRegistry registry = Platform.getExtensionRegistry();
 
-        new ExtensionPointHandler<PitRuntimeOptions>(EXTENSION_POINT_ID).execute(registry, new PitRuntimeOptions(
-                portNumber, options, configWrapper.getMutatedProjects()));
+        new ExtensionPointHandler<PitRuntimeOptions>(EXTENSION_POINT_ID).execute(registry,
+                new PitRuntimeOptions(portNumber, options, configWrapper.getMutatedProjects()));
 
     }
 

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

@@ -16,6 +16,7 @@
 
 package org.pitest.pitclipse.launch.config;
 
+
 import static org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME;
 import static org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME;
 import static org.pitest.pitclipse.core.PitCoreActivator.getDefault;
@@ -24,6 +25,7 @@
 
 import java.io.File;
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.core.resources.IProject;
@@ -42,9 +44,7 @@
 import org.pitest.pitclipse.runner.PitOptions;
 import org.pitest.pitclipse.runner.PitOptions.PitOptionsBuilder;
 import org.pitest.pitclipse.runner.config.PitConfiguration;
-
-import com.google.common.base.Splitter;
-import com.google.common.collect.ImmutableList;
+import org.pitest.pitclipse.runner.util.PitUtils;
 
 public class LaunchConfigurationWrapper {
 
@@ -207,39 +207,33 @@ public Builder withPitConfiguration(PitConfiguration pitConfiguration) {
     }
 
     private List<String> getExcludedMethods() throws CoreException {
-        ImmutableList.Builder<String> results = ImmutableList.builder();
         String excludedMethods;
         if (launchConfig.hasAttribute(ATTR_EXCLUDE_METHODS)) {
             excludedMethods = launchConfig.getAttribute(ATTR_EXCLUDE_METHODS, "");
         } else {
             excludedMethods = pitConfiguration.getExcludedMethods();
         }
-        results.addAll(Splitter.on(',').trimResults().omitEmptyStrings().split(excludedMethods));
-        return results.build();
+        return PitUtils.splitBasedOnComma(excludedMethods);
     }
 
     private List<String> getAvoidCallsTo() throws CoreException {
-        ImmutableList.Builder<String> results = ImmutableList.builder();
         String avoidCallsTo;
         if (launchConfig.hasAttribute(ATTR_AVOID_CALLS_TO)) {
             avoidCallsTo = launchConfig.getAttribute(ATTR_AVOID_CALLS_TO, "");
         } else {
             avoidCallsTo = pitConfiguration.getAvoidCallsTo();
         }
-        results.addAll(Splitter.on(',').trimResults().omitEmptyStrings().split(avoidCallsTo));
-        return results.build();
+        return PitUtils.splitBasedOnComma(avoidCallsTo);
     }
 
     private List<String> getExcludedClasses() throws CoreException {
-        ImmutableList.Builder<String> results = ImmutableList.builder();
         String excludedClasses;
         if (launchConfig.hasAttribute(ATTR_EXCLUDE_CLASSES)) {
             excludedClasses = launchConfig.getAttribute(ATTR_EXCLUDE_CLASSES, "");
         } else {
             excludedClasses = pitConfiguration.getExcludedClasses();
         }
-        results.addAll(Splitter.on(',').trimResults().omitEmptyStrings().split(excludedClasses));
-        return results.build();
+        return PitUtils.splitBasedOnComma(excludedClasses);
     }
 
     private boolean isIncrementalAnalysis() throws CoreException {
@@ -264,10 +258,9 @@ private List<String> getClassesFromProject() throws CoreException {
     }
 
     private List<String> getTargetClasses() throws CoreException {
-        ImmutableList.Builder<String> results = ImmutableList.builder();
         final String targetClasses = launchConfig.getAttribute(ATTR_TARGET_CLASSES, "");
         return targetClasses.equals("") ? null
-                : results.addAll(Splitter.on(',').trimResults().omitEmptyStrings().split(targetClasses)).build();
+                : new ArrayList<>(PitUtils.splitBasedOnComma(targetClasses));
     }
 
     public IResource[] getMappedResources() throws CoreException {

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

@@ -16,8 +16,17 @@
 
 package org.pitest.pitclipse.launch.config;
 
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSet.Builder;
+import static org.eclipse.core.resources.IResource.FOLDER;
+import static org.eclipse.core.resources.IResource.NONE;
+import static org.eclipse.core.resources.IResource.PROJECT;
+import static org.eclipse.jdt.core.IJavaElement.PACKAGE_FRAGMENT;
+import static org.eclipse.jdt.core.IJavaElement.PACKAGE_FRAGMENT_ROOT;
+import static org.eclipse.jdt.core.IPackageFragment.DEFAULT_PACKAGE_NAME;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IResourceProxy;
@@ -31,24 +40,13 @@
 import org.eclipse.jdt.core.IType;
 import org.eclipse.jdt.core.JavaCore;
 
-import java.util.List;
-import java.util.Set;
-
-import static com.google.common.collect.ImmutableList.copyOf;
-import static org.eclipse.core.resources.IResource.FOLDER;
-import static org.eclipse.core.resources.IResource.NONE;
-import static org.eclipse.core.resources.IResource.PROJECT;
-import static org.eclipse.jdt.core.IJavaElement.PACKAGE_FRAGMENT;
-import static org.eclipse.jdt.core.IJavaElement.PACKAGE_FRAGMENT_ROOT;
-import static org.eclipse.jdt.core.IPackageFragment.DEFAULT_PACKAGE_NAME;
-
 public class PackageFinder {
 
     private static final class ProjectLevelProxyVisitor implements IResourceProxyVisitor {
         private final LaunchConfigurationWrapper configurationWrapper;
-        private final Builder<String> builder;
+        private final Set<String> builder;
 
-        private ProjectLevelProxyVisitor(LaunchConfigurationWrapper configurationWrapper, Builder<String> builder) {
+        private ProjectLevelProxyVisitor(LaunchConfigurationWrapper configurationWrapper, Set<String> builder) {
             this.configurationWrapper = configurationWrapper;
             this.builder = builder;
         }
@@ -75,18 +73,18 @@ public boolean visit(IResourceProxy proxy) throws CoreException {
         }
 
         private Set<String> getPackagesFromRoot(IJavaProject project, String handleId) throws CoreException {
-            Builder<String> setBuilder = ImmutableSet.builder();
+            Set<String> setBuilder = new HashSet<>();
             IPackageFragmentRoot[] roots = project.getPackageFragmentRoots();
             for (IPackageFragmentRoot root : roots) {
                 if (handleId.equals(root.getHandleIdentifier())) {
                     setBuilder.addAll(packagesFrom(root));
                 }
             }
-            return setBuilder.build();
+            return setBuilder;
         }
 
         private Set<String> packagesFrom(IPackageFragmentRoot root) throws CoreException {
-            Builder<String> setBuilder = ImmutableSet.builder();
+            Set<String> setBuilder = new HashSet<>();
             IJavaElement[] elements = root.getChildren();
             for (IJavaElement element : elements) {
                 if (element instanceof IPackageFragment) {
@@ -95,40 +93,40 @@ private Set<String> packagesFrom(IPackageFragmentRoot root) throws CoreException
                 }
 
             }
-            return setBuilder.build();
+            return setBuilder;
         }
 
         private Set<String> packagesFrom(IPackageFragment packageFragment) throws CoreException {
-            Builder<String> setBuilder = ImmutableSet.builder();
+            Set<String> setBuilder = new HashSet<>();
             if (packageFragment.getElementName().equals(DEFAULT_PACKAGE_NAME)) {
                 setBuilder.addAll(classesFromDefaultPackage(packageFragment));
             } else {
                 if (packageFragment.getCompilationUnits().length > 0) {
                     setBuilder.add(packageFragment.getElementName() + ".*");
                 }
             }
-            return setBuilder.build();
+            return setBuilder;
         }
 
         private Set<String> classesFromDefaultPackage(IPackageFragment packageFragment) throws CoreException {
-            Builder<String> setBuilder = ImmutableSet.builder();
+            Set<String> setBuilder = new HashSet<>();
             for (ICompilationUnit c : packageFragment.getCompilationUnits()) {
                 for (IType type : c.getAllTypes()) {
                     setBuilder.add(type.getFullyQualifiedName());
                 }
             }
-            return setBuilder.build();
+            return setBuilder;
         }
     }
 
     public List<String> getPackages(LaunchConfigurationWrapper configurationWrapper) throws CoreException {
-        final Builder<String> builder = ImmutableSet.builder();
+        Set<String> setBuilder = new HashSet<>();
         IResource[] resources = configurationWrapper.getMappedResources();
-        IResourceProxyVisitor visitor = new ProjectLevelProxyVisitor(configurationWrapper, builder);
+        IResourceProxyVisitor visitor = new ProjectLevelProxyVisitor(configurationWrapper, setBuilder);
         for (IResource resource : resources) {
             resource.accept(visitor, NONE);
         }
-        return copyOf(builder.build());
+        return new ArrayList<>(setBuilder);
     }
 
 }