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

[MNG-7290] Java8 improvements 

Closes #571
This commit is contained in:
Arturo Bernal 2021-10-08 18:08:43 +02:00 committed by Sylwester Lachiewicz
parent d61fcf7da1
commit 16afe061c9
7 changed files with 29 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
View File

@ -164,12 +164,7 @@ private void traverseObjectWithParents( Class<?> cls, Object target )
} }
else if ( isQualifiedForInterpolation( cls ) ) else if ( isQualifiedForInterpolation( cls ) )
{ {
Field[] fields = FIELDS_BY_CLASS.get( cls ); Field[] fields = FIELDS_BY_CLASS.computeIfAbsent( cls, k -> cls.getDeclaredFields() );
if ( fields == null )
{
fields = cls.getDeclaredFields();
FIELDS_BY_CLASS.put( cls, fields );
}
for ( Field field : fields ) for ( Field field : fields )
{ {

2
maven-core/src/main/java/org/apache/maven/execution/ProfileActivation.java
View File

@ -133,7 +133,7 @@ private Set<String> getProfileIds( final Predicate<ActivationSettings> predicate
{ {
return this.activations.entrySet().stream() return this.activations.entrySet().stream()
.filter( e -> predicate.test( e.getValue() ) ) .filter( e -> predicate.test( e.getValue() ) )
.map( e -> e.getKey() ) .map( Map.Entry::getKey )
.collect( toSet() ); .collect( toSet() );
} }

2
maven-core/src/main/java/org/apache/maven/graph/DefaultProjectDependencyGraph.java
View File

@ -154,7 +154,7 @@ private void getUpstreamProjects( String projectId, Collection<String> projectId
private List<MavenProject> getSortedProjects( Set<String> projectIds ) private List<MavenProject> getSortedProjects( Set<String> projectIds )
{ {
return projectIds.stream() return projectIds.stream()
.map( id -> projects.get( id ) ) .map( projects::get )
.sorted( Comparator.comparingInt( order::get ) ) .sorted( Comparator.comparingInt( order::get ) )
.collect( Collectors.toList() ); .collect( Collectors.toList() );
} }

5
maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultBuildPomXMLFilterFactory.java
View File

@ -58,14 +58,15 @@ public DefaultBuildPomXMLFilterFactory( TransformerContext context,
@Override @Override
protected Function<Path, Optional<RelativeProject>> getRelativePathMapper() protected Function<Path, Optional<RelativeProject>> getRelativePathMapper()
{ {
return p -> Optional.ofNullable( context.getRawModel( p ) ).map( m -> toRelativeProject( m ) ); return p -> Optional.ofNullable( context.getRawModel( p ) )
.map( DefaultBuildPomXMLFilterFactory::toRelativeProject );
} }
@Override @Override
protected BiFunction<String, String, String> getDependencyKeyToVersionMapper() protected BiFunction<String, String, String> getDependencyKeyToVersionMapper()
{ {
return ( g, a ) -> Optional.ofNullable( context.getRawModel( g, a ) ) return ( g, a ) -> Optional.ofNullable( context.getRawModel( g, a ) )
.map( m -> toVersion( m ) ) .map( DefaultBuildPomXMLFilterFactory::toVersion )
.orElse( null ); .orElse( null );
} }

8
maven-model-builder/src/main/java/org/apache/maven/model/building/FileToRawModelMerger.java
View File

@ -80,7 +80,7 @@ protected void mergeDependencyManagement_Dependencies( DependencyManagement targ
boolean sourceDominant, Map<Object, Object> context ) boolean sourceDominant, Map<Object, Object> context )
{ {
Iterator<Dependency> sourceIterator = source.getDependencies().iterator(); Iterator<Dependency> sourceIterator = source.getDependencies().iterator();
target.getDependencies().stream().forEach( t -> mergeDependency( t, sourceIterator.next(), sourceDominant, target.getDependencies().forEach( t -> mergeDependency( t, sourceIterator.next(), sourceDominant,
context ) ); context ) );
} }
@ -124,7 +124,7 @@ protected void mergeModel_Profiles( Model target, Model source, boolean sourceDo
Map<Object, Object> context ) Map<Object, Object> context )
{ {
Iterator<Profile> sourceIterator = source.getProfiles().iterator(); Iterator<Profile> sourceIterator = source.getProfiles().iterator();
target.getProfiles().stream().forEach( t -> mergeProfile( t, sourceIterator.next(), sourceDominant, target.getProfiles().forEach( t -> mergeProfile( t, sourceIterator.next(), sourceDominant,
context ) ); context ) );
} }
@ -133,7 +133,7 @@ protected void mergeModelBase_Dependencies( ModelBase target, ModelBase source,
Map<Object, Object> context ) Map<Object, Object> context )
{ {
Iterator<Dependency> sourceIterator = source.getDependencies().iterator(); Iterator<Dependency> sourceIterator = source.getDependencies().iterator();
target.getDependencies().stream().forEach( t -> mergeDependency( t, sourceIterator.next(), sourceDominant, target.getDependencies().forEach( t -> mergeDependency( t, sourceIterator.next(), sourceDominant,
context ) ); context ) );
} }
@ -156,7 +156,7 @@ protected void mergePlugin_Dependencies( Plugin target, Plugin source, boolean s
Map<Object, Object> context ) Map<Object, Object> context )
{ {
Iterator<Dependency> sourceIterator = source.getDependencies().iterator(); Iterator<Dependency> sourceIterator = source.getDependencies().iterator();
target.getDependencies().stream().forEach( t -> mergeDependency( t, sourceIterator.next(), sourceDominant, target.getDependencies().forEach( t -> mergeDependency( t, sourceIterator.next(), sourceDominant,
context ) ); context ) );
} }

32
maven-model-transform/src/main/java/org/apache/maven/model/transform/AbstractEventXMLFilter.java
View File

@ -86,16 +86,14 @@ private void processEvent( final SAXEvent event )
if ( !lockCharacters ) if ( !lockCharacters )
{ {
charactersSegments.stream().forEach( e -> charactersSegments.forEach( e ->
{ saxEvents.add( () ->
saxEvents.add( () ->
{
if ( acceptEvent( eventState ) )
{ {
e.execute(); if ( acceptEvent( eventState ) )
} {
} ); e.execute();
} ); }
} ) );
charactersSegments.clear(); charactersSegments.clear();
} }
@ -127,16 +125,14 @@ protected Includer include()
protected final void executeEvents() throws SAXException protected final void executeEvents() throws SAXException
{ {
final String eventState = getState(); final String eventState = getState();
charactersSegments.stream().forEach( e -> charactersSegments.forEach( e ->
{ saxEvents.add( () ->
saxEvents.add( () ->
{
if ( acceptEvent( eventState ) )
{ {
e.execute(); if ( acceptEvent( eventState ) )
} {
} ); e.execute();
} ); }
} ) );
charactersSegments.clear(); charactersSegments.clear();
// not with streams due to checked SAXException // not with streams due to checked SAXException

10
maven-model-transform/src/main/java/org/apache/maven/model/transform/sax/SAXEventFactory.java
View File

@ -51,7 +51,7 @@ public SAXEvent characters( final char[] ch, final int start, final int length )
public SAXEvent endDocument() public SAXEvent endDocument()
{ {
return () -> contentHandler.endDocument(); return contentHandler::endDocument;
} }
public SAXEvent endElement( final String uri, final String localName, final String qName ) public SAXEvent endElement( final String uri, final String localName, final String qName )
@ -86,7 +86,7 @@ public SAXEvent skippedEntity( final String name )
public SAXEvent startDocument() public SAXEvent startDocument()
{ {
return () -> contentHandler.startDocument(); return contentHandler::startDocument;
} }
public SAXEvent startElement( final String uri, final String localName, final String qName, final Attributes atts ) public SAXEvent startElement( final String uri, final String localName, final String qName, final Attributes atts )
@ -111,7 +111,7 @@ public SAXEvent startDTD( String name, String publicId, String systemId )
public SAXEvent endDTD() public SAXEvent endDTD()
{ {
return () -> lexicalHandler.endDTD(); return lexicalHandler::endDTD;
} }
public SAXEvent startEntity( String name ) public SAXEvent startEntity( String name )
@ -127,12 +127,12 @@ public SAXEvent endEntity( String name )
public SAXEvent startCDATA() public SAXEvent startCDATA()
{ {
return () -> lexicalHandler.startCDATA(); return lexicalHandler::startCDATA;
} }
public SAXEvent endCDATA() public SAXEvent endCDATA()
{ {
return () -> lexicalHandler.endCDATA(); return lexicalHandler::endCDATA;
} }
public SAXEvent comment( char[] ch, int start, int length ) public SAXEvent comment( char[] ch, int start, int length )