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

[MNG-7678] Settings (v3) and Settings.Builder() cannot unset a non-null field (#983)

This commit is contained in:
Guillaume Nodet 2023-03-13 19:35:35 +01:00 committed by GitHub
parent 696cf37dc7
commit 9d851eea68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 72 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/maven-api-model/src/main/java/org/apache/maven/api/model/ImmutableCollections.java
View File

@ -485,7 +485,11 @@ class ImmutableCollections {
private final Object[] entries;
private MapN(Map<K, V> map) {
entries = map != null ? map.entrySet().toArray() : new Object[0];
entries = map != null
? map.entrySet().stream()
.map(e -> new SimpleImmutableEntry<>(e.getKey(), e.getValue()))
.toArray()
: new Object[0];
}
@Override

6
api/maven-api-settings/src/main/java/org/apache/maven/api/settings/ImmutableCollections.java
View File

@ -485,7 +485,11 @@ class ImmutableCollections {
private final Object[] entries;
private MapN(Map<K, V> map) {
entries = map != null ? map.entrySet().toArray() : new Object[0];
entries = map != null
? map.entrySet().stream()
.map(e -> new SimpleImmutableEntry<>(e.getKey(), e.getValue()))
.toArray()
: new Object[0];
}
@Override

41
api/maven-api-settings/src/test/java/org/apache/maven/api/settings/SettingsTest.java Normal file
View File

@ -0,0 +1,41 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.maven.api.settings;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
public class SettingsTest {
@Test
void testSetLocalRepository() {
Settings s = Settings.newInstance();
s = s.withLocalRepository("xxx");
assertEquals("xxx", s.getLocalRepository());
s = s.withLocalRepository("yyy");
assertEquals("yyy", s.getLocalRepository());
s = s.withLocalRepository(null);
assertNull(s.getLocalRepository());
}
}

6
api/maven-api-toolchain/src/main/java/org/apache/maven/api/toolchain/ImmutableCollections.java
View File

@ -485,7 +485,11 @@ class ImmutableCollections {
private final Object[] entries;
private MapN(Map<K, V> map) {
entries = map != null ? map.entrySet().toArray() : new Object[0];
entries = map != null
? map.entrySet().stream()
.map(e -> new SimpleImmutableEntry<>(e.getKey(), e.getValue()))
.toArray()
: new Object[0];
}
@Override

6
maven-plugin-api/src/main/java/org/apache/maven/plugin/lifecycle/ImmutableCollections.java
View File

@ -485,7 +485,11 @@ class ImmutableCollections {
private final Object[] entries;
private MapN(Map<K, V> map) {
entries = map != null ? map.entrySet().toArray() : new Object[0];
entries = map != null
? map.entrySet().stream()
.map(e -> new SimpleImmutableEntry<>(e.getKey(), e.getValue()))
.toArray()
: new Object[0];
}
@Override

71
src/mdo/model.vm
View File

@ -125,15 +125,7 @@ public class ${class.name}
#end
#if ( $locationTracking )
#if ( ! $class.superClass )
/** Location of the xml element for this object. */
final InputLocation location;
#end
#foreach ( $field in $class.getFields($version) )
/** Location of the xml element for the field ${field.name}. */
final InputLocation ${field.name}Location;
#end
#if ( ! $class.superClass )
/** Other locations */
/** Locations */
final Map<Object, InputLocation> locations;
#end
#end
@ -155,13 +147,7 @@ public class ${class.name}
$type $field.name${sep}
#end
#if ( $locationTracking )
Map<Object, InputLocation> locations,
#set ( $sep = "#if(${allFields.size()}>0),#end" )
InputLocation location${sep}
#foreach ( $field in $allFields )
#set ( $sep = "#if(${locationTracking}&&$field!=${allFields[${allFields.size()} - 1]}),#end" )
InputLocation ${field.name}Location${sep}
#end
Map<Object, InputLocation> locations
#end
)
{
@ -172,13 +158,7 @@ public class ${class.name}
${field.name}${sep}
#end
#if ( $locationTracking )
locations,
#set ( $sep = "#if(${inheritedFields.size()}>0),#end" )
location${sep}
#foreach ( $field in $inheritedFields )
#set ( $sep = "#if(${locationTracking}&&$field!=${inheritedFields[${inheritedFields.size()} - 1]}),#end" )
${field.name}Location${sep}
#end
locations
#end
);
#end
@ -195,10 +175,6 @@ public class ${class.name}
#if ( $locationTracking )
#if ( ! $class.superClass )
this.locations = ImmutableCollections.copy( locations );
this.location = location;
#end
#foreach ( $field in $class.getFields($version) )
this.${field.name}Location = ${field.name}Location;
#end
#end
}
@ -258,31 +234,13 @@ public class ${class.name}
}
#end
#if ( $locationTracking )
#if ( $locationTracking && !$class.superClass )
/**
* Gets the location of the specified field in the input source.
*/
public InputLocation getLocation( Object key )
{
if ( key instanceof String )
{
switch ( ( String ) key )
{
#if ( ! $class.superClass )
case "":
return location;
#end
#foreach ( $field in $class.getFields($version) )
case "${field.name}":
return ${field.name}Location;
#end
}
}
#if ( $class.superClass )
return super.getLocation( key );
#else
return locations != null ? locations.get( key ) : null;
#end
}
#end
@ -311,7 +269,7 @@ public class ${class.name}
@Nonnull
public ${class.name} with${cap}( $type $field.name )
{
return with().${field.name}( $field.name ).build();
return newBuilder(this, true).${field.name}( $field.name ).build();
}
#end
@ -453,6 +411,9 @@ public class ${class.name}
{
#foreach ( $field in $class.getFields($version) )
this.${field.name} = base.${field.name};
#end
#if ( $locationTracking )
this.locations = base.locations;
#end
}
else
@ -490,9 +451,9 @@ public class ${class.name}
{
if ( location != null )
{
if ( this.locations == null )
if ( !(this.locations instanceof HashMap) )
{
this.locations = new HashMap<>();
this.locations = this.locations != null ? new HashMap<>( this.locations ) : new HashMap<>();
}
this.locations.put( key, location );
}
@ -520,10 +481,6 @@ public class ${class.name}
if ( this.locations != null )
{
locations = this.locations;
location = locations.remove( "" );
#foreach ( $field in $allFields )
${field.name}Location = locations.remove( "${field.name}" );
#end
}
#end
return new ${class.name}(
@ -539,13 +496,7 @@ public class ${class.name}
#end
#end
#if ( $locationTracking )
locations != null ? locations : ( base != null ? base.locations : null ),
#set ( $sep = "#if(${allFields.size()}>0),#end" )
location != null ? location : ( base != null ? base.location : null )${sep}
#foreach ( $field in $allFields )
#set ( $sep = "#if(${locationTracking}&&$field!=${allFields[${allFields.size()} - 1]}),#end" )
${field.name}Location != null ? ${field.name}Location : ( base != null ? base.${field.name}Location : null )${sep}
#end
locations != null ? locations : ( base != null ? base.locations : null )
#end
);
}