X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=olm%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Folm%2Futil%2FOlmUtils121.java;h=ca20d6cdd3ef64c506e4ac48b7824c0b00ea048c;hb=HEAD;hp=9e882a2b7991c4a9571144567c131ad9d3f6e3ac;hpb=303bf6a2c50119d6a16525af2bde84d74435a7a1;p=transportpce.git

diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils121.java b/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils121.java
index 9e882a2b7..bcbb8f134 100644
--- a/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils121.java
+++ b/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils121.java
@@ -86,7 +86,7 @@ final class OlmUtils121 {
             //PmNamesEnum pmName = null;
             List<org.opendaylight.yang.gen.v1.http
                     .org.opendaylight.transportpce.olm.rev210618.get.pm.output.Measurements> measurements =
-                extractWantedMeasurements(currentPmList.get(),
+                extractWantedMeasurements(currentPmList.orElseThrow(),
                     ResourceTypeEnum.forValue(input.getResourceType().getIntValue()),
                     input.getResourceIdentifier(),
                     PmGranularity.forValue(input.getGranularity().getIntValue()),
@@ -153,8 +153,6 @@ final class OlmUtils121 {
             extractMeasurements(List<Measurements> measurementsFromDevice, PmNamesEnum pmNamesEnum, String extension,
             org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev220926.Location location,
             org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev220926.Direction direction) {
-        List<org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.get.pm.output.Measurements>
-            extractedMeasurements = new ArrayList<>();
         List<Measurements> pmMeasurements = measurementsFromDevice;
         Stream<Measurements> measurementStream = pmMeasurements.stream();
         if (pmNamesEnum != null) {
@@ -180,6 +178,8 @@ final class OlmUtils121 {
                 .equals(direction.getName()));
         }
         List<Measurements> filteredMeasurements = measurementStream.collect(Collectors.toList());
+        List<org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.get.pm.output.Measurements>
+            extractedMeasurements = new ArrayList<>();
         for (Measurements measure : filteredMeasurements) {
             MeasurementsBuilder measurement = new MeasurementsBuilder();
             measurement.setPmparameterName(measure.getMeasurement().getPmParameterName().getType().toString());