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

[MNG-7386] Make sure the ModelMerger$MergingList can be serialized

This commit is contained in:
Guillaume Nodet 2022-01-21 16:53:03 +01:00 committed by GitHub
parent 27755123e3
commit 0cda424772
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 57 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java
View File

@ -19,6 +19,7 @@ package org.apache.maven.model.merge;
* under the License.
*/
import java.io.ObjectStreamException;
import java.util.AbstractList;
import java.util.ArrayList;
import java.util.Collection;
@ -2870,8 +2871,9 @@ public class ModelMerger
* Merging list
* @param <V>
*/
private static class MergingList<V> extends AbstractList<V>
private static class MergingList<V> extends AbstractList<V> implements java.io.Serializable
{
private final KeyComputer<V> keyComputer;
private Map<Object, V> map;
private List<V> list;
@ -2882,6 +2884,11 @@ public class ModelMerger
this.keyComputer = keyComputer;
}
Object writeReplace() throws ObjectStreamException
{
return new ArrayList<>( this );
}
@Override
public Iterator<V> iterator()
{

49
maven-model/src/test/java/org/apache/maven/model/merge/ModelMergerTest.java Normal file
View File

@ -0,0 +1,49 @@
package org.apache.maven.model.merge;
/*
* 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.
*/
import java.io.ByteArrayOutputStream;
import java.io.ObjectOutputStream;
import java.util.ArrayList;
import org.apache.maven.model.License;
import org.apache.maven.model.Model;
import org.junit.Test;
public class ModelMergerTest {
@Test
public void testMergedModelSerialization() throws Exception {
Model target = new Model();
Model source = new Model();
target.setLicenses(new ArrayList<License>());
License lic1 = new License();
License lic2 = new License();
target.getLicenses().add(lic1);
source.setLicenses(new ArrayList<License>());
source.getLicenses().add(lic2);
new ModelMerger().mergeModel(target, source, false, null);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream oos = new ObjectOutputStream(baos);
oos.writeObject(target);
}
}