Merge pull request #407 from siom79/optional

Unify usage of `Optional` instances
siom79 · Aug 25, 2024 · d6944c1 · d6944c1
2 parents 5c050ea + 6a0b26a
commit d6944c1
Show file tree

Hide file tree

Showing 75 changed files with 234 additions and 348 deletions.
diff --git a/japicmp-ant-task/src/main/java/japicmp/ant/JApiCmpTask.java b/japicmp-ant-task/src/main/java/japicmp/ant/JApiCmpTask.java
@@ -15,7 +15,6 @@
 import japicmp.output.xml.XmlOutput;
 import japicmp.output.xml.XmlOutputGenerator;
 import japicmp.output.xml.XmlOutputGeneratorOptions;
-import japicmp.util.Optional;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
@@ -29,6 +28,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
 
 import static japicmp.model.AccessModifier.toModifier;
 import static japicmp.util.FileHelper.createFileList;
@@ -242,18 +242,18 @@ private Options createOptionsFromAntAttrs() {
 		Options options = Options.newDefault();
 		options.getOldArchives().addAll(createFileList(this.oldJar));
 		options.getNewArchives().addAll(createFileList(this.newJar));
-		options.setXmlOutputFile(Optional.fromNullable(xmlOutputFile));
-		options.setHtmlOutputFile(Optional.fromNullable(htmlOutputFile));
-		options.setHtmlStylesheet(Optional.fromNullable(htmlStylesheet));
+		options.setXmlOutputFile(Optional.ofNullable(xmlOutputFile));
+		options.setHtmlOutputFile(Optional.ofNullable(htmlOutputFile));
+		options.setHtmlStylesheet(Optional.ofNullable(htmlStylesheet));
 		options.setOutputOnlyModifications(onlyModified);
 		options.setAccessModifier(toModifier(accessModifier));
-		options.addIncludeFromArgument(Optional.fromNullable(includes), includeExclusively);
-		options.addExcludeFromArgument(Optional.fromNullable(excludes), excludeExclusively);
+		options.addIncludeFromArgument(Optional.ofNullable(includes), includeExclusively);
+		options.addExcludeFromArgument(Optional.ofNullable(excludes), excludeExclusively);
 		options.setOutputOnlyBinaryIncompatibleModifications(onlyBinaryIncompatible);
 		options.setIncludeSynthetic(includeSynthetic);
 		options.setIgnoreMissingClasses(ignoreMissingClasses);
-		options.setOldClassPath(Optional.fromNullable(getOldClassPath().size() > 0 ? getOldClassPath().toString() : null));
-		options.setNewClassPath(Optional.fromNullable(getNewClassPath().size() > 0 ? getNewClassPath().toString() : null));
+		options.setOldClassPath(Optional.ofNullable(getOldClassPath().size() > 0 ? getOldClassPath().toString() : null));
+		options.setNewClassPath(Optional.ofNullable(getNewClassPath().size() > 0 ? getNewClassPath().toString() : null));
 		options.setNoAnnotations(noAnnotations);
 		for (String missingClassRegEx : ignoreMissingClassesByRegularExpressions) {
 			options.addIgnoreMissingClassRegularExpression(missingClassRegEx);

diff --git a/japicmp-maven-plugin/src/main/java/japicmp/maven/JApiCmpMojo.java b/japicmp-maven-plugin/src/main/java/japicmp/maven/JApiCmpMojo.java
@@ -22,7 +22,6 @@
 import japicmp.output.xml.XmlOutput;
 import japicmp.output.xml.XmlOutputGenerator;
 import japicmp.output.xml.XmlOutputGeneratorOptions;
-import japicmp.util.Optional;
 import japicmp.versioning.SemanticVersion;
 import org.apache.maven.RepositoryUtils;
 import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -118,22 +117,22 @@ public void execute() throws MojoExecutionException, MojoFailureException {
 			this.mavenProject, this.mojoExecution, this.versionRangeWithProjectVersion, this.repoSystem, this.repoSession,
 			this.remoteRepos);
 		PluginParameters pluginParameters = new PluginParameters(this.skipExec || this.skip, this.newVersion, this.oldVersion, this.parameter, this.dependencies, Optional.of(
-			this.projectBuildDir), Optional.<String>absent(), true, this.oldVersions, this.newVersions, this.oldClassPathDependencies,
+			this.projectBuildDir), Optional.<String>empty(), true, this.oldVersions, this.newVersions, this.oldClassPathDependencies,
 			this.newClassPathDependencies);
 		executeWithParameters(pluginParameters, mavenParameters);
 	}
 
 	Optional<HtmlOutput> executeWithParameters(PluginParameters pluginParameters, MavenParameters mavenParameters) throws MojoFailureException, MojoExecutionException {
 		if (pluginParameters.getSkipParam()) {
 			getLog().info("Skipping execution because parameter 'skip' was set to true.");
-			return Optional.absent();
+			return Optional.empty();
 		}
 		if (isPomModuleNeedingSkip(pluginParameters, mavenParameters)) {
 			getLog().info("Skipping execution because parameter 'skipPomModules' was set to true and this is artifact is of type pom.");
-			return Optional.absent();
+			return Optional.empty();
 		}
 		if (skipModule(pluginParameters, mavenParameters)) {
-			return Optional.absent();
+			return Optional.empty();
 		}
 		Options options = getOptions(pluginParameters, mavenParameters);
 		JarArchiveComparatorOptions comparatorOptions = JarArchiveComparatorOptions.of(options);
@@ -142,7 +141,7 @@ Optional<HtmlOutput> executeWithParameters(PluginParameters pluginParameters, Ma
 		JarArchiveComparator jarArchiveComparator = new JarArchiveComparator(comparatorOptions);
 		if (options.getNewArchives().isEmpty()) {
 			getLog().warn("Skipping execution because no new version could be resolved/found.");
-			return Optional.absent();
+			return Optional.empty();
 		}
 		List<JApiClass> jApiClasses = jarArchiveComparator.compare(options.getOldArchives(), options.getNewArchives());
 		try {
@@ -164,7 +163,7 @@ Optional<HtmlOutput> executeWithParameters(PluginParameters pluginParameters, Ma
 					}
 				}
 			}
-			Optional<HtmlOutput> retVal = Optional.absent();
+			Optional<HtmlOutput> retVal = Optional.empty();
 			if (!skipHtmlReport(pluginParameters)) {
 				HtmlOutput htmlOutput = generateHtmlOutput(jApiClasses, jApiCmpBuildDir, options, mavenParameters, pluginParameters, semanticVersioningInformation);
 				retVal = Optional.of(htmlOutput);
@@ -470,13 +469,13 @@ Options getOptions(PluginParameters pluginParameters, MavenParameters mavenParam
 			List<String> excludes = parameterParam.getExcludes();
 			if (excludes != null) {
 				for (String exclude : excludes) {
-					this.options.addExcludeFromArgument(Optional.fromNullable(exclude), parameterParam.isExcludeExclusively());
+					this.options.addExcludeFromArgument(Optional.ofNullable(exclude), parameterParam.isExcludeExclusively());
 				}
 			}
 			List<String> includes = parameterParam.getIncludes();
 			if (includes != null) {
 				for (String include : includes) {
-					this.options.addIncludeFromArgument(Optional.fromNullable(include), parameterParam.isIncludeExlusively());
+					this.options.addIncludeFromArgument(Optional.ofNullable(include), parameterParam.isIncludeExlusively());
 				}
 			}
 

diff --git a/japicmp-maven-plugin/src/main/java/japicmp/maven/JApiCmpReport.java b/japicmp-maven-plugin/src/main/java/japicmp/maven/JApiCmpReport.java
@@ -2,7 +2,6 @@
 
 import japicmp.config.Options;
 import japicmp.output.html.HtmlOutput;
-import japicmp.util.Optional;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.doxia.sink.Sink;
 import org.apache.maven.plugin.MojoExecution;
@@ -20,6 +19,7 @@
 import java.io.File;
 import java.util.List;
 import java.util.Locale;
+import java.util.Optional;
 
 @Mojo(name = "cmp-report", defaultPhase = LifecyclePhase.SITE)
 public class JApiCmpReport extends AbstractMavenReport {
@@ -121,7 +121,7 @@ private JApiCmpMojo getMojo() {
 		this.mavenParameters = new MavenParameters(this.artifactRepositories,
 			this.mavenProject, this.mojoExecution, this.versionRangeWithProjectVersion, this.repoSystem, this.repoSession,
 			this.remoteRepos);
-		this.pluginParameters = new PluginParameters(this.skip, this.newVersion, this.oldVersion, this.parameter, this.dependencies, Optional.<File>absent(), Optional.of(
+		this.pluginParameters = new PluginParameters(this.skip, this.newVersion, this.oldVersion, this.parameter, this.dependencies, Optional.<File>empty(), Optional.of(
 			this.outputDirectory), false, this.oldVersions, this.newVersions, this.oldClassPathDependencies, this.newClassPathDependencies);
 		return this.mojo;
 	}

diff --git a/japicmp-maven-plugin/src/main/java/japicmp/maven/PluginParameters.java b/japicmp-maven-plugin/src/main/java/japicmp/maven/PluginParameters.java
@@ -1,9 +1,8 @@
 package japicmp.maven;
 
-import japicmp.util.Optional;
-
 import java.io.File;
 import java.util.List;
+import java.util.Optional;
 
 public class PluginParameters {
 	private final boolean skipParam;

diff --git a/japicmp-maven-plugin/src/test/java/japicmp/maven/JApiCmpMojoTest.java b/japicmp-maven-plugin/src/test/java/japicmp/maven/JApiCmpMojoTest.java
@@ -8,7 +8,6 @@
 import japicmp.maven.util.CtFieldBuilder;
 import japicmp.maven.util.CtInterfaceBuilder;
 import japicmp.maven.util.CtMethodBuilder;
-import japicmp.util.Optional;
 import javassist.ClassPool;
 import javassist.CtClass;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -19,6 +18,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.StringContains.containsString;

diff --git a/japicmp-maven-plugin/src/test/java/japicmp/maven/SkipModuleStrategyTest.java b/japicmp-maven-plugin/src/test/java/japicmp/maven/SkipModuleStrategyTest.java
@@ -1,6 +1,5 @@
 package japicmp.maven;
 
-import japicmp.util.Optional;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.plugin.MojoExecution;
 import org.apache.maven.plugin.logging.Log;
@@ -13,6 +12,7 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Optional;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
@@ -101,7 +101,7 @@ private PluginParameters createPluginParameters() {
 		Version newVersion = JApiCmpMojoTest.createVersion("groupId", "artifactId", "0.1.1");
 		Parameter parameter = new Parameter();
 		return new PluginParameters(false, newVersion, oldVersion, parameter, new ArrayList<Dependency>(),
-			Optional.<File>absent(), Optional.<String>absent(), false, new ArrayList<DependencyDescriptor>(),
+			Optional.<File>empty(), Optional.<String>empty(), false, new ArrayList<DependencyDescriptor>(),
 			new ArrayList<DependencyDescriptor>(), new ArrayList<Dependency>(), new ArrayList<Dependency>());
 	}
 }
diff --git a/japicmp-maven-plugin/src/test/java/japicmp/maven/util/CtClassBuilder.java b/japicmp-maven-plugin/src/test/java/japicmp/maven/util/CtClassBuilder.java
@@ -1,6 +1,5 @@
 package japicmp.maven.util;
 
-import com.google.common.base.Optional;
 import japicmp.util.ModifierHelper;
 import javassist.ClassPool;
 import javassist.CtClass;
@@ -12,13 +11,14 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 public class CtClassBuilder {
 	private static final String DEFAULT_CLASS_NAME = "japicmp.Test";
 	private String name = DEFAULT_CLASS_NAME;
 	private int modifier = Modifier.PUBLIC;
 	private final List<String> annotations = new ArrayList<>();
-	private Optional<CtClass> superclass = Optional.absent();
+	private Optional<CtClass> superclass = Optional.empty();
 	private final List<CtClass> interfaces = new ArrayList<>();
 
 	public CtClassBuilder name(String name) {

diff --git a/japicmp-maven-plugin/src/test/java/japicmp/maven/util/CtInterfaceBuilder.java b/japicmp-maven-plugin/src/test/java/japicmp/maven/util/CtInterfaceBuilder.java
@@ -1,13 +1,14 @@
 package japicmp.maven.util;
 
-import com.google.common.base.Optional;
 import javassist.CannotCompileException;
 import javassist.ClassPool;
 import javassist.CtClass;
 
+import java.util.Optional;
+
 public class CtInterfaceBuilder {
 	private String name = "japicmp.Test";
-	private Optional<CtClass> superInterfaceOptional = Optional.absent();
+	private Optional<CtClass> superInterfaceOptional = Optional.empty();
 
 	public CtInterfaceBuilder name(String name) {
 		this.name = name;
@@ -29,7 +30,7 @@ public static CtInterfaceBuilder create() {
 	}
 
 	public CtInterfaceBuilder withSuperInterface(CtClass superInterface) {
-		this.superInterfaceOptional = Optional.fromNullable(superInterface);
+		this.superInterfaceOptional = Optional.ofNullable(superInterface);
 		return this;
 	}
 }
diff --git a/...-base/japicmp-test-service-test/src/test/java/japicmp/test/service/MavenPluginTestIT.java b/...-base/japicmp-test-service-test/src/test/java/japicmp/test/service/MavenPluginTestIT.java
@@ -1,6 +1,5 @@
 package japicmp.test.service;
 
-import com.google.common.base.Optional;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -9,6 +8,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
+import java.util.Optional;
 
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
@@ -30,6 +30,6 @@ private Optional<String> findLineThatContains(List<String> lines, String str) {
 				return Optional.of(line);
 			}
 		}
-		return Optional.absent();
+		return Optional.empty();
 	}
 }
diff --git a/...test/src/test/java/japicmp/test/service/SuperclassWithSubclassAddsNewStaticFieldTest.java b/...test/src/test/java/japicmp/test/service/SuperclassWithSubclassAddsNewStaticFieldTest.java
@@ -6,11 +6,11 @@
 import japicmp.model.JApiClass;
 import japicmp.model.JApiField;
 import japicmp.model.JApiSuperclass;
-import japicmp.util.Optional;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 import java.util.List;
+import java.util.Optional;
 import java.util.logging.Handler;
 import java.util.logging.Level;
 import java.util.logging.Logger;

diff --git a/...e-impl-base/japicmp-test-service-test/src/test/java/japicmp/test/service/util/Helper.java b/...e-impl-base/japicmp-test-service-test/src/test/java/japicmp/test/service/util/Helper.java
@@ -14,7 +14,6 @@
 import japicmp.output.xml.XmlOutput;
 import japicmp.output.xml.XmlOutputGenerator;
 import japicmp.output.xml.XmlOutputGeneratorOptions;
-import japicmp.util.Optional;
 import org.hamcrest.CoreMatchers;
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
@@ -25,6 +24,7 @@
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 public class Helper {
 

diff --git a/japicmp-testbase/japicmp-test/src/test/java/japicmp/test/AbstractTest.java b/japicmp-testbase/japicmp-test/src/test/java/japicmp/test/AbstractTest.java
@@ -1,6 +1,5 @@
 package japicmp.test;
 
-import japicmp.util.Optional;
 import japicmp.cmp.JarArchiveComparator;
 import japicmp.cmp.JarArchiveComparatorOptions;
 import japicmp.model.JApiChangeStatus;
@@ -9,6 +8,7 @@
 import org.junit.Test;
 
 import java.util.List;
+import java.util.Optional;
 
 import static japicmp.test.util.Helper.getArchive;
 import static japicmp.test.util.Helper.getJApiClass;

diff --git a/japicmp-testbase/japicmp-test/src/test/java/japicmp/test/FieldsTest.java b/japicmp-testbase/japicmp-test/src/test/java/japicmp/test/FieldsTest.java
@@ -1,6 +1,5 @@
 package japicmp.test;
 
-import japicmp.util.Optional;
 import japicmp.cmp.JarArchiveComparator;
 import japicmp.cmp.JarArchiveComparatorOptions;
 import japicmp.model.AccessModifier;
@@ -11,6 +10,7 @@
 import org.junit.Test;
 
 import java.util.List;
+import java.util.Optional;
 
 import static japicmp.test.util.Helper.getArchive;
 import static japicmp.test.util.Helper.getJApiClass;

diff --git a/japicmp-testbase/japicmp-test/src/test/java/japicmp/test/JavaObjectSerializationTest.java b/japicmp-testbase/japicmp-test/src/test/java/japicmp/test/JavaObjectSerializationTest.java
@@ -1,6 +1,5 @@
 package japicmp.test;
 
-import japicmp.util.Optional;
 import japicmp.cmp.JarArchiveComparator;
 import japicmp.cmp.JarArchiveComparatorOptions;
 import japicmp.model.AccessModifier;
@@ -29,6 +28,7 @@
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.List;
+import java.util.Optional;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 

diff --git a/japicmp-testbase/japicmp-test/src/test/java/japicmp/test/MultipleArchivesTest.java b/japicmp-testbase/japicmp-test/src/test/java/japicmp/test/MultipleArchivesTest.java
@@ -1,6 +1,5 @@
 package japicmp.test;
 
-import japicmp.util.Optional;
 import japicmp.cmp.JApiCmpArchive;
 import japicmp.cmp.JarArchiveComparator;
 import japicmp.cmp.JarArchiveComparatorOptions;
@@ -21,6 +20,7 @@
 import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
 
 import static japicmp.test.util.Helper.getArchive;
 import static japicmp.test.util.Helper.getJApiClass;

diff --git a/japicmp-testbase/japicmp-test/src/test/java/japicmp/test/SuperclassesTest.java b/japicmp-testbase/japicmp-test/src/test/java/japicmp/test/SuperclassesTest.java
@@ -1,6 +1,5 @@
 package japicmp.test;
 
-import japicmp.util.Optional;
 import japicmp.cmp.JarArchiveComparator;
 import japicmp.cmp.JarArchiveComparatorOptions;
 import japicmp.model.JApiChangeStatus;
@@ -9,6 +8,7 @@
 import org.junit.Test;
 
 import java.util.List;
+import java.util.Optional;
 
 import static japicmp.test.util.Helper.getArchive;
 import static japicmp.test.util.Helper.getJApiClass;

diff --git a/japicmp-testbase/japicmp-test/src/test/java/japicmp/test/SyntheticAttributeTest.java b/japicmp-testbase/japicmp-test/src/test/java/japicmp/test/SyntheticAttributeTest.java
@@ -1,6 +1,5 @@
 package japicmp.test;
 
-import japicmp.util.Optional;
 import japicmp.cmp.JApiCmpArchive;
 import japicmp.cmp.JarArchiveComparator;
 import japicmp.cmp.JarArchiveComparatorOptions;
@@ -24,6 +23,7 @@
 import java.nio.file.Paths;
 import java.util.Enumeration;
 import java.util.List;
+import java.util.Optional;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 import java.util.zip.ZipOutputStream;
@@ -53,10 +53,10 @@ public void test() throws IOException, CannotCompileException, NotFoundException
 		assertThat(syntheticClass.getSyntheticAttribute().getNewAttribute(), is(Optional.of(SyntheticAttribute.SYNTHETIC)));
 		assertThat(getJApiMethod(syntheticClass.getMethods(), "newMethod").getChangeStatus(), is(JApiChangeStatus.NEW));
 		assertThat(getJApiMethod(syntheticClass.getMethods(), "newMethod").getSyntheticAttribute().getChangeStatus(), is(JApiChangeStatus.NEW));
-		assertThat(getJApiMethod(syntheticClass.getMethods(), "newMethod").getSyntheticAttribute().getOldAttribute(), is(Optional.<SyntheticAttribute>absent()));
+		assertThat(getJApiMethod(syntheticClass.getMethods(), "newMethod").getSyntheticAttribute().getOldAttribute(), is(Optional.<SyntheticAttribute>empty()));
 		assertThat(getJApiMethod(syntheticClass.getMethods(), "newMethod").getSyntheticAttribute().getNewAttribute(), is(Optional.of(SyntheticAttribute.SYNTHETIC)));
 		assertThat(getJApiField(syntheticClass.getFields(), "newField").getSyntheticAttribute().getChangeStatus(), is(JApiChangeStatus.NEW));
-		assertThat(getJApiField(syntheticClass.getFields(), "newField").getSyntheticAttribute().getOldAttribute(), is(Optional.<SyntheticAttribute>absent()));
+		assertThat(getJApiField(syntheticClass.getFields(), "newField").getSyntheticAttribute().getOldAttribute(), is(Optional.<SyntheticAttribute>empty()));
 		assertThat(getJApiField(syntheticClass.getFields(), "newField").getSyntheticAttribute().getNewAttribute(), is(Optional.of(SyntheticAttribute.SYNTHETIC)));
 	}