multi release jar removed

Signed-off-by: David Kral <[email protected]>

pom.xml

@@ -285,12 +285,11 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-compiler-plugin</artifactId>
-                        <version>3.13.0</version>
                         <executions>
                             <execution>
                                 <id>default-testCompile</id>
                                 <configuration>
-                                    <release>16</release>
+                                    <release>17</release>
                                     <compileSourceRoots>
                                         <compileSourceRoot>${project.basedir}/src/test/java</compileSourceRoot>
                                         <compileSourceRoot>${project.basedir}/src/test/java16</compileSourceRoot>
@@ -394,28 +393,15 @@
                                 <goal>compile</goal>
                             </goals>
                             <configuration>
-                                <release>11</release>
-                                <source>11</source>
-                                <target>11</target>
+                                <release>17</release>
+                                <source>17</source>
+                                <target>17</target>
                             </configuration>
                         </execution>
                         <execution>
                             <id>default-testCompile</id>
                             <configuration>
-                                <release>11</release>
-                            </configuration>
-                        </execution>
-                        <execution>
-                            <id>multi-release-compile-16</id>
-                            <goals>
-                                <goal>compile</goal>
-                            </goals>
-                            <configuration>
-                                <release>16</release>
-                                <compileSourceRoots>
-                                    <compileSourceRoot>${project.basedir}/src/main/java16</compileSourceRoot>
-                                </compileSourceRoots>
-                                <multiReleaseOutput>true</multiReleaseOutput>
+                                <release>17</release>
                             </configuration>
                         </execution>
                     </executions>
@@ -471,7 +457,7 @@
                             <additionalJOption>--add-modules</additionalJOption>
                             <additionalJOption>jakarta.json.bind,jakarta.json</additionalJOption>
                         </additionalJOptions>
-                        <source>11</source>
+                        <source>17</source>
                     </configuration>
                     <executions>
                         <execution>
@@ -591,7 +577,7 @@
                     <configuration>
                         <rules>
                             <requireJavaVersion>
-                                <version>[11,)</version>
+                                <version>[17,)</version>
                             </requireJavaVersion>
                             <requireMavenVersion>
                                 <version>[3.3.9,)</version>
@@ -714,7 +700,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>findbugs-maven-plugin</artifactId>
-                <version>${findbugs-maven-plugin.version}</version>
             </plugin>
         </plugins>
     </reporting>

src/main/java/org/eclipse/yasson/internal/ClassMultiReleaseExtension.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -22,6 +22,8 @@
 
 import org.eclipse.yasson.internal.model.JsonbCreator;
 import org.eclipse.yasson.internal.model.Property;
+import org.eclipse.yasson.internal.properties.MessageKeys;
+import org.eclipse.yasson.internal.properties.Messages;
 
 /**
  * Search for instance creator from other sources.
@@ -34,25 +36,38 @@ private ClassMultiReleaseExtension() {
     }
 
     static boolean shouldTransformToPropertyName(Method method) {
-        return true;
+        return !method.getDeclaringClass().isRecord();
     }
 
     static boolean isSpecialAccessorMethod(Method method, Map<String, Property> classProperties) {
-        return false;
+        return isRecord(method.getDeclaringClass())
+                && method.getParameterCount() == 0
+                && !void.class.equals(method.getReturnType())
+                && classProperties.containsKey(method.getName());
     }
 
     static JsonbCreator findCreator(Class<?> clazz,
                                     Constructor<?>[] declaredConstructors,
                                     AnnotationIntrospector introspector,
                                     PropertyNamingStrategy propertyNamingStrategy) {
+        if (clazz.isRecord()) {
+            if (declaredConstructors.length == 1) {
+                return introspector.createJsonbCreator(declaredConstructors[0], null, clazz, propertyNamingStrategy);
+            }
+        }
         return null;
     }
 
     public static boolean isRecord(Class<?> clazz) {
-        return false;
+        return clazz.isRecord();
     }
 
     public static Optional<JsonbException> exceptionToThrow(Class<?> clazz) {
+        if (clazz.isRecord()) {
+            if (clazz.getDeclaredConstructors().length > 1) {
+                return Optional.of(new JsonbException(Messages.getMessage(MessageKeys.RECORD_MULTIPLE_CONSTRUCTORS, clazz)));
+            }
+        }
         return Optional.empty();
     }
 

src/test/java16/org/eclipse/yasson/records/Car.java → src/test/java/org/eclipse/yasson/records/Car.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at

src/test/java16/org/eclipse/yasson/records/CarWithCreateNamingStrategyTest.java → src/test/java/org/eclipse/yasson/records/CarWithCreateNamingStrategyTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at

src/test/java16/org/eclipse/yasson/records/CarWithCreator.java → src/test/java/org/eclipse/yasson/records/CarWithCreator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at

src/test/java16/org/eclipse/yasson/records/CarWithDefaultConstructor.java → src/test/java/org/eclipse/yasson/records/CarWithDefaultConstructor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at

src/test/java16/org/eclipse/yasson/records/CarWithExtraMethod.java → src/test/java/org/eclipse/yasson/records/CarWithExtraMethod.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at

src/test/java16/org/eclipse/yasson/records/CarWithMultipleConstructors.java → src/test/java/org/eclipse/yasson/records/CarWithMultipleConstructors.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at

src/test/java16/org/eclipse/yasson/records/CarWithMultipleConstructorsAndCreator.java → src/test/java/org/eclipse/yasson/records/CarWithMultipleConstructorsAndCreator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at

src/test/java16/org/eclipse/yasson/records/CarWithoutAnnotations.java → src/test/java/org/eclipse/yasson/records/CarWithoutAnnotations.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at

src/test/java16/org/eclipse/yasson/records/RecordTest.java → src/test/java/org/eclipse/yasson/records/RecordTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at