X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ONAP-REST%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Frest%2Fjpa%2FPolicyEditorScopes.java;h=923f5ec6f8673dbbff76e42ea12fde2577a92785;hb=9450c8d0102b9188933b5d26193df754a70a7157;hp=698ec36da82039ab090c08e09bec25cbbd2abfa1;hpb=79343205a720ef656837275f973de93f1d26b3e9;p=policy%2Fengine.git

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 698ec36da..923f5ec6f 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
@@ -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() {