Code Review
/
policy
/
engine.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[Policy-17] Removed the sql scripts from sdk app
[policy/engine.git]
/
ECOMP-REST
/
src
/
main
/
java
/
org
/
openecomp
/
policy
/
rest
/
jpa
/
Attribute.java
diff --git
a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/Attribute.java
b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/Attribute.java
index
6badfa9
..
f9d60ff
100644
(file)
--- a/
ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/Attribute.java
+++ b/
ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/Attribute.java
@@
-58,10
+58,8
@@
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;
@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);
- public static String ATTRIBUTE_DESIGNATOR = "Attribute Designator";
- public static String ATTRIBUTE_SELECTOR = "Attribute Selector";
-
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name="id")
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name="id")
@@
-151,7
+149,7
@@
public class Attribute implements Serializable {
this.userModifiedBy = userModifiedBy;
}
this.userModifiedBy = userModifiedBy;
}
- private static Log LOGGER = LogFactory.getLog(Attribute.class);
+
public Attribute() {
}
public Attribute() {
}
@@
-159,12
+157,8
@@
public class Attribute implements Serializable {
this.xacmlId = domain;
}
this.xacmlId = domain;
}
- public Attribute(String domain, String user) {
- this(domain);
- }
-
- public Attribute(Attribute copy, String user) {
- this(copy.getXacmlId() + ":(0)", user);
+ public Attribute(Attribute copy) {
+ this(copy.getXacmlId() + ":(0)");
this.constraintType = copy.getConstraintType();
this.categoryBean = copy.getCategoryBean();
this.datatypeBean = copy.getDatatypeBean();
this.constraintType = copy.getConstraintType();
this.categoryBean = copy.getCategoryBean();
this.datatypeBean = copy.getDatatypeBean();
@@
-189,7
+183,7
@@
public class Attribute implements Serializable {
try {
this.userModifiedBy = XacmlAdminAuthorization.getUserId();
} catch (Exception e) {
try {
this.userModifiedBy = XacmlAdminAuthorization.getUserId();
} catch (Exception e) {
-
LOGGER
.error("Exception caused While adding Modified by Role"+e);
+
logger
.error("Exception caused While adding Modified by Role"+e);
}
}
}
}