summaryrefslogtreecommitdiffstats
path: root/examples/examples-aadm/src
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2021-08-02 16:36:26 -0400
committerJim Hahn <jrh3@att.com>2021-08-06 14:56:04 -0400
commit9344ec1396b7151262e9b4ac48c72020e2b03e7e (patch)
tree532be4e8f8f5d3ec009dc20f198c1ae1db5399d0 /examples/examples-aadm/src
parentd7d3b5bd8f1c69fdaddffb3c200468feee424564 (diff)
Use lombok in apex-pdp #5
Updated examples thru integration-executor-test. Issue-ID: POLICY-3391 Change-Id: Idc707146a646d05720675a787761c199484048e9 Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'examples/examples-aadm/src')
-rw-r--r--examples/examples-aadm/src/main/java/org/onap/policy/apex/examples/aadm/concepts/ENodeBStatus.java43
-rw-r--r--examples/examples-aadm/src/main/java/org/onap/policy/apex/examples/aadm/concepts/ImsiStatus.java91
-rw-r--r--examples/examples-aadm/src/main/java/org/onap/policy/apex/examples/aadm/concepts/IpAddressStatus.java32
-rw-r--r--examples/examples-aadm/src/main/java/org/onap/policy/apex/examples/aadm/model/AadmDomainModelSaver.java10
-rw-r--r--examples/examples-aadm/src/main/resources/org/onap/policy/apex/examples/aadm/model/mvel/AADMDoSProvenActTaskTaskLogic.mvel11
-rw-r--r--examples/examples-aadm/src/main/resources/org/onap/policy/apex/examples/aadm/model/mvel/AADMDoSSuggestionActTaskTaskLogic.mvel11
-rw-r--r--examples/examples-aadm/src/main/resources/org/onap/policy/apex/examples/aadm/model/mvel/AADMPolicyActTaskSelectionLogic.mvel11
-rw-r--r--examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/AadmModelTest.java5
-rw-r--r--examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/TestApexActionListener.java12
9 files changed, 49 insertions, 177 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 70af74ab9..650bd82e0 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
@@ -1,6 +1,7 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -21,13 +22,19 @@
package org.onap.policy.apex.examples.aadm.concepts;
import java.io.Serializable;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.Setter;
/**
* The Class ENodeBStatus holds the status of an eNodeB in the AADM domain.
*/
+@Getter
+@Setter
public class ENodeBStatus implements Serializable {
private static final long serialVersionUID = 2852523814242234172L;
+ @Getter(AccessLevel.NONE)
private final String enodeB;
private long dosCount = 0;
@@ -52,24 +59,6 @@ public class ENodeBStatus implements Serializable {
}
/**
- * Gets the number of Denial Of Service incidents on the eNodeB.
- *
- * @return the number of Denial Of Service incidents on the eNodeB
- */
- public long getDosCount() {
- return dosCount;
- }
-
- /**
- * Sets the number of Denial Of Service incidents on the eNodeB.
- *
- * @param incomingDosCount the number of Denial Of Service incidents on the eNodeB
- */
- public void setDosCount(final long incomingDosCount) {
- this.dosCount = incomingDosCount;
- }
-
- /**
* Increment DOS count.
*
* @return the long
@@ -86,22 +75,4 @@ public class ENodeBStatus implements Serializable {
public long decrementDosCount() {
return --dosCount;
}
-
- /**
- * Gets the being probed.
- *
- * @return the being probed
- */
- public boolean getBeingProbed() {
- return beingProbed;
- }
-
- /**
- * Sets the being probed.
- *
- * @param beingProbed the being probed
- */
- public void setBeingProbed(final boolean beingProbed) {
- this.beingProbed = beingProbed;
- }
}
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 4b7def097..74f069dce 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
@@ -1,6 +1,7 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -21,10 +22,15 @@
package org.onap.policy.apex.examples.aadm.concepts;
import java.io.Serializable;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.Setter;
/**
* The Class IMSIStatus holds the status of an IMSI in the AADM domain.
*/
+@Getter
+@Setter
public class ImsiStatus implements Serializable {
private static final long serialVersionUID = 2852523814242234172L;
@@ -34,8 +40,10 @@ public class ImsiStatus implements Serializable {
private boolean anomalous = false;
private long anomalousTime = TIME_NOT_SET;
+ @Getter(AccessLevel.NONE)
+ @Setter(AccessLevel.NONE)
private String enodeBId;
- private long blackListedTime = TIME_NOT_SET;
+ private long blacklistedTime = TIME_NOT_SET;
private long blockingCount = 0;
/**
@@ -48,51 +56,6 @@ public class ImsiStatus implements Serializable {
}
/**
- * Gets the IMSI value.
- *
- * @return the IMSI value
- */
- public String getImsi() {
- return imsi;
- }
-
- /**
- * Gets the anomalous flag.
- *
- * @return the anomalous flag
- */
- public boolean getAnomalous() {
- return anomalous;
- }
-
- /**
- * Sets the anomalous flag.
- *
- * @param anomalous the anomalous flag
- */
- public void setAnomalous(final boolean anomalous) {
- this.anomalous = anomalous;
- }
-
- /**
- * Gets the time of the most recent anomolous event.
- *
- * @return the time of the most recent anomolous event
- */
- public long getAnomolousTime() {
- return anomalousTime;
- }
-
- /**
- * Sets the time of the most recent anomolous event.
- *
- * @param incomingAnomalousTime the time of the most recent anomolous event
- */
- public void setAnomolousTime(final long incomingAnomalousTime) {
- this.anomalousTime = incomingAnomalousTime;
- }
-
- /**
* Gets the eNodeB ID to which the IMSI is attached.
*
* @return theeNodeB ID to which the IMSI is attached
@@ -120,42 +83,6 @@ public class ImsiStatus implements Serializable {
}
/**
- * Gets the time at which the IMSI was blacklisted.
- *
- * @return the time at which the IMSI was blacklisted
- */
- public long getBlacklistedTime() {
- return blackListedTime;
- }
-
- /**
- * Sets the time at which the IMSI was blacklisted.
- *
- * @param incomingBlackListedTime the time at which the IMSI was blacklisted
- */
- public void setBlacklistedTime(final long incomingBlackListedTime) {
- this.blackListedTime = incomingBlackListedTime;
- }
-
- /**
- * Gets the number of times this IMSI was blocked.
- *
- * @return the number of times this IMSI was blocked
- */
- public long getBlockingCount() {
- return blockingCount;
- }
-
- /**
- * Sets the number of times this IMSI was blocked.
- *
- * @param blockingCount the number of times this IMSI was blocked
- */
- public void setBlockingCount(final long blockingCount) {
- this.blockingCount = blockingCount;
- }
-
- /**
* Increment the number of times this IMSI was blocked.
*
* @return the incremented number of times this IMSI was blocked
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 689865b16..26f2b4110 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
@@ -1,6 +1,7 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -21,10 +22,14 @@
package org.onap.policy.apex.examples.aadm.concepts;
import java.io.Serializable;
+import lombok.Getter;
+import lombok.Setter;
/**
* The Class IPAddressStatus holds the status of an IP address in the AADM domain.
*/
+@Getter
+@Setter
public class IpAddressStatus implements Serializable {
private static final long serialVersionUID = -7402022458317593252L;
@@ -42,33 +47,6 @@ public class IpAddressStatus implements Serializable {
}
/**
- * Gets the IP address.
- *
- * @return the IP address
- */
- public String getIpAddress() {
- return ipAddress;
- }
-
- /**
- * Gets the IMSI.
- *
- * @return the imsi
- */
- public String getImsi() {
- return imsi;
- }
-
- /**
- * Sets the IMSI.
- *
- * @param incomingImsi the imsi
- */
- public void setImsi(final String incomingImsi) {
- this.imsi = incomingImsi;
- }
-
- /**
* Check set IMSI.
*
* @return true, if check set IMSI
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 492769dad..52edb31a3 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
@@ -2,6 +2,7 @@
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
* Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -21,6 +22,8 @@
package org.onap.policy.apex.examples.aadm.model;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
import org.onap.policy.apex.model.basicmodel.handling.ApexModelSaver;
import org.onap.policy.apex.model.policymodel.concepts.AxPolicyModel;
@@ -32,17 +35,12 @@ import org.slf4j.ext.XLoggerFactory;
*
* @author Liam Fallon (liam.fallon@ericsson.com)
*/
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class AadmDomainModelSaver {
// Logger for this class
private static final XLogger LOGGER = XLoggerFactory.getXLogger(AadmDomainModelSaver.class);
/**
- * Private default constructor to prevent subclassing.
- */
- private AadmDomainModelSaver() {
- }
-
- /**
* Write the AADM model to args[0].
*
* @param args Not used
diff --git a/examples/examples-aadm/src/main/resources/org/onap/policy/apex/examples/aadm/model/mvel/AADMDoSProvenActTaskTaskLogic.mvel b/examples/examples-aadm/src/main/resources/org/onap/policy/apex/examples/aadm/model/mvel/AADMDoSProvenActTaskTaskLogic.mvel
index 225a0da4d..743824394 100644
--- a/examples/examples-aadm/src/main/resources/org/onap/policy/apex/examples/aadm/model/mvel/AADMDoSProvenActTaskTaskLogic.mvel
+++ b/examples/examples-aadm/src/main/resources/org/onap/policy/apex/examples/aadm/model/mvel/AADMDoSProvenActTaskTaskLogic.mvel
@@ -1,19 +1,20 @@
/*
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
@@ -52,7 +53,7 @@ eNodeBStatus.setBeingProbed(false);
leaveProbingOn = false;
for (ENodeBStatus enbStatus : getContextAlbum("ENodeBStatusAlbum").values) {
- if (enbStatus.getBeingProbed()) {
+ if (enbStatus.isBeingProbed()) {
leaveProbingOn = true;
}
}
@@ -67,7 +68,7 @@ logger.debug(eNodeBStatus.getENodeB() + ": dosCount is " + eNodeBStatus.getDosCo
imsiStatus.setAnomalous(false);
-logger.debug("imsi: " + imsiStatus.getImsi() + " anamalous " + imsiStatus.getAnomalous());
+logger.debug("imsi: " + imsiStatus.getImsi() + " anamalous " + imsiStatus.isAnomalous());
getContextAlbum("IMSIStatusAlbum") .put(imsiStatus.getImsi(), imsiStatus);
getContextAlbum("ENodeBStatusAlbum").put(eNodeBStatus.getENodeB(), eNodeBStatus);
diff --git a/examples/examples-aadm/src/main/resources/org/onap/policy/apex/examples/aadm/model/mvel/AADMDoSSuggestionActTaskTaskLogic.mvel b/examples/examples-aadm/src/main/resources/org/onap/policy/apex/examples/aadm/model/mvel/AADMDoSSuggestionActTaskTaskLogic.mvel
index 63ac8d0ba..6af2d1163 100644
--- a/examples/examples-aadm/src/main/resources/org/onap/policy/apex/examples/aadm/model/mvel/AADMDoSSuggestionActTaskTaskLogic.mvel
+++ b/examples/examples-aadm/src/main/resources/org/onap/policy/apex/examples/aadm/model/mvel/AADMDoSSuggestionActTaskTaskLogic.mvel
@@ -1,19 +1,20 @@
/*
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
@@ -60,7 +61,7 @@ if (imsiStatus.getENodeBId() != null && !imsiStatus.getENodeBId().equals(inField
outFields["ACTTASK"] = "remove_from_probe";
for (ENodeBStatus enbStatus : getContextAlbum("ENodeBStatusAlbum").values) {
- if (enbStatus.getBeingProbed()) {
+ if (enbStatus.isBeingProbed()) {
outFields["PROBE_ON"] = true;
outFields["TCP_ON"] = true;
return true;
@@ -78,7 +79,7 @@ if (imsiStatus.getENodeBId() != null && !imsiStatus.getENodeBId().equals(inField
}
imsiStatus.setAnomalous(true);
-imsiStatus.setAnomolousTime(System.currentTimeMillis());
+imsiStatus.setAnomalousTime(System.currentTimeMillis());
imsiStatus.setENodeBId(inFields["ENODEB_ID"]);
getContextAlbum("IMSIStatusAlbum").put(imsiStatus.getImsi(), imsiStatus);
logger.debug(imsiStatus.getENodeBId() + ": enodeb added to imsi ip added " + outFields["IMSI_IP"]);
diff --git a/examples/examples-aadm/src/main/resources/org/onap/policy/apex/examples/aadm/model/mvel/AADMPolicyActTaskSelectionLogic.mvel b/examples/examples-aadm/src/main/resources/org/onap/policy/apex/examples/aadm/model/mvel/AADMPolicyActTaskSelectionLogic.mvel
index 9c71db50a..2aca804d1 100644
--- a/examples/examples-aadm/src/main/resources/org/onap/policy/apex/examples/aadm/model/mvel/AADMPolicyActTaskSelectionLogic.mvel
+++ b/examples/examples-aadm/src/main/resources/org/onap/policy/apex/examples/aadm/model/mvel/AADMPolicyActTaskSelectionLogic.mvel
@@ -1,19 +1,20 @@
/*
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
@@ -33,10 +34,10 @@ if (imsiStatus.getBlockingCount() > 1) {
return false;
}
-logger.debug("imsi: " + imsiStatus.getImsi() + " anamalous " + imsiStatus.getAnomalous());
+logger.debug("imsi: " + imsiStatus.getImsi() + " anamalous " + imsiStatus.isAnomalous());
// check if this is second iteration
-if (inFields["TCP_UE_SIDE_AVG_THROUGHPUT"] != null && inFields["TCP_UE_SIDE_AVG_THROUGHPUT"] > 100 && imsiStatus.getAnomalous()) {
+if (inFields["TCP_UE_SIDE_AVG_THROUGHPUT"] != null && inFields["TCP_UE_SIDE_AVG_THROUGHPUT"] > 100 && imsiStatus.isAnomalous()) {
subject.getTaskKey("AADMDoSProvenActTask").copyTo(selectedTask);
logger.debug("inside TCP_UE_SIDE_AVG_THROUGHPUT");
return true;
diff --git a/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/AadmModelTest.java b/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/AadmModelTest.java
index fe9914061..99625f136 100644
--- a/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/AadmModelTest.java
+++ b/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/AadmModelTest.java
@@ -2,6 +2,7 @@
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
* Modifications Copyright (C) 2019-2020 Nordix Foundation.
+ * Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -31,6 +32,8 @@ import org.onap.policy.apex.model.basicmodel.test.TestApexModel;
import org.onap.policy.apex.model.policymodel.concepts.AxPolicyModel;
public class AadmModelTest {
+ private static final String VALID_MODEL_STRING = "***validation of model successful***";
+
TestApexModel<AxPolicyModel> testApexModel;
/**
@@ -66,6 +69,4 @@ public class AadmModelTest {
testApexModel.testApexModelWriteReadJpa(DaoParameters);
}
-
- private static final String VALID_MODEL_STRING = "***validation of model successful***";
}
diff --git a/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/TestApexActionListener.java b/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/TestApexActionListener.java
index 00cf98a93..37a916a1e 100644
--- a/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/TestApexActionListener.java
+++ b/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/TestApexActionListener.java
@@ -2,6 +2,7 @@
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
* Modifications Copyright (C) 2020 Nordix Foundation.
+ * Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -23,6 +24,7 @@ package org.onap.policy.apex.examples.aadm;
import java.util.ArrayList;
import java.util.List;
+import lombok.Getter;
import org.onap.policy.apex.core.engine.engine.EnEventListener;
import org.onap.policy.apex.core.engine.event.EnEvent;
@@ -37,6 +39,7 @@ import org.onap.policy.apex.core.engine.event.EnEvent;
public class TestApexActionListener implements EnEventListener {
List<EnEvent> resultEvents = new ArrayList<EnEvent>();
+ @Getter
private final String id;
/**
@@ -64,13 +67,4 @@ public class TestApexActionListener implements EnEventListener {
public void onEnEvent(final EnEvent actionEvent) {
resultEvents.add(actionEvent);
}
-
- /**
- * Gets the id.
- *
- * @return the id
- */
- public String getId() {
- return id;
- }
}