Convert tabs to spaces basic refactoring
[policy/engine.git] / ONAP-REST / src / main / java / org / onap / policy / rest / jpa / ClosedLoopD2Services.java
index f4ade22..94838b4 100644 (file)
@@ -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,136 +40,111 @@ 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.common.logging.eelf.MessageCodes;
-import org.onap.policy.common.logging.eelf.PolicyLogger;
-import org.onap.policy.rest.XacmlAdminAuthorization;
-
 
 @Entity
 @Table(name = "ClosedLoopD2Services")
 @NamedQuery(name="ClosedLoopD2Services.findAll", query="SELECT c FROM ClosedLoopD2Services c ")
 public class ClosedLoopD2Services implements Serializable{
-       private static final long serialVersionUID = 1L;
-       
-       private static String domain;
-
-       
-       @Id
-       @Column(name ="id")
-       @GeneratedValue(strategy = GenerationType.AUTO)
-       private int id;
-       
-       @Column(name="service_Name", nullable=false, unique=true)
-       @OrderBy("asc")
-       private String serviceName;
-
-       @Column(name="description", nullable=true, length=2048)
-       private String description;
-       
-       @Temporal(TemporalType.TIMESTAMP)
-       @Column(name="created_date", updatable=false)
-       private Date createdDate;
-       
-       @Temporal(TemporalType.TIMESTAMP)
-       @Column(name="modified_date", nullable=false)
-       private Date modifiedDate;
-       
-       @ManyToOne(optional = false)
-       @JoinColumn(name="created_by")
-       private UserInfo userCreatedBy;
-
-       @ManyToOne(optional = false)
-       @JoinColumn(name="modified_by")
-       private UserInfo userModifiedBy;
-       
-       public UserInfo getUserCreatedBy() {
-               return userCreatedBy;
-       }
-
-       public void setUserCreatedBy(UserInfo userCreatedBy) {
-               this.userCreatedBy = userCreatedBy;
-       }
-
-       public UserInfo getUserModifiedBy() {
-               return userModifiedBy;
-       }
-
-       public void setUserModifiedBy(UserInfo userModifiedBy) {
-               this.userModifiedBy = userModifiedBy;
-       }
-
-       private static Log LOGGER = LogFactory.getLog(ClosedLoopD2Services.class);
-       
-       public ClosedLoopD2Services(){
-               
-       }
-       
-       public ClosedLoopD2Services(String string, String userid) {
-               this(domain);
-       }
-       
-       public ClosedLoopD2Services(String domain) {
-               this.serviceName = domain;
-       }       
-
-       @PrePersist
-       public void     prePersist() {
-               Date date = new Date();
-               this.createdDate = date;
-               this.modifiedDate = date;
-       }
-
-       @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, "ClosedLoopD2Services", "Exception caused While adding Modified by Role");
-               }
-       }
-       
-       public int getId() {
-               return id;
-       }
-
-       public void setId(int id) {
-               this.id = id;
-       }
-
-       public String getServiceName() {
-               return serviceName;
-       }
-
-       public void setServiceName(String serviceName) {
-               this.serviceName = serviceName;
-       }
-
-       public String getDescription() {
-               return description;
-       }
-
-       public void setDescription(String description) {
-               this.description = description;
-       }
-
-       public Date getCreatedDate() {
-               return createdDate;
-       }
-
-       public void setCreatedDate(Date createdDate) {
-               this.createdDate = createdDate;
-       }
-       
-       public Date getModifiedDate() {
-               return modifiedDate;
-       }
-
-       public void setModifiedDate(Date modifiedDate) {
-               this.modifiedDate = modifiedDate;
-       }
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @Column(name ="id")
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private int id;
+
+    @Column(name="service_Name", nullable=false, unique=true)
+    @OrderBy("asc")
+    private String serviceName;
+
+    @Column(name="description", nullable=true, length=2048)
+    private String description;
+
+    @Temporal(TemporalType.TIMESTAMP)
+    @Column(name="created_date", updatable=false)
+    private Date createdDate;
+
+    @Temporal(TemporalType.TIMESTAMP)
+    @Column(name="modified_date", nullable=false)
+    private Date modifiedDate;
+
+    @ManyToOne(optional = false)
+    @JoinColumn(name="created_by")
+    private UserInfo userCreatedBy;
+
+    @ManyToOne(optional = false)
+    @JoinColumn(name="modified_by")
+    private UserInfo userModifiedBy;
+
+    public UserInfo getUserCreatedBy() {
+        return userCreatedBy;
+    }
+
+    public void setUserCreatedBy(UserInfo userCreatedBy) {
+        this.userCreatedBy = userCreatedBy;
+    }
+
+    public UserInfo getUserModifiedBy() {
+        return userModifiedBy;
+    }
+
+    public void setUserModifiedBy(UserInfo userModifiedBy) {
+        this.userModifiedBy = userModifiedBy;
+    }
+
+    public ClosedLoopD2Services(){
+        //An empty constructor
+    }
+
+    @PrePersist
+    public void        prePersist() {
+        Date date = new Date();
+        this.createdDate = date;
+        this.modifiedDate = date;
+    }
+
+    @PreUpdate
+    public void preUpdate() {
+        this.modifiedDate = new Date();
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getServiceName() {
+        return serviceName;
+    }
+
+    public void setServiceName(String serviceName) {
+        this.serviceName = serviceName;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public Date getCreatedDate() {
+        return createdDate;
+    }
+
+    public void setCreatedDate(Date createdDate) {
+        this.createdDate = createdDate;
+    }
+
+    public Date getModifiedDate() {
+        return modifiedDate;
+    }
+
+    public void setModifiedDate(Date modifiedDate) {
+        this.modifiedDate = modifiedDate;
+    }
 
 }