You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2019/11/17 10:59:04 UTC
[maven-war-plugin] 03/03: fix typos
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch java7features
in repository https://gitbox.apache.org/repos/asf/maven-war-plugin.git
commit 3c8bee83d86d02f5d1b5826d323c3f729623c812
Author: Andrey Turbanov <tu...@gmail.com>
AuthorDate: Sun Nov 17 12:11:58 2019 +0300
fix typos
---
.../apache/maven/plugins/war/AbstractWarMojo.java | 20 ++++++++++----------
.../plugins/war/packaging/ClassesPackagingTask.java | 2 +-
.../plugins/war/packaging/WarPackagingContext.java | 4 ++--
.../war/packaging/WarProjectPackagingTask.java | 4 ++--
.../maven/plugins/war/util/DependencyInfo.java | 11 ++++-------
.../plugins/war/AbstractWarExplodedMojoTest.java | 2 +-
.../maven/plugins/war/WarExplodedMojoTest.java | 6 ++++--
.../org/apache/maven/plugins/war/WarMojoTest.java | 2 +-
.../plugins/war/overlay/OverlayManagerTest.java | 15 ++++++---------
.../maven/plugins/war/stub/AbstractArtifactStub.java | 4 ++--
.../maven/plugins/war/stub/WarArtifact4CCStub.java | 2 +-
11 files changed, 34 insertions(+), 38 deletions(-)
diff --git a/src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java b/src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java
index 01a736d..4894536 100644
--- a/src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java
+++ b/src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java
@@ -495,10 +495,10 @@ public abstract class AbstractWarMojo
}
catch ( MavenFilteringException e )
{
- getLog().error( "fail to build filering wrappers " + e.getMessage() );
+ getLog().error( "fail to build filtering wrappers " + e.getMessage() );
throw new MojoExecutionException( e.getMessage(), e );
}
-
+
final WarPackagingContext context =
new DefaultWarPackagingContext( webapplicationDirectory, structure, overlayManager, defaultFilterWrappers,
getNonFilteredFileExtensions(), filteringDeploymentDescriptors,
@@ -510,7 +510,7 @@ public abstract class AbstractWarMojo
{
warPackagingTask.performPackaging( context );
}
-
+
getLog().debug( "Webapp assembled in [" + ( System.currentTimeMillis() - startTime ) + " msecs]" );
}
@@ -568,7 +568,7 @@ public abstract class AbstractWarMojo
private boolean filteringDeploymentDescriptors;
- private boolean useJvmChmod = true;
+ private boolean useJvmChmod;
private final Boolean failOnMissingWebXml;
@@ -611,22 +611,22 @@ public abstract class AbstractWarMojo
}
this.useJvmChmod = useJvmChmod;
this.failOnMissingWebXml = failOnMissingWebXml;
-
+
if ( !webappDirectory.exists() )
{
- outdatedResources = Collections.emptyList();
+ outdatedResources = Collections.emptyList();
}
else if ( getWarSourceDirectory().toPath().equals( webappDirectory.toPath() ) )
{
- getLog().info( "Can't detect outdated resources when running inplace goal" );
- outdatedResources = Collections.emptyList();
+ getLog().info( "Can't detect outdated resources when running inplace goal" );
+ outdatedResources = Collections.emptyList();
}
- else
+ else
{
outdatedResources = new ArrayList<>();
try
{
- Files.walkFileTree( webappDirectory.toPath(), new SimpleFileVisitor<Path>()
+ Files.walkFileTree( webappDirectory.toPath(), new SimpleFileVisitor<Path>()
{
@Override
public FileVisitResult visitFile( Path file, BasicFileAttributes attrs )
diff --git a/src/main/java/org/apache/maven/plugins/war/packaging/ClassesPackagingTask.java b/src/main/java/org/apache/maven/plugins/war/packaging/ClassesPackagingTask.java
index 12aa782..e07cff6 100644
--- a/src/main/java/org/apache/maven/plugins/war/packaging/ClassesPackagingTask.java
+++ b/src/main/java/org/apache/maven/plugins/war/packaging/ClassesPackagingTask.java
@@ -90,7 +90,7 @@ public class ClassesPackagingTask
/**
* @param context The warPackingContext.
- * @throws MojoExecutionException In casae of an error.
+ * @throws MojoExecutionException In case of an error.
*/
protected void generateJarArchive( WarPackagingContext context )
throws MojoExecutionException
diff --git a/src/main/java/org/apache/maven/plugins/war/packaging/WarPackagingContext.java b/src/main/java/org/apache/maven/plugins/war/packaging/WarPackagingContext.java
index e85cca5..9629e5a 100644
--- a/src/main/java/org/apache/maven/plugins/war/packaging/WarPackagingContext.java
+++ b/src/main/java/org/apache/maven/plugins/war/packaging/WarPackagingContext.java
@@ -70,9 +70,9 @@ public interface WarPackagingContext
String[] getWebappSourceIncludes();
/**
- * Returns {@code true} if empty directories should be includes, othewrwise {@code false}
+ * Returns {@code true} if empty directories should be includes, otherwise {@code false}
*
- * @return {@code true} if empty directories should be includes, othewrwise {@code false}
+ * @return {@code true} if empty directories should be includes, otherwise {@code false}
*/
boolean isWebappSourceIncludeEmptyDirectories();
diff --git a/src/main/java/org/apache/maven/plugins/war/packaging/WarProjectPackagingTask.java b/src/main/java/org/apache/maven/plugins/war/packaging/WarProjectPackagingTask.java
index 03c4926..64e37de 100644
--- a/src/main/java/org/apache/maven/plugins/war/packaging/WarProjectPackagingTask.java
+++ b/src/main/java/org/apache/maven/plugins/war/packaging/WarProjectPackagingTask.java
@@ -95,7 +95,7 @@ public class WarProjectPackagingTask
handleWebResources( context );
- handeWebAppSourceDirectory( context );
+ handleWebAppSourceDirectory( context );
// Debug mode: dump the path set for the current build
PathSet pathSet = context.getWebappStructure().getStructure( "currentBuild" );
@@ -166,7 +166,7 @@ public class WarProjectPackagingTask
* @param context the packaging context
* @throws MojoExecutionException if the sources could not be copied
*/
- protected void handeWebAppSourceDirectory( WarPackagingContext context )
+ protected void handleWebAppSourceDirectory( WarPackagingContext context )
throws MojoExecutionException
{
// CHECKSTYLE_OFF: LineLength
diff --git a/src/main/java/org/apache/maven/plugins/war/util/DependencyInfo.java b/src/main/java/org/apache/maven/plugins/war/util/DependencyInfo.java
index 164487b..ff145e3 100644
--- a/src/main/java/org/apache/maven/plugins/war/util/DependencyInfo.java
+++ b/src/main/java/org/apache/maven/plugins/war/util/DependencyInfo.java
@@ -19,6 +19,8 @@ package org.apache.maven.plugins.war.util;
* under the License.
*/
+import java.util.Objects;
+
import org.apache.maven.model.Dependency;
/**
@@ -55,7 +57,7 @@ public class DependencyInfo
}
/**
- * Returns the target filen ame of the dependency. If no target file name is associated, returns <tt>null</tt>.
+ * Returns the target filename of the dependency. If no target file name is associated, returns <tt>null</tt>.
*
* @return the target file name or <tt>null</tt>
*/
@@ -90,12 +92,7 @@ public class DependencyInfo
DependencyInfo that = (DependencyInfo) o;
- if ( dependency != null ? !dependency.equals( that.dependency ) : that.dependency != null )
- {
- return false;
- }
-
- return true;
+ return Objects.equals( dependency, that.dependency );
}
/**
diff --git a/src/test/java/org/apache/maven/plugins/war/AbstractWarExplodedMojoTest.java b/src/test/java/org/apache/maven/plugins/war/AbstractWarExplodedMojoTest.java
index fc93bb5..994c470 100644
--- a/src/test/java/org/apache/maven/plugins/war/AbstractWarExplodedMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/war/AbstractWarExplodedMojoTest.java
@@ -245,7 +245,7 @@ public abstract class AbstractWarExplodedMojoTest
*
* @param dir the base directory
* @param filter the filter
- * @param content the current content, updated recursivly
+ * @param content the current content, updated recursively
*/
private void buildFilesList( final File dir, FileFilter filter, final List<File> content )
{
diff --git a/src/test/java/org/apache/maven/plugins/war/WarExplodedMojoTest.java b/src/test/java/org/apache/maven/plugins/war/WarExplodedMojoTest.java
index f6be401..22ff280 100644
--- a/src/test/java/org/apache/maven/plugins/war/WarExplodedMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/war/WarExplodedMojoTest.java
@@ -19,6 +19,8 @@ package org.apache.maven.plugins.war;
* under the License.
*/
+import static org.junit.Assert.assertNotEquals;
+
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.plugin.testing.stubs.ArtifactStub;
import org.apache.maven.plugins.war.stub.AarArtifactStub;
@@ -937,8 +939,8 @@ public class WarExplodedMojoTest
// 1st phase destination is older than source
// destination starts with a value of error replaced with a blank source
- assertFalse( "source files not updated with new copy: " + expectedWebSourceFile.toString(),
- "error".equals( FileUtils.fileRead( expectedWebSourceFile ) ) );
+ assertNotEquals( "source files not updated with new copy: " + expectedWebSourceFile.toString(),
+ "error", FileUtils.fileRead( expectedWebSourceFile ) );
// TODO: uncomment when lastModified problem is resolved
// FileWriter writer = new FileWriter(expectedWebSourceFile);
diff --git a/src/test/java/org/apache/maven/plugins/war/WarMojoTest.java b/src/test/java/org/apache/maven/plugins/war/WarMojoTest.java
index 5fe9b94..dd6acae 100644
--- a/src/test/java/org/apache/maven/plugins/war/WarMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/war/WarMojoTest.java
@@ -495,7 +495,7 @@ public class WarMojoTest
throws IOException
{
// Sanity check
- assertEquals( "Could not test, files and filesContent lenght does not match", files.length, filesContent.length );
+ assertEquals( "Could not test, files and filesContent length does not match", files.length, filesContent.length );
assertTrue( "war file not created: " + expectedJarFile.toString(), expectedJarFile.exists() );
final Map<String, JarEntry> jarContent = new HashMap<>();
diff --git a/src/test/java/org/apache/maven/plugins/war/overlay/OverlayManagerTest.java b/src/test/java/org/apache/maven/plugins/war/overlay/OverlayManagerTest.java
index 606a228..c46f2e4 100644
--- a/src/test/java/org/apache/maven/plugins/war/overlay/OverlayManagerTest.java
+++ b/src/test/java/org/apache/maven/plugins/war/overlay/OverlayManagerTest.java
@@ -24,9 +24,6 @@ import static org.apache.maven.plugins.war.Overlay.DEFAULT_EXCLUDES;
import org.apache.maven.plugin.testing.stubs.ArtifactStub;
import org.apache.maven.plugins.war.Overlay;
-import org.apache.maven.plugins.war.overlay.DefaultOverlay;
-import org.apache.maven.plugins.war.overlay.InvalidOverlayConfigurationException;
-import org.apache.maven.plugins.war.overlay.OverlayManager;
import org.apache.maven.plugins.war.stub.MavenProjectArtifactsStub;
import org.apache.maven.plugins.war.stub.WarArtifactStub;
import org.codehaus.plexus.PlexusTestCase;
@@ -50,12 +47,12 @@ public class OverlayManagerTest
final List<Overlay> overlays = new ArrayList<>();
try
{
- final Overlay currentProjectOVerlay = Overlay.createInstance();
+ final Overlay currentProjectOverlay = Overlay.createInstance();
OverlayManager manager = new OverlayManager( overlays, project, DEFAULT_INCLUDES, DEFAULT_EXCLUDES,
- currentProjectOVerlay );
+ currentProjectOverlay );
assertNotNull( manager.getOverlays() );
assertEquals( 1, manager.getOverlays().size() );
- assertEquals( currentProjectOVerlay, manager.getOverlays().get( 0 ) );
+ assertEquals( currentProjectOverlay, manager.getOverlays().get( 0 ) );
}
catch ( InvalidOverlayConfigurationException e )
{
@@ -119,7 +116,7 @@ public class OverlayManagerTest
}
}
- public void testUnknonwnOverlay()
+ public void testUnknownOverlay()
throws Exception
{
@@ -132,8 +129,8 @@ public class OverlayManagerTest
try
{
- final Overlay currentProjectOVerlay = Overlay.createInstance();
- new OverlayManager( overlays, project, DEFAULT_INCLUDES, DEFAULT_EXCLUDES, currentProjectOVerlay );
+ final Overlay currentProjectOverlay = Overlay.createInstance();
+ new OverlayManager( overlays, project, DEFAULT_INCLUDES, DEFAULT_EXCLUDES, currentProjectOverlay );
fail( "Should have failed to validate an unknown overlay" );
}
catch ( InvalidOverlayConfigurationException e )
diff --git a/src/test/java/org/apache/maven/plugins/war/stub/AbstractArtifactStub.java b/src/test/java/org/apache/maven/plugins/war/stub/AbstractArtifactStub.java
index 0afcc31..de6890e 100644
--- a/src/test/java/org/apache/maven/plugins/war/stub/AbstractArtifactStub.java
+++ b/src/test/java/org/apache/maven/plugins/war/stub/AbstractArtifactStub.java
@@ -67,7 +67,7 @@ public abstract class AbstractArtifactStub
}
/*
- * TODO: Coppied from org/apache/maven/artifact/DefaultArtifact.java; Consider merging...
+ * TODO: Copied from org/apache/maven/artifact/DefaultArtifact.java; Consider merging...
*/
public int compareTo( Artifact a )
{
@@ -121,7 +121,7 @@ public abstract class AbstractArtifactStub
}
/*
- * TODO: Coppied from org/apache/maven/artifact/DefaultArtifact.java; Consider merging...
+ * TODO: Copied from org/apache/maven/artifact/DefaultArtifact.java; Consider merging...
*/
public boolean equals( Object o )
{
diff --git a/src/test/java/org/apache/maven/plugins/war/stub/WarArtifact4CCStub.java b/src/test/java/org/apache/maven/plugins/war/stub/WarArtifact4CCStub.java
index ed54297..c2b05b2 100644
--- a/src/test/java/org/apache/maven/plugins/war/stub/WarArtifact4CCStub.java
+++ b/src/test/java/org/apache/maven/plugins/war/stub/WarArtifact4CCStub.java
@@ -25,7 +25,7 @@ import org.apache.maven.artifact.versioning.VersionRange;
/**
* stub for copy constructor
- * to preven the copy constructor frow blowing up
+ * to prevent the copy constructor from blowing up
*/
public class WarArtifact4CCStub
extends WarArtifactStub