This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch unused
in repository https://gitbox.apache.org/repos/asf/maven-ejb-plugin.git
The following commit(s) were added to refs/heads/unused by this push:
new dbae3be redundant code
dbae3be is described below
commit dbae3be4dd430e6511de6d16ee8653b8ca1ba70f
Author: Elliotte Rusty Harold <[email protected]>
AuthorDate: Sun Nov 16 07:59:53 2025 -0600
redundant code
---
.../apache/maven/plugins/ejb/IncludesExcludes.java | 2 +-
.../org/apache/maven/plugins/ejb/EjbMojoTest.java | 2 +-
.../maven/plugins/ejb/IncludesExcludesTest.java | 20 ++++++------
.../plugins/ejb/stub/MavenProjectBasicStub.java | 24 ++++----------
.../plugins/ejb/stub/MavenProjectBuildStub.java | 6 +---
.../ejb/stub/MavenProjectResourcesStub.java | 38 ----------------------
6 files changed, 20 insertions(+), 72 deletions(-)
diff --git a/src/main/java/org/apache/maven/plugins/ejb/IncludesExcludes.java
b/src/main/java/org/apache/maven/plugins/ejb/IncludesExcludes.java
index 0026d37..7d21d89 100644
--- a/src/main/java/org/apache/maven/plugins/ejb/IncludesExcludes.java
+++ b/src/main/java/org/apache/maven/plugins/ejb/IncludesExcludes.java
@@ -59,7 +59,7 @@ public class IncludesExcludes {
private List<String> makeNonNullList(List<String> in) {
if (in == null) {
- return Collections.<String>emptyList();
+ return Collections.emptyList();
} else {
return in;
}
diff --git a/src/test/java/org/apache/maven/plugins/ejb/EjbMojoTest.java
b/src/test/java/org/apache/maven/plugins/ejb/EjbMojoTest.java
index 693a5da..4382287 100644
--- a/src/test/java/org/apache/maven/plugins/ejb/EjbMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/ejb/EjbMojoTest.java
@@ -518,7 +518,7 @@ public class EjbMojoTest extends AbstractMojoTestCase {
protected EjbMojo lookupMojo() throws Exception {
File pomFile = new File(getBasedir(), DEFAULT_POM_PATH);
- EjbMojo mojo = (EjbMojo) lookupMojo("ejb", pomFile);
+ EjbMojo mojo = lookupMojo("ejb", pomFile);
assertNotNull(mojo);
diff --git
a/src/test/java/org/apache/maven/plugins/ejb/IncludesExcludesTest.java
b/src/test/java/org/apache/maven/plugins/ejb/IncludesExcludesTest.java
index 1930c0c..545c9c6 100644
--- a/src/test/java/org/apache/maven/plugins/ejb/IncludesExcludesTest.java
+++ b/src/test/java/org/apache/maven/plugins/ejb/IncludesExcludesTest.java
@@ -30,8 +30,8 @@ public class IncludesExcludesTest {
@Test
public void emptyListsShouldResultInZeroSizeResults() {
IncludesExcludes ie = new IncludesExcludes(
- Collections.<String>emptyList(),
Collections.<String>emptyList(),
- Collections.<String>emptyList(),
Collections.<String>emptyList());
+ Collections.emptyList(), Collections.<String>emptyList(),
+ Collections.emptyList(), Collections.<String>emptyList());
assertArrayEquals(new String[0], ie.resultingIncludes());
assertArrayEquals(new String[0], ie.resultingExcludes());
@@ -41,9 +41,9 @@ public class IncludesExcludesTest {
public void nullForIncludesShouldResultInZeroSizeResults() {
IncludesExcludes ie = new IncludesExcludes(
null,
- Collections.<String>emptyList(),
- Collections.<String>emptyList(),
- Collections.<String>emptyList());
+ Collections.emptyList(),
+ Collections.emptyList(),
+ Collections.emptyList());
assertArrayEquals(new String[0], ie.resultingIncludes());
assertArrayEquals(new String[0], ie.resultingExcludes());
@@ -52,10 +52,10 @@ public class IncludesExcludesTest {
@Test
public void nullForExcludesShouldResultInZeroSizeResults() {
IncludesExcludes ie = new IncludesExcludes(
- Collections.<String>emptyList(),
+ Collections.emptyList(),
null,
- Collections.<String>emptyList(),
- Collections.<String>emptyList());
+ Collections.emptyList(),
+ Collections.emptyList());
assertArrayEquals(new String[0], ie.resultingIncludes());
assertArrayEquals(new String[0], ie.resultingExcludes());
@@ -64,7 +64,7 @@ public class IncludesExcludesTest {
@Test
public void
nonNullForDefaultExcludesShouldResultInExcludesWithDefaultExcludes() {
IncludesExcludes ie =
- new IncludesExcludes(null, null,
Collections.<String>emptyList(), Arrays.asList("**/package.html"));
+ new IncludesExcludes(null, null, Collections.emptyList(),
Arrays.asList("**/package.html"));
assertArrayEquals(new String[0], ie.resultingIncludes());
assertArrayEquals(new String[] {"**/package.html"},
ie.resultingExcludes());
@@ -73,7 +73,7 @@ public class IncludesExcludesTest {
@Test
public void
nonNullForDefaultIncludesShouldResultInIncludesWithDefaultIncludes() {
IncludesExcludes ie =
- new IncludesExcludes(null, null,
Arrays.asList("**/package.html"), Collections.<String>emptyList());
+ new IncludesExcludes(null, null,
Arrays.asList("**/package.html"), Collections.emptyList());
assertArrayEquals(new String[] {"**/package.html"},
ie.resultingIncludes());
assertArrayEquals(new String[0], ie.resultingExcludes());
diff --git
a/src/test/java/org/apache/maven/plugins/ejb/stub/MavenProjectBasicStub.java
b/src/test/java/org/apache/maven/plugins/ejb/stub/MavenProjectBasicStub.java
index f5f30ba..f09c542 100644
--- a/src/test/java/org/apache/maven/plugins/ejb/stub/MavenProjectBasicStub.java
+++ b/src/test/java/org/apache/maven/plugins/ejb/stub/MavenProjectBasicStub.java
@@ -45,8 +45,6 @@ public class MavenProjectBasicStub extends MavenProject {
protected ModelStub model;
- protected File file;
-
protected DefaultArtifact artifact;
public MavenProjectBasicStub(String id) throws Exception {
@@ -113,18 +111,10 @@ public class MavenProjectBasicStub extends MavenProject {
return getModel().getArtifactId();
}
- public String getPackaging() {
- return "ejb";
- }
-
public String getVersion() {
return identifier;
}
- public void addProperty(String key, String value) {
- properties.put(key, value);
- }
-
public Properties getProperties() {
return properties;
}
@@ -133,13 +123,13 @@ public class MavenProjectBasicStub extends MavenProject {
private void initializeParentFields() {
// the pom should be located in the isolated dummy root
super.setFile(new File(getBasedir(), "pom.xml"));
- super.setDependencyArtifacts(Collections.<Artifact>emptySet());
- super.setArtifacts(Collections.<Artifact>emptySet());
- super.setExtensionArtifacts(Collections.<Artifact>emptySet());
-
super.setRemoteArtifactRepositories(Collections.<ArtifactRepository>emptyList());
-
super.setPluginArtifactRepositories(Collections.<ArtifactRepository>emptyList());
- super.setCollectedProjects(Collections.<MavenProject>emptyList());
- super.setActiveProfiles(Collections.<Profile>emptyList());
+ super.setDependencyArtifacts(Collections.emptySet());
+ super.setArtifacts(Collections.emptySet());
+ super.setExtensionArtifacts(Collections.emptySet());
+ super.setRemoteArtifactRepositories(Collections.emptyList());
+ super.setPluginArtifactRepositories(Collections.emptyList());
+ super.setCollectedProjects(Collections.emptyList());
+ super.setActiveProfiles(Collections.emptyList());
super.setOriginalModel(null);
super.setExecutionProject(this);
super.setArtifact(artifact);
diff --git
a/src/test/java/org/apache/maven/plugins/ejb/stub/MavenProjectBuildStub.java
b/src/test/java/org/apache/maven/plugins/ejb/stub/MavenProjectBuildStub.java
index 7b8b871..b5bc7b5 100644
--- a/src/test/java/org/apache/maven/plugins/ejb/stub/MavenProjectBuildStub.java
+++ b/src/test/java/org/apache/maven/plugins/ejb/stub/MavenProjectBuildStub.java
@@ -94,10 +94,6 @@ public class MavenProjectBuildStub extends
MavenProjectBasicStub {
return outputDirectory;
}
- public String getTestOutputDirectory() {
- return testOutputDirectory;
- }
-
public Build getBuild() {
return build;
}
@@ -245,7 +241,7 @@ public class MavenProjectBuildStub extends
MavenProjectBasicStub {
private void populateFile(File file, int type) {
FileOutputStream outputStream;
- String data = (String) dataMap.get(file.getName());
+ String data = dataMap.get(file.getName());
if ((data != null) && file.exists()) {
try {
diff --git
a/src/test/java/org/apache/maven/plugins/ejb/stub/MavenProjectResourcesStub.java
b/src/test/java/org/apache/maven/plugins/ejb/stub/MavenProjectResourcesStub.java
index 654c7f0..b2c8176 100644
---
a/src/test/java/org/apache/maven/plugins/ejb/stub/MavenProjectResourcesStub.java
+++
b/src/test/java/org/apache/maven/plugins/ejb/stub/MavenProjectResourcesStub.java
@@ -31,44 +31,6 @@ public class MavenProjectResourcesStub extends
MavenProjectBuildStub {
setupTestResources();
}
- public void addInclude(String pattern) {
- ((Resource) build.getResources().get(0)).addInclude(pattern);
- }
-
- public void addExclude(String pattern) {
- ((Resource) build.getResources().get(0)).addExclude(pattern);
- }
-
- public void addTestInclude(String pattern) {
- ((Resource) build.getTestResources().get(0)).addInclude(pattern);
- }
-
- public void addTestExclude(String pattern) {
- ((Resource) build.getTestResources().get(0)).addExclude(pattern);
- }
-
- public void setTargetPath(String path) {
- ((Resource) build.getResources().get(0)).setTargetPath(path);
- }
-
- public void setTestTargetPath(String path) {
- ((Resource) build.getTestResources().get(0)).setTargetPath(path);
- }
-
- public void setDirectory(String dir) {
- ((Resource) build.getResources().get(0)).setDirectory(dir);
- }
-
- public void setTestDirectory(String dir) {
- ((Resource) build.getTestResources().get(0)).setDirectory(dir);
- }
-
- public void setResourceFiltering(int nIndex, boolean filter) {
- if (build.getResources().size() > nIndex) {
- ((Resource) build.getResources().get(nIndex)).setFiltering(filter);
- }
- }
-
private void setupResources() {
Resource resource = new Resource();
