Merge "Added Junits for ONAP-PAP-REST"

4 files changed, 1 insertions, 324 deletions

diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/ClosedLoopPolicy.java b/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/ClosedLoopPolicy.java
deleted file mode 100644
index ea1cfb548..000000000
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/adapter/ClosedLoopPolicy.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP Policy Engine
- * ================================================================================
- * 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.adapter;
-
-
-public class ClosedLoopPolicy {
-	public static final String CLFAULT_UIFIELD_D2_SERVICES_TRINITY = "Hosted Voice (Trinity)";
-	public static final String CLFAULT_UIJSON_D2_SERVICES_TRINITY = "trinity";
-
-	public static final String CLFAULT_UIFIELD_D2_SERVICES_VUSP = "vUSP";
-	public static final String CLFAULT_UIJSON_D2_SERVICES_VUSP = "vUSP";
-
-	public static final String CLFAULT_UIFIELD_D2_SERVICES_MCR = "MCR";
-	public static final String CLFAULT_UIJSON_D2_SERVICES_MCR = "mcr";
-
-	public static final String CLFAULT_UIFIELD_D2_SERVICES_GAMMA = "Gamma";
-	public static final String CLFAULT_UIJSON_D2_SERVICES_GAMMA = "gama";
-
-	public static final String CLFAULT_UIFIELD_D2_SERVICES_VDNS = "vDNS";
-	public static final String CLFAULT_UIJSON_D2_SERVICES_VDNS = "vDNS";
-
-	public static final String CLFAULT_UIFIELD_EMAIL_ADDRESS = "Email Address";
-	public static final String CLFAULT_UIJSON_EMAIL_ADDRESS = "emailAddress";
-
-	public static final String CLFAULT_UIFIELD_TRIGGER_SIGNATURE = "Trigger Signature";
-	public static final String CLFAULT_UIJSON_TRIGGER_SIGNATURE = "triggerSignaturesUsedForUI.signatures";
-
-	public static final String CLFAULT_UIFIELD_VERIFICATION_SIGNATURE = "Verification Signature";
-	public static final String CLFAULT_UIJSON_VERIFICATION_SIGNATURE = "verificationSignaturesUsedForUI.signatures";
-
-	public static final String CLFAULT_UIFIELD_CONNECT_ALL_TRAPS = "Connect All Traps";
-	public static final String CLFAULT_UIJSON_CONNECT_ALL_TRAPS = "triggerSignaturesUsedForUI.connectSignatures";
-
-	public static final String CLFAULT_UIFIELD_CONNECT_ALL_FAULTS = "Connect All Faults";
-	public static final String CLFAULT_UIJSON_CONNECT_ALL_FAULTS = "verificationSignaturesUsedForUI.connectSignatures";
-
-	public static final String CLFAULT_UIFIELD_POLICY_STATUS_ACTIVE = "Active";
-	public static final String CLFAULT_UIJSON_POLICY_STATUS_ACTIVE = "ACTIVE";
-
-	public static final String CLFAULT_UIFIELD_POLICY_STATUS_INACTIVE = "InActive";
-	public static final String CLFAULT_UIJSON_POLICY_STATUS_INACTIVE = "INACTIVE";
-
-	private ClosedLoopPolicy(){
-		// Empty constructor
-	}
-}
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 dfc6dff49..a9daf1732 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
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP-PAP-REST
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-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.
@@ -20,7 +20,6 @@
 
 package org.onap.policy.rest.adapter;
 
-import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/EnforcingType.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/EnforcingType.java
deleted file mode 100644
index 9c1cda451..000000000
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/EnforcingType.java
+++ /dev/null
@@ -1,96 +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.*;
-
-/**
- * Entity implementation class for Entity: EnforcingType
- *
- */
-@Entity
-@Table(name="EnforcingType")
-@NamedQuery(name="EnforcingType.findAll", query="SELECT e FROM EnforcingType e ")
-public class EnforcingType implements Serializable {
-
-	
-	private static final long serialVersionUID = 1L;
-	@Id
-	@GeneratedValue(strategy = GenerationType.AUTO)
-	@Column(name="id")
-	private int id;
-	@Column(name="enforcingType", nullable=false, unique=true)
-	@OrderBy("asc")
-	private String enforcingType;
-	@Column(name="script", nullable=false, length=255)
-	private String script;
-	@Column(name="connectionQuery", nullable=false, length=255)
-	private String connectionQuery;
-	@Column(name="valueQuery", nullable=false, length=255)
-	private String valueQuery;
-		
-	public int getId() {
-		return id;
-	}
-
-	public void setId(int id) {
-		this.id = id;
-	}
-
-	public String getEnforcingType() {
-		return enforcingType;
-	}
-
-	public void setEnforcingType(String enforcingType) {
-		this.enforcingType = enforcingType;
-	}
-
-	public String getScript() {
-		return script;
-	}
-
-	public void setScript(String script) {
-		this.script = script;
-	}
-
-	public String getConnectionQuery() {
-		return connectionQuery;
-	}
-
-	public void setConnectionQuery(String connectionQuery) {
-		this.connectionQuery = connectionQuery;
-	}
-
-	public String getValueQuery() {
-		return valueQuery;
-	}
-
-	public void setValueQuery(String valueQuery) {
-		this.valueQuery = valueQuery;
-	}
-
-	public EnforcingType() {
-		super();
-	}
-   
-}
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyManagement.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyManagement.java
deleted file mode 100644
index c79ee1e82..000000000
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PolicyManagement.java
+++ /dev/null
@@ -1,162 +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.sql.Clob;
-import java.sql.Timestamp;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
-
-
-/**
- * The persistent class for the roles database table.
- * 
- */
-@Entity
-@Table(name="policy_manangement")
-@NamedQuery(name="PolicyManagement.findAll", query="SELECT r FROM PolicyManagement r")
-public class PolicyManagement implements Serializable {
-	private static final long serialVersionUID = 1L;
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.AUTO)
-	
-	@Column(name="id")
-	private int id;
-
-	@Column(name="POLICY_NAME", nullable=false, length=45)
-	private String policyName;	
-	
-	@Column(name="scope", nullable=false, length=45)
-	private String scope;
-
-	@Column(name="ONAP_NAME", nullable=false, length=45)
-	private String onapName;
-	
-	@Column(name="CONFIG_NAME", nullable=false, length=45)
-	private String configName;
-	
-	@Column(name="XML", nullable=false)
-	private transient Clob xml;
-	
-	@Column(name="CREATE_DATE_TIME", nullable=false)
-	private Timestamp createDateTime;
-	
-	
-	@Column(name="CREATED_BY", nullable=false, length=45)
-	private String createdBy;
-	
-	@Column(name="UPDATE_DATE_TIME", nullable=false)
-	private Timestamp updateDateTime;
-	
-	@Column(name="UPDATED_BY", nullable=false, length=45)
-	private String updatedBy;
-
-	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 String getScope() {
-		return scope;
-	}
-
-	public void setScope(String scope) {
-		this.scope = scope;
-	}
-
-	public String getOnapName() {
-		return onapName;
-	}
-
-	public void setOnapName(String onapName) {
-		this.onapName = onapName;
-	}
-
-	public String getConfigName() {
-		return configName;
-	}
-
-	public void setConfigName(String configName) {
-		this.configName = configName;
-	}
-
-	public Clob getXml() {
-		return xml;
-	}
-
-	public void setXml(Clob xml) {
-		this.xml = xml;
-	}
-
-	public Timestamp getCreateDateTime() {
-		return createDateTime;
-	}
-
-	public void setCreateDateTime(Timestamp createDateTime) {
-		this.createDateTime = createDateTime;
-	}
-
-	public String getCreatedBy() {
-		return createdBy;
-	}
-
-	public void setCreatedBy(String createdBy) {
-		this.createdBy = createdBy;
-	}
-
-	public Timestamp getUpdateDateTime() {
-		return updateDateTime;
-	}
-
-	public void setUpdateDateTime(Timestamp updateDateTime) {
-		this.updateDateTime = updateDateTime;
-	}
-
-	public String getUpdatedBy() {
-		return updatedBy;
-	}
-
-	public void setUpdatedBy(String updatedBy) {
-		this.updatedBy = updatedBy;
-	}
-	
-	
-
-}