[MSHARED-367]
- Fixed serveral checkstyle reported problems.
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1632611 13f79535-47bb-0310-9956-ffa450edef68
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 660ba40..7d1784c 100644
--- a/src/main/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequest.java
+++ b/src/main/java/org/apache/maven/shared/filtering/AbstractMavenFilteringRequest.java
@@ -43,7 +43,7 @@
private MavenSession mavenSession;
- /**
+ /**
* List of Strings considered as expressions which contains values in the project/pom:
* pom project
* Default value will be pom and project.
@@ -51,7 +51,7 @@
* @since 1.0-beta-2
*/
private List<String> projectStartExpressions = new ArrayList<String>();
-
+
/**
* String which will escape interpolation mechanism:
* foo \${foo.bar} -> foo ${foo.bar}
@@ -59,17 +59,17 @@
* @since 1.0-beta-2
*/
private String escapeString;
-
+
/**
* @since 1.0-beta-3
*/
private Properties additionalProperties;
-
+
/**
* @since 1.0-beta-3
*/
private boolean injectProjectBuildFilters = false;
-
+
/**
* Set of expression delimiter specifications to use during filtering. Delimiter specifications are
* given in the form 'BEGIN*END' or, for symmetrical delimiters, simply 'TOKEN'. The default
@@ -78,21 +78,24 @@
* @since 1.0-beta-3
*/
private LinkedHashSet<String> delimiters = new LinkedHashSet<String>();
-
+
/**
* Do not stop trying to filter tokens when reaching EOL.
*
* @since 1.0
*/
private boolean supportMultiLineFiltering;
-
+
protected AbstractMavenFilteringRequest()
{
initDefaults();
}
- protected AbstractMavenFilteringRequest( MavenProject mavenProject, List<String> filters,
- String encoding, MavenSession mavenSession )
+ protected AbstractMavenFilteringRequest(
+ MavenProject mavenProject,
+ List<String> filters,
+ String encoding,
+ MavenSession mavenSession )
{
initDefaults();
this.mavenProject = mavenProject;
@@ -105,7 +108,7 @@
{
projectStartExpressions.add( "pom" );
projectStartExpressions.add( "project" );
-
+
delimiters.add( "${*}" );
delimiters.add( "@" );
}
@@ -155,12 +158,12 @@
{
this.escapeWindowsPaths = escapedBackslashesInFilePath;
}
-
+
public boolean isEscapedBackslashesInFilePath()
{
return isEscapeWindowsPaths();
}
-
+
public void setEscapedBackslashesInFilePath( boolean escape )
{
setEscapeWindowsPaths( escape );
@@ -234,7 +237,7 @@
{
this.escapeString = escapeString;
}
-
+
/**
* @since 1.0-beta-2
*/
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 3600442..de13caf 100644
--- a/src/main/java/org/apache/maven/shared/filtering/BaseFilter.java
+++ b/src/main/java/org/apache/maven/shared/filtering/BaseFilter.java
@@ -22,289 +22,309 @@
import java.io.File;
import java.io.IOException;
import java.io.Reader;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Properties;
+
+import javax.annotation.Nonnull;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.project.MavenProject;
import org.apache.maven.settings.Settings;
import org.apache.maven.shared.utils.StringUtils;
import org.apache.maven.shared.utils.io.FileUtils;
-import org.codehaus.plexus.interpolation.*;
+import org.codehaus.plexus.interpolation.InterpolationPostProcessor;
+import org.codehaus.plexus.interpolation.PrefixAwareRecursionInterceptor;
+import org.codehaus.plexus.interpolation.PrefixedObjectValueSource;
+import org.codehaus.plexus.interpolation.PropertiesBasedValueSource;
+import org.codehaus.plexus.interpolation.RecursionInterceptor;
+import org.codehaus.plexus.interpolation.SimpleRecursionInterceptor;
+import org.codehaus.plexus.interpolation.SingleResponseValueSource;
+import org.codehaus.plexus.interpolation.ValueSource;
import org.codehaus.plexus.interpolation.multi.MultiDelimiterStringSearchInterpolator;
import org.codehaus.plexus.logging.AbstractLogEnabled;
-import javax.annotation.Nonnull;
+class BaseFilter
+ extends AbstractLogEnabled
+ implements DefaultFilterInfo
+{
-class BaseFilter extends AbstractLogEnabled implements DefaultFilterInfo {
+ /**
+ * @see org.apache.maven.shared.filtering.MavenFileFilter#getDefaultFilterWrappers(org.apache.maven.project.MavenProject,
+ * java.util.List, boolean, org.apache.maven.execution.MavenSession)
+ * @deprecated
+ */
+ public List<FileUtils.FilterWrapper> getDefaultFilterWrappers( final MavenProject mavenProject,
+ List<String> filters,
+ final boolean escapedBackslashesInFilePath,
+ MavenSession mavenSession )
+ throws MavenFilteringException
+ {
+ return getDefaultFilterWrappers( mavenProject, filters, escapedBackslashesInFilePath, mavenSession, null );
+ }
+ @Nonnull
+ public List<FileUtils.FilterWrapper> getDefaultFilterWrappers( final MavenProject mavenProject,
+ List<String> filters,
+ final boolean escapedBackslashesInFilePath,
+ MavenSession mavenSession,
+ MavenResourcesExecution mavenResourcesExecution )
+ throws MavenFilteringException
+ {
- /**
- * @see org.apache.maven.shared.filtering.MavenFileFilter#getDefaultFilterWrappers(org.apache.maven.project.MavenProject, java.util.List, boolean, org.apache.maven.execution.MavenSession)
- * @deprecated
- */
- public List<FileUtils.FilterWrapper> getDefaultFilterWrappers( final MavenProject mavenProject,
- List<String> filters,
- final boolean escapedBackslashesInFilePath,
- MavenSession mavenSession )
- throws MavenFilteringException
- {
- return getDefaultFilterWrappers( mavenProject, filters, escapedBackslashesInFilePath, mavenSession, null );
- }
+ MavenResourcesExecution mre =
+ mavenResourcesExecution == null ? new MavenResourcesExecution() : mavenResourcesExecution.copyOf();
+ mre.setMavenProject( mavenProject );
+ mre.setMavenSession( mavenSession );
+ mre.setFilters( filters );
+ mre.setEscapedBackslashesInFilePath( escapedBackslashesInFilePath );
- @Nonnull public List<FileUtils.FilterWrapper> getDefaultFilterWrappers( final MavenProject mavenProject, List<String> filters,
- final boolean escapedBackslashesInFilePath,
- MavenSession mavenSession,
- MavenResourcesExecution mavenResourcesExecution )
- throws MavenFilteringException
- {
+ return getDefaultFilterWrappers( mre );
- MavenResourcesExecution mre =
- mavenResourcesExecution == null ? new MavenResourcesExecution() : mavenResourcesExecution.copyOf();
+ }
- mre.setMavenProject( mavenProject );
- mre.setMavenSession( mavenSession );
- mre.setFilters( filters );
- mre.setEscapedBackslashesInFilePath( escapedBackslashesInFilePath );
+ @Nonnull
+ public List<FileUtils.FilterWrapper> getDefaultFilterWrappers( final AbstractMavenFilteringRequest req )
+ throws MavenFilteringException
+ {
+ // backup values
+ boolean supportMultiLineFiltering = req.isSupportMultiLineFiltering();
- return getDefaultFilterWrappers( mre );
+ // compensate for null parameter value.
+ final AbstractMavenFilteringRequest request = req == null ? new MavenFileFilterRequest() : req;
- }
+ request.setSupportMultiLineFiltering( supportMultiLineFiltering );
- @Nonnull public List<FileUtils.FilterWrapper> getDefaultFilterWrappers( final AbstractMavenFilteringRequest req )
- throws MavenFilteringException
- {
- // backup values
- boolean supportMultiLineFiltering = req.isSupportMultiLineFiltering();
+ // Here we build some properties which will be used to read some properties files
+ // to interpolate the expression ${ } in this properties file
- // compensate for null parameter value.
- final AbstractMavenFilteringRequest request = req == null ? new MavenFileFilterRequest() : req;
+ // Take a copy of filterProperties to ensure that evaluated filterTokens are not propagated
+ // to subsequent filter files. Note: this replicates current behaviour and seems to make sense.
- request.setSupportMultiLineFiltering( supportMultiLineFiltering );
+ final Properties baseProps = new Properties();
- // Here we build some properties which will be used to read some properties files
- // to interpolate the expression ${ } in this properties file
+ // Project properties
+ 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
+ if ( request.getMavenSession() != null )
+ {
+ // execution properties wins
+ baseProps.putAll( request.getMavenSession().getExecutionProperties() );
+ }
- // Take a copy of filterProperties to ensure that evaluated filterTokens are not propagated
- // to subsequent filter files. Note: this replicates current behaviour and seems to make sense.
+ // now we build properties to use for resources interpolation
- final Properties baseProps = new Properties();
+ final Properties filterProperties = new Properties();
- // Project properties
- 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
- if ( request.getMavenSession() != null )
- {
- // execution properties wins
- baseProps.putAll( request.getMavenSession().getExecutionProperties() );
- }
+ File basedir = request.getMavenProject() != null ? request.getMavenProject().getBasedir() : new File( "." );
- // now we build properties to use for resources interpolation
+ loadProperties( filterProperties, basedir, request.getFileFilters(), baseProps );
+ if ( filterProperties.size() < 1 )
+ {
+ filterProperties.putAll( baseProps );
+ }
- final Properties filterProperties = new Properties();
+ if ( request.getMavenProject() != null )
+ {
+ if ( request.isInjectProjectBuildFilters() )
+ {
+ List<String> buildFilters = new ArrayList<String>( request.getMavenProject().getBuild().getFilters() );
- File basedir = request.getMavenProject() != null ? request.getMavenProject().getBasedir() : new File( "." );
+ // JDK-8015656: (coll) unexpected NPE from removeAll
+ if ( request.getFileFilters() != null )
+ {
+ buildFilters.removeAll( request.getFileFilters() );
+ }
- loadProperties( filterProperties, basedir, request.getFileFilters(), baseProps );
- if ( filterProperties.size() < 1 )
- {
- filterProperties.putAll( baseProps );
- }
+ loadProperties( filterProperties, basedir, buildFilters, baseProps );
+ }
- if ( request.getMavenProject() != null )
- {
- if ( request.isInjectProjectBuildFilters() )
- {
- @SuppressWarnings( "unchecked" )
- List<String> buildFilters = new ArrayList<String>( request.getMavenProject().getBuild().getFilters() );
+ // Project properties
+ filterProperties.putAll( request.getMavenProject().getProperties() == null ? Collections.emptyMap()
+ : request.getMavenProject().getProperties() );
+ }
+ if ( request.getMavenSession() != null )
+ {
+ // execution properties wins
+ filterProperties.putAll( request.getMavenSession().getExecutionProperties() );
+ }
- // JDK-8015656: (coll) unexpected NPE from removeAll
- if ( request.getFileFilters() != null )
- {
- buildFilters.removeAll( request.getFileFilters() );
- }
+ if ( request.getAdditionalProperties() != null )
+ {
+ // additional properties wins
+ filterProperties.putAll( request.getAdditionalProperties() );
+ }
- loadProperties( filterProperties, basedir, buildFilters, baseProps );
- }
+ List<FileUtils.FilterWrapper> defaultFilterWrappers =
+ request == null ? new ArrayList<FileUtils.FilterWrapper>( 1 )
+ : new ArrayList<FileUtils.FilterWrapper>( request.getDelimiters().size() + 1 );
- // Project properties
- filterProperties.putAll( request.getMavenProject().getProperties() == null
- ? Collections.emptyMap()
- : request.getMavenProject().getProperties() );
- }
- if ( request.getMavenSession() != null )
- {
- // execution properties wins
- filterProperties.putAll( request.getMavenSession().getExecutionProperties() );
- }
+ if ( getLogger().isDebugEnabled() )
+ {
+ getLogger().debug( "properties used " + filterProperties );
+ }
- if ( request.getAdditionalProperties() != null )
- {
- // additional properties wins
- filterProperties.putAll( request.getAdditionalProperties() );
- }
+ final ValueSource propertiesValueSource = new PropertiesBasedValueSource( filterProperties );
- List<FileUtils.FilterWrapper> defaultFilterWrappers = request == null
- ? new ArrayList<FileUtils.FilterWrapper>( 1 )
- : new ArrayList<FileUtils.FilterWrapper>( request.getDelimiters().size() + 1 );
+ if ( request != null )
+ {
+ FileUtils.FilterWrapper wrapper =
+ new Wrapper( request.getDelimiters(), request.getMavenProject(), request.getMavenSession(),
+ propertiesValueSource, request.getProjectStartExpressions(), request.getEscapeString(),
+ request.isEscapeWindowsPaths(), request.isSupportMultiLineFiltering() );
- if ( getLogger().isDebugEnabled() )
- {
- getLogger().debug( "properties used " + filterProperties );
- }
+ defaultFilterWrappers.add( wrapper );
+ }
- final ValueSource propertiesValueSource = new PropertiesBasedValueSource( filterProperties );
+ return defaultFilterWrappers;
+ }
- if ( request != null )
- {
- FileUtils.FilterWrapper wrapper =
- new Wrapper( request.getDelimiters(), request.getMavenProject(), request.getMavenSession(),
- propertiesValueSource, request.getProjectStartExpressions(), request.getEscapeString(),
- request.isEscapeWindowsPaths(), request.isSupportMultiLineFiltering() );
+ /**
+ * default visibility only for testing reason !
+ */
+ void loadProperties( Properties filterProperties, File basedir, List<String> propertiesFilePaths,
+ Properties baseProps )
+ throws MavenFilteringException
+ {
+ if ( propertiesFilePaths != null )
+ {
+ Properties workProperties = new Properties();
+ workProperties.putAll( baseProps );
- defaultFilterWrappers.add( wrapper );
- }
+ for ( String filterFile : propertiesFilePaths )
+ {
+ if ( StringUtils.isEmpty( filterFile ) )
+ {
+ // skip empty file name
+ continue;
+ }
+ try
+ {
+ File propFile = FileUtils.resolveFile( basedir, filterFile );
+ Properties properties = PropertyUtils.loadPropertyFile( propFile, workProperties );
+ filterProperties.putAll( properties );
+ workProperties.putAll( properties );
+ }
+ catch ( IOException e )
+ {
+ throw new MavenFilteringException( "Error loading property file '" + filterFile + "'", e );
+ }
+ }
+ }
+ }
- return defaultFilterWrappers;
- }
+ private static final class Wrapper
+ extends FileUtils.FilterWrapper
+ {
- /**
- * default visibility only for testing reason !
- */
- void loadProperties( Properties filterProperties, File basedir, List<String> propertiesFilePaths, Properties baseProps )
- throws MavenFilteringException
- {
- if ( propertiesFilePaths != null )
- {
- Properties workProperties = new Properties();
- workProperties.putAll( baseProps );
+ private LinkedHashSet<String> delimiters;
- for ( String filterFile : propertiesFilePaths )
- {
- if ( StringUtils.isEmpty(filterFile) )
- {
- // skip empty file name
- continue;
- }
- try
- {
- File propFile = FileUtils.resolveFile( basedir, filterFile );
- Properties properties = PropertyUtils.loadPropertyFile( propFile, workProperties );
- filterProperties.putAll( properties );
- workProperties.putAll( properties );
- }
- catch ( IOException e )
- {
- throw new MavenFilteringException( "Error loading property file '" + filterFile + "'", e );
- }
- }
- }
- }
+ private MavenProject project;
- private static final class Wrapper
- extends FileUtils.FilterWrapper
- {
+ private ValueSource propertiesValueSource;
- private LinkedHashSet<String> delimiters;
+ private List<String> projectStartExpressions;
- private MavenProject project;
+ private String escapeString;
- private ValueSource propertiesValueSource;
+ private boolean escapeWindowsPaths;
- private List<String> projectStartExpressions;
+ private final MavenSession mavenSession;
- private String escapeString;
+ private boolean supportMultiLineFiltering;
- private boolean escapeWindowsPaths;
+ 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;
+ this.mavenSession = mavenSession;
+ this.propertiesValueSource = propertiesValueSource;
+ this.projectStartExpressions = projectStartExpressions;
+ this.escapeString = escapeString;
+ this.escapeWindowsPaths = escapeWindowsPaths;
+ this.supportMultiLineFiltering = supportMultiLineFiltering;
+ }
- private final MavenSession mavenSession;
+ public Reader getReader( Reader reader )
+ {
+ MultiDelimiterStringSearchInterpolator interpolator = new MultiDelimiterStringSearchInterpolator();
+ interpolator.setDelimiterSpecs( delimiters );
- private boolean supportMultiLineFiltering;
+ RecursionInterceptor ri = null;
+ if ( projectStartExpressions != null && !projectStartExpressions.isEmpty() )
+ {
+ ri = new PrefixAwareRecursionInterceptor( projectStartExpressions, true );
+ }
+ else
+ {
+ ri = new SimpleRecursionInterceptor();
+ }
- 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;
- this.mavenSession = mavenSession;
- this.propertiesValueSource = propertiesValueSource;
- this.projectStartExpressions = projectStartExpressions;
- this.escapeString = escapeString;
- this.escapeWindowsPaths = escapeWindowsPaths;
- this.supportMultiLineFiltering = supportMultiLineFiltering;
- }
+ interpolator.addValueSource( propertiesValueSource );
- public Reader getReader( Reader reader )
- {
- MultiDelimiterStringSearchInterpolator interpolator = new MultiDelimiterStringSearchInterpolator();
- interpolator.setDelimiterSpecs( delimiters );
+ if ( project != null )
+ {
+ interpolator.addValueSource( new PrefixedObjectValueSource( projectStartExpressions, project, true ) );
+ }
- RecursionInterceptor ri = null;
- if ( projectStartExpressions != null && !projectStartExpressions.isEmpty() )
- {
- ri = new PrefixAwareRecursionInterceptor( projectStartExpressions, true );
- }
- else
- {
- ri = new SimpleRecursionInterceptor();
- }
+ if ( mavenSession != null )
+ {
+ interpolator.addValueSource( new PrefixedObjectValueSource( "session", mavenSession ) );
- interpolator.addValueSource( propertiesValueSource );
+ final Settings settings = mavenSession.getSettings();
+ if ( settings != null )
+ {
+ interpolator.addValueSource( new PrefixedObjectValueSource( "settings", settings ) );
+ interpolator.addValueSource( new SingleResponseValueSource( "localRepository",
+ settings.getLocalRepository() ) );
+ }
+ }
- if ( project != null )
- {
- interpolator.addValueSource( new PrefixedObjectValueSource( projectStartExpressions, project, true ) );
- }
+ interpolator.setEscapeString( escapeString );
- if ( mavenSession != null )
- {
- interpolator.addValueSource( new PrefixedObjectValueSource( "session", mavenSession ) );
+ if ( escapeWindowsPaths )
+ {
+ interpolator.addPostProcessor( new InterpolationPostProcessor()
+ {
+ public Object execute( String expression, Object value )
+ {
+ if ( value instanceof String )
+ {
+ return FilteringUtils.escapeWindowsPath( (String) value );
+ }
- final Settings settings = mavenSession.getSettings();
- if ( settings != null )
- {
- interpolator.addValueSource( new PrefixedObjectValueSource( "settings", settings ) );
- interpolator.addValueSource(
- new SingleResponseValueSource( "localRepository", settings.getLocalRepository() ) );
- }
- }
+ return value;
+ }
+ } );
+ }
- interpolator.setEscapeString( escapeString );
+ MultiDelimiterInterpolatorFilterReaderLineEnding filterReader =
+ new MultiDelimiterInterpolatorFilterReaderLineEnding( reader, interpolator, supportMultiLineFiltering );
+ filterReader.setRecursionInterceptor( ri );
+ filterReader.setDelimiterSpecs( delimiters );
- if ( escapeWindowsPaths )
- {
- interpolator.addPostProcessor( new InterpolationPostProcessor()
- {
- public Object execute( String expression, Object value )
- {
- if ( value instanceof String )
- {
- return FilteringUtils.escapeWindowsPath( (String) value );
- }
+ filterReader.setInterpolateWithPrefixPattern( false );
+ filterReader.setEscapeString( escapeString );
- return value;
- }
- } );
- }
+ return filterReader;
+ }
- MultiDelimiterInterpolatorFilterReaderLineEnding filterReader =
- new MultiDelimiterInterpolatorFilterReaderLineEnding( reader, interpolator, supportMultiLineFiltering );
- filterReader.setRecursionInterceptor( ri );
- filterReader.setDelimiterSpecs( delimiters );
-
- filterReader.setInterpolateWithPrefixPattern( false );
- filterReader.setEscapeString( escapeString );
-
- return filterReader;
- }
-
- }
+ }
}
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 a90058d..07dd54d 100644
--- a/src/main/java/org/apache/maven/shared/filtering/BoundedReader.java
+++ b/src/main/java/org/apache/maven/shared/filtering/BoundedReader.java
@@ -1,3 +1,5 @@
+package org.apache.maven.shared.filtering;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -16,7 +18,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.shared.filtering;
import java.io.IOException;
import java.io.Reader;
@@ -24,53 +25,77 @@
/**
* A reader that imposes a limit to the number of bytes that can be read from
* an underlying reader, simulating eof when 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;
+ private final Reader target;
- int pos = 0;
+ int pos = 0;
- int readAheadLimit;
+ int readAheadLimit;
- public BoundedReader(Reader target, int readAheadLimit) throws IOException {
- this.target = target;
- target.mark(readAheadLimit);
- this.readAheadLimit = readAheadLimit;
- }
+ public BoundedReader( Reader target, int readAheadLimit )
+ throws IOException
+ {
+ this.target = target;
+ target.mark( readAheadLimit );
+ this.readAheadLimit = readAheadLimit;
+ }
+ @Override
+ public void close()
+ throws IOException
+ {
+ target.close();
+ }
- @Override public void close() throws IOException {
- target.close();
- }
+ @Override
+ public void reset()
+ throws IOException
+ {
+ pos = 0;
+ target.reset();
+ }
- @Override public void reset() throws IOException {
- pos = 0;
- target.reset();
- }
+ @Override
+ public void mark( int readAheadLimit )
+ throws IOException
+ {
+ this.readAheadLimit = readAheadLimit;
+ target.mark( readAheadLimit );
+ }
- @Override public void mark(int readAheadLimit) throws IOException {
- this.readAheadLimit = readAheadLimit;
- target.mark(readAheadLimit);
- }
+ @Override
+ public int read()
+ throws IOException
+ {
+ if ( pos >= readAheadLimit )
+ {
+ return -1;
+ }
+ pos++;
+ return target.read();
+ }
- @Override public int read() throws IOException {
- if (pos >= readAheadLimit) return -1;
- pos++;
- return target.read();
- }
-
- @Override public int read(char[] cbuf, int off, int len) throws IOException{
- int c;
- for (int i = 0; i < len; i++){
- c = read();
- if (c == -1) return i;
- cbuf[off + i] = (char) c;
- }
- return len;
- }
+ @Override
+ public int read( char[] cbuf, int off, int len )
+ throws IOException
+ {
+ int c;
+ for ( int i = 0; i < len; i++ )
+ {
+ c = read();
+ if ( c == -1 )
+ {
+ return i;
+ }
+ cbuf[off + i] = (char) c;
+ }
+ return len;
+ }
}
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 91f92bd..d23a393 100644
--- a/src/main/java/org/apache/maven/shared/filtering/DefaultFilterInfo.java
+++ b/src/main/java/org/apache/maven/shared/filtering/DefaultFilterInfo.java
@@ -1,6 +1,5 @@
package org.apache.maven.shared.filtering;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -22,56 +21,61 @@
import java.util.List;
+import javax.annotation.Nonnull;
+
import org.apache.maven.execution.MavenSession;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.utils.io.FileUtils;
-import javax.annotation.Nonnull;
+public interface DefaultFilterInfo
+{
+ /**
+ * Will return the default FileUtils.FilterWrappers.
+ * <p/>
+ * <ul>
+ * <li>interpolate with token ${} and values from sysProps, project.properties, filters and project filters.</li>
+ * <li>interpolate with token @ @ and values from sysProps, project.properties, filters and project filters.</li>
+ * <li>interpolate with token ${} and values from mavenProject interpolation.</li>
+ * <li>interpolation with token @ @ and values from mavenProject interpolation</li>
+ * </ul>
+ * <b>This method is now deprecated and no escape mechanism will be used.</b>
+ *
+ * @param mavenProject
+ * @param filters {@link java.util.List} of properties file
+ * @return {@link java.util.List} of FileUtils.FilterWrapper
+ * @deprecated use
+ * {@link #getDefaultFilterWrappers(org.apache.maven.project.MavenProject, java.util.List, boolean, org.apache.maven.execution.MavenSession, org.apache.maven.shared.filtering.MavenResourcesExecution)}
+ */
+ @Nonnull
+ List<FileUtils.FilterWrapper> getDefaultFilterWrappers( MavenProject mavenProject, List<String> filters,
+ boolean escapedBackslashesInFilePath,
+ MavenSession mavenSession )
+ throws MavenFilteringException;
-public interface DefaultFilterInfo {
- /**
- * Will return the default FileUtils.FilterWrappers.
- * <p/>
- * <ul>
- * <li>interpolate with token ${} and values from sysProps, project.properties, filters and project filters.</li>
- * <li>interpolate with token @ @ and values from sysProps, project.properties, filters and project filters.</li>
- * <li>interpolate with token ${} and values from mavenProject interpolation.</li>
- * <li>interpolation with token @ @ and values from mavenProject interpolation</li>
- * </ul>
- * <b>This method is now deprecated and no escape mechanism will be used.</b>
- *
- * @param mavenProject
- * @param filters {@link java.util.List} of properties file
- * @return {@link java.util.List} of FileUtils.FilterWrapper
- * @deprecated use {@link #getDefaultFilterWrappers(org.apache.maven.project.MavenProject, java.util.List, boolean, org.apache.maven.execution.MavenSession, org.apache.maven.shared.filtering.MavenResourcesExecution)}
- */
- @Nonnull List<FileUtils.FilterWrapper> getDefaultFilterWrappers(MavenProject mavenProject, List<String> filters,
- boolean escapedBackslashesInFilePath,
- MavenSession mavenSession)
- throws MavenFilteringException;
+ /**
+ * @param mavenProject
+ * @param filters
+ * @param escapedBackslashesInFilePath
+ * @param mavenSession
+ * @param mavenResourcesExecution
+ * @return {@link java.util.List} of FileUtils.FilterWrapper
+ * @throws org.apache.maven.shared.filtering.MavenFilteringException
+ * @since 1.0-beta-2
+ */
+ @Nonnull
+ List<FileUtils.FilterWrapper> getDefaultFilterWrappers( MavenProject mavenProject, List<String> filters,
+ boolean escapedBackslashesInFilePath,
+ MavenSession mavenSession,
+ MavenResourcesExecution mavenResourcesExecution )
+ throws MavenFilteringException;
- /**
- * @param mavenProject
- * @param filters
- * @param escapedBackslashesInFilePath
- * @param mavenSession
- * @param mavenResourcesExecution
- * @return {@link java.util.List} of FileUtils.FilterWrapper
- * @throws org.apache.maven.shared.filtering.MavenFilteringException
- * @since 1.0-beta-2
- */
- @Nonnull List<FileUtils.FilterWrapper> getDefaultFilterWrappers(MavenProject mavenProject, List<String> filters,
- boolean escapedBackslashesInFilePath,
- MavenSession mavenSession,
- MavenResourcesExecution mavenResourcesExecution)
- throws MavenFilteringException;
-
- /**
- * @param request
- * @return {@link java.util.List} of FileUtils.FilterWrapper
- * @throws org.apache.maven.shared.filtering.MavenFilteringException
- * @since 1.0-beta-3
- */
- @Nonnull List<FileUtils.FilterWrapper> getDefaultFilterWrappers(AbstractMavenFilteringRequest request)
- throws MavenFilteringException;
+ /**
+ * @param request
+ * @return {@link java.util.List} of FileUtils.FilterWrapper
+ * @throws org.apache.maven.shared.filtering.MavenFilteringException
+ * @since 1.0-beta-3
+ */
+ @Nonnull
+ List<FileUtils.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 09cffe0..f500a17 100644
--- a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
+++ b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
@@ -19,16 +19,6 @@
* under the License.
*/
-import org.apache.maven.execution.MavenSession;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.shared.utils.StringUtils;
-import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.utils.io.FileUtils.FilterWrapper;
-import org.apache.maven.shared.utils.io.IOUtil;
-import org.sonatype.plexus.build.incremental.BuildContext;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
@@ -42,13 +32,23 @@
import java.io.Reader;
import java.io.UnsupportedEncodingException;
import java.io.Writer;
-import java.util.Arrays;
import java.util.List;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import org.apache.maven.execution.MavenSession;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.shared.utils.StringUtils;
+import org.apache.maven.shared.utils.io.FileUtils;
+import org.apache.maven.shared.utils.io.FileUtils.FilterWrapper;
+import org.apache.maven.shared.utils.io.IOUtil;
+import org.sonatype.plexus.build.incremental.BuildContext;
+
/**
* @author Olivier Lamy
* @plexus.component role="org.apache.maven.shared.filtering.MavenFileFilter"
- * role-hint="default"
+ * role-hint="default"
*/
public class DefaultMavenFileFilter
extends BaseFilter
@@ -80,7 +80,6 @@
copyFile( from, to, filtering, filterWrappers, encoding );
}
-
public void copyFile( MavenFileFilterRequest mavenFileFilterRequest )
throws MavenFilteringException
{
@@ -90,7 +89,6 @@
mavenFileFilterRequest.isFiltering(), filterWrappers, mavenFileFilterRequest.getEncoding() );
}
-
public void copyFile( File from, File to, boolean filtering, List<FileUtils.FilterWrapper> filterWrappers,
String encoding )
throws MavenFilteringException
@@ -99,7 +97,6 @@
copyFile( from, to, filtering, filterWrappers, encoding, false );
}
-
public void copyFile( File from, File to, boolean filtering, List<FileUtils.FilterWrapper> filterWrappers,
String encoding, boolean overwrite )
throws MavenFilteringException
@@ -156,7 +153,7 @@
}
else
{
- if ( to.lastModified() < from.lastModified() )
+ if ( to.lastModified() < from.lastModified() )
{
FileUtils.copyFile( from, to );
}
@@ -193,5 +190,4 @@
}
}
-
}
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 e5b2b26..6f1b1e7 100644
--- a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenReaderFilter.java
+++ b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenReaderFilter.java
@@ -19,19 +19,20 @@
* under the License.
*/
-import org.apache.maven.execution.MavenSession;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.shared.utils.io.FileUtils.FilterWrapper;
-
-import javax.annotation.Nonnull;
import java.io.Reader;
import java.util.Collections;
import java.util.List;
+import javax.annotation.Nonnull;
+
+import org.apache.maven.execution.MavenSession;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.shared.utils.io.FileUtils.FilterWrapper;
+
/**
* @author Kristian Rosenvold
* @plexus.component role="org.apache.maven.shared.filtering.MavenReaderFilter"
- * role-hint="default"
+ * role-hint="default"
*/
public class DefaultMavenReaderFilter
extends BaseFilter
@@ -53,22 +54,19 @@
return filter( from, filtering, filterWrappers );
}
-
- @Nonnull public Reader filter( @Nonnull MavenReaderFilterRequest mavenFileFilterRequest )
+ @Nonnull
+ public Reader filter( @Nonnull MavenReaderFilterRequest mavenFileFilterRequest )
throws MavenFilteringException
{
List<FilterWrapper> filterWrappers = getDefaultFilterWrappers( mavenFileFilterRequest );
return filter( mavenFileFilterRequest.getFrom(), mavenFileFilterRequest.isFiltering(), filterWrappers );
}
-
- @SuppressWarnings( "unchecked" )
public @Nonnull Reader filter( @Nonnull Reader from, boolean filtering, @Nonnull List<FilterWrapper> filterWrappers )
{
- return filterWrap( from, filtering ? filterWrappers : Collections.<FilterWrapper>emptyList() );
+ return filterWrap( from, filtering ? filterWrappers : Collections.<FilterWrapper> emptyList() );
}
-
private static @Nonnull Reader filterWrap( @Nonnull Reader from, @Nonnull Iterable<FilterWrapper> wrappers )
{
Reader reader = from;
@@ -79,5 +77,4 @@
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 43a317f..2821619 100644
--- a/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
+++ b/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
@@ -46,14 +46,14 @@
/**
* @author Olivier Lamy
* @plexus.component role="org.apache.maven.shared.filtering.MavenResourcesFiltering"
- * role-hint="default"
+ * role-hint="default"
*/
public class DefaultMavenResourcesFiltering
extends AbstractLogEnabled
implements MavenResourcesFiltering, Initializable
{
- private static final String[] EMPTY_STRING_ARRAY = { };
+ private static final String[] EMPTY_STRING_ARRAY = {};
private static final String[] DEFAULT_INCLUDES = { "**/**" };
@@ -65,7 +65,7 @@
private BuildContext buildContext;
// ------------------------------------------------
- // Plexus lifecycle
+ // Plexus lifecycle
// ------------------------------------------------
public void initialize()
throws InitializationException
@@ -79,7 +79,6 @@
this.defaultNonFilteredFileExtensions.add( "png" );
}
-
/**
* @plexus.requirement role-hint="default"
*/
@@ -94,7 +93,7 @@
new MavenResourcesExecution( resources, outputDirectory, mavenProject, encoding, fileFilters,
nonFilteredFileExtensions, mavenSession );
mavenResourcesExecution.setUseDefaultFilterWrappers( true );
-// mavenResourcesExecution.setEscapeWindowsPaths( false );
+ // mavenResourcesExecution.setEscapeWindowsPaths( false );
filterResources( mavenResourcesExecution );
}
@@ -110,7 +109,6 @@
filterResources( mavenResourcesExecution );
}
-
public boolean filteredFileExtension( String fileName, List<String> userNonFilteredFileExtensions )
{
List<String> nonFilteredFileExtensions = new ArrayList<String>( getDefaultNonFilteredFileExtensions() );
@@ -122,8 +120,8 @@
!nonFilteredFileExtensions.contains( StringUtils.lowerCase( FileUtils.extension( fileName ) ) );
if ( getLogger().isDebugEnabled() )
{
- getLogger().debug(
- "file " + fileName + " has a" + ( filteredFileExtension ? " " : " non " ) + "filtered file extension" );
+ getLogger().debug( "file " + fileName + " has a" + ( filteredFileExtension ? " " : " non " )
+ + "filtered file extension" );
}
return filteredFileExtension;
}
@@ -174,8 +172,8 @@
}
else
{
- getLogger().info(
- "Using '" + mavenResourcesExecution.getEncoding() + "' encoding to copy filtered resources." );
+ getLogger().info( "Using '" + mavenResourcesExecution.getEncoding()
+ + "' encoding to copy filtered resources." );
}
for ( Resource resource : mavenResourcesExecution.getResources() )
@@ -219,8 +217,9 @@
throw new MavenFilteringException( "Cannot create resource output directory: " + outputDirectory );
}
- boolean ignoreDelta = !outputExists || buildContext.hasDelta( mavenResourcesExecution.getFileFilters() )
- || buildContext.hasDelta( getRelativeOutputDirectory( mavenResourcesExecution ) );
+ boolean ignoreDelta =
+ !outputExists || buildContext.hasDelta( mavenResourcesExecution.getFileFilters() )
+ || buildContext.hasDelta( getRelativeOutputDirectory( mavenResourcesExecution ) );
getLogger().debug( "ignoreDelta " + ignoreDelta );
Scanner scanner = buildContext.newScanner( resourceDirectory, ignoreDelta );
@@ -238,33 +237,29 @@
}
catch ( IOException e )
{
- throw new MavenFilteringException(
- "Cannot copy directory structure from " + resourceDirectory.getPath() + " to "
- + outputDirectory.getPath() );
+ throw new MavenFilteringException( "Cannot copy directory structure from "
+ + resourceDirectory.getPath() + " to " + outputDirectory.getPath() );
}
}
List<String> includedFiles = Arrays.asList( scanner.getIncludedFiles() );
- getLogger().info(
- "Copying " + includedFiles.size() + " resource" + ( includedFiles.size() > 1 ? "s" : "" ) + (
- targetPath == null ? "" : " to " + targetPath ) );
+ getLogger().info( "Copying " + includedFiles.size() + " resource" + ( includedFiles.size() > 1 ? "s" : "" )
+ + ( targetPath == null ? "" : " to " + targetPath ) );
for ( String name : includedFiles )
{
File source = new File( resourceDirectory, name );
- File destinationFile =
- getDestinationFile( outputDirectory, targetPath, name, mavenResourcesExecution );
+ File destinationFile = getDestinationFile( outputDirectory, targetPath, name, mavenResourcesExecution );
boolean filteredExt =
filteredFileExtension( source.getName(), mavenResourcesExecution.getNonFilteredFileExtensions() );
mavenFileFilter.copyFile( source, destinationFile, resource.isFiltering() && filteredExt,
mavenResourcesExecution.getFilterWrappers(),
- mavenResourcesExecution.getEncoding(),
- mavenResourcesExecution.isOverwrite() );
+ mavenResourcesExecution.getEncoding(), mavenResourcesExecution.isOverwrite() );
}
// deal with deleted source files
@@ -279,8 +274,7 @@
for ( String name : deletedFiles )
{
- File destinationFile =
- getDestinationFile( outputDirectory, targetPath, name, mavenResourcesExecution );
+ File destinationFile = getDestinationFile( outputDirectory, targetPath, name, mavenResourcesExecution );
destinationFile.delete();
@@ -291,11 +285,12 @@
}
- private File getDestinationFile( File outputDirectory, String targetPath, String name, MavenResourcesExecution mavenResourcesExecution )
+ private File getDestinationFile( File outputDirectory, String targetPath, String name,
+ MavenResourcesExecution mavenResourcesExecution )
throws MavenFilteringException
{
String destination = name;
-
+
if ( mavenResourcesExecution.isFilterFilenames() && mavenResourcesExecution.getFilterWrappers().size() > 0 )
{
destination = filterFileName( destination, mavenResourcesExecution.getFilterWrappers() );
@@ -402,7 +397,7 @@
return relOutDir;
}
-
+
/*
* Filter the name of a file using the same mechanism for filtering the content of the file.
*/
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 3878c06..6a2928a 100644
--- a/src/main/java/org/apache/maven/shared/filtering/FilteringUtils.java
+++ b/src/main/java/org/apache/maven/shared/filtering/FilteringUtils.java
@@ -20,18 +20,18 @@
*/
import java.util.regex.Pattern;
+
import org.apache.maven.shared.utils.StringUtils;
/**
* @author Olivier Lamy
* @author Dennis Lundberg
- *
*/
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 );
/**
*
@@ -40,7 +40,7 @@
{
// nothing just an util class
}
-
+
// TODO: Correct to handle relative windows paths. (http://jira.codehaus.org/browse/MSHARED-121)
// How do we distinguish a relative windows path from some other value that happens to contain backslashes??
public static String escapeWindowsPath( String val )
@@ -54,15 +54,15 @@
{
buf.append( val.substring( start, end ) ).append( "\\\\" );
start = end + 1;
-
+
if ( val.indexOf( '\\', end + 1 ) == end + 1 )
{
start++;
}
}
-
+
buf.append( val.substring( start ) );
-
+
return buf.toString();
}
return val;
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 f756046..dcc7326 100644
--- a/src/main/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEnding.java
+++ b/src/main/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEnding.java
@@ -19,23 +19,22 @@
* under the License.
*/
-import org.codehaus.plexus.interpolation.InterpolationException;
-import org.codehaus.plexus.interpolation.Interpolator;
-import org.codehaus.plexus.interpolation.RecursionInterceptor;
-import org.codehaus.plexus.interpolation.SimpleRecursionInterceptor;
-
import java.io.BufferedReader;
import java.io.FilterReader;
import java.io.IOException;
import java.io.Reader;
+import org.codehaus.plexus.interpolation.InterpolationException;
+import org.codehaus.plexus.interpolation.Interpolator;
+import org.codehaus.plexus.interpolation.RecursionInterceptor;
+import org.codehaus.plexus.interpolation.SimpleRecursionInterceptor;
+
/**
* A FilterReader implementation, that works with Interpolator interface instead of it's own interpolation
* implementation. This implementation is heavily based on org.codehaus.plexus.util.InterpolationFilterReader.
*
* @author cstamas
* @author Olivier Lamy
- *
* @since 1.0
*/
public class InterpolatorFilterReaderLineEnding
@@ -97,28 +96,36 @@
private boolean eof = false;
/**
- * @param in reader to use
- * @param interpolator interpolator instance to use
- * @param beginToken start token to use
- * @param endToken end token to use
+ * @param in reader to use
+ * @param interpolator interpolator instance to use
+ * @param beginToken start token to use
+ * @param endToken end token to use
* @param supportMultiLineFiltering If multi line filtering is allowed
*/
- public InterpolatorFilterReaderLineEnding( Reader in, Interpolator interpolator, String beginToken, String endToken,
+ public InterpolatorFilterReaderLineEnding(
+ Reader in,
+ Interpolator interpolator,
+ String beginToken,
+ String endToken,
boolean supportMultiLineFiltering )
{
this( in, interpolator, beginToken, endToken, new SimpleRecursionInterceptor(), supportMultiLineFiltering );
}
/**
- * @param in reader to use
- * @param interpolator interpolator instance to use
- * @param beginToken start token to use
- * @param endToken end token to use
- * @param ri The {@link RecursionInterceptor} to use to prevent recursive expressions.
+ * @param in reader to use
+ * @param interpolator interpolator instance to use
+ * @param beginToken start token to use
+ * @param endToken end token to use
+ * @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,
+ 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.
@@ -145,7 +152,7 @@
* @param n The number of characters to skip
* @return the number of characters actually skipped
* @throws IllegalArgumentException If <code>n</code> is negative.
- * @throws IOException If an I/O error occurs
+ * @throws IOException If an I/O error occurs
*/
public long skip( long n )
throws IOException
@@ -170,8 +177,8 @@
* occurs, or the end of the stream is reached.
*
* @param cbuf Destination buffer to write characters to. Must not be <code>null</code>.
- * @param off Offset at which to start storing characters.
- * @param len Maximum number of characters to read.
+ * @param off Offset at which to start storing characters.
+ * @param len Maximum number of characters to read.
* @return the number of characters read, or -1 if the end of the stream has been reached
* @throws IOException If an I/O error occurs
*/
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 b383649..d14de60 100644
--- a/src/main/java/org/apache/maven/shared/filtering/MavenFileFilter.java
+++ b/src/main/java/org/apache/maven/shared/filtering/MavenFileFilter.java
@@ -19,28 +19,28 @@
* under the License.
*/
+import java.io.File;
+import java.util.List;
+
import org.apache.maven.execution.MavenSession;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.utils.io.FileUtils;
-import java.io.File;
-import java.util.List;
-
/**
* @author Olivier Lamy
- *
*/
-public interface MavenFileFilter extends DefaultFilterInfo
+public interface MavenFileFilter
+ extends DefaultFilterInfo
{
/**
* Will copy a file with some filtering using defaultFilterWrappers.
*
- * @param from file to copy/filter
- * @param to destination file
- * @param filtering enable or not filering
+ * @param from file to copy/filter
+ * @param to destination file
+ * @param filtering enable or not filering
* @param mavenProject the mavenproject
- * @param filters {@link List} of String which are path to a Property file
+ * @param filters {@link List} of String which are path to a Property file
* @throws MavenFilteringException
* @see #getDefaultFilterWrappers(MavenProject, List, boolean, MavenSession)
*/
@@ -67,7 +67,6 @@
String encoding )
throws MavenFilteringException;
-
/**
* @param from
* @param to
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 e6bf9f8..7421e79 100644
--- a/src/main/java/org/apache/maven/shared/filtering/MavenFileFilterRequest.java
+++ b/src/main/java/org/apache/maven/shared/filtering/MavenFileFilterRequest.java
@@ -33,11 +33,11 @@
public class MavenFileFilterRequest
extends AbstractMavenFilteringRequest
{
-
+
private File from;
private File to;
-
+
private boolean filtering;
public MavenFileFilterRequest()
@@ -45,8 +45,15 @@
// nothing
}
- public MavenFileFilterRequest( File from, File to, boolean filtering, MavenProject mavenProject, List<String> filters,
- boolean escapedBackslashesInFilePath, String encoding, MavenSession 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, encoding, mavenSession );
@@ -57,7 +64,6 @@
setEscapeWindowsPaths( escapedBackslashesInFilePath );
}
-
public File getFrom()
{
return from;
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 010401c..1f7e159 100644
--- a/src/main/java/org/apache/maven/shared/filtering/MavenFilteringException.java
+++ b/src/main/java/org/apache/maven/shared/filtering/MavenFilteringException.java
@@ -21,7 +21,6 @@
/**
* @author Olivier Lamy
- *
*/
public class MavenFilteringException
extends Exception
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 84bf95e..56c8e46 100644
--- a/src/main/java/org/apache/maven/shared/filtering/MavenReaderFilter.java
+++ b/src/main/java/org/apache/maven/shared/filtering/MavenReaderFilter.java
@@ -22,13 +22,13 @@
import java.io.Reader;
import java.util.List;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
import org.apache.maven.execution.MavenSession;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.utils.io.FileUtils;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
/**
* @author Olivier Lamy
* @author Kristian Rosenvold
@@ -40,15 +40,17 @@
/**
* Provides a new reader that applies filtering using defaultFilterWrappers.
*
- * @param from the source reader
- * @param filtering enable or not filering
+ * @param from the source reader
+ * @param filtering enable or not filering
* @param mavenProject the mavenproject
- * @param filters {@link java.util.List} of String which are path to a Property file
+ * @param filters {@link java.util.List} of String which are path to a Property file
* @return an input stream that applies the filter
* @throws org.apache.maven.shared.filtering.MavenFilteringException
- * @see #getDefaultFilterWrappers(org.apache.maven.project.MavenProject, java.util.List, boolean, org.apache.maven.execution.MavenSession)
+ * @see #getDefaultFilterWrappers(org.apache.maven.project.MavenProject, java.util.List, boolean,
+ * org.apache.maven.execution.MavenSession)
*/
- @Nonnull Reader filter( @Nonnull Reader from, boolean filtering, @Nullable MavenProject mavenProject, List<String> filters,
+ @Nonnull
+ Reader filter( @Nonnull Reader from, boolean filtering, @Nullable MavenProject mavenProject, List<String> filters,
boolean escapedBackslashesInFilePath, MavenSession mavenSession )
throws MavenFilteringException;
@@ -60,16 +62,18 @@
* @return an input stream that applies the filter
* @since 1.0-beta-3
*/
- @Nonnull Reader filter( @Nonnull MavenReaderFilterRequest mavenFileFilterRequest )
+ @Nonnull
+ Reader filter( @Nonnull MavenReaderFilterRequest mavenFileFilterRequest )
throws MavenFilteringException;
/**
* Provides a new reader that applies filtering using defaultFilterWrappers.
*
- * @param from the source reader
+ * @param from the source reader
* @param filtering true to apply filtering
* @param filterWrappers {@link java.util.List} of FileUtils.FilterWrapper
* @return an input stream that applies the filter
*/
- @Nonnull Reader filter( @Nonnull Reader from, boolean filtering, @Nonnull List<FileUtils.FilterWrapper> filterWrappers );
+ @Nonnull
+ Reader filter( @Nonnull Reader from, boolean filtering, @Nonnull List<FileUtils.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 9c64a80..68a6eb2 100644
--- a/src/main/java/org/apache/maven/shared/filtering/MavenReaderFilterRequest.java
+++ b/src/main/java/org/apache/maven/shared/filtering/MavenReaderFilterRequest.java
@@ -19,8 +19,6 @@
* under the License.
*/
-import java.io.File;
-import java.io.InputStream;
import java.io.Reader;
import java.util.List;
import java.util.Properties;
@@ -46,8 +44,14 @@
// nothing
}
- public MavenReaderFilterRequest( Reader from, boolean filtering, MavenProject mavenProject, List<String> filters,
- boolean escapedBackslashesInFilePath, String encoding, MavenSession mavenSession,
+ public MavenReaderFilterRequest(
+ Reader from,
+ boolean filtering,
+ MavenProject mavenProject,
+ List<String> filters,
+ boolean escapedBackslashesInFilePath,
+ String encoding,
+ MavenSession mavenSession,
Properties additionalProperties )
{
super( mavenProject, filters, encoding, mavenSession );
@@ -57,7 +61,6 @@
setEscapeWindowsPaths( escapedBackslashesInFilePath );
}
-
public Reader getFrom()
{
return from;
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 927a339..61e9082 100644
--- a/src/main/java/org/apache/maven/shared/filtering/MavenResourcesExecution.java
+++ b/src/main/java/org/apache/maven/shared/filtering/MavenResourcesExecution.java
@@ -19,26 +19,25 @@
* under the License.
*/
-import org.apache.maven.execution.MavenSession;
-import org.apache.maven.model.Resource;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.interpolation.Interpolator;
-import org.codehaus.plexus.interpolation.RegexBasedInterpolator;
-import org.codehaus.plexus.interpolation.StringSearchInterpolator;
-import org.codehaus.plexus.interpolation.ValueSource;
-import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.utils.io.FileUtils.FilterWrapper;
-
import java.io.File;
import java.io.Reader;
import java.util.ArrayList;
import java.util.List;
+import org.apache.maven.execution.MavenSession;
+import org.apache.maven.model.Resource;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.shared.utils.io.FileUtils;
+import org.apache.maven.shared.utils.io.FileUtils.FilterWrapper;
+import org.codehaus.plexus.interpolation.Interpolator;
+import org.codehaus.plexus.interpolation.RegexBasedInterpolator;
+import org.codehaus.plexus.interpolation.StringSearchInterpolator;
+import org.codehaus.plexus.interpolation.ValueSource;
+
/**
* A bean to configure a resources filtering execution.
*
* @author Olivier Lamy
- *
*/
public class MavenResourcesExecution
extends AbstractMavenFilteringRequest
@@ -59,8 +58,7 @@
private boolean filterFilenames = false;
/**
- * Overwrite existing files even if the destination files are newer.
- * <code>false</code> by default.
+ * Overwrite existing files even if the destination files are newer. <code>false</code> by default.
*
* @since 1.0-beta-2
*/
@@ -96,8 +94,13 @@
* @param nonFilteredFileExtensions
* @param mavenSession
*/
- public MavenResourcesExecution( List<Resource> resources, File outputDirectory, MavenProject mavenProject,
- String encoding, List<String> fileFilters, List<String> nonFilteredFileExtensions,
+ public MavenResourcesExecution(
+ List<Resource> resources,
+ File outputDirectory,
+ MavenProject mavenProject,
+ String encoding,
+ List<String> fileFilters,
+ List<String> nonFilteredFileExtensions,
MavenSession mavenSession )
{
super( mavenProject, fileFilters, encoding, mavenSession );
@@ -108,8 +111,12 @@
this.resourcesBaseDirectory = mavenProject.getBasedir();
}
- public MavenResourcesExecution( List<Resource> resources, File outputDirectory, String encoding,
- List<FileUtils.FilterWrapper> filterWrappers, File resourcesBaseDirectory,
+ public MavenResourcesExecution(
+ List<Resource> resources,
+ File outputDirectory,
+ String encoding,
+ List<FileUtils.FilterWrapper> filterWrappers,
+ File resourcesBaseDirectory,
List<String> nonFilteredFileExtensions )
{
this();
@@ -122,7 +129,6 @@
setEncoding( encoding );
}
-
/**
* @return List of {@link org.apache.maven.model.Resource}
*/
@@ -195,7 +201,8 @@
* and InterpolatorFilterReaderLineEnding with defaultTokens ${ }.
*
* @param valueSource
- * @deprecated This doesn't support escaping use {@link #addFilerWrapperWithEscaping(ValueSource, String, String, String, boolean)}
+ * @deprecated This doesn't support escaping use
+ * {@link #addFilerWrapperWithEscaping(ValueSource, String, String, String, boolean)}
*/
public void addFilerWrapper( final ValueSource valueSource )
{
@@ -219,7 +226,8 @@
* @param endRegExp
* @param startToken
* @param endToken
- * @deprecated This doesn't support escaping use {@link #addFilerWrapperWithEscaping(ValueSource, String, String, String, boolean)}
+ * @deprecated This doesn't support escaping use
+ * {@link #addFilerWrapperWithEscaping(ValueSource, String, String, String, boolean)}
*/
public void addFilerWrapper( final ValueSource valueSource, final String startRegExp, final String endRegExp,
final String startToken, final String endToken )
@@ -238,11 +246,12 @@
/**
* @param valueSource
- * @param startExp start token like ${
- * @param endExp endToken }
+ * @param startExp start token like ${
+ * @param endExp endToken }
* @param escapeString
* @since 1.0-beta-2
- * @deprecated This doesn't support escaping use {@link #addFilerWrapperWithEscaping(ValueSource, String, String, String, boolean)}
+ * @deprecated This doesn't support escaping use
+ * {@link #addFilerWrapperWithEscaping(ValueSource, String, String, String, boolean)}
*/
public void addFilerWrapperWithEscaping( final ValueSource valueSource, final String startExp, final String endExp,
final String escapeString )
@@ -264,10 +273,11 @@
/**
* @param valueSource
- * @param startExp start token like ${
- * @param endExp endToken }
+ * @param startExp start token like ${
+ * @param endExp endToken }
* @param escapeString
- * @param supportMultiLineFiltering do we support or use filtering on multi lines with start and endtoken on multi lines
+ * @param supportMultiLineFiltering 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,
@@ -289,7 +299,6 @@
} );
}
-
public File getResourcesBaseDirectory()
{
return resourcesBaseDirectory;
@@ -353,7 +362,6 @@
}
/**
- *
* @return {@code true} if filenames are filtered, otherwise {@code false}
* @since 1.2
*/
@@ -363,7 +371,6 @@
}
/**
- *
* @param filterFilenames {@code true} if filenames should be filtered, otherwise {@code false}
* @since 1.2
*/
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 bfe2c08..b0e9a44 100644
--- a/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java
+++ b/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java
@@ -19,29 +19,28 @@
* under the License.
*/
+import java.io.File;
+import java.util.List;
+
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Resource;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.utils.io.FileUtils;
-import java.io.File;
-import java.util.List;
-
/**
* @author Olivier Lamy
- *
*/
public interface MavenResourcesFiltering
{
/**
- * @param resources {@link List} of {@link org.apache.maven.model.Resource}
- * @param outputDirectory parent destination directory
- * @param mavenProject the maven project
- * @param encoding encoding to use for writing files
- * @param fileFilters {@link List} of String which are path to a Property file
+ * @param resources {@link List} of {@link org.apache.maven.model.Resource}
+ * @param outputDirectory parent destination directory
+ * @param mavenProject the maven project
+ * @param encoding encoding to use for writing files
+ * @param fileFilters {@link List} of String which are path to a Property file
* @param nonFilteredFileExtensions {@link List} of String for non filtered file extensions
- * @param mavenSession Can include executionProperties that will be used for filtering
+ * @param mavenSession Can include executionProperties that will be used for filtering
* @throws MavenFilteringException
* @deprecated use {@link #filterResources(MavenResourcesExecution)}
*/
@@ -50,11 +49,11 @@
throws MavenFilteringException;
/**
- * @param resources {@link List} of {@link org.apache.maven.model.Resource}
- * @param outputDirectory parent destination directory
- * @param encoding encoding to use for writing files
- * @param filterWrappers {@link List} of FileUtils.FilterWrapper
- * @param resourcesBaseDirectory baseDirectory of resources
+ * @param resources {@link List} of {@link org.apache.maven.model.Resource}
+ * @param outputDirectory parent destination directory
+ * @param encoding encoding to use for writing files
+ * @param filterWrappers {@link List} of FileUtils.FilterWrapper
+ * @param resourcesBaseDirectory baseDirectory of resources
* @param nonFilteredFileExtensions {@link List} of String for non filtered file extensions
* @throws MavenFilteringException
* @deprecated use {@link #filterResources(MavenResourcesExecution)}
@@ -72,7 +71,7 @@
List<String> getDefaultNonFilteredFileExtensions();
/**
- * @param fileName the file name
+ * @param fileName the file name
* @param userNonFilteredFileExtensions an extra list of file extensions
* @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)
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 d27a17a..9c0eca8 100644
--- a/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java
+++ b/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java
@@ -38,7 +38,6 @@
*
* @author cstamas
* @author Olivier Lamy
- *
* @since 1.0
*/
public class MultiDelimiterInterpolatorFilterReaderLineEnding
@@ -106,23 +105,27 @@
/**
* This constructor uses default begin token ${ and default end token }.
*
- * @param in reader to use
- * @param interpolator interpolator instance to use
+ * @param in reader to use
+ * @param interpolator interpolator instance to use
* @param supportMultiLineFiltering If multi line filtering is allowed
*/
- public MultiDelimiterInterpolatorFilterReaderLineEnding( Reader in, Interpolator interpolator,
+ public MultiDelimiterInterpolatorFilterReaderLineEnding(
+ Reader in,
+ Interpolator interpolator,
boolean supportMultiLineFiltering )
{
this( in, interpolator, new SimpleRecursionInterceptor(), supportMultiLineFiltering );
}
/**
- * @param in reader to use
- * @param interpolator interpolator instance to use
- * @param ri The {@link RecursionInterceptor} to use to prevent recursive expressions.
+ * @param in reader to use
+ * @param interpolator interpolator instance to use
+ * @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,
+ public MultiDelimiterInterpolatorFilterReaderLineEnding(
+ Reader in,
+ Interpolator interpolator,
RecursionInterceptor ri,
boolean supportMultiLineFiltering )
{
@@ -168,7 +171,7 @@
* @param n The number of characters to skip
* @return the number of characters actually skipped
* @throws IllegalArgumentException If <code>n</code> is negative.
- * @throws IOException If an I/O error occurs
+ * @throws IOException If an I/O error occurs
*/
public long skip( long n )
throws IOException
@@ -193,8 +196,8 @@
* occurs, or the end of the stream is reached.
*
* @param cbuf Destination buffer to write characters to. Must not be <code>null</code>.
- * @param off Offset at which to start storing characters.
- * @param len Maximum number of characters to read.
+ * @param off Offset at which to start storing characters.
+ * @param len Maximum number of characters to read.
* @return the number of characters read, or -1 if the end of the stream has been reached
* @throws IOException If an I/O error occurs
*/
@@ -238,7 +241,7 @@
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 ) )
@@ -345,7 +348,7 @@
// we're committed, find the end token, EOL or EOF
- key.append(beginToken);
+ key.append( beginToken );
in.reset();
in.skip( beginToken.length() );
ch = in.read();
@@ -479,8 +482,7 @@
return recursionInterceptor;
}
- public MultiDelimiterInterpolatorFilterReaderLineEnding setRecursionInterceptor(
- RecursionInterceptor recursionInterceptor )
+ public MultiDelimiterInterpolatorFilterReaderLineEnding setRecursionInterceptor( RecursionInterceptor recursionInterceptor )
{
this.recursionInterceptor = recursionInterceptor;
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 a8f20b8..81741e7 100644
--- a/src/main/java/org/apache/maven/shared/filtering/PropertyUtils.java
+++ b/src/main/java/org/apache/maven/shared/filtering/PropertyUtils.java
@@ -19,9 +19,6 @@
* under the License.
*/
-import org.apache.maven.shared.utils.io.IOUtil;
-import org.apache.maven.shared.utils.StringUtils;
-
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
@@ -29,11 +26,12 @@
import java.util.Iterator;
import java.util.Properties;
+import org.apache.maven.shared.utils.StringUtils;
+import org.apache.maven.shared.utils.io.IOUtil;
/**
* @author <a href="mailto:kenney@neonics.com">Kenney Westerhof</a>
* @author William Ferguson
- *
*/
public final class PropertyUtils
{
@@ -48,8 +46,8 @@
/**
* Reads a property file, resolving all internal variables, using the supplied base properties.
* <p>
- * The properties are resolved iteratively, so if the value of property A refers to property B,
- * then after resolution the value of property B will contain the value of property B.
+ * The properties are resolved iteratively, so if the value of property A refers to property B, then after
+ * resolution the value of property B will contain the value of property B.
* </p>
*
* @param propFile The property file to load.
@@ -83,13 +81,13 @@
// 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
// I suspect that this was the actual original intent.
- //
+ //
// The difference is that #loadPropertyFile(File, boolean, boolean) also resolves System properties
// whose values contain expressions. I believe this is unexpected and is not validated by the test cases,
// 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 ( Iterator iter = fileProps.keySet().iterator(); iter.hasNext(); )
+ for ( Iterator<Object> iter = fileProps.keySet().iterator(); iter.hasNext(); )
{
final String k = (String) iter.next();
final String propValue = getPropertyValue( k, combinedProps );
@@ -111,7 +109,7 @@
public static Properties loadPropertyFile( File propfile, boolean fail, boolean useSystemProps )
throws IOException
{
-
+
final Properties baseProps = new Properties();
if ( useSystemProps )
@@ -140,16 +138,10 @@
return resolvedProps;
}
-
/**
- * Retrieves a property value, replacing values like ${token}
- * using the Properties to look them up.
- *
- * It will leave unresolved properties alone, trying for System
- * properties, and implements reparsing (in the case that
- * the value of a property contains a key), and will
- * not loop endlessly on a pair like
- * test = ${test}.
+ * Retrieves a property value, replacing values like ${token} using the Properties to look them up. It will leave
+ * unresolved properties alone, trying for System properties, and implements reparsing (in the case that the value
+ * of a property contains a key), and will not loop endlessly on a pair like test = ${test}.
*
* @param k
* @param p
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 c0f8442..d80f442 100644
--- a/src/test/java/org/apache/maven/shared/filtering/AbstractInterpolatorFilterReaderLineEndingTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/AbstractInterpolatorFilterReaderLineEndingTest.java
@@ -26,8 +26,6 @@
import java.io.Reader;
import java.io.StringReader;
-import java.util.Arrays;
-import java.util.HashSet;
import org.codehaus.plexus.interpolation.Interpolator;
import org.codehaus.plexus.interpolation.RecursionInterceptor;
@@ -40,7 +38,7 @@
public abstract class AbstractInterpolatorFilterReaderLineEndingTest
{
- @Mock
+ @Mock
private Interpolator interpolator;
@Before
@@ -48,9 +46,10 @@
{
MockitoAnnotations.initMocks( this );
}
-
+
@Test
- public void testDefaults() throws Exception
+ public void testDefaults()
+ throws Exception
{
when( interpolator.interpolate( eq( "${a}" ), eq( "" ), isA( RecursionInterceptor.class ) ) ).thenReturn( "DONE_A" );
@@ -82,7 +81,6 @@
reader = getDollarBracesReader( in, interpolator, "\\" );
assertEquals( "unknown expression ${unknown}", IOUtil.toString( reader ) );
}
-
// MSHARED-198: custom delimiters doesn't work as expected
@Test
@@ -91,12 +89,12 @@
{
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 );
-
+
assertEquals( "DONE", IOUtil.toString( reader ) );
-
+
in = new StringReader( "abcFILTER.a.MEabc" );
reader = getAbc_AbcReader( in, interpolator );
assertEquals( "DONE", IOUtil.toString( reader ) );
@@ -104,20 +102,21 @@
// MSHARED-235: reader exceeds readAheadLimit
@Test
- public void testMarkInvalid() throws Exception
+ public void testMarkInvalid()
+ throws Exception
{
Reader in = new StringReader( "@\").replace(p,\"]\").replace(q,\"" );
Reader reader = getAtReader( in, interpolator, "\\" );
- assertEquals( "@\").replace(p,\"]\").replace(q,\"", IOUtil.toString( reader ) );
+ assertEquals( "@\").replace(p,\"]\").replace(q,\"", IOUtil.toString( reader ) );
}
protected abstract Reader getAbc_AbcReader( Reader in, Interpolator interpolator );
-
+
protected abstract Reader getAaa_AaaReader( Reader in, Interpolator interpolator );
-
+
protected abstract Reader getDollarBracesReader( Reader in, Interpolator interpolator, String escapeString );
-
+
protected abstract Reader getAtReader( Reader in, Interpolator interpolator, String escapeString );
}
\ 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 728c981..f657abe 100644
--- a/src/test/java/org/apache/maven/shared/filtering/BoundedReaderTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/BoundedReaderTest.java
@@ -27,66 +27,78 @@
import org.junit.Test;
-public class BoundedReaderTest {
+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
+ {
+ BoundedReader mr = new BoundedReader( sr, 3 );
+ mr.mark( 3 );
+ mr.read();
+ mr.read();
+ mr.read();
+ assertEquals( -1, mr.read() );
+ }
- @Test
- public void readTillEnd() throws IOException {
- BoundedReader mr = new BoundedReader(sr, 3);
- mr.mark(3);
- mr.read();
- mr.read();
- mr.read();
- assertEquals(-1, mr.read());
- }
+ @Test
+ public void readMulti()
+ throws IOException
+ {
+ BoundedReader mr = new BoundedReader( sr, 3 );
+ char[] cbuf = new char[4];
+ for ( int i = 0; i < cbuf.length; i++ )
+ cbuf[i] = 'X';
+ 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] );
+ }
- @Test
- public void readMulti() throws IOException {
- BoundedReader mr = new BoundedReader(sr, 3);
- char[] cbuf = new char[4];
- for (int i= 0; i < cbuf.length; i++) cbuf[i] = 'X';
- 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]);
- }
+ @Test
+ public void readMultiWithOffset()
+ throws IOException
+ {
+ BoundedReader mr = new BoundedReader( sr, 3 );
+ char[] cbuf = new char[4];
+ for ( int i = 0; i < cbuf.length; i++ )
+ cbuf[i] = 'X';
+ 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] );
+ }
- @Test
- public void readMultiWithOffset() throws IOException {
- BoundedReader mr = new BoundedReader(sr, 3);
- char[] cbuf = new char[4];
- for (int i= 0; i < cbuf.length; i++) cbuf[i] = 'X';
- 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]);
- }
+ @Test
+ public void resetWorks()
+ throws IOException
+ {
+ BoundedReader mr = new BoundedReader( sr, 3 );
+ mr.read();
+ mr.read();
+ mr.read();
+ mr.reset();
+ mr.read();
+ mr.read();
+ mr.read();
+ assertEquals( -1, mr.read() );
- @Test
- public void resetWorks() throws IOException {
- BoundedReader mr = new BoundedReader(sr,3 );
- mr.read();
- mr.read();
- mr.read();
- mr.reset();
- mr.read();
- mr.read();
- mr.read();
- assertEquals(-1, mr.read());
+ }
- }
-
- @Test
- public void skipTest() throws IOException {
- BoundedReader mr = new BoundedReader(sr, 3);
- mr.skip(2);
- mr.read();
- assertEquals(-1, mr.read());
- }
+ @Test
+ public void skipTest()
+ throws IOException
+ {
+ BoundedReader mr = new BoundedReader( sr, 3 );
+ mr.skip( 2 );
+ 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 95177d1..7a3fbdb 100644
--- a/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/DefaultMavenFileFilterTest.java
@@ -42,8 +42,6 @@
public class DefaultMavenFileFilterTest
extends PlexusTestCase
{
-
-
File to = new File( getBasedir(), "target/reflection-test.properties" );
@@ -132,7 +130,6 @@
assertTrue( filterProperties.getProperty( "third_filter_key" ).equals( "first and second" ) );
}
-
// MSHARED-161: DefaultMavenFileFilter.getDefaultFilterWrappers loads
// filters from the current directory instead of using basedir
@@ -150,9 +147,9 @@
req.setInjectProjectBuildFilters( true );
List<FilterWrapper> wrappers = mavenFileFilter.getDefaultFilterWrappers( req );
-
- Reader reader = wrappers.get(0).getReader( new StringReader( "${filefilter} ${buildfilter}" ) );
-
+
+ Reader reader = wrappers.get( 0 ).getReader( new StringReader( "${filefilter} ${buildfilter}" ) );
+
assertEquals( "true true", IOUtil.toString( reader ) );
}
@@ -176,9 +173,10 @@
reader = wrappers.get( 0 ).getReader( new StringReader( "abcFILTER.a.MEabc" ) );
assertEquals( "DONE", IOUtil.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
+ public void testLineWithSingleAtAndExpression()
+ throws Exception
{
MavenFileFilter mavenFileFilter = (MavenFileFilter) lookup( MavenFileFilter.class.getName(), "default" );
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 1b7ae61..b6a9b2d 100644
--- a/src/test/java/org/apache/maven/shared/filtering/DefaultMavenReaderFilterTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/DefaultMavenReaderFilterTest.java
@@ -19,23 +19,23 @@
* under the License.
*/
-import org.apache.maven.shared.utils.io.IOUtil;
-import org.codehaus.plexus.PlexusTestCase;
-
import java.io.Reader;
import java.io.StringReader;
import java.util.Properties;
+import org.apache.maven.shared.utils.io.IOUtil;
+import org.codehaus.plexus.PlexusTestCase;
+
/**
* @author Kristian Rosenvold
- *
*/
public class DefaultMavenReaderFilterTest
extends PlexusTestCase
{
- public void testJustDoSomeFiltering() throws Exception
+ public void testJustDoSomeFiltering()
+ throws Exception
{
- assertNotNull(DefaultMavenReaderFilter.class);
+ assertNotNull( DefaultMavenReaderFilter.class );
MavenReaderFilter readerFilter = (MavenReaderFilter) lookup( MavenReaderFilter.class.getName(), "default" );
StringReader src = new StringReader( "toto@titi.com ${foo}" );
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 e47f495..9706ddc 100644
--- a/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
@@ -19,15 +19,6 @@
* under the License.
*/
-import org.apache.maven.execution.MavenSession;
-import org.apache.maven.model.Resource;
-import org.apache.maven.settings.Settings;
-import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.interpolation.PrefixedObjectValueSource;
-import org.codehaus.plexus.interpolation.ValueSource;
-import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.utils.io.IOUtil;
-
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@@ -37,6 +28,15 @@
import java.util.List;
import java.util.Properties;
+import org.apache.maven.execution.MavenSession;
+import org.apache.maven.model.Resource;
+import org.apache.maven.settings.Settings;
+import org.apache.maven.shared.utils.io.FileUtils;
+import org.apache.maven.shared.utils.io.IOUtil;
+import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.interpolation.PrefixedObjectValueSource;
+import org.codehaus.plexus.interpolation.ValueSource;
+
/**
* @author Olivier Lamy
* @version $Id$
@@ -85,8 +85,8 @@
resource.setFiltering( true );
List<String> filtersFile = new ArrayList<String>();
- 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" );
@@ -116,13 +116,13 @@
List<String> filtersFile = new ArrayList<String>();
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 );
mavenResourcesFiltering.filterResources( resources, outputDirectory, mavenProject, "UTF-8", filtersFile,
- Collections.<String>emptyList(), session );
+ Collections.<String> emptyList(), session );
Properties result = new Properties();
FileInputStream in = null;
@@ -167,8 +167,8 @@
resource.setFiltering( true );
List<String> filtersFile = new ArrayList<String>();
- 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" );
MavenResourcesExecution mavenResourcesExecution =
@@ -205,8 +205,8 @@
resource.setFiltering( true );
List<String> filtersFile = new ArrayList<String>();
- 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" );
Properties additionalProperties = new Properties();
@@ -221,8 +221,7 @@
assertFiltering( baseDir, initialImageFile, true, true );
}
- private void assertFiltering( File baseDir, File initialImageFile, boolean escapeTest,
- boolean additionnalProperties )
+ private void assertFiltering( File baseDir, File initialImageFile, boolean escapeTest, boolean additionnalProperties )
throws Exception
{
assertEquals( 7, outputDirectory.listFiles().length );
@@ -319,8 +318,8 @@
resource.setFiltering( true );
List<String> filtersFile = new ArrayList<String>();
- 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" );
@@ -361,7 +360,7 @@
resource.setDirectory( unitFilesDir );
resource.setFiltering( false );
mavenResourcesFiltering.filterResources( resources, outputDirectory, mavenProject, "UTF-8", null,
- Collections.<String>emptyList(), new StubMavenSession() );
+ Collections.<String> emptyList(), new StubMavenSession() );
assertEquals( 7, outputDirectory.listFiles().length );
Properties result =
@@ -439,12 +438,12 @@
resource.addInclude( "includ*" );
List<String> filtersFile = new ArrayList<String>();
- 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() );
+ Collections.<String> emptyList(), new StubMavenSession() );
mavenResourcesFiltering.filterResources( mavenResourcesExecution );
File[] files = outputDirectory.listFiles();
@@ -476,12 +475,12 @@
resource.addInclude( "**/includ*" );
List<String> filtersFile = new ArrayList<String>();
- 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() );
+ Collections.<String> emptyList(), new StubMavenSession() );
mavenResourcesFiltering.filterResources( mavenResourcesExecution );
File[] files = outputDirectory.listFiles();
@@ -517,12 +516,12 @@
resource.addExclude( "**/excludedir/**" );
List<String> filtersFile = new ArrayList<String>();
- 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() );
+ Collections.<String> emptyList(), new StubMavenSession() );
mavenResourcesFiltering.filterResources( mavenResourcesExecution );
File[] files = outputDirectory.listFiles();
@@ -574,12 +573,12 @@
FileUtils.cleanDirectory( targetPathFile );
}
List<String> filtersFile = new ArrayList<String>();
- 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() );
+ Collections.<String> emptyList(), new StubMavenSession() );
mavenResourcesFiltering.filterResources( mavenResourcesExecution );
File[] files = targetPathFile.listFiles();
@@ -609,12 +608,12 @@
resource.addInclude( "includ*" );
resource.setTargetPath( "testTargetPath" );
List<String> filtersFile = new ArrayList<String>();
- 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() );
+ Collections.<String> emptyList(), new StubMavenSession() );
mavenResourcesFiltering.filterResources( mavenResourcesExecution );
File targetPathFile = new File( outputDirectory, "testTargetPath" );
@@ -646,7 +645,7 @@
} );
MavenResourcesExecution mavenResourcesExecution =
new MavenResourcesExecution( resources, outputDirectory, mavenProject, "UTF-8", Collections.EMPTY_LIST,
- Collections.<String>emptyList(), new StubMavenSession() );
+ Collections.<String> emptyList(), new StubMavenSession() );
mavenResourcesExecution.setIncludeEmptyDirs( true );
mavenResourcesFiltering.filterResources( mavenResourcesExecution );
@@ -718,7 +717,7 @@
File output = new File( outputDirectory, "MSHARED-81" );
MavenResourcesExecution mavenResourcesExecution =
new MavenResourcesExecution( resources, output, mavenProject, "UTF-8", Collections.EMPTY_LIST,
- Collections.<String>emptyList(), new StubMavenSession() );
+ Collections.<String> emptyList(), new StubMavenSession() );
mavenResourcesExecution.setIncludeEmptyDirs( true );
mavenResourcesExecution.setEscapeString( "\\" );
@@ -726,8 +725,9 @@
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 );
System.out.println( "\nExpected:\n" );
expectedFilteredResult.list( System.out );
@@ -739,8 +739,9 @@
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 ) );
}
@@ -782,7 +783,7 @@
File output = new File( outputDirectory, "edge-cases" );
MavenResourcesExecution mavenResourcesExecution =
new MavenResourcesExecution( resources, output, mavenProject, "UTF-8", Collections.EMPTY_LIST,
- Collections.<String>emptyList(), new StubMavenSession() );
+ Collections.<String> emptyList(), new StubMavenSession() );
mavenResourcesExecution.setIncludeEmptyDirs( true );
mavenResourcesExecution.setEscapeString( "\\" );
@@ -790,8 +791,9 @@
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 );
System.out.println( "\nExpected:\n" );
expectedFilteredResult.list( System.out );
@@ -803,12 +805,13 @@
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 ) );
}
-
+
// MSHARED-220: Apply filtering to filenames
public void testFilterFileName()
throws Exception
@@ -832,8 +835,9 @@
resource.setTargetPath( "testTargetPath" );
MavenResourcesExecution mavenResourcesExecution =
- new MavenResourcesExecution( Collections.singletonList( resource ), outputDirectory, mavenProject, "UTF-8", Collections.<String>emptyList(),
- Collections.<String>emptyList(), new StubMavenSession() );
+ new MavenResourcesExecution( Collections.singletonList( resource ), outputDirectory, mavenProject, "UTF-8",
+ Collections.<String> emptyList(), Collections.<String> emptyList(),
+ new StubMavenSession() );
mavenResourcesExecution.setFilterFilenames( true );
mavenResourcesFiltering.filterResources( mavenResourcesExecution );
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 5c3df2b..033ad87 100644
--- a/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/EscapeStringTest.java
@@ -27,18 +27,17 @@
import java.util.Properties;
import org.apache.maven.model.Resource;
-import org.codehaus.plexus.PlexusTestCase;
import org.apache.maven.shared.utils.io.FileUtils;
import org.apache.maven.shared.utils.io.IOUtil;
+import org.codehaus.plexus.PlexusTestCase;
/**
* @author Olivier Lamy
- *
*/
public class EscapeStringTest
extends PlexusTestCase
{
-
+
File outputDirectory = new File( getBasedir(), "target/EscapeStringTest" );
File unitDirectory = new File( getBasedir(), "src/test/units-files/escape-remove-char" );
@@ -68,8 +67,8 @@
projectProperties.put( "java.version", "zloug" );
projectProperties.put( "replaceThis", "I am the replacement" );
mavenProject.setProperties( projectProperties );
- MavenResourcesFiltering mavenResourcesFiltering = (MavenResourcesFiltering) lookup( MavenResourcesFiltering.class
- .getName() );
+ MavenResourcesFiltering mavenResourcesFiltering =
+ (MavenResourcesFiltering) lookup( MavenResourcesFiltering.class.getName() );
Resource resource = new Resource();
List<Resource> resources = new ArrayList<Resource>();
@@ -81,11 +80,9 @@
List<String> nonFilteredFileExtensions = Collections.singletonList( "gif" );
- MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution( resources, outputDirectory,
- mavenProject, "UTF-8",
- filtersFile,
- nonFilteredFileExtensions,
- new StubMavenSession() );
+ MavenResourcesExecution mavenResourcesExecution =
+ new MavenResourcesExecution( resources, outputDirectory, mavenProject, "UTF-8", filtersFile,
+ nonFilteredFileExtensions, new StubMavenSession() );
mavenResourcesExecution.setUseDefaultFilterWrappers( true );
mavenResourcesExecution.setEscapeString( "!" );
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 90e389b..478560f 100644
--- a/src/test/java/org/apache/maven/shared/filtering/FilteringUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/FilteringUtilsTest.java
@@ -47,24 +47,25 @@
// This doesn't work, see MSHARED-121
/*
- public void testEscapeWindowsPathStartingWithDrivelessAbsolutePath()
- {
- assertEquals( "\\\\Users\\\\Administrator", FilteringUtils.escapeWindowsPath( "\\Users\\Administrator" ) );
- }
- */
+ * public void testEscapeWindowsPathStartingWithDrivelessAbsolutePath()
+ * {
+ * assertEquals( "\\\\Users\\\\Administrator", FilteringUtils.escapeWindowsPath( "\\Users\\Administrator" ) );
+ * }
+ */
// This doesn't work, see MSHARED-121
/*
- public void testEscapeWindowsPathStartingWithExpression()
- {
- assertEquals( "${pathExpr}\\\\Documents", FilteringUtils.escapeWindowsPath( "${pathExpr}\\Documents" ) );
- }
- */
+ * public void testEscapeWindowsPathStartingWithExpression()
+ * {
+ * assertEquals( "${pathExpr}\\\\Documents", FilteringUtils.escapeWindowsPath( "${pathExpr}\\Documents" ) );
+ * }
+ */
// MSHARED-179
public void testEscapeWindowsPathNotAtBeginning()
throws Exception
{
- assertEquals( "jdbc:derby:C:\\\\Users\\\\Administrator/test;create=true", FilteringUtils.escapeWindowsPath( "jdbc:derby:C:\\Users\\Administrator/test;create=true" ) );
+ 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/InterpolatorFilterReaderLineEndingTest.java b/src/test/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEndingTest.java
index c25b8b1..fb8d953 100644
--- a/src/test/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEndingTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEndingTest.java
@@ -37,19 +37,21 @@
{
return new InterpolatorFilterReaderLineEnding( in, interpolator, "abc", "abc", true );
}
-
+
@Override
protected Reader getDollarBracesReader( Reader in, Interpolator interpolator, String escapeString )
{
- InterpolatorFilterReaderLineEnding reader = new InterpolatorFilterReaderLineEnding( in, interpolator, "${", "}", true );
+ InterpolatorFilterReaderLineEnding reader =
+ new InterpolatorFilterReaderLineEnding( in, interpolator, "${", "}", true );
reader.setEscapeString( escapeString );
return reader;
}
-
+
@Override
protected Reader getAtReader( Reader in, Interpolator interpolator, String escapeString )
{
- InterpolatorFilterReaderLineEnding reader = new InterpolatorFilterReaderLineEnding( in, interpolator, "@", "@", true );
+ InterpolatorFilterReaderLineEnding reader =
+ 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 cd00730..fc91ad5 100644
--- a/src/test/java/org/apache/maven/shared/filtering/InvalidMarkTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/InvalidMarkTest.java
@@ -23,8 +23,8 @@
import java.util.Collections;
import org.apache.maven.model.Resource;
-import org.codehaus.plexus.PlexusTestCase;
import org.apache.maven.shared.utils.io.FileUtils;
+import org.codehaus.plexus.PlexusTestCase;
/**
* @author Mikolaj Izdebski
@@ -48,20 +48,18 @@
public void testEscape()
throws Exception
{
- MavenResourcesFiltering mavenResourcesFiltering = (MavenResourcesFiltering) lookup( MavenResourcesFiltering.class
- .getName() );
+ MavenResourcesFiltering mavenResourcesFiltering =
+ (MavenResourcesFiltering) lookup( MavenResourcesFiltering.class.getName() );
Resource resource = new Resource();
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
{
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 17f01e1..757a29e 100644
--- a/src/test/java/org/apache/maven/shared/filtering/MuliLinesMavenResourcesFilteringTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/MuliLinesMavenResourcesFilteringTest.java
@@ -27,14 +27,12 @@
import java.util.Properties;
import org.apache.maven.model.Resource;
-import org.codehaus.plexus.PlexusTestCase;
import org.apache.maven.shared.utils.io.FileUtils;
import org.apache.maven.shared.utils.io.IOUtil;
+import org.codehaus.plexus.PlexusTestCase;
/**
* @author Olivier Lamy
- *
- *
* @version $Id$
*/
public class MuliLinesMavenResourcesFilteringTest
@@ -55,7 +53,6 @@
}
/**
- *
* @throws Exception
*/
public void testFilteringTokenOnce()
@@ -71,7 +68,8 @@
projectProperties.put( "foo", "bar" );
projectProperties.put( "java.version", "zloug" );
mavenProject.setProperties( projectProperties );
- MavenResourcesFiltering mavenResourcesFiltering = (MavenResourcesFiltering) lookup( MavenResourcesFiltering.class.getName() );
+ MavenResourcesFiltering mavenResourcesFiltering =
+ (MavenResourcesFiltering) lookup( MavenResourcesFiltering.class.getName() );
String unitFilesDir = getBasedir() + "/src/test/units-files/MRESOURCES-104";
@@ -86,14 +84,11 @@
List<String> nonFilteredFileExtensions = Collections.singletonList( "gif" );
- MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution( resources, outputDirectory,
- mavenProject, "UTF-8",
- filtersFile,
- nonFilteredFileExtensions,
- new StubMavenSession() );
+ MavenResourcesExecution mavenResourcesExecution =
+ new MavenResourcesExecution( resources, outputDirectory, mavenProject, "UTF-8", filtersFile,
+ nonFilteredFileExtensions, new StubMavenSession() );
mavenResourcesExecution.setUseDefaultFilterWrappers( true );
-
-
+
mavenResourcesFiltering.filterResources( mavenResourcesExecution );
Properties result = new Properties();
@@ -107,11 +102,11 @@
{
IOUtil.close( in );
}
-
- System.out.println("properties " + result.toString());
- //email=foo@bar.com
- //foo=${project.version}
- //bar=@project.version@
+
+ System.out.println( "properties " + result.toString() );
+ // 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" ) );
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 7246b0c..e256e4b 100644
--- a/src/test/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEndingTest.java
+++ b/src/test/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEndingTest.java
@@ -38,10 +38,11 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-public class MultiDelimiterInterpolatorFilterReaderLineEndingTest extends AbstractInterpolatorFilterReaderLineEndingTest
+public class MultiDelimiterInterpolatorFilterReaderLineEndingTest
+ extends AbstractInterpolatorFilterReaderLineEndingTest
{
- @Mock
+ @Mock
private Interpolator interpolator;
@Before
@@ -49,36 +50,40 @@
{
MockitoAnnotations.initMocks( this );
}
-
+
@Override
protected Reader getAaa_AaaReader( Reader in, Interpolator interpolator )
{
- MultiDelimiterInterpolatorFilterReaderLineEnding reader = new MultiDelimiterInterpolatorFilterReaderLineEnding( in, interpolator, true );
+ MultiDelimiterInterpolatorFilterReaderLineEnding reader =
+ new MultiDelimiterInterpolatorFilterReaderLineEnding( in, interpolator, true );
reader.setDelimiterSpecs( Collections.singleton( "aaa*aaa" ) );
return reader;
}
-
+
@Override
protected Reader getAbc_AbcReader( Reader in, Interpolator interpolator )
{
- MultiDelimiterInterpolatorFilterReaderLineEnding reader = new MultiDelimiterInterpolatorFilterReaderLineEnding( in, interpolator, true );
+ MultiDelimiterInterpolatorFilterReaderLineEnding reader =
+ new MultiDelimiterInterpolatorFilterReaderLineEnding( in, interpolator, true );
reader.setDelimiterSpecs( Collections.singleton( "abc*abc" ) );
return reader;
}
-
+
@Override
protected Reader getDollarBracesReader( Reader in, Interpolator interpolator, String escapeString )
{
- MultiDelimiterInterpolatorFilterReaderLineEnding reader = new MultiDelimiterInterpolatorFilterReaderLineEnding( in, interpolator, true );
+ MultiDelimiterInterpolatorFilterReaderLineEnding reader =
+ new MultiDelimiterInterpolatorFilterReaderLineEnding( in, interpolator, true );
reader.setDelimiterSpecs( Collections.singleton( "${*}" ) );
reader.setEscapeString( escapeString );
return reader;
}
-
+
@Override
protected Reader getAtReader( Reader in, Interpolator interpolator, String escapeString )
{
- MultiDelimiterInterpolatorFilterReaderLineEnding reader = new MultiDelimiterInterpolatorFilterReaderLineEnding( in, interpolator, true );
+ MultiDelimiterInterpolatorFilterReaderLineEnding reader =
+ new MultiDelimiterInterpolatorFilterReaderLineEnding( in, interpolator, true );
reader.setDelimiterSpecs( Collections.singleton( "@" ) );
reader.setEscapeString( escapeString );
return reader;
@@ -95,24 +100,25 @@
MultiDelimiterInterpolatorFilterReaderLineEnding reader =
new MultiDelimiterInterpolatorFilterReaderLineEnding( in, interpolator, true );
reader.setDelimiterSpecs( new HashSet<String>( Arrays.asList( "${*}", "@" ) ) );
-
+
assertEquals( "toto@titi.com bar", IOUtil.toString( reader ) );
}
-
+
// http://stackoverflow.com/questions/21786805/maven-war-plugin-customize-filter-delimitters-in-webresources/
@Test
- public void testAtDollarExpression() throws Exception
+ 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 );
+ new MultiDelimiterInterpolatorFilterReaderLineEnding( in, interpolator, true );
reader.setEscapeString( "\\" );
reader.setDelimiterSpecs( new HashSet<String>( Arrays.asList( "${*}", "@" ) ) );
-
+
assertEquals( " url=\"jdbc:oracle:thin:@DB_SERVER:DB_PORT:DB_NAME\"", IOUtil.toString( reader ) );
}
}
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 d74655f..6673ca4 100644
--- a/src/test/java/org/apache/maven/shared/filtering/StubMavenProject.java
+++ b/src/test/java/org/apache/maven/shared/filtering/StubMavenProject.java
@@ -33,14 +33,14 @@
extends MavenProject
{
private Properties properties;
-
+
private File basedir;
- protected StubMavenProject (File basedir)
+ protected StubMavenProject( File basedir )
{
this.basedir = basedir;
}
-
+
public Properties getProperties()
{
return this.properties;
@@ -51,19 +51,18 @@
this.properties = properties;
}
- public void addProperty(String key, String value)
+ public void addProperty( String key, String value )
{
- if (this.properties == null)
+ if ( this.properties == null )
{
this.properties = new Properties();
}
this.properties.put( key, value );
}
-
+
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 e02c5c7..9019bc6 100644
--- a/src/test/java/org/apache/maven/shared/filtering/StubMavenSession.java
+++ b/src/test/java/org/apache/maven/shared/filtering/StubMavenSession.java
@@ -34,9 +34,9 @@
{
private Properties executionProperties;
-
+
private final Settings settings;
-
+
public StubMavenSession( Settings settings )
{
this( null, settings );
@@ -51,11 +51,11 @@
{
this( executionProperties, null );
}
-
+
public StubMavenSession( Properties executionProperties, Settings settings )
{
super( null, null, null, null, null, null, null, null, null );
-
+
this.settings = settings;
this.executionProperties = new Properties();
if ( executionProperties != null )
@@ -64,7 +64,7 @@
}
this.executionProperties.putAll( System.getProperties() );
}
-
+
public Settings getSettings()
{
return settings;
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 65fbf05..0eea937 100644
--- a/src/test/java/org/apache/maven/shared/filtering/TestReflectionProperties.java
+++ b/src/test/java/org/apache/maven/shared/filtering/TestReflectionProperties.java
@@ -51,11 +51,11 @@
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( executionProperties ) );
@@ -93,11 +93,11 @@
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( executionProperties ) );
@@ -117,6 +117,6 @@
}
}
- }
-
+ }
+
}
