Fixup of initial jt-264-basics merge PR highsource#282

laurentschoelens · Aug 4, 2023 · 68121f2 · 68121f2
1 parent ecc6839
commit 68121f2
Show file tree

Hide file tree

Showing 110 changed files with 432 additions and 331 deletions.
diff --git a/basics/ant/pom.xml b/basics/ant/pom.xml
@@ -2,10 +2,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>jaxb2-basics-ant</artifactId>
 	<packaging>jar</packaging>
-	<name>JAXB2 Basics - Ant Task</name>
+	<name>JAXB Tools :: JAXB Basics :: Ant Task</name>
 	<parent>
-		<groupId>org.jvnet.jaxb2_commons</groupId>
-		<artifactId>jaxb2-basics-project</artifactId>
+		<groupId>org.jvnet.jaxb</groupId>
+		<artifactId>jaxb-basics-project</artifactId>
 		<version>2.0.4-SNAPSHOT</version>
 	</parent>
 	<dependencies>

diff --git a/basics/basic/pom.xml b/basics/basic/pom.xml
@@ -2,19 +2,19 @@
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>jaxb2-basics</artifactId>
 	<packaging>jar</packaging>
-	<name>JAXB2 Basics - Basic Plugins</name>
+	<name>JAXB Tools :: JAXB Basics :: Basic Plugins</name>
 	<parent>
-		<groupId>org.jvnet.jaxb2_commons</groupId>
-		<artifactId>jaxb2-basics-project</artifactId>
+		<groupId>org.jvnet.jaxb</groupId>
+		<artifactId>jaxb-basics-project</artifactId>
 		<version>2.0.4-SNAPSHOT</version>
 	</parent>
 	<dependencies>
 		<dependency>
-			<groupId>org.jvnet.jaxb2_commons</groupId>
+			<groupId>org.jvnet.jaxb</groupId>
 			<artifactId>jaxb2-basics-runtime</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.jvnet.jaxb2_commons</groupId>
+			<groupId>org.jvnet.jaxb</groupId>
 			<artifactId>jaxb2-basics-tools</artifactId>
 		</dependency>
 		<dependency>
@@ -32,8 +32,8 @@
 			<artifactId>javaparser</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.jvnet.jaxb2.maven2</groupId>
-			<artifactId>maven-jaxb2-plugin-testing</artifactId>
+			<groupId>org.jvnet.jaxb</groupId>
+			<artifactId>jaxb-maven-plugin-testing</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -78,13 +78,13 @@
 										<pluginExecution>
 											<pluginExecutionFilter>
 												<groupId>
-													org.jvnet.jaxb2.maven2
+													org.jvnet.jaxb
 												</groupId>
 												<artifactId>
-													maven-jaxb2-plugin
+													jaxb-maven-plugin
 												</artifactId>
 												<versionRange>
-													[0.8.1,)
+													[2.0.0,)
 												</versionRange>
 												<goals>
 													<goal>generate</goal>

diff --git a/.../basic/src/test/java/org/jvnet/jaxb2_commons/plugin/copyable/tests/RunCopyablePlugin.java b/.../basic/src/test/java/org/jvnet/jaxb2_commons/plugin/copyable/tests/RunCopyablePlugin.java
@@ -4,8 +4,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jvnet.jaxb2.maven2.AbstractXJC2Mojo;
-import org.jvnet.jaxb2.maven2.test.RunXJC2Mojo;
+import org.jvnet.jaxb.maven.AbstractXJC2Mojo;
+import org.jvnet.jaxb.maven.test.RunXJC2Mojo;
 
 public class RunCopyablePlugin extends RunXJC2Mojo {
 

diff --git a/basics/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/equals/tests/RunEqualsPlugin.java b/basics/basic/src/test/java/org/jvnet/jaxb2_commons/plugin/equals/tests/RunEqualsPlugin.java
@@ -4,8 +4,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jvnet.jaxb2.maven2.AbstractXJC2Mojo;
-import org.jvnet.jaxb2.maven2.test.RunXJC2Mojo;
+import org.jvnet.jaxb.maven.AbstractXJC2Mojo;
+import org.jvnet.jaxb.maven.test.RunXJC2Mojo;
 
 public class RunEqualsPlugin extends RunXJC2Mojo {
 

diff --git a/...asic/src/test/java/org/jvnet/jaxb2_commons/plugin/mergeable/tests/RunMergeablePlugin.java b/...asic/src/test/java/org/jvnet/jaxb2_commons/plugin/mergeable/tests/RunMergeablePlugin.java
@@ -4,8 +4,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jvnet.jaxb2.maven2.AbstractXJC2Mojo;
-import org.jvnet.jaxb2.maven2.test.RunXJC2Mojo;
+import org.jvnet.jaxb.maven.AbstractXJC2Mojo;
+import org.jvnet.jaxb.maven.test.RunXJC2Mojo;
 
 public class RunMergeablePlugin extends RunXJC2Mojo {
 

diff --git a/.../basic/src/test/java/org/jvnet/jaxb2_commons/plugin/tostring/tests/RunToStringPlugin.java b/.../basic/src/test/java/org/jvnet/jaxb2_commons/plugin/tostring/tests/RunToStringPlugin.java
@@ -4,8 +4,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jvnet.jaxb2.maven2.AbstractXJC2Mojo;
-import org.jvnet.jaxb2.maven2.test.RunXJC2Mojo;
+import org.jvnet.jaxb.maven.AbstractXJC2Mojo;
+import org.jvnet.jaxb.maven.test.RunXJC2Mojo;
 import org.jvnet.jaxb2_commons.lang.JAXBToStringStrategy;
 
 public class RunToStringPlugin extends RunXJC2Mojo {

diff --git a/basics/dist/pom.xml b/basics/dist/pom.xml
@@ -2,13 +2,13 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.jvnet.jaxb2_commons</groupId>
+	<groupId>org.jvnet.jaxb</groupId>
 	<artifactId>jaxb2-basics-dist</artifactId>
 	<packaging>pom</packaging>
-	<name>JAXB2 Basics - Distribution</name>
+	<name>JAXB Tools :: JAXB Basics :: Distribution</name>
 	<parent>
-		<groupId>org.jvnet.jaxb2_commons</groupId>
-		<artifactId>jaxb2-basics-project</artifactId>
+		<groupId>org.jvnet.jaxb</groupId>
+		<artifactId>jaxb-basics-project</artifactId>
 		<version>2.0.4-SNAPSHOT</version>
 	</parent>
 	<dependencies>

diff --git a/basics/plugins/pom.xml b/basics/plugins/pom.xml
@@ -2,23 +2,23 @@
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>jaxb2-basics-plugins</artifactId>
 	<packaging>jar</packaging>
-	<name>JAXB2 Basics - Full Plugins JAR</name>
+	<name>JAXB Tools :: JAXB Basics :: Full Plugins JAR</name>
 	<parent>
-		<groupId>org.jvnet.jaxb2_commons</groupId>
-		<artifactId>jaxb2-basics-project</artifactId>
+		<groupId>org.jvnet.jaxb</groupId>
+		<artifactId>jaxb-basics-project</artifactId>
 		<version>2.0.4-SNAPSHOT</version>
 	</parent>
 	<dependencies>
 		<dependency>
-			<groupId>org.jvnet.jaxb2_commons</groupId>
+			<groupId>org.jvnet.jaxb</groupId>
 			<artifactId>jaxb2-basics</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.jvnet.jaxb2_commons</groupId>
+			<groupId>org.jvnet.jaxb</groupId>
 			<artifactId>jaxb2-basics-runtime</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.jvnet.jaxb2_commons</groupId>
+			<groupId>org.jvnet.jaxb</groupId>
 			<artifactId>jaxb2-basics-tools</artifactId>
 		</dependency>
 		<dependency>

diff --git a/basics/pom.xml b/basics/pom.xml
@@ -8,7 +8,7 @@
         </parent>
 	<artifactId>jaxb-basics-project</artifactId>
 	<packaging>pom</packaging>
-	<name>JAXB2 Basics - Project</name>
+	<name>JAXB Tools :: JAXB Basics :: Project</name>
 	<description>JAXB Basics is a part of JAXB Tools project which implements plugins and tools for JAXB implementation.</description>
 	<modules>
 		<module>ant</module>
@@ -65,32 +65,32 @@
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
-				<groupId>org.jvnet.jaxb2_commons</groupId>
+				<groupId>org.jvnet.jaxb</groupId>
 				<artifactId>jaxb2-basics-plugins</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>org.jvnet.jaxb2_commons</groupId>
+				<groupId>org.jvnet.jaxb</groupId>
 				<artifactId>jaxb2-basics-ant</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>org.jvnet.jaxb2_commons</groupId>
+				<groupId>org.jvnet.jaxb</groupId>
 				<artifactId>jaxb2-basics-runtime</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>org.jvnet.jaxb2_commons</groupId>
+				<groupId>org.jvnet.jaxb</groupId>
 				<artifactId>jaxb2-basics-tools</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>org.jvnet.jaxb2_commons</groupId>
+				<groupId>org.jvnet.jaxb</groupId>
 				<artifactId>jaxb2-basics-testing</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>org.jvnet.jaxb2_commons</groupId>
+				<groupId>org.jvnet.jaxb</groupId>
 				<artifactId>jaxb2-basics</artifactId>
 				<version>${project.version}</version>
 			</dependency>

diff --git a/basics/runtime/pom.xml b/basics/runtime/pom.xml
@@ -2,10 +2,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>jaxb2-basics-runtime</artifactId>
 	<packaging>jar</packaging>
-	<name>JAXB2 Basics - Runtime</name>
+	<name>JAXB Tools :: JAXB Basics :: Runtime</name>
 	<parent>
-		<groupId>org.jvnet.jaxb2_commons</groupId>
-		<artifactId>jaxb2-basics-project</artifactId>
+		<groupId>org.jvnet.jaxb</groupId>
+		<artifactId>jaxb-basics-project</artifactId>
 		<version>2.0.4-SNAPSHOT</version>
 	</parent>
 	<dependencies>

diff --git a/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultCopyStrategy.java b/basics/runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultCopyStrategy.java
@@ -220,10 +220,24 @@ public boolean[] copy(ObjectLocator locator, boolean[] array) {
 	}
 
 	protected Object copyInternal(ObjectLocator locator, Cloneable object) {
+		return copyInternal(locator, object, false);
+	}
+
+	protected Object copyInternal(ObjectLocator locator, Cloneable object, boolean checkCloneable) {
+		Class<?> clazz = object.getClass();
 		Method method = null;
 
+		if (checkCloneable) {
+			Class<?> parentClazz = clazz.getSuperclass();
+
+			while (parentClazz != null && hasCloneableInterface(parentClazz)) {
+				clazz = parentClazz;
+				parentClazz = clazz.getSuperclass();
+			}
+		}
+
 		try {
-			method = object.getClass().getMethod("clone", (Class[]) null);
+			method = clazz.getMethod("clone", (Class[]) null);
 		} catch (NoSuchMethodException nsmex) {
 			method = null;
 		}
@@ -236,6 +250,7 @@ protected Object copyInternal(ObjectLocator locator, Cloneable object) {
 							"Object class ["
 									+ object.getClass()
 									+ "] implements java.lang.Cloneable interface, "
+									+ (checkCloneable ? ("with final determined class [" + clazz + "]") : "")
 									+ "but does not provide a public no-arg clone() method. "
 									+ "By convention, classes that implement java.lang.Cloneable "
 									+ "should override java.lang.Object.clone() method (which is protected) "
@@ -253,6 +268,9 @@ protected Object copyInternal(ObjectLocator locator, Cloneable object) {
 
 			return method.invoke(object, (Object[]) null);
 		} catch (Exception ex) {
+			if (!checkCloneable && "java.lang.reflect.InaccessibleObjectException".equals(ex.getClass().getName())) {
+				return copyInternal(locator, object, true);
+			}
 			throw new UnsupportedOperationException(
 					"Could not clone the object ["
 							+ object
@@ -268,6 +286,17 @@ protected Object copyInternal(ObjectLocator locator, Cloneable object) {
 		}
 	}
 
+	private static boolean hasCloneableInterface(Class<?> clazz) {
+		if (clazz != null) {
+			for (Class<?> iface : clazz.getInterfaces()) {
+				if (iface.isAssignableFrom(Cloneable.class)) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
 	@Override
 	public Boolean shouldBeCopiedAndSet(ObjectLocator locator, boolean valueSet) {
 		return valueSet;

diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/DefaultCopyStrategyTest.java b/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/DefaultCopyStrategyTest.java
@@ -0,0 +1,46 @@
+package org.jvnet.jaxb2_commons.lang.tests;
+
+import com.vividsolutions.jts.geom.Coordinate;
+import com.vividsolutions.jts.geom.GeometryFactory;
+import com.vividsolutions.jts.geom.Polygon;
+import org.junit.Assert;
+import org.junit.Test;
+import org.jvnet.jaxb2_commons.lang.DefaultCopyStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBCopyStrategy;
+import org.jvnet.jaxb2_commons.lang.tests.pojo.CloneableNoClone;
+
+import javax.xml.datatype.DatatypeConfigurationException;
+import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.XMLGregorianCalendar;
+
+public class DefaultCopyStrategyTest {
+
+    @Test
+    public void testPolygonOK() {
+        final GeometryFactory geometryFactory = new GeometryFactory();
+        final Polygon polygon = geometryFactory.createPolygon(
+                geometryFactory.createLinearRing(new Coordinate[] {
+                        new Coordinate(0, 0, 0), new Coordinate(1, 1, 0),
+
+                        new Coordinate(1, 0, 0), new Coordinate(0, 1, 0),
+                        new Coordinate(0, 0, 0) }), null);
+
+        polygon.clone();
+
+        new DefaultCopyStrategy().copy(null, polygon);
+    }
+
+    @Test
+    public void testXMLGregorianCalendarOK() throws DatatypeConfigurationException {
+        final XMLGregorianCalendar calendar = DatatypeFactory.newInstance().newXMLGregorianCalendar();
+
+        new DefaultCopyStrategy().copy(null, calendar);
+    }
+    @Test
+    public void testCloneableNoCloneKO() {
+        final CloneableNoClone object = new CloneableNoClone("no-clone-method-in-it");
+
+        Assert.assertThrows("Exception UnsupportedOperationException not thrown",
+                UnsupportedOperationException.class, () -> new DefaultCopyStrategy().copy(null, object));
+    }
+}
diff --git a/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/pojo/CloneableNoClone.java b/basics/runtime/src/test/java/org/jvnet/jaxb2_commons/lang/tests/pojo/CloneableNoClone.java
@@ -0,0 +1,13 @@
+package org.jvnet.jaxb2_commons.lang.tests.pojo;
+
+public class CloneableNoClone implements Cloneable {
+    private final String attribute;
+
+    public CloneableNoClone(String attribute) {
+        this.attribute = attribute;
+    }
+
+    public String getAttribute() {
+        return attribute;
+    }
+}
diff --git a/basics/samples/basic/pom.xml b/basics/samples/basic/pom.xml
@@ -4,9 +4,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>jaxb2-basics-sample-basic</artifactId>
 	<packaging>pom</packaging>
-	<name>JAXB2 Basics - Sample [basic]</name>
+	<name>JAXB Tools :: JAXB Basics :: Sample [basic]</name>
 	<parent>
-		<groupId>org.jvnet.jaxb2_commons</groupId>
+		<groupId>org.jvnet.jaxb</groupId>
 		<artifactId>jaxb2-basics-samples</artifactId>
 		<version>2.0.4-SNAPSHOT</version>
 	</parent>
@@ -16,15 +16,15 @@
 			<artifactId>junit</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.jvnet.jaxb2_commons</groupId>
+			<groupId>org.jvnet.jaxb</groupId>
 			<artifactId>jaxb2-basics-plugins</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.jvnet.jaxb2_commons</groupId>
+			<groupId>org.jvnet.jaxb</groupId>
 			<artifactId>jaxb2-basics-testing</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.jvnet.jaxb2_commons</groupId>
+			<groupId>org.jvnet.jaxb</groupId>
 			<artifactId>jaxb2-basics-ant</artifactId>
 		</dependency>
 		<dependency>