summaryrefslogtreecommitdiffstats
path: root/ONAP-REST
diff options
context:
space:
mode:
Diffstat (limited to 'ONAP-REST')
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/adapter/PolicyRestAdapter.java51
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroserviceHeaderdeFaults.java8
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/util/ParserException.java25
-rw-r--r--ONAP-REST/src/test/java/org/onap/policy/rest/adapter/PolicyRestAdapterTest.java30
4 files changed, 96 insertions, 18 deletions
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/PolicyRestAdapter.java b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/PolicyRestAdapter.java
index 0a3f46c78..97e6e9ef6 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/PolicyRestAdapter.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/PolicyRestAdapter.java
@@ -1154,4 +1154,55 @@ public class PolicyRestAdapter {
public void setUiJsonBody(String uiJsonBody) {
this.uiJsonBody = uiJsonBody;
}
+
+ public boolean setupUsingAttribute(String attributeId, String value) {
+ switch (attributeId) {
+ case "ONAPName":
+ this.setOnapName(value);
+ OnapName tempOnapName = new OnapName();
+ tempOnapName.setOnapName(value);
+ this.setOnapNameField(tempOnapName);
+ return true;
+ case "RiskType":
+ this.setRiskType(value);
+ return true;
+ case "RiskLevel":
+ this.setRiskLevel(value);
+ return true;
+ case "guard":
+ this.setGuard(value);
+ return true;
+ case "ConfigName":
+ this.setConfigName(value);
+ return true;
+ case "uuid":
+ this.setUuid(value);
+ return true;
+ case "location":
+ this.setLocation(value);
+ return true;
+ case "TTLDate":
+ if (!value.contains("NA")) {
+ this.setTtlDate(PolicyRestAdapter.convertDate(value));
+ return true;
+ }
+ return false;
+ default:
+ return false;
+ }
+ }
+
+ /**
+ * Function to convert date.
+ *
+ * @param dateTimeToLive input date value.
+ * @return
+ */
+ private static String convertDate(String dateTimeToLive) {
+ String formatDate = null;
+ if (dateTimeToLive.contains("-")) {
+ formatDate = dateTimeToLive.replace("-", "/");
+ }
+ return formatDate;
+ }
}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroserviceHeaderdeFaults.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroserviceHeaderdeFaults.java
index 905555120..5098628b0 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroserviceHeaderdeFaults.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroserviceHeaderdeFaults.java
@@ -2,14 +2,14 @@
* ============LICENSE_START=======================================================
* ONAP-REST
* ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018-2019 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.
@@ -39,8 +39,6 @@ import javax.persistence.Table;
public class MicroserviceHeaderdeFaults implements Serializable {
private static final long serialVersionUID = 1L;
- private static String domain;
-
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name="id")
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/util/ParserException.java b/ONAP-REST/src/main/java/org/onap/policy/rest/util/ParserException.java
index 50e30f05b..f509abdbb 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/util/ParserException.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/util/ParserException.java
@@ -2,14 +2,14 @@
* ============LICENSE_START=======================================================
* ONAP-REST
* ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018-2019 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.
@@ -19,12 +19,17 @@
*/
package org.onap.policy.rest.util;
-public class ParserException extends Exception{
- String message;
- ParserException(String message) {
+public class ParserException extends Exception {
+ private static final long serialVersionUID = -1166704711958410424L;
+
+ final String message;
+
+ ParserException(String message) {
this.message = message;
- }
- public String getMessage(){
- return message ;
- }
+ }
+
+ @Override
+ public String getMessage() {
+ return message;
+ }
} \ No newline at end of file
diff --git a/ONAP-REST/src/test/java/org/onap/policy/rest/adapter/PolicyRestAdapterTest.java b/ONAP-REST/src/test/java/org/onap/policy/rest/adapter/PolicyRestAdapterTest.java
index 971614359..860e08d93 100644
--- a/ONAP-REST/src/test/java/org/onap/policy/rest/adapter/PolicyRestAdapterTest.java
+++ b/ONAP-REST/src/test/java/org/onap/policy/rest/adapter/PolicyRestAdapterTest.java
@@ -2,14 +2,14 @@
* ============LICENSE_START=======================================================
* ONAP Policy Engine
* ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018-2019 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.
@@ -19,6 +19,8 @@
*/
package org.onap.policy.rest.adapter;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
@@ -257,4 +259,26 @@ public class PolicyRestAdapterTest {
adapter.setSupressionType("Test");
assertTrue("Test".equals(adapter.getSupressionType()));
}
+
+ @Test
+ public void testPublic() {
+ PolicyRestAdapter adapter = new PolicyRestAdapter();
+ adapter.setupUsingAttribute("ONAPName", "onapvalue");
+ adapter.setupUsingAttribute("RiskType", "riskvalue");
+ adapter.setupUsingAttribute("RiskLevel", "risklevel");
+ adapter.setupUsingAttribute("guard", "guardvalue");
+ adapter.setupUsingAttribute("ConfigName", "configvalue");
+ adapter.setupUsingAttribute("uuid", "uuidvalue");
+ adapter.setupUsingAttribute("location", "locationvalue");
+ assertEquals("riskvalue", adapter.getRiskType());
+ assertEquals("risklevel", adapter.getRiskLevel());
+ assertEquals("guardvalue", adapter.getGuard());
+ assertEquals("onapvalue", adapter.getOnapName());
+ assertEquals("onapvalue", adapter.getOnapNameField().getOnapName());
+ assertEquals("uuidvalue", adapter.getUuid());
+ assertEquals("locationvalue", adapter.getLocation());
+ assertEquals("configvalue", adapter.getConfigName());
+
+ assertFalse(adapter.setupUsingAttribute("foobar", "foo"));
+ }
}