From 56cd728ae69b9b9d037483df80d9421fc64bd83a Mon Sep 17 00:00:00 2001 From: Keegan Witt Date: Tue, 26 Sep 2023 14:38:07 -0400 Subject: [PATCH] Implement IntelliJ suggestions --- .../gmavenplus/mojo/AbstractGenerateStubsMojo.java | 4 ++-- .../gmavenplus/mojo/AbstractGroovyDocMojo.java | 11 +++++------ .../codehaus/gmavenplus/mojo/GroovyDocJarMojo.java | 4 +++- .../gmavenplus/mojo/GroovyDocTestsJarMojo.java | 4 +++- .../gmavenplus/mojo/AbstractCompileMojoTest.java | 3 --- .../gmavenplus/mojo/AbstractGroovyDocMojoTest.java | 3 --- .../gmavenplus/mojo/AbstractGroovyMojoTest.java | 2 +- .../gmavenplus/mojo/AbstractToolsMojoTest.java | 2 -- .../org/codehaus/gmavenplus/mojo/CompileMojoTest.java | 6 ------ .../gmavenplus/mojo/CompileTestsMojoTest.java | 7 ------- .../org/codehaus/gmavenplus/mojo/ExecuteMojoTest.java | 8 ++++++-- .../gmavenplus/mojo/GenerateStubsMojoTest.java | 6 ------ .../gmavenplus/mojo/GenerateTestStubsMojoTest.java | 7 ------- 13 files changed, 20 insertions(+), 47 deletions(-) diff --git a/src/main/java/org/codehaus/gmavenplus/mojo/AbstractGenerateStubsMojo.java b/src/main/java/org/codehaus/gmavenplus/mojo/AbstractGenerateStubsMojo.java index 50be77bc..51e20451 100644 --- a/src/main/java/org/codehaus/gmavenplus/mojo/AbstractGenerateStubsMojo.java +++ b/src/main/java/org/codehaus/gmavenplus/mojo/AbstractGenerateStubsMojo.java @@ -400,10 +400,10 @@ protected void logGeneratedStubs(File outputDirectory) { } /** - * This is a fix for http://jira.codehaus.org/browse/MGROOVY-187 + * This is a fix for ... * It modifies the dates of the created stubs to 1/1/1970, ensuring that the Java compiler will not overwrite perfectly * good compiled Groovy just because it has a newer source stub. Basically, this prevents the stubs from causing a - * side-effect with the Java compiler, but still allows stubs to work with JavaDoc. + * side effect with the Java compiler, but still allows stubs to work with JavaDoc. * * @param stubs the files on which to reset the modified date */ diff --git a/src/main/java/org/codehaus/gmavenplus/mojo/AbstractGroovyDocMojo.java b/src/main/java/org/codehaus/gmavenplus/mojo/AbstractGroovyDocMojo.java index 177d7c46..0a898e7f 100644 --- a/src/main/java/org/codehaus/gmavenplus/mojo/AbstractGroovyDocMojo.java +++ b/src/main/java/org/codehaus/gmavenplus/mojo/AbstractGroovyDocMojo.java @@ -29,14 +29,13 @@ import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStreamReader; import java.io.OutputStreamWriter; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.net.MalformedURLException; +import java.nio.file.Files; import java.util.ArrayList; import java.util.List; import java.util.Properties; @@ -537,9 +536,9 @@ protected void copyStylesheet(final File outputDirectory) { BufferedWriter bufferedWriter = null; try { if (stylesheetEncoding != null) { - bufferedReader = new BufferedReader(new InputStreamReader(new FileInputStream(stylesheetFile), stylesheetEncoding)); + bufferedReader = new BufferedReader(new InputStreamReader(Files.newInputStream(stylesheetFile.toPath()), stylesheetEncoding)); } else { - bufferedReader = new BufferedReader(new InputStreamReader(new FileInputStream(stylesheetFile))); + bufferedReader = new BufferedReader(new InputStreamReader(Files.newInputStream(stylesheetFile.toPath()))); } StringBuilder css = new StringBuilder(); String line; @@ -548,9 +547,9 @@ protected void copyStylesheet(final File outputDirectory) { } File outfile = new File(outputDirectory, "stylesheet.css"); if (stylesheetEncoding != null) { - bufferedWriter = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outfile), stylesheetEncoding)); + bufferedWriter = new BufferedWriter(new OutputStreamWriter(Files.newOutputStream(outfile.toPath()), stylesheetEncoding)); } else { - bufferedWriter = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outfile))); + bufferedWriter = new BufferedWriter(new OutputStreamWriter(Files.newOutputStream(outfile.toPath()))); } bufferedWriter.write(css.toString()); } finally { diff --git a/src/main/java/org/codehaus/gmavenplus/mojo/GroovyDocJarMojo.java b/src/main/java/org/codehaus/gmavenplus/mojo/GroovyDocJarMojo.java index e5d9a9cb..0fd2e7a3 100644 --- a/src/main/java/org/codehaus/gmavenplus/mojo/GroovyDocJarMojo.java +++ b/src/main/java/org/codehaus/gmavenplus/mojo/GroovyDocJarMojo.java @@ -156,7 +156,9 @@ protected File generateArchive(File groovydocFiles, String jarFileName) throws A File groovydocJar = new File(jarOutputDirectory, jarFileName); if (groovydocJar.exists()) { - groovydocJar.delete(); + if (!groovydocJar.delete()) { + getLog().warn("Unable to delete " + groovydocJar.getAbsolutePath()); + } } MavenArchiver archiver = new MavenArchiver(); diff --git a/src/main/java/org/codehaus/gmavenplus/mojo/GroovyDocTestsJarMojo.java b/src/main/java/org/codehaus/gmavenplus/mojo/GroovyDocTestsJarMojo.java index 48eb3076..f69df014 100644 --- a/src/main/java/org/codehaus/gmavenplus/mojo/GroovyDocTestsJarMojo.java +++ b/src/main/java/org/codehaus/gmavenplus/mojo/GroovyDocTestsJarMojo.java @@ -156,7 +156,9 @@ protected File generateArchive(File groovydocFiles, String jarFileName) throws A File groovydocJar = new File(jarOutputDirectory, jarFileName); if (groovydocJar.exists()) { - groovydocJar.delete(); + if (!groovydocJar.delete()) { + getLog().warn("Unable to delete " + groovydocJar.getAbsolutePath()); + } } MavenArchiver archiver = new MavenArchiver(); diff --git a/src/test/java/org/codehaus/gmavenplus/mojo/AbstractCompileMojoTest.java b/src/test/java/org/codehaus/gmavenplus/mojo/AbstractCompileMojoTest.java index ac3cd286..b2b69271 100644 --- a/src/test/java/org/codehaus/gmavenplus/mojo/AbstractCompileMojoTest.java +++ b/src/test/java/org/codehaus/gmavenplus/mojo/AbstractCompileMojoTest.java @@ -18,13 +18,10 @@ import org.codehaus.gmavenplus.model.internal.Version; import org.codehaus.gmavenplus.util.ClassWrangler; -import org.codehaus.groovy.control.CompilerConfiguration; import org.junit.Before; import org.junit.Test; import org.mockito.MockitoAnnotations; -import java.io.File; -import java.lang.reflect.InvocationTargetException; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/test/java/org/codehaus/gmavenplus/mojo/AbstractGroovyDocMojoTest.java b/src/test/java/org/codehaus/gmavenplus/mojo/AbstractGroovyDocMojoTest.java index 2282ec8e..2be3bb81 100644 --- a/src/test/java/org/codehaus/gmavenplus/mojo/AbstractGroovyDocMojoTest.java +++ b/src/test/java/org/codehaus/gmavenplus/mojo/AbstractGroovyDocMojoTest.java @@ -36,7 +36,6 @@ public class AbstractGroovyDocMojoTest { private MavenProject project; @Before - @SuppressWarnings("deprecation") public void setup() throws Exception { MockitoAnnotations.openMocks(this); testMojo.mojoExecution = mojoExecution; @@ -48,14 +47,12 @@ public void setup() throws Exception { } @Test - @SuppressWarnings("deprecation") public void testDontSkipGroovyDoc() throws Exception { testMojo.doGroovyDocGeneration(new FileSet[]{new FileSet()}, emptyList(), new File("")); verify(testMojo, times(1)).generateGroovyDoc(any(File.class), any(Class.class), any(Class.class), any(), anyList(), any()); } @Test - @SuppressWarnings("deprecation") public void testSkipGroovyDoc() throws Exception { testMojo.skipGroovyDoc = true; testMojo.doGroovyDocGeneration(new FileSet[]{new FileSet()}, emptyList(), new File("")); diff --git a/src/test/java/org/codehaus/gmavenplus/mojo/AbstractGroovyMojoTest.java b/src/test/java/org/codehaus/gmavenplus/mojo/AbstractGroovyMojoTest.java index ba585f91..43ae107a 100644 --- a/src/test/java/org/codehaus/gmavenplus/mojo/AbstractGroovyMojoTest.java +++ b/src/test/java/org/codehaus/gmavenplus/mojo/AbstractGroovyMojoTest.java @@ -40,7 +40,7 @@ public void setup() { @Test public void testGetJavaVersion() { - assertTrue(testMojo.getJavaVersionString() != null && testMojo.getJavaVersionString().length() != 0); + assertTrue(testMojo.getJavaVersionString() != null && !testMojo.getJavaVersionString().isEmpty()); assertNotNull(testMojo.getJavaVersion()); } diff --git a/src/test/java/org/codehaus/gmavenplus/mojo/AbstractToolsMojoTest.java b/src/test/java/org/codehaus/gmavenplus/mojo/AbstractToolsMojoTest.java index 3749677e..d78e485a 100644 --- a/src/test/java/org/codehaus/gmavenplus/mojo/AbstractToolsMojoTest.java +++ b/src/test/java/org/codehaus/gmavenplus/mojo/AbstractToolsMojoTest.java @@ -85,7 +85,6 @@ public void testInitializeProperties() { } @Test - @SuppressWarnings("deprecation") public void testInitializePropertiesNull() { testMojo.project = null; testMojo.session = null; @@ -101,7 +100,6 @@ public void testInitializePropertiesNull() { } @Test - @SuppressWarnings("deprecation") public void testInitializePropertiesAlreadyInProps() { testMojo.properties = properties; diff --git a/src/test/java/org/codehaus/gmavenplus/mojo/CompileMojoTest.java b/src/test/java/org/codehaus/gmavenplus/mojo/CompileMojoTest.java index 8a48aee0..4c82e052 100644 --- a/src/test/java/org/codehaus/gmavenplus/mojo/CompileMojoTest.java +++ b/src/test/java/org/codehaus/gmavenplus/mojo/CompileMojoTest.java @@ -63,7 +63,6 @@ public void setup() { } @Test - @SuppressWarnings("deprecation") public void testCallsExpectedMethods() throws Exception { doNothing().when(compileMojo).doCompile(anySet(), anyList(), any(File.class)); compileMojo.execute(); @@ -71,28 +70,24 @@ public void testCallsExpectedMethods() throws Exception { } @Test(expected = MojoExecutionException.class) - @SuppressWarnings("deprecation") public void testClassNotFoundExceptionThrowsMojoExecutionException() throws Exception { doThrow(new ClassNotFoundException(INTENTIONAL_EXCEPTION_MESSAGE)).when(compileMojo).doCompile(anySet(), anyList(), any(File.class)); compileMojo.execute(); } @Test(expected = MojoExecutionException.class) - @SuppressWarnings("deprecation") public void testInvocationTargetExceptionThrowsMojoExecutionException() throws Exception { doThrow(new InvocationTargetException(mock(Exception.class), INTENTIONAL_EXCEPTION_MESSAGE)).when(compileMojo).doCompile(anySet(), anyList(), any(File.class)); compileMojo.execute(); } @Test(expected = MojoExecutionException.class) - @SuppressWarnings("deprecation") public void testInstantiationExceptionThrowsMojoExecutionException() throws Exception { doThrow(new InstantiationException(INTENTIONAL_EXCEPTION_MESSAGE)).when(compileMojo).doCompile(anySet(), anyList(), any(File.class)); compileMojo.execute(); } @Test(expected = MojoExecutionException.class) - @SuppressWarnings("deprecation") public void testIllegalAccessExceptionThrowsMojoExecutionException() throws Exception { doThrow(new IllegalAccessException(INTENTIONAL_EXCEPTION_MESSAGE)).when(compileMojo).doCompile(anySet(), anyList(), any(File.class)); compileMojo.execute(); @@ -105,7 +100,6 @@ public void testDependencyResolutionRequiredExceptionThrowsMojoExecutionExceptio } @Test(expected = MojoExecutionException.class) - @SuppressWarnings("deprecation") public void testMalformedURLExceptionThrowsMojoExecutionException() throws Exception { doThrow(new MalformedURLException(INTENTIONAL_EXCEPTION_MESSAGE)).when(compileMojo).doCompile(anySet(), anyList(), any(File.class)); compileMojo.execute(); diff --git a/src/test/java/org/codehaus/gmavenplus/mojo/CompileTestsMojoTest.java b/src/test/java/org/codehaus/gmavenplus/mojo/CompileTestsMojoTest.java index 1f5c005e..34d8777f 100644 --- a/src/test/java/org/codehaus/gmavenplus/mojo/CompileTestsMojoTest.java +++ b/src/test/java/org/codehaus/gmavenplus/mojo/CompileTestsMojoTest.java @@ -63,7 +63,6 @@ public void setup() { } @Test - @SuppressWarnings("deprecation") public void testCallsExpectedMethods() throws Exception { doNothing().when(compileTestsMojo).doCompile(anySet(), anyList(), any(File.class)); compileTestsMojo.execute(); @@ -71,7 +70,6 @@ public void testCallsExpectedMethods() throws Exception { } @Test - @SuppressWarnings("deprecation") public void testSkipped() throws Exception { compileTestsMojo.skipTests = true; compileTestsMojo.execute(); @@ -79,28 +77,24 @@ public void testSkipped() throws Exception { } @Test(expected = MojoExecutionException.class) - @SuppressWarnings("deprecation") public void testClassNotFoundExceptionThrowsMojoExecutionException() throws Exception { doThrow(new ClassNotFoundException(INTENTIONAL_EXCEPTION_MESSAGE)).when(compileTestsMojo).doCompile(anySet(), anyList(), any(File.class)); compileTestsMojo.execute(); } @Test(expected = MojoExecutionException.class) - @SuppressWarnings("deprecation") public void testInvocationTargetExceptionThrowsMojoExecutionException() throws Exception { doThrow(new InvocationTargetException(mock(Exception.class), INTENTIONAL_EXCEPTION_MESSAGE)).when(compileTestsMojo).doCompile(anySet(), anyList(), any(File.class)); compileTestsMojo.execute(); } @Test(expected = MojoExecutionException.class) - @SuppressWarnings("deprecation") public void testInstantiationExceptionThrowsMojoExecutionException() throws Exception { doThrow(new InstantiationException(INTENTIONAL_EXCEPTION_MESSAGE)).when(compileTestsMojo).doCompile(anySet(), anyList(), any(File.class)); compileTestsMojo.execute(); } @Test(expected = MojoExecutionException.class) - @SuppressWarnings("deprecation") public void testIllegalAccessExceptionThrowsMojoExecutionException() throws Exception { doThrow(new IllegalAccessException(INTENTIONAL_EXCEPTION_MESSAGE)).when(compileTestsMojo).doCompile(anySet(), anyList(), any(File.class)); compileTestsMojo.execute(); @@ -113,7 +107,6 @@ public void testDependencyResolutionRequiredExceptionThrowsMojoExecutionExceptio } @Test(expected = MojoExecutionException.class) - @SuppressWarnings("deprecation") public void testMalformedURLExceptionThrowsMojoExecutionException() throws Exception { doThrow(new MalformedURLException(INTENTIONAL_EXCEPTION_MESSAGE)).when(compileTestsMojo).doCompile(anySet(), anyList(), any(File.class)); compileTestsMojo.execute(); diff --git a/src/test/java/org/codehaus/gmavenplus/mojo/ExecuteMojoTest.java b/src/test/java/org/codehaus/gmavenplus/mojo/ExecuteMojoTest.java index 134bdbe3..100f29a9 100644 --- a/src/test/java/org/codehaus/gmavenplus/mojo/ExecuteMojoTest.java +++ b/src/test/java/org/codehaus/gmavenplus/mojo/ExecuteMojoTest.java @@ -90,7 +90,9 @@ public void testScriptPath() throws Exception { BufferedReader reader = new BufferedReader(new FileReader(file)); actualLine = reader.readLine(); FileUtils.closeQuietly(reader); - file.delete(); + if (!file.delete()) { + System.err.println("Unable to delete " + file.getAbsolutePath()); + } } assertEquals(line, actualLine); @@ -110,7 +112,9 @@ public void testScriptURL() throws Exception { BufferedReader reader = new BufferedReader(new FileReader(file)); actualLine = reader.readLine(); FileUtils.closeQuietly(reader); - file.delete(); + if (!file.delete()) { + System.err.println("Unable to delete " + file.getAbsolutePath()); + } } assertEquals(line, actualLine); diff --git a/src/test/java/org/codehaus/gmavenplus/mojo/GenerateStubsMojoTest.java b/src/test/java/org/codehaus/gmavenplus/mojo/GenerateStubsMojoTest.java index 331d4d88..7b1e3094 100644 --- a/src/test/java/org/codehaus/gmavenplus/mojo/GenerateStubsMojoTest.java +++ b/src/test/java/org/codehaus/gmavenplus/mojo/GenerateStubsMojoTest.java @@ -60,7 +60,6 @@ public void setup() { } @Test - @SuppressWarnings("deprecation") public void testCallsExpectedMethods() throws Exception { doReturn(true).when(generateStubsMojo).groovyVersionSupportsAction(); doNothing().when(generateStubsMojo).doStubGeneration(anySet(), anyList(), any(File.class)); @@ -69,7 +68,6 @@ public void testCallsExpectedMethods() throws Exception { } @Test(expected = MojoExecutionException.class) - @SuppressWarnings("deprecation") public void testClassNotFoundExceptionThrowsMojoExecutionException() throws Exception { doReturn(true).when(generateStubsMojo).groovyVersionSupportsAction(); doThrow(new ClassNotFoundException(INTENTIONAL_EXCEPTION_MESSAGE)).when(generateStubsMojo).doStubGeneration(anySet(), anyList(), any(File.class)); @@ -77,7 +75,6 @@ public void testClassNotFoundExceptionThrowsMojoExecutionException() throws Exce } @Test(expected = MojoExecutionException.class) - @SuppressWarnings("deprecation") public void testInvocationTargetExceptionThrowsMojoExecutionException() throws Exception { doReturn(true).when(generateStubsMojo).groovyVersionSupportsAction(); doThrow(new InvocationTargetException(mock(Exception.class), INTENTIONAL_EXCEPTION_MESSAGE)).when(generateStubsMojo).doStubGeneration(anySet(), anyList(), any(File.class)); @@ -85,7 +82,6 @@ public void testInvocationTargetExceptionThrowsMojoExecutionException() throws E } @Test(expected = MojoExecutionException.class) - @SuppressWarnings("deprecation") public void testInstantiationExceptionThrowsMojoExecutionException() throws Exception { doReturn(true).when(generateStubsMojo).groovyVersionSupportsAction(); doThrow(new InstantiationException(INTENTIONAL_EXCEPTION_MESSAGE)).when(generateStubsMojo).doStubGeneration(anySet(), anyList(), any(File.class)); @@ -93,7 +89,6 @@ public void testInstantiationExceptionThrowsMojoExecutionException() throws Exce } @Test(expected = MojoExecutionException.class) - @SuppressWarnings("deprecation") public void testIllegalAccessExceptionThrowsMojoExecutionException() throws Exception { doReturn(true).when(generateStubsMojo).groovyVersionSupportsAction(); doThrow(new IllegalAccessException(INTENTIONAL_EXCEPTION_MESSAGE)).when(generateStubsMojo).doStubGeneration(anySet(), anyList(), any(File.class)); @@ -107,7 +102,6 @@ public void testDependencyResolutionRequiredExceptionThrowsMojoExecutionExceptio } @Test(expected = MojoExecutionException.class) - @SuppressWarnings("deprecation") public void testMalformedURLExceptionThrowsMojoExecutionException() throws Exception { doReturn(true).when(generateStubsMojo).groovyVersionSupportsAction(); doThrow(new MalformedURLException(INTENTIONAL_EXCEPTION_MESSAGE)).when(generateStubsMojo).doStubGeneration(anySet(), anyList(), any(File.class)); diff --git a/src/test/java/org/codehaus/gmavenplus/mojo/GenerateTestStubsMojoTest.java b/src/test/java/org/codehaus/gmavenplus/mojo/GenerateTestStubsMojoTest.java index 0c154813..0c627be0 100644 --- a/src/test/java/org/codehaus/gmavenplus/mojo/GenerateTestStubsMojoTest.java +++ b/src/test/java/org/codehaus/gmavenplus/mojo/GenerateTestStubsMojoTest.java @@ -60,7 +60,6 @@ public void setup() { } @Test - @SuppressWarnings("deprecation") public void testCallsExpectedMethods() throws Exception { doReturn(true).when(generateTestStubsMojo).groovyVersionSupportsAction(); doNothing().when(generateTestStubsMojo).doStubGeneration(anySet(), anyList(), any(File.class)); @@ -69,7 +68,6 @@ public void testCallsExpectedMethods() throws Exception { } @Test - @SuppressWarnings("deprecation") public void testSkipped() throws Exception { doReturn(true).when(generateTestStubsMojo).groovyVersionSupportsAction(); generateTestStubsMojo.skipTests = true; @@ -78,7 +76,6 @@ public void testSkipped() throws Exception { } @Test(expected = MojoExecutionException.class) - @SuppressWarnings("deprecation") public void testClassNotFoundExceptionThrowsMojoExecutionException() throws Exception { doReturn(true).when(generateTestStubsMojo).groovyVersionSupportsAction(); doThrow(new ClassNotFoundException(INTENTIONAL_EXCEPTION_MESSAGE)).when(generateTestStubsMojo).doStubGeneration(anySet(), anyList(), any(File.class)); @@ -86,7 +83,6 @@ public void testClassNotFoundExceptionThrowsMojoExecutionException() throws Exce } @Test(expected = MojoExecutionException.class) - @SuppressWarnings("deprecation") public void testInvocationTargetExceptionThrowsMojoExecutionException() throws Exception { doReturn(true).when(generateTestStubsMojo).groovyVersionSupportsAction(); doThrow(new InvocationTargetException(mock(Exception.class), INTENTIONAL_EXCEPTION_MESSAGE)).when(generateTestStubsMojo).doStubGeneration(anySet(), anyList(), any(File.class)); @@ -94,7 +90,6 @@ public void testInvocationTargetExceptionThrowsMojoExecutionException() throws E } @Test(expected = MojoExecutionException.class) - @SuppressWarnings("deprecation") public void testInstantiationExceptionThrowsMojoExecutionException() throws Exception { doReturn(true).when(generateTestStubsMojo).groovyVersionSupportsAction(); doThrow(new InstantiationException(INTENTIONAL_EXCEPTION_MESSAGE)).when(generateTestStubsMojo).doStubGeneration(anySet(), anyList(), any(File.class)); @@ -102,7 +97,6 @@ public void testInstantiationExceptionThrowsMojoExecutionException() throws Exce } @Test(expected = MojoExecutionException.class) - @SuppressWarnings("deprecation") public void testIllegalAccessExceptionThrowsMojoExecutionException() throws Exception { doReturn(true).when(generateTestStubsMojo).groovyVersionSupportsAction(); doThrow(new IllegalAccessException(INTENTIONAL_EXCEPTION_MESSAGE)).when(generateTestStubsMojo).doStubGeneration(anySet(), anyList(), any(File.class)); @@ -116,7 +110,6 @@ public void testDependencyResolutionRequiredExceptionThrowsMojoExecutionExceptio } @Test(expected = MojoExecutionException.class) - @SuppressWarnings("deprecation") public void testMalformedURLExceptionThrowsMojoExecutionException() throws Exception { doReturn(true).when(generateTestStubsMojo).groovyVersionSupportsAction(); doThrow(new MalformedURLException(INTENTIONAL_EXCEPTION_MESSAGE)).when(generateTestStubsMojo).doStubGeneration(anySet(), anyList(), any(File.class));