You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2023/03/07 21:25:00 UTC
[maven-filtering] branch master updated (2c9153c -> 6e12570)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-filtering.git
from 2c9153c [MSHARED-1198] Bump plexus-utils from 3.4.2 to 3.5.1 (#69)
new f11560a [MSHARED-1199] Upgrade parent pom to 39
new 6e12570 [MSHARED-1199] Reformat
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 20 +-
.../filtering/AbstractFilterReaderLineEnding.java | 39 +-
.../filtering/AbstractMavenFilteringRequest.java | 141 +--
.../apache/maven/shared/filtering/BaseFilter.java | 279 +++--
.../maven/shared/filtering/BoundedReader.java | 46 +-
.../maven/shared/filtering/DefaultFilterInfo.java | 23 +-
.../shared/filtering/DefaultMavenFileFilter.java | 115 +-
.../shared/filtering/DefaultMavenReaderFilter.java | 58 +-
.../filtering/DefaultMavenResourcesFiltering.java | 494 ++++----
.../maven/shared/filtering/FilterWrapper.java | 10 +-
.../maven/shared/filtering/FilteringUtils.java | 332 ++---
.../InterpolatorFilterReaderLineEnding.java | 212 ++--
.../maven/shared/filtering/MavenFileFilter.java | 41 +-
.../shared/filtering/MavenFileFilterRequest.java | 57 +-
.../shared/filtering/MavenFilteringException.java | 28 +-
.../maven/shared/filtering/MavenReaderFilter.java | 25 +-
.../shared/filtering/MavenReaderFilterRequest.java | 43 +-
.../shared/filtering/MavenResourcesExecution.java | 218 ++--
.../shared/filtering/MavenResourcesFiltering.java | 13 +-
...elimiterInterpolatorFilterReaderLineEnding.java | 231 ++--
.../maven/shared/filtering/PropertyUtils.java | 144 +--
...ractInterpolatorFilterReaderLineEndingTest.java | 144 ++-
.../AbstractMavenFilteringRequestTest.java | 92 +-
.../maven/shared/filtering/BoundedReaderTest.java | 94 +-
.../filtering/DefaultMavenFileFilterTest.java | 151 +--
.../filtering/DefaultMavenReaderFilterTest.java | 30 +-
.../DefaultMavenResourcesFilteringTest.java | 1269 ++++++++++----------
.../maven/shared/filtering/EscapeStringTest.java | 82 +-
.../maven/shared/filtering/FilteringUtilsTest.java | 32 +-
.../IncrementalResourceFilteringTest.java | 211 ++--
.../InterpolatorFilterReaderLineEndingTest.java | 33 +-
.../maven/shared/filtering/InvalidMarkTest.java | 52 +-
.../MuliLinesMavenResourcesFilteringTest.java | 81 +-
...iterInterpolatorFilterReaderLineEndingTest.java | 95 +-
.../maven/shared/filtering/PropertyUtilsTest.java | 168 ++-
.../maven/shared/filtering/StubMavenProject.java | 30 +-
.../maven/shared/filtering/StubMavenSession.java | 56 +-
.../shared/filtering/TestReflectionProperties.java | 85 +-
.../apache/maven/shared/filtering/TestSupport.java | 14 +-
39 files changed, 2316 insertions(+), 2972 deletions(-)
[maven-filtering] 01/02: [MSHARED-1199] Upgrade parent pom to 39
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-filtering.git
commit f11560a0167c42a3d06998b748332360efc5babc
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Tue Mar 7 22:09:04 2023 +0100
[MSHARED-1199] Upgrade parent pom to 39
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index c669f3b..1674ebe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
- <version>36</version>
+ <version>39</version>
<relativePath />
</parent>
[maven-filtering] 02/02: [MSHARED-1199] Reformat
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-filtering.git
commit 6e125707cfd353d44f2f29f27bb6ace560a7a038
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Tue Mar 7 22:16:27 2023 +0100
[MSHARED-1199] Reformat
---
pom.xml | 18 +-
.../filtering/AbstractFilterReaderLineEnding.java | 39 +-
.../filtering/AbstractMavenFilteringRequest.java | 141 +--
.../apache/maven/shared/filtering/BaseFilter.java | 279 +++--
.../maven/shared/filtering/BoundedReader.java | 46 +-
.../maven/shared/filtering/DefaultFilterInfo.java | 23 +-
.../shared/filtering/DefaultMavenFileFilter.java | 115 +-
.../shared/filtering/DefaultMavenReaderFilter.java | 58 +-
.../filtering/DefaultMavenResourcesFiltering.java | 494 ++++----
.../maven/shared/filtering/FilterWrapper.java | 10 +-
.../maven/shared/filtering/FilteringUtils.java | 332 ++---
.../InterpolatorFilterReaderLineEnding.java | 212 ++--
.../maven/shared/filtering/MavenFileFilter.java | 41 +-
.../shared/filtering/MavenFileFilterRequest.java | 57 +-
.../shared/filtering/MavenFilteringException.java | 28 +-
.../maven/shared/filtering/MavenReaderFilter.java | 25 +-
.../shared/filtering/MavenReaderFilterRequest.java | 43 +-
.../shared/filtering/MavenResourcesExecution.java | 218 ++--
.../shared/filtering/MavenResourcesFiltering.java | 13 +-
...elimiterInterpolatorFilterReaderLineEnding.java | 231 ++--
.../maven/shared/filtering/PropertyUtils.java | 144 +--
...ractInterpolatorFilterReaderLineEndingTest.java | 144 ++-
.../AbstractMavenFilteringRequestTest.java | 92 +-
.../maven/shared/filtering/BoundedReaderTest.java | 94 +-
.../filtering/DefaultMavenFileFilterTest.java | 151 +--
.../filtering/DefaultMavenReaderFilterTest.java | 30 +-
.../DefaultMavenResourcesFilteringTest.java | 1269 ++++++++++----------
.../maven/shared/filtering/EscapeStringTest.java | 82 +-
.../maven/shared/filtering/FilteringUtilsTest.java | 32 +-
.../IncrementalResourceFilteringTest.java | 211 ++--
.../InterpolatorFilterReaderLineEndingTest.java | 33 +-
.../maven/shared/filtering/InvalidMarkTest.java | 52 +-
.../MuliLinesMavenResourcesFilteringTest.java | 81 +-
...iterInterpolatorFilterReaderLineEndingTest.java | 95 +-
.../maven/shared/filtering/PropertyUtilsTest.java | 168 ++-
.../maven/shared/filtering/StubMavenProject.java | 30 +-
.../maven/shared/filtering/StubMavenSession.java | 56 +-
.../shared/filtering/TestReflectionProperties.java | 85 +-
.../apache/maven/shared/filtering/TestSupport.java | 14 +-
39 files changed, 2315 insertions(+), 2971 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1674ebe..0f77fdb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -33,11 +33,17 @@
<name>Apache Maven Filtering</name>
<description>A component to assist in filtering of resource files with properties from a Maven project.</description>
+ <contributors>
+ <contributor>
+ <name>Graham Leggett</name>
+ </contributor>
+ </contributors>
+
<scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/maven-filtering.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-filtering.git</developerConnection>
- <url>https://github.com/apache/maven-filtering/tree/${project.scm.tag}</url>
<tag>maven-filtering-3.2.0</tag>
+ <url>https://github.com/apache/maven-filtering/tree/${project.scm.tag}</url>
</scm>
<issueManagement>
<system>JIRA</system>
@@ -62,12 +68,6 @@
<project.build.outputTimestamp>2022-06-11T13:41:41Z</project.build.outputTimestamp>
</properties>
- <contributors>
- <contributor>
- <name>Graham Leggett</name>
- </contributor>
- </contributors>
-
<dependencies>
<dependency>
<groupId>javax.inject</groupId>
@@ -146,8 +146,8 @@
<groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-build-api</artifactId>
<version>${plexusBuildApiVersion}</version>
- <scope>test</scope>
<classifier>tests</classifier>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.sisu</groupId>
diff --git a/src/main/java/org/apache/maven/shared/filtering/AbstractFilterReaderLineEnding.java b/src/main/java/org/apache/maven/shared/filtering/AbstractFilterReaderLineEnding.java
index d74ce5f..5ef7b0e 100644
--- a/src/main/java/org/apache/maven/shared/filtering/AbstractFilterReaderLineEnding.java
+++ b/src/main/java/org/apache/maven/shared/filtering/AbstractFilterReaderLineEnding.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.filtering;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.shared.filtering;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.shared.filtering;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.filtering;
import java.io.FilterReader;
import java.io.Reader;
@@ -28,9 +27,7 @@ import org.codehaus.plexus.interpolation.multi.DelimiterSpecification;
/**
* @author Karl Heinz Marbaise <a href="mailto:khmarbaise@apache.org">khmarbaise@apache.org</a>
*/
-public abstract class AbstractFilterReaderLineEnding
- extends FilterReader
-{
+public abstract class AbstractFilterReaderLineEnding extends FilterReader {
private String escapeString;
@@ -53,27 +50,23 @@ public abstract class AbstractFilterReaderLineEnding
protected int markLength = 255;
// CHECKSTYLE_ON: MagicNumber
- protected AbstractFilterReaderLineEnding( Reader in )
- {
- super( in );
+ protected AbstractFilterReaderLineEnding(Reader in) {
+ super(in);
}
/**
* @return the escapce string.
*/
- public String getEscapeString()
- {
+ public String getEscapeString() {
return escapeString;
}
/**
* @param escapeString Set the value of the escape string.
*/
- public void setEscapeString( String escapeString )
- {
+ public void setEscapeString(String escapeString) {
// TODO NPE if escapeString is null ?
- if ( escapeString != null && escapeString.length() >= 1 )
- {
+ if (escapeString != null && escapeString.length() >= 1) {
this.escapeString = escapeString;
this.useEscape = true;
calculateMarkLength();
@@ -83,34 +76,28 @@ public abstract class AbstractFilterReaderLineEnding
/**
* @return state of preserve escape string.
*/
- public boolean isPreserveEscapeString()
- {
+ public boolean isPreserveEscapeString() {
return preserveEscapeString;
}
/**
* @param preserveEscapeString preserve escape string {@code true} or {@code false}.
*/
- public void setPreserveEscapeString( boolean preserveEscapeString )
- {
+ public void setPreserveEscapeString(boolean preserveEscapeString) {
this.preserveEscapeString = preserveEscapeString;
}
- protected void calculateMarkLength()
- {
+ protected void calculateMarkLength() {
// CHECKSTYLE_OFF: MagicNumber
markLength = 255;
// CHECKSTYLE_ON: MagicNumber
- if ( escapeString != null )
- {
+ if (escapeString != null) {
markLength += escapeString.length();
}
- for ( DelimiterSpecification spec : delimiters )
- {
+ for (DelimiterSpecification spec : delimiters) {
markLength += spec.getBegin().length();
markLength += spec.getEnd().length();
-
}
}
}
diff --git a/src/main/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequest.java b/src/main/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequest.java
index 0b10ab8..503e70e 100644
--- a/src/main/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequest.java
+++ b/src/main/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.filtering;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.shared.filtering;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.shared.filtering;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.filtering;
import java.util.ArrayList;
import java.util.LinkedHashSet;
@@ -30,8 +29,7 @@ import org.apache.maven.project.MavenProject;
/**
* @since 1.0-beta-3
*/
-public class AbstractMavenFilteringRequest
-{
+public class AbstractMavenFilteringRequest {
private MavenProject mavenProject;
@@ -84,8 +82,7 @@ public class AbstractMavenFilteringRequest
/**
* Create instance.
*/
- protected AbstractMavenFilteringRequest()
- {
+ protected AbstractMavenFilteringRequest() {
initDefaults();
}
@@ -96,29 +93,26 @@ public class AbstractMavenFilteringRequest
* @param filters The list of filters.
* @param mavenSession The MavenSession.
*/
- protected AbstractMavenFilteringRequest( MavenProject mavenProject, List<String> filters,
- MavenSession mavenSession )
- {
+ protected AbstractMavenFilteringRequest(
+ MavenProject mavenProject, List<String> filters, MavenSession mavenSession) {
initDefaults();
this.mavenProject = mavenProject;
this.filters = filters;
this.mavenSession = mavenSession;
}
- private void initDefaults()
- {
- projectStartExpressions.add( "pom" );
- projectStartExpressions.add( "project" );
+ private void initDefaults() {
+ projectStartExpressions.add("pom");
+ projectStartExpressions.add("project");
- delimiters.add( "${*}" );
- delimiters.add( "@" );
+ delimiters.add("${*}");
+ delimiters.add("@");
}
/**
* @return The MavenProject
*/
- public MavenProject getMavenProject()
- {
+ public MavenProject getMavenProject() {
return mavenProject;
}
@@ -127,8 +121,7 @@ public class AbstractMavenFilteringRequest
*
* @param mavenProject The MavenProject to be set.
*/
- public void setMavenProject( MavenProject mavenProject )
- {
+ public void setMavenProject(MavenProject mavenProject) {
this.mavenProject = mavenProject;
}
@@ -137,8 +130,7 @@ public class AbstractMavenFilteringRequest
*
* @return The list of currently set filters.
*/
- public List<String> getFilters()
- {
+ public List<String> getFilters() {
return filters;
}
@@ -147,8 +139,7 @@ public class AbstractMavenFilteringRequest
*
* @param filters Set the list of filters
*/
- public void setFilters( List<String> filters )
- {
+ public void setFilters(List<String> filters) {
this.filters = filters;
}
@@ -157,8 +148,7 @@ public class AbstractMavenFilteringRequest
*
* @return The list of filters.
*/
- public List<String> getFileFilters()
- {
+ public List<String> getFileFilters() {
return getFilters();
}
@@ -167,17 +157,15 @@ public class AbstractMavenFilteringRequest
*
* @param paramfilters The list of filters to be set.
*/
- public void setFileFilters( List<String> paramfilters )
- {
- setFilters( paramfilters );
+ public void setFileFilters(List<String> paramfilters) {
+ setFilters(paramfilters);
}
/**
* @since 1.0-beta-3
* @return true if escape is activated false otherwise.
*/
- public boolean isEscapeWindowsPaths()
- {
+ public boolean isEscapeWindowsPaths() {
return escapeWindowsPaths;
}
@@ -185,8 +173,7 @@ public class AbstractMavenFilteringRequest
* @since 1.0-beta-3
* @param escapedBackslashesInFilePath true or false.
*/
- public void setEscapeWindowsPaths( boolean escapedBackslashesInFilePath )
- {
+ public void setEscapeWindowsPaths(boolean escapedBackslashesInFilePath) {
this.escapeWindowsPaths = escapedBackslashesInFilePath;
}
@@ -195,8 +182,7 @@ public class AbstractMavenFilteringRequest
*
* @return The current value of {@link #isEscapeWindowsPaths()}
*/
- public boolean isEscapedBackslashesInFilePath()
- {
+ public boolean isEscapedBackslashesInFilePath() {
return isEscapeWindowsPaths();
}
@@ -205,24 +191,21 @@ public class AbstractMavenFilteringRequest
*
* @param escape activate or deactivate escaping.
*/
- public void setEscapedBackslashesInFilePath( boolean escape )
- {
- setEscapeWindowsPaths( escape );
+ public void setEscapedBackslashesInFilePath(boolean escape) {
+ setEscapeWindowsPaths(escape);
}
/**
* @return Current value of mavenSession
*/
- public MavenSession getMavenSession()
- {
+ public MavenSession getMavenSession() {
return mavenSession;
}
/**
* @param mavenSession Set new value for the MavenSession of the instance.
*/
- public void setMavenSession( MavenSession mavenSession )
- {
+ public void setMavenSession(MavenSession mavenSession) {
this.mavenSession = mavenSession;
}
@@ -230,8 +213,7 @@ public class AbstractMavenFilteringRequest
* @return the additional properties.
* @since 1.0-beta-3
*/
- public Properties getAdditionalProperties()
- {
+ public Properties getAdditionalProperties() {
return additionalProperties;
}
@@ -239,8 +221,7 @@ public class AbstractMavenFilteringRequest
* @param additionalProperties The additional properties to be set.
* @since 1.0-beta-3
*/
- public void setAdditionalProperties( Properties additionalProperties )
- {
+ public void setAdditionalProperties(Properties additionalProperties) {
this.additionalProperties = additionalProperties;
}
@@ -248,8 +229,7 @@ public class AbstractMavenFilteringRequest
* @return the current value of injectProjectBuildFilters.
* @since 1.0-beta-3
*/
- public boolean isInjectProjectBuildFilters()
- {
+ public boolean isInjectProjectBuildFilters() {
return injectProjectBuildFilters;
}
@@ -257,8 +237,7 @@ public class AbstractMavenFilteringRequest
* @param injectProjectBuildFilters true or false.
* @since 1.0-beta-3
*/
- public void setInjectProjectBuildFilters( boolean injectProjectBuildFilters )
- {
+ public void setInjectProjectBuildFilters(boolean injectProjectBuildFilters) {
this.injectProjectBuildFilters = injectProjectBuildFilters;
}
@@ -266,8 +245,7 @@ public class AbstractMavenFilteringRequest
* @return Current value of escapeString.
* @since 1.0-beta-2
*/
- public String getEscapeString()
- {
+ public String getEscapeString() {
return escapeString;
}
@@ -275,8 +253,7 @@ public class AbstractMavenFilteringRequest
* @param escapeString The escape string to use
* @since 1.0-beta-2
*/
- public void setEscapeString( String escapeString )
- {
+ public void setEscapeString(String escapeString) {
this.escapeString = escapeString;
}
@@ -284,8 +261,7 @@ public class AbstractMavenFilteringRequest
* @return The list of project start expressions.
* @since 1.0-beta-2
*/
- public List<String> getProjectStartExpressions()
- {
+ public List<String> getProjectStartExpressions() {
return projectStartExpressions;
}
@@ -293,8 +269,7 @@ public class AbstractMavenFilteringRequest
* @param projectStartExpressions The start expressions
* @since 1.0-beta-2
*/
- public void setProjectStartExpressions( List<String> projectStartExpressions )
- {
+ public void setProjectStartExpressions(List<String> projectStartExpressions) {
this.projectStartExpressions = projectStartExpressions;
}
@@ -304,8 +279,7 @@ public class AbstractMavenFilteringRequest
* @return Not allowed to be <code>null</code> or empty.
* @since 1.0-beta-3
*/
- public LinkedHashSet<String> getDelimiters()
- {
+ public LinkedHashSet<String> getDelimiters() {
return delimiters;
}
@@ -317,15 +291,11 @@ public class AbstractMavenFilteringRequest
* @param delimiters If <code>null</code>, reset delimiters to '${*}' only. Otherwise, use the provided value.
* @since 1.0-beta-3
*/
- public void setDelimiters( LinkedHashSet<String> delimiters )
- {
- if ( delimiters == null || delimiters.isEmpty() )
- {
+ public void setDelimiters(LinkedHashSet<String> delimiters) {
+ if (delimiters == null || delimiters.isEmpty()) {
this.delimiters.clear();
- this.delimiters.add( "${*}" );
- }
- else
- {
+ this.delimiters.add("${*}");
+ } else {
this.delimiters = delimiters;
}
}
@@ -335,48 +305,37 @@ public class AbstractMavenFilteringRequest
* according to the contents. If delimiter entries are {@code null} those entries will be set to '${*}'.
* @param useDefaultDelimiters true if the default delimiters will be used false otherwise.
*/
- public void setDelimiters( LinkedHashSet<String> delimiters, boolean useDefaultDelimiters )
- {
- if ( delimiters != null && !delimiters.isEmpty() )
- {
+ public void setDelimiters(LinkedHashSet<String> delimiters, boolean useDefaultDelimiters) {
+ if (delimiters != null && !delimiters.isEmpty()) {
LinkedHashSet<String> delims = new LinkedHashSet<>();
- if ( useDefaultDelimiters )
- {
- delims.addAll( this.getDelimiters() );
+ if (useDefaultDelimiters) {
+ delims.addAll(this.getDelimiters());
}
- for ( String delim : delimiters )
- {
- if ( delim == null )
- {
+ for (String delim : delimiters) {
+ if (delim == null) {
// FIXME: ${filter:*} could also trigger this condition. Need a better long-term solution.
- delims.add( "${*}" );
- }
- else
- {
- delims.add( delim );
+ delims.add("${*}");
+ } else {
+ delims.add(delim);
}
}
- this.setDelimiters( delims );
+ this.setDelimiters(delims);
}
-
}
/**
* @return If support multiple line filtering is active or not.
*/
- public boolean isSupportMultiLineFiltering()
- {
+ public boolean isSupportMultiLineFiltering() {
return supportMultiLineFiltering;
}
/**
* @param supportMultiLineFiltering activate or deactivate multiple line filtering support.
*/
- public void setSupportMultiLineFiltering( boolean supportMultiLineFiltering )
- {
+ public void setSupportMultiLineFiltering(boolean supportMultiLineFiltering) {
this.supportMultiLineFiltering = supportMultiLineFiltering;
}
-
}
diff --git a/src/main/java/org/apache/maven/shared/filtering/BaseFilter.java b/src/main/java/org/apache/maven/shared/filtering/BaseFilter.java
index fc3afd8..b29bb01 100644
--- a/src/main/java/org/apache/maven/shared/filtering/BaseFilter.java
+++ b/src/main/java/org/apache/maven/shared/filtering/BaseFilter.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.filtering;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.shared.filtering;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.shared.filtering;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.filtering;
import java.io.File;
import java.io.IOException;
@@ -45,45 +44,40 @@ import org.codehaus.plexus.interpolation.multi.MultiDelimiterStringSearchInterpo
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-class BaseFilter
- implements DefaultFilterInfo
-{
- private final Logger logger = LoggerFactory.getLogger( getClass() );
+class BaseFilter implements DefaultFilterInfo {
+ private final Logger logger = LoggerFactory.getLogger(getClass());
- protected Logger getLogger()
- {
+ protected Logger getLogger() {
return logger;
}
@Override
- public List<FilterWrapper> getDefaultFilterWrappers( final MavenProject mavenProject,
- List<String> filters,
- final boolean escapedBackslashesInFilePath,
- MavenSession mavenSession,
- MavenResourcesExecution mavenResourcesExecution )
- throws MavenFilteringException
- {
+ public List<FilterWrapper> getDefaultFilterWrappers(
+ final MavenProject mavenProject,
+ List<String> filters,
+ final boolean escapedBackslashesInFilePath,
+ MavenSession mavenSession,
+ MavenResourcesExecution mavenResourcesExecution)
+ throws MavenFilteringException {
MavenResourcesExecution mre =
- mavenResourcesExecution == null ? new MavenResourcesExecution() : mavenResourcesExecution.copyOf();
-
- mre.setMavenProject( mavenProject );
- mre.setMavenSession( mavenSession );
- mre.setFilters( filters );
- mre.setEscapedBackslashesInFilePath( escapedBackslashesInFilePath );
+ mavenResourcesExecution == null ? new MavenResourcesExecution() : mavenResourcesExecution.copyOf();
- return getDefaultFilterWrappers( mre );
+ mre.setMavenProject(mavenProject);
+ mre.setMavenSession(mavenSession);
+ mre.setFilters(filters);
+ mre.setEscapedBackslashesInFilePath(escapedBackslashesInFilePath);
+ return getDefaultFilterWrappers(mre);
}
@Override
- public List<FilterWrapper> getDefaultFilterWrappers( final AbstractMavenFilteringRequest request )
- throws MavenFilteringException
- {
+ public List<FilterWrapper> getDefaultFilterWrappers(final AbstractMavenFilteringRequest request)
+ throws MavenFilteringException {
// backup values
boolean supportMultiLineFiltering = request.isSupportMultiLineFiltering();
- request.setSupportMultiLineFiltering( supportMultiLineFiltering );
+ request.setSupportMultiLineFiltering(supportMultiLineFiltering);
// Here we build some properties which will be used to read some properties files
// to interpolate the expression ${ } in this properties file
@@ -94,10 +88,11 @@ class BaseFilter
final Properties baseProps = new Properties();
// Project properties
- if ( request.getMavenProject() != null )
- {
- baseProps.putAll( request.getMavenProject().getProperties() == null ? Collections.emptyMap()
- : request.getMavenProject().getProperties() );
+ if (request.getMavenProject() != null) {
+ baseProps.putAll(
+ request.getMavenProject().getProperties() == null
+ ? Collections.emptyMap()
+ : request.getMavenProject().getProperties());
}
// TODO this is NPE free but do we consider this as normal
// or do we have to throw an MavenFilteringException with mavenSession cannot be null
@@ -111,76 +106,77 @@ class BaseFilter
// So changing here to throw a MavenFilteringException would make
// it necessary to change the interface or we need to find a better solution.
//
- if ( request.getMavenSession() != null )
- {
+ if (request.getMavenSession() != null) {
// User properties have precedence over system properties
- baseProps.putAll( request.getMavenSession().getSystemProperties() );
- baseProps.putAll( request.getMavenSession().getUserProperties() );
+ baseProps.putAll(request.getMavenSession().getSystemProperties());
+ baseProps.putAll(request.getMavenSession().getUserProperties());
}
// now we build properties to use for resources interpolation
final Properties filterProperties = new Properties();
- File basedir = request.getMavenProject() != null ? request.getMavenProject().getBasedir() : new File( "." );
+ File basedir =
+ request.getMavenProject() != null ? request.getMavenProject().getBasedir() : new File(".");
- loadProperties( filterProperties, basedir, request.getFileFilters(), baseProps );
- if ( filterProperties.size() < 1 )
- {
- filterProperties.putAll( baseProps );
+ loadProperties(filterProperties, basedir, request.getFileFilters(), baseProps);
+ if (filterProperties.size() < 1) {
+ filterProperties.putAll(baseProps);
}
- if ( request.getMavenProject() != null )
- {
- if ( request.isInjectProjectBuildFilters() )
- {
- List<String> buildFilters = new ArrayList<>( request.getMavenProject().getBuild().getFilters() );
+ if (request.getMavenProject() != null) {
+ if (request.isInjectProjectBuildFilters()) {
+ List<String> buildFilters =
+ new ArrayList<>(request.getMavenProject().getBuild().getFilters());
// JDK-8015656: (coll) unexpected NPE from removeAll
- if ( request.getFileFilters() != null )
- {
- buildFilters.removeAll( request.getFileFilters() );
+ if (request.getFileFilters() != null) {
+ buildFilters.removeAll(request.getFileFilters());
}
- loadProperties( filterProperties, basedir, buildFilters, baseProps );
+ loadProperties(filterProperties, basedir, buildFilters, baseProps);
}
// Project properties
- filterProperties.putAll( request.getMavenProject().getProperties() == null ? Collections.emptyMap()
- : request.getMavenProject().getProperties() );
+ filterProperties.putAll(
+ request.getMavenProject().getProperties() == null
+ ? Collections.emptyMap()
+ : request.getMavenProject().getProperties());
}
- if ( request.getMavenSession() != null )
- {
+ if (request.getMavenSession() != null) {
// User properties have precedence over system properties
- filterProperties.putAll( request.getMavenSession().getSystemProperties() );
- filterProperties.putAll( request.getMavenSession().getUserProperties() );
+ filterProperties.putAll(request.getMavenSession().getSystemProperties());
+ filterProperties.putAll(request.getMavenSession().getUserProperties());
}
- if ( request.getAdditionalProperties() != null )
- {
+ if (request.getAdditionalProperties() != null) {
// additional properties wins
- filterProperties.putAll( request.getAdditionalProperties() );
+ filterProperties.putAll(request.getAdditionalProperties());
}
- List<FilterWrapper> defaultFilterWrappers = new ArrayList<>( request.getDelimiters().size() + 1 );
+ List<FilterWrapper> defaultFilterWrappers =
+ new ArrayList<>(request.getDelimiters().size() + 1);
- if ( getLogger().isDebugEnabled() )
- {
- getLogger().debug( "properties used:" );
- for ( String s : new TreeSet<>( filterProperties.stringPropertyNames() ) )
- {
- getLogger().debug( s + ": " + filterProperties.getProperty( s ) );
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("properties used:");
+ for (String s : new TreeSet<>(filterProperties.stringPropertyNames())) {
+ getLogger().debug(s + ": " + filterProperties.getProperty(s));
}
}
- final ValueSource propertiesValueSource = new PropertiesBasedValueSource( filterProperties );
+ final ValueSource propertiesValueSource = new PropertiesBasedValueSource(filterProperties);
- FilterWrapper wrapper =
- new Wrapper( request.getDelimiters(), request.getMavenProject(), request.getMavenSession(),
- propertiesValueSource, request.getProjectStartExpressions(), request.getEscapeString(),
- request.isEscapeWindowsPaths(), request.isSupportMultiLineFiltering() );
+ FilterWrapper wrapper = new Wrapper(
+ request.getDelimiters(),
+ request.getMavenProject(),
+ request.getMavenSession(),
+ propertiesValueSource,
+ request.getProjectStartExpressions(),
+ request.getEscapeString(),
+ request.isEscapeWindowsPaths(),
+ request.isSupportMultiLineFiltering());
- defaultFilterWrappers.add( wrapper );
+ defaultFilterWrappers.add(wrapper);
return defaultFilterWrappers;
}
@@ -188,40 +184,31 @@ class BaseFilter
/**
* default visibility only for testing reason !
*/
- void loadProperties( Properties filterProperties, File basedir, List<String> propertiesFilePaths,
- Properties baseProps )
- throws MavenFilteringException
- {
- if ( propertiesFilePaths != null )
- {
+ void loadProperties(
+ Properties filterProperties, File basedir, List<String> propertiesFilePaths, Properties baseProps)
+ throws MavenFilteringException {
+ if (propertiesFilePaths != null) {
Properties workProperties = new Properties();
- workProperties.putAll( baseProps );
+ workProperties.putAll(baseProps);
- for ( String filterFile : propertiesFilePaths )
- {
- if ( filterFile == null || filterFile.trim().isEmpty() )
- {
+ for (String filterFile : propertiesFilePaths) {
+ if (filterFile == null || filterFile.trim().isEmpty()) {
// skip empty file name
continue;
}
- try
- {
- File propFile = FilteringUtils.resolveFile( basedir, filterFile );
- Properties properties = PropertyUtils.loadPropertyFile( propFile, workProperties, getLogger() );
- filterProperties.putAll( properties );
- workProperties.putAll( properties );
- }
- catch ( IOException e )
- {
- throw new MavenFilteringException( "Error loading property file '" + filterFile + "'", e );
+ try {
+ File propFile = FilteringUtils.resolveFile(basedir, filterFile);
+ Properties properties = PropertyUtils.loadPropertyFile(propFile, workProperties, getLogger());
+ filterProperties.putAll(properties);
+ workProperties.putAll(properties);
+ } catch (IOException e) {
+ throw new MavenFilteringException("Error loading property file '" + filterFile + "'", e);
}
}
}
}
- private static final class Wrapper
- extends FilterWrapper
- {
+ private static final class Wrapper extends FilterWrapper {
private LinkedHashSet<String> delimiters;
@@ -239,10 +226,15 @@ class BaseFilter
private boolean supportMultiLineFiltering;
- Wrapper( LinkedHashSet<String> delimiters, MavenProject project, MavenSession mavenSession,
- ValueSource propertiesValueSource, List<String> projectStartExpressions, String escapeString,
- boolean escapeWindowsPaths, boolean supportMultiLineFiltering )
- {
+ Wrapper(
+ LinkedHashSet<String> delimiters,
+ MavenProject project,
+ MavenSession mavenSession,
+ ValueSource propertiesValueSource,
+ List<String> projectStartExpressions,
+ String escapeString,
+ boolean escapeWindowsPaths,
+ boolean supportMultiLineFiltering) {
super();
this.delimiters = delimiters;
this.project = project;
@@ -255,81 +247,78 @@ class BaseFilter
}
@Override
- public Reader getReader( Reader reader )
- {
- Interpolator interpolator = createInterpolator( delimiters, projectStartExpressions, propertiesValueSource,
- project, mavenSession, escapeString, escapeWindowsPaths );
+ public Reader getReader(Reader reader) {
+ Interpolator interpolator = createInterpolator(
+ delimiters,
+ projectStartExpressions,
+ propertiesValueSource,
+ project,
+ mavenSession,
+ escapeString,
+ escapeWindowsPaths);
MultiDelimiterInterpolatorFilterReaderLineEnding filterReader =
- new MultiDelimiterInterpolatorFilterReaderLineEnding( reader, interpolator, supportMultiLineFiltering );
+ new MultiDelimiterInterpolatorFilterReaderLineEnding(
+ reader, interpolator, supportMultiLineFiltering);
final RecursionInterceptor ri;
- if ( projectStartExpressions != null && !projectStartExpressions.isEmpty() )
- {
- ri = new PrefixAwareRecursionInterceptor( projectStartExpressions, true );
- }
- else
- {
+ if (projectStartExpressions != null && !projectStartExpressions.isEmpty()) {
+ ri = new PrefixAwareRecursionInterceptor(projectStartExpressions, true);
+ } else {
ri = new SimpleRecursionInterceptor();
}
- filterReader.setRecursionInterceptor( ri );
- filterReader.setDelimiterSpecs( delimiters );
+ filterReader.setRecursionInterceptor(ri);
+ filterReader.setDelimiterSpecs(delimiters);
- filterReader.setInterpolateWithPrefixPattern( false );
- filterReader.setEscapeString( escapeString );
+ filterReader.setInterpolateWithPrefixPattern(false);
+ filterReader.setEscapeString(escapeString);
return filterReader;
}
-
}
- private static Interpolator createInterpolator( LinkedHashSet<String> delimiters,
- List<String> projectStartExpressions,
- ValueSource propertiesValueSource, MavenProject project,
- MavenSession mavenSession, String escapeString,
- boolean escapeWindowsPaths )
- {
+ private static Interpolator createInterpolator(
+ LinkedHashSet<String> delimiters,
+ List<String> projectStartExpressions,
+ ValueSource propertiesValueSource,
+ MavenProject project,
+ MavenSession mavenSession,
+ String escapeString,
+ boolean escapeWindowsPaths) {
MultiDelimiterStringSearchInterpolator interpolator = new MultiDelimiterStringSearchInterpolator();
- interpolator.setDelimiterSpecs( delimiters );
+ interpolator.setDelimiterSpecs(delimiters);
- interpolator.addValueSource( propertiesValueSource );
+ interpolator.addValueSource(propertiesValueSource);
- if ( project != null )
- {
- interpolator.addValueSource( new PrefixedObjectValueSource( projectStartExpressions, project, true ) );
+ if (project != null) {
+ interpolator.addValueSource(new PrefixedObjectValueSource(projectStartExpressions, project, true));
}
- if ( mavenSession != null )
- {
- interpolator.addValueSource( new PrefixedObjectValueSource( "session", mavenSession ) );
+ if (mavenSession != null) {
+ interpolator.addValueSource(new PrefixedObjectValueSource("session", mavenSession));
final Settings settings = mavenSession.getSettings();
- if ( settings != null )
- {
- interpolator.addValueSource( new PrefixedObjectValueSource( "settings", settings ) );
- interpolator.addValueSource( new SingleResponseValueSource( "localRepository",
- settings.getLocalRepository() ) );
+ if (settings != null) {
+ interpolator.addValueSource(new PrefixedObjectValueSource("settings", settings));
+ interpolator.addValueSource(
+ new SingleResponseValueSource("localRepository", settings.getLocalRepository()));
}
}
- interpolator.setEscapeString( escapeString );
+ interpolator.setEscapeString(escapeString);
- if ( escapeWindowsPaths )
- {
- interpolator.addPostProcessor( new InterpolationPostProcessor()
- {
+ if (escapeWindowsPaths) {
+ interpolator.addPostProcessor(new InterpolationPostProcessor() {
@Override
- public Object execute( String expression, Object value )
- {
- if ( value instanceof String )
- {
- return FilteringUtils.escapeWindowsPath( (String) value );
+ public Object execute(String expression, Object value) {
+ if (value instanceof String) {
+ return FilteringUtils.escapeWindowsPath((String) value);
}
return value;
}
- } );
+ });
}
return interpolator;
}
diff --git a/src/main/java/org/apache/maven/shared/filtering/BoundedReader.java b/src/main/java/org/apache/maven/shared/filtering/BoundedReader.java
index 62dc37b..447e0c9 100644
--- a/src/main/java/org/apache/maven/shared/filtering/BoundedReader.java
+++ b/src/main/java/org/apache/maven/shared/filtering/BoundedReader.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.filtering;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.shared.filtering;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.shared.filtering;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.filtering;
import java.io.IOException;
import java.io.Reader;
@@ -27,9 +26,7 @@ import java.io.Reader;
* this limit is reached. This stream can typically be used to constrain a client with regard to a readAheadLimit of an
* underlying stream, to avoid overrunning this limit and hence lose the opportunity do to reset.
*/
-public class BoundedReader
- extends Reader
-{
+public class BoundedReader extends Reader {
private final Reader target;
@@ -42,43 +39,32 @@ public class BoundedReader
* @param readAheadLimit read ahead limit.
* @throws IOException in case of a failure.
*/
- public BoundedReader( Reader target, int readAheadLimit )
- throws IOException
- {
+ public BoundedReader(Reader target, int readAheadLimit) throws IOException {
this.target = target;
- target.mark( readAheadLimit );
+ target.mark(readAheadLimit);
this.readAheadLimit = readAheadLimit;
}
@Override
- public void close()
- throws IOException
- {
+ public void close() throws IOException {
target.close();
}
@Override
- public void reset()
- throws IOException
- {
+ public void reset() throws IOException {
pos = 0;
target.reset();
}
@Override
- public void mark( int theReadAheadLimit )
- throws IOException
- {
+ public void mark(int theReadAheadLimit) throws IOException {
this.readAheadLimit = theReadAheadLimit;
- target.mark( theReadAheadLimit );
+ target.mark(theReadAheadLimit);
}
@Override
- public int read()
- throws IOException
- {
- if ( pos >= readAheadLimit )
- {
+ public int read() throws IOException {
+ if (pos >= readAheadLimit) {
return -1;
}
pos++;
@@ -86,15 +72,11 @@ public class BoundedReader
}
@Override
- public int read( char[] cbuf, int off, int len )
- throws IOException
- {
+ public int read(char[] cbuf, int off, int len) throws IOException {
int c;
- for ( int i = 0; i < len; i++ )
- {
+ for (int i = 0; i < len; i++) {
c = read();
- if ( c == -1 )
- {
+ if (c == -1) {
return i;
}
cbuf[off + i] = (char) c;
diff --git a/src/main/java/org/apache/maven/shared/filtering/DefaultFilterInfo.java b/src/main/java/org/apache/maven/shared/filtering/DefaultFilterInfo.java
index 3254556..45560c9 100644
--- a/src/main/java/org/apache/maven/shared/filtering/DefaultFilterInfo.java
+++ b/src/main/java/org/apache/maven/shared/filtering/DefaultFilterInfo.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.filtering;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.shared.filtering;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.shared.filtering;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.filtering;
import java.util.List;
@@ -27,8 +26,7 @@ import org.apache.maven.project.MavenProject;
/**
* @author Kristian Rosenvold
*/
-public interface DefaultFilterInfo
-{
+public interface DefaultFilterInfo {
/**
* @param mavenProject The maven project
@@ -40,11 +38,13 @@ public interface DefaultFilterInfo
* @return {@link java.util.List} of FileUtils.FilterWrapper
* @since 1.0-beta-2
*/
- List<FilterWrapper> getDefaultFilterWrappers( MavenProject mavenProject, List<String> filters,
- boolean escapedBackslashesInFilePath,
- MavenSession mavenSession,
- MavenResourcesExecution mavenResourcesExecution )
- throws MavenFilteringException;
+ List<FilterWrapper> getDefaultFilterWrappers(
+ MavenProject mavenProject,
+ List<String> filters,
+ boolean escapedBackslashesInFilePath,
+ MavenSession mavenSession,
+ MavenResourcesExecution mavenResourcesExecution)
+ throws MavenFilteringException;
/**
* @param request The filtering request
@@ -52,6 +52,5 @@ public interface DefaultFilterInfo
* @return {@link java.util.List} of FileUtils.FilterWrapper
* @since 1.0-beta-3
*/
- List<FilterWrapper> getDefaultFilterWrappers( AbstractMavenFilteringRequest request )
- throws MavenFilteringException;
+ List<FilterWrapper> getDefaultFilterWrappers(AbstractMavenFilteringRequest request) throws MavenFilteringException;
}
diff --git a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
index ac8ba89..a196e32 100644
--- a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
+++ b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.filtering;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.shared.filtering;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.shared.filtering;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.filtering;
import javax.inject.Inject;
import javax.inject.Named;
@@ -38,84 +37,84 @@ import static java.util.Objects.requireNonNull;
*/
@Singleton
@Named
-public class DefaultMavenFileFilter
- extends BaseFilter
- implements MavenFileFilter
-{
+public class DefaultMavenFileFilter extends BaseFilter implements MavenFileFilter {
private final BuildContext buildContext;
@Inject
- public DefaultMavenFileFilter( BuildContext buildContext )
- {
- this.buildContext = requireNonNull( buildContext );
+ public DefaultMavenFileFilter(BuildContext buildContext) {
+ this.buildContext = requireNonNull(buildContext);
}
@Override
- public void copyFile( File from, File to, boolean filtering, MavenProject mavenProject, List<String> filters,
- boolean escapedBackslashesInFilePath, String encoding, MavenSession mavenSession )
- throws MavenFilteringException
- {
+ public void copyFile(
+ File from,
+ File to,
+ boolean filtering,
+ MavenProject mavenProject,
+ List<String> filters,
+ boolean escapedBackslashesInFilePath,
+ String encoding,
+ MavenSession mavenSession)
+ throws MavenFilteringException {
MavenResourcesExecution mre = new MavenResourcesExecution();
- mre.setMavenProject( mavenProject );
- mre.setFileFilters( filters );
- mre.setEscapeWindowsPaths( escapedBackslashesInFilePath );
- mre.setMavenSession( mavenSession );
- mre.setInjectProjectBuildFilters( true );
+ mre.setMavenProject(mavenProject);
+ mre.setFileFilters(filters);
+ mre.setEscapeWindowsPaths(escapedBackslashesInFilePath);
+ mre.setMavenSession(mavenSession);
+ mre.setInjectProjectBuildFilters(true);
- List<FilterWrapper> filterWrappers = getDefaultFilterWrappers( mre );
- copyFile( from, to, filtering, filterWrappers, encoding );
+ List<FilterWrapper> filterWrappers = getDefaultFilterWrappers(mre);
+ copyFile(from, to, filtering, filterWrappers, encoding);
}
@Override
- public void copyFile( MavenFileFilterRequest mavenFileFilterRequest )
- throws MavenFilteringException
- {
- List<FilterWrapper> filterWrappers = getDefaultFilterWrappers( mavenFileFilterRequest );
+ public void copyFile(MavenFileFilterRequest mavenFileFilterRequest) throws MavenFilteringException {
+ List<FilterWrapper> filterWrappers = getDefaultFilterWrappers(mavenFileFilterRequest);
- copyFile( mavenFileFilterRequest.getFrom(), mavenFileFilterRequest.getTo(),
- mavenFileFilterRequest.isFiltering(), filterWrappers, mavenFileFilterRequest.getEncoding() );
+ copyFile(
+ mavenFileFilterRequest.getFrom(),
+ mavenFileFilterRequest.getTo(),
+ mavenFileFilterRequest.isFiltering(),
+ filterWrappers,
+ mavenFileFilterRequest.getEncoding());
}
@Override
- public void copyFile( File from, File to, boolean filtering, List<FilterWrapper> filterWrappers,
- String encoding )
- throws MavenFilteringException
- {
+ public void copyFile(File from, File to, boolean filtering, List<FilterWrapper> filterWrappers, String encoding)
+ throws MavenFilteringException {
// overwrite forced to false to preserve backward comp
- copyFile( from, to, filtering, filterWrappers, encoding, false );
+ copyFile(from, to, filtering, filterWrappers, encoding, false);
}
@Override
- public void copyFile( File from, File to, boolean filtering, List<FilterWrapper> filterWrappers,
- String encoding, boolean overwrite )
- throws MavenFilteringException
- {
- try
- {
- if ( filtering )
- {
- if ( getLogger().isDebugEnabled() )
- {
- getLogger().debug( "filtering " + from.getPath() + " to " + to.getPath() );
+ public void copyFile(
+ File from,
+ File to,
+ boolean filtering,
+ List<FilterWrapper> filterWrappers,
+ String encoding,
+ boolean overwrite)
+ throws MavenFilteringException {
+ try {
+ if (filtering) {
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("filtering " + from.getPath() + " to " + to.getPath());
}
- FilterWrapper[] array = filterWrappers.toArray( new FilterWrapper[0] );
- FilteringUtils.copyFile( from, to, encoding, array, false );
- }
- else
- {
- if ( getLogger().isDebugEnabled() )
- {
- getLogger().debug( "copy " + from.getPath() + " to " + to.getPath() );
+ FilterWrapper[] array = filterWrappers.toArray(new FilterWrapper[0]);
+ FilteringUtils.copyFile(from, to, encoding, array, false);
+ } else {
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("copy " + from.getPath() + " to " + to.getPath());
}
- FilteringUtils.copyFile( from, to, encoding, new FilterWrapper[0], overwrite );
+ FilteringUtils.copyFile(from, to, encoding, new FilterWrapper[0], overwrite);
}
- buildContext.refresh( to );
- }
- catch ( IOException e )
- {
- throw new MavenFilteringException( ( filtering ? "filtering " : "copying " ) + from.getPath() + " to "
- + to.getPath() + " failed with " + e.getClass().getSimpleName(), e );
+ buildContext.refresh(to);
+ } catch (IOException e) {
+ throw new MavenFilteringException(
+ (filtering ? "filtering " : "copying ") + from.getPath() + " to " + to.getPath() + " failed with "
+ + e.getClass().getSimpleName(),
+ e);
}
}
}
diff --git a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenReaderFilter.java b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenReaderFilter.java
index 7243679..a3c7d2a 100644
--- a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenReaderFilter.java
+++ b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenReaderFilter.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.filtering;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.shared.filtering;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.shared.filtering;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.filtering;
import javax.inject.Named;
import javax.inject.Singleton;
@@ -34,48 +33,43 @@ import org.apache.maven.project.MavenProject;
*/
@Singleton
@Named
-public class DefaultMavenReaderFilter
- extends BaseFilter
- implements MavenReaderFilter
-{
+public class DefaultMavenReaderFilter extends BaseFilter implements MavenReaderFilter {
@Override
- public Reader filter( Reader from, boolean filtering, MavenProject mavenProject, List<String> filters,
- boolean escapedBackslashesInFilePath, MavenSession mavenSession )
- throws MavenFilteringException
- {
+ public Reader filter(
+ Reader from,
+ boolean filtering,
+ MavenProject mavenProject,
+ List<String> filters,
+ boolean escapedBackslashesInFilePath,
+ MavenSession mavenSession)
+ throws MavenFilteringException {
MavenResourcesExecution mre = new MavenResourcesExecution();
- mre.setMavenProject( mavenProject );
- mre.setFileFilters( filters );
- mre.setEscapeWindowsPaths( escapedBackslashesInFilePath );
- mre.setMavenSession( mavenSession );
- mre.setInjectProjectBuildFilters( true );
+ mre.setMavenProject(mavenProject);
+ mre.setFileFilters(filters);
+ mre.setEscapeWindowsPaths(escapedBackslashesInFilePath);
+ mre.setMavenSession(mavenSession);
+ mre.setInjectProjectBuildFilters(true);
- List<FilterWrapper> filterWrappers = getDefaultFilterWrappers( mre );
- return filter( from, filtering, filterWrappers );
+ List<FilterWrapper> filterWrappers = getDefaultFilterWrappers(mre);
+ return filter(from, filtering, filterWrappers);
}
@Override
- public Reader filter( MavenReaderFilterRequest mavenFileFilterRequest )
- throws MavenFilteringException
- {
- List<FilterWrapper> filterWrappers = getDefaultFilterWrappers( mavenFileFilterRequest );
- return filter( mavenFileFilterRequest.getFrom(), mavenFileFilterRequest.isFiltering(), filterWrappers );
+ public Reader filter(MavenReaderFilterRequest mavenFileFilterRequest) throws MavenFilteringException {
+ List<FilterWrapper> filterWrappers = getDefaultFilterWrappers(mavenFileFilterRequest);
+ return filter(mavenFileFilterRequest.getFrom(), mavenFileFilterRequest.isFiltering(), filterWrappers);
}
@Override
- public Reader filter( Reader from, boolean filtering, List<FilterWrapper> filterWrappers )
- {
- return filterWrap( from, filtering ? filterWrappers : Collections.<FilterWrapper>emptyList() );
+ public Reader filter(Reader from, boolean filtering, List<FilterWrapper> filterWrappers) {
+ return filterWrap(from, filtering ? filterWrappers : Collections.<FilterWrapper>emptyList());
}
- private static Reader filterWrap( Reader from, Iterable<FilterWrapper> wrappers )
- {
+ private static Reader filterWrap(Reader from, Iterable<FilterWrapper> wrappers) {
Reader reader = from;
- for ( FilterWrapper wrapper : wrappers )
- {
- reader = wrapper.getReader( reader );
+ for (FilterWrapper wrapper : wrappers) {
+ reader = wrapper.getReader(reader);
}
return reader;
}
-
}
diff --git a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
index e61d6ec..87be770 100644
--- a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
+++ b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.filtering;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.shared.filtering;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.shared.filtering;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.filtering;
import javax.inject.Inject;
import javax.inject.Named;
@@ -50,14 +49,12 @@ import static java.util.Objects.requireNonNull;
*/
@Singleton
@Named
-public class DefaultMavenResourcesFiltering
- implements MavenResourcesFiltering
-{
- private static final Logger LOGGER = LoggerFactory.getLogger( DefaultMavenResourcesFiltering.class );
+public class DefaultMavenResourcesFiltering implements MavenResourcesFiltering {
+ private static final Logger LOGGER = LoggerFactory.getLogger(DefaultMavenResourcesFiltering.class);
private static final String[] EMPTY_STRING_ARRAY = {};
- private static final String[] DEFAULT_INCLUDES = { "**/**" };
+ private static final String[] DEFAULT_INCLUDES = {"**/**"};
private final List<String> defaultNonFilteredFileExtensions;
@@ -66,134 +63,125 @@ public class DefaultMavenResourcesFiltering
private final BuildContext buildContext;
@Inject
- public DefaultMavenResourcesFiltering( MavenFileFilter mavenFileFilter, BuildContext buildContext )
- {
- this.mavenFileFilter = requireNonNull( mavenFileFilter );
- this.buildContext = requireNonNull( buildContext );
- this.defaultNonFilteredFileExtensions = new ArrayList<>( 5 );
- this.defaultNonFilteredFileExtensions.add( "jpg" );
- this.defaultNonFilteredFileExtensions.add( "jpeg" );
- this.defaultNonFilteredFileExtensions.add( "gif" );
- this.defaultNonFilteredFileExtensions.add( "bmp" );
- this.defaultNonFilteredFileExtensions.add( "png" );
- this.defaultNonFilteredFileExtensions.add( "ico" );
+ public DefaultMavenResourcesFiltering(MavenFileFilter mavenFileFilter, BuildContext buildContext) {
+ this.mavenFileFilter = requireNonNull(mavenFileFilter);
+ this.buildContext = requireNonNull(buildContext);
+ this.defaultNonFilteredFileExtensions = new ArrayList<>(5);
+ this.defaultNonFilteredFileExtensions.add("jpg");
+ this.defaultNonFilteredFileExtensions.add("jpeg");
+ this.defaultNonFilteredFileExtensions.add("gif");
+ this.defaultNonFilteredFileExtensions.add("bmp");
+ this.defaultNonFilteredFileExtensions.add("png");
+ this.defaultNonFilteredFileExtensions.add("ico");
}
@Override
- public boolean filteredFileExtension( String fileName, List<String> userNonFilteredFileExtensions )
- {
- List<String> nonFilteredFileExtensions = new ArrayList<>( getDefaultNonFilteredFileExtensions() );
- if ( userNonFilteredFileExtensions != null )
- {
- nonFilteredFileExtensions.addAll( userNonFilteredFileExtensions );
+ public boolean filteredFileExtension(String fileName, List<String> userNonFilteredFileExtensions) {
+ List<String> nonFilteredFileExtensions = new ArrayList<>(getDefaultNonFilteredFileExtensions());
+ if (userNonFilteredFileExtensions != null) {
+ nonFilteredFileExtensions.addAll(userNonFilteredFileExtensions);
}
- String extension = getExtension( fileName );
- boolean filteredFileExtension = !nonFilteredFileExtensions.contains( extension );
- if ( LOGGER.isDebugEnabled() )
- {
- LOGGER.debug( "file " + fileName + " has a" + ( filteredFileExtension ? " " : " non " )
- + "filtered file extension" );
+ String extension = getExtension(fileName);
+ boolean filteredFileExtension = !nonFilteredFileExtensions.contains(extension);
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("file " + fileName + " has a" + (filteredFileExtension ? " " : " non ")
+ + "filtered file extension");
}
return filteredFileExtension;
}
- private static String getExtension( String fileName )
- {
- String rawExt = FilenameUtils.getExtension( fileName );
- return rawExt == null ? null : rawExt.toLowerCase( Locale.ROOT );
+ private static String getExtension(String fileName) {
+ String rawExt = FilenameUtils.getExtension(fileName);
+ return rawExt == null ? null : rawExt.toLowerCase(Locale.ROOT);
}
@Override
- public List<String> getDefaultNonFilteredFileExtensions()
- {
+ public List<String> getDefaultNonFilteredFileExtensions() {
return this.defaultNonFilteredFileExtensions;
}
@Override
- public void filterResources( MavenResourcesExecution mavenResourcesExecution )
- throws MavenFilteringException
- {
- if ( mavenResourcesExecution == null )
- {
- throw new MavenFilteringException( "mavenResourcesExecution cannot be null" );
+ public void filterResources(MavenResourcesExecution mavenResourcesExecution) throws MavenFilteringException {
+ if (mavenResourcesExecution == null) {
+ throw new MavenFilteringException("mavenResourcesExecution cannot be null");
}
- if ( mavenResourcesExecution.getResources() == null )
- {
- LOGGER.info( "No resources configured skip copying/filtering" );
+ if (mavenResourcesExecution.getResources() == null) {
+ LOGGER.info("No resources configured skip copying/filtering");
return;
}
- if ( mavenResourcesExecution.getOutputDirectory() == null )
- {
- throw new MavenFilteringException( "outputDirectory cannot be null" );
+ if (mavenResourcesExecution.getOutputDirectory() == null) {
+ throw new MavenFilteringException("outputDirectory cannot be null");
}
- if ( mavenResourcesExecution.isUseDefaultFilterWrappers() )
- {
- handleDefaultFilterWrappers( mavenResourcesExecution );
+ if (mavenResourcesExecution.isUseDefaultFilterWrappers()) {
+ handleDefaultFilterWrappers(mavenResourcesExecution);
}
- if ( mavenResourcesExecution.getEncoding() == null || mavenResourcesExecution.getEncoding().length() < 1 )
- {
- LOGGER.warn( "Using platform encoding (" + System.getProperty( "file.encoding" )
- + " actually) to copy filtered resources, i.e. build is platform dependent!" );
- }
- else
- {
- LOGGER.debug( "Using '" + mavenResourcesExecution.getEncoding()
- + "' encoding to copy filtered resources." );
+ if (mavenResourcesExecution.getEncoding() == null
+ || mavenResourcesExecution.getEncoding().length() < 1) {
+ LOGGER.warn("Using platform encoding (" + System.getProperty("file.encoding")
+ + " actually) to copy filtered resources, i.e. build is platform dependent!");
+ } else {
+ LOGGER.debug("Using '" + mavenResourcesExecution.getEncoding() + "' encoding to copy filtered resources.");
}
- if ( mavenResourcesExecution.getPropertiesEncoding() == null
- || mavenResourcesExecution.getPropertiesEncoding().length() < 1 )
- {
- LOGGER.debug( "Using '" + mavenResourcesExecution.getEncoding()
- + "' encoding to copy filtered properties files." );
- }
- else
- {
- LOGGER.debug( "Using '" + mavenResourcesExecution.getPropertiesEncoding()
- + "' encoding to copy filtered properties files." );
+ if (mavenResourcesExecution.getPropertiesEncoding() == null
+ || mavenResourcesExecution.getPropertiesEncoding().length() < 1) {
+ LOGGER.debug("Using '" + mavenResourcesExecution.getEncoding()
+ + "' encoding to copy filtered properties files.");
+ } else {
+ LOGGER.debug("Using '" + mavenResourcesExecution.getPropertiesEncoding()
+ + "' encoding to copy filtered properties files.");
}
// Keep track of filtering being used and the properties files being filtered
boolean isFilteringUsed = false;
List<File> propertiesFiles = new ArrayList<>();
- for ( Resource resource : mavenResourcesExecution.getResources() )
- {
+ for (Resource resource : mavenResourcesExecution.getResources()) {
- if ( LOGGER.isDebugEnabled() )
- {
+ if (LOGGER.isDebugEnabled()) {
String ls = System.lineSeparator();
- StringBuilder debugMessage =
- new StringBuilder( "resource with targetPath " ).append( resource.getTargetPath() ).append( ls );
- debugMessage.append( "directory " ).append( resource.getDirectory() ).append( ls );
+ StringBuilder debugMessage = new StringBuilder("resource with targetPath ")
+ .append(resource.getTargetPath())
+ .append(ls);
+ debugMessage
+ .append("directory ")
+ .append(resource.getDirectory())
+ .append(ls);
// @formatter:off
- debugMessage.append( "excludes " ).append( resource.getExcludes() == null ? " empty "
- : resource.getExcludes().toString() ).append( ls );
- debugMessage.append( "includes " ).append( resource.getIncludes() == null ? " empty "
- : resource.getIncludes().toString() );
+ debugMessage
+ .append("excludes ")
+ .append(
+ resource.getExcludes() == null
+ ? " empty "
+ : resource.getExcludes().toString())
+ .append(ls);
+ debugMessage
+ .append("includes ")
+ .append(
+ resource.getIncludes() == null
+ ? " empty "
+ : resource.getIncludes().toString());
// @formatter:on
- LOGGER.debug( debugMessage.toString() );
+ LOGGER.debug(debugMessage.toString());
}
String targetPath = resource.getTargetPath();
- File resourceDirectory = ( resource.getDirectory() == null ) ? null : new File( resource.getDirectory() );
+ File resourceDirectory = (resource.getDirectory() == null) ? null : new File(resource.getDirectory());
- if ( resourceDirectory != null && !resourceDirectory.isAbsolute() )
- {
+ if (resourceDirectory != null && !resourceDirectory.isAbsolute()) {
resourceDirectory =
- new File( mavenResourcesExecution.getResourcesBaseDirectory(), resourceDirectory.getPath() );
+ new File(mavenResourcesExecution.getResourcesBaseDirectory(), resourceDirectory.getPath());
}
- if ( resourceDirectory == null || !resourceDirectory.exists() )
- {
- LOGGER.info( "skip non existing resourceDirectory " + resourceDirectory );
+ if (resourceDirectory == null || !resourceDirectory.exists()) {
+ LOGGER.info("skip non existing resourceDirectory " + resourceDirectory);
continue;
}
@@ -202,101 +190,89 @@ public class DefaultMavenResourcesFiltering
// see MNG-1345
File outputDirectory = mavenResourcesExecution.getOutputDirectory();
boolean outputExists = outputDirectory.exists();
- if ( !outputExists && !outputDirectory.mkdirs() )
- {
- throw new MavenFilteringException( "Cannot create resource output directory: " + outputDirectory );
+ if (!outputExists && !outputDirectory.mkdirs()) {
+ throw new MavenFilteringException("Cannot create resource output directory: " + outputDirectory);
}
- if ( resource.isFiltering() )
- {
+ if (resource.isFiltering()) {
isFilteringUsed = true;
}
- boolean ignoreDelta = !outputExists || buildContext.hasDelta( mavenResourcesExecution.getFileFilters() )
- || buildContext.hasDelta( getRelativeOutputDirectory( mavenResourcesExecution ) );
- LOGGER.debug( "ignoreDelta " + ignoreDelta );
- Scanner scanner = buildContext.newScanner( resourceDirectory, ignoreDelta );
+ boolean ignoreDelta = !outputExists
+ || buildContext.hasDelta(mavenResourcesExecution.getFileFilters())
+ || buildContext.hasDelta(getRelativeOutputDirectory(mavenResourcesExecution));
+ LOGGER.debug("ignoreDelta " + ignoreDelta);
+ Scanner scanner = buildContext.newScanner(resourceDirectory, ignoreDelta);
- setupScanner( resource, scanner, mavenResourcesExecution.isAddDefaultExcludes() );
+ setupScanner(resource, scanner, mavenResourcesExecution.isAddDefaultExcludes());
scanner.scan();
- if ( mavenResourcesExecution.isIncludeEmptyDirs() )
- {
- try
- {
- File targetDirectory =
- targetPath == null ? outputDirectory : new File( outputDirectory, targetPath );
- copyDirectoryLayout( resourceDirectory, targetDirectory, scanner );
- }
- catch ( IOException e )
- {
- throw new MavenFilteringException( "Cannot copy directory structure from "
- + resourceDirectory.getPath() + " to " + outputDirectory.getPath() );
+ if (mavenResourcesExecution.isIncludeEmptyDirs()) {
+ try {
+ File targetDirectory = targetPath == null ? outputDirectory : new File(outputDirectory, targetPath);
+ copyDirectoryLayout(resourceDirectory, targetDirectory, scanner);
+ } catch (IOException e) {
+ throw new MavenFilteringException("Cannot copy directory structure from "
+ + resourceDirectory.getPath() + " to " + outputDirectory.getPath());
}
}
- List<String> includedFiles = Arrays.asList( scanner.getIncludedFiles() );
+ List<String> includedFiles = Arrays.asList(scanner.getIncludedFiles());
- LOGGER.info( "Copying " + includedFiles.size() + " resource" + ( includedFiles.size() > 1 ? "s" : "" )
- + ( targetPath == null ? "" : " to " + targetPath ) );
+ LOGGER.info("Copying " + includedFiles.size() + " resource" + (includedFiles.size() > 1 ? "s" : "")
+ + (targetPath == null ? "" : " to " + targetPath));
- for ( String name : includedFiles )
- {
+ for (String name : includedFiles) {
- LOGGER.debug( "Copying file " + name );
- File source = new File( resourceDirectory, name );
+ LOGGER.debug("Copying file " + name);
+ File source = new File(resourceDirectory, name);
- File destinationFile = getDestinationFile( outputDirectory, targetPath, name, mavenResourcesExecution );
+ File destinationFile = getDestinationFile(outputDirectory, targetPath, name, mavenResourcesExecution);
- if ( mavenResourcesExecution.isFlatten() && destinationFile.exists() )
- {
- if ( mavenResourcesExecution.isOverwrite() )
- {
- LOGGER.warn( "existing file " + destinationFile.getName()
- + " will be overwritten by " + name );
- }
- else
- {
- throw new MavenFilteringException( "existing file " + destinationFile.getName()
- + " will be overwritten by " + name + " and overwrite was not set to true" );
+ if (mavenResourcesExecution.isFlatten() && destinationFile.exists()) {
+ if (mavenResourcesExecution.isOverwrite()) {
+ LOGGER.warn("existing file " + destinationFile.getName() + " will be overwritten by " + name);
+ } else {
+ throw new MavenFilteringException("existing file " + destinationFile.getName()
+ + " will be overwritten by " + name + " and overwrite was not set to true");
}
}
boolean filteredExt =
- filteredFileExtension( source.getName(), mavenResourcesExecution.getNonFilteredFileExtensions() );
- if ( resource.isFiltering() && isPropertiesFile( source ) )
- {
- propertiesFiles.add( source );
+ filteredFileExtension(source.getName(), mavenResourcesExecution.getNonFilteredFileExtensions());
+ if (resource.isFiltering() && isPropertiesFile(source)) {
+ propertiesFiles.add(source);
}
// Determine which encoding to use when filtering this file
- String encoding = getEncoding( source, mavenResourcesExecution.getEncoding(),
- mavenResourcesExecution.getPropertiesEncoding() );
- LOGGER.debug( "Using '" + encoding + "' encoding to copy filtered resource '"
- + source.getName() + "'." );
- mavenFileFilter.copyFile( source, destinationFile, resource.isFiltering() && filteredExt,
- mavenResourcesExecution.getFilterWrappers(),
- encoding,
- mavenResourcesExecution.isOverwrite() );
+ String encoding = getEncoding(
+ source, mavenResourcesExecution.getEncoding(), mavenResourcesExecution.getPropertiesEncoding());
+ LOGGER.debug("Using '" + encoding + "' encoding to copy filtered resource '" + source.getName() + "'.");
+ mavenFileFilter.copyFile(
+ source,
+ destinationFile,
+ resource.isFiltering() && filteredExt,
+ mavenResourcesExecution.getFilterWrappers(),
+ encoding,
+ mavenResourcesExecution.isOverwrite());
}
// deal with deleted source files
- scanner = buildContext.newDeleteScanner( resourceDirectory );
+ scanner = buildContext.newDeleteScanner(resourceDirectory);
- setupScanner( resource, scanner, mavenResourcesExecution.isAddDefaultExcludes() );
+ setupScanner(resource, scanner, mavenResourcesExecution.isAddDefaultExcludes());
scanner.scan();
- List<String> deletedFiles = Arrays.asList( scanner.getIncludedFiles() );
+ List<String> deletedFiles = Arrays.asList(scanner.getIncludedFiles());
- for ( String name : deletedFiles )
- {
- File destinationFile = getDestinationFile( outputDirectory, targetPath, name, mavenResourcesExecution );
+ for (String name : deletedFiles) {
+ File destinationFile = getDestinationFile(outputDirectory, targetPath, name, mavenResourcesExecution);
destinationFile.delete();
- buildContext.refresh( destinationFile );
+ buildContext.refresh(destinationFile);
}
}
@@ -305,32 +281,28 @@ public class DefaultMavenResourcesFiltering
// - properties is a filtered extension
// - filtering is enabled for at least one resource
// - there is at least one properties file in one of the resources that has filtering enabled
- if ( ( mavenResourcesExecution.getPropertiesEncoding() == null
- || mavenResourcesExecution.getPropertiesEncoding().length() < 1 )
- && !mavenResourcesExecution.getNonFilteredFileExtensions().contains( "properties" )
- && isFilteringUsed
- && propertiesFiles.size() > 0 )
- {
+ if ((mavenResourcesExecution.getPropertiesEncoding() == null
+ || mavenResourcesExecution.getPropertiesEncoding().length() < 1)
+ && !mavenResourcesExecution.getNonFilteredFileExtensions().contains("properties")
+ && isFilteringUsed
+ && propertiesFiles.size() > 0) {
// @todo Sometime in the future we should change this to be a warning
- LOGGER.info( "The encoding used to copy filtered properties files have not been set."
- + " This means that the same encoding will be used to copy filtered properties files"
- + " as when copying other filtered resources. This might not be what you want!"
- + " Run your build with --debug to see which files might be affected."
- + " Read more at "
- + "https://maven.apache.org/plugins/maven-resources-plugin/"
- + "examples/filtering-properties-files.html" );
+ LOGGER.info("The encoding used to copy filtered properties files have not been set."
+ + " This means that the same encoding will be used to copy filtered properties files"
+ + " as when copying other filtered resources. This might not be what you want!"
+ + " Run your build with --debug to see which files might be affected."
+ + " Read more at "
+ + "https://maven.apache.org/plugins/maven-resources-plugin/"
+ + "examples/filtering-properties-files.html");
StringBuilder affectedFiles = new StringBuilder();
- affectedFiles.append( "Here is a list of the filtered properties files in you project that might be"
- + " affected by encoding problems: " );
- for ( File propertiesFile : propertiesFiles )
- {
- affectedFiles.append( System.lineSeparator() ).append( " - " ).append( propertiesFile.getPath() );
+ affectedFiles.append("Here is a list of the filtered properties files in you project that might be"
+ + " affected by encoding problems: ");
+ for (File propertiesFile : propertiesFiles) {
+ affectedFiles.append(System.lineSeparator()).append(" - ").append(propertiesFile.getPath());
}
- LOGGER.debug( affectedFiles.toString() );
-
+ LOGGER.debug(affectedFiles.toString());
}
-
}
/**
@@ -343,23 +315,16 @@ public class DefaultMavenResourcesFiltering
* @return The encoding to use when filtering the specified file
* @since 3.2.0
*/
- static String getEncoding( File file, String encoding, String propertiesEncoding )
- {
- if ( isPropertiesFile( file ) )
- {
- if ( propertiesEncoding == null )
- {
+ static String getEncoding(File file, String encoding, String propertiesEncoding) {
+ if (isPropertiesFile(file)) {
+ if (propertiesEncoding == null) {
// Since propertiesEncoding is a new feature, not all plugins will have implemented support for it.
// These plugins will have propertiesEncoding set to null.
return encoding;
- }
- else
- {
+ } else {
return propertiesEncoding;
}
- }
- else
- {
+ } else {
return encoding;
}
}
@@ -371,143 +336,115 @@ public class DefaultMavenResourcesFiltering
* @return <code>true</code> if the file name has an extension of "properties", otherwise <code>false</code>
* @since 3.2.0
*/
- static boolean isPropertiesFile( File file )
- {
- return "properties".equals( getExtension( file.getName() ) );
+ static boolean isPropertiesFile(File file) {
+ return "properties".equals(getExtension(file.getName()));
}
- private void handleDefaultFilterWrappers( MavenResourcesExecution mavenResourcesExecution )
- throws MavenFilteringException
- {
+ private void handleDefaultFilterWrappers(MavenResourcesExecution mavenResourcesExecution)
+ throws MavenFilteringException {
List<FilterWrapper> filterWrappers = new ArrayList<>();
- if ( mavenResourcesExecution.getFilterWrappers() != null )
- {
- filterWrappers.addAll( mavenResourcesExecution.getFilterWrappers() );
+ if (mavenResourcesExecution.getFilterWrappers() != null) {
+ filterWrappers.addAll(mavenResourcesExecution.getFilterWrappers());
}
- filterWrappers.addAll( mavenFileFilter.getDefaultFilterWrappers( mavenResourcesExecution ) );
- mavenResourcesExecution.setFilterWrappers( filterWrappers );
+ filterWrappers.addAll(mavenFileFilter.getDefaultFilterWrappers(mavenResourcesExecution));
+ mavenResourcesExecution.setFilterWrappers(filterWrappers);
}
- private File getDestinationFile( File outputDirectory, String targetPath, String name,
- MavenResourcesExecution mavenResourcesExecution )
- throws MavenFilteringException
- {
+ private File getDestinationFile(
+ File outputDirectory, String targetPath, String name, MavenResourcesExecution mavenResourcesExecution)
+ throws MavenFilteringException {
String destination;
- if ( !mavenResourcesExecution.isFlatten() )
- {
+ if (!mavenResourcesExecution.isFlatten()) {
destination = name;
- }
- else
- {
- Path path = Paths.get( name );
+ } else {
+ Path path = Paths.get(name);
Path filePath = path.getFileName();
destination = filePath.toString();
}
- if ( mavenResourcesExecution.isFilterFilenames() && mavenResourcesExecution.getFilterWrappers().size() > 0 )
- {
- destination = filterFileName( destination, mavenResourcesExecution.getFilterWrappers() );
+ if (mavenResourcesExecution.isFilterFilenames()
+ && mavenResourcesExecution.getFilterWrappers().size() > 0) {
+ destination = filterFileName(destination, mavenResourcesExecution.getFilterWrappers());
}
- if ( targetPath != null )
- {
+ if (targetPath != null) {
destination = targetPath + "/" + destination;
}
- File destinationFile = new File( destination );
- if ( !destinationFile.isAbsolute() )
- {
- destinationFile = new File( outputDirectory, destination );
+ File destinationFile = new File(destination);
+ if (!destinationFile.isAbsolute()) {
+ destinationFile = new File(outputDirectory, destination);
}
- if ( !destinationFile.getParentFile().exists() )
- {
+ if (!destinationFile.getParentFile().exists()) {
destinationFile.getParentFile().mkdirs();
}
return destinationFile;
}
- private String[] setupScanner( Resource resource, Scanner scanner, boolean addDefaultExcludes )
- {
+ private String[] setupScanner(Resource resource, Scanner scanner, boolean addDefaultExcludes) {
String[] includes = null;
- if ( resource.getIncludes() != null && !resource.getIncludes().isEmpty() )
- {
- includes = resource.getIncludes().toArray( EMPTY_STRING_ARRAY );
- }
- else
- {
+ if (resource.getIncludes() != null && !resource.getIncludes().isEmpty()) {
+ includes = resource.getIncludes().toArray(EMPTY_STRING_ARRAY);
+ } else {
includes = DEFAULT_INCLUDES;
}
- scanner.setIncludes( includes );
+ scanner.setIncludes(includes);
String[] excludes = null;
- if ( resource.getExcludes() != null && !resource.getExcludes().isEmpty() )
- {
- excludes = resource.getExcludes().toArray( EMPTY_STRING_ARRAY );
- scanner.setExcludes( excludes );
+ if (resource.getExcludes() != null && !resource.getExcludes().isEmpty()) {
+ excludes = resource.getExcludes().toArray(EMPTY_STRING_ARRAY);
+ scanner.setExcludes(excludes);
}
- if ( addDefaultExcludes )
- {
+ if (addDefaultExcludes) {
scanner.addDefaultExcludes();
}
return includes;
}
- private void copyDirectoryLayout( File sourceDirectory, File destinationDirectory, Scanner scanner )
- throws IOException
- {
- if ( sourceDirectory == null )
- {
- throw new IOException( "source directory can't be null." );
+ private void copyDirectoryLayout(File sourceDirectory, File destinationDirectory, Scanner scanner)
+ throws IOException {
+ if (sourceDirectory == null) {
+ throw new IOException("source directory can't be null.");
}
- if ( destinationDirectory == null )
- {
- throw new IOException( "destination directory can't be null." );
+ if (destinationDirectory == null) {
+ throw new IOException("destination directory can't be null.");
}
- if ( sourceDirectory.equals( destinationDirectory ) )
- {
- throw new IOException( "source and destination are the same directory." );
+ if (sourceDirectory.equals(destinationDirectory)) {
+ throw new IOException("source and destination are the same directory.");
}
- if ( !sourceDirectory.exists() )
- {
- throw new IOException( "Source directory doesn't exists (" + sourceDirectory.getAbsolutePath() + ")." );
+ if (!sourceDirectory.exists()) {
+ throw new IOException("Source directory doesn't exists (" + sourceDirectory.getAbsolutePath() + ").");
}
- List<String> includedDirectories = Arrays.asList( scanner.getIncludedDirectories() );
+ List<String> includedDirectories = Arrays.asList(scanner.getIncludedDirectories());
- for ( String name : includedDirectories )
- {
- File source = new File( sourceDirectory, name );
+ for (String name : includedDirectories) {
+ File source = new File(sourceDirectory, name);
- if ( source.equals( sourceDirectory ) )
- {
+ if (source.equals(sourceDirectory)) {
continue;
}
- File destination = new File( destinationDirectory, name );
+ File destination = new File(destinationDirectory, name);
destination.mkdirs();
}
}
- private String getRelativeOutputDirectory( MavenResourcesExecution execution )
- {
+ private String getRelativeOutputDirectory(MavenResourcesExecution execution) {
String relOutDir = execution.getOutputDirectory().getAbsolutePath();
- if ( execution.getMavenProject() != null && execution.getMavenProject().getBasedir() != null )
- {
+ if (execution.getMavenProject() != null && execution.getMavenProject().getBasedir() != null) {
String basedir = execution.getMavenProject().getBasedir().getAbsolutePath();
- relOutDir = FilteringUtils.getRelativeFilePath( basedir, relOutDir );
- if ( relOutDir == null )
- {
+ relOutDir = FilteringUtils.getRelativeFilePath(basedir, relOutDir);
+ if (relOutDir == null) {
relOutDir = execution.getOutputDirectory().getPath();
- }
- else
- {
- relOutDir = relOutDir.replace( '\\', '/' );
+ } else {
+ relOutDir = relOutDir.replace('\\', '/');
}
}
@@ -517,32 +454,23 @@ public class DefaultMavenResourcesFiltering
/*
* Filter the name of a file using the same mechanism for filtering the content of the file.
*/
- private String filterFileName( String name, List<FilterWrapper> wrappers )
- throws MavenFilteringException
- {
-
- Reader reader = new StringReader( name );
- for ( FilterWrapper wrapper : wrappers )
- {
- reader = wrapper.getReader( reader );
+ private String filterFileName(String name, List<FilterWrapper> wrappers) throws MavenFilteringException {
+
+ Reader reader = new StringReader(name);
+ for (FilterWrapper wrapper : wrappers) {
+ reader = wrapper.getReader(reader);
}
- try ( StringWriter writer = new StringWriter() )
- {
- IOUtils.copy( reader, writer );
+ try (StringWriter writer = new StringWriter()) {
+ IOUtils.copy(reader, writer);
String filteredFilename = writer.toString();
- if ( LOGGER.isDebugEnabled() )
- {
- LOGGER.debug( "renaming filename " + name + " to " + filteredFilename );
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("renaming filename " + name + " to " + filteredFilename);
}
return filteredFilename;
+ } catch (IOException e) {
+ throw new MavenFilteringException("Failed filtering filename" + name, e);
}
- catch ( IOException e )
- {
- throw new MavenFilteringException( "Failed filtering filename" + name, e );
- }
-
}
-
}
diff --git a/src/main/java/org/apache/maven/shared/filtering/FilterWrapper.java b/src/main/java/org/apache/maven/shared/filtering/FilterWrapper.java
index fdef02b..b00f45d 100644
--- a/src/main/java/org/apache/maven/shared/filtering/FilterWrapper.java
+++ b/src/main/java/org/apache/maven/shared/filtering/FilterWrapper.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.filtering;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.shared.filtering;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.shared.filtering;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.filtering;
import java.io.Reader;
@@ -26,11 +25,10 @@ import java.io.Reader;
*
* @since TBD
*/
-public abstract class FilterWrapper
-{
+public abstract class FilterWrapper {
/**
* @param fileReader {@link Reader}
* @return the Reader instance
*/
- public abstract Reader getReader( Reader fileReader );
+ public abstract Reader getReader(Reader fileReader);
}
diff --git a/src/main/java/org/apache/maven/shared/filtering/FilteringUtils.java b/src/main/java/org/apache/maven/shared/filtering/FilteringUtils.java
index 8871434..1dd6f6b 100644
--- a/src/main/java/org/apache/maven/shared/filtering/FilteringUtils.java
+++ b/src/main/java/org/apache/maven/shared/filtering/FilteringUtils.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.filtering;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.shared.filtering;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.shared.filtering;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.filtering;
import java.io.File;
import java.io.IOException;
@@ -44,8 +43,7 @@ import org.codehaus.plexus.util.Os;
* @author Olivier Lamy
* @author Dennis Lundberg
*/
-public final class FilteringUtils
-{
+public final class FilteringUtils {
/**
* The number of bytes in a kilobyte.
*/
@@ -63,13 +61,12 @@ public final class FilteringUtils
private static final String WINDOWS_PATH_PATTERN = "^(.*)[a-zA-Z]:\\\\(.*)";
- private static final Pattern PATTERN = Pattern.compile( WINDOWS_PATH_PATTERN );
+ private static final Pattern PATTERN = Pattern.compile(WINDOWS_PATH_PATTERN);
/**
*
*/
- private FilteringUtils()
- {
+ private FilteringUtils() {
// nothing just an util class
}
@@ -79,32 +76,27 @@ public final class FilteringUtils
* @param val The value to be escaped.
* @return Escaped value
*/
- public static String escapeWindowsPath( String val )
- {
- if ( !isEmpty( val ) && PATTERN.matcher( val ).matches() )
- {
+ public static String escapeWindowsPath(String val) {
+ if (!isEmpty(val) && PATTERN.matcher(val).matches()) {
// Adapted from StringUtils.replace in plexus-utils to accommodate pre-escaped backslashes.
- StringBuilder buf = new StringBuilder( val.length() );
+ StringBuilder buf = new StringBuilder(val.length());
int start = 0, end = 0;
- while ( ( end = val.indexOf( '\\', start ) ) != -1 )
- {
- buf.append( val.substring( start, end ) ).append( "\\\\" );
+ while ((end = val.indexOf('\\', start)) != -1) {
+ buf.append(val.substring(start, end)).append("\\\\");
start = end + 1;
- if ( val.indexOf( '\\', end + 1 ) == end + 1 )
- {
+ if (val.indexOf('\\', end + 1) == end + 1) {
start++;
}
}
- buf.append( val.substring( start ) );
+ buf.append(val.substring(start));
return buf.toString();
}
return val;
}
-
/**
* Resolve a file <code>filename</code> to its canonical form. If <code>filename</code> is
* relative (doesn't start with <code>/</code>), it is resolved relative to
@@ -114,30 +106,23 @@ public final class FilteringUtils
* @param filename absolute or relative file path to resolve
* @return the canonical <code>File</code> of <code>filename</code>
*/
- public static File resolveFile( final File baseFile, String filename )
- {
+ public static File resolveFile(final File baseFile, String filename) {
String filenm = filename;
- if ( '/' != File.separatorChar )
- {
- filenm = filename.replace( '/', File.separatorChar );
+ if ('/' != File.separatorChar) {
+ filenm = filename.replace('/', File.separatorChar);
}
- if ( '\\' != File.separatorChar )
- {
- filenm = filename.replace( '\\', File.separatorChar );
+ if ('\\' != File.separatorChar) {
+ filenm = filename.replace('\\', File.separatorChar);
}
// deal with absolute files
- if ( filenm.startsWith( File.separator ) || ( Os.isFamily( Os.FAMILY_WINDOWS ) && filenm.indexOf( ":" ) > 0 ) )
- {
- File file = new File( filenm );
+ if (filenm.startsWith(File.separator) || (Os.isFamily(Os.FAMILY_WINDOWS) && filenm.indexOf(":") > 0)) {
+ File file = new File(filenm);
- try
- {
+ try {
file = file.getCanonicalFile();
- }
- catch ( final IOException ioe )
- {
+ } catch (final IOException ioe) {
// nop
}
@@ -148,44 +133,37 @@ public final class FilteringUtils
final char[] chars = filename.toCharArray();
final StringBuilder sb = new StringBuilder();
- //remove duplicate file separators in succession - except
- //on win32 at start of filename as UNC filenames can
- //be \\AComputer\AShare\myfile.txt
+ // remove duplicate file separators in succession - except
+ // on win32 at start of filename as UNC filenames can
+ // be \\AComputer\AShare\myfile.txt
int start = 0;
- if ( '\\' == File.separatorChar )
- {
- sb.append( filenm.charAt( 0 ) );
+ if ('\\' == File.separatorChar) {
+ sb.append(filenm.charAt(0));
start++;
}
- for ( int i = start; i < chars.length; i++ )
- {
+ for (int i = start; i < chars.length; i++) {
final boolean doubleSeparator = File.separatorChar == chars[i] && File.separatorChar == chars[i - 1];
- if ( !doubleSeparator )
- {
- sb.append( chars[i] );
+ if (!doubleSeparator) {
+ sb.append(chars[i]);
}
}
filenm = sb.toString();
- //must be relative
- File file = ( new File( baseFile, filenm ) ).getAbsoluteFile();
+ // must be relative
+ File file = (new File(baseFile, filenm)).getAbsoluteFile();
- try
- {
+ try {
file = file.getCanonicalFile();
- }
- catch ( final IOException ioe )
- {
+ } catch (final IOException ioe) {
// nop
}
return file;
}
-
/**
* <p>This method can calculate the relative path between two paths on a file system.</p>
* <pre>
@@ -206,87 +184,71 @@ public final class FilteringUtils
* @param newPath new path
* @return a relative file path from <code>oldPath</code>.
*/
- public static String getRelativeFilePath( final String oldPath, final String newPath )
- {
- if ( isEmpty( oldPath ) || isEmpty( newPath ) )
- {
+ public static String getRelativeFilePath(final String oldPath, final String newPath) {
+ if (isEmpty(oldPath) || isEmpty(newPath)) {
return "";
}
// normalise the path delimiters
- String fromPath = new File( oldPath ).getPath();
- String toPath = new File( newPath ).getPath();
+ String fromPath = new File(oldPath).getPath();
+ String toPath = new File(newPath).getPath();
// strip any leading slashes if its a windows path
- if ( toPath.matches( "^\\[a-zA-Z]:" ) )
- {
- toPath = toPath.substring( 1 );
+ if (toPath.matches("^\\[a-zA-Z]:")) {
+ toPath = toPath.substring(1);
}
- if ( fromPath.matches( "^\\[a-zA-Z]:" ) )
- {
- fromPath = fromPath.substring( 1 );
+ if (fromPath.matches("^\\[a-zA-Z]:")) {
+ fromPath = fromPath.substring(1);
}
// lowercase windows drive letters.
- if ( fromPath.startsWith( ":", 1 ) )
- {
- fromPath = Character.toLowerCase( fromPath.charAt( 0 ) ) + fromPath.substring( 1 );
+ if (fromPath.startsWith(":", 1)) {
+ fromPath = Character.toLowerCase(fromPath.charAt(0)) + fromPath.substring(1);
}
- if ( toPath.startsWith( ":", 1 ) )
- {
- toPath = Character.toLowerCase( toPath.charAt( 0 ) ) + toPath.substring( 1 );
+ if (toPath.startsWith(":", 1)) {
+ toPath = Character.toLowerCase(toPath.charAt(0)) + toPath.substring(1);
}
// check for the presence of windows drives. No relative way of
// traversing from one to the other.
- if ( ( toPath.startsWith( ":", 1 ) && fromPath.startsWith( ":", 1 ) )
- && ( !toPath.substring( 0, 1 ).equals( fromPath.substring( 0, 1 ) ) ) )
- {
+ if ((toPath.startsWith(":", 1) && fromPath.startsWith(":", 1))
+ && (!toPath.substring(0, 1).equals(fromPath.substring(0, 1)))) {
// they both have drive path element but they dont match, no
// relative path
return null;
}
- if ( ( toPath.startsWith( ":", 1 ) && !fromPath.startsWith( ":", 1 ) )
- || ( !toPath.startsWith( ":", 1 ) && fromPath.startsWith( ":", 1 ) ) )
- {
+ if ((toPath.startsWith(":", 1) && !fromPath.startsWith(":", 1))
+ || (!toPath.startsWith(":", 1) && fromPath.startsWith(":", 1))) {
// one has a drive path element and the other doesnt, no relative
// path.
return null;
}
- String resultPath = buildRelativePath( toPath, fromPath, File.separatorChar );
+ String resultPath = buildRelativePath(toPath, fromPath, File.separatorChar);
- if ( newPath.endsWith( File.separator ) && !resultPath.endsWith( File.separator ) )
- {
+ if (newPath.endsWith(File.separator) && !resultPath.endsWith(File.separator)) {
return resultPath + File.separator;
}
return resultPath;
}
- private static String buildRelativePath( String toPath, String fromPath, final char separatorChar )
- {
+ private static String buildRelativePath(String toPath, String fromPath, final char separatorChar) {
// use tokeniser to traverse paths and for lazy checking
- StringTokenizer toTokeniser = new StringTokenizer( toPath, String.valueOf( separatorChar ) );
- StringTokenizer fromTokeniser = new StringTokenizer( fromPath, String.valueOf( separatorChar ) );
+ StringTokenizer toTokeniser = new StringTokenizer(toPath, String.valueOf(separatorChar));
+ StringTokenizer fromTokeniser = new StringTokenizer(fromPath, String.valueOf(separatorChar));
int count = 0;
// walk along the to path looking for divergence from the from path
- while ( toTokeniser.hasMoreTokens() && fromTokeniser.hasMoreTokens() )
- {
- if ( separatorChar == '\\' )
- {
- if ( !fromTokeniser.nextToken().equalsIgnoreCase( toTokeniser.nextToken() ) )
- {
+ while (toTokeniser.hasMoreTokens() && fromTokeniser.hasMoreTokens()) {
+ if (separatorChar == '\\') {
+ if (!fromTokeniser.nextToken().equalsIgnoreCase(toTokeniser.nextToken())) {
break;
}
- }
- else
- {
- if ( !fromTokeniser.nextToken().equals( toTokeniser.nextToken() ) )
- {
+ } else {
+ if (!fromTokeniser.nextToken().equals(toTokeniser.nextToken())) {
break;
}
}
@@ -297,11 +259,10 @@ public final class FilteringUtils
// reinitialise the tokenisers to count positions to retrieve the
// gobbled token
- toTokeniser = new StringTokenizer( toPath, String.valueOf( separatorChar ) );
- fromTokeniser = new StringTokenizer( fromPath, String.valueOf( separatorChar ) );
+ toTokeniser = new StringTokenizer(toPath, String.valueOf(separatorChar));
+ fromTokeniser = new StringTokenizer(fromPath, String.valueOf(separatorChar));
- while ( count-- > 0 )
- {
+ while (count-- > 0) {
fromTokeniser.nextToken();
toTokeniser.nextToken();
}
@@ -309,38 +270,32 @@ public final class FilteringUtils
StringBuilder relativePath = new StringBuilder();
// add back refs for the rest of from location.
- while ( fromTokeniser.hasMoreTokens() )
- {
+ while (fromTokeniser.hasMoreTokens()) {
fromTokeniser.nextToken();
- relativePath.append( ".." );
+ relativePath.append("..");
- if ( fromTokeniser.hasMoreTokens() )
- {
- relativePath.append( separatorChar );
+ if (fromTokeniser.hasMoreTokens()) {
+ relativePath.append(separatorChar);
}
}
- if ( relativePath.length() != 0 && toTokeniser.hasMoreTokens() )
- {
- relativePath.append( separatorChar );
+ if (relativePath.length() != 0 && toTokeniser.hasMoreTokens()) {
+ relativePath.append(separatorChar);
}
// add fwd fills for whatevers left of newPath.
- while ( toTokeniser.hasMoreTokens() )
- {
- relativePath.append( toTokeniser.nextToken() );
+ while (toTokeniser.hasMoreTokens()) {
+ relativePath.append(toTokeniser.nextToken());
- if ( toTokeniser.hasMoreTokens() )
- {
- relativePath.append( separatorChar );
+ if (toTokeniser.hasMoreTokens()) {
+ relativePath.append(separatorChar);
}
}
return relativePath.toString();
}
- static boolean isEmpty( final String string )
- {
+ static boolean isEmpty(final String string) {
return string == null || string.trim().isEmpty();
}
@@ -356,109 +311,87 @@ public final class FilteringUtils
* to.lastModified() < from.lastModified()
* @throws IOException if an IO error occurs during copying or filtering
*/
- public static void copyFile( File from, File to, String encoding,
- FilterWrapper[] wrappers, boolean overwrite )
- throws IOException
- {
- if ( wrappers == null || wrappers.length == 0 )
- {
- if ( overwrite || to.lastModified() < from.lastModified() )
- {
- Files.copy( from.toPath(), to.toPath(), LinkOption.NOFOLLOW_LINKS,
- StandardCopyOption.REPLACE_EXISTING );
+ public static void copyFile(File from, File to, String encoding, FilterWrapper[] wrappers, boolean overwrite)
+ throws IOException {
+ if (wrappers == null || wrappers.length == 0) {
+ if (overwrite || to.lastModified() < from.lastModified()) {
+ Files.copy(from.toPath(), to.toPath(), LinkOption.NOFOLLOW_LINKS, StandardCopyOption.REPLACE_EXISTING);
}
- }
- else
- {
- Charset charset = charset( encoding );
+ } else {
+ Charset charset = charset(encoding);
// buffer so it isn't reading a byte at a time!
- try ( Reader fileReader = Files.newBufferedReader( from.toPath(), charset ) )
- {
+ try (Reader fileReader = Files.newBufferedReader(from.toPath(), charset)) {
Reader wrapped = fileReader;
- for ( FilterWrapper wrapper : wrappers )
- {
- wrapped = wrapper.getReader( wrapped );
+ for (FilterWrapper wrapper : wrappers) {
+ wrapped = wrapper.getReader(wrapped);
}
- if ( overwrite || !to.exists() )
- {
- try ( Writer fileWriter = Files.newBufferedWriter( to.toPath(), charset ) )
- {
- IOUtils.copy( wrapped, fileWriter );
+ if (overwrite || !to.exists()) {
+ try (Writer fileWriter = Files.newBufferedWriter(to.toPath(), charset)) {
+ IOUtils.copy(wrapped, fileWriter);
}
- }
- else
- {
+ } else {
CharsetEncoder encoder = charset.newEncoder();
int totalBufferSize = FILE_COPY_BUFFER_SIZE;
- int charBufferSize = ( int ) Math.floor( totalBufferSize / ( 2 + 2 * encoder.maxBytesPerChar() ) );
- int byteBufferSize = ( int ) Math.ceil( charBufferSize * encoder.maxBytesPerChar() );
+ int charBufferSize = (int) Math.floor(totalBufferSize / (2 + 2 * encoder.maxBytesPerChar()));
+ int byteBufferSize = (int) Math.ceil(charBufferSize * encoder.maxBytesPerChar());
- CharBuffer newChars = CharBuffer.allocate( charBufferSize );
- ByteBuffer newBytes = ByteBuffer.allocate( byteBufferSize );
- ByteBuffer existingBytes = ByteBuffer.allocate( byteBufferSize );
+ CharBuffer newChars = CharBuffer.allocate(charBufferSize);
+ ByteBuffer newBytes = ByteBuffer.allocate(byteBufferSize);
+ ByteBuffer existingBytes = ByteBuffer.allocate(byteBufferSize);
CoderResult coderResult;
int existingRead;
boolean writing = false;
- try ( RandomAccessFile existing = new RandomAccessFile( to, "rw" ) )
- {
+ try (RandomAccessFile existing = new RandomAccessFile(to, "rw")) {
int n;
- while ( -1 != ( n = wrapped.read( newChars ) ) )
- {
- ( (Buffer) newChars ).flip();
+ while (-1 != (n = wrapped.read(newChars))) {
+ ((Buffer) newChars).flip();
- coderResult = encoder.encode( newChars, newBytes, n != 0 );
- if ( coderResult.isError() )
- {
+ coderResult = encoder.encode(newChars, newBytes, n != 0);
+ if (coderResult.isError()) {
coderResult.throwException();
}
- ( ( Buffer ) newBytes ).flip();
+ ((Buffer) newBytes).flip();
- if ( !writing )
- {
- existingRead = existing.read( existingBytes.array(), 0, newBytes.remaining() );
- ( ( Buffer ) existingBytes ).position( existingRead );
- ( ( Buffer ) existingBytes ).flip();
+ if (!writing) {
+ existingRead = existing.read(existingBytes.array(), 0, newBytes.remaining());
+ ((Buffer) existingBytes).position(existingRead);
+ ((Buffer) existingBytes).flip();
- if ( newBytes.compareTo( existingBytes ) != 0 )
- {
+ if (newBytes.compareTo(existingBytes) != 0) {
writing = true;
- if ( existingRead > 0 )
- {
- existing.seek( existing.getFilePointer() - existingRead );
+ if (existingRead > 0) {
+ existing.seek(existing.getFilePointer() - existingRead);
}
}
}
- if ( writing )
- {
- existing.write( newBytes.array(), 0, newBytes.remaining() );
+ if (writing) {
+ existing.write(newBytes.array(), 0, newBytes.remaining());
}
- ( ( Buffer ) newChars ).clear();
- ( ( Buffer ) newBytes ).clear();
- ( ( Buffer ) existingBytes ).clear();
+ ((Buffer) newChars).clear();
+ ((Buffer) newBytes).clear();
+ ((Buffer) existingBytes).clear();
}
- if ( existing.length() > existing.getFilePointer() )
- {
- existing.setLength( existing.getFilePointer() );
+ if (existing.length() > existing.getFilePointer()) {
+ existing.setLength(existing.getFilePointer());
}
}
}
}
}
- copyFilePermissions( from, to );
+ copyFilePermissions(from, to);
}
-
/**
* Attempts to copy file permissions from the source to the destination file.
* Initially attempts to copy posix file permissions, assuming that the files are both on posix filesystems.
@@ -469,40 +402,25 @@ public final class FilteringUtils
* @param source the file to copy permissions from.
* @param destination the file to copy permissions to.
*/
- private static void copyFilePermissions( File source, File destination )
- throws IOException
- {
- try
- {
+ private static void copyFilePermissions(File source, File destination) throws IOException {
+ try {
// attempt to copy posix file permissions
- Files.setPosixFilePermissions(
- destination.toPath(),
- Files.getPosixFilePermissions( source.toPath() )
- );
- }
- catch ( NoSuchFileException nsfe )
- {
+ Files.setPosixFilePermissions(destination.toPath(), Files.getPosixFilePermissions(source.toPath()));
+ } catch (NoSuchFileException nsfe) {
// ignore if destination file or symlink does not exist
- }
- catch ( UnsupportedOperationException e )
- {
+ } catch (UnsupportedOperationException e) {
// fallback to setting partial permissions
- destination.setExecutable( source.canExecute() );
- destination.setReadable( source.canRead() );
- destination.setWritable( source.canWrite() );
+ destination.setExecutable(source.canExecute());
+ destination.setReadable(source.canRead());
+ destination.setWritable(source.canWrite());
}
}
- private static Charset charset( String encoding )
- {
- if ( encoding == null || encoding.isEmpty() )
- {
+ private static Charset charset(String encoding) {
+ if (encoding == null || encoding.isEmpty()) {
return Charset.defaultCharset();
- }
- else
- {
- return Charset.forName( encoding );
+ } else {
+ return Charset.forName(encoding);
}
}
-
}
diff --git a/src/main/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEnding.java b/src/main/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEnding.java
index a4b396f..8d8a3cc 100644
--- a/src/main/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEnding.java
+++ b/src/main/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEnding.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.filtering;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.shared.filtering;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.shared.filtering;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.filtering;
import java.io.BufferedReader;
import java.io.IOException;
@@ -36,9 +35,7 @@ import org.codehaus.plexus.interpolation.SimpleRecursionInterceptor;
* @author Olivier Lamy
* @since 1.0
*/
-public class InterpolatorFilterReaderLineEnding
- extends AbstractFilterReaderLineEnding
-{
+public class InterpolatorFilterReaderLineEnding extends AbstractFilterReaderLineEnding {
/**
* Interpolator used to interpolate
@@ -87,10 +84,13 @@ public class InterpolatorFilterReaderLineEnding
* @param endToken end token to use
* @param supportMultiLineFiltering If multi line filtering is allowed
*/
- public InterpolatorFilterReaderLineEnding( Reader in, Interpolator interpolator, String beginToken, String endToken,
- boolean supportMultiLineFiltering )
- {
- this( in, interpolator, beginToken, endToken, new SimpleRecursionInterceptor(), supportMultiLineFiltering );
+ public InterpolatorFilterReaderLineEnding(
+ Reader in,
+ Interpolator interpolator,
+ String beginToken,
+ String endToken,
+ boolean supportMultiLineFiltering) {
+ this(in, interpolator, beginToken, endToken, new SimpleRecursionInterceptor(), supportMultiLineFiltering);
}
/**
@@ -101,12 +101,15 @@ public class InterpolatorFilterReaderLineEnding
* @param ri The {@link RecursionInterceptor} to use to prevent recursive expressions.
* @param supportMultiLineFiltering If multi line filtering is allowed
*/
- private InterpolatorFilterReaderLineEnding( Reader in, Interpolator interpolator, String beginToken,
- String endToken, RecursionInterceptor ri,
- boolean supportMultiLineFiltering )
- {
+ private InterpolatorFilterReaderLineEnding(
+ Reader in,
+ Interpolator interpolator,
+ String beginToken,
+ String endToken,
+ RecursionInterceptor ri,
+ boolean supportMultiLineFiltering) {
// wrap our own buffer, so we can use mark/reset safely.
- super( new BufferedReader( in ) );
+ super(new BufferedReader(in));
this.interpolator = interpolator;
@@ -119,7 +122,6 @@ public class InterpolatorFilterReaderLineEnding
this.supportMultiLineFiltering = supportMultiLineFiltering;
calculateMarkLength();
-
}
/**
@@ -131,18 +133,13 @@ public class InterpolatorFilterReaderLineEnding
* @throws IOException If an I/O error occurs
*/
@Override
- public long skip( long n )
- throws IOException
- {
- if ( n < 0L )
- {
- throw new IllegalArgumentException( "skip value is negative" );
+ public long skip(long n) throws IOException {
+ if (n < 0L) {
+ throw new IllegalArgumentException("skip value is negative");
}
- for ( long i = 0; i < n; i++ )
- {
- if ( read() == -1 )
- {
+ for (long i = 0; i < n; i++) {
+ if (read() == -1) {
return i;
}
}
@@ -160,20 +157,13 @@ public class InterpolatorFilterReaderLineEnding
* @throws IOException If an I/O error occurs
*/
@Override
- public int read( char cbuf[], int off, int len )
- throws IOException
- {
- for ( int i = 0; i < len; i++ )
- {
+ public int read(char cbuf[], int off, int len) throws IOException {
+ for (int i = 0; i < len; i++) {
int ch = read();
- if ( ch == -1 )
- {
- if ( i == 0 )
- {
+ if (ch == -1) {
+ if (i == 0) {
return -1;
- }
- else
- {
+ } else {
return i;
}
}
@@ -189,209 +179,165 @@ public class InterpolatorFilterReaderLineEnding
* @throws IOException if the underlying stream throws an IOException during reading
*/
@Override
- public int read()
- throws IOException
- {
- if ( replaceIndex > 0 )
- {
- return replaceData.charAt( replaceData.length() - ( replaceIndex-- ) );
+ public int read() throws IOException {
+ if (replaceIndex > 0) {
+ return replaceData.charAt(replaceData.length() - (replaceIndex--));
}
- if ( eof )
- {
+ if (eof) {
return -1;
}
- in.mark( markLength );
+ in.mark(markLength);
int ch = in.read();
- if ( ch == -1 || ( ch == '\n' && !supportMultiLineFiltering ) )
- {
+ if (ch == -1 || (ch == '\n' && !supportMultiLineFiltering)) {
return ch;
}
- boolean inEscape = useEscape && ch == getEscapeString().charAt( 0 );
+ boolean inEscape = useEscape && ch == getEscapeString().charAt(0);
StringBuilder key = new StringBuilder();
// have we found an escape string?
- if ( inEscape )
- {
- for ( int i = 0; i < getEscapeString().length(); i++ )
- {
- key.append( (char) ch );
-
- if ( ch != getEscapeString().charAt( i ) || ch == -1 || ( ch == '\n' && !supportMultiLineFiltering ) )
- {
+ if (inEscape) {
+ for (int i = 0; i < getEscapeString().length(); i++) {
+ key.append((char) ch);
+
+ if (ch != getEscapeString().charAt(i) || ch == -1 || (ch == '\n' && !supportMultiLineFiltering)) {
// mismatch, EOF or EOL, no escape string here
in.reset();
inEscape = false;
- key.setLength( 0 );
+ key.setLength(0);
break;
}
ch = in.read();
}
-
}
// have we found a delimiter?
boolean foundToken = false;
- for ( int i = 0; i < beginToken.length(); i++ )
- {
- if ( ch != beginToken.charAt( i ) || ch == -1 || ( ch == '\n' && !supportMultiLineFiltering ) )
- {
+ for (int i = 0; i < beginToken.length(); i++) {
+ if (ch != beginToken.charAt(i) || ch == -1 || (ch == '\n' && !supportMultiLineFiltering)) {
// mismatch, EOF or EOL, no match
break;
}
- if ( i == beginToken.length() - 1 )
- {
+ if (i == beginToken.length() - 1) {
foundToken = true;
-
}
ch = in.read();
-
}
in.reset();
- in.skip( key.length() );
+ in.skip(key.length());
ch = in.read();
// escape means no luck, prevent parsing of the escaped character, and return
- if ( inEscape )
- {
-
- if ( beginToken != null )
- {
- if ( !isPreserveEscapeString() )
- {
- key.setLength( 0 );
+ if (inEscape) {
+
+ if (beginToken != null) {
+ if (!isPreserveEscapeString()) {
+ key.setLength(0);
}
}
- key.append( (char) ch );
+ key.append((char) ch);
replaceData = key.toString();
replaceIndex = key.length();
return read();
-
}
// no match means no luck, reset and return
- if ( !foundToken )
- {
+ if (!foundToken) {
in.reset();
return in.read();
-
}
// we're committed, find the end token, EOL or EOF
- key.append( beginToken );
+ key.append(beginToken);
in.reset();
- in.skip( beginToken.length() );
+ in.skip(beginToken.length());
ch = in.read();
int endTokenSize = endToken.length();
int end = endTokenSize;
- do
- {
- if ( ch == -1 )
- {
+ do {
+ if (ch == -1) {
break;
- }
- else if ( ch == '\n' && !supportMultiLineFiltering )
- {
+ } else if (ch == '\n' && !supportMultiLineFiltering) {
// EOL
- key.append( (char) ch );
+ key.append((char) ch);
break;
}
- key.append( (char) ch );
+ key.append((char) ch);
- if ( ch == this.endToken.charAt( endTokenSize - end ) )
- {
+ if (ch == this.endToken.charAt(endTokenSize - end)) {
end--;
- if ( end == 0 )
- {
+ if (end == 0) {
break;
}
- }
- else
- {
+ } else {
end = endTokenSize;
}
ch = in.read();
- }
- while ( true );
+ } while (true);
// found endtoken? interpolate our key resolved above
String value = null;
- if ( end == 0 )
- {
- try
- {
- if ( interpolateWithPrefixPattern )
- {
- value = interpolator.interpolate( key.toString(), "", recursionInterceptor );
+ if (end == 0) {
+ try {
+ if (interpolateWithPrefixPattern) {
+ value = interpolator.interpolate(key.toString(), "", recursionInterceptor);
+ } else {
+ value = interpolator.interpolate(key.toString(), recursionInterceptor);
}
- else
- {
- value = interpolator.interpolate( key.toString(), recursionInterceptor );
- }
- }
- catch ( InterpolationException e )
- {
- throw new IllegalArgumentException( e );
+ } catch (InterpolationException e) {
+ throw new IllegalArgumentException(e);
}
}
// write away the value if present, otherwise the key unmodified
- if ( value != null )
- {
+ if (value != null) {
replaceData = value;
replaceIndex = value.length();
- }
- else
- {
+ } else {
replaceData = key.toString();
replaceIndex = key.length();
}
- if ( ch == -1 )
- {
+ if (ch == -1) {
eof = true;
}
return read();
-
}
/**
* @return current state of interpolate with prefix pattern.
*/
- public boolean isInterpolateWithPrefixPattern()
- {
+ public boolean isInterpolateWithPrefixPattern() {
return interpolateWithPrefixPattern;
}
/**
* @param interpolateWithPrefixPattern interpolate with prefix pattern.
*/
- public void setInterpolateWithPrefixPattern( boolean interpolateWithPrefixPattern )
- {
+ public void setInterpolateWithPrefixPattern(boolean interpolateWithPrefixPattern) {
this.interpolateWithPrefixPattern = interpolateWithPrefixPattern;
}
/**
* @return {@link #recursionInterceptor}
*/
- public RecursionInterceptor getRecursionInterceptor()
- {
+ public RecursionInterceptor getRecursionInterceptor() {
return recursionInterceptor;
}
@@ -399,10 +345,8 @@ public class InterpolatorFilterReaderLineEnding
* @param theRecursionInterceptor {@link RecursionInterceptor}
* @return {@link InterpolatorFilterReaderLineEnding}
*/
- public InterpolatorFilterReaderLineEnding setRecursionInterceptor( RecursionInterceptor theRecursionInterceptor )
- {
+ public InterpolatorFilterReaderLineEnding setRecursionInterceptor(RecursionInterceptor theRecursionInterceptor) {
this.recursionInterceptor = theRecursionInterceptor;
return this;
}
-
}
diff --git a/src/main/java/org/apache/maven/shared/filtering/MavenFileFilter.java b/src/main/java/org/apache/maven/shared/filtering/MavenFileFilter.java
index c6607e3..261eea6 100644
--- a/src/main/java/org/apache/maven/shared/filtering/MavenFileFilter.java
+++ b/src/main/java/org/apache/maven/shared/filtering/MavenFileFilter.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.filtering;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.shared.filtering;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.shared.filtering;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.filtering;
import java.io.File;
import java.util.List;
@@ -28,9 +27,7 @@ import org.apache.maven.project.MavenProject;
/**
* @author Olivier Lamy
*/
-public interface MavenFileFilter
- extends DefaultFilterInfo
-{
+public interface MavenFileFilter extends DefaultFilterInfo {
/**
* Will copy a file with some filtering using defaultFilterWrappers.
@@ -46,17 +43,23 @@ public interface MavenFileFilter
* @throws MavenFilteringException in case of failure.
* @see DefaultFilterInfo#getDefaultFilterWrappers(MavenProject, List, boolean,MavenSession, MavenResourcesExecution)
*/
- void copyFile( File from, final File to, boolean filtering, MavenProject mavenProject, List<String> filters,
- boolean escapedBackslashesInFilePath, String encoding, MavenSession mavenSession )
- throws MavenFilteringException;
+ void copyFile(
+ File from,
+ File to,
+ boolean filtering,
+ MavenProject mavenProject,
+ List<String> filters,
+ boolean escapedBackslashesInFilePath,
+ String encoding,
+ MavenSession mavenSession)
+ throws MavenFilteringException;
/**
* @param mavenFileFilterRequest the request
* @throws MavenFilteringException in case of failure.
* @since 1.0-beta-3
*/
- void copyFile( MavenFileFilterRequest mavenFileFilterRequest )
- throws MavenFilteringException;
+ void copyFile(MavenFileFilterRequest mavenFileFilterRequest) throws MavenFilteringException;
/**
* @param from The source file
@@ -66,9 +69,8 @@ public interface MavenFileFilter
* @param encoding The encoding used during the filtering.
* @throws MavenFilteringException In case of an error.
*/
- void copyFile( File from, final File to, boolean filtering, List<FilterWrapper> filterWrappers,
- String encoding )
- throws MavenFilteringException;
+ void copyFile(File from, File to, boolean filtering, List<FilterWrapper> filterWrappers, String encoding)
+ throws MavenFilteringException;
/**
* @param from The source file
@@ -80,7 +82,12 @@ public interface MavenFileFilter
* @throws MavenFilteringException In case of an error.
* @since 1.0-beta-2
*/
- void copyFile( File from, final File to, boolean filtering, List<FilterWrapper> filterWrappers,
- String encoding, boolean overwrite )
- throws MavenFilteringException;
+ void copyFile(
+ File from,
+ File to,
+ boolean filtering,
+ List<FilterWrapper> filterWrappers,
+ String encoding,
+ boolean overwrite)
+ throws MavenFilteringException;
}
diff --git a/src/main/java/org/apache/maven/shared/filtering/MavenFileFilterRequest.java b/src/main/java/org/apache/maven/shared/filtering/MavenFileFilterRequest.java
index 27d0fc6..fed5794 100644
--- a/src/main/java/org/apache/maven/shared/filtering/MavenFileFilterRequest.java
+++ b/src/main/java/org/apache/maven/shared/filtering/MavenFileFilterRequest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.filtering;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.shared.filtering;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.shared.filtering;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.filtering;
import java.io.File;
import java.util.List;
@@ -30,9 +29,7 @@ import org.apache.maven.project.MavenProject;
* @author Olivier Lamy
* @since 1.0-beta-3
*/
-public class MavenFileFilterRequest
- extends AbstractMavenFilteringRequest
-{
+public class MavenFileFilterRequest extends AbstractMavenFilteringRequest {
private File from;
@@ -45,8 +42,7 @@ public class MavenFileFilterRequest
/**
* The constructor.
*/
- public MavenFileFilterRequest()
- {
+ public MavenFileFilterRequest() {
// nothing
}
@@ -61,17 +57,23 @@ public class MavenFileFilterRequest
* @param mavenSession The Maven Session.
* @param additionalProperties Supplemental properties.
*/
- public MavenFileFilterRequest( File from, File to, boolean filtering, MavenProject mavenProject,
- List<String> filters, boolean escapedBackslashesInFilePath, String encoding,
- MavenSession mavenSession, Properties additionalProperties )
- {
- super( mavenProject, filters, mavenSession );
+ public MavenFileFilterRequest(
+ File from,
+ File to,
+ boolean filtering,
+ MavenProject mavenProject,
+ List<String> filters,
+ boolean escapedBackslashesInFilePath,
+ String encoding,
+ MavenSession mavenSession,
+ Properties additionalProperties) {
+ super(mavenProject, filters, mavenSession);
this.encoding = encoding;
this.from = from;
this.to = to;
this.filtering = filtering;
- setAdditionalProperties( additionalProperties );
- setEscapeWindowsPaths( escapedBackslashesInFilePath );
+ setAdditionalProperties(additionalProperties);
+ setEscapeWindowsPaths(escapedBackslashesInFilePath);
}
/**
@@ -79,8 +81,7 @@ public class MavenFileFilterRequest
*
* @return Current encoding.
*/
- public String getEncoding()
- {
+ public String getEncoding() {
return encoding;
}
@@ -89,57 +90,49 @@ public class MavenFileFilterRequest
*
* @param encoding Give the new value for encoding.
*/
- public void setEncoding( String encoding )
- {
+ public void setEncoding(String encoding) {
this.encoding = encoding;
}
/**
* @return to filter from.
*/
- public File getFrom()
- {
+ public File getFrom() {
return from;
}
/**
* @param from set filter from.
*/
- public void setFrom( File from )
- {
+ public void setFrom(File from) {
this.from = from;
}
/**
* @return The filter to
*/
- public File getTo()
- {
+ public File getTo() {
return to;
}
/**
* @param to Set the target.
*/
- public void setTo( File to )
- {
+ public void setTo(File to) {
this.to = to;
}
/**
* @return if we are filtering yes {@code true} no {@code false}
*/
- public boolean isFiltering()
- {
+ public boolean isFiltering() {
return filtering;
}
/**
* @param filtering set filtering yes / no.
*/
- public void setFiltering( boolean filtering )
- {
+ public void setFiltering(boolean filtering) {
this.filtering = filtering;
}
-
}
diff --git a/src/main/java/org/apache/maven/shared/filtering/MavenFilteringException.java b/src/main/java/org/apache/maven/shared/filtering/MavenFilteringException.java
index 3de9bf0..26668fb 100644
--- a/src/main/java/org/apache/maven/shared/filtering/MavenFilteringException.java
+++ b/src/main/java/org/apache/maven/shared/filtering/MavenFilteringException.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.filtering;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.shared.filtering;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,13 +16,12 @@ package org.apache.maven.shared.filtering;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.filtering;
/**
* @author Olivier Lamy
*/
-public class MavenFilteringException
- extends Exception
-{
+public class MavenFilteringException extends Exception {
/**
*
@@ -34,34 +31,29 @@ public class MavenFilteringException
/**
*
*/
- public MavenFilteringException()
- {
+ public MavenFilteringException() {
// nothing
}
/**
* @param message the message
*/
- public MavenFilteringException( String message )
- {
- super( message );
+ public MavenFilteringException(String message) {
+ super(message);
}
/**
* @param cause the cause of the exception
*/
- public MavenFilteringException( Throwable cause )
- {
- super( cause );
+ public MavenFilteringException(Throwable cause) {
+ super(cause);
}
/**
* @param message a message
* @param cause a worthy cause
*/
- public MavenFilteringException( String message, Throwable cause )
- {
- super( message, cause );
+ public MavenFilteringException(String message, Throwable cause) {
+ super(message, cause);
}
-
}
diff --git a/src/main/java/org/apache/maven/shared/filtering/MavenReaderFilter.java b/src/main/java/org/apache/maven/shared/filtering/MavenReaderFilter.java
index 28c74ff..1ef0387 100644
--- a/src/main/java/org/apache/maven/shared/filtering/MavenReaderFilter.java
+++ b/src/main/java/org/apache/maven/shared/filtering/MavenReaderFilter.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.filtering;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.shared.filtering;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.shared.filtering;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.filtering;
import java.io.Reader;
import java.util.List;
@@ -30,9 +29,7 @@ import org.apache.maven.project.MavenProject;
* @author Kristian Rosenvold
* @since 1.3
*/
-public interface MavenReaderFilter
- extends DefaultFilterInfo
-{
+public interface MavenReaderFilter extends DefaultFilterInfo {
/**
* Provides a new reader that applies filtering using defaultFilterWrappers.
*
@@ -47,9 +44,14 @@ public interface MavenReaderFilter
* @see #getDefaultFilterWrappers(org.apache.maven.project.MavenProject, java.util.List, boolean,
* org.apache.maven.execution.MavenSession, org.apache.maven.shared.filtering.MavenResourcesExecution)
*/
- Reader filter( Reader from, boolean filtering, MavenProject mavenProject, List<String> filters,
- boolean escapedBackslashesInFilePath, MavenSession mavenSession )
- throws MavenFilteringException;
+ Reader filter(
+ Reader from,
+ boolean filtering,
+ MavenProject mavenProject,
+ List<String> filters,
+ boolean escapedBackslashesInFilePath,
+ MavenSession mavenSession)
+ throws MavenFilteringException;
/**
* Provides a new reader that applies filtering using defaultFilterWrappers.
@@ -59,8 +61,7 @@ public interface MavenReaderFilter
* @return an input stream that applies the filter
* @since 1.0-beta-3
*/
- Reader filter( MavenReaderFilterRequest mavenFileFilterRequest )
- throws MavenFilteringException;
+ Reader filter(MavenReaderFilterRequest mavenFileFilterRequest) throws MavenFilteringException;
/**
* Provides a new reader that applies filtering using defaultFilterWrappers.
@@ -70,5 +71,5 @@ public interface MavenReaderFilter
* @param filterWrappers {@link java.util.List} of FileUtils.FilterWrapper
* @return an input stream that applies the filter
*/
- Reader filter( Reader from, boolean filtering, List<FilterWrapper> filterWrappers );
+ Reader filter(Reader from, boolean filtering, List<FilterWrapper> filterWrappers);
}
diff --git a/src/main/java/org/apache/maven/shared/filtering/MavenReaderFilterRequest.java b/src/main/java/org/apache/maven/shared/filtering/MavenReaderFilterRequest.java
index aa3fa77..e961af2 100644
--- a/src/main/java/org/apache/maven/shared/filtering/MavenReaderFilterRequest.java
+++ b/src/main/java/org/apache/maven/shared/filtering/MavenReaderFilterRequest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.filtering;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.shared.filtering;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.shared.filtering;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.filtering;
import java.io.Reader;
import java.util.List;
@@ -31,9 +30,7 @@ import org.apache.maven.project.MavenProject;
* @author Kristian Rosenvold
* @since 1.0-beta-3
*/
-public class MavenReaderFilterRequest
- extends AbstractMavenFilteringRequest
-{
+public class MavenReaderFilterRequest extends AbstractMavenFilteringRequest {
private Reader from;
@@ -42,8 +39,7 @@ public class MavenReaderFilterRequest
/**
* Default constructor.
*/
- public MavenReaderFilterRequest()
- {
+ public MavenReaderFilterRequest() {
// nothing
}
@@ -56,47 +52,46 @@ public class MavenReaderFilterRequest
* @param mavenSession The Maven Session.
* @param additionalProperties supplemental properties.
*/
- public MavenReaderFilterRequest( Reader from, boolean filtering, MavenProject mavenProject, List<String> filters,
- boolean escapedBackslashesInFilePath, MavenSession mavenSession,
- Properties additionalProperties )
- {
- super( mavenProject, filters, mavenSession );
+ public MavenReaderFilterRequest(
+ Reader from,
+ boolean filtering,
+ MavenProject mavenProject,
+ List<String> filters,
+ boolean escapedBackslashesInFilePath,
+ MavenSession mavenSession,
+ Properties additionalProperties) {
+ super(mavenProject, filters, mavenSession);
this.from = from;
this.filtering = filtering;
- setAdditionalProperties( additionalProperties );
- setEscapeWindowsPaths( escapedBackslashesInFilePath );
+ setAdditionalProperties(additionalProperties);
+ setEscapeWindowsPaths(escapedBackslashesInFilePath);
}
/**
* @return where we read from.
*/
- public Reader getFrom()
- {
+ public Reader getFrom() {
return from;
}
/**
* @param from set where to read from.
*/
- public void setFrom( Reader from )
- {
+ public void setFrom(Reader from) {
this.from = from;
}
/**
* @return is filtering active ({@code true}) false otherwise.
*/
- public boolean isFiltering()
- {
+ public boolean isFiltering() {
return filtering;
}
/**
* @param filtering turn filtering on {@code true}) or off ({@code false}).
*/
- public void setFiltering( boolean filtering )
- {
+ public void setFiltering(boolean filtering) {
this.filtering = filtering;
}
-
}
diff --git a/src/main/java/org/apache/maven/shared/filtering/MavenResourcesExecution.java b/src/main/java/org/apache/maven/shared/filtering/MavenResourcesExecution.java
index ed97165..460aeea 100644
--- a/src/main/java/org/apache/maven/shared/filtering/MavenResourcesExecution.java
+++ b/src/main/java/org/apache/maven/shared/filtering/MavenResourcesExecution.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.filtering;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.shared.filtering;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.shared.filtering;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.filtering;
import java.io.File;
import java.io.Reader;
@@ -35,9 +34,7 @@ import org.codehaus.plexus.interpolation.ValueSource;
*
* @author Olivier Lamy
*/
-public class MavenResourcesExecution
- extends AbstractMavenFilteringRequest
-{
+public class MavenResourcesExecution extends AbstractMavenFilteringRequest {
private List<Resource> resources;
@@ -119,8 +116,7 @@ public class MavenResourcesExecution
/**
* Do nothing.
*/
- public MavenResourcesExecution()
- {
+ public MavenResourcesExecution() {
// no op
}
@@ -136,11 +132,15 @@ public class MavenResourcesExecution
* @param nonFilteredFileExtensions The extensions which should not being filtered.
* @param mavenSession The maven session.
*/
- public MavenResourcesExecution( List<Resource> resources, File outputDirectory, MavenProject mavenProject,
- String encoding, List<String> fileFilters, List<String> nonFilteredFileExtensions,
- MavenSession mavenSession )
- {
- super( mavenProject, fileFilters, mavenSession );
+ public MavenResourcesExecution(
+ List<Resource> resources,
+ File outputDirectory,
+ MavenProject mavenProject,
+ String encoding,
+ List<String> fileFilters,
+ List<String> nonFilteredFileExtensions,
+ MavenSession mavenSession) {
+ super(mavenProject, fileFilters, mavenSession);
this.encoding = encoding;
this.resources = resources;
this.outputDirectory = outputDirectory;
@@ -158,10 +158,13 @@ public class MavenResourcesExecution
* @param resourcesBaseDirectory The resources base directory.
* @param nonFilteredFileExtensions The list of extensions which should not being filtered.
*/
- public MavenResourcesExecution( List<Resource> resources, File outputDirectory, String encoding,
- List<FilterWrapper> filterWrappers, File resourcesBaseDirectory,
- List<String> nonFilteredFileExtensions )
- {
+ public MavenResourcesExecution(
+ List<Resource> resources,
+ File outputDirectory,
+ String encoding,
+ List<FilterWrapper> filterWrappers,
+ File resourcesBaseDirectory,
+ List<String> nonFilteredFileExtensions) {
this();
this.resources = resources;
this.outputDirectory = outputDirectory;
@@ -169,7 +172,7 @@ public class MavenResourcesExecution
this.nonFilteredFileExtensions = nonFilteredFileExtensions;
this.resourcesBaseDirectory = resourcesBaseDirectory;
this.useDefaultFilterWrappers = false;
- setEncoding( encoding );
+ setEncoding(encoding);
}
/**
@@ -177,8 +180,7 @@ public class MavenResourcesExecution
*
* @return Current encoding.
*/
- public String getEncoding()
- {
+ public String getEncoding() {
return encoding;
}
@@ -187,8 +189,7 @@ public class MavenResourcesExecution
*
* @param encoding Give the new value for encoding.
*/
- public void setEncoding( String encoding )
- {
+ public void setEncoding(String encoding) {
this.encoding = encoding;
}
@@ -198,8 +199,7 @@ public class MavenResourcesExecution
* @return Current encoding of properties files.
* @since 3.2.0
*/
- public String getPropertiesEncoding()
- {
+ public String getPropertiesEncoding() {
return propertiesEncoding;
}
@@ -209,85 +209,74 @@ public class MavenResourcesExecution
* @param propertiesEncoding Give the new value for encoding of properties files.
* @since 3.2.0
*/
- public void setPropertiesEncoding( String propertiesEncoding )
- {
+ public void setPropertiesEncoding(String propertiesEncoding) {
this.propertiesEncoding = propertiesEncoding;
}
/**
* @return List of {@link org.apache.maven.model.Resource}
*/
- public List<Resource> getResources()
- {
+ public List<Resource> getResources() {
return resources;
}
/**
* @param resources List of {@link org.apache.maven.model.Resource}
*/
- public void setResources( List<Resource> resources )
- {
+ public void setResources(List<Resource> resources) {
this.resources = resources;
}
/**
* @return The output directory.
*/
- public File getOutputDirectory()
- {
+ public File getOutputDirectory() {
return outputDirectory;
}
/**
* @param outputDirectory The output directory.
*/
- public void setOutputDirectory( File outputDirectory )
- {
+ public void setOutputDirectory(File outputDirectory) {
this.outputDirectory = outputDirectory;
}
/**
* @return List of {@link String} file extensions not to filter
*/
- public List<String> getNonFilteredFileExtensions()
- {
+ public List<String> getNonFilteredFileExtensions() {
return nonFilteredFileExtensions;
}
/**
* @param nonFilteredFileExtensions List of {@link String} file extensions to not filter
*/
- public void setNonFilteredFileExtensions( List<String> nonFilteredFileExtensions )
- {
+ public void setNonFilteredFileExtensions(List<String> nonFilteredFileExtensions) {
this.nonFilteredFileExtensions = nonFilteredFileExtensions;
}
/**
* @return List of {@link FilterWrapper}
*/
- public List<FilterWrapper> getFilterWrappers()
- {
+ public List<FilterWrapper> getFilterWrappers() {
return filterWrappers;
}
/**
* @param filterWrappers List of {@link FilterWrapper}
*/
- public void setFilterWrappers( List<FilterWrapper> filterWrappers )
- {
+ public void setFilterWrappers(List<FilterWrapper> filterWrappers) {
this.filterWrappers = filterWrappers;
}
/**
* @param filterWrapper The filter wrapper which should be added.
*/
- public void addFilterWrapper( FilterWrapper filterWrapper )
- {
- if ( this.filterWrappers == null )
- {
+ public void addFilterWrapper(FilterWrapper filterWrapper) {
+ if (this.filterWrappers == null) {
this.filterWrappers = new ArrayList<>();
}
- this.filterWrappers.add( filterWrapper );
+ this.filterWrappers.add(filterWrapper);
}
/**
@@ -298,71 +287,65 @@ public class MavenResourcesExecution
* @param multiLineFiltering do we support or use filtering on multi lines with start and endtoken on multi lines
* @since 1.0
*/
- public void addFilerWrapperWithEscaping( final ValueSource valueSource, final String startExp, final String endExp,
- final String escapeString, final boolean multiLineFiltering )
- {
- addFilterWrapper( new FilterWrapper()
- {
+ public void addFilerWrapperWithEscaping(
+ final ValueSource valueSource,
+ final String startExp,
+ final String endExp,
+ final String escapeString,
+ final boolean multiLineFiltering) {
+ addFilterWrapper(new FilterWrapper() {
@Override
- public Reader getReader( Reader reader )
- {
- StringSearchInterpolator propertiesInterpolator = new StringSearchInterpolator( startExp, endExp );
- propertiesInterpolator.addValueSource( valueSource );
- propertiesInterpolator.setEscapeString( escapeString );
- InterpolatorFilterReaderLineEnding interpolatorFilterReader =
- new InterpolatorFilterReaderLineEnding( reader, propertiesInterpolator, startExp, endExp,
- multiLineFiltering );
- interpolatorFilterReader.setInterpolateWithPrefixPattern( false );
+ public Reader getReader(Reader reader) {
+ StringSearchInterpolator propertiesInterpolator = new StringSearchInterpolator(startExp, endExp);
+ propertiesInterpolator.addValueSource(valueSource);
+ propertiesInterpolator.setEscapeString(escapeString);
+ InterpolatorFilterReaderLineEnding interpolatorFilterReader = new InterpolatorFilterReaderLineEnding(
+ reader, propertiesInterpolator, startExp, endExp, multiLineFiltering);
+ interpolatorFilterReader.setInterpolateWithPrefixPattern(false);
return interpolatorFilterReader;
}
- } );
+ });
}
/**
* @return The resource base directory.
*/
- public File getResourcesBaseDirectory()
- {
+ public File getResourcesBaseDirectory() {
return resourcesBaseDirectory;
}
/**
* @param resourcesBaseDirectory Set the resource base directory.
*/
- public void setResourcesBaseDirectory( File resourcesBaseDirectory )
- {
+ public void setResourcesBaseDirectory(File resourcesBaseDirectory) {
this.resourcesBaseDirectory = resourcesBaseDirectory;
}
/**
* @return use default filter wrapper
*/
- public boolean isUseDefaultFilterWrappers()
- {
+ public boolean isUseDefaultFilterWrappers() {
return useDefaultFilterWrappers;
}
/**
* @param useDefaultFilterWrappers {@link #useDefaultFilterWrappers}
*/
- public void setUseDefaultFilterWrappers( boolean useDefaultFilterWrappers )
- {
+ public void setUseDefaultFilterWrappers(boolean useDefaultFilterWrappers) {
this.useDefaultFilterWrappers = useDefaultFilterWrappers;
}
/**
* @return add the default excludes.
*/
- public boolean isAddDefaultExcludes()
- {
+ public boolean isAddDefaultExcludes() {
return addDefaultExcludes;
}
/**
* @param addDefaultExcludes {@link #addDefaultExcludes}
*/
- public void setAddDefaultExcludes( boolean addDefaultExcludes )
- {
+ public void setAddDefaultExcludes(boolean addDefaultExcludes) {
this.addDefaultExcludes = addDefaultExcludes;
}
@@ -372,8 +355,7 @@ public class MavenResourcesExecution
* @return {@link #overwrite}
* @since 1.0-beta-2
*/
- public boolean isOverwrite()
- {
+ public boolean isOverwrite() {
return overwrite;
}
@@ -383,8 +365,7 @@ public class MavenResourcesExecution
* @param overwrite overwrite true or false.
* @since 1.0-beta-2
*/
- public void setOverwrite( boolean overwrite )
- {
+ public void setOverwrite(boolean overwrite) {
this.overwrite = overwrite;
}
@@ -393,8 +374,7 @@ public class MavenResourcesExecution
*
* @return {@link #flatten}
*/
- public boolean isFlatten()
- {
+ public boolean isFlatten() {
return flatten;
}
@@ -403,8 +383,7 @@ public class MavenResourcesExecution
*
* @param flatten flatten true or false.
*/
- public void setFlatten( boolean flatten )
- {
+ public void setFlatten(boolean flatten) {
this.flatten = flatten;
}
@@ -414,8 +393,7 @@ public class MavenResourcesExecution
* @return {@link #includeEmptyDirs}
* @since 1.0-beta-2
*/
- public boolean isIncludeEmptyDirs()
- {
+ public boolean isIncludeEmptyDirs() {
return includeEmptyDirs;
}
@@ -425,8 +403,7 @@ public class MavenResourcesExecution
* @param includeEmptyDirs {@code true} to include empty directories, otherwise {@code false}.
* @since 1.0-beta-2
*/
- public void setIncludeEmptyDirs( boolean includeEmptyDirs )
- {
+ public void setIncludeEmptyDirs(boolean includeEmptyDirs) {
this.includeEmptyDirs = includeEmptyDirs;
}
@@ -434,8 +411,7 @@ public class MavenResourcesExecution
* @return {@code true} if filenames are filtered, otherwise {@code false}
* @since 1.2
*/
- public boolean isFilterFilenames()
- {
+ public boolean isFilterFilenames() {
return filterFilenames;
}
@@ -443,64 +419,54 @@ public class MavenResourcesExecution
* @param filterFilenames {@code true} if filenames should be filtered, otherwise {@code false}
* @since 1.2
*/
- public void setFilterFilenames( boolean filterFilenames )
- {
+ public void setFilterFilenames(boolean filterFilenames) {
this.filterFilenames = filterFilenames;
}
/**
* @return {@link MavenResourcesExecution}
*/
- public MavenResourcesExecution copyOf()
- {
+ public MavenResourcesExecution copyOf() {
MavenResourcesExecution mre = new MavenResourcesExecution();
- mre.setAdditionalProperties( this.getAdditionalProperties() );
- mre.setEncoding( this.getEncoding() );
- mre.setEscapedBackslashesInFilePath( this.isEscapedBackslashesInFilePath() );
- mre.setEscapeString( this.getEscapeString() );
- mre.setFileFilters( copyList( this.getFileFilters() ) );
- mre.setFilterWrappers( copyList( this.getFilterWrappers() ) );
- mre.setIncludeEmptyDirs( this.isIncludeEmptyDirs() );
- mre.setInjectProjectBuildFilters( this.isInjectProjectBuildFilters() );
- mre.setMavenProject( this.getMavenProject() );
- mre.setMavenSession( this.getMavenSession() );
- mre.setNonFilteredFileExtensions( copyList( this.getNonFilteredFileExtensions() ) );
- mre.setOutputDirectory( this.getOutputDirectory() );
- mre.setOverwrite( this.isOverwrite() );
- mre.setProjectStartExpressions( copyList( this.getProjectStartExpressions() ) );
- mre.setResources( copyList( this.getResources() ) );
- mre.setResourcesBaseDirectory( this.getResourcesBaseDirectory() );
- mre.setUseDefaultFilterWrappers( this.isUseDefaultFilterWrappers() );
- mre.setAddDefaultExcludes( this.isAddDefaultExcludes() );
- mre.setSupportMultiLineFiltering( this.isSupportMultiLineFiltering() );
+ mre.setAdditionalProperties(this.getAdditionalProperties());
+ mre.setEncoding(this.getEncoding());
+ mre.setEscapedBackslashesInFilePath(this.isEscapedBackslashesInFilePath());
+ mre.setEscapeString(this.getEscapeString());
+ mre.setFileFilters(copyList(this.getFileFilters()));
+ mre.setFilterWrappers(copyList(this.getFilterWrappers()));
+ mre.setIncludeEmptyDirs(this.isIncludeEmptyDirs());
+ mre.setInjectProjectBuildFilters(this.isInjectProjectBuildFilters());
+ mre.setMavenProject(this.getMavenProject());
+ mre.setMavenSession(this.getMavenSession());
+ mre.setNonFilteredFileExtensions(copyList(this.getNonFilteredFileExtensions()));
+ mre.setOutputDirectory(this.getOutputDirectory());
+ mre.setOverwrite(this.isOverwrite());
+ mre.setProjectStartExpressions(copyList(this.getProjectStartExpressions()));
+ mre.setResources(copyList(this.getResources()));
+ mre.setResourcesBaseDirectory(this.getResourcesBaseDirectory());
+ mre.setUseDefaultFilterWrappers(this.isUseDefaultFilterWrappers());
+ mre.setAddDefaultExcludes(this.isAddDefaultExcludes());
+ mre.setSupportMultiLineFiltering(this.isSupportMultiLineFiltering());
return mre;
}
- private <T> List<T> copyList( List<T> lst )
- {
- if ( lst == null )
- {
+ private <T> List<T> copyList(List<T> lst) {
+ if (lst == null) {
return null;
- }
- else if ( lst.isEmpty() )
- {
+ } else if (lst.isEmpty()) {
return new ArrayList<>();
- }
- else
- {
- return new ArrayList<>( lst );
+ } else {
+ return new ArrayList<>(lst);
}
}
@Override
- public boolean isSupportMultiLineFiltering()
- {
+ public boolean isSupportMultiLineFiltering() {
return supportMultiLineFiltering;
}
@Override
- public void setSupportMultiLineFiltering( boolean supportMultiLineFiltering )
- {
+ public void setSupportMultiLineFiltering(boolean supportMultiLineFiltering) {
this.supportMultiLineFiltering = supportMultiLineFiltering;
}
}
diff --git a/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java b/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java
index f92996d..6aefafe 100644
--- a/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java
+++ b/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.filtering;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.shared.filtering;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,14 +16,14 @@ package org.apache.maven.shared.filtering;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.filtering;
import java.util.List;
/**
* @author Olivier Lamy
*/
-public interface MavenResourcesFiltering
-{
+public interface MavenResourcesFiltering {
/**
* return the List of the non filtered extensions (jpg,jpeg,gif,bmp,png,ico)
@@ -40,12 +38,11 @@ public interface MavenResourcesFiltering
* @return true if filtering can be applied to the file (means extensions.lowerCase is in the default List or in the
* user defined extension List)
*/
- boolean filteredFileExtension( String fileName, List<String> userNonFilteredFileExtensions );
+ boolean filteredFileExtension(String fileName, List<String> userNonFilteredFileExtensions);
/**
* @param mavenResourcesExecution {@link MavenResourcesExecution}
* @throws MavenFilteringException in case of failure.
*/
- void filterResources( MavenResourcesExecution mavenResourcesExecution )
- throws MavenFilteringException;
+ void filterResources(MavenResourcesExecution mavenResourcesExecution) throws MavenFilteringException;
}
diff --git a/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java b/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java
index dd75f5a..84fa63f 100644
--- a/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java
+++ b/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.filtering;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.shared.filtering;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.shared.filtering;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.filtering;
import java.io.BufferedReader;
import java.io.IOException;
@@ -38,9 +37,7 @@ import org.codehaus.plexus.interpolation.multi.DelimiterSpecification;
* @author Olivier Lamy
* @since 1.0
*/
-public class MultiDelimiterInterpolatorFilterReaderLineEnding
- extends AbstractFilterReaderLineEnding
-{
+public class MultiDelimiterInterpolatorFilterReaderLineEnding extends AbstractFilterReaderLineEnding {
/**
* Interpolator used to interpolate
@@ -91,10 +88,9 @@ public class MultiDelimiterInterpolatorFilterReaderLineEnding
* @param interpolator interpolator instance to use
* @param supportMultiLineFiltering If multi line filtering is allowed
*/
- public MultiDelimiterInterpolatorFilterReaderLineEnding( Reader in, Interpolator interpolator,
- boolean supportMultiLineFiltering )
- {
- this( in, interpolator, new SimpleRecursionInterceptor(), supportMultiLineFiltering );
+ public MultiDelimiterInterpolatorFilterReaderLineEnding(
+ Reader in, Interpolator interpolator, boolean supportMultiLineFiltering) {
+ this(in, interpolator, new SimpleRecursionInterceptor(), supportMultiLineFiltering);
}
/**
@@ -103,47 +99,41 @@ public class MultiDelimiterInterpolatorFilterReaderLineEnding
* @param ri The {@link RecursionInterceptor} to use to prevent recursive expressions.
* @param supportMultiLineFiltering If multi line filtering is allowed
*/
- public MultiDelimiterInterpolatorFilterReaderLineEnding( Reader in, Interpolator interpolator,
- RecursionInterceptor ri,
- boolean supportMultiLineFiltering )
- {
+ public MultiDelimiterInterpolatorFilterReaderLineEnding(
+ Reader in, Interpolator interpolator, RecursionInterceptor ri, boolean supportMultiLineFiltering) {
// wrap our own buffer, so we can use mark/reset safely.
- super( new BufferedReader( in, MAXIMUM_BUFFER_SIZE ) );
+ super(new BufferedReader(in, MAXIMUM_BUFFER_SIZE));
this.interpolator = interpolator;
// always cache answers, since we'll be sending in pure expressions, not mixed text.
- this.interpolator.setCacheAnswers( true );
+ this.interpolator.setCacheAnswers(true);
recursionInterceptor = ri;
- delimiters.add( DelimiterSpecification.DEFAULT_SPEC );
+ delimiters.add(DelimiterSpecification.DEFAULT_SPEC);
this.supportMultiLineFiltering = supportMultiLineFiltering;
calculateMarkLength();
-
}
/**
* @param delimiterSpec delimiter spec.
* @return true/false.
*/
- public boolean removeDelimiterSpec( String delimiterSpec )
- {
- return delimiters.remove( DelimiterSpecification.parse( delimiterSpec ) );
+ public boolean removeDelimiterSpec(String delimiterSpec) {
+ return delimiters.remove(DelimiterSpecification.parse(delimiterSpec));
}
/**
* @param specs set of specs.
* @return {@link MultiDelimiterInterpolatorFilterReaderLineEnding}
*/
- public AbstractFilterReaderLineEnding setDelimiterSpecs( Set<String> specs )
- {
+ public AbstractFilterReaderLineEnding setDelimiterSpecs(Set<String> specs) {
delimiters.clear();
- for ( String spec : specs )
- {
- delimiters.add( DelimiterSpecification.parse( spec ) );
+ for (String spec : specs) {
+ delimiters.add(DelimiterSpecification.parse(spec));
markLength += spec.length() * 2;
}
@@ -160,18 +150,13 @@ public class MultiDelimiterInterpolatorFilterReaderLineEnding
* @return the number of characters actually skipped
*/
@Override
- public long skip( long n )
- throws IOException, IllegalArgumentException
- {
- if ( n < 0L )
- {
- throw new IllegalArgumentException( "skip value is negative" );
+ public long skip(long n) throws IOException, IllegalArgumentException {
+ if (n < 0L) {
+ throw new IllegalArgumentException("skip value is negative");
}
- for ( long i = 0; i < n; i++ )
- {
- if ( read() == -1 )
- {
+ for (long i = 0; i < n; i++) {
+ if (read() == -1) {
return i;
}
}
@@ -189,20 +174,13 @@ public class MultiDelimiterInterpolatorFilterReaderLineEnding
* @throws IOException If an I/O error occurs
*/
@Override
- public int read( char cbuf[], int off, int len )
- throws IOException
- {
- for ( int i = 0; i < len; i++ )
- {
+ public int read(char cbuf[], int off, int len) throws IOException {
+ for (int i = 0; i < len; i++) {
int ch = read();
- if ( ch == -1 )
- {
- if ( i == 0 )
- {
+ if (ch == -1) {
+ if (i == 0) {
return -1;
- }
- else
- {
+ } else {
return i;
}
}
@@ -218,163 +196,130 @@ public class MultiDelimiterInterpolatorFilterReaderLineEnding
* @throws IOException if the underlying stream throws an IOException during reading
*/
@Override
- public int read()
- throws IOException
- {
- if ( replaceIndex > 0 )
- {
- return replaceData.charAt( replaceData.length() - ( replaceIndex-- ) );
+ public int read() throws IOException {
+ if (replaceIndex > 0) {
+ return replaceData.charAt(replaceData.length() - (replaceIndex--));
}
- if ( eof )
- {
+ if (eof) {
return -1;
}
- BoundedReader in = new BoundedReader( this.in, markLength );
+ BoundedReader in = new BoundedReader(this.in, markLength);
int ch = in.read();
- if ( ch == -1 || ( ch == '\n' && !supportMultiLineFiltering ) )
- {
+ if (ch == -1 || (ch == '\n' && !supportMultiLineFiltering)) {
return ch;
}
- boolean inEscape = useEscape && ch == getEscapeString().charAt( 0 );
+ boolean inEscape = useEscape && ch == getEscapeString().charAt(0);
StringBuilder key = new StringBuilder();
// have we found an escape string?
- if ( inEscape )
- {
- for ( int i = 0; i < getEscapeString().length(); i++ )
- {
- key.append( (char) ch );
+ if (inEscape) {
+ for (int i = 0; i < getEscapeString().length(); i++) {
+ key.append((char) ch);
- if ( ch != getEscapeString().charAt( i ) || ch == -1 || ( ch == '\n' && !supportMultiLineFiltering ) )
- {
+ if (ch != getEscapeString().charAt(i) || ch == -1 || (ch == '\n' && !supportMultiLineFiltering)) {
// mismatch, EOF or EOL, no escape string here
in.reset();
inEscape = false;
- key.setLength( 0 );
+ key.setLength(0);
break;
}
ch = in.read();
-
}
-
}
// have we found a delimiter?
int max = 0;
- for ( DelimiterSpecification spec : delimiters )
- {
+ for (DelimiterSpecification spec : delimiters) {
String begin = spec.getBegin();
// longest match wins
- if ( begin.length() < max )
- {
+ if (begin.length() < max) {
continue;
}
- for ( int i = 0; i < begin.length(); i++ )
- {
- if ( ch != begin.charAt( i ) || ch == -1 || ( ch == '\n' && !supportMultiLineFiltering ) )
- {
+ for (int i = 0; i < begin.length(); i++) {
+ if (ch != begin.charAt(i) || ch == -1 || (ch == '\n' && !supportMultiLineFiltering)) {
// mismatch, EOF or EOL, no match
break;
}
- if ( i == begin.length() - 1 )
- {
+ if (i == begin.length() - 1) {
beginToken = spec.getBegin();
endToken = spec.getEnd();
-
}
ch = in.read();
-
}
in.reset();
- in.skip( key.length() );
+ in.skip(key.length());
ch = in.read();
-
}
// escape means no luck, prevent parsing of the escaped character, and return
- if ( inEscape )
- {
+ if (inEscape) {
- if ( beginToken != null )
- {
- if ( !isPreserveEscapeString() )
- {
- key.setLength( 0 );
+ if (beginToken != null) {
+ if (!isPreserveEscapeString()) {
+ key.setLength(0);
}
}
beginToken = null;
endToken = null;
- key.append( (char) ch );
+ key.append((char) ch);
replaceData = key.toString();
replaceIndex = key.length();
return read();
-
}
// no match means no luck, reset and return
- if ( beginToken == null || beginToken.length() == 0 || endToken == null || endToken.length() == 0 )
- {
+ if (beginToken == null || beginToken.length() == 0 || endToken == null || endToken.length() == 0) {
in.reset();
return in.read();
-
}
// we're committed, find the end token, EOL or EOF
- key.append( beginToken );
+ key.append(beginToken);
in.reset();
- in.skip( beginToken.length() );
+ in.skip(beginToken.length());
ch = in.read();
int endTokenSize = endToken.length();
int end = endTokenSize;
- do
- {
- if ( ch == -1 )
- {
+ do {
+ if (ch == -1) {
break;
- }
- else if ( ch == '\n' && !supportMultiLineFiltering )
- {
+ } else if (ch == '\n' && !supportMultiLineFiltering) {
// EOL
- key.append( (char) ch );
+ key.append((char) ch);
break;
}
- key.append( (char) ch );
+ key.append((char) ch);
- if ( ch == this.endToken.charAt( endTokenSize - end ) )
- {
+ if (ch == this.endToken.charAt(endTokenSize - end)) {
end--;
- if ( end == 0 )
- {
+ if (end == 0) {
break;
}
- }
- else
- {
+ } else {
end = endTokenSize;
}
ch = in.read();
- }
- while ( true );
+ } while (true);
// reset back to no tokens
beginToken = null;
@@ -382,72 +327,55 @@ public class MultiDelimiterInterpolatorFilterReaderLineEnding
// found endtoken? interpolate our key resolved above
String value = null;
- if ( end == 0 )
- {
- try
- {
- if ( interpolateWithPrefixPattern )
- {
- value = interpolator.interpolate( key.toString(), "", recursionInterceptor );
+ if (end == 0) {
+ try {
+ if (interpolateWithPrefixPattern) {
+ value = interpolator.interpolate(key.toString(), "", recursionInterceptor);
+ } else {
+ value = interpolator.interpolate(key.toString(), recursionInterceptor);
}
- else
- {
- value = interpolator.interpolate( key.toString(), recursionInterceptor );
- }
- }
- catch ( InterpolationException e )
- {
- throw new IllegalArgumentException( e );
+ } catch (InterpolationException e) {
+ throw new IllegalArgumentException(e);
}
- }
- else
- {
+ } else {
// no endtoken? Write current char and continue in search for next expression
in.reset();
return in.read();
}
// write away the value if present, otherwise the key unmodified
- if ( value != null )
- {
+ if (value != null) {
replaceData = value;
replaceIndex = value.length();
- }
- else
- {
+ } else {
replaceData = key.toString();
replaceIndex = key.length();
}
- if ( ch == -1 )
- {
+ if (ch == -1) {
eof = true;
}
return read();
-
}
/**
* @return interpolate with prefix pattern {@code true} (active) {@code false} otherwise.
*/
- public boolean isInterpolateWithPrefixPattern()
- {
+ public boolean isInterpolateWithPrefixPattern() {
return interpolateWithPrefixPattern;
}
/**
* @param interpolateWithPrefixPattern set the interpolate with prefix pattern.
*/
- public void setInterpolateWithPrefixPattern( boolean interpolateWithPrefixPattern )
- {
+ public void setInterpolateWithPrefixPattern(boolean interpolateWithPrefixPattern) {
this.interpolateWithPrefixPattern = interpolateWithPrefixPattern;
}
/**
* @return {@link RecursionInterceptor}
*/
- public RecursionInterceptor getRecursionInterceptor()
- {
+ public RecursionInterceptor getRecursionInterceptor() {
return recursionInterceptor;
}
@@ -456,11 +384,10 @@ public class MultiDelimiterInterpolatorFilterReaderLineEnding
* @return this
*/
// CHECKSTYLE_OFF: LineLength
- public AbstractFilterReaderLineEnding setRecursionInterceptor( RecursionInterceptor givenRecursionInterceptor )
- // CHECKSTYLE_ON: LineLength
- {
+ public AbstractFilterReaderLineEnding setRecursionInterceptor(RecursionInterceptor givenRecursionInterceptor)
+ // CHECKSTYLE_ON: LineLength
+ {
this.recursionInterceptor = givenRecursionInterceptor;
return this;
}
-
}
diff --git a/src/main/java/org/apache/maven/shared/filtering/PropertyUtils.java b/src/main/java/org/apache/maven/shared/filtering/PropertyUtils.java
index 1282046..a494524 100644
--- a/src/main/java/org/apache/maven/shared/filtering/PropertyUtils.java
+++ b/src/main/java/org/apache/maven/shared/filtering/PropertyUtils.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.filtering;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.shared.filtering;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.shared.filtering;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.filtering;
import java.io.File;
import java.io.FileNotFoundException;
@@ -36,13 +35,11 @@ import static org.apache.maven.shared.filtering.FilteringUtils.isEmpty;
* @author <a href="mailto:kenney@neonics.com">Kenney Westerhof</a>
* @author William Ferguson
*/
-public final class PropertyUtils
-{
+public final class PropertyUtils {
/**
* Private empty constructor to prevent instantiation.
*/
- private PropertyUtils()
- {
+ private PropertyUtils() {
// prevent instantiation
}
@@ -58,10 +55,8 @@ public final class PropertyUtils
* @return Properties object containing the properties in the file with their values fully resolved.
* @throws IOException if profile does not exist, or cannot be read.
*/
- public static Properties loadPropertyFile( File propFile, Properties baseProps )
- throws IOException
- {
- return loadPropertyFile( propFile, baseProps, null );
+ public static Properties loadPropertyFile(File propFile, Properties baseProps) throws IOException {
+ return loadPropertyFile(propFile, baseProps, null);
}
/**
@@ -79,24 +74,20 @@ public final class PropertyUtils
*
* @since 3.1.2
*/
- public static Properties loadPropertyFile( File propFile, Properties baseProps, Logger logger )
- throws IOException
- {
- if ( !propFile.exists() )
- {
- throw new FileNotFoundException( propFile.toString() );
+ public static Properties loadPropertyFile(File propFile, Properties baseProps, Logger logger) throws IOException {
+ if (!propFile.exists()) {
+ throw new FileNotFoundException(propFile.toString());
}
final Properties fileProps = new Properties();
-
- try ( InputStream inStream = Files.newInputStream( propFile.toPath() ) )
- {
- fileProps.load( inStream );
+
+ try (InputStream inStream = Files.newInputStream(propFile.toPath())) {
+ fileProps.load(inStream);
}
final Properties combinedProps = new Properties();
- combinedProps.putAll( baseProps == null ? new Properties() : baseProps );
- combinedProps.putAll( fileProps );
+ combinedProps.putAll(baseProps == null ? new Properties() : baseProps);
+ combinedProps.putAll(fileProps);
// The algorithm iterates only over the fileProps which is all that is required to resolve
// the properties defined within the file. This is slightly different to current, however
@@ -107,11 +98,10 @@ public final class PropertyUtils
// as can be verified by replacing the implementation of #loadPropertyFile(File, boolean, boolean)
// with the commented variant I have provided that reuses this method.
- for ( Object o : fileProps.keySet() )
- {
+ for (Object o : fileProps.keySet()) {
final String k = (String) o;
- final String propValue = getPropertyValue( k, combinedProps, logger );
- fileProps.setProperty( k, propValue );
+ final String propValue = getPropertyValue(k, combinedProps, logger);
+ fileProps.setProperty(k, propValue);
}
return fileProps;
@@ -126,10 +116,8 @@ public final class PropertyUtils
* @return the loaded and fully resolved Properties object
* @throws IOException if profile does not exist, or cannot be read.
*/
- public static Properties loadPropertyFile( File propfile, boolean fail, boolean useSystemProps )
- throws IOException
- {
- return loadPropertyFile( propfile, fail, useSystemProps, null );
+ public static Properties loadPropertyFile(File propfile, boolean fail, boolean useSystemProps) throws IOException {
+ return loadPropertyFile(propfile, fail, useSystemProps, null);
}
/**
@@ -144,33 +132,26 @@ public final class PropertyUtils
*
* @since 3.1.2
*/
- public static Properties loadPropertyFile( File propfile, boolean fail, boolean useSystemProps, Logger logger )
- throws IOException
- {
+ public static Properties loadPropertyFile(File propfile, boolean fail, boolean useSystemProps, Logger logger)
+ throws IOException {
final Properties baseProps = new Properties();
- if ( useSystemProps )
- {
- baseProps.putAll( System.getProperties() );
+ if (useSystemProps) {
+ baseProps.putAll(System.getProperties());
}
final Properties resolvedProps = new Properties();
- try
- {
- resolvedProps.putAll( loadPropertyFile( propfile, baseProps, logger ) );
- }
- catch ( FileNotFoundException e )
- {
- if ( fail )
- {
- throw new FileNotFoundException( propfile.toString() );
+ try {
+ resolvedProps.putAll(loadPropertyFile(propfile, baseProps, logger));
+ } catch (FileNotFoundException e) {
+ if (fail) {
+ throw new FileNotFoundException(propfile.toString());
}
}
- if ( useSystemProps )
- {
- resolvedProps.putAll( baseProps );
+ if (useSystemProps) {
+ resolvedProps.putAll(baseProps);
}
return resolvedProps;
@@ -186,58 +167,50 @@ public final class PropertyUtils
* @param logger Logger instance
* @return The filtered property value.
*/
- private static String getPropertyValue( String k, Properties p, Logger logger )
- {
+ private static String getPropertyValue(String k, Properties p, Logger logger) {
// This can also be done using InterpolationFilterReader,
// but it requires reparsing the file over and over until
// it doesn't change.
// for cycle detection
List<String> valueChain = new LinkedList<>();
- valueChain.add( k );
+ valueChain.add(k);
- String v = p.getProperty( k );
+ String v = p.getProperty(k);
String defaultValue = v;
String ret = "";
int idx, idx2;
- while ( ( idx = v.indexOf( "${" ) ) >= 0 )
- {
+ while ((idx = v.indexOf("${")) >= 0) {
// append prefix to result
- ret += v.substring( 0, idx );
+ ret += v.substring(0, idx);
// strip prefix from original
- v = v.substring( idx + 2 );
+ v = v.substring(idx + 2);
// if no matching } then bail
- idx2 = v.indexOf( '}' );
- if ( idx2 < 0 )
- {
+ idx2 = v.indexOf('}');
+ if (idx2 < 0) {
break;
}
// strip out the key and resolve it
// resolve the key/value for the ${statement}
- String nk = v.substring( 0, idx2 );
- v = v.substring( idx2 + 1 );
- String nv = p.getProperty( nk );
+ String nk = v.substring(0, idx2);
+ v = v.substring(idx2 + 1);
+ String nv = p.getProperty(nk);
- if ( valueChain.contains( nk ) )
- {
- if ( logger != null )
- {
- logCircularDetection( valueChain, nk, logger );
+ if (valueChain.contains(nk)) {
+ if (logger != null) {
+ logCircularDetection(valueChain, nk, logger);
}
return defaultValue;
- }
- else
- {
- valueChain.add( nk );
+ } else {
+ valueChain.add(nk);
// try global environment..
- if ( nv == null && !isEmpty( nk ) )
- {
- nv = System.getProperty( nk );
+ if (nv == null && !isEmpty(nk)) {
+ nv = System.getProperty(nk);
}
// if the key cannot be resolved,
@@ -245,12 +218,9 @@ public final class PropertyUtils
// else prefix the original string with the
// resolved property ( so it can be parsed further )
// taking recursion into account.
- if ( nv == null || nv.equals( k ) || k.equals( nk ) )
- {
+ if (nv == null || nv.equals(k) || k.equals(nk)) {
ret += "${" + nk + "}";
- }
- else
- {
+ } else {
v = nv + v;
}
}
@@ -265,14 +235,12 @@ public final class PropertyUtils
* @param nk the key the closes the cycle
* @param logger Logger instance
*/
- private static void logCircularDetection( List<String> valueChain, String nk, Logger logger )
- {
- StringBuilder sb = new StringBuilder( "Circular reference between properties detected: " );
- for ( String key : valueChain )
- {
- sb.append( key ).append( " => " );
+ private static void logCircularDetection(List<String> valueChain, String nk, Logger logger) {
+ StringBuilder sb = new StringBuilder("Circular reference between properties detected: ");
+ for (String key : valueChain) {
+ sb.append(key).append(" => ");
}
- sb.append( nk );
- logger.warn( sb.toString() );
+ sb.append(nk);
+ logger.warn(sb.toString());
}
}
diff --git a/src/test/java/org/apache/maven/shared/filtering/AbstractInterpolatorFilterReaderLineEndingTest.java b/src/test/java/org/apache/maven/shared/filtering/AbstractInterpolatorFilterReaderLineEndingTest.java
index 863ed7a..35ba64c 100644
--- a/src/test/java/org/apache/maven/shared/filtering/AbstractInterpolatorFilterReaderLineEndingTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/AbstractInterpolatorFilterReaderLineEndingTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.filtering;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.shared.filtering;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,11 +16,7 @@ package org.apache.maven.shared.filtering;
* specific language governing permissions and limitations
* under the License.
*/
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.when;
+package org.apache.maven.shared.filtering;
import java.io.IOException;
import java.io.Reader;
@@ -36,96 +30,94 @@ import org.junit.Test;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-public abstract class AbstractInterpolatorFilterReaderLineEndingTest
-{
+import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isA;
+import static org.mockito.Mockito.when;
+
+public abstract class AbstractInterpolatorFilterReaderLineEndingTest {
@Mock
private Interpolator interpolator;
@Before
- public void onSetup()
- {
- MockitoAnnotations.initMocks( this );
+ public void onSetup() {
+ MockitoAnnotations.initMocks(this);
}
@Test
- public void testDefaults()
- throws Exception
- {
- when( interpolator.interpolate( eq( "${a}" ), eq( "" ), isA( RecursionInterceptor.class ) ) ).thenReturn( "DONE_A" );
-
- Reader in = new StringReader( "text without expression" );
- Reader reader = getDollarBracesReader( in, interpolator, "\\" );
- assertEquals( "text without expression", IOUtils.toString( reader ) );
-
- in = new StringReader( "valid expression ${a}" );
- reader = getDollarBracesReader( in, interpolator, null );
- assertEquals( "valid expression DONE_A", IOUtils.toString( reader ) );
-
- in = new StringReader( "empty expression ${}" );
- reader = getDollarBracesReader( in, interpolator, null );
- assertEquals( "empty expression ${}", IOUtils.toString( reader ) );
-
- in = new StringReader( "dollar space expression $ {a}" );
- reader = getDollarBracesReader( in, interpolator, "\\" );
- assertEquals( "dollar space expression $ {a}", IOUtils.toString( reader ) );
-
- in = new StringReader( "space in expression ${ a}" );
- reader = getDollarBracesReader( in, interpolator, "\\" );
- assertEquals( "space in expression ${ a}", IOUtils.toString( reader ) );
-
- in = new StringReader( "escape dollar with expression \\${a}" );
- reader = getDollarBracesReader( in, interpolator, "\\" );
- assertEquals( "escape dollar with expression ${a}", IOUtils.toString( reader ) );
-
-// in = new StringReader( "escape escape string before expression \\\\${a}" );
-// reader = getDollarBracesReader( in, interpolator, "\\" );
-// assertEquals( "escape escape string before expression \\DONE_A", IOUtils.toString( reader ) );
-//
-// in = new StringReader( "escape escape string and expression \\\\\\${a}" );
-// reader = getDollarBracesReader( in, interpolator, "\\" );
-// assertEquals( "escape escape string before expression \\${a}", IOUtils.toString( reader ) );
-
- in = new StringReader( "unknown expression ${unknown}" );
- reader = getDollarBracesReader( in, interpolator, "\\" );
- assertEquals( "unknown expression ${unknown}", IOUtils.toString( reader ) );
+ public void testDefaults() throws Exception {
+ when(interpolator.interpolate(eq("${a}"), eq(""), isA(RecursionInterceptor.class)))
+ .thenReturn("DONE_A");
+
+ Reader in = new StringReader("text without expression");
+ Reader reader = getDollarBracesReader(in, interpolator, "\\");
+ assertEquals("text without expression", IOUtils.toString(reader));
+
+ in = new StringReader("valid expression ${a}");
+ reader = getDollarBracesReader(in, interpolator, null);
+ assertEquals("valid expression DONE_A", IOUtils.toString(reader));
+
+ in = new StringReader("empty expression ${}");
+ reader = getDollarBracesReader(in, interpolator, null);
+ assertEquals("empty expression ${}", IOUtils.toString(reader));
+
+ in = new StringReader("dollar space expression $ {a}");
+ reader = getDollarBracesReader(in, interpolator, "\\");
+ assertEquals("dollar space expression $ {a}", IOUtils.toString(reader));
+
+ in = new StringReader("space in expression ${ a}");
+ reader = getDollarBracesReader(in, interpolator, "\\");
+ assertEquals("space in expression ${ a}", IOUtils.toString(reader));
+
+ in = new StringReader("escape dollar with expression \\${a}");
+ reader = getDollarBracesReader(in, interpolator, "\\");
+ assertEquals("escape dollar with expression ${a}", IOUtils.toString(reader));
+
+ // in = new StringReader( "escape escape string before expression \\\\${a}" );
+ // reader = getDollarBracesReader( in, interpolator, "\\" );
+ // assertEquals( "escape escape string before expression \\DONE_A", IOUtils.toString( reader ) );
+ //
+ // in = new StringReader( "escape escape string and expression \\\\\\${a}" );
+ // reader = getDollarBracesReader( in, interpolator, "\\" );
+ // assertEquals( "escape escape string before expression \\${a}", IOUtils.toString( reader ) );
+
+ in = new StringReader("unknown expression ${unknown}");
+ reader = getDollarBracesReader(in, interpolator, "\\");
+ assertEquals("unknown expression ${unknown}", IOUtils.toString(reader));
}
// MSHARED-198: custom delimiters doesn't work as expected
@Test
- public void testCustomDelimiters()
- throws Exception
- {
- when( interpolator.interpolate( eq( "aaaFILTER.a.MEaaa" ), eq( "" ), isA( RecursionInterceptor.class ) ) ).thenReturn( "DONE" );
- when( interpolator.interpolate( eq( "abcFILTER.a.MEabc" ), eq( "" ), isA( RecursionInterceptor.class ) ) ).thenReturn( "DONE" );
+ public void testCustomDelimiters() throws Exception {
+ when(interpolator.interpolate(eq("aaaFILTER.a.MEaaa"), eq(""), isA(RecursionInterceptor.class)))
+ .thenReturn("DONE");
+ when(interpolator.interpolate(eq("abcFILTER.a.MEabc"), eq(""), isA(RecursionInterceptor.class)))
+ .thenReturn("DONE");
- Reader in = new StringReader( "aaaFILTER.a.MEaaa" );
- Reader reader = getAaa_AaaReader( in, interpolator );
+ Reader in = new StringReader("aaaFILTER.a.MEaaa");
+ Reader reader = getAaa_AaaReader(in, interpolator);
- assertEquals( "DONE", IOUtils.toString( reader ) );
+ assertEquals("DONE", IOUtils.toString(reader));
- in = new StringReader( "abcFILTER.a.MEabc" );
- reader = getAbc_AbcReader( in, interpolator );
- assertEquals( "DONE", IOUtils.toString( reader ) );
+ in = new StringReader("abcFILTER.a.MEabc");
+ reader = getAbc_AbcReader(in, interpolator);
+ assertEquals("DONE", IOUtils.toString(reader));
}
// MSHARED-235: reader exceeds readAheadLimit
@Test
- public void testMarkInvalid() throws IOException
- {
- try ( Reader reader =
- getAtReader( new StringReader( "@\").replace(p,\"]\").replace(q,\"" ), interpolator, "\\" ) )
- {
- assertEquals( "@\").replace(p,\"]\").replace(q,\"", IOUtils.toString( reader ) );
+ public void testMarkInvalid() throws IOException {
+ try (Reader reader = getAtReader(new StringReader("@\").replace(p,\"]\").replace(q,\""), interpolator, "\\")) {
+ assertEquals("@\").replace(p,\"]\").replace(q,\"", IOUtils.toString(reader));
}
}
- protected abstract Reader getAbc_AbcReader( Reader in, Interpolator interpolator );
-
- protected abstract Reader getAaa_AaaReader( Reader in, Interpolator interpolator );
+ protected abstract Reader getAbc_AbcReader(Reader in, Interpolator interpolator);
- protected abstract Reader getDollarBracesReader( Reader in, Interpolator interpolator, String escapeString );
+ protected abstract Reader getAaa_AaaReader(Reader in, Interpolator interpolator);
- protected abstract Reader getAtReader( Reader in, Interpolator interpolator, String escapeString );
+ protected abstract Reader getDollarBracesReader(Reader in, Interpolator interpolator, String escapeString);
-}
\ No newline at end of file
+ protected abstract Reader getAtReader(Reader in, Interpolator interpolator, String escapeString);
+}
diff --git a/src/test/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequestTest.java b/src/test/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequestTest.java
index 6799737..9aa8d70 100644
--- a/src/test/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequestTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequestTest.java
@@ -1,7 +1,3 @@
-package org.apache.maven.shared.filtering;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -11,7 +7,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -20,85 +16,77 @@ import static org.hamcrest.MatcherAssert.assertThat;
* specific language governing permissions and limitations
* under the License.
*/
-
+package org.apache.maven.shared.filtering;
import java.util.LinkedHashSet;
import org.hamcrest.Matchers;
import org.junit.Test;
+import static org.hamcrest.MatcherAssert.assertThat;
+
/**
* @author Karl Heinz Marbaise <a href="mailto:khmarbaise@apache.org">khmarbaise@apache.org</a>.
*/
-public class AbstractMavenFilteringRequestTest
-{
-
+public class AbstractMavenFilteringRequestTest {
+
private AbstractMavenFilteringRequest request = new AbstractMavenFilteringRequest();
private LinkedHashSet<String> delimiters = new LinkedHashSet<>();
-
+
@Test
- public void setDelimitersShouldNotChangeAnythingIfUsingNull()
- {
- request.setDelimiters( null, false );
- assertThat( request.getDelimiters(), Matchers.contains( "${*}", "@" ) );
+ public void setDelimitersShouldNotChangeAnythingIfUsingNull() {
+ request.setDelimiters(null, false);
+ assertThat(request.getDelimiters(), Matchers.contains("${*}", "@"));
}
@Test
- public void setDelimitersShouldNotChangeAnythingIfUsingEmpty()
- {
- request.setDelimiters( delimiters, false );
- assertThat( request.getDelimiters(), Matchers.contains( "${*}", "@" ) );
+ public void setDelimitersShouldNotChangeAnythingIfUsingEmpty() {
+ request.setDelimiters(delimiters, false);
+ assertThat(request.getDelimiters(), Matchers.contains("${*}", "@"));
}
@Test
- public void setDelimitersShouldAddOnlyTheGivenDelimiter()
- {
- delimiters.add( "test" );
- request.setDelimiters( delimiters, false );
- assertThat( request.getDelimiters(), Matchers.contains( "test" ) );
+ public void setDelimitersShouldAddOnlyTheGivenDelimiter() {
+ delimiters.add("test");
+ request.setDelimiters(delimiters, false);
+ assertThat(request.getDelimiters(), Matchers.contains("test"));
}
@Test
- public void setDelimitersShouldAddDefaultDelimitersForNullElements()
- {
- delimiters.add( "test" );
- delimiters.add( null );
- delimiters.add( "second" );
- request.setDelimiters( delimiters, false );
- assertThat( request.getDelimiters(), Matchers.contains( "test", "${*}", "second" ) );
+ public void setDelimitersShouldAddDefaultDelimitersForNullElements() {
+ delimiters.add("test");
+ delimiters.add(null);
+ delimiters.add("second");
+ request.setDelimiters(delimiters, false);
+ assertThat(request.getDelimiters(), Matchers.contains("test", "${*}", "second"));
}
@Test
- public void setDelimitersShouldAddDefaultDelimitersIfUseDefaultDelimitersIfNullGiven()
- {
- request.setDelimiters( null, true );
- assertThat( request.getDelimiters(), Matchers.contains( "${*}", "@" ) );
+ public void setDelimitersShouldAddDefaultDelimitersIfUseDefaultDelimitersIfNullGiven() {
+ request.setDelimiters(null, true);
+ assertThat(request.getDelimiters(), Matchers.contains("${*}", "@"));
}
@Test
- public void setDelimitersShouldAddDefaultDelimitersIfUseDefaultDelimitersIfNotNullGiven()
- {
+ public void setDelimitersShouldAddDefaultDelimitersIfUseDefaultDelimitersIfNotNullGiven() {
LinkedHashSet<String> delimiters = new LinkedHashSet<>();
- request.setDelimiters( delimiters, true );
- assertThat( request.getDelimiters(), Matchers.contains( "${*}", "@" ) );
+ request.setDelimiters(delimiters, true);
+ assertThat(request.getDelimiters(), Matchers.contains("${*}", "@"));
}
@Test
- public void setDelimitersShouldAddDefaultDelimitersIfUseDefaultDelimitersIfSingleElementIsGiven()
- {
- delimiters.add( "test" );
- request.setDelimiters( delimiters, true );
- assertThat( request.getDelimiters(), Matchers.contains( "${*}", "@", "test" ) );
+ public void setDelimitersShouldAddDefaultDelimitersIfUseDefaultDelimitersIfSingleElementIsGiven() {
+ delimiters.add("test");
+ request.setDelimiters(delimiters, true);
+ assertThat(request.getDelimiters(), Matchers.contains("${*}", "@", "test"));
}
@Test
- public void setDelimitersShouldAddDefaultDelimitersForNullElement()
- {
- delimiters.add( "test" );
- delimiters.add( null );
- delimiters.add( "second" );
- request.setDelimiters( delimiters, true );
- assertThat( request.getDelimiters(), Matchers.contains( "${*}", "@", "test", "second" ) );
+ public void setDelimitersShouldAddDefaultDelimitersForNullElement() {
+ delimiters.add("test");
+ delimiters.add(null);
+ delimiters.add("second");
+ request.setDelimiters(delimiters, true);
+ assertThat(request.getDelimiters(), Matchers.contains("${*}", "@", "test", "second"));
}
-
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/apache/maven/shared/filtering/BoundedReaderTest.java b/src/test/java/org/apache/maven/shared/filtering/BoundedReaderTest.java
index 28ecfc0..58ac372 100644
--- a/src/test/java/org/apache/maven/shared/filtering/BoundedReaderTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/BoundedReaderTest.java
@@ -7,7 +7,7 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,8 +18,6 @@
*/
package org.apache.maven.shared.filtering;
-import static org.junit.Assert.assertEquals;
-
import java.io.BufferedReader;
import java.io.IOException;
import java.io.Reader;
@@ -27,76 +25,63 @@ import java.io.StringReader;
import org.junit.Test;
-public class BoundedReaderTest
-{
+import static org.junit.Assert.assertEquals;
+
+public class BoundedReaderTest {
- private final Reader sr = new BufferedReader( new StringReader( "01234567890" ) );
+ private final Reader sr = new BufferedReader(new StringReader("01234567890"));
@Test
- public void readTillEnd()
- throws IOException
- {
- try ( BoundedReader mr = new BoundedReader( sr, 3 ) )
- {
- mr.mark( 3 );
+ public void readTillEnd() throws IOException {
+ try (BoundedReader mr = new BoundedReader(sr, 3)) {
+ mr.mark(3);
mr.read();
mr.read();
mr.read();
- assertEquals( -1, mr.read() );
+ assertEquals(-1, mr.read());
}
}
@Test
- public void readMulti()
- throws IOException
- {
+ public void readMulti() throws IOException {
char[] cbuf = new char[4];
- for ( int i = 0; i < cbuf.length; i++ )
- {
+ for (int i = 0; i < cbuf.length; i++) {
cbuf[i] = 'X';
}
- try ( BoundedReader mr = new BoundedReader( sr, 3 ) )
- {
- final int read = mr.read( cbuf, 0, 4 );
- assertEquals( 3, read );
+ try (BoundedReader mr = new BoundedReader(sr, 3)) {
+ final int read = mr.read(cbuf, 0, 4);
+ assertEquals(3, read);
}
- assertEquals( '0', cbuf[0] );
- assertEquals( '1', cbuf[1] );
- assertEquals( '2', cbuf[2] );
- assertEquals( 'X', cbuf[3] );
+ assertEquals('0', cbuf[0]);
+ assertEquals('1', cbuf[1]);
+ assertEquals('2', cbuf[2]);
+ assertEquals('X', cbuf[3]);
}
@Test
- public void readMultiWithOffset()
- throws IOException
- {
-
+ public void readMultiWithOffset() throws IOException {
+
char[] cbuf = new char[4];
- for ( int i = 0; i < cbuf.length; i++ )
- {
+ for (int i = 0; i < cbuf.length; i++) {
cbuf[i] = 'X';
}
-
- try ( BoundedReader mr = new BoundedReader( sr, 3 ) )
- {
- final int read = mr.read( cbuf, 1, 2 );
- assertEquals( 2, read );
+
+ try (BoundedReader mr = new BoundedReader(sr, 3)) {
+ final int read = mr.read(cbuf, 1, 2);
+ assertEquals(2, read);
}
-
- assertEquals( 'X', cbuf[0] );
- assertEquals( '0', cbuf[1] );
- assertEquals( '1', cbuf[2] );
- assertEquals( 'X', cbuf[3] );
+
+ assertEquals('X', cbuf[0]);
+ assertEquals('0', cbuf[1]);
+ assertEquals('1', cbuf[2]);
+ assertEquals('X', cbuf[3]);
}
@Test
- public void resetWorks()
- throws IOException
- {
- try ( BoundedReader mr = new BoundedReader( sr, 3 ) )
- {
+ public void resetWorks() throws IOException {
+ try (BoundedReader mr = new BoundedReader(sr, 3)) {
mr.read();
mr.read();
mr.read();
@@ -104,19 +89,16 @@ public class BoundedReaderTest
mr.read();
mr.read();
mr.read();
- assertEquals( -1, mr.read() );
+ assertEquals(-1, mr.read());
}
}
@Test
- public void skipTest()
- throws IOException
- {
- try (BoundedReader mr = new BoundedReader( sr, 3 ) )
- {
- mr.skip( 2 );
+ public void skipTest() throws IOException {
+ try (BoundedReader mr = new BoundedReader(sr, 3)) {
+ mr.skip(2);
mr.read();
- assertEquals( -1, mr.read() );
+ assertEquals(-1, mr.read());
}
}
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java b/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java
index d53456f..d321def 100644
--- a/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.filtering;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.shared.filtering;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.shared.filtering;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.filtering;
import java.io.File;
import java.io.Reader;
@@ -40,156 +39,134 @@ import static org.mockito.Mockito.mock;
* @author Olivier Lamy
*
*/
-public class DefaultMavenFileFilterTest
- extends TestSupport
-{
+public class DefaultMavenFileFilterTest extends TestSupport {
- File to = new File( getBasedir(), "target/reflection-test.properties" );
+ File to = new File(getBasedir(), "target/reflection-test.properties");
@Override
- protected void setUp()
- throws Exception
- {
+ protected void setUp() throws Exception {
super.setUp();
- Files.deleteIfExists( to.toPath() );
+ Files.deleteIfExists(to.toPath());
}
- public void testNotOverwriteFile()
- throws Exception
- {
- MavenFileFilter mavenFileFilter = lookup( MavenFileFilter.class );
+ public void testNotOverwriteFile() throws Exception {
+ MavenFileFilter mavenFileFilter = lookup(MavenFileFilter.class);
- File from = new File( getBasedir(), "src/test/units-files/reflection-test.properties" );
+ File from = new File(getBasedir(), "src/test/units-files/reflection-test.properties");
- mavenFileFilter.copyFile( from, to, false, null, null );
+ mavenFileFilter.copyFile(from, to, false, null, null);
- from = new File( getBasedir(), "src/test/units-files/reflection-test-older.properties" );
+ from = new File(getBasedir(), "src/test/units-files/reflection-test-older.properties");
// very old file :-)
- from.setLastModified( 1 );
+ from.setLastModified(1);
- to.setLastModified( System.currentTimeMillis() );
+ to.setLastModified(System.currentTimeMillis());
- mavenFileFilter.copyFile( from, to, false, null, null );
-
- Properties properties = PropertyUtils.loadPropertyFile( to, null );
- assertEquals( "${pom.version}", properties.getProperty( "version" ) );
+ mavenFileFilter.copyFile(from, to, false, null, null);
+ Properties properties = PropertyUtils.loadPropertyFile(to, null);
+ assertEquals("${pom.version}", properties.getProperty("version"));
}
- public void testOverwriteFile()
- throws Exception
- {
- MavenFileFilter mavenFileFilter = lookup( MavenFileFilter.class );
+ public void testOverwriteFile() throws Exception {
+ MavenFileFilter mavenFileFilter = lookup(MavenFileFilter.class);
- File from = new File( getBasedir(), "src/test/units-files/reflection-test.properties" );
+ File from = new File(getBasedir(), "src/test/units-files/reflection-test.properties");
- mavenFileFilter.copyFile( from, to, false, null, null );
+ mavenFileFilter.copyFile(from, to, false, null, null);
- from = new File( getBasedir(), "src/test/units-files/reflection-test-older.properties" );
+ from = new File(getBasedir(), "src/test/units-files/reflection-test-older.properties");
// very old file :-)
- from.setLastModified( 1 );
-
- to.setLastModified( System.currentTimeMillis() );
+ from.setLastModified(1);
- mavenFileFilter.copyFile( from, to, false, null, null, true );
+ to.setLastModified(System.currentTimeMillis());
- Properties properties = PropertyUtils.loadPropertyFile( to, null );
- assertEquals( "older file", properties.getProperty( "version" ) );
+ mavenFileFilter.copyFile(from, to, false, null, null, true);
+ Properties properties = PropertyUtils.loadPropertyFile(to, null);
+ assertEquals("older file", properties.getProperty("version"));
}
- public void testNullSafeDefaultFilterWrappers()
- throws Exception
- {
- MavenFileFilter mavenFileFilter = lookup( MavenFileFilter.class );
+ public void testNullSafeDefaultFilterWrappers() throws Exception {
+ MavenFileFilter mavenFileFilter = lookup(MavenFileFilter.class);
- mavenFileFilter.getDefaultFilterWrappers( null, null, false, null, null );
+ mavenFileFilter.getDefaultFilterWrappers(null, null, false, null, null);
// shouldn't fail
}
- public void testMultiFilterFileInheritance()
- throws Exception
- {
- DefaultMavenFileFilter mavenFileFilter = new DefaultMavenFileFilter( mock( BuildContext.class ) );
+ public void testMultiFilterFileInheritance() throws Exception {
+ DefaultMavenFileFilter mavenFileFilter = new DefaultMavenFileFilter(mock(BuildContext.class));
- File testDir = new File( getBasedir(), "src/test/units-files/MSHARED-177" );
+ File testDir = new File(getBasedir(), "src/test/units-files/MSHARED-177");
List<String> filters = new ArrayList<>();
- filters.add( new File( testDir, "first_filter_file.properties" ).getAbsolutePath() );
- filters.add( new File( testDir, "second_filter_file.properties" ).getAbsolutePath() );
- filters.add( new File( testDir, "third_filter_file.properties" ).getAbsolutePath() );
+ filters.add(new File(testDir, "first_filter_file.properties").getAbsolutePath());
+ filters.add(new File(testDir, "second_filter_file.properties").getAbsolutePath());
+ filters.add(new File(testDir, "third_filter_file.properties").getAbsolutePath());
final Properties filterProperties = new Properties();
- mavenFileFilter.loadProperties( filterProperties, new File( getBasedir() ), filters, new Properties() );
+ mavenFileFilter.loadProperties(filterProperties, new File(getBasedir()), filters, new Properties());
- assertTrue( filterProperties.getProperty( "third_filter_key" ).equals( "first and second" ) );
+ assertTrue(filterProperties.getProperty("third_filter_key").equals("first and second"));
}
// MSHARED-161: DefaultMavenFileFilter.getDefaultFilterWrappers loads
// filters from the current directory instead of using basedir
- public void testMavenBasedir()
- throws Exception
- {
- MavenFileFilter mavenFileFilter = lookup( MavenFileFilter.class );
+ public void testMavenBasedir() throws Exception {
+ MavenFileFilter mavenFileFilter = lookup(MavenFileFilter.class);
AbstractMavenFilteringRequest req = new AbstractMavenFilteringRequest();
- req.setFileFilters( Collections.singletonList( "src/main/filters/filefilter.properties" ) );
+ req.setFileFilters(Collections.singletonList("src/main/filters/filefilter.properties"));
- MavenProject mavenProject = new StubMavenProject( new File( "src/test/units-files/MSHARED-161" ) );
- mavenProject.getBuild().setFilters( Collections.singletonList( "src/main/filters/buildfilter.properties" ) );
- req.setMavenProject( mavenProject );
- req.setInjectProjectBuildFilters( true );
+ MavenProject mavenProject = new StubMavenProject(new File("src/test/units-files/MSHARED-161"));
+ mavenProject.getBuild().setFilters(Collections.singletonList("src/main/filters/buildfilter.properties"));
+ req.setMavenProject(mavenProject);
+ req.setInjectProjectBuildFilters(true);
- List<FilterWrapper> wrappers = mavenFileFilter.getDefaultFilterWrappers( req );
+ List<FilterWrapper> wrappers = mavenFileFilter.getDefaultFilterWrappers(req);
- try ( Reader reader = wrappers.get( 0 ).getReader( new StringReader( "${filefilter} ${buildfilter}" ) ) )
- {
- assertEquals( "true true", IOUtils.toString( reader ) );
+ try (Reader reader = wrappers.get(0).getReader(new StringReader("${filefilter} ${buildfilter}"))) {
+ assertEquals("true true", IOUtils.toString(reader));
}
}
// MSHARED-198: custom delimiters doesn't work as expected
- public void testCustomDelimiters()
- throws Exception
- {
- MavenFileFilter mavenFileFilter = lookup( MavenFileFilter.class );
+ public void testCustomDelimiters() throws Exception {
+ MavenFileFilter mavenFileFilter = lookup(MavenFileFilter.class);
AbstractMavenFilteringRequest req = new AbstractMavenFilteringRequest();
Properties additionalProperties = new Properties();
- additionalProperties.setProperty( "FILTER.a.ME", "DONE" );
- req.setAdditionalProperties( additionalProperties );
- req.setDelimiters( new LinkedHashSet<>( Arrays.asList( "aaa*aaa", "abc*abc" ) ) );
+ additionalProperties.setProperty("FILTER.a.ME", "DONE");
+ req.setAdditionalProperties(additionalProperties);
+ req.setDelimiters(new LinkedHashSet<>(Arrays.asList("aaa*aaa", "abc*abc")));
- List<FilterWrapper> wrappers = mavenFileFilter.getDefaultFilterWrappers( req );
+ List<FilterWrapper> wrappers = mavenFileFilter.getDefaultFilterWrappers(req);
- Reader reader = wrappers.get( 0 ).getReader( new StringReader( "aaaFILTER.a.MEaaa" ) );
- assertEquals( "DONE", IOUtils.toString( reader ) );
+ Reader reader = wrappers.get(0).getReader(new StringReader("aaaFILTER.a.MEaaa"));
+ assertEquals("DONE", IOUtils.toString(reader));
- reader = wrappers.get( 0 ).getReader( new StringReader( "abcFILTER.a.MEabc" ) );
- assertEquals( "DONE", IOUtils.toString( reader ) );
+ reader = wrappers.get(0).getReader(new StringReader("abcFILTER.a.MEabc"));
+ assertEquals("DONE", IOUtils.toString(reader));
}
// MSHARED-199: Filtering doesn't work if 2 delimiters are used on the same line, the first one being left open
- public void testLineWithSingleAtAndExpression()
- throws Exception
- {
- MavenFileFilter mavenFileFilter = lookup( MavenFileFilter.class );
+ public void testLineWithSingleAtAndExpression() throws Exception {
+ MavenFileFilter mavenFileFilter = lookup(MavenFileFilter.class);
AbstractMavenFilteringRequest req = new AbstractMavenFilteringRequest();
Properties additionalProperties = new Properties();
- additionalProperties.setProperty( "foo", "bar" );
- req.setAdditionalProperties( additionalProperties );
+ additionalProperties.setProperty("foo", "bar");
+ req.setAdditionalProperties(additionalProperties);
- List<FilterWrapper> wrappers = mavenFileFilter.getDefaultFilterWrappers( req );
+ List<FilterWrapper> wrappers = mavenFileFilter.getDefaultFilterWrappers(req);
- try ( Reader reader = wrappers.get( 0 ).getReader( new StringReader( "toto@titi.com ${foo}" ) ) )
- {
- assertEquals( "toto@titi.com bar", IOUtils.toString( reader ) );
+ try (Reader reader = wrappers.get(0).getReader(new StringReader("toto@titi.com ${foo}"))) {
+ assertEquals("toto@titi.com bar", IOUtils.toString(reader));
}
}
}
diff --git a/src/test/java/org/apache/maven/shared/filtering/DefaultMavenReaderFilterTest.java b/src/test/java/org/apache/maven/shared/filtering/DefaultMavenReaderFilterTest.java
index 303927b..7788288 100644
--- a/src/test/java/org/apache/maven/shared/filtering/DefaultMavenReaderFilterTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/DefaultMavenReaderFilterTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.filtering;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.shared.filtering;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.shared.filtering;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.filtering;
import java.io.Reader;
import java.io.StringReader;
@@ -28,25 +27,20 @@ import org.apache.commons.io.IOUtils;
/**
* @author Kristian Rosenvold
*/
-public class DefaultMavenReaderFilterTest
- extends TestSupport
-{
- public void testJustDoSomeFiltering()
- throws Exception
- {
- MavenReaderFilter readerFilter = lookup( MavenReaderFilter.class );
+public class DefaultMavenReaderFilterTest extends TestSupport {
+ public void testJustDoSomeFiltering() throws Exception {
+ MavenReaderFilter readerFilter = lookup(MavenReaderFilter.class);
- StringReader src = new StringReader( "toto@titi.com ${foo}" );
+ StringReader src = new StringReader("toto@titi.com ${foo}");
MavenReaderFilterRequest req = new MavenReaderFilterRequest();
Properties additionalProperties = new Properties();
- additionalProperties.setProperty( "foo", "bar" );
- req.setFrom( src );
- req.setFiltering( true );
- req.setAdditionalProperties( additionalProperties );
+ additionalProperties.setProperty("foo", "bar");
+ req.setFrom(src);
+ req.setFiltering(true);
+ req.setAdditionalProperties(additionalProperties);
- try ( Reader filter = readerFilter.filter( req ) )
- {
- assertEquals( "toto@titi.com bar", IOUtils.toString( filter ) );
+ try (Reader filter = readerFilter.filter(req)) {
+ assertEquals("toto@titi.com bar", IOUtils.toString(filter));
}
}
}
diff --git a/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java b/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
index 7cf19cf..752928c 100644
--- a/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.filtering;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.shared.filtering;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.shared.filtering;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.filtering;
import java.io.File;
import java.io.FileInputStream;
@@ -41,475 +40,472 @@ import org.codehaus.plexus.interpolation.ValueSource;
*
* @since 1.0-beta-1
*/
-public class DefaultMavenResourcesFilteringTest
- extends TestSupport
-{
+public class DefaultMavenResourcesFilteringTest extends TestSupport {
- private File outputDirectory = new File( getBasedir(), "target/DefaultMavenResourcesFilteringTest" );
- private File baseDir = new File( "c:\\foo\\bar" );
- private StubMavenProject mavenProject = new StubMavenProject( baseDir );
+ private File outputDirectory = new File(getBasedir(), "target/DefaultMavenResourcesFilteringTest");
+ private File baseDir = new File("c:\\foo\\bar");
+ private StubMavenProject mavenProject = new StubMavenProject(baseDir);
private MavenResourcesFiltering mavenResourcesFiltering;
@Override
- protected void setUp()
- throws Exception
- {
+ protected void setUp() throws Exception {
super.setUp();
- if ( outputDirectory.exists() )
- {
- FileUtils.deleteDirectory( outputDirectory );
+ if (outputDirectory.exists()) {
+ FileUtils.deleteDirectory(outputDirectory);
}
outputDirectory.mkdirs();
-
- mavenProject.setVersion( "1.0" );
- mavenProject.setGroupId( "org.apache" );
- mavenProject.setName( "test project" );
-
- mavenResourcesFiltering = lookup( MavenResourcesFiltering.class );
+
+ mavenProject.setVersion("1.0");
+ mavenProject.setGroupId("org.apache");
+ mavenProject.setName("test project");
+
+ mavenResourcesFiltering = lookup(MavenResourcesFiltering.class);
}
- public void testSimpleFiltering()
- throws Exception
- {
+ public void testSimpleFiltering() throws Exception {
Properties projectProperties = new Properties();
- projectProperties.put( "foo", "bar" );
- projectProperties.put( "java.version", "zloug" );
- mavenProject.setProperties( projectProperties );
+ projectProperties.put("foo", "bar");
+ projectProperties.put("java.version", "zloug");
+ mavenProject.setProperties(projectProperties);
String unitFilesDir = getBasedir() + "/src/test/units-files/maven-resources-filtering";
- File initialImageFile = new File( unitFilesDir, "happy_duke.gif" );
+ File initialImageFile = new File(unitFilesDir, "happy_duke.gif");
Resource resource = new Resource();
List<Resource> resources = new ArrayList<>();
- resources.add( resource );
- resource.setDirectory( unitFilesDir );
- resource.setFiltering( true );
+ resources.add(resource);
+ resource.setDirectory(unitFilesDir);
+ resource.setFiltering(true);
List<String> filtersFile = new ArrayList<>();
- filtersFile.add( getBasedir()
- + "/src/test/units-files/maven-resources-filtering/empty-maven-resources-filtering.txt" );
-
- List<String> nonFilteredFileExtensions = Collections.singletonList( "gif" );
-
- MavenResourcesExecution mavenResourcesExecution =
- new MavenResourcesExecution( resources, outputDirectory, mavenProject, "UTF-8", filtersFile,
- nonFilteredFileExtensions, new StubMavenSession() );
- mavenResourcesExecution.setUseDefaultFilterWrappers( true );
- mavenResourcesFiltering.filterResources( mavenResourcesExecution );
-
- assertFiltering( initialImageFile, false, false );
+ filtersFile.add(
+ getBasedir() + "/src/test/units-files/maven-resources-filtering/empty-maven-resources-filtering.txt");
+
+ List<String> nonFilteredFileExtensions = Collections.singletonList("gif");
+
+ MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution(
+ resources,
+ outputDirectory,
+ mavenProject,
+ "UTF-8",
+ filtersFile,
+ nonFilteredFileExtensions,
+ new StubMavenSession());
+ mavenResourcesExecution.setUseDefaultFilterWrappers(true);
+ mavenResourcesFiltering.filterResources(mavenResourcesExecution);
+
+ assertFiltering(initialImageFile, false, false);
}
- public void testSessionFiltering()
- throws Exception
- {
+ public void testSessionFiltering() throws Exception {
String unitFilesDir = getBasedir() + "/src/test/units-files/session-filtering";
Resource resource = new Resource();
List<Resource> resources = new ArrayList<>();
- resources.add( resource );
- resource.setDirectory( unitFilesDir );
- resource.setFiltering( true );
+ resources.add(resource);
+ resource.setDirectory(unitFilesDir);
+ resource.setFiltering(true);
List<String> filtersFile = new ArrayList<>();
Settings settings = new Settings();
- settings.setLocalRepository( System.getProperty( "localRepository",
- System.getProperty( "maven.repo.local",
- "/path/to/local/repo" ) ) );
+ settings.setLocalRepository(
+ System.getProperty("localRepository", System.getProperty("maven.repo.local", "/path/to/local/repo")));
- MavenSession session = new StubMavenSession( settings );
+ MavenSession session = new StubMavenSession(settings);
MavenResourcesExecution mre = new MavenResourcesExecution();
- mre.setResources( resources );
- mre.setOutputDirectory( outputDirectory );
- mre.setEncoding( "UTF-8" );
- mre.setMavenProject( mavenProject );
- mre.setFilters( filtersFile );
- mre.setNonFilteredFileExtensions( Collections.<String> emptyList() );
- mre.setMavenSession( session );
- mre.setUseDefaultFilterWrappers( true );
+ mre.setResources(resources);
+ mre.setOutputDirectory(outputDirectory);
+ mre.setEncoding("UTF-8");
+ mre.setMavenProject(mavenProject);
+ mre.setFilters(filtersFile);
+ mre.setNonFilteredFileExtensions(Collections.<String>emptyList());
+ mre.setMavenSession(session);
+ mre.setUseDefaultFilterWrappers(true);
- mavenResourcesFiltering.filterResources( mre );
+ mavenResourcesFiltering.filterResources(mre);
Properties result = new Properties();
-
- try ( FileInputStream in = new FileInputStream( new File( outputDirectory, "session-filter-target.txt" ) ) )
- {
- result.load( in );
+
+ try (FileInputStream in = new FileInputStream(new File(outputDirectory, "session-filter-target.txt"))) {
+ result.load(in);
}
- assertEquals( settings.getLocalRepository(), result.getProperty( "session.settings.local.repo" ) );
- assertEquals( settings.getLocalRepository(), result.getProperty( "settings.local.repo" ) );
- assertEquals( settings.getLocalRepository(), result.getProperty( "local.repo" ) );
+ assertEquals(settings.getLocalRepository(), result.getProperty("session.settings.local.repo"));
+ assertEquals(settings.getLocalRepository(), result.getProperty("settings.local.repo"));
+ assertEquals(settings.getLocalRepository(), result.getProperty("local.repo"));
}
- public void testWithMavenResourcesExecution()
- throws Exception
- {
+ public void testWithMavenResourcesExecution() throws Exception {
Properties projectProperties = new Properties();
- projectProperties.put( "foo", "bar" );
- projectProperties.put( "java.version", "zloug" );
- mavenProject.setProperties( projectProperties );
+ projectProperties.put("foo", "bar");
+ projectProperties.put("java.version", "zloug");
+ mavenProject.setProperties(projectProperties);
String unitFilesDir = getBasedir() + "/src/test/units-files/maven-resources-filtering";
- File initialImageFile = new File( unitFilesDir, "happy_duke.gif" );
+ File initialImageFile = new File(unitFilesDir, "happy_duke.gif");
Resource resource = new Resource();
List<Resource> resources = new ArrayList<>();
- resources.add( resource );
- resource.setDirectory( unitFilesDir );
- resource.setFiltering( true );
+ resources.add(resource);
+ resource.setDirectory(unitFilesDir);
+ resource.setFiltering(true);
List<String> filtersFile = new ArrayList<>();
- filtersFile.add( getBasedir()
- + "/src/test/units-files/maven-resources-filtering/empty-maven-resources-filtering.txt" );
-
- List<String> nonFilteredFileExtensions = Collections.singletonList( "gif" );
- MavenResourcesExecution mavenResourcesExecution =
- new MavenResourcesExecution( resources, outputDirectory, mavenProject, "UTF-8", filtersFile,
- nonFilteredFileExtensions, new StubMavenSession() );
- mavenResourcesExecution.setEscapeString( "\\" );
- mavenResourcesFiltering.filterResources( mavenResourcesExecution );
- assertFiltering( initialImageFile, true, false );
+ filtersFile.add(
+ getBasedir() + "/src/test/units-files/maven-resources-filtering/empty-maven-resources-filtering.txt");
+
+ List<String> nonFilteredFileExtensions = Collections.singletonList("gif");
+ MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution(
+ resources,
+ outputDirectory,
+ mavenProject,
+ "UTF-8",
+ filtersFile,
+ nonFilteredFileExtensions,
+ new StubMavenSession());
+ mavenResourcesExecution.setEscapeString("\\");
+ mavenResourcesFiltering.filterResources(mavenResourcesExecution);
+ assertFiltering(initialImageFile, true, false);
}
- public void testWithMavenResourcesExecutionWithAdditionalProperties()
- throws Exception
- {
+ public void testWithMavenResourcesExecutionWithAdditionalProperties() throws Exception {
Properties projectProperties = new Properties();
- projectProperties.put( "foo", "bar" );
- projectProperties.put( "java.version", "zloug" );
- mavenProject.setProperties( projectProperties );
+ projectProperties.put("foo", "bar");
+ projectProperties.put("java.version", "zloug");
+ mavenProject.setProperties(projectProperties);
String unitFilesDir = getBasedir() + "/src/test/units-files/maven-resources-filtering";
- File initialImageFile = new File( unitFilesDir, "happy_duke.gif" );
+ File initialImageFile = new File(unitFilesDir, "happy_duke.gif");
Resource resource = new Resource();
List<Resource> resources = new ArrayList<>();
- resources.add( resource );
- resource.setDirectory( unitFilesDir );
- resource.setFiltering( true );
+ resources.add(resource);
+ resource.setDirectory(unitFilesDir);
+ resource.setFiltering(true);
List<String> filtersFile = new ArrayList<>();
- filtersFile.add( getBasedir()
- + "/src/test/units-files/maven-resources-filtering/empty-maven-resources-filtering.txt" );
+ filtersFile.add(
+ getBasedir() + "/src/test/units-files/maven-resources-filtering/empty-maven-resources-filtering.txt");
- List<String> nonFilteredFileExtensions = Collections.singletonList( "gif" );
+ List<String> nonFilteredFileExtensions = Collections.singletonList("gif");
Properties additionalProperties = new Properties();
- additionalProperties.put( "greatDate", "1973-06-14" );
- additionalProperties.put( "pom.version", "99.00" );
- MavenResourcesExecution mavenResourcesExecution =
- new MavenResourcesExecution( resources, outputDirectory, mavenProject, "UTF-8", filtersFile,
- nonFilteredFileExtensions, new StubMavenSession() );
- mavenResourcesExecution.setAdditionalProperties( additionalProperties );
- mavenResourcesExecution.setEscapeString( "\\" );
- mavenResourcesFiltering.filterResources( mavenResourcesExecution );
- assertFiltering( initialImageFile, true, true );
+ additionalProperties.put("greatDate", "1973-06-14");
+ additionalProperties.put("pom.version", "99.00");
+ MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution(
+ resources,
+ outputDirectory,
+ mavenProject,
+ "UTF-8",
+ filtersFile,
+ nonFilteredFileExtensions,
+ new StubMavenSession());
+ mavenResourcesExecution.setAdditionalProperties(additionalProperties);
+ mavenResourcesExecution.setEscapeString("\\");
+ mavenResourcesFiltering.filterResources(mavenResourcesExecution);
+ assertFiltering(initialImageFile, true, true);
}
- private void assertFiltering( File initialImageFile, boolean escapeTest,
- boolean additionalProperties )
- throws Exception
- {
- assertEquals( 7, outputDirectory.listFiles().length );
+ private void assertFiltering(File initialImageFile, boolean escapeTest, boolean additionalProperties)
+ throws Exception {
+ assertEquals(7, outputDirectory.listFiles().length);
Properties result = new Properties();
-
- try ( FileInputStream in = new FileInputStream( new File( outputDirectory, "empty-maven-resources-filtering.txt" ) ) )
- {
- result.load( in );
+
+ try (FileInputStream in =
+ new FileInputStream(new File(outputDirectory, "empty-maven-resources-filtering.txt"))) {
+ result.load(in);
}
-
- assertTrue( result.isEmpty() );
+
+ assertTrue(result.isEmpty());
result = new Properties();
- try ( FileInputStream in = new FileInputStream( new File( outputDirectory, "maven-resources-filtering.txt" ) ) )
- {
- result.load( in );
+ try (FileInputStream in = new FileInputStream(new File(outputDirectory, "maven-resources-filtering.txt"))) {
+ result.load(in);
}
- assertFalse( result.isEmpty() );
+ assertFalse(result.isEmpty());
- if ( additionalProperties )
- {
- assertEquals( "1973-06-14", result.getProperty( "goodDate" ) );
- assertEquals( "99.00", result.get( "version" ) );
- }
- else
- {
- assertEquals( "1.0", result.get( "version" ) );
+ if (additionalProperties) {
+ assertEquals("1973-06-14", result.getProperty("goodDate"));
+ assertEquals("99.00", result.get("version"));
+ } else {
+ assertEquals("1.0", result.get("version"));
}
- assertEquals( "org.apache", result.get( "groupId" ) );
- assertEquals( "bar", result.get( "foo" ) );
- assertEquals( "${foo.version}", result.get( "fooVersion" ) );
-
- assertEquals( "@@", result.getProperty( "emptyexpression" ) );
- assertEquals( "${}", result.getProperty( "emptyexpression2" ) );
- assertEquals( System.getProperty( "user.dir" ), result.getProperty( "userDir" ) );
- String userDir = result.getProperty( "userDir" );
- assertTrue( new File( userDir ).exists() );
- assertEquals( new File( System.getProperty( "user.dir" ) ), new File( userDir ) );
- assertEquals( System.getProperty( "java.version" ), result.getProperty( "javaVersion" ) );
-
- String userHome = result.getProperty( "userHome" );
-
- assertTrue( "'" + userHome + "' does not exist.", new File( userHome ).exists() );
- assertEquals( new File( System.getProperty( "user.home" ) ), new File( userHome ) );
-
- if ( escapeTest )
- {
- assertEquals( "${java.version}", result.getProperty( "escapeJavaVersion" ) );
- assertEquals( "@user.dir@", result.getProperty( "escapeuserDir" ) );
+ assertEquals("org.apache", result.get("groupId"));
+ assertEquals("bar", result.get("foo"));
+ assertEquals("${foo.version}", result.get("fooVersion"));
+
+ assertEquals("@@", result.getProperty("emptyexpression"));
+ assertEquals("${}", result.getProperty("emptyexpression2"));
+ assertEquals(System.getProperty("user.dir"), result.getProperty("userDir"));
+ String userDir = result.getProperty("userDir");
+ assertTrue(new File(userDir).exists());
+ assertEquals(new File(System.getProperty("user.dir")), new File(userDir));
+ assertEquals(System.getProperty("java.version"), result.getProperty("javaVersion"));
+
+ String userHome = result.getProperty("userHome");
+
+ assertTrue("'" + userHome + "' does not exist.", new File(userHome).exists());
+ assertEquals(new File(System.getProperty("user.home")), new File(userHome));
+
+ if (escapeTest) {
+ assertEquals("${java.version}", result.getProperty("escapeJavaVersion"));
+ assertEquals("@user.dir@", result.getProperty("escapeuserDir"));
}
- assertEquals( baseDir.toString(), result.get( "base" ) );
- assertEquals( new File( baseDir.toString() ).getPath(), new File( result.getProperty( "base" ) ).getPath() );
+ assertEquals(baseDir.toString(), result.get("base"));
+ assertEquals(new File(baseDir.toString()).getPath(), new File(result.getProperty("base")).getPath());
- File imageFile = new File( outputDirectory, "happy_duke.gif" );
- assertTrue( imageFile.exists() );
+ File imageFile = new File(outputDirectory, "happy_duke.gif");
+ assertTrue(imageFile.exists());
// assertEquals( initialImageFile.length(), imageFile.length() );
- assertTrue( filesAreIdentical( initialImageFile, imageFile ) );
+ assertTrue(filesAreIdentical(initialImageFile, imageFile));
}
- public void testAddingTokens()
- throws Exception
- {
+ public void testAddingTokens() throws Exception {
Properties projectProperties = new Properties();
- projectProperties.put( "foo", "bar" );
- projectProperties.put( "java.version", "zloug" );
- mavenProject.setProperties( projectProperties );
+ projectProperties.put("foo", "bar");
+ projectProperties.put("java.version", "zloug");
+ mavenProject.setProperties(projectProperties);
String unitFilesDir = getBasedir() + "/src/test/units-files/maven-resources-filtering";
- File initialImageFile = new File( unitFilesDir, "happy_duke.gif" );
+ File initialImageFile = new File(unitFilesDir, "happy_duke.gif");
Resource resource = new Resource();
List<Resource> resources = new ArrayList<>();
- resources.add( resource );
- resource.setDirectory( unitFilesDir );
- resource.setFiltering( true );
+ resources.add(resource);
+ resource.setDirectory(unitFilesDir);
+ resource.setFiltering(true);
List<String> filtersFile = new ArrayList<>();
- filtersFile.add( getBasedir()
- + "/src/test/units-files/maven-resources-filtering/empty-maven-resources-filtering.txt" );
+ filtersFile.add(
+ getBasedir() + "/src/test/units-files/maven-resources-filtering/empty-maven-resources-filtering.txt");
- List<String> nonFilteredFileExtensions = Collections.singletonList( "gif" );
+ List<String> nonFilteredFileExtensions = Collections.singletonList("gif");
- MavenResourcesExecution mavenResourcesExecution =
- new MavenResourcesExecution( resources, outputDirectory, mavenProject, "UTF-8", null,
- nonFilteredFileExtensions, new StubMavenSession() );
+ MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution(
+ resources,
+ outputDirectory,
+ mavenProject,
+ "UTF-8",
+ null,
+ nonFilteredFileExtensions,
+ new StubMavenSession());
ValueSource vs =
- new PrefixedObjectValueSource( mavenResourcesExecution.getProjectStartExpressions(), mavenProject, true );
+ new PrefixedObjectValueSource(mavenResourcesExecution.getProjectStartExpressions(), mavenProject, true);
- mavenResourcesExecution.addFilerWrapperWithEscaping( vs, "@", "@", null, false );
+ mavenResourcesExecution.addFilerWrapperWithEscaping(vs, "@", "@", null, false);
- mavenResourcesFiltering.filterResources( mavenResourcesExecution );
+ mavenResourcesFiltering.filterResources(mavenResourcesExecution);
Properties result =
- PropertyUtils.loadPropertyFile( new File( outputDirectory, "maven-resources-filtering.txt" ), null );
- assertFalse( result.isEmpty() );
- assertEquals( mavenProject.getName(), result.get( "pomName" ) );
- assertFiltering( initialImageFile, false, false );
+ PropertyUtils.loadPropertyFile(new File(outputDirectory, "maven-resources-filtering.txt"), null);
+ assertFalse(result.isEmpty());
+ assertEquals(mavenProject.getName(), result.get("pomName"));
+ assertFiltering(initialImageFile, false, false);
}
- public void testNoFiltering()
- throws Exception
- {
+ public void testNoFiltering() throws Exception {
String unitFilesDir = getBasedir() + "/src/test/units-files/maven-resources-filtering";
- File initialImageFile = new File( unitFilesDir, "happy_duke.gif" );
+ File initialImageFile = new File(unitFilesDir, "happy_duke.gif");
Resource resource = new Resource();
List<Resource> resources = new ArrayList<>();
- resources.add( resource );
+ resources.add(resource);
- resource.setDirectory( unitFilesDir );
- resource.setFiltering( false );
+ resource.setDirectory(unitFilesDir);
+ resource.setFiltering(false);
MavenResourcesExecution mre = new MavenResourcesExecution();
- mre.setResources( resources );
- mre.setOutputDirectory( outputDirectory );
- mre.setEncoding( "UTF-8" );
- mre.setMavenProject( mavenProject );
- mre.setFilters( null );
- mre.setNonFilteredFileExtensions( Collections.<String> emptyList() );
- mre.setMavenSession( new StubMavenSession() );
+ mre.setResources(resources);
+ mre.setOutputDirectory(outputDirectory);
+ mre.setEncoding("UTF-8");
+ mre.setMavenProject(mavenProject);
+ mre.setFilters(null);
+ mre.setNonFilteredFileExtensions(Collections.<String>emptyList());
+ mre.setMavenSession(new StubMavenSession());
- mavenResourcesFiltering.filterResources( mre );
+ mavenResourcesFiltering.filterResources(mre);
- assertEquals( 7, outputDirectory.listFiles().length );
+ assertEquals(7, outputDirectory.listFiles().length);
Properties result =
- PropertyUtils.loadPropertyFile( new File( outputDirectory, "empty-maven-resources-filtering.txt" ), null );
- assertTrue( result.isEmpty() );
-
- result = PropertyUtils.loadPropertyFile( new File( outputDirectory, "maven-resources-filtering.txt" ), null );
- assertFalse( result.isEmpty() );
-
- assertEquals( "${pom.version}", result.get( "version" ) );
- assertEquals( "${pom.groupId}", result.get( "groupId" ) );
- assertEquals( "${foo}", result.get( "foo" ) );
- assertEquals( "@@", result.getProperty( "emptyexpression" ) );
- assertEquals( "${}", result.getProperty( "emptyexpression2" ) );
- File imageFile = new File( outputDirectory, "happy_duke.gif" );
- assertTrue( filesAreIdentical( initialImageFile, imageFile ) );
+ PropertyUtils.loadPropertyFile(new File(outputDirectory, "empty-maven-resources-filtering.txt"), null);
+ assertTrue(result.isEmpty());
+
+ result = PropertyUtils.loadPropertyFile(new File(outputDirectory, "maven-resources-filtering.txt"), null);
+ assertFalse(result.isEmpty());
+
+ assertEquals("${pom.version}", result.get("version"));
+ assertEquals("${pom.groupId}", result.get("groupId"));
+ assertEquals("${foo}", result.get("foo"));
+ assertEquals("@@", result.getProperty("emptyexpression"));
+ assertEquals("${}", result.getProperty("emptyexpression2"));
+ File imageFile = new File(outputDirectory, "happy_duke.gif");
+ assertTrue(filesAreIdentical(initialImageFile, imageFile));
}
- private static boolean filesAreIdentical( File expected, File current )
- throws IOException
- {
- if ( expected.length() != current.length() )
- {
+ private static boolean filesAreIdentical(File expected, File current) throws IOException {
+ if (expected.length() != current.length()) {
return false;
}
- byte[] expectedBuffer = Files.readAllBytes( expected.toPath() );
- byte[] currentBuffer = Files.readAllBytes( current.toPath() );
- if ( expectedBuffer.length != currentBuffer.length )
- {
+ byte[] expectedBuffer = Files.readAllBytes(expected.toPath());
+ byte[] currentBuffer = Files.readAllBytes(current.toPath());
+ if (expectedBuffer.length != currentBuffer.length) {
return false;
}
- for ( int i = 0, size = expectedBuffer.length; i < size; i++ )
- {
- if ( expectedBuffer[i] != currentBuffer[i] )
- {
+ for (int i = 0, size = expectedBuffer.length; i < size; i++) {
+ if (expectedBuffer[i] != currentBuffer[i]) {
return false;
}
}
- return true;
+ return true;
}
- public void testIncludeOneFile()
- throws Exception
- {
+ public void testIncludeOneFile() throws Exception {
String unitFilesDir = getBasedir() + "/src/test/units-files/maven-resources-filtering";
Resource resource = new Resource();
List<Resource> resources = new ArrayList<>();
- resources.add( resource );
- resource.setDirectory( unitFilesDir );
- resource.setFiltering( true );
- resource.addInclude( "includ*" );
+ resources.add(resource);
+ resource.setDirectory(unitFilesDir);
+ resource.setFiltering(true);
+ resource.addInclude("includ*");
List<String> filtersFile = new ArrayList<>();
- filtersFile.add( getBasedir()
- + "/src/test/units-files/maven-resources-filtering/empty-maven-resources-filtering.txt" );
-
- MavenResourcesExecution mavenResourcesExecution =
- new MavenResourcesExecution( resources, outputDirectory, mavenProject, "UTF-8", filtersFile,
- Collections.<String> emptyList(), new StubMavenSession() );
- mavenResourcesFiltering.filterResources( mavenResourcesExecution );
+ filtersFile.add(
+ getBasedir() + "/src/test/units-files/maven-resources-filtering/empty-maven-resources-filtering.txt");
+
+ MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution(
+ resources,
+ outputDirectory,
+ mavenProject,
+ "UTF-8",
+ filtersFile,
+ Collections.<String>emptyList(),
+ new StubMavenSession());
+ mavenResourcesFiltering.filterResources(mavenResourcesExecution);
File[] files = outputDirectory.listFiles();
- assertEquals( 1, files.length );
- assertEquals( "includefile.txt", files[0].getName() );
-
+ assertEquals(1, files.length);
+ assertEquals("includefile.txt", files[0].getName());
}
- public void testIncludeOneFileAndDirectory()
- throws Exception
- {
+ public void testIncludeOneFileAndDirectory() throws Exception {
String unitFilesDir = getBasedir() + "/src/test/units-files/maven-resources-filtering";
Resource resource = new Resource();
List<Resource> resources = new ArrayList<>();
- resources.add( resource );
- resource.setDirectory( unitFilesDir );
- resource.setFiltering( true );
- resource.addInclude( "includ*" );
- resource.addInclude( "**/includ*" );
+ resources.add(resource);
+ resource.setDirectory(unitFilesDir);
+ resource.setFiltering(true);
+ resource.addInclude("includ*");
+ resource.addInclude("**/includ*");
List<String> filtersFile = new ArrayList<>();
- filtersFile.add( getBasedir()
- + "/src/test/units-files/maven-resources-filtering/empty-maven-resources-filtering.txt" );
-
- MavenResourcesExecution mavenResourcesExecution =
- new MavenResourcesExecution( resources, outputDirectory, mavenProject, "UTF-8", filtersFile,
- Collections.<String> emptyList(), new StubMavenSession() );
- mavenResourcesFiltering.filterResources( mavenResourcesExecution );
+ filtersFile.add(
+ getBasedir() + "/src/test/units-files/maven-resources-filtering/empty-maven-resources-filtering.txt");
+
+ MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution(
+ resources,
+ outputDirectory,
+ mavenProject,
+ "UTF-8",
+ filtersFile,
+ Collections.<String>emptyList(),
+ new StubMavenSession());
+ mavenResourcesFiltering.filterResources(mavenResourcesExecution);
File[] files = outputDirectory.listFiles();
- assertNotNull( files );
- assertEquals( 2, files.length );
- File includeFile = new File( outputDirectory, "includefile.txt" );
- assertTrue( includeFile.exists() );
-
- includeFile = new File( new File( outputDirectory, "includedir" ), "include.txt" );
- assertTrue( includeFile.exists() );
+ assertNotNull(files);
+ assertEquals(2, files.length);
+ File includeFile = new File(outputDirectory, "includefile.txt");
+ assertTrue(includeFile.exists());
+ includeFile = new File(new File(outputDirectory, "includedir"), "include.txt");
+ assertTrue(includeFile.exists());
}
- public void testFlattenDirectoryStructure()
- throws Exception
- {
- File baseDir = new File( "c:\\foo\\bar" );
- StubMavenProject mavenProject = new StubMavenProject( baseDir );
- mavenProject.setVersion( "1.0" );
- mavenProject.setGroupId( "org.apache" );
- mavenProject.setName( "test project" );
+ public void testFlattenDirectoryStructure() throws Exception {
+ File baseDir = new File("c:\\foo\\bar");
+ StubMavenProject mavenProject = new StubMavenProject(baseDir);
+ mavenProject.setVersion("1.0");
+ mavenProject.setGroupId("org.apache");
+ mavenProject.setName("test project");
- MavenResourcesFiltering mavenResourcesFiltering = lookup( MavenResourcesFiltering.class );
+ MavenResourcesFiltering mavenResourcesFiltering = lookup(MavenResourcesFiltering.class);
String unitFilesDir = getBasedir() + "/src/test/units-files/maven-resources-filtering";
Resource resource = new Resource();
List<Resource> resources = new ArrayList<>();
- resources.add( resource );
- resource.setDirectory( unitFilesDir );
- resource.setFiltering( true );
- resource.addInclude( "includ*" );
- resource.addInclude( "**/includ*" );
+ resources.add(resource);
+ resource.setDirectory(unitFilesDir);
+ resource.setFiltering(true);
+ resource.addInclude("includ*");
+ resource.addInclude("**/includ*");
List<String> filtersFile = new ArrayList<>();
- filtersFile.add( getBasedir()
- + "/src/test/units-files/maven-resources-filtering/empty-maven-resources-filtering.txt" );
-
- MavenResourcesExecution mavenResourcesExecution =
- new MavenResourcesExecution( resources, outputDirectory, mavenProject, "UTF-8", filtersFile,
- Collections.<String> emptyList(), new StubMavenSession() );
+ filtersFile.add(
+ getBasedir() + "/src/test/units-files/maven-resources-filtering/empty-maven-resources-filtering.txt");
+
+ MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution(
+ resources,
+ outputDirectory,
+ mavenProject,
+ "UTF-8",
+ filtersFile,
+ Collections.<String>emptyList(),
+ new StubMavenSession());
mavenResourcesExecution.setFlatten(true);
mavenResourcesExecution.setOverwrite(true);
- mavenResourcesFiltering.filterResources( mavenResourcesExecution );
+ mavenResourcesFiltering.filterResources(mavenResourcesExecution);
File[] files = outputDirectory.listFiles();
- assertNotNull( files );
- assertEquals( 2, files.length );
- File includeFile = new File( outputDirectory, "includefile.txt" );
- assertTrue( includeFile.exists() );
-
- includeFile = new File( outputDirectory, "include.txt" );
- assertTrue( includeFile.exists() );
+ assertNotNull(files);
+ assertEquals(2, files.length);
+ File includeFile = new File(outputDirectory, "includefile.txt");
+ assertTrue(includeFile.exists());
+ includeFile = new File(outputDirectory, "include.txt");
+ assertTrue(includeFile.exists());
}
- public void testFlattenDirectoryStructureWithoutOverride()
- throws Exception
- {
- File baseDir = new File( "c:\\foo\\bar" );
- StubMavenProject mavenProject = new StubMavenProject( baseDir );
- mavenProject.setVersion( "1.0" );
- mavenProject.setGroupId( "org.apache" );
- mavenProject.setName( "test project" );
+ public void testFlattenDirectoryStructureWithoutOverride() throws Exception {
+ File baseDir = new File("c:\\foo\\bar");
+ StubMavenProject mavenProject = new StubMavenProject(baseDir);
+ mavenProject.setVersion("1.0");
+ mavenProject.setGroupId("org.apache");
+ mavenProject.setName("test project");
- MavenResourcesFiltering mavenResourcesFiltering = lookup( MavenResourcesFiltering.class );
+ MavenResourcesFiltering mavenResourcesFiltering = lookup(MavenResourcesFiltering.class);
String unitFilesDir = getBasedir() + "/src/test/units-files/maven-resources-filtering";
Resource resource = new Resource();
List<Resource> resources = new ArrayList<>();
- resources.add( resource );
- resource.setDirectory( unitFilesDir );
- resource.setFiltering( true );
- resource.addInclude( "includ*" );
- resource.addInclude( "**/includ*" );
+ resources.add(resource);
+ resource.setDirectory(unitFilesDir);
+ resource.setFiltering(true);
+ resource.addInclude("includ*");
+ resource.addInclude("**/includ*");
List<String> filtersFile = new ArrayList<>();
- filtersFile.add( getBasedir()
- + "/src/test/units-files/maven-resources-filtering/empty-maven-resources-filtering.txt" );
-
- MavenResourcesExecution mavenResourcesExecution =
- new MavenResourcesExecution( resources, outputDirectory, mavenProject, "UTF-8", filtersFile,
- Collections.<String> emptyList(), new StubMavenSession() );
+ filtersFile.add(
+ getBasedir() + "/src/test/units-files/maven-resources-filtering/empty-maven-resources-filtering.txt");
+
+ MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution(
+ resources,
+ outputDirectory,
+ mavenProject,
+ "UTF-8",
+ filtersFile,
+ Collections.<String>emptyList(),
+ new StubMavenSession());
mavenResourcesExecution.setFlatten(true);
mavenResourcesExecution.setOverwrite(false);
try {
@@ -518,223 +514,218 @@ public class DefaultMavenResourcesFilteringTest
return;
}
fail("Copying directory structure with duplicate filename includefile.txt should have failed with overwrite");
-
}
- public void testExcludeOneFile()
- throws Exception
- {
+ public void testExcludeOneFile() throws Exception {
String unitFilesDir = getBasedir() + "/src/test/units-files/maven-resources-filtering";
Resource resource = new Resource();
List<Resource> resources = new ArrayList<>();
- resources.add( resource );
- resource.setDirectory( unitFilesDir );
- resource.setFiltering( true );
- resource.addExclude( "*.gif" );
- resource.addExclude( "**/excludedir/**" );
+ resources.add(resource);
+ resource.setDirectory(unitFilesDir);
+ resource.setFiltering(true);
+ resource.addExclude("*.gif");
+ resource.addExclude("**/excludedir/**");
List<String> filtersFile = new ArrayList<>();
- filtersFile.add( getBasedir()
- + "/src/test/units-files/maven-resources-filtering/empty-maven-resources-filtering.txt" );
-
- MavenResourcesExecution mavenResourcesExecution =
- new MavenResourcesExecution( resources, outputDirectory, mavenProject, "UTF-8", filtersFile,
- Collections.<String> emptyList(), new StubMavenSession() );
- mavenResourcesFiltering.filterResources( mavenResourcesExecution );
+ filtersFile.add(
+ getBasedir() + "/src/test/units-files/maven-resources-filtering/empty-maven-resources-filtering.txt");
+
+ MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution(
+ resources,
+ outputDirectory,
+ mavenProject,
+ "UTF-8",
+ filtersFile,
+ Collections.<String>emptyList(),
+ new StubMavenSession());
+ mavenResourcesFiltering.filterResources(mavenResourcesExecution);
File[] files = outputDirectory.listFiles();
- assertEquals( 5, files.length );
- File includeFile = new File( outputDirectory, "includefile.txt" );
- assertTrue( includeFile.exists() );
+ assertEquals(5, files.length);
+ File includeFile = new File(outputDirectory, "includefile.txt");
+ assertTrue(includeFile.exists());
- includeFile = new File( new File( outputDirectory, "includedir" ), "include.txt" );
- assertTrue( includeFile.exists() );
+ includeFile = new File(new File(outputDirectory, "includedir"), "include.txt");
+ assertTrue(includeFile.exists());
- File imageFile = new File( outputDirectory, "happy_duke.gif" );
- assertFalse( imageFile.exists() );
+ File imageFile = new File(outputDirectory, "happy_duke.gif");
+ assertFalse(imageFile.exists());
- File excludeDir = new File( outputDirectory, "excludedir" );
- assertFalse( excludeDir.exists() );
+ File excludeDir = new File(outputDirectory, "excludedir");
+ assertFalse(excludeDir.exists());
}
- public void testTargetAbsolutePath()
- throws Exception
- {
+ public void testTargetAbsolutePath() throws Exception {
String unitFilesDir = getBasedir() + "/src/test/units-files/maven-resources-filtering";
Resource resource = new Resource();
List<Resource> resources = new ArrayList<>();
- resources.add( resource );
- resource.setDirectory( unitFilesDir );
- resource.setFiltering( true );
- resource.addInclude( "includ*" );
+ resources.add(resource);
+ resource.setDirectory(unitFilesDir);
+ resource.setFiltering(true);
+ resource.addInclude("includ*");
String targetPath = getBasedir() + "/target/testAbsolutePath/";
- File targetPathFile = new File( targetPath );
- resource.setTargetPath( targetPathFile.getAbsolutePath() );
+ File targetPathFile = new File(targetPath);
+ resource.setTargetPath(targetPathFile.getAbsolutePath());
- if ( !targetPathFile.exists() )
- {
+ if (!targetPathFile.exists()) {
targetPathFile.mkdirs();
- }
- else
- {
- FileUtils.cleanDirectory( targetPathFile );
+ } else {
+ FileUtils.cleanDirectory(targetPathFile);
}
List<String> filtersFile = new ArrayList<>();
- filtersFile.add( getBasedir()
- + "/src/test/units-files/maven-resources-filtering/empty-maven-resources-filtering.txt" );
-
- MavenResourcesExecution mavenResourcesExecution =
- new MavenResourcesExecution( resources, outputDirectory, mavenProject, "UTF-8", filtersFile,
- Collections.<String> emptyList(), new StubMavenSession() );
- mavenResourcesFiltering.filterResources( mavenResourcesExecution );
+ filtersFile.add(
+ getBasedir() + "/src/test/units-files/maven-resources-filtering/empty-maven-resources-filtering.txt");
+
+ MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution(
+ resources,
+ outputDirectory,
+ mavenProject,
+ "UTF-8",
+ filtersFile,
+ Collections.<String>emptyList(),
+ new StubMavenSession());
+ mavenResourcesFiltering.filterResources(mavenResourcesExecution);
File[] files = targetPathFile.listFiles();
- assertEquals( 1, files.length );
- assertEquals( "includefile.txt", files[0].getName() );
+ assertEquals(1, files.length);
+ assertEquals("includefile.txt", files[0].getName());
}
- public void testTargetPath()
- throws Exception
- {
+ public void testTargetPath() throws Exception {
String unitFilesDir = getBasedir() + "/src/test/units-files/maven-resources-filtering";
Resource resource = new Resource();
List<Resource> resources = new ArrayList<>();
- resources.add( resource );
- resource.setDirectory( unitFilesDir );
- resource.setFiltering( true );
- resource.addInclude( "includ*" );
- resource.setTargetPath( "testTargetPath" );
+ resources.add(resource);
+ resource.setDirectory(unitFilesDir);
+ resource.setFiltering(true);
+ resource.addInclude("includ*");
+ resource.setTargetPath("testTargetPath");
List<String> filtersFile = new ArrayList<>();
- filtersFile.add( getBasedir()
- + "/src/test/units-files/maven-resources-filtering/empty-maven-resources-filtering.txt" );
+ filtersFile.add(
+ getBasedir() + "/src/test/units-files/maven-resources-filtering/empty-maven-resources-filtering.txt");
- MavenResourcesExecution mavenResourcesExecution =
- new MavenResourcesExecution( resources, outputDirectory, mavenProject, "UTF-8", filtersFile,
- Collections.<String> emptyList(), new StubMavenSession() );
- mavenResourcesFiltering.filterResources( mavenResourcesExecution );
+ MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution(
+ resources,
+ outputDirectory,
+ mavenProject,
+ "UTF-8",
+ filtersFile,
+ Collections.<String>emptyList(),
+ new StubMavenSession());
+ mavenResourcesFiltering.filterResources(mavenResourcesExecution);
- File targetPathFile = new File( outputDirectory, "testTargetPath" );
+ File targetPathFile = new File(outputDirectory, "testTargetPath");
File[] files = targetPathFile.listFiles();
- assertEquals( 1, files.length );
- assertEquals( "includefile.txt", files[0].getName() );
+ assertEquals(1, files.length);
+ assertEquals("includefile.txt", files[0].getName());
}
- @SuppressWarnings( "serial" )
- public void testEmptyDirectories()
- throws Exception
- {
+ @SuppressWarnings("serial")
+ public void testEmptyDirectories() throws Exception {
List<Resource> resources = new ArrayList<>();
- resources.add( new Resource()
- {
+ resources.add(new Resource() {
{
- setDirectory( getBasedir() + "/src/test/units-files/includeEmptyDirs" );
- setExcludes( Arrays.asList( "**/.gitignore" ) );
+ setDirectory(getBasedir() + "/src/test/units-files/includeEmptyDirs");
+ setExcludes(Arrays.asList("**/.gitignore"));
}
- } );
- MavenResourcesExecution mavenResourcesExecution =
- new MavenResourcesExecution( resources, outputDirectory, mavenProject, "UTF-8",
- Collections.<String> emptyList(), Collections.<String> emptyList(),
- new StubMavenSession() );
- mavenResourcesExecution.setIncludeEmptyDirs( true );
- mavenResourcesFiltering.filterResources( mavenResourcesExecution );
+ });
+ MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution(
+ resources,
+ outputDirectory,
+ mavenProject,
+ "UTF-8",
+ Collections.<String>emptyList(),
+ Collections.<String>emptyList(),
+ new StubMavenSession());
+ mavenResourcesExecution.setIncludeEmptyDirs(true);
+ mavenResourcesFiltering.filterResources(mavenResourcesExecution);
File[] childs = outputDirectory.listFiles();
- assertNotNull( childs );
- assertEquals( 3, childs.length );
-
- for ( File file : childs )
- {
- if ( file.getName().endsWith( "dir1" ) || file.getName().endsWith( "empty-directory" )
- || file.getName().endsWith( "empty-directory-child" ) )
- {
- if ( file.getName().endsWith( "dir1" ) )
- {
- assertEquals( 1, file.list().length );
- assertTrue( file.listFiles()[0].getName().endsWith( "foo.txt" ) );
+ assertNotNull(childs);
+ assertEquals(3, childs.length);
+
+ for (File file : childs) {
+ if (file.getName().endsWith("dir1")
+ || file.getName().endsWith("empty-directory")
+ || file.getName().endsWith("empty-directory-child")) {
+ if (file.getName().endsWith("dir1")) {
+ assertEquals(1, file.list().length);
+ assertTrue(file.listFiles()[0].getName().endsWith("foo.txt"));
}
- if ( file.getName().endsWith( "empty-directory" ) )
- {
- assertEquals( 0, file.list().length );
+ if (file.getName().endsWith("empty-directory")) {
+ assertEquals(0, file.list().length);
}
- if ( file.getName().endsWith( "empty-directory-child" ) )
- {
- assertEquals( 1, file.list().length );
- assertTrue( file.listFiles()[0].isDirectory() );
- assertEquals( 0, file.listFiles()[0].listFiles().length );
+ if (file.getName().endsWith("empty-directory-child")) {
+ assertEquals(1, file.list().length);
+ assertTrue(file.listFiles()[0].isDirectory());
+ assertEquals(0, file.listFiles()[0].listFiles().length);
}
- }
- else
- {
- fail( "unknow child file found " + file.getName() );
+ } else {
+ fail("unknow child file found " + file.getName());
}
}
}
- @SuppressWarnings( "serial" )
- public void testShouldReturnGitIgnoreFiles()
- throws Exception
- {
+ @SuppressWarnings("serial")
+ public void testShouldReturnGitIgnoreFiles() throws Exception {
createTestDataStructure();
- File outputDirectory = new File( getBasedir(), "/target/testGitIgnoreFile" );
+ File outputDirectory = new File(getBasedir(), "/target/testGitIgnoreFile");
List<Resource> resources = new ArrayList<>();
- resources.add( new Resource()
- {
+ resources.add(new Resource() {
{
- setDirectory( getBasedir() + "/target/sourceTestGitIgnoreFile" );
- setIncludes( Arrays.asList( "**/*" ) );
+ setDirectory(getBasedir() + "/target/sourceTestGitIgnoreFile");
+ setIncludes(Arrays.asList("**/*"));
}
- } );
- MavenResourcesExecution mavenResourcesExecution =
- new MavenResourcesExecution( resources, outputDirectory, mavenProject, "UTF-8",
- Collections.<String> emptyList(), Collections.<String> emptyList(),
- new StubMavenSession() );
- mavenResourcesExecution.setIncludeEmptyDirs( true );
- mavenResourcesExecution.setAddDefaultExcludes( false );
- mavenResourcesFiltering.filterResources( mavenResourcesExecution );
+ });
+ MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution(
+ resources,
+ outputDirectory,
+ mavenProject,
+ "UTF-8",
+ Collections.<String>emptyList(),
+ Collections.<String>emptyList(),
+ new StubMavenSession());
+ mavenResourcesExecution.setIncludeEmptyDirs(true);
+ mavenResourcesExecution.setAddDefaultExcludes(false);
+ mavenResourcesFiltering.filterResources(mavenResourcesExecution);
File[] children = outputDirectory.listFiles();
- assertNotNull( children );
- assertEquals( 3, children.length );
-
- for ( File file : children )
- {
- if ( file.getName().endsWith( "dir1" ) || file.getName().endsWith( "empty-directory" )
- || file.getName().endsWith( "empty-directory-child" ) )
- {
- if ( file.getName().endsWith( "dir1" ) )
- {
- assertEquals( 1, file.list().length );
- assertTrue( file.listFiles()[0].getName().endsWith( "foo.txt" ) );
+ assertNotNull(children);
+ assertEquals(3, children.length);
+
+ for (File file : children) {
+ if (file.getName().endsWith("dir1")
+ || file.getName().endsWith("empty-directory")
+ || file.getName().endsWith("empty-directory-child")) {
+ if (file.getName().endsWith("dir1")) {
+ assertEquals(1, file.list().length);
+ assertTrue(file.listFiles()[0].getName().endsWith("foo.txt"));
}
- if ( file.getName().endsWith( "empty-directory" ) )
- {
+ if (file.getName().endsWith("empty-directory")) {
- assertEquals( 1, file.list().length );
- assertTrue( file.listFiles()[0].getName().endsWith( ".gitignore" ) );
+ assertEquals(1, file.list().length);
+ assertTrue(file.listFiles()[0].getName().endsWith(".gitignore"));
}
- if ( file.getName().endsWith( "empty-directory-child" ) )
- {
- assertEquals( 1, file.list().length );
- assertTrue( file.listFiles()[0].isDirectory() );
- assertEquals( 1, file.listFiles()[0].listFiles().length );
+ if (file.getName().endsWith("empty-directory-child")) {
+ assertEquals(1, file.list().length);
+ assertTrue(file.listFiles()[0].isDirectory());
+ assertEquals(1, file.listFiles()[0].listFiles().length);
- assertTrue( file.listFiles()[0].listFiles()[0].getName().endsWith( ".gitignore" ) );
+ assertTrue(file.listFiles()[0].listFiles()[0].getName().endsWith(".gitignore"));
}
- }
- else
- {
- fail( "unknown child file found " + file.getName() );
+ } else {
+ fail("unknown child file found " + file.getName());
}
}
}
@@ -743,267 +734,257 @@ public class DefaultMavenResourcesFilteringTest
* The folder and file structure will be created instead of letting this resource plugin
* copy the structure which does not work.
*/
- private static void createTestDataStructure()
- throws IOException
- {
- File sourceDirectory = new File( getBasedir(), "/target/sourceTestGitIgnoreFile" );
- if ( sourceDirectory.exists() )
- {
- FileUtils.forceDelete( sourceDirectory );
+ private static void createTestDataStructure() throws IOException {
+ File sourceDirectory = new File(getBasedir(), "/target/sourceTestGitIgnoreFile");
+ if (sourceDirectory.exists()) {
+ FileUtils.forceDelete(sourceDirectory);
}
- File dir1 = new File( sourceDirectory, "dir1" );
+ File dir1 = new File(sourceDirectory, "dir1");
dir1.mkdirs();
- FileUtils.write( new File( dir1, "foo.txt" ), "This is a Test File", "UTF-8" );
+ FileUtils.write(new File(dir1, "foo.txt"), "This is a Test File", "UTF-8");
- File emptyDirectory = new File( sourceDirectory, "empty-directory" );
+ File emptyDirectory = new File(sourceDirectory, "empty-directory");
emptyDirectory.mkdirs();
- FileUtils.write( new File( emptyDirectory, ".gitignore" ), "# .gitignore file", "UTF-8" );
+ FileUtils.write(new File(emptyDirectory, ".gitignore"), "# .gitignore file", "UTF-8");
- File emptyDirectoryChild = new File( sourceDirectory, "empty-directory-child" );
+ File emptyDirectoryChild = new File(sourceDirectory, "empty-directory-child");
emptyDirectory.mkdirs();
- File emptyDirectoryChildEmptyChild = new File( emptyDirectoryChild, "empty-child" );
+ File emptyDirectoryChildEmptyChild = new File(emptyDirectoryChild, "empty-child");
emptyDirectoryChildEmptyChild.mkdirs();
- FileUtils.write( new File( emptyDirectoryChildEmptyChild, ".gitignore" ), "# .gitignore file", "UTF-8" );
+ FileUtils.write(new File(emptyDirectoryChildEmptyChild, ".gitignore"), "# .gitignore file", "UTF-8");
}
/**
* unit test for MSHARED-81 : https://issues.apache.org/jira/browse/MSHARED-81
*/
- @SuppressWarnings( "serial" )
- public void testMSHARED81()
- throws Exception
- {
- mavenProject.addProperty( "escaped", "this is escaped" );
- mavenProject.addProperty( "escaped.at", "this is escaped.at" );
- mavenProject.addProperty( "foo", "this is foo" );
- mavenProject.addProperty( "bar", "this is bar" );
-
+ @SuppressWarnings("serial")
+ public void testMSHARED81() throws Exception {
+ mavenProject.addProperty("escaped", "this is escaped");
+ mavenProject.addProperty("escaped.at", "this is escaped.at");
+ mavenProject.addProperty("foo", "this is foo");
+ mavenProject.addProperty("bar", "this is bar");
List<Resource> resources = new ArrayList<>();
- resources.add( new Resource()
- {
+ resources.add(new Resource() {
{
- setDirectory( getBasedir() + "/src/test/units-files/MSHARED-81/resources" );
- setFiltering( false );
+ setDirectory(getBasedir() + "/src/test/units-files/MSHARED-81/resources");
+ setFiltering(false);
}
- } );
- resources.add( new Resource()
- {
+ });
+ resources.add(new Resource() {
{
- setDirectory( getBasedir() + "/src/test/units-files/MSHARED-81/filtered" );
- setFiltering( true );
+ setDirectory(getBasedir() + "/src/test/units-files/MSHARED-81/filtered");
+ setFiltering(true);
}
- } );
- File output = new File( outputDirectory, "MSHARED-81" );
- MavenResourcesExecution mavenResourcesExecution =
- new MavenResourcesExecution( resources, output, mavenProject, "UTF-8", Collections.<String> emptyList(),
- Collections.<String> emptyList(), new StubMavenSession() );
- mavenResourcesExecution.setIncludeEmptyDirs( true );
- mavenResourcesExecution.setEscapeString( "\\" );
+ });
+ File output = new File(outputDirectory, "MSHARED-81");
+ MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution(
+ resources,
+ output,
+ mavenProject,
+ "UTF-8",
+ Collections.<String>emptyList(),
+ Collections.<String>emptyList(),
+ new StubMavenSession());
+ mavenResourcesExecution.setIncludeEmptyDirs(true);
+ mavenResourcesExecution.setEscapeString("\\");
- mavenResourcesFiltering.filterResources( mavenResourcesExecution );
+ mavenResourcesFiltering.filterResources(mavenResourcesExecution);
- Properties filteredResult = PropertyUtils.loadPropertyFile( new File( output, "filtered.properties" ), null );
+ Properties filteredResult = PropertyUtils.loadPropertyFile(new File(output, "filtered.properties"), null);
- Properties expectedFilteredResult =
- PropertyUtils.loadPropertyFile( new File( getBasedir() + "/src/test/units-files/MSHARED-81",
- "expected-filtered.properties" ),
- null );
+ Properties expectedFilteredResult = PropertyUtils.loadPropertyFile(
+ new File(getBasedir() + "/src/test/units-files/MSHARED-81", "expected-filtered.properties"), null);
- assertEquals( expectedFilteredResult, filteredResult );
+ assertEquals(expectedFilteredResult, filteredResult);
- Properties nonFilteredResult =
- PropertyUtils.loadPropertyFile( new File( output, "unfiltered.properties" ), null );
+ Properties nonFilteredResult = PropertyUtils.loadPropertyFile(new File(output, "unfiltered.properties"), null);
- Properties expectedNonFilteredResult =
- PropertyUtils.loadPropertyFile( new File( getBasedir() + "/src/test/units-files/MSHARED-81/resources",
- "unfiltered.properties" ),
- null );
+ Properties expectedNonFilteredResult = PropertyUtils.loadPropertyFile(
+ new File(getBasedir() + "/src/test/units-files/MSHARED-81/resources", "unfiltered.properties"), null);
- assertTrue( nonFilteredResult.equals( expectedNonFilteredResult ) );
+ assertTrue(nonFilteredResult.equals(expectedNonFilteredResult));
}
/**
* unit test for MRESOURCES-230 : https://issues.apache.org/jira/browse/MRESOURCES-230
*/
-// public void testCorrectlyEscapesEscapeString()
-// throws Exception
-// {
-// mavenProject.addProperty( "a", "DONE_A" );
-//
-////
-// List<Resource> resources = new ArrayList<Resource>();
-// resources.add( new Resource()
-// {
-//
-// {
-// setDirectory( getBasedir() + "/src/test/units-files/MRESOURCES-230" );
-// setFiltering( true );
-// }
-//
-// } );
-// resources.get( 0 ).addExclude( "expected.txt" );
-//
-// File output = new File( outputDirectory, "MRESOURCES-230" );
-// MavenResourcesExecution mavenResourcesExecution =
-// new MavenResourcesExecution( resources, output, mavenProject, "UTF-8", Collections.<String>emptyList(),
-// Collections.<String>emptyList(), new StubMavenSession() );
-// mavenResourcesExecution.setIncludeEmptyDirs( true );
-// mavenResourcesExecution.setEscapeString( "\\" );
-//
-// mavenResourcesFiltering.filterResources( mavenResourcesExecution );
-//
-// final String filtered = FileUtils.fileRead( new File( output, "resource.txt" ), "UTF-8" );
-// final String expected =
-// FileUtils.fileRead( new File( getBasedir() + "/src/test/units-files/MRESOURCES-230/expected.txt" ) );
-//
-// assertEquals( expected, filtered );
-// }
+ // public void testCorrectlyEscapesEscapeString()
+ // throws Exception
+ // {
+ // mavenProject.addProperty( "a", "DONE_A" );
+ //
+ ////
+ // List<Resource> resources = new ArrayList<Resource>();
+ // resources.add( new Resource()
+ // {
+ //
+ // {
+ // setDirectory( getBasedir() + "/src/test/units-files/MRESOURCES-230" );
+ // setFiltering( true );
+ // }
+ //
+ // } );
+ // resources.get( 0 ).addExclude( "expected.txt" );
+ //
+ // File output = new File( outputDirectory, "MRESOURCES-230" );
+ // MavenResourcesExecution mavenResourcesExecution =
+ // new MavenResourcesExecution( resources, output, mavenProject, "UTF-8",
+ // Collections.<String>emptyList(),
+ // Collections.<String>emptyList(), new StubMavenSession() );
+ // mavenResourcesExecution.setIncludeEmptyDirs( true );
+ // mavenResourcesExecution.setEscapeString( "\\" );
+ //
+ // mavenResourcesFiltering.filterResources( mavenResourcesExecution );
+ //
+ // final String filtered = FileUtils.fileRead( new File( output, "resource.txt" ), "UTF-8" );
+ // final String expected =
+ // FileUtils.fileRead( new File( getBasedir() + "/src/test/units-files/MRESOURCES-230/expected.txt" ) );
+ //
+ // assertEquals( expected, filtered );
+ // }
/**
* unit test for edge cases : https://issues.apache.org/jira/browse/MSHARED-228
*/
- @SuppressWarnings( "serial" )
- public void testEdgeCases()
- throws Exception
- {
- mavenProject.addProperty( "escaped", "this is escaped" );
- mavenProject.addProperty( "escaped.at", "this is escaped.at" );
- mavenProject.addProperty( "foo", "this is foo" );
- mavenProject.addProperty( "bar", "this is bar" );
- mavenProject.addProperty( "domain", "this.is.domain.com" );
- mavenProject.addProperty( "com.xxxxxxx.xxxx.root.build.environment.CLOUD_AZURE_AKS_KUBERNETES_NODE_LABEL_AGENTPOOL_VALUE_PRODUCTION_XXXXXXXXXXX_NODE_IMPL_PRODUCT_SEGMENT_PROCESSOR", "longpropvalue" );
-
+ @SuppressWarnings("serial")
+ public void testEdgeCases() throws Exception {
+ mavenProject.addProperty("escaped", "this is escaped");
+ mavenProject.addProperty("escaped.at", "this is escaped.at");
+ mavenProject.addProperty("foo", "this is foo");
+ mavenProject.addProperty("bar", "this is bar");
+ mavenProject.addProperty("domain", "this.is.domain.com");
+ mavenProject.addProperty(
+ "com.xxxxxxx.xxxx.root.build.environment.CLOUD_AZURE_AKS_KUBERNETES_NODE_LABEL_AGENTPOOL_VALUE_PRODUCTION_XXXXXXXXXXX_NODE_IMPL_PRODUCT_SEGMENT_PROCESSOR",
+ "longpropvalue");
List<Resource> resources = new ArrayList<>();
- resources.add( new Resource()
- {
+ resources.add(new Resource() {
{
- setDirectory( getBasedir() + "/src/test/units-files/edge-cases/resources" );
- setFiltering( false );
+ setDirectory(getBasedir() + "/src/test/units-files/edge-cases/resources");
+ setFiltering(false);
}
- } );
- resources.add( new Resource()
- {
+ });
+ resources.add(new Resource() {
{
- setDirectory( getBasedir() + "/src/test/units-files/edge-cases/filtered" );
- setFiltering( true );
+ setDirectory(getBasedir() + "/src/test/units-files/edge-cases/filtered");
+ setFiltering(true);
}
- } );
- File output = new File( outputDirectory, "edge-cases" );
- MavenResourcesExecution mavenResourcesExecution =
- new MavenResourcesExecution( resources, output, mavenProject, "UTF-8", Collections.<String> emptyList(),
- Collections.<String> emptyList(), new StubMavenSession() );
- mavenResourcesExecution.setIncludeEmptyDirs( true );
- mavenResourcesExecution.setEscapeString( "\\" );
+ });
+ File output = new File(outputDirectory, "edge-cases");
+ MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution(
+ resources,
+ output,
+ mavenProject,
+ "UTF-8",
+ Collections.<String>emptyList(),
+ Collections.<String>emptyList(),
+ new StubMavenSession());
+ mavenResourcesExecution.setIncludeEmptyDirs(true);
+ mavenResourcesExecution.setEscapeString("\\");
- mavenResourcesFiltering.filterResources( mavenResourcesExecution );
+ mavenResourcesFiltering.filterResources(mavenResourcesExecution);
- Properties filteredResult = PropertyUtils.loadPropertyFile( new File( output, "filtered.properties" ), null );
+ Properties filteredResult = PropertyUtils.loadPropertyFile(new File(output, "filtered.properties"), null);
- Properties expectedFilteredResult =
- PropertyUtils.loadPropertyFile( new File( getBasedir() + "/src/test/units-files/edge-cases",
- "expected-filtered.properties" ),
- null );
+ Properties expectedFilteredResult = PropertyUtils.loadPropertyFile(
+ new File(getBasedir() + "/src/test/units-files/edge-cases", "expected-filtered.properties"), null);
- assertEquals( expectedFilteredResult, filteredResult );
+ assertEquals(expectedFilteredResult, filteredResult);
- Properties nonFilteredResult =
- PropertyUtils.loadPropertyFile( new File( output, "unfiltered.properties" ), null );
+ Properties nonFilteredResult = PropertyUtils.loadPropertyFile(new File(output, "unfiltered.properties"), null);
- Properties expectedNonFilteredResult =
- PropertyUtils.loadPropertyFile( new File( getBasedir() + "/src/test/units-files/edge-cases/resources",
- "unfiltered.properties" ),
- null );
+ Properties expectedNonFilteredResult = PropertyUtils.loadPropertyFile(
+ new File(getBasedir() + "/src/test/units-files/edge-cases/resources", "unfiltered.properties"), null);
- assertTrue( nonFilteredResult.equals( expectedNonFilteredResult ) );
+ assertTrue(nonFilteredResult.equals(expectedNonFilteredResult));
}
// MSHARED-220: Apply filtering to filenames
- public void testFilterFileName()
- throws Exception
- {
+ public void testFilterFileName() throws Exception {
String unitFilesDir = getBasedir() + "/src/test/units-files/maven-filename-filtering";
Resource resource = new Resource();
- resource.setDirectory( unitFilesDir );
- resource.setFiltering( true );
- resource.addInclude( "${pom.version}*" );
- resource.setTargetPath( "testTargetPath" );
-
- MavenResourcesExecution mavenResourcesExecution =
- new MavenResourcesExecution( Collections.singletonList( resource ), outputDirectory, mavenProject, "UTF-8",
- Collections.<String> emptyList(), Collections.<String> emptyList(),
- new StubMavenSession() );
- mavenResourcesExecution.setFilterFilenames( true );
- mavenResourcesFiltering.filterResources( mavenResourcesExecution );
-
- File targetPathFile = new File( outputDirectory, "testTargetPath" );
+ resource.setDirectory(unitFilesDir);
+ resource.setFiltering(true);
+ resource.addInclude("${pom.version}*");
+ resource.setTargetPath("testTargetPath");
+
+ MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution(
+ Collections.singletonList(resource),
+ outputDirectory,
+ mavenProject,
+ "UTF-8",
+ Collections.<String>emptyList(),
+ Collections.<String>emptyList(),
+ new StubMavenSession());
+ mavenResourcesExecution.setFilterFilenames(true);
+ mavenResourcesFiltering.filterResources(mavenResourcesExecution);
+
+ File targetPathFile = new File(outputDirectory, "testTargetPath");
File[] files = targetPathFile.listFiles();
- assertEquals( 1, files.length );
- assertEquals( "1.0.txt", files[0].getName() );
+ assertEquals(1, files.length);
+ assertEquals("1.0.txt", files[0].getName());
}
/**
* MRESOURCES-171: Use correct encoding when filtering properties-files
*/
- public void testFilterPropertiesFiles()
- throws Exception
- {
+ public void testFilterPropertiesFiles() throws Exception {
String unitFilesDir = getBasedir() + "/src/test/units-files/MRESOURCES-171";
Resource resource = new Resource();
- resource.setDirectory( unitFilesDir );
- resource.setFiltering( true );
- resource.setTargetPath( "testFilterPropertiesFiles" );
-
- MavenResourcesExecution mavenResourcesExecution =
- new MavenResourcesExecution( Collections.singletonList( resource ), outputDirectory, mavenProject, "UTF-8",
- Collections.<String> emptyList(), Collections.<String> emptyList(),
- new StubMavenSession() );
- mavenResourcesExecution.setPropertiesEncoding( "ISO-8859-1" );
- mavenResourcesFiltering.filterResources( mavenResourcesExecution );
-
- File targetPathFile = new File( outputDirectory, "testFilterPropertiesFiles" );
- assertTrue( FileUtils.contentEquals( new File( unitFilesDir, "test.properties" ),
- new File( targetPathFile, "test.properties" ) ) );
- assertTrue( FileUtils.contentEquals( new File( unitFilesDir, "test.txt" ),
- new File( targetPathFile, "test.txt" ) ) );
+ resource.setDirectory(unitFilesDir);
+ resource.setFiltering(true);
+ resource.setTargetPath("testFilterPropertiesFiles");
+
+ MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution(
+ Collections.singletonList(resource),
+ outputDirectory,
+ mavenProject,
+ "UTF-8",
+ Collections.<String>emptyList(),
+ Collections.<String>emptyList(),
+ new StubMavenSession());
+ mavenResourcesExecution.setPropertiesEncoding("ISO-8859-1");
+ mavenResourcesFiltering.filterResources(mavenResourcesExecution);
+
+ File targetPathFile = new File(outputDirectory, "testFilterPropertiesFiles");
+ assertTrue(FileUtils.contentEquals(
+ new File(unitFilesDir, "test.properties"), new File(targetPathFile, "test.properties")));
+ assertTrue(FileUtils.contentEquals(new File(unitFilesDir, "test.txt"), new File(targetPathFile, "test.txt")));
}
- public void testGetEncoding()
- {
- File propertiesFile = new File( "file.properties" );
- File regularFile = new File( "file.xml" );
+ public void testGetEncoding() {
+ File propertiesFile = new File("file.properties");
+ File regularFile = new File("file.xml");
// Properties files
- assertEquals( null, DefaultMavenResourcesFiltering.getEncoding( propertiesFile, null, null ) );
- assertEquals( "UTF-8", DefaultMavenResourcesFiltering.getEncoding( propertiesFile, "UTF-8", null ) );
- assertEquals( "ISO-8859-1", DefaultMavenResourcesFiltering.getEncoding( propertiesFile, "UTF-8", "ISO-8859-1" ) );
+ assertEquals(null, DefaultMavenResourcesFiltering.getEncoding(propertiesFile, null, null));
+ assertEquals("UTF-8", DefaultMavenResourcesFiltering.getEncoding(propertiesFile, "UTF-8", null));
+ assertEquals("ISO-8859-1", DefaultMavenResourcesFiltering.getEncoding(propertiesFile, "UTF-8", "ISO-8859-1"));
// Regular files
- assertEquals( null, DefaultMavenResourcesFiltering.getEncoding( regularFile, null, null ) );
- assertEquals( "UTF-8", DefaultMavenResourcesFiltering.getEncoding( regularFile, "UTF-8", null ) );
- assertEquals( "UTF-8", DefaultMavenResourcesFiltering.getEncoding( regularFile, "UTF-8", "ISO-8859-1" ) );
+ assertEquals(null, DefaultMavenResourcesFiltering.getEncoding(regularFile, null, null));
+ assertEquals("UTF-8", DefaultMavenResourcesFiltering.getEncoding(regularFile, "UTF-8", null));
+ assertEquals("UTF-8", DefaultMavenResourcesFiltering.getEncoding(regularFile, "UTF-8", "ISO-8859-1"));
}
- public void testIsPropertiesFile()
- {
+ public void testIsPropertiesFile() {
// Properties files
- assertTrue( DefaultMavenResourcesFiltering.isPropertiesFile( new File( "file.properties" ) ) );
- assertTrue( DefaultMavenResourcesFiltering.isPropertiesFile( new File( "some/parent/path",
- "file.properties" ) ) );
+ assertTrue(DefaultMavenResourcesFiltering.isPropertiesFile(new File("file.properties")));
+ assertTrue(DefaultMavenResourcesFiltering.isPropertiesFile(new File("some/parent/path", "file.properties")));
// Regular files
- assertFalse( DefaultMavenResourcesFiltering.isPropertiesFile( new File( "file" ) ) );
- assertFalse( DefaultMavenResourcesFiltering.isPropertiesFile( new File( "some/parent/path", "file" ) ) );
- assertFalse( DefaultMavenResourcesFiltering.isPropertiesFile( new File( "file.xml" ) ) );
- assertFalse( DefaultMavenResourcesFiltering.isPropertiesFile( new File( "some/parent/path", "file.xml" ) ) );
+ assertFalse(DefaultMavenResourcesFiltering.isPropertiesFile(new File("file")));
+ assertFalse(DefaultMavenResourcesFiltering.isPropertiesFile(new File("some/parent/path", "file")));
+ assertFalse(DefaultMavenResourcesFiltering.isPropertiesFile(new File("file.xml")));
+ assertFalse(DefaultMavenResourcesFiltering.isPropertiesFile(new File("some/parent/path", "file.xml")));
}
}
diff --git a/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java b/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java
index 1977e1a..69c5244 100644
--- a/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.filtering;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.shared.filtering;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.shared.filtering;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.filtering;
import java.io.File;
import java.nio.charset.StandardCharsets;
@@ -32,64 +31,63 @@ import org.apache.maven.model.Resource;
/**
* @author Olivier Lamy
*/
-public class EscapeStringTest
- extends TestSupport
-{
+public class EscapeStringTest extends TestSupport {
- File outputDirectory = new File( getBasedir(), "target/EscapeStringTest" );
+ File outputDirectory = new File(getBasedir(), "target/EscapeStringTest");
- File unitDirectory = new File( getBasedir(), "src/test/units-files/escape-remove-char" );
+ File unitDirectory = new File(getBasedir(), "src/test/units-files/escape-remove-char");
@Override
- protected void setUp()
- throws Exception
- {
+ protected void setUp() throws Exception {
super.setUp();
- if ( outputDirectory.exists() )
- {
- FileUtils.deleteDirectory( outputDirectory );
+ if (outputDirectory.exists()) {
+ FileUtils.deleteDirectory(outputDirectory);
}
outputDirectory.mkdirs();
}
- public void testEscape()
- throws Exception
- {
- File baseDir = new File( "c:\\foo\\bar" );
- StubMavenProject mavenProject = new StubMavenProject( baseDir );
- mavenProject.setVersion( "1.0" );
- mavenProject.setGroupId( "org.apache" );
- mavenProject.setName( "test project" );
+ public void testEscape() throws Exception {
+ File baseDir = new File("c:\\foo\\bar");
+ StubMavenProject mavenProject = new StubMavenProject(baseDir);
+ mavenProject.setVersion("1.0");
+ mavenProject.setGroupId("org.apache");
+ mavenProject.setName("test project");
Properties projectProperties = new Properties();
- projectProperties.put( "foo", "bar" );
- projectProperties.put( "java.version", "zloug" );
- projectProperties.put( "replaceThis", "I am the replacement" );
- mavenProject.setProperties( projectProperties );
- MavenResourcesFiltering mavenResourcesFiltering = lookup( MavenResourcesFiltering.class );
+ projectProperties.put("foo", "bar");
+ projectProperties.put("java.version", "zloug");
+ projectProperties.put("replaceThis", "I am the replacement");
+ mavenProject.setProperties(projectProperties);
+ MavenResourcesFiltering mavenResourcesFiltering = lookup(MavenResourcesFiltering.class);
Resource resource = new Resource();
List<Resource> resources = new ArrayList<>();
- resources.add( resource );
- resource.setDirectory( unitDirectory.getPath() );
- resource.setFiltering( true );
+ resources.add(resource);
+ resource.setDirectory(unitDirectory.getPath());
+ resource.setFiltering(true);
List<String> filtersFile = new ArrayList<>();
- List<String> nonFilteredFileExtensions = Collections.singletonList( "gif" );
+ List<String> nonFilteredFileExtensions = Collections.singletonList("gif");
+
+ MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution(
+ resources,
+ outputDirectory,
+ mavenProject,
+ "UTF-8",
+ filtersFile,
+ nonFilteredFileExtensions,
+ new StubMavenSession());
+ mavenResourcesExecution.setUseDefaultFilterWrappers(true);
- MavenResourcesExecution mavenResourcesExecution =
- new MavenResourcesExecution( resources, outputDirectory, mavenProject, "UTF-8", filtersFile,
- nonFilteredFileExtensions, new StubMavenSession() );
- mavenResourcesExecution.setUseDefaultFilterWrappers( true );
+ mavenResourcesExecution.setEscapeString("!");
- mavenResourcesExecution.setEscapeString( "!" );
+ mavenResourcesFiltering.filterResources(mavenResourcesExecution);
- mavenResourcesFiltering.filterResources( mavenResourcesExecution );
-
- File file = new File( outputDirectory, "content.xml" );
- String content = FileUtils.readFileToString( file, StandardCharsets.UTF_8 );
- assertTrue( content.contains( "<broken-tag>Content with replacement: I am the replacement !</broken-tag>" ) );
- assertTrue( content.contains( "<broken-tag>Content with escaped replacement: Do not ${replaceThis} !</broken-tag>" ) );
+ File file = new File(outputDirectory, "content.xml");
+ String content = FileUtils.readFileToString(file, StandardCharsets.UTF_8);
+ assertTrue(content.contains("<broken-tag>Content with replacement: I am the replacement !</broken-tag>"));
+ assertTrue(
+ content.contains("<broken-tag>Content with escaped replacement: Do not ${replaceThis} !</broken-tag>"));
}
}
diff --git a/src/test/java/org/apache/maven/shared/filtering/FilteringUtilsTest.java b/src/test/java/org/apache/maven/shared/filtering/FilteringUtilsTest.java
index 4cab67e..bb78566 100644
--- a/src/test/java/org/apache/maven/shared/filtering/FilteringUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/FilteringUtilsTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.filtering;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.shared.filtering;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.shared.filtering;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.filtering;
import org.junit.Test;
@@ -29,24 +28,20 @@ import static org.junit.Assert.assertEquals;
* @since 1.0
*
*/
-public class FilteringUtilsTest
-{
+public class FilteringUtilsTest {
@Test
- public void testEscapeWindowsPathStartingWithDrive()
- {
- assertEquals( "C:\\\\Users\\\\Administrator", FilteringUtils.escapeWindowsPath( "C:\\Users\\Administrator" ) );
+ public void testEscapeWindowsPathStartingWithDrive() {
+ assertEquals("C:\\\\Users\\\\Administrator", FilteringUtils.escapeWindowsPath("C:\\Users\\Administrator"));
}
@Test
- public void testEscapeWindowsPathMissingDriveLetter()
- {
- assertEquals( ":\\Users\\Administrator", FilteringUtils.escapeWindowsPath( ":\\Users\\Administrator" ) );
+ public void testEscapeWindowsPathMissingDriveLetter() {
+ assertEquals(":\\Users\\Administrator", FilteringUtils.escapeWindowsPath(":\\Users\\Administrator"));
}
@Test
- public void testEscapeWindowsPathInvalidDriveLetter()
- {
- assertEquals( "4:\\Users\\Administrator", FilteringUtils.escapeWindowsPath( "4:\\Users\\Administrator" ) );
+ public void testEscapeWindowsPathInvalidDriveLetter() {
+ assertEquals("4:\\Users\\Administrator", FilteringUtils.escapeWindowsPath("4:\\Users\\Administrator"));
}
// This doesn't work, see MSHARED-121
@@ -67,10 +62,9 @@ public class FilteringUtilsTest
// MSHARED-179
@Test
- public void testEscapeWindowsPathNotAtBeginning()
- throws Exception
- {
- assertEquals( "jdbc:derby:C:\\\\Users\\\\Administrator/test;create=true",
- FilteringUtils.escapeWindowsPath( "jdbc:derby:C:\\Users\\Administrator/test;create=true" ) );
+ public void testEscapeWindowsPathNotAtBeginning() throws Exception {
+ assertEquals(
+ "jdbc:derby:C:\\\\Users\\\\Administrator/test;create=true",
+ FilteringUtils.escapeWindowsPath("jdbc:derby:C:\\Users\\Administrator/test;create=true"));
}
}
diff --git a/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java b/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java
index bccc980..b8104cb 100644
--- a/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.filtering;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.shared.filtering;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.shared.filtering;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.filtering;
import java.io.File;
import java.io.FileInputStream;
@@ -32,181 +31,167 @@ import java.util.Set;
import org.apache.commons.io.FileUtils;
import org.apache.maven.model.Resource;
-import org.codehaus.plexus.PlexusTestCase;
import org.sonatype.plexus.build.incremental.ThreadBuildContext;
import org.sonatype.plexus.build.incremental.test.TestIncrementalBuildContext;
-public class IncrementalResourceFilteringTest
- extends TestSupport
-{
+public class IncrementalResourceFilteringTest extends TestSupport {
- File outputDirectory = new File( getBasedir(), "target/IncrementalResourceFilteringTest" );
+ File outputDirectory = new File(getBasedir(), "target/IncrementalResourceFilteringTest");
- File unitDirectory = new File( getBasedir(), "src/test/units-files/incremental" );
+ File unitDirectory = new File(getBasedir(), "src/test/units-files/incremental");
@Override
- protected void setUp()
- throws Exception
- {
+ protected void setUp() throws Exception {
super.setUp();
- if ( outputDirectory.exists() )
- {
- FileUtils.deleteDirectory( outputDirectory );
+ if (outputDirectory.exists()) {
+ FileUtils.deleteDirectory(outputDirectory);
}
outputDirectory.mkdirs();
}
- public void testSimpleIncrementalFiltering()
- throws Exception
- {
+ public void testSimpleIncrementalFiltering() throws Exception {
// run full build first
- filter( "time" );
+ filter("time");
- assertTime( "time", "file01.txt" );
- assertTime( "time", "file02.txt" );
+ assertTime("time", "file01.txt");
+ assertTime("time", "file02.txt");
// only one file is expected to change
Set<String> changedFiles = new HashSet<>();
- changedFiles.add( "file01.txt" );
+ changedFiles.add("file01.txt");
TestIncrementalBuildContext ctx =
- new TestIncrementalBuildContext( unitDirectory, changedFiles, Collections.emptyMap() );
- ThreadBuildContext.setThreadBuildContext( ctx );
+ new TestIncrementalBuildContext(unitDirectory, changedFiles, Collections.emptyMap());
+ ThreadBuildContext.setThreadBuildContext(ctx);
- filter( "notime" );
- assertTime( "notime", "file01.txt" );
- assertTime( "time", "file02.txt" ); // this one is unchanged
+ filter("notime");
+ assertTime("notime", "file01.txt");
+ assertTime("time", "file02.txt"); // this one is unchanged
- assertTrue( ctx.getRefreshFiles().contains( new File( outputDirectory, "file01.txt" ) ) );
+ assertTrue(ctx.getRefreshFiles().contains(new File(outputDirectory, "file01.txt")));
- ctx = new TestIncrementalBuildContext( unitDirectory, Collections.emptySet(), changedFiles,
- Collections.emptyMap(), new ArrayList(), new ArrayList() );
- ThreadBuildContext.setThreadBuildContext( ctx );
+ ctx = new TestIncrementalBuildContext(
+ unitDirectory,
+ Collections.emptySet(),
+ changedFiles,
+ Collections.emptyMap(),
+ new ArrayList(),
+ new ArrayList());
+ ThreadBuildContext.setThreadBuildContext(ctx);
- filter( "moretime" );
- assertFalse( new File( outputDirectory, "file01.txt" ).exists() );
- assertTime( "time", "file02.txt" ); // this one is unchanged
-
- assertTrue( ctx.getRefreshFiles().contains( new File( outputDirectory, "file01.txt" ) ) );
+ filter("moretime");
+ assertFalse(new File(outputDirectory, "file01.txt").exists());
+ assertTime("time", "file02.txt"); // this one is unchanged
+ assertTrue(ctx.getRefreshFiles().contains(new File(outputDirectory, "file01.txt")));
}
- public void testOutputChange()
- throws Exception
- {
+ public void testOutputChange() throws Exception {
// run full build first
- filter( "time" );
+ filter("time");
// all files are reprocessed after contents of output directory changed (e.g. was deleted)
Set<String> changedFiles = new HashSet<>();
- changedFiles.add( "target/IncrementalResourceFilteringTest" );
+ changedFiles.add("target/IncrementalResourceFilteringTest");
TestIncrementalBuildContext ctx =
- new TestIncrementalBuildContext( unitDirectory, changedFiles, Collections.emptyMap() );
- ThreadBuildContext.setThreadBuildContext( ctx );
-
- filter( "notime" );
- assertTime( "notime", "file01.txt" );
- assertTime( "notime", "file02.txt" );
+ new TestIncrementalBuildContext(unitDirectory, changedFiles, Collections.emptyMap());
+ ThreadBuildContext.setThreadBuildContext(ctx);
- assertTrue( ctx.getRefreshFiles().contains( new File( outputDirectory, "file01.txt" ) ) );
- assertTrue( ctx.getRefreshFiles().contains( new File( outputDirectory, "file02.txt" ) ) );
+ filter("notime");
+ assertTime("notime", "file01.txt");
+ assertTime("notime", "file02.txt");
+ assertTrue(ctx.getRefreshFiles().contains(new File(outputDirectory, "file01.txt")));
+ assertTrue(ctx.getRefreshFiles().contains(new File(outputDirectory, "file02.txt")));
}
- public void testFilterChange()
- throws Exception
- {
+ public void testFilterChange() throws Exception {
// run full build first
- filter( "time" );
+ filter("time");
// all files are reprocessed after content of filters changes
Set<String> changedFiles = new HashSet<>();
- changedFiles.add( "filters.txt" );
+ changedFiles.add("filters.txt");
TestIncrementalBuildContext ctx =
- new TestIncrementalBuildContext( unitDirectory, changedFiles, Collections.emptyMap() );
- ThreadBuildContext.setThreadBuildContext( ctx );
+ new TestIncrementalBuildContext(unitDirectory, changedFiles, Collections.emptyMap());
+ ThreadBuildContext.setThreadBuildContext(ctx);
- filter( "notime" );
- assertTime( "notime", "file01.txt" );
- assertTime( "notime", "file02.txt" );
-
- assertTrue( ctx.getRefreshFiles().contains( new File( outputDirectory, "file01.txt" ) ) );
- assertTrue( ctx.getRefreshFiles().contains( new File( outputDirectory, "file02.txt" ) ) );
+ filter("notime");
+ assertTime("notime", "file01.txt");
+ assertTime("notime", "file02.txt");
+ assertTrue(ctx.getRefreshFiles().contains(new File(outputDirectory, "file01.txt")));
+ assertTrue(ctx.getRefreshFiles().contains(new File(outputDirectory, "file02.txt")));
}
- public void testFilterDeleted()
- throws Exception
- {
+ public void testFilterDeleted() throws Exception {
// run full build first
- filter( "time" );
+ filter("time");
// all files are reprocessed after content of filters changes
Set<String> deletedFiles = new HashSet<>();
- deletedFiles.add( "filters.txt" );
- TestIncrementalBuildContext ctx = new TestIncrementalBuildContext( unitDirectory, Collections.emptySet(),
- deletedFiles, Collections.emptyMap(), new ArrayList(), new ArrayList() );
- ThreadBuildContext.setThreadBuildContext( ctx );
-
- filter( "notime" );
- assertTime( "notime", "file01.txt" );
- assertTime( "notime", "file02.txt" );
-
- assertTrue( ctx.getRefreshFiles().contains( new File( outputDirectory, "file01.txt" ) ) );
- assertTrue( ctx.getRefreshFiles().contains( new File( outputDirectory, "file02.txt" ) ) );
+ deletedFiles.add("filters.txt");
+ TestIncrementalBuildContext ctx = new TestIncrementalBuildContext(
+ unitDirectory,
+ Collections.emptySet(),
+ deletedFiles,
+ Collections.emptyMap(),
+ new ArrayList(),
+ new ArrayList());
+ ThreadBuildContext.setThreadBuildContext(ctx);
+
+ filter("notime");
+ assertTime("notime", "file01.txt");
+ assertTime("notime", "file02.txt");
+
+ assertTrue(ctx.getRefreshFiles().contains(new File(outputDirectory, "file01.txt")));
+ assertTrue(ctx.getRefreshFiles().contains(new File(outputDirectory, "file02.txt")));
}
- private void assertTime( String time, String relpath )
- throws IOException
- {
+ private void assertTime(String time, String relpath) throws IOException {
Properties properties = new Properties();
-
- try ( InputStream is = new FileInputStream( new File( outputDirectory, relpath ) ) )
- {
- properties.load( is );
+ try (InputStream is = new FileInputStream(new File(outputDirectory, relpath))) {
+ properties.load(is);
}
- assertEquals( time, properties.getProperty( "time" ) );
+ assertEquals(time, properties.getProperty("time"));
}
- private void filter( String time )
- throws Exception
- {
- File baseDir = new File( getBasedir() );
- StubMavenProject mavenProject = new StubMavenProject( baseDir );
- mavenProject.setVersion( "1.0" );
- mavenProject.setGroupId( "org.apache" );
- mavenProject.setName( "test project" );
+ private void filter(String time) throws Exception {
+ File baseDir = new File(getBasedir());
+ StubMavenProject mavenProject = new StubMavenProject(baseDir);
+ mavenProject.setVersion("1.0");
+ mavenProject.setGroupId("org.apache");
+ mavenProject.setName("test project");
Properties projectProperties = new Properties();
- projectProperties.put( "time", time );
- projectProperties.put( "java.version", "zloug" );
- mavenProject.setProperties( projectProperties );
- MavenResourcesFiltering mavenResourcesFiltering = lookup( MavenResourcesFiltering.class );
+ projectProperties.put("time", time);
+ projectProperties.put("java.version", "zloug");
+ mavenProject.setProperties(projectProperties);
+ MavenResourcesFiltering mavenResourcesFiltering = lookup(MavenResourcesFiltering.class);
- String unitFilesDir = new File( unitDirectory, "files" ).getPath();
+ String unitFilesDir = new File(unitDirectory, "files").getPath();
Resource resource = new Resource();
List<Resource> resources = new ArrayList<>();
- resources.add( resource );
- resource.setDirectory( unitFilesDir );
- resource.setFiltering( true );
+ resources.add(resource);
+ resource.setDirectory(unitFilesDir);
+ resource.setFiltering(true);
List<String> filtersFile = new ArrayList<>();
- filtersFile.add( new File( unitDirectory, "filters.txt" ).getPath() );
+ filtersFile.add(new File(unitDirectory, "filters.txt").getPath());
MavenResourcesExecution mre = new MavenResourcesExecution();
- mre.setResources( resources );
- mre.setOutputDirectory( outputDirectory );
- mre.setEncoding( "UTF-8" );
- mre.setMavenProject( mavenProject );
- mre.setFilters( filtersFile );
- mre.setNonFilteredFileExtensions( Collections.<String>emptyList() );
- mre.setMavenSession( new StubMavenSession() );
- mre.setUseDefaultFilterWrappers( true );
-
- mavenResourcesFiltering.filterResources( mre );
+ mre.setResources(resources);
+ mre.setOutputDirectory(outputDirectory);
+ mre.setEncoding("UTF-8");
+ mre.setMavenProject(mavenProject);
+ mre.setFilters(filtersFile);
+ mre.setNonFilteredFileExtensions(Collections.<String>emptyList());
+ mre.setMavenSession(new StubMavenSession());
+ mre.setUseDefaultFilterWrappers(true);
+
+ mavenResourcesFiltering.filterResources(mre);
}
-
}
diff --git a/src/test/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEndingTest.java b/src/test/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEndingTest.java
index dd4836b..c56c1b1 100644
--- a/src/test/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEndingTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEndingTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.filtering;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.shared.filtering;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,41 +16,36 @@ package org.apache.maven.shared.filtering;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.filtering;
import java.io.Reader;
import org.codehaus.plexus.interpolation.Interpolator;
-public class InterpolatorFilterReaderLineEndingTest
- extends AbstractInterpolatorFilterReaderLineEndingTest
-{
+public class InterpolatorFilterReaderLineEndingTest extends AbstractInterpolatorFilterReaderLineEndingTest {
@Override
- protected Reader getAaa_AaaReader( Reader in, Interpolator interpolator )
- {
- return new InterpolatorFilterReaderLineEnding( in, interpolator, "aaa", "aaa", true );
+ protected Reader getAaa_AaaReader(Reader in, Interpolator interpolator) {
+ return new InterpolatorFilterReaderLineEnding(in, interpolator, "aaa", "aaa", true);
}
@Override
- protected Reader getAbc_AbcReader( Reader in, Interpolator interpolator )
- {
- return new InterpolatorFilterReaderLineEnding( in, interpolator, "abc", "abc", true );
+ protected Reader getAbc_AbcReader(Reader in, Interpolator interpolator) {
+ return new InterpolatorFilterReaderLineEnding(in, interpolator, "abc", "abc", true);
}
@Override
- protected Reader getDollarBracesReader( Reader in, Interpolator interpolator, String escapeString )
- {
+ protected Reader getDollarBracesReader(Reader in, Interpolator interpolator, String escapeString) {
InterpolatorFilterReaderLineEnding reader =
- new InterpolatorFilterReaderLineEnding( in, interpolator, "${", "}", true );
- reader.setEscapeString( escapeString );
+ new InterpolatorFilterReaderLineEnding(in, interpolator, "${", "}", true);
+ reader.setEscapeString(escapeString);
return reader;
}
@Override
- protected Reader getAtReader( Reader in, Interpolator interpolator, String escapeString )
- {
+ protected Reader getAtReader(Reader in, Interpolator interpolator, String escapeString) {
InterpolatorFilterReaderLineEnding reader =
- new InterpolatorFilterReaderLineEnding( in, interpolator, "@", "@", true );
- reader.setEscapeString( escapeString );
+ new InterpolatorFilterReaderLineEnding(in, interpolator, "@", "@", true);
+ reader.setEscapeString(escapeString);
return reader;
}
}
diff --git a/src/test/java/org/apache/maven/shared/filtering/InvalidMarkTest.java b/src/test/java/org/apache/maven/shared/filtering/InvalidMarkTest.java
index d154ccd..4d0cf44 100644
--- a/src/test/java/org/apache/maven/shared/filtering/InvalidMarkTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/InvalidMarkTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.filtering;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.shared.filtering;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.shared.filtering;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.filtering;
import java.io.File;
import java.util.Collections;
@@ -28,44 +27,37 @@ import org.apache.maven.model.Resource;
/**
* @author Mikolaj Izdebski
*/
-public class InvalidMarkTest
- extends TestSupport
-{
- File outputDirectory = new File( getBasedir(), "target/LongLineTest" );
+public class InvalidMarkTest extends TestSupport {
+ File outputDirectory = new File(getBasedir(), "target/LongLineTest");
@Override
- protected void setUp()
- throws Exception
- {
+ protected void setUp() throws Exception {
super.setUp();
- if ( outputDirectory.exists() )
- {
- FileUtils.deleteDirectory( outputDirectory );
+ if (outputDirectory.exists()) {
+ FileUtils.deleteDirectory(outputDirectory);
}
outputDirectory.mkdirs();
}
- public void testEscape()
- throws Exception
- {
- MavenResourcesFiltering mavenResourcesFiltering = lookup( MavenResourcesFiltering.class );
+ public void testEscape() throws Exception {
+ MavenResourcesFiltering mavenResourcesFiltering = lookup(MavenResourcesFiltering.class);
Resource resource = new Resource();
- resource.setDirectory( "src/test/units-files/MSHARED-325" );
- resource.setFiltering( true );
+ resource.setDirectory("src/test/units-files/MSHARED-325");
+ resource.setFiltering(true);
- MavenResourcesExecution mavenResourcesExecution =
- new MavenResourcesExecution( Collections.singletonList( resource ), outputDirectory,
- new StubMavenProject( new File( "." ) ), "UTF-8",
- Collections.<String>emptyList(), Collections.<String>emptyList(),
- new StubMavenSession() );
+ MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution(
+ Collections.singletonList(resource),
+ outputDirectory,
+ new StubMavenProject(new File(".")),
+ "UTF-8",
+ Collections.<String>emptyList(),
+ Collections.<String>emptyList(),
+ new StubMavenSession());
- try
- {
- mavenResourcesFiltering.filterResources( mavenResourcesExecution );
- }
- catch ( MavenFilteringException e )
- {
+ try {
+ mavenResourcesFiltering.filterResources(mavenResourcesExecution);
+ } catch (MavenFilteringException e) {
fail();
}
}
diff --git a/src/test/java/org/apache/maven/shared/filtering/MuliLinesMavenResourcesFilteringTest.java b/src/test/java/org/apache/maven/shared/filtering/MuliLinesMavenResourcesFilteringTest.java
index 3a903f4..4cf9226 100644
--- a/src/test/java/org/apache/maven/shared/filtering/MuliLinesMavenResourcesFilteringTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/MuliLinesMavenResourcesFilteringTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.filtering;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.shared.filtering;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.shared.filtering;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.filtering;
import java.io.File;
import java.io.FileInputStream;
@@ -33,20 +32,15 @@ import org.apache.maven.model.Resource;
* @author Olivier Lamy
*
*/
-public class MuliLinesMavenResourcesFilteringTest
- extends TestSupport
-{
+public class MuliLinesMavenResourcesFilteringTest extends TestSupport {
- File outputDirectory = new File( getBasedir(), "target/MuliLinesMavenResourcesFilteringTest" );
+ File outputDirectory = new File(getBasedir(), "target/MuliLinesMavenResourcesFilteringTest");
@Override
- protected void setUp()
- throws Exception
- {
+ protected void setUp() throws Exception {
super.setUp();
- if ( outputDirectory.exists() )
- {
- FileUtils.deleteDirectory( outputDirectory );
+ if (outputDirectory.exists()) {
+ FileUtils.deleteDirectory(outputDirectory);
}
outputDirectory.mkdirs();
}
@@ -54,54 +48,55 @@ public class MuliLinesMavenResourcesFilteringTest
/**
* @throws Exception
*/
- public void testFilteringTokenOnce()
- throws Exception
- {
- File baseDir = new File( "c:\\foo\\bar" );
- StubMavenProject mavenProject = new StubMavenProject( baseDir );
- mavenProject.setVersion( "1.0" );
- mavenProject.setGroupId( "org.apache" );
- mavenProject.setName( "test project" );
+ public void testFilteringTokenOnce() throws Exception {
+ File baseDir = new File("c:\\foo\\bar");
+ StubMavenProject mavenProject = new StubMavenProject(baseDir);
+ mavenProject.setVersion("1.0");
+ mavenProject.setGroupId("org.apache");
+ mavenProject.setName("test project");
Properties projectProperties = new Properties();
- projectProperties.put( "foo", "bar" );
- projectProperties.put( "java.version", "zloug" );
- mavenProject.setProperties( projectProperties );
- MavenResourcesFiltering mavenResourcesFiltering = lookup( MavenResourcesFiltering.class );
+ projectProperties.put("foo", "bar");
+ projectProperties.put("java.version", "zloug");
+ mavenProject.setProperties(projectProperties);
+ MavenResourcesFiltering mavenResourcesFiltering = lookup(MavenResourcesFiltering.class);
String unitFilesDir = getBasedir() + "/src/test/units-files/MRESOURCES-104";
Resource resource = new Resource();
List<Resource> resources = new ArrayList<>();
- resources.add( resource );
- resource.setDirectory( unitFilesDir );
- resource.setFiltering( true );
+ resources.add(resource);
+ resource.setDirectory(unitFilesDir);
+ resource.setFiltering(true);
List<String> filtersFile = new ArrayList<>();
- filtersFile.add( getBasedir() + "/src/test/units-files/MRESOURCES-104/test.properties" );
+ filtersFile.add(getBasedir() + "/src/test/units-files/MRESOURCES-104/test.properties");
- List<String> nonFilteredFileExtensions = Collections.singletonList( "gif" );
+ List<String> nonFilteredFileExtensions = Collections.singletonList("gif");
- MavenResourcesExecution mavenResourcesExecution =
- new MavenResourcesExecution( resources, outputDirectory, mavenProject, "UTF-8", filtersFile,
- nonFilteredFileExtensions, new StubMavenSession() );
- mavenResourcesExecution.setUseDefaultFilterWrappers( true );
+ MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution(
+ resources,
+ outputDirectory,
+ mavenProject,
+ "UTF-8",
+ filtersFile,
+ nonFilteredFileExtensions,
+ new StubMavenSession());
+ mavenResourcesExecution.setUseDefaultFilterWrappers(true);
- mavenResourcesFiltering.filterResources( mavenResourcesExecution );
+ mavenResourcesFiltering.filterResources(mavenResourcesExecution);
Properties result = new Properties();
-
- try ( FileInputStream in = new FileInputStream( new File( outputDirectory, "test.properties" ) ) )
- {
- result.load( in );
+
+ try (FileInputStream in = new FileInputStream(new File(outputDirectory, "test.properties"))) {
+ result.load(in);
}
// email=foo@bar.com
// foo=${project.version}
// bar=@project.version@
- assertEquals( "1.0", result.get( "foo" ) );
- assertEquals( "1.0", result.get( "bar" ) );
- assertEquals( "foo@bar.com", result.get( "email" ) );
+ assertEquals("1.0", result.get("foo"));
+ assertEquals("1.0", result.get("bar"));
+ assertEquals("foo@bar.com", result.get("email"));
}
-
}
diff --git a/src/test/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEndingTest.java b/src/test/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEndingTest.java
index e1b8a4e..4494df7 100644
--- a/src/test/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEndingTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEndingTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.filtering;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.shared.filtering;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,11 +16,7 @@ package org.apache.maven.shared.filtering;
* specific language governing permissions and limitations
* under the License.
*/
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isA;
-import static org.mockito.Mockito.when;
+package org.apache.maven.shared.filtering;
import java.io.Reader;
import java.io.StringReader;
@@ -38,88 +32,87 @@ import org.junit.Test;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isA;
+import static org.mockito.Mockito.when;
+
public class MultiDelimiterInterpolatorFilterReaderLineEndingTest
- extends AbstractInterpolatorFilterReaderLineEndingTest
-{
+ extends AbstractInterpolatorFilterReaderLineEndingTest {
@Mock
private Interpolator interpolator;
@Override
@Before
- public void onSetup()
- {
- MockitoAnnotations.initMocks( this );
+ public void onSetup() {
+ MockitoAnnotations.initMocks(this);
}
@Override
- protected Reader getAaa_AaaReader( Reader in, Interpolator interpolator )
- {
+ protected Reader getAaa_AaaReader(Reader in, Interpolator interpolator) {
MultiDelimiterInterpolatorFilterReaderLineEnding reader =
- new MultiDelimiterInterpolatorFilterReaderLineEnding( in, interpolator, true );
- reader.setDelimiterSpecs( Collections.singleton( "aaa*aaa" ) );
+ new MultiDelimiterInterpolatorFilterReaderLineEnding(in, interpolator, true);
+ reader.setDelimiterSpecs(Collections.singleton("aaa*aaa"));
return reader;
}
@Override
- protected Reader getAbc_AbcReader( Reader in, Interpolator interpolator )
- {
+ protected Reader getAbc_AbcReader(Reader in, Interpolator interpolator) {
MultiDelimiterInterpolatorFilterReaderLineEnding reader =
- new MultiDelimiterInterpolatorFilterReaderLineEnding( in, interpolator, true );
- reader.setDelimiterSpecs( Collections.singleton( "abc*abc" ) );
+ new MultiDelimiterInterpolatorFilterReaderLineEnding(in, interpolator, true);
+ reader.setDelimiterSpecs(Collections.singleton("abc*abc"));
return reader;
}
@Override
- protected Reader getDollarBracesReader( Reader in, Interpolator interpolator, String escapeString )
- {
+ protected Reader getDollarBracesReader(Reader in, Interpolator interpolator, String escapeString) {
MultiDelimiterInterpolatorFilterReaderLineEnding reader =
- new MultiDelimiterInterpolatorFilterReaderLineEnding( in, interpolator, true );
- reader.setDelimiterSpecs( Collections.singleton( "${*}" ) );
- reader.setEscapeString( escapeString );
+ new MultiDelimiterInterpolatorFilterReaderLineEnding(in, interpolator, true);
+ reader.setDelimiterSpecs(Collections.singleton("${*}"));
+ reader.setEscapeString(escapeString);
return reader;
}
@Override
- protected Reader getAtReader( Reader in, Interpolator interpolator, String escapeString )
- {
+ protected Reader getAtReader(Reader in, Interpolator interpolator, String escapeString) {
MultiDelimiterInterpolatorFilterReaderLineEnding reader =
- new MultiDelimiterInterpolatorFilterReaderLineEnding( in, interpolator, true );
- reader.setDelimiterSpecs( Collections.singleton( "@" ) );
- reader.setEscapeString( escapeString );
+ new MultiDelimiterInterpolatorFilterReaderLineEnding(in, interpolator, true);
+ reader.setDelimiterSpecs(Collections.singleton("@"));
+ reader.setEscapeString(escapeString);
return reader;
}
// MSHARED-199: Filtering doesn't work if 2 delimiters are used on the same line, the first one being left open
@Test
- public void testLineWithSingleAtAndExpression()
- throws Exception
- {
- when( interpolator.interpolate( eq( "${foo}" ), eq( "" ), isA( RecursionInterceptor.class ) ) ).thenReturn( "bar" );
+ public void testLineWithSingleAtAndExpression() throws Exception {
+ when(interpolator.interpolate(eq("${foo}"), eq(""), isA(RecursionInterceptor.class)))
+ .thenReturn("bar");
- Reader in = new StringReader( "toto@titi.com ${foo}" );
+ Reader in = new StringReader("toto@titi.com ${foo}");
MultiDelimiterInterpolatorFilterReaderLineEnding reader =
- new MultiDelimiterInterpolatorFilterReaderLineEnding( in, interpolator, true );
- reader.setDelimiterSpecs( new HashSet<>( Arrays.asList( "${*}", "@" ) ) );
+ new MultiDelimiterInterpolatorFilterReaderLineEnding(in, interpolator, true);
+ reader.setDelimiterSpecs(new HashSet<>(Arrays.asList("${*}", "@")));
- assertEquals( "toto@titi.com bar", IOUtils.toString( reader ) );
+ assertEquals("toto@titi.com bar", IOUtils.toString(reader));
}
// http://stackoverflow.com/questions/21786805/maven-war-plugin-customize-filter-delimitters-in-webresources/
@Test
- public void testAtDollarExpression()
- throws Exception
- {
- when( interpolator.interpolate( eq( "${db.server}" ), eq( "" ), isA( RecursionInterceptor.class ) ) ).thenReturn( "DB_SERVER" );
- when( interpolator.interpolate( eq( "${db.port}" ), eq( "" ), isA( RecursionInterceptor.class ) ) ).thenReturn( "DB_PORT" );
- when( interpolator.interpolate( eq( "${db.name}" ), eq( "" ), isA( RecursionInterceptor.class ) ) ).thenReturn( "DB_NAME" );
-
- Reader in = new StringReader( " url=\"jdbc:oracle:thin:\\@${db.server}:${db.port}:${db.name}\"" );
+ public void testAtDollarExpression() throws Exception {
+ when(interpolator.interpolate(eq("${db.server}"), eq(""), isA(RecursionInterceptor.class)))
+ .thenReturn("DB_SERVER");
+ when(interpolator.interpolate(eq("${db.port}"), eq(""), isA(RecursionInterceptor.class)))
+ .thenReturn("DB_PORT");
+ when(interpolator.interpolate(eq("${db.name}"), eq(""), isA(RecursionInterceptor.class)))
+ .thenReturn("DB_NAME");
+
+ Reader in = new StringReader(" url=\"jdbc:oracle:thin:\\@${db.server}:${db.port}:${db.name}\"");
MultiDelimiterInterpolatorFilterReaderLineEnding reader =
- new MultiDelimiterInterpolatorFilterReaderLineEnding( in, interpolator, true );
- reader.setEscapeString( "\\" );
- reader.setDelimiterSpecs( new HashSet<>( Arrays.asList( "${*}", "@" ) ) );
+ new MultiDelimiterInterpolatorFilterReaderLineEnding(in, interpolator, true);
+ reader.setEscapeString("\\");
+ reader.setDelimiterSpecs(new HashSet<>(Arrays.asList("${*}", "@")));
- assertEquals( " url=\"jdbc:oracle:thin:@DB_SERVER:DB_PORT:DB_NAME\"", IOUtils.toString( reader ) );
+ assertEquals(" url=\"jdbc:oracle:thin:@DB_SERVER:DB_PORT:DB_NAME\"", IOUtils.toString(reader));
}
}
diff --git a/src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java b/src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java
index b5ab443..24c091e 100644
--- a/src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/PropertyUtilsTest.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.filtering;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.shared.filtering;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.shared.filtering;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.filtering;
import java.io.File;
import java.io.FileWriter;
@@ -36,86 +35,69 @@ import static org.mockito.Mockito.verify;
* @author Olivier Lamy
* @since 1.0-beta-1
*/
-public class PropertyUtilsTest
- extends TestSupport
-{
- private static File testDirectory = new File( getBasedir(), "target/test-classes/" );
-
- public void testBasic()
- throws Exception
- {
- File basicProp = new File( testDirectory, "basic.properties" );
-
- if ( basicProp.exists() )
- {
+public class PropertyUtilsTest extends TestSupport {
+ private static File testDirectory = new File(getBasedir(), "target/test-classes/");
+
+ public void testBasic() throws Exception {
+ File basicProp = new File(testDirectory, "basic.properties");
+
+ if (basicProp.exists()) {
basicProp.delete();
}
basicProp.createNewFile();
- try ( FileWriter writer = new FileWriter( basicProp ) )
- {
- writer.write( "ghost=${non_existent}\n" );
- writer.write( "key=${untat_na_damgo}\n" );
- writer.write( "untat_na_damgo=gani_man\n" );
+ try (FileWriter writer = new FileWriter(basicProp)) {
+ writer.write("ghost=${non_existent}\n");
+ writer.write("key=${untat_na_damgo}\n");
+ writer.write("untat_na_damgo=gani_man\n");
writer.flush();
}
- Properties prop = PropertyUtils.loadPropertyFile( basicProp, false, false );
- assertTrue( prop.getProperty( "key" ).equals( "gani_man" ) );
- assertTrue( prop.getProperty( "ghost" ).equals( "${non_existent}" ) );
+ Properties prop = PropertyUtils.loadPropertyFile(basicProp, false, false);
+ assertTrue(prop.getProperty("key").equals("gani_man"));
+ assertTrue(prop.getProperty("ghost").equals("${non_existent}"));
}
- public void testSystemProperties()
- throws Exception
- {
- File systemProp = new File( testDirectory, "system.properties" );
+ public void testSystemProperties() throws Exception {
+ File systemProp = new File(testDirectory, "system.properties");
- if ( systemProp.exists() )
- {
+ if (systemProp.exists()) {
systemProp.delete();
}
systemProp.createNewFile();
- try ( FileWriter writer = new FileWriter( systemProp ) )
- {
- writer.write( "key=${user.dir}" );
+ try (FileWriter writer = new FileWriter(systemProp)) {
+ writer.write("key=${user.dir}");
writer.flush();
}
- Properties prop = PropertyUtils.loadPropertyFile( systemProp, false, true );
- assertTrue( prop.getProperty( "key" ).equals( System.getProperty( "user.dir" ) ) );
+ Properties prop = PropertyUtils.loadPropertyFile(systemProp, false, true);
+ assertTrue(prop.getProperty("key").equals(System.getProperty("user.dir")));
}
- public void testException()
- throws Exception
- {
- File nonExistent = new File( testDirectory, "not_existent_file" );
+ public void testException() throws Exception {
+ File nonExistent = new File(testDirectory, "not_existent_file");
- assertFalse( "property file exist: " + nonExistent.toString(), nonExistent.exists() );
+ assertFalse("property file exist: " + nonExistent.toString(), nonExistent.exists());
- try
- {
- PropertyUtils.loadPropertyFile( nonExistent, true, false );
- assertTrue( "Exception failed", false );
- }
- catch ( Exception ex )
- {
+ try {
+ PropertyUtils.loadPropertyFile(nonExistent, true, false);
+ assertTrue("Exception failed", false);
+ } catch (Exception ex) {
// exception ok
}
}
- public void testloadpropertiesFile()
- throws Exception
- {
- File propertyFile = new File( getBasedir() + "/src/test/units-files/propertyutils-test.properties" );
+ public void testloadpropertiesFile() throws Exception {
+ File propertyFile = new File(getBasedir() + "/src/test/units-files/propertyutils-test.properties");
Properties baseProps = new Properties();
- baseProps.put( "pom.version", "realVersion" );
+ baseProps.put("pom.version", "realVersion");
- Properties interpolated = PropertyUtils.loadPropertyFile( propertyFile, baseProps );
- assertEquals( "realVersion", interpolated.get( "version" ) );
- assertEquals( "${foo}", interpolated.get( "foo" ) );
- assertEquals( "realVersion", interpolated.get( "bar" ) );
- assertEquals( "none filtered", interpolated.get( "none" ) );
+ Properties interpolated = PropertyUtils.loadPropertyFile(propertyFile, baseProps);
+ assertEquals("realVersion", interpolated.get("version"));
+ assertEquals("${foo}", interpolated.get("foo"));
+ assertEquals("realVersion", interpolated.get("bar"));
+ assertEquals("none filtered", interpolated.get("none"));
}
/**
@@ -123,32 +105,29 @@ public class PropertyUtilsTest
*
* @throws IOException if problem writing file
*/
- public void testCircularReferences()
- throws IOException
- {
- File basicProp = new File( testDirectory, "circular.properties" );
+ public void testCircularReferences() throws IOException {
+ File basicProp = new File(testDirectory, "circular.properties");
- if ( basicProp.exists() )
- {
+ if (basicProp.exists()) {
basicProp.delete();
}
basicProp.createNewFile();
- try ( FileWriter writer = new FileWriter( basicProp ) )
- {
- writer.write( "test=${test2}\n" );
- writer.write( "test2=${test2}\n" );
+ try (FileWriter writer = new FileWriter(basicProp)) {
+ writer.write("test=${test2}\n");
+ writer.write("test2=${test2}\n");
writer.flush();
}
- Logger logger = mock( Logger.class );
+ Logger logger = mock(Logger.class);
- Properties prop = PropertyUtils.loadPropertyFile( basicProp, null, logger );
- assertEquals( "${test2}", prop.getProperty( "test" ) );
- assertEquals( "${test2}", prop.getProperty( "test2" ) );
- assertWarn( logger,
+ Properties prop = PropertyUtils.loadPropertyFile(basicProp, null, logger);
+ assertEquals("${test2}", prop.getProperty("test"));
+ assertEquals("${test2}", prop.getProperty("test2"));
+ assertWarn(
+ logger,
"Circular reference between properties detected: test2 => test2",
- "Circular reference between properties detected: test => test2 => test2" );
+ "Circular reference between properties detected: test => test2 => test2");
}
/**
@@ -156,45 +135,40 @@ public class PropertyUtilsTest
*
* @throws IOException if problem writing file
*/
- public void testCircularReferences3Vars()
- throws IOException
- {
- File basicProp = new File( testDirectory, "circular.properties" );
+ public void testCircularReferences3Vars() throws IOException {
+ File basicProp = new File(testDirectory, "circular.properties");
- if ( basicProp.exists() )
- {
+ if (basicProp.exists()) {
basicProp.delete();
}
basicProp.createNewFile();
- try ( FileWriter writer = new FileWriter( basicProp ) )
- {
- writer.write( "test=${test2}\n" );
- writer.write( "test2=${test3}\n" );
- writer.write( "test3=${test}\n" );
+ try (FileWriter writer = new FileWriter(basicProp)) {
+ writer.write("test=${test2}\n");
+ writer.write("test2=${test3}\n");
+ writer.write("test3=${test}\n");
writer.flush();
}
- Logger logger = mock( Logger.class );
+ Logger logger = mock(Logger.class);
- Properties prop = PropertyUtils.loadPropertyFile( basicProp, null, logger );
- assertEquals( "${test2}", prop.getProperty( "test" ) );
- assertEquals( "${test3}", prop.getProperty( "test2" ) );
- assertEquals( "${test}", prop.getProperty( "test3" ) );
- assertWarn( logger,
+ Properties prop = PropertyUtils.loadPropertyFile(basicProp, null, logger);
+ assertEquals("${test2}", prop.getProperty("test"));
+ assertEquals("${test3}", prop.getProperty("test2"));
+ assertEquals("${test}", prop.getProperty("test3"));
+ assertWarn(
+ logger,
"Circular reference between properties detected: test3 => test => test2 => test3",
"Circular reference between properties detected: test2 => test3 => test => test2",
- "Circular reference between properties detected: test => test2 => test3 => test" );
+ "Circular reference between properties detected: test => test2 => test3 => test");
}
- private void assertWarn( Logger mock, String... expected )
- {
- ArgumentCaptor<String> argument = ArgumentCaptor.forClass( String.class );
- verify( mock, times( expected.length ) ).warn( argument.capture() );
+ private void assertWarn(Logger mock, String... expected) {
+ ArgumentCaptor<String> argument = ArgumentCaptor.forClass(String.class);
+ verify(mock, times(expected.length)).warn(argument.capture());
List<String> messages = argument.getAllValues();
- for ( String str : expected )
- {
- assertTrue( messages.contains( str ) );
+ for (String str : expected) {
+ assertTrue(messages.contains(str));
}
}
}
diff --git a/src/test/java/org/apache/maven/shared/filtering/StubMavenProject.java b/src/test/java/org/apache/maven/shared/filtering/StubMavenProject.java
index 4bc9b2a..81d6f50 100644
--- a/src/test/java/org/apache/maven/shared/filtering/StubMavenProject.java
+++ b/src/test/java/org/apache/maven/shared/filtering/StubMavenProject.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.filtering;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.shared.filtering;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.shared.filtering;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.filtering;
import java.io.File;
import java.util.Properties;
@@ -29,42 +28,33 @@ import org.apache.maven.project.MavenProject;
* @since 1.0-beta-1
*
*/
-public class StubMavenProject
- extends MavenProject
-{
+public class StubMavenProject extends MavenProject {
private Properties properties;
private File basedir;
- protected StubMavenProject( File basedir )
- {
+ protected StubMavenProject(File basedir) {
this.basedir = basedir;
}
@Override
- public Properties getProperties()
- {
+ public Properties getProperties() {
return this.properties;
}
- public void setProperties( Properties properties )
- {
+ public void setProperties(Properties properties) {
this.properties = properties;
}
- public void addProperty( String key, String value )
- {
- if ( this.properties == null )
- {
+ public void addProperty(String key, String value) {
+ if (this.properties == null) {
this.properties = new Properties();
}
- this.properties.put( key, value );
+ this.properties.put(key, value);
}
@Override
- public File getBasedir()
- {
+ public File getBasedir() {
return basedir;
}
-
}
diff --git a/src/test/java/org/apache/maven/shared/filtering/StubMavenSession.java b/src/test/java/org/apache/maven/shared/filtering/StubMavenSession.java
index 644329a..4c24afa 100644
--- a/src/test/java/org/apache/maven/shared/filtering/StubMavenSession.java
+++ b/src/test/java/org/apache/maven/shared/filtering/StubMavenSession.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.filtering;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.shared.filtering;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.shared.filtering;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.filtering;
import java.util.Properties;
@@ -33,9 +32,7 @@ import org.eclipse.aether.RepositorySystemSession;
* @since 1.0-beta-1
*
*/
-public class StubMavenSession
- extends MavenSession
-{
+public class StubMavenSession extends MavenSession {
private Properties userProperties;
@@ -43,59 +40,52 @@ public class StubMavenSession
private final Settings settings;
- public StubMavenSession( Settings settings )
- {
- this( null, null, settings );
+ public StubMavenSession(Settings settings) {
+ this(null, null, settings);
}
- public StubMavenSession()
- {
- this( null, null, null );
+ public StubMavenSession() {
+ this(null, null, null);
}
- public StubMavenSession( Properties userProperties )
- {
- this( null, userProperties, null );
+ public StubMavenSession(Properties userProperties) {
+ this(null, userProperties, null);
}
- public StubMavenSession( Properties systemProperties, Properties userProperties, Settings settings )
- {
+ public StubMavenSession(Properties systemProperties, Properties userProperties, Settings settings) {
- super( (PlexusContainer) null, (RepositorySystemSession) null, new DefaultMavenExecutionRequest(),
- (MavenExecutionResult) null );
+ super(
+ (PlexusContainer) null,
+ (RepositorySystemSession) null,
+ new DefaultMavenExecutionRequest(),
+ (MavenExecutionResult) null);
this.settings = settings;
this.systemProperties = new Properties();
- if ( systemProperties != null )
- {
- this.systemProperties.putAll( systemProperties );
+ if (systemProperties != null) {
+ this.systemProperties.putAll(systemProperties);
}
- this.systemProperties.putAll( System.getProperties() );
+ this.systemProperties.putAll(System.getProperties());
this.userProperties = new Properties();
- if ( userProperties != null )
- {
- this.userProperties.putAll( userProperties );
+ if (userProperties != null) {
+ this.userProperties.putAll(userProperties);
}
}
@Override
- public Settings getSettings()
- {
+ public Settings getSettings() {
return settings;
}
@Override
- public Properties getSystemProperties()
- {
+ public Properties getSystemProperties() {
return this.systemProperties;
}
@Override
- public Properties getUserProperties()
- {
+ public Properties getUserProperties() {
return this.userProperties;
}
-
}
diff --git a/src/test/java/org/apache/maven/shared/filtering/TestReflectionProperties.java b/src/test/java/org/apache/maven/shared/filtering/TestReflectionProperties.java
index 81ad6e7..98f684b 100644
--- a/src/test/java/org/apache/maven/shared/filtering/TestReflectionProperties.java
+++ b/src/test/java/org/apache/maven/shared/filtering/TestReflectionProperties.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.filtering;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.shared.filtering;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.shared.filtering;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.filtering;
import java.io.File;
import java.io.FileInputStream;
@@ -30,77 +29,65 @@ import org.apache.maven.project.MavenProject;
* @since 1.0-beta-1
*
*/
-public class TestReflectionProperties
- extends TestSupport
-{
+public class TestReflectionProperties extends TestSupport {
- public void testSimpleFiltering()
- throws Exception
- {
+ public void testSimpleFiltering() throws Exception {
MavenProject mavenProject = new MavenProject();
- mavenProject.setVersion( "1.0" );
- mavenProject.setGroupId( "org.apache" );
+ mavenProject.setVersion("1.0");
+ mavenProject.setGroupId("org.apache");
Properties userProperties = new Properties();
- userProperties.setProperty( "foo", "bar" );
- MavenFileFilter mavenFileFilter = lookup( MavenFileFilter.class );
+ userProperties.setProperty("foo", "bar");
+ MavenFileFilter mavenFileFilter = lookup(MavenFileFilter.class);
- File from = new File( getBasedir() + "/src/test/units-files/reflection-test.properties" );
- File to = new File( getBasedir() + "/target/reflection-test.properties" );
+ File from = new File(getBasedir() + "/src/test/units-files/reflection-test.properties");
+ File to = new File(getBasedir() + "/target/reflection-test.properties");
- if ( to.exists() )
- {
+ if (to.exists()) {
to.delete();
}
-
- mavenFileFilter.copyFile( from, to, true, mavenProject, null, false, null,
- new StubMavenSession( userProperties ) );
+
+ mavenFileFilter.copyFile(from, to, true, mavenProject, null, false, null, new StubMavenSession(userProperties));
Properties reading = new Properties();
- try ( FileInputStream readFileInputStream = new FileInputStream( to ) )
- {
- reading.load( readFileInputStream );
+ try (FileInputStream readFileInputStream = new FileInputStream(to)) {
+ reading.load(readFileInputStream);
}
- assertEquals( "1.0", reading.get( "version" ) );
- assertEquals( "org.apache", reading.get( "groupId" ) );
- assertEquals( "bar", reading.get( "foo" ) );
- assertEquals( "none filtered", reading.get( "none" ) );
+ assertEquals("1.0", reading.get("version"));
+ assertEquals("org.apache", reading.get("groupId"));
+ assertEquals("bar", reading.get("foo"));
+ assertEquals("none filtered", reading.get("none"));
}
- public void testSimpleNonFiltering()
- throws Exception
- {
-
+ public void testSimpleNonFiltering() throws Exception {
+
MavenProject mavenProject = new MavenProject();
- mavenProject.setVersion( "1.0" );
- mavenProject.setGroupId( "org.apache" );
+ mavenProject.setVersion("1.0");
+ mavenProject.setGroupId("org.apache");
Properties userProperties = new Properties();
- userProperties.setProperty( "foo", "bar" );
- MavenFileFilter mavenFileFilter = lookup( MavenFileFilter.class );
+ userProperties.setProperty("foo", "bar");
+ MavenFileFilter mavenFileFilter = lookup(MavenFileFilter.class);
- File from = new File( getBasedir() + "/src/test/units-files/reflection-test.properties" );
- File to = new File( getBasedir() + "/target/reflection-test.properties" );
+ File from = new File(getBasedir() + "/src/test/units-files/reflection-test.properties");
+ File to = new File(getBasedir() + "/target/reflection-test.properties");
- if ( to.exists() )
- {
+ if (to.exists()) {
to.delete();
}
- mavenFileFilter.copyFile( from, to, false, mavenProject, null, false, null,
- new StubMavenSession( userProperties ) );
+ mavenFileFilter.copyFile(
+ from, to, false, mavenProject, null, false, null, new StubMavenSession(userProperties));
Properties reading = new Properties();
- try ( FileInputStream readFileInputStream = new FileInputStream( to ); )
- {
- reading.load( readFileInputStream );
+ try (FileInputStream readFileInputStream = new FileInputStream(to); ) {
+ reading.load(readFileInputStream);
}
- assertEquals( "${pom.version}", reading.get( "version" ) );
- assertEquals( "${pom.groupId}", reading.get( "groupId" ) );
- assertEquals( "${foo}", reading.get( "foo" ) );
- assertEquals( "none filtered", reading.get( "none" ) );
+ assertEquals("${pom.version}", reading.get("version"));
+ assertEquals("${pom.groupId}", reading.get("groupId"));
+ assertEquals("${foo}", reading.get("foo"));
+ assertEquals("none filtered", reading.get("none"));
}
-
}
diff --git a/src/test/java/org/apache/maven/shared/filtering/TestSupport.java b/src/test/java/org/apache/maven/shared/filtering/TestSupport.java
index 35aca98..5eb18a3 100644
--- a/src/test/java/org/apache/maven/shared/filtering/TestSupport.java
+++ b/src/test/java/org/apache/maven/shared/filtering/TestSupport.java
@@ -1,5 +1,3 @@
-package org.apache.maven.shared.filtering;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +7,7 @@ package org.apache.maven.shared.filtering;
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -18,6 +16,7 @@ package org.apache.maven.shared.filtering;
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.maven.shared.filtering;
import org.codehaus.plexus.ContainerConfiguration;
import org.codehaus.plexus.PlexusConstants;
@@ -26,12 +25,9 @@ import org.codehaus.plexus.PlexusTestCase;
/**
* Support class for injected tests. This should be moved off ancient Junit3 PlexusTestCase to more modern JUnit.
*/
-public abstract class TestSupport
- extends PlexusTestCase
-{
+public abstract class TestSupport extends PlexusTestCase {
@Override
- protected void customizeContainerConfiguration( ContainerConfiguration configuration )
- {
- configuration.setAutoWiring( true ).setClassPathScanning( PlexusConstants.SCANNING_INDEX );
+ protected void customizeContainerConfiguration(ContainerConfiguration configuration) {
+ configuration.setAutoWiring(true).setClassPathScanning(PlexusConstants.SCANNING_INDEX);
}
}