Added Junis for Policy ONAP-REST

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

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 698ec36..923f5ec 100644 (file)
--- 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
@@ -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.
@@ -38,21 +38,11 @@ import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.onap.policy.rest.XacmlAdminAuthorization;
-
-import org.onap.policy.common.logging.eelf.MessageCodes;
-import org.onap.policy.common.logging.eelf.PolicyLogger;
-
 @Entity
 @Table(name="PolicyEditorScopes")
 @NamedQuery(name="PolicyEditorScopes.findAll", query="SELECT p FROM PolicyEditorScopes p ")
 public class PolicyEditorScopes implements Serializable{
        private static final long serialVersionUID = 1L;
-       private static Log logger = LogFactory.getLog(PolicyEditorScopes.class);
-
-       private static String domain;
 
        @Id
        @GeneratedValue(strategy = GenerationType.AUTO)
@@ -78,18 +68,6 @@ public class PolicyEditorScopes implements Serializable{
        @ManyToOne(optional = false)
        @JoinColumn(name="modified_by")
        private UserInfo userModifiedBy;
-       
-       public PolicyEditorScopes() {
-               // Empty constructor
-       }
-       
-       public PolicyEditorScopes(String string, String userid) {
-               this(domain);
-       }
-       
-       public PolicyEditorScopes(String domain) {
-               this.scopeName = domain;
-       }       
 
        @PrePersist
        public void     prePersist() {
@@ -101,12 +79,6 @@ public class PolicyEditorScopes 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);
-                       PolicyLogger.error(MessageCodes.EXCEPTION_ERROR, e, "PolicyEditorScopes", "Exception caused While adding Modified by Role");
-               }
        }
        
        public int getId() {