From: Robert Varga Date: Mon, 3 Jul 2023 20:47:01 +0000 (+0200) Subject: Bump upstreams X-Git-Tag: release/potassium~8 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=lispflowmapping.git;a=commitdiff_plain;h=b8ecf2c4f639936e005487cd8d8c4cc1cf14abc2 Bump upstreams Adopt: - odparent-13.0.3 - infrautils-6.0.1 - yangtools-11.0.0 - mdsal-12.0.0 - controller-8.0.0 - aaa-0.18.0 - netconf-6.0.0 Change-Id: I3565609227c85dad80b92eed98b605565a741992 Signed-off-by: Robert Varga --- diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 2a6e26281..15f68d842 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 12.0.3 + 13.0.3 diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml index fdc4593d8..bde6013bb 100644 --- a/commons/parent/pom.xml +++ b/commons/parent/pom.xml @@ -15,7 +15,7 @@ for plugin configuration etc. --> org.opendaylight.odlparent odlparent - 12.0.3 + 13.0.3 @@ -45,14 +45,14 @@ org.opendaylight.mdsal mdsal-artifacts - 11.0.7 + 12.0.0 pom import org.opendaylight.controller controller-artifacts - 7.0.4 + 8.0.0 pom import diff --git a/features/features-lispflowmapping/pom.xml b/features/features-lispflowmapping/pom.xml index 1d7cdfb38..daa76048c 100644 --- a/features/features-lispflowmapping/pom.xml +++ b/features/features-lispflowmapping/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent feature-repo-parent - 12.0.3 + 13.0.3 diff --git a/features/odl-lispflowmapping-inmemorydb/pom.xml b/features/odl-lispflowmapping-inmemorydb/pom.xml index 98967ffb9..171dd892b 100644 --- a/features/odl-lispflowmapping-inmemorydb/pom.xml +++ b/features/odl-lispflowmapping-inmemorydb/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 12.0.3 + 13.0.3 @@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller controller-artifacts - 7.0.4 + 8.0.0 pom import diff --git a/features/odl-lispflowmapping-inmemorydb/src/main/feature/feature.xml b/features/odl-lispflowmapping-inmemorydb/src/main/feature/feature.xml index 8310e7cd5..d79193711 100644 --- a/features/odl-lispflowmapping-inmemorydb/src/main/feature/feature.xml +++ b/features/odl-lispflowmapping-inmemorydb/src/main/feature/feature.xml @@ -8,6 +8,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL --> - odl-mdsal-broker + odl-mdsal-broker diff --git a/features/odl-lispflowmapping-mappingservice-shell/pom.xml b/features/odl-lispflowmapping-mappingservice-shell/pom.xml index 83b02b3e7..715bb5c68 100644 --- a/features/odl-lispflowmapping-mappingservice-shell/pom.xml +++ b/features/odl-lispflowmapping-mappingservice-shell/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 12.0.3 + 13.0.3 diff --git a/features/odl-lispflowmapping-mappingservice/pom.xml b/features/odl-lispflowmapping-mappingservice/pom.xml index 9abe935bb..15908de56 100644 --- a/features/odl-lispflowmapping-mappingservice/pom.xml +++ b/features/odl-lispflowmapping-mappingservice/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 12.0.3 + 13.0.3 @@ -28,7 +28,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf odl-restconf - 5.0.4 + 6.0.0 xml features diff --git a/features/odl-lispflowmapping-models/pom.xml b/features/odl-lispflowmapping-models/pom.xml index 60324a268..aa201ab75 100644 --- a/features/odl-lispflowmapping-models/pom.xml +++ b/features/odl-lispflowmapping-models/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 12.0.3 + 13.0.3 @@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal mdsal-artifacts - 11.0.7 + 12.0.0 pom import diff --git a/features/odl-lispflowmapping-models/src/main/feature/feature.xml b/features/odl-lispflowmapping-models/src/main/feature/feature.xml index b2828906c..844fd9083 100644 --- a/features/odl-lispflowmapping-models/src/main/feature/feature.xml +++ b/features/odl-lispflowmapping-models/src/main/feature/feature.xml @@ -8,7 +8,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL --> - odl-apache-commons-lang3 - odl-mdsal-model-rfc6991 + odl-apache-commons-lang3 + odl-mdsal-model-rfc6991 diff --git a/features/odl-lispflowmapping-msmr/pom.xml b/features/odl-lispflowmapping-msmr/pom.xml index 0bdc6a83f..72fe76772 100644 --- a/features/odl-lispflowmapping-msmr/pom.xml +++ b/features/odl-lispflowmapping-msmr/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 12.0.3 + 13.0.3 diff --git a/features/odl-lispflowmapping-southbound/pom.xml b/features/odl-lispflowmapping-southbound/pom.xml index 54a2bfec5..8f4a87269 100644 --- a/features/odl-lispflowmapping-southbound/pom.xml +++ b/features/odl-lispflowmapping-southbound/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 12.0.3 + 13.0.3 @@ -28,14 +28,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf odl-restconf - 5.0.4 + 6.0.0 xml features org.opendaylight.controller odl-mdsal-broker - 7.0.4 + 8.0.0 xml features diff --git a/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml b/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml index 69651d811..1c00de49a 100644 --- a/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml +++ b/features/odl-lispflowmapping-southbound/src/main/feature/feature.xml @@ -8,7 +8,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL --> - odl-netty-4 - odl-mdsal-broker + odl-netty-4 + odl-mdsal-broker diff --git a/features/pom.xml b/features/pom.xml index 8c7d0013b..dacf4f1d0 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 12.0.3 + 13.0.3 diff --git a/integrationtest/pom.xml b/integrationtest/pom.xml index df629c238..1d5adfe5a 100644 --- a/integrationtest/pom.xml +++ b/integrationtest/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller mdsal-it-parent - 7.0.4 + 8.0.0 diff --git a/lispflowmapping-karaf/pom.xml b/lispflowmapping-karaf/pom.xml index d94521a90..7b1668fa5 100644 --- a/lispflowmapping-karaf/pom.xml +++ b/lispflowmapping-karaf/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent karaf4-parent - 12.0.3 + 13.0.3 diff --git a/mappingservice/api/pom.xml b/mappingservice/api/pom.xml index db199566f..609452b0c 100644 --- a/mappingservice/api/pom.xml +++ b/mappingservice/api/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.mdsal binding-parent - 11.0.7 + 12.0.0 diff --git a/mappingservice/dsbackend/pom.xml b/mappingservice/dsbackend/pom.xml index 44b2c2d33..6d4538b5f 100644 --- a/mappingservice/dsbackend/pom.xml +++ b/mappingservice/dsbackend/pom.xml @@ -31,6 +31,11 @@ ${project.groupId} mappingservice.lisp-proto + + com.github.spotbugs + spotbugs-annotations + true + org.opendaylight.mdsal mdsal-binding-api diff --git a/mappingservice/dsbackend/src/main/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEnd.java b/mappingservice/dsbackend/src/main/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEnd.java index e37580809..93375c4cd 100644 --- a/mappingservice/dsbackend/src/main/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEnd.java +++ b/mappingservice/dsbackend/src/main/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEnd.java @@ -286,7 +286,7 @@ public class DataStoreBackEnd implements TransactionChainListener { try { Optional optionalDataObject = readFuture.get(); if (optionalDataObject != null && optionalDataObject.isPresent()) { - return optionalDataObject.get(); + return optionalDataObject.orElseThrow(); } else { LOG.debug("{}: Failed to read", Thread.currentThread().getStackTrace()[1]); } diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/DSBEInputUtil.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/DSBEInputUtil.java index 41495ec7f..00fc1360b 100644 --- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/DSBEInputUtil.java +++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/DSBEInputUtil.java @@ -9,8 +9,8 @@ package org.opendaylight.lispflowmapping.implementation.util; import static java.util.Objects.requireNonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Set; +import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.lispflowmapping.lisp.type.MappingData; import org.opendaylight.lispflowmapping.lisp.util.LispAddressStringifier; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.SiteId; diff --git a/mappingservice/lisp-proto/pom.xml b/mappingservice/lisp-proto/pom.xml index 65e586f8a..0866a79ba 100644 --- a/mappingservice/lisp-proto/pom.xml +++ b/mappingservice/lisp-proto/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 11.0.7 + 12.0.0 diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4BinarySerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4BinarySerializer.java index 54609f558..c1d983357 100644 --- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4BinarySerializer.java +++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4BinarySerializer.java @@ -108,7 +108,7 @@ public final class Ipv4BinarySerializer extends LispAddressSerializer { private static Ipv4Address deserializeDataNonBinary(ByteBuffer buffer) { byte[] ipBuffer = new byte[4]; buffer.get(ipBuffer); - return IetfInetUtil.INSTANCE.ipv4AddressFor(ipBuffer); + return IetfInetUtil.ipv4AddressFor(ipBuffer); } protected interface Length { diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4Serializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4Serializer.java index f69216ac2..4ac25f827 100644 --- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4Serializer.java +++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4Serializer.java @@ -105,7 +105,7 @@ public final class Ipv4Serializer extends LispAddressSerializer { private static Ipv4Address deserializeData(ByteBuffer buffer) { byte[] ipBuffer = new byte[4]; buffer.get(ipBuffer); - return IetfInetUtil.INSTANCE.ipv4AddressFor(ipBuffer); + return IetfInetUtil.ipv4AddressFor(ipBuffer); } protected interface Length { diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/MacSerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/MacSerializer.java index 7f0bd3c07..76e0d5344 100644 --- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/MacSerializer.java +++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/MacSerializer.java @@ -51,12 +51,12 @@ public final class MacSerializer extends LispAddressSerializer { @Override protected void serializeData(ByteBuffer buffer, LispAddress lispAddress) { Mac mac = (Mac) lispAddress.getAddress(); - buffer.put(IetfYangUtil.INSTANCE.macAddressBytes(mac.getMac())); + buffer.put(IetfYangUtil.macAddressBytes(mac.getMac())); } @Override protected void serializeData(ByteBuffer buffer, SimpleAddress simpleAddress) { - buffer.put(IetfYangUtil.INSTANCE.macAddressBytes(simpleAddress.getMacAddress())); + buffer.put(IetfYangUtil.macAddressBytes(simpleAddress.getMacAddress())); } @Override @@ -85,7 +85,7 @@ public final class MacSerializer extends LispAddressSerializer { private static MacAddress deserializeData(ByteBuffer buffer) { byte[] macBuffer = new byte[6]; buffer.get(macBuffer); - return IetfYangUtil.INSTANCE.macAddressFor(macBuffer); + return IetfYangUtil.macAddressFor(macBuffer); } private interface Length { diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressUtil.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressUtil.java index f24b58965..f38856a41 100644 --- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressUtil.java +++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressUtil.java @@ -148,11 +148,11 @@ public final class LispAddressUtil { if (address instanceof Inet4Address) { return new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types .rev151105.lisp.address.address.Ipv4Builder() - .setIpv4(IetfInetUtil.INSTANCE.ipv4AddressFor(address)).build(); + .setIpv4(IetfInetUtil.ipv4AddressFor(address)).build(); } else if (address instanceof Inet6Address) { return new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types .rev151105.lisp.address.address.Ipv6Builder() - .setIpv6(IetfInetUtil.INSTANCE.ipv6AddressFor(address)).build(); + .setIpv6(IetfInetUtil.ipv6AddressFor(address)).build(); } return null; } @@ -454,7 +454,7 @@ public final class LispAddressUtil { } public static Eid asIpv4PrefixEid(Ipv4Address addr, InstanceIdType vni) { - return toEid(new IpPrefix(IetfInetUtil.INSTANCE.ipv4PrefixFor(addr)), vni); + return toEid(new IpPrefix(IetfInetUtil.ipv4PrefixFor(addr)), vni); } public static Eid asIpv4PrefixEid(final String prefix, final InstanceIdType iiType) { @@ -466,7 +466,7 @@ public final class LispAddressUtil { builder.setAddressType(Ipv4PrefixAfi.VALUE); builder.setVirtualNetworkId(eid.getVirtualNetworkId()); builder.setAddress(new Ipv4PrefixBuilder().setIpv4Prefix( - IetfInetUtil.INSTANCE.ipv4PrefixFor(address, mask)).build()); + IetfInetUtil.ipv4PrefixFor(address, mask)).build()); return builder.build(); } @@ -529,7 +529,7 @@ public final class LispAddressUtil { } public static Eid asIpv6PrefixEid(Ipv6Address addr, InstanceIdType vni) { - return toEid(new IpPrefix(IetfInetUtil.INSTANCE.ipv6PrefixFor(addr)), vni); + return toEid(new IpPrefix(IetfInetUtil.ipv6PrefixFor(addr)), vni); } public static Eid asIpv6PrefixEid(Eid eid, Inet6Address address, short mask) { @@ -537,7 +537,7 @@ public final class LispAddressUtil { builder.setAddressType(Ipv6PrefixAfi.VALUE); builder.setVirtualNetworkId(eid.getVirtualNetworkId()); builder.setAddress(new Ipv6PrefixBuilder().setIpv6Prefix( - IetfInetUtil.INSTANCE.ipv6PrefixFor(address, mask)).build()); + IetfInetUtil.ipv6PrefixFor(address, mask)).build()); return builder.build(); } @@ -895,25 +895,25 @@ public final class LispAddressUtil { private static org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105 .lisp.address.address.Ipv4Prefix convertFromBinary(Ipv4PrefixBinary prefix) { - return new Ipv4PrefixBuilder().setIpv4Prefix(IetfInetUtil.INSTANCE.ipv4PrefixFor( + return new Ipv4PrefixBuilder().setIpv4Prefix(IetfInetUtil.ipv4PrefixFor( prefix.getIpv4AddressBinary().getValue(), prefix.getIpv4MaskLength().toJava())).build(); } private static org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105 .lisp.address.address.Ipv6Prefix convertFromBinary(Ipv6PrefixBinary prefix) { - return new Ipv6PrefixBuilder().setIpv6Prefix(IetfInetUtil.INSTANCE.ipv6PrefixFor( + return new Ipv6PrefixBuilder().setIpv6Prefix(IetfInetUtil.ipv6PrefixFor( prefix.getIpv6AddressBinary().getValue(), prefix.getIpv6MaskLength().toJava())).build(); } private static Ipv4 convertFromBinary(Ipv4Binary address) { - return new Ipv4Builder().setIpv4(IetfInetUtil.INSTANCE.ipv4AddressFor(address.getIpv4Binary().getValue())) + return new Ipv4Builder().setIpv4(IetfInetUtil.ipv4AddressFor(address.getIpv4Binary().getValue())) .build(); } private static Ipv6 convertFromBinary(Ipv6Binary address) { - return new Ipv6Builder().setIpv6(IetfInetUtil.INSTANCE.ipv6AddressFor(address.getIpv6Binary().getValue())) + return new Ipv6Builder().setIpv6(IetfInetUtil.ipv6AddressFor(address.getIpv6Binary().getValue())) .build(); } diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/MaskUtil.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/MaskUtil.java index 60219345c..f2ecd0989 100644 --- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/MaskUtil.java +++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/MaskUtil.java @@ -173,7 +173,7 @@ public final class MaskUtil { short mask = Short.parseShort(prefix[1]); InetAddress normalizedAddress = normalizeIP(InetAddresses.forString(prefix[0]), mask); - return IetfInetUtil.INSTANCE.ipPrefixFor(normalizedAddress.getAddress(), mask); + return IetfInetUtil.ipPrefixFor(normalizedAddress.getAddress(), mask); } private static InetAddress normalizeIP(InetAddress address, int maskLength) throws UnknownHostException { diff --git a/mappingservice/pom.xml b/mappingservice/pom.xml index 9d7c0d538..4c43f7c5f 100644 --- a/mappingservice/pom.xml +++ b/mappingservice/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent - 12.0.3 + 13.0.3 @@ -38,7 +38,7 @@ org.opendaylight.mdsal mdsal-artifacts - 11.0.7 + 12.0.0 pom import diff --git a/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/lisp/cache/MapRegisterPartialDeserializer.java b/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/lisp/cache/MapRegisterPartialDeserializer.java index be6cfe6c9..972b077fd 100644 --- a/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/lisp/cache/MapRegisterPartialDeserializer.java +++ b/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/lisp/cache/MapRegisterPartialDeserializer.java @@ -167,7 +167,7 @@ public final class MapRegisterPartialDeserializer { final int eidPrefixAfi = ByteUtil.getUnsignedShort(buffer, startPositionOfEidPrefixAFI); Optional eidPrefixLengthOpt = resolveEidPrefixAfi(eidPrefixAfi, buffer); if (eidPrefixLengthOpt.isPresent()) { - final byte[] eidPrefix = new byte[eidPrefixLengthOpt.get()]; + final byte[] eidPrefix = new byte[eidPrefixLengthOpt.orElseThrow()]; final int startPositionOfEidPrefix = startPositionOfEidPrefixAFI + NUM_OF_BYTES_EID_PREFIX_AFI; buffer.position(startPositionOfEidPrefix); buffer.get(eidPrefix);