summaryrefslogtreecommitdiffstats
path: root/controlloop/common
diff options
context:
space:
mode:
authorJorge Hernandez <jh1730@att.com>2018-01-18 19:49:37 +0000
committerGerrit Code Review <gerrit@onap.org>2018-01-18 19:49:37 +0000
commitdef409f0065bd7e892833dfce8f5a60dcffdf97d (patch)
treed3e2b3e1a21af6c613b52a38ae6af20b1640b824 /controlloop/common
parentcebad66213ff84469971b253320f72fa3a41b3cd (diff)
parentb2a9a8adbcf036780bf47c5c94dbf65a088ab540 (diff)
Merge "Fix Tech Debt/JUnit on control loop event POJOs"
Diffstat (limited to 'controlloop/common')
-rw-r--r--controlloop/common/actors/actor.appc/src/main/java/org/onap/policy/controlloop/actor/appc/APPCActorServiceProvider.java4
-rw-r--r--controlloop/common/actors/actor.appc/src/test/java/org/onap/policy/controlloop/actor/appc/AppcServiceProviderTest.java32
-rw-r--r--controlloop/common/actors/actor.appclcm/src/main/java/org/onap/policy/controlloop/actor/appclcm/AppcLcmActorServiceProvider.java8
-rw-r--r--controlloop/common/actors/actor.appclcm/src/test/java/org/onap/policy/controlloop/actor/appclcm/AppcLcmServiceProviderTest.java40
-rw-r--r--controlloop/common/actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SOActorServiceProvider.java6
-rw-r--r--controlloop/common/actors/actor.vfc/src/main/java/org/onap/policy/controlloop/actor/vfc/VFCActorServiceProvider.java18
-rw-r--r--controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java108
-rw-r--r--controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager.java54
-rw-r--r--controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManagerTest.java74
-rw-r--r--controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManagerTest.java26
-rw-r--r--controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopEvent.java118
-rw-r--r--controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopNotification.java163
-rw-r--r--controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopOperation.java84
-rw-r--r--controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopOperationWrapper.java20
-rw-r--r--controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/PhysicalControlLoopEvent.java6
-rw-r--r--controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/PhysicalControlLoopNotification.java4
-rw-r--r--controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/VirtualControlLoopEvent.java33
-rw-r--r--controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/VirtualControlLoopNotification.java37
-rw-r--r--controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/util/Serialization.java73
19 files changed, 614 insertions, 294 deletions
diff --git a/controlloop/common/actors/actor.appc/src/main/java/org/onap/policy/controlloop/actor/appc/APPCActorServiceProvider.java b/controlloop/common/actors/actor.appc/src/main/java/org/onap/policy/controlloop/actor/appc/APPCActorServiceProvider.java
index 41a99496c..c0bbfe8f3 100644
--- a/controlloop/common/actors/actor.appc/src/main/java/org/onap/policy/controlloop/actor/appc/APPCActorServiceProvider.java
+++ b/controlloop/common/actors/actor.appc/src/main/java/org/onap/policy/controlloop/actor/appc/APPCActorServiceProvider.java
@@ -94,8 +94,8 @@ public class APPCActorServiceProvider implements Actor {
*/
Request request = new Request();
request.setCommonHeader(new CommonHeader());
- request.getCommonHeader().setRequestID(onset.requestID);
- request.getCommonHeader().setSubRequestID(operation.subRequestId);
+ request.getCommonHeader().setRequestID(onset.getRequestID());
+ request.getCommonHeader().setSubRequestID(operation.getSubRequestId());
request.setAction(policy.getRecipe().substring(0, 1).toUpperCase()
+ policy.getRecipe().substring(1));
diff --git a/controlloop/common/actors/actor.appc/src/test/java/org/onap/policy/controlloop/actor/appc/AppcServiceProviderTest.java b/controlloop/common/actors/actor.appc/src/test/java/org/onap/policy/controlloop/actor/appc/AppcServiceProviderTest.java
index e07589081..89de717fb 100644
--- a/controlloop/common/actors/actor.appc/src/test/java/org/onap/policy/controlloop/actor/appc/AppcServiceProviderTest.java
+++ b/controlloop/common/actors/actor.appc/src/test/java/org/onap/policy/controlloop/actor/appc/AppcServiceProviderTest.java
@@ -60,24 +60,24 @@ public class AppcServiceProviderTest {
* generic-vnf.vnf-id and a target type of VM.
*/
onsetEvent = new VirtualControlLoopEvent();
- onsetEvent.closedLoopControlName = "closedLoopControlName-Test";
- onsetEvent.requestID = UUID.randomUUID();
- onsetEvent.closedLoopEventClient = "tca.instance00001";
- onsetEvent.target_type = ControlLoopTargetType.VNF;
- onsetEvent.target = "generic-vnf.vnf-name";
- onsetEvent.from = "DCAE";
- onsetEvent.closedLoopAlarmStart = Instant.now();
- onsetEvent.AAI = new HashMap<>();
- onsetEvent.AAI.put("generic-vnf.vnf-name", "fw0001vm001fw001");
- onsetEvent.closedLoopEventStatus = ControlLoopEventStatus.ONSET;
+ onsetEvent.setClosedLoopControlName("closedLoopControlName-Test");
+ onsetEvent.setRequestID(UUID.randomUUID());
+ onsetEvent.setClosedLoopEventClient("tca.instance00001");
+ onsetEvent.setTargetType(ControlLoopTargetType.VNF);
+ onsetEvent.setTarget("generic-vnf.vnf-name");
+ onsetEvent.setFrom("DCAE");
+ onsetEvent.setClosedLoopAlarmStart(Instant.now());
+ onsetEvent.setAAI(new HashMap<>());
+ onsetEvent.getAAI().put("generic-vnf.vnf-name", "fw0001vm001fw001");
+ onsetEvent.setClosedLoopEventStatus(ControlLoopEventStatus.ONSET);
/* Construct an operation with an APPC actor and ModifyConfig operation. */
operation = new ControlLoopOperation();
- operation.actor = "APPC";
- operation.operation = "ModifyConfig";
- operation.target = "VNF";
- operation.end = Instant.now();
- operation.subRequestId = "1";
+ operation.setActor("APPC");
+ operation.setOperation("ModifyConfig");
+ operation.setTarget("VNF");
+ operation.setEnd(Instant.now());
+ operation.setSubRequestId("1");
/* Construct a policy specifying to modify configuration. */
policy = new Policy();
@@ -123,7 +123,7 @@ public class AppcServiceProviderTest {
/* A common header is required and cannot be null */
assertNotNull(appcRequest.getCommonHeader());
- assertEquals(appcRequest.getCommonHeader().getRequestID(), onsetEvent.requestID);
+ assertEquals(appcRequest.getCommonHeader().getRequestID(), onsetEvent.getRequestID());
/* An action is required and cannot be null */
assertNotNull(appcRequest.getAction());
diff --git a/controlloop/common/actors/actor.appclcm/src/main/java/org/onap/policy/controlloop/actor/appclcm/AppcLcmActorServiceProvider.java b/controlloop/common/actors/actor.appclcm/src/main/java/org/onap/policy/controlloop/actor/appclcm/AppcLcmActorServiceProvider.java
index 0f4a00423..8e416cb63 100644
--- a/controlloop/common/actors/actor.appclcm/src/main/java/org/onap/policy/controlloop/actor/appclcm/AppcLcmActorServiceProvider.java
+++ b/controlloop/common/actors/actor.appclcm/src/main/java/org/onap/policy/controlloop/actor/appclcm/AppcLcmActorServiceProvider.java
@@ -211,7 +211,7 @@ public class AppcLcmActorServiceProvider implements Actor {
*/
LCMRequestWrapper dmaapRequest = new LCMRequestWrapper();
dmaapRequest.setVersion("2.0");
- dmaapRequest.setCorrelationId(onset.requestID + "-" + operation.subRequestId);
+ dmaapRequest.setCorrelationId(onset.getRequestID() + "-" + operation.getSubRequestId());
dmaapRequest.setRpcName(policy.getRecipe().toLowerCase());
dmaapRequest.setType("request");
@@ -220,9 +220,9 @@ public class AppcLcmActorServiceProvider implements Actor {
/* The common header is a required field for all APPC requests. */
LCMCommonHeader requestCommonHeader = new LCMCommonHeader();
- requestCommonHeader.setOriginatorId(onset.requestID.toString());
- requestCommonHeader.setRequestId(onset.requestID);
- requestCommonHeader.setSubRequestId(operation.subRequestId);
+ requestCommonHeader.setOriginatorId(onset.getRequestID().toString());
+ requestCommonHeader.setRequestId(onset.getRequestID());
+ requestCommonHeader.setSubRequestId(operation.getSubRequestId());
appcRequest.setCommonHeader(requestCommonHeader);
diff --git a/controlloop/common/actors/actor.appclcm/src/test/java/org/onap/policy/controlloop/actor/appclcm/AppcLcmServiceProviderTest.java b/controlloop/common/actors/actor.appclcm/src/test/java/org/onap/policy/controlloop/actor/appclcm/AppcLcmServiceProviderTest.java
index d446968ef..b498566da 100644
--- a/controlloop/common/actors/actor.appclcm/src/test/java/org/onap/policy/controlloop/actor/appclcm/AppcLcmServiceProviderTest.java
+++ b/controlloop/common/actors/actor.appclcm/src/test/java/org/onap/policy/controlloop/actor/appclcm/AppcLcmServiceProviderTest.java
@@ -66,24 +66,24 @@ public class AppcLcmServiceProviderTest {
* generic-vnf.vnf-id and a target type of VM.
*/
onsetEvent = new VirtualControlLoopEvent();
- onsetEvent.closedLoopControlName = "closedLoopControlName-Test";
- onsetEvent.requestID = UUID.randomUUID();
- onsetEvent.closedLoopEventClient = "tca.instance00001";
- onsetEvent.target_type = ControlLoopTargetType.VM;
- onsetEvent.target = "generic-vnf.vnf-name";
- onsetEvent.from = "DCAE";
- onsetEvent.closedLoopAlarmStart = Instant.now();
- onsetEvent.AAI = new HashMap<>();
- onsetEvent.AAI.put("generic-vnf.vnf-name", "fw0001vm001fw001");
- onsetEvent.closedLoopEventStatus = ControlLoopEventStatus.ONSET;
+ onsetEvent.setClosedLoopControlName("closedLoopControlName-Test");
+ onsetEvent.setRequestID(UUID.randomUUID());
+ onsetEvent.setClosedLoopEventClient("tca.instance00001");
+ onsetEvent.setTargetType(ControlLoopTargetType.VM);
+ onsetEvent.setTarget("generic-vnf.vnf-name");
+ onsetEvent.setFrom("DCAE");
+ onsetEvent.setClosedLoopAlarmStart(Instant.now());
+ onsetEvent.setAAI(new HashMap<>());
+ onsetEvent.getAAI().put("generic-vnf.vnf-name", "fw0001vm001fw001");
+ onsetEvent.setClosedLoopEventStatus(ControlLoopEventStatus.ONSET);
/* Construct an operation with an APPC actor and restart operation. */
operation = new ControlLoopOperation();
- operation.actor = "APPC";
- operation.operation = "Restart";
- operation.target = "VM";
- operation.end = Instant.now();
- operation.subRequestId = "1";
+ operation.setActor("APPC");
+ operation.setOperation("Restart");
+ operation.setTarget("VM");
+ operation.setEnd(Instant.now());
+ operation.setSubRequestId("1");
/* Construct a policy specifying to restart vm. */
policy = new Policy();
@@ -98,13 +98,13 @@ public class AppcLcmServiceProviderTest {
/* A sample DMAAP request wrapper. */
dmaapRequest = new LCMRequestWrapper();
- dmaapRequest.setCorrelationId(onsetEvent.requestID.toString() + "-" + "1");
+ dmaapRequest.setCorrelationId(onsetEvent.getRequestID().toString() + "-" + "1");
dmaapRequest.setRpcName(policy.getRecipe().toLowerCase());
dmaapRequest.setType("request");
/* A sample DMAAP response wrapper */
dmaapResponse = new LCMResponseWrapper();
- dmaapResponse.setCorrelationId(onsetEvent.requestID.toString() + "-" + "1");
+ dmaapResponse.setCorrelationId(onsetEvent.getRequestID().toString() + "-" + "1");
dmaapResponse.setRpcName(policy.getRecipe().toLowerCase());
dmaapResponse.setType("response");
@@ -125,9 +125,9 @@ public class AppcLcmServiceProviderTest {
appcRequest.setActionIdentifiers(actionIdentifiers);
LCMCommonHeader commonHeader = new LCMCommonHeader();
- commonHeader.setRequestId(onsetEvent.requestID);
+ commonHeader.setRequestId(onsetEvent.getRequestID());
commonHeader.setSubRequestId("1");
- commonHeader.setOriginatorId(onsetEvent.requestID.toString());
+ commonHeader.setOriginatorId(onsetEvent.getRequestID().toString());
appcRequest.setCommonHeader(commonHeader);
@@ -184,7 +184,7 @@ public class AppcLcmServiceProviderTest {
/* A common header is required and cannot be null */
assertNotNull(appcRequest.getCommonHeader());
- assertEquals(appcRequest.getCommonHeader().getRequestId(), onsetEvent.requestID);
+ assertEquals(appcRequest.getCommonHeader().getRequestId(), onsetEvent.getRequestID());
/* An action is required and cannot be null */
assertNotNull(appcRequest.getAction());
diff --git a/controlloop/common/actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SOActorServiceProvider.java b/controlloop/common/actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SOActorServiceProvider.java
index ad27a0201..6fe1c7f36 100644
--- a/controlloop/common/actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SOActorServiceProvider.java
+++ b/controlloop/common/actors/actor.so/src/main/java/org/onap/policy/controlloop/actor/so/SOActorServiceProvider.java
@@ -158,7 +158,7 @@ public class SOActorServiceProvider implements Actor {
//
Map<String, Map<String, String>> aainqinstancefiltermap = new HashMap<>();
Map<String, String> aainqinstancefiltermapitem = new HashMap<>();
- aainqinstancefiltermapitem.put("vserver-name", onset.AAI.get("vserver.vserver-name")); // TO DO: get vserver.vname from dcae onset.AAI.get("vserver.vserver-name")
+ aainqinstancefiltermapitem.put("vserver-name", onset.getAAI().get("vserver.vserver-name")); // TO DO: get vserver.vname from dcae onset.AAI.get("vserver.vserver-name")
aainqinstancefiltermap.put("vserver", aainqinstancefiltermapitem);
aainqinstancefilter.getInstanceFilter().add(aainqinstancefiltermap);
aainqrequest.setInstanceFilters(aainqinstancefilter);
@@ -186,7 +186,7 @@ public class SOActorServiceProvider implements Actor {
//***** send the request *****\\
AAINQResponse aainqresponse = new AAIManager(new RESTManager()).postQuery(aaiUrl, aaiUsername, aaiPassword,
- aainqrequest, onset.requestID);
+ aainqrequest, onset.getRequestID());
// Check AAI response
if (aainqresponse == null) {
@@ -196,7 +196,7 @@ public class SOActorServiceProvider implements Actor {
return null;
} else {
// Create AAINQResponseWrapper
- AAINQResponseWrapper aainqResponseWrapper = new AAINQResponseWrapper(onset.requestID, aainqresponse);
+ AAINQResponseWrapper aainqResponseWrapper = new AAINQResponseWrapper(onset.getRequestID(), aainqresponse);
// insert aainqResponseWrapper to memory -- Is this needed?
// insert(aainqResponseWrapper);
diff --git a/controlloop/common/actors/actor.vfc/src/main/java/org/onap/policy/controlloop/actor/vfc/VFCActorServiceProvider.java b/controlloop/common/actors/actor.vfc/src/main/java/org/onap/policy/controlloop/actor/vfc/VFCActorServiceProvider.java
index efa3dba1f..dae60cb82 100644
--- a/controlloop/common/actors/actor.vfc/src/main/java/org/onap/policy/controlloop/actor/vfc/VFCActorServiceProvider.java
+++ b/controlloop/common/actors/actor.vfc/src/main/java/org/onap/policy/controlloop/actor/vfc/VFCActorServiceProvider.java
@@ -70,7 +70,7 @@ public class VFCActorServiceProvider implements Actor {
Policy policy, AAIGETVnfResponse vnfResponse) {
// Construct an VFC request
VFCRequest request = new VFCRequest();
- String serviceInstance = onset.AAI.get("service-instance.service-instance-id");
+ String serviceInstance = onset.getAAI().get("service-instance.service-instance-id");
if (serviceInstance == null || "".equals(serviceInstance))
{
AAIGETVnfResponse tempVnfResp = vnfResponse;
@@ -83,18 +83,18 @@ public class VFCActorServiceProvider implements Actor {
serviceInstance = tempVnfResp.getServiceId();
}
request.nsInstanceId = serviceInstance;
- request.requestId = onset.requestID;
+ request.requestId = onset.getRequestID();
request.healRequest = new VFCHealRequest();
- request.healRequest.vnfInstanceId = onset.AAI.get("generic-vnf.vnf-id");
- request.healRequest.cause = operation.message;
+ request.healRequest.vnfInstanceId = onset.getAAI().get("generic-vnf.vnf-id");
+ request.healRequest.cause = operation.getMessage();
request.healRequest.additionalParams = new VFCHealAdditionalParams();
switch (policy.getRecipe().toLowerCase()) {
case "restart":
request.healRequest.additionalParams.action = "restartvm";
request.healRequest.additionalParams.actionInfo = new VFCHealActionVmInfo();
- request.healRequest.additionalParams.actionInfo.vmid = onset.AAI.get("vserver.vserver-id");
- request.healRequest.additionalParams.actionInfo.vmname = onset.AAI.get("vserver.vserver-name");
+ request.healRequest.additionalParams.actionInfo.vmid = onset.getAAI().get("vserver.vserver-id");
+ request.healRequest.additionalParams.actionInfo.vmname = onset.getAAI().get("vserver.vserver-name");
break;
default:
return null;
@@ -105,9 +105,9 @@ public class VFCActorServiceProvider implements Actor {
private static AAIGETVnfResponse getAAIServiceInstance(VirtualControlLoopEvent event) {
AAIGETVnfResponse response = null;
- UUID requestID = event.requestID;
- String vnfName = event.AAI.get("generic-vnf.vnf-name");
- String vnfID = event.AAI.get("generic-vnf.vnf-id");
+ UUID requestID = event.getRequestID();
+ String vnfName = event.getAAI().get("generic-vnf.vnf-name");
+ String vnfID = event.getAAI().get("generic-vnf.vnf-id");
String aaiUrl = PolicyEngine.manager.getEnvironmentProperty("aai.url");
String aaiUsername = PolicyEngine.manager.getEnvironmentProperty("aai.username");
String aaiPassword = PolicyEngine.manager.getEnvironmentProperty("aai.password");
diff --git a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java
index 559eab9d9..2b296616d 100644
--- a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java
+++ b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java
@@ -157,15 +157,15 @@ public class ControlLoopEventManager implements LockCallback, Serializable {
this.onset = event;
this.numOnsets = 1;
//
- notification.notification = ControlLoopNotificationType.ACTIVE;
+ notification.setNotification(ControlLoopNotificationType.ACTIVE);
//
// Set ourselves as active
//
this.isActivated = true;
} catch (ControlLoopException e) {
logger.error("{}: activate threw: ",this, e);
- notification.notification = ControlLoopNotificationType.REJECTED;
- notification.message = e.getMessage();
+ notification.setNotification(ControlLoopNotificationType.REJECTED);
+ notification.setMessage(e.getMessage());
}
return notification;
}
@@ -214,15 +214,15 @@ public class ControlLoopEventManager implements LockCallback, Serializable {
//
//
//
- notification.notification = ControlLoopNotificationType.ACTIVE;
+ notification.setNotification(ControlLoopNotificationType.ACTIVE);
//
// Set ourselves as active
//
this.isActivated = true;
} catch (ControlLoopException e) {
logger.error("{}: activate threw: ",this, e);
- notification.notification = ControlLoopNotificationType.REJECTED;
- notification.message = e.getMessage();
+ notification.setNotification(ControlLoopNotificationType.REJECTED);
+ notification.setMessage(e.getMessage());
}
return notification;
}
@@ -251,9 +251,9 @@ public class ControlLoopEventManager implements LockCallback, Serializable {
//
// Yes we have timed out
//
- notification.notification = ControlLoopNotificationType.FINAL_FAILURE;
- notification.message = "Control Loop timed out";
- notification.history.addAll(this.controlLoopHistory);
+ notification.setNotification(ControlLoopNotificationType.FINAL_FAILURE);
+ notification.setMessage("Control Loop timed out");
+ notification.getHistory().addAll(this.controlLoopHistory);
return notification;
}
//
@@ -269,18 +269,18 @@ public class ControlLoopEventManager implements LockCallback, Serializable {
switch (result) {
case FINAL_FAILURE_EXCEPTION:
- notification.message = "Exception in processing closed loop";
+ notification.setMessage("Exception in processing closed loop");
case FINAL_FAILURE:
case FINAL_FAILURE_RETRIES:
case FINAL_FAILURE_TIMEOUT:
case FINAL_FAILURE_GUARD:
- notification.notification = ControlLoopNotificationType.FINAL_FAILURE;
+ notification.setNotification(ControlLoopNotificationType.FINAL_FAILURE);
break;
case FINAL_OPENLOOP:
- notification.notification = ControlLoopNotificationType.FINAL_OPENLOOP;
+ notification.setNotification(ControlLoopNotificationType.FINAL_OPENLOOP);
break;
case FINAL_SUCCESS:
- notification.notification = ControlLoopNotificationType.FINAL_SUCCESS;
+ notification.setNotification(ControlLoopNotificationType.FINAL_SUCCESS);
break;
default:
return null;
@@ -288,7 +288,7 @@ public class ControlLoopEventManager implements LockCallback, Serializable {
//
// Be sure to add all the history
//
- notification.history.addAll(this.controlLoopHistory);
+ notification.getHistory().addAll(this.controlLoopHistory);
return notification;
}
@@ -401,7 +401,7 @@ public class ControlLoopEventManager implements LockCallback, Serializable {
LockResult<GuardResult, TargetLock> lockResult = PolicyGuard.lockTarget(
this.currentOperation.policy.getTarget().getType(),
this.currentOperation.getTargetEntity(),
- this.onset.requestID,
+ this.onset.getRequestID(),
this);
//
// Was it acquired?
@@ -440,7 +440,7 @@ public class ControlLoopEventManager implements LockCallback, Serializable {
public NEW_EVENT_STATUS onNewEvent(VirtualControlLoopEvent event) throws AAIException {
try {
this.checkEventSyntax(event);
- if (event.closedLoopEventStatus == ControlLoopEventStatus.ONSET) {
+ if (event.getClosedLoopEventStatus() == ControlLoopEventStatus.ONSET) {
//
// Check if this is our original ONSET
//
@@ -460,7 +460,7 @@ public class ControlLoopEventManager implements LockCallback, Serializable {
//
this.numOnsets++;
return NEW_EVENT_STATUS.SUBSEQUENT_ONSET;
- } else if (event.closedLoopEventStatus == ControlLoopEventStatus.ABATED) {
+ } else if (event.getClosedLoopEventStatus() == ControlLoopEventStatus.ABATED) {
//
// Have we already got an abatement?
//
@@ -499,9 +499,9 @@ public class ControlLoopEventManager implements LockCallback, Serializable {
public VirtualControlLoopNotification setControlLoopTimedOut() {
this.controlLoopTimedOut = FinalResult.FINAL_FAILURE_TIMEOUT;
VirtualControlLoopNotification notification = new VirtualControlLoopNotification(this.onset);
- notification.notification = ControlLoopNotificationType.FINAL_FAILURE;
- notification.message = "Control Loop timed out";
- notification.history.addAll(this.controlLoopHistory);
+ notification.setNotification(ControlLoopNotificationType.FINAL_FAILURE);
+ notification.setMessage("Control Loop timed out");
+ notification.getHistory().addAll(this.controlLoopHistory);
return notification;
}
@@ -528,43 +528,43 @@ public class ControlLoopEventManager implements LockCallback, Serializable {
}
public void checkEventSyntax(VirtualControlLoopEvent event) throws ControlLoopException {
- if (event.closedLoopEventStatus == null ||
- (event.closedLoopEventStatus != ControlLoopEventStatus.ONSET &&
- event.closedLoopEventStatus != ControlLoopEventStatus.ABATED)) {
+ if (event.getClosedLoopEventStatus() == null ||
+ (event.getClosedLoopEventStatus() != ControlLoopEventStatus.ONSET &&
+ event.getClosedLoopEventStatus() != ControlLoopEventStatus.ABATED)) {
throw new ControlLoopException("Invalid value in closedLoopEventStatus");
}
- if (event.closedLoopControlName == null || event.closedLoopControlName.length() < 1) {
+ if (event.getClosedLoopControlName() == null || event.getClosedLoopControlName().length() < 1) {
throw new ControlLoopException("No control loop name");
}
- if (event.requestID == null) {
+ if (event.getRequestID() == null) {
throw new ControlLoopException("No request ID");
}
- if (event.closedLoopEventStatus == ControlLoopEventStatus.ABATED) {
+ if (event.getClosedLoopEventStatus() == ControlLoopEventStatus.ABATED) {
return;
}
- if (event.target == null || event.target.length() < 1) {
+ if (event.getTarget() == null || event.getTarget().length() < 1) {
throw new ControlLoopException("No target field");
- } else if (! "VM_NAME".equalsIgnoreCase(event.target) &&
- ! "VNF_NAME".equalsIgnoreCase(event.target) &&
- ! "vserver.vserver-name".equalsIgnoreCase(event.target) &&
- ! "generic-vnf.vnf-id".equalsIgnoreCase(event.target) &&
- ! "generic-vnf.vnf-name".equalsIgnoreCase(event.target) ) {
+ } else if (! "VM_NAME".equalsIgnoreCase(event.getTarget()) &&
+ ! "VNF_NAME".equalsIgnoreCase(event.getTarget()) &&
+ ! "vserver.vserver-name".equalsIgnoreCase(event.getTarget()) &&
+ ! "generic-vnf.vnf-id".equalsIgnoreCase(event.getTarget()) &&
+ ! "generic-vnf.vnf-name".equalsIgnoreCase(event.getTarget()) ) {
throw new ControlLoopException("target field invalid - expecting VM_NAME or VNF_NAME");
}
- if (event.AAI == null) {
+ if (event.getAAI() == null) {
throw new ControlLoopException("AAI is null");
}
- if (event.AAI.get("generic-vnf.vnf-id") == null && event.AAI.get("vserver.vserver-name") == null &&
- event.AAI.get("generic-vnf.vnf-name") == null) {
+ if (event.getAAI().get("generic-vnf.vnf-id") == null && event.getAAI().get("vserver.vserver-name") == null &&
+ event.getAAI().get("generic-vnf.vnf-name") == null) {
throw new ControlLoopException("generic-vnf.vnf-id or generic-vnf.vnf-name or vserver.vserver-name information missing");
}
}
public void queryAai(VirtualControlLoopEvent event) throws AAIException {
- if (event.AAI.get("vserver.is-closed-loop-disabled") == null &&
- event.AAI.get("generic-vnf.is-closed-loop-disabled") == null) {
+ if (event.getAAI().get("vserver.is-closed-loop-disabled") == null &&
+ event.getAAI().get("generic-vnf.is-closed-loop-disabled") == null) {
try {
- if (event.AAI.get("generic-vnf.vnf-id") != null) {
+ if (event.getAAI().get("generic-vnf.vnf-id") != null) {
vnfResponse = getAAIVnfInfo(event);
if (vnfResponse == null) {
throw new AAIException("AAI Response is null (query by vnf-id)");
@@ -575,7 +575,7 @@ public class ControlLoopEventManager implements LockCallback, Serializable {
if (isClosedLoopDisabled(vnfResponse) == true) {
throw new AAIException("is-closed-loop-disabled is set to true");
}
- } else if (event.AAI.get("generic-vnf.vnf-name") != null) {
+ } else if (event.getAAI().get("generic-vnf.vnf-name") != null) {
vnfResponse = getAAIVnfInfo(event);
if (vnfResponse == null) {
throw new AAIException("AAI Response is null (query by vnf-name)");
@@ -586,7 +586,7 @@ public class ControlLoopEventManager implements LockCallback, Serializable {
if (isClosedLoopDisabled(vnfResponse) == true) {
throw new AAIException("is-closed-loop-disabled is set to true");
}
- } else if (event.AAI.get("vserver.vserver-name") != null) {
+ } else if (event.getAAI().get("vserver.vserver-name") != null) {
vserverResponse = getAAIVserverInfo(event);
if (vserverResponse == null) {
throw new AAIException("AAI Response is null (query by vserver-name)");
@@ -632,25 +632,25 @@ public class ControlLoopEventManager implements LockCallback, Serializable {
}
public static boolean isClosedLoopDisabled(VirtualControlLoopEvent event) {
- if ("true".equalsIgnoreCase(event.AAI.get("vserver.is-closed-loop-disabled")) ||
- "T".equalsIgnoreCase(event.AAI.get("vserver.is-closed-loop-disabled")) ||
- "yes".equalsIgnoreCase(event.AAI.get("vserver.is-closed-loop-disabled")) ||
- "Y".equalsIgnoreCase(event.AAI.get("vserver.is-closed-loop-disabled"))) {
+ if ("true".equalsIgnoreCase(event.getAAI().get("vserver.is-closed-loop-disabled")) ||
+ "T".equalsIgnoreCase(event.getAAI().get("vserver.is-closed-loop-disabled")) ||
+ "yes".equalsIgnoreCase(event.getAAI().get("vserver.is-closed-loop-disabled")) ||
+ "Y".equalsIgnoreCase(event.getAAI().get("vserver.is-closed-loop-disabled"))) {
return true;
}
- else if ("true".equalsIgnoreCase(event.AAI.get("generic-vnf.is-closed-loop-disabled")) ||
- "T".equalsIgnoreCase(event.AAI.get("generic-vnf.is-closed-loop-disabled")) ||
- "yes".equalsIgnoreCase(event.AAI.get("generic-vnf.is-closed-loop-disabled")) ||
- "Y".equalsIgnoreCase(event.AAI.get("generic-vnf.is-closed-loop-disabled"))) {
+ else if ("true".equalsIgnoreCase(event.getAAI().get("generic-vnf.is-closed-loop-disabled")) ||
+ "T".equalsIgnoreCase(event.getAAI().get("generic-vnf.is-closed-loop-disabled")) ||
+ "yes".equalsIgnoreCase(event.getAAI().get("generic-vnf.is-closed-loop-disabled")) ||
+ "Y".equalsIgnoreCase(event.getAAI().get("generic-vnf.is-closed-loop-disabled"))) {
return true;
}
return false;
}
public static AAIGETVserverResponse getAAIVserverInfo(VirtualControlLoopEvent event) throws ControlLoopException {
- UUID requestID = event.requestID;
+ UUID requestID = event.getRequestID();
AAIGETVserverResponse response = null;
- String vserverName = event.AAI.get("vserver.vserver-name");
+ String vserverName = event.getAAI().get("vserver.vserver-name");
try {
if (vserverName != null) {
@@ -671,10 +671,10 @@ public class ControlLoopEventManager implements LockCallback, Serializable {
}
public static AAIGETVnfResponse getAAIVnfInfo(VirtualControlLoopEvent event) throws ControlLoopException {
- UUID requestID = event.requestID;
+ UUID requestID = event.getRequestID();
AAIGETVnfResponse response = null;
- String vnfName = event.AAI.get("generic-vnf.vnf-name");
- String vnfID = event.AAI.get("generic-vnf.vnf-id");
+ String vnfName = event.getAAI().get("generic-vnf.vnf-name");
+ String vnfID = event.getAAI().get("generic-vnf.vnf-id");
aaiHostURL = PolicyEngine.manager.getEnvironmentProperty("aai.url");
aaiUser = PolicyEngine.manager.getEnvironmentProperty("aai.username");
@@ -715,7 +715,7 @@ public class ControlLoopEventManager implements LockCallback, Serializable {
@Override
public String toString() {
return "ControlLoopEventManager [closedLoopControlName=" + closedLoopControlName + ", requestID=" + requestID
- + ", processor=" + processor + ", onset=" + (onset != null ? onset.requestID : "null") + ", numOnsets=" + numOnsets + ", numAbatements="
+ + ", processor=" + processor + ", onset=" + (onset != null ? onset.getRequestID() : "null") + ", numOnsets=" + numOnsets + ", numAbatements="
+ numAbatements + ", isActivated="
+ isActivated + ", currentOperation=" + currentOperation + ", targetLock=" + targetLock + "]";
}
diff --git a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager.java b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager.java
index 0ce3bc5c3..acbacc824 100644
--- a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager.java
+++ b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager.java
@@ -62,7 +62,7 @@ public class ControlLoopOperationManager implements Serializable {
@Override
public String toString() {
- return "ControlLoopOperationManager [onset=" + (onset != null ? onset.requestID : "null") + ", policy="
+ return "ControlLoopOperationManager [onset=" + (onset != null ? onset.getRequestID() : "null") + ", policy="
+ (policy != null ? policy.getId() : "null") + ", attempts=" + attempts
+ ", policyResult=" + policyResult
+ ", currentOperation=" + currentOperation + ", operationHistory=" + operationHistory
@@ -137,19 +137,19 @@ public class ControlLoopOperationManager implements Serializable {
case VM:
case VNF:
VirtualControlLoopEvent virtualOnset = (VirtualControlLoopEvent) this.onset;
- if (this.onset.target.equalsIgnoreCase("vserver.vserver-name")) {
- return virtualOnset.AAI.get("vserver.vserver-name");
+ if (this.onset.getTarget().equalsIgnoreCase("vserver.vserver-name")) {
+ return virtualOnset.getAAI().get("vserver.vserver-name");
}
- else if (this.onset.target.equalsIgnoreCase("generic-vnf.vnf-id")) {
- return virtualOnset.AAI.get("generic-vnf.vnf-id");
+ else if (this.onset.getTarget().equalsIgnoreCase("generic-vnf.vnf-id")) {
+ return virtualOnset.getAAI().get("generic-vnf.vnf-id");
}
- else if (this.onset.target.equalsIgnoreCase("generic-vnf.vnf-name")) {
+ else if (this.onset.getTarget().equalsIgnoreCase("generic-vnf.vnf-name")) {
/*
* If the onset is enriched with the vnf-id,
* we don't need an A&AI response
*/
- if (virtualOnset.AAI.containsKey("generic-vnf.vnf-id")) {
- return virtualOnset.AAI.get("generic-vnf.vnf-id");
+ if (virtualOnset.getAAI().containsKey("generic-vnf.vnf-id")) {
+ return virtualOnset.getAAI().get("generic-vnf.vnf-id");
}
/*
@@ -256,10 +256,10 @@ public class ControlLoopOperationManager implements Serializable {
this.policyResult = null;
Operation operation = new Operation();
operation.attempt = ++this.attempts;
- operation.operation.actor = this.policy.getActor();
- operation.operation.operation = this.policy.getRecipe();
- operation.operation.target = this.policy.getTarget().toString();
- operation.operation.subRequestId = Integer.toString(operation.attempt);
+ operation.operation.setActor(this.policy.getActor());
+ operation.operation.setOperation(this.policy.getRecipe());
+ operation.operation.setTarget(this.policy.getTarget().toString());
+ operation.operation.setSubRequestId(Integer.toString(operation.attempt));
//
// Now determine which actor we need to construct a request for
//
@@ -657,16 +657,16 @@ public class ControlLoopOperationManager implements Serializable {
OperationsHistoryDbEntry newEntry = new OperationsHistoryDbEntry();
- newEntry.closedLoopName = this.onset.closedLoopControlName;
- newEntry.requestId = this.onset.requestID.toString();
- newEntry.actor = this.currentOperation.operation.actor;
- newEntry.operation = this.currentOperation.operation.operation;
+ newEntry.closedLoopName = this.onset.getClosedLoopControlName();
+ newEntry.requestId = this.onset.getRequestID().toString();
+ newEntry.actor = this.currentOperation.operation.getActor();
+ newEntry.operation = this.currentOperation.operation.getOperation();
newEntry.target = this.targetEntity;
- newEntry.starttime = Timestamp.from(this.currentOperation.operation.start);
- newEntry.subrequestId = this.currentOperation.operation.subRequestId;
- newEntry.endtime = new Timestamp(this.currentOperation.operation.end.toEpochMilli());
- newEntry.message = this.currentOperation.operation.message;
- newEntry.outcome = this.currentOperation.operation.outcome;
+ newEntry.starttime = Timestamp.from(this.currentOperation.operation.getStart());
+ newEntry.subrequestId = this.currentOperation.operation.getSubRequestId();
+ newEntry.endtime = new Timestamp(this.currentOperation.operation.getEnd().toEpochMilli());
+ newEntry.message = this.currentOperation.operation.getMessage();
+ newEntry.outcome = this.currentOperation.operation.getOutcome();
em.getTransaction().begin();
em.persist(newEntry);
@@ -685,9 +685,9 @@ public class ControlLoopOperationManager implements Serializable {
}
if (this.currentOperation != null) {
if (this.currentOperation.attempt == attempt.intValue()) {
- this.currentOperation.operation.end = Instant.now();
- this.currentOperation.operation.message = message;
- this.currentOperation.operation.outcome = result.toString();
+ this.currentOperation.operation.setEnd(Instant.now());
+ this.currentOperation.operation.setMessage(message);
+ this.currentOperation.operation.setOutcome(result.toString());
this.currentOperation.policyResult = result;
//
// Save it in history
@@ -708,9 +708,9 @@ public class ControlLoopOperationManager implements Serializable {
}
for (Operation op : this.operationHistory) {
if (op.attempt == attempt.intValue()) {
- op.operation.end = Instant.now();
- op.operation.message = message;
- op.operation.outcome = result.toString();
+ op.operation.setEnd(Instant.now());
+ op.operation.setMessage(message);
+ op.operation.setOutcome(result.toString());
op.policyResult = result;
return;
}
diff --git a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManagerTest.java b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManagerTest.java
index bc832a907..d4083150d 100644
--- a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManagerTest.java
+++ b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManagerTest.java
@@ -59,15 +59,15 @@ public class ControlLoopEventManagerTest {
private static VirtualControlLoopEvent onset;
static {
onset = new VirtualControlLoopEvent();
- onset.closedLoopControlName = "ControlLoop-vUSP";
- onset.requestID = UUID.randomUUID();
- onset.target = "VM_NAME";
- onset.closedLoopAlarmStart = Instant.now();
- onset.AAI = new HashMap<String, String>();
- onset.AAI.put("cloud-region.identity-url", "foo");
- onset.AAI.put("vserver.selflink", "bar");
- onset.AAI.put("generic-vnf.vnf-id", "83f674e8-7555-44d7-9a39-bdc3770b0491");
- onset.closedLoopEventStatus = ControlLoopEventStatus.ONSET;
+ onset.setClosedLoopControlName("ControlLoop-vUSP");
+ onset.setRequestID(UUID.randomUUID());
+ onset.setTarget("VM_NAME");
+ onset.setClosedLoopAlarmStart(Instant.now());
+ onset.setAAI(new HashMap<String, String>());
+ onset.getAAI().put("cloud-region.identity-url", "foo");
+ onset.getAAI().put("vserver.selflink", "bar");
+ onset.getAAI().put("generic-vnf.vnf-id", "83f674e8-7555-44d7-9a39-bdc3770b0491");
+ onset.setClosedLoopEventStatus(ControlLoopEventStatus.ONSET);
}
@BeforeClass
@@ -90,7 +90,7 @@ public class ControlLoopEventManagerTest {
@Test
public void testAAIVnfInfo() {
final Util.Pair<ControlLoopPolicy, String> pair = Util.loadYaml("src/test/resources/test.yaml");
- onset.closedLoopControlName = pair.a.getControlLoop().getControlLoopName();
+ onset.setClosedLoopControlName(pair.a.getControlLoop().getControlLoopName());
try {
AAIGETVnfResponse response = getQueryByVnfID2(PolicyEngine.manager.getEnvironmentProperty("aai.url") + "/aai/v11/network/generic-vnfs/generic-vnf/",
PolicyEngine.manager.getEnvironmentProperty("aai.username"),
@@ -107,7 +107,7 @@ public class ControlLoopEventManagerTest {
@Test
public void testAAIVnfInfo2() {
final Util.Pair<ControlLoopPolicy, String> pair = Util.loadYaml("src/test/resources/test.yaml");
- onset.closedLoopControlName = pair.a.getControlLoop().getControlLoopName();
+ onset.setClosedLoopControlName(pair.a.getControlLoop().getControlLoopName());
try {
AAIGETVnfResponse response = getQueryByVnfName2(PolicyEngine.manager.getEnvironmentProperty("aai.url") + "/aai/v11/network/generic-vnfs/generic-vnf?vnf-name=",
PolicyEngine.manager.getEnvironmentProperty("aai.username"),
@@ -124,7 +124,7 @@ public class ControlLoopEventManagerTest {
@Test
public void testAAIVserver() {
final Util.Pair<ControlLoopPolicy, String> pair = Util.loadYaml("src/test/resources/test.yaml");
- onset.closedLoopControlName = pair.a.getControlLoop().getControlLoopName();
+ onset.setClosedLoopControlName(pair.a.getControlLoop().getControlLoopName());
try {
AAIGETVserverResponse response = getQueryByVserverName2(PolicyEngine.manager.getEnvironmentProperty("aai.url") + "/aai/v11/nodes/vservers?vserver-name=",
PolicyEngine.manager.getEnvironmentProperty("aai.username"),
@@ -144,7 +144,7 @@ public class ControlLoopEventManagerTest {
// Load up the policy
//
final Util.Pair<ControlLoopPolicy, String> pair = Util.loadYaml("src/test/resources/test.yaml");
- onset.closedLoopControlName = pair.a.getControlLoop().getControlLoopName();
+ onset.setClosedLoopControlName(pair.a.getControlLoop().getControlLoopName());
try {
logger.info("testIsClosedLoopDisabled --");
@@ -179,12 +179,12 @@ public class ControlLoopEventManagerTest {
@Test
public void abatemetCheckEventSyntaxTest() {
VirtualControlLoopEvent event = new VirtualControlLoopEvent();
- event.closedLoopControlName = "abatementAAI";
- event.requestID = UUID.randomUUID();
- event.target = "generic-vnf.vnf-id";
- event.closedLoopAlarmStart = Instant.now();
- event.closedLoopEventStatus = ControlLoopEventStatus.ABATED;
- ControlLoopEventManager manager = new ControlLoopEventManager(event.closedLoopControlName, event.requestID);
+ event.setClosedLoopControlName("abatementAAI");
+ event.setRequestID(UUID.randomUUID());
+ event.setTarget("generic-vnf.vnf-id");
+ event.setClosedLoopAlarmStart(Instant.now());
+ event.setClosedLoopEventStatus(ControlLoopEventStatus.ABATED);
+ ControlLoopEventManager manager = new ControlLoopEventManager(event.getClosedLoopControlName(), event.getRequestID());
assertNull(manager.getVnfResponse());
assertNull(manager.getVserverResponse());
try {
@@ -198,8 +198,8 @@ public class ControlLoopEventManagerTest {
assertNull(manager.getVserverResponse());
- event.AAI = new HashMap<>();
- event.AAI.put("generic-vnf.vnf-name", "abatementTest");
+ event.setAAI(new HashMap<>());
+ event.getAAI().put("generic-vnf.vnf-name", "abatementTest");
try {
manager.checkEventSyntax(event);
} catch (ControlLoopException e) {
@@ -215,19 +215,19 @@ public class ControlLoopEventManagerTest {
public void subsequentOnsetTest() {
UUID requestId = UUID.randomUUID();
VirtualControlLoopEvent event = new VirtualControlLoopEvent();
- event.closedLoopControlName = "TwoOnsetTest";
- event.requestID = requestId;
- event.target = "generic-vnf.vnf-id";
- event.closedLoopAlarmStart = Instant.now();
- event.closedLoopEventStatus = ControlLoopEventStatus.ONSET;
- event.AAI = new HashMap<>();
- event.AAI.put("generic-vnf.vnf-name", "onsetOne");
+ event.setClosedLoopControlName("TwoOnsetTest");
+ event.setRequestID(requestId);
+ event.setTarget("generic-vnf.vnf-id");
+ event.setClosedLoopAlarmStart(Instant.now());
+ event.setClosedLoopEventStatus(ControlLoopEventStatus.ONSET);
+ event.setAAI(new HashMap<>());
+ event.getAAI().put("generic-vnf.vnf-name", "onsetOne");
- ControlLoopEventManager manager = new ControlLoopEventManager(event.closedLoopControlName, event.requestID);
+ ControlLoopEventManager manager = new ControlLoopEventManager(event.getClosedLoopControlName(), event.getRequestID());
VirtualControlLoopNotification notification = manager.activate(event);
assertNotNull(notification);
- assertEquals(ControlLoopNotificationType.ACTIVE, notification.notification);
+ assertEquals(ControlLoopNotificationType.ACTIVE, notification.getNotification());
ControlLoopEventManager.NEW_EVENT_STATUS status = null;
try {
@@ -244,13 +244,13 @@ public class ControlLoopEventManagerTest {
assertNull(manager.getVserverResponse());
VirtualControlLoopEvent event2 = new VirtualControlLoopEvent();
- event2.closedLoopControlName = "TwoOnsetTest";
- event2.requestID = requestId;
- event2.target = "generic-vnf.vnf-id";
- event2.closedLoopAlarmStart = Instant.now();
- event2.closedLoopEventStatus = ControlLoopEventStatus.ONSET;
- event2.AAI = new HashMap<>();
- event2.AAI.put("generic-vnf.vnf-name", "onsetTwo");
+ event2.setClosedLoopControlName("TwoOnsetTest");
+ event2.setRequestID(requestId);
+ event2.setTarget("generic-vnf.vnf-id");
+ event2.setClosedLoopAlarmStart(Instant.now());
+ event2.setClosedLoopEventStatus(ControlLoopEventStatus.ONSET);
+ event2.setAAI(new HashMap<>());
+ event2.getAAI().put("generic-vnf.vnf-name", "onsetTwo");
try {
diff --git a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManagerTest.java b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManagerTest.java
index 1714d3e26..76020b0c9 100644
--- a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManagerTest.java
+++ b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManagerTest.java
@@ -58,13 +58,13 @@ public class ControlLoopOperationManagerTest {
private static VirtualControlLoopEvent onset;
static {
onset = new VirtualControlLoopEvent();
- onset.requestID = UUID.randomUUID();
- onset.target = "generic-vnf.vnf-name";
- onset.target_type = ControlLoopTargetType.VNF;
- onset.closedLoopAlarmStart = Instant.now();
- onset.AAI = new HashMap<>();
- onset.AAI.put("generic-vnf.vnf-name", "testTriggerSource");
- onset.closedLoopEventStatus = ControlLoopEventStatus.ONSET;
+ onset.setRequestID(UUID.randomUUID());
+ onset.setTarget("generic-vnf.vnf-name");
+ onset.setTargetType(ControlLoopTargetType.VNF);
+ onset.setClosedLoopAlarmStart(Instant.now());
+ onset.setAAI(new HashMap<>());
+ onset.getAAI().put("generic-vnf.vnf-name", "testTriggerSource");
+ onset.setClosedLoopEventStatus(ControlLoopEventStatus.ONSET);
/* Set environment properties */
PolicyEngine.manager.setEnvironmentProperty("aai.url", "http://localhost:6666");
@@ -92,7 +92,7 @@ public class ControlLoopOperationManagerTest {
// Load up the policy
//
final Util.Pair<ControlLoopPolicy, String> pair = Util.loadYaml("src/test/resources/test.yaml");
- onset.closedLoopControlName = pair.a.getControlLoop().getControlLoopName();
+ onset.setClosedLoopControlName(pair.a.getControlLoop().getControlLoopName());
try {
//
// Create a processor
@@ -101,11 +101,11 @@ public class ControlLoopOperationManagerTest {
//
// create the manager
//
- ControlLoopEventManager eventManager = new ControlLoopEventManager(onset.closedLoopControlName, onset.requestID);
+ ControlLoopEventManager eventManager = new ControlLoopEventManager(onset.getClosedLoopControlName(), onset.getRequestID());
VirtualControlLoopNotification notification = eventManager.activate(onset);
assertNotNull(notification);
- assertEquals(ControlLoopNotificationType.ACTIVE, notification.notification);
+ assertEquals(ControlLoopNotificationType.ACTIVE, notification.getNotification());
ControlLoopEventManager.NEW_EVENT_STATUS status = null;
try {
@@ -221,7 +221,7 @@ public class ControlLoopOperationManagerTest {
// Load up the policy
//
final Util.Pair<ControlLoopPolicy, String> pair = Util.loadYaml("src/test/resources/test.yaml");
- onset.closedLoopControlName = pair.a.getControlLoop().getControlLoopName();
+ onset.setClosedLoopControlName(pair.a.getControlLoop().getControlLoopName());
try {
//
// Create a processor
@@ -230,11 +230,11 @@ public class ControlLoopOperationManagerTest {
//
// create the manager
//
- ControlLoopEventManager eventManager = new ControlLoopEventManager(onset.closedLoopControlName, onset.requestID);
+ ControlLoopEventManager eventManager = new ControlLoopEventManager(onset.getClosedLoopControlName(), onset.getRequestID());
VirtualControlLoopNotification notification = eventManager.activate(onset);
assertNotNull(notification);
- assertEquals(ControlLoopNotificationType.ACTIVE, notification.notification);
+ assertEquals(ControlLoopNotificationType.ACTIVE, notification.getNotification());
ControlLoopEventManager.NEW_EVENT_STATUS status = null;
try {
diff --git a/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopEvent.java b/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopEvent.java
index df099ed5e..1d85ccb77 100644
--- a/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopEvent.java
+++ b/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopEvent.java
@@ -27,17 +27,17 @@ public abstract class ControlLoopEvent implements Serializable {
private static final long serialVersionUID = 2391252138583119195L;
- public String closedLoopControlName;
- public String version = "1.0.2";
- public UUID requestID;
- public String closedLoopEventClient;
- public ControlLoopTargetType target_type;
- public String target;
- public String from;
- public String policyScope;
- public String policyName;
- public String policyVersion;
- public ControlLoopEventStatus closedLoopEventStatus;
+ private String closedLoopControlName;
+ private String version = "1.0.2";
+ private UUID requestID;
+ private String closedLoopEventClient;
+ private ControlLoopTargetType targetType;
+ private String target;
+ private String from;
+ private String policyScope;
+ private String policyName;
+ private String policyVersion;
+ private ControlLoopEventStatus closedLoopEventStatus;
public ControlLoopEvent() {
@@ -50,7 +50,7 @@ public abstract class ControlLoopEvent implements Serializable {
this.closedLoopControlName = event.closedLoopControlName;
this.requestID = event.requestID;
this.closedLoopEventClient = event.closedLoopEventClient;
- this.target_type = event.target_type;
+ this.targetType = event.targetType;
this.target = event.target;
this.from = event.from;
this.policyScope = event.policyScope;
@@ -59,11 +59,95 @@ public abstract class ControlLoopEvent implements Serializable {
this.closedLoopEventStatus = event.closedLoopEventStatus;
}
- public boolean isEventStatusValid() {
- if (this.closedLoopEventStatus == null) {
- return false;
- }
- return true;
+ public boolean isEventStatusValid() {
+ return this.closedLoopEventStatus != null;
+ }
+
+ public String getClosedLoopControlName() {
+ return closedLoopControlName;
+ }
+
+ public void setClosedLoopControlName(String closedLoopControlName) {
+ this.closedLoopControlName = closedLoopControlName;
+ }
+
+ public String getVersion() {
+ return version;
+ }
+
+ public void setVersion(String version) {
+ this.version = version;
+ }
+
+ public UUID getRequestID() {
+ return requestID;
+ }
+
+ public void setRequestID(UUID requestID) {
+ this.requestID = requestID;
+ }
+
+ public String getClosedLoopEventClient() {
+ return closedLoopEventClient;
+ }
+
+ public void setClosedLoopEventClient(String closedLoopEventClient) {
+ this.closedLoopEventClient = closedLoopEventClient;
+ }
+
+ public ControlLoopTargetType getTargetType() {
+ return targetType;
+ }
+
+ public void setTargetType(ControlLoopTargetType targetType) {
+ this.targetType = targetType;
+ }
+
+ public String getTarget() {
+ return target;
+ }
+
+ public void setTarget(String target) {
+ this.target = target;
+ }
+
+ public String getFrom() {
+ return from;
+ }
+
+ public void setFrom(String from) {
+ this.from = from;
+ }
+
+ public String getPolicyScope() {
+ return policyScope;
+ }
+
+ public void setPolicyScope(String policyScope) {
+ this.policyScope = policyScope;
}
+ public String getPolicyName() {
+ return policyName;
+ }
+
+ public void setPolicyName(String policyName) {
+ this.policyName = policyName;
+ }
+
+ public String getPolicyVersion() {
+ return policyVersion;
+ }
+
+ public void setPolicyVersion(String policyVersion) {
+ this.policyVersion = policyVersion;
+ }
+
+ public ControlLoopEventStatus getClosedLoopEventStatus() {
+ return closedLoopEventStatus;
+ }
+
+ public void setClosedLoopEventStatus(ControlLoopEventStatus closedLoopEventStatus) {
+ this.closedLoopEventStatus = closedLoopEventStatus;
+ }
}
diff --git a/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopNotification.java b/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopNotification.java
index 8e29b1de3..8e7a50fac 100644
--- a/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopNotification.java
+++ b/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopNotification.java
@@ -31,32 +31,155 @@ public abstract class ControlLoopNotification implements Serializable {
private static final long serialVersionUID = 7538596984567127915L;
- public String closedLoopControlName;
- public String version = "1.0.2";
- public UUID requestID;
- public String closedLoopEventClient;
- public ControlLoopTargetType target_type;
- public String target;
- public String from;
- public String policyScope;
- public String policyName;
- public String policyVersion;
- public ControlLoopNotificationType notification;
- public String message;
- public ZonedDateTime notificationTime = ZonedDateTime.now(ZoneOffset.UTC);;
- public Integer OPS_CL_timer;
- public List<ControlLoopOperation> history = new LinkedList<ControlLoopOperation>();
+ private String closedLoopControlName;
+ private String version = "1.0.2";
+ private UUID requestID;
+ private String closedLoopEventClient;
+ private ControlLoopTargetType targetType;
+ private String target;
+ private String from;
+ private String policyScope;
+ private String policyName;
+ private String policyVersion;
+ private ControlLoopNotificationType notification;
+ private String message;
+ private ZonedDateTime notificationTime = ZonedDateTime.now(ZoneOffset.UTC);
+ private Integer opsCLTimer;
+ private List<ControlLoopOperation> history = new LinkedList<>();
public ControlLoopNotification() {
}
public ControlLoopNotification(ControlLoopEvent event) {
- this.closedLoopControlName = event.closedLoopControlName;
- this.requestID = event.requestID;
- this.closedLoopEventClient = event.closedLoopEventClient;
- this.target_type = event.target_type;
- this.target = event.target;
+ if (event == null) {
+ return;
+ }
+
+ this.setClosedLoopControlName(event.getClosedLoopControlName());
+ this.setRequestID(event.getRequestID());
+ this.setClosedLoopEventClient(event.getClosedLoopEventClient());
+ this.setTargetType(event.getTargetType());
+ this.setTarget(event.getTarget());
+ }
+
+ public String getClosedLoopControlName() {
+ return closedLoopControlName;
+ }
+
+ public void setClosedLoopControlName(String closedLoopControlName) {
+ this.closedLoopControlName = closedLoopControlName;
+ }
+
+ public String getVersion() {
+ return version;
+ }
+
+ public void setVersion(String version) {
+ this.version = version;
+ }
+
+ public UUID getRequestID() {
+ return requestID;
+ }
+
+ public void setRequestID(UUID requestID) {
+ this.requestID = requestID;
+ }
+
+ public String getClosedLoopEventClient() {
+ return closedLoopEventClient;
+ }
+
+ public void setClosedLoopEventClient(String closedLoopEventClient) {
+ this.closedLoopEventClient = closedLoopEventClient;
+ }
+
+ public ControlLoopTargetType getTargetType() {
+ return targetType;
+ }
+
+ public void setTargetType(ControlLoopTargetType targetType) {
+ this.targetType = targetType;
+ }
+
+ public String getTarget() {
+ return target;
+ }
+
+ public void setTarget(String target) {
+ this.target = target;
+ }
+
+ public String getFrom() {
+ return from;
+ }
+
+ public void setFrom(String from) {
+ this.from = from;
+ }
+
+ public String getPolicyScope() {
+ return policyScope;
+ }
+
+ public void setPolicyScope(String policyScope) {
+ this.policyScope = policyScope;
+ }
+
+ public String getPolicyName() {
+ return policyName;
+ }
+
+ public void setPolicyName(String policyName) {
+ this.policyName = policyName;
+ }
+
+ public String getPolicyVersion() {
+ return policyVersion;
+ }
+
+ public void setPolicyVersion(String policyVersion) {
+ this.policyVersion = policyVersion;
+ }
+
+ public ControlLoopNotificationType getNotification() {
+ return notification;
+ }
+
+ public void setNotification(ControlLoopNotificationType notification) {
+ this.notification = notification;
}
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+ public ZonedDateTime getNotificationTime() {
+ return notificationTime;
+ }
+
+ public void setNotificationTime(ZonedDateTime notificationTime) {
+ this.notificationTime = notificationTime;
+ }
+
+ public Integer getOpsCLTimer() {
+ return opsCLTimer;
+ }
+
+ public void setOpsCLTimer(Integer opsCLTimer) {
+ this.opsCLTimer = opsCLTimer;
+ }
+
+ public List<ControlLoopOperation> getHistory() {
+ return history;
+ }
+
+ public void setHistory(List<ControlLoopOperation> history) {
+ this.history = history;
+ }
}
diff --git a/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopOperation.java b/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopOperation.java
index ce721b43d..d024b7cec 100644
--- a/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopOperation.java
+++ b/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopOperation.java
@@ -30,20 +30,24 @@ public class ControlLoopOperation implements Serializable {
*/
private static final long serialVersionUID = 8662706581293017099L;
- public String actor;
- public String operation;
- public String target;
- public Instant start = Instant.now();
- public Instant end;
- public String subRequestId;
- public String outcome;
- public String message;
+ private String actor;
+ private String operation;
+ private String target;
+ private Instant start = Instant.now();
+ private Instant end;
+ private String subRequestId;
+ private String outcome;
+ private String message;
public ControlLoopOperation() {
}
public ControlLoopOperation(ControlLoopOperation op) {
+ if (op == null) {
+ return;
+ }
+
this.actor = op.actor;
this.operation = op.operation;
this.target = op.target;
@@ -62,6 +66,70 @@ public class ControlLoopOperation implements Serializable {
return "actor="+actor+",operation="+operation+",target="+target+",start="+start+",end="+end+",subRequestId="+subRequestId+",outcome="+outcome+",message="+message;
}
+ public String getActor() {
+ return actor;
+ }
+
+ public void setActor(String actor) {
+ this.actor = actor;
+ }
+
+ public String getOperation() {
+ return operation;
+ }
+
+ public void setOperation(String operation) {
+ this.operation = operation;
+ }
+
+ public String getTarget() {
+ return target;
+ }
+
+ public void setTarget(String target) {
+ this.target = target;
+ }
+
+ public Instant getStart() {
+ return start;
+ }
+
+ public void setStart(Instant start) {
+ this.start = start;
+ }
+
+ public Instant getEnd() {
+ return end;
+ }
+
+ public void setEnd(Instant end) {
+ this.end = end;
+ }
+
+ public String getSubRequestId() {
+ return subRequestId;
+ }
+
+ public void setSubRequestId(String subRequestId) {
+ this.subRequestId = subRequestId;
+ }
+
+ public String getOutcome() {
+ return outcome;
+ }
+
+ public void setOutcome(String outcome) {
+ this.outcome = outcome;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
@Override
public String toString() {
return "ControlLoopOperation [actor=" + actor + ", operation=" + operation + ", target=" + target + ", start="
diff --git a/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopOperationWrapper.java b/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopOperationWrapper.java
index fb3942b63..f957808d1 100644
--- a/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopOperationWrapper.java
+++ b/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/ControlLoopOperationWrapper.java
@@ -24,8 +24,8 @@ import java.util.UUID;
public class ControlLoopOperationWrapper {
- public UUID requestID;
- public ControlLoopOperation operation;
+ private UUID requestID;
+ private ControlLoopOperation operation;
public ControlLoopOperationWrapper() {
@@ -35,4 +35,20 @@ public class ControlLoopOperationWrapper {
this.requestID = requestID;
this.operation = operation;
}
+
+ public UUID getRequestID() {
+ return requestID;
+ }
+
+ public void setRequestID(UUID requestID) {
+ this.requestID = requestID;
+ }
+
+ public ControlLoopOperation getOperation() {
+ return operation;
+ }
+
+ public void setOperation(ControlLoopOperation operation) {
+ this.operation = operation;
+ }
}
diff --git a/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/PhysicalControlLoopEvent.java b/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/PhysicalControlLoopEvent.java
index aca072eaa..12ced939e 100644
--- a/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/PhysicalControlLoopEvent.java
+++ b/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/PhysicalControlLoopEvent.java
@@ -21,10 +21,6 @@
package org.onap.policy.controlloop;
public class PhysicalControlLoopEvent extends ControlLoopEvent {
-
- /**
- *
- */
private static final long serialVersionUID = -7282930271094849487L;
public PhysicalControlLoopEvent() {
@@ -36,6 +32,4 @@ public class PhysicalControlLoopEvent extends ControlLoopEvent {
return;
}
}
-
-
}
diff --git a/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/PhysicalControlLoopNotification.java b/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/PhysicalControlLoopNotification.java
index c904d6740..9c63665ae 100644
--- a/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/PhysicalControlLoopNotification.java
+++ b/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/PhysicalControlLoopNotification.java
@@ -21,10 +21,6 @@
package org.onap.policy.controlloop;
public class PhysicalControlLoopNotification extends ControlLoopNotification {
-
- /**
- *
- */
private static final long serialVersionUID = 8105197217140032892L;
public PhysicalControlLoopNotification() {
diff --git a/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/VirtualControlLoopEvent.java b/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/VirtualControlLoopEvent.java
index 932da84fc..c512b6796 100644
--- a/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/VirtualControlLoopEvent.java
+++ b/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/VirtualControlLoopEvent.java
@@ -30,9 +30,9 @@ public class VirtualControlLoopEvent extends ControlLoopEvent {
*
*/
private static final long serialVersionUID = -5752405682246066226L;
- public Instant closedLoopAlarmStart;
- public Instant closedLoopAlarmEnd;
- public Map<String, String> AAI = new HashMap<>();
+ private Instant closedLoopAlarmStart;
+ private Instant closedLoopAlarmEnd;
+ private Map<String, String> aai = new HashMap<>();
public VirtualControlLoopEvent() {
}
@@ -42,11 +42,34 @@ public class VirtualControlLoopEvent extends ControlLoopEvent {
if (event == null) {
return;
}
- if (event.AAI != null) {
- this.AAI = new HashMap<>(event.AAI);
+ if (event.aai != null) {
+ this.aai = new HashMap<>(event.aai);
}
this.closedLoopAlarmStart = event.closedLoopAlarmStart;
this.closedLoopAlarmEnd = event.closedLoopAlarmEnd;
}
+ public Instant getClosedLoopAlarmStart() {
+ return closedLoopAlarmStart;
+ }
+
+ public void setClosedLoopAlarmStart(Instant closedLoopAlarmStart) {
+ this.closedLoopAlarmStart = closedLoopAlarmStart;
+ }
+
+ public Instant getClosedLoopAlarmEnd() {
+ return closedLoopAlarmEnd;
+ }
+
+ public void setClosedLoopAlarmEnd(Instant closedLoopAlarmEnd) {
+ this.closedLoopAlarmEnd = closedLoopAlarmEnd;
+ }
+
+ public Map<String, String> getAAI() {
+ return aai;
+ }
+
+ public void setAAI(Map<String, String> aai) {
+ this.aai = aai;
+ }
}
diff --git a/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/VirtualControlLoopNotification.java b/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/VirtualControlLoopNotification.java
index 7415fccf0..c99e3a1b0 100644
--- a/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/VirtualControlLoopNotification.java
+++ b/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/VirtualControlLoopNotification.java
@@ -31,9 +31,9 @@ public class VirtualControlLoopNotification extends ControlLoopNotification {
*/
private static final long serialVersionUID = 5354756047932144017L;
- public Map<String, String> AAI = new HashMap<>();
- public Instant closedLoopAlarmStart;
- public Instant closedLoopAlarmEnd;
+ private Map<String, String> aai = new HashMap<>();
+ private Instant closedLoopAlarmStart;
+ private Instant closedLoopAlarmEnd;
public VirtualControlLoopNotification() {
}
@@ -43,11 +43,34 @@ public class VirtualControlLoopNotification extends ControlLoopNotification {
if (event == null) {
return;
}
- if (event.AAI != null) {
- this.AAI = new HashMap<>(event.AAI);
+ if (event.getAAI() != null) {
+ this.setAAI(new HashMap<>(event.getAAI()));
}
- this.closedLoopAlarmStart = event.closedLoopAlarmStart;
- this.closedLoopAlarmEnd = event.closedLoopAlarmEnd;
+ this.closedLoopAlarmStart = event.getClosedLoopAlarmStart();
+ this.closedLoopAlarmEnd = event.getClosedLoopAlarmEnd();
}
+ public Map<String, String> getAAI() {
+ return aai;
+ }
+
+ public void setAAI(Map<String, String> aAI) {
+ this.aai = aAI;
+ }
+
+ public Instant getClosedLoopAlarmStart() {
+ return closedLoopAlarmStart;
+ }
+
+ public void setClosedLoopAlarmStart(Instant closedLoopAlarmStart) {
+ this.closedLoopAlarmStart = closedLoopAlarmStart;
+ }
+
+ public Instant getClosedLoopAlarmEnd() {
+ return closedLoopAlarmEnd;
+ }
+
+ public void setClosedLoopAlarmEnd(Instant closedLoopAlarmEnd) {
+ this.closedLoopAlarmEnd = closedLoopAlarmEnd;
+ }
}
diff --git a/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/util/Serialization.java b/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/util/Serialization.java
index 858dc82b9..d2a51f770 100644
--- a/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/util/Serialization.java
+++ b/controlloop/common/model-impl/events/src/main/java/org/onap/policy/controlloop/util/Serialization.java
@@ -35,17 +35,15 @@ import com.google.gson.GsonBuilder;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer;
import com.google.gson.JsonElement;
-import com.google.gson.JsonParseException;
import com.google.gson.JsonPrimitive;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
-
public final class Serialization {
+ private Serialization() {
+ }
- public static class notificationTypeAdapter implements JsonSerializer<ControlLoopNotificationType>, JsonDeserializer<ControlLoopNotificationType> {
-
-
+ public static class NotificationTypeAdapter implements JsonSerializer<ControlLoopNotificationType>, JsonDeserializer<ControlLoopNotificationType> {
@Override
public JsonElement serialize(ControlLoopNotificationType src, Type typeOfSrc,
JsonSerializationContext context) {
@@ -54,14 +52,12 @@ public final class Serialization {
@Override
public ControlLoopNotificationType deserialize(JsonElement json, Type typeOfT,
- JsonDeserializationContext context) throws JsonParseException {
+ JsonDeserializationContext context) {
return ControlLoopNotificationType.toType(json.getAsString());
}
-
}
-
- public static class targetTypeAdapter implements JsonSerializer<ControlLoopTargetType>, JsonDeserializer<ControlLoopTargetType> {
+ public static class TargetTypeAdapter implements JsonSerializer<ControlLoopTargetType>, JsonDeserializer<ControlLoopTargetType> {
@Override
public JsonElement serialize(ControlLoopTargetType src, Type typeOfSrc,
JsonSerializationContext context) {
@@ -70,19 +66,17 @@ public final class Serialization {
@Override
public ControlLoopTargetType deserialize(JsonElement json, Type typeOfT,
- JsonDeserializationContext context) throws JsonParseException {
+ JsonDeserializationContext context) {
return ControlLoopTargetType.toType(json.getAsString());
}
-
}
-
- public static class gsonUTCAdapter implements JsonSerializer<ZonedDateTime>, JsonDeserializer<ZonedDateTime> {
- private static final Logger logger = LoggerFactory.getLogger(gsonUTCAdapter.class);
+
+ public static class GSONUTCAdapter implements JsonSerializer<ZonedDateTime>, JsonDeserializer<ZonedDateTime> {
+ private static final Logger logger = LoggerFactory.getLogger(GSONUTCAdapter.class);
public static final DateTimeFormatter format = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSSSSSxxx");
- @Override
- public ZonedDateTime deserialize(JsonElement element, Type type, JsonDeserializationContext context)
- throws JsonParseException {
+ @Override
+ public ZonedDateTime deserialize(JsonElement element, Type type, JsonDeserializationContext context) {
try {
return ZonedDateTime.parse(element.getAsString(), format);
} catch (Exception e) {
@@ -91,17 +85,16 @@ public final class Serialization {
return null;
}
- @Override
+ @Override
public JsonElement serialize(ZonedDateTime datetime, Type type, JsonSerializationContext context) {
return new JsonPrimitive(datetime.format(format));
}
}
-
- public static class gsonInstantAdapter implements JsonSerializer<Instant>, JsonDeserializer<Instant> {
+
+ public static class GSONInstantAdapter implements JsonSerializer<Instant>, JsonDeserializer<Instant> {
@Override
- public Instant deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
- throws JsonParseException {
+ public Instant deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) {
return Instant.ofEpochMilli(json.getAsLong());
}
@@ -109,30 +102,30 @@ public final class Serialization {
public JsonElement serialize(Instant src, Type typeOfSrc, JsonSerializationContext context) {
return new JsonPrimitive(src.toEpochMilli());
}
-
+
}
-
- final static public Gson gson = new GsonBuilder().disableHtmlEscaping()
- .registerTypeAdapter(ZonedDateTime.class, new gsonUTCAdapter())
- .registerTypeAdapter(Instant.class, new gsonInstantAdapter())
- .registerTypeAdapter(ControlLoopNotificationType.class, new notificationTypeAdapter())
- .registerTypeAdapter(ControlLoopTargetType.class, new targetTypeAdapter())
+
+ public static final Gson gson = new GsonBuilder().disableHtmlEscaping()
+ .registerTypeAdapter(ZonedDateTime.class, new GSONUTCAdapter())
+ .registerTypeAdapter(Instant.class, new GSONInstantAdapter())
+ .registerTypeAdapter(ControlLoopNotificationType.class, new NotificationTypeAdapter())
+ .registerTypeAdapter(ControlLoopTargetType.class, new TargetTypeAdapter())
.create();
-
- final static public Gson gsonPretty = new GsonBuilder().disableHtmlEscaping()
+
+ public static final Gson gsonPretty = new GsonBuilder().disableHtmlEscaping()
.setPrettyPrinting()
- .registerTypeAdapter(ZonedDateTime.class, new gsonUTCAdapter())
- .registerTypeAdapter(Instant.class, new gsonInstantAdapter())
- .registerTypeAdapter(ControlLoopNotificationType.class, new notificationTypeAdapter())
- .registerTypeAdapter(ControlLoopTargetType.class, new targetTypeAdapter())
+ .registerTypeAdapter(ZonedDateTime.class, new GSONUTCAdapter())
+ .registerTypeAdapter(Instant.class, new GSONInstantAdapter())
+ .registerTypeAdapter(ControlLoopNotificationType.class, new NotificationTypeAdapter())
+ .registerTypeAdapter(ControlLoopTargetType.class, new TargetTypeAdapter())
.create();
-
- final static public Gson gsonJunit = new GsonBuilder().disableHtmlEscaping()
+
+ public static final Gson gsonJunit = new GsonBuilder().disableHtmlEscaping()
.setPrettyPrinting()
- .registerTypeAdapter(ZonedDateTime.class, new gsonUTCAdapter())
- .registerTypeAdapter(Instant.class, new gsonInstantAdapter())
- .registerTypeAdapter(ControlLoopTargetType.class, new targetTypeAdapter())
+ .registerTypeAdapter(ZonedDateTime.class, new GSONUTCAdapter())
+ .registerTypeAdapter(Instant.class, new GSONInstantAdapter())
+ .registerTypeAdapter(ControlLoopTargetType.class, new TargetTypeAdapter())
.create();
}