moved to Java 17

xmlobjects · Dec 10, 2023 · 26d902f · 26d902f
1 parent 12bcd99
commit 26d902f
Show file tree

Hide file tree

Showing 22 changed files with 45 additions and 44 deletions.
diff --git a/build.gradle b/build.gradle
@@ -9,13 +9,13 @@ plugins {
 }
 
 group 'org.xmlobjects.xal'
-version '1.0.4'
+version '1.1.0-SNAPSHOT'
 description 'A Java mapping for the OASIS eXtensible Address Language (xAL)'
 ext.date = new Date()
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(11)
+        languageVersion = JavaLanguageVersion.of(17)
     }
     withJavadocJar()
     withSourcesJar()
@@ -33,8 +33,8 @@ repositories {
 }
 
 dependencies {
-    api 'org.xmlobjects:xml-objects:1.0.4'
-    annotationProcessor 'org.xmlobjects:xml-objects:1.0.4'
+    api 'org.xmlobjects:xml-objects:1.1.0-SNAPSHOT'
+    annotationProcessor 'org.xmlobjects:xml-objects:1.1.0-SNAPSHOT'
 }
 
 javadoc {
@@ -49,6 +49,7 @@ javadoc {
             Claus Nagel &lt;[email protected]&gt;
             """.replaceAll("[\r|\n]+", "")
         addStringOption('doctitle', project.name + ' - ' + project.description)
+        addStringOption('Xdoclint:none', '-quiet')
     }
 
     doFirst {

diff --git a/src/main/java/org/xmlobjects/xal/adapter/deprecated/AdministrativeAreaAdapter.java b/src/main/java/org/xmlobjects/xal/adapter/deprecated/AdministrativeAreaAdapter.java
@@ -45,8 +45,8 @@ public class AdministrativeAreaAdapter extends AddressObjectAdapter<Administrati
     @Override
     public AdministrativeArea createObject(QName name, Object parent) throws ObjectBuildException {
         AdministrativeArea object = new AdministrativeArea();
-        if (parent instanceof Child)
-            object.setParent((Child) parent);
+        if (parent instanceof Child child)
+            object.setParent(child);
 
         return object;
     }

diff --git a/src/main/java/org/xmlobjects/xal/adapter/deprecated/CountryAdapter.java b/src/main/java/org/xmlobjects/xal/adapter/deprecated/CountryAdapter.java
@@ -44,8 +44,8 @@ public class CountryAdapter extends AddressObjectAdapter<Country> {
     @Override
     public Country createObject(QName name, Object parent) throws ObjectBuildException {
         Country object = new Country();
-        if (parent instanceof Child)
-            object.setParent((Child) parent);
+        if (parent instanceof Child child)
+            object.setParent(child);
 
         return object;
     }

diff --git a/src/main/java/org/xmlobjects/xal/adapter/deprecated/DepartmentAdapter.java b/src/main/java/org/xmlobjects/xal/adapter/deprecated/DepartmentAdapter.java
@@ -46,8 +46,8 @@ public class DepartmentAdapter extends AddressObjectAdapter<SubPremises> {
     @Override
     public SubPremises createObject(QName name, Object parent) throws ObjectBuildException {
         SubPremises object = new SubPremises();
-        if (parent instanceof Child)
-            object.setParent((Child) parent);
+        if (parent instanceof Child child)
+            object.setParent(child);
 
         return object;
     }

diff --git a/src/main/java/org/xmlobjects/xal/adapter/deprecated/DependentLocalityAdapter.java b/src/main/java/org/xmlobjects/xal/adapter/deprecated/DependentLocalityAdapter.java
@@ -47,8 +47,8 @@ public class DependentLocalityAdapter extends AddressObjectAdapter<SubLocality>
     @Override
     public SubLocality createObject(QName name, Object parent) throws ObjectBuildException {
         SubLocality object = new SubLocality();
-        if (parent instanceof Child)
-            object.setParent((Child) parent);
+        if (parent instanceof Child child)
+            object.setParent(child);
 
         return object;
     }

diff --git a/src/main/java/org/xmlobjects/xal/adapter/deprecated/DependentThoroughfareAdapter.java b/src/main/java/org/xmlobjects/xal/adapter/deprecated/DependentThoroughfareAdapter.java
@@ -49,8 +49,8 @@ public class DependentThoroughfareAdapter extends AddressObjectAdapter<SubThorou
     @Override
     public SubThoroughfare createObject(QName name, Object parent) throws ObjectBuildException {
         SubThoroughfare object = new SubThoroughfare();
-        if (parent instanceof Child)
-            object.setParent((Child) parent);
+        if (parent instanceof Child child)
+            object.setParent(child);
 
         return object;
     }

diff --git a/src/main/java/org/xmlobjects/xal/adapter/deprecated/FirmAdapter.java b/src/main/java/org/xmlobjects/xal/adapter/deprecated/FirmAdapter.java
@@ -48,8 +48,8 @@ public class FirmAdapter extends AddressObjectAdapter<Premises> {
     @Override
     public Premises createObject(QName name, Object parent) throws ObjectBuildException {
         Premises object = new Premises();
-        if (parent instanceof Child)
-            object.setParent((Child) parent);
+        if (parent instanceof Child child)
+            object.setParent(child);
 
         return object;
     }

diff --git a/src/main/java/org/xmlobjects/xal/adapter/deprecated/LargeMailUserAdapter.java b/src/main/java/org/xmlobjects/xal/adapter/deprecated/LargeMailUserAdapter.java
@@ -50,8 +50,8 @@ public class LargeMailUserAdapter extends AddressObjectAdapter<Premises> {
     @Override
     public Premises createObject(QName name, Object parent) throws ObjectBuildException {
         Premises object = new Premises(PremisesType.LARGE_MAIL_USER);
-        if (parent instanceof Child)
-            object.setParent((Child) parent);
+        if (parent instanceof Child child)
+            object.setParent(child);
 
         return object;
     }

diff --git a/src/main/java/org/xmlobjects/xal/adapter/deprecated/LocalityAdapter.java b/src/main/java/org/xmlobjects/xal/adapter/deprecated/LocalityAdapter.java
@@ -46,8 +46,8 @@ public class LocalityAdapter extends AddressObjectAdapter<Locality> {
     @Override
     public Locality createObject(QName name, Object parent) throws ObjectBuildException {
         Locality object = new Locality();
-        if (parent instanceof Child)
-            object.setParent((Child) parent);
+        if (parent instanceof Child child)
+            object.setParent(child);
 
         return object;
     }

diff --git a/src/main/java/org/xmlobjects/xal/adapter/deprecated/MailStopAdapter.java b/src/main/java/org/xmlobjects/xal/adapter/deprecated/MailStopAdapter.java
@@ -48,8 +48,8 @@ public class MailStopAdapter extends AddressObjectAdapter<PostalDeliveryPoint> {
     @Override
     public PostalDeliveryPoint createObject(QName name, Object parent) throws ObjectBuildException {
         PostalDeliveryPoint object = new PostalDeliveryPoint(PostalDeliveryPointType.MAIL_STOP);
-        if (parent instanceof Child)
-            object.setParent((Child) parent);
+        if (parent instanceof Child child)
+            object.setParent(child);
 
         return object;
     }

diff --git a/src/main/java/org/xmlobjects/xal/adapter/deprecated/PostBoxAdapter.java b/src/main/java/org/xmlobjects/xal/adapter/deprecated/PostBoxAdapter.java
@@ -48,8 +48,8 @@ public class PostBoxAdapter extends AddressObjectAdapter<PostalDeliveryPoint> {
     @Override
     public PostalDeliveryPoint createObject(QName name, Object parent) throws ObjectBuildException {
         PostalDeliveryPoint object = new PostalDeliveryPoint(PostalDeliveryPointType.PO_BOX);
-        if (parent instanceof Child)
-            object.setParent((Child) parent);
+        if (parent instanceof Child child)
+            object.setParent(child);
 
         return object;
     }

diff --git a/src/main/java/org/xmlobjects/xal/adapter/deprecated/PostOfficeAdapter.java b/src/main/java/org/xmlobjects/xal/adapter/deprecated/PostOfficeAdapter.java
@@ -47,8 +47,8 @@ public class PostOfficeAdapter extends AddressObjectAdapter<PostOffice> {
     @Override
     public PostOffice createObject(QName name, Object parent) throws ObjectBuildException {
         PostOffice object = new PostOffice();
-        if (parent instanceof Child)
-            object.setParent((Child) parent);
+        if (parent instanceof Child child)
+            object.setParent(child);
 
         return object;
     }

diff --git a/src/main/java/org/xmlobjects/xal/adapter/deprecated/PostTownAdapter.java b/src/main/java/org/xmlobjects/xal/adapter/deprecated/PostTownAdapter.java
@@ -47,8 +47,8 @@ public class PostTownAdapter extends AddressObjectAdapter<Locality> {
     @Override
     public Locality createObject(QName name, Object parent) throws ObjectBuildException {
         Locality object = new Locality(LocalityType.POST_TOWN);
-        if (parent instanceof Child)
-            object.setParent((Child) parent);
+        if (parent instanceof Child child)
+            object.setParent(child);
 
         return object;
     }

diff --git a/src/main/java/org/xmlobjects/xal/adapter/deprecated/PostalCodeAdapter.java b/src/main/java/org/xmlobjects/xal/adapter/deprecated/PostalCodeAdapter.java
@@ -47,8 +47,8 @@ public class PostalCodeAdapter extends AddressObjectAdapter<PostCode> {
     @Override
     public PostCode createObject(QName name, Object parent) throws ObjectBuildException {
         PostCode object = new PostCode();
-        if (parent instanceof Child)
-            object.setParent((Child) parent);
+        if (parent instanceof Child child)
+            object.setParent(child);
 
         return object;
     }

diff --git a/src/main/java/org/xmlobjects/xal/adapter/deprecated/PostalRouteAdapter.java b/src/main/java/org/xmlobjects/xal/adapter/deprecated/PostalRouteAdapter.java
@@ -47,8 +47,8 @@ public class PostalRouteAdapter extends AddressObjectAdapter<Thoroughfare> {
     @Override
     public Thoroughfare createObject(QName name, Object parent) throws ObjectBuildException {
         Thoroughfare object = new Thoroughfare();
-        if (parent instanceof Child)
-            object.setParent((Child) parent);
+        if (parent instanceof Child child)
+            object.setParent(child);
 
         return object;
     }

diff --git a/src/main/java/org/xmlobjects/xal/adapter/deprecated/PremiseAdapter.java b/src/main/java/org/xmlobjects/xal/adapter/deprecated/PremiseAdapter.java
@@ -45,8 +45,8 @@ public class PremiseAdapter extends AddressObjectAdapter<Premises> {
     @Override
     public Premises createObject(QName name, Object parent) throws ObjectBuildException {
         Premises object = new Premises();
-        if (parent instanceof Child)
-            object.setParent((Child) parent);
+        if (parent instanceof Child child)
+            object.setParent(child);
 
         return object;
     }

diff --git a/src/main/java/org/xmlobjects/xal/adapter/deprecated/SubAdministrativeAreaAdapter.java b/src/main/java/org/xmlobjects/xal/adapter/deprecated/SubAdministrativeAreaAdapter.java
@@ -45,8 +45,8 @@ public class SubAdministrativeAreaAdapter extends AddressObjectAdapter<SubAdmini
     @Override
     public SubAdministrativeArea createObject(QName name, Object parent) throws ObjectBuildException {
         SubAdministrativeArea object = new SubAdministrativeArea();
-        if (parent instanceof Child)
-            object.setParent((Child) parent);
+        if (parent instanceof Child child)
+            object.setParent(child);
 
         return object;
     }

diff --git a/src/main/java/org/xmlobjects/xal/adapter/deprecated/SubPremiseAdapter.java b/src/main/java/org/xmlobjects/xal/adapter/deprecated/SubPremiseAdapter.java
@@ -47,8 +47,8 @@ public class SubPremiseAdapter extends AddressObjectAdapter<SubPremises> {
     @Override
     public SubPremises createObject(QName name, Object parent) throws ObjectBuildException {
         SubPremises object = new SubPremises();
-        if (parent instanceof Child)
-            object.setParent((Child) parent);
+        if (parent instanceof Child child)
+            object.setParent(child);
 
         return object;
     }

diff --git a/src/main/java/org/xmlobjects/xal/adapter/deprecated/ThoroughfareAdapter.java b/src/main/java/org/xmlobjects/xal/adapter/deprecated/ThoroughfareAdapter.java
@@ -47,8 +47,8 @@ public class ThoroughfareAdapter extends AddressObjectAdapter<Thoroughfare> {
     @Override
     public Thoroughfare createObject(QName name, Object parent) throws ObjectBuildException {
         Thoroughfare object = new Thoroughfare();
-        if (parent instanceof Child)
-            object.setParent((Child) parent);
+        if (parent instanceof Child child)
+            object.setParent(child);
 
         return object;
     }

diff --git a/src/main/java/org/xmlobjects/xal/adapter/deprecated/types/PremiseNumberRangeAdapter.java b/src/main/java/org/xmlobjects/xal/adapter/deprecated/types/PremiseNumberRangeAdapter.java
@@ -44,7 +44,7 @@ public class PremiseNumberRangeAdapter implements ObjectBuilder<ChildList<Premis
 
     @Override
     public ChildList<PremisesNameOrNumber> createObject(QName name, Object parent) throws ObjectBuildException {
-        return new ChildList<>(parent instanceof Child ? (Child) parent : null);
+        return new ChildList<>(parent instanceof Child child ? child : null);
     }
 
     @Override

diff --git a/...main/java/org/xmlobjects/xal/adapter/deprecated/types/ThoroughfareNumberRangeAdapter.java b/...main/java/org/xmlobjects/xal/adapter/deprecated/types/ThoroughfareNumberRangeAdapter.java
@@ -45,7 +45,7 @@ public class ThoroughfareNumberRangeAdapter implements ObjectBuilder<ChildList<T
 
     @Override
     public ChildList<ThoroughfareNameOrNumber> createObject(QName name, Object parent) throws ObjectBuildException {
-        ChildList<ThoroughfareNameOrNumber> object = new ChildList<>(parent instanceof Child ? (Child) parent : null);
+        ChildList<ThoroughfareNameOrNumber> object = new ChildList<>(parent instanceof Child child ? child : null);
         separator = null;
         return object;
     }

diff --git a/src/main/java/org/xmlobjects/xal/model/XALObject.java b/src/main/java/org/xmlobjects/xal/model/XALObject.java
@@ -36,8 +36,8 @@ protected final <T extends Child> T asChild(T child) {
     }
 
     protected final <T extends Child> List<T> asChild(List<T> child) {
-        if (child instanceof ChildList) {
-            ((ChildList<T>) child).setParent(this);
+        if (child instanceof ChildList<T> childList) {
+            childList.setParent(this);
             return child;
         } else
             return child != null ? new ChildList<>(child, this) : null;