This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MNG-6261
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 2c0c7d75343abda641ca95f73e280035e83beef1
Author: Fabiano C. de Oliveira <fabcipri...@yahoo.com.br>
AuthorDate: Fri Nov 16 01:13:12 2018 -0200
- using File apis to compare
---
.../maven/model/building/DefaultModelBuilder.java | 3 +-
.../maven/model/building/FileModelSource.java | 23 ++++++++++
.../maven/model/building/FileModelSourceTest.java | 52 ++++++++++++++++++++++
3 files changed, 77 insertions(+), 1 deletion(-)
diff --git
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index 0ac45ee..dee8956 100644
---
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -852,10 +852,11 @@ public class DefaultModelBuilder
File pomFile = parentData.getModel().getPomFile();
if ( pomFile != null )
{
+ FileModelSource pomFileModel = new FileModelSource(
pomFile );
ModelSource expectedParentSource = getParentPomFile(
childModel, childSource );
if ( expectedParentSource == null || (
expectedParentSource instanceof ModelSource2
- && !pomFile.toURI().equals( ( (ModelSource2)
expectedParentSource ).getLocationURI() ) ) )
+ && !pomFileModel.equals( expectedParentSource ) ) )
{
parentData = readParentExternally( childModel,
request, problems );
}
diff --git
a/maven-model-builder/src/main/java/org/apache/maven/model/building/FileModelSource.java
b/maven-model-builder/src/main/java/org/apache/maven/model/building/FileModelSource.java
index a2e1141..aa80b2f 100644
---
a/maven-model-builder/src/main/java/org/apache/maven/model/building/FileModelSource.java
+++
b/maven-model-builder/src/main/java/org/apache/maven/model/building/FileModelSource.java
@@ -80,4 +80,27 @@ public class FileModelSource extends FileSource implements
ModelSource2
{
return getFile().toURI();
}
+
+ @Override
+ public boolean equals( Object obj )
+ {
+ if ( this == obj )
+ {
+ return true;
+ }
+
+ if ( ( obj == null ) || !( obj instanceof FileModelSource ) )
+ {
+ return false;
+ }
+ FileModelSource other = ( FileModelSource ) obj;
+ return getFile().equals( other.getFile() );
+ }
+
+ @Override
+ public int hashCode()
+ {
+ return super.hashCode();
+ }
+
}
diff --git
a/maven-model-builder/src/test/java/org/apache/maven/model/building/FileModelSourceTest.java
b/maven-model-builder/src/test/java/org/apache/maven/model/building/FileModelSourceTest.java
new file mode 100644
index 0000000..77436c0
--- /dev/null
+++
b/maven-model-builder/src/test/java/org/apache/maven/model/building/FileModelSourceTest.java
@@ -0,0 +1,52 @@
+package org.apache.maven.model.building;
+
+/*
+ * 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.File;
+import junit.framework.TestCase;
+
+/**
+ *
+ * @author fabiano
+ */
+public class FileModelSourceTest
+ extends TestCase
+{
+
+ public FileModelSourceTest() {
+ }
+
+ /**
+ * Test of equals method, of class FileModelSource.
+ */
+ public void testEquals()
+ throws Exception
+ {
+ File tempFile = File.createTempFile("pomTest-", ".xml");
+ tempFile.deleteOnExit();
+ FileModelSource instance = new FileModelSource( tempFile );
+
+ assertFalse( instance.equals( null ) );
+ assertFalse( instance.equals( new Object() ) );
+ assertTrue( instance.equals( instance ) );
+ assertTrue( instance.equals( new FileModelSource( tempFile ) ) );
+ }
+
+}
