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 @@ private static String[] resultingXcludes(List currentXcludes, List makeNonNullList(List in) { if (in == null) { - return Collections.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 void testEjb4VersionValidation() throws MojoExecutionException { 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 faf5929..e1b9610 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 @@ class IncludesExcludesTest { @Test void emptyListsShouldResultInZeroSizeResults() { IncludesExcludes ie = new IncludesExcludes( - Collections.emptyList(), Collections.emptyList(), - Collections.emptyList(), Collections.emptyList()); + Collections.emptyList(), Collections.emptyList(), + Collections.emptyList(), Collections.emptyList()); assertArrayEquals(new String[0], ie.resultingIncludes()); assertArrayEquals(new String[0], ie.resultingExcludes()); @@ -64,7 +64,7 @@ void nullForExcludesShouldResultInZeroSizeResults() { @Test void nonNullForDefaultExcludesShouldResultInExcludesWithDefaultExcludes() { IncludesExcludes ie = - new IncludesExcludes(null, null, Collections.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 @@ void nonNullForDefaultExcludesShouldResultInExcludesWithDefaultExcludes() { @Test void nonNullForDefaultIncludesShouldResultInIncludesWithDefaultIncludes() { IncludesExcludes ie = - new IncludesExcludes(null, null, Arrays.asList("**/package.html"), Collections.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..a3765b4 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 @@ -24,9 +24,7 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.DefaultArtifact; -import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.model.Model; -import org.apache.maven.model.Profile; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.util.FileUtils; @@ -45,8 +43,6 @@ public class MavenProjectBasicStub extends MavenProject { protected ModelStub model; - protected File file; - protected DefaultArtifact artifact; public MavenProjectBasicStub(String id) throws Exception { @@ -113,18 +109,10 @@ public String getArtifactId() { 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 +121,13 @@ public Properties getProperties() { private void initializeParentFields() { // the pom should be located in the isolated dummy root super.setFile(new File(getBasedir(), "pom.xml")); - 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.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 ca6eef8..d0613d6 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 @@ -45,8 +45,6 @@ public class MavenProjectBuildStub extends MavenProjectBasicStub { protected String srcDirectory; - protected String targetDirectory; - protected String buildDirectory; protected String outputDirectory; @@ -57,10 +55,6 @@ public class MavenProjectBuildStub extends MavenProjectBasicStub { protected String testResourcesDirectory; - protected String targetResourceDirectory; - - protected String targetTestResourcesDirectory; - protected List targetClassesList; protected List sourceFileList; @@ -88,17 +82,6 @@ public MavenProjectBuildStub(String key) throws Exception { model.setBuild(build); } - public void addDirectory(String name) { - if (isValidPath(name)) { - directoryList.add(name); - } - } - - public void setOutputDirectory(String dir) { - outputDirectory = buildDirectory + "/" + dir; - build.setOutputDirectory(outputDirectory); - } - public void addFile(String name, int type) { if (isValidPath(name)) { List list = getList(type); @@ -107,38 +90,16 @@ public void addFile(String name, int type) { } } - public void addFile(String name, String data, int type) { - File fileName = new File(name); - - addFile(name, type); - dataMap.put(fileName.getName(), data); - } - public String getOutputDirectory() { return outputDirectory; } - public String getTestOutputDirectory() { - return testOutputDirectory; - } - - public String getResourcesDirectory() { - return resourcesDirectory; - } - - public String getTestResourcesDirectory() { - return testResourcesDirectory; - } - public Build getBuild() { return build; } /** - * returns true if the path is relative and false if absolute also returns false if it is relative to the parent - * - * @param path - * @return + * @return true if the path is relative and false if absolute also returns false if it is relative to the parent */ private boolean isValidPath(String path) { boolean bRetVal = true; @@ -257,7 +218,7 @@ private void createFiles(String parent, int type) { if (!currentFile.exists()) { try { currentFile.createNewFile(); - populateFile(currentFile, RESOURCES_FILE); + populateFile(currentFile); } catch (IOException io) { // TODO: handle exception } @@ -278,9 +239,9 @@ private void createFiles(String parent, String testparent) { createFiles(testparent, RESOURCES_FILE); } - private void populateFile(File file, int type) { + private void populateFile(File file) { 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 MavenProjectResourcesStub(String id) throws Exception { 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();