From 383f47b1ae6e767d0bd8334f4f45e4cf83bd7c32 Mon Sep 17 00:00:00 2001 From: PatrikBuhr Date: Fri, 27 Aug 2021 09:02:49 +0200 Subject: [PATCH] Uplift of PMS source from ONAP Bugfixes, timing problems in unittests. Signed-off-by: PatrikBuhr Issue-ID: NONRTRIC-551 Change-Id: I8700d5ca427e5fcbb4ce3ff25e799c890a9e491a --- .../enrichment/repository/InfoTypeSubscriptions.java | 14 ++++++-------- onap/oran | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) 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 f54a8498..bdf0e8e4 100644 --- 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 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 b9a70169..633c8e32 160000 --- a/onap/oran +++ b/onap/oran @@ -1 +1 @@ -Subproject commit b9a7016920746a6537bf4c0165595e758716ea03 +Subproject commit 633c8e32702db13c28349152c76efea8e97fb252 -- 2.16.6