aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2019-11-15 13:33:39 +0000
committerGerrit Code Review <gerrit@onap.org>2019-11-15 13:33:39 +0000
commitd79badf67d5c253eb9883ac823626d7efa16c731 (patch)
tree5f0e5be07006416ae2fc8d301cdcda7dab358048
parent577b34e9bdad94d0b1559a9917af3283124aeeda (diff)
parent2f3ca9fc5edc5a52659b3486605e0db508143318 (diff)
Merge "Unit/SONAR/Checkstyle in ONAP-REST"
-rw-r--r--ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/DictionaryNames.java2
-rw-r--r--ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/UpdateOthersPAPS.java8
-rw-r--r--ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/CreateNewMicroServiceModel.java12
-rw-r--r--ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/NotifyOtherPaps.java8
-rw-r--r--ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/PolicyDbDao.java20
-rw-r--r--ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/ClosedLoopDictionaryController.java18
-rw-r--r--ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/DictionaryController.java2
-rw-r--r--ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/DictionaryImportController.java18
-rw-r--r--ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/MicroServiceDictionaryController.java12
-rw-r--r--ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/PolicyElasticSearchController.java6
-rw-r--r--ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/DictionaryHandlerImpl.java4
-rw-r--r--ONAP-PAP-REST/src/main/resources/META-INF/drop.ddl2
-rw-r--r--ONAP-PAP-REST/src/main/resources/META-INF/persistence.xml16
-rw-r--r--ONAP-PAP-REST/src/test/java/org/onap/policy/pap/test/UpdateOthersPAPSTest.java12
-rw-r--r--ONAP-PAP-REST/src/test/java/org/onap/policy/pap/test/XACMLPAPTest.java6
-rw-r--r--ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/components/NotifyOtherPapsTest.java8
-rw-r--r--ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/ClosedLoopDictionaryControllerTest.java6
-rw-r--r--ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/DictionaryImportControllerTest.java2
-rw-r--r--ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/jpa/PolicyEntityTest.java68
-rw-r--r--ONAP-PAP-REST/src/test/resources/dictionaryImport/PepOptions.csv (renamed from ONAP-PAP-REST/src/test/resources/dictionaryImport/PEPOptions.csv)0
-rw-r--r--ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/GetDictionaryService.java2
-rw-r--r--ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/test/GetDictionaryServiceTest.java2
-rw-r--r--ONAP-PDP-REST/src/test/resources/META-INF/drop.ddl2
-rw-r--r--ONAP-PDP-REST/src/test/resources/META-INF/persistence.xml16
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/adapter/PolicyRestAdapter.java4
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ConstraintType.java11
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/GroupPolicyScopeList.java2
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/GroupServiceList.java2
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceAttribute.java55
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceConfigName.java49
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceLocation.java48
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceModels.java134
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroserviceHeaderdeFaults.java87
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/Obadvice.java148
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ObadviceExpression.java58
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/OnapName.java99
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/OptimizationModels.java140
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PIPConfigParam.java148
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PIPResolverParam.java148
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PdpEntity.java190
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PepOptions.java (renamed from ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PEPOptions.java)107
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PipConfigParam.java135
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PipConfiguration.java (renamed from ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PIPConfiguration.java)466
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PipResolver.java (renamed from ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PIPResolver.java)286
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PipResolverParam.java132
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PipType.java (renamed from ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PIPType.java)114
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyAlgorithms.java84
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyAuditlog.java48
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyDBDaoEntity.java150
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyDbDaoEntity.java107
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyEditorScopes.java88
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyEntity.java283
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyGroupEntity.java37
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyRoles.java64
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeClosedLoop.java48
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeResource.java47
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeService.java48
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeType.java47
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScore.java75
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyVersion.java176
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PortList.java47
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PrefixList.java58
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ProtocolList.java50
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/util/PolicyValidation.java6
-rw-r--r--ONAP-REST/src/test/java/org/onap/policy/rest/adapter/PolicyRestAdapterTest.java76
-rw-r--r--ONAP-REST/src/test/java/org/onap/policy/rest/daoimpl/PolicyValidationDaoImplTest.java31
-rw-r--r--ONAP-REST/src/test/java/org/onap/policy/rest/jpa/ActionDictionaryJpaTest.java18
-rw-r--r--ONAP-REST/src/test/java/org/onap/policy/rest/jpa/ClosedLoopPolicyDictionaryJpaTest.java (renamed from ONAP-REST/src/test/java/org/onap/policy/rest/jpa/ClosedLoopPolicyDictionaryJPATest.java)98
-rw-r--r--ONAP-REST/src/test/java/org/onap/policy/rest/jpa/CommonDictionaryJpaTest.java10
-rw-r--r--ONAP-REST/src/test/java/org/onap/policy/rest/jpa/ConfigurationDataEntityTest.java83
-rw-r--r--ONAP-REST/src/test/java/org/onap/policy/rest/jpa/DecisionDictionaryJpaTest.java (renamed from ONAP-REST/src/test/java/org/onap/policy/rest/jpa/DecisionDictionaryJPATest.java)38
-rw-r--r--ONAP-REST/src/test/java/org/onap/policy/rest/jpa/DictionaryDataTest.java4
-rw-r--r--ONAP-REST/src/test/java/org/onap/policy/rest/jpa/MicroServiceDictionaryJpaTest.java34
-rw-r--r--ONAP-REST/src/test/java/org/onap/policy/rest/jpa/MicroserviceHeaderdeFaultsTest.java54
-rw-r--r--ONAP-REST/src/test/java/org/onap/policy/rest/jpa/OptimizationModelsJpaTest.java (renamed from ONAP-REST/src/test/java/org/onap/policy/rest/jpa/OptimizationModelsJPATest.java)26
-rw-r--r--ONAP-REST/src/test/java/org/onap/policy/rest/jpa/PIPConfigurationTest.java121
-rw-r--r--ONAP-REST/src/test/java/org/onap/policy/rest/jpa/PipConfigurationTest.java196
-rw-r--r--ONAP-REST/src/test/java/org/onap/policy/rest/jpa/PipJpaTest.java (renamed from ONAP-REST/src/test/java/org/onap/policy/rest/jpa/PIPJPATest.java)131
-rw-r--r--ONAP-REST/src/test/java/org/onap/policy/rest/jpa/PolicyAuditlogTest.java3
-rw-r--r--ONAP-REST/src/test/java/org/onap/policy/rest/jpa/PolicyEntityJpaTest.java260
-rw-r--r--ONAP-REST/src/test/java/org/onap/policy/rest/jpa/PolicyUtilsJpaTest.java (renamed from ONAP-REST/src/test/java/org/onap/policy/rest/jpa/PolicyUtilsJPATest.java)182
-rw-r--r--POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateDcaeMicroServiceController.java12
-rw-r--r--POLICY-SDK-APP/src/test/java/org/onap/policy/controller/CreateDcaeMicroServiceControllerTest.java4
-rw-r--r--POLICY-SDK-APP/src/test/java/org/onap/policy/daoImp/CommonClassDaoImplTest.java2
-rwxr-xr-xpackages/base/src/files/install/mysql/data/161000_upgrade_script.sql2
85 files changed, 2562 insertions, 3101 deletions
diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/DictionaryNames.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/DictionaryNames.java
index 2bb2e95bb..0e1cc521a 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/DictionaryNames.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/DictionaryNames.java
@@ -36,7 +36,7 @@ public enum DictionaryNames {
VSCLAction,
ClosedLoopService,
ClosedLoopSite,
- PEPOptions,
+ PepOptions,
VarbindDictionary,
BRMSParamDictionary,
BRMSControllerDictionary,
diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/UpdateOthersPAPS.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/UpdateOthersPAPS.java
index 2bb4229a6..1b25c3b9f 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/UpdateOthersPAPS.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/UpdateOthersPAPS.java
@@ -48,7 +48,7 @@ import org.onap.policy.rest.XacmlRestProperties;
import org.onap.policy.rest.dao.CommonClassDao;
import org.onap.policy.rest.jpa.ActionBodyEntity;
import org.onap.policy.rest.jpa.ConfigurationDataEntity;
-import org.onap.policy.rest.jpa.PolicyDBDaoEntity;
+import org.onap.policy.rest.jpa.PolicyDbDaoEntity;
import org.onap.policy.utils.PeCryptoUtils;
import org.onap.policy.xacml.api.XACMLErrorConstants;
import org.springframework.beans.factory.annotation.Autowired;
@@ -103,11 +103,11 @@ public class UpdateOthersPAPS {
body.setOldPolicyName(request.getParameter("oldPolicyName"));
String currentPap = XacmlRestProperties.getProperty("xacml.rest.pap.url");
- List<Object> getPAPUrls = commonClassDao.getData(PolicyDBDaoEntity.class);
+ List<Object> getPAPUrls = commonClassDao.getData(PolicyDbDaoEntity.class);
if (getPAPUrls != null && !getPAPUrls.isEmpty()) {
for (int i = 0; i < getPAPUrls.size(); i++) {
- PolicyDBDaoEntity papId = (PolicyDBDaoEntity) getPAPUrls.get(i);
- String papUrl = papId.getPolicyDBDaoUrl();
+ PolicyDbDaoEntity papId = (PolicyDbDaoEntity) getPAPUrls.get(i);
+ String papUrl = papId.getPolicyDbDaoUrl();
if (!papUrl.equals(currentPap)) {
String userName = papId.getUsername();
String password = papId.getPassword();
diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/CreateNewMicroServiceModel.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/CreateNewMicroServiceModel.java
index 573f274f2..ea5e8aa43 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/CreateNewMicroServiceModel.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/CreateNewMicroServiceModel.java
@@ -275,7 +275,7 @@ public class CreateNewMicroServiceModel {
newModel.setDependency("[]");
if (mainClass.getSubClass() != null) {
String value = new Gson().toJson(mainClass.getSubClass());
- newModel.setSub_attributes(value);
+ newModel.setSubAttributes(value);
}
if (mainClass.getAttribute() != null) {
@@ -289,7 +289,7 @@ public class CreateNewMicroServiceModel {
String refAttributes = mainClass.getRefAttribute().toString().replace("{", "").replace("}", "");
int equalsIndex = refAttributes.indexOf("=");
String refAttributesAfterFirstEquals = refAttributes.substring(equalsIndex + 1);
- this.newModel.setRef_attributes(refAttributesAfterFirstEquals);
+ this.newModel.setRefAttributes(refAttributesAfterFirstEquals);
}
if (mainClass.getEnumType() != null) {
@@ -328,14 +328,14 @@ public class CreateNewMicroServiceModel {
}
subAttribute = utils.createSubAttributes(dependency, classMap, this.newModel.getModelName());
- this.newModel.setSub_attributes(subAttribute);
+ this.newModel.setSubAttributes(subAttribute);
if (mainClass.getAttribute() != null && !mainClass.getAttribute().isEmpty()) {
this.newModel.setAttributes(mainClass.getAttribute().toString().replace("{", "").replace("}", ""));
}
if (mainClass.getRefAttribute() != null && !mainClass.getRefAttribute().isEmpty()) {
this.newModel
- .setRef_attributes(mainClass.getRefAttribute().toString().replace("{", "").replace("}", ""));
+ .setRefAttributes(mainClass.getRefAttribute().toString().replace("{", "").replace("}", ""));
}
if (mainClass.getEnumType() != null && !mainClass.getEnumType().isEmpty()) {
@@ -368,8 +368,8 @@ public class CreateNewMicroServiceModel {
model.setDependency(this.newModel.getDependency());
model.setDescription(this.newModel.getDescription());
model.setEnumValues(this.newModel.getEnumValues());
- model.setRef_attributes(this.newModel.getRef_attributes());
- model.setSub_attributes(this.newModel.getSub_attributes());
+ model.setRefAttributes(this.newModel.getRefAttributes());
+ model.setSubAttributes(this.newModel.getSubAttributes());
model.setDataOrderInfo(this.newModel.getDataOrderInfo());
model.setDecisionModel(this.newModel.isDecisionModel());
model.setRuleFormation(this.newModel.getRuleFormation());
diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/NotifyOtherPaps.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/NotifyOtherPaps.java
index cd290c66c..e9db043bf 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/NotifyOtherPaps.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/NotifyOtherPaps.java
@@ -35,13 +35,13 @@ import java.util.UUID;
import org.onap.policy.common.logging.flexlogger.FlexLogger;
import org.onap.policy.common.logging.flexlogger.Logger;
import org.onap.policy.rest.XacmlRestProperties;
-import org.onap.policy.rest.jpa.PolicyDBDaoEntity;
+import org.onap.policy.rest.jpa.PolicyDbDaoEntity;
import org.onap.policy.utils.PeCryptoUtils;
public class NotifyOtherPaps {
private static final Logger LOGGER = FlexLogger.getLogger(NotifyOtherPaps.class);
- private List<PolicyDBDaoEntity> failedPaps = null;
+ private List<PolicyDbDaoEntity> failedPaps = null;
public void notifyOthers(long entityId, String entityType) {
notifyOthers(entityId, entityType, null);
@@ -104,8 +104,8 @@ public class NotifyOtherPaps {
@Override
public void run() {
PolicyDbDao dao = new PolicyDbDao();
- PolicyDBDaoEntity dbdEntity = (PolicyDBDaoEntity) obj;
- String otherPap = dbdEntity.getPolicyDBDaoUrl();
+ PolicyDbDaoEntity dbdEntity = (PolicyDbDaoEntity) obj;
+ String otherPap = dbdEntity.getPolicyDbDaoUrl();
String txt;
try {
txt = PeCryptoUtils.decrypt(dbdEntity.getPassword());
diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/PolicyDbDao.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/PolicyDbDao.java
index e0db53e8b..9af380b05 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/PolicyDbDao.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/PolicyDbDao.java
@@ -59,7 +59,7 @@ import org.onap.policy.rest.jpa.ConfigurationDataEntity;
import org.onap.policy.rest.jpa.DatabaseLockEntity;
import org.onap.policy.rest.jpa.GroupEntity;
import org.onap.policy.rest.jpa.PdpEntity;
-import org.onap.policy.rest.jpa.PolicyDBDaoEntity;
+import org.onap.policy.rest.jpa.PolicyDbDaoEntity;
import org.onap.policy.rest.jpa.PolicyEntity;
import org.onap.policy.utils.PeCryptoUtils;
import org.onap.policy.xacml.api.XACMLErrorConstants;
@@ -212,14 +212,14 @@ public class PolicyDbDao {
/**
* Gets the list of other registered PolicyDBDaos from the database.
*
- * @return List (type PolicyDBDaoEntity) of other PolicyDBDaos
+ * @return List (type PolicyDbDaoEntity) of other PolicyDBDaos
*/
private List<?> getRemotePolicyDbDaoList() {
logger.debug("getRemotePolicyDBDaoList() as getRemotePolicyDBDaoList() called");
List<?> policyDbDaoEntityList = new LinkedList<>();
Session session = sessionfactory.openSession();
try {
- Criteria cr = session.createCriteria(PolicyDBDaoEntity.class);
+ Criteria cr = session.createCriteria(PolicyDbDaoEntity.class);
policyDbDaoEntityList = cr.list();
} catch (Exception e) {
PolicyLogger.error(MessageCodes.EXCEPTION_ERROR, e, POLICYDBDAO_VAR,
@@ -328,7 +328,7 @@ public class PolicyDbDao {
}
/**
- * Register the PolicyDBDao instance in the PolicyDBDaoEntity table.
+ * Register the PolicyDBDao instance in the PolicyDbDaoEntity table.
*
* @return Boolean, were we able to register?
*/
@@ -370,19 +370,19 @@ public class PolicyDbDao {
}
}
logger.debug("\nPolicyDBDao.register. Database locking and concurrency control is initialized\n");
- PolicyDBDaoEntity foundPolicyDbDaoEntity = null;
- Criteria cr = session.createCriteria(PolicyDBDaoEntity.class);
- cr.add(Restrictions.eq("policyDBDaoUrl", url[0]));
+ PolicyDbDaoEntity foundPolicyDbDaoEntity = null;
+ Criteria cr = session.createCriteria(PolicyDbDaoEntity.class);
+ cr.add(Restrictions.eq("policyDbDaoUrl", url[0]));
List<?> data = cr.list();
if (!data.isEmpty()) {
- foundPolicyDbDaoEntity = (PolicyDBDaoEntity) data.get(0);
+ foundPolicyDbDaoEntity = (PolicyDbDaoEntity) data.get(0);
}
// encrypt the password
String txt = PeCryptoUtils.encrypt(url[2]);
if (foundPolicyDbDaoEntity == null) {
- PolicyDBDaoEntity newPolicyDbDaoEntity = new PolicyDBDaoEntity();
- newPolicyDbDaoEntity.setPolicyDBDaoUrl(url[0]);
+ PolicyDbDaoEntity newPolicyDbDaoEntity = new PolicyDbDaoEntity();
+ newPolicyDbDaoEntity.setPolicyDbDaoUrl(url[0]);
newPolicyDbDaoEntity.setDescription("PAP server at " + url[0]);
newPolicyDbDaoEntity.setUsername(url[1]);
newPolicyDbDaoEntity.setPassword(txt);
diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/ClosedLoopDictionaryController.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/ClosedLoopDictionaryController.java
index 0b94b40bc..16e8e2e2c 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/ClosedLoopDictionaryController.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/ClosedLoopDictionaryController.java
@@ -38,7 +38,7 @@ import org.onap.policy.rest.dao.CommonClassDao;
import org.onap.policy.rest.jpa.ClosedLoopD2Services;
import org.onap.policy.rest.jpa.ClosedLoopSite;
import org.onap.policy.rest.jpa.OnapName;
-import org.onap.policy.rest.jpa.PEPOptions;
+import org.onap.policy.rest.jpa.PepOptions;
import org.onap.policy.rest.jpa.UserInfo;
import org.onap.policy.rest.jpa.VNFType;
import org.onap.policy.rest.jpa.VSCLAction;
@@ -134,7 +134,7 @@ public class ClosedLoopDictionaryController {
produces = MediaType.APPLICATION_JSON_VALUE)
public void getPEPOptionsDictionaryByNameEntityData(HttpServletResponse response) {
DictionaryUtils utils = getDictionaryUtilsInstance();
- utils.getDataByEntity(response, pepOptionDatas, pepName, PEPOptions.class);
+ utils.getDataByEntity(response, pepOptionDatas, pepName, PepOptions.class);
}
@RequestMapping(
@@ -143,7 +143,7 @@ public class ClosedLoopDictionaryController {
produces = MediaType.APPLICATION_JSON_VALUE)
public void getPEPOptionsDictionaryEntityData(HttpServletResponse response) {
DictionaryUtils utils = getDictionaryUtilsInstance();
- utils.getData(response, pepOptionDatas, PEPOptions.class);
+ utils.getData(response, pepOptionDatas, PepOptions.class);
}
@RequestMapping(
@@ -336,15 +336,15 @@ public class ClosedLoopDictionaryController {
ObjectMapper mapper = new ObjectMapper();
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
JsonNode root = mapper.readTree(request.getReader());
- PEPOptions pEPOptions;
+ PepOptions pEPOptions;
GridData gridData;
String userId = null;
if (fromAPI) {
- pEPOptions = mapper.readValue(root.get(dictionaryFields).toString(), PEPOptions.class);
+ pEPOptions = mapper.readValue(root.get(dictionaryFields).toString(), PepOptions.class);
gridData = mapper.readValue(root.get(dictionaryFields).toString(), GridData.class);
userId = "API";
} else {
- pEPOptions = mapper.readValue(root.get("pepOptionsDictionaryData").toString(), PEPOptions.class);
+ pEPOptions = mapper.readValue(root.get("pepOptionsDictionaryData").toString(), PepOptions.class);
gridData = mapper.readValue(root.get("pepOptionsDictionaryData").toString(), GridData.class);
userId = root.get(userid).textValue();
}
@@ -355,10 +355,10 @@ public class ClosedLoopDictionaryController {
}
List<Object> duplicateData =
- commonClassDao.checkDuplicateEntry(pEPOptions.getPepName(), pepName, PEPOptions.class);
+ commonClassDao.checkDuplicateEntry(pEPOptions.getPepName(), pepName, PepOptions.class);
boolean duplicateflag = false;
if (!duplicateData.isEmpty()) {
- PEPOptions data = (PEPOptions) duplicateData.get(0);
+ PepOptions data = (PepOptions) duplicateData.get(0);
if (request.getParameter(operation) != null && "update".equals(request.getParameter(operation))) {
pEPOptions.setId(data.getId());
} else if ((request.getParameter(operation) != null
@@ -377,7 +377,7 @@ public class ClosedLoopDictionaryController {
pEPOptions.setModifiedDate(new Date());
commonClassDao.update(pEPOptions);
}
- responseString = mapper.writeValueAsString(commonClassDao.getData(PEPOptions.class));
+ responseString = mapper.writeValueAsString(commonClassDao.getData(PepOptions.class));
} else {
responseString = duplicateResponseString;
}
diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/DictionaryController.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/DictionaryController.java
index 5de2dfbc2..e2e2e3872 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/DictionaryController.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/DictionaryController.java
@@ -211,7 +211,7 @@ public class DictionaryController {
UserInfo userInfo = utils.getUserInfo(userId);
List<Object> duplicateData =
- commonClassDao.checkDuplicateEntry(onapData.getOnapName(), onapName, OnapName.class);
+ commonClassDao.checkDuplicateEntry(onapData.getName(), onapName, OnapName.class);
boolean duplicateflag = false;
if (!duplicateData.isEmpty()) {
OnapName data = (OnapName) duplicateData.get(0);
diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/DictionaryImportController.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/DictionaryImportController.java
index 7400eb0c8..ef475039d 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/DictionaryImportController.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/DictionaryImportController.java
@@ -56,7 +56,7 @@ import org.onap.policy.rest.jpa.DescriptiveScope;
import org.onap.policy.rest.jpa.GroupServiceList;
import org.onap.policy.rest.jpa.MicroServiceModels;
import org.onap.policy.rest.jpa.OnapName;
-import org.onap.policy.rest.jpa.PEPOptions;
+import org.onap.policy.rest.jpa.PepOptions;
import org.onap.policy.rest.jpa.PrefixList;
import org.onap.policy.rest.jpa.ProtocolList;
import org.onap.policy.rest.jpa.SecurityZone;
@@ -213,7 +213,7 @@ public class DictionaryImportController {
for (int j = 0; j < rows.length; j++) {
if ("onap_name".equalsIgnoreCase(dictSheet.get(0)[j])
|| "Onap Name".equalsIgnoreCase(dictSheet.get(0)[j])) {
- attribute.setOnapName(rows[j]);
+ attribute.setName(rows[j]);
}
if (DESCRIPTION.equalsIgnoreCase(dictSheet.get(0)[j])) {
attribute.setDescription(rows[j]);
@@ -252,10 +252,10 @@ public class DictionaryImportController {
attribute.setEnumValues(rows[j]);
}
if ("Ref Attributes".equalsIgnoreCase(dictSheet.get(0)[j])) {
- attribute.setRef_attributes(rows[j]);
+ attribute.setRefAttributes(rows[j]);
}
if ("Sub Attributes".equalsIgnoreCase(dictSheet.get(0)[j])) {
- attribute.setSub_attributes(rows[j]);
+ attribute.setSubAttributes(rows[j]);
}
if ("annotations".equalsIgnoreCase(dictSheet.get(0)[j])) {
attribute.setAnnotation(rows[j]);
@@ -295,10 +295,10 @@ public class DictionaryImportController {
attribute.setEnumValues(rows[j]);
}
if ("Ref Attributes".equalsIgnoreCase(dictSheet.get(0)[j])) {
- attribute.setRef_attributes(rows[j]);
+ attribute.setRefAttributes(rows[j]);
}
if ("Sub Attributes".equalsIgnoreCase(dictSheet.get(0)[j])) {
- attribute.setSub_attributes(rows[j]);
+ attribute.setSubAttributes(rows[j]);
}
if ("annotations".equalsIgnoreCase(dictSheet.get(0)[j])) {
attribute.setAnnotation(rows[j]);
@@ -389,9 +389,9 @@ public class DictionaryImportController {
commonClassDao.save(attribute);
}
}
- if (dictionaryName.startsWith("PEPOptions")) {
+ if (dictionaryName.startsWith("PepOptions")) {
for (int i = 1; i < dictSheet.size(); i++) {
- PEPOptions attribute = new PEPOptions();
+ PepOptions attribute = new PepOptions();
UserInfo userinfo = new UserInfo();
userinfo.setUserLoginId(userId);
attribute.setUserCreatedBy(userinfo);
@@ -801,7 +801,7 @@ public class DictionaryImportController {
case VSCLAction:
case ClosedLoopService:
case ClosedLoopSite:
- case PEPOptions:
+ case PepOptions:
case VarbindDictionary:
case BRMSParamDictionary:
case BRMSControllerDictionary:
diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/MicroServiceDictionaryController.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/MicroServiceDictionaryController.java
index dfd7af48d..b9e1ce1ce 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/MicroServiceDictionaryController.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/controller/MicroServiceDictionaryController.java
@@ -658,7 +658,7 @@ public class MicroServiceDictionaryController {
MSAttributeObject mainClass = classMap.get(this.newModel.getModelName());
this.newModel.setDependency("[]");
String value = new Gson().toJson(mainClass.getSubClass());
- this.newModel.setSub_attributes(value);
+ this.newModel.setSubAttributes(value);
String attributes = mainClass.getAttribute().toString().replace("{", "").replace("}", "");
int equalsIndexForAttributes = attributes.indexOf('=');
String atttributesAfterFirstEquals = attributes.substring(equalsIndexForAttributes + 1);
@@ -666,7 +666,7 @@ public class MicroServiceDictionaryController {
String refAttributes = mainClass.getRefAttribute().toString().replace("{", "").replace("}", "");
int equalsIndex = refAttributes.indexOf("=");
String refAttributesAfterFirstEquals = refAttributes.substring(equalsIndex + 1);
- this.newModel.setRef_attributes(refAttributesAfterFirstEquals);
+ this.newModel.setRefAttributes(refAttributesAfterFirstEquals);
this.newModel.setEnumValues(mainClass.getEnumType().toString().replace("{", "").replace("}", ""));
this.newModel
.setAnnotation(mainClass.getMatchingSet().toString().replace("{", "").replace("}", ""));
@@ -713,10 +713,10 @@ public class MicroServiceDictionaryController {
}
}
microServiceModels.setAttributes(this.newModel.getAttributes());
- microServiceModels.setRef_attributes(this.newModel.getRef_attributes());
+ microServiceModels.setRefAttributes(this.newModel.getRefAttributes());
microServiceModels.setDependency(this.newModel.getDependency());
microServiceModels.setModelName(this.newModel.getModelName());
- microServiceModels.setSub_attributes(this.newModel.getSub_attributes());
+ microServiceModels.setSubAttributes(this.newModel.getSubAttributes());
microServiceModels.setVersion(this.newModel.getVersion());
microServiceModels.setEnumValues(this.newModel.getEnumValues());
microServiceModels.setAnnotation(this.newModel.getAnnotation());
@@ -798,9 +798,9 @@ public class MicroServiceDictionaryController {
}
if (mainClass != null) {
this.newModel.setDependency(mainClass.getDependency());
- this.newModel.setSub_attributes(subAttribute);
+ this.newModel.setSubAttributes(subAttribute);
this.newModel.setAttributes(mainClass.getAttribute().toString().replace("{", "").replace("}", ""));
- this.newModel.setRef_attributes(mainClass.getRefAttribute().toString().replace("{", "").replace("}", ""));
+ this.newModel.setRefAttributes(mainClass.getRefAttribute().toString().replace("{", "").replace("}", ""));
this.newModel.setEnumValues(mainClass.getEnumType().toString().replace("{", "").replace("}", ""));
this.newModel.setAnnotation(mainClass.getMatchingSet().toString().replace("{", "").replace("}", ""));
}
diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/PolicyElasticSearchController.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/PolicyElasticSearchController.java
index ad6b9cf8e..f21ac60c8 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/PolicyElasticSearchController.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/elk/client/PolicyElasticSearchController.java
@@ -58,7 +58,7 @@ import org.onap.policy.rest.jpa.GroupPolicyScopeList;
import org.onap.policy.rest.jpa.MicroServiceLocation;
import org.onap.policy.rest.jpa.MicroServiceModels;
import org.onap.policy.rest.jpa.OnapName;
-import org.onap.policy.rest.jpa.PEPOptions;
+import org.onap.policy.rest.jpa.PepOptions;
import org.onap.policy.rest.jpa.RiskType;
import org.onap.policy.rest.jpa.SafePolicyWarning;
import org.onap.policy.rest.jpa.TermList;
@@ -340,7 +340,7 @@ public class PolicyElasticSearchController {
break;
case onapName:
OnapName onapName = mapper.readValue(root.get("data").toString(), OnapName.class);
- value = onapName.getOnapName();
+ value = onapName.getName();
policyList = searchElkDatabase(all, "onapName", value);
break;
case actionPolicy:
@@ -356,7 +356,7 @@ public class PolicyElasticSearchController {
policyList = searchElkDatabase(config, "ruleName", value);
break;
case pepOptions:
- PEPOptions pEPOptions = mapper.readValue(root.get("data").toString(), PEPOptions.class);
+ PepOptions pEPOptions = mapper.readValue(root.get("data").toString(), PepOptions.class);
value = pEPOptions.getPepName();
policyList = searchElkDatabase(closedloop, "jsonBodyData.pepName", value);
break;
diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/DictionaryHandlerImpl.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/DictionaryHandlerImpl.java
index 65c50b1c0..f16c2031c 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/DictionaryHandlerImpl.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/DictionaryHandlerImpl.java
@@ -56,7 +56,7 @@ public class DictionaryHandlerImpl implements DictionaryHandler {
case "VNFType":
dictionary.getVnfType(response);
break;
- case "PEPOptions":
+ case "PepOptions":
dictionary.getPEPOptions(response);
break;
case "Varbind":
@@ -206,7 +206,7 @@ public class DictionaryHandlerImpl implements DictionaryHandler {
case "VNFType":
result = dictionary.saveVnfType(request, response);
break;
- case "PEPOptions":
+ case "PepOptions":
result = dictionary.savePEPOptions(request, response);
break;
case "Varbind":
diff --git a/ONAP-PAP-REST/src/main/resources/META-INF/drop.ddl b/ONAP-PAP-REST/src/main/resources/META-INF/drop.ddl
index 062169345..d28a00dde 100644
--- a/ONAP-PAP-REST/src/main/resources/META-INF/drop.ddl
+++ b/ONAP-PAP-REST/src/main/resources/META-INF/drop.ddl
@@ -20,7 +20,7 @@
DROP TABLE IF EXISTS ConfigurationDataEntity
DROP TABLE IF EXISTS PolicyEntity
-DROP TABLE IF EXISTS PolicyDBDaoEntity
+DROP TABLE IF EXISTS PolicyDbDaoEntity
DROP TABLE IF EXISTS ActionBodyEntity
DROP SEQUENCE IF EXISTS seqPolicy
DROP SEQUENCE IF EXISTS seqConfig
diff --git a/ONAP-PAP-REST/src/main/resources/META-INF/persistence.xml b/ONAP-PAP-REST/src/main/resources/META-INF/persistence.xml
index 057666ee6..0280219a7 100644
--- a/ONAP-PAP-REST/src/main/resources/META-INF/persistence.xml
+++ b/ONAP-PAP-REST/src/main/resources/META-INF/persistence.xml
@@ -22,7 +22,7 @@
<persistence-unit name="XACML-PAP-REST">
<class>org.onap.policy.rest.jpa.PolicyEntity</class>
<class>org.onap.policy.rest.jpa.ConfigurationDataEntity</class>
- <class>org.onap.policy.rest.jpa.PolicyDBDaoEntity</class>
+ <class>org.onap.policy.rest.jpa.PolicyDbDaoEntity</class>
<class>org.onap.policy.rest.jpa.GroupEntity</class>
<class>org.onap.policy.rest.jpa.PdpEntity</class>
<class>org.onap.policy.rest.jpa.ActionBodyEntity</class>
@@ -109,7 +109,7 @@
<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
<class>org.onap.policy.rest.jpa.PolicyEntity</class>
<class>org.onap.policy.rest.jpa.ConfigurationDataEntity</class>
- <class>org.onap.policy.rest.jpa.PolicyDBDaoEntity</class>
+ <class>org.onap.policy.rest.jpa.PolicyDbDaoEntity</class>
<class>org.onap.policy.rest.jpa.GroupEntity</class>
<class>org.onap.policy.rest.jpa.PdpEntity</class>
<class>org.onap.policy.rest.jpa.ActionBodyEntity</class>
@@ -146,12 +146,12 @@
<class>org.onap.policy.rest.jpa.MicroServiceLocation</class>
<class>org.onap.policy.rest.jpa.Obadvice</class>
<class>org.onap.policy.rest.jpa.ObadviceExpression</class>
- <class>org.onap.policy.rest.jpa.PEPOptions</class>
- <class>org.onap.policy.rest.jpa.PIPConfigParam</class>
- <class>org.onap.policy.rest.jpa.PIPConfiguration</class>
- <class>org.onap.policy.rest.jpa.PIPResolver</class>
- <class>org.onap.policy.rest.jpa.PIPResolverParam</class>
- <class>org.onap.policy.rest.jpa.PIPType</class>
+ <class>org.onap.policy.rest.jpa.PepOptions</class>
+ <class>org.onap.policy.rest.jpa.PipConfigParam</class>
+ <class>org.onap.policy.rest.jpa.PipConfiguration</class>
+ <class>org.onap.policy.rest.jpa.PipResolver</class>
+ <class>org.onap.policy.rest.jpa.PipResolverParam</class>
+ <class>org.onap.policy.rest.jpa.PipType</class>
<class>org.onap.policy.rest.jpa.PolicyAlgorithms</class>
<class>org.onap.policy.rest.jpa.PolicyManagement</class>
<class>org.onap.policy.rest.jpa.PolicyScopeService</class>
diff --git a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/test/UpdateOthersPAPSTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/test/UpdateOthersPAPSTest.java
index 99902012b..ffac655a6 100644
--- a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/test/UpdateOthersPAPSTest.java
+++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/test/UpdateOthersPAPSTest.java
@@ -43,7 +43,7 @@ import org.onap.policy.pap.xacml.rest.UpdateOthersPAPS;
import org.onap.policy.pap.xacml.rest.adapters.UpdateObjectData;
import org.onap.policy.pap.xacml.rest.components.Policy;
import org.onap.policy.rest.dao.CommonClassDao;
-import org.onap.policy.rest.jpa.PolicyDBDaoEntity;
+import org.onap.policy.rest.jpa.PolicyDbDaoEntity;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
@@ -65,20 +65,20 @@ public class UpdateOthersPAPSTest {
request = mock(HttpServletRequest.class);
response = new MockHttpServletResponse();
List<Object> data = new ArrayList<>();
- PolicyDBDaoEntity entity = new PolicyDBDaoEntity();
- entity.setPolicyDBDaoUrl("http://localhost:8070/pap");
+ PolicyDbDaoEntity entity = new PolicyDbDaoEntity();
+ entity.setPolicyDbDaoUrl("http://localhost:8070/pap");
entity.setUsername("test");
entity.setPassword("test");
- PolicyDBDaoEntity entity1 = new PolicyDBDaoEntity();
- entity1.setPolicyDBDaoUrl("http://localhost:8071/pap");
+ PolicyDbDaoEntity entity1 = new PolicyDbDaoEntity();
+ entity1.setPolicyDbDaoUrl("http://localhost:8071/pap");
entity1.setUsername("test");
entity1.setPassword("test");
data.add(entity);
data.add(entity1);
System.setProperty("xacml.rest.pap.url", "http://localhost:8070/pap");
- when(commonClassDao.getData(PolicyDBDaoEntity.class)).thenReturn(data);
+ when(commonClassDao.getData(PolicyDbDaoEntity.class)).thenReturn(data);
}
@Test
diff --git a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/test/XACMLPAPTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/test/XACMLPAPTest.java
index 10fcd300d..f978d7464 100644
--- a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/test/XACMLPAPTest.java
+++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/test/XACMLPAPTest.java
@@ -499,14 +499,14 @@ public class XACMLPAPTest {
// Verify
Mockito.verify(httpServletResponse).setStatus(HttpServletResponse.SC_OK);
//
- // Check PEPOptions
+ // Check PepOptions
//
httpServletRequest = Mockito.mock(HttpServletRequest.class);
httpServletResponse = Mockito.mock(MockHttpServletResponse.class);
json = "{\"dictionaryFields\":{\"pepName\":\"testRestAPI\",\"description\":\"testing create\","
+ "\"attributes\":[{\"option\":\"test1\",\"number\":\"test\"},{\"option\":\"test2\","
+ "\"number\":\"test\"}]}}";
- dictionaryTestSetup(false, "PEPOptions", json);
+ dictionaryTestSetup(false, "PepOptions", json);
// send Request to PAP
pap.service(httpServletRequest, httpServletResponse);
// Verify
@@ -886,7 +886,7 @@ public class XACMLPAPTest {
@Test
public void getDictionary() throws ServletException, IOException {
String[] dictionarys = new String[] {"Attribute", "OnapName", "Action", "BRMSParamTemplate", "VSCLAction",
- "VNFType", "PEPOptions", "Varbind", "Service", "Site", "Settings", "RainyDayTreatments",
+ "VNFType", "PepOptions", "Varbind", "Service", "Site", "Settings", "RainyDayTreatments",
"DescriptiveScope", "ActionList", "ProtocolList", "Zone", "SecurityZone", "PrefixList", "AddressGroup",
"ServiceGroup", "ServiceList", "TermList", "MicroServiceLocation", "MicroServiceConfigName", "DCAEUUID",
"MicroServiceModels", "PolicyScopeService", "PolicyScopeResource", "PolicyScopeType",
diff --git a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/components/NotifyOtherPapsTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/components/NotifyOtherPapsTest.java
index 50c166aed..7156ec788 100644
--- a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/components/NotifyOtherPapsTest.java
+++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/components/NotifyOtherPapsTest.java
@@ -28,7 +28,7 @@ import java.util.List;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.onap.policy.rest.jpa.PolicyDBDaoEntity;
+import org.onap.policy.rest.jpa.PolicyDbDaoEntity;
public class NotifyOtherPapsTest {
private static final String systemKey = XACMLProperties.XACML_PROPERTIES_NAME;
@@ -43,9 +43,9 @@ public class NotifyOtherPapsTest {
@Test
public void negTestNotify() {
NotifyOtherPaps notify = new NotifyOtherPaps();
- List<PolicyDBDaoEntity> otherServers = new ArrayList<PolicyDBDaoEntity>();
- PolicyDBDaoEntity dbdaoEntity = new PolicyDBDaoEntity();
- dbdaoEntity.setPolicyDBDaoUrl("http://test");
+ List<PolicyDbDaoEntity> otherServers = new ArrayList<PolicyDbDaoEntity>();
+ PolicyDbDaoEntity dbdaoEntity = new PolicyDbDaoEntity();
+ dbdaoEntity.setPolicyDbDaoUrl("http://test");
otherServers.add(dbdaoEntity);
long entityId = 0;
String entityType = "entityType";
diff --git a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/ClosedLoopDictionaryControllerTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/ClosedLoopDictionaryControllerTest.java
index 3472b0df5..fab361118 100644
--- a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/ClosedLoopDictionaryControllerTest.java
+++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/ClosedLoopDictionaryControllerTest.java
@@ -42,7 +42,7 @@ import org.onap.policy.pap.xacml.rest.util.DictionaryUtils;
import org.onap.policy.rest.dao.CommonClassDao;
import org.onap.policy.rest.jpa.ClosedLoopD2Services;
import org.onap.policy.rest.jpa.ClosedLoopSite;
-import org.onap.policy.rest.jpa.PEPOptions;
+import org.onap.policy.rest.jpa.PepOptions;
import org.onap.policy.rest.jpa.UserInfo;
import org.onap.policy.rest.jpa.VNFType;
import org.onap.policy.rest.jpa.VSCLAction;
@@ -140,7 +140,7 @@ public class ClosedLoopDictionaryControllerTest {
@Test
public void testGetPEPOptionsDictionaryByNameEntityData() {
- when(commonClassDao.getDataByColumn(PEPOptions.class, "pepName")).thenReturn(data);
+ when(commonClassDao.getDataByColumn(PepOptions.class, "pepName")).thenReturn(data);
controller.getPEPOptionsDictionaryByNameEntityData(response);
try {
assertTrue(response.getContentAsString() != null
@@ -153,7 +153,7 @@ public class ClosedLoopDictionaryControllerTest {
@Test
public void testGetPEPOptionsDictionaryEntityData() {
- when(commonClassDao.getData(PEPOptions.class)).thenReturn(new ArrayList<>());
+ when(commonClassDao.getData(PepOptions.class)).thenReturn(new ArrayList<>());
controller.getPEPOptionsDictionaryEntityData(response);
try {
assertTrue(response.getContentAsString() != null
diff --git a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/DictionaryImportControllerTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/DictionaryImportControllerTest.java
index ef723a3fd..ee4dff803 100644
--- a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/DictionaryImportControllerTest.java
+++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/DictionaryImportControllerTest.java
@@ -96,7 +96,7 @@ public class DictionaryImportControllerTest extends Mockito {
fileNames.add("SearchCriteria.csv");
fileNames.add("VNFType.csv");
fileNames.add("VSCLAction.csv");
- fileNames.add("PEPOptions.csv");
+ fileNames.add("PepOptions.csv");
fileNames.add("Settings.csv");
fileNames.add("Zone.csv");
fileNames.add("ActionList.csv");
diff --git a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/jpa/PolicyEntityTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/jpa/PolicyEntityTest.java
index 9da3f8b5c..d7fbda259 100644
--- a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/jpa/PolicyEntityTest.java
+++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/jpa/PolicyEntityTest.java
@@ -38,7 +38,7 @@ import org.onap.policy.common.logging.flexlogger.Logger;
import org.onap.policy.rest.XacmlRestProperties;
import org.onap.policy.rest.jpa.ActionBodyEntity;
import org.onap.policy.rest.jpa.ConfigurationDataEntity;
-import org.onap.policy.rest.jpa.PolicyDBDaoEntity;
+import org.onap.policy.rest.jpa.PolicyDbDaoEntity;
import org.onap.policy.rest.jpa.PolicyEntity;
public class PolicyEntityTest {
@@ -59,7 +59,7 @@ public class PolicyEntityTest {
et.begin();
// Make sure the DB is clean
- em.createQuery("DELETE FROM PolicyDBDaoEntity").executeUpdate();
+ em.createQuery("DELETE FROM PolicyDbDaoEntity").executeUpdate();
em.createQuery("DELETE FROM PolicyEntity").executeUpdate();
em.createQuery("DELETE FROM ConfigurationDataEntity").executeUpdate();
em.createQuery("DELETE FROM ActionBodyEntity").executeUpdate();
@@ -605,7 +605,7 @@ public class PolicyEntityTest {
+ "\n with exception: " + e);
}
- // ****************Test the PolicyDBDaoEntity************************
+ // ****************Test the PolicyDbDaoEntity************************
// Create a transaction
EntityTransaction et3 = em.getTransaction();
@@ -613,29 +613,29 @@ public class PolicyEntityTest {
et3.begin();
// create one
- PolicyDBDaoEntity pe1 = new PolicyDBDaoEntity();
+ PolicyDbDaoEntity pe1 = new PolicyDbDaoEntity();
em.persist(pe1);
pe1.setDescription("This is pe1");
- pe1.setPolicyDBDaoUrl("http://123.45.2.456:2345");
+ pe1.setPolicyDbDaoUrl("http://123.45.2.456:2345");
// push it to the DB
em.flush();
// create another
- PolicyDBDaoEntity pe2 = new PolicyDBDaoEntity();
+ PolicyDbDaoEntity pe2 = new PolicyDbDaoEntity();
em.persist(pe2);
pe2.setDescription("This is pe2");
- pe2.setPolicyDBDaoUrl("http://789.01.2.345:2345");
+ pe2.setPolicyDbDaoUrl("http://789.01.2.345:2345");
// Print them to the log before flushing
- logger.debug("\n\n***********PolicyEntityTest: PolicyDBDaoEntity objects before flush********"
- + "\n policyDBDaoUrl-1 = " + pe1.getPolicyDBDaoUrl() + "\n description-1 = " + pe1.getDescription()
+ logger.debug("\n\n***********PolicyEntityTest: PolicyDbDaoEntity objects before flush********"
+ + "\n policyDbDaoUrl-1 = " + pe1.getPolicyDbDaoUrl() + "\n description-1 = " + pe1.getDescription()
+ "\n createdDate-1 = " + pe1.getCreatedDate() + "\n modifiedDate-1 " + pe1.getModifiedDate()
- + "\n*****************************************" + "\n policyDBDaoUrl-2 = " + pe2.getPolicyDBDaoUrl()
+ + "\n*****************************************" + "\n policyDbDaoUrl-2 = " + pe2.getPolicyDbDaoUrl()
+ "\n description-2 = " + pe2.getDescription() + "\n createdDate-2 = " + pe2.getCreatedDate()
+ "\n modifiedDate-2 " + pe2.getModifiedDate());
@@ -644,36 +644,36 @@ public class PolicyEntityTest {
// Now let's retrieve them from the DB using the named query
- resultList = em.createNamedQuery("PolicyDBDaoEntity.findAll").getResultList();
+ resultList = em.createNamedQuery("PolicyDbDaoEntity.findAll").getResultList();
- PolicyDBDaoEntity pex = null;
- PolicyDBDaoEntity pey = null;
+ PolicyDbDaoEntity pex = null;
+ PolicyDbDaoEntity pey = null;
if (!resultList.isEmpty()) {
if (resultList.size() != 2) {
- fail("\nPolicyEntityTest: Number of PolicyDBDaoEntity entries = " + resultList.size()
+ fail("\nPolicyEntityTest: Number of PolicyDbDaoEntity entries = " + resultList.size()
+ " instead of 2");
}
for (Object policyDBDaoEntity : resultList) {
- PolicyDBDaoEntity pdbdao = (PolicyDBDaoEntity) policyDBDaoEntity;
- if (pdbdao.getPolicyDBDaoUrl().equals("http://123.45.2.456:2345")) {
+ PolicyDbDaoEntity pdbdao = (PolicyDbDaoEntity) policyDBDaoEntity;
+ if (pdbdao.getPolicyDbDaoUrl().equals("http://123.45.2.456:2345")) {
pex = pdbdao;
- } else if (pdbdao.getPolicyDBDaoUrl().equals("http://789.01.2.345:2345")) {
+ } else if (pdbdao.getPolicyDbDaoUrl().equals("http://789.01.2.345:2345")) {
pey = pdbdao;
}
}
// Print them to the log before flushing
- logger.debug("\n\n***********PolicyEntityTest: PolicyDBDaoEntity objects retrieved from DB********"
- + "\n policyDBDaoUrl-x = " + pex.getPolicyDBDaoUrl() + "\n description-x = "
+ logger.debug("\n\n***********PolicyEntityTest: PolicyDbDaoEntity objects retrieved from DB********"
+ + "\n policyDbDaoUrl-x = " + pex.getPolicyDbDaoUrl() + "\n description-x = "
+ pex.getDescription() + "\n createdDate-x = " + pex.getCreatedDate() + "\n modifiedDate-x "
+ pex.getModifiedDate() + "\n*****************************************"
- + "\n policyDBDaoUrl-y = "
- + pey.getPolicyDBDaoUrl() + "\n description-y = " + pey.getDescription()
+ + "\n policyDbDaoUrl-y = "
+ + pey.getPolicyDbDaoUrl() + "\n description-y = " + pey.getDescription()
+ "\n createdDate-y = "
+ pey.getCreatedDate() + "\n modifiedDate-y " + pey.getModifiedDate());
// Verify the retrieved objects are the same as the ones we stored in the DB
- if (pex.getPolicyDBDaoUrl().equals("http://123.45.2.456:2345")) {
+ if (pex.getPolicyDbDaoUrl().equals("http://123.45.2.456:2345")) {
assertSame(pe1, pex);
assertSame(pe2, pey);
} else {
@@ -682,46 +682,46 @@ public class PolicyEntityTest {
}
} else {
- fail("\nPolicyEntityTest: No PolicyDBDaoEntity DB entry found");
+ fail("\nPolicyEntityTest: No PolicyDbDaoEntity DB entry found");
}
- // Now let's see if we can do an update on the PolicyDBDaoEntity which we retrieved.
+ // Now let's see if we can do an update on the PolicyDbDaoEntity which we retrieved.
// em.persist(pex);
pex.setDescription("This is pex");
em.flush();
// retrieve it
- Query createPolicyQuery = em.createQuery("SELECT p FROM PolicyDBDaoEntity p WHERE p.description=:desc");
+ Query createPolicyQuery = em.createQuery("SELECT p FROM PolicyDbDaoEntity p WHERE p.description=:desc");
resultList = createPolicyQuery.setParameter("desc", "This is pex").getResultList();
- PolicyDBDaoEntity pez = null;
+ PolicyDbDaoEntity pez = null;
if (!resultList.isEmpty()) {
if (resultList.size() != 1) {
- fail("\nPolicyEntityTest: Update Test - Number of PolicyDBDaoEntity entries = " + resultList.size()
+ fail("\nPolicyEntityTest: Update Test - Number of PolicyDbDaoEntity entries = " + resultList.size()
+ " instead of 1");
}
- pez = (PolicyDBDaoEntity) resultList.get(0);
+ pez = (PolicyDbDaoEntity) resultList.get(0);
// Print them to the log before flushing
logger.debug(
- "\n\n***********PolicyEntityTest: Update Test - PolicyDBDaoEntity objects retrieved from "
+ "\n\n***********PolicyEntityTest: Update Test - PolicyDbDaoEntity objects retrieved from "
+ "DB********"
- + "\n policyDBDaoUrl-x = " + pex.getPolicyDBDaoUrl() + "\n description-x = "
+ + "\n policyDbDaoUrl-x = " + pex.getPolicyDbDaoUrl() + "\n description-x = "
+ pex.getDescription() + "\n createdDate-x = " + pex.getCreatedDate()
+ "\n modifiedDate-x " + pex.getModifiedDate()
- + "\n*****************************************" + "\n policyDBDaoUrl-z = "
- + pez.getPolicyDBDaoUrl() + "\n description-z = " + pez.getDescription()
+ + "\n*****************************************" + "\n policyDbDaoUrl-z = "
+ + pez.getPolicyDbDaoUrl() + "\n description-z = " + pez.getDescription()
+ "\n createdDate-z = " + pez.getCreatedDate() + "\n modifiedDate-z "
+ pez.getModifiedDate());
// Verify the retrieved objects are the same as the ones we stored in the DB
assertSame(pex, pez);
} else {
- fail("\nPolicyEntityTest: Update Test - No PolicyDBDaoEntity DB updated entry found");
+ fail("\nPolicyEntityTest: Update Test - No PolicyDbDaoEntity DB updated entry found");
}
// Clean up the DB
- em.createQuery("DELETE FROM PolicyDBDaoEntity").executeUpdate();
+ em.createQuery("DELETE FROM PolicyDbDaoEntity").executeUpdate();
em.createQuery("DELETE FROM PolicyEntity").executeUpdate();
em.createQuery("DELETE FROM ConfigurationDataEntity").executeUpdate();
em.createQuery("DELETE FROM ActionBodyEntity").executeUpdate();
diff --git a/ONAP-PAP-REST/src/test/resources/dictionaryImport/PEPOptions.csv b/ONAP-PAP-REST/src/test/resources/dictionaryImport/PepOptions.csv
index 61adca140..61adca140 100644
--- a/ONAP-PAP-REST/src/test/resources/dictionaryImport/PEPOptions.csv
+++ b/ONAP-PAP-REST/src/test/resources/dictionaryImport/PepOptions.csv
diff --git a/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/GetDictionaryService.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/GetDictionaryService.java
index 44cc76478..1f0700f81 100644
--- a/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/GetDictionaryService.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/GetDictionaryService.java
@@ -158,7 +158,7 @@ public class GetDictionaryService {
case "VNFType":
jsonString = jsonString.replace("vnfTypeDictionaryDatas", "DictionaryDatas");
break;
- case "PEPOptions":
+ case "PepOptions":
jsonString = jsonString.replace("pepOptionsDictionaryDatas", "DictionaryDatas");
break;
case "Varbind":
diff --git a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/test/GetDictionaryServiceTest.java b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/test/GetDictionaryServiceTest.java
index 4544b6b1c..1904b4bf0 100644
--- a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/test/GetDictionaryServiceTest.java
+++ b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/test/GetDictionaryServiceTest.java
@@ -76,7 +76,7 @@ public class GetDictionaryServiceTest {
result = (String) formatDictionary.invoke(gds, input);
assertNotNull(result);
//
- dp.setDictionary("PEPOptions");
+ dp.setDictionary("PepOptions");
gds = new GetDictionaryService(dp, null);
result = (String) formatDictionary.invoke(gds, input);
assertNotNull(result);
diff --git a/ONAP-PDP-REST/src/test/resources/META-INF/drop.ddl b/ONAP-PDP-REST/src/test/resources/META-INF/drop.ddl
index 062169345..d28a00dde 100644
--- a/ONAP-PDP-REST/src/test/resources/META-INF/drop.ddl
+++ b/ONAP-PDP-REST/src/test/resources/META-INF/drop.ddl
@@ -20,7 +20,7 @@
DROP TABLE IF EXISTS ConfigurationDataEntity
DROP TABLE IF EXISTS PolicyEntity
-DROP TABLE IF EXISTS PolicyDBDaoEntity
+DROP TABLE IF EXISTS PolicyDbDaoEntity
DROP TABLE IF EXISTS ActionBodyEntity
DROP SEQUENCE IF EXISTS seqPolicy
DROP SEQUENCE IF EXISTS seqConfig
diff --git a/ONAP-PDP-REST/src/test/resources/META-INF/persistence.xml b/ONAP-PDP-REST/src/test/resources/META-INF/persistence.xml
index b4313271e..4362be902 100644
--- a/ONAP-PDP-REST/src/test/resources/META-INF/persistence.xml
+++ b/ONAP-PDP-REST/src/test/resources/META-INF/persistence.xml
@@ -22,7 +22,7 @@
<persistence-unit name="XACML-PAP-REST">
<class>org.onap.policy.rest.jpa.PolicyEntity</class>
<class>org.onap.policy.rest.jpa.ConfigurationDataEntity</class>
- <class>org.onap.policy.rest.jpa.PolicyDBDaoEntity</class>
+ <class>org.onap.policy.rest.jpa.PolicyDbDaoEntity</class>
<class>org.onap.policy.rest.jpa.GroupEntity</class>
<class>org.onap.policy.rest.jpa.PdpEntity</class>
<class>org.onap.policy.rest.jpa.ActionBodyEntity</class>
@@ -109,7 +109,7 @@
<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
<class>org.onap.policy.rest.jpa.PolicyEntity</class>
<class>org.onap.policy.rest.jpa.ConfigurationDataEntity</class>
- <class>org.onap.policy.rest.jpa.PolicyDBDaoEntity</class>
+ <class>org.onap.policy.rest.jpa.PolicyDbDaoEntity</class>
<class>org.onap.policy.rest.jpa.GroupEntity</class>
<class>org.onap.policy.rest.jpa.PdpEntity</class>
<class>org.onap.policy.rest.jpa.ActionBodyEntity</class>
@@ -146,12 +146,12 @@
<class>org.onap.policy.rest.jpa.MicroServiceLocation</class>
<class>org.onap.policy.rest.jpa.Obadvice</class>
<class>org.onap.policy.rest.jpa.ObadviceExpression</class>
- <class>org.onap.policy.rest.jpa.PEPOptions</class>
- <class>org.onap.policy.rest.jpa.PIPConfigParam</class>
- <class>org.onap.policy.rest.jpa.PIPConfiguration</class>
- <class>org.onap.policy.rest.jpa.PIPResolver</class>
- <class>org.onap.policy.rest.jpa.PIPResolverParam</class>
- <class>org.onap.policy.rest.jpa.PIPType</class>
+ <class>org.onap.policy.rest.jpa.PepOptions</class>
+ <class>org.onap.policy.rest.jpa.PipConfigParam</class>
+ <class>org.onap.policy.rest.jpa.PipConfiguration</class>
+ <class>org.onap.policy.rest.jpa.PipResolver</class>
+ <class>org.onap.policy.rest.jpa.PipResolverParam</class>
+ <class>org.onap.policy.rest.jpa.PipType</class>
<class>org.onap.policy.rest.jpa.PolicyAlgorithms</class>
<class>org.onap.policy.rest.jpa.PolicyManagement</class>
<class>org.onap.policy.rest.jpa.PolicyScopeService</class>
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 97e6e9ef6..e7879a855 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
@@ -23,7 +23,9 @@ package org.onap.policy.rest.adapter;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+
import javax.persistence.EntityManagerFactory;
+
import org.onap.policy.rest.jpa.OnapName;
public class PolicyRestAdapter {
@@ -1160,7 +1162,7 @@ public class PolicyRestAdapter {
case "ONAPName":
this.setOnapName(value);
OnapName tempOnapName = new OnapName();
- tempOnapName.setOnapName(value);
+ tempOnapName.setName(value);
this.setOnapNameField(tempOnapName);
return true;
case "RiskType":
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ConstraintType.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ConstraintType.java
index a79866a36..10394ae6f 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ConstraintType.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ConstraintType.java
@@ -73,7 +73,7 @@ public class ConstraintType implements Serializable {
private int id;
@Column(name = "constraint_type", nullable = false, length = 64)
- private String constraintType;
+ private String theConstraintType;
@Column(name = "description", nullable = false, length = 255)
private String description;
@@ -84,7 +84,7 @@ public class ConstraintType implements Serializable {
public ConstraintType(String constraintType) {
this();
- this.constraintType = constraintType;
+ this.theConstraintType = constraintType;
}
public ConstraintType(String constraintType, String description) {
@@ -96,4 +96,11 @@ public class ConstraintType implements Serializable {
return RANGE_TYPES;
}
+ public String getConstraintType() {
+ return theConstraintType;
+ }
+
+ public void setConstraintType(final String theConstraintType) {
+ this.theConstraintType = theConstraintType;
+ }
}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/GroupPolicyScopeList.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/GroupPolicyScopeList.java
index 394b6dc59..71eb19ec5 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/GroupPolicyScopeList.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/GroupPolicyScopeList.java
@@ -21,8 +21,6 @@
package org.onap.policy.rest.jpa;
-/*
- */
import java.io.Serializable;
import javax.persistence.Column;
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/GroupServiceList.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/GroupServiceList.java
index e97a26ebc..6d1120307 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/GroupServiceList.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/GroupServiceList.java
@@ -21,8 +21,6 @@
package org.onap.policy.rest.jpa;
-/*
- */
import java.io.Serializable;
import javax.persistence.Column;
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceAttribute.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceAttribute.java
index 574212097..8ae81b9c0 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceAttribute.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceAttribute.java
@@ -3,13 +3,14 @@
* ONAP-REST
* ================================================================================
* Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* 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.
@@ -31,54 +32,30 @@ import javax.persistence.NamedQuery;
import javax.persistence.OrderBy;
import javax.persistence.Table;
+import lombok.Getter;
+import lombok.Setter;
+
@Entity
-@Table(name="MicroServiceAttribute")
-@NamedQuery(name="MicroServiceAttribute.findAll", query="SELECT e FROM MicroServiceAttribute e ")
+@Table(name = "MicroServiceAttribute")
+@NamedQuery(name = "MicroServiceAttribute.findAll", query = "SELECT e FROM MicroServiceAttribute e ")
+@Getter
+@Setter
+
public class MicroServiceAttribute implements Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
- @Column(name="id")
+ @Column(name = "id")
private int id;
- @Column(name="name", nullable=false)
+ @Column(name = "name", nullable = false)
@OrderBy("asc")
private String name;
- @Column(name="value")
- private String value ;
+ @Column(name = "value")
+ private String value;
- @Column(name="modelName")
+ @Column(name = "modelName")
private String modelName;
-
- public int getId() {
- return this.id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
- public String getName() {
- return this.name;
- }
-
- public void setName(String name) {
- this.name = name;
-
- }
- public String getValue() {
- return this.value ;
- }
-
- public void setValue(String value ) {
- this.value = value ;
- }
- public String getModelName() {
- return modelName;
- }
- public void setModelName(String modelName) {
- this.modelName = modelName;
- }
-
} \ No newline at end of file
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceConfigName.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceConfigName.java
index 9719abbed..ab80c582b 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceConfigName.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceConfigName.java
@@ -3,13 +3,14 @@
* ONAP-REST
* ================================================================================
* Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* 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,8 +20,7 @@
*/
package org.onap.policy.rest.jpa;
-/*
- */
+
import java.io.Serializable;
import javax.persistence.Column;
@@ -32,46 +32,27 @@ import javax.persistence.NamedQuery;
import javax.persistence.OrderBy;
import javax.persistence.Table;
+import lombok.Getter;
+import lombok.Setter;
@Entity
-@Table(name="MicroServiceConfigName")
-@NamedQuery(name="MicroServiceConfigName.findAll", query="SELECT e FROM MicroServiceConfigName e ")
+@Table(name = "MicroServiceConfigName")
+@NamedQuery(name = "MicroServiceConfigName.findAll", query = "SELECT e FROM MicroServiceConfigName e ")
+@Getter
+@Setter
+
public class MicroServiceConfigName implements Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
- @Column(name="id")
+ @Column(name = "id")
private int id;
- @Column(name="name", nullable=false)
+ @Column(name = "name", nullable = false)
@OrderBy("asc")
private String name;
- @Column(name="description ")
- private String description ;
-
- public int getId() {
- return this.id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
- public String getName() {
- return this.name;
- }
-
- public void setName(String name) {
- this.name = name;
-
- }
- public String getDescriptionValue() {
- return this.description ;
- }
-
- public void setDescriptionValue(String description ) {
- this.description = description ;
- }
-
+ @Column(name = "description ")
+ private String description;
}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceLocation.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceLocation.java
index 669b191e7..84962d551 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceLocation.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceLocation.java
@@ -3,13 +3,14 @@
* ONAP-REST
* ================================================================================
* Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* 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,8 +20,7 @@
*/
package org.onap.policy.rest.jpa;
-/*
- */
+
import java.io.Serializable;
import javax.persistence.Column;
@@ -32,46 +32,26 @@ import javax.persistence.NamedQuery;
import javax.persistence.OrderBy;
import javax.persistence.Table;
+import lombok.Getter;
+import lombok.Setter;
@Entity
-@Table(name="MicroServiceLocation")
-@NamedQuery(name="MicroServiceLocation.findAll", query="SELECT e FROM MicroServiceLocation e ")
+@Table(name = "MicroServiceLocation")
+@NamedQuery(name = "MicroServiceLocation.findAll", query = "SELECT e FROM MicroServiceLocation e ")
+@Getter
+@Setter
public class MicroServiceLocation implements Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
- @Column(name="id")
+ @Column(name = "id")
private int id;
- @Column(name="name", nullable=false)
+ @Column(name = "name", nullable = false)
@OrderBy("asc")
private String name;
- @Column(name="description ")
- private String description ;
-
- public int getId() {
- return this.id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
- public String getName() {
- return this.name;
- }
-
- public void setName(String name) {
- this.name = name;
-
- }
- public String getDescriptionValue() {
- return this.description ;
- }
-
- public void setDescriptionValue(String description ) {
- this.description = description ;
- }
-
+ @Column(name = "description ")
+ private String description;
}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceModels.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceModels.java
index 1c6d811e1..ccedd6b8b 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceModels.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/MicroServiceModels.java
@@ -3,6 +3,7 @@
* ONAP-REST
* ================================================================================
* Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* 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,7 @@
package org.onap.policy.rest.jpa;
import java.io.Serializable;
+
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -38,12 +40,23 @@ import javax.persistence.Table;
* @version: 0.1
*/
+import lombok.Getter;
+import lombok.Setter;
+// @formatter:off
@Entity
@Table(name = "MicroServiceModels")
-@NamedQueries({@NamedQuery(name = "MicroServiceModels.findAll", query = "SELECT b FROM MicroServiceModels b "),
- @NamedQuery(name = "MicroServiceModels.findAllDecision",
- query = "SELECT b FROM MicroServiceModels b WHERE b.decisionModel=1")})
+@NamedQueries(
+ {
+ @NamedQuery(name = "MicroServiceModels.findAll", query = "SELECT b FROM MicroServiceModels b "),
+ @NamedQuery(
+ name = "MicroServiceModels.findAllDecision",
+ query = "SELECT b FROM MicroServiceModels b WHERE b.decisionModel=1")
+ }
+)
+@Getter
+@Setter
+// @formatter:on
public class MicroServiceModels implements Serializable {
private static final long serialVersionUID = 1L;
@@ -66,10 +79,10 @@ public class MicroServiceModels implements Serializable {
private String attributes;
@Column(name = "ref_attributes", nullable = false, length = 255)
- private String ref_attributes;
+ private String refAttributes;
@Column(name = "sub_attributes", nullable = false, length = 2000)
- private String sub_attributes;
+ private String subAttributes;
@Column(name = "dataOrderInfo", nullable = true, length = 2000)
private String dataOrderInfo;
@@ -89,120 +102,11 @@ public class MicroServiceModels implements Serializable {
@Column(name = "ruleFormation", nullable = true)
private String ruleFormation;
- public String getRuleFormation() {
- return ruleFormation;
- }
-
- public void setRuleFormation(String ruleFormation) {
- this.ruleFormation = ruleFormation;
- }
-
- public String getSub_attributes() {
- return sub_attributes;
- }
-
- public void setSub_attributes(String sub_attributes) {
- this.sub_attributes = sub_attributes;
- }
-
- public String getDataOrderInfo() {
- return dataOrderInfo;
- }
-
- public void setDataOrderInfo(String dataOrderInfo) {
- this.dataOrderInfo = dataOrderInfo;
- }
-
- public String getVersion() {
- return version;
- }
-
- public void setVersion(String version) {
- this.version = version;
- }
-
@ManyToOne
@JoinColumn(name = "imported_by")
private UserInfo userCreatedBy;
- public UserInfo getUserCreatedBy() {
- return userCreatedBy;
- }
-
- public void setUserCreatedBy(UserInfo userCreatedBy) {
- this.userCreatedBy = userCreatedBy;
- }
-
- public String getAttributes() {
- return attributes;
- }
-
- public void setAttributes(String attributes) {
- this.attributes = attributes;
- }
-
- public String getRef_attributes() {
- return ref_attributes;
- }
-
- public void setRef_attributes(String ref_attributes) {
- this.ref_attributes = ref_attributes;
- }
-
- public int getId() {
- return this.id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
-
- public String getDescription() {
- return this.description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getDependency() {
- return dependency;
- }
-
- public void setDependency(String dependency) {
- this.dependency = dependency;
- }
-
- public String getModelName() {
- return this.modelName;
- }
-
- public void setModelName(String modelName) {
- this.modelName = modelName;
- }
-
- public String getEnumValues() {
- return enumValues;
- }
-
- public void setEnumValues(String enumValues) {
- this.enumValues = enumValues;
- }
-
- public String getAnnotation() {
- return annotation;
- }
-
- public void setAnnotation(String annotation) {
- this.annotation = annotation;
- }
-
- public Boolean isDecisionModel() {
+ public boolean isDecisionModel() {
return decisionModel;
}
-
- public void setDecisionModel(boolean decisionModel) {
- this.decisionModel = decisionModel;
- }
}
-
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 5098628b0..c7708abb3 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
@@ -3,6 +3,7 @@
* ONAP-REST
* ================================================================================
* Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -33,89 +34,55 @@ import javax.persistence.PrePersist;
import javax.persistence.PreUpdate;
import javax.persistence.Table;
+import lombok.Getter;
+import lombok.Setter;
+
@Entity
-@Table(name="MicroserviceHeaderdeFaults")
-@NamedQuery(name="MicroserviceHeaderdeFaults.findAll", query="SELECT e FROM MicroserviceHeaderdeFaults e ")
+@Table(name = "MicroserviceHeaderdeFaults")
+@NamedQuery(name = "MicroserviceHeaderdeFaults.findAll", query = "SELECT e FROM MicroserviceHeaderdeFaults e ")
+@Getter
+@Setter
public class MicroserviceHeaderdeFaults implements Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
- @Column(name="id")
+ @Column(name = "id")
private int id;
- @Column(name="onapName")
+ @Column(name = "onapName")
private String onapName;
- @Column(name="guard")
- private String guard ;
+ @Column(name = "guard")
+ private String guard;
- @Column(name="priority")
+ @Column(name = "priority")
private String priority;
- @Column(name="riskType")
- private String riskType ;
+ @Column(name = "riskType")
+ private String riskType;
- @Column(name="riskLevel")
+ @Column(name = "riskLevel")
private String riskLevel;
- @Column(name="modelName", nullable=false)
+ @Column(name = "modelName", nullable = false)
@OrderBy("asc")
private String modelName;
+ /**
+ * Called before persisting the object.
+ */
@PrePersist
- public void prePersist() {
-
+ public void prePersist() {
+ // Required for testing
}
+
+ /**
+ * Called before updating the object.
+ */
@PreUpdate
public void preUpdate() {
+ // Required for testing
}
-
-
- public int getId() {
- return this.id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
-
- public String getModelName() {
- return modelName;
- }
- public void setModelName(String modelName) {
- this.modelName = modelName;
- }
- public String getOnapName() {
- return onapName;
- }
- public void setOnapName(String onapName) {
- this.onapName = onapName;
- }
- public String getGuard() {
- return guard;
- }
- public void setGuard(String guard) {
- this.guard = guard;
- }
- public String getPriority() {
- return priority;
- }
- public void setPriority(String priority) {
- this.priority = priority;
- }
- public String getRiskType() {
- return riskType;
- }
- public void setRiskType(String riskType) {
- this.riskType = riskType;
- }
- public String getRiskLevel() {
- return riskLevel;
- }
- public void setRiskLevel(String riskLevel) {
- this.riskLevel = riskLevel;
- }
-
} \ No newline at end of file
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/Obadvice.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/Obadvice.java
index 1c6b75d25..0734203e4 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/Obadvice.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/Obadvice.java
@@ -3,13 +3,14 @@
* ONAP-REST
* ================================================================================
* Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,6 +21,8 @@
package org.onap.policy.rest.jpa;
+import com.att.research.xacml.api.Identifier;
+
import java.io.Serializable;
import java.util.Date;
import java.util.HashSet;
@@ -40,15 +43,17 @@ import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import javax.persistence.Transient;
-import com.att.research.xacml.api.Identifier;
+import lombok.Getter;
+import lombok.Setter;
/**
* The persistent class for the Obadvice database table.
- *
*/
@Entity
-@Table(name="Obadvice")
-@NamedQuery(name="Obadvice.findAll", query="SELECT o FROM Obadvice o")
+@Table(name = "Obadvice")
+@NamedQuery(name = "Obadvice.findAll", query = "SELECT o FROM Obadvice o")
+@Getter
+@Setter
public class Obadvice implements Serializable {
private static final long serialVersionUID = 1L;
@@ -58,44 +63,53 @@ public class Obadvice implements Serializable {
public static final String EFFECT_DENY = "Deny";
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
- @Column(name="id")
+ @Column(name = "id")
private int id;
- @Column(name="type", nullable=false)
+ @Column(name = "type", nullable = false)
private String type;
- @Column(name="xacml_id", nullable=false, length=255)
+ @Column(name = "xacml_id", nullable = false, length = 255)
private String xacmlId;
- @Column(name="fulfill_on", nullable=true, length=32)
+ @Column(name = "fulfill_on", nullable = true, length = 32)
private String fulfillOn;
- @Column(name="description", nullable=true, length=2048)
+ @Column(name = "description", nullable = true, length = 2048)
private String description;
- //bi-directional one-to-many association to Attribute Assignment
- @OneToMany(mappedBy="obadvice", orphanRemoval=true, cascade=CascadeType.REMOVE)
+ // bi-directional one-to-many association to Attribute Assignment
+ @OneToMany(mappedBy = "obadvice", orphanRemoval = true, cascade = CascadeType.REMOVE)
private Set<ObadviceExpression> obadviceExpressions = new HashSet<>(2);
- @Column(name="created_by", nullable=false, length=255)
+ @Column(name = "created_by", nullable = false, length = 255)
private String createdBy;
@Temporal(TemporalType.TIMESTAMP)
- @Column(name="created_date", nullable=false, updatable=false)
+ @Column(name = "created_date", nullable = false, updatable = false)
private Date createdDate;
- @Column(name="modified_by", nullable=false, length=255)
+ @Column(name = "modified_by", nullable = false, length = 255)
private String modifiedBy;
@Temporal(TemporalType.TIMESTAMP)
- @Column(name="modified_date", nullable=false)
+ @Column(name = "modified_date", nullable = false)
private Date modifiedDate;
+ /**
+ * Instantiates a new obadvice.
+ */
public Obadvice() {
this.type = Obadvice.OBLIGATION;
this.fulfillOn = Obadvice.EFFECT_PERMIT;
}
+ /**
+ * Instantiates a new obadvice.
+ *
+ * @param domain the domain
+ * @param userid the userid
+ */
public Obadvice(String domain, String userid) {
this.xacmlId = domain;
this.type = Obadvice.OBLIGATION;
@@ -104,86 +118,40 @@ public class Obadvice implements Serializable {
this.modifiedBy = userid;
}
+ /**
+ * Instantiates a new obadvice.
+ *
+ * @param id the id
+ * @param userid the userid
+ */
public Obadvice(Identifier id, String userid) {
this(id.stringValue(), userid);
}
+ /**
+ * Pre persist.
+ */
@PrePersist
- public void prePersist() {
+ public void prePersist() {
Date date = new Date();
this.createdDate = date;
this.modifiedDate = date;
}
+ /**
+ * Pre update.
+ */
@PreUpdate
public void preUpdate() {
this.modifiedDate = new Date();
}
- public int getId() {
- return this.id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
-
- public String getCreatedBy() {
- return this.createdBy;
- }
-
- public void setCreatedBy(String createdBy) {
- this.createdBy = createdBy;
- }
-
- public String getDescription() {
- return this.description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getFulfillOn() {
- return this.fulfillOn;
- }
-
- public void setFulfillOn(String fulfillOn) {
- this.fulfillOn = fulfillOn;
- }
-
- public String getModifiedBy() {
- return this.modifiedBy;
- }
-
- public void setModifiedBy(String modifiedBy) {
- this.modifiedBy = modifiedBy;
- }
-
- public String getType() {
- return this.type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getXacmlId() {
- return this.xacmlId;
- }
-
- public void setXacmlId(String xacmlId) {
- this.xacmlId = xacmlId;
- }
-
- public Set<ObadviceExpression> getObadviceExpressions() {
- return this.obadviceExpressions;
- }
-
- public void setObadviceExpressions(Set<ObadviceExpression> obadviceExpressions) {
- this.obadviceExpressions = obadviceExpressions;
- }
-
+ /**
+ * Adds the obadvice expression.
+ *
+ * @param obadviceExpression the obadvice expression
+ * @return the obadvice expression
+ */
public ObadviceExpression addObadviceExpression(ObadviceExpression obadviceExpression) {
this.obadviceExpressions.add(obadviceExpression);
obadviceExpression.setObadvice(this);
@@ -191,6 +159,12 @@ public class Obadvice implements Serializable {
return obadviceExpression;
}
+ /**
+ * Removes the obadvice expression.
+ *
+ * @param obadviceExpression the obadvice expression
+ * @return the obadvice expression
+ */
public ObadviceExpression removeObadviceExpression(ObadviceExpression obadviceExpression) {
this.obadviceExpressions.remove(obadviceExpression);
obadviceExpression.setObadvice(null);
@@ -198,6 +172,9 @@ public class Obadvice implements Serializable {
return obadviceExpression;
}
+ /**
+ * Removes the all expressions.
+ */
public void removeAllExpressions() {
if (this.obadviceExpressions == null) {
return;
@@ -208,6 +185,11 @@ public class Obadvice implements Serializable {
this.obadviceExpressions.clear();
}
+ /**
+ * Clone.
+ *
+ * @return the obadvice
+ */
@Transient
@Override
public Obadvice clone() {
@@ -219,7 +201,7 @@ public class Obadvice implements Serializable {
obadvice.description = this.description;
obadvice.createdBy = this.createdBy;
obadvice.modifiedBy = this.modifiedBy;
- for (ObadviceExpression exp: this.obadviceExpressions) {
+ for (ObadviceExpression exp : this.obadviceExpressions) {
obadvice.addObadviceExpression(exp.clone());
}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ObadviceExpression.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ObadviceExpression.java
index 9d82b7325..db437095c 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ObadviceExpression.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ObadviceExpression.java
@@ -3,13 +3,14 @@
* ONAP-REST
* ================================================================================
* Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* 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.
@@ -33,14 +34,17 @@ import javax.persistence.NamedQuery;
import javax.persistence.OneToOne;
import javax.persistence.Table;
+import lombok.Getter;
+import lombok.Setter;
/**
* The persistent class for the ObadviceExpressions database table.
- *
*/
@Entity
-@Table(name="ObadviceExpressions")
-@NamedQuery(name="ObadviceExpression.findAll", query="SELECT o FROM ObadviceExpression o")
+@Table(name = "ObadviceExpressions")
+@NamedQuery(name = "ObadviceExpression.findAll", query = "SELECT o FROM ObadviceExpression o")
+@Getter
+@Setter
public class ObadviceExpression implements Serializable {
private static final long serialVersionUID = 1L;
@@ -53,58 +57,26 @@ public class ObadviceExpression implements Serializable {
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
- @Column(name="id")
+ @Column(name = "id")
private int id;
- //unidirectional one-to-one association to Attribute
+ // unidirectional one-to-one association to Attribute
@OneToOne
- @JoinColumn(name="attribute_id")
+ @JoinColumn(name = "attribute_id")
private Attribute attribute;
- @Column(name="type", nullable=false)
+ @Column(name = "type", nullable = false)
private String type;
- //bi-directional many-to-one association to Obadvice
+ // bi-directional many-to-one association to Obadvice
@ManyToOne
- @JoinColumn(name="obadvice_id")
+ @JoinColumn(name = "obadvice_id")
private Obadvice obadvice;
public ObadviceExpression() {
type = EXPRESSION_VALUE;
}
- public int getId() {
- return this.id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
-
- public Attribute getAttribute() {
- return this.attribute;
- }
-
- public void setAttribute(Attribute attribute) {
- this.attribute = attribute;
- }
-
- public String getType() {
- return this.type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public Obadvice getObadvice() {
- return this.obadvice;
- }
-
- public void setObadvice(Obadvice obadvice) {
- this.obadvice = obadvice;
- }
-
@Override
public ObadviceExpression clone() {
ObadviceExpression expression = new ObadviceExpression();
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/OnapName.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/OnapName.java
index 0b39129a8..e128241ec 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/OnapName.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/OnapName.java
@@ -3,13 +3,14 @@
* ONAP-REST
* ================================================================================
* Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* 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,8 +20,7 @@
*/
package org.onap.policy.rest.jpa;
-/*
- */
+
import java.io.Serializable;
import java.util.Date;
@@ -39,106 +39,63 @@ import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
+import lombok.Getter;
+import lombok.Setter;
+/**
+ * The Class OnapName.
+ */
@Entity
-@Table(name="OnapName")
-@NamedQuery(name="OnapName.findAll", query="SELECT e FROM OnapName e ")
+@Table(name = "OnapName")
+@NamedQuery(name = "OnapName.findAll", query = "SELECT e FROM OnapName e ")
+@Getter
+@Setter
public class OnapName implements Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
- @Column(name="id")
+ @Column(name = "id")
private int id;
- @Column(name="onap_Name", nullable=false, unique=true)
+ @Column(name = "onap_Name", nullable = false, unique = true)
@OrderBy("asc")
- private String onapName;
+ private String name;
@Temporal(TemporalType.TIMESTAMP)
- @Column(name="created_date", updatable=false)
+ @Column(name = "created_date", updatable = false)
private Date createdDate;
- @Column(name="description", nullable=true, length=2048)
+ @Column(name = "description", nullable = true, length = 2048)
private String description;
@Temporal(TemporalType.TIMESTAMP)
- @Column(name="modified_date", nullable=false)
+ @Column(name = "modified_date", nullable = false)
private Date modifiedDate;
@ManyToOne(optional = false)
- @JoinColumn(name="created_by")
+ @JoinColumn(name = "created_by")
private UserInfo userCreatedBy;
@ManyToOne(optional = false)
- @JoinColumn(name="modified_by")
+ @JoinColumn(name = "modified_by")
private UserInfo userModifiedBy;
- public UserInfo getUserCreatedBy() {
- return userCreatedBy;
- }
-
- public void setUserCreatedBy(UserInfo userCreatedBy) {
- this.userCreatedBy = userCreatedBy;
- }
-
- public UserInfo getUserModifiedBy() {
- return userModifiedBy;
- }
-
- public void setUserModifiedBy(UserInfo userModifiedBy) {
- this.userModifiedBy = userModifiedBy;
- }
-
+ /**
+ * Pre persist.
+ */
@PrePersist
- public void prePersist() {
+ public void prePersist() {
Date date = new Date();
this.createdDate = date;
this.modifiedDate = date;
}
+ /**
+ * Pre update.
+ */
@PreUpdate
public void preUpdate() {
this.modifiedDate = new Date();
}
- public String getOnapName() {
- return this.onapName;
- }
-
- public void setOnapName(String onapName) {
- this.onapName = onapName;
-
- }
- public int getId() {
- return this.id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
-
- public Date getCreatedDate() {
- return this.createdDate;
- }
-
- public void setCreatedDate(Date createdDate) {
- this.createdDate = createdDate;
- }
-
- public String getDescription() {
- return this.description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public Date getModifiedDate() {
- return this.modifiedDate;
- }
-
- public void setModifiedDate(Date modifiedDate) {
- this.modifiedDate = modifiedDate;
- }
-
}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/OptimizationModels.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/OptimizationModels.java
index 60b360029..457ca7382 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/OptimizationModels.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/OptimizationModels.java
@@ -3,13 +3,14 @@
* ONAP-REST
* ================================================================================
* Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* 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.
@@ -17,6 +18,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*/
+
package org.onap.policy.rest.jpa;
import java.io.Serializable;
@@ -32,151 +34,59 @@ import javax.persistence.NamedQuery;
import javax.persistence.OrderBy;
import javax.persistence.Table;
/*
- * JPA for the OOF Models.
- *
+ * JPA for the OOF Models.
+ *
* @version: 0.1
*/
+import lombok.Getter;
+import lombok.Setter;
@Entity
-@Table(name="OptimizationModels")
-@NamedQuery(name="OptimizationModels.findAll", query="SELECT b FROM OptimizationModels b ")
-public class OptimizationModels implements Serializable{
+@Table(name = "OptimizationModels")
+@NamedQuery(name = "OptimizationModels.findAll", query = "SELECT b FROM OptimizationModels b ")
+@Getter
+@Setter
+public class OptimizationModels implements Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
- @Column(name="id")
+ @Column(name = "id")
private int id;
- @Column(name="modelName", nullable=false, unique=true)
+ @Column(name = "modelName", nullable = false, unique = true)
@OrderBy("asc")
private String modelName;
- @Column(name="description", nullable=true, length=2048)
+ @Column(name = "description", nullable = true, length = 2048)
private String description;
- @Column(name="dependency", nullable=true, length=2048)
+ @Column(name = "dependency", nullable = true, length = 2048)
private String dependency;
- @Column(name="attributes", nullable=false, length=255)
+ @Column(name = "attributes", nullable = false, length = 255)
private String attributes;
- @Column(name="ref_attributes", nullable=false, length=255)
+ @Column(name = "ref_attributes", nullable = false, length = 255)
private String refattributes;
- @Column (name="sub_attributes", nullable=false, length=2000)
+ @Column(name = "sub_attributes", nullable = false, length = 2000)
private String subattributes;
- @Column (name="dataOrderInfo", nullable=true, length=2000)
+ @Column(name = "dataOrderInfo", nullable = true, length = 2000)
private String dataOrderInfo;
- @Column (name="version", nullable=false, length=2000)
+ @Column(name = "version", nullable = false, length = 2000)
private String version;
- @Column (name="enumValues", nullable=false, length=2000)
+ @Column(name = "enumValues", nullable = false, length = 2000)
private String enumValues;
- @Column (name="annotation", nullable=false, length=2000)
+ @Column(name = "annotation", nullable = false, length = 2000)
private String annotation;
- public String getSubattributes() {
- return subattributes;
- }
-
- public void setSubattributes(String subattributes) {
- this.subattributes = subattributes;
- }
-
- public String getDataOrderInfo() {
- return dataOrderInfo;
- }
-
- public void setDataOrderInfo(String dataOrderInfo) {
- this.dataOrderInfo = dataOrderInfo;
- }
-
- public String getVersion() {
- return version;
- }
-
- public void setVersion(String version) {
- this.version = version;
- }
-
@ManyToOne
- @JoinColumn(name="imported_by")
+ @JoinColumn(name = "imported_by")
private UserInfo userCreatedBy;
-
- public UserInfo getUserCreatedBy() {
- return userCreatedBy;
- }
-
- public void setUserCreatedBy(UserInfo userCreatedBy) {
- this.userCreatedBy = userCreatedBy;
- }
-
- public String getAttributes() {
- return attributes;
- }
-
- public void setAttributes(String attributes) {
- this.attributes = attributes;
- }
-
- public String getRefattributes() {
- return refattributes;
- }
-
- public void setRefattributes(String refattributes) {
- this.refattributes = refattributes;
- }
-
- public int getId() {
- return this.id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
-
- public String getDescription() {
- return this.description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getDependency() {
- return dependency;
- }
-
- public void setDependency(String dependency) {
- this.dependency = dependency;
- }
-
- public String getModelName(){
- return this.modelName;
- }
-
- public void setModelName(String modelName){
- this.modelName = modelName;
- }
-
- public String getEnumValues() {
- return enumValues;
- }
-
- public void setEnumValues(String enumValues) {
- this.enumValues = enumValues;
- }
-
- public String getAnnotation() {
- return annotation;
- }
-
- public void setAnnotation(String annotation) {
- this.annotation = annotation;
- }
}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PIPConfigParam.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PIPConfigParam.java
deleted file mode 100644
index 0f32de6d3..000000000
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PIPConfigParam.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP-REST
- * ================================================================================
- * Copyright (C) 2017 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.rest.jpa;
-
-import java.io.Serializable;
-
-import javax.persistence.*;
-
-
-/**
- * The persistent class for the PIPConfigParams database table.
- *
- */
-@Entity
-@Table(name="PIPConfigParams")
-@NamedQuery(name="PIPConfigParam.findAll", query="SELECT p FROM PIPConfigParam p")
-public class PIPConfigParam implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @Id
- @GeneratedValue(strategy=GenerationType.AUTO)
- @Column(name="id")
- private int id;
-
- @Column(name="PARAM_NAME", nullable=false, length=1024)
- private String paramName;
-
- @Column(name="PARAM_VALUE", nullable=false, length=2048)
- private String paramValue;
-
- @Column(name="PARAM_DEFAULT", nullable=true, length=2048)
- private String paramDefault = null;
-
- @Column(name="REQUIRED", nullable=false)
- private char required = '0';
-
- //bi-directional many-to-one association to PIPConfiguration
- @ManyToOne
- @JoinColumn(name="PIP_ID")
- private PIPConfiguration pipconfiguration;
-
- public PIPConfigParam() {
- //An empty constructor
- }
-
- public PIPConfigParam(String param) {
- this.paramName = param;
- }
-
- public PIPConfigParam(String param, String value) {
- this(param);
- this.paramValue = value;
- }
-
- public PIPConfigParam(PIPConfigParam param) {
- this(param.getParamName(), param.getParamValue());
- this.paramDefault = param.getParamDefault();
- this.required = param.required;
- }
-
- public int getId() {
- return this.id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
-
- public String getParamName() {
- return this.paramName;
- }
-
- public void setParamName(String paramName) {
- this.paramName = paramName;
- }
-
- public String getParamValue() {
- return this.paramValue;
- }
-
- public void setParamValue(String paramValue) {
- this.paramValue = paramValue;
- }
-
- public String getParamDefault() {
- return paramDefault;
- }
-
- public void setParamDefault(String paramDefault) {
- this.paramDefault = paramDefault;
- }
-
- public char getRequired() {
- return required;
- }
-
- public void setRequired(char required) {
- this.required = required;
- }
-
- public PIPConfiguration getPipconfiguration() {
- return this.pipconfiguration;
- }
-
- public void setPipconfiguration(PIPConfiguration pipconfiguration) {
- this.pipconfiguration = pipconfiguration;
- }
-
- @Transient
- public boolean isRequired() {
- return this.required == '1';
- }
-
- @Transient
- public void setRequired(boolean required) {
- if (required) {
- this.setRequired('1');
- } else {
- this.setRequired('0');
- }
- }
-
- @Transient
- @Override
- public String toString() {
- return "PIPConfigParam [id=" + id + ", paramName=" + paramName
- + ", paramValue=" + paramValue + ", required=" + required + "]";
- }
-
-}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PIPResolverParam.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PIPResolverParam.java
deleted file mode 100644
index 7356eebf8..000000000
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PIPResolverParam.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP-REST
- * ================================================================================
- * Copyright (C) 2017 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.rest.jpa;
-
-import java.io.Serializable;
-
-import javax.persistence.*;
-
-
-/**
- * The persistent class for the PIPResolverParams database table.
- *
- */
-@Entity
-@Table(name="PIPResolverParams")
-@NamedQuery(name="PIPResolverParam.findAll", query="SELECT p FROM PIPResolverParam p")
-public class PIPResolverParam implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @Id
- @GeneratedValue(strategy=GenerationType.AUTO)
- @Column(name="id")
- private int id;
-
- @Column(name="PARAM_NAME", nullable=false, length=1024)
- private String paramName;
-
- @Column(name="PARAM_VALUE", nullable=false, length=2048)
- private String paramValue;
-
- @Column(name="PARAM_DEFAULT", nullable=true, length=2048)
- private String paramDefault;
-
- @Column(name="REQUIRED", nullable=false)
- private char required = '0';
-
- //bi-directional many-to-one association to PIPResolver
- @ManyToOne
- @JoinColumn(name="ID_RESOLVER")
- private PIPResolver pipresolver;
-
- public PIPResolverParam() {
- // Empty constructor
- }
-
- public PIPResolverParam(String name) {
- this.paramName = name;
- }
-
- public PIPResolverParam(String name, String value) {
- this(name);
- this.paramValue = value;
- }
-
- public PIPResolverParam(PIPResolverParam param) {
- this(param.getParamName(), param.getParamValue());
- this.paramDefault = param.getParamDefault();
- this.required = param.required;
- }
-
- public int getId() {
- return this.id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
-
- public String getParamName() {
- return this.paramName;
- }
-
- public void setParamName(String paramName) {
- this.paramName = paramName;
- }
-
- public String getParamValue() {
- return this.paramValue;
- }
-
- public void setParamValue(String paramValue) {
- this.paramValue = paramValue;
- }
-
- public String getParamDefault() {
- return paramDefault;
- }
-
- public void setParamDefault(String paramDefault) {
- this.paramDefault = paramDefault;
- }
-
- public char getRequired() {
- return required;
- }
-
- public void setRequired(char required) {
- this.required = required;
- }
-
- public PIPResolver getPipresolver() {
- return this.pipresolver;
- }
-
- public void setPipresolver(PIPResolver pipresolver) {
- this.pipresolver = pipresolver;
- }
-
- @Transient
- public boolean isRequired() {
- return this.required == '1';
- }
-
- @Transient
- public void setRequired(boolean required) {
- if (required) {
- this.required = '1';
- } else {
- this.required = '0';
- }
- }
-
- @Transient
- @Override
- public String toString() {
- return "PIPResolverParam [id=" + id + ", paramName=" + paramName
- + ", paramValue=" + paramValue + ", required=" + required + "]";
- }
-
-}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PdpEntity.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PdpEntity.java
index 92c0c9dbe..69ad3f572 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PdpEntity.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PdpEntity.java
@@ -3,13 +3,14 @@
* ONAP-REST
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* 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,8 +20,7 @@
*/
package org.onap.policy.rest.jpa;
-/*
- */
+
import java.io.Serializable;
import java.util.Date;
@@ -39,108 +39,95 @@ import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
-/*
- * The Entity class to persist a policy object and its configuration data
- */
+import lombok.Getter;
+import lombok.Setter;
/**
- *
+ * The Entity class to persist a policy object and its configuration data.
*/
+// @formatter:off
@Entity
-//Add a non-unique index and a constraint that says the combo of policyName and scopeId must be unique
-@Table(name="PdpEntity")
-@NamedQueries({
- @NamedQuery(name="PdpEntity.findAll", query="SELECT e FROM PdpEntity e "),
- @NamedQuery(name="PdpEntity.deleteAll", query="DELETE FROM PdpEntity WHERE 1=1")
-})
-
+// Add a non-unique index and a constraint that says the combo of policyName and scopeId must be unique
+@Table(name = "PdpEntity")
+@NamedQueries(
+ {
+ @NamedQuery(name = "PdpEntity.findAll", query = "SELECT e FROM PdpEntity e "),
+ @NamedQuery(name = "PdpEntity.deleteAll", query = "DELETE FROM PdpEntity WHERE 1=1")
+ }
+)
+@Getter
+@Setter
+// @formatter:on
public class PdpEntity implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- //@GeneratedValue(strategy = GenerationType.SEQUENCE, generator="seqPdp")
+ // @GeneratedValue(strategy = GenerationType.SEQUENCE, generator="seqPdp")
@GeneratedValue(strategy = GenerationType.AUTO)
- @Column (name="pdpKey")
+ @Column(name = "pdpKey")
private long pdpKey;
- @Column (name="pdpId", nullable=false, unique=false, length=255)
+ @Column(name = "pdpId", nullable = false, unique = false, length = 255)
private String pdpId;
- @Column(name="pdpName", nullable=false, unique=false, length=255)
+ @Column(name = "pdpName", nullable = false, unique = false, length = 255)
private String pdpName;
- @Column(name="jmxPort", nullable=false, unique=false)
+ @Column(name = "jmxPort", nullable = false, unique = false)
private int jmxPort;
-
- @ManyToOne(optional=false)
- @JoinColumn(name="groupKey", referencedColumnName="groupKey")
+ @ManyToOne(optional = false)
+ @JoinColumn(name = "groupKey", referencedColumnName = "groupKey")
private GroupEntity groupEntity;
- @Column(name="created_by", nullable=false, length=255)
+ @Column(name = "created_by", nullable = false, length = 255)
private String createdBy = "guest";
@Temporal(TemporalType.TIMESTAMP)
- @Column(name="created_date", updatable=false)
+ @Column(name = "created_date", updatable = false)
private Date createdDate;
- @Column(name="description", nullable=false, length=2048)
+ @Column(name = "description", nullable = false, length = 2048)
private String description = "NoDescription";
- @Column(name="modified_by", nullable=false, length=255)
+ @Column(name = "modified_by", nullable = false, length = 255)
private String modifiedBy = "guest";
@Temporal(TemporalType.TIMESTAMP)
- @Column(name="modified_date", nullable=false)
+ @Column(name = "modified_date", nullable = false)
private Date modifiedDate;
- @Column(name="deleted", nullable=false)
+ @Column(name = "deleted", nullable = false)
private boolean deleted = false;
+ /**
+ * Instantiates a new pdp entity.
+ */
public PdpEntity() {
super();
}
+ /**
+ * Pre persist.
+ */
@PrePersist
- public void prePersist() {
+ public void prePersist() {
Date date = new Date();
this.createdDate = date;
this.modifiedDate = date;
}
+ /**
+ * Pre update.
+ */
@PreUpdate
public void preUpdate() {
this.modifiedDate = new Date();
}
- public long getPdpKey(){
- return pdpKey;
- }
- /**
- * @return the policyId
- */
- public String getPdpId() {
- return pdpId;
- }
-
- public void setPdpId(String id){
- pdpId = id;
- }
- /**
- * @param policyId cannot be set
- */
-
- public String getPdpName() {
- return pdpName;
- }
-
- public void setPdpName(String groupName) {
- this.pdpName = groupName;
- }
-
-
-
/**
+ * Gets the group.
+ *
* @return the configurationDataEntity
*/
public GroupEntity getGroup() {
@@ -148,94 +135,11 @@ public class PdpEntity implements Serializable {
}
/**
- * @param configurationDataEntity the configurationDataEntity to set
+ * Sets the group.
+ *
+ * @param group the new group
*/
public void setGroup(GroupEntity group) {
this.groupEntity = group;
}
-
-
-
- /**
- * @return the createdBy
- */
- public String getCreatedBy() {
- return createdBy;
- }
-
- /**
- * @param createdBy the createdBy to set
- */
- public void setCreatedBy(String createdBy) {
- this.createdBy = createdBy;
- }
-
- /**
- * @return the description
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * @param description the description to set
- */
- public void setDescription(String description) {
- this.description = description;
- }
-
- /**
- * @return the modifiedBy
- */
- public String getModifiedBy() {
- return modifiedBy;
- }
-
- /**
- * @param modifiedBy the modifiedBy to set
- */
- public void setModifiedBy(String modifiedBy) {
- this.modifiedBy = modifiedBy;
- }
-
- /**
- * @return the version
- */
- public int getJmxPort() {
- return jmxPort;
- }
-
- public void setJmxPort(int jmxPort){
- this.jmxPort = jmxPort;
- }
-
- /**
- * @return the createdDate
- */
- public Date getCreatedDate() {
- return createdDate;
- }
-
- /**
- * @return the modifiedDate
- */
- public Date getModifiedDate() {
- return modifiedDate;
- }
-
- /**
- * @return the deleted
- */
- public boolean isDeleted() {
- return deleted;
- }
-
- /**
- * @param deleted the deleted to set
- */
- public void setDeleted(boolean deleted) {
- this.deleted = deleted;
- }
-
-
}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PEPOptions.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PepOptions.java
index f9413b860..3a5f791de 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PEPOptions.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PepOptions.java
@@ -3,6 +3,7 @@
* ONAP-REST
* ================================================================================
* Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,11 +20,13 @@
*/
package org.onap.policy.rest.jpa;
+
/*
*
* */
import java.io.Serializable;
import java.util.Date;
+
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -39,121 +42,73 @@ import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
+import lombok.Getter;
+import lombok.Setter;
+/**
+ * The Class PepOptions.
+ */
@Entity
-@Table(name = "PEPOptions")
-@NamedQuery(name = "PEPOptions.findAll", query= "Select p from PEPOptions p")
-public class PEPOptions implements Serializable {
+@Table(name = "PepOptions")
+@NamedQuery(name = "PepOptions.findAll", query = "Select p from PepOptions p")
+@Getter
+@Setter
+public class PepOptions implements Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name = "Id")
private int id;
- @Column(name="PEP_NAME", nullable=false)
+ @Column(name = "PEP_NAME", nullable = false)
@OrderBy("asc")
private String pepName;
- @Column(name="description", nullable=true, length=2048)
+ @Column(name = "description", nullable = true, length = 2048)
private String description;
- @Column(name="Actions", nullable=true)
+ @Column(name = "Actions", nullable = true)
@OrderBy("asc")
private String actions;
@Temporal(TemporalType.TIMESTAMP)
- @Column(name="created_date", updatable=false)
+ @Column(name = "created_date", updatable = false)
private Date createdDate;
@Temporal(TemporalType.TIMESTAMP)
- @Column(name="modified_date", nullable=false)
+ @Column(name = "modified_date", nullable = false)
private Date modifiedDate;
@ManyToOne(optional = false)
- @JoinColumn(name="created_by")
+ @JoinColumn(name = "created_by")
private UserInfo userCreatedBy;
@ManyToOne(optional = false)
- @JoinColumn(name="modified_by")
+ @JoinColumn(name = "modified_by")
private UserInfo userModifiedBy;
- public PEPOptions() {
+ /**
+ * Instantiates a new PEP options.
+ */
+ public PepOptions() {
this.modifiedDate = new Date();
}
- public UserInfo getUserCreatedBy() {
- return userCreatedBy;
- }
-
- public void setUserCreatedBy(UserInfo userCreatedBy) {
- this.userCreatedBy = userCreatedBy;
- }
-
- public UserInfo getUserModifiedBy() {
- return userModifiedBy;
- }
-
- public void setUserModifiedBy(UserInfo userModifiedBy) {
- this.userModifiedBy = userModifiedBy;
- }
-
+ /**
+ * Pre persist.
+ */
@PrePersist
- public void prePersist() {
+ public void prePersist() {
Date date = new Date();
this.createdDate = date;
this.modifiedDate = date;
}
+ /**
+ * Pre update.
+ */
@PreUpdate
public void preUpdate() {
this.modifiedDate = new Date();
}
-
- public int getId() {
- return this.id;
- }
- public void setId(int id) {
- this.id = id;
- }
-
- public String getPepName() {
- return pepName;
- }
-
- public void setPepName(String pepName) {
- this.pepName = pepName;
- }
-
- public String getActions() {
- return actions;
- }
-
- public void setActions(String actions) {
- this.actions = actions;
- }
-
- public Date getCreatedDate() {
- return this.createdDate;
- }
-
- public void setCreatedDate(Date createdDate) {
- this.createdDate = createdDate;
- }
-
- public String getDescription() {
- return this.description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public Date getModifiedDate() {
- return this.modifiedDate;
- }
-
- public void setModifiedDate(Date modifiedDate) {
- this.modifiedDate = modifiedDate;
- }
-
}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PipConfigParam.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PipConfigParam.java
new file mode 100644
index 000000000..06f6bef61
--- /dev/null
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PipConfigParam.java
@@ -0,0 +1,135 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP-REST
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.rest.jpa;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * The persistent class for the PipConfigParams database table.
+ *
+ */
+@Entity
+@Table(name = "PipConfigParams")
+@NamedQuery(name = "PipConfigParam.findAll", query = "SELECT p FROM PipConfigParam p")
+@Getter
+@Setter
+@ToString
+/**
+ * Instantiates a new PIP config param.
+ */
+@NoArgsConstructor
+public class PipConfigParam implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.AUTO)
+ @Column(name = "id")
+ private int id;
+
+ @Column(name = "PARAM_NAME", nullable = false, length = 1024)
+ private String paramName;
+
+ @Column(name = "PARAM_VALUE", nullable = false, length = 2048)
+ private String paramValue;
+
+ @Column(name = "PARAM_DEFAULT", nullable = true, length = 2048)
+ private String paramDefault = null;
+
+ @Column(name = "REQUIRED", nullable = false)
+ private char required = '0';
+
+ // bi-directional many-to-one association to PipConfiguration
+ @ManyToOne
+ @JoinColumn(name = "PIP_ID")
+ private PipConfiguration pipconfiguration;
+
+ /**
+ * Instantiates a new PIP config param.
+ *
+ * @param param the param
+ */
+ public PipConfigParam(String param) {
+ this.paramName = param;
+ }
+
+ /**
+ * Instantiates a new PIP config param.
+ *
+ * @param param the param
+ * @param value the value
+ */
+ public PipConfigParam(String param, String value) {
+ this(param);
+ this.paramValue = value;
+ }
+
+ /**
+ * Instantiates a new PIP config param.
+ *
+ * @param param the param
+ */
+ public PipConfigParam(PipConfigParam param) {
+ this(param.getParamName(), param.getParamValue());
+ this.paramDefault = param.getParamDefault();
+ this.required = param.required;
+ }
+
+ /**
+ * Checks if is required.
+ *
+ * @return true, if is required
+ */
+ @Transient
+ public boolean isRequired() {
+ return this.required == '1';
+ }
+
+ /**
+ * Sets the required flag.
+ *
+ * @param required the new required flag
+ */
+ @Transient
+ public void setRequiredFlag(boolean required) {
+ if (required) {
+ this.setRequired('1');
+ } else {
+ this.setRequired('0');
+ }
+ }
+}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PIPConfiguration.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PipConfiguration.java
index d34c4bd0b..99bd613e8 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PIPConfiguration.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PipConfiguration.java
@@ -3,13 +3,14 @@
* ONAP-REST
* ================================================================================
* Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,6 +21,12 @@
package org.onap.policy.rest.jpa;
+import com.att.research.xacml.api.pip.PIPException;
+import com.att.research.xacml.std.pip.engines.StdConfigurableEngine;
+import com.att.research.xacml.util.XACMLProperties;
+import com.google.common.base.Joiner;
+import com.google.common.base.Splitter;
+
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
@@ -49,85 +56,89 @@ import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import javax.persistence.Transient;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.onap.policy.common.logging.eelf.MessageCodes;
import org.onap.policy.common.logging.eelf.PolicyLogger;
import org.onap.policy.xacml.api.XACMLErrorConstants;
-import com.att.research.xacml.api.pip.PIPException;
-import com.att.research.xacml.std.pip.engines.StdConfigurableEngine;
-import com.att.research.xacml.util.XACMLProperties;
-import com.google.common.base.Joiner;
-import com.google.common.base.Splitter;
-
-
/**
- * The persistent class for the PIPConfiguration database table.
- *
+ * The persistent class for the PipConfiguration database table.
+ *
*/
@Entity
-@Table(name="PIPConfiguration")
-@NamedQuery(name="PIPConfiguration.findAll", query="SELECT p FROM PIPConfiguration p")
-public class PIPConfiguration implements Serializable {
+@Table(name = "PipConfiguration")
+@NamedQuery(name = "PipConfiguration.findAll", query = "SELECT p FROM PipConfiguration p")
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class PipConfiguration implements Serializable {
private static final long serialVersionUID = 1L;
- private static final Log logger = LogFactory.getLog(PIPConfiguration.class);
+ private static final Log logger = LogFactory.getLog(PipConfiguration.class);
@Id
- @GeneratedValue(strategy=GenerationType.AUTO)
- @Column(name="id")
+ @GeneratedValue(strategy = GenerationType.AUTO)
+ @Column(name = "id")
private int id;
- @Column(name="DESCRIPTION", nullable=true, length=2048)
+ @Column(name = "DESCRIPTION", nullable = true, length = 2048)
private String description;
- @Column(name="NAME", nullable=false, length=255)
+ @Column(name = "NAME", nullable = false, length = 255)
private String name;
- @Column(name="CLASSNAME", nullable=false, length=2048)
+ @Column(name = "CLASSNAME", nullable = false, length = 2048)
private String classname;
- @Column(name="ISSUER", nullable=true, length=1024)
+ @Column(name = "ISSUER", nullable = true, length = 1024)
private String issuer;
- @Column(name="READ_ONLY", nullable=false)
+ @Column(name = "READ_ONLY", nullable = false)
private char readOnly = '0';
- @Column(name="REQUIRES_RESOLVER", nullable=false)
+ @Column(name = "REQUIRES_RESOLVER", nullable = false)
private char requiresResolvers;
- @Column(name="CREATED_BY", nullable=false, length=255)
+ @Column(name = "CREATED_BY", nullable = false, length = 255)
private String createdBy = "guest";
@Temporal(TemporalType.TIMESTAMP)
- @Column(name="CREATED_DATE", nullable=false, updatable=false)
+ @Column(name = "CREATED_DATE", nullable = false, updatable = false)
private Date createdDate;
- @Column(name="MODIFIED_BY", nullable=false, length=255)
+ @Column(name = "MODIFIED_BY", nullable = false, length = 255)
private String modifiedBy = "guest";
@Temporal(TemporalType.TIMESTAMP)
- @Column(name="MODIFIED_DATE", nullable=false)
+ @Column(name = "MODIFIED_DATE", nullable = false)
private Date modifiedDate;
- //bi-directional many-to-one association to PIPConfigParam
- @OneToMany(mappedBy="pipconfiguration", orphanRemoval=true, cascade=CascadeType.REMOVE)
- private Set<PIPConfigParam> pipconfigParams = new HashSet<>();
+ // bi-directional many-to-one association to PipConfigParam
+ @OneToMany(mappedBy = "pipconfiguration", orphanRemoval = true, cascade = CascadeType.REMOVE)
+ private Set<PipConfigParam> pipconfigParams = new HashSet<>();
- //bi-directional many-to-one association to PIPType
+ // bi-directional many-to-one association to PipType
@ManyToOne
- @JoinColumn(name="TYPE")
- private PIPType piptype;
-
- //bi-directional many-to-one association to PIPResolver
- @OneToMany(mappedBy="pipconfiguration", orphanRemoval=true, cascade=CascadeType.REMOVE)
- private Set<PIPResolver> pipresolvers = new HashSet<>();
-
- public PIPConfiguration() {
- //An empty constructor
- }
-
- public PIPConfiguration(PIPConfiguration config, String user) {
+ @JoinColumn(name = "TYPE")
+ private PipType piptype;
+
+ // bi-directional many-to-one association to PipResolver
+ @OneToMany(mappedBy = "pipconfiguration", orphanRemoval = true, cascade = CascadeType.REMOVE)
+ private Set<PipResolver> pipresolvers = new HashSet<>();
+
+ /**
+ * Instantiates a new PIP configuration.
+ *
+ * @param config the config
+ * @param user the user
+ */
+ public PipConfiguration(PipConfiguration config, String user) {
this.description = config.description;
this.name = config.name;
this.classname = config.classname;
@@ -135,108 +146,77 @@ public class PIPConfiguration implements Serializable {
this.requiresResolvers = config.requiresResolvers;
this.readOnly = config.readOnly;
this.piptype = config.piptype;
- for (PIPConfigParam param : config.pipconfigParams) {
- this.addPipconfigParam(new PIPConfigParam(param));
+ for (PipConfigParam param : config.pipconfigParams) {
+ this.addPipconfigParam(new PipConfigParam(param));
}
- for (PIPResolver resolver : config.pipresolvers) {
- this.addPipresolver(new PIPResolver(resolver));
+ for (PipResolver resolver : config.pipresolvers) {
+ this.addPipresolver(new PipResolver(resolver));
}
}
- public PIPConfiguration(String id, Properties properties) throws PIPException {
+ /**
+ * Instantiates a new PIP configuration.
+ *
+ * @param id the id
+ * @param properties the properties
+ * @throws PIPException the PIP exception
+ */
+ public PipConfiguration(String id, Properties properties) throws PIPException {
this.readProperties(id, properties);
}
- public PIPConfiguration(String id, Properties properties, String user) throws PIPException {
+ /**
+ * Instantiates a new PIP configuration.
+ *
+ * @param id the id
+ * @param properties the properties
+ * @param user the user
+ * @throws PIPException the PIP exception
+ */
+ public PipConfiguration(String id, Properties properties, String user) throws PIPException {
this.createdBy = user;
this.modifiedBy = user;
this.readProperties(id, properties);
}
+ /**
+ * Pre persist.
+ */
@PrePersist
- public void prePersist() {
+ public void prePersist() {
Date date = new Date();
this.createdDate = date;
this.modifiedDate = date;
}
+ /**
+ * Pre update.
+ */
@PreUpdate
public void preUpdate() {
this.modifiedDate = new Date();
}
- public int getId() {
- return this.id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
-
- public String getDescription() {
- return this.description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getName() {
- return this.name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getClassname() {
- return classname;
- }
-
- public void setClassname(String classname) {
- this.classname = classname;
- }
-
- public String getIssuer() {
- return issuer;
- }
-
- public void setIssuer(String issuer) {
- this.issuer = issuer;
- }
-
- public char getReadOnly() {
- return readOnly;
- }
-
- public void setReadOnly(char readOnly) {
- this.readOnly = readOnly;
- }
-
- public char getRequiresResolvers() {
- return requiresResolvers;
- }
-
- public void setRequiresResolvers(char requireResolvers) {
- this.requiresResolvers = requireResolvers;
- }
-
- public Set<PIPConfigParam> getPipconfigParams() {
- return this.pipconfigParams;
- }
-
- public void setPipconfigParams(Set<PIPConfigParam> pipconfigParams) {
- this.pipconfigParams = pipconfigParams;
- }
-
- public PIPConfigParam addPipconfigParam(PIPConfigParam pipconfigParam) {
+ /**
+ * Adds the pipconfig param.
+ *
+ * @param pipconfigParam the pipconfig param
+ * @return the PIP config param
+ */
+ public PipConfigParam addPipconfigParam(PipConfigParam pipconfigParam) {
getPipconfigParams().add(pipconfigParam);
pipconfigParam.setPipconfiguration(this);
return pipconfigParam;
}
- public PIPConfigParam removePipconfigParam(PIPConfigParam pipconfigParam) {
+ /**
+ * Removes the pipconfig param.
+ *
+ * @param pipconfigParam the pipconfig param
+ * @return the PIP config param
+ */
+ public PipConfigParam removePipconfigParam(PipConfigParam pipconfigParam) {
if (pipconfigParam == null) {
return pipconfigParam;
}
@@ -246,6 +226,9 @@ public class PIPConfiguration implements Serializable {
return pipconfigParam;
}
+ /**
+ * Clear config params.
+ */
@Transient
public void clearConfigParams() {
while (!this.pipconfigParams.isEmpty()) {
@@ -253,75 +236,49 @@ public class PIPConfiguration implements Serializable {
}
}
- public PIPType getPiptype() {
- return this.piptype;
- }
-
- public void setPiptype(PIPType piptype) {
- this.piptype = piptype;
- }
-
- public Set<PIPResolver> getPipresolvers() {
- return this.pipresolvers;
- }
-
- public void setPipresolvers(Set<PIPResolver> pipresolvers) {
- this.pipresolvers = pipresolvers;
- }
-
- public PIPResolver addPipresolver(PIPResolver pipresolver) {
+ /**
+ * Adds the pipresolver.
+ *
+ * @param pipresolver the pipresolver
+ * @return the PIP resolver
+ */
+ public PipResolver addPipresolver(PipResolver pipresolver) {
getPipresolvers().add(pipresolver);
pipresolver.setPipconfiguration(this);
return pipresolver;
}
- public PIPResolver removePipresolver(PIPResolver pipresolver) {
+ /**
+ * Removes the pipresolver.
+ *
+ * @param pipresolver the pipresolver
+ * @return the PIP resolver
+ */
+ public PipResolver removePipresolver(PipResolver pipresolver) {
getPipresolvers().remove(pipresolver);
pipresolver.setPipconfiguration(null);
return pipresolver;
}
- public String getCreatedBy() {
- return createdBy;
- }
-
- public void setCreatedBy(String createdBy) {
- this.createdBy = createdBy;
- }
-
- public Date getCreatedDate() {
- return createdDate;
- }
-
- public void setCreatedDate(Date createdDate) {
- this.createdDate = createdDate;
- }
-
- public String getModifiedBy() {
- return modifiedBy;
- }
-
- public void setModifiedBy(String modifiedBy) {
- this.modifiedBy = modifiedBy;
- }
-
- public Date getModifiedDate() {
- return modifiedDate;
- }
-
- public void setModifiedDate(Date modifiedDate) {
- this.modifiedDate = modifiedDate;
- }
-
+ /**
+ * Checks if is read only.
+ *
+ * @return true, if is read only
+ */
@Transient
public boolean isReadOnly() {
return this.readOnly == '1';
}
+ /**
+ * Sets the read only flag.
+ *
+ * @param readOnly the new read only flag
+ */
@Transient
- public void setReadOnly(boolean readOnly) {
+ public void setReadOnlyFlag(boolean readOnly) {
if (readOnly) {
this.readOnly = '1';
} else {
@@ -329,13 +286,23 @@ public class PIPConfiguration implements Serializable {
}
}
+ /**
+ * Requires resolvers.
+ *
+ * @return true, if successful
+ */
@Transient
public boolean requiresResolvers() {
return this.requiresResolvers == '1';
}
+ /**
+ * Sets the requires resolvers flag.
+ *
+ * @param requires the new requires resolvers flag
+ */
@Transient
- public void setRequiresResolvers(boolean requires) {
+ public void setRequiresResolversFlag(boolean requires) {
if (requires) {
this.requiresResolvers = '1';
} else {
@@ -343,32 +310,45 @@ public class PIPConfiguration implements Serializable {
}
}
+ /**
+ * Import PIP configurations.
+ *
+ * @param properties the properties
+ * @return the collection
+ */
@Transient
- public static Collection<PIPConfiguration> importPIPConfigurations(Properties properties) {
- Collection<PIPConfiguration> configurations = new ArrayList<>();
+ public static Collection<PipConfiguration> importPipConfigurations(Properties properties) {
+ Collection<PipConfiguration> configurations = new ArrayList<>();
String engines = properties.getProperty(XACMLProperties.PROP_PIP_ENGINES);
if (engines == null || engines.isEmpty()) {
return configurations;
}
for (String id : Splitter.on(',').trimResults().omitEmptyStrings().split(engines)) {
- PIPConfiguration configuration;
+ PipConfiguration configuration;
try {
String user = "super-admin";
- configuration = new PIPConfiguration(id, properties, user);
+ configuration = new PipConfiguration(id, properties, user);
configuration.setCreatedBy(user);
configuration.setModifiedBy(user);
configurations.add(configuration);
} catch (PIPException e) {
logger.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Import failed: " + e.getLocalizedMessage());
- PolicyLogger.error(MessageCodes.EXCEPTION_ERROR, e, "PIPConfiguration", "Import failed");
+ PolicyLogger.error(MessageCodes.EXCEPTION_ERROR, e, "PipConfiguration", "Import failed");
}
}
return configurations;
}
+ /**
+ * Read properties.
+ *
+ * @param id the id
+ * @param properties the properties
+ * @throws PIPException the PIP exception
+ */
@Transient
- protected void readProperties(String id, Properties properties) throws PIPException {
+ protected void readProperties(String id, Properties properties) throws PIPException {
//
// Save the id if we don't have one already
//
@@ -378,7 +358,7 @@ public class PIPConfiguration implements Serializable {
this.id = Integer.parseInt(id);
} catch (NumberFormatException e) {
logger.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Convert id to integer failed: " + id);
- PolicyLogger.error(MessageCodes.EXCEPTION_ERROR, e, "PIPConfiguration", "Convert id to integer failed");
+ PolicyLogger.error(MessageCodes.EXCEPTION_ERROR, e, "PipConfiguration", "Convert id to integer failed");
}
}
//
@@ -391,47 +371,8 @@ public class PIPConfiguration implements Serializable {
//
// Go through each property
//
- for (Object nme : properties.keySet()) {
- if (!nme.toString().startsWith(id)) {
- continue;
- }
- if (nme.equals(id + ".classname")) {
- //
- // We already saved this
- //
- } else if (nme.equals(id + "." + StdConfigurableEngine.PROP_NAME)) {
- this.name = properties.getProperty(nme.toString());
- } else if (nme.equals(id + "." + StdConfigurableEngine.PROP_DESCRIPTION)) {
- this.description = properties.getProperty(nme.toString());
- } else if (nme.equals(id + "." + StdConfigurableEngine.PROP_ISSUER)) {
- this.issuer = properties.getProperty(nme.toString());
- } else if (nme.equals(id + ".resolvers")) {
- //
- // It has resolvers, make sure this is set to true if
- // it has been already.
- //
- this.setRequiresResolvers(true);
- //
- // Parse the resolvers
- //
- Collection<PIPResolver> resolvers = PIPResolver.importResolvers(id + ".resolver",
- properties.getProperty(nme.toString()),
- properties,"super-admin"
- );
- for (PIPResolver resolver : resolvers) {
- this.addPipresolver(resolver);
- }
- } else if (nme.toString().startsWith(id + ".resolver")) {
- //
- // Ignore, the PIPResolver will parse these values
- //
- } else {
- //
- // Config Parameter
- //
- this.addPipconfigParam(new PIPConfigParam(nme.toString().substring(id.length() + 1),
- properties.getProperty(nme.toString())));
- }
+ for (Object propertyKey : properties.keySet()) {
+ readProperty(id, properties, propertyKey);
}
//
// Make sure we have a name at least
@@ -441,7 +382,61 @@ public class PIPConfiguration implements Serializable {
}
}
+ /**
+ * Read a property into the PIP configuration.
+ *
+ * @param id the ID of the property
+ * @param properties the properties object to read from
+ * @param key the key of the property being checked
+ * @throws PIPException on exceptions thrown on reading the property
+ */
+ private void readProperty(String id, Properties properties, Object key) throws PIPException {
+ if (!key.toString().startsWith(id)) {
+ return;
+ }
+ if (key.equals(id + ".classname")) {
+ //
+ // We already saved this
+ //
+ } else if (key.equals(id + "." + StdConfigurableEngine.PROP_NAME)) {
+ this.name = properties.getProperty(key.toString());
+ } else if (key.equals(id + "." + StdConfigurableEngine.PROP_DESCRIPTION)) {
+ this.description = properties.getProperty(key.toString());
+ } else if (key.equals(id + "." + StdConfigurableEngine.PROP_ISSUER)) {
+ this.issuer = properties.getProperty(key.toString());
+ } else if (key.equals(id + ".resolvers")) {
+ //
+ // It has resolvers, make sure this is set to true if
+ // it has been already.
+ //
+ this.setRequiresResolversFlag(true);
+ //
+ // Parse the resolvers
+ //
+ Collection<PipResolver> resolvers = PipResolver.importResolvers(id + ".resolver",
+ properties.getProperty(key.toString()), properties, "super-admin");
+ for (PipResolver resolver : resolvers) {
+ this.addPipresolver(resolver);
+ }
+ } else if (key.toString().startsWith(id + ".resolver")) {
+ //
+ // Ignore, the PipResolver will parse these values
+ //
+ } else {
+ //
+ // Config Parameter
+ //
+ this.addPipconfigParam(new PipConfigParam(key.toString().substring(id.length() + 1),
+ properties.getProperty(key.toString())));
+ }
+ }
+ /**
+ * Gets the configuration.
+ *
+ * @param name the name
+ * @return the configuration
+ */
@Transient
public Map<String, String> getConfiguration(String name) {
String prefix;
@@ -463,14 +458,14 @@ public class PIPConfiguration implements Serializable {
map.put(prefix + "issuer", this.issuer);
}
- for (PIPConfigParam param : this.pipconfigParams) {
+ for (PipConfigParam param : this.pipconfigParams) {
map.put(prefix + param.getParamName(), param.getParamValue());
}
List<String> ids = new ArrayList<>();
- Iterator<PIPResolver> iter = this.pipresolvers.iterator();
+ Iterator<PipResolver> iter = this.pipresolvers.iterator();
while (iter.hasNext()) {
- PIPResolver resolver = iter.next();
+ PipResolver resolver = iter.next();
String idd = Integer.toString(resolver.getId());
Map<String, String> resolverMap = resolver.getConfiguration(prefix + "resolver." + idd);
map.putAll(resolverMap);
@@ -482,8 +477,14 @@ public class PIPConfiguration implements Serializable {
return map;
}
+ /**
+ * Generate properties.
+ *
+ * @param name the name
+ * @return the properties
+ */
@Transient
- public Properties generateProperties(String name) {
+ public Properties generateProperties(String name) {
String prefix;
if (name == null) {
prefix = Integer.toString(this.id);
@@ -492,10 +493,14 @@ public class PIPConfiguration implements Serializable {
prefix = name;
} else {
prefix = name + ".";
+ /**
+ * Instantiates a new PIP configuration.
+ */
+
}
}
Properties props = new Properties();
- props.setProperty("xacml.pip.engines", name);
+ props.setProperty("xacml.pip.engines", prefix);
props.setProperty(prefix + "classname", this.classname);
props.setProperty(prefix + "name", this.name);
if (this.description != null) {
@@ -505,14 +510,14 @@ public class PIPConfiguration implements Serializable {
props.setProperty(prefix + "issuer", this.issuer);
}
- for (PIPConfigParam param : this.pipconfigParams) {
+ for (PipConfigParam param : this.pipconfigParams) {
props.setProperty(prefix + param.getParamName(), param.getParamValue());
}
List<String> ids = new ArrayList<>();
- Iterator<PIPResolver> iter = this.pipresolvers.iterator();
+ Iterator<PipResolver> iter = this.pipresolvers.iterator();
while (iter.hasNext()) {
- PIPResolver resolver = iter.next();
+ PipResolver resolver = iter.next();
String idd = Integer.toString(resolver.getId());
resolver.generateProperties(props, prefix + "resolver." + idd);
ids.add(idd);
@@ -522,17 +527,4 @@ public class PIPConfiguration implements Serializable {
}
return props;
}
-
- @Transient
- @Override
- public String toString() {
- return "PIPConfiguration [id=" + id + ", piptype=" + piptype
- + ", classname=" + classname + ", name=" + name
- + ", description=" + description + ", issuer=" + issuer
- + ", readOnly=" + readOnly + ", requiresResolvers="
- + requiresResolvers + ", createdBy=" + createdBy
- + ", createdDate=" + createdDate + ", modifiedBy=" + modifiedBy
- + ", modifiedDate=" + modifiedDate + ", pipconfigParams="
- + pipconfigParams + ", pipresolvers=" + pipresolvers + "]";
- }
}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PIPResolver.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PipResolver.java
index a8b02580d..74e24b3db 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PIPResolver.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PipResolver.java
@@ -3,13 +3,14 @@
* ONAP-REST
* ================================================================================
* Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,6 +21,10 @@
package org.onap.policy.rest.jpa;
+import com.att.research.xacml.api.pip.PIPException;
+import com.att.research.xacml.std.pip.engines.StdConfigurableEngine;
+import com.google.common.base.Splitter;
+
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
@@ -47,202 +52,135 @@ import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import javax.persistence.Transient;
-import com.att.research.xacml.api.pip.PIPException;
-import com.att.research.xacml.std.pip.engines.StdConfigurableEngine;
-import com.google.common.base.Splitter;
-
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
/**
- * The persistent class for the PIPResolver database table.
- *
+ * The persistent class for the PipResolver database table.
+ *
*/
@Entity
-@Table(name="PIPResolver")
-@NamedQuery(name="PIPResolver.findAll", query="SELECT p FROM PIPResolver p")
-public class PIPResolver implements Serializable {
+@Table(name = "PipResolver")
+@NamedQuery(name = "PipResolver.findAll", query = "SELECT p FROM PipResolver p")
+@Getter
+@Setter
+@NoArgsConstructor
+public class PipResolver implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- @GeneratedValue(strategy=GenerationType.AUTO)
- @Column(name="id")
+ @GeneratedValue(strategy = GenerationType.AUTO)
+ @Column(name = "id")
private int id;
- @Column(name="DESCRIPTION", nullable=true, length=2048)
+ @Column(name = "DESCRIPTION", nullable = true, length = 2048)
private String description;
- @Column(name="NAME", nullable=false, length=255)
+ @Column(name = "NAME", nullable = false, length = 255)
private String name;
- @Column(name="ISSUER", nullable=true, length=1024)
+ @Column(name = "ISSUER", nullable = true, length = 1024)
private String issuer;
- @Column(name="CLASSNAME", nullable=false, length=2048)
+ @Column(name = "CLASSNAME", nullable = false, length = 2048)
private String classname;
- @Column(name="READ_ONLY", nullable=false)
+ @Column(name = "READ_ONLY", nullable = false)
private char readOnly = '0';
- @Column(name="CREATED_BY", nullable=false, length=255)
+ @Column(name = "CREATED_BY", nullable = false, length = 255)
private String createdBy = "guest";
@Temporal(TemporalType.TIMESTAMP)
- @Column(name="CREATED_DATE", nullable=false, updatable=false)
+ @Column(name = "CREATED_DATE", nullable = false, updatable = false)
private Date createdDate;
- @Column(name="MODIFIED_BY", nullable=false, length=255)
+ @Column(name = "MODIFIED_BY", nullable = false, length = 255)
private String modifiedBy = "guest";
@Temporal(TemporalType.TIMESTAMP)
- @Column(name="MODIFIED_DATE", nullable=false)
+ @Column(name = "MODIFIED_DATE", nullable = false)
private Date modifiedDate;
- //bi-directional many-to-one association to PIPConfiguration
+ // bi-directional many-to-one association to PipConfiguration
@ManyToOne
- @JoinColumn(name="PIP_ID")
- private PIPConfiguration pipconfiguration;
-
- //bi-directional many-to-one association to PIPResolverParam
- @OneToMany(mappedBy="pipresolver", orphanRemoval=true, cascade=CascadeType.REMOVE)
- private Set<PIPResolverParam> pipresolverParams = new HashSet<>();
-
- public PIPResolver() {
- //An empty constructor
- }
-
- public PIPResolver(String prefix, Properties properties, String user) throws PIPException {
+ @JoinColumn(name = "PIP_ID")
+ private PipConfiguration pipconfiguration;
+
+ // bi-directional many-to-one association to PipResolverParam
+ @OneToMany(mappedBy = "pipresolver", orphanRemoval = true, cascade = CascadeType.REMOVE)
+ private Set<PipResolverParam> pipresolverParams = new HashSet<>();
+
+ /**
+ * Instantiates a new PIP resolver.
+ *
+ * @param prefix the prefix
+ * @param properties the properties
+ * @param user the user
+ * @throws PIPException the PIP exception
+ */
+ public PipResolver(String prefix, Properties properties, String user) throws PIPException {
this.createdBy = user;
this.modifiedBy = user;
this.readOnly = '0';
this.readProperties(prefix, properties);
}
- public PIPResolver(PIPResolver resolver) {
+ /**
+ * Instantiates a new PIP resolver.
+ *
+ * @param resolver the resolver
+ */
+ public PipResolver(PipResolver resolver) {
this.name = resolver.name;
this.description = resolver.description;
this.issuer = resolver.issuer;
this.classname = resolver.classname;
this.readOnly = resolver.readOnly;
- for (PIPResolverParam param : this.pipresolverParams) {
- this.addPipresolverParam(new PIPResolverParam(param));
+ for (PipResolverParam param : resolver.pipresolverParams) {
+ this.addPipresolverParam(new PipResolverParam(param));
}
}
+ /**
+ * Pre persist.
+ */
@PrePersist
- public void prePersist() {
+ public void prePersist() {
Date date = new Date();
this.createdDate = date;
this.modifiedDate = date;
}
+ /**
+ * Pre update.
+ */
@PreUpdate
public void preUpdate() {
this.modifiedDate = new Date();
}
- public int getId() {
- return this.id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
-
- public String getDescription() {
- return this.description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getName() {
- return this.name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getIssuer() {
- return issuer;
- }
-
- public void setIssuer(String issuer) {
- this.issuer = issuer;
- }
-
- public String getClassname() {
- return classname;
- }
-
- public void setClassname(String classname) {
- this.classname = classname;
- }
-
- public char getReadOnly() {
- return readOnly;
- }
-
- public void setReadOnly(char readOnly) {
- this.readOnly = readOnly;
- }
-
- public String getCreatedBy() {
- return createdBy;
- }
-
- public void setCreatedBy(String createdBy) {
- this.createdBy = createdBy;
- }
-
- public Date getCreatedDate() {
- return createdDate;
- }
-
- public void setCreatedDate(Date createdDate) {
- this.createdDate = createdDate;
- }
-
- public String getModifiedBy() {
- return modifiedBy;
- }
-
- public void setModifiedBy(String modifiedBy) {
- this.modifiedBy = modifiedBy;
- }
-
- public Date getModifiedDate() {
- return modifiedDate;
- }
-
- public void setModifiedDate(Date modifiedDate) {
- this.modifiedDate = modifiedDate;
- }
-
- public PIPConfiguration getPipconfiguration() {
- return this.pipconfiguration;
- }
-
- public void setPipconfiguration(PIPConfiguration pipconfiguration) {
- this.pipconfiguration = pipconfiguration;
- }
-
- public Set<PIPResolverParam> getPipresolverParams() {
- return this.pipresolverParams;
- }
-
- public void setPipresolverParams(Set<PIPResolverParam> pipresolverParams) {
- this.pipresolverParams = pipresolverParams;
- }
-
- public PIPResolverParam addPipresolverParam(PIPResolverParam pipresolverParam) {
+ /**
+ * Adds the pipresolver param.
+ *
+ * @param pipresolverParam the pipresolver param
+ * @return the PIP resolver param
+ */
+ public PipResolverParam addPipresolverParam(PipResolverParam pipresolverParam) {
getPipresolverParams().add(pipresolverParam);
pipresolverParam.setPipresolver(this);
return pipresolverParam;
}
- public PIPResolverParam removePipresolverParam(PIPResolverParam pipresolverParam) {
+ /**
+ * Removes the pipresolver param.
+ *
+ * @param pipresolverParam the pipresolver param
+ * @return the PIP resolver param
+ */
+ public PipResolverParam removePipresolverParam(PipResolverParam pipresolverParam) {
if (pipresolverParam == null) {
return pipresolverParam;
}
@@ -252,6 +190,9 @@ public class PIPResolver implements Serializable {
return pipresolverParam;
}
+ /**
+ * Clear params.
+ */
@Transient
public void clearParams() {
while (!this.pipresolverParams.isEmpty()) {
@@ -259,11 +200,21 @@ public class PIPResolver implements Serializable {
}
}
+ /**
+ * Checks if is read only.
+ *
+ * @return true, if is read only
+ */
@Transient
public boolean isReadOnly() {
return this.readOnly == '1';
}
+ /**
+ * Sets the read only.
+ *
+ * @param readOnly the new read only
+ */
@Transient
public void setReadOnly(boolean readOnly) {
if (readOnly) {
@@ -273,15 +224,33 @@ public class PIPResolver implements Serializable {
}
}
+ /**
+ * Import resolvers.
+ *
+ * @param prefix the prefix
+ * @param list the list
+ * @param properties the properties
+ * @param user the user
+ * @return the collection
+ * @throws PIPException the PIP exception
+ */
@Transient
- public static Collection<PIPResolver> importResolvers(String prefix, String list, Properties properties, String user) throws PIPException {
- Collection<PIPResolver> resolvers = new ArrayList<>();
+ public static Collection<PipResolver> importResolvers(String prefix, String list, Properties properties,
+ String user) throws PIPException {
+ Collection<PipResolver> resolvers = new ArrayList<>();
for (String id : Splitter.on(',').trimResults().omitEmptyStrings().split(list)) {
- resolvers.add(new PIPResolver(prefix + "." + id, properties, user));
+ resolvers.add(new PipResolver(prefix + "." + id, properties, user));
}
return resolvers;
}
+ /**
+ * Read properties.
+ *
+ * @param prefix the prefix
+ * @param properties the properties
+ * @throws PIPException the PIP exception
+ */
@Transient
protected void readProperties(String prefix, Properties properties) throws PIPException {
//
@@ -309,12 +278,18 @@ public class PIPResolver implements Serializable {
} else if (nme.equals(prefix + "." + StdConfigurableEngine.PROP_ISSUER)) {
this.issuer = properties.getProperty(nme.toString());
} else {
- this.addPipresolverParam(new PIPResolverParam(nme.toString().substring(prefix.length() + 1),
- properties.getProperty(nme.toString())));
+ this.addPipresolverParam(new PipResolverParam(nme.toString().substring(prefix.length() + 1),
+ properties.getProperty(nme.toString())));
}
}
}
+ /**
+ * Gets the configuration.
+ *
+ * @param prefix the prefix
+ * @return the configuration
+ */
@Transient
public Map<String, String> getConfiguration(String prefix) {
String pref = prefix;
@@ -330,14 +305,20 @@ public class PIPResolver implements Serializable {
if (this.issuer != null && this.issuer.isEmpty()) {
map.put(pref + "issuer", this.issuer);
}
- for (PIPResolverParam param : this.pipresolverParams) {
+ for (PipResolverParam param : this.pipresolverParams) {
map.put(pref + param.getParamName(), param.getParamValue());
}
return map;
}
+ /**
+ * Generate properties.
+ *
+ * @param props the props
+ * @param prefix the prefix
+ */
@Transient
- public void generateProperties(Properties props, String prefix) {
+ public void generateProperties(Properties props, String prefix) {
String pref = prefix;
if (!prefix.endsWith(".")) {
pref = prefix + ".";
@@ -350,19 +331,22 @@ public class PIPResolver implements Serializable {
if (this.issuer != null && this.issuer.isEmpty()) {
props.setProperty(pref + "issuer", this.issuer);
}
- for (PIPResolverParam param : this.pipresolverParams) {
+ for (PipResolverParam param : this.pipresolverParams) {
props.setProperty(pref + param.getParamName(), param.getParamValue());
}
}
+ /**
+ * To string.
+ *
+ * @return the string
+ */
@Transient
@Override
public String toString() {
- return "PIPResolver [id=" + id + ", classname=" + classname + ", name="
- + name + ", description=" + description + ", issuer=" + issuer
- + ", readOnly=" + readOnly + ", createdBy=" + createdBy
- + ", createdDate=" + createdDate + ", modifiedBy=" + modifiedBy
- + ", modifiedDate=" + modifiedDate + ", pipresolverParams="
- + pipresolverParams + "]";
+ return "PipResolver [id=" + id + ", classname=" + classname + ", name=" + name + ", description=" + description
+ + ", issuer=" + issuer + ", readOnly=" + readOnly + ", createdBy=" + createdBy
+ + ", createdDate=" + createdDate + ", modifiedBy=" + modifiedBy + ", modifiedDate="
+ + modifiedDate + ", pipresolverParams=" + pipresolverParams + "]";
}
}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PipResolverParam.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PipResolverParam.java
new file mode 100644
index 000000000..3dd096862
--- /dev/null
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PipResolverParam.java
@@ -0,0 +1,132 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP-REST
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.rest.jpa;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * The persistent class for the PipResolverParam database table.
+ *
+ */
+@Entity
+@Table(name = "PipResolverParams")
+@NamedQuery(name = "PipResolverParam.findAll", query = "SELECT p FROM PipResolverParam p")
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class PipResolverParam implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.AUTO)
+ @Column(name = "id")
+ private int id;
+
+ @Column(name = "PARAM_NAME", nullable = false, length = 1024)
+ private String paramName;
+
+ @Column(name = "PARAM_VALUE", nullable = false, length = 2048)
+ private String paramValue;
+
+ @Column(name = "PARAM_DEFAULT", nullable = true, length = 2048)
+ private String paramDefault;
+
+ @Column(name = "REQUIRED", nullable = false)
+ private char required = '0';
+
+ // bi-directional many-to-one association to PipResolver
+ @ManyToOne
+ @JoinColumn(name = "ID_RESOLVER")
+ private PipResolver pipresolver;
+
+ /**
+ * Instantiates a new PIP resolver param.
+ *
+ * @param name the name
+ */
+ public PipResolverParam(String name) {
+ this.paramName = name;
+ }
+
+ /**
+ * Instantiates a new PIP resolver param.
+ *
+ * @param name the name
+ * @param value the value
+ */
+ public PipResolverParam(String name, String value) {
+ this(name);
+ this.paramValue = value;
+ }
+
+ /**
+ * Instantiates a new PIP resolver param.
+ *
+ * @param param the param
+ */
+ public PipResolverParam(PipResolverParam param) {
+ this(param.getParamName(), param.getParamValue());
+ this.paramDefault = param.getParamDefault();
+ this.required = param.required;
+ }
+
+ /**
+ * Checks if is required.
+ *
+ * @return true, if is required
+ */
+ @Transient
+ public boolean isRequired() {
+ return this.required == '1';
+ }
+
+ /**
+ * Sets the required.
+ *
+ * @param required the new required
+ */
+ @Transient
+ public void setRequired(boolean required) {
+ if (required) {
+ this.required = '1';
+ } else {
+ this.required = '0';
+ }
+ }
+}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PIPType.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PipType.java
index aa8c45ef2..0179d0d33 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PIPType.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PipType.java
@@ -3,13 +3,14 @@
* ONAP-REST
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* 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.
@@ -33,15 +34,21 @@ import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.persistence.Transient;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
/**
- * The persistent class for the PIPType database table.
- *
+ * The persistent class for the PipType database table.
+ *
*/
@Entity
-@Table(name="PIPType")
-@NamedQuery(name="PIPType.findAll", query="SELECT p FROM PIPType p")
-public class PIPType implements Serializable {
+@Table(name = "PipType")
+@NamedQuery(name = "PipType.findAll", query = "SELECT p FROM PipType p")
+@Getter
+@Setter
+@NoArgsConstructor
+public class PipType implements Serializable {
private static final long serialVersionUID = 1L;
public static final String TYPE_SQL = "SQL";
@@ -51,81 +58,90 @@ public class PIPType implements Serializable {
public static final String TYPE_CUSTOM = "Custom";
@Id
- @GeneratedValue(strategy=GenerationType.AUTO)
- @Column(name="id")
+ @GeneratedValue(strategy = GenerationType.AUTO)
+ @Column(name = "id")
private int id;
- @Column(name="type", nullable=false, length=45)
+ @Column(name = "type", nullable = false, length = 45)
private String type;
- //bi-directional many-to-one association to PIPConfiguration
- @OneToMany(mappedBy="piptype")
- private Set<PIPConfiguration> pipconfigurations;
-
- public PIPType() {
- // Empty constructor
- }
-
- public int getId() {
- return this.id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
-
- public String getType() {
- return this.type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public Set<PIPConfiguration> getPipconfigurations() {
- return this.pipconfigurations;
- }
-
- public void setPipconfigurations(Set<PIPConfiguration> pipconfigurations) {
- this.pipconfigurations = pipconfigurations;
- }
-
- public PIPConfiguration addPipconfiguration(PIPConfiguration pipconfiguration) {
+ // bi-directional many-to-one association to PipConfiguration
+ @OneToMany(mappedBy = "piptype")
+ private Set<PipConfiguration> pipconfigurations;
+
+ /**
+ * Adds the pipconfiguration.
+ *
+ * @param pipconfiguration the pipconfiguration
+ * @return the PIP configuration
+ */
+ public PipConfiguration addPipconfiguration(PipConfiguration pipconfiguration) {
getPipconfigurations().add(pipconfiguration);
pipconfiguration.setPiptype(this);
return pipconfiguration;
}
- public PIPConfiguration removePipconfiguration(PIPConfiguration pipconfiguration) {
+ /**
+ * Removes the pipconfiguration.
+ *
+ * @param pipconfiguration the pipconfiguration
+ * @return the PIP configuration
+ */
+ public PipConfiguration removePipconfiguration(PipConfiguration pipconfiguration) {
getPipconfigurations().remove(pipconfiguration);
pipconfiguration.setPiptype(null);
return pipconfiguration;
}
+ /**
+ * Checks if is sql.
+ *
+ * @return true, if is sql
+ */
@Transient
- public boolean isSQL() {
+ public boolean isSql() {
return this.type.equals(TYPE_SQL);
}
+ /**
+ * Checks if is ldap.
+ *
+ * @return true, if is ldap
+ */
@Transient
- public boolean isLDAP() {
+ public boolean isLdap() {
return this.type.equals(TYPE_LDAP);
}
+ /**
+ * Checks if is csv.
+ *
+ * @return true, if is csv
+ */
@Transient
- public boolean isCSV() {
+ public boolean isCsv() {
return this.type.equals(TYPE_CSV);
}
+ /**
+ * Checks if is hyper CSV.
+ *
+ * @return true, if is hyper CSV
+ */
@Transient
- public boolean isHyperCSV() {
+ public boolean isHyperCsv() {
return this.type.equals(TYPE_HYPERCSV);
}
+ /**
+ * Checks if is custom.
+ *
+ * @return true, if is custom
+ */
@Transient
- public boolean isCustom() {
+ public boolean isCustom() {
return this.type.equals(TYPE_CUSTOM);
}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyAlgorithms.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyAlgorithms.java
index ba1097500..0f23f55da 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyAlgorithms.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyAlgorithms.java
@@ -3,13 +3,14 @@
* ONAP-REST
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,6 +21,8 @@
package org.onap.policy.rest.jpa;
+import com.att.research.xacml.api.Identifier;
+
import java.io.Serializable;
import javax.persistence.Column;
@@ -31,11 +34,17 @@ import javax.persistence.NamedQuery;
import javax.persistence.Table;
import javax.persistence.Transient;
-import com.att.research.xacml.api.Identifier;
+import lombok.Getter;
+import lombok.Setter;
+/**
+ * The Class PolicyAlgorithms.
+ */
@Entity
-@Table(name="PolicyAlgorithms")
-@NamedQuery(name="PolicyAlgorithms.findAll", query="SELECT d FROM PolicyAlgorithms d")
+@Table(name = "PolicyAlgorithms")
+@NamedQuery(name = "PolicyAlgorithms.findAll", query = "SELECT d FROM PolicyAlgorithms d")
+@Getter
+@Setter
public class PolicyAlgorithms implements Serializable {
private static final long serialVersionUID = 1L;
@@ -44,18 +53,24 @@ public class PolicyAlgorithms implements Serializable {
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
- @Column(name="id")
+ @Column(name = "id")
private int id;
- @Column(name="is_standard", nullable=false)
+ @Column(name = "is_standard", nullable = false)
private char isStandard;
- @Column(name="xacml_id", nullable=false, unique=true, length=255)
+ @Column(name = "xacml_id", nullable = false, unique = true, length = 255)
private String xacmlId;
- @Column(name="short_name", nullable=false, length=64)
+ @Column(name = "short_name", nullable = false, length = 64)
private String shortName;
+ /**
+ * Instantiates a new policy algorithms.
+ *
+ * @param identifier the identifier
+ * @param standard the standard
+ */
public PolicyAlgorithms(Identifier identifier, char standard) {
this.isStandard = standard;
if (identifier != null) {
@@ -63,54 +78,39 @@ public class PolicyAlgorithms implements Serializable {
}
}
+ /**
+ * Instantiates a new policy algorithms.
+ *
+ * @param identifier the identifier
+ */
public PolicyAlgorithms(Identifier identifier) {
this(identifier, PolicyAlgorithms.STANDARD);
}
+ /**
+ * Instantiates a new policy algorithms.
+ */
public PolicyAlgorithms() {
this(null, PolicyAlgorithms.STANDARD);
}
- public int getId() {
- return this.id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
-
- public char getIsStandard() {
- return this.isStandard;
- }
-
- public void setIsStandard(char isStandard) {
- this.isStandard = isStandard;
- }
-
+ /**
+ * Checks if is standard.
+ *
+ * @return true, if is standard
+ */
@Transient
public boolean isStandard() {
return this.isStandard == PolicyAlgorithms.STANDARD;
}
+ /**
+ * Checks if is custom.
+ *
+ * @return true, if is custom
+ */
@Transient
public boolean isCustom() {
return this.isStandard == PolicyAlgorithms.CUSTOM;
}
-
- public String getXacmlId() {
- return this.xacmlId;
- }
-
- public void setXacmlId(String xacmlId) {
- this.xacmlId = xacmlId;
- }
-
- public String getShortName() {
- return shortName;
- }
-
- public void setShortName(String shortName) {
- this.shortName = shortName;
- }
-
}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyAuditlog.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyAuditlog.java
index bfd7769b4..75924e867 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyAuditlog.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyAuditlog.java
@@ -3,6 +3,7 @@
* ONAP-PAP-REST
* ================================================================================
* Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* 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,7 @@
package org.onap.policy.rest.jpa;
import java.util.Date;
+
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -29,11 +31,15 @@ import javax.persistence.Id;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
+import lombok.Getter;
+import lombok.Setter;
+
@Entity
@Table(name = "policyAuditlog")
@NamedQuery(name = "policyAuditlog.findAll", query = "SELECT v FROM PolicyAuditlog v ")
+@Getter
+@Setter
public class PolicyAuditlog {
- private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name = "id", nullable = false, unique = true)
@@ -50,44 +56,4 @@ public class PolicyAuditlog {
@Column(name = "dateAndTime", nullable = false)
private Date dateAndTime;
-
- public int getId() {
- return id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
-
- public String getUserName() {
- return userName;
- }
-
- public void setUserName(String userName) {
- this.userName = userName;
- }
-
- public String getPolicyName() {
- return policyName;
- }
-
- public void setPolicyName(String policyName) {
- this.policyName = policyName;
- }
-
- public String getActions() {
- return actions;
- }
-
- public void setActions(String actions) {
- this.actions = actions;
- }
-
- public Date getDateAndTime() {
- return dateAndTime;
- }
-
- public void setDateAndTime(Date dateAndTime) {
- this.dateAndTime = dateAndTime;
- }
}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyDBDaoEntity.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyDBDaoEntity.java
deleted file mode 100644
index 7a0c2fe2f..000000000
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyDBDaoEntity.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP-REST
- * ================================================================================
- * Copyright (C) 2017 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.rest.jpa;
-/*
- */
-import java.io.Serializable;
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.PrePersist;
-import javax.persistence.PreUpdate;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-
-/*
- * The Entity class to persist a PolicyDBDaoEntity object for registration of PolicyDBDao
- */
-
-/**
- *
- */
-@Entity
-@Table(name="PolicyDBDaoEntity")
-
-@NamedQueries({
- @NamedQuery(name="PolicyDBDaoEntity.findAll", query="SELECT e FROM PolicyDBDaoEntity e "),
- @NamedQuery(name="PolicyDBDaoEntity.deleteAll", query="DELETE FROM PolicyDBDaoEntity WHERE 1=1")
-})
-
-public class PolicyDBDaoEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @Id
- @Column(name="policyDBDaoUrl", nullable=false, unique=true)
- private String policyDBDaoUrl;
-
- @Temporal(TemporalType.TIMESTAMP)
- @Column(name="created_date", updatable=false)
- private Date createdDate;
-
- //username for the pap server that registered this PolicyDBDaoEntity
- @Column(name="username")
- private String username;
-
- //AES encrypted password for the pap server that registered this PolicyDBDaoEntity
- @Column(name="password")
- private String password;
-
- //A column to allow some descriptive text. For example: Atlanta data center
- @Column(name="description", nullable=false, length=2048)
- private String description = "NoDescription";
-
- @Temporal(TemporalType.TIMESTAMP)
- @Column(name="modified_date", nullable=false)
- private Date modifiedDate;
-
- public PolicyDBDaoEntity() {
- super();
- }
-
- @PrePersist
- public void prePersist() {
- Date date = new Date();
- this.createdDate = date;
- this.modifiedDate = date;
- }
-
- @PreUpdate
- public void preUpdate() {
- this.modifiedDate = new Date();
- }
-
- /**
- * @return the policyDBDaoUrl
- */
- public String getPolicyDBDaoUrl() {
- return policyDBDaoUrl;
- }
-
- /**
- * @param url the policyDBDaoUrl to set
- */
- public void setPolicyDBDaoUrl(String url) {
- this.policyDBDaoUrl = url;
- }
-
- /**
- * @return the description
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * @param description the description to set
- */
- public void setDescription(String description) {
- this.description = description;
- }
-
- /**
- * @return the createdDate
- */
- public Date getCreatedDate() {
- return createdDate;
- }
-
- /**
- * @return the modifiedDate
- */
- public Date getModifiedDate() {
- return modifiedDate;
- }
-
- public String getUsername(){
- return this.username;
- }
- public void setUsername(String username){
- this.username = username;
- }
- public String getPassword(){
- return this.password;
- }
- public void setPassword(String password){
- this.password = password;
- }
-}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyDbDaoEntity.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyDbDaoEntity.java
new file mode 100644
index 000000000..fbad21763
--- /dev/null
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyDbDaoEntity.java
@@ -0,0 +1,107 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP-REST
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.rest.jpa;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
+import javax.persistence.PrePersist;
+import javax.persistence.PreUpdate;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * The Entity class to persist a PolicyDbDaoEntity object for registration of PolicyDBDao.
+ */
+// @formatter:off
+@Entity
+@Table(name = "PolicyDbDaoEntity")
+@NamedQueries(
+ {
+ @NamedQuery(name = "PolicyDbDaoEntity.findAll", query = "SELECT e FROM PolicyDbDaoEntity e "),
+ @NamedQuery(name = "PolicyDbDaoEntity.deleteAll", query = "DELETE FROM PolicyDbDaoEntity WHERE 1=1")
+ }
+)
+@Getter
+@Setter
+//@formatter:on
+public class PolicyDbDaoEntity implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ @Id
+ @Column(name = "policyDbDaoUrl", nullable = false, unique = true)
+ private String policyDbDaoUrl;
+
+ @Temporal(TemporalType.TIMESTAMP)
+ @Column(name = "created_date", updatable = false)
+ private Date createdDate;
+
+ // username for the pap server that registered this PolicyDbDaoEntity
+ @Column(name = "username")
+ private String username;
+
+ // AES encrypted password for the pap server that registered this PolicyDbDaoEntity
+ @Column(name = "password")
+ private String password;
+
+ // A column to allow some descriptive text. For example: Atlanta data center
+ @Column(name = "description", nullable = false, length = 2048)
+ private String description = "NoDescription";
+
+ @Temporal(TemporalType.TIMESTAMP)
+ @Column(name = "modified_date", nullable = false)
+ private Date modifiedDate;
+
+ /**
+ * Instantiates a new policy DB dao entity.
+ */
+ public PolicyDbDaoEntity() {
+ super();
+ }
+
+ /**
+ * Pre persist.
+ */
+ @PrePersist
+ public void prePersist() {
+ Date date = new Date();
+ this.createdDate = date;
+ this.modifiedDate = date;
+ }
+
+ /**
+ * Pre update.
+ */
+ @PreUpdate
+ public void preUpdate() {
+ this.modifiedDate = new Date();
+ }
+}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyEditorScopes.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyEditorScopes.java
index 62fd0266e..7642a1417 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyEditorScopes.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyEditorScopes.java
@@ -3,6 +3,7 @@
* ONAP-REST
* ================================================================================
* Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,6 +23,7 @@ package org.onap.policy.rest.jpa;
import java.io.Serializable;
import java.util.Date;
+
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -37,99 +39,67 @@ import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * The Class PolicyEditorScopes.
+ */
@Entity
-@Table(name="PolicyEditorScopes")
-@NamedQuery(name="PolicyEditorScopes.findAll", query="SELECT p FROM PolicyEditorScopes p ")
-public class PolicyEditorScopes implements Serializable{
+@Table(name = "PolicyEditorScopes")
+@NamedQuery(name = "PolicyEditorScopes.findAll", query = "SELECT p FROM PolicyEditorScopes p ")
+@Getter
+@Setter
+public class PolicyEditorScopes implements Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
- @Column(name="id")
+ @Column(name = "id")
private int id;
- @Column(name="scopeName", nullable=false, unique=true)
+ @Column(name = "scopeName", nullable = false, unique = true)
@OrderBy("asc")
private String scopeName;
@Temporal(TemporalType.TIMESTAMP)
- @Column(name="created_date", updatable=false)
+ @Column(name = "created_date", updatable = false)
private Date createdDate;
@Temporal(TemporalType.TIMESTAMP)
- @Column(name="modified_date", nullable=false)
+ @Column(name = "modified_date", nullable = false)
private Date modifiedDate;
@ManyToOne(optional = false)
- @JoinColumn(name="created_by")
+ @JoinColumn(name = "created_by")
private UserInfo userCreatedBy;
@ManyToOne(optional = false)
- @JoinColumn(name="modified_by")
+ @JoinColumn(name = "modified_by")
private UserInfo userModifiedBy;
+ /**
+ * Instantiates a new policy editor scopes.
+ */
public PolicyEditorScopes() {
this.modifiedDate = new Date();
}
+ /**
+ * Pre persist.
+ */
@PrePersist
- public void prePersist() {
+ public void prePersist() {
Date date = new Date();
this.createdDate = date;
this.modifiedDate = date;
}
+ /**
+ * Pre update.
+ */
@PreUpdate
public void preUpdate() {
this.modifiedDate = new Date();
}
-
- public int getId() {
- return this.id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
-
- public String getScopeName() {
- return scopeName;
- }
-
- public void setScopeName(String scopeName) {
- this.scopeName = scopeName;
- }
-
- public Date getCreatedDate() {
- return this.createdDate;
- }
-
- public void setCreatedDate(Date createdDate) {
- this.createdDate = createdDate;
- }
-
- public Date getModifiedDate() {
- return this.modifiedDate;
- }
-
- public void setModifiedDate(Date modifiedDate) {
- this.modifiedDate = modifiedDate;
- }
-
- public UserInfo getUserCreatedBy() {
- return userCreatedBy;
- }
-
- public void setUserCreatedBy(UserInfo userCreatedBy) {
- this.userCreatedBy = userCreatedBy;
- }
-
- public UserInfo getUserModifiedBy() {
- return userModifiedBy;
- }
-
- public void setUserModifiedBy(UserInfo userModifiedBy) {
- this.userModifiedBy = userModifiedBy;
- }
-
}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyEntity.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyEntity.java
index 40ddb4308..8fa80e635 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyEntity.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyEntity.java
@@ -3,13 +3,14 @@
* ONAP-REST
* ================================================================================
* Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* 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.
@@ -24,9 +25,10 @@ package org.onap.policy.rest.jpa;
*/
import com.fasterxml.jackson.annotation.JsonBackReference;
import com.fasterxml.jackson.annotation.JsonManagedReference;
+
import java.io.Serializable;
import java.util.Date;
-import java.util.Objects;
+
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -44,23 +46,45 @@ import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import javax.persistence.Version;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
-/*
- * The Entity class to persist a policy object and its configuration data
+/**
+ * The Entity class to persist a policy object and its configuration data.
*/
-
+// @formatter:off
@Entity
// Add a non-unique index and a constraint that says the combo of policyName and scopeId must be unique
@Table(name = "PolicyEntity")
-@NamedQueries({
- @NamedQuery(name = "PolicyEntity.findAll", query = "SELECT e FROM PolicyEntity e "),
- @NamedQuery(name = "PolicyEntity.findAllByDeletedFlag",
- query = "SELECT e FROM PolicyEntity e WHERE e.deleted = :deleted"),
- @NamedQuery(name = "PolicyEntity.FindById", query = "SELECT e FROM PolicyEntity e WHERE e.policyId = :id"),
- @NamedQuery(name = "PolicyEntity.deleteAll", query = "DELETE FROM PolicyEntity WHERE 1=1"),
- @NamedQuery(name = "PolicyEntity.findByNameAndScope",
- query = "SELECT e FROM PolicyEntity e WHERE e.policyName = :name AND e.scope = :scope")
-})
+@NamedQueries(
+ {
+ @NamedQuery(
+ name = "PolicyEntity.findAll",
+ query = "SELECT e FROM PolicyEntity e "
+ ),
+ @NamedQuery(
+ name = "PolicyEntity.findAllByDeletedFlag",
+ query = "SELECT e FROM PolicyEntity e WHERE e.deleted = :deleted"
+ ),
+ @NamedQuery(
+ name = "PolicyEntity.FindById",
+ query = "SELECT e FROM PolicyEntity e WHERE e.policyId = :id"
+ ),
+ @NamedQuery(
+ name = "PolicyEntity.deleteAll",
+ query = "DELETE FROM PolicyEntity WHERE 1=1"
+ ),
+ @NamedQuery(
+ name = "PolicyEntity.findByNameAndScope",
+ query = "SELECT e FROM PolicyEntity e WHERE e.policyName = :name AND e.scope = :scope"
+ )
+ }
+)
+@Getter
+@Setter
+@EqualsAndHashCode
+// @formatter:on
public class PolicyEntity implements Serializable {
private static final long serialVersionUID = 1L;
@@ -145,43 +169,8 @@ public class PolicyEntity implements Serializable {
}
/**
- * Returns Policy Id.
- * @return the policyId
- */
- public long getPolicyId() {
- return policyId;
- }
-
- /**
- * Returns policy name.
- * @return the policy name
- */
- public String getPolicyName() {
- return policyName;
- }
-
- public void setPolicyName(String policyName) {
- this.policyName = policyName;
- }
-
- /**
- * Returns policy data.
- * @return the policyData
- */
- public String getPolicyData() {
- return policyData;
- }
-
- /**
- * Set policy data.
- * @param policyData the policyData to set
- */
- public void setPolicyData(String policyData) {
- this.policyData = policyData;
- }
-
- /**
* Returns configurationDataEntity.
+ *
* @return the configurationDataEntity
*/
public ConfigurationDataEntity getConfigurationData() {
@@ -190,200 +179,10 @@ public class PolicyEntity implements Serializable {
/**
* Set configurationDataEntity.
+ *
* @param configurationDataEntity the configurationDataEntity to set
*/
public void setConfigurationData(ConfigurationDataEntity configurationDataEntity) {
this.configurationDataEntity = configurationDataEntity;
}
-
- /**
- * Returns actionBodyEntity.
- * @return the actionBodyEntity
- */
- public ActionBodyEntity getActionBodyEntity() {
- return actionBodyEntity;
- }
-
- /**
- * Set actionBodyEntity.
- * @param actionBodyEntity the actionBodyEntity to set
- */
- public void setActionBodyEntity(ActionBodyEntity actionBodyEntity) {
- this.actionBodyEntity = actionBodyEntity;
- }
-
- /**
- * Returns scope.
- * @return the scope
- */
- public String getScope() {
- return scope;
- }
-
- /**
- * Set scope.
- * @param scope the scope to set
- */
- public void setScope(String scope) {
- this.scope = scope;
- }
-
- /**
- * Returns createdBy.
- * @return the createdBy
- */
- public String getCreatedBy() {
- return createdBy;
- }
-
- /**
- * Set createdBy.
- * @param createdBy the createdBy to set
- */
- public void setCreatedBy(String createdBy) {
- this.createdBy = createdBy;
- }
-
- /**
- * Returns description.
- * @return the description
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * Set description.
- * @param description the description to set
- */
- public void setDescription(String description) {
- this.description = description;
- }
-
- /**
- * Returns modifiedBy.
- * @return the modifiedBy
- */
- public String getModifiedBy() {
- return modifiedBy;
- }
-
- /**
- * Set modifiedBy.
- * @param modifiedBy the modifiedBy to set
- */
- public void setModifiedBy(String modifiedBy) {
- this.modifiedBy = modifiedBy;
- }
-
- /**
- * Returns version.
- * @return version
- */
- public int getVersion() {
- return version;
- }
-
- /**
- * Returns createdDate.
- * @return the createdDate
- */
- public Date getCreatedDate() {
- return createdDate;
- }
-
- /**
- * Returns modifiedDate.
- * @return the modifiedDate
- */
- public Date getModifiedDate() {
- return modifiedDate;
- }
-
- /**
- * Return deleted.
- * @return the deleted
- */
- public boolean isDeleted() {
- return deleted;
- }
-
- /**
- * Set deleted.
- * @param deleted the deleted to set
- */
- public void setDeleted(boolean deleted) {
- this.deleted = deleted;
- }
-
- /**
- * Return the reason code.
- * @return deleted reason code
- */
- public String getDeleteReasonCode() {
- return deleteReasonCode;
- }
-
- /**
- * Set the reason of deletion.
- * @param deleteReasonCode String object
- */
- public void setDeleteReasonCode(String deleteReasonCode) {
- this.deleteReasonCode = deleteReasonCode;
- }
-
- /**
- * Return deleted By.
- * @return deletedBy
- */
- public String getDeletedBy() {
- return deletedBy;
- }
-
- /**
- * Set deleted By.
- * @param deletedBy String object
- */
- public void setDeletedBy(String deletedBy) {
- this.deletedBy = deletedBy;
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(policyId, policyName, scope, version, policyVersion, policyData, configurationDataEntity,
- actionBodyEntity, createdBy, createdDate, description, modifiedBy, modifiedDate, deleted);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (obj == null) {
- return false;
- }
- if (obj == this) {
- return true;
- }
- if (!(obj instanceof PolicyEntity)) {
- return false;
- }
-
- PolicyEntity p = (PolicyEntity) obj;
-
- return policyId == p.policyId
- && policyName.equals(p.policyName)
- && scope.equals(p.scope)
- && version == p.version
- && policyVersion == p.policyVersion
- && policyData.equals(p.policyData)
- && ((configurationDataEntity == null && p.configurationDataEntity == null)
- || (configurationDataEntity != null
- && configurationDataEntity
- .equals(p.configurationDataEntity)))
- && ((actionBodyEntity == null && p.actionBodyEntity == null) || (actionBodyEntity != null
- && actionBodyEntity
- .equals(p.actionBodyEntity))) && createdBy.equals(p.createdBy)
- && createdDate.equals(p.createdDate) && description.equals(p.description)
- && modifiedBy.equals(p.modifiedBy) && modifiedDate.equals(p.modifiedDate) && deleted == p.deleted;
- }
-
-
}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyGroupEntity.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyGroupEntity.java
index 52f8177f3..175db577c 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyGroupEntity.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyGroupEntity.java
@@ -3,13 +3,14 @@
* ONAP-REST
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* 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.
@@ -17,6 +18,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*/
+
package org.onap.policy.rest.jpa;
import java.io.Serializable;
@@ -27,34 +29,23 @@ import javax.persistence.Id;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
+import lombok.Getter;
+import lombok.Setter;
+
@Entity
-@Table(name="PolicyGroupEntity")
-@NamedQuery(name="PolicyGroupEntity.findAll", query="SELECT p FROM PolicyGroupEntity p ")
-public class PolicyGroupEntity implements Serializable{
+@Table(name = "PolicyGroupEntity")
+@NamedQuery(name = "PolicyGroupEntity.findAll", query = "SELECT p FROM PolicyGroupEntity p ")
+@Getter
+@Setter
+public class PolicyGroupEntity implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- @Column(name="groupKey")
+ @Column(name = "groupKey")
private int groupKey;
@Id
- @Column(name="policyid")
+ @Column(name = "policyid")
private int policyid;
-
- public int getGroupKey() {
- return groupKey;
- }
-
- public void setGroupKey(int groupKey) {
- this.groupKey = groupKey;
- }
-
- public int getPolicyid() {
- return policyid;
- }
-
- public void setPolicyid(int policyid) {
- this.policyid = policyid;
- }
}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyRoles.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyRoles.java
index f220570bd..10680313b 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyRoles.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyRoles.java
@@ -3,13 +3,14 @@
* ONAP-REST
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* 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 +20,7 @@
*/
package org.onap.policy.rest.jpa;
+
/*
*/
import java.io.Serializable;
@@ -34,70 +36,44 @@ import javax.persistence.NamedQuery;
import javax.persistence.OrderBy;
import javax.persistence.Table;
-import org.onap.policy.rest.jpa.UserInfo;
-
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
/**
* The persistent class for the roles database table.
- *
*/
@Entity
-@Table(name="roles")
-@NamedQuery(name="PolicyRoles.findAll", query="SELECT r FROM PolicyRoles r ")
+@Table(name = "roles")
+@NamedQuery(name = "PolicyRoles.findAll", query = "SELECT r FROM PolicyRoles r ")
+@Getter
+@Setter
+@NoArgsConstructor
public class PolicyRoles implements Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
- @Column(name="id")
+ @Column(name = "id")
private int id;
@ManyToOne
- @JoinColumn(name="loginid")
+ @JoinColumn(name = "loginid")
@OrderBy("asc")
private UserInfo loginId;
- public UserInfo getLoginId() {
- return loginId;
- }
-
- public void setLoginId(UserInfo loginId) {
- this.loginId = loginId;
- }
-
- @Column(name="scope", nullable=true, length=45)
+ @Column(name = "scope", nullable = true, length = 45)
private String scope;
- @Column(name="role", nullable=false, length=45)
+ @Column(name = "role", nullable = false, length = 45)
private String role;
- public PolicyRoles() {
- // Empty constructor
- }
-
- public int getId() {
- return this.id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
-
- public String getScope() {
- return this.scope;
- }
-
- public void setScope(String scope) {
- this.scope = scope;
-
- }
- public String getRole() {
- return this.role;
+ public UserInfo getLoginId() {
+ return loginId;
}
- public void setRole(String role) {
- this.role = role;
+ public void setLoginId(UserInfo loginId) {
+ this.loginId = loginId;
}
-
}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeClosedLoop.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeClosedLoop.java
index c1597741e..7e0bba3be 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeClosedLoop.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeClosedLoop.java
@@ -3,13 +3,14 @@
* ONAP-REST
* ================================================================================
* Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* 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,8 +20,7 @@
*/
package org.onap.policy.rest.jpa;
-/*
- */
+
import java.io.Serializable;
import javax.persistence.Column;
@@ -32,46 +32,26 @@ import javax.persistence.NamedQuery;
import javax.persistence.OrderBy;
import javax.persistence.Table;
+import lombok.Getter;
+import lombok.Setter;
@Entity
-@Table(name="PolicyScopeClosedLoop")
-@NamedQuery(name="PolicyScopeClosedLoop.findAll", query="SELECT e FROM PolicyScopeClosedLoop e ")
+@Table(name = "PolicyScopeClosedLoop")
+@NamedQuery(name = "PolicyScopeClosedLoop.findAll", query = "SELECT e FROM PolicyScopeClosedLoop e ")
+@Getter
+@Setter
public class PolicyScopeClosedLoop implements Serializable {
private static final long serialVersionUID = 1L;
-
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
- @Column(name="id")
+ @Column(name = "id")
private int id;
- @Column(name="name", nullable=false)
+ @Column(name = "name", nullable = false)
@OrderBy("asc")
private String name;
- @Column(name="description ")
- private String description ;
-
- public int getId() {
- return this.id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
- public String getName() {
- return this.name;
- }
-
- public void setName(String name) {
- this.name = name;
-
- }
- public String getDescriptionValue() {
- return this.description ;
- }
-
- public void setDescriptionValue(String description ) {
- this.description = description ;
- }
+ @Column(name = "description ")
+ private String description;
}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeResource.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeResource.java
index 323275624..ebc570fa8 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeResource.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeResource.java
@@ -3,13 +3,14 @@
* ONAP-REST
* ================================================================================
* Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* 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,8 +20,7 @@
*/
package org.onap.policy.rest.jpa;
-/*
- */
+
import java.io.Serializable;
import javax.persistence.Column;
@@ -32,45 +32,26 @@ import javax.persistence.NamedQuery;
import javax.persistence.OrderBy;
import javax.persistence.Table;
+import lombok.Getter;
+import lombok.Setter;
@Entity
-@Table(name="PolicyScopeResource")
-@NamedQuery(name="PolicyScopeResource.findAll", query="SELECT e FROM PolicyScopeResource e ")
+@Table(name = "PolicyScopeResource")
+@NamedQuery(name = "PolicyScopeResource.findAll", query = "SELECT e FROM PolicyScopeResource e ")
+@Getter
+@Setter
public class PolicyScopeResource implements Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
- @Column(name="id")
+ @Column(name = "id")
private int id;
- @Column(name="name", nullable=false)
+ @Column(name = "name", nullable = false)
@OrderBy("asc")
private String name;
- @Column(name="description ")
- private String description ;
-
- public int getId() {
- return this.id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
- public String getName() {
- return this.name;
- }
-
- public void setName(String name) {
- this.name = name;
-
- }
- public String getDescriptionValue() {
- return this.description ;
- }
-
- public void setDescriptionValue(String description ) {
- this.description = description ;
- }
+ @Column(name = "description ")
+ private String description;
}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeService.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeService.java
index 8238110f0..7af22e338 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeService.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeService.java
@@ -3,13 +3,14 @@
* ONAP-REST
* ================================================================================
* Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* 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,8 +20,7 @@
*/
package org.onap.policy.rest.jpa;
-/*
- */
+
import java.io.Serializable;
import javax.persistence.Column;
@@ -32,46 +32,26 @@ import javax.persistence.NamedQuery;
import javax.persistence.OrderBy;
import javax.persistence.Table;
+import lombok.Getter;
+import lombok.Setter;
@Entity
-@Table(name="PolicyScopeService")
-@NamedQuery(name="PolicyScopeService.findAll", query="SELECT e FROM PolicyScopeService e ")
+@Table(name = "PolicyScopeService")
+@NamedQuery(name = "PolicyScopeService.findAll", query = "SELECT e FROM PolicyScopeService e ")
+@Getter
+@Setter
public class PolicyScopeService implements Serializable {
private static final long serialVersionUID = 1L;
-
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
- @Column(name="id")
+ @Column(name = "id")
private int id;
- @Column(name="name", nullable=false)
+ @Column(name = "name", nullable = false)
@OrderBy("asc")
private String name;
- @Column(name="description ")
- private String description ;
-
- public int getId() {
- return this.id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
- public String getName() {
- return this.name;
- }
-
- public void setName(String name) {
- this.name = name;
-
- }
- public String getDescriptionValue() {
- return this.description ;
- }
-
- public void setDescriptionValue(String description ) {
- this.description = description ;
- }
+ @Column(name = "description ")
+ private String description;
}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeType.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeType.java
index 04f20c330..e53a1acbf 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeType.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScopeType.java
@@ -3,13 +3,14 @@
* ONAP-REST
* ================================================================================
* Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* 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,8 +20,7 @@
*/
package org.onap.policy.rest.jpa;
-/*
- */
+
import java.io.Serializable;
import javax.persistence.Column;
@@ -32,45 +32,26 @@ import javax.persistence.NamedQuery;
import javax.persistence.OrderBy;
import javax.persistence.Table;
+import lombok.Getter;
+import lombok.Setter;
@Entity
-@Table(name="PolicyScopeType")
-@NamedQuery(name="PolicyScopeType.findAll", query="SELECT e FROM PolicyScopeType e ")
+@Table(name = "PolicyScopeType")
+@NamedQuery(name = "PolicyScopeType.findAll", query = "SELECT e FROM PolicyScopeType e ")
+@Getter
+@Setter
public class PolicyScopeType implements Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
- @Column(name="id")
+ @Column(name = "id")
private int id;
- @Column(name="name", nullable=false)
+ @Column(name = "name", nullable = false)
@OrderBy("asc")
private String name;
- @Column(name="description ")
- private String description ;
-
- public int getId() {
- return this.id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
- public String getName() {
- return this.name;
- }
-
- public void setName(String name) {
- this.name = name;
-
- }
- public String getDescriptionValue() {
- return this.description ;
- }
-
- public void setDescriptionValue(String description ) {
- this.description = description ;
- }
+ @Column(name = "description ")
+ private String description;
}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScore.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScore.java
index 3bb0919b7..74b53babb 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScore.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyScore.java
@@ -3,13 +3,14 @@
* ONAP-REST
* ================================================================================
* Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* 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 +20,7 @@
*/
package org.onap.policy.rest.jpa;
+
import java.io.Serializable;
import javax.persistence.Column;
@@ -31,60 +33,45 @@ import javax.persistence.NamedQuery;
import javax.persistence.OrderBy;
import javax.persistence.Table;
+import lombok.Getter;
+import lombok.Setter;
+// @formatter:off
@Entity
-@Table(name="POLICYSCORE")
-@NamedQueries({
- @NamedQuery(name="POLICYSCORE.findAll", query="SELECT p FROM PolicyScore p"),
- @NamedQuery(name="POLICYSCORE.deleteAll", query="DELETE FROM PolicyScore WHERE 1=1"),
- @NamedQuery(name="POLICYSCORE.findByPolicyName", query="Select p from PolicyScore p where p.PolicyName=:pname")
-})
+@Table(name = "POLICYSCORE")
+@NamedQueries(
+ {
+ @NamedQuery(
+ name = "POLICYSCORE.findAll", query = "SELECT p FROM PolicyScore p"
+ ),
+ @NamedQuery(
+ name = "POLICYSCORE.deleteAll", query = "DELETE FROM PolicyScore WHERE 1=1"
+ ),
+ @NamedQuery(
+ name = "POLICYSCORE.findByPolicyName", query = "Select p from PolicyScore p where p.policyName=:pname"
+ )
+ }
+)
+@Getter
+@Setter
+// @formatter:on
public class PolicyScore implements Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
- @Column(name="id")
+ @Column(name = "id")
private int id;
- @Column(name="POLICY_NAME", nullable=false)
+ @Column(name = "POLICY_NAME", nullable = false)
@OrderBy("asc")
- private String PolicyName;
+ private String policyName;
- @Column(name="VERSIONEXTENSION", nullable=false)
+ @Column(name = "VERSIONEXTENSION", nullable = false)
@OrderBy("asc")
- private String VersionExtension;
-
- @Column(name="POLICY_SCORE", nullable=true)
- private String PolicyScore;
-
- public int getId() {
- return id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
- public String getPolicyName() {
- return PolicyName;
- }
- public void setPolicyName(String policyName) {
- PolicyName = policyName;
- }
- public String getVersionExtension() {
- return VersionExtension;
- }
-
- public void setVersionExtension(String versionExtension) {
- VersionExtension = versionExtension;
- }
- public String getPolicyScore() {
- return PolicyScore;
- }
- public void setPolicyScore(String policyScore) {
- PolicyScore = policyScore;
- }
-
+ private String versionExtension;
+ @Column(name = "POLICY_SCORE", nullable = true)
+ private String score;
}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyVersion.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyVersion.java
index f6512af88..0332dcbfd 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyVersion.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyVersion.java
@@ -3,6 +3,7 @@
* ONAP-REST
* ================================================================================
* Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,7 +23,7 @@ package org.onap.policy.rest.jpa;
import java.io.Serializable;
import java.util.Date;
-import java.util.Objects;
+
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -36,169 +37,112 @@ import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+/**
+ * The Class PolicyVersion.
+ */
+// @formatter:off
@Entity
-@Table(name="PolicyVersion")
-@NamedQueries({
- @NamedQuery(name="PolicyVersion.findAll", query="SELECT p FROM PolicyVersion p"),
- @NamedQuery(name="PolicyVersion.deleteAll", query="DELETE FROM PolicyVersion WHERE 1=1"),
- @NamedQuery(name="PolicyVersion.findByPolicyName", query="Select p from PolicyVersion p where p.policyName=:pname"),
- @NamedQuery(name="PolicyVersion.findAllCount", query="SELECT COUNT(p) FROM PolicyVersion p")
-})
+@Table(name = "PolicyVersion")
+@NamedQueries(
+ {
+ @NamedQuery(
+ name = "PolicyVersion.findAll", query = "SELECT p FROM PolicyVersion p"
+ ),
+ @NamedQuery(
+ name = "PolicyVersion.deleteAll", query = "DELETE FROM PolicyVersion WHERE 1=1"
+ ),
+ @NamedQuery(
+ name = "PolicyVersion.findByPolicyName", query = "Select p from PolicyVersion p where p.policyName=:pname"
+ ),
+ @NamedQuery(
+ name = "PolicyVersion.findAllCount", query = "SELECT COUNT(p) FROM PolicyVersion p"
+ )
+ }
+)
+@Getter
+@Setter
+@EqualsAndHashCode
+// @formatter:on
public class PolicyVersion implements Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
- @Column(name="id")
+ @Column(name = "id")
private int id;
- @Column(name="POLICY_NAME", nullable=false, length=255)
+ @Column(name = "POLICY_NAME", nullable = false, length = 255)
private String policyName;
- @Column(name="ACTIVE_VERSION")
+ @Column(name = "ACTIVE_VERSION")
private int activeVersion;
- @Column(name="HIGHEST_VERSION")
+ @Column(name = "HIGHEST_VERSION")
private int higherVersion;
@Temporal(TemporalType.TIMESTAMP)
- @Column(name="created_date", nullable=false)
+ @Column(name = "created_date", nullable = false)
private Date createdDate;
- @Column(name="CREATED_BY", nullable=false, length=45)
+ @Column(name = "CREATED_BY", nullable = false, length = 45)
private String createdBy;
@Temporal(TemporalType.TIMESTAMP)
- @Column(name="modified_date", nullable=false)
+ @Column(name = "modified_date", nullable = false)
private Date modifiedDate;
-
- @Column(name="modified_by", nullable=false, length=45)
+ @Column(name = "modified_by", nullable = false, length = 45)
private String modifiedBy;
+ /**
+ * Instantiates a new policy version.
+ */
public PolicyVersion() {
this.modifiedDate = new Date();
this.createdDate = new Date();
}
+ /**
+ * Instantiates a new policy version.
+ *
+ * @param domain the domain
+ * @param loginUserId the login user id
+ */
public PolicyVersion(String domain, String loginUserId) {
this(domain);
this.createdBy = loginUserId;
this.modifiedBy = loginUserId;
}
+ /**
+ * Instantiates a new policy version.
+ *
+ * @param domain the domain
+ */
public PolicyVersion(String domain) {
this.policyName = domain;
}
- public int getActiveVersion() {
- return activeVersion;
- }
-
- public void setActiveVersion(int activeVersion) {
- this.activeVersion = activeVersion;
- }
-
- public int getHigherVersion() {
- return higherVersion;
- }
-
- public void setHigherVersion(int higherVersion) {
- this.higherVersion = higherVersion;
- }
-
-
+ /**
+ * Pre persist.
+ */
@PrePersist
- public void prePersist() {
+ public void prePersist() {
Date date = new Date();
this.createdDate = date;
this.modifiedDate = date;
}
+ /**
+ * Pre update.
+ */
@PreUpdate
public void preUpdate() {
- this.modifiedDate = new Date();
- }
-
- public int getId() {
- return id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
-
- public String getPolicyName() {
- return policyName;
- }
-
- public void setPolicyName(String policyName) {
- this.policyName = policyName;
- }
-
- public Date getCreatedDate() {
- return createdDate;
- }
-
- public void setCreatedDate(Date createdDate) {
- this.createdDate = createdDate;
- }
-
- public String getCreatedBy() {
- return createdBy;
- }
-
- public void setCreatedBy(String createdBy) {
- this.createdBy = createdBy;
- }
-
- public Date getModifiedDate() {
- return modifiedDate;
- }
-
- public void setModifiedDate(Date modifiedDate) {
- this.modifiedDate = modifiedDate;
- }
-
- public String getModifiedBy() {
- return modifiedBy;
- }
-
- public void setModifiedBy(String modifiedBy) {
- this.modifiedBy = modifiedBy;
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(id, policyName, activeVersion, higherVersion, createdDate,
- createdBy, modifiedDate, modifiedBy);
- }
-
- @Override
- public boolean equals(Object obj) {
- if(obj == null){
- return false;
- }
- if(obj == this){
- return true;
- }
- if(!(obj instanceof PolicyVersion)){
- return false;
- }
-
- PolicyVersion p = (PolicyVersion) obj;
-
- return id == p.id &&
- policyName.equals(p.policyName) &&
- activeVersion == p.activeVersion &&
- higherVersion == p.higherVersion &&
- createdDate.equals(p.createdDate) &&
- createdBy.equals(p.createdBy) &&
- modifiedDate.equals(p.modifiedDate) &&
- modifiedBy.equals(p.modifiedBy);
+ this.modifiedDate = new Date();
}
-
}
-
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PortList.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PortList.java
index 93732ffcd..6e26ed93f 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PortList.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PortList.java
@@ -3,13 +3,14 @@
* ONAP-REST
* ================================================================================
* Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* 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,8 +20,7 @@
*/
package org.onap.policy.rest.jpa;
-/*
- */
+
import java.io.Serializable;
import javax.persistence.Column;
@@ -32,45 +32,26 @@ import javax.persistence.NamedQuery;
import javax.persistence.OrderBy;
import javax.persistence.Table;
+import lombok.Getter;
+import lombok.Setter;
+
@Entity
-@Table(name="portlist")
-@NamedQuery(name="PortList.findAll", query="SELECT e FROM PortList e ")
+@Table(name = "portlist")
+@NamedQuery(name = "PortList.findAll", query = "SELECT e FROM PortList e ")
+@Getter
+@Setter
public class PortList implements Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
- @Column(name="id")
+ @Column(name = "id")
private int id;
- @Column(name="portname", nullable=false)
+ @Column(name = "portname", nullable = false)
@OrderBy("asc")
private String portName;
- @Column(name="description")
+ @Column(name = "description")
private String description;
-
- public int getId() {
- return this.id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
- public String getPortName() {
- return this.portName;
- }
-
- public void setPortName(String portName) {
- this.portName = portName;
-
- }
- public String getDescription() {
- return this.description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PrefixList.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PrefixList.java
index 9a0e8aec0..c723ebe39 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PrefixList.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PrefixList.java
@@ -3,13 +3,14 @@
* ONAP-REST
* ================================================================================
* Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* 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,8 +20,7 @@
*/
package org.onap.policy.rest.jpa;
-/*
- */
+
import java.io.Serializable;
import javax.persistence.Column;
@@ -32,57 +32,29 @@ import javax.persistence.NamedQuery;
import javax.persistence.OrderBy;
import javax.persistence.Table;
+import lombok.Getter;
+import lombok.Setter;
+
@Entity
-@Table(name="PrefixList")
-@NamedQuery(name="PrefixList.findAll", query="SELECT e FROM PrefixList e ")
+@Table(name = "PrefixList")
+@NamedQuery(name = "PrefixList.findAll", query = "SELECT e FROM PrefixList e ")
+@Getter
+@Setter
public class PrefixList implements Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
- @Column(name="id")
+ @Column(name = "id")
private int id;
- @Column(name="pl_name", nullable=false)
+ @Column(name = "pl_name", nullable = false)
@OrderBy("asc")
private String prefixListName;
- @Column(name="description", nullable=false)
+ @Column(name = "description", nullable = false)
private String description;
- @Column(name="pl_value", nullable=false)
+ @Column(name = "pl_value", nullable = false)
private String prefixListValue;
-
- public String getPrefixListName() {
- return this.prefixListName;
- }
-
- public void setPrefixListName(String prefixListName) {
- this.prefixListName = prefixListName;
-
- }
-
- public String getDescription() {
- return this.description;
- }
-
- public void setDescription(String description) {
- this.description = description;
-
- }
- public int getId() {
- return this.id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
- public String getPrefixListValue() {
- return this.prefixListValue;
- }
-
- public void setPrefixListValue(String prefixListValue) {
- this.prefixListValue = prefixListValue;
- }
-
}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ProtocolList.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ProtocolList.java
index 5e79e6785..edb514b3f 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ProtocolList.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ProtocolList.java
@@ -3,13 +3,14 @@
* ONAP-REST
* ================================================================================
* Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* 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,8 +20,7 @@
*/
package org.onap.policy.rest.jpa;
-/*
- */
+
import java.io.Serializable;
import javax.persistence.Column;
@@ -32,48 +32,26 @@ import javax.persistence.NamedQuery;
import javax.persistence.OrderBy;
import javax.persistence.Table;
+import lombok.Getter;
+import lombok.Setter;
+
@Entity
-@Table(name="protocollist")
-@NamedQuery(name="ProtocolList.findAll", query="SELECT e FROM ProtocolList e ")
+@Table(name = "protocollist")
+@NamedQuery(name = "ProtocolList.findAll", query = "SELECT e FROM ProtocolList e ")
+@Getter
+@Setter
public class ProtocolList implements Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
- @Column(name="id")
+ @Column(name = "id")
private int id;
- @Column(name="protocolname", nullable=false)
+ @Column(name = "protocolname", nullable = false)
@OrderBy("asc")
private String protocolName;
- @Column(name="description")
+ @Column(name = "description")
private String description;
-
- public String getProtocolName() {
- return this.protocolName;
- }
-
- public void setProtocolName(String protocolName) {
- this.protocolName = protocolName;
-
- }
-
- public String getDescription() {
- return this.description;
- }
-
- public void setDescription(String description) {
- this.description = description;
-
- }
-
- public int getId() {
- return this.id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
-
}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/util/PolicyValidation.java b/ONAP-REST/src/main/java/org/onap/policy/rest/util/PolicyValidation.java
index de20cd3f8..da54b05bd 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/util/PolicyValidation.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/util/PolicyValidation.java
@@ -1089,8 +1089,8 @@ public class PolicyValidation {
if (returnModel != null) {
String annotation = returnModel.getAnnotation();
- String refAttributes = returnModel.getRef_attributes();
- String subAttributes = returnModel.getSub_attributes();
+ String refAttributes = returnModel.getRefAttributes();
+ String subAttributes = returnModel.getSubAttributes();
String modelAttributes = returnModel.getAttributes();
if (!Strings.isNullOrEmpty(annotation)) {
@@ -1384,4 +1384,4 @@ public class PolicyValidation {
}
-} \ 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 860e08d93..61a63ce0c 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
@@ -33,14 +33,14 @@ import org.onap.policy.rest.jpa.OnapName;
public class PolicyRestAdapterTest {
@Test
- public void testPolicyExportAdapter(){
+ public void testPolicyExportAdapter() {
PolicyExportAdapter adapter = new PolicyExportAdapter();
adapter.setPolicyDatas(new ArrayList<>());
assertTrue(adapter.getPolicyDatas() != null);
}
@Test
- public void testPolicyRestAdapter(){
+ public void testPolicyRestAdapter() {
PolicyRestAdapter adapter = new PolicyRestAdapter();
adapter.setData(new Object());
assertTrue(adapter.getData() != null);
@@ -117,27 +117,27 @@ public class PolicyRestAdapterTest {
adapter.setExistingCLName("Test");
assertTrue("Test".equals(adapter.getExistingCLName()));
adapter.setOnapNameField(new OnapName());
- assertTrue(adapter.getOnapNameField()!=null);
+ assertTrue(adapter.getOnapNameField() != null);
adapter.setJsonBodyData(new Object());
- assertTrue(adapter.getJsonBodyData()!=null);
+ assertTrue(adapter.getJsonBodyData() != null);
adapter.setDirPath("Test");
assertTrue("Test".equals(adapter.getDirPath()));
adapter.setConfigBodyPath("Test");
assertTrue("Test".equals(adapter.getConfigBodyPath()));
adapter.setAttributes(new ArrayList<>());
- assertTrue(adapter.getAttributes()!=null);
+ assertTrue(adapter.getAttributes() != null);
adapter.setSettings(new ArrayList<>());
- assertTrue(adapter.getSettings()!=null);
+ assertTrue(adapter.getSettings() != null);
adapter.setRuleAlgorithmschoices(new ArrayList<>());
- assertTrue(adapter.getRuleAlgorithmschoices()!=null);
+ assertTrue(adapter.getRuleAlgorithmschoices() != null);
adapter.setServiceTypePolicyName(new HashMap<>());
- assertTrue(adapter.getServiceTypePolicyName()!=null);
+ assertTrue(adapter.getServiceTypePolicyName() != null);
adapter.setVerticaMetrics(new HashMap<>());
- assertTrue(adapter.getVerticaMetrics()!=null);
+ assertTrue(adapter.getVerticaMetrics() != null);
adapter.setDescription(new LinkedHashMap<>());
- assertTrue(adapter.getVerticaMetrics()!=null);
+ assertTrue(adapter.getVerticaMetrics() != null);
adapter.setAttributeFields(new LinkedHashMap<>());
- assertTrue(adapter.getAttributeFields()!=null);
+ assertTrue(adapter.getAttributeFields() != null);
adapter.setClearTimeOut("Test");
assertTrue("Test".equals(adapter.getClearTimeOut()));
adapter.setTrapMaxAge("Test");
@@ -145,15 +145,15 @@ public class PolicyRestAdapterTest {
adapter.setVerificationclearTimeOut("Test");
assertTrue("Test".equals(adapter.getVerificationclearTimeOut()));
adapter.setDynamicLayoutMap(new HashMap<>());
- assertTrue(adapter.getDynamicLayoutMap()!=null);
+ assertTrue(adapter.getDynamicLayoutMap() != null);
adapter.setTrapDatas(new ClosedLoopFaultTrapDatas());
- assertTrue(adapter.getTrapDatas()!=null);
+ assertTrue(adapter.getTrapDatas() != null);
adapter.setFaultDatas(new ClosedLoopFaultTrapDatas());
- assertTrue(adapter.getFaultDatas()!=null);
+ assertTrue(adapter.getFaultDatas() != null);
adapter.setFwPolicyType("Test");
assertTrue("Test".equals(adapter.getFwPolicyType()));
adapter.setFwattributes(new ArrayList<>());
- assertTrue(adapter.getFwattributes()!=null);
+ assertTrue(adapter.getFwattributes() != null);
adapter.setParentForChild("Test");
assertTrue("Test".equals(adapter.getParentForChild()));
adapter.setSecurityZone("Test");
@@ -161,27 +161,27 @@ public class PolicyRestAdapterTest {
adapter.setRuleCombiningAlgId("Test");
assertTrue("Test".equals(adapter.getRuleCombiningAlgId()));
adapter.setDynamicFieldConfigAttributes(new HashMap<>());
- assertTrue(adapter.getDynamicFieldConfigAttributes()!=null);
+ assertTrue(adapter.getDynamicFieldConfigAttributes() != null);
adapter.setDynamicSettingsMap(new HashMap<>());
- assertTrue(adapter.getDynamicSettingsMap()!=null);
+ assertTrue(adapter.getDynamicSettingsMap() != null);
adapter.setDropDownMap(new HashMap<>());
- assertTrue(adapter.getDropDownMap()!=null);
+ assertTrue(adapter.getDropDownMap() != null);
adapter.setActionPerformer("Test");
assertTrue("Test".equals(adapter.getActionPerformer()));
adapter.setActionAttribute("Test");
assertTrue("Test".equals(adapter.getActionAttribute()));
adapter.setDynamicRuleAlgorithmLabels(new ArrayList<>());
- assertTrue(adapter.getDynamicRuleAlgorithmLabels()!=null);
+ assertTrue(adapter.getDynamicRuleAlgorithmLabels() != null);
adapter.setDynamicRuleAlgorithmCombo(new ArrayList<>());
- assertTrue(adapter.getDynamicRuleAlgorithmCombo()!=null);
+ assertTrue(adapter.getDynamicRuleAlgorithmCombo() != null);
adapter.setDynamicRuleAlgorithmField1(new ArrayList<>());
- assertTrue(adapter.getDynamicRuleAlgorithmField1()!=null);
+ assertTrue(adapter.getDynamicRuleAlgorithmField1() != null);
adapter.setDynamicRuleAlgorithmField2(new ArrayList<>());
- assertTrue(adapter.getDynamicRuleAlgorithmField2()!=null);
+ assertTrue(adapter.getDynamicRuleAlgorithmField2() != null);
adapter.setDynamicVariableList(new ArrayList<>());
- assertTrue(adapter.getDynamicVariableList()!=null);
+ assertTrue(adapter.getDynamicVariableList() != null);
adapter.setDataTypeList(new ArrayList<>());
- assertTrue(adapter.getDataTypeList()!=null);
+ assertTrue(adapter.getDataTypeList() != null);
adapter.setActionAttributeValue("Test");
assertTrue("Test".equals(adapter.getActionAttributeValue()));
adapter.setRuleProvider("Test");
@@ -197,15 +197,15 @@ public class PolicyRestAdapterTest {
adapter.setActionDictMethod("Test");
assertTrue("Test".equals(adapter.getActionDictMethod()));
adapter.setYamlparams(new YAMLParams());
- assertTrue(adapter.getYamlparams()!=null);
+ assertTrue(adapter.getYamlparams() != null);
adapter.setRainyday(new RainyDayParams());
- assertTrue(adapter.getRainyday()!=null);
+ assertTrue(adapter.getRainyday() != null);
adapter.setRainydayMap(new HashMap<>());
- assertTrue(adapter.getRainydayMap()!=null);
+ assertTrue(adapter.getRainydayMap() != null);
adapter.setErrorCodeList(new ArrayList<>());
- assertTrue(adapter.getErrorCodeList()!=null);
+ assertTrue(adapter.getErrorCodeList() != null);
adapter.setTreatmentList(new ArrayList<>());
- assertTrue(adapter.getTreatmentList()!=null);
+ assertTrue(adapter.getTreatmentList() != null);
adapter.setServiceType("Test");
assertTrue("Test".equals(adapter.getServiceType()));
adapter.setUuid("Test");
@@ -221,17 +221,17 @@ public class PolicyRestAdapterTest {
adapter.setRuleName("Test");
assertTrue("Test".equals(adapter.getRuleName()));
adapter.setBrmsParamBody(new HashMap<>());
- assertTrue(adapter.getBrmsParamBody()!=null);
+ assertTrue(adapter.getBrmsParamBody() != null);
adapter.setBrmsController("Test");
assertTrue("Test".equals(adapter.getBrmsController()));
adapter.setBrmsDependency(new ArrayList<>());
- assertTrue(adapter.getBrmsDependency()!=null);
+ assertTrue(adapter.getBrmsDependency() != null);
adapter.setRuleData(new LinkedHashMap<>());
- assertTrue(adapter.getRuleData()!=null);
+ assertTrue(adapter.getRuleData() != null);
adapter.setRuleListData(new LinkedHashMap<>());
- assertTrue(adapter.getRuleListData()!=null);
+ assertTrue(adapter.getRuleListData() != null);
adapter.setDrlRuleAndUIParams(new LinkedHashMap<>());
- assertTrue(adapter.getDrlRuleAndUIParams()!=null);
+ assertTrue(adapter.getDrlRuleAndUIParams() != null);
adapter.setPolicyScope("Test");
assertTrue("Test".equals(adapter.getPolicyScope()));
adapter.setProviderComboBox("Test");
@@ -245,11 +245,11 @@ public class PolicyRestAdapterTest {
adapter.setTtlDate("Test");
assertTrue("Test".equals(adapter.getTtlDate()));
adapter.setMatching(new LinkedHashMap<>());
- assertTrue(adapter.getMatching()!=null);
+ assertTrue(adapter.getMatching() != null);
adapter.setTriggerSignatures(new ArrayList<>());
- assertTrue(adapter.getTriggerSignatures()!=null);
+ assertTrue(adapter.getTriggerSignatures() != null);
adapter.setSymptomSignatures(new ArrayList<>());
- assertTrue(adapter.getSymptomSignatures()!=null);
+ assertTrue(adapter.getSymptomSignatures() != null);
adapter.setLogicalConnector("Test");
assertTrue("Test".equals(adapter.getLogicalConnector()));
adapter.setPolicyStatus("Test");
@@ -274,7 +274,7 @@ public class PolicyRestAdapterTest {
assertEquals("risklevel", adapter.getRiskLevel());
assertEquals("guardvalue", adapter.getGuard());
assertEquals("onapvalue", adapter.getOnapName());
- assertEquals("onapvalue", adapter.getOnapNameField().getOnapName());
+ assertEquals("onapvalue", adapter.getOnapNameField().getName());
assertEquals("uuidvalue", adapter.getUuid());
assertEquals("locationvalue", adapter.getLocation());
assertEquals("configvalue", adapter.getConfigName());
diff --git a/ONAP-REST/src/test/java/org/onap/policy/rest/daoimpl/PolicyValidationDaoImplTest.java b/ONAP-REST/src/test/java/org/onap/policy/rest/daoimpl/PolicyValidationDaoImplTest.java
index 4d9d1c576..47456106b 100644
--- a/ONAP-REST/src/test/java/org/onap/policy/rest/daoimpl/PolicyValidationDaoImplTest.java
+++ b/ONAP-REST/src/test/java/org/onap/policy/rest/daoimpl/PolicyValidationDaoImplTest.java
@@ -70,6 +70,7 @@ public class PolicyValidationDaoImplTest {
/**
* Set up all unit tests.
+ *
* @throws SQLException on SQL exceptions
*/
@BeforeClass
@@ -136,13 +137,12 @@ public class PolicyValidationDaoImplTest {
userinfo.setUserName("Test");
commonClassDao.save(userinfo);
OnapName onapName = new OnapName();
- onapName.setOnapName("Test");
+ onapName.setName("Test");
onapName.setUserCreatedBy(userinfo);
onapName.setUserModifiedBy(userinfo);
onapName.setModifiedDate(new Date());
commonClassDao.save(onapName);
-
List<Object> list = commonClassDao.getData(OnapName.class);
assertTrue(list.size() == 1);
logger.debug(list.size());
@@ -160,7 +160,6 @@ public class PolicyValidationDaoImplTest {
userinfo.setUserName(loginIdUserName);
commonClassDao.save(userinfo);
-
List<Object> dataCur = commonClassDao.getDataByQuery("from UserInfo", new SimpleBindings());
assertEquals(1, dataCur.size());
@@ -224,7 +223,6 @@ public class PolicyValidationDaoImplTest {
params.put("scope", scope);
List<Object> dataCur = commonClassDao.getDataByQuery(query, params);
-
assertTrue(1 == dataCur.size());
assertEquals(pv, dataCur.get(0));
}
@@ -244,7 +242,6 @@ public class PolicyValidationDaoImplTest {
userinfo.setUserName(loginIdUserName);
commonClassDao.save(userinfo);
-
List<Object> dataCur = commonClassDao.getDataByQuery("from UserInfo", new SimpleBindings());
assertEquals(1, dataCur.size());
@@ -254,7 +251,6 @@ public class PolicyValidationDaoImplTest {
assertFalse(dataCur.isEmpty());
-
watch.setPolicyName("bananaWatch");
commonClassDao.save(watch);
@@ -281,7 +277,6 @@ public class PolicyValidationDaoImplTest {
assertEquals(watch, dataCur.get(0));
}
-
@Test
@Transactional
@Rollback(true)
@@ -326,7 +321,6 @@ public class PolicyValidationDaoImplTest {
watch.setPolicyName(finalName);
commonClassDao.save(watch);
-
// Current Implementation
String query = "from WatchPolicyNotificationTable where POLICYNAME = :finalName and LOGINIDS = :userId";
SimpleBindings params = new SimpleBindings();
@@ -363,7 +357,6 @@ public class PolicyValidationDaoImplTest {
// SQL Injection attempt
String finalName = "banana' OR '1'='1";
-
// Current Implementation
String query = "from WatchPolicyNotificationTable where POLICYNAME = :finalName and LOGINIDS = :userId";
SimpleBindings params = new SimpleBindings();
@@ -394,8 +387,8 @@ public class PolicyValidationDaoImplTest {
commonClassDao.update(userInfoUpdate);
List<String> data1 = commonClassDao.getDataByColumn(UserInfo.class, "userLoginId");
assertTrue(data1.size() == 1);
- UserInfo data2 =
- (UserInfo) commonClassDao.getEntityItem(UserInfo.class, "userLoginId:userName", "TestID:Test1");
+ UserInfo data2 = (UserInfo) commonClassDao.getEntityItem(UserInfo.class, "userLoginId:userName",
+ "TestID:Test1");
assertTrue("TestID".equals(data2.getUserLoginId()));
List<Object> data3 = commonClassDao.checkDuplicateEntry("TestID:Test1", "userLoginId:userName", UserInfo.class);
assertTrue(data3.size() == 1);
@@ -408,8 +401,8 @@ public class PolicyValidationDaoImplTest {
assertTrue(roles1.size() == 1);
List<String> multipleData = new ArrayList<>();
multipleData.add("TestID:Test1");
- List<Object> data4 =
- commonClassDao.getMultipleDataOnAddingConjunction(UserInfo.class, "userLoginId:userName", multipleData);
+ List<Object> data4 = commonClassDao.getMultipleDataOnAddingConjunction(UserInfo.class, "userLoginId:userName",
+ multipleData);
assertTrue(data4.size() == 1);
commonClassDao.delete(data2);
}
@@ -433,7 +426,7 @@ public class PolicyValidationDaoImplTest {
data = commonClassDao.getDataById(UserInfo.class, "userLoginIduserName", "TestIDTest");
assertNull(data);
data = commonClassDao.getDataById(UserInfo.class, "userLoginId data2.getUserLoginId()" + ":userName",
- "TestIDTest");
+ "TestIDTest");
assertNull(data);
commonClassDao.delete(data);
}
@@ -463,8 +456,8 @@ public class PolicyValidationDaoImplTest {
commonClassDao.save(userInfo);
List<String> multipleData = new ArrayList<>();
multipleData.add("TestID:Test1");
- List<Object> data =
- commonClassDao.getMultipleDataOnAddingConjunction(UserInfo.class, "userLoginId:userName", multipleData);
+ List<Object> data = commonClassDao.getMultipleDataOnAddingConjunction(UserInfo.class, "userLoginId:userName",
+ multipleData);
assertTrue(data.size() == 0);
data = commonClassDao.getMultipleDataOnAddingConjunction(null, null, null);
assertNull(data);
@@ -506,7 +499,6 @@ public class PolicyValidationDaoImplTest {
commonClassDao.delete(data);
}
-
@Test
public void testGetEntityItemParameters() {
UserInfo userInfo = new UserInfo();
@@ -520,8 +512,8 @@ public class PolicyValidationDaoImplTest {
commonClassDao.update(userInfoUpdate);
List<String> data1 = commonClassDao.getDataByColumn(UserInfo.class, "userLoginId");
assertTrue(data1.size() == 1);
- UserInfo data2 =
- (UserInfo) commonClassDao.getEntityItem(UserInfo.class, "userLoginId:userName", "TestID:Test1");
+ UserInfo data2 = (UserInfo) commonClassDao.getEntityItem(UserInfo.class, "userLoginId:userName",
+ "TestID:Test1");
assertTrue("TestID".equals(data2.getUserLoginId()));
data2 = (UserInfo) commonClassDao.getEntityItem(null, null, null);
assertNull(data2);
@@ -587,7 +579,6 @@ public class PolicyValidationDaoImplTest {
commonClassDao.delete(data);
}
-
@Test
public void testGetDataByQueryParameters() {
// Add data
diff --git a/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/ActionDictionaryJpaTest.java b/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/ActionDictionaryJpaTest.java
index a840f9d9d..3967bb48e 100644
--- a/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/ActionDictionaryJpaTest.java
+++ b/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/ActionDictionaryJpaTest.java
@@ -23,6 +23,7 @@ package org.onap.policy.rest.jpa;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
@@ -228,13 +229,19 @@ public class ActionDictionaryJpaTest {
@Test
public void testObadvice() {
- Obadvice data = new Obadvice();
new Obadvice();
new Obadvice("Test", "Test");
+ new Obadvice(new DummyIdentifier(), "Test");
+ Obadvice data = new Obadvice();
data.clone();
data.addObadviceExpression(new ObadviceExpression());
+ assertNotNull(data.clone());
data.removeObadviceExpression(new ObadviceExpression());
data.removeAllExpressions();
+ assertEquals(0, data.getObadviceExpressions().size());
+ data.setObadviceExpressions(null);
+ assertNull(data.getObadviceExpressions());
+ data.removeAllExpressions();
data.prePersist();
data.preUpdate();
data.setId(1);
@@ -253,6 +260,7 @@ public class ActionDictionaryJpaTest {
assertTrue("Test".equals(data.getType()));
data.setXacmlId("Test");
assertTrue("Test".equals(data.getXacmlId()));
+
}
@Test
@@ -349,5 +357,13 @@ public class ActionDictionaryJpaTest {
assertTrue("Test".equals(data.getXacmlId()));
data.setIsStandard(PolicyAlgorithms.STANDARD);
assertTrue(data.isStandard());
+ assertFalse(data.isCustom());
+ data.setIsStandard(PolicyAlgorithms.CUSTOM);
+ assertFalse(data.isStandard());
+ assertTrue(data.isCustom());
+
+ DummyIdentifier identifier = new DummyIdentifier();
+ assertNotNull(new PolicyAlgorithms(identifier));
+ assertNotNull(new PolicyAlgorithms(identifier, 'C'));
}
}
diff --git a/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/ClosedLoopPolicyDictionaryJPATest.java b/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/ClosedLoopPolicyDictionaryJpaTest.java
index 2274855e1..96a00f934 100644
--- a/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/ClosedLoopPolicyDictionaryJPATest.java
+++ b/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/ClosedLoopPolicyDictionaryJpaTest.java
@@ -3,13 +3,14 @@
* ONAP-REST
* ================================================================================
* Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* 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.
@@ -17,6 +18,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*/
+
package org.onap.policy.rest.jpa;
import static org.junit.Assert.assertTrue;
@@ -28,11 +30,19 @@ import org.junit.Test;
import org.onap.policy.common.logging.flexlogger.FlexLogger;
import org.onap.policy.common.logging.flexlogger.Logger;
-public class ClosedLoopPolicyDictionaryJPATest {
+/**
+ * The Class ClosedLoopPolicyDictionaryJpaTest.
+ */
+public class ClosedLoopPolicyDictionaryJpaTest {
- private static Logger logger = FlexLogger.getLogger(ClosedLoopPolicyDictionaryJPATest.class);
+ private static Logger logger = FlexLogger.getLogger(ClosedLoopPolicyDictionaryJpaTest.class);
private UserInfo userInfo;
+ /**
+ * Sets the up.
+ *
+ * @throws Exception the exception
+ */
@Before
public void setUp() throws Exception {
logger.info("setUp: Entering");
@@ -42,8 +52,11 @@ public class ClosedLoopPolicyDictionaryJPATest {
logger.info("setUp: exit");
}
+ /**
+ * Test VSCL action.
+ */
@Test
- public void testVSCLAction(){
+ public void testVsclAction() {
VSCLAction data = new VSCLAction();
data.preUpdate();
data.prePersist();
@@ -54,17 +67,20 @@ public class ClosedLoopPolicyDictionaryJPATest {
data.setDescription("Test");
assertTrue("Test".equals(data.getDescription()));
data.setCreatedDate(new Date());
- assertTrue(data.getCreatedDate()!= null);
+ assertTrue(data.getCreatedDate() != null);
data.setModifiedDate(new Date());
- assertTrue(data.getModifiedDate()!= null);
+ assertTrue(data.getModifiedDate() != null);
data.setUserCreatedBy(userInfo);
- assertTrue(data.getUserCreatedBy()!= null);
+ assertTrue(data.getUserCreatedBy() != null);
data.setUserModifiedBy(userInfo);
- assertTrue(data.getUserModifiedBy()!= null);
+ assertTrue(data.getUserModifiedBy() != null);
}
+ /**
+ * Test VNF type.
+ */
@Test
- public void testVNFType(){
+ public void testVnfType() {
VNFType data = new VNFType();
data.preUpdate();
data.prePersist();
@@ -75,18 +91,21 @@ public class ClosedLoopPolicyDictionaryJPATest {
data.setDescription("Test");
assertTrue("Test".equals(data.getDescription()));
data.setCreatedDate(new Date());
- assertTrue(data.getCreatedDate()!= null);
+ assertTrue(data.getCreatedDate() != null);
data.setModifiedDate(new Date());
- assertTrue(data.getModifiedDate()!= null);
+ assertTrue(data.getModifiedDate() != null);
data.setUserCreatedBy(userInfo);
- assertTrue(data.getUserCreatedBy()!= null);
+ assertTrue(data.getUserCreatedBy() != null);
data.setUserModifiedBy(userInfo);
- assertTrue(data.getUserModifiedBy()!= null);
+ assertTrue(data.getUserModifiedBy() != null);
}
+ /**
+ * Test PEP options.
+ */
@Test
- public void testPEPOptions(){
- PEPOptions data = new PEPOptions();
+ public void testPepOptions() {
+ PepOptions data = new PepOptions();
data.preUpdate();
data.prePersist();
data.setId(1);
@@ -96,17 +115,20 @@ public class ClosedLoopPolicyDictionaryJPATest {
data.setDescription("Test");
assertTrue("Test".equals(data.getDescription()));
data.setCreatedDate(new Date());
- assertTrue(data.getCreatedDate()!= null);
+ assertTrue(data.getCreatedDate() != null);
data.setModifiedDate(new Date());
- assertTrue(data.getModifiedDate()!= null);
+ assertTrue(data.getModifiedDate() != null);
data.setUserCreatedBy(userInfo);
- assertTrue(data.getUserCreatedBy()!= null);
+ assertTrue(data.getUserCreatedBy() != null);
data.setUserModifiedBy(userInfo);
- assertTrue(data.getUserModifiedBy()!= null);
+ assertTrue(data.getUserModifiedBy() != null);
}
+ /**
+ * Test varbind dictionary.
+ */
@Test
- public void testVarbindDictionary(){
+ public void testVarbindDictionary() {
VarbindDictionary data = new VarbindDictionary();
data.preUpdate();
data.prePersist();
@@ -119,17 +141,20 @@ public class ClosedLoopPolicyDictionaryJPATest {
data.setVarbindOID("Test");
assertTrue("Test".equals(data.getVarbindOID()));
data.setCreatedDate(new Date());
- assertTrue(data.getCreatedDate()!= null);
+ assertTrue(data.getCreatedDate() != null);
data.setModifiedDate(new Date());
- assertTrue(data.getModifiedDate()!= null);
+ assertTrue(data.getModifiedDate() != null);
data.setUserCreatedBy(userInfo);
- assertTrue(data.getUserCreatedBy()!= null);
+ assertTrue(data.getUserCreatedBy() != null);
data.setUserModifiedBy(userInfo);
- assertTrue(data.getUserModifiedBy()!= null);
+ assertTrue(data.getUserModifiedBy() != null);
}
+ /**
+ * Test closed loop D 2 services.
+ */
@Test
- public void testClosedLoopD2Services(){
+ public void testClosedLoopD2Services() {
ClosedLoopD2Services data = new ClosedLoopD2Services();
data.preUpdate();
data.prePersist();
@@ -140,17 +165,20 @@ public class ClosedLoopPolicyDictionaryJPATest {
data.setDescription("Test");
assertTrue("Test".equals(data.getDescription()));
data.setCreatedDate(new Date());
- assertTrue(data.getCreatedDate()!= null);
+ assertTrue(data.getCreatedDate() != null);
data.setModifiedDate(new Date());
- assertTrue(data.getModifiedDate()!= null);
+ assertTrue(data.getModifiedDate() != null);
data.setUserCreatedBy(userInfo);
- assertTrue(data.getUserCreatedBy()!= null);
+ assertTrue(data.getUserCreatedBy() != null);
data.setUserModifiedBy(userInfo);
- assertTrue(data.getUserModifiedBy()!= null);
+ assertTrue(data.getUserModifiedBy() != null);
}
+ /**
+ * Test closed loop site.
+ */
@Test
- public void testClosedLoopSite(){
+ public void testClosedLoopSite() {
ClosedLoopSite data = new ClosedLoopSite();
data.preUpdate();
data.prePersist();
@@ -161,12 +189,12 @@ public class ClosedLoopPolicyDictionaryJPATest {
data.setDescription("Test");
assertTrue("Test".equals(data.getDescription()));
data.setCreatedDate(new Date());
- assertTrue(data.getCreatedDate()!= null);
+ assertTrue(data.getCreatedDate() != null);
data.setModifiedDate(new Date());
- assertTrue(data.getModifiedDate()!= null);
+ assertTrue(data.getModifiedDate() != null);
data.setUserCreatedBy(userInfo);
- assertTrue(data.getUserCreatedBy()!= null);
+ assertTrue(data.getUserCreatedBy() != null);
data.setUserModifiedBy(userInfo);
- assertTrue(data.getUserModifiedBy()!= null);
+ assertTrue(data.getUserModifiedBy() != null);
}
}
diff --git a/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/CommonDictionaryJpaTest.java b/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/CommonDictionaryJpaTest.java
index fa83017f2..caeb808d8 100644
--- a/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/CommonDictionaryJpaTest.java
+++ b/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/CommonDictionaryJpaTest.java
@@ -8,9 +8,9 @@
* 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.
@@ -43,7 +43,7 @@ public class CommonDictionaryJpaTest {
/**
* Initiations for testing.
- *
+ *
* @throws Exception on test initiation errors
*/
@Before
@@ -157,8 +157,8 @@ public class CommonDictionaryJpaTest {
data.prePersist();
data.setId(1);
assertTrue(1 == data.getId());
- data.setOnapName("Test");
- assertTrue("Test".equals(data.getOnapName()));
+ data.setName("Test");
+ assertTrue("Test".equals(data.getName()));
data.setDescription("Test");
assertTrue("Test".equals(data.getDescription()));
data.setCreatedDate(new Date());
diff --git a/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/ConfigurationDataEntityTest.java b/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/ConfigurationDataEntityTest.java
index da5dd5005..a18fcbae3 100644
--- a/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/ConfigurationDataEntityTest.java
+++ b/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/ConfigurationDataEntityTest.java
@@ -3,13 +3,14 @@
* ONAP-REST
* ================================================================================
* Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* 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.
@@ -25,47 +26,51 @@ import static org.hamcrest.CoreMatchers.not;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
+
import java.util.Date;
+
import org.junit.Test;
public class ConfigurationDataEntityTest {
- @Test
- public void testEquals() {
- // Set up test data
- String value = "testVal";
- Date date = new Date();
- ConfigurationDataEntity entity = new ConfigurationDataEntity();
- entity.prePersist();
- ConfigurationDataEntity entity2 = new ConfigurationDataEntity();
- ConfigurationDataEntity entity3 = new ConfigurationDataEntity();
+ @Test
+ public void testEquals() {
+ // Set up test data
+ String value = "testVal";
+ ConfigurationDataEntity entity = new ConfigurationDataEntity();
+ entity.prePersist();
+ ConfigurationDataEntity entity3 = new ConfigurationDataEntity();
+
+ // Test set and get
+ entity3.preUpdate();
+ entity3.setConfigBody(value);
+ assertEquals(value, entity3.getConfigBody());
+ entity3.setCreatedBy(value);
+ assertEquals(value, entity3.getCreatedBy());
+ entity3.setModifiedBy(value);
+ assertEquals(value, entity3.getModifiedBy());
+
+ Date date = new Date();
+ entity3.setModifiedDate(date);
+ assertEquals(date, entity3.getModifiedDate());
+ assertEquals(0, entity3.getVersion());
+ assertNull(entity3.getCreatedDate());
+ entity3.setDeleted(true);
+ assertEquals(true, entity3.isDeleted());
+ entity3.setDescription(value);
+ assertEquals(value, entity3.getDescription());
+ entity3.setConfigType(value);
+ assertEquals(value, entity3.getConfigType());
+ entity3.setConfigurationName(value);
+ assertEquals(value, entity3.getConfigurationName());
+ assertEquals(0, entity3.getConfigurationDataId());
- // Test set and get
- entity3.preUpdate();
- entity3.setConfigBody(value);
- assertEquals(value, entity3.getConfigBody());
- entity3.setCreatedBy(value);
- assertEquals(value, entity3.getCreatedBy());
- entity3.setModifiedBy(value);
- assertEquals(value, entity3.getModifiedBy());
- entity3.setModifiedDate(date);
- assertEquals(date, entity3.getModifiedDate());
- assertEquals(0, entity3.getVersion());
- assertNull(entity3.getCreatedDate());
- entity3.setDeleted(true);
- assertEquals(true, entity3.isDeleted());
- entity3.setDescription(value);
- assertEquals(value, entity3.getDescription());
- entity3.setConfigType(value);
- assertEquals(value, entity3.getConfigType());
- entity3.setConfigurationName(value);
- assertEquals(value, entity3.getConfigurationName());
- assertEquals(0, entity3.getConfigurationDataId());
+ // Test method combinations
+ assertEquals(false, entity.equals(null));
+ assertEquals(true, entity.equals(entity));
+ assertEquals(false, entity.equals(value));
- // Test method combinations
- assertEquals(false, entity.equals(null));
- assertEquals(true, entity.equals(entity));
- assertEquals(false, entity.equals(value));
- assertEquals(false, entity.equals(entity2));
- assertThat(entity.hashCode(), is(not(0)));
- }
+ ConfigurationDataEntity entity2 = new ConfigurationDataEntity();
+ assertEquals(false, entity.equals(entity2));
+ assertThat(entity.hashCode(), is(not(0)));
+ }
}
diff --git a/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/DecisionDictionaryJPATest.java b/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/DecisionDictionaryJpaTest.java
index b1fc69903..b664cf3ed 100644
--- a/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/DecisionDictionaryJPATest.java
+++ b/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/DecisionDictionaryJpaTest.java
@@ -3,13 +3,14 @@
* ONAP-REST
* ================================================================================
* Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* 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.
@@ -17,6 +18,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*/
+
package org.onap.policy.rest.jpa;
import static org.junit.Assert.assertTrue;
@@ -28,11 +30,19 @@ import org.junit.Test;
import org.onap.policy.common.logging.flexlogger.FlexLogger;
import org.onap.policy.common.logging.flexlogger.Logger;
-public class DecisionDictionaryJPATest {
+/**
+ * The Class DecisionDictionaryJpaTest.
+ */
+public class DecisionDictionaryJpaTest {
- private static Logger logger = FlexLogger.getLogger(DecisionDictionaryJPATest.class);
+ private static Logger logger = FlexLogger.getLogger(DecisionDictionaryJpaTest.class);
private UserInfo userInfo;
+ /**
+ * Sets the up.
+ *
+ * @throws Exception the exception
+ */
@Before
public void setUp() throws Exception {
logger.info("setUp: Entering");
@@ -42,8 +52,11 @@ public class DecisionDictionaryJPATest {
logger.info("setUp: exit");
}
+ /**
+ * Test decision settings.
+ */
@Test
- public void testDecisionSettings(){
+ public void testDecisionSettings() {
DecisionSettings data = new DecisionSettings();
data.setId(1);
assertTrue(1 == data.getId());
@@ -54,7 +67,7 @@ public class DecisionDictionaryJPATest {
data.setXacmlId("Test");
assertTrue("Test".equals(data.getXacmlId()));
data.setDatatypeBean(new Datatype());
- assertTrue(data.getDatatypeBean()!=null);
+ assertTrue(data.getDatatypeBean() != null);
data.setIssuer("Test");
assertTrue("Test".equals(data.getIssuer()));
data.setMustBePresent(true);
@@ -62,17 +75,20 @@ public class DecisionDictionaryJPATest {
data.setPriority("Test");
assertTrue("Test".equals(data.getPriority()));
data.setCreatedDate(new Date());
- assertTrue(data.getCreatedDate()!=null);
+ assertTrue(data.getCreatedDate() != null);
data.setModifiedDate(new Date());
- assertTrue(data.getModifiedDate()!=null);
+ assertTrue(data.getModifiedDate() != null);
data.setUserCreatedBy(userInfo);
- assertTrue(data.getUserCreatedBy()!=null);
+ assertTrue(data.getUserCreatedBy() != null);
data.setUserModifiedBy(userInfo);
- assertTrue(data.getUserModifiedBy()!=null);
+ assertTrue(data.getUserModifiedBy() != null);
}
+ /**
+ * Test rainy day treatments.
+ */
@Test
- public void testRainyDayTreatments(){
+ public void testRainyDayTreatments() {
RainyDayTreatments data = new RainyDayTreatments();
data.setId(1);
assertTrue(1 == data.getId());
diff --git a/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/DictionaryDataTest.java b/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/DictionaryDataTest.java
index 486d36442..1b4bb7114 100644
--- a/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/DictionaryDataTest.java
+++ b/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/DictionaryDataTest.java
@@ -5,6 +5,7 @@
* Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* 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.rest.jpa;
import static org.junit.Assert.assertEquals;
+
import org.junit.Test;
public class DictionaryDataTest {
@@ -34,7 +36,7 @@ public class DictionaryDataTest {
String value = "testData1";
// Set Data
- dictData.setId(1);;
+ dictData.setId(1);
dictData.setDictionaryDataByName(value);
dictData.setDictionaryName(value);
dictData.setDictionaryUrl(value);
diff --git a/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/MicroServiceDictionaryJpaTest.java b/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/MicroServiceDictionaryJpaTest.java
index 5ea92fd13..1fcc7baa6 100644
--- a/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/MicroServiceDictionaryJpaTest.java
+++ b/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/MicroServiceDictionaryJpaTest.java
@@ -21,6 +21,7 @@
package org.onap.policy.rest.jpa;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Before;
@@ -88,8 +89,8 @@ public class MicroServiceDictionaryJpaTest {
assertTrue(1 == data.getId());
data.setName("Test");
assertTrue("Test".equals(data.getName()));
- data.setDescriptionValue("Test");
- assertTrue("Test".equals(data.getDescriptionValue()));
+ data.setDescription("Test");
+ assertTrue("Test".equals(data.getDescription()));
}
/**
@@ -102,8 +103,8 @@ public class MicroServiceDictionaryJpaTest {
assertTrue(1 == data.getId());
data.setName("Test");
assertTrue("Test".equals(data.getName()));
- data.setDescriptionValue("Test");
- assertTrue("Test".equals(data.getDescriptionValue()));
+ data.setDescription("Test");
+ assertTrue("Test".equals(data.getDescription()));
}
/**
@@ -126,14 +127,15 @@ public class MicroServiceDictionaryJpaTest {
assertTrue("Test".equals(data.getAnnotation()));
data.setAttributes("Test");
assertTrue("Test".equals(data.getAttributes()));
- data.setRef_attributes("Test");
- assertTrue("Test".equals(data.getRef_attributes()));
+ data.setRefAttributes("Test");
+ assertTrue("Test".equals(data.getRefAttributes()));
data.setUserCreatedBy(userInfo);
assertTrue(data.getUserCreatedBy() != null);
- data.setSub_attributes("Test");
- assertTrue("Test".equals(data.getSub_attributes()));
+ data.setSubAttributes("Test");
+ assertTrue("Test".equals(data.getSubAttributes()));
data.setVersion("Test");
assertTrue("Test".equals(data.getVersion()));
+ assertFalse(data.isDecisionModel());
}
/**
@@ -162,8 +164,8 @@ public class MicroServiceDictionaryJpaTest {
assertTrue(1 == data.getId());
data.setName("Test");
assertTrue("Test".equals(data.getName()));
- data.setDescriptionValue("Test");
- assertTrue("Test".equals(data.getDescriptionValue()));
+ data.setDescription("Test");
+ assertTrue("Test".equals(data.getDescription()));
}
/**
@@ -176,8 +178,8 @@ public class MicroServiceDictionaryJpaTest {
assertTrue(1 == data.getId());
data.setName("Test");
assertTrue("Test".equals(data.getName()));
- data.setDescriptionValue("Test");
- assertTrue("Test".equals(data.getDescriptionValue()));
+ data.setDescription("Test");
+ assertTrue("Test".equals(data.getDescription()));
}
/**
@@ -190,8 +192,8 @@ public class MicroServiceDictionaryJpaTest {
assertTrue(1 == data.getId());
data.setName("Test");
assertTrue("Test".equals(data.getName()));
- data.setDescriptionValue("Test");
- assertTrue("Test".equals(data.getDescriptionValue()));
+ data.setDescription("Test");
+ assertTrue("Test".equals(data.getDescription()));
}
/**
@@ -204,8 +206,8 @@ public class MicroServiceDictionaryJpaTest {
assertTrue(1 == data.getId());
data.setName("Test");
assertTrue("Test".equals(data.getName()));
- data.setDescriptionValue("Test");
- assertTrue("Test".equals(data.getDescriptionValue()));
+ data.setDescription("Test");
+ assertTrue("Test".equals(data.getDescription()));
}
/**
diff --git a/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/MicroserviceHeaderdeFaultsTest.java b/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/MicroserviceHeaderdeFaultsTest.java
index 62452dcb0..cbccc3b96 100644
--- a/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/MicroserviceHeaderdeFaultsTest.java
+++ b/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/MicroserviceHeaderdeFaultsTest.java
@@ -3,13 +3,14 @@
* ONAP-REST
* ================================================================================
* Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* 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.
@@ -21,33 +22,34 @@
package org.onap.policy.rest.jpa;
import static org.junit.Assert.assertEquals;
+
import org.junit.Test;
public class MicroserviceHeaderdeFaultsTest {
- @Test
- public void testHeader() {
- // Set up test data
- String value = "testVal";
- MicroserviceHeaderdeFaults header = new MicroserviceHeaderdeFaults();
- header.prePersist();
- header.preUpdate();
+ @Test
+ public void testHeader() {
+ // Set up test data
+ String value = "testVal";
+ MicroserviceHeaderdeFaults header = new MicroserviceHeaderdeFaults();
+ header.prePersist();
+ header.preUpdate();
- // Set data
- header.setGuard(value);
- header.setId(1);
- header.setModelName(value);
- header.setOnapName(value);
- header.setPriority(value);
- header.setRiskLevel(value);
- header.setRiskType(value);
+ // Set data
+ header.setGuard(value);
+ header.setId(1);
+ header.setModelName(value);
+ header.setOnapName(value);
+ header.setPriority(value);
+ header.setRiskLevel(value);
+ header.setRiskType(value);
- // Test gets
- assertEquals(value, header.getGuard());
- assertEquals(1, header.getId());
- assertEquals(value, header.getModelName());
- assertEquals(value, header.getOnapName());
- assertEquals(value, header.getPriority());
- assertEquals(value, header.getRiskLevel());
- assertEquals(value, header.getRiskType());
- }
+ // Test gets
+ assertEquals(value, header.getGuard());
+ assertEquals(1, header.getId());
+ assertEquals(value, header.getModelName());
+ assertEquals(value, header.getOnapName());
+ assertEquals(value, header.getPriority());
+ assertEquals(value, header.getRiskLevel());
+ assertEquals(value, header.getRiskType());
+ }
}
diff --git a/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/OptimizationModelsJPATest.java b/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/OptimizationModelsJpaTest.java
index 243cb5106..81481e191 100644
--- a/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/OptimizationModelsJPATest.java
+++ b/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/OptimizationModelsJpaTest.java
@@ -3,13 +3,14 @@
* ONAP-REST
* ================================================================================
* Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* 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.
@@ -17,6 +18,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*/
+
package org.onap.policy.rest.jpa;
import static org.junit.Assert.assertTrue;
@@ -26,11 +28,19 @@ import org.junit.Test;
import org.onap.policy.common.logging.flexlogger.FlexLogger;
import org.onap.policy.common.logging.flexlogger.Logger;
-public class OptimizationModelsJPATest {
+/**
+ * The Class OptimizationModelsJpaTest.
+ */
+public class OptimizationModelsJpaTest {
- private static Logger logger = FlexLogger.getLogger(OptimizationModelsJPATest.class);
+ private static Logger logger = FlexLogger.getLogger(OptimizationModelsJpaTest.class);
private UserInfo userInfo;
+ /**
+ * Sets the up.
+ *
+ * @throws Exception the exception
+ */
@Before
public void setUp() throws Exception {
logger.info("setUp: Entering");
@@ -40,8 +50,11 @@ public class OptimizationModelsJPATest {
logger.info("setUp: exit");
}
+ /**
+ * Test ms models.
+ */
@Test
- public void testMSModels(){
+ public void testMsModels() {
OptimizationModels data = new OptimizationModels();
data.setId(1);
assertTrue(1 == data.getId());
@@ -60,12 +73,11 @@ public class OptimizationModelsJPATest {
data.setRefattributes("Test");
assertTrue("Test".equals(data.getRefattributes()));
data.setUserCreatedBy(userInfo);
- assertTrue(data.getUserCreatedBy()!=null);
+ assertTrue(data.getUserCreatedBy() != null);
data.setSubattributes("Test");
assertTrue("Test".equals(data.getSubattributes()));
data.setVersion("Test");
assertTrue("Test".equals(data.getVersion()));
}
-
}
diff --git a/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/PIPConfigurationTest.java b/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/PIPConfigurationTest.java
deleted file mode 100644
index 1a4c2756b..000000000
--- a/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/PIPConfigurationTest.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP-REST
- * ================================================================================
- * Copyright (C) 2018 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.rest.jpa;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Properties;
-import java.util.Set;
-import org.junit.Test;
-import com.att.research.xacml.api.pip.PIPException;
-import com.att.research.xacml.util.XACMLProperties;
-
-public class PIPConfigurationTest {
- @Test
- public void testConfig() throws PIPException {
- String value = "testVal";
- String id = "1";
- PIPConfigParam param = new PIPConfigParam();
- param.setParamName(value);
- param.setParamValue(value);
- Set<PIPConfigParam> params = new HashSet<PIPConfigParam>();
- PIPResolver resolver = new PIPResolver();
- resolver.setClassname(value);
- resolver.setName(value);
- params.add(param);
- Set<PIPResolver> resolvers = new HashSet<PIPResolver>();
- resolvers.add(resolver);
- Properties props = new Properties();
- props.setProperty(id + ".classname", value);
- props.setProperty(XACMLProperties.PROP_PIP_ENGINES, id);
- PIPType type = new PIPType();
- Date date = new Date();
-
- // Test constructors
- PIPConfiguration config = new PIPConfiguration();
- assertNotNull(config);
- config.setPipconfigParams(params);
- config.setPipresolvers(resolvers);
- PIPConfiguration config2 = new PIPConfiguration(config, value);
- assertNotNull(config2);
- config2.prePersist();
- config2.preUpdate();
- PIPConfiguration config3 = new PIPConfiguration(id, props);
- assertNotNull(config3);
- PIPConfiguration config4 = new PIPConfiguration(id, props, value);
- assertNotNull(config4);
-
- // Test set and get
- config.setId(1);
- assertEquals(1, config.getId());
- config.setDescription(value);
- assertEquals(value, config.getDescription());
- config.setName(id);
- assertEquals(id, config.getName());
- config.setClassname(value);
- assertEquals(value, config.getClassname());
- config.setIssuer(value);
- assertEquals(value, config.getIssuer());
- config.setReadOnly(true);
- assertEquals('1', config.getReadOnly());
- config.setReadOnly('0');
- assertEquals('0', config.getReadOnly());
- assertEquals(false, config.isReadOnly());
- config.setRequiresResolvers('t');
- assertEquals('t', config.getRequiresResolvers());
- config.setReadOnly(false);
- assertEquals('0', config.getReadOnly());
- config.setPiptype(type);
- assertEquals(type, config.getPiptype());
- config.setRequiresResolvers(false);
- assertEquals('0', config.getRequiresResolvers());
- config.setCreatedBy(value);
- assertEquals(value, config.getCreatedBy());
- config.setCreatedDate(date);
- assertEquals(date, config.getCreatedDate());
- config.setModifiedBy(value);
- assertEquals(value, config.getModifiedBy());
- config.setModifiedDate(date);
- assertEquals(date, config.getModifiedDate());
- config.setRequiresResolvers(true);
- assertEquals(true, config.requiresResolvers());
- assertEquals(8, config.getConfiguration(id).size());
- assertEquals(9, config.generateProperties(id).size());
-
- // Test remove and clear
- assertEquals(param, config.removePipconfigParam(param));
- config.clearConfigParams();
- assertEquals(0, config.getPipconfigParams().size());
- config.removePipresolver(resolver);
- assertEquals(0, config.getPipresolvers().size());
-
- // Test import
- assertEquals(1, PIPConfiguration.importPIPConfigurations(props).size());
- config.readProperties(id, props);
- assertEquals(id, config.getName());
-
- // Test toString
- String configString = config.toString().replaceAll("@[0-9a-f]*", "");
- assertEquals(323, configString.length());
- }
-}
diff --git a/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/PipConfigurationTest.java b/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/PipConfigurationTest.java
new file mode 100644
index 000000000..9bc95dc5f
--- /dev/null
+++ b/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/PipConfigurationTest.java
@@ -0,0 +1,196 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP-REST
+ * ================================================================================
+ * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.rest.jpa;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import com.att.research.xacml.api.pip.PIPException;
+import com.att.research.xacml.std.pip.engines.StdConfigurableEngine;
+import com.att.research.xacml.util.XACMLProperties;
+
+import java.util.Date;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.Properties;
+import java.util.Set;
+
+import org.junit.Test;
+
+public class PipConfigurationTest {
+ @Test
+ public void testConfig() throws PIPException {
+ String value = "testVal";
+ PipConfigParam param = new PipConfigParam();
+ param.setParamName(value);
+ param.setParamValue(value);
+ Set<PipConfigParam> params = new HashSet<PipConfigParam>();
+ PipResolver resolver = new PipResolver();
+ resolver.setClassname(value);
+ resolver.setName(value);
+ params.add(param);
+ Set<PipResolver> resolvers = new HashSet<PipResolver>();
+ resolvers.add(resolver);
+ Properties props = new Properties();
+
+ String id = "1";
+ props.setProperty(id + ".classname", value);
+ props.setProperty(XACMLProperties.PROP_PIP_ENGINES, id);
+
+ // Test constructors
+ PipConfiguration config = new PipConfiguration();
+ assertNotNull(config);
+ config.setPipconfigParams(params);
+ config.setPipresolvers(resolvers);
+ PipConfiguration config2 = new PipConfiguration(config, value);
+ assertNotNull(config2);
+ config2.prePersist();
+ config2.preUpdate();
+ PipConfiguration config3 = new PipConfiguration(id, props);
+ assertNotNull(config3);
+ PipConfiguration config4 = new PipConfiguration(id, props, value);
+ assertNotNull(config4);
+
+ // Test set and get
+ config.setId(1);
+ assertEquals(1, config.getId());
+ config.setDescription(value);
+ assertEquals(value, config.getDescription());
+ config.setName(id);
+ assertEquals(id, config.getName());
+ config.setClassname(value);
+ assertEquals(value, config.getClassname());
+ config.setIssuer(value);
+ assertEquals(value, config.getIssuer());
+ config.setReadOnlyFlag(true);
+ assertEquals('1', config.getReadOnly());
+ config.setReadOnly('0');
+ assertEquals('0', config.getReadOnly());
+ assertEquals(false, config.isReadOnly());
+ config.setRequiresResolvers('t');
+ assertEquals('t', config.getRequiresResolvers());
+ config.setReadOnlyFlag(false);
+ assertEquals('0', config.getReadOnly());
+
+ PipType type = new PipType();
+ config.setPiptype(type);
+ assertEquals(type, config.getPiptype());
+ config.setRequiresResolversFlag(false);
+ assertEquals('0', config.getRequiresResolvers());
+ config.setCreatedBy(value);
+ assertEquals(value, config.getCreatedBy());
+
+ Date date = new Date();
+ config.setCreatedDate(date);
+ assertEquals(date, config.getCreatedDate());
+ config.setModifiedBy(value);
+ assertEquals(value, config.getModifiedBy());
+ config.setModifiedDate(date);
+ assertEquals(date, config.getModifiedDate());
+ config.setRequiresResolversFlag(true);
+ assertTrue(config.requiresResolvers());
+ config.setRequiresResolversFlag(false);
+ assertFalse(config.requiresResolvers());
+ assertEquals(8, config.getConfiguration(id).size());
+ assertEquals(9, config.generateProperties(id).size());
+
+ // Test remove and clear
+ assertEquals(param, config.removePipconfigParam(param));
+ assertNull(config.removePipconfigParam(null));
+ config.clearConfigParams();
+ assertEquals(0, config.getPipconfigParams().size());
+ config.removePipresolver(resolver);
+ assertEquals(0, config.getPipresolvers().size());
+
+ assertEquals(param, config.addPipconfigParam(param));
+ config.clearConfigParams();
+ assertEquals(0, config.getPipconfigParams().size());
+ config.removePipresolver(resolver);
+ assertEquals(0, config.getPipresolvers().size());
+
+ // Test import
+ assertEquals(1, PipConfiguration.importPipConfigurations(props).size());
+ config.readProperties(id, props);
+ assertEquals(id, config.getName());
+
+ // Test toString
+ String configString = config.toString().replaceAll("@[0-9a-f]*", "");
+ assertEquals(322, configString.length());
+
+ assertEquals(0, PipConfiguration.importPipConfigurations(new Properties()).size());
+
+ Properties otherProperties = new Properties();
+ otherProperties.put(XACMLProperties.PROP_PIP_ENGINES, "");
+ assertEquals(0, PipConfiguration.importPipConfigurations(otherProperties).size());
+
+ otherProperties.put(XACMLProperties.PROP_PIP_ENGINES, "badvalue:evenworse");
+ assertEquals(0, PipConfiguration.importPipConfigurations(otherProperties).size());
+
+ // Test readProperties
+ props.setProperty(id + "." + StdConfigurableEngine.PROP_ISSUER, "himself");
+ props.setProperty(id + ".resolvers", "");
+ props.setProperty(id + ".resolver", "");
+ props.setProperty(id + ".anotherproperty", "");
+ config.readProperties(id, props);
+ assertEquals("himself", config.getIssuer());
+ assertEquals(49, config.getRequiresResolvers());
+
+ props.setProperty(id + ".resolvers", "aaa");
+ assertThatThrownBy(() -> config.readProperties(id, props)).hasMessage("PIP Engine defined without a classname");
+
+ props.setProperty(id + ".resolver.aaa.classname", "somewhere.over.the.Rainbow");
+ props.setProperty(id + ".resolver.aaa." + StdConfigurableEngine.PROP_NAME, "Dorothy");
+ props.setProperty(id + ".resolver.aaa." + StdConfigurableEngine.PROP_DESCRIPTION, "Oz");
+ props.setProperty(id + ".resolver.aaa." + StdConfigurableEngine.PROP_ISSUER, "Wizard");
+ props.setProperty(id + ".resolver.aaa.witch", "North");
+ config.readProperties(id, props);
+
+ PipResolver pipResolver = config.getPipresolvers().iterator().next();
+
+ assertEquals("somewhere.over.the.Rainbow", pipResolver.getClassname());
+ assertEquals("Dorothy", pipResolver.getName());
+ assertEquals("Oz", pipResolver.getDescription());
+ assertEquals("Wizard", pipResolver.getIssuer());
+
+ // Test getConfiguration
+ assertEquals(10, config.getConfiguration(null).size());
+ assertEquals(10, config.getConfiguration("kansas").size());
+ assertEquals(10, config.getConfiguration("kansas.").size());
+ config.setDescription(null);
+ assertEquals(9, config.getConfiguration(null).size());
+ config.setIssuer(null);
+ assertEquals(8, config.getConfiguration(null).size());
+ config.setPipresolvers(new LinkedHashSet<PipResolver>());
+ assertEquals(3, config.getConfiguration(null).size());
+
+ // Test generateProperties
+ assertEquals(4, config.generateProperties(null).size());
+ assertEquals(4, config.generateProperties("kansas").size());
+ assertEquals(4, config.generateProperties("kansas.").size());
+ config.setIssuer("");
+ assertEquals(4, config.generateProperties("kansas.").size());
+ }
+}
diff --git a/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/PIPJPATest.java b/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/PipJpaTest.java
index 7421d79c9..2a5dff61f 100644
--- a/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/PIPJPATest.java
+++ b/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/PipJpaTest.java
@@ -3,13 +3,14 @@
* ONAP-REST
* ================================================================================
* Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* 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.
@@ -17,25 +18,33 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*/
+
package org.onap.policy.rest.jpa;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import com.att.research.xacml.api.pip.PIPException;
import java.util.Date;
import java.util.HashSet;
+import java.util.LinkedHashSet;
import java.util.Properties;
+import java.util.Set;
import org.junit.Test;
-import com.att.research.xacml.api.pip.PIPException;
-
-public class PIPJPATest {
+public class PipJpaTest {
@Test
- public void testPIPConfigParam(){
- PIPConfigParam data = new PIPConfigParam();
- new PIPConfigParam("test");
- new PIPConfigParam(new PIPConfigParam());
+ public void testPipConfigParam() {
+ PipConfigParam data = new PipConfigParam();
+ new PipConfigParam("test");
+ new PipConfigParam(new PipConfigParam());
data.setId(1);
assertTrue(1 == data.getId());
data.setParamName("Test");
@@ -44,18 +53,20 @@ public class PIPJPATest {
assertTrue("Test".equals(data.getParamValue()));
data.setParamDefault("Test");
assertTrue("Test".equals(data.getParamDefault()));
- data.setPipconfiguration(new PIPConfiguration());
- assertTrue(data.getPipconfiguration()!=null);
- data.setRequired(true);
+ data.setPipconfiguration(new PipConfiguration());
+ assertTrue(data.getPipconfiguration() != null);
+ data.setRequiredFlag(true);
assertTrue(data.isRequired());
+ data.setRequiredFlag(false);
+ assertFalse(data.isRequired());
data.toString();
}
@Test
- public void testPIPResolverParam(){
- PIPResolverParam data = new PIPResolverParam();
- new PIPResolverParam("test");
- new PIPResolverParam(new PIPResolverParam());
+ public void testPipResolverParam() {
+ PipResolverParam data = new PipResolverParam();
+ new PipResolverParam("test");
+ new PipResolverParam(new PipResolverParam());
data.setId(1);
assertTrue(1 == data.getId());
data.setParamName("Test");
@@ -64,40 +75,42 @@ public class PIPJPATest {
assertTrue("Test".equals(data.getParamValue()));
data.setParamDefault("Test");
assertTrue("Test".equals(data.getParamDefault()));
- data.setPipresolver(new PIPResolver());
- assertTrue(data.getPipresolver()!=null);
+ data.setPipresolver(new PipResolver());
+ assertTrue(data.getPipresolver() != null);
data.setRequired(true);
assertTrue(data.isRequired());
+ data.setRequired(false);
+ assertFalse(data.isRequired());
data.toString();
}
@Test
- public void testPIPType(){
- PIPType data = new PIPType();
+ public void testPipType() {
+ PipType data = new PipType();
data.setId(1);
assertTrue(1 == data.getId());
data.setType("Test");
assertTrue("Test".equals(data.getType()));
data.setPipconfigurations(new HashSet<>());
- assertTrue(data.getPipconfigurations()!=null);
- data.addPipconfiguration(new PIPConfiguration());
- data.removePipconfiguration(new PIPConfiguration());
+ assertTrue(data.getPipconfigurations() != null);
+ data.addPipconfiguration(new PipConfiguration());
+ data.removePipconfiguration(new PipConfiguration());
data.setType("SQL");
- assertTrue(data.isSQL());
+ assertTrue(data.isSql());
data.setType("LDAP");
- assertTrue(data.isLDAP());
+ assertTrue(data.isLdap());
data.setType("CSV");
- assertTrue(data.isCSV());
+ assertTrue(data.isCsv());
data.setType("Hyper-CSV");
- assertTrue(data.isHyperCSV());
+ assertTrue(data.isHyperCsv());
data.setType("Custom");
assertTrue(data.isCustom());
}
@Test
- public void testPIPResolver(){
- PIPResolver data = new PIPResolver();
- new PIPResolver(new PIPResolver());
+ public void testPipResolver() {
+ PipResolver data = new PipResolver();
+ new PipResolver(new PipResolver());
data.prePersist();
data.preUpdate();
data.setId(1);
@@ -115,32 +128,50 @@ public class PIPJPATest {
data.setModifiedBy("Test");
assertTrue("Test".equals(data.getModifiedBy()));
data.setCreatedDate(new Date());
- assertTrue(data.getCreatedDate()!=null);
+ assertTrue(data.getCreatedDate() != null);
data.setModifiedDate(new Date());
- assertTrue(data.getModifiedDate()!=null);
- data.setPipconfiguration(new PIPConfiguration());
- assertTrue(data.getPipconfiguration()!=null);
+ assertTrue(data.getModifiedDate() != null);
+ data.setPipconfiguration(new PipConfiguration());
+ assertTrue(data.getPipconfiguration() != null);
data.setPipresolverParams(new HashSet<>());
- assertTrue(data.getPipresolverParams()!=null);
- data.addPipresolverParam(new PIPResolverParam());
- data.removePipresolverParam(new PIPResolverParam());
+ assertTrue(data.getPipresolverParams() != null);
+ data.addPipresolverParam(new PipResolverParam());
+ data.removePipresolverParam(new PipResolverParam());
+ assertNull(data.removePipresolverParam(null));
data.clearParams();
data.getConfiguration("test");
+ assertNotNull(data.getConfiguration("test."));
data.setReadOnly(true);
assertTrue(data.isReadOnly());
+ data.setReadOnly(false);
+ assertFalse(data.isReadOnly());
data.toString();
Properties properties = new Properties();
- data.generateProperties(properties,"test");
+ data.generateProperties(properties, "test");
try {
data.readProperties("test", properties);
} catch (PIPException e) {
fail();
}
+ data.setIssuer("");
+ assertEquals(4, data.getConfiguration("test").size());
+ data.generateProperties(properties, "test.");
+ assertEquals(4, data.getConfiguration("test").size());
+
+ Set<PipResolverParam> pipresolverParams = new LinkedHashSet<>();
+ PipResolverParam prp = new PipResolverParam();
+ prp.setParamName("Dorothy");
+ prp.setParamValue("Gale");
+ pipresolverParams.add(prp);
+ data.setPipresolverParams(pipresolverParams);
+ data.generateProperties(properties, "test");
+ assertEquals(5, data.getConfiguration("test").size());
+ assertEquals(5, new PipResolver(data).getConfiguration("test").size());
}
@Test
- public void testPIPConfiguration(){
- PIPConfiguration data = new PIPConfiguration();
+ public void testPipConfiguration() {
+ PipConfiguration data = new PipConfiguration();
data.prePersist();
data.preUpdate();
data.setId(1);
@@ -158,24 +189,24 @@ public class PIPJPATest {
data.setModifiedBy("Test");
assertTrue("Test".equals(data.getModifiedBy()));
data.setCreatedDate(new Date());
- assertTrue(data.getCreatedDate()!=null);
+ assertTrue(data.getCreatedDate() != null);
data.setModifiedDate(new Date());
- assertTrue(data.getModifiedDate()!=null);
+ assertTrue(data.getModifiedDate() != null);
try {
data.readProperties("test", data.generateProperties("test"));
} catch (PIPException e) {
fail();
}
- data.setPiptype(new PIPType());
- assertTrue(data.getPiptype()!=null);
+ data.setPiptype(new PipType());
+ assertTrue(data.getPiptype() != null);
data.setPipresolvers(new HashSet<>());
- assertTrue(data.getPipresolvers()!=null);
- data.addPipresolver(new PIPResolver());
- data.removePipresolver(new PIPResolver());
+ assertTrue(data.getPipresolvers() != null);
+ data.addPipresolver(new PipResolver());
+ data.removePipresolver(new PipResolver());
data.getConfiguration("test");
- data.setReadOnly(true);
+ data.setReadOnlyFlag(true);
assertTrue(data.isReadOnly());
- data.setRequiresResolvers(true);
+ data.setRequiresResolversFlag(true);
assertTrue(data.requiresResolvers());
data.toString();
}
diff --git a/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/PolicyAuditlogTest.java b/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/PolicyAuditlogTest.java
index 15e28b142..1ae1cb3e2 100644
--- a/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/PolicyAuditlogTest.java
+++ b/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/PolicyAuditlogTest.java
@@ -3,6 +3,7 @@
* ONAP-REST
* ================================================================================
* Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -21,7 +22,9 @@
package org.onap.policy.rest.jpa;
import static org.junit.Assert.assertEquals;
+
import java.text.ParseException;
+
import org.junit.Test;
public class PolicyAuditlogTest {
diff --git a/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/PolicyEntityJpaTest.java b/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/PolicyEntityJpaTest.java
index 224513eee..b392b6f5a 100644
--- a/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/PolicyEntityJpaTest.java
+++ b/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/PolicyEntityJpaTest.java
@@ -22,6 +22,7 @@
package org.onap.policy.rest.jpa;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
@@ -71,11 +72,11 @@ public class PolicyEntityJpaTest {
*/
@Test
public void testPolicyDbDaoEntity() {
- PolicyDBDaoEntity data = new PolicyDBDaoEntity();
+ PolicyDbDaoEntity data = new PolicyDbDaoEntity();
data.prePersist();
data.preUpdate();
- data.setPolicyDBDaoUrl("Test");
- assertTrue("Test".equals(data.getPolicyDBDaoUrl()));
+ data.setPolicyDbDaoUrl("Test");
+ assertTrue("Test".equals(data.getPolicyDbDaoUrl()));
data.setDescription("Test");
assertTrue("Test".equals(data.getDescription()));
assertTrue(data.getCreatedDate() != null);
@@ -126,6 +127,259 @@ public class PolicyEntityJpaTest {
assertTrue(data.isDeleted());
data.equals(new PolicyEntity());
data.hashCode();
+
+ PolicyEntity entity0 = new PolicyEntity();
+ PolicyEntity entity1 = new PolicyEntity();
+ assertTrue(entity0.equals(entity0));
+ assertTrue(entity0.equals(entity1));
+ assertFalse(entity0.equals(null));
+ String helloString = "Hello";
+ Object helloObject = helloString;
+ assertFalse(entity0.equals(helloObject));
+
+ entity0.setPolicyId(1);
+ assertFalse(entity0.equals(entity1));
+ entity1.setPolicyId(1);
+ assertTrue(entity0.equals(entity1));
+ entity0.setPolicyId(2);
+ assertFalse(entity0.equals(entity1));
+ entity1.setPolicyId(2);
+ assertTrue(entity0.equals(entity1));
+
+ entity0.setPolicyName("GoToOz");
+ assertFalse(entity0.equals(entity1));
+ entity1.setPolicyName("GoToOz");
+ assertTrue(entity0.equals(entity1));
+ entity1.setPolicyName(null);
+ assertFalse(entity0.equals(entity1));
+ entity0.setPolicyName(null);
+ assertTrue(entity0.equals(entity1));
+ entity1.setPolicyName("GoToOz");
+ assertFalse(entity0.equals(entity1));
+ entity0.setPolicyName("GoToOz");
+ assertTrue(entity0.equals(entity1));
+ entity1.setPolicyName("GoToOzNow");
+ assertFalse(entity0.equals(entity1));
+ entity0.setPolicyName("GoToOzNow");
+ assertTrue(entity0.equals(entity1));
+
+ entity0.setScope("All");
+ assertFalse(entity0.equals(entity1));
+ entity1.setScope("All");
+ assertTrue(entity0.equals(entity1));
+ entity1.setScope(null);
+ assertFalse(entity0.equals(entity1));
+ entity0.setScope(null);
+ assertTrue(entity0.equals(entity1));
+ entity1.setScope("All");
+ assertFalse(entity0.equals(entity1));
+ entity0.setScope("All");
+ assertTrue(entity0.equals(entity1));
+ entity1.setScope("AllIn");
+ assertFalse(entity0.equals(entity1));
+ entity0.setScope("AllIn");
+ assertTrue(entity0.equals(entity1));
+
+ entity0.setVersion(1);
+ assertFalse(entity0.equals(entity1));
+ entity1.setVersion(1);
+ assertTrue(entity0.equals(entity1));
+
+ entity0.setPolicyVersion(1);
+ assertFalse(entity0.equals(entity1));
+ entity1.setPolicyVersion(1);
+ assertTrue(entity0.equals(entity1));
+ entity0.setPolicyVersion(2);
+ assertFalse(entity0.equals(entity1));
+ entity1.setPolicyVersion(2);
+ assertTrue(entity0.equals(entity1));
+
+ entity0.setPolicyData("SomeData");
+ assertFalse(entity0.equals(entity1));
+ entity1.setPolicyData("SomeData");
+ assertTrue(entity0.equals(entity1));
+ entity1.setPolicyData(null);
+ assertFalse(entity0.equals(entity1));
+ entity0.setPolicyData(null);
+ assertTrue(entity0.equals(entity1));
+ entity1.setPolicyData("SomeData");
+ assertFalse(entity0.equals(entity1));
+ entity0.setPolicyData("SomeData");
+ assertTrue(entity0.equals(entity1));
+ entity1.setPolicyData("SomeMoreData");
+ assertFalse(entity0.equals(entity1));
+ entity0.setPolicyData("SomeMoreData");
+ assertTrue(entity0.equals(entity1));
+
+ ConfigurationDataEntity cde0 = new ConfigurationDataEntity();
+ entity0.setConfigurationDataEntity(cde0);
+ assertFalse(entity0.equals(entity1));
+ entity1.setConfigurationDataEntity(cde0);
+ assertTrue(entity0.equals(entity1));
+ entity1.setConfigurationDataEntity(null);
+ assertFalse(entity0.equals(entity1));
+ entity0.setConfigurationDataEntity(null);
+ assertTrue(entity0.equals(entity1));
+ ConfigurationDataEntity cde1 = new ConfigurationDataEntity();
+ entity1.setConfigurationDataEntity(cde1);
+ assertFalse(entity0.equals(entity1));
+ entity0.setConfigurationDataEntity(cde1);
+ assertTrue(entity0.equals(entity1));
+
+ ActionBodyEntity abe0 = new ActionBodyEntity();
+ entity0.setActionBodyEntity(abe0);
+ assertFalse(entity0.equals(entity1));
+ entity1.setActionBodyEntity(abe0);
+ assertTrue(entity0.equals(entity1));
+ entity1.setActionBodyEntity(null);
+ assertFalse(entity0.equals(entity1));
+ entity0.setActionBodyEntity(null);
+ assertTrue(entity0.equals(entity1));
+ entity1.setActionBodyEntity(abe0);
+ assertFalse(entity0.equals(entity1));
+ entity0.setActionBodyEntity(abe0);
+ assertTrue(entity0.equals(entity1));
+ ActionBodyEntity abe1 = new ActionBodyEntity();
+ entity1.setActionBodyEntity(abe1);
+ assertFalse(entity0.equals(entity1));
+ entity0.setActionBodyEntity(abe1);
+ assertTrue(entity0.equals(entity1));
+
+ entity0.setDescription("Description");
+ assertFalse(entity0.equals(entity1));
+ entity1.setDescription("Description");
+ assertTrue(entity0.equals(entity1));
+ entity1.setDescription(null);
+ assertFalse(entity0.equals(entity1));
+ entity0.setDescription(null);
+ assertTrue(entity0.equals(entity1));
+ entity1.setDescription("Description");
+ assertFalse(entity0.equals(entity1));
+ entity0.setDescription("Description");
+ assertTrue(entity0.equals(entity1));
+ assertTrue(entity0.equals(entity1));
+ entity1.setDescription("Description Extra");
+ assertFalse(entity0.equals(entity1));
+ entity0.setDescription("Description Extra");
+ assertTrue(entity0.equals(entity1));
+
+ entity0.setDeleted(true);
+ assertFalse(entity0.equals(entity1));
+ entity1.setDeleted(true);
+ assertTrue(entity0.equals(entity1));
+ entity0.setDeleted(false);
+ assertFalse(entity0.equals(entity1));
+ entity1.setDeleted(false);
+ assertTrue(entity0.equals(entity1));
+
+ entity0.setDeleteReasonCode("NoReason");
+ assertFalse(entity0.equals(entity1));
+ entity1.setDeleteReasonCode("NoReason");
+ assertTrue(entity0.equals(entity1));
+ entity1.setDeleteReasonCode(null);
+ assertFalse(entity0.equals(entity1));
+ entity0.setDeleteReasonCode(null);
+ assertTrue(entity0.equals(entity1));
+ entity1.setDeleteReasonCode("NoReason");
+ assertFalse(entity0.equals(entity1));
+ entity0.setDeleteReasonCode("NoReason");
+ assertTrue(entity0.equals(entity1));
+ assertTrue(entity0.equals(entity1));
+ entity1.setDeleteReasonCode("NoOtherReason");
+ assertFalse(entity0.equals(entity1));
+ entity0.setDeleteReasonCode("NoOtherReason");
+ assertTrue(entity0.equals(entity1));
+
+ entity0.setCreatedBy("Dorothy");
+ assertFalse(entity0.equals(entity1));
+ entity1.setCreatedBy("Dorothy");
+ assertTrue(entity0.equals(entity1));
+ entity1.setCreatedBy(null);
+ assertFalse(entity0.equals(entity1));
+ entity0.setCreatedBy(null);
+ assertTrue(entity0.equals(entity1));
+ entity1.setCreatedBy("Dorothy");
+ assertFalse(entity0.equals(entity1));
+ entity0.setCreatedBy("Dorothy");
+ assertTrue(entity0.equals(entity1));
+ entity1.setCreatedBy("Toto");
+ assertFalse(entity0.equals(entity1));
+ entity0.setCreatedBy("Toto");
+ assertTrue(entity0.equals(entity1));
+
+ entity0.setCreatedDate(new Date(12345L));
+ assertFalse(entity0.equals(entity1));
+ entity1.setCreatedDate(new Date(12345L));
+ assertTrue(entity0.equals(entity1));
+ entity1.setCreatedDate(null);
+ assertFalse(entity0.equals(entity1));
+ entity0.setCreatedDate(null);
+ assertTrue(entity0.equals(entity1));
+ entity1.setCreatedDate(new Date(12345L));
+ assertFalse(entity0.equals(entity1));
+ entity0.setCreatedDate(new Date(12345L));
+ assertTrue(entity0.equals(entity1));
+ assertTrue(entity0.equals(entity1));
+ entity1.setCreatedDate(new Date(123456L));
+ assertFalse(entity0.equals(entity1));
+ entity0.setCreatedDate(new Date(123456L));
+ assertTrue(entity0.equals(entity1));
+
+ entity0.setModifiedBy("Dorothy");
+ assertFalse(entity0.equals(entity1));
+ entity1.setModifiedBy("Dorothy");
+ assertTrue(entity0.equals(entity1));
+ entity1.setModifiedBy(null);
+ assertFalse(entity0.equals(entity1));
+ entity0.setModifiedBy(null);
+ assertTrue(entity0.equals(entity1));
+ entity1.setModifiedBy("Dorothy");
+ assertFalse(entity0.equals(entity1));
+ entity0.setModifiedBy("Dorothy");
+ assertTrue(entity0.equals(entity1));
+ entity1.setModifiedBy("Toto");
+ assertFalse(entity0.equals(entity1));
+ entity0.setModifiedBy("Toto");
+ assertTrue(entity0.equals(entity1));
+
+ entity0.setModifiedDate(new Date(12345L));
+ assertFalse(entity0.equals(entity1));
+ entity1.setModifiedDate(new Date(12345L));
+ assertTrue(entity0.equals(entity1));
+ entity1.setModifiedDate(null);
+ assertFalse(entity0.equals(entity1));
+ entity0.setModifiedDate(null);
+ assertTrue(entity0.equals(entity1));
+ entity1.setModifiedDate(new Date(12345L));
+ assertFalse(entity0.equals(entity1));
+ entity0.setModifiedDate(new Date(12345L));
+ assertTrue(entity0.equals(entity1));
+ assertTrue(entity0.equals(entity1));
+ entity1.setModifiedDate(new Date(123456L));
+ assertFalse(entity0.equals(entity1));
+ entity0.setModifiedDate(new Date(123456L));
+ assertTrue(entity0.equals(entity1));
+
+ entity0.setDeletedBy("Dorothy");
+ assertFalse(entity0.equals(entity1));
+ entity1.setDeletedBy("Dorothy");
+ assertTrue(entity0.equals(entity1));
+ entity1.setDeletedBy(null);
+ assertFalse(entity0.equals(entity1));
+ entity0.setDeletedBy(null);
+ assertTrue(entity0.equals(entity1));
+ entity1.setDeletedBy("Dorothy");
+ assertFalse(entity0.equals(entity1));
+ entity0.setDeletedBy("Dorothy");
+ assertTrue(entity0.equals(entity1));
+ assertTrue(entity0.equals(entity1));
+ entity1.setDeletedBy("Toto");
+ assertFalse(entity0.equals(entity1));
+ entity0.setDeletedBy("Toto");
+ assertTrue(entity0.equals(entity1));
+
+ assertNotNull(entity0.hashCode());
+ assertNotNull(entity1.hashCode());
}
/**
diff --git a/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/PolicyUtilsJPATest.java b/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/PolicyUtilsJpaTest.java
index 3ada4dfca..26d47a2fc 100644
--- a/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/PolicyUtilsJPATest.java
+++ b/ONAP-REST/src/test/java/org/onap/policy/rest/jpa/PolicyUtilsJpaTest.java
@@ -3,13 +3,14 @@
* ONAP-REST
* ================================================================================
* Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* 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.
@@ -17,8 +18,11 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*/
+
package org.onap.policy.rest.jpa;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import java.util.Date;
@@ -28,11 +32,19 @@ import org.junit.Test;
import org.onap.policy.common.logging.flexlogger.FlexLogger;
import org.onap.policy.common.logging.flexlogger.Logger;
-public class PolicyUtilsJPATest {
+/**
+ * The Class PolicyUtilsJpaTest.
+ */
+public class PolicyUtilsJpaTest {
- private static Logger logger = FlexLogger.getLogger(PolicyUtilsJPATest.class);
+ private static Logger logger = FlexLogger.getLogger(PolicyUtilsJpaTest.class);
private UserInfo userInfo;
+ /**
+ * Sets the up.
+ *
+ * @throws Exception the exception
+ */
@Before
public void setUp() throws Exception {
logger.info("setUp: Entering");
@@ -42,8 +54,11 @@ public class PolicyUtilsJPATest {
logger.info("setUp: exit");
}
+ /**
+ * Test watch policy notification table.
+ */
@Test
- public void testWatchPolicyNotificationTable(){
+ public void testWatchPolicyNotificationTable() {
WatchPolicyNotificationTable data = new WatchPolicyNotificationTable();
data.setId(1);
assertTrue(1 == data.getId());
@@ -55,8 +70,11 @@ public class PolicyUtilsJPATest {
data.hashCode();
}
+ /**
+ * Test policy roles.
+ */
@Test
- public void testPolicyRoles(){
+ public void testPolicyRoles() {
PolicyRoles data = new PolicyRoles();
data.setId(1);
assertTrue(1 == data.getId());
@@ -68,8 +86,11 @@ public class PolicyUtilsJPATest {
assertTrue("Test".equals(data.getLoginId().getUserLoginId()));
}
+ /**
+ * Test policy version.
+ */
@Test
- public void testPolicyVersion(){
+ public void testPolicyVersion() {
PolicyVersion data = new PolicyVersion();
new PolicyVersion("Test", "Test");
data.prePersist();
@@ -87,17 +108,105 @@ public class PolicyUtilsJPATest {
data.setModifiedBy("Test");
assertTrue("Test".equals(data.getModifiedBy()));
data.setCreatedDate(new Date());
- assertTrue(data.getCreatedDate()!=null);
+ assertTrue(data.getCreatedDate() != null);
data.setModifiedDate(new Date());
- assertTrue(data.getModifiedDate()!=null);
- data.equals(data);
- data.hashCode();
+ assertTrue(data.getModifiedDate() != null);
+
+ assertNotNull(data.hashCode());
+
+ PolicyVersion version0 = new PolicyVersion();
+ PolicyVersion version1 = new PolicyVersion();
+ assertTrue(version0.equals(version0));
+ assertTrue(version0.equals(version1));
+ assertFalse(version0.equals(null));
+ String helloString = "Hello";
+ Object helloObject = helloString;
+ assertFalse(version0.equals(helloObject));
+
+ version0.setId(1);
+ assertFalse(version0.equals(version1));
+ version1.setId(1);
+ assertTrue(version0.equals(version1));
+ version0.setActiveVersion(1);
+ assertFalse(version0.equals(version1));
+ version1.setActiveVersion(1);
+ assertTrue(version0.equals(version1));
+ version0.setCreatedBy("Dorothy");
+ assertFalse(version0.equals(version1));
+ version1.setCreatedBy("Dorothy");
+ assertTrue(version0.equals(version1));
+ version1.setCreatedBy(null);
+ assertFalse(version0.equals(version1));
+ version0.setCreatedBy(null);
+ assertTrue(version0.equals(version1));
+ version1.setCreatedBy("Dorothy");
+ assertFalse(version0.equals(version1));
+ version0.setCreatedBy("Dorothy");
+ assertTrue(version0.equals(version1));
+ version0.setCreatedDate(new Date(12345L));
+ assertFalse(version0.equals(version1));
+ version1.setCreatedDate(new Date(12345L));
+ assertTrue(version0.equals(version1));
+ version1.setCreatedDate(null);
+ assertFalse(version0.equals(version1));
+ version0.setCreatedDate(null);
+ assertTrue(version0.equals(version1));
+ version1.setCreatedDate(new Date(12345L));
+ assertFalse(version0.equals(version1));
+ version0.setCreatedDate(new Date(12345L));
+ assertTrue(version0.equals(version1));
+ version0.setHigherVersion(1);
+ assertFalse(version0.equals(version1));
+ version1.setHigherVersion(1);
+ assertTrue(version0.equals(version1));
+ version0.setModifiedBy("Dorothy");
+ assertFalse(version0.equals(version1));
+ version1.setModifiedBy("Dorothy");
+ assertTrue(version0.equals(version1));
+ version1.setModifiedBy(null);
+ assertFalse(version0.equals(version1));
+ version0.setModifiedBy(null);
+ assertTrue(version0.equals(version1));
+ version1.setModifiedBy("Dorothy");
+ assertFalse(version0.equals(version1));
+ version0.setModifiedBy("Dorothy");
+ assertTrue(version0.equals(version1));
+ version0.setModifiedDate(new Date(12345L));
+ assertFalse(version0.equals(version1));
+ version1.setModifiedDate(new Date(12345L));
+ assertTrue(version0.equals(version1));
+ version1.setModifiedDate(null);
+ assertFalse(version0.equals(version1));
+ version0.setModifiedDate(null);
+ assertTrue(version0.equals(version1));
+ version1.setModifiedDate(new Date(12345L));
+ assertFalse(version0.equals(version1));
+ version0.setModifiedDate(new Date(12345L));
+ assertTrue(version0.equals(version1));
+ version0.setPolicyName("GoToOz");
+ assertFalse(version0.equals(version1));
+ version1.setPolicyName("GoToOz");
+ assertTrue(version0.equals(version1));
+ version1.setPolicyName(null);
+ assertFalse(version0.equals(version1));
+ version0.setPolicyName(null);
+ assertTrue(version0.equals(version1));
+ version1.setPolicyName("GoToOz");
+ assertFalse(version0.equals(version1));
+ version0.setPolicyName("GoToOz");
+ assertTrue(version0.equals(version1));
+
+ assertNotNull(version0.hashCode());
+ assertNotNull(version1.hashCode());
}
+ /**
+ * Test system log DB.
+ */
@Test
- public void testSystemLogDB(){
+ public void testSystemLogDB() {
SystemLogDB data = new SystemLogDB();
- new SystemLogDB(1, "","","","","");
+ new SystemLogDB(1, "", "", "", "", "");
data.setId(1);
assertTrue(1 == data.getId());
data.setDescription("Test");
@@ -111,11 +220,14 @@ public class PolicyUtilsJPATest {
data.setLogtype("Test");
assertTrue("Test".equals(data.getLogtype()));
data.setDate(new Date());
- assertTrue(data.getDate()!=null);
+ assertTrue(data.getDate() != null);
}
+ /**
+ * Test remote catalog values.
+ */
@Test
- public void testRemoteCatalogValues(){
+ public void testRemoteCatalogValues() {
RemoteCatalogValues data = new RemoteCatalogValues();
data.setId(1);
assertTrue(1 == data.getId());
@@ -125,8 +237,11 @@ public class PolicyUtilsJPATest {
assertTrue("Test".equals(data.getValue()));
}
+ /**
+ * Test policy score.
+ */
@Test
- public void testPolicyScore(){
+ public void testPolicyScore() {
PolicyScore data = new PolicyScore();
data.setId(1);
assertTrue(1 == data.getId());
@@ -134,12 +249,15 @@ public class PolicyUtilsJPATest {
assertTrue("Test".equals(data.getPolicyName()));
data.setVersionExtension("Test");
assertTrue("Test".equals(data.getVersionExtension()));
- data.setPolicyScore("Test");
- assertTrue("Test".equals(data.getPolicyScore()));
+ data.setScore("Test");
+ assertTrue("Test".equals(data.getScore()));
}
+ /**
+ * Test policy editor scopes.
+ */
@Test
- public void testPolicyEditorScopes(){
+ public void testPolicyEditorScopes() {
PolicyEditorScopes data = new PolicyEditorScopes();
data.prePersist();
data.preUpdate();
@@ -148,17 +266,20 @@ public class PolicyUtilsJPATest {
data.setScopeName("Test");
assertTrue("Test".equals(data.getScopeName()));
data.setCreatedDate(new Date());
- assertTrue(data.getCreatedDate()!=null);
+ assertTrue(data.getCreatedDate() != null);
data.setModifiedDate(new Date());
- assertTrue(data.getModifiedDate()!=null);
+ assertTrue(data.getModifiedDate() != null);
data.setUserCreatedBy(userInfo);
- assertTrue(data.getUserCreatedBy()!=null);
+ assertTrue(data.getUserCreatedBy() != null);
data.setUserModifiedBy(userInfo);
- assertTrue(data.getUserModifiedBy()!=null);
+ assertTrue(data.getUserModifiedBy() != null);
}
+ /**
+ * Test descriptive scope.
+ */
@Test
- public void testDescriptiveScope(){
+ public void testDescriptiveScope() {
DescriptiveScope data = new DescriptiveScope();
data.prePersist();
data.preUpdate();
@@ -169,17 +290,20 @@ public class PolicyUtilsJPATest {
data.setSearch("Test");
assertTrue("Test".equals(data.getSearch()));
data.setCreatedDate(new Date());
- assertTrue(data.getCreatedDate()!=null);
+ assertTrue(data.getCreatedDate() != null);
data.setModifiedDate(new Date());
- assertTrue(data.getModifiedDate()!=null);
+ assertTrue(data.getModifiedDate() != null);
data.setUserCreatedBy(userInfo);
- assertTrue(data.getUserCreatedBy()!=null);
+ assertTrue(data.getUserCreatedBy() != null);
data.setUserModifiedBy(userInfo);
- assertTrue(data.getUserModifiedBy()!=null);
+ assertTrue(data.getUserModifiedBy() != null);
}
+ /**
+ * Test global role settings.
+ */
@Test
- public void testGlobalRoleSettings(){
+ public void testGlobalRoleSettings() {
GlobalRoleSettings data = new GlobalRoleSettings();
new GlobalRoleSettings(true);
data.setRole("Test");
diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateDcaeMicroServiceController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateDcaeMicroServiceController.java
index 1cc41f97b..2e7654e84 100644
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateDcaeMicroServiceController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateDcaeMicroServiceController.java
@@ -903,8 +903,8 @@ public class CreateDcaeMicroServiceController extends RestrictedBaseController {
// Get all keys with "MANY-true" defined in their value from subAttribute
Set<String> allkeys = null;
- if (returnModel.getSub_attributes() != null && !returnModel.getSub_attributes().isEmpty()) {
- JSONObject json = new JSONObject(returnModel.getSub_attributes());
+ if (returnModel.getSubAttributes() != null && !returnModel.getSubAttributes().isEmpty()) {
+ JSONObject json = new JSONObject(returnModel.getSubAttributes());
getAllKeys(json);
allkeys = allManyTrueKeys;
allManyTrueKeys = new TreeSet<>();
@@ -942,8 +942,8 @@ public class CreateDcaeMicroServiceController extends RestrictedBaseController {
jsonModel = finalJsonObject.toString();
}
- // get all properties with "MANY-true" defined in Ref_attributes
- Set<String> manyTrueProperties = getManyTrueProperties(returnModel.getRef_attributes());
+ // get all properties with "MANY-true" defined in RefAttributes
+ Set<String> manyTrueProperties = getManyTrueProperties(returnModel.getRefAttributes());
if (manyTrueProperties != null) {
JSONObject jsonObj = new JSONObject(jsonModel);
for (String s : manyTrueProperties) {
@@ -988,7 +988,7 @@ public class CreateDcaeMicroServiceController extends RestrictedBaseController {
if (attribute != null) {
attribute = attribute.trim();
}
- String refAttribute = returnModel.getRef_attributes();
+ String refAttribute = returnModel.getRefAttributes();
if (refAttribute != null) {
refAttribute = refAttribute.trim();
}
@@ -1005,7 +1005,7 @@ public class CreateDcaeMicroServiceController extends RestrictedBaseController {
Gson gson = new Gson();
- String subAttributes = returnModel.getSub_attributes();
+ String subAttributes = returnModel.getSubAttributes();
if (subAttributes != null) {
subAttributes = subAttributes.trim();
} else {
diff --git a/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/CreateDcaeMicroServiceControllerTest.java b/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/CreateDcaeMicroServiceControllerTest.java
index 1a99fdf92..cb7ffbb2f 100644
--- a/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/CreateDcaeMicroServiceControllerTest.java
+++ b/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/CreateDcaeMicroServiceControllerTest.java
@@ -108,11 +108,11 @@ public class CreateDcaeMicroServiceControllerTest {
+ "CorrelationWindow=String:defaultValue-null:required-true:MANY-false:description-null,"
+ "EmailNotification=String:defaultValue-null:required-true:MANY-false:description-null,"
+ "CorrelationPriority=string:defaultValue-null:required-true:MANY-false:description-null,");
- testData.setRef_attributes("SymptomTriggerSignature=resource-model-symptomEntity:MANY-true:description-null,"
+ testData.setRefAttributes("SymptomTriggerSignature=resource-model-symptomEntity:MANY-true:description-null,"
+ "triggerSignature=resource-model-entity:MANY-true:description-null,"
+ "SelectServerScope=SELECTSERVERSCOPE:MANY-false,logicalConnector=LOGICALCONNECTOR:MANY-false,"
+ "ParentCorrelationTraversal=PARENTCORRELATIONTRAVERSAL:MANY-false,");
- testData.setSub_attributes(
+ testData.setSubAttributes(
"{\"symptomAlarms\":{\"symptomContains\":\"SYMPTOMCONTAINS:defaultValue-null:required-true:MANY-false:"
+ "description-null\",\"symptomFilterValue\":\"string:defaultValue-null:"
+ "required-true:MANY-false:"
diff --git a/POLICY-SDK-APP/src/test/java/org/onap/policy/daoImp/CommonClassDaoImplTest.java b/POLICY-SDK-APP/src/test/java/org/onap/policy/daoImp/CommonClassDaoImplTest.java
index 16c53841c..0a9f9a3c0 100644
--- a/POLICY-SDK-APP/src/test/java/org/onap/policy/daoImp/CommonClassDaoImplTest.java
+++ b/POLICY-SDK-APP/src/test/java/org/onap/policy/daoImp/CommonClassDaoImplTest.java
@@ -130,7 +130,7 @@ public class CommonClassDaoImplTest {
userinfo.setUserName("Test");
commonClassDao.save(userinfo);
OnapName onapName = new OnapName();
- onapName.setOnapName("Test");
+ onapName.setName("Test");
onapName.setUserCreatedBy(userinfo);
onapName.setUserModifiedBy(userinfo);
onapName.setModifiedDate(new Date());
diff --git a/packages/base/src/files/install/mysql/data/161000_upgrade_script.sql b/packages/base/src/files/install/mysql/data/161000_upgrade_script.sql
index dbab6ac30..b3589b053 100755
--- a/packages/base/src/files/install/mysql/data/161000_upgrade_script.sql
+++ b/packages/base/src/files/install/mysql/data/161000_upgrade_script.sql
@@ -6320,7 +6320,7 @@ INSERT INTO FunctionArguments (id, is_bag, function_id, arg_index, datatype_id)
INSERT INTO FunctionArguments (id, is_bag, function_id, arg_index, datatype_id) VALUES (452,0,254,2,28);
INSERT INTO FunctionArguments (id, is_bag, function_id, arg_index, datatype_id) VALUES (453,0,92,3,16);
-INSERT INTO PIPType VALUES (500,'SQL'), (501,'LDAP'), (502,'CSV'), (503,'Hyper-CSV'), (504,'Custom');
+INSERT INTO PipType VALUES (500,'SQL'), (501,'LDAP'), (502,'CSV'), (503,'Hyper-CSV'), (504,'Custom');
INSERT INTO GlobalRoleSettings (role, lockdown) values ('super-admin', '0');