diff options
Diffstat (limited to 'plugins/org.eclipse.osee.orcs.core/src')
66 files changed, 124 insertions, 124 deletions
diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/DynamicData.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/DynamicData.java index 7a228fff4e5..86ccc4a1643 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/DynamicData.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/DynamicData.java @@ -71,7 +71,7 @@ public class DynamicData extends BaseIdentity<String> implements Named { public void put(String key, Object value) { if (properties == null) { - properties = new LinkedHashMap<String, Object>(); + properties = new LinkedHashMap<>(); } properties.put(key, value); } diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/DynamicObject.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/DynamicObject.java index 9497fba9e88..56cd739065a 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/DynamicObject.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/DynamicObject.java @@ -18,7 +18,7 @@ import org.eclipse.osee.framework.jdk.core.util.Conditions; */ public class DynamicObject extends DynamicData { - private final ArrayList<DynamicData> children = new ArrayList<DynamicData>(); + private final ArrayList<DynamicData> children = new ArrayList<>(); public DynamicObject(String uid, String alias) { super(uid, alias); diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/Options.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/Options.java index dcefa66071d..0104804153f 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/Options.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/Options.java @@ -22,7 +22,7 @@ import java.util.Set; public class Options implements Cloneable { private static final String EXCEPTION_MESSAGE = "No setting found for key: [%s]"; - private final Map<String, Object> data = new HashMap<String, Object>(); + private final Map<String, Object> data = new HashMap<>(); protected Options() { super(); diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/QueryData.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/QueryData.java index 9f4cde4cbb1..683cdaddd81 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/QueryData.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/QueryData.java @@ -40,7 +40,7 @@ public class QueryData implements HasOptions, Cloneable { } public List<Criteria> getAllCriteria() { - List<Criteria> allCriterias = new ArrayList<Criteria>(); + List<Criteria> allCriterias = new ArrayList<>(); for (CriteriaSet set : criterias) { allCriterias.addAll(set.getCriterias()); } @@ -108,7 +108,7 @@ public class QueryData implements HasOptions, Cloneable { @Override public QueryData clone() { - List<CriteriaSet> newCriterias = new ArrayList<CriteriaSet>(criterias.size()); + List<CriteriaSet> newCriterias = new ArrayList<>(criterias.size()); for (CriteriaSet criteriaSet : criterias) { newCriterias.add(criteriaSet.clone()); } diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/SelectData.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/SelectData.java index 681de078604..10240eca784 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/SelectData.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/SelectData.java @@ -22,7 +22,7 @@ public class SelectData implements Cloneable { private final List<SelectSet> selects; public SelectData() { - this.selects = new ArrayList<SelectSet>(); + this.selects = new ArrayList<>(); this.selects.add(new SelectSet()); } @@ -66,7 +66,7 @@ public class SelectData implements Cloneable { @Override public SelectData clone() { - List<SelectSet> cloned = new ArrayList<SelectSet>(selects.size()); + List<SelectSet> cloned = new ArrayList<>(selects.size()); for (SelectSet select : selects) { cloned.add(select.clone()); } diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaArtifactGuids.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaArtifactGuids.java index 7d5ee7af01c..c9cc091c440 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaArtifactGuids.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaArtifactGuids.java @@ -34,7 +34,7 @@ public class CriteriaArtifactGuids extends Criteria { @Override public void checkValid(Options options) throws OseeCoreException { Conditions.checkNotNullOrEmpty(artifactGuids, "artifact guids"); - List<String> invalids = new ArrayList<String>(); + List<String> invalids = new ArrayList<>(); for (String guid : artifactGuids) { if (!GUID.isValid(guid)) { invalids.add(guid); diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaArtifactType.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaArtifactType.java index aa226c92465..73b4925d405 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaArtifactType.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaArtifactType.java @@ -47,7 +47,7 @@ public class CriteriaArtifactType extends Criteria { public Collection<? extends IArtifactType> getTypes() throws OseeCoreException { Collection<? extends IArtifactType> toReturn; if (includeTypeInheritance) { - Collection<IArtifactType> typesToUse = new LinkedHashSet<IArtifactType>(); + Collection<IArtifactType> typesToUse = new LinkedHashSet<>(); for (IArtifactType type : getOriginalTypes()) { for (IArtifactType descendant : artTypeCache.getAllDescendantTypes(type)) { typesToUse.add(descendant); diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaAttributeKeywords.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaAttributeKeywords.java index 60672c8d0c2..7880a68c800 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaAttributeKeywords.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaAttributeKeywords.java @@ -85,7 +85,7 @@ public class CriteriaAttributeKeywords extends Criteria { public void checkNotTaggable() throws OseeCoreException { if (!includeAllTypes) { - ArrayList<String> notTaggable = new ArrayList<String>(); + ArrayList<String> notTaggable = new ArrayList<>(); if (attributeTypeCache != null) { for (IAttributeType type : attributeType) { if (!attributeTypeCache.isTaggable(type)) { diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaTxArtifactGuids.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaTxArtifactGuids.java index cae8f95ea9b..2936a2a8a06 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaTxArtifactGuids.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/criteria/CriteriaTxArtifactGuids.java @@ -34,7 +34,7 @@ public class CriteriaTxArtifactGuids extends Criteria implements TxCriteria { @Override public void checkValid(Options options) throws OseeCoreException { Conditions.checkNotNullOrEmpty(artifactGuids, "artifact guids"); - List<String> invalids = new ArrayList<String>(); + List<String> invalids = new ArrayList<>(); for (String guid : artifactGuids) { if (!GUID.isValid(guid)) { invalids.add(guid); diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/SystemPreferencesImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/SystemPreferencesImpl.java index 2fed19217b5..c0a8e922f2d 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/SystemPreferencesImpl.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/SystemPreferencesImpl.java @@ -33,7 +33,7 @@ public class SystemPreferencesImpl implements SystemPreferences { } public void start() { - cache = new ConcurrentHashMap<String, Pair<Long, String>>(); + cache = new ConcurrentHashMap<>(); } public void stop() { diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/artifact/ArtifactFactory.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/artifact/ArtifactFactory.java index eea171c0d8a..cb37c782f4e 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/artifact/ArtifactFactory.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/artifact/ArtifactFactory.java @@ -137,7 +137,7 @@ public class ArtifactFactory { } private Collection<? extends IAttributeType> getAllowedTypes(Artifact destination, Collection<? extends IAttributeType> types) throws OseeCoreException { - Set<IAttributeType> toReturn = new HashSet<IAttributeType>(); + Set<IAttributeType> toReturn = new HashSet<>(); for (IAttributeType type : types) { if (!CoreAttributeTypes.RelationOrder.equals(type)) { if (destination.isAttributeTypeValid(type)) { diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/AttributeFactory.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/AttributeFactory.java index 46ee2bc4048..0d477c17c75 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/AttributeFactory.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/AttributeFactory.java @@ -59,7 +59,7 @@ public class AttributeFactory { ResourceNameResolver resolver = createResolver(attribute); proxy.setResolver(resolver); - Reference<AttributeContainer> artifactRef = new WeakReference<AttributeContainer>(container); + Reference<AttributeContainer> artifactRef = new WeakReference<>(container); attribute.internalInitialize(cache, artifactRef, data, isDirty, createWithDefaults); container.add(type, attribute); @@ -86,7 +86,7 @@ public class AttributeFactory { if (source.getVersion().isInStorage()) { try { destinationAttribute = destination.getAttributeById(source, DeletionFlag.INCLUDE_DELETED); - Reference<AttributeContainer> artifactRef = new WeakReference<AttributeContainer>(destination); + Reference<AttributeContainer> artifactRef = new WeakReference<>(destination); destinationAttribute.internalInitialize(cache, artifactRef, attributeData, true, false); } catch (AttributeDoesNotExist ex) { destinationAttribute = createAttribute(destination, attributeData); diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/AttributeManagerImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/AttributeManagerImpl.java index 56e9948cd2f..337e2833870 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/AttributeManagerImpl.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/AttributeManagerImpl.java @@ -170,7 +170,7 @@ public abstract class AttributeManagerImpl extends BaseIdentity<String> implemen public <T> List<T> getAttributeValues(IAttributeType attributeType) throws OseeCoreException { List<Attribute<T>> attributes = getAttributesExcludeDeleted(attributeType); - List<T> values = new LinkedList<T>(); + List<T> values = new LinkedList<>(); for (Attribute<T> attribute : attributes) { T value = attribute.getValue(); if (value != null) { @@ -286,7 +286,7 @@ public abstract class AttributeManagerImpl extends BaseIdentity<String> implemen @Override public <T> void setAttributesFromValues(IAttributeType attributeType, Collection<T> values) throws OseeCoreException { - AttributeSetHelper<T, T> setter = new TypedValueAttributeSetHelper<T>(attributes, this); + AttributeSetHelper<T, T> setter = new TypedValueAttributeSetHelper<>(attributes, this); setAttributesFromValuesHelper(setter, attributeType, values); } @@ -413,9 +413,9 @@ public abstract class AttributeManagerImpl extends BaseIdentity<String> implemen private <A, T> void setAttributesFromValuesHelper(AttributeSetHelper<A, T> helper, IAttributeType attributeType, Collection<T> values) throws OseeCoreException { ensureAttributesLoaded(); - Set<T> uniqueItems = new LinkedHashSet<T>(values); + Set<T> uniqueItems = new LinkedHashSet<>(values); List<Attribute<A>> remainingAttributes = getAttributesExcludeDeleted(attributeType); - List<T> remainingNewValues = new ArrayList<T>(uniqueItems.size()); + List<T> remainingNewValues = new ArrayList<>(uniqueItems.size()); // all existing attributes matching a new value will be left untouched for (T newValue : uniqueItems) { diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/primitives/PrimitiveAttributeClassProvider.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/primitives/PrimitiveAttributeClassProvider.java index 0fcbe00b402..1efe7526367 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/primitives/PrimitiveAttributeClassProvider.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/attribute/primitives/PrimitiveAttributeClassProvider.java @@ -22,7 +22,7 @@ public class PrimitiveAttributeClassProvider implements AttributeClassProvider { @Override public List<Class<? extends Attribute<?>>> getClasses() { - List<Class<? extends Attribute<?>>> clazzes = new ArrayList<Class<? extends Attribute<?>>>(); + List<Class<? extends Attribute<?>>> clazzes = new ArrayList<>(); clazzes.add(BooleanAttribute.class); clazzes.add(IntegerAttribute.class); diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/branch/PurgeBranchCallable.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/branch/PurgeBranchCallable.java index 7ea84c0397b..9a07f60c906 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/branch/PurgeBranchCallable.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/branch/PurgeBranchCallable.java @@ -53,7 +53,7 @@ public class PurgeBranchCallable extends AbstractBranchCallable<List<IOseeBranch ResultSet<BranchReadable> branches = branchQuery.getResults(); - List<IOseeBranch> purged = new LinkedList<IOseeBranch>(); + List<IOseeBranch> purged = new LinkedList<>(); List<BranchReadable> orderedBranches = BranchUtil.orderByParentReadable(queryFactory, branches); for (BranchReadable aBranch : orderedBranches) { checkForCancelled(); diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/branch/provider/DeletedBranchProvider.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/branch/provider/DeletedBranchProvider.java index e11c26647f9..a7e8d92ec50 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/branch/provider/DeletedBranchProvider.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/branch/provider/DeletedBranchProvider.java @@ -40,7 +40,7 @@ public final class DeletedBranchProvider implements BranchProvider { branchFilter.setNegatedBranchTypes(BranchType.BASELINE); List<Branch> branches = branchCache.getBranches(branchFilter); - Collection<Branch> branchesToReturn = new LinkedHashSet<Branch>(); + Collection<Branch> branchesToReturn = new LinkedHashSet<>(); branchesToReturn.addAll(branches); for (Branch branch : branches) { branch.getChildBranches(branchesToReturn, true, branchFilter); diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/branch/provider/MultiBranchProvider.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/branch/provider/MultiBranchProvider.java index 298755b99ae..2816b4c006e 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/branch/provider/MultiBranchProvider.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/branch/provider/MultiBranchProvider.java @@ -34,7 +34,7 @@ public class MultiBranchProvider implements BranchProvider { } private Collection<Branch> getChildBranches(Branch branch) throws OseeCoreException { - Set<Branch> children = new HashSet<Branch>(); + Set<Branch> children = new HashSet<>(); branch.getChildBranches(children, true, filter); if (filter.matches(branch)) { @@ -48,7 +48,7 @@ public class MultiBranchProvider implements BranchProvider { Conditions.checkNotNull(branches, "seeds"); Set<Branch> result = branches; if (recursive) { - result = new HashSet<Branch>(branches); + result = new HashSet<>(branches); for (Branch b : branches) { result.addAll(getChildBranches(b)); } diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/BranchCommand.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/BranchCommand.java index 750a1a04fe9..9d475ae859d 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/BranchCommand.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/BranchCommand.java @@ -92,7 +92,7 @@ public final class BranchCommand implements ConsoleCommand { private BranchType[] toBranchType(String[] types, boolean alllIfEmpty) { BranchType[] toReturn = new BranchType[0]; if (types != null && types.length > 0) { - Set<BranchType> data = new HashSet<BranchType>(); + Set<BranchType> data = new HashSet<>(); for (String type : types) { BranchType typeEnum = BranchType.valueOf(type.toUpperCase()); data.add(typeEnum); @@ -109,7 +109,7 @@ public final class BranchCommand implements ConsoleCommand { private BranchState[] toBranchState(String[] types, boolean alllIfEmpty) { BranchState[] toReturn = new BranchState[0]; if (types != null && types.length > 0) { - Set<BranchState> data = new HashSet<BranchState>(); + Set<BranchState> data = new HashSet<>(); for (String type : types) { BranchState typeEnum = BranchState.valueOf(type.toUpperCase()); data.add(typeEnum); diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/BranchExportCommand.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/BranchExportCommand.java index 0273d7f5496..59e8ca2f3cf 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/BranchExportCommand.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/BranchExportCommand.java @@ -107,7 +107,7 @@ public final class BranchExportCommand implements ConsoleCommand { } private List<IOseeBranch> getBranchesToExport() throws OseeCoreException { - List<IOseeBranch> branches = new LinkedList<IOseeBranch>(); + List<IOseeBranch> branches = new LinkedList<>(); BranchQuery branchQuery = orcsApi.getQueryFactory().branchQuery(); if (includeBranchIds.isEmpty()) { ResultSet<BranchReadable> branchReadables = null; diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/BranchImportCommand.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/BranchImportCommand.java index fa2c7068b9e..b8a480590ef 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/BranchImportCommand.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/BranchImportCommand.java @@ -104,7 +104,7 @@ public final class BranchImportCommand implements ConsoleCommand { throw new OseeArgumentException("Files to import were not specified"); } - List<IOseeBranch> branches = new LinkedList<IOseeBranch>(); + List<IOseeBranch> branches = new LinkedList<>(); for (String branchUuidString : branchUuids) { IOseeBranch branch = branchQuery.andUuids(Long.valueOf(branchUuidString)).getResults().getExactlyOne(); branches.add(branch); diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/BranchPurgeCommand.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/BranchPurgeCommand.java index c739f10a9f6..dc598e27f45 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/BranchPurgeCommand.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/BranchPurgeCommand.java @@ -86,7 +86,7 @@ public final class BranchPurgeCommand implements ConsoleCommand { @Override public Callable<?> createCallable(Console console, ConsoleParameters params) { - List<Long> branchUuids = new ArrayList<Long>(); + List<Long> branchUuids = new ArrayList<>(); for (String uuid : params.getArray("branchUuids")) { if (Strings.isNumeric(uuid)) { branchUuids.add(Long.parseLong(uuid)); @@ -150,7 +150,7 @@ public final class BranchPurgeCommand implements ConsoleCommand { } private Collection<BranchReadable> getBranchesToPurge() throws OseeCoreException { - Set<BranchReadable> specifiedBranches = new HashSet<BranchReadable>(); + Set<BranchReadable> specifiedBranches = new HashSet<>(); for (Long uuid : branchUuids) { if (uuid <= 0) { console.writeln("UUID listed %s is not a valid UUID", uuid); @@ -195,7 +195,7 @@ public final class BranchPurgeCommand implements ConsoleCommand { branchQuery.andStateIs(BranchState.DELETED); } - Set<BranchReadable> results = new HashSet<BranchReadable>(); + Set<BranchReadable> results = new HashSet<>(); for (BranchReadable parent : branches) { for (BranchReadable branch : branchQuery.andIsChildOf(parent).getResults()) { if (includeUnarchived || branch.getArchiveState() == BranchArchivedState.ARCHIVED) { @@ -224,7 +224,7 @@ public final class BranchPurgeCommand implements ConsoleCommand { console.writeln("Branch [%s] guid [%s] will be purged!", toPurge.getName(), toPurge.getGuid()); } - List<IOseeBranch> purged = new LinkedList<IOseeBranch>(); + List<IOseeBranch> purged = new LinkedList<>(); if (runPurge) { int size = orderedBranches.size(); int count = 0; diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/IndexStatusDisplayCollector.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/IndexStatusDisplayCollector.java index 3e19c290181..48eb4f60b4f 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/IndexStatusDisplayCollector.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/IndexStatusDisplayCollector.java @@ -22,7 +22,7 @@ import org.eclipse.osee.orcs.search.IndexerCollectorAdapter; public final class IndexStatusDisplayCollector extends IndexerCollectorAdapter { private final int DEFAULT_STATS_PRINT_FREQUENCY = 1000; - private final List<Integer> taskIds = new CopyOnWriteArrayList<Integer>(); + private final List<Integer> taskIds = new CopyOnWriteArrayList<>(); private int attributesProcessed; private int queriesProcessed; private final long startTime; diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/IndexerCommand.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/IndexerCommand.java index 672feb9288e..cad474596dc 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/IndexerCommand.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/IndexerCommand.java @@ -106,7 +106,7 @@ public class IndexerCommand implements ConsoleCommand { long startTime = System.currentTimeMillis(); boolean indexOnlyMissingitems = false; - Set<BranchReadable> branches = new HashSet<BranchReadable>(); + Set<BranchReadable> branches = new HashSet<>(); String[] uuids = params.getArray("branchUuids"); if (uuids != null & uuids.length > 0) { for (String uuid : uuids) { @@ -136,7 +136,7 @@ public class IndexerCommand implements ConsoleCommand { break; case ITEM_IDS: boolean printTags = params.getBoolean("debug"); - Set<Long> ids = new LinkedHashSet<Long>(); + Set<Long> ids = new LinkedHashSet<>(); for (String value : params.getArray("ids")) { ids.add(Long.parseLong(value)); } diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/PerformanceInfoCommand.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/PerformanceInfoCommand.java index c7aa20929a7..580451418a8 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/PerformanceInfoCommand.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/PerformanceInfoCommand.java @@ -60,7 +60,7 @@ public class PerformanceInfoCommand implements ConsoleCommand { } private Collection<StatsType> toStatusTypes(String[] stats) { - Collection<StatsType> statsType = new HashSet<StatsType>(); + Collection<StatsType> statsType = new HashSet<>(); boolean addAllStatTypes = false; if (stats != null && stats.length > 0) { diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/PurgeArtifactTypeCommand.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/PurgeArtifactTypeCommand.java index 45edf5d73cc..b28ae7414ab 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/PurgeArtifactTypeCommand.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/PurgeArtifactTypeCommand.java @@ -79,7 +79,7 @@ public class PurgeArtifactTypeCommand implements ConsoleCommand { private Set<IArtifactType> getTypes(String[] typesToPurge) throws OseeCoreException { ArtifactTypes artifactTypes = orcsTypes.getArtifactTypes(); - Set<IArtifactType> toReturn = new HashSet<IArtifactType>(); + Set<IArtifactType> toReturn = new HashSet<>(); for (String uuid : typesToPurge) { try { Long typeId = HexUtil.toLong(uuid); diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/PurgeAttributeTypeCommand.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/PurgeAttributeTypeCommand.java index f7a2a74432d..13ce72e3e6e 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/PurgeAttributeTypeCommand.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/PurgeAttributeTypeCommand.java @@ -86,7 +86,7 @@ public class PurgeAttributeTypeCommand implements ConsoleCommand { private Set<IAttributeType> getTypes(String[] typesToPurge) throws OseeCoreException { AttributeTypes attributeTypes = orcsTypes.getAttributeTypes(); - Set<IAttributeType> toReturn = new HashSet<IAttributeType>(); + Set<IAttributeType> toReturn = new HashSet<>(); for (String uuid : typesToPurge) { try { Long typeId = -1L; diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/PurgeRelationTypeCommand.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/PurgeRelationTypeCommand.java index f0568e4b52c..aaa6723954c 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/PurgeRelationTypeCommand.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/PurgeRelationTypeCommand.java @@ -79,7 +79,7 @@ public class PurgeRelationTypeCommand implements ConsoleCommand { private Set<IRelationType> getTypes(String[] typesToPurge) throws OseeCoreException { RelationTypes relationTypes = orcsTypes.getRelationTypes(); - Set<IRelationType> toReturn = new HashSet<IRelationType>(); + Set<IRelationType> toReturn = new HashSet<>(); for (String uuid : typesToPurge) { try { Long typeId = HexUtil.toLong(uuid); diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/PurgeTransactionCommand.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/PurgeTransactionCommand.java index 3a78833c63e..5478c5a557a 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/PurgeTransactionCommand.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/console/PurgeTransactionCommand.java @@ -60,7 +60,7 @@ public class PurgeTransactionCommand implements ConsoleCommand { @Override public Object call() throws Exception { String[] stringIds = params.getArray("txIds"); - final List<ITransaction> transactions = new ArrayList<ITransaction>(); + final List<ITransaction> transactions = new ArrayList<>(); for (String arg : stringIds) { ITransaction tx = TokenFactory.createTransaction(Integer.parseInt(arg)); transactions.add(tx); diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/graph/impl/GraphBuilderImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/graph/impl/GraphBuilderImpl.java index d93340f1b73..eb137563da0 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/graph/impl/GraphBuilderImpl.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/graph/impl/GraphBuilderImpl.java @@ -43,7 +43,7 @@ public class GraphBuilderImpl extends LoadDataHandlerAdapter implements GraphBui private final RelationFactory relationFactory; private final GraphProvider graphProvider; - private final Set<Artifact> updated = new LinkedHashSet<Artifact>(); + private final Set<Artifact> updated = new LinkedHashSet<>(); private GraphData graph; public GraphBuilderImpl(Log logger, ArtifactFactory artifactFactory, AttributeFactory attributeFactory, RelationFactory relationFactory, GraphProvider graphProvider) { diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/graph/impl/GraphDataImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/graph/impl/GraphDataImpl.java index f5e18704492..c0068b6ce4a 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/graph/impl/GraphDataImpl.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/graph/impl/GraphDataImpl.java @@ -26,8 +26,8 @@ import org.eclipse.osee.orcs.core.internal.graph.GraphNode; */ public class GraphDataImpl implements GraphData { - private final Map<Integer, GraphNode> nodesById = new ConcurrentHashMap<Integer, GraphNode>(); - private final Map<Integer, GraphAdjacencies> adjacenciesById = new ConcurrentHashMap<Integer, GraphAdjacencies>(); + private final Map<Integer, GraphNode> nodesById = new ConcurrentHashMap<>(); + private final Map<Integer, GraphAdjacencies> adjacenciesById = new ConcurrentHashMap<>(); private final IOseeBranch branch; private final int txId; diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/proxy/impl/ArtifactReadOnlyImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/proxy/impl/ArtifactReadOnlyImpl.java index a0dafa16ad9..685ed6d62dd 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/proxy/impl/ArtifactReadOnlyImpl.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/proxy/impl/ArtifactReadOnlyImpl.java @@ -224,7 +224,7 @@ public class ArtifactReadOnlyImpl extends AbstractProxied<Artifact>implements Ar @Override public List<ArtifactReadable> getDescendants() throws OseeCoreException { - List<ArtifactReadable> descendants = new LinkedList<ArtifactReadable>(); + List<ArtifactReadable> descendants = new LinkedList<>(); getDescendants(descendants); return descendants; } @@ -239,7 +239,7 @@ public class ArtifactReadOnlyImpl extends AbstractProxied<Artifact>implements Ar @Override public List<ArtifactReadable> getAncestors() throws OseeCoreException { - List<ArtifactReadable> ancestors = new ArrayList<ArtifactReadable>(); + List<ArtifactReadable> ancestors = new ArrayList<>(); for (ArtifactReadable parent = getParent(); parent != null; parent = parent.getParent()) { ancestors.add(parent); } diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/RelationTypeValidity.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/RelationTypeValidity.java index 45daf9b6982..94d5d3608fe 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/RelationTypeValidity.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/RelationTypeValidity.java @@ -103,7 +103,7 @@ public class RelationTypeValidity { public List<IRelationType> getValidRelationTypes(IArtifactType artifactType) throws OseeCoreException { Conditions.checkNotNull(artifactType, "artifactType"); Collection<? extends IRelationType> types = relationTypes.getAll(); - List<IRelationType> toReturn = new ArrayList<IRelationType>(); + List<IRelationType> toReturn = new ArrayList<>(); for (IRelationType relationType : types) { if (isTypeAllowed(artifactType, relationType)) { toReturn.add(relationType); diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationManagerImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationManagerImpl.java index c673fb10eba..110bbc43f51 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationManagerImpl.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationManagerImpl.java @@ -298,7 +298,7 @@ public class RelationManagerImpl implements RelationManager { resolver.resolve(session, graph, relations, otherSide); boolean modified = false; - Set<RelationNode> otherNodes = new LinkedHashSet<RelationNode>(); + Set<RelationNode> otherNodes = new LinkedHashSet<>(); for (Relation relation : relations) { relation.delete(); Integer artId = relation.getLocalIdForSide(otherSide); @@ -333,7 +333,7 @@ public class RelationManagerImpl implements RelationManager { node.delete(); if (relations != null && !relations.isEmpty()) { - Map<IRelationType, RelationSide> typesToRemove = new HashMap<IRelationType, RelationSide>(); + Map<IRelationType, RelationSide> typesToRemove = new HashMap<>(); for (Relation relation : relations) { relation.delete(); IRelationType type = relation.getRelationType(); @@ -435,7 +435,7 @@ public class RelationManagerImpl implements RelationManager { List<Identifiable<String>> relatives = Collections.emptyList(); if (RelationOrderBaseTypes.USER_DEFINED == sorterIdToUse) { ResultSet<RelationNode> arts = getRelated(session, type, node1, side); - relatives = new LinkedList<Identifiable<String>>(); + relatives = new LinkedList<>(); for (RelationNode art : arts) { relatives.add(art); } diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationResolverImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationResolverImpl.java index 28f56c52464..c6c1dd590c2 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationResolverImpl.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/impl/RelationResolverImpl.java @@ -47,14 +47,14 @@ public class RelationResolverImpl implements RelationResolver { List<T> toReturn = Collections.emptyList(); if (!links.isEmpty()) { Set<Integer> toLoad = null; - LinkedHashMap<Integer, T> items = new LinkedHashMap<Integer, T>(); + LinkedHashMap<Integer, T> items = new LinkedHashMap<>(); for (Relation relation : links) { for (RelationSide side : sides) { int localId = relation.getLocalIdForSide(side); RelationNode node = graph.getNode(localId); if (node == null) { if (toLoad == null) { - toLoad = new LinkedHashSet<Integer>(); + toLoad = new LinkedHashSet<>(); } toLoad.add(localId); } diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderEntryComparator.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderEntryComparator.java index 650af7ac9a9..3cfdbaecfdb 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderEntryComparator.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderEntryComparator.java @@ -37,8 +37,8 @@ public class OrderEntryComparator implements Comparator<Entry<IRelationTypeSide, result = orderData1.getSorterId().getGuid().compareTo(orderData2.getSorterId().getGuid()); } if (result == 0) { - List<String> guids1 = new ArrayList<String>(orderData1.getOrderIds()); - List<String> guids2 = new ArrayList<String>(orderData2.getOrderIds()); + List<String> guids1 = new ArrayList<>(orderData1.getOrderIds()); + List<String> guids2 = new ArrayList<>(orderData2.getOrderIds()); result = guids1.size() - guids2.size(); if (result == 0) { Collections.sort(guids1); diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderManager.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderManager.java index 338753ef2d8..5263d80f162 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderManager.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderManager.java @@ -35,7 +35,7 @@ public class OrderManager implements HasOrderData { private static final OrderEntryComparator ENTRY_COMPARATOR = new OrderEntryComparator(); - private final Map<IRelationTypeSide, OrderData> orderDataMap = new ConcurrentHashMap<IRelationTypeSide, OrderData>(); + private final Map<IRelationTypeSide, OrderData> orderDataMap = new ConcurrentHashMap<>(); private final OrderAccessor accessor; private final SorterProvider sorterProvider; @@ -140,7 +140,7 @@ public class OrderManager implements HasOrderData { public void setOrder(IRelationTypeSide typeAndSide, IRelationSorterId sorterId, List<? extends Identifiable<String>> relativeSequence) throws OseeCoreException { List<String> sequence; if (!relativeSequence.isEmpty()) { - sequence = new ArrayList<String>(); + sequence = new ArrayList<>(); for (Identifiable<String> item : relativeSequence) { sequence.add(item.getGuid()); } diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderParser.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderParser.java index de6ec87cf67..0a1f6e14b75 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderParser.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderParser.java @@ -105,7 +105,7 @@ public class OrderParser { if (relationTypeName != null && orderType != null && relationSide != null) { List<String> list = Collections.emptyList(); if (rawList != null) { - list = new ArrayList<String>(); + list = new ArrayList<>(); StringTokenizer tokenizer = new StringTokenizer(rawList, ","); while (tokenizer.hasMoreTokens()) { list.add(tokenizer.nextToken()); diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/sorter/SorterProvider.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/sorter/SorterProvider.java index 07ea868d834..47f13cf9889 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/sorter/SorterProvider.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/sorter/SorterProvider.java @@ -32,8 +32,8 @@ import org.eclipse.osee.orcs.utility.SortOrder; */ public class SorterProvider { - private final Map<IRelationSorterId, Sorter> orderMap = new HashMap<IRelationSorterId, Sorter>(); - private final List<IRelationSorterId> ids = new ArrayList<IRelationSorterId>(); + private final Map<IRelationSorterId, Sorter> orderMap = new HashMap<>(); + private final List<IRelationSorterId> ids = new ArrayList<>(); private final RelationTypes typeCache; diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/sorter/UserDefinedComparator.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/sorter/UserDefinedComparator.java index 7d8d0dbae16..199a0189506 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/sorter/UserDefinedComparator.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/relation/sorter/UserDefinedComparator.java @@ -24,7 +24,7 @@ public class UserDefinedComparator implements Comparator<Identifiable<String>> { private final Map<String, Integer> value; public UserDefinedComparator(List<String> guidOrder) { - value = new HashMap<String, Integer>(guidOrder.size()); + value = new HashMap<>(guidOrder.size()); for (int i = 0; i < guidOrder.size(); i++) { value.put(guidOrder.get(i), i); } diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/script/OrcsScriptEngineFactory.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/script/OrcsScriptEngineFactory.java index 3ca594736cf..ca8fbf2565f 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/script/OrcsScriptEngineFactory.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/script/OrcsScriptEngineFactory.java @@ -35,7 +35,7 @@ public class OrcsScriptEngineFactory implements ScriptEngineFactory { private static List<String> mimeTypes; private static List<String> aliases; static { - List<String> names = new ArrayList<String>(6); + List<String> names = new ArrayList<>(6); names.add("orcs"); names.add("OrcsScript"); names.add(SCRIPT_NAME); @@ -43,12 +43,12 @@ public class OrcsScriptEngineFactory implements ScriptEngineFactory { names.add("orcsdsl"); aliases = Collections.unmodifiableList(names); - List<String> mimeTypes = new ArrayList<String>(4); + List<String> mimeTypes = new ArrayList<>(4); mimeTypes.add("application/orcsscript"); mimeTypes.add("text/orcsscript"); OrcsScriptEngineFactory.mimeTypes = Collections.unmodifiableList(mimeTypes); - List<String> extensions = new ArrayList<String>(1); + List<String> extensions = new ArrayList<>(1); extensions.add("orcs"); OrcsScriptEngineFactory.extensions = Collections.unmodifiableList(extensions); } diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/script/impl/ExcelOutputHandler.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/script/impl/ExcelOutputHandler.java index 416a35fd497..6376be95c00 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/script/impl/ExcelOutputHandler.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/script/impl/ExcelOutputHandler.java @@ -63,7 +63,7 @@ public class ExcelOutputHandler extends OrcsScriptOutputHandler { private int numSheets; private int querySheetNum; private final HeaderCollector headers = new HeaderCollector(); - private final List<Map<String, Object>> providedData = new LinkedList<Map<String, Object>>(); + private final List<Map<String, Object>> providedData = new LinkedList<>(); public ExcelOutputHandler(ScriptContext context) { super(); @@ -106,7 +106,7 @@ public class ExcelOutputHandler extends OrcsScriptOutputHandler { @Override public void onError(Throwable th) { if (errors == null) { - errors = new ArrayList<Throwable>(); + errors = new ArrayList<>(); } errors.add(th); } @@ -463,8 +463,8 @@ public class ExcelOutputHandler extends OrcsScriptOutputHandler { private static final class DebugInfo { public String scriptVersion; - public final List<LoadDescription> descriptions = new ArrayList<LoadDescription>(); - private final List<QueryData> queries = new ArrayList<QueryData>(); + public final List<LoadDescription> descriptions = new ArrayList<>(); + private final List<QueryData> queries = new ArrayList<>(); public void setScriptVersion(String version) { this.scriptVersion = version; @@ -493,7 +493,7 @@ public class ExcelOutputHandler extends OrcsScriptOutputHandler { private static final class HeaderCollector { - private final List<List<String>> columnGroups = new ArrayList<List<String>>(); + private final List<List<String>> columnGroups = new ArrayList<>(); private volatile int totalSize = -1; public void clear() { @@ -510,7 +510,7 @@ public class ExcelOutputHandler extends OrcsScriptOutputHandler { private void processHelper(Map<String, Object> data, int index) { List<String> columns; if (index >= columnGroups.size()) { - columns = new ArrayList<String>(data.keySet()); + columns = new ArrayList<>(data.keySet()); columnGroups.add(columns); } else { columns = columnGroups.get(index); @@ -545,7 +545,7 @@ public class ExcelOutputHandler extends OrcsScriptOutputHandler { } public Iterable<String> getHeaders() { - List<String> headings = new ArrayList<String>(); + List<String> headings = new ArrayList<>(); for (Collection<String> attributes : columnGroups) { for (String value : attributes) { headings.add(value); diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/script/impl/JsonOutputHandler.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/script/impl/JsonOutputHandler.java index cbdc2bafb8a..45155e4ff02 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/script/impl/JsonOutputHandler.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/script/impl/JsonOutputHandler.java @@ -122,7 +122,7 @@ public class JsonOutputHandler extends OrcsScriptOutputHandler { @Override public void onError(Throwable th) { if (errors == null) { - errors = new ArrayList<Throwable>(); + errors = new ArrayList<>(); } errors.add(th); } @@ -371,8 +371,8 @@ public class JsonOutputHandler extends OrcsScriptOutputHandler { private static final class DebugInfo { public String scriptVersion; - public final List<LoadDescription> descriptions = new ArrayList<LoadDescription>(); - private final List<QueryData> queries = new ArrayList<QueryData>(); + public final List<LoadDescription> descriptions = new ArrayList<>(); + private final List<QueryData> queries = new ArrayList<>(); public void setScriptVersion(String version) { this.scriptVersion = version; diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/script/impl/JsonOutputMath.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/script/impl/JsonOutputMath.java index 9284b151347..984949bb186 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/script/impl/JsonOutputMath.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/script/impl/JsonOutputMath.java @@ -52,7 +52,7 @@ public class JsonOutputMath { doMax = Boolean.parseBoolean(String.valueOf(max)); Object min = context.getAttribute(OUTPUT_MIN); doMin = Boolean.parseBoolean(String.valueOf(min)); - attributeValues = new LinkedList<Double>(); + attributeValues = new LinkedList<>(); } public boolean isUsed() { diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/script/impl/OrcsScriptAssemblerImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/script/impl/OrcsScriptAssemblerImpl.java index 685922cec1c..886cd5037c0 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/script/impl/OrcsScriptAssemblerImpl.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/script/impl/OrcsScriptAssemblerImpl.java @@ -53,7 +53,7 @@ public class OrcsScriptAssemblerImpl implements OrcsScriptAssembler, OrcsScriptE private final BranchCriteriaFactory factory2; private final CriteriaFactory factory3; - private final LinkedList<QueryData> queries = new LinkedList<QueryData>(); + private final LinkedList<QueryData> queries = new LinkedList<>(); private String version; private TxQueryBuilderImpl<?> txQuery; private ArtifactQueryBuilderImpl<?> artQuery; @@ -102,7 +102,7 @@ public class OrcsScriptAssemblerImpl implements OrcsScriptAssembler, OrcsScriptE OptionsUtil.setIncludeDeletedAttributes(options, false); OptionsUtil.setIncludeDeletedRelations(options, false); - List<CriteriaSet> criterias = new ArrayList<CriteriaSet>(); + List<CriteriaSet> criterias = new ArrayList<>(); criterias.add(new CriteriaSet()); queries.add(new QueryData(options, criterias, new SelectData())); } @@ -121,19 +121,19 @@ public class OrcsScriptAssemblerImpl implements OrcsScriptAssembler, OrcsScriptE @Override public TxQueryBuilder<?> newTxQuery() { - this.txQuery = new TxQueryBuilderImpl<TxQueryBuilder<?>>(factory1, getLastQuery()); + this.txQuery = new TxQueryBuilderImpl<>(factory1, getLastQuery()); return txQuery; } @Override public BranchQueryBuilder<?> newBranchQuery() { - this.branchQuery = new BranchQueryBuilderImpl<BranchQueryBuilder<?>>(factory2, getLastQuery()); + this.branchQuery = new BranchQueryBuilderImpl<>(factory2, getLastQuery()); return branchQuery; } @Override public ArtifactQueryBuilder<?> newArtifactQuery() { - this.artQuery = new ArtifactQueryBuilderImpl<ArtifactQueryBuilder<?>>(factory3, getLastQuery()); + this.artQuery = new ArtifactQueryBuilderImpl<>(factory3, getLastQuery()); return artQuery; } diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/script/impl/OrcsScriptCompilerImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/script/impl/OrcsScriptCompilerImpl.java index 5130fcc9205..4916a216cb3 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/script/impl/OrcsScriptCompilerImpl.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/script/impl/OrcsScriptCompilerImpl.java @@ -159,7 +159,7 @@ public class OrcsScriptCompilerImpl implements OrcsScriptCompiler { } private Map<String, Object> asMap(ScriptContext context) { - Map<String, Object> data = new LinkedHashMap<String, Object>(); + Map<String, Object> data = new LinkedHashMap<>(); for (Integer scope : context.getScopes()) { Bindings bindings = context.getBindings(scope); if (bindings != null) { diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/script/impl/OrcsScriptInterpreterImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/script/impl/OrcsScriptInterpreterImpl.java index d4eaf08ba03..b721690ae1d 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/script/impl/OrcsScriptInterpreterImpl.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/script/impl/OrcsScriptInterpreterImpl.java @@ -638,7 +638,7 @@ public class OrcsScriptInterpreterImpl implements OrcsScriptInterpreter { ////////////////////////////// Call handler to get actual types ?; private Collection<IArtifactType> asArtifactTypes(List<OsExpression> expressions) { - Set<IArtifactType> toReturn = new LinkedHashSet<IArtifactType>(); + Set<IArtifactType> toReturn = new LinkedHashSet<>(); List<Class<?>> resolvedTypes = resolver.resolveTypes(expressions); for (int index = 0; index < resolvedTypes.size(); index++) { @@ -656,7 +656,7 @@ public class OrcsScriptInterpreterImpl implements OrcsScriptInterpreter { } private Collection<IAttributeType> asAttributeTypes(List<OsExpression> expressions) { - Set<IAttributeType> toReturn = new LinkedHashSet<IAttributeType>(); + Set<IAttributeType> toReturn = new LinkedHashSet<>(); List<Class<?>> resolvedTypes = resolver.resolveTypes(expressions); for (int index = 0; index < resolvedTypes.size(); index++) { Class<?> clazz = resolvedTypes.get(index); @@ -721,7 +721,7 @@ public class OrcsScriptInterpreterImpl implements OrcsScriptInterpreter { } private TransactionDetailsType[] asTxTypes(List<OsTxType> values) { - Set<TransactionDetailsType> toReturn = new LinkedHashSet<TransactionDetailsType>(); + Set<TransactionDetailsType> toReturn = new LinkedHashSet<>(); for (OsTxType value : values) { TransactionDetailsType type = TransactionDetailsType.Baselined; if (OsTxType.NON_BASELINE == value) { @@ -733,7 +733,7 @@ public class OrcsScriptInterpreterImpl implements OrcsScriptInterpreter { } private BranchState[] asStates(List<OsBranchState> values) { - Set<BranchState> toReturn = new LinkedHashSet<BranchState>(); + Set<BranchState> toReturn = new LinkedHashSet<>(); for (OsBranchState value : values) { BranchState state = BranchState.valueOf(value.getName()); toReturn.add(state); @@ -742,7 +742,7 @@ public class OrcsScriptInterpreterImpl implements OrcsScriptInterpreter { } private BranchType[] asBranchTypes(List<OsBranchType> values) { - Set<BranchType> toReturn = new LinkedHashSet<BranchType>(); + Set<BranchType> toReturn = new LinkedHashSet<>(); for (OsBranchType value : values) { BranchType type = BranchType.valueOf(value.getName()); toReturn.add(type); @@ -751,7 +751,7 @@ public class OrcsScriptInterpreterImpl implements OrcsScriptInterpreter { } private QueryOption[] asQueryOptions(List<OsQueryOption> options) { - Set<QueryOption> toReturn = new LinkedHashSet<QueryOption>(); + Set<QueryOption> toReturn = new LinkedHashSet<>(); for (OsQueryOption op : options) { if (OsQueryOption.CONTAINS == op) { toReturn.add(QueryOption.CASE__IGNORE); diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/ArtifactMatchDataHandler.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/ArtifactMatchDataHandler.java index 38fc96b4211..12f17f79288 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/ArtifactMatchDataHandler.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/ArtifactMatchDataHandler.java @@ -58,7 +58,7 @@ public class ArtifactMatchDataHandler extends LoadDataHandlerDecorator { @Override public void onLoadStart() throws OseeCoreException { super.onLoadStart(); - matches = new HashMap<Integer, ArtifactMatch>(); + matches = new HashMap<>(); results = null; } @@ -104,7 +104,7 @@ public class ArtifactMatchDataHandler extends LoadDataHandlerDecorator { } private static <K, V> ListMultimap<K, V> newLinkedHashListMultimap() { - Map<K, Collection<V>> map = new LinkedHashMap<K, Collection<V>>(); + Map<K, Collection<V>> map = new LinkedHashMap<>(); return Multimaps.newListMultimap(map, new Supplier<List<V>>() { @Override public List<V> get() { diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/ArtifactQueryBuilderImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/ArtifactQueryBuilderImpl.java index 41190298556..4221c559bc5 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/ArtifactQueryBuilderImpl.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/ArtifactQueryBuilderImpl.java @@ -144,7 +144,7 @@ public class ArtifactQueryBuilderImpl<T> implements ArtifactQueryBuilder<T> { @Override public T andUuid(long... uuids) throws OseeCoreException { - List<Long> ids = new ArrayList<Long>(uuids.length); + List<Long> ids = new ArrayList<>(uuids.length); for (long id : uuids) { ids.add(id); } @@ -165,8 +165,8 @@ public class ArtifactQueryBuilderImpl<T> implements ArtifactQueryBuilder<T> { @SuppressWarnings("unchecked") @Override public T andGuids(Collection<String> ids) throws OseeCoreException { - Set<String> guids = new HashSet<String>(); - Set<String> invalids = new HashSet<String>(); + Set<String> guids = new HashSet<>(); + Set<String> invalids = new HashSet<>(); for (String id : ids) { if (GUID.isValid(id)) { guids.add(id); @@ -279,7 +279,7 @@ public class ArtifactQueryBuilderImpl<T> implements ArtifactQueryBuilder<T> { @Override public T andIds(Collection<? extends Identifiable<String>> ids) throws OseeCoreException { - Set<String> guids = new HashSet<String>(); + Set<String> guids = new HashSet<>(); for (Identity<String> id : ids) { guids.add(id.getGuid()); } @@ -293,7 +293,7 @@ public class ArtifactQueryBuilderImpl<T> implements ArtifactQueryBuilder<T> { @Override public T andRelatedTo(IRelationTypeSide relationTypeSide, Collection<? extends ArtifactReadable> artifacts) throws OseeCoreException { - Set<Integer> ids = new HashSet<Integer>(); + Set<Integer> ids = new HashSet<>(); for (HasLocalId<Integer> token : artifacts) { ids.add(token.getLocalId()); } @@ -302,7 +302,7 @@ public class ArtifactQueryBuilderImpl<T> implements ArtifactQueryBuilder<T> { @Override public T andRelatedToLocalIds(IRelationTypeSide relationTypeSide, int... artifactIds) throws OseeCoreException { - Set<Integer> ids = new HashSet<Integer>(); + Set<Integer> ids = new HashSet<>(); for (Integer id : artifactIds) { ids.add(id); } diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/BranchCallableQueryFactory.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/BranchCallableQueryFactory.java index 9ec6507b734..55368561e45 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/BranchCallableQueryFactory.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/BranchCallableQueryFactory.java @@ -111,13 +111,13 @@ public class BranchCallableQueryFactory { @Override public void onLoadStart() throws OseeCoreException { super.onLoadStart(); - branchMap = new LinkedHashMap<Long, T>(); + branchMap = new LinkedHashMap<>(); } @Override public void onLoadEnd() throws OseeCoreException { super.onLoadEnd(); - results = new LinkedList<T>(branchMap.values()); + results = new LinkedList<>(branchMap.values()); branchMap.clear(); } diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/BranchQueryBuilderImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/BranchQueryBuilderImpl.java index 17acd50fd1d..e0b86973215 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/BranchQueryBuilderImpl.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/BranchQueryBuilderImpl.java @@ -101,7 +101,7 @@ public class BranchQueryBuilderImpl<T> implements BranchQueryBuilder<T> { @Override public T andUuids(long... uuids) throws OseeCoreException { - Set<Long> allUuids = new HashSet<Long>(); + Set<Long> allUuids = new HashSet<>(); for (Long uuid : uuids) { allUuids.add(uuid); } @@ -121,7 +121,7 @@ public class BranchQueryBuilderImpl<T> implements BranchQueryBuilder<T> { @Override public T andIds(Collection<? extends IOseeBranch> ids) throws OseeCoreException { - Set<Long> allIds = new HashSet<Long>(); + Set<Long> allIds = new HashSet<>(); for (IOseeBranch token : ids) { allIds.add(token.getUuid()); } @@ -202,7 +202,7 @@ public class BranchQueryBuilderImpl<T> implements BranchQueryBuilder<T> { addAndCheck(queryData, criteriaFactory.createBranchArchivedCriteria(states)); } if (!areDeletedIncluded()) { - Collection<BranchState> states = new ArrayList<BranchState>(); + Collection<BranchState> states = new ArrayList<>(); for (BranchState state : BranchState.values()) { if (state != DELETE_IN_PROGRESS && state != DELETED && state != PURGE_IN_PROGRESS && state != PURGED) { states.add(state); diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/CallableQueryFactory.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/CallableQueryFactory.java index 5b073d093b7..424dbe3e6bb 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/CallableQueryFactory.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/CallableQueryFactory.java @@ -74,7 +74,7 @@ public class CallableQueryFactory { @Override protected ResultSet<HasLocalId<Integer>> innerCall() throws Exception { - final List<HasLocalId<Integer>> results = new LinkedList<HasLocalId<Integer>>(); + final List<HasLocalId<Integer>> results = new LinkedList<>(); LoadDataHandlerAdapter handler = new LoadDataHandlerAdapter() { @Override public void onData(ArtifactData data) { diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/CriteriaFactory.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/CriteriaFactory.java index be63cb8671e..b3c7ad45ca1 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/CriteriaFactory.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/CriteriaFactory.java @@ -53,7 +53,7 @@ public class CriteriaFactory { private Collection<? extends IAttributeType> checkForAnyType(Collection<? extends IAttributeType> attributeTypes) throws OseeCoreException { Collection<? extends IAttributeType> toReturn; if (attributeTypes.contains(ArtifactQueryBuilder.ANY_ATTRIBUTE_TYPE)) { - Collection<IAttributeType> temp = new LinkedList<IAttributeType>(); + Collection<IAttributeType> temp = new LinkedList<>(); temp.addAll(attributeTypeCache.getAll()); toReturn = temp; } else { diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/QueryFactoryImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/QueryFactoryImpl.java index 94bdeef3bcd..876e087e658 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/QueryFactoryImpl.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/QueryFactoryImpl.java @@ -92,7 +92,7 @@ public class QueryFactoryImpl implements QueryFactory { Conditions.checkNotNullOrEmpty(artifacts, "artifacts"); ArtifactReadable artifact = artifacts.iterator().next(); IOseeBranch branch = artifact.getBranch(); - Set<String> guids = new HashSet<String>(); + Set<String> guids = new HashSet<>(); for (ArtifactReadable art : artifacts) { guids.add(art.getGuid()); } diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/TransactionCallableQueryFactory.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/TransactionCallableQueryFactory.java index 3b80dadcc02..0121c2b8a35 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/TransactionCallableQueryFactory.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/TransactionCallableQueryFactory.java @@ -87,7 +87,7 @@ public class TransactionCallableQueryFactory { @Override protected ResultSet<Integer> innerCall() throws Exception { - final Set<Integer> txs = new LinkedHashSet<Integer>(); + final Set<Integer> txs = new LinkedHashSet<>(); LoadDataHandler handler = new LoadDataHandlerAdapter() { @Override public void onData(TxOrcsData data) { @@ -109,7 +109,7 @@ public class TransactionCallableQueryFactory { @Override public void onLoadStart() throws OseeCoreException { super.onLoadStart(); - dataMap = new LinkedHashMap<Integer, T>(); + dataMap = new LinkedHashMap<>(); } @Override diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/TransactionCriteriaFactory.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/TransactionCriteriaFactory.java index 5a2febae2fb..e02627dcbf3 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/TransactionCriteriaFactory.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/TransactionCriteriaFactory.java @@ -78,7 +78,7 @@ public class TransactionCriteriaFactory { } public Criteria newByArtifactId(Collection<ArtifactId> ids) { - ArrayList<String> theGuids = new ArrayList<String>(ids.size()); + ArrayList<String> theGuids = new ArrayList<>(ids.size()); for (ArtifactId id : ids) { theGuids.add(id.getGuid()); } diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/TxQueryBuilderImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/TxQueryBuilderImpl.java index cad7f67c952..101a01073c5 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/TxQueryBuilderImpl.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/TxQueryBuilderImpl.java @@ -49,7 +49,7 @@ public class TxQueryBuilderImpl<T> implements TxQueryBuilder<T> { @Override public T andTxId(int... ids) throws OseeCoreException { - Set<Integer> values = new LinkedHashSet<Integer>(); + Set<Integer> values = new LinkedHashSet<>(); for (int value : ids) { values.add(value); } @@ -104,7 +104,7 @@ public class TxQueryBuilderImpl<T> implements TxQueryBuilder<T> { @Override public T andBranch(Collection<? extends IOseeBranch> ids) throws OseeCoreException { - Set<Long> values = new LinkedHashSet<Long>(); + Set<Long> values = new LinkedHashSet<>(); for (IOseeBranch value : ids) { values.add(value.getUuid()); } @@ -114,7 +114,7 @@ public class TxQueryBuilderImpl<T> implements TxQueryBuilder<T> { @Override public T andBranchIds(long... ids) throws OseeCoreException { - Set<Long> values = new LinkedHashSet<Long>(); + Set<Long> values = new LinkedHashSet<>(); for (long value : ids) { values.add(value); } @@ -152,7 +152,7 @@ public class TxQueryBuilderImpl<T> implements TxQueryBuilder<T> { @Override public T andAuthorIds(int... id) throws OseeCoreException { - ArrayList<Integer> theList = new ArrayList<Integer>(); + ArrayList<Integer> theList = new ArrayList<>(); for (int i = 0; i < id.length; i++) { theList.add(new Integer(id[i])); } @@ -172,7 +172,7 @@ public class TxQueryBuilderImpl<T> implements TxQueryBuilder<T> { @Override public T andNullCommitId() throws OseeCoreException { - Collection<Integer> aNull = new ArrayList<Integer>(); + Collection<Integer> aNull = new ArrayList<>(); aNull.add(null); return andCommitIds(aNull); } diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/OrcsTransactionUtil.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/OrcsTransactionUtil.java index 78c20551435..e8765eac082 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/OrcsTransactionUtil.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/OrcsTransactionUtil.java @@ -26,7 +26,7 @@ public class OrcsTransactionUtil { List<Integer> toReturn; if (Strings.isValid(rawValue)) { String[] entries = rawValue.split(","); - toReturn = new ArrayList<Integer>(); + toReturn = new ArrayList<>(); for (String entry : entries) { Integer value = Integer.parseInt(entry.trim()); toReturn.add(value); diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionFactoryImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionFactoryImpl.java index 52a46317ccd..98f54517650 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionFactoryImpl.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionFactoryImpl.java @@ -169,7 +169,7 @@ public class TransactionFactoryImpl implements TransactionFactory { private void checkAllTxsFound(String opName, List<Integer> txIds, ResultSet<TransactionReadable> result) { if (txIds.size() != result.size()) { - Set<Integer> found = new HashSet<Integer>(); + Set<Integer> found = new HashSet<>(); for (TransactionReadable tx : result) { found.add(tx.getGuid()); } diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TxData.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TxData.java index cd3eb57b7dc..7f4a14ee4e5 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TxData.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TxData.java @@ -35,8 +35,8 @@ public class TxData implements HasSession { private final OrcsSession session; private final GraphData graph; - private final Map<String, Artifact> writeables = new HashMap<String, Artifact>(); - private final Map<String, ArtifactReadable> readables = new HashMap<String, ArtifactReadable>(); + private final Map<String, Artifact> writeables = new HashMap<>(); + private final Map<String, ArtifactReadable> readables = new HashMap<>(); private ArtifactReadable author; private String comment; diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataLoaderImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataLoaderImpl.java index 6e7beb7c894..f12f462b25f 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataLoaderImpl.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataLoaderImpl.java @@ -56,7 +56,7 @@ public class TxDataLoaderImpl implements TxDataLoader { } private DataLoader createLoader(OrcsSession session, IOseeBranch branch, Collection<ArtifactId> artifactIds) throws OseeCoreException { - Set<String> ids = new LinkedHashSet<String>(); + Set<String> ids = new LinkedHashSet<>(); for (ArtifactId artifactId : artifactIds) { ids.add(artifactId.getGuid()); } diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataManager.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataManager.java index 3b52ce0b08f..6423baea19d 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataManager.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataManager.java @@ -105,9 +105,9 @@ public class TxDataManager { public Iterable<Artifact> getForWrite(TxData txData, Iterable<? extends ArtifactId> ids) throws OseeCoreException { checkChangesAllowed(txData); - Set<ArtifactId> toLoad = new LinkedHashSet<ArtifactId>(); + Set<ArtifactId> toLoad = new LinkedHashSet<>(); - LinkedHashMap<String, Artifact> items = new LinkedHashMap<String, Artifact>(); + LinkedHashMap<String, Artifact> items = new LinkedHashMap<>(); for (ArtifactId artifactId : ids) { Artifact node = findArtifactLocallyForWrite(txData, artifactId); if (node == null) { diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/AttributeTypeIndex.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/AttributeTypeIndex.java index a5ddf64a013..c1ad47218b3 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/AttributeTypeIndex.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/AttributeTypeIndex.java @@ -22,7 +22,7 @@ import org.eclipse.osee.framework.jdk.core.util.Strings; */ public class AttributeTypeIndex extends TokenTypeIndex<Long, IAttributeType, XAttributeType> { - private final Set<IAttributeType> taggables = new HashSet<IAttributeType>(); + private final Set<IAttributeType> taggables = new HashSet<>(); @Override public void put(IAttributeType token, XAttributeType dslType) { diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/EnumTypeImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/EnumTypeImpl.java index 2041947066c..4007b36db79 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/EnumTypeImpl.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/EnumTypeImpl.java @@ -61,7 +61,7 @@ public final class EnumTypeImpl extends FullyNamedIdentity<Long> implements Enum @Override public Set<String> valuesAsOrderedStringSet() { - Set<String> values = new LinkedHashSet<String>(); + Set<String> values = new LinkedHashSet<>(); for (EnumEntry oseeEnumEntry : values()) { values.add(oseeEnumEntry.getName()); } diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/OrcsTypesIndexer.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/OrcsTypesIndexer.java index f163e39a980..266eb211f8b 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/OrcsTypesIndexer.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/types/impl/OrcsTypesIndexer.java @@ -210,7 +210,7 @@ public class OrcsTypesIndexer { private EnumType createEnumType(XOseeEnumType dslType) throws OseeCoreException { int lastOrdinal = 0; - List<EnumEntry> entries = new LinkedList<EnumEntry>(); + List<EnumEntry> entries = new LinkedList<>(); for (XOseeEnumEntry entry : dslType.getEnumEntries()) { String ordinal = entry.getOrdinal(); if (Strings.isValid(ordinal)) { @@ -262,7 +262,7 @@ public class OrcsTypesIndexer { public Void caseRemoveAttribute(RemoveAttribute removeOption) { XAttributeType attribute = removeOption.getAttribute(); String guidToMatch = attribute.getUuid(); - List<XAttributeTypeRef> toRemove = new LinkedList<XAttributeTypeRef>(); + List<XAttributeTypeRef> toRemove = new LinkedList<>(); for (XAttributeTypeRef xAttributeTypeRef : validAttributeTypes) { String itemGuid = xAttributeTypeRef.getValidAttributeType().getUuid(); if (guidToMatch.equals(itemGuid)) { @@ -277,7 +277,7 @@ public class OrcsTypesIndexer { public Void caseUpdateAttribute(UpdateAttribute updateAttribute) { XAttributeTypeRef refToUpdate = updateAttribute.getAttribute(); String guidToMatch = refToUpdate.getValidAttributeType().getUuid(); - List<XAttributeTypeRef> toRemove = new LinkedList<XAttributeTypeRef>(); + List<XAttributeTypeRef> toRemove = new LinkedList<>(); for (XAttributeTypeRef xAttributeTypeRef : validAttributeTypes) { String itemGuid = xAttributeTypeRef.getValidAttributeType().getUuid(); if (guidToMatch.equals(itemGuid)) { @@ -322,7 +322,7 @@ public class OrcsTypesIndexer { public Void caseRemoveEnum(RemoveEnum removeEnum) { XOseeEnumEntry enumEntry = removeEnum.getEnumEntry(); String nameToMatch = enumEntry.getName(); - List<XOseeEnumEntry> toRemove = new LinkedList<XOseeEnumEntry>(); + List<XOseeEnumEntry> toRemove = new LinkedList<>(); for (XOseeEnumEntry item : enumEntries) { String toMatch = item.getName(); if (nameToMatch.equals(toMatch)) { diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/util/AbstractTypeCollection.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/util/AbstractTypeCollection.java index 0e129a4b66a..a45dd2cbcff 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/util/AbstractTypeCollection.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/util/AbstractTypeCollection.java @@ -38,7 +38,7 @@ public abstract class AbstractTypeCollection<TYPE, MATCH_DATA extends OrcsWritea protected abstract TYPE getType(DATA data) throws OseeCoreException; public Collection<? extends TYPE> getExistingTypes(DeletionFlag includeDeleted) throws OseeCoreException { - Set<TYPE> toReturn = new LinkedHashSet<TYPE>(); + Set<TYPE> toReturn = new LinkedHashSet<>(); for (DATA data : getList(includeDeleted)) { if (isValid(data)) { toReturn.add(getType(data)); diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/util/FilterableCollection.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/util/FilterableCollection.java index e9df410ec06..cf9dfdb6a0e 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/util/FilterableCollection.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/util/FilterableCollection.java @@ -93,7 +93,7 @@ public abstract class FilterableCollection<MATCH_DATA, KEY, DATA> { private <T extends DATA> List<T> getListByFilter(Collection<DATA> source, Predicate<MATCH_DATA> matcher) throws OseeCoreException { List<T> toReturn; if (source != null && !source.isEmpty()) { - toReturn = new LinkedList<T>(); + toReturn = new LinkedList<>(); for (Iterator<DATA> iterator = source.iterator(); iterator.hasNext();) { DATA data = iterator.next(); if (isValid(data)) { |