Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove redundant type arguments. #212

Merged
merged 1 commit into from
Aug 9, 2023
Merged

Remove redundant type arguments. #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions org.eclipse.m2e.tests/src/org/eclipse/m2e/tests/builder/EclipseBuildContextTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,11 @@
import java.util.HashMap;
import java.util.List;

import org.junit.Test;

import org.eclipse.core.resources.IProject;

import org.codehaus.plexus.util.Scanner;

import org.eclipse.core.resources.IProject;
import org.eclipse.m2e.core.internal.builder.plexusbuildapi.EclipseBuildContext;
import org.eclipse.m2e.tests.common.AbstractMavenProjectTestCase;
import org.junit.Test;

public class EclipseBuildContextTest extends AbstractMavenProjectTestCase {
@Test
Expand All @@ -46,7 +43,7 @@ public void testScanner() throws Exception {
}

private EclipseBuildContext newBuildContext(IProject project) {
return new EclipseBuildContext(project, new HashMap<String, Object>(), new DummyBuildResultCollector());
return new EclipseBuildContext(project, new HashMap<>(), new DummyBuildResultCollector());
}

private void checkScanner(Scanner scanner) {
Expand Down
9 changes: 3 additions & 6 deletions ...lipse.m2e.tests/src/org/eclipse/m2e/tests/builder/EclipseIncrementalBuildContextTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,12 @@
import java.util.HashMap;
import java.util.List;

import org.junit.Test;

import org.eclipse.core.resources.IProject;

import org.codehaus.plexus.util.Scanner;

import org.eclipse.core.resources.IProject;
import org.eclipse.m2e.core.internal.builder.plexusbuildapi.EclipseIncrementalBuildContext;
import org.eclipse.m2e.tests.common.AbstractMavenProjectTestCase;
import org.eclipse.m2e.tests.mocks.ResourceDeltaStub;
import org.junit.Test;


public class EclipseIncrementalBuildContextTest extends AbstractMavenProjectTestCase {
Expand Down Expand Up @@ -58,7 +55,7 @@ public void testScanner() throws Exception {
}

private EclipseIncrementalBuildContext newBuildContext(ResourceDeltaStub delta) {
return new EclipseIncrementalBuildContext(delta, new HashMap<String, Object>(), new DummyBuildResultCollector());
return new EclipseIncrementalBuildContext(delta, new HashMap<>(), new DummyBuildResultCollector());
}

private void checkResourcesScanner(Scanner scanner) {
Expand Down
14 changes: 6 additions & 8 deletions org.eclipse.m2e.tests/src/org/eclipse/m2e/tests/discovery/MavenDiscoveryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@
import java.util.Collections;
import java.util.List;

import org.junit.After;
import org.junit.Before;
import org.junit.Test;

import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.equinox.internal.p2.discovery.AbstractCatalogSource;
import org.eclipse.equinox.internal.p2.discovery.Catalog;
Expand All @@ -39,13 +35,15 @@
import org.eclipse.jface.operation.IRunnableContext;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.window.IShellProvider;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.internal.Workbench;

import org.eclipse.m2e.core.project.configurator.MojoExecutionKey;
import org.eclipse.m2e.internal.discovery.MavenDiscovery;
import org.eclipse.m2e.internal.discovery.wizards.MavenCatalogConfiguration;
import org.eclipse.m2e.internal.discovery.wizards.MavenCatalogViewer;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.internal.Workbench;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;


public class MavenDiscoveryTest implements IShellProvider {
Expand Down Expand Up @@ -277,7 +275,7 @@ public Object getId() {
item.setId("id");

List<String> configurators = new ArrayList<>();
MavenDiscovery.getProvidedProjectConfigurators(item, configurators, new ArrayList<String>());
MavenDiscovery.getProvidedProjectConfigurators(item, configurators, new ArrayList<>());

assertEquals(1, configurators.size());
assertEquals("LifecycleMappingTest.projectConfigurator", configurators.get(0));
Expand Down
Loading