Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

small refactoring in StringSearchModelInterpolator (removed unused variables, removed too open modifier 'protected')

This commit is contained in:
tibordigana 2019-08-11 11:32:11 +02:00
parent 203cfc67cc
commit b893c3eca4
1 changed files with 7 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java
View File

@ -57,7 +57,6 @@ import javax.inject.Singleton;
public class StringSearchModelInterpolator
extends AbstractStringBasedModelInterpolator
{
private static final Map<Class<?>, InterpolateObjectAction.CacheItem> CACHED_ENTRIES =
new ConcurrentHashMap<>( 80, 0.75f, 2 );
// Empirical data from 3.x, actual =40
@ -72,23 +71,19 @@ public class StringSearchModelInterpolator
ModelProblemCollector problems )
{
interpolateObject( model, model, projectDir, config, problems );
return model;
}
protected void interpolateObject( Object obj, Model model, File projectDir, ModelBuildingRequest config,
final ModelProblemCollector problems )
void interpolateObject( Object obj, Model model, File projectDir, ModelBuildingRequest config,
ModelProblemCollector problems )
{
List<? extends ValueSource> valueSources = createValueSources( model, projectDir, config, problems );
List<? extends InterpolationPostProcessor> postProcessors =
createPostProcessors( model, projectDir, config );
List<? extends InterpolationPostProcessor> postProcessors = createPostProcessors( model, projectDir, config );
InnerInterpolator innerInterpolator = createInterpolator( valueSources, postProcessors, problems );
PrivilegedAction<Object> action;
action = new InterpolateObjectAction( obj, valueSources, postProcessors, innerInterpolator, problems );
PrivilegedAction<Object> action = new InterpolateObjectAction( obj, innerInterpolator, problems );
AccessController.doPrivileged( action );
}
private InnerInterpolator createInterpolator( List<? extends ValueSource> valueSources,
@ -138,24 +133,14 @@ public class StringSearchModelInterpolator
private static final class InterpolateObjectAction
implements PrivilegedAction<Object>
{
private final LinkedList<Object> interpolationTargets;
private final InnerInterpolator interpolator;
private final List<? extends ValueSource> valueSources;
private final List<? extends InterpolationPostProcessor> postProcessors;
private final ModelProblemCollector problems;
InterpolateObjectAction( Object target, List<? extends ValueSource> valueSources,
List<? extends InterpolationPostProcessor> postProcessors,
InnerInterpolator interpolator, ModelProblemCollector problems )
InterpolateObjectAction( Object target, InnerInterpolator interpolator, ModelProblemCollector problems )
{
this.valueSources = valueSources;
this.postProcessors = postProcessors;
this.interpolationTargets = new LinkedList<>();
interpolationTargets.add( target );
@ -173,11 +158,9 @@ public class StringSearchModelInterpolator
traverseObjectWithParents( obj.getClass(), obj );
}
return null;
}
private String interpolate( String value )
{
return interpolator.interpolate( value );
@ -203,7 +186,6 @@ public class StringSearchModelInterpolator
}
}
private CacheItem getCacheEntry( Class<?> cls )
{
CacheItem cacheItem = CACHED_ENTRIES.get( cls );
@ -319,7 +301,6 @@ public class StringSearchModelInterpolator
}
}
this.fields = fields.toArray( new CacheField[0] );
}
public void interpolate( Object target, InterpolateObjectAction interpolateObjectAction )
@ -330,7 +311,7 @@ public class StringSearchModelInterpolator
}
}
public boolean isArray()
boolean isArray()
{
return isArray;
}
@ -338,7 +319,7 @@ public class StringSearchModelInterpolator
abstract static class CacheField
{
protected final Field field;
final Field field;
CacheField( Field field )
{
@ -543,7 +524,5 @@ public class StringSearchModelInterpolator
}
}
}
}
}