diff options
Diffstat (limited to 'ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa')
4 files changed, 12 insertions, 12 deletions
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 184b4f80b..6badfa9a9 100644 --- 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 @@ -99,7 +99,7 @@ public class Attribute implements Serializable { //bi-directional many-to-one association to ConstraintValue @OneToMany(mappedBy="attribute", orphanRemoval=true, cascade=CascadeType.REMOVE) @JsonIgnore - private Set<ConstraintValue> constraintValues = new HashSet<ConstraintValue>(); + private Set<ConstraintValue> constraintValues = new HashSet<>(); //bi-directional many-to-one association to Category @ManyToOne @@ -259,7 +259,7 @@ public class Attribute implements Serializable { public ConstraintValue addConstraintValue(ConstraintValue constraintValue) { if (this.constraintValues == null) { - this.constraintValues = new HashSet<ConstraintValue>(); + this.constraintValues = new HashSet<>(); } this.constraintValues.add(constraintValue); constraintValue.setAttribute(this); diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/Obadvice.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/Obadvice.java index f26fc9d95..494092029 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/Obadvice.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/Obadvice.java @@ -75,7 +75,7 @@ public class Obadvice implements Serializable { //bi-directional one-to-many association to Attribute Assignment @OneToMany(mappedBy="obadvice", orphanRemoval=true, cascade=CascadeType.REMOVE) - private Set<ObadviceExpression> obadviceExpressions = new HashSet<ObadviceExpression>(2); + private Set<ObadviceExpression> obadviceExpressions = new HashSet<>(2); @Column(name="created_by", nullable=false, length=255) private String createdBy; diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PIPConfiguration.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PIPConfiguration.java index 07f1b3bbc..70a0e845f 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PIPConfiguration.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PIPConfiguration.java @@ -112,7 +112,7 @@ public class PIPConfiguration implements Serializable { //bi-directional many-to-one association to PIPConfigParam @OneToMany(mappedBy="pipconfiguration", orphanRemoval=true, cascade=CascadeType.REMOVE) - private Set<PIPConfigParam> pipconfigParams = new HashSet<PIPConfigParam>(); + private Set<PIPConfigParam> pipconfigParams = new HashSet<>(); //bi-directional many-to-one association to PIPType @ManyToOne @@ -121,7 +121,7 @@ public class PIPConfiguration implements Serializable { //bi-directional many-to-one association to PIPResolver @OneToMany(mappedBy="pipconfiguration", orphanRemoval=true, cascade=CascadeType.REMOVE) - private Set<PIPResolver> pipresolvers = new HashSet<PIPResolver>(); + private Set<PIPResolver> pipresolvers = new HashSet<>(); public PIPConfiguration() { } @@ -344,7 +344,7 @@ public class PIPConfiguration implements Serializable { @Transient public static Collection<PIPConfiguration> importPIPConfigurations(Properties properties) { - Collection<PIPConfiguration> configurations = new ArrayList<PIPConfiguration>(); + Collection<PIPConfiguration> configurations = new ArrayList<>(); String engines = properties.getProperty(XACMLProperties.PROP_PIP_ENGINES); if (engines == null || engines.isEmpty()) { return configurations; @@ -452,7 +452,7 @@ public class PIPConfiguration implements Serializable { if (prefix.endsWith(".") == false) { prefix = prefix + "."; } - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); map.put(prefix + "classname", this.classname); map.put(prefix + "name", this.name); if (this.description != null) { @@ -466,7 +466,7 @@ public class PIPConfiguration implements Serializable { map.put(prefix + param.getParamName(), param.getParamValue()); } - List<String> ids = new ArrayList<String>(); + List<String> ids = new ArrayList<>(); Iterator<PIPResolver> iter = this.pipresolvers.iterator(); while (iter.hasNext()) { PIPResolver resolver = iter.next(); @@ -508,7 +508,7 @@ public class PIPConfiguration implements Serializable { props.setProperty(prefix + param.getParamName(), param.getParamValue()); } - List<String> ids = new ArrayList<String>(); + List<String> ids = new ArrayList<>(); Iterator<PIPResolver> iter = this.pipresolvers.iterator(); while (iter.hasNext()) { PIPResolver resolver = iter.next(); diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PIPResolver.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PIPResolver.java index 634ff3e63..618c1a4ea 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PIPResolver.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PIPResolver.java @@ -103,7 +103,7 @@ public class PIPResolver implements Serializable { //bi-directional many-to-one association to PIPResolverParam @OneToMany(mappedBy="pipresolver", orphanRemoval=true, cascade=CascadeType.REMOVE) - private Set<PIPResolverParam> pipresolverParams = new HashSet<PIPResolverParam>(); + private Set<PIPResolverParam> pipresolverParams = new HashSet<>(); public PIPResolver() { } @@ -274,7 +274,7 @@ public class PIPResolver implements Serializable { @Transient public static Collection<PIPResolver> importResolvers(String prefix, String list, Properties properties, String user) throws PIPException { - Collection<PIPResolver> resolvers = new ArrayList<PIPResolver>(); + Collection<PIPResolver> resolvers = new ArrayList<>(); for (String id : Splitter.on(',').trimResults().omitEmptyStrings().split(list)) { resolvers.add(new PIPResolver(prefix + "." + id, properties, user)); } @@ -316,7 +316,7 @@ public class PIPResolver implements Serializable { @Transient public Map<String, String> getConfiguration(String prefix) { - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); if (prefix.endsWith(".") == false) { prefix = prefix + "."; } |