Uplift of PMS source from ONAP

Bugfixes, timing problems in unittests.

Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
Issue-ID: NONRTRIC-551
Change-Id: I8700d5ca427e5fcbb4ce3ff25e799c890a9e491a

diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/InfoTypeSubscriptions.java b/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/InfoTypeSubscriptions.java
index f54a849..bdf0e8e 100644 (file)
--- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/InfoTypeSubscriptions.java
+++ b/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/repository/InfoTypeSubscriptions.java
@@ -103,13 +103,13 @@ public class InfoTypeSubscriptions {
     }
 
     public synchronized void clear() {
-        this.allSubscriptions.clear();
-        this.subscriptionsByOwner.clear();
+        allSubscriptions.clear();
+        subscriptionsByOwner.clear();
     }
 
     public void remove(SubscriptionInfo subscription) {
         allSubscriptions.remove(subscription.getId());
-        this.subscriptionsByOwner.remove(subscription.owner, subscription.id);
+        subscriptionsByOwner.remove(subscription.owner, subscription.id);
         logger.debug("Removed type status subscription {}", subscription.id);
     }
 
@@ -121,17 +121,15 @@ public class InfoTypeSubscriptions {
      * @return
      */
     public synchronized Collection<SubscriptionInfo> getSubscriptionsForOwner(String owner) {
-        return this.subscriptionsByOwner.get(owner);
+        return subscriptionsByOwner.get(owner);
     }
 
     public synchronized void notifyTypeRegistered(InfoType type) {
-        this.allSubscriptions
-            .forEach((id, subscription) -> subscription.callback.notifyTypeRegistered(type, subscription));
+        allSubscriptions.forEach((id, subscription) -> subscription.callback.notifyTypeRegistered(type, subscription));
     }
 
     public synchronized void notifyTypeRemoved(InfoType type) {
-        this.allSubscriptions
-            .forEach((id, subscription) -> subscription.callback.notifyTypeRemoved(type, subscription));
+        allSubscriptions.forEach((id, subscription) -> subscription.callback.notifyTypeRemoved(type, subscription));
     }
 
 }

diff --git a/onap/oran b/onap/oran
index b9a7016..633c8e3 160000 (submodule)
--- a/onap/oran
+++ b/onap/oran
@@ -1 +1 @@
-Subproject commit b9a7016920746a6537bf4c0165595e758716ea03
+Subproject commit 633c8e32702db13c28349152c76efea8e97fb252