X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ONAP-REST%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Frest%2Fjpa%2FPEPOptions.java;h=ae01999a36f6bb7f6ae69f6278ca21088ce9043a;hb=9450c8d0102b9188933b5d26193df754a70a7157;hp=869386f6908a972d4fa32cbddad2faad59067c19;hpb=79343205a720ef656837275f973de93f1d26b3e9;p=policy%2Fengine.git diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PEPOptions.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PEPOptions.java index 869386f69..ae01999a3 100644 --- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PEPOptions.java +++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PEPOptions.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. @@ -40,13 +40,6 @@ 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 = "PEPOptions") @@ -100,20 +93,7 @@ public class PEPOptions implements Serializable { public void setUserModifiedBy(UserInfo userModifiedBy) { this.userModifiedBy = userModifiedBy; } - - private static Log LOGGER = LogFactory.getLog(PEPOptions.class); - - public PEPOptions(){ - //An empty constructor - } - - public PEPOptions(String string, String userid) { - this(string); - } - - public PEPOptions(String domain) { - this.pepName = domain; - } + @PrePersist public void prePersist() { @@ -125,12 +105,6 @@ public class PEPOptions 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, "PEPOptions", "Exception caused While adding Modified by Role"); - } } public int getId() {