aboutsummaryrefslogtreecommitdiffstats
path: root/integrity-monitor/src/main
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2020-01-10 11:30:21 -0500
committerJim Hahn <jrh3@att.com>2020-01-10 14:44:58 -0500
commit1f049a441ac4efc63fb9671107649d6106f02f7c (patch)
treee9964640a0a65c015a9c7b5a4f8a48a674f52133 /integrity-monitor/src/main
parent613946040a9e49bed487b5946f925bb6f22c5ee8 (diff)
Address items deprecated by move to java 11
Addressed the following deprecated items: - "new Integer(xxx)" - Observable/Observer - Mockito.anyObject() Added assertion to a junit test to address a sonar issue. Did not address deprecated Nashorn javascript interpreter; that will be done in a separate review. Updated licenses. Issue-ID: POLICY-1406 Signed-off-by: Jim Hahn <jrh3@att.com> Change-Id: I81fd158f831e01d5410d79898ced658285787d47
Diffstat (limited to 'integrity-monitor/src/main')
-rw-r--r--integrity-monitor/src/main/java/org/onap/policy/common/im/StateChangeNotifier.java43
-rw-r--r--integrity-monitor/src/main/java/org/onap/policy/common/im/StateManagement.java27
2 files changed, 45 insertions, 25 deletions
diff --git a/integrity-monitor/src/main/java/org/onap/policy/common/im/StateChangeNotifier.java b/integrity-monitor/src/main/java/org/onap/policy/common/im/StateChangeNotifier.java
index a678319f..eee3a9ef 100644
--- a/integrity-monitor/src/main/java/org/onap/policy/common/im/StateChangeNotifier.java
+++ b/integrity-monitor/src/main/java/org/onap/policy/common/im/StateChangeNotifier.java
@@ -2,14 +2,14 @@
* ============LICENSE_START=======================================================
* Integrity Monitor
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017, 2020 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,22 +20,19 @@
package org.onap.policy.common.im;
-import java.util.Observable;
-import java.util.Observer;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-/*
+/*
* This is implementing the Observer interface to make it specific for
* state management.
- *
- * It saves the StateManagement object and a String message that is
- * passed in when notifyObservers is called by the Observable
- * host class.
- *
- * It provides an abstract method for handling the state change
- * so this class must be overwritten and made concrete for the
- * Observer who is monitoring the state changes.
+ *
+ * It saves the StateManagement object and a String message that is
+ * passed in when notifyObservers is called by the Observable
+ * host class.
+ *
+ * It provides an abstract method for handling the state change
+ * so this class must be overwritten and made concrete for the
+ * Observer who is monitoring the state changes.
*/
@@ -46,19 +43,23 @@ import org.slf4j.LoggerFactory;
* StateManagement class.
*
*/
-public class StateChangeNotifier implements Observer {
+public class StateChangeNotifier {
private static final Logger logger = LoggerFactory.getLogger(StateChangeNotifier.class);
// The observable class
StateManagement stateManagement;
// A string argument passed by the observable class when
- // Observable:notifyObservers(Object arg) is called
+ // StateManagement:notifyObservers(String changed) is called
String message;
- @Override
- public void update(Observable observable, Object arg) {
- this.stateManagement = (StateManagement) observable;
- this.message = (String) arg;
+ /**
+ * Invoked to indicate that something observed by this notifier has changed.
+ * @param observable item that has changed
+ * @param changed message indicating what change was made
+ */
+ public void update(StateManagement observable, String changed) {
+ this.stateManagement = observable;
+ this.message = changed;
handleStateChange();
}
diff --git a/integrity-monitor/src/main/java/org/onap/policy/common/im/StateManagement.java b/integrity-monitor/src/main/java/org/onap/policy/common/im/StateManagement.java
index 68ad3bc6..7a018ef9 100644
--- a/integrity-monitor/src/main/java/org/onap/policy/common/im/StateManagement.java
+++ b/integrity-monitor/src/main/java/org/onap/policy/common/im/StateManagement.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* Integrity Monitor
* ================================================================================
- * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,8 +20,9 @@
package org.onap.policy.common.im;
+import java.util.Collection;
import java.util.List;
-import java.util.Observable;
+import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Consumer;
import javax.persistence.EntityManager;
@@ -43,7 +44,7 @@ import org.slf4j.LoggerFactory;
* notified.
*
*/
-public class StateManagement extends Observable {
+public class StateManagement {
private static final String RESOURCE_NAME = "resource";
private static final String GET_STATE_MANAGEMENT_ENTITY_QUERY =
"Select p from StateManagementEntity p where p.resourceName=:" + RESOURCE_NAME;
@@ -97,6 +98,11 @@ public class StateManagement extends Observable {
private static final Object FLUSHLOCK = new Object();
/**
+ * Observers to be notified when this object changes state.
+ */
+ private final Collection<StateChangeNotifier> observers = new ConcurrentLinkedQueue<>();
+
+ /**
* StateManagement constructor.
*
* @param entityManagerFactory the entity manager factory
@@ -162,7 +168,6 @@ public class StateManagement extends Observable {
et.commit();
if (changed != null) {
- setChanged();
notifyObservers(changed);
}
@@ -175,6 +180,20 @@ public class StateManagement extends Observable {
}
}
+ /**
+ * Adds an observer to list of those to be notified when this changes.
+ * @param observer observer to be added
+ */
+ public void addObserver(StateChangeNotifier observer) {
+ observers.add(observer);
+ }
+
+ private void notifyObservers(String changed) {
+ for (StateChangeNotifier obs : observers) {
+ obs.update(this, changed);
+ }
+ }
+
private void setStateUsingTable(String actionName, String resourceName, String changeName)
throws StateManagementException {