Do not import java.io.Serial

This annotation is not worth an import, just use fully-qualified
references.

Change-Id: I393c5e13ef89f3ca740f010018288309dad96838
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/AbstractIdentifier.java b/common/util/src/main/java/org/opendaylight/yangtools/util/AbstractIdentifier.java
index 85058df2f319cab74e5c8756cf9215e73867ae91..133dcb019f2168adb74620ddd699b310ae2ec60b 100644 (file)
--- a/common/util/src/main/java/org/opendaylight/yangtools/util/AbstractIdentifier.java
+++ b/common/util/src/main/java/org/opendaylight/yangtools/util/AbstractIdentifier.java
@@ -10,7 +10,6 @@ package org.opendaylight.yangtools.util;
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.base.MoreObjects;
-import java.io.Serial;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.concepts.Identifier;
 
@@ -21,7 +20,7 @@ import org.opendaylight.yangtools.concepts.Identifier;
  * @param <T> Object type
  */
 public abstract class AbstractIdentifier<T> implements Identifier {
-    @Serial
+    @java.io.Serial
     private static final long serialVersionUID = 1L;
 
     private final @NonNull T value;
@@ -44,11 +43,7 @@ public abstract class AbstractIdentifier<T> implements Identifier {
         if (this == obj) {
             return true;
         }
-        if (obj == null) {
-            return false;
-        }
-
-        return getClass().equals(obj.getClass()) && value.equals(((AbstractIdentifier<?>)obj).value);
+        return obj != null && getClass().equals(obj.getClass()) && value.equals(((AbstractIdentifier<?>)obj).value);
     }
 
     @Override

diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/AbstractStringIdentifier.java b/common/util/src/main/java/org/opendaylight/yangtools/util/AbstractStringIdentifier.java
index 90a3c061f3bf9b5aa47ff4072a4e1a47adac8298..8eab6ae32b5565304d83001e843e1a937108c410 100644 (file)
--- a/common/util/src/main/java/org/opendaylight/yangtools/util/AbstractStringIdentifier.java
+++ b/common/util/src/main/java/org/opendaylight/yangtools/util/AbstractStringIdentifier.java
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.yangtools.util;
 
-import java.io.Serial;
 import java.util.UUID;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.concepts.Identifier;
@@ -17,7 +16,7 @@ import org.opendaylight.yangtools.concepts.Identifier;
  */
 public abstract class AbstractStringIdentifier<T extends AbstractStringIdentifier<T>>
         extends AbstractIdentifier<String> implements Comparable<T> {
-    @Serial
+    @java.io.Serial
     private static final long serialVersionUID = 1L;
 
     protected AbstractStringIdentifier(final @NonNull String string) {

diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/AbstractUUIDIdentifier.java b/common/util/src/main/java/org/opendaylight/yangtools/util/AbstractUUIDIdentifier.java
index 1de2304045a1bf4bce9d3354db422da3a1f3d5fa..afd9ed4d76b513a3096dde9b55ee9b4b26dce12e 100644 (file)
--- a/common/util/src/main/java/org/opendaylight/yangtools/util/AbstractUUIDIdentifier.java
+++ b/common/util/src/main/java/org/opendaylight/yangtools/util/AbstractUUIDIdentifier.java
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.yangtools.util;
 
-import java.io.Serial;
 import java.util.UUID;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.concepts.Identifier;
@@ -17,7 +16,7 @@ import org.opendaylight.yangtools.concepts.Identifier;
  */
 public abstract class AbstractUUIDIdentifier<T extends AbstractUUIDIdentifier<T>> extends AbstractIdentifier<UUID>
         implements Comparable<T> {
-    @Serial
+    @java.io.Serial
     private static final long serialVersionUID = 1L;
 
     protected AbstractUUIDIdentifier(final @NonNull UUID uuid) {

diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/ConstantArrayCollection.java b/common/util/src/main/java/org/opendaylight/yangtools/util/ConstantArrayCollection.java
index b3e7d616a96f3f2965e23ffacf9eee0ff03a9c96..7ff50b966bb52c90c052204eb08e81d22461f5e1 100644 (file)
--- a/common/util/src/main/java/org/opendaylight/yangtools/util/ConstantArrayCollection.java
+++ b/common/util/src/main/java/org/opendaylight/yangtools/util/ConstantArrayCollection.java
@@ -10,7 +10,6 @@ package org.opendaylight.yangtools.util;
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.collect.UnmodifiableIterator;
-import java.io.Serial;
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Collection;
@@ -27,7 +26,7 @@ import org.eclipse.jdt.annotation.NonNull;
  * @param <E> the type of elements in this list
  */
 final class ConstantArrayCollection<E> implements Collection<E>, Serializable {
-    @Serial
+    @java.io.Serial
     private static final long serialVersionUID = 1L;
 
     private final E @NonNull[] array;

diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/IOMv1.java b/common/util/src/main/java/org/opendaylight/yangtools/util/IOMv1.java
index 7982faa39152de948392e8d2b96db55a1a1fa1e0..ad77f71a922625e9e40bbb4e8ac9bf050653834a 100644 (file)
--- a/common/util/src/main/java/org/opendaylight/yangtools/util/IOMv1.java
+++ b/common/util/src/main/java/org/opendaylight/yangtools/util/IOMv1.java
@@ -15,14 +15,13 @@ import java.io.Externalizable;
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import java.io.Serial;
 import org.eclipse.jdt.annotation.NonNull;
 
 /**
  * Base class for {@link ImmutableOffsetMap} serialization proxies. Implements most of the serialization form at logic.
  */
 abstract sealed class IOMv1<T extends ImmutableOffsetMap<?, ?>> implements Externalizable permits OIOMv1, UIOMv1 {
-    @Serial
+    @java.io.Serial
     private static final long serialVersionUID = 1;
 
     private ImmutableOffsetMap<?, ?> map;
@@ -61,7 +60,7 @@ abstract sealed class IOMv1<T extends ImmutableOffsetMap<?, ?>> implements Exter
 
     abstract @NonNull T createInstance(@NonNull ImmutableList<Object> keys, @NonNull Object[] values);
 
-    @Serial
+    @java.io.Serial
     final Object readResolve() {
         return verifyNotNull(map);
     }

diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/ImmutableOffsetMap.java b/common/util/src/main/java/org/opendaylight/yangtools/util/ImmutableOffsetMap.java
index 58be1327ae4d20d131152156ed683cef434a18b5..dcce4c6b5e32b3a94d8f0160393349abbca7196d 100644 (file)
--- a/common/util/src/main/java/org/opendaylight/yangtools/util/ImmutableOffsetMap.java
+++ b/common/util/src/main/java/org/opendaylight/yangtools/util/ImmutableOffsetMap.java
@@ -13,7 +13,6 @@ import static java.util.Objects.requireNonNull;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.UnmodifiableIterator;
-import java.io.Serial;
 import java.io.Serializable;
 import java.util.AbstractMap.SimpleImmutableEntry;
 import java.util.AbstractSet;
@@ -39,7 +38,7 @@ import org.eclipse.jdt.annotation.Nullable;
  */
 public abstract sealed class ImmutableOffsetMap<K, V> implements UnmodifiableMapPhase<K, V>, Serializable {
     static final class Ordered<K, V> extends ImmutableOffsetMap<K, V> {
-        @Serial
+        @java.io.Serial
         private static final long serialVersionUID = 1L;
 
         Ordered(final ImmutableMap<K, Integer> offsets, final V[] objects) {
@@ -58,7 +57,7 @@ public abstract sealed class ImmutableOffsetMap<K, V> implements UnmodifiableMap
     }
 
     static final class Unordered<K, V> extends ImmutableOffsetMap<K, V> {
-        @Serial
+        @java.io.Serial
         private static final long serialVersionUID = 1L;
 
         Unordered(final ImmutableMap<K, Integer> offsets, final V[] objects) {
@@ -76,7 +75,7 @@ public abstract sealed class ImmutableOffsetMap<K, V> implements UnmodifiableMap
         }
     }
 
-    @Serial
+    @java.io.Serial
     private static final long serialVersionUID = 1L;
 
     private final @NonNull ImmutableMap<K, Integer> offsets;
@@ -357,6 +356,6 @@ public abstract sealed class ImmutableOffsetMap<K, V> implements UnmodifiableMap
         }
     }
 
-    @Serial
+    @java.io.Serial
     abstract Object writeReplace();
 }

diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/OIOMv1.java b/common/util/src/main/java/org/opendaylight/yangtools/util/OIOMv1.java
index 778a56edbd8a64449693241a82544706f7def519..0acbd00428cc657f16b421f3b8e596e928e6b707 100644 (file)
--- a/common/util/src/main/java/org/opendaylight/yangtools/util/OIOMv1.java
+++ b/common/util/src/main/java/org/opendaylight/yangtools/util/OIOMv1.java
@@ -8,7 +8,6 @@
 package org.opendaylight.yangtools.util;
 
 import com.google.common.collect.ImmutableList;
-import java.io.Serial;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.util.ImmutableOffsetMap.Ordered;
 
@@ -16,7 +15,7 @@ import org.opendaylight.yangtools.util.ImmutableOffsetMap.Ordered;
  * Serialization proxy for {@link Ordered}.
  */
 final class OIOMv1 extends IOMv1<Ordered<?, ?>> {
-    @Serial
+    @java.io.Serial
     private static final long serialVersionUID = 1;
 
     @SuppressWarnings("checkstyle:RedundantModifier")

diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/SSv1.java b/common/util/src/main/java/org/opendaylight/yangtools/util/SSv1.java
index 1545f8d31df5c3d5b23816077e0b07c4cf3674ce..68d4ed51526760ebbd00a621604f37f7ecad95be 100644 (file)
--- a/common/util/src/main/java/org/opendaylight/yangtools/util/SSv1.java
+++ b/common/util/src/main/java/org/opendaylight/yangtools/util/SSv1.java
@@ -7,14 +7,13 @@
  */
 package org.opendaylight.yangtools.util;
 
-import java.io.Serial;
 import java.io.Serializable;
 
 /**
  * Serialization proxy for {@link SingletonSet}.
  */
 final class SSv1 implements Serializable {
-    @Serial
+    @java.io.Serial
     private static final long serialVersionUID = 1;
 
     private final Object element;
@@ -23,7 +22,7 @@ final class SSv1 implements Serializable {
         this.element = element;
     }
 
-    @Serial
+    @java.io.Serial
     private Object readResolve() {
         return SingletonSet.of(element);
     }

diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/SharedSingletonMap.java b/common/util/src/main/java/org/opendaylight/yangtools/util/SharedSingletonMap.java
index 8c20269e1f89cf0bd7ba2c6579445930053aad52..8036473fecaf2896dabab6c2301c7983283d809d 100644 (file)
--- a/common/util/src/main/java/org/opendaylight/yangtools/util/SharedSingletonMap.java
+++ b/common/util/src/main/java/org/opendaylight/yangtools/util/SharedSingletonMap.java
@@ -13,10 +13,8 @@ import static java.util.Objects.requireNonNull;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
-import java.io.Serial;
 import java.io.Serializable;
 import java.util.AbstractMap.SimpleImmutableEntry;
-import java.util.Iterator;
 import java.util.Map;
 import org.eclipse.jdt.annotation.NonNull;
 
@@ -33,7 +31,7 @@ import org.eclipse.jdt.annotation.NonNull;
  */
 public abstract sealed class SharedSingletonMap<K, V> implements Serializable, UnmodifiableMapPhase<K, V> {
     static final class Ordered<K, V> extends SharedSingletonMap<K, V> {
-        @Serial
+        @java.io.Serial
         private static final long serialVersionUID = 1L;
 
         Ordered(final K key, final V value) {
@@ -51,7 +49,7 @@ public abstract sealed class SharedSingletonMap<K, V> implements Serializable, U
     }
 
     static final class Unordered<K, V> extends SharedSingletonMap<K, V> {
-        @Serial
+        @java.io.Serial
         private static final long serialVersionUID = 1L;
 
         Unordered(final K key, final V value) {
@@ -68,7 +66,7 @@ public abstract sealed class SharedSingletonMap<K, V> implements Serializable, U
         }
     }
 
-    @Serial
+    @java.io.Serial
     private static final long serialVersionUID = 1L;
     private static final LoadingCache<Object, SingletonSet<Object>> CACHE = CacheBuilder.newBuilder().weakValues()
             .build(new CacheLoader<Object, SingletonSet<Object>>() {
@@ -222,15 +220,8 @@ public abstract sealed class SharedSingletonMap<K, V> implements Serializable, U
 
     @Override
     public final boolean equals(final Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (!(obj instanceof Map)) {
-            return false;
-        }
-
-        final Map<?, ?> m = (Map<?, ?>)obj;
-        return m.size() == 1 && value.equals(m.get(keySet.getElement()));
+        return this == obj || obj instanceof Map<?, ?> other && other.size() == 1
+            && value.equals(other.get(keySet.getElement()));
     }
 
     @Override
@@ -244,9 +235,9 @@ public abstract sealed class SharedSingletonMap<K, V> implements Serializable, U
     }
 
     private static <K, V> Entry<K, V> singleEntry(final Map<K, V> map) {
-        final Iterator<Entry<K, V>> it = map.entrySet().iterator();
+        final var it = map.entrySet().iterator();
         checkArgument(it.hasNext(), "Input map is empty");
-        final Entry<K, V> ret = it.next();
+        final var ret = it.next();
         checkArgument(!it.hasNext(), "Input map has more than one entry");
         return ret;
     }

diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/SingletonSet.java b/common/util/src/main/java/org/opendaylight/yangtools/util/SingletonSet.java
index 6795dd8e885c3902caaa367bee19ef7da603ac1d..c1a6f5b0b8f0858d8b4863aa4267d65220e9db3d 100644 (file)
--- a/common/util/src/main/java/org/opendaylight/yangtools/util/SingletonSet.java
+++ b/common/util/src/main/java/org/opendaylight/yangtools/util/SingletonSet.java
@@ -11,7 +11,6 @@ import static java.util.Objects.requireNonNull;
 
 import com.google.common.collect.Iterators;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.io.Serial;
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.Iterator;
@@ -142,7 +141,7 @@ public abstract sealed class SingletonSet<E> implements Set<E>, Immutable, Seria
     }
 
     private static final class NullElement<E> extends SingletonSet<E> {
-        @Serial
+        @java.io.Serial
         private static final long serialVersionUID = 1L;
         static final @NonNull NullElement<?> INSTANCE = new NullElement<>();
 
@@ -176,7 +175,7 @@ public abstract sealed class SingletonSet<E> implements Set<E>, Immutable, Seria
 
     @NonNullByDefault
     private static final class Regular<E> extends SingletonSet<E> {
-        @Serial
+        @java.io.Serial
         private static final long serialVersionUID = 1L;
 
         private final @NonNull E element;

diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/UIOMv1.java b/common/util/src/main/java/org/opendaylight/yangtools/util/UIOMv1.java
index 7798226e05e93c7277bb514b4dcddf2fdc88f502..f89f037e87b2e23612ed1566b3a258d9d86dcd14 100644 (file)
--- a/common/util/src/main/java/org/opendaylight/yangtools/util/UIOMv1.java
+++ b/common/util/src/main/java/org/opendaylight/yangtools/util/UIOMv1.java
@@ -8,7 +8,6 @@
 package org.opendaylight.yangtools.util;
 
 import com.google.common.collect.ImmutableList;
-import java.io.Serial;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.util.ImmutableOffsetMap.Unordered;
 
@@ -16,7 +15,7 @@ import org.opendaylight.yangtools.util.ImmutableOffsetMap.Unordered;
  * Serialization proxy for {@link Unordered}.
  */
 final class UIOMv1 extends IOMv1<Unordered<?, ?>> {
-    @Serial
+    @java.io.Serial
     private static final long serialVersionUID = 1;
 
     @SuppressWarnings("checkstyle:RedundantModifier")

diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/CachedThreadPoolExecutor.java b/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/CachedThreadPoolExecutor.java
index e3f1f40f4ce5a0c960285e1a73832d9c199df553..3da7a55f82fc777a616c17a450adc17caf67c8e4 100644 (file)
--- a/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/CachedThreadPoolExecutor.java
+++ b/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/CachedThreadPoolExecutor.java
@@ -12,7 +12,6 @@ import static java.util.Objects.requireNonNull;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.MoreObjects.ToStringHelper;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.io.Serial;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.RejectedExecutionException;
@@ -130,7 +129,7 @@ public class CachedThreadPoolExecutor extends ThreadPoolExecutor {
      * threads are busy.
      */
     private static class ExecutorQueue extends SynchronousQueue<Runnable> {
-        @Serial
+        @java.io.Serial
         private static final long serialVersionUID = 1L;
 
         private static final long POLL_WAIT_TIME_IN_MS = 300;

diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/TrackingLinkedBlockingQueue.java b/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/TrackingLinkedBlockingQueue.java
index 4eaae3974e9d6f08919db00b2e350c6a29e48426..dcb45f404e50b2b8ff2323ce844d09f3e50ad7f7 100644 (file)
--- a/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/TrackingLinkedBlockingQueue.java
+++ b/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/TrackingLinkedBlockingQueue.java
@@ -8,7 +8,6 @@
 package org.opendaylight.yangtools.util.concurrent;
 
 import com.google.common.annotations.Beta;
-import java.io.Serial;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.util.Collection;
@@ -24,7 +23,7 @@ import org.eclipse.jdt.annotation.NonNull;
  * @param <E> the element t.ype
  */
 public class TrackingLinkedBlockingQueue<E> extends LinkedBlockingQueue<E> {
-    @Serial
+    @java.io.Serial
     private static final long serialVersionUID = 1L;
 
     private static final VarHandle LARGEST_QUEUE_SIZE;

diff --git a/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/DSIv1.java b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/DSIv1.java
index b0afdddfca874346416e6ee2b2643f5c7594c7c7..2b1a7c3967106d565c1f293fd96636de08a0b65f 100644 (file)
--- a/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/DSIv1.java
+++ b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/DSIv1.java
@@ -13,12 +13,11 @@ import java.io.Externalizable;
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import java.io.Serial;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.common.QName;
 
 final class DSIv1 implements Externalizable {
-    @Serial
+    @java.io.Serial
     private static final long serialVersionUID = 1L;
 
     private QName qname;
@@ -42,7 +41,7 @@ final class DSIv1 implements Externalizable {
         qname = QName.readFrom(in);
     }
 
-    @Serial
+    @java.io.Serial
     private Object readResolve() {
         return DatastoreIdentifier.create(qname);
     }

diff --git a/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NIPv2.java b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NIPv2.java
index 838ad1a387d3b8ca00c26ba098c8f0721a3c0f94..18b6213523e1d20d0748cd86398c5a2ce81d2302 100644 (file)
--- a/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NIPv2.java
+++ b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NIPv2.java
@@ -14,7 +14,6 @@ import java.io.Externalizable;
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import java.io.Serial;
 import java.util.Map.Entry;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
@@ -23,7 +22,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdent
  * Externalizable proxy for {@link NodeIdentifierWithPredicates}.
  */
 final class NIPv2 implements Externalizable {
-    @Serial
+    @java.io.Serial
     private static final long serialVersionUID = 1L;
 
     private NodeIdentifierWithPredicates nip;
@@ -65,7 +64,7 @@ final class NIPv2 implements Externalizable {
         };
     }
 
-    @Serial
+    @java.io.Serial
     private Object readResolve() {
         return nip;
     }

diff --git a/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NIVv1.java b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NIVv1.java
index 17d32fb3c3da6af4c31450a20f9a4ae49a9d2849..89f78c518b75e70aba70d8eddd983cf323a9a023 100644 (file)
--- a/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NIVv1.java
+++ b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NIVv1.java
@@ -13,7 +13,6 @@ import java.io.Externalizable;
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import java.io.Serial;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue;
 
@@ -21,7 +20,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithV
  * Externalizable proxy for {@link NodeWithValue}.
  */
 final class NIVv1 implements Externalizable {
-    @Serial
+    @java.io.Serial
     private static final long serialVersionUID = 1L;
 
     private NodeWithValue<?> niv;
@@ -46,7 +45,7 @@ final class NIVv1 implements Externalizable {
         niv = new NodeWithValue<>(QName.readFrom(in), in.readObject());
     }
 
-    @Serial
+    @java.io.Serial
     private Object readResolve() {
         return niv;
     }

diff --git a/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NIv1.java b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NIv1.java
index 018d4f474dca7ad70efa6e9815b81f32e827738e..635e95ee624f3650c40d6178c7d8b2806ad4c983 100644 (file)
--- a/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NIv1.java
+++ b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/NIv1.java
@@ -13,7 +13,6 @@ import java.io.Externalizable;
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import java.io.Serial;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
 
@@ -21,7 +20,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdent
  * Externalizable proxy for {@link NodeIdentifier}.
  */
 final class NIv1 implements Externalizable {
-    @Serial
+    @java.io.Serial
     private static final long serialVersionUID = 1L;
 
     private NodeIdentifier nid;
@@ -45,7 +44,7 @@ final class NIv1 implements Externalizable {
         nid = new NodeIdentifier(QName.readFrom(in));
     }
 
-    @Serial
+    @java.io.Serial
     private Object readResolve() {
         return nid;
     }

diff --git a/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YIDv1.java b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YIDv1.java
index 53b6a966e2c1f046c229fa578d1db1c9ada0cd46..34b32a263bd78a0ac9d3c56afac5755fe5a77a65 100644 (file)
--- a/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YIDv1.java
+++ b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YIDv1.java
@@ -14,14 +14,13 @@ import java.io.Externalizable;
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import java.io.Serial;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 
 /**
  * Externalizable proxy for {@link YangInstanceIdentifier}.
  */
 final class YIDv1 implements Externalizable {
-    @Serial
+    @java.io.Serial
     private static final long serialVersionUID = 1L;
 
     private YangInstanceIdentifier yid;
@@ -56,7 +55,7 @@ final class YIDv1 implements Externalizable {
         yid = YangInstanceIdentifier.of(builder.build());
     }
 
-    @Serial
+    @java.io.Serial
     private Object readResolve() {
         return yid;
     }