Merge "New Optimization Policy"

[policy/engine.git] / ONAP-REST / src / main / java / org / onap / policy / rest / jpa / DecisionSettings.java

diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/DecisionSettings.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/DecisionSettings.java
index e0ed676..ccd1052 100644 (file)
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/DecisionSettings.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/DecisionSettings.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP-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.
@@ -39,10 +39,6 @@ import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.persistence.Transient;
 
-import org.onap.policy.common.logging.eelf.MessageCodes;
-import org.onap.policy.common.logging.eelf.PolicyLogger;
-import org.onap.policy.rest.XacmlAdminAuthorization;
-
 
 @Entity
 @Table(name="DecisionSettings")
@@ -108,32 +104,7 @@ public class DecisionSettings implements Serializable {
        public void setUserModifiedBy(UserInfo userModifiedBy) {
                this.userModifiedBy = userModifiedBy;
        }
-       
-       public DecisionSettings() {
-               //An empty constructor
-       }
-       
-       public DecisionSettings(String domain) {
-               this.xacmlId = domain;
-       }
-       
-       public DecisionSettings(String domain, String user) {
-               this(domain);
-       }
-       public DecisionSettings(DecisionSettings copy, String user) {
-               this(copy.getXacmlId() + ":(0)", user);
-               this.datatypeBean = copy.getDatatypeBean();
-               this.description = copy.getDescription();
-               
-       }
-       
-       public String getDecisionSettings(){
-               return this.xacmlId;
-       }
-       
-       public String setDecisionSettings(){
-               return this.xacmlId;
-       }
+
        @PrePersist
        public void     prePersist() {
                Date date = new Date();
@@ -144,11 +115,6 @@ public class DecisionSettings implements Serializable {
        @PreUpdate
        public void preUpdate() {
                this.modifiedDate = new Date();
-               try {
-                       this.userModifiedBy = XacmlAdminAuthorization.getUserId();
-               } catch (Exception e) {
-                       PolicyLogger.error(MessageCodes.EXCEPTION_ERROR, e, "DecisionSettings", "Exception caused While adding Modified by Role");
-               }
        }
 
        public int getId() {