Merge "New Optimization Policy"

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

diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/Attribute.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/Attribute.java
index 7285e2e..3a4624a 100644 (file)
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/Attribute.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/Attribute.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.
@@ -43,10 +43,6 @@ import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.persistence.Transient;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.onap.policy.rest.XacmlAdminAuthorization;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
 /**
@@ -58,7 +54,6 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 @NamedQuery(name="Attribute.findAll", query="SELECT a FROM Attribute a order by  a.priority asc, a.xacmlId asc")
 public class Attribute implements Serializable {
        private static final long serialVersionUID = 1L;
-       private static final Log logger = LogFactory.getLog(Attribute.class);
        
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
@@ -151,6 +146,7 @@ public class Attribute implements Serializable {
 
        
        public Attribute() {
+               //An empty constructor
        }
        
        public Attribute(String domain) {
@@ -180,11 +176,6 @@ public class Attribute implements Serializable {
        @PreUpdate
        public void preUpdate() {
                this.modifiedDate = new Date();
-               try {
-                       this.userModifiedBy = XacmlAdminAuthorization.getUserId();
-               } catch (Exception e) {
-                       logger.error("Exception caused While adding Modified by Role"+e);
-               }
        }
 
        public int getId() {
@@ -230,11 +221,7 @@ public class Attribute implements Serializable {
        public String getXacmlId() {
                return this.xacmlId;
        }
-       
-/*     @Transient
-       public Identifier getXacmlIdentifier() {
-               return new IdentifierImpl(this.xacmlId);
-       }*/
+
 
        public void setXacmlId(String xacmlId) {
                this.xacmlId = xacmlId;
@@ -332,7 +319,7 @@ public class Attribute implements Serializable {
 
        @Transient
        public boolean isDesignator() {
-               return (this.isDesignator == '1');
+               return this.isDesignator == '1';
        }
        
        @Transient