aboutsummaryrefslogtreecommitdiffstats
path: root/examples/examples-aadm/src/main/java
diff options
context:
space:
mode:
authorliamfallon <liam.fallon@ericsson.com>2018-09-13 15:25:32 +0100
committerliamfallon <liam.fallon@ericsson.com>2018-09-13 15:26:47 +0100
commit4cfa2e2d98f6877d54da304ef17f096284430908 (patch)
treec9452d2bf6bb96fae9c1e8e2d8ce8f8d01e69d22 /examples/examples-aadm/src/main/java
parent0e23f7634e1e1fb31454c516974613335fcea1a4 (diff)
Sonar/Checkstyle in service/plugins
Sonar and Checkstyle changes in plugins and services, and knock on changes Issue-ID: POLICY-1034 Change-Id: Iff7df74e54fce2c661dcc2fae75ae93d4cacfe5b Signed-off-by: liamfallon <liam.fallon@ericsson.com>
Diffstat (limited to 'examples/examples-aadm/src/main/java')
-rw-r--r--examples/examples-aadm/src/main/java/org/onap/policy/apex/examples/aadm/concepts/ENodeBStatus.java8
-rw-r--r--examples/examples-aadm/src/main/java/org/onap/policy/apex/examples/aadm/concepts/ImsiStatus.java (renamed from examples/examples-aadm/src/main/java/org/onap/policy/apex/examples/aadm/concepts/IMSIStatus.java)16
-rw-r--r--examples/examples-aadm/src/main/java/org/onap/policy/apex/examples/aadm/concepts/IpAddressStatus.java (renamed from examples/examples-aadm/src/main/java/org/onap/policy/apex/examples/aadm/concepts/IPAddressStatus.java)12
-rw-r--r--examples/examples-aadm/src/main/java/org/onap/policy/apex/examples/aadm/model/AadmDomainModelFactory.java (renamed from examples/examples-aadm/src/main/java/org/onap/policy/apex/examples/aadm/model/AADMDomainModelFactory.java)224
-rw-r--r--examples/examples-aadm/src/main/java/org/onap/policy/apex/examples/aadm/model/AadmDomainModelSaver.java (renamed from examples/examples-aadm/src/main/java/org/onap/policy/apex/examples/aadm/model/AADMDomainModelSaver.java)8
5 files changed, 134 insertions, 134 deletions
diff --git a/examples/examples-aadm/src/main/java/org/onap/policy/apex/examples/aadm/concepts/ENodeBStatus.java b/examples/examples-aadm/src/main/java/org/onap/policy/apex/examples/aadm/concepts/ENodeBStatus.java
index 1f3cf5185..70af74ab9 100644
--- a/examples/examples-aadm/src/main/java/org/onap/policy/apex/examples/aadm/concepts/ENodeBStatus.java
+++ b/examples/examples-aadm/src/main/java/org/onap/policy/apex/examples/aadm/concepts/ENodeBStatus.java
@@ -56,7 +56,7 @@ public class ENodeBStatus implements Serializable {
*
* @return the number of Denial Of Service incidents on the eNodeB
*/
- public long getDOSCount() {
+ public long getDosCount() {
return dosCount;
}
@@ -65,7 +65,7 @@ public class ENodeBStatus implements Serializable {
*
* @param incomingDosCount the number of Denial Of Service incidents on the eNodeB
*/
- public void setDOSCount(final long incomingDosCount) {
+ public void setDosCount(final long incomingDosCount) {
this.dosCount = incomingDosCount;
}
@@ -74,7 +74,7 @@ public class ENodeBStatus implements Serializable {
*
* @return the long
*/
- public long incrementDOSCount() {
+ public long incrementDosCount() {
return ++dosCount;
}
@@ -83,7 +83,7 @@ public class ENodeBStatus implements Serializable {
*
* @return the long
*/
- public long decrementDOSCount() {
+ public long decrementDosCount() {
return --dosCount;
}
diff --git a/examples/examples-aadm/src/main/java/org/onap/policy/apex/examples/aadm/concepts/IMSIStatus.java b/examples/examples-aadm/src/main/java/org/onap/policy/apex/examples/aadm/concepts/ImsiStatus.java
index 8f89d4c15..4b7def097 100644
--- a/examples/examples-aadm/src/main/java/org/onap/policy/apex/examples/aadm/concepts/IMSIStatus.java
+++ b/examples/examples-aadm/src/main/java/org/onap/policy/apex/examples/aadm/concepts/ImsiStatus.java
@@ -25,7 +25,7 @@ import java.io.Serializable;
/**
* The Class IMSIStatus holds the status of an IMSI in the AADM domain.
*/
-public class IMSIStatus implements Serializable {
+public class ImsiStatus implements Serializable {
private static final long serialVersionUID = 2852523814242234172L;
private static final long TIME_NOT_SET = 0;
@@ -43,7 +43,7 @@ public class IMSIStatus implements Serializable {
*
* @param imsi the IMSI value
*/
- public IMSIStatus(final String imsi) {
+ public ImsiStatus(final String imsi) {
this.imsi = imsi;
}
@@ -52,7 +52,7 @@ public class IMSIStatus implements Serializable {
*
* @return the IMSI value
*/
- public String getIMSI() {
+ public String getImsi() {
return imsi;
}
@@ -97,17 +97,17 @@ public class IMSIStatus implements Serializable {
*
* @return theeNodeB ID to which the IMSI is attached
*/
- public String getENodeBID() {
+ public String getENodeBId() {
return enodeBId;
}
/**
* Sets the eNodeB ID to which the IMSI is attached.
*
- * @param incomingENodeBID the eNodeB ID to which the IMSI is attached
+ * @param incomingENodeBId the eNodeB ID to which the IMSI is attached
*/
- public void setENodeBID(final String incomingENodeBID) {
- this.enodeBId = incomingENodeBID;
+ public void setENodeBId(final String incomingENodeBId) {
+ this.enodeBId = incomingENodeBId;
}
/**
@@ -115,7 +115,7 @@ public class IMSIStatus implements Serializable {
*
* @return true, if eNodeB ID to which the IMSI is attached is set
*/
- public boolean checkSetENodeBID() {
+ public boolean checkSetENodeBId() {
return (enodeBId != null);
}
diff --git a/examples/examples-aadm/src/main/java/org/onap/policy/apex/examples/aadm/concepts/IPAddressStatus.java b/examples/examples-aadm/src/main/java/org/onap/policy/apex/examples/aadm/concepts/IpAddressStatus.java
index fc3780f17..689865b16 100644
--- a/examples/examples-aadm/src/main/java/org/onap/policy/apex/examples/aadm/concepts/IPAddressStatus.java
+++ b/examples/examples-aadm/src/main/java/org/onap/policy/apex/examples/aadm/concepts/IpAddressStatus.java
@@ -25,7 +25,7 @@ import java.io.Serializable;
/**
* The Class IPAddressStatus holds the status of an IP address in the AADM domain.
*/
-public class IPAddressStatus implements Serializable {
+public class IpAddressStatus implements Serializable {
private static final long serialVersionUID = -7402022458317593252L;
private final String ipAddress;
@@ -37,7 +37,7 @@ public class IPAddressStatus implements Serializable {
*
* @param ipAddress the ip address
*/
- public IPAddressStatus(final String ipAddress) {
+ public IpAddressStatus(final String ipAddress) {
this.ipAddress = ipAddress;
}
@@ -46,7 +46,7 @@ public class IPAddressStatus implements Serializable {
*
* @return the IP address
*/
- public String getIPAddress() {
+ public String getIpAddress() {
return ipAddress;
}
@@ -55,7 +55,7 @@ public class IPAddressStatus implements Serializable {
*
* @return the imsi
*/
- public String getIMSI() {
+ public String getImsi() {
return imsi;
}
@@ -64,7 +64,7 @@ public class IPAddressStatus implements Serializable {
*
* @param incomingImsi the imsi
*/
- public void setIMSI(final String incomingImsi) {
+ public void setImsi(final String incomingImsi) {
this.imsi = incomingImsi;
}
@@ -73,7 +73,7 @@ public class IPAddressStatus implements Serializable {
*
* @return true, if check set IMSI
*/
- public boolean checkSetIMSI() {
+ public boolean checkSetImsi() {
return (imsi != null);
}
}
diff --git a/examples/examples-aadm/src/main/java/org/onap/policy/apex/examples/aadm/model/AADMDomainModelFactory.java b/examples/examples-aadm/src/main/java/org/onap/policy/apex/examples/aadm/model/AadmDomainModelFactory.java
index 9a2d50626..376643211 100644
--- a/examples/examples-aadm/src/main/java/org/onap/policy/apex/examples/aadm/model/AADMDomainModelFactory.java
+++ b/examples/examples-aadm/src/main/java/org/onap/policy/apex/examples/aadm/model/AadmDomainModelFactory.java
@@ -49,20 +49,20 @@ import org.onap.policy.apex.model.policymodel.handling.PolicyLogicReader;
/**
* The Class AADMDomainModelFactory.
*/
-public class AADMDomainModelFactory {
+public class AadmDomainModelFactory {
/**
* Gets the AADM policy model.
*
* @return the AADM policy model
*/
// CHECKSTYLE:OFF: checkstyle
- public AxPolicyModel getAADMPolicyModel() {
+ public AxPolicyModel getAadmPolicyModel() {
// CHECKSTYLE:ON: checkstyle
// Data types for event parameters
final AxContextSchema imsi = new AxContextSchema(new AxArtifactKey("IMSI", "0.0.1"), "Java", "java.lang.Long");
- final AxContextSchema ueIPAddress =
+ final AxContextSchema ueIpAddress =
new AxContextSchema(new AxArtifactKey("UEIPAddress", "0.0.1"), "Java", "java.lang.String");
- final AxContextSchema nwIPAddress =
+ final AxContextSchema nwIpAddress =
new AxContextSchema(new AxArtifactKey("NWIPAddress", "0.0.1"), "Java", "java.lang.String");
final AxContextSchema dosFlag =
new AxContextSchema(new AxArtifactKey("DOSFlag", "0.0.1"), "Java", "java.lang.Boolean");
@@ -72,7 +72,7 @@ public class AADMDomainModelFactory {
new AxContextSchema(new AxArtifactKey("ApplicationName", "0.0.1"), "Java", "java.lang.String");
final AxContextSchema protocolGroup =
new AxContextSchema(new AxArtifactKey("ProtocolGroup", "0.0.1"), "Java", "java.lang.String");
- final AxContextSchema eNodeBID =
+ final AxContextSchema eNodeBId =
new AxContextSchema(new AxArtifactKey("ENodeBID", "0.0.1"), "Java", "java.lang.Long");
final AxContextSchema httpHostClass =
new AxContextSchema(new AxArtifactKey("HttpHostClass", "0.0.1"), "Java", "java.lang.String");
@@ -113,13 +113,13 @@ public class AADMDomainModelFactory {
final AxContextSchemas aadmContextSchemas = new AxContextSchemas(new AxArtifactKey("AADMDatatypes", "0.0.1"));
aadmContextSchemas.getSchemasMap().put(imsi.getKey(), imsi);
- aadmContextSchemas.getSchemasMap().put(ueIPAddress.getKey(), ueIPAddress);
- aadmContextSchemas.getSchemasMap().put(nwIPAddress.getKey(), nwIPAddress);
+ aadmContextSchemas.getSchemasMap().put(ueIpAddress.getKey(), ueIpAddress);
+ aadmContextSchemas.getSchemasMap().put(nwIpAddress.getKey(), nwIpAddress);
aadmContextSchemas.getSchemasMap().put(dosFlag.getKey(), dosFlag);
aadmContextSchemas.getSchemasMap().put(roundTripTime.getKey(), roundTripTime);
aadmContextSchemas.getSchemasMap().put(applicationName.getKey(), applicationName);
aadmContextSchemas.getSchemasMap().put(protocolGroup.getKey(), protocolGroup);
- aadmContextSchemas.getSchemasMap().put(eNodeBID.getKey(), eNodeBID);
+ aadmContextSchemas.getSchemasMap().put(eNodeBId.getKey(), eNodeBId);
aadmContextSchemas.getSchemasMap().put(httpHostClass.getKey(), httpHostClass);
aadmContextSchemas.getSchemasMap().put(tcpOnFlag.getKey(), tcpOnFlag);
aadmContextSchemas.getSchemasMap().put(probeOnFlag.getKey(), probeOnFlag);
@@ -146,11 +146,11 @@ public class AADMDomainModelFactory {
aadmEvent.getParameterMap().put("IMSI",
new AxField(new AxReferenceKey(aadmEvent.getKey(), "IMSI"), imsi.getKey()));
aadmEvent.getParameterMap().put("ENODEB_ID",
- new AxField(new AxReferenceKey(aadmEvent.getKey(), "ENODEB_ID"), eNodeBID.getKey()));
+ new AxField(new AxReferenceKey(aadmEvent.getKey(), "ENODEB_ID"), eNodeBId.getKey()));
aadmEvent.getParameterMap().put("IMSI_IP",
- new AxField(new AxReferenceKey(aadmEvent.getKey(), "IMSI_IP"), ueIPAddress.getKey()));
+ new AxField(new AxReferenceKey(aadmEvent.getKey(), "IMSI_IP"), ueIpAddress.getKey()));
aadmEvent.getParameterMap().put("NW_IP",
- new AxField(new AxReferenceKey(aadmEvent.getKey(), "NW_IP"), nwIPAddress.getKey()));
+ new AxField(new AxReferenceKey(aadmEvent.getKey(), "NW_IP"), nwIpAddress.getKey()));
aadmEvent.getParameterMap().put("DoS",
new AxField(new AxReferenceKey(aadmEvent.getKey(), "DoS"), dosFlag.getKey()));
aadmEvent.getParameterMap().put("TCP_UE_SIDE_MEDIAN_RTT_TX_TO_RX", new AxField(
@@ -168,9 +168,9 @@ public class AADMDomainModelFactory {
aadmEvent.getParameterMap().put("TCP_ON",
new AxField(new AxReferenceKey(aadmEvent.getKey(), "TCP_ON"), tcpOnFlag.getKey()));
aadmEvent.getParameterMap().put("SGW_IP_ADDRESS",
- new AxField(new AxReferenceKey(aadmEvent.getKey(), "SGW_IP_ADDRESS"), nwIPAddress.getKey()));
+ new AxField(new AxReferenceKey(aadmEvent.getKey(), "SGW_IP_ADDRESS"), nwIpAddress.getKey()));
aadmEvent.getParameterMap().put("UE_IP_ADDRESS",
- new AxField(new AxReferenceKey(aadmEvent.getKey(), "UE_IP_ADDRESS"), ueIPAddress.getKey()));
+ new AxField(new AxReferenceKey(aadmEvent.getKey(), "UE_IP_ADDRESS"), ueIpAddress.getKey()));
aadmEvent.getParameterMap().put("SERVICE_REQUEST_COUNT", new AxField(
new AxReferenceKey(aadmEvent.getKey(), "SERVICE_REQUEST_COUNT"), serviceRequestCount.getKey()));
aadmEvent.getParameterMap().put("ATTACH_COUNT",
@@ -192,11 +192,11 @@ public class AADMDomainModelFactory {
aadmXStreamActEvent.getParameterMap().put("IMSI",
new AxField(new AxReferenceKey(aadmXStreamActEvent.getKey(), "IMSI"), imsi.getKey()));
aadmXStreamActEvent.getParameterMap().put("IMSI_IP",
- new AxField(new AxReferenceKey(aadmXStreamActEvent.getKey(), "IMSI_IP"), ueIPAddress.getKey()));
+ new AxField(new AxReferenceKey(aadmXStreamActEvent.getKey(), "IMSI_IP"), ueIpAddress.getKey()));
aadmXStreamActEvent.getParameterMap().put("ENODEB_ID",
- new AxField(new AxReferenceKey(aadmXStreamActEvent.getKey(), "ENODEB_ID"), eNodeBID.getKey()));
+ new AxField(new AxReferenceKey(aadmXStreamActEvent.getKey(), "ENODEB_ID"), eNodeBId.getKey()));
aadmXStreamActEvent.getParameterMap().put("NW_IP",
- new AxField(new AxReferenceKey(aadmXStreamActEvent.getKey(), "NW_IP"), nwIPAddress.getKey()));
+ new AxField(new AxReferenceKey(aadmXStreamActEvent.getKey(), "NW_IP"), nwIpAddress.getKey()));
aadmXStreamActEvent.getParameterMap().put("ACTTASK",
new AxField(new AxReferenceKey(aadmXStreamActEvent.getKey(), "ACTTASK"), actionTask.getKey()));
aadmXStreamActEvent.getParameterMap().put("PROBE_ON",
@@ -216,22 +216,22 @@ public class AADMDomainModelFactory {
aadmXStreamActEvent.getParameterMap().put("THRESHOLD",
new AxField(new AxReferenceKey(aadmXStreamActEvent.getKey(), "THRESHOLD"), threshold.getKey()));
- final AxEvent vMMEEvent =
+ final AxEvent vMmeEvent =
new AxEvent(new AxArtifactKey("VMMEEvent", "0.0.1"), "org.onap.policy.apex.examples.aadm.events");
- vMMEEvent.setSource("External");
- vMMEEvent.setTarget("Apex");
- vMMEEvent.getParameterMap().put("IMSI",
- new AxField(new AxReferenceKey(vMMEEvent.getKey(), "IMSI"), imsi.getKey()));
- vMMEEvent.getParameterMap().put("ENODEB_ID",
- new AxField(new AxReferenceKey(vMMEEvent.getKey(), "ENODEB_ID"), eNodeBID.getKey()));
- vMMEEvent.getParameterMap().put("IMSI_IP",
- new AxField(new AxReferenceKey(vMMEEvent.getKey(), "IMSI_IP"), ueIPAddress.getKey()));
- vMMEEvent.getParameterMap().put("NW_IP",
- new AxField(new AxReferenceKey(vMMEEvent.getKey(), "NW_IP"), nwIPAddress.getKey()));
- vMMEEvent.getParameterMap().put("PROFILE",
- new AxField(new AxReferenceKey(vMMEEvent.getKey(), "PROFILE"), profile.getKey()));
- vMMEEvent.getParameterMap().put("THRESHOLD",
- new AxField(new AxReferenceKey(vMMEEvent.getKey(), "THRESHOLD"), threshold.getKey()));
+ vMmeEvent.setSource("External");
+ vMmeEvent.setTarget("Apex");
+ vMmeEvent.getParameterMap().put("IMSI",
+ new AxField(new AxReferenceKey(vMmeEvent.getKey(), "IMSI"), imsi.getKey()));
+ vMmeEvent.getParameterMap().put("ENODEB_ID",
+ new AxField(new AxReferenceKey(vMmeEvent.getKey(), "ENODEB_ID"), eNodeBId.getKey()));
+ vMmeEvent.getParameterMap().put("IMSI_IP",
+ new AxField(new AxReferenceKey(vMmeEvent.getKey(), "IMSI_IP"), ueIpAddress.getKey()));
+ vMmeEvent.getParameterMap().put("NW_IP",
+ new AxField(new AxReferenceKey(vMmeEvent.getKey(), "NW_IP"), nwIpAddress.getKey()));
+ vMmeEvent.getParameterMap().put("PROFILE",
+ new AxField(new AxReferenceKey(vMmeEvent.getKey(), "PROFILE"), profile.getKey()));
+ vMmeEvent.getParameterMap().put("THRESHOLD",
+ new AxField(new AxReferenceKey(vMmeEvent.getKey(), "THRESHOLD"), threshold.getKey()));
final AxEvent sapcEvent =
new AxEvent(new AxArtifactKey("SAPCEvent", "0.0.1"), "org.onap.policy.apex.examples.aadm.events");
@@ -240,11 +240,11 @@ public class AADMDomainModelFactory {
sapcEvent.getParameterMap().put("IMSI",
new AxField(new AxReferenceKey(sapcEvent.getKey(), "IMSI"), imsi.getKey()));
sapcEvent.getParameterMap().put("ENODEB_ID",
- new AxField(new AxReferenceKey(sapcEvent.getKey(), "ENODEB_ID"), eNodeBID.getKey()));
+ new AxField(new AxReferenceKey(sapcEvent.getKey(), "ENODEB_ID"), eNodeBId.getKey()));
sapcEvent.getParameterMap().put("IMSI_IP",
- new AxField(new AxReferenceKey(sapcEvent.getKey(), "IMSI_IP"), ueIPAddress.getKey()));
+ new AxField(new AxReferenceKey(sapcEvent.getKey(), "IMSI_IP"), ueIpAddress.getKey()));
sapcEvent.getParameterMap().put("NW_IP",
- new AxField(new AxReferenceKey(sapcEvent.getKey(), "NW_IP"), nwIPAddress.getKey()));
+ new AxField(new AxReferenceKey(sapcEvent.getKey(), "NW_IP"), nwIpAddress.getKey()));
sapcEvent.getParameterMap().put("PROFILE",
new AxField(new AxReferenceKey(sapcEvent.getKey(), "PROFILE"), profile.getKey()));
sapcEvent.getParameterMap().put("THRESHOLD",
@@ -270,9 +270,9 @@ public class AADMDomainModelFactory {
sapcBlacklistSubscriberEvent.getParameterMap().put("BLACKLIST_ON", new AxField(
new AxReferenceKey(sapcBlacklistSubscriberEvent.getKey(), "BLACKLIST_ON"), blacklistOnFlag.getKey()));
sapcBlacklistSubscriberEvent.getParameterMap().put("IMSI_IP", new AxField(
- new AxReferenceKey(sapcBlacklistSubscriberEvent.getKey(), "IMSI_IP"), ueIPAddress.getKey()));
+ new AxReferenceKey(sapcBlacklistSubscriberEvent.getKey(), "IMSI_IP"), ueIpAddress.getKey()));
sapcBlacklistSubscriberEvent.getParameterMap().put("NW_IP",
- new AxField(new AxReferenceKey(sapcBlacklistSubscriberEvent.getKey(), "NW_IP"), nwIPAddress.getKey()));
+ new AxField(new AxReferenceKey(sapcBlacklistSubscriberEvent.getKey(), "NW_IP"), nwIpAddress.getKey()));
sapcBlacklistSubscriberEvent.getParameterMap().put("PROBE_ON", new AxField(
new AxReferenceKey(sapcBlacklistSubscriberEvent.getKey(), "PROBE_ON"), probeOnFlag.getKey()));
sapcBlacklistSubscriberEvent.getParameterMap().put("TCP_ON",
@@ -296,7 +296,7 @@ public class AADMDomainModelFactory {
final AxEvents aadmEvents = new AxEvents(new AxArtifactKey("AADMEvents", "0.0.1"));
aadmEvents.getEventMap().put(aadmEvent.getKey(), aadmEvent);
aadmEvents.getEventMap().put(aadmXStreamActEvent.getKey(), aadmXStreamActEvent);
- aadmEvents.getEventMap().put(vMMEEvent.getKey(), vMMEEvent);
+ aadmEvents.getEventMap().put(vMmeEvent.getKey(), vMmeEvent);
aadmEvents.getEventMap().put(sapcEvent.getKey(), sapcEvent);
aadmEvents.getEventMap().put(sapcBlacklistSubscriberEvent.getKey(), sapcBlacklistSubscriberEvent);
aadmEvents.getEventMap().put(periodicEvent.getKey(), periodicEvent);
@@ -305,9 +305,9 @@ public class AADMDomainModelFactory {
final AxContextSchema eNodeBStatus = new AxContextSchema(new AxArtifactKey("ENodeBStatus", "0.0.1"), "Java",
"org.onap.policy.apex.examples.aadm.concepts.ENodeBStatus");
final AxContextSchema imsiStatus = new AxContextSchema(new AxArtifactKey("IMSIStatus", "0.0.1"), "Java",
- "org.onap.policy.apex.examples.aadm.concepts.IMSIStatus");
+ "org.onap.policy.apex.examples.aadm.concepts.ImsiStatus");
final AxContextSchema ipAddressStatus = new AxContextSchema(new AxArtifactKey("IPAddressStatus", "0.0.1"),
- "Java", "org.onap.policy.apex.examples.aadm.concepts.IPAddressStatus");
+ "Java", "org.onap.policy.apex.examples.aadm.concepts.IpAddressStatus");
aadmContextSchemas.getSchemasMap().put(eNodeBStatus.getKey(), eNodeBStatus);
aadmContextSchemas.getSchemasMap().put(imsiStatus.getKey(), imsiStatus);
aadmContextSchemas.getSchemasMap().put(ipAddressStatus.getKey(), ipAddressStatus);
@@ -371,32 +371,32 @@ public class AADMDomainModelFactory {
aadmDoSProvenActTask
.setTaskLogic(new AxTaskLogic(aadmDoSProvenActTask.getKey(), "TaskLogic", "MVEL", logicReader));
- final AxTask vMMEMatchTask = new AxTask(new AxArtifactKey("VMMEMatchTask", "0.0.1"));
- vMMEMatchTask.duplicateInputFields(vMMEEvent.getParameterMap());
- vMMEMatchTask.duplicateOutputFields(vMMEEvent.getParameterMap());
- vMMEMatchTask.setTaskLogic(new AxTaskLogic(vMMEMatchTask.getKey(), "TaskLogic", "MVEL", logicReader));
+ final AxTask vMmeMatchTask = new AxTask(new AxArtifactKey("VMMEMatchTask", "0.0.1"));
+ vMmeMatchTask.duplicateInputFields(vMmeEvent.getParameterMap());
+ vMmeMatchTask.duplicateOutputFields(vMmeEvent.getParameterMap());
+ vMmeMatchTask.setTaskLogic(new AxTaskLogic(vMmeMatchTask.getKey(), "TaskLogic", "MVEL", logicReader));
- final AxTask vMMEEstablishTask = new AxTask(new AxArtifactKey("VMMEEstablishTask", "0.0.1"));
- vMMEEstablishTask.duplicateInputFields(vMMEEvent.getParameterMap());
- vMMEEstablishTask.duplicateOutputFields(vMMEEvent.getParameterMap());
+ final AxTask vMmeEstablishTask = new AxTask(new AxArtifactKey("VMMEEstablishTask", "0.0.1"));
+ vMmeEstablishTask.duplicateInputFields(vMmeEvent.getParameterMap());
+ vMmeEstablishTask.duplicateOutputFields(vMmeEvent.getParameterMap());
logicReader.setDefaultLogic("Default_TaskLogic");
- vMMEEstablishTask.setTaskLogic(new AxTaskLogic(vMMEEstablishTask.getKey(), "TaskLogic", "MVEL", logicReader));
+ vMmeEstablishTask.setTaskLogic(new AxTaskLogic(vMmeEstablishTask.getKey(), "TaskLogic", "MVEL", logicReader));
- final AxTask vMMEDecideTask = new AxTask(new AxArtifactKey("VMMEDecideTask", "0.0.1"));
- vMMEDecideTask.duplicateInputFields(vMMEEvent.getParameterMap());
- vMMEDecideTask.duplicateOutputFields(vMMEEvent.getParameterMap());
- vMMEDecideTask.setTaskLogic(new AxTaskLogic(vMMEDecideTask.getKey(), "TaskLogic", "MVEL", logicReader));
+ final AxTask vMmeDecideTask = new AxTask(new AxArtifactKey("VMMEDecideTask", "0.0.1"));
+ vMmeDecideTask.duplicateInputFields(vMmeEvent.getParameterMap());
+ vMmeDecideTask.duplicateOutputFields(vMmeEvent.getParameterMap());
+ vMmeDecideTask.setTaskLogic(new AxTaskLogic(vMmeDecideTask.getKey(), "TaskLogic", "MVEL", logicReader));
- final AxTask vMMENoActTask = new AxTask(new AxArtifactKey("VMMENoActTask", "0.0.1"));
- vMMENoActTask.duplicateInputFields(vMMEEvent.getParameterMap());
- vMMENoActTask.duplicateOutputFields(vMMEEvent.getParameterMap());
- vMMENoActTask.setTaskLogic(new AxTaskLogic(vMMENoActTask.getKey(), "TaskLogic", "MVEL", logicReader));
+ final AxTask vMmeNoActTask = new AxTask(new AxArtifactKey("VMMENoActTask", "0.0.1"));
+ vMmeNoActTask.duplicateInputFields(vMmeEvent.getParameterMap());
+ vMmeNoActTask.duplicateOutputFields(vMmeEvent.getParameterMap());
+ vMmeNoActTask.setTaskLogic(new AxTaskLogic(vMmeNoActTask.getKey(), "TaskLogic", "MVEL", logicReader));
- final AxTask vMMEActTask = new AxTask(new AxArtifactKey("VMMEActTask", "0.0.1"));
- vMMEActTask.duplicateInputFields(vMMEEvent.getParameterMap());
- vMMEActTask.duplicateOutputFields(vMMEEvent.getParameterMap());
+ final AxTask vMmeActTask = new AxTask(new AxArtifactKey("VMMEActTask", "0.0.1"));
+ vMmeActTask.duplicateInputFields(vMmeEvent.getParameterMap());
+ vMmeActTask.duplicateOutputFields(vMmeEvent.getParameterMap());
logicReader.setDefaultLogic(null);
- vMMEActTask.setTaskLogic(new AxTaskLogic(vMMEActTask.getKey(), "TaskLogic", "MVEL", logicReader));
+ vMmeActTask.setTaskLogic(new AxTaskLogic(vMmeActTask.getKey(), "TaskLogic", "MVEL", logicReader));
final AxTask sapcMatchTask = new AxTask(new AxArtifactKey("SAPCMatchTask", "0.0.1"));
sapcMatchTask.duplicateInputFields(sapcEvent.getParameterMap());
@@ -453,11 +453,11 @@ public class AADMDomainModelFactory {
aadmTasks.getTaskMap().put(aadmDoSSuggestionActTask.getKey(), aadmDoSSuggestionActTask);
aadmTasks.getTaskMap().put(aadmNoActTask.getKey(), aadmNoActTask);
aadmTasks.getTaskMap().put(aadmDoSProvenActTask.getKey(), aadmDoSProvenActTask);
- aadmTasks.getTaskMap().put(vMMEMatchTask.getKey(), vMMEMatchTask);
- aadmTasks.getTaskMap().put(vMMEEstablishTask.getKey(), vMMEEstablishTask);
- aadmTasks.getTaskMap().put(vMMEDecideTask.getKey(), vMMEDecideTask);
- aadmTasks.getTaskMap().put(vMMENoActTask.getKey(), vMMENoActTask);
- aadmTasks.getTaskMap().put(vMMEActTask.getKey(), vMMEActTask);
+ aadmTasks.getTaskMap().put(vMmeMatchTask.getKey(), vMmeMatchTask);
+ aadmTasks.getTaskMap().put(vMmeEstablishTask.getKey(), vMmeEstablishTask);
+ aadmTasks.getTaskMap().put(vMmeDecideTask.getKey(), vMmeDecideTask);
+ aadmTasks.getTaskMap().put(vMmeNoActTask.getKey(), vMmeNoActTask);
+ aadmTasks.getTaskMap().put(vMmeActTask.getKey(), vMmeActTask);
aadmTasks.getTaskMap().put(sapcMatchTask.getKey(), sapcMatchTask);
aadmTasks.getTaskMap().put(sapcEstablishTask.getKey(), sapcEstablishTask);
aadmTasks.getTaskMap().put(sapcDecideTask.getKey(), sapcDecideTask);
@@ -535,53 +535,53 @@ public class AADMDomainModelFactory {
aadmPolicy.getStateMap().put(aadmDecideState.getKey().getLocalName(), aadmDecideState);
aadmPolicy.getStateMap().put(aadmActState.getKey().getLocalName(), aadmActState);
- final AxPolicy vMMEPolicy = new AxPolicy(new AxArtifactKey("VMMEPolicy", "0.0.1"));
- vMMEPolicy.setTemplate("MEDA");
-
- final AxState vMMEActState = new AxState(new AxReferenceKey(vMMEPolicy.getKey(), "Act"));
- vMMEActState.setTrigger(vMMEEvent.getKey());
- final AxStateOutput vMMEAct2Out =
- new AxStateOutput(vMMEActState.getKey(), AxReferenceKey.getNullKey(), vMMEEvent.getKey());
- vMMEActState.getStateOutputs().put(vMMEAct2Out.getKey().getLocalName(), vMMEAct2Out);
- vMMEActState.setDefaultTask(vMMEActTask.getKey());
- vMMEActState.getTaskReferences().put(vMMEActTask.getKey(), new AxStateTaskReference(vMMEActState.getKey(),
- vMMEActTask.getKey(), AxStateTaskOutputType.DIRECT, vMMEAct2Out.getKey()));
- vMMEActState.getTaskReferences().put(vMMENoActTask.getKey(), new AxStateTaskReference(vMMEActState.getKey(),
- vMMENoActTask.getKey(), AxStateTaskOutputType.DIRECT, vMMEAct2Out.getKey()));
-
- final AxState vMMEDecideState = new AxState(new AxReferenceKey(vMMEPolicy.getKey(), "Decide"));
- vMMEDecideState.setTrigger(vMMEEvent.getKey());
- final AxStateOutput vMMEDec2Act =
- new AxStateOutput(vMMEDecideState.getKey(), vMMEActState.getKey(), vMMEEvent.getKey());
- vMMEDecideState.getStateOutputs().put(vMMEDec2Act.getKey().getLocalName(), vMMEDec2Act);
- vMMEDecideState.setDefaultTask(vMMEDecideTask.getKey());
- vMMEDecideState.getTaskReferences().put(vMMEDecideTask.getKey(), new AxStateTaskReference(
- vMMEDecideState.getKey(), vMMEDecideTask.getKey(), AxStateTaskOutputType.DIRECT, vMMEDec2Act.getKey()));
-
- final AxState vMMEEstablishState = new AxState(new AxReferenceKey(vMMEPolicy.getKey(), "Establish"));
- vMMEEstablishState.setTrigger(vMMEEvent.getKey());
- final AxStateOutput vMMEEst2Dec =
- new AxStateOutput(vMMEEstablishState.getKey(), vMMEDecideState.getKey(), vMMEEvent.getKey());
- vMMEEstablishState.getStateOutputs().put(vMMEEst2Dec.getKey().getLocalName(), vMMEEst2Dec);
- vMMEEstablishState.setDefaultTask(vMMEEstablishTask.getKey());
- vMMEEstablishState.getTaskReferences().put(vMMEEstablishTask.getKey(),
- new AxStateTaskReference(vMMEEstablishState.getKey(), vMMEEstablishTask.getKey(),
- AxStateTaskOutputType.DIRECT, vMMEEst2Dec.getKey()));
-
- final AxState vMMEMatchState = new AxState(new AxReferenceKey(vMMEPolicy.getKey(), "Match"));
- vMMEMatchState.setTrigger(vMMEEvent.getKey());
- final AxStateOutput vMMEMat2Est =
- new AxStateOutput(vMMEMatchState.getKey(), vMMEEstablishState.getKey(), vMMEEvent.getKey());
- vMMEMatchState.getStateOutputs().put(vMMEMat2Est.getKey().getLocalName(), vMMEMat2Est);
- vMMEMatchState.setDefaultTask(vMMEMatchTask.getKey());
- vMMEMatchState.getTaskReferences().put(vMMEMatchTask.getKey(), new AxStateTaskReference(vMMEMatchState.getKey(),
- vMMEMatchTask.getKey(), AxStateTaskOutputType.DIRECT, vMMEMat2Est.getKey()));
-
- vMMEPolicy.setFirstState(vMMEMatchState.getKey().getLocalName());
- vMMEPolicy.getStateMap().put(vMMEMatchState.getKey().getLocalName(), vMMEMatchState);
- vMMEPolicy.getStateMap().put(vMMEEstablishState.getKey().getLocalName(), vMMEEstablishState);
- vMMEPolicy.getStateMap().put(vMMEDecideState.getKey().getLocalName(), vMMEDecideState);
- vMMEPolicy.getStateMap().put(vMMEActState.getKey().getLocalName(), vMMEActState);
+ final AxPolicy vMmePolicy = new AxPolicy(new AxArtifactKey("VMMEPolicy", "0.0.1"));
+ vMmePolicy.setTemplate("MEDA");
+
+ final AxState vMmeActState = new AxState(new AxReferenceKey(vMmePolicy.getKey(), "Act"));
+ vMmeActState.setTrigger(vMmeEvent.getKey());
+ final AxStateOutput vMmeAct2Out =
+ new AxStateOutput(vMmeActState.getKey(), AxReferenceKey.getNullKey(), vMmeEvent.getKey());
+ vMmeActState.getStateOutputs().put(vMmeAct2Out.getKey().getLocalName(), vMmeAct2Out);
+ vMmeActState.setDefaultTask(vMmeActTask.getKey());
+ vMmeActState.getTaskReferences().put(vMmeActTask.getKey(), new AxStateTaskReference(vMmeActState.getKey(),
+ vMmeActTask.getKey(), AxStateTaskOutputType.DIRECT, vMmeAct2Out.getKey()));
+ vMmeActState.getTaskReferences().put(vMmeNoActTask.getKey(), new AxStateTaskReference(vMmeActState.getKey(),
+ vMmeNoActTask.getKey(), AxStateTaskOutputType.DIRECT, vMmeAct2Out.getKey()));
+
+ final AxState vMmeDecideState = new AxState(new AxReferenceKey(vMmePolicy.getKey(), "Decide"));
+ vMmeDecideState.setTrigger(vMmeEvent.getKey());
+ final AxStateOutput vMmeDec2Act =
+ new AxStateOutput(vMmeDecideState.getKey(), vMmeActState.getKey(), vMmeEvent.getKey());
+ vMmeDecideState.getStateOutputs().put(vMmeDec2Act.getKey().getLocalName(), vMmeDec2Act);
+ vMmeDecideState.setDefaultTask(vMmeDecideTask.getKey());
+ vMmeDecideState.getTaskReferences().put(vMmeDecideTask.getKey(), new AxStateTaskReference(
+ vMmeDecideState.getKey(), vMmeDecideTask.getKey(), AxStateTaskOutputType.DIRECT, vMmeDec2Act.getKey()));
+
+ final AxState vMmeEstablishState = new AxState(new AxReferenceKey(vMmePolicy.getKey(), "Establish"));
+ vMmeEstablishState.setTrigger(vMmeEvent.getKey());
+ final AxStateOutput vMmeEst2Dec =
+ new AxStateOutput(vMmeEstablishState.getKey(), vMmeDecideState.getKey(), vMmeEvent.getKey());
+ vMmeEstablishState.getStateOutputs().put(vMmeEst2Dec.getKey().getLocalName(), vMmeEst2Dec);
+ vMmeEstablishState.setDefaultTask(vMmeEstablishTask.getKey());
+ vMmeEstablishState.getTaskReferences().put(vMmeEstablishTask.getKey(),
+ new AxStateTaskReference(vMmeEstablishState.getKey(), vMmeEstablishTask.getKey(),
+ AxStateTaskOutputType.DIRECT, vMmeEst2Dec.getKey()));
+
+ final AxState vMmeMatchState = new AxState(new AxReferenceKey(vMmePolicy.getKey(), "Match"));
+ vMmeMatchState.setTrigger(vMmeEvent.getKey());
+ final AxStateOutput vMmeMat2Est =
+ new AxStateOutput(vMmeMatchState.getKey(), vMmeEstablishState.getKey(), vMmeEvent.getKey());
+ vMmeMatchState.getStateOutputs().put(vMmeMat2Est.getKey().getLocalName(), vMmeMat2Est);
+ vMmeMatchState.setDefaultTask(vMmeMatchTask.getKey());
+ vMmeMatchState.getTaskReferences().put(vMmeMatchTask.getKey(), new AxStateTaskReference(vMmeMatchState.getKey(),
+ vMmeMatchTask.getKey(), AxStateTaskOutputType.DIRECT, vMmeMat2Est.getKey()));
+
+ vMmePolicy.setFirstState(vMmeMatchState.getKey().getLocalName());
+ vMmePolicy.getStateMap().put(vMmeMatchState.getKey().getLocalName(), vMmeMatchState);
+ vMmePolicy.getStateMap().put(vMmeEstablishState.getKey().getLocalName(), vMmeEstablishState);
+ vMmePolicy.getStateMap().put(vMmeDecideState.getKey().getLocalName(), vMmeDecideState);
+ vMmePolicy.getStateMap().put(vMmeActState.getKey().getLocalName(), vMmeActState);
final AxPolicy sapcPolicy = new AxPolicy(new AxArtifactKey("SAPCPolicy", "0.0.1"));
sapcPolicy.setTemplate("MEDA");
@@ -680,7 +680,7 @@ public class AADMDomainModelFactory {
final AxPolicies aadmPolicies = new AxPolicies(new AxArtifactKey("AADMPolicies", "0.0.1"));
aadmPolicies.getPolicyMap().put(aadmPolicy.getKey(), aadmPolicy);
- aadmPolicies.getPolicyMap().put(vMMEPolicy.getKey(), vMMEPolicy);
+ aadmPolicies.getPolicyMap().put(vMmePolicy.getKey(), vMmePolicy);
aadmPolicies.getPolicyMap().put(sapcPolicy.getKey(), sapcPolicy);
aadmPolicies.getPolicyMap().put(periodicPolicy.getKey(), periodicPolicy);
diff --git a/examples/examples-aadm/src/main/java/org/onap/policy/apex/examples/aadm/model/AADMDomainModelSaver.java b/examples/examples-aadm/src/main/java/org/onap/policy/apex/examples/aadm/model/AadmDomainModelSaver.java
index a25a0e983..5a3afd901 100644
--- a/examples/examples-aadm/src/main/java/org/onap/policy/apex/examples/aadm/model/AADMDomainModelSaver.java
+++ b/examples/examples-aadm/src/main/java/org/onap/policy/apex/examples/aadm/model/AadmDomainModelSaver.java
@@ -29,11 +29,11 @@ import org.onap.policy.apex.model.policymodel.concepts.AxPolicyModel;
*
* @author Liam Fallon (liam.fallon@ericsson.com)
*/
-public final class AADMDomainModelSaver {
+public final class AadmDomainModelSaver {
/**
* Private default constructor to prevent subclassing.
*/
- private AADMDomainModelSaver() {}
+ private AadmDomainModelSaver() {}
/**
* Write the AADM model to args[0].
@@ -43,12 +43,12 @@ public final class AADMDomainModelSaver {
*/
public static void main(final String[] args) throws ApexException {
if (args.length != 1) {
- System.err.println("usage: " + AADMDomainModelSaver.class.getCanonicalName() + " modelDirectory");
+ System.err.println("usage: " + AadmDomainModelSaver.class.getCanonicalName() + " modelDirectory");
return;
}
// Save Java model
- final AxPolicyModel aadmPolicyModel = new AADMDomainModelFactory().getAADMPolicyModel();
+ final AxPolicyModel aadmPolicyModel = new AadmDomainModelFactory().getAadmPolicyModel();
final ApexModelSaver<AxPolicyModel> aadmModelSaver =
new ApexModelSaver<>(AxPolicyModel.class, aadmPolicyModel, args[0]);
aadmModelSaver.apexModelWriteJson();