X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=blobdiff_plain;f=ONAP-REST%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Frest%2Fjpa%2FDatatype.java;h=4ab5779763cb991d45206a4fdf439b76a7ca8b00;hp=15948bd6d0e9a8febbe91163f1c9b8bbe5f5865a;hb=023280727ac52e777b4128d726e212c9e8abd435;hpb=1ecf9de8c889adb2dbc9ddd9a79d28e1da89d87b

diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/Datatype.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/Datatype.java
index 15948bd6d..4ab577976 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/Datatype.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/Datatype.java
@@ -49,194 +49,194 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 @Table(name="Datatype")
 @NamedQuery(name="Datatype.findAll", query="SELECT d FROM Datatype d")
 public class Datatype implements Serializable {
-	private static final long serialVersionUID = 1L;
-	
-	public static final char STANDARD = 'S';
-	public static final char CUSTOM = 'C';
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.AUTO)
-	@Column(name="id")
-	private int id;
-
-	@Column(name="is_standard", nullable=false)
-	private char isStandard;
-
-	@Column(name="xacml_id", nullable=false, unique=true, length=255)
-	private String xacmlId;
-
-	@Column(name="short_name", nullable=false, length=64)
-	private String shortName;
-
-	//bi-directional many-to-one association to Attribute
-	@OneToMany(mappedBy="datatypeBean")
-	@JsonBackReference
-	private Set<Attribute> attributes = new HashSet<>();
-
-	//bi-directional many-to-one association to Attribute
-	@OneToMany(mappedBy="datatypeBean")
-	@JsonIgnore
-	private Set<FunctionDefinition> functions = new HashSet<>();
-
-	//bi-directional many-to-one association to Attribute
-	@OneToMany(mappedBy="datatypeBean")
-	@JsonIgnore
-	private Set<FunctionArgument> arguments = new HashSet<>();
-
-	public Datatype() {
-		this.xacmlId = XACML3.ID_DATATYPE_STRING.stringValue();
-		this.isStandard = Datatype.STANDARD;
-	}
-	
-	
-	public Datatype(int id, Datatype dt) {
-		this.id = id;
-		this.isStandard = dt.isStandard;
-		this.xacmlId = dt.xacmlId;
-		this.shortName = dt.shortName;
-		//
-		// Make a copy?
-		//
-		this.attributes = new HashSet<>();
-	}
-	
-	public Datatype(Identifier identifier, char standard) {
-		if (identifier != null) {
-			this.xacmlId = identifier.stringValue();
-			
-		}
-		this.isStandard = standard;
-	}
-	
-	public Datatype(Identifier identifier) {
-		this(identifier, Datatype.STANDARD);
-	}
-	
-	public int getId() {
-		return this.id;
-	}
-
-	public void setId(int id) {
-		this.id = id;
-	}
-
-	public char getIsStandard() {
-		return this.isStandard;
-	}
-
-	public void setIsStandard(char isStandard) {
-		this.isStandard = isStandard;
-	}
-
-	public String getXacmlId() {
-		return this.xacmlId;
-	}
-
-	public void setXacmlId(String xacmlId) {
-		this.xacmlId = xacmlId;
-	}
-
-	public String getShortName() {
-		return shortName;
-	}
-
-	public void setShortName(String shortName) {
-		this.shortName = shortName;
-	}	
-
-	public Set<Attribute> getAttributes() {
-		return this.attributes;
-	}
-
-	public void setAttributes(Set<Attribute> attributes) {
-		this.attributes = attributes;
-	}
-
-	public Attribute addAttribute(Attribute attribute) {
-		getAttributes().add(attribute);
-		attribute.setDatatypeBean(this);
-
-		return attribute;
-	}
-
-	public Attribute removeAttribute(Attribute attribute) {
-		getAttributes().remove(attribute);
-		attribute.setDatatypeBean(null);
-
-		return attribute;
-	}
-
-	public Set<FunctionDefinition> getFunctions() {
-		return this.functions;
-	}
-
-	public void setFunctions(Set<FunctionDefinition> functions) {
-		this.functions = functions;
-	}
-
-	public FunctionDefinition addFunction(FunctionDefinition function) {
-		getFunctions().add(function);
-		function.setDatatypeBean(this);
-
-		return function;
-	}
-
-	public FunctionDefinition removeAttribute(FunctionDefinition function) {
-		getFunctions().remove(function);
-		function.setDatatypeBean(null);
-
-		return function;
-	}
-
-	public Set<FunctionArgument> getArguments() {
-		return this.arguments;
-	}
-
-	public void setArguments(Set<FunctionArgument> argument) {
-		this.arguments = argument;
-	}
-
-	public FunctionArgument addArgument(FunctionArgument argument) {
-		getArguments().add(argument);
-		argument.setDatatypeBean(this);
-
-		return argument;
-	}
-
-	public FunctionArgument removeArgument(FunctionArgument argument) {
-		getArguments().remove(argument);
-		argument.setDatatypeBean(null);
-
-		return argument;
-	}
-
-	@Transient
-	public Identifier getIdentifer() {
-		return new IdentifierImpl(this.xacmlId);
-	}
-	
-	@Transient
-	public Identifier getIdentiferByShortName() {
-		return new IdentifierImpl(this.shortName);
-	}
-
-	@Transient
-	public boolean isStandard() {
-		return this.isStandard == Datatype.STANDARD;
-	}
-	
-	@Transient
-	public boolean isCustom() {
-		return this.isStandard == Datatype.CUSTOM;
-	}
-
-	@Transient
-	@Override
-	public String toString() {
-		return "Datatype [id=" + id + ", isStandard=" + isStandard
-				+ ", xacmlId=" + xacmlId + ", shortName=" + shortName
-				+ ", attributes=" + attributes + ", functions=" + functions
-				+ ", arguments=" + arguments + "]";
-	}
+    private static final long serialVersionUID = 1L;
+
+    public static final char STANDARD = 'S';
+    public static final char CUSTOM = 'C';
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name="id")
+    private int id;
+
+    @Column(name="is_standard", nullable=false)
+    private char isStandard;
+
+    @Column(name="xacml_id", nullable=false, unique=true, length=255)
+    private String xacmlId;
+
+    @Column(name="short_name", nullable=false, length=64)
+    private String shortName;
+
+    //bi-directional many-to-one association to Attribute
+    @OneToMany(mappedBy="datatypeBean")
+    @JsonBackReference
+    private Set<Attribute> attributes = new HashSet<>();
+
+    //bi-directional many-to-one association to Attribute
+    @OneToMany(mappedBy="datatypeBean")
+    @JsonIgnore
+    private Set<FunctionDefinition> functions = new HashSet<>();
+
+    //bi-directional many-to-one association to Attribute
+    @OneToMany(mappedBy="datatypeBean")
+    @JsonIgnore
+    private Set<FunctionArgument> arguments = new HashSet<>();
+
+    public Datatype() {
+        this.xacmlId = XACML3.ID_DATATYPE_STRING.stringValue();
+        this.isStandard = Datatype.STANDARD;
+    }
+
+
+    public Datatype(int id, Datatype dt) {
+        this.id = id;
+        this.isStandard = dt.isStandard;
+        this.xacmlId = dt.xacmlId;
+        this.shortName = dt.shortName;
+        //
+        // Make a copy?
+        //
+        this.attributes = new HashSet<>();
+    }
+
+    public Datatype(Identifier identifier, char standard) {
+        if (identifier != null) {
+            this.xacmlId = identifier.stringValue();
+
+        }
+        this.isStandard = standard;
+    }
+
+    public Datatype(Identifier identifier) {
+        this(identifier, Datatype.STANDARD);
+    }
+
+    public int getId() {
+        return this.id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public char getIsStandard() {
+        return this.isStandard;
+    }
+
+    public void setIsStandard(char isStandard) {
+        this.isStandard = isStandard;
+    }
+
+    public String getXacmlId() {
+        return this.xacmlId;
+    }
+
+    public void setXacmlId(String xacmlId) {
+        this.xacmlId = xacmlId;
+    }
+
+    public String getShortName() {
+        return shortName;
+    }
+
+    public void setShortName(String shortName) {
+        this.shortName = shortName;
+    }
+
+    public Set<Attribute> getAttributes() {
+        return this.attributes;
+    }
+
+    public void setAttributes(Set<Attribute> attributes) {
+        this.attributes = attributes;
+    }
+
+    public Attribute addAttribute(Attribute attribute) {
+        getAttributes().add(attribute);
+        attribute.setDatatypeBean(this);
+
+        return attribute;
+    }
+
+    public Attribute removeAttribute(Attribute attribute) {
+        getAttributes().remove(attribute);
+        attribute.setDatatypeBean(null);
+
+        return attribute;
+    }
+
+    public Set<FunctionDefinition> getFunctions() {
+        return this.functions;
+    }
+
+    public void setFunctions(Set<FunctionDefinition> functions) {
+        this.functions = functions;
+    }
+
+    public FunctionDefinition addFunction(FunctionDefinition function) {
+        getFunctions().add(function);
+        function.setDatatypeBean(this);
+
+        return function;
+    }
+
+    public FunctionDefinition removeAttribute(FunctionDefinition function) {
+        getFunctions().remove(function);
+        function.setDatatypeBean(null);
+
+        return function;
+    }
+
+    public Set<FunctionArgument> getArguments() {
+        return this.arguments;
+    }
+
+    public void setArguments(Set<FunctionArgument> argument) {
+        this.arguments = argument;
+    }
+
+    public FunctionArgument addArgument(FunctionArgument argument) {
+        getArguments().add(argument);
+        argument.setDatatypeBean(this);
+
+        return argument;
+    }
+
+    public FunctionArgument removeArgument(FunctionArgument argument) {
+        getArguments().remove(argument);
+        argument.setDatatypeBean(null);
+
+        return argument;
+    }
+
+    @Transient
+    public Identifier getIdentifer() {
+        return new IdentifierImpl(this.xacmlId);
+    }
+
+    @Transient
+    public Identifier getIdentiferByShortName() {
+        return new IdentifierImpl(this.shortName);
+    }
+
+    @Transient
+    public boolean isStandard() {
+        return this.isStandard == Datatype.STANDARD;
+    }
+
+    @Transient
+    public boolean isCustom() {
+        return this.isStandard == Datatype.CUSTOM;
+    }
+
+    @Transient
+    @Override
+    public String toString() {
+        return "Datatype [id=" + id + ", isStandard=" + isStandard
+                + ", xacmlId=" + xacmlId + ", shortName=" + shortName
+                + ", attributes=" + attributes + ", functions=" + functions
+                + ", arguments=" + arguments + "]";
+    }
 
 }