fix Sodium bump build problems

- fix Neon deprecated methods removed in Sodium
- use ListenerRegistry.getRegistrations() instead of Iterable manner
- autogenerated classes accessor getImplementedInterface() replaced by
  implementedInterface()

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I87283fdacd647a26f11e74e88a8717e0961533cc

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/DataStoreContextImpl.java b/common/src/main/java/org/opendaylight/transportpce/common/DataStoreContextImpl.java
index 72607df525c785a8763dc5c2677e354011fcb24c..6a9608bab06b10692ecafd8fad59a9975850135a 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/DataStoreContextImpl.java
+++ b/common/src/main/java/org/opendaylight/transportpce/common/DataStoreContextImpl.java
@@ -74,7 +74,8 @@ public class DataStoreContextImpl implements DataStoreContext {
         this.dataBroker = createDataBroker();
         this.notificationService = createNotificationService();
         this.notificationPublishService = createNotificationPublishService();
-        for (ListenerRegistration<SchemaContextListener> listener : this.mockedSchemaContext.listeners) {
+        for (ListenerRegistration<? extends SchemaContextListener> listener :
+                                                        this.mockedSchemaContext.listeners.getRegistrations()) {
             listener.getInstance().onGlobalContextUpdated(this.mockedSchemaContext.schemaContext);
         }
     }

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/converter/XMLDataObjectConverter.java b/common/src/main/java/org/opendaylight/transportpce/common/converter/XMLDataObjectConverter.java
index 5afbb407571ee08efe25fd5671a10667c375234f..90efeca088cdea7b68df5499dbf871b88785fd1a 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/converter/XMLDataObjectConverter.java
+++ b/common/src/main/java/org/opendaylight/transportpce/common/converter/XMLDataObjectConverter.java
@@ -17,7 +17,6 @@ import java.util.Optional;
 import javax.annotation.Nonnull;
 import javax.xml.XMLConstants;
 import javax.xml.parsers.FactoryConfigurationError;
-import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLOutputFactory;
 import javax.xml.stream.XMLStreamException;
@@ -192,8 +191,7 @@ public final class XMLDataObjectConverter extends AbstractDataObjectConverter {
         try (NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result);
              XmlParserStream xmlParser = XmlParserStream.create(streamWriter, getSchemaContext(), parentSchemaNode)) {
             xmlParser.parse(reader);
-        } catch (XMLStreamException | URISyntaxException | IOException | ParserConfigurationException
-                | SAXException e) {
+        } catch (XMLStreamException | URISyntaxException | IOException | SAXException e) {
             LOG.warn("An error {} occured during parsing XML input stream", e.getMessage(), e);
             return Optional.empty();
         }

diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsCalc.java b/pce/src/main/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsCalc.java
index 2cd7ec8065da200469d2b2e64037bb8c83dddeec..ebd51564fbc971e1da5f7b0b7b1527cd6ef7d726 100644 (file)
--- a/pce/src/main/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsCalc.java
+++ b/pce/src/main/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsCalc.java
@@ -192,7 +192,7 @@ public class PceConstraintsCalc {
         for (int i = 0; i < listHops.size(); i++) {
             HopType hoptype = listHops.get(i).getHopType().getHopType();
 
-            String hopt = hoptype.getImplementedInterface().getSimpleName();
+            String hopt = hoptype.implementedInterface().getSimpleName();
             LOG.info("in readIncludeNodes next hop to include {}", hopt);
             switch (hopt) {
                 case "Node":

diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/ModelMappingUtils.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/ModelMappingUtils.java
index 093729ac54cc59ffb2eb0ec58d3f5dfccf508f01..ba71e159aaec51b40085f95060d09d8db5b85587 100644 (file)
--- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/ModelMappingUtils.java
+++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/ModelMappingUtils.java
@@ -126,7 +126,7 @@ public final class ModelMappingUtils {
         String sortId = "";
         while (iterator.hasNext()) {
             ZToA pathDesObj = iterator.next();
-            resourceType = pathDesObj.getResource().getResource().getImplementedInterface().getSimpleName();
+            resourceType = pathDesObj.getResource().getResource().implementedInterface().getSimpleName();
             LOG.info("Inside ZtoA {}", resourceType);
 
             try {
@@ -201,7 +201,7 @@ public final class ModelMappingUtils {
 
         while (iterator.hasNext()) {
             AToZ pathDesObj = iterator.next();
-            resourceType = pathDesObj.getResource().getResource().getImplementedInterface().getSimpleName();
+            resourceType = pathDesObj.getResource().getResource().implementedInterface().getSimpleName();
             LOG.info("Inside AtoZ {}", resourceType);
             try {
                 if (TERMINATION_POINT.equals(resourceType)) {