From e3794059b1250729872daecf9c1ff0b35fc75daf Mon Sep 17 00:00:00 2001 From: Michael Keppler Date: Fri, 2 Dec 2022 20:48:45 +0100 Subject: [PATCH] fix several Java warnings * silence unchecked casts with generics * replace Maven FileUtils by Apache IO FileUtils (in test) * silence "discouraged reference" warning in tests * silence overridden deprecated method warning * remove unused variables, imports and exception declarations --- .../AbstractBinaryProjectsImportJob.java | 1 - org.eclipse.m2e.core.tests/META-INF/MANIFEST.MF | 3 ++- .../src/org/eclipse/m2e/core/MavenBugsTest.java | 10 +++++----- .../project/registry/MemoryConsumptionTest.java | 3 +-- .../.settings/org.eclipse.jdt.core.prefs | 2 +- .../m2e/core/internal/embedder/MavenImpl.java | 6 +++--- .../LifecycleMappingFactory.java | 1 - .../project/registry/ProjectRegistryManager.java | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 1 + .../eclipse/m2e/editor/tests/M2EEditorTest.java | 1 - .../editor/dialogs/ManageDependenciesDialog.java | 1 + .../m2e/editor/pom/PomHyperlinkDetector.java | 14 ++++---------- .../m2e/editor/pom/PomTemplateContext.java | 16 ++++++++-------- .../edit/pom/translators/ModelObjectAdapter.java | 4 +++- 14 files changed, 30 insertions(+), 35 deletions(-) diff --git a/org.eclipse.m2e.binaryproject/src/org/eclipse/m2e/binaryproject/internal/AbstractBinaryProjectsImportJob.java b/org.eclipse.m2e.binaryproject/src/org/eclipse/m2e/binaryproject/internal/AbstractBinaryProjectsImportJob.java index 4478f6ce3..231149a9f 100644 --- a/org.eclipse.m2e.binaryproject/src/org/eclipse/m2e/binaryproject/internal/AbstractBinaryProjectsImportJob.java +++ b/org.eclipse.m2e.binaryproject/src/org/eclipse/m2e/binaryproject/internal/AbstractBinaryProjectsImportJob.java @@ -18,7 +18,6 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.jobs.Job; import org.eclipse.m2e.core.embedder.ArtifactKey; import org.eclipse.m2e.core.internal.jobs.MavenJob; diff --git a/org.eclipse.m2e.core.tests/META-INF/MANIFEST.MF b/org.eclipse.m2e.core.tests/META-INF/MANIFEST.MF index d256b2bd5..6b14c50a6 100644 --- a/org.eclipse.m2e.core.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.core.tests/META-INF/MANIFEST.MF @@ -11,6 +11,7 @@ Require-Bundle: org.eclipse.m2e.tests.common, org.eclipse.core.resources, org.eclipse.core.runtime, org.eclipse.m2e.maven.runtime -Import-Package: javax.annotation;version="1.2.0" +Import-Package: javax.annotation;version="1.2.0", + org.apache.commons.io Eclipse-BundleShape: dir Automatic-Module-Name: org.eclipse.m2e.core.tests diff --git a/org.eclipse.m2e.core.tests/src/org/eclipse/m2e/core/MavenBugsTest.java b/org.eclipse.m2e.core.tests/src/org/eclipse/m2e/core/MavenBugsTest.java index 5f6f2eb47..d962479c3 100644 --- a/org.eclipse.m2e.core.tests/src/org/eclipse/m2e/core/MavenBugsTest.java +++ b/org.eclipse.m2e.core.tests/src/org/eclipse/m2e/core/MavenBugsTest.java @@ -22,11 +22,11 @@ import java.util.Arrays; import java.util.List; +import org.apache.commons.io.FileUtils; import org.apache.maven.execution.MavenExecutionResult; import org.apache.maven.execution.MavenSession; import org.apache.maven.project.MavenProject; import org.apache.maven.project.ProjectBuildingRequest; -import org.apache.maven.shared.utils.io.FileUtils; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IProject; @@ -62,7 +62,7 @@ public void testMNG6530() throws Exception { FileLocator.toFileURL(getClass().getResource("/resources/projects/testMNG6530")).toURI()); File tempDirectory = Files.createTempDirectory(getClass().getSimpleName()).toFile(); try { - FileUtils.copyDirectoryStructure(sourceDirectory, tempDirectory); + FileUtils.copyDirectory(sourceDirectory, tempDirectory); List toImport = new ArrayList<>(2); toImport.add(new MavenProjectInfo("", new File(tempDirectory, "pom.xml"), null, null)); toImport.add(new MavenProjectInfo("", new File(tempDirectory, "child/pom.xml"), null, null)); @@ -75,11 +75,11 @@ public void testMNG6530() throws Exception { IMavenProjectFacade childFacade = MavenPlugin.getMavenProjectRegistry().getProject(child); MavenProject mavenProject = childFacade.getMavenProject(new NullProgressMonitor()); assertEquals("bar", mavenProject.getProperties().get("foo")); - + IFile pomXml = parent.getFile("pom.xml"); String content = Files.readString(Path.of(pomXml.getLocationURI())).replace("bar", "lol"); pomXml.setContents(new ByteArrayInputStream(content.getBytes()), true, false, null); - + MavenPlugin.getProjectConfigurationManager().updateProjectConfiguration(child, monitor); waitForJobsToComplete(); mavenProject = childFacade.getMavenProject(monitor); @@ -100,7 +100,7 @@ public void testMultiModuleProjectDirectoryChild() throws Exception { IMavenProjectFacade facade = MavenPluginActivator.getDefault().getMavenProjectManagerImpl().create(project.getFile("child/pom.xml"), true, monitor); Assert.assertNotNull(facade); - File[] multiModuleDirectory = new File[] { null }; + File[] multiModuleDirectory = new File[] { null }; facade.createExecutionContext().execute((context, monitor) -> multiModuleDirectory[0] = context.getExecutionRequest().getMultiModuleProjectDirectory(), null); assertEquals(project.getLocation().toFile(), multiModuleDirectory[0]); } diff --git a/org.eclipse.m2e.core.tests/src/org/eclipse/m2e/core/internal/project/registry/MemoryConsumptionTest.java b/org.eclipse.m2e.core.tests/src/org/eclipse/m2e/core/internal/project/registry/MemoryConsumptionTest.java index 87b75935d..afaf298c3 100644 --- a/org.eclipse.m2e.core.tests/src/org/eclipse/m2e/core/internal/project/registry/MemoryConsumptionTest.java +++ b/org.eclipse.m2e.core.tests/src/org/eclipse/m2e/core/internal/project/registry/MemoryConsumptionTest.java @@ -31,9 +31,8 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.NullProgressMonitor; - +import org.apache.commons.io.FileUtils; import org.apache.maven.project.MavenProject; -import org.apache.maven.shared.utils.io.FileUtils; import org.eclipse.m2e.core.MavenPlugin; import org.eclipse.m2e.core.internal.IMavenConstants; diff --git a/org.eclipse.m2e.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.core/.settings/org.eclipse.jdt.core.prefs index 6a2a57cc5..696a7c3b8 100644 --- a/org.eclipse.m2e.core/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.core/.settings/org.eclipse.jdt.core.prefs @@ -46,7 +46,7 @@ org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning org.eclipse.jdt.core.compiler.problem.deprecation=warning org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenImpl.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenImpl.java index a064c1e86..0c0bd0dd3 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenImpl.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenImpl.java @@ -396,7 +396,7 @@ public Server decryptPassword(Server server) throws CoreException { @Override public void mavenConfigurationChange(MavenConfigurationChangeEvent event) throws CoreException { - if(MavenConfigurationChangeEvent.P_USER_SETTINGS_FILE.equals(event.key()) + if(MavenPreferenceConstants.P_USER_SETTINGS_FILE.equals(event.key()) || MavenPreferenceConstants.P_GLOBAL_SETTINGS_FILE.equals(event.key())) { reloadSettings(); } @@ -486,7 +486,7 @@ public Map readMavenProjects(Collection pomFil @Deprecated @Override - public void detachFromSession(MavenProject project) throws CoreException { + public void detachFromSession(MavenProject project) { //noop now } @@ -757,7 +757,7 @@ public T getMojoParameterValue(MavenProject project, MojoExecution mojoExecu * Resolves a nested configuration parameter from the given {@code mojoExecution}. It coerces from String to the given * type and considers expressions and default values. Deliberately no public API yet as probably refactored in the * near future. - * + * * @param * @param project the Maven project * @param mojoExecution the mojo execution from which to retrieve the configuration value diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingFactory.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingFactory.java index 42a7ce055..b0485c6ad 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingFactory.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/lifecyclemapping/LifecycleMappingFactory.java @@ -859,7 +859,6 @@ private static boolean isPomMapping(IPluginExecutionMetadata metadata) { */ public static List getPomMappingMetadataSources(MavenProject mavenProject, IProgressMonitor monitor) throws CoreException { - IMaven maven = MavenPlugin.getMaven(); List sources = new ArrayList<>(); diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/registry/ProjectRegistryManager.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/registry/ProjectRegistryManager.java index 17138fbf8..254d0473d 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/registry/ProjectRegistryManager.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/registry/ProjectRegistryManager.java @@ -981,7 +981,7 @@ MutableProjectRegistry newMutableProjectRegistry() { * @throws StaleMutableProjectRegistryException if primary project registry was modified after mutable registry has * been created */ - void applyMutableProjectRegistry(MutableProjectRegistry newState, IProgressMonitor monitor) throws CoreException { + void applyMutableProjectRegistry(MutableProjectRegistry newState, IProgressMonitor monitor) { List events = projectRegistry.apply(newState); //stateReader.writeWorkspaceState(projectRegistry); notifyProjectChangeListeners(events, monitor); diff --git a/org.eclipse.m2e.editor.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.m2e.editor.tests/.settings/org.eclipse.jdt.core.prefs index d4540a53f..00a1fd4d0 100644 --- a/org.eclipse.m2e.editor.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.m2e.editor.tests/.settings/org.eclipse.jdt.core.prefs @@ -3,6 +3,7 @@ org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning diff --git a/org.eclipse.m2e.editor.tests/src/org/eclipse/m2e/editor/tests/M2EEditorTest.java b/org.eclipse.m2e.editor.tests/src/org/eclipse/m2e/editor/tests/M2EEditorTest.java index 201149b5b..39aa66db4 100644 --- a/org.eclipse.m2e.editor.tests/src/org/eclipse/m2e/editor/tests/M2EEditorTest.java +++ b/org.eclipse.m2e.editor.tests/src/org/eclipse/m2e/editor/tests/M2EEditorTest.java @@ -45,7 +45,6 @@ import org.eclipse.ui.texteditor.ITextEditor; import org.junit.Test; -@SuppressWarnings("restriction") public class M2EEditorTest extends AbstractMavenProjectTestCase { @Test diff --git a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/dialogs/ManageDependenciesDialog.java b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/dialogs/ManageDependenciesDialog.java index 90e9be58c..d4df344c6 100644 --- a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/dialogs/ManageDependenciesDialog.java +++ b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/dialogs/ManageDependenciesDialog.java @@ -506,6 +506,7 @@ public Object getParent(Object element) { public Object[] getElements(Object inputElement) { if(inputElement instanceof LinkedList) { + @SuppressWarnings("unchecked") LinkedList projects = (LinkedList) inputElement; if(projects.isEmpty()) { return new Object[0]; diff --git a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/PomHyperlinkDetector.java b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/PomHyperlinkDetector.java index e81a3ff7a..0d8f82dbf 100644 --- a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/PomHyperlinkDetector.java +++ b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/PomHyperlinkDetector.java @@ -39,7 +39,6 @@ import org.eclipse.core.filesystem.EFS; import org.eclipse.core.filesystem.IFileStore; import org.eclipse.core.resources.IMarker; -import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; @@ -595,15 +594,10 @@ protected IStatus run(IProgressMonitor monitor) { String versionString = version == null ? null : XmlUtils.getTextValue(version); if(prj != null && gridString != null && artidString != null && (versionString == null || versionString.contains("${"))) { //$NON-NLS-1$ - try { - //TODO how do we decide here if the hyperlink is a dependency or a plugin - // hyperlink?? - versionString = PomTemplateContext.extractVersion(prj, null, versionString, gridString, artidString, - PomTemplateContext.EXTRACT_STRATEGY_DEPENDENCY); - - } catch(CoreException e) { - versionString = null; - } + //TODO how do we decide here if the hyperlink is a dependency or a plugin + // hyperlink?? + versionString = PomTemplateContext.extractVersion(prj, null, versionString, gridString, artidString, + PomTemplateContext.EXTRACT_STRATEGY_DEPENDENCY); } if(versionString == null) { return Status.OK_STATUS; diff --git a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/PomTemplateContext.java b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/PomTemplateContext.java index 2f8bb8b5b..1e5b3b0a9 100644 --- a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/PomTemplateContext.java +++ b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/PomTemplateContext.java @@ -313,7 +313,7 @@ protected void addTemplates(final MavenProject project, IProject eclipseprj, Col GROUP_ID("groupId") { //$NON-NLS-1$ @Override public void addTemplates(MavenProject project, IProject eclipseprj, Collection