From 90a6ab6c63699343acf3adcd4346bce2f5665bdd Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 07 Jul 2015 15:12:28 +0000
Subject: [PATCH] AutoRefactor'ed Use Diamond Operator
---
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/ExtOp.java | 4
opendj-server-legacy/src/main/java/org/opends/server/api/DirectoryThread.java | 11
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/DN2URI.java | 6
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/CursorTransformer.java | 2
opendj-server-legacy/src/main/java/org/opends/server/core/AddOperationBasis.java | 20
opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/LDAPDriver.java | 18
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/AttributeIndex.java | 2
opendj-server-legacy/src/main/java/org/opends/server/core/VirtualAttributeConfigManager.java | 15
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendMonitor.java | 2
opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectPath.java | 42
opendj-server-legacy/src/main/java/org/opends/server/core/SchemaHandler.java | 4
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargAttrFilterList.java | 3
opendj-server-legacy/src/main/java/org/opends/server/core/CertificateMapperConfigManager.java | 4
opendj-server-legacy/src/main/java/org/opends/server/core/LockFileManager.java | 13
opendj-server-legacy/src/main/java/org/opends/server/admin/OptionalRelationDefinition.java | 11
opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/PropertySet.java | 34
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryIDSetSorter.java | 4
opendj-server-legacy/src/main/java/org/opends/server/controls/MatchedValuesControl.java | 2
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/DayOfWeek.java | 2
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternIP.java | 7
opendj-server-legacy/src/main/java/org/opends/server/admin/AggregationPropertyDefinition.java | 22
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/DBTest.java | 11
opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyErrorType.java | 7
opendj-server-legacy/src/main/java/org/opends/server/admin/condition/ContainsCondition.java | 2
opendj-server-legacy/src/main/java/org/opends/server/core/DeleteOperationBasis.java | 4
opendj-server-legacy/src/test/java/org/opends/server/replication/common/CSNTest.java | 4
opendj-server-legacy/src/main/java/org/opends/server/admin/DefaultManagedObject.java | 9
opendj-server-legacy/src/main/java/org/opends/server/core/MatchingRuleConfigManager.java | 4
opendj-server-legacy/src/main/java/org/opends/server/core/SubentryPasswordPolicy.java | 8
opendj-server-legacy/src/main/java/org/opends/server/admin/DefinedDefaultBehaviorProvider.java | 7
opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationBasis.java | 2
opendj-server-legacy/src/main/java/org/opends/server/core/PasswordGeneratorConfigManager.java | 4
opendj-server-legacy/src/main/java/org/opends/server/api/CompressedSchema.java | 49 -
opendj-server-legacy/src/test/java/org/opends/server/tools/makeldif/MakeLDIFTestCase.java | 4
opendj-server-legacy/src/main/java/org/opends/server/admin/RelationDefinition.java | 2
opendj-server-legacy/src/main/java/org/opends/server/controls/PersistentSearchChangeType.java | 3
opendj-server-legacy/src/main/java/org/opends/server/backends/TrustStoreBackend.java | 45
opendj-server-legacy/src/main/java/org/opends/server/api/ClientConnection.java | 29
opendj-server-legacy/src/test/java/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElementTest.java | 6
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Suffix.java | 9
opendj-server-legacy/src/main/java/org/opends/server/config/BooleanConfigAttribute.java | 30
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciEffectiveRights.java | 2
opendj-server-legacy/src/main/java/org/opends/server/backends/MemoryBackend.java | 10
opendj-server-legacy/src/main/java/org/opends/server/config/DNConfigAttribute.java | 42
opendj-server-legacy/src/main/java/org/opends/server/core/SchemaConfigManager.java | 15
opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskScheduler.java | 56 -
opendj-server-legacy/src/main/java/org/opends/server/admin/EnumPropertyDefinition.java | 6
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ImportLDIFReader.java | 10
opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java | 123 +-
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeStorageImporter.java | 7
opendj-server-legacy/src/main/java/org/opends/server/core/AlertHandlerConfigManager.java | 4
opendj-server-legacy/src/main/java/org/opends/server/config/ConfigEntry.java | 12
opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObject.java | 26
opendj-server-legacy/src/main/java/org/opends/server/config/ReadOnlyConfigAttribute.java | 14
opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortRequestControl.java | 6
opendj-server-legacy/src/main/java/org/opends/server/core/MonitorConfigManager.java | 2
opendj-server-legacy/src/main/java/org/opends/server/config/StringConfigAttribute.java | 32
opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/JEReplicaDBTest.java | 2
opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPreReadRequestControl.java | 4
opendj-server-legacy/src/main/java/org/opends/server/core/ModifyOperationBasis.java | 10
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/UserDN.java | 2
opendj-server-legacy/src/main/java/org/opends/server/admin/client/OperationRejectedException.java | 2
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/PersistentCompressedSchema.java | 4
opendj-server-legacy/src/main/java/org/opends/server/core/BindOperationBasis.java | 2
opendj-server-legacy/src/main/java/org/opends/server/admin/AdministrationConnector.java | 4
opendj-server-legacy/src/main/java/org/opends/server/core/EntryCacheConfigManager.java | 7
opendj-server-legacy/src/main/java/org/opends/server/api/Backend.java | 22
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/RootContainer.java | 4
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternDN.java | 14
opendj-server-legacy/src/main/java/org/opends/server/core/ConfigurationHandler.java | 25
opendj-server-legacy/src/main/java/org/opends/server/admin/AbstractManagedObjectDefinition.java | 48
opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/ReplicationDbEnvTest.java | 4
opendj-server-legacy/src/main/java/org/opends/server/config/ConfigAttribute.java | 63 -
opendj-server-legacy/src/main/java/org/opends/server/admin/ClassPropertyDefinition.java | 15
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ConfigurableEnvironment.java | 17
opendj-server-legacy/src/main/java/org/opends/server/backends/VerifyConfig.java | 4
opendj-server-legacy/src/main/java/org/opends/server/core/RootPrivilegeChangeListener.java | 3
opendj-server-legacy/src/main/java/org/opends/server/core/PersistentSearch.java | 14
opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagementContext.java | 41
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexQueryFactoryImpl.java | 2
opendj-server-legacy/src/main/java/org/opends/server/config/JMXMBean.java | 32
opendj-server-legacy/src/main/java/org/opends/server/core/PasswordValidatorConfigManager.java | 4
opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyDefinitionUsageBuilder.java | 2
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Importer.java | 74 -
opendj-server-legacy/src/main/java/org/opends/server/core/ConnectionHandlerConfigManager.java | 2
opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationConfigManager.java | 2
opendj-server-legacy/src/main/java/org/opends/server/backends/RootDSEBackend.java | 46
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/VerifyJob.java | 11
opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigAddListenerAdaptor.java | 2
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargetControl.java | 13
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/DatabaseEnvironmentMonitor.java | 18
opendj-server-legacy/src/main/java/org/opends/server/core/SearchOperationBasis.java | 10
opendj-server-legacy/src/main/java/org/opends/server/config/MultiChoiceConfigAttribute.java | 32
opendj-server-legacy/src/test/java/org/opends/server/tasks/TestBackupAndRestore.java | 4
opendj-server-legacy/src/main/java/org/opends/server/core/PluginConfigManager.java | 86 -
opendj-server-legacy/src/main/java/org/opends/server/core/BaseDnRegistry.java | 24
opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/JNDIDirContextAdaptor.java | 9
opendj-server-legacy/src/main/java/org/opends/server/backends/LDIFBackend.java | 25
opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/LDAPNameBuilder.java | 8
opendj-server-legacy/src/main/java/org/opends/server/core/RootDNConfigManager.java | 15
opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConstraintViolationException.java | 2
opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyState.java | 36
opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyWarningType.java | 7
opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyFactory.java | 14
opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java | 46
opendj-server-legacy/src/main/java/org/opends/server/core/PasswordStorageSchemeConfigManager.java | 4
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciHandler.java | 8
opendj-server-legacy/src/test/java/org/opends/server/tasks/LdifFileWriter.java | 4
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/BindRule.java | 4
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/IndexFilter.java | 14
opendj-server-legacy/src/main/java/org/opends/server/controls/MatchedValuesFilter.java | 2
opendj-server-legacy/src/main/java/org/opends/server/core/DefaultCompressedSchema.java | 4
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ExportJob.java | 6
opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPostReadRequestControl.java | 6
opendj-server-legacy/src/main/java/org/opends/server/core/SASLConfigManager.java | 6
opendj-server-legacy/src/main/java/org/opends/server/admin/AdministrationDataSync.java | 4
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/BackendImpl.java | 6
opendj-server-legacy/src/main/java/org/opends/server/backends/NullBackend.java | 6
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/IndexBuffer.java | 15
opendj-server-legacy/src/main/java/org/opends/server/config/IntegerWithUnitConfigAttribute.java | 11
opendj-server-legacy/src/main/java/org/opends/server/admin/LDAPProfile.java | 10
opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyDefinition.java | 8
opendj-server-legacy/src/main/java/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java | 4
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciBody.java | 3
opendj-server-legacy/src/main/java/org/opends/server/core/AuthenticatedUsers.java | 14
opendj-server-legacy/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java | 51
opendj-server-legacy/src/main/java/org/opends/server/backends/task/Task.java | 34
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/DNS.java | 2
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciListenerManager.java | 22
opendj-server-legacy/src/main/java/org/opends/server/core/IdentityMapperConfigManager.java | 4
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargetAttr.java | 4
opendj-server-legacy/src/main/java/org/opends/server/admin/client/MissingMandatoryPropertiesException.java | 2
opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigChangeListenerAdaptor.java | 6
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/Aci.java | 2
opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java | 39
opendj-server-legacy/src/main/java/org/opends/server/controls/GetEffectiveRightsRequestControl.java | 2
opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/AbstractManagedObject.java | 13
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternRDN.java | 7
opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java | 34
opendj-server-legacy/src/main/java/org/opends/server/config/IntegerConfigAttribute.java | 68
opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/LDAPManagedObject.java | 2
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JECompressedSchema.java | 4
opendj-server-legacy/src/main/java/org/opends/server/backends/RebuildConfig.java | 11
opendj-server-legacy/src/main/java/org/opends/server/core/LoggerConfigManager.java | 15
opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigDeleteListenerAdaptor.java | 2
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryContainer.java | 11
opendj-server-legacy/src/main/java/org/opends/server/core/ModifyDNOperationBasis.java | 8
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexFilter.java | 14
opendj-server-legacy/src/main/java/org/opends/server/core/TrustManagerProviderConfigManager.java | 4
opendj-server-legacy/src/main/java/org/opends/server/admin/Reference.java | 4
opendj-server-legacy/src/main/java/org/opends/server/admin/InstantiableRelationDefinition.java | 6
opendj-server-legacy/src/main/java/org/opends/server/core/SynchronizationProviderConfigManager.java | 4
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/GroupDN.java | 2
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/VLVIndex.java | 4
opendj-server-legacy/src/main/java/org/opends/server/core/CoreConfigManager.java | 4
opendj-server-legacy/src/main/java/org/opends/server/admin/BooleanPropertyDefinition.java | 4
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/IP.java | 2
opendj-server-legacy/src/main/java/org/opends/server/api/plugin/PluginType.java | 10
opendj-server-legacy/src/main/java/org/opends/server/admin/SetRelationDefinition.java | 25
opendj-server-legacy/src/main/java/org/opends/server/core/AccessControlConfigManager.java | 4
opendj-server-legacy/src/main/java/org/opends/server/admin/ClassLoaderProvider.java | 14
opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectDefinitionResource.java | 18
opendj-server-legacy/src/main/java/org/opends/server/core/ServerShutdownMonitor.java | 4
opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectDefinitionI18NResource.java | 12
opendj-server-legacy/src/main/java/org/opends/server/core/AttributeSyntaxConfigManager.java | 4
opendj-server-legacy/src/main/java/org/opends/server/core/KeyManagerProviderConfigManager.java | 4
opendj-server-legacy/src/main/java/org/opends/server/admin/SingletonRelationDefinition.java | 7
opendj-server-legacy/src/main/java/org/opends/server/api/DITCacheMap.java | 10
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Index.java | 4
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciContainer.java | 2
opendj-server-legacy/src/main/java/org/opends/server/core/CompareOperationBasis.java | 10
opendj-server-legacy/src/main/java/org/opends/server/admin/Tag.java | 2
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ExportJob.java | 2
173 files changed, 910 insertions(+), 1,423 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/AbstractManagedObjectDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/AbstractManagedObjectDefinition.java
index d6c1134..e7f6395 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/AbstractManagedObjectDefinition.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/AbstractManagedObjectDefinition.java
@@ -155,24 +155,18 @@
AbstractManagedObjectDefinition<? super C, ? super S> parent) {
this.name = name;
this.parent = parent;
- this.constraints = new LinkedList<Constraint>();
- this.propertyDefinitions = new HashMap<String, PropertyDefinition<?>>();
- this.relationDefinitions = new HashMap<String, RelationDefinition<?,?>>();
- this.reverseRelationDefinitions = new HashSet<RelationDefinition<C,S>>();
- this.allPropertyDefinitions = new HashMap<String, PropertyDefinition<?>>();
- this.allRelationDefinitions =
- new HashMap<String, RelationDefinition<?, ?>>();
- this.aggregationPropertyDefinitions =
- new HashMap<String, AggregationPropertyDefinition<?,?>>();
- this.reverseAggregationPropertyDefinitions =
- new Vector<AggregationPropertyDefinition<?,?>>();
- this.allAggregationPropertyDefinitions =
- new HashMap<String, AggregationPropertyDefinition<?, ?>>();
- this.allTags = new HashSet<Tag>();
+ this.constraints = new LinkedList<>();
+ this.propertyDefinitions = new HashMap<>();
+ this.relationDefinitions = new HashMap<>();
+ this.reverseRelationDefinitions = new HashSet<>();
+ this.allPropertyDefinitions = new HashMap<>();
+ this.allRelationDefinitions = new HashMap<>();
+ this.aggregationPropertyDefinitions = new HashMap<>();
+ this.reverseAggregationPropertyDefinitions = new Vector<>();
+ this.allAggregationPropertyDefinitions = new HashMap<>();
+ this.allTags = new HashSet<>();
this.options = EnumSet.noneOf(ManagedObjectOption.class);
-
- this.children = new HashMap<String,
- AbstractManagedObjectDefinition<? extends C, ? extends S>>();
+ this.children = new HashMap<>();
// If we have a parent definition then inherit its features.
if (parent != null) {
@@ -209,11 +203,9 @@
public final Collection<AbstractManagedObjectDefinition
<? extends C, ? extends S>> getAllChildren() {
List<AbstractManagedObjectDefinition<? extends C, ? extends S>> list =
- new ArrayList<AbstractManagedObjectDefinition<? extends C, ? extends S>>(
- children.values());
+ new ArrayList<>(children.values());
- for (AbstractManagedObjectDefinition<? extends C, ? extends S> child :
- children.values()) {
+ for (AbstractManagedObjectDefinition<? extends C, ? extends S> child : children.values()) {
list.addAll(child.getAllChildren());
}
@@ -233,9 +225,8 @@
*/
public final Collection<Constraint> getAllConstraints() {
// This method does not used a cached set of constraints because
- // constraints may be updated after child definitions have been
- // defined.
- List<Constraint> allConstraints = new LinkedList<Constraint>();
+ // constraints may be updated after child definitions have been defined.
+ List<Constraint> allConstraints = new LinkedList<>();
if (parent != null) {
allConstraints.addAll(parent.getAllConstraints());
@@ -292,10 +283,8 @@
public final Collection<RelationDefinition<? super C, ? super S>>
getAllReverseRelationDefinitions() {
// This method does not used a cached set of relations because
- // relations may be updated after child definitions have been
- // defined.
- List<RelationDefinition<? super C, ? super S>> rdlist =
- new LinkedList<RelationDefinition<? super C, ? super S>>();
+ // relations may be updated after child definitions have been defined.
+ List<RelationDefinition<? super C, ? super S>> rdlist = new LinkedList<>();
if (parent != null) {
rdlist.addAll(parent.getAllReverseRelationDefinitions());
@@ -340,8 +329,7 @@
// This method does not used a cached set of aggregation properties because
// aggregation properties may be updated after child definitions have been
// defined.
- List<AggregationPropertyDefinition<?, ?>> apdlist =
- new LinkedList<AggregationPropertyDefinition<?, ?>>();
+ List<AggregationPropertyDefinition<?, ?>> apdlist = new LinkedList<>();
if (parent != null) {
apdlist.addAll(parent.getAllReverseAggregationPropertyDefinitions());
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/AdministrationConnector.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/AdministrationConnector.java
index d82e8fe..8d2b35f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/AdministrationConnector.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/AdministrationConnector.java
@@ -93,8 +93,8 @@
private static final boolean ADMIN_ALLOW_LDAP_V2 = false;
private static final boolean ADMIN_ALLOW_START_TLS = false;
- private static final SortedSet<AddressMask> ADMIN_ALLOWED_CLIENT = new TreeSet<AddressMask>();
- private static final SortedSet<AddressMask> ADMIN_DENIED_CLIENT = new TreeSet<AddressMask>();
+ private static final SortedSet<AddressMask> ADMIN_ALLOWED_CLIENT = new TreeSet<>();
+ private static final SortedSet<AddressMask> ADMIN_DENIED_CLIENT = new TreeSet<>();
private static final boolean ADMIN_ENABLED = true;
private static final boolean ADMIN_KEEP_STATS = true;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/AdministrationDataSync.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/AdministrationDataSync.java
index 1b1405e..f7ba80d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/AdministrationDataSync.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/AdministrationDataSync.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.admin;
@@ -119,7 +119,7 @@
return;
}
- LinkedList<Modification> mods = new LinkedList<Modification>();
+ LinkedList<Modification> mods = new LinkedList<>();
// adminport
String attName = "adminport";
AttributeType attrType = DirectoryServer.getAttributeType(attName
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/AggregationPropertyDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/AggregationPropertyDefinition.java
index 62e784b..e22cdb1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/AggregationPropertyDefinition.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/AggregationPropertyDefinition.java
@@ -236,11 +236,10 @@
throw new IllegalStateException("Relation definition undefined");
}
- return new AggregationPropertyDefinition<C, S>(d, propertyName, options,
+ return new AggregationPropertyDefinition<>(d, propertyName, options,
adminAction, defaultBehavior, parentPathString, rdName,
targetNeedsEnablingCondition, targetIsEnabledCondition);
}
-
}
@@ -463,12 +462,10 @@
ServerManagedObject<?> parent = context.getManagedObject(parentPath);
// Create entries in the listener tables.
- List<ReferentialIntegrityDeleteListener> dlist =
- new LinkedList<ReferentialIntegrityDeleteListener>();
+ List<ReferentialIntegrityDeleteListener> dlist = new LinkedList<>();
deleteListeners.put(managedObject.getDN(), dlist);
- List<ReferentialIntegrityChangeListener> clist =
- new LinkedList<ReferentialIntegrityChangeListener>();
+ List<ReferentialIntegrityChangeListener> clist = new LinkedList<>();
changeListeners.put(managedObject.getDN(), clist);
for (String name : managedObject
@@ -727,8 +724,7 @@
List<ManagedObject<? extends CC>> findInstances(
ManagementContext context, AbstractManagedObjectDefinition<CC, ?> mod)
throws AuthorizationException, CommunicationException {
- List<ManagedObject<? extends CC>> instances =
- new LinkedList<ManagedObject<? extends CC>>();
+ List<ManagedObject<? extends CC>> instances = new LinkedList<>();
if (mod == RootCfgDefn.getInstance()) {
instances.add((ManagedObject<? extends CC>) context
@@ -797,24 +793,20 @@
public static <C extends ConfigurationClient, S extends Configuration>
Builder<C, S> createBuilder(
AbstractManagedObjectDefinition<?, ?> d, String propertyName) {
- return new Builder<C, S>(d, propertyName);
+ return new Builder<>(d, propertyName);
}
/**
* The active server-side referential integrity change listeners
* associated with this property.
*/
- private final Map<DN, List<ReferentialIntegrityChangeListener>>
- changeListeners = new HashMap<DN,
- List<ReferentialIntegrityChangeListener>>();
+ private final Map<DN, List<ReferentialIntegrityChangeListener>> changeListeners = new HashMap<>();
/**
* The active server-side referential integrity delete listeners
* associated with this property.
*/
- private final Map<DN, List<ReferentialIntegrityDeleteListener>>
- deleteListeners = new HashMap<DN,
- List<ReferentialIntegrityDeleteListener>>();
+ private final Map<DN, List<ReferentialIntegrityDeleteListener>> deleteListeners = new HashMap<>();
/**
* The name of the managed object which is the parent of the
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/BooleanPropertyDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/BooleanPropertyDefinition.java
index 4af41a9..922890c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/BooleanPropertyDefinition.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/BooleanPropertyDefinition.java
@@ -48,10 +48,8 @@
* the standard boolean string parser and supports common true/false synonyms
* used in configuration.
*/
- private static final Map<String, Boolean> VALUE_MAP;
+ private static final Map<String, Boolean> VALUE_MAP = new HashMap<>();
static {
- VALUE_MAP = new HashMap<String, Boolean>();
-
// We could have more possibilities but decided against in issue 1960.
VALUE_MAP.put("false", Boolean.FALSE);
VALUE_MAP.put("true", Boolean.TRUE);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/ClassLoaderProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/ClassLoaderProvider.java
index f73c9b0..fc996e3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/ClassLoaderProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/ClassLoaderProvider.java
@@ -174,7 +174,7 @@
}
/** Set of registered Jar files. */
- private Set<File> jarFiles = new HashSet<File>();
+ private Set<File> jarFiles = new HashSet<>();
/**
* Underlying class loader used to load classes and resources (null
@@ -224,7 +224,7 @@
File libPath = new File(DirectoryServer.getInstanceRoot(), LIB_DIR);
File extensionsPath = new File(libPath, EXTENSIONS_DIR);
- ArrayList<File> files = new ArrayList<File>(extensions.length);
+ ArrayList<File> files = new ArrayList<>(extensions.length);
for (String extension : extensions) {
File file = new File(extensionsPath, extension);
@@ -261,7 +261,7 @@
"Class loader provider already disabled.");
}
loader = null;
- jarFiles = new HashSet<File>();
+ jarFiles = new HashSet<>();
}
@@ -399,7 +399,7 @@
private synchronized void addExtension(File... extensions)
throws InitializationException {
// First add the Jar files to the class loader.
- List<JarFile> jars = new LinkedList<JarFile>();
+ List<JarFile> jars = new LinkedList<>();
for (File extension : extensions) {
if (jarFiles.contains(extension)) {
// Skip this file as it is already loaded.
@@ -698,10 +698,8 @@
*/
private void loadDefinitionClasses(InputStream is)
throws InitializationException {
- BufferedReader reader = new BufferedReader(new InputStreamReader(
- is));
- List<AbstractManagedObjectDefinition<?, ?>> definitions =
- new LinkedList<AbstractManagedObjectDefinition<?,?>>();
+ BufferedReader reader = new BufferedReader(new InputStreamReader(is));
+ List<AbstractManagedObjectDefinition<?, ?>> definitions = new LinkedList<>();
while (true) {
String className;
try {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/ClassPropertyDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/ClassPropertyDefinition.java
index 9425f93..e121382 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/ClassPropertyDefinition.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/ClassPropertyDefinition.java
@@ -29,7 +29,7 @@
-import static org.forgerock.util.Reject.ifNull;
+import static org.forgerock.util.Reject.*;
import static org.opends.server.admin.PropertyException.*;
import java.util.Collections;
@@ -63,20 +63,13 @@
AbstractBuilder<String, ClassPropertyDefinition> {
/** List of interfaces which property values must implement. */
- private List<String> instanceOfInterfaces;
-
-
+ private List<String> instanceOfInterfaces = new LinkedList<>();
/** Private constructor. */
- private Builder(
- AbstractManagedObjectDefinition<?, ?> d, String propertyName) {
+ private Builder(AbstractManagedObjectDefinition<?, ?> d, String propertyName) {
super(d, propertyName);
-
- this.instanceOfInterfaces = new LinkedList<String>();
}
-
-
/**
* Add an class name which property values must implement.
*
@@ -201,8 +194,6 @@
/** List of interfaces which property values must implement. */
private final List<String> instanceOfInterfaces;
-
-
/** Private constructor. */
private ClassPropertyDefinition(
AbstractManagedObjectDefinition<?, ?> d, String propertyName,
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/DefaultManagedObject.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/DefaultManagedObject.java
index de8c6b0..3246afe 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/DefaultManagedObject.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/DefaultManagedObject.java
@@ -67,10 +67,7 @@
private final ManagedObjectDefinition<C, S> definition;
/** The string encoded default managed object's properties. */
- private final Map<String, List<String>> propertyStringValues =
- new HashMap<String, List<String>>();
-
-
+ private final Map<String, List<String>> propertyStringValues = new HashMap<>();
/**
* Creates a new default managed object builder.
@@ -91,7 +88,7 @@
* @return Returns the new default managed object.
*/
public DefaultManagedObject<C, S> getInstance() {
- return new DefaultManagedObject<C, S>(definition, propertyStringValues);
+ return new DefaultManagedObject<>(definition, propertyStringValues);
}
@@ -167,7 +164,7 @@
definition.getPropertyDefinition(pd.getName());
// Do a defensive copy.
- SortedSet<T> values = new TreeSet<T>(pd);
+ SortedSet<T> values = new TreeSet<>(pd);
List<String> stringValues = propertyStringValues.get(pd.getName());
if (stringValues != null) {
for (String stringValue : stringValues) {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/DefinedDefaultBehaviorProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/DefinedDefaultBehaviorProvider.java
index f4e37cb..cd65864 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/DefinedDefaultBehaviorProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/DefinedDefaultBehaviorProvider.java
@@ -69,15 +69,11 @@
this.values = Arrays.asList(values);
}
-
-
/** {@inheritDoc} */
public <R, P> R accept(DefaultBehaviorProviderVisitor<T, R, P> v, P p) {
return v.visitDefined(this, p);
}
-
-
/**
* Get a copy of the default values.
*
@@ -85,7 +81,6 @@
* default values.
*/
public Collection<String> getDefaultValues() {
- return new ArrayList<String>(values);
+ return new ArrayList<>(values);
}
-
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/EnumPropertyDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/EnumPropertyDefinition.java
index 1eb9dcb..702732f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/EnumPropertyDefinition.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/EnumPropertyDefinition.java
@@ -101,7 +101,7 @@
throw new IllegalStateException("Enumeration class undefined");
}
- return new EnumPropertyDefinition<E>(d, propertyName, options,
+ return new EnumPropertyDefinition<>(d, propertyName, options,
adminAction, defaultBehavior, enumClass);
}
}
@@ -123,7 +123,7 @@
*/
public static <E extends Enum<E>> Builder<E> createBuilder(
AbstractManagedObjectDefinition<?, ?> d, String propertyName) {
- return new Builder<E>(d, propertyName);
+ return new Builder<>(d, propertyName);
}
/** The enumeration class. */
@@ -143,7 +143,7 @@
this.enumClass = enumClass;
// Initialize the decoding map.
- this.decodeMap = new HashMap<String, E>();
+ this.decodeMap = new HashMap<>();
for (E value : EnumSet.<E> allOf(enumClass)) {
String s = value.toString().trim().toLowerCase();
this.decodeMap.put(s, value);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/InstantiableRelationDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/InstantiableRelationDefinition.java
index dcecd91..4889c46 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/InstantiableRelationDefinition.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/InstantiableRelationDefinition.java
@@ -80,9 +80,7 @@
* The optional default managed objects associated with this
* instantiable relation definition.
*/
- private final Map<String, DefaultManagedObject<? extends C, ? extends S>>
- defaultManagedObjects = new HashMap<String,
- DefaultManagedObject<? extends C, ? extends S>>();
+ private final Map<String, DefaultManagedObject<? extends C, ? extends S>> defaultManagedObjects = new HashMap<>();
/**
@@ -143,7 +141,7 @@
@Override
protected InstantiableRelationDefinition<C, S> buildInstance(
Common<C, S> common) {
- return new InstantiableRelationDefinition<C, S>(common, pluralName,
+ return new InstantiableRelationDefinition<>(common, pluralName,
namingPropertyDefinition, defaultManagedObjects);
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/LDAPProfile.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/LDAPProfile.java
index 3430fb7..498f209 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/LDAPProfile.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/LDAPProfile.java
@@ -183,7 +183,7 @@
}
/** The list of profile wrappers. */
- private final LinkedList<Wrapper> profiles = new LinkedList<Wrapper>();;
+ private final LinkedList<Wrapper> profiles = new LinkedList<>();;
/** The LDAP profile property table. */
private final ManagedObjectDefinitionResource resource =
@@ -349,8 +349,8 @@
*/
public List<String> getObjectClasses(AbstractManagedObjectDefinition<?, ?> d)
throws MissingResourceException {
- LinkedList<String> objectClasses = new LinkedList<String>();
- Set<String> s = new HashSet<String>();
+ LinkedList<String> objectClasses = new LinkedList<>();
+ Set<String> s = new HashSet<>();
// Add the object classes from the parent hierarchy.
while (d != null) {
@@ -372,11 +372,11 @@
/**
- * Get an LDAP RDN sequence associatied with a relation.
+ * Get an LDAP RDN sequence associated with a relation.
*
* @param r
* The relation.
- * @return Returns the LDAP RDN sequence associatied with a
+ * @return Returns the LDAP RDN sequence associated with a
* relation.
* @throws MissingResourceException
* If the LDAP profile properties file associated with the
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectDefinitionI18NResource.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectDefinitionI18NResource.java
index 0bd3eaa..4127019 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectDefinitionI18NResource.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectDefinitionI18NResource.java
@@ -49,10 +49,7 @@
public final class ManagedObjectDefinitionI18NResource {
/** Application-wide set of instances. */
- private static final Map<String, ManagedObjectDefinitionI18NResource>
- INSTANCES = new HashMap<String, ManagedObjectDefinitionI18NResource>();
-
-
+ private static final Map<String, ManagedObjectDefinitionI18NResource> INSTANCES = new HashMap<>();
/**
* Gets the internationalized resource instance which can be used to
@@ -110,8 +107,7 @@
/** Private constructor. */
private ManagedObjectDefinitionI18NResource(String prefix) {
- this.resources = new HashMap<AbstractManagedObjectDefinition<?, ?>,
- Map<Locale, ResourceBundle>>();
+ this.resources = new HashMap<>();
this.prefix = prefix;
}
@@ -305,7 +301,7 @@
// necessary.
Map<Locale, ResourceBundle> map = resources.get(d);
if (map == null) {
- map = new HashMap<Locale, ResourceBundle>();
+ map = new HashMap<>();
resources.put(d, map);
}
@@ -332,7 +328,7 @@
// necessary.
Map<Locale, ResourceBundle> map = resources.get(d);
if (map == null) {
- map = new HashMap<Locale, ResourceBundle>();
+ map = new HashMap<>();
resources.put(d, map);
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectDefinitionResource.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectDefinitionResource.java
index 642782a..6c6a5b6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectDefinitionResource.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectDefinitionResource.java
@@ -48,14 +48,10 @@
public final class ManagedObjectDefinitionResource {
/** Mapping from definition to property tables. */
- private final Map<AbstractManagedObjectDefinition<?, ?>,
- Properties> properties;
-
+ private final Map<AbstractManagedObjectDefinition<?, ?>, Properties> properties = new HashMap<>();
/** The resource name prefix. */
private final String prefix;
-
-
/**
* Creates a new resource instance for the named profile.
*
@@ -63,23 +59,15 @@
* The name of the profile.
* @return Returns the resource instance for the named profile.
*/
- public static ManagedObjectDefinitionResource createForProfile(
- String profile) {
- return new ManagedObjectDefinitionResource("admin.profiles."
- + profile);
+ public static ManagedObjectDefinitionResource createForProfile(String profile) {
+ return new ManagedObjectDefinitionResource("admin.profiles." + profile);
}
-
-
/** Private constructor. */
private ManagedObjectDefinitionResource(String prefix) {
- this.properties =
- new HashMap<AbstractManagedObjectDefinition<?, ?>, Properties>();
this.prefix = prefix;
}
-
-
/**
* Get the resource value associated with the specified key.
*
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectPath.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectPath.java
index 4b1dc9b..bb35755 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectPath.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectPath.java
@@ -303,7 +303,7 @@
InstantiableElement<C, S> create(
InstantiableRelationDefinition<? super C, ? super S> r,
AbstractManagedObjectDefinition<C, S> d, String name) {
- return new InstantiableElement<C, S>(r, d, name);
+ return new InstantiableElement<>(r, d, name);
}
/** The name of the managed object. */
@@ -364,7 +364,7 @@
S extends Configuration> OptionalElement<C, S> create(
OptionalRelationDefinition<? super C, ? super S> r,
AbstractManagedObjectDefinition<C, S> d) {
- return new OptionalElement<C, S>(r, d);
+ return new OptionalElement<>(r, d);
}
/** The optional relation. */
@@ -413,7 +413,7 @@
SetElement<C, S> create(
SetRelationDefinition<? super C, ? super S> r,
AbstractManagedObjectDefinition<C, S> d) {
- return new SetElement<C, S>(r, d);
+ return new SetElement<>(r, d);
}
/** The set relation. */
@@ -462,7 +462,7 @@
S extends Configuration> SingletonElement<C, S> create(
SingletonRelationDefinition<? super C, ? super S> r,
AbstractManagedObjectDefinition<C, S> d) {
- return new SingletonElement<C, S>(r, d);
+ return new SingletonElement<>(r, d);
}
/** The singleton relation. */
@@ -580,8 +580,7 @@
/** Single instance of a root path. */
private static final ManagedObjectPath<RootCfgClient, RootCfg> EMPTY_PATH =
- new ManagedObjectPath<RootCfgClient, RootCfg>(
- new LinkedList<Element<?, ?>>(), null, RootCfgDefn.getInstance());
+ new ManagedObjectPath<>(new LinkedList<Element<?, ?>>(), null, RootCfgDefn.getInstance());
/** A regular expression used to parse path elements. */
private static final Pattern PE_REGEXP = Pattern
@@ -625,10 +624,9 @@
}
// Parse the elements.
- LinkedList<Element<?, ?>> elements = new LinkedList<Element<?, ?>>();
+ LinkedList<Element<?, ?>> elements = new LinkedList<>();
Element<?, ?> lastElement = null;
- AbstractManagedObjectDefinition<?, ?> definition = RootCfgDefn
- .getInstance();
+ AbstractManagedObjectDefinition<?, ?> definition = RootCfgDefn.getInstance();
if (!ns.startsWith("/")) {
throw new IllegalArgumentException("Invalid path \"" + ns
@@ -713,8 +711,8 @@
private static <C extends ConfigurationClient, S extends Configuration>
ManagedObjectPath<C, S> create(
LinkedList<Element<?, ?>> elements, Element<C, S> lastElement) {
- return new ManagedObjectPath<C, S>(elements, lastElement
- .getRelationDefinition(), lastElement.getManagedObjectDefinition());
+ return new ManagedObjectPath<>(
+ elements, lastElement.getRelationDefinition(), lastElement.getManagedObjectDefinition());
}
@@ -893,10 +891,9 @@
throw new IllegalArgumentException(
"Empty or blank managed object names are not allowed");
}
- LinkedList<Element<?, ?>> celements = new LinkedList<Element<?, ?>>(
- elements);
+ LinkedList<Element<?, ?>> celements = new LinkedList<>(elements);
celements.add(new InstantiableElement<M, N>(r, d, name));
- return new ManagedObjectPath<M, N>(celements, r, d);
+ return new ManagedObjectPath<>(celements, r, d);
}
@@ -951,10 +948,9 @@
ManagedObjectPath<M, N> child(
OptionalRelationDefinition<? super M, ? super N> r,
AbstractManagedObjectDefinition<M, N> d) {
- LinkedList<Element<?, ?>> celements = new LinkedList<Element<?, ?>>(
- elements);
+ LinkedList<Element<?, ?>> celements = new LinkedList<>(elements);
celements.add(new OptionalElement<M, N>(r, d));
- return new ManagedObjectPath<M, N>(celements, r, d);
+ return new ManagedObjectPath<>(celements, r, d);
}
@@ -1003,10 +999,9 @@
ManagedObjectPath<M, N> child(
SingletonRelationDefinition<? super M, ? super N> r,
AbstractManagedObjectDefinition<M, N> d) {
- LinkedList<Element<?, ?>> celements = new LinkedList<Element<?, ?>>(
- elements);
+ LinkedList<Element<?, ?>> celements = new LinkedList<>(elements);
celements.add(new SingletonElement<M, N>(r, d));
- return new ManagedObjectPath<M, N>(celements, r, d);
+ return new ManagedObjectPath<>(celements, r, d);
}
@@ -1058,10 +1053,9 @@
SetRelationDefinition<? super M, ? super N> r,
AbstractManagedObjectDefinition<M, N> d)
throws IllegalArgumentException {
- LinkedList<Element<?, ?>> celements = new LinkedList<Element<?, ?>>(
- elements);
+ LinkedList<Element<?, ?>> celements = new LinkedList<>(elements);
celements.add(new SetElement<M, N>(r, d));
- return new ManagedObjectPath<M, N>(celements, r, d);
+ return new ManagedObjectPath<>(celements, r, d);
}
@@ -1286,7 +1280,7 @@
return emptyPath();
}
- LinkedList<Element<?, ?>> celements = new LinkedList<Element<?, ?>>(
+ LinkedList<Element<?, ?>> celements = new LinkedList<>(
elements.subList(0, elements.size() - offset));
return create(celements, celements.getLast());
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/OptionalRelationDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/OptionalRelationDefinition.java
index b198d86..90c9232 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/OptionalRelationDefinition.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/OptionalRelationDefinition.java
@@ -106,19 +106,14 @@
@Override
protected OptionalRelationDefinition<C, S> buildInstance(
Common<C, S> common) {
- return new OptionalRelationDefinition<C, S>(common, defaultManagedObject);
+ return new OptionalRelationDefinition<>(common, defaultManagedObject);
}
-
}
- /**
- * The optional default managed object associated with this
- * optional relation.
- */
- private final DefaultManagedObject<? extends C, ? extends S>
- defaultManagedObject;
+ /** The optional default managed object associated with this optional relation. */
+ private final DefaultManagedObject<? extends C, ? extends S> defaultManagedObject;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyDefinition.java
index 478dc93..4e1514f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyDefinition.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyDefinition.java
@@ -95,14 +95,12 @@
* @param propertyName
* The property name.
*/
- protected AbstractBuilder(AbstractManagedObjectDefinition<?, ?> d,
- String propertyName) {
+ protected AbstractBuilder(AbstractManagedObjectDefinition<?, ?> d, String propertyName) {
this.definition = d;
this.propertyName = propertyName;
this.options = EnumSet.noneOf(PropertyOption.class);
- this.adminAction = new AdministratorAction(AdministratorAction.Type.NONE,
- d, propertyName);
- this.defaultBehavior = new UndefinedDefaultBehaviorProvider<T>();
+ this.adminAction = new AdministratorAction(AdministratorAction.Type.NONE, d, propertyName);
+ this.defaultBehavior = new UndefinedDefaultBehaviorProvider<>();
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyDefinitionUsageBuilder.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyDefinitionUsageBuilder.java
index d097c14..0d97b55 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyDefinitionUsageBuilder.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyDefinitionUsageBuilder.java
@@ -174,7 +174,7 @@
return LocalizableMessage.raw(name.substring(i + 1).toUpperCase());
}
} else {
- Set<String> values = new TreeSet<String>();
+ Set<String> values = new TreeSet<>();
for (Object value : EnumSet.allOf(d.getEnumClass())) {
values.add(value.toString().trim().toLowerCase());
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/Reference.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/Reference.java
index 312c472..7049e9e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/Reference.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/Reference.java
@@ -113,7 +113,7 @@
+ s + "\"");
}
- return new Reference<C, S>(p, rd, name);
+ return new Reference<>(p, rd, name);
}
@@ -156,7 +156,7 @@
throw new IllegalArgumentException("Empty names are not allowed");
}
- return new Reference<C, S>(p, rd, s);
+ return new Reference<>(p, rd, s);
}
/** The name of the referenced managed object. */
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/RelationDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/RelationDefinition.java
index 555ce85..ba215ea 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/RelationDefinition.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/RelationDefinition.java
@@ -122,7 +122,7 @@
*/
protected AbstractBuilder(AbstractManagedObjectDefinition<?, ?> pd,
String name, AbstractManagedObjectDefinition<C, S> cd) {
- this.common = new Common<C, S>(pd, name, cd);
+ this.common = new Common<>(pd, name, cd);
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/SetRelationDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/SetRelationDefinition.java
index 4c1bfe0..ac6874d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/SetRelationDefinition.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/SetRelationDefinition.java
@@ -79,10 +79,8 @@
* The optional default managed objects associated with this
* set relation definition.
*/
- private final Map<String,
- DefaultManagedObject<? extends C, ? extends S>>
- defaultManagedObjects =
- new HashMap<String, DefaultManagedObject<? extends C, ? extends S>>();
+ private final Map<String, DefaultManagedObject<? extends C, ? extends S>>
+ defaultManagedObjects = new HashMap<>();
@@ -127,29 +125,18 @@
/** {@inheritDoc} */
@Override
- protected SetRelationDefinition<C, S> buildInstance(
- Common<C, S> common)
+ protected SetRelationDefinition<C, S> buildInstance(Common<C, S> common)
{
- return new SetRelationDefinition<C, S>(common, pluralName,
- defaultManagedObjects);
+ return new SetRelationDefinition<>(common, pluralName, defaultManagedObjects);
}
-
}
/** The plural name of the relation. */
private final String pluralName;
-
- /**
- * The optional default managed objects associated with this
- * set relation definition.
- */
- private final Map<String,
- DefaultManagedObject<? extends C, ? extends S>>
- defaultManagedObjects;
-
-
+ /** The optional default managed objects associated with this set relation definition. */
+ private final Map<String, DefaultManagedObject<? extends C, ? extends S>> defaultManagedObjects;
/** Private constructor. */
private SetRelationDefinition(
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/SingletonRelationDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/SingletonRelationDefinition.java
index 19cf54c..91cebfe 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/SingletonRelationDefinition.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/SingletonRelationDefinition.java
@@ -106,10 +106,8 @@
@Override
protected SingletonRelationDefinition<C, S> buildInstance(
Common<C, S> common) {
- return new SingletonRelationDefinition<C, S>(common,
- defaultManagedObject);
+ return new SingletonRelationDefinition<>(common, defaultManagedObject);
}
-
}
@@ -118,8 +116,7 @@
* The optional default managed object associated with this
* singleton relation.
*/
- private final DefaultManagedObject<? extends C, ? extends S>
- defaultManagedObject;
+ private final DefaultManagedObject<? extends C, ? extends S> defaultManagedObject;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/Tag.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/Tag.java
index 6573f00..c0af03f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/Tag.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/Tag.java
@@ -49,7 +49,7 @@
public final class Tag implements Comparable<Tag> {
/** All the tags. */
- private static final Map<String, Tag> tags = new HashMap<String, Tag>();
+ private static final Map<String, Tag> tags = new HashMap<>();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/MissingMandatoryPropertiesException.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/MissingMandatoryPropertiesException.java
index c4564e4..616979b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/MissingMandatoryPropertiesException.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/MissingMandatoryPropertiesException.java
@@ -112,7 +112,7 @@
Collection<PropertyException> causes, boolean isCreate) {
super(createMessage(causes));
- this.causes = new ArrayList<PropertyException>(causes);
+ this.causes = new ArrayList<>(causes);
this.ufn = ufn;
this.isCreate = isCreate;
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/OperationRejectedException.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/OperationRejectedException.java
index b1de19e..3295418 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/OperationRejectedException.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/OperationRejectedException.java
@@ -164,7 +164,7 @@
Collection<LocalizableMessage> messages) {
super(getDefaultMessage(messages));
- this.messages = new ArrayList<LocalizableMessage>(messages);
+ this.messages = new ArrayList<>(messages);
this.type = type;
this.ufn = ufn;
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/JNDIDirContextAdaptor.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/JNDIDirContextAdaptor.java
index ba299f5..326e9f3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/JNDIDirContextAdaptor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/JNDIDirContextAdaptor.java
@@ -98,7 +98,7 @@
public static JNDIDirContextAdaptor simpleBind(String host, int port,
String name, String password) throws CommunicationException,
AuthenticationNotSupportedException, AuthenticationException {
- Hashtable<String, Object> env = new Hashtable<String, Object>();
+ Hashtable<String, Object> env = new Hashtable<>();
env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory");
String hostname = getHostNameForLdapUrl(host);
env.put(Context.PROVIDER_URL, "ldap://" + hostname + ":" + port);
@@ -132,7 +132,7 @@
public static JNDIDirContextAdaptor simpleSSLBind(String host, int port,
String name, String password) throws CommunicationException,
AuthenticationNotSupportedException, AuthenticationException {
- Hashtable<String, Object> env = new Hashtable<String, Object>();
+ Hashtable<String, Object> env = new Hashtable<>();
env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory");
String hostname = getHostNameForLdapUrl(host);
env.put(Context.PROVIDER_URL, "ldaps://" + hostname + ":" + port);
@@ -238,9 +238,8 @@
SearchControls controls = new SearchControls();
controls.setSearchScope(SearchControls.ONELEVEL_SCOPE);
- List<LdapName> children = new LinkedList<LdapName>();
- NamingEnumeration<SearchResult> results = dirContext.search(dn, filter,
- controls);
+ List<LdapName> children = new LinkedList<>();
+ NamingEnumeration<SearchResult> results = dirContext.search(dn, filter, controls);
try
{
while (results.hasMore()) {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/LDAPDriver.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/LDAPDriver.java
index 4b7cb88..c57b3c8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/LDAPDriver.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/LDAPDriver.java
@@ -209,7 +209,7 @@
ManagedObjectDefinition<? extends C, ? extends S> mod =
getEntryDefinition(d, dn);
- ArrayList<String> attrIds = new ArrayList<String>();
+ ArrayList<String> attrIds = new ArrayList<>();
for (PropertyDefinition<?> pd : mod.getAllPropertyDefinitions()) {
String attrId = profile.getAttributeName(mod, pd);
attrIds.add(attrId);
@@ -218,7 +218,7 @@
Attributes attributes = connection.readEntry(dn, attrIds);
// Build the managed object's properties.
- List<PropertyException> exceptions = new LinkedList<PropertyException>();
+ List<PropertyException> exceptions = new LinkedList<>();
PropertySet newProperties = new PropertySet();
for (PropertyDefinition<?> pd : mod.getAllPropertyDefinitions()) {
String attrID = profile.getAttributeName(mod, pd);
@@ -289,7 +289,7 @@
Attribute attribute = attributes.get(attrID);
// Decode the values.
- SortedSet<PD> values = new TreeSet<PD>(pd);
+ SortedSet<PD> values = new TreeSet<>(pd);
if (attribute != null) {
NamingEnumeration<?> ldapValues = attribute.getAll();
while (ldapValues.hasMore()) {
@@ -330,7 +330,7 @@
/** {@inheritDoc} */
@Override
public ManagedObject<RootCfgClient> getRootConfigurationManagedObject() {
- return new LDAPManagedObject<RootCfgClient>(this,
+ return new LDAPManagedObject<>(this,
RootCfgDefn.getInstance(), ManagedObjectPath.emptyPath(),
new PropertySet(), true, null);
}
@@ -362,7 +362,7 @@
builder.append(')');
String filter = builder.toString();
- List<String> children = new ArrayList<String>();
+ List<String> children = new ArrayList<>();
try {
for (LdapName child : connection.listEntries(dn, filter)) {
children.add(child.getRdn(child.size() - 1).getValue().toString());
@@ -405,7 +405,7 @@
builder.append(')');
String filter = builder.toString();
- List<String> children = new ArrayList<String>();
+ List<String> children = new ArrayList<>();
try {
for (LdapName child : connection.listEntries(dn, filter)) {
children.add(child.getRdn(child.size() - 1).getValue().toString());
@@ -571,7 +571,7 @@
(InstantiableRelationDefinition<?, ?>) rd;
pd = ird.getNamingPropertyDefinition();
}
- return new LDAPManagedObject<M>(this, d, p.asSubType(d), properties, true, pd);
+ return new LDAPManagedObject<>(this, d, p.asSubType(d), properties, true, pd);
}
@@ -584,7 +584,7 @@
PropertyException exception = null;
// Get the property's active values.
- SortedSet<PD> activeValues = new TreeSet<PD>(pd);
+ SortedSet<PD> activeValues = new TreeSet<>(pd);
if (attribute != null) {
NamingEnumeration<?> ldapValues = attribute.getAll();
while (ldapValues.hasMore()) {
@@ -644,7 +644,7 @@
throw new DefinitionDecodingException(d, Reason.NO_TYPE_INFORMATION);
}
- final Set<String> objectClasses = new HashSet<String>();
+ final Set<String> objectClasses = new HashSet<>();
NamingEnumeration<?> values = oc.getAll();
while (values.hasMore()) {
Object value = values.next();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/LDAPManagedObject.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/LDAPManagedObject.java
index b207a23..9559f74 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/LDAPManagedObject.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/LDAPManagedObject.java
@@ -332,7 +332,7 @@
ManagedObjectDefinition<M, ?> d, ManagedObjectPath<M, ?> path,
PropertySet properties, boolean existsOnServer,
PropertyDefinition<?> namingPropertyDefinition) {
- return new LDAPManagedObject<M>(driver, d, path, properties,
+ return new LDAPManagedObject<>(driver, d, path, properties,
existsOnServer, namingPropertyDefinition);
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/LDAPNameBuilder.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/LDAPNameBuilder.java
index c75d4d9..d43148d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/LDAPNameBuilder.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/ldap/LDAPNameBuilder.java
@@ -122,13 +122,10 @@
}
/** The list of RDNs in big-endian order. */
- private final LinkedList<Rdn> rdns;
-
+ private final LinkedList<Rdn> rdns = new LinkedList<>();
/** The LDAP profile. */
private final LDAPProfile profile;
-
-
/**
* Create a new JNDI LDAP name builder.
*
@@ -137,12 +134,9 @@
* names.
*/
public LDAPNameBuilder(LDAPProfile profile) {
- this.rdns = new LinkedList<Rdn>();
this.profile = profile;
}
-
-
/** {@inheritDoc} */
public <C extends ConfigurationClient, S extends Configuration>
void appendManagedObjectPathElement(
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/AbstractManagedObject.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/AbstractManagedObject.java
index e3463ad..541a880 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/AbstractManagedObject.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/AbstractManagedObject.java
@@ -285,7 +285,7 @@
OperationRejectedException, AuthorizationException,
CommunicationException {
// First make sure all mandatory properties are defined.
- List<PropertyException> exceptions = new LinkedList<PropertyException>();
+ List<PropertyException> exceptions = new LinkedList<>();
for (PropertyDefinition<?> pd : definition.getAllPropertyDefinitions()) {
Property<?> p = getProperty(pd);
@@ -301,7 +301,7 @@
}
// Now enforce any constraints.
- List<LocalizableMessage> messages = new LinkedList<LocalizableMessage>();
+ List<LocalizableMessage> messages = new LinkedList<>();
boolean isAcceptable = true;
ManagementContext context = getDriver().getManagementContext();
@@ -525,7 +525,7 @@
/** {@inheritDoc} */
public final <PD> SortedSet<PD> getPropertyDefaultValues(
PropertyDefinition<PD> pd) throws IllegalArgumentException {
- return new TreeSet<PD>(getProperty(pd).getDefaultValues());
+ return new TreeSet<>(getProperty(pd).getDefaultValues());
}
@@ -534,11 +534,10 @@
public final <PD> PD getPropertyValue(PropertyDefinition<PD> pd)
throws IllegalArgumentException {
Set<PD> values = getProperty(pd).getEffectiveValues();
- if (values.isEmpty()) {
- return null;
- } else {
+ if (!values.isEmpty()) {
return values.iterator().next();
}
+ return null;
}
@@ -546,7 +545,7 @@
/** {@inheritDoc} */
public final <PD> SortedSet<PD> getPropertyValues(PropertyDefinition<PD> pd)
throws IllegalArgumentException {
- return new TreeSet<PD>(getProperty(pd).getEffectiveValues());
+ return new TreeSet<>(getProperty(pd).getEffectiveValues());
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/PropertySet.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/PropertySet.java
index dce5e1f..a91a57f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/PropertySet.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/PropertySet.java
@@ -80,45 +80,34 @@
Collection<T> activeValues) {
this.d = pd;
- SortedSet<T> sortedDefaultValues = new TreeSet<T>(pd);
+ SortedSet<T> sortedDefaultValues = new TreeSet<>(pd);
sortedDefaultValues.addAll(defaultValues);
this.defaultValues = Collections
.unmodifiableSortedSet(sortedDefaultValues);
- this.activeValues = new TreeSet<T>(pd);
+ this.activeValues = new TreeSet<>(pd);
this.activeValues.addAll(activeValues);
- // Initially the pending values is the same as the active
- // values.
- this.pendingValues = new TreeSet<T>(this.activeValues);
+ // Initially the pending values is the same as the active values.
+ this.pendingValues = new TreeSet<>(this.activeValues);
}
-
-
- /**
- * Makes the pending values active.
- */
+ /** Makes the pending values active. */
public void commit() {
activeValues.clear();
activeValues.addAll(pendingValues);
}
-
-
/** {@inheritDoc} */
public SortedSet<T> getActiveValues() {
return Collections.unmodifiableSortedSet(activeValues);
}
-
-
/** {@inheritDoc} */
public SortedSet<T> getDefaultValues() {
return defaultValues;
}
-
-
/** {@inheritDoc} */
public SortedSet<T> getEffectiveValues() {
SortedSet<T> values = getPendingValues();
@@ -190,19 +179,12 @@
}
/** The properties. */
- private final Map<PropertyDefinition<?>, MyProperty<?>> properties;
+ private final Map<PropertyDefinition<?>, MyProperty<?>> properties = new HashMap<>();
-
-
- /**
- * Creates a new empty property set.
- */
+ /** Creates a new empty property set. */
public PropertySet() {
- this.properties = new HashMap<PropertyDefinition<?>, MyProperty<?>>();
}
-
-
/**
* Creates a property with the provided sets of pre-validated
* default and active values.
@@ -218,7 +200,7 @@
*/
public <T> void addProperty(PropertyDefinition<T> pd,
Collection<T> defaultValues, Collection<T> activeValues) {
- MyProperty<T> p = new MyProperty<T>(pd, defaultValues, activeValues);
+ MyProperty<T> p = new MyProperty<>(pd, defaultValues, activeValues);
properties.put(pd, p);
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/condition/ContainsCondition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/condition/ContainsCondition.java
index 160cdbc..e31afb2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/condition/ContainsCondition.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/condition/ContainsCondition.java
@@ -179,7 +179,7 @@
private <T> void buildImpl(PropertyDefinition<T> pd)
throws PropertyException {
T value = pd.decodeValue(propertyStringValue);
- this.impl = new Impl<T>(pd, value);
+ this.impl = new Impl<>(pd, value);
}
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java
index 27a4bdd..6c5dca3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java
@@ -208,7 +208,7 @@
TreeMap<String, RelationDefinition> catMap =
catTopRelList.get(tag.getName());
if (catMap == null) {
- catMap = new TreeMap<String, RelationDefinition>();
+ catMap = new TreeMap<>();
catTopRelList.put(tag.getName(), catMap);
}
catMap.put(mo.getName(), rel);
@@ -222,7 +222,7 @@
TreeMap<String, AbstractManagedObjectDefinition> catMap =
catTopMoList.get(tag.getName());
if (catMap == null) {
- catMap = new TreeMap<String, AbstractManagedObjectDefinition>();
+ catMap = new TreeMap<>();
catTopMoList.put(tag.getName(), catMap);
}
catMap.put(topObject.getName(), topObject);
@@ -472,10 +472,8 @@
paragraph("A description of each property follows.");
newline();
- TreeMap<String, PropertyDefinition> basicProps =
- new TreeMap<String, PropertyDefinition>();
- TreeMap<String, PropertyDefinition> advancedProps =
- new TreeMap<String, PropertyDefinition>();
+ TreeMap<String, PropertyDefinition> basicProps = new TreeMap<>();
+ TreeMap<String, PropertyDefinition> advancedProps = new TreeMap<>();
// Properties actually defined in this managed object
@SuppressWarnings("unchecked")
Collection<PropertyDefinition> props = mo.getAllPropertyDefinitions();
@@ -624,8 +622,7 @@
paragraph(
"The following components have a direct AGGREGATION relation FROM " +
mo.getUserFriendlyPluralName() + " :");
- TreeMap<String, AbstractManagedObjectDefinition> componentList =
- new TreeMap<String, AbstractManagedObjectDefinition>();
+ TreeMap<String, AbstractManagedObjectDefinition> componentList = new TreeMap<>();
for ( AggregationPropertyDefinition agg : aggregProps) {
RelationDefinition rel = agg.getRelationDefinition();
AbstractManagedObjectDefinition childRel = rel.getChildDefinition();
@@ -633,8 +630,7 @@
}
for (AbstractManagedObjectDefinition component : componentList.values()) {
beginList();
- link(component.getUserFriendlyName().toString(), component.getName() +
- ".html");
+ link(component.getUserFriendlyName().toString(), component.getName() + ".html");
endList();
}
}
@@ -665,8 +661,7 @@
paragraph(
"The following components have a direct AGGREGATION relation TO " +
mo.getUserFriendlyPluralName() + " :");
- TreeMap<String, AbstractManagedObjectDefinition> componentList =
- new TreeMap<String, AbstractManagedObjectDefinition>();
+ TreeMap<String, AbstractManagedObjectDefinition> componentList = new TreeMap<>();
for ( AggregationPropertyDefinition agg : reverseAggregProps) {
AbstractManagedObjectDefinition fromMo =
agg.getManagedObjectDefinition();
@@ -887,7 +882,7 @@
private void genPropertiesIndex() {
// Build a sorted list of (property name + its managed object name)
- TreeSet<String> propMoList = new TreeSet<String>();
+ TreeSet<String> propMoList = new TreeSet<>();
for (AbstractManagedObjectDefinition<?, ?> mo : moList.values()) {
for (PropertyDefinition<?> prop : mo.getPropertyDefinitions()) {
propMoList.add(
@@ -1273,8 +1268,7 @@
if (coll == null) {
return null;
}
- TreeMap<String, AbstractManagedObjectDefinition> map =
- new TreeMap<String, AbstractManagedObjectDefinition>();
+ TreeMap<String, AbstractManagedObjectDefinition> map = new TreeMap<>();
for (AbstractManagedObjectDefinition mo : coll) {
if (mo.hasOption(ManagedObjectOption.HIDDEN))
{
@@ -1291,8 +1285,7 @@
if (coll == null) {
return null;
}
- TreeMap<String, RelationDefinition> map =
- new TreeMap<String, RelationDefinition>();
+ TreeMap<String, RelationDefinition> map = new TreeMap<>();
for (RelationDefinition rel : coll) {
map.put(rel.getChildDefinition().getName(), rel);
}
@@ -1305,8 +1298,7 @@
if (coll == null) {
return null;
}
- TreeMap<String, PropertyDefinition> map =
- new TreeMap<String, PropertyDefinition>();
+ TreeMap<String, PropertyDefinition> map = new TreeMap<>();
for (PropertyDefinition prop : coll) {
map.put(prop.getName(), prop);
}
@@ -1611,21 +1603,14 @@
}
/** Relation List from RootConfiguration. */
- private final TreeMap<String, RelationDefinition> topRelList =
- new TreeMap<String, RelationDefinition>();
- private final TreeMap<String, RelationDefinition> relList =
- new TreeMap<String, RelationDefinition>();
- private final TreeMap<String, TreeMap<String, RelationDefinition>>
- catTopRelList = new TreeMap<String, TreeMap<String, RelationDefinition>>();
+ private final TreeMap<String, RelationDefinition> topRelList = new TreeMap<>();
+ private final TreeMap<String, RelationDefinition> relList = new TreeMap<>();
+ private final TreeMap<String, TreeMap<String, RelationDefinition>> catTopRelList = new TreeMap<>();
/** Managed object list. */
- private final TreeMap<String, AbstractManagedObjectDefinition> moList =
- new TreeMap<String, AbstractManagedObjectDefinition>();
- private final TreeMap<String, AbstractManagedObjectDefinition> topMoList =
- new TreeMap<String, AbstractManagedObjectDefinition>();
- private final TreeMap<String,
- TreeMap<String, AbstractManagedObjectDefinition>>
- catTopMoList =
- new TreeMap<String, TreeMap<String, AbstractManagedObjectDefinition>>();
+ private final TreeMap<String, AbstractManagedObjectDefinition> moList = new TreeMap<>();
+ private final TreeMap<String, AbstractManagedObjectDefinition> topMoList = new TreeMap<>();
+ private final TreeMap<String, TreeMap<String, AbstractManagedObjectDefinition>>
+ catTopMoList = new TreeMap<>();
private final int ind = 0;
private StringBuffer htmlBuff = new StringBuffer();
private static String generationDir;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigAddListenerAdaptor.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigAddListenerAdaptor.java
index cb62ef5..50b1dfe 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigAddListenerAdaptor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigAddListenerAdaptor.java
@@ -241,7 +241,7 @@
}
// Let the add listener decide.
- List<LocalizableMessage> reasons = new LinkedList<LocalizableMessage>();
+ List<LocalizableMessage> reasons = new LinkedList<>();
if (listener.isConfigurationAddAcceptable(cachedManagedObject, reasons)) {
return true;
} else {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigChangeListenerAdaptor.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigChangeListenerAdaptor.java
index 93926a8..54e5547 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigChangeListenerAdaptor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigChangeListenerAdaptor.java
@@ -101,7 +101,7 @@
*/
public static <T> void find(ManagedObjectPath<?, ?> path,
PropertyDefinition<T> pd, Collection<DN> dependencies) {
- Visitor<T> v = new Visitor<T>(dependencies);
+ Visitor<T> v = new Visitor<>(dependencies);
DefaultBehaviorProvider<T> db = pd.getDefaultBehaviorProvider();
db.accept(v, path);
}
@@ -229,7 +229,7 @@
// This change listener should be notified when dependent entries
// are modified. Determine the dependencies and register change
// listeners against them.
- this.dependencies = new HashSet<DN>();
+ this.dependencies = new HashSet<>();
this.dependencyListener = new ConfigChangeListener() {
public ConfigChangeResult applyConfigurationChange(
@@ -394,7 +394,7 @@
}
// Let the change listener decide.
- List<LocalizableMessage> reasons = new LinkedList<LocalizableMessage>();
+ List<LocalizableMessage> reasons = new LinkedList<>();
if (listener.isConfigurationChangeAcceptable(cachedManagedObject,reasons)) {
return true;
} else {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigDeleteListenerAdaptor.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigDeleteListenerAdaptor.java
index d77d703..d87a381 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigDeleteListenerAdaptor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigDeleteListenerAdaptor.java
@@ -236,7 +236,7 @@
return false;
}
- List<LocalizableMessage> reasons = new LinkedList<LocalizableMessage>();
+ List<LocalizableMessage> reasons = new LinkedList<>();
// Enforce any constraints.
boolean isDeleteAllowed = true;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConstraintViolationException.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConstraintViolationException.java
index 273549a..d880b43 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConstraintViolationException.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConstraintViolationException.java
@@ -117,7 +117,7 @@
super(getDefaultMessage(messages));
this.managedObject = managedObject;
- this.messages = new ArrayList<LocalizableMessage>(messages);
+ this.messages = new ArrayList<>(messages);
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObject.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObject.java
index e41c068..22b21a4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObject.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObject.java
@@ -791,8 +791,7 @@
throws IllegalArgumentException, ConfigException {
validateRelationDefinition(d);
DN baseDN = DNBuilder.create(path, d);
- ConfigAddListener adaptor = new ConfigAddListenerAdaptor<M>(path, d,
- listener);
+ ConfigAddListener adaptor = new ConfigAddListenerAdaptor<>(path, d, listener);
registerAddListener(baseDN, adaptor);
}
@@ -818,8 +817,7 @@
public <M extends Configuration> void registerAddListener(
OptionalRelationDefinition<?, M> d, ConfigurationAddListener<M> listener)
throws IllegalArgumentException, ConfigException {
- registerAddListener(d, new ServerManagedObjectAddListenerAdaptor<M>(
- listener));
+ registerAddListener(d, new ServerManagedObjectAddListenerAdaptor<M>(listener));
}
@@ -847,8 +845,7 @@
throws IllegalArgumentException, ConfigException {
validateRelationDefinition(d);
DN baseDN = DNBuilder.create(path, d).parent();
- ConfigAddListener adaptor = new ConfigAddListenerAdaptor<M>(path, d,
- listener);
+ ConfigAddListener adaptor = new ConfigAddListenerAdaptor<>(path, d, listener);
registerAddListener(baseDN, adaptor);
}
@@ -904,8 +901,7 @@
throws IllegalArgumentException, ConfigException {
validateRelationDefinition(d);
DN baseDN = DNBuilder.create(path, d);
- ConfigAddListener adaptor = new ConfigAddListenerAdaptor<M>(path, d,
- listener);
+ ConfigAddListener adaptor = new ConfigAddListenerAdaptor<>(path, d, listener);
registerAddListener(baseDN, adaptor);
}
@@ -935,8 +931,7 @@
*/
public void registerChangeListener(
ServerManagedObjectChangeListener<? super S> listener) {
- ConfigChangeListener adaptor = new ConfigChangeListenerAdaptor<S>(path,
- listener);
+ ConfigChangeListener adaptor = new ConfigChangeListenerAdaptor<>(path, listener);
configEntry.registerChangeListener(adaptor);
// Change listener registration usually signifies that a managed
@@ -1009,8 +1004,7 @@
throws IllegalArgumentException, ConfigException {
validateRelationDefinition(d);
DN baseDN = DNBuilder.create(path, d);
- ConfigDeleteListener adaptor = new ConfigDeleteListenerAdaptor<M>(path, d,
- listener);
+ ConfigDeleteListener adaptor = new ConfigDeleteListenerAdaptor<>(path, d, listener);
registerDeleteListener(baseDN, adaptor);
}
@@ -1066,8 +1060,7 @@
throws IllegalArgumentException, ConfigException {
validateRelationDefinition(d);
DN baseDN = DNBuilder.create(path, d).parent();
- ConfigDeleteListener adaptor = new ConfigDeleteListenerAdaptor<M>(path, d,
- listener);
+ ConfigDeleteListener adaptor = new ConfigDeleteListenerAdaptor<>(path, d, listener);
registerDeleteListener(baseDN, adaptor);
}
@@ -1123,8 +1116,7 @@
throws IllegalArgumentException, ConfigException {
validateRelationDefinition(d);
DN baseDN = DNBuilder.create(path, d);
- ConfigDeleteListener adaptor = new ConfigDeleteListenerAdaptor<M>(path, d,
- listener);
+ ConfigDeleteListener adaptor = new ConfigDeleteListenerAdaptor<>(path, d, listener);
registerDeleteListener(baseDN, adaptor);
}
@@ -1165,7 +1157,7 @@
void ensureIsUsable() throws ConstraintViolationException {
// Enforce any constraints.
boolean isUsable = true;
- List<LocalizableMessage> reasons = new LinkedList<LocalizableMessage>();
+ List<LocalizableMessage> reasons = new LinkedList<>();
for (Constraint constraint : definition.getAllConstraints()) {
for (ServerConstraintHandler handler : constraint
.getServerConstraintHandlers()) {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagementContext.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagementContext.java
index b3ecb2a..7194f01 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagementContext.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagementContext.java
@@ -147,7 +147,7 @@
public Collection<T> visitDefined(DefinedDefaultBehaviorProvider<T> d,
Void p) {
Collection<String> stringValues = d.getDefaultValues();
- List<T> values = new ArrayList<T>(stringValues.size());
+ List<T> values = new ArrayList<>(stringValues.size());
for (String stringValue : stringValues) {
try {
@@ -257,14 +257,14 @@
if (values.isEmpty()) {
// Recursively retrieve this property's default values.
Collection<T> tmp = find(target, pd2);
- Collection<T> pvalues = new ArrayList<T>(tmp.size());
+ Collection<T> pvalues = new ArrayList<>(tmp.size());
for (T value : tmp) {
pd1.validateValue(value);
pvalues.add(value);
}
return pvalues;
} else {
- Collection<T> pvalues = new ArrayList<T>(values.size());
+ Collection<T> pvalues = new ArrayList<>(values.size());
for (ByteString value : values) {
pvalues.add(ValueDecoder.decode(pd1, value));
}
@@ -369,14 +369,10 @@
/** Singleton instance. */
- private static final ServerManagementContext INSTANCE =
- new ServerManagementContext();
+ private static final ServerManagementContext INSTANCE = new ServerManagementContext();
- /**
- * The root server managed object.
- */
- private static final ServerManagedObject<RootCfg> ROOT =
- new ServerManagedObject<RootCfg>(
+ /** The root server managed object. */
+ private static final ServerManagedObject<RootCfg> ROOT = new ServerManagedObject<>(
ManagedObjectPath.emptyPath(), RootCfgDefn.getInstance(), Collections
.<PropertyDefinition<?>, SortedSet<?>> emptyMap(), null);
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -627,7 +623,7 @@
// Retrieve the children.
Set<DN> children = configEntry.getChildren().keySet();
- ArrayList<String> names = new ArrayList<String>(children.size());
+ ArrayList<String> names = new ArrayList<>(children.size());
for (DN child : children) {
// Assume that RDNs are single-valued and can be trimmed.
ByteString av = child.rdn().getAttributeValue(0);
@@ -679,7 +675,7 @@
// Retrieve the children.
Set<DN> children = configEntry.getChildren().keySet();
- ArrayList<String> names = new ArrayList<String>(children.size());
+ ArrayList<String> names = new ArrayList<>(children.size());
for (DN child : children) {
// Assume that RDNs are single-valued and can be trimmed.
ByteString av = child.rdn().getAttributeValue(0);
@@ -783,9 +779,8 @@
.resolveManagedObjectDefinition(resolver);
// Build the managed object's properties.
- List<PropertyException> exceptions = new LinkedList<PropertyException>();
- Map<PropertyDefinition<?>, SortedSet<?>> properties =
- new HashMap<PropertyDefinition<?>, SortedSet<?>>();
+ List<PropertyException> exceptions = new LinkedList<>();
+ Map<PropertyDefinition<?>, SortedSet<?>> properties = new HashMap<>();
for (PropertyDefinition<?> pd : mod.getAllPropertyDefinitions()) {
List<ByteString> values = getAttribute(mod, pd, configEntry);
try {
@@ -798,13 +793,11 @@
// If there were no decoding problems then return the managed
// object, otherwise throw an operations exception.
- ServerManagedObject<? extends S> mo = decodeAux(path, mod, properties,
- configEntry);
- if (exceptions.isEmpty()) {
- return mo;
- } else {
+ ServerManagedObject<? extends S> mo = decodeAux(path, mod, properties, configEntry);
+ if (!exceptions.isEmpty()) {
throw new ServerManagedObjectDecodingException(mo, exceptions);
}
+ return mo;
}
@@ -817,7 +810,7 @@
Map<PropertyDefinition<?>, SortedSet<?>> properties,
ConfigEntry configEntry) {
ManagedObjectPath<C, S> newPath = path.asSubType(d);
- return new ServerManagedObject<S>(newPath, d, properties, configEntry);
+ return new ServerManagedObject<>(newPath, d, properties, configEntry);
}
@@ -827,7 +820,7 @@
PropertyDefinition<T> pd, List<ByteString> values,
ConfigEntry newConfigEntry) throws PropertyException {
PropertyException exception = null;
- SortedSet<T> pvalues = new TreeSet<T>(pd);
+ SortedSet<T> pvalues = new TreeSet<>(pd);
if (!values.isEmpty()) {
// The property has values defined for it.
@@ -880,7 +873,7 @@
AttributeType type = DirectoryServer.getAttributeType(attrID, true);
List<Attribute> attributes = configEntry.getEntry().getAttribute(type, true);
- List<ByteString> results = new LinkedList<ByteString>();
+ List<ByteString> results = new LinkedList<>();
if (attributes != null)
{
for (Attribute a : attributes)
@@ -900,7 +893,7 @@
private <T> Collection<T> getDefaultValues(ManagedObjectPath<?, ?> p,
PropertyDefinition<T> pd, ConfigEntry newConfigEntry)
throws PropertyException {
- DefaultValueFinder<T> v = new DefaultValueFinder<T>(newConfigEntry);
+ DefaultValueFinder<T> v = new DefaultValueFinder<>(newConfigEntry);
return v.find(p, pd);
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/Backend.java b/opendj-server-legacy/src/main/java/org/opends/server/api/Backend.java
index 159926e..0026c3b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/Backend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/Backend.java
@@ -30,6 +30,7 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Queue;
@@ -109,8 +110,7 @@
private WritabilityMode writabilityMode = WritabilityMode.ENABLED;
/** The set of persistent searches registered with this backend. */
- private final ConcurrentLinkedQueue<PersistentSearch> persistentSearches =
- new ConcurrentLinkedQueue<PersistentSearch>();
+ private final ConcurrentLinkedQueue<PersistentSearch> persistentSearches = new ConcurrentLinkedQueue<>();
/**
* Configure this backend based on the information in the provided configuration.
@@ -897,18 +897,12 @@
*/
public final synchronized void addSubordinateBackend(Backend<?> subordinateBackend)
{
- LinkedHashSet<Backend<?>> backendSet = new LinkedHashSet<Backend<?>>();
-
- for (Backend<?> b : subordinateBackends)
- {
- backendSet.add(b);
- }
+ LinkedHashSet<Backend<?>> backendSet = new LinkedHashSet<>();
+ Collections.addAll(backendSet, subordinateBackends);
if (backendSet.add(subordinateBackend))
{
- Backend<?>[] newSubordinateBackends = new Backend[backendSet.size()];
- backendSet.toArray(newSubordinateBackends);
- subordinateBackends = newSubordinateBackends;
+ subordinateBackends = backendSet.toArray(new Backend[backendSet.size()]);
}
}
@@ -922,7 +916,7 @@
*/
public final synchronized void removeSubordinateBackend(Backend<?> subordinateBackend)
{
- ArrayList<Backend<?>> backendList = new ArrayList<Backend<?>>(subordinateBackends.length);
+ ArrayList<Backend<?>> backendList = new ArrayList<>(subordinateBackends.length);
boolean found = false;
for (Backend<?> b : subordinateBackends)
@@ -939,9 +933,7 @@
if (found)
{
- Backend<?>[] newSubordinateBackends = new Backend[backendList.size()];
- backendList.toArray(newSubordinateBackends);
- subordinateBackends = newSubordinateBackends;
+ subordinateBackends = backendList.toArray(new Backend[backendList.size()]);
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/ClientConnection.java b/opendj-server-legacy/src/main/java/org/opends/server/api/ClientConnection.java
index fc6c725..155247b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/ClientConnection.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/ClientConnection.java
@@ -105,20 +105,16 @@
private boolean finalized;
/** The set of privileges assigned to this client connection. */
- private HashSet<Privilege> privileges;
+ private HashSet<Privilege> privileges = new HashSet<>();
/** The size limit for use with this client connection. */
private int sizeLimit;
-
/** The time limit for use with this client connection. */
private int timeLimit;
-
/** The lookthrough limit for use with this client connection. */
private int lookthroughLimit;
-
/** The time that this client connection was established. */
private final long connectTime;
-
/** The idle time limit for this client connection. */
private long idleTimeLimit;
@@ -128,20 +124,13 @@
*/
private Object saslAuthState;
- /**
- * A string representation of the time that this client connection was
- * established.
- */
+ /** A string representation of the time that this client connection was established. */
private final String connectTimeString;
/** A set of persistent searches registered for this client. */
- private final CopyOnWriteArrayList<PersistentSearch>
- persistentSearches;
+ private final CopyOnWriteArrayList<PersistentSearch> persistentSearches = new CopyOnWriteArrayList<>();
- /**
- * Performs the appropriate initialization generic to all client
- * connections.
- */
+ /** Performs the appropriate initialization generic to all client connections. */
protected ClientConnection()
{
connectTime = TimeThread.getTime();
@@ -150,13 +139,11 @@
saslAuthState = null;
saslBindInProgress = new AtomicBoolean(false);
bindOrStartTLSInProgress = new AtomicBoolean(false);
- persistentSearches = new CopyOnWriteArrayList<PersistentSearch>();
sizeLimit = DirectoryServer.getSizeLimit();
timeLimit = DirectoryServer.getTimeLimit();
idleTimeLimit = DirectoryServer.getIdleTimeLimit();
lookthroughLimit = DirectoryServer.getLookthroughLimit();
finalized = false;
- privileges = new HashSet<Privilege>();
}
@@ -1104,7 +1091,7 @@
{
if (entry == null)
{
- return new HashSet<Privilege>(0);
+ return new HashSet<>(0);
}
HashSet<Privilege> newPrivileges = new HashSet<>();
@@ -1476,16 +1463,14 @@
return Collections.<Group<?>>emptySet();
}
- HashSet<Group<?>> groupSet = new HashSet<Group<?>>();
- for (Group<?> g :
- DirectoryServer.getGroupManager().getGroupInstances())
+ HashSet<Group<?>> groupSet = new HashSet<>();
+ for (Group<?> g : DirectoryServer.getGroupManager().getGroupInstances())
{
if (g.isMember(userEntry))
{
groupSet.add(g);
}
}
-
return groupSet;
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/CompressedSchema.java b/opendj-server-legacy/src/main/java/org/opends/server/api/CompressedSchema.java
index 9b986aa..74b5297 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/CompressedSchema.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/CompressedSchema.java
@@ -66,32 +66,13 @@
public class CompressedSchema
{
/** Maps attribute description to ID. */
- private final List<Entry<AttributeType, Set<String>>> adDecodeMap;
-
+ private final List<Entry<AttributeType, Set<String>>> adDecodeMap = new CopyOnWriteArrayList<>();
/** Maps ID to attribute description. */
- private final Map<Entry<AttributeType, Set<String>>, Integer> adEncodeMap;
-
+ private final Map<Entry<AttributeType, Set<String>>, Integer> adEncodeMap = new ConcurrentHashMap<>();
/** The map between encoded representations and object class sets. */
- private final List<Map<ObjectClass, String>> ocDecodeMap;
-
+ private final List<Map<ObjectClass, String>> ocDecodeMap = new CopyOnWriteArrayList<>();
/** The map between object class sets and encoded representations. */
- private final Map<Map<ObjectClass, String>, Integer> ocEncodeMap;
-
-
-
- /**
- * Creates a new empty instance of this compressed schema.
- */
- public CompressedSchema()
- {
- adDecodeMap = new CopyOnWriteArrayList<Entry<AttributeType, Set<String>>>();
- ocDecodeMap = new CopyOnWriteArrayList<Map<ObjectClass, String>>();
- adEncodeMap = new ConcurrentHashMap<Entry<AttributeType, Set<String>>,
- Integer>();
- ocEncodeMap = new ConcurrentHashMap<Map<ObjectClass, String>, Integer>();
- }
-
-
+ private final Map<Map<ObjectClass, String>, Integer> ocEncodeMap = new ConcurrentHashMap<>();
/**
* Decodes the contents of the provided array as an attribute at the current
@@ -223,8 +204,7 @@
// Re-use or allocate a new ID.
final AttributeType type = attribute.getAttributeType();
final Set<String> options = attribute.getOptions();
- final Entry<AttributeType, Set<String>> ad =
- new SimpleImmutableEntry<AttributeType, Set<String>>(type, options);
+ final Entry<AttributeType, Set<String>> ad = new SimpleImmutableEntry<>(type, options);
// Use double checked locking to avoid lazy registration races.
Integer id = adEncodeMap.get(ad);
@@ -378,27 +358,20 @@
{
private int id = 0;
-
-
@Override
public boolean hasNext()
{
return id < ocDecodeMap.size();
}
-
-
@Override
public Entry<byte[], Collection<String>> next()
{
final byte[] encodedObjectClasses = encodeId(id);
final Map<ObjectClass, String> ocMap = ocDecodeMap.get(id++);
- return new SimpleImmutableEntry<byte[], Collection<String>>(
- encodedObjectClasses, ocMap.values());
+ return new SimpleImmutableEntry<>(encodedObjectClasses, ocMap.values());
}
-
-
@Override
public void remove()
{
@@ -409,8 +382,6 @@
};
}
-
-
/**
* Loads an encoded attribute into this compressed schema. This method may
* called by implementations during initialization when loading content from
@@ -440,11 +411,10 @@
options = Collections.singleton(attributeOptions.iterator().next());
break;
default:
- options = new LinkedHashSet<String>(attributeOptions);
+ options = new LinkedHashSet<>(attributeOptions);
break;
}
- final Entry<AttributeType, Set<String>> ad =
- new SimpleImmutableEntry<AttributeType, Set<String>>(type, options);
+ final Entry<AttributeType, Set<String>> ad = new SimpleImmutableEntry<>(type, options);
final int id = decodeId(encodedAttribute);
synchronized (adEncodeMap)
{
@@ -483,8 +453,7 @@
final byte[] encodedObjectClasses,
final Collection<String> objectClassNames)
{
- final LinkedHashMap<ObjectClass, String> ocMap =
- new LinkedHashMap<ObjectClass, String>(objectClassNames.size());
+ final LinkedHashMap<ObjectClass, String> ocMap = new LinkedHashMap<>(objectClassNames.size());
for (final String name : objectClassNames)
{
final String lowerName = toLowerCase(name);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/DITCacheMap.java b/opendj-server-legacy/src/main/java/org/opends/server/api/DITCacheMap.java
index d9e37b8..2465792 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/DITCacheMap.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/DITCacheMap.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.api;
@@ -121,12 +121,11 @@
private int size;
/** Backing Map implementation. */
- private Map<DN,Node<T>> ditCacheMap;
+ private final Map<DN,Node<T>> ditCacheMap = new HashMap<>();
/** Default constructor. */
public DITCacheMap()
{
- ditCacheMap = new HashMap<DN,Node<T>>();
}
/**
@@ -136,7 +135,6 @@
*/
public DITCacheMap(Map<? extends DN, ? extends T> m)
{
- ditCacheMap = new HashMap<DN,Node<T>>();
this.putAll(m);
}
@@ -207,7 +205,7 @@
return returnValue;
}
- Node<T> node = new Node<T>();
+ Node<T> node = new Node<>();
node.dn = key;
node.element = value;
node.parent = null;
@@ -228,7 +226,7 @@
if (parentNode == null)
{
// Add glue node.
- final Node<T> newParentNode = new Node<T>();
+ final Node<T> newParentNode = new Node<>();
newParentNode.dn = parentDN;
newParentNode.element = null;
newParentNode.parent = null;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/DirectoryThread.java b/opendj-server-legacy/src/main/java/org/opends/server/api/DirectoryThread.java
index bc3f66a..e8a8834 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/DirectoryThread.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/DirectoryThread.java
@@ -175,7 +175,7 @@
/** The current logical thread's state. */
private volatile AtomicReference<ThreadState> threadState =
- new AtomicReference<ThreadState>(ThreadState.IDLE);
+ new AtomicReference<>(ThreadState.IDLE);
/**
* A thread group for all directory threads. This implements a
@@ -184,15 +184,12 @@
private static class DirectoryThreadGroup extends ThreadGroup
implements AlertGenerator
{
- private final LinkedHashMap<String,String> alerts;
+ private final LinkedHashMap<String,String> alerts = new LinkedHashMap<>();
- /**
- * Private constructor for DirectoryThreadGroup.
- */
+ /** Private constructor for DirectoryThreadGroup. */
private DirectoryThreadGroup()
{
super("Directory Server Thread Group");
- alerts = new LinkedHashMap<String,String>();
alerts.put(ALERT_TYPE_UNCAUGHT_EXCEPTION,
ALERT_DESCRIPTION_UNCAUGHT_EXCEPTION);
}
@@ -362,7 +359,7 @@
*/
public Map<String, String> getDebugProperties()
{
- Map<String, String> properties = new LinkedHashMap<String, String>();
+ Map<String, String> properties = new LinkedHashMap<>();
properties.put("parentThread", parentThread.getName() +
"(" + parentThread.getId() + ")");
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/plugin/PluginType.java b/opendj-server-legacy/src/main/java/org/opends/server/api/plugin/PluginType.java
index d07ac45..8731319 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/plugin/PluginType.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/plugin/PluginType.java
@@ -474,24 +474,18 @@
* A hash map that relates the plugin type names to the
* corresponding plugin type.
*/
- private static final Map<String, PluginType> PLUGIN_TYPE_MAP;
+ private static final Map<String, PluginType> PLUGIN_TYPE_MAP = new HashMap<>(PluginType.values().length);
static
{
- PLUGIN_TYPE_MAP =
- new HashMap<String, PluginType>(PluginType.values().length);
for (PluginType type : PluginType.values())
{
PLUGIN_TYPE_MAP.put(type.name, type);
}
}
-
-
/** The name for this plugin type. */
private String name;
-
-
/**
* Creates a new plugin type instance with the specified name.
*
@@ -502,8 +496,6 @@
this.name = name;
}
-
-
/**
* Retrieves the name for this plugin type.
*
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/Aci.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/Aci.java
index e58e28e..b8c8e23 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/Aci.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/Aci.java
@@ -550,7 +550,7 @@
*/
public static Set<String> decodeOID(String expr, LocalizableMessage msg)
throws AciException {
- Set<String> OIDs = new HashSet<String>();
+ Set<String> OIDs = new HashSet<>();
//Quick check to see if the expression is valid.
if (Pattern.matches(oidListRegex, expr)) {
// Remove the spaces in the oid string and
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciBody.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciBody.java
index f434f4b..5f214c2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciBody.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciBody.java
@@ -178,8 +178,7 @@
throws AciException {
String version=null, name=null;
int startPos=0;
- List<PermBindRulePair> permBindRulePairs=
- new ArrayList<PermBindRulePair>();
+ List<PermBindRulePair> permBindRulePairs = new ArrayList<>();
Pattern bodyPattern = Pattern.compile(header);
Matcher bodyMatcher = bodyPattern.matcher(input);
if(bodyMatcher.find()) {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciContainer.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciContainer.java
index aefa568..c81cf7b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciContainer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciContainer.java
@@ -161,7 +161,7 @@
* Table of ACIs that have targattrfilter keywords that matched. Used
* in geteffectiverights attributeLevel write evaluation.
*/
- private final HashMap<Aci,Aci> targAttrFilterAcis=new HashMap<Aci, Aci>();
+ private final HashMap<Aci,Aci> targAttrFilterAcis = new HashMap<>();
/**
* The name of a ACI that decided an evaluation and contained a
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciEffectiveRights.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciEffectiveRights.java
index 2ae28ee..5d831af 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciEffectiveRights.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciEffectiveRights.java
@@ -246,7 +246,7 @@
// Check if the attributes aclRights and aclRightsInfo were requested and
// add attributes less those two attributes to a new list of attribute
// types.
- List<AttributeType> nonRightsAttrs = new LinkedList<AttributeType>();
+ List<AttributeType> nonRightsAttrs = new LinkedList<>();
int attrMask = ACI_NULL;
for (String a : searchAttributes)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciHandler.java
index e59db6d..e552301 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciHandler.java
@@ -945,8 +945,8 @@
private void createApplicableList(List<Aci> candidates,
AciTargetMatchContext targetMatchCtx)
{
- List<Aci> denys = new LinkedList<Aci>();
- List<Aci> allows = new LinkedList<Aci>();
+ List<Aci> denys = new LinkedList<>();
+ List<Aci> allows = new LinkedList<>();
for (Aci aci : candidates)
{
if (Aci.isApplicable(aci, targetMatchCtx))
@@ -982,7 +982,7 @@
*/
private List<AttributeType> getAllAttrs(Entry e)
{
- List<AttributeType> typeList = new LinkedList<AttributeType>();
+ List<AttributeType> typeList = new LinkedList<>();
/*
* When a search is not all attributes returned, the "objectclass"
* attribute type is missing from the entry.
@@ -1045,7 +1045,7 @@
*/
private void processConfigAcis() throws InitializationException
{
- LinkedList<LocalizableMessage> failedACIMsgs = new LinkedList<LocalizableMessage>();
+ LinkedList<LocalizableMessage> failedACIMsgs = new LinkedList<>();
InternalClientConnection conn = getRootConnection();
ConfigHandler<?> configBackend = DirectoryServer.getConfigHandler();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciListenerManager.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciListenerManager.java
index 3f7b242..0cef096 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciListenerManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciListenerManager.java
@@ -316,18 +316,11 @@
*/
private final AciChangeListenerPlugin plugin;
- /**
- * The aci attribute type is operational so we need to specify it to
- * be returned.
- */
- private static LinkedHashSet<String> attrs =
- new LinkedHashSet<String>();
-
+ /** The aci attribute type is operational so we need to specify it to be returned. */
+ private static LinkedHashSet<String> attrs = new LinkedHashSet<>();
static
{
- /*
- * Set up the filter used to search private and public contexts.
- */
+ // Set up the filter used to search private and public contexts.
try
{
aciFilter = SearchFilter.createFilterFromString("(aci=*)");
@@ -408,7 +401,7 @@
logger.warn(WARN_ACI_ATTRIBUTE_NOT_INDEXED, backend.getBackendID(), "aci");
}
- LinkedList<LocalizableMessage> failedACIMsgs = new LinkedList<LocalizableMessage>();
+ LinkedList<LocalizableMessage> failedACIMsgs = new LinkedList<>();
InternalClientConnection conn = getRootConnection();
// Add manageDsaIT control so any ACIs in referral entries will be
@@ -517,16 +510,12 @@
@Override
public LinkedHashMap<String, String> getAlerts()
{
- LinkedHashMap<String, String> alerts =
- new LinkedHashMap<String, String>();
+ LinkedHashMap<String, String> alerts = new LinkedHashMap<>();
alerts.put(ALERT_TYPE_ACCESS_CONTROL_PARSE_FAILED,
ALERT_DESCRIPTION_ACCESS_CONTROL_PARSE_FAILED);
return alerts;
-
}
-
-
/**
* Log the exception messages from the failed ACI decode and then put
* the server in lockdown mode -- if needed.
@@ -536,7 +525,6 @@
*/
public void logMsgsSetLockDownMode(LinkedList<LocalizableMessage> failedACIMsgs)
{
-
for (LocalizableMessage msg : failedACIMsgs)
{
logger.warn(WARN_ACI_SERVER_DECODE_FAILED, msg);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/BindRule.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/BindRule.java
index 50b2378..c5be8d3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/BindRule.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/BindRule.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.authorization.dseecompat;
@@ -41,7 +41,7 @@
public class BindRule {
/** This hash table holds the keyword bind rule mapping. */
- private final HashMap<String, KeywordBindRule> keywordRuleMap = new HashMap<String, KeywordBindRule>();
+ private final HashMap<String, KeywordBindRule> keywordRuleMap = new HashMap<>();
/** True is a boolean "not" was seen. */
private boolean negate;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/DNS.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/DNS.java
index 8d65fe8..7b63ce4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/DNS.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/DNS.java
@@ -84,7 +84,7 @@
LocalizableMessage message = WARN_ACI_SYNTAX_INVALID_DNS_EXPRESSION.get(expr);
throw new AciException(message);
}
- List<String> dns = new LinkedList<String>();
+ List<String> dns = new LinkedList<>();
int valuePos = 1;
Pattern valuePattern = Pattern.compile(valueRegex);
Matcher valueMatcher = valuePattern.matcher(expr);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/DayOfWeek.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/DayOfWeek.java
index 6d6b143..eefdb2d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/DayOfWeek.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/DayOfWeek.java
@@ -67,7 +67,7 @@
public static KeywordBindRule decode(String expr, EnumBindRuleType type)
throws AciException
{
- List<EnumDayOfWeek> days = new LinkedList<EnumDayOfWeek>();
+ List<EnumDayOfWeek> days = new LinkedList<>();
String[] dayArray=expr.split(",", -1);
for (String element : dayArray)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/ExtOp.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/ExtOp.java
index 0fbb6f2..83eed6d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/ExtOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/ExtOp.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.authorization.dseecompat;
@@ -39,7 +39,7 @@
/**
* HashSet of OID strings parsed from the decode.
*/
- private Set<String> extOpOIDs = new HashSet<String>();
+ private Set<String> extOpOIDs = new HashSet<>();
/**
* Enumeration representing the extop operator.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/GroupDN.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/GroupDN.java
index 6a5d3cc..7e90aa3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/GroupDN.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/GroupDN.java
@@ -85,7 +85,7 @@
WARN_ACI_SYNTAX_INVALID_GROUPDN_EXPRESSION.get(expr);
throw new AciException(message);
}
- List<DN> groupDNs = new LinkedList<DN>();
+ List<DN> groupDNs = new LinkedList<>();
int ldapURLPos = 1;
Pattern ldapURLPattern = Pattern.compile(LDAP_URL);
Matcher ldapURLMatcher = ldapURLPattern.matcher(expr);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/IP.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/IP.java
index 7b8dc14..5150673 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/IP.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/IP.java
@@ -82,7 +82,7 @@
throws AciException {
//Split on the ','.
String[] ipStrs=expr.split("\\,", -1);
- List<PatternIP> patternIPList= new LinkedList<PatternIP>();
+ List<PatternIP> patternIPList= new LinkedList<>();
for (String ipStr : ipStrs) {
if (!Pattern.matches(ipRegEx, ipStr)) {
LocalizableMessage message =
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternDN.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternDN.java
index 654f7a3..881c11a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternDN.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternDN.java
@@ -294,8 +294,8 @@
public static PatternDN decode(String dnString)
throws DirectoryException
{
- ArrayList<PatternRDN> rdnComponents = new ArrayList<PatternRDN>();
- ArrayList<Integer> doubleWildPos = new ArrayList<Integer>();
+ ArrayList<PatternRDN> rdnComponents = new ArrayList<>();
+ ArrayList<Integer> doubleWildPos = new ArrayList<>();
// A null or empty DN is acceptable.
if (dnString == null)
@@ -442,7 +442,7 @@
// RDN component and return the DN.
if (pos >= length)
{
- ArrayList<ByteString> arrayList = new ArrayList<ByteString>(1);
+ ArrayList<ByteString> arrayList = new ArrayList<>(1);
arrayList.add(ByteString.empty());
rdnComponents.add(new PatternRDN(name, arrayList, dnString));
break;
@@ -450,7 +450,7 @@
// Parse the value for this RDN component.
- ArrayList<ByteString> parsedValue = new ArrayList<ByteString>();
+ ArrayList<ByteString> parsedValue = new ArrayList<>();
pos = parseValuePattern(dnString, pos, parsedValue);
@@ -575,7 +575,7 @@
// the RDN component and return the DN.
if (pos >= length)
{
- ArrayList<ByteString> arrayList = new ArrayList<ByteString>(1);
+ ArrayList<ByteString> arrayList = new ArrayList<>(1);
arrayList.add(ByteString.empty());
rdn.addValue(name, arrayList, dnString);
rdnComponents.add(rdn);
@@ -584,7 +584,7 @@
// Parse the value for this RDN component.
- parsedValue = new ArrayList<ByteString>();
+ parsedValue = new ArrayList<>();
pos = parseValuePattern(dnString, pos, parsedValue);
@@ -641,7 +641,7 @@
{
PatternRDN[] subInitial = null;
PatternRDN[] subFinal = null;
- List<PatternRDN[]> subAnyElements = new ArrayList<PatternRDN[]>();
+ List<PatternRDN[]> subAnyElements = new ArrayList<>();
int i = 0;
int numComponents = rdnComponents.size();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternIP.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternIP.java
index 492c28c..cbe96b3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternIP.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternIP.java
@@ -75,11 +75,8 @@
*/
private BitSet wildCardBitSet;
- /**
- Hash map of valid netmask strings. Used in parsing netmask values.
- */
- private static HashMap<String,String> validNetMasks =
- new HashMap<String, String>();
+ /** Hash map of valid netmask strings. Used in parsing netmask values. */
+ private static HashMap<String,String> validNetMasks = new HashMap<>();
/** Initialize valid netmask hash map. */
static {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternRDN.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternRDN.java
index 731cdfd..2e6eaa8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternRDN.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternRDN.java
@@ -109,7 +109,7 @@
numValues = 1;
typePatterns = new String[] { type };
- valuePatterns = new ArrayList<ArrayList<ByteString>>(1);
+ valuePatterns = new ArrayList<>(1);
valuePatterns.add(valuePattern);
}
@@ -210,9 +210,8 @@
}
// Sort the attribute-value pairs by attribute type.
- TreeMap<String,ArrayList<ByteString>> patternMap =
- new TreeMap<String, ArrayList<ByteString>>();
- TreeMap<String, ByteString> rdnMap = new TreeMap<String, ByteString>();
+ TreeMap<String,ArrayList<ByteString>> patternMap = new TreeMap<>();
+ TreeMap<String, ByteString> rdnMap = new TreeMap<>();
for (int i = 0; i < rdn.getNumValues(); i++)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargAttrFilterList.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargAttrFilterList.java
index 4b0283e..3edaf98 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargAttrFilterList.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargAttrFilterList.java
@@ -109,8 +109,7 @@
*/
public static TargAttrFilterList decode(int mask, String expression)
throws AciException {
- LinkedHashMap<AttributeType, SearchFilter> attrFilterList =
- new LinkedHashMap<AttributeType, SearchFilter>();
+ LinkedHashMap<AttributeType, SearchFilter> attrFilterList = new LinkedHashMap<>();
String[] subExpressions=expression.split(filterListSeperator, -1);
//Iterate over each sub-expression, parse and add them to the list
//if there are no errors.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargetAttr.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargetAttr.java
index b6324b0..444bb23 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargetAttr.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargetAttr.java
@@ -48,9 +48,9 @@
/** Flags that is set if all operational attributes pattern seen "+". */
private boolean allOpAttributes;
/** Set of the attribute types parsed by the constructor. */
- private HashSet<AttributeType> attributes = new HashSet<AttributeType>();
+ private HashSet<AttributeType> attributes = new HashSet<>();
/** Set of the operational attribute types parsed by the constructor. */
- private HashSet<AttributeType> opAttributes = new HashSet<AttributeType>();
+ private HashSet<AttributeType> opAttributes = new HashSet<>();
/**
* Regular expression that matches one or more ATTR_NAME's separated by
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargetControl.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargetControl.java
index 1aade2b..e5bcc23 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargetControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargetControl.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.authorization.dseecompat;
@@ -36,14 +36,9 @@
*/
public class TargetControl {
- /**
- * HashSet of OID strings parsed from the decode.
- */
- private Set<String> controlOIDS = new HashSet<String>();
-
- /**
- * Enumeration representing the targetcontrol operator.
- */
+ /** HashSet of OID strings parsed from the decode. */
+ private Set<String> controlOIDS = new HashSet<>();
+ /** Enumeration representing the targetcontrol operator. */
private EnumTargetOperator op = EnumTargetOperator.EQUALITY;
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/UserDN.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/UserDN.java
index 213d5df..d5fd820 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/UserDN.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/UserDN.java
@@ -81,7 +81,7 @@
EnumBindRuleType type) throws AciException {
String[] vals=expression.split("[|][|]");
- List<UserDNTypeURL> urlList = new LinkedList<UserDNTypeURL>();
+ List<UserDNTypeURL> urlList = new LinkedList<>();
for (String val : vals)
{
StringBuilder value = new StringBuilder(val.trim());
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java
index 5f792e3..47d92fb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java
@@ -198,7 +198,7 @@
// Determine the set of backup directories that we will use by default.
Set<String> values = currentConfig.getBackupDirectory();
- backupDirectories = new LinkedHashMap<File,CachedBackupDirectory>(values.size());
+ backupDirectories = new LinkedHashMap<>(values.size());
for (String s : values)
{
File dir = getFileForPath(s);
@@ -207,33 +207,27 @@
// Construct the backup base entry.
- LinkedHashMap<ObjectClass,String> objectClasses =
- new LinkedHashMap<ObjectClass,String>(2);
+ LinkedHashMap<ObjectClass,String> objectClasses = new LinkedHashMap<>(2);
objectClasses.put(DirectoryServer.getTopObjectClass(), OC_TOP);
ObjectClass untypedOC =
DirectoryServer.getObjectClass(OC_UNTYPED_OBJECT_LC, true);
objectClasses.put(untypedOC, OC_UNTYPED_OBJECT);
- LinkedHashMap<AttributeType,List<Attribute>> opAttrs =
- new LinkedHashMap<AttributeType,List<Attribute>>(0);
- LinkedHashMap<AttributeType,List<Attribute>> userAttrs =
- new LinkedHashMap<AttributeType,List<Attribute>>(1);
+ LinkedHashMap<AttributeType,List<Attribute>> opAttrs = new LinkedHashMap<>(0);
+ LinkedHashMap<AttributeType,List<Attribute>> userAttrs = new LinkedHashMap<>(1);
RDN rdn = backupBaseDN.rdn();
int numAVAs = rdn.getNumValues();
for (int i=0; i < numAVAs; i++)
{
AttributeType attrType = rdn.getAttributeType(i);
- ArrayList<Attribute> attrList = new ArrayList<Attribute>(1);
- attrList.add(Attributes.create(attrType, rdn
- .getAttributeValue(i)));
-
+ ArrayList<Attribute> attrList = new ArrayList<>(1);
+ attrList.add(Attributes.create(attrType, rdn.getAttributeValue(i)));
userAttrs.put(attrType, attrList);
}
- backupBaseEntry = new Entry(backupBaseDN, objectClasses, userAttrs,
- opAttrs);
+ backupBaseEntry = new Entry(backupBaseDN, objectClasses, userAttrs, opAttrs);
currentConfig.addBackupChangeListener(this);
@@ -539,19 +533,15 @@
// Construct the backup directory entry to return.
- LinkedHashMap<ObjectClass,String> ocMap =
- new LinkedHashMap<ObjectClass,String>(2);
+ LinkedHashMap<ObjectClass,String> ocMap = new LinkedHashMap<>(2);
ocMap.put(DirectoryServer.getTopObjectClass(), OC_TOP);
ObjectClass backupDirOC =
DirectoryServer.getObjectClass(OC_BACKUP_DIRECTORY, true);
ocMap.put(backupDirOC, OC_BACKUP_DIRECTORY);
- LinkedHashMap<AttributeType,List<Attribute>> opAttrs =
- new LinkedHashMap<AttributeType,List<Attribute>>(0);
- LinkedHashMap<AttributeType,List<Attribute>> userAttrs =
- new LinkedHashMap<AttributeType,List<Attribute>>(3);
-
+ LinkedHashMap<AttributeType,List<Attribute>> opAttrs = new LinkedHashMap<>(0);
+ LinkedHashMap<AttributeType,List<Attribute>> userAttrs = new LinkedHashMap<>(3);
userAttrs.put(t, asList(t, v));
t = DirectoryServer.getAttributeType(ATTR_BACKUP_BACKEND_DN, true);
@@ -625,8 +615,7 @@
}
// Construct the backup entry to return.
- LinkedHashMap<ObjectClass, String> ocMap =
- new LinkedHashMap<ObjectClass, String>(3);
+ LinkedHashMap<ObjectClass, String> ocMap = new LinkedHashMap<>(3);
ocMap.put(DirectoryServer.getTopObjectClass(), OC_TOP);
ObjectClass oc = DirectoryServer.getObjectClass(OC_BACKUP_INFO, true);
@@ -635,11 +624,8 @@
oc = DirectoryServer.getObjectClass(OC_EXTENSIBLE_OBJECT_LC, true);
ocMap.put(oc, OC_EXTENSIBLE_OBJECT);
- LinkedHashMap<AttributeType, List<Attribute>> opAttrs =
- new LinkedHashMap<AttributeType, List<Attribute>>(0);
- LinkedHashMap<AttributeType, List<Attribute>> userAttrs =
- new LinkedHashMap<AttributeType, List<Attribute>>();
-
+ LinkedHashMap<AttributeType, List<Attribute>> opAttrs = new LinkedHashMap<>(0);
+ LinkedHashMap<AttributeType, List<Attribute>> userAttrs = new LinkedHashMap<>();
userAttrs.put(idType, asList(idType, idValue));
backupInfo.getBackupDirectory();
@@ -663,7 +649,7 @@
for (String s : dependencies) {
builder.add(s);
}
- ArrayList<Attribute> attrList = new ArrayList<Attribute>(1);
+ ArrayList<Attribute> attrList = new ArrayList<>(1);
attrList.add(builder.toAttribute());
userAttrs.put(t, attrList);
}
@@ -706,7 +692,7 @@
private ArrayList<Attribute> asList(AttributeType attrType, ByteString value)
{
- final ArrayList<Attribute> attrList = new ArrayList<Attribute>(1);
+ final ArrayList<Attribute> attrList = new ArrayList<>(1);
attrList.add(Attributes.create(attrType, value));
return attrList;
}
@@ -991,7 +977,7 @@
final ConfigChangeResult ccr = new ConfigChangeResult();
Set<String> values = cfg.getBackupDirectory();
- backupDirectories = new LinkedHashMap<File,CachedBackupDirectory>(values.size());
+ backupDirectories = new LinkedHashMap<>(values.size());
for (String s : values)
{
File dir = getFileForPath(s);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java
index 48ce4c1..e946a30 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java
@@ -183,8 +183,7 @@
/** The set of objectclasses that will be used in root entry. */
private static final Map<ObjectClass, String>
- CHANGELOG_ROOT_OBJECT_CLASSES = new LinkedHashMap<ObjectClass, String>(2);
-
+ CHANGELOG_ROOT_OBJECT_CLASSES = new LinkedHashMap<>(2);
static
{
CHANGELOG_ROOT_OBJECT_CLASSES.put(DirectoryServer.getObjectClass(OC_TOP, true), OC_TOP);
@@ -193,8 +192,7 @@
/** The set of objectclasses that will be used in ECL entries. */
private static final Map<ObjectClass, String>
- CHANGELOG_ENTRY_OBJECT_CLASSES = new LinkedHashMap<ObjectClass, String>(2);
-
+ CHANGELOG_ENTRY_OBJECT_CLASSES = new LinkedHashMap<>(2);
static
{
CHANGELOG_ENTRY_OBJECT_CLASSES.put(DirectoryServer.getObjectClass(OC_TOP, true), OC_TOP);
@@ -236,14 +234,10 @@
private final ECLEnabledDomainPredicate domainPredicate;
/** The set of cookie-based persistent searches registered with this backend. */
- private final ConcurrentLinkedQueue<PersistentSearch> cookieBasedPersistentSearches =
- new ConcurrentLinkedQueue<PersistentSearch>();
- /**
- * The set of change number-based persistent searches registered with this
- * backend.
- */
+ private final ConcurrentLinkedQueue<PersistentSearch> cookieBasedPersistentSearches = new ConcurrentLinkedQueue<>();
+ /** The set of change number-based persistent searches registered with this backend. */
private final ConcurrentLinkedQueue<PersistentSearch> changeNumberBasedPersistentSearches =
- new ConcurrentLinkedQueue<PersistentSearch>();
+ new ConcurrentLinkedQueue<>();
/**
* Creates a new backend with the provided replication server.
@@ -1027,7 +1021,7 @@
}
DBCursor<ChangeNumberIndexRecord> cnIndexDBCursor = null;
- final AtomicReference<MultiDomainDBCursor> replicaUpdatesCursor = new AtomicReference<MultiDomainDBCursor>();
+ final AtomicReference<MultiDomainDBCursor> replicaUpdatesCursor = new AtomicReference<>();
try
{
cnIndexDBCursor = getCNIndexDBCursor(entrySender.lowestChangeNumber);
@@ -1381,8 +1375,8 @@
dnString = "replicationCSN=" + csn + "," + baseDN + "," + DN_EXTERNAL_CHANGELOG_ROOT;
}
- final Map<AttributeType, List<Attribute>> userAttrs = new LinkedHashMap<AttributeType, List<Attribute>>();
- final Map<AttributeType, List<Attribute>> opAttrs = new LinkedHashMap<AttributeType, List<Attribute>>();
+ final Map<AttributeType, List<Attribute>> userAttrs = new LinkedHashMap<>();
+ final Map<AttributeType, List<Attribute>> opAttrs = new LinkedHashMap<>();
// Operational standard attributes
addAttributeByType(ATTR_SUBSCHEMA_SUBENTRY_LC, ATTR_SUBSCHEMA_SUBENTRY_LC,
@@ -1510,8 +1504,8 @@
{
final String hasSubordinatesStr = Boolean.toString(baseChangelogHasSubordinates());
- final Map<AttributeType, List<Attribute>> userAttrs = new LinkedHashMap<AttributeType, List<Attribute>>();
- final Map<AttributeType, List<Attribute>> operationalAttrs = new LinkedHashMap<AttributeType, List<Attribute>>();
+ final Map<AttributeType, List<Attribute>> userAttrs = new LinkedHashMap<>();
+ final Map<AttributeType, List<Attribute>> operationalAttrs = new LinkedHashMap<>();
// We never return the numSubordinates attribute for the base changelog entry
// and there is a very good reason for that:
@@ -1604,7 +1598,7 @@
*/
private static class SendEntryData<K extends Comparable<K>>
{
- private final AtomicReference<SearchPhase> searchPhase = new AtomicReference<SearchPhase>(SearchPhase.INITIAL);
+ private final AtomicReference<SearchPhase> searchPhase = new AtomicReference<>(SearchPhase.INITIAL);
private final Object transitioningLock = new Object();
private volatile K lastKeySentByInitialSearch;
@@ -1679,7 +1673,7 @@
private ChangeNumberEntrySender(SearchOperation searchOp, SearchPhase startPhase, ChangeNumberRange range)
{
this.searchOp = searchOp;
- this.sendEntryData = new SendEntryData<Long>(startPhase);
+ this.sendEntryData = new SendEntryData<>(startPhase);
this.lowestChangeNumber = range.lowerBound;
this.highestChangeNumber = range.upperBound;
}
@@ -1736,7 +1730,7 @@
private final Set<DN> excludedBaseDNs;
private final MultiDomainServerState cookie;
private final ConcurrentSkipListMap<ReplicaId, SendEntryData<CSN>> replicaIdToSendEntryData =
- new ConcurrentSkipListMap<ReplicaId, SendEntryData<CSN>>();
+ new ConcurrentSkipListMap<>();
private CookieEntrySender(SearchOperation searchOp, SearchPhase startPhase, MultiDomainServerState cookie,
Set<DN> excludedBaseDNs)
@@ -1769,7 +1763,7 @@
SendEntryData<CSN> data = replicaIdToSendEntryData.get(replicaId);
if (data == null)
{
- final SendEntryData<CSN> newData = new SendEntryData<CSN>(startPhase);
+ final SendEntryData<CSN> newData = new SendEntryData<>(startPhase);
data = replicaIdToSendEntryData.putIfAbsent(replicaId, newData);
return data == null ? newData : data;
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/LDIFBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/LDIFBackend.java
index 7ac2573..d683719 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/LDIFBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/LDIFBackend.java
@@ -73,7 +73,7 @@
private DN[] baseDNs;
/** The mapping between parent DNs and their immediate children. */
- private final Map<DN, Set<DN>> childDNs;
+ private final Map<DN, Set<DN>> childDNs = new HashMap<>();
/** The base DNs for this backend, in a hash set. */
private Set<DN> baseDNSet;
@@ -86,16 +86,14 @@
private LDIFBackendCfg currentConfig;
/** The mapping between entry DNs and the corresponding entries. */
- private final Map<DN, Entry> entryMap;
+ private final Map<DN, Entry> entryMap = new LinkedHashMap<>();
/** A read-write lock used to protect access to this backend. */
- private final ReentrantReadWriteLock backendLock;
+ private final ReentrantReadWriteLock backendLock = new ReentrantReadWriteLock();
/** The path to the LDIF file containing the data for this backend. */
private String ldifFilePath;
-
-
/**
* Creates a new backend with the provided information. All backend
* implementations must implement a default constructor that use
@@ -103,9 +101,6 @@
*/
public LDIFBackend()
{
- entryMap = new LinkedHashMap<DN,Entry>();
- childDNs = new HashMap<DN, Set<DN>>();
- backendLock = new ReentrantReadWriteLock();
}
/** {@inheritDoc} */
@@ -550,7 +545,7 @@
Set<DN> childDNSet = childDNs.get(parentDN);
if (childDNSet == null)
{
- childDNSet = new HashSet<DN>();
+ childDNSet = new HashSet<>();
childDNs.put(parentDN, childDNSet);
}
childDNSet.add(entryDN);
@@ -812,7 +807,7 @@
parentChildDNs = childDNs.get(newParentDN);
if (parentChildDNs == null)
{
- parentChildDNs = new HashSet<DN>();
+ parentChildDNs = new HashSet<>();
childDNs.put(newParentDN, parentChildDNs);
}
parentChildDNs.add(newDN);
@@ -873,7 +868,7 @@
Set<DN> parentChildren = childDNs.get(newParentDN);
if (parentChildren == null)
{
- parentChildren = new HashSet<DN>();
+ parentChildren = new HashSet<>();
childDNs.put(newParentDN, parentChildren);
}
parentChildren.add(newEntryDN);
@@ -1168,7 +1163,7 @@
Set<DN> childDNSet = childDNs.get(parentDN);
if (childDNSet == null)
{
- childDNSet = new HashSet<DN>();
+ childDNSet = new HashSet<>();
childDNs.put(parentDN, childDNSet);
}
@@ -1250,7 +1245,7 @@
throw new ConfigException(ERR_LDIF_BACKEND_MULTIPLE_BASE_DNS.get(currentConfig.dn()));
}
- baseDNSet = new HashSet<DN>();
+ baseDNSet = new HashSet<>();
Collections.addAll(baseDNSet, baseDNs);
ldifFilePath = currentConfig.getLDIFFile();
@@ -1323,11 +1318,9 @@
@Override
public Map<String,String> getAlerts()
{
- Map<String,String> alerts = new LinkedHashMap<String,String>();
-
+ Map<String,String> alerts = new LinkedHashMap<>();
alerts.put(ALERT_TYPE_LDIF_BACKEND_CANNOT_WRITE_UPDATE,
ALERT_DESCRIPTION_LDIF_BACKEND_CANNOT_WRITE_UPDATE);
-
return alerts;
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/MemoryBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/MemoryBackend.java
index 398e8c7..17eadb9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/MemoryBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/MemoryBackend.java
@@ -176,14 +176,14 @@
throw new ConfigException(message);
}
- baseDNSet = new HashSet<DN>();
+ baseDNSet = new HashSet<>();
for (DN dn : baseDNs)
{
baseDNSet.add(dn);
}
- entryMap = new LinkedHashMap<DN,Entry>();
- childDNs = new HashMap<DN,HashSet<DN>>();
+ entryMap = new LinkedHashMap<>();
+ childDNs = new HashMap<>();
for (DN dn : baseDNs)
{
@@ -374,7 +374,7 @@
HashSet<DN> children = childDNs.get(parentDN);
if (children == null)
{
- children = new HashSet<DN>();
+ children = new HashSet<>();
childDNs.put(parentDN, children);
}
@@ -404,7 +404,7 @@
{
if (children != null)
{
- HashSet<DN> childrenCopy = new HashSet<DN>(children);
+ HashSet<DN> childrenCopy = new HashSet<>(children);
for (DN childDN : childrenCopy)
{
try
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java
index 0cf1b91..27803b9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java
@@ -73,7 +73,7 @@
private ArrayList<Attribute> userDefinedAttributes;
/** The set of objectclasses that will be used in monitor entries. */
- private final HashMap<ObjectClass, String> monitorObjectClasses = new LinkedHashMap<ObjectClass, String>(2);
+ private final HashMap<ObjectClass, String> monitorObjectClasses = new LinkedHashMap<>(2);
/** The DN of the configuration entry for this backend. */
private DN configEntryDN;
@@ -114,7 +114,7 @@
final ConfigChangeResult ccr = new ConfigChangeResult();
// Check to see if there is a new set of user-defined attributes.
- final ArrayList<Attribute> userAttrs = new ArrayList<Attribute>();
+ final ArrayList<Attribute> userAttrs = new ArrayList<>();
try
{
final ConfigEntry configEntry = DirectoryServer
@@ -182,7 +182,7 @@
// Get the set of user-defined attributes for the configuration entry. Any
// attributes that we don't recognize will be included directly in the base
// monitor entry.
- userDefinedAttributes = new ArrayList<Attribute>();
+ userDefinedAttributes = new ArrayList<>();
addAll(userDefinedAttributes, configEntry.getEntry().getUserAttributes().values());
addAll(userDefinedAttributes, configEntry.getEntry().getOperationalAttributes().values());
@@ -599,10 +599,8 @@
final ObjectClass extensibleObjectOC = DirectoryServer.getObjectClass(OC_EXTENSIBLE_OBJECT_LC, true);
final HashMap<ObjectClass, String> monitorClasses = newObjectClasses(extensibleObjectOC, OC_EXTENSIBLE_OBJECT);
- final HashMap<AttributeType, List<Attribute>> monitorUserAttrs =
- new LinkedHashMap<AttributeType, List<Attribute>>();
- final HashMap<AttributeType, List<Attribute>> monitorOperationalAttrs =
- new LinkedHashMap<AttributeType, List<Attribute>>();
+ final HashMap<AttributeType, List<Attribute>> monitorUserAttrs = new LinkedHashMap<>();
+ final HashMap<AttributeType, List<Attribute>> monitorOperationalAttrs = new LinkedHashMap<>();
put(monitorUserAttrs, Attributes.create(ATTR_COMMON_NAME, "monitor"));
put(monitorUserAttrs, Attributes.create(ATTR_PRODUCT_NAME, DynamicConstants.PRODUCT_NAME));
@@ -634,7 +632,7 @@
List<Attribute> attrs = attrsMap.get(type);
if (attrs == null)
{
- attrs = new ArrayList<Attribute>();
+ attrs = new ArrayList<>();
attrsMap.put(type, attrs);
}
attrs.add(a);
@@ -662,7 +660,7 @@
private ArrayList<Attribute> toList(final Attribute attr)
{
- final ArrayList<Attribute> results = new ArrayList<Attribute>(1);
+ final ArrayList<Attribute> results = new ArrayList<>(1);
results.add(attr);
return results;
}
@@ -679,8 +677,7 @@
final ObjectClass monitorOC = DirectoryServer.getObjectClass(OC_MONITOR_BRANCH, true);
final HashMap<ObjectClass, String> monitorClasses = newObjectClasses(monitorOC, OC_MONITOR_BRANCH);
- final HashMap<AttributeType, List<Attribute>> monitorUserAttrs =
- new LinkedHashMap<AttributeType, List<Attribute>>();
+ final HashMap<AttributeType, List<Attribute>> monitorUserAttrs = new LinkedHashMap<>();
final RDN rdn = dn.rdn();
if (rdn != null)
@@ -707,10 +704,8 @@
*/
private NavigableMap<DN, MonitorProvider<?>> getDIT()
{
- final NavigableMap<DN, MonitorProvider<?>> dit =
- new TreeMap<DN, MonitorProvider<?>>();
- for (final MonitorProvider<?> monitorProvider : DirectoryServer
- .getMonitorProviders().values())
+ final NavigableMap<DN, MonitorProvider<?>> dit = new TreeMap<>();
+ for (final MonitorProvider<?> monitorProvider : DirectoryServer.getMonitorProviders().values())
{
DN dn = DirectoryServer.getMonitorProviderDN(monitorProvider);
dit.put(dn, monitorProvider);
@@ -722,10 +717,7 @@
{
break;
}
- else
- {
- dit.put(dn, null);
- }
+ dit.put(dn, null);
}
}
return dit;
@@ -784,9 +776,7 @@
final HashMap<ObjectClass, String> monitorClasses = newObjectClasses(monitorOC, monitorOC.getPrimaryName());
final List<Attribute> monitorAttrs = monitorProvider.getMonitorData();
- final HashMap<AttributeType, List<Attribute>> attrMap =
- new LinkedHashMap<AttributeType, List<Attribute>>(
- monitorAttrs.size() + 1);
+ final HashMap<AttributeType, List<Attribute>> attrMap = new LinkedHashMap<>(monitorAttrs.size() + 1);
// Make sure to include the RDN attribute.
final RDN entryRDN = entryDN.rdn();
@@ -803,7 +793,7 @@
List<Attribute> attrs = attrMap.get(type);
if (attrs == null)
{
- attrs = new ArrayList<Attribute>();
+ attrs = new ArrayList<>();
attrMap.put(type, attrs);
}
attrs.add(a);
@@ -814,8 +804,7 @@
private HashMap<ObjectClass, String> newObjectClasses(ObjectClass objectClass, String objectClassName)
{
- final HashMap<ObjectClass, String> monitorClasses =
- new LinkedHashMap<ObjectClass, String>(monitorObjectClasses.size() + 1);
+ final HashMap<ObjectClass, String> monitorClasses = new LinkedHashMap<>(monitorObjectClasses.size() + 1);
monitorClasses.putAll(monitorObjectClasses);
monitorClasses.put(objectClass, objectClassName);
return monitorClasses;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/NullBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/NullBackend.java
index f93c756..d082f13 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/NullBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/NullBackend.java
@@ -110,7 +110,7 @@
private HashSet<DN> baseDNSet;
/** The set of supported controls for this backend. */
- private final Set<String> supportedControls = new HashSet<String>(Arrays.asList(
+ private final Set<String> supportedControls = new HashSet<>(Arrays.asList(
OID_SUBTREE_DELETE_CONTROL,
OID_PAGED_RESULTS_CONTROL,
OID_MANAGE_DSAIT_CONTROL,
@@ -162,7 +162,7 @@
@Override
public synchronized void openBackend() throws ConfigException, InitializationException
{
- baseDNSet = new HashSet<DN>();
+ baseDNSet = new HashSet<>();
for (DN dn : baseDNs)
{
baseDNSet.add(dn);
@@ -186,7 +186,7 @@
}
// Initialize null entry object classes.
- objectClasses = new HashMap<ObjectClass,String>();
+ objectClasses = new HashMap<>();
String topOCName = "top";
ObjectClass topOC = DirectoryServer.getObjectClass(topOCName);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/RebuildConfig.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/RebuildConfig.java
index 32c29b0..db93d5a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/RebuildConfig.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/RebuildConfig.java
@@ -27,6 +27,7 @@
package org.opends.server.backends;
import java.util.ArrayList;
+import java.util.List;
import org.opends.server.types.DN;
@@ -48,16 +49,10 @@
private DN baseDN;
private RebuildMode rebuildMode = RebuildMode.USER_DEFINED;
/** The names of indexes to rebuild. */
- private ArrayList<String> rebuildList;
+ private final List<String> rebuildList = new ArrayList<>();
private String tmpDirectory;
private boolean isClearDegradedState;
- /** Create a new rebuild configuration. */
- public RebuildConfig()
- {
- rebuildList = new ArrayList<String>();
- }
-
/**
* Get the base DN to rebuild.
*
@@ -84,7 +79,7 @@
*
* @return The list of indexes to rebuild.
*/
- public ArrayList<String> getRebuildList()
+ public List<String> getRebuildList()
{
return rebuildList;
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/RootDSEBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/RootDSEBackend.java
index e3f1387..43135bb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/RootDSEBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/RootDSEBackend.java
@@ -166,7 +166,7 @@
throw new ConfigException(message);
}
- userDefinedAttributes = new ArrayList<Attribute>();
+ userDefinedAttributes = new ArrayList<>();
addAllUserDefinedAttrs(userDefinedAttributes, configEntry.getEntry());
@@ -189,7 +189,7 @@
}
else
{
- subordinateBaseDNs = new ConcurrentHashMap<DN, Backend<?>>();
+ subordinateBaseDNs = new ConcurrentHashMap<>();
for (DN baseDN : subDNs)
{
Backend<?> backend = DirectoryServer.getBackend(baseDN);
@@ -221,19 +221,15 @@
// Construct the set of "static" attributes that will always be present in
// the root DSE.
- staticDSEAttributes = new ArrayList<Attribute>();
-
- staticDSEAttributes.add(Attributes.create(ATTR_VENDOR_NAME,
- SERVER_VENDOR_NAME));
-
+ staticDSEAttributes = new ArrayList<>();
+ staticDSEAttributes.add(Attributes.create(ATTR_VENDOR_NAME, SERVER_VENDOR_NAME));
staticDSEAttributes.add(Attributes.create(ATTR_VENDOR_VERSION,
DirectoryServer.getVersionString()));
-
staticDSEAttributes.add(Attributes.create("fullVendorVersion",
BuildVersion.binaryVersion().toString()));
// Construct the set of objectclasses to include in the root DSE entry.
- dseObjectClasses = new HashMap<ObjectClass,String>(2);
+ dseObjectClasses = new HashMap<>(2);
ObjectClass topOC = DirectoryServer.getObjectClass(OC_TOP);
if (topOC == null)
{
@@ -241,8 +237,7 @@
}
dseObjectClasses.put(topOC, OC_TOP);
- ObjectClass rootDSEOC =
- DirectoryServer.getObjectClass(OC_ROOT_DSE);
+ ObjectClass rootDSEOC = DirectoryServer.getObjectClass(OC_ROOT_DSE);
if (rootDSEOC == null)
{
rootDSEOC = DirectoryServer.getDefaultObjectClass(OC_ROOT_DSE);
@@ -462,10 +457,8 @@
*/
private Entry getRootDSE(ClientConnection connection)
{
- HashMap<AttributeType,List<Attribute>> dseUserAttrs =
- new HashMap<AttributeType,List<Attribute>>();
- HashMap<AttributeType,List<Attribute>> dseOperationalAttrs =
- new HashMap<AttributeType,List<Attribute>>();
+ HashMap<AttributeType,List<Attribute>> dseUserAttrs = new HashMap<>();
+ HashMap<AttributeType,List<Attribute>> dseOperationalAttrs = new HashMap<>();
Attribute publicNamingContextAttr = createDNAttribute(
@@ -473,7 +466,6 @@
DirectoryServer.getPublicNamingContexts().keySet());
addAttribute(publicNamingContextAttr, dseUserAttrs, dseOperationalAttrs);
-
// Add the "ds-private-naming-contexts" attribute.
Attribute privateNamingContextAttr = createDNAttribute(
ATTR_PRIVATE_NAMING_CONTEXTS, ATTR_PRIVATE_NAMING_CONTEXTS,
@@ -496,27 +488,22 @@
ATTR_SUPPORTED_FEATURE_LC, DirectoryServer.getSupportedFeatures());
addAttribute(supportedFeatureAttr, dseUserAttrs, dseOperationalAttrs);
-
// Add the "supportedSASLMechanisms" attribute.
Attribute supportedSASLMechAttr = createAttribute(
ATTR_SUPPORTED_SASL_MECHANISMS, ATTR_SUPPORTED_SASL_MECHANISMS_LC,
DirectoryServer.getSupportedSASLMechanisms().keySet());
addAttribute(supportedSASLMechAttr, dseUserAttrs, dseOperationalAttrs);
-
// Add the "supportedLDAPVersions" attribute.
- TreeSet<String> versionStrings = new TreeSet<String>();
+ TreeSet<String> versionStrings = new TreeSet<>();
for (Integer ldapVersion : DirectoryServer.getSupportedLDAPVersions())
{
versionStrings.add(ldapVersion.toString());
}
- Attribute supportedLDAPVersionAttr =
- createAttribute(ATTR_SUPPORTED_LDAP_VERSION,
- ATTR_SUPPORTED_LDAP_VERSION_LC,
- versionStrings);
+ Attribute supportedLDAPVersionAttr = createAttribute(
+ ATTR_SUPPORTED_LDAP_VERSION, ATTR_SUPPORTED_LDAP_VERSION_LC, versionStrings);
addAttribute(supportedLDAPVersionAttr, dseUserAttrs, dseOperationalAttrs);
-
// Add the "supportedAuthPasswordSchemes" attribute.
Set<String> authPWSchemes =
DirectoryServer.getAuthPasswordStorageSchemes().keySet();
@@ -525,8 +512,7 @@
Attribute supportedAuthPWSchemesAttr =
createAttribute(ATTR_SUPPORTED_AUTH_PW_SCHEMES,
ATTR_SUPPORTED_AUTH_PW_SCHEMES_LC, authPWSchemes);
- ArrayList<Attribute> supportedAuthPWSchemesAttrs =
- new ArrayList<Attribute>(1);
+ ArrayList<Attribute> supportedAuthPWSchemesAttrs = new ArrayList<>(1);
supportedAuthPWSchemesAttrs.add(supportedAuthPWSchemesAttr);
if (showAllAttributes
|| !supportedSASLMechAttr.getAttributeType().isOperational())
@@ -606,7 +592,7 @@
List<Attribute> attrs = attrsMap.get(type);
if (attrs == null)
{
- attrs = new ArrayList<Attribute>();
+ attrs = new ArrayList<>();
attrsMap.put(type, attrs);
}
attrs.add(a);
@@ -621,7 +607,7 @@
{
if (!publicNamingContextAttr.isEmpty())
{
- List<Attribute> privateNamingContextAttrs = new ArrayList<Attribute>(1);
+ List<Attribute> privateNamingContextAttrs = new ArrayList<>(1);
privateNamingContextAttrs.add(publicNamingContextAttr);
final AttributeType attrType = publicNamingContextAttr.getAttributeType();
if (showAllAttributes || !attrType.isOperational())
@@ -1049,7 +1035,7 @@
}
else
{
- subBases = new ConcurrentHashMap<DN, Backend<?>>();
+ subBases = new ConcurrentHashMap<>();
for (DN baseDN : subDNs)
{
Backend<?> backend = DirectoryServer.getBackend(baseDN);
@@ -1082,7 +1068,7 @@
// Check to see if there is a new set of user-defined attributes.
- ArrayList<Attribute> userAttrs = new ArrayList<Attribute>();
+ ArrayList<Attribute> userAttrs = new ArrayList<>();
try
{
ConfigEntry configEntry = DirectoryServer.getConfigEntry(configEntryDN);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
index b7a97a5..3cdb273 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
@@ -297,15 +297,13 @@
DirectoryServer.getAttributeType(OP_ATTR_MODIFY_TIMESTAMP_LC, true);
// Construct the set of objectclasses to include in the schema entry.
- schemaObjectClasses = new LinkedHashMap<ObjectClass,String>(3);
+ schemaObjectClasses = new LinkedHashMap<>(3);
schemaObjectClasses.put(DirectoryServer.getTopObjectClass(), OC_TOP);
- ObjectClass subentryOC = DirectoryServer.getObjectClass(OC_LDAP_SUBENTRY_LC,
- true);
+ ObjectClass subentryOC = DirectoryServer.getObjectClass(OC_LDAP_SUBENTRY_LC, true);
schemaObjectClasses.put(subentryOC, OC_LDAP_SUBENTRY);
- ObjectClass subschemaOC = DirectoryServer.getObjectClass(OC_SUBSCHEMA,
- true);
+ ObjectClass subschemaOC = DirectoryServer.getObjectClass(OC_SUBSCHEMA, true);
schemaObjectClasses.put(subschemaOC, OC_SUBSCHEMA);
@@ -331,7 +329,7 @@
// Get the set of user-defined attributes for the configuration entry. Any
// attributes that we don't recognize will be included directly in the
// schema entry.
- userDefinedAttributes = new ArrayList<Attribute>();
+ userDefinedAttributes = new ArrayList<>();
addAll(configEntry.getEntry().getUserAttributes().values());
addAll(configEntry.getEntry().getOperationalAttributes().values());
@@ -381,15 +379,14 @@
try
{
// First, generate lists of elements from the current schema.
- Set<String> newATs = new LinkedHashSet<String>();
- Set<String> newOCs = new LinkedHashSet<String>();
- Set<String> newNFs = new LinkedHashSet<String>();
- Set<String> newDCRs = new LinkedHashSet<String>();
- Set<String> newDSRs = new LinkedHashSet<String>();
- Set<String> newMRUs = new LinkedHashSet<String>();
- Set<String> newLSDs = new LinkedHashSet<String>();
- Schema.genConcatenatedSchema(newATs, newOCs, newNFs, newDCRs, newDSRs,
- newMRUs,newLSDs);
+ Set<String> newATs = new LinkedHashSet<>();
+ Set<String> newOCs = new LinkedHashSet<>();
+ Set<String> newNFs = new LinkedHashSet<>();
+ Set<String> newDCRs = new LinkedHashSet<>();
+ Set<String> newDSRs = new LinkedHashSet<>();
+ Set<String> newMRUs = new LinkedHashSet<>();
+ Set<String> newLSDs = new LinkedHashSet<>();
+ Schema.genConcatenatedSchema(newATs, newOCs, newNFs, newDCRs, newDSRs, newMRUs,newLSDs);
// Next, generate lists of elements from the previous concatenated schema.
// If there isn't a previous concatenated schema, then use the base
@@ -398,8 +395,7 @@
File configFile = new File(DirectoryServer.getConfigFile());
File configDirectory = configFile.getParentFile();
File upgradeDirectory = new File(configDirectory, "upgrade");
- File concatFile = new File(upgradeDirectory,
- SCHEMA_CONCAT_FILE_NAME);
+ File concatFile = new File(upgradeDirectory, SCHEMA_CONCAT_FILE_NAME);
if (concatFile.exists())
{
concatFilePath = concatFile.getAbsolutePath();
@@ -433,19 +429,19 @@
}
}
- Set<String> oldATs = new LinkedHashSet<String>();
- Set<String> oldOCs = new LinkedHashSet<String>();
- Set<String> oldNFs = new LinkedHashSet<String>();
- Set<String> oldDCRs = new LinkedHashSet<String>();
- Set<String> oldDSRs = new LinkedHashSet<String>();
- Set<String> oldMRUs = new LinkedHashSet<String>();
- Set<String> oldLSDs = new LinkedHashSet<String>();
+ Set<String> oldATs = new LinkedHashSet<>();
+ Set<String> oldOCs = new LinkedHashSet<>();
+ Set<String> oldNFs = new LinkedHashSet<>();
+ Set<String> oldDCRs = new LinkedHashSet<>();
+ Set<String> oldDSRs = new LinkedHashSet<>();
+ Set<String> oldMRUs = new LinkedHashSet<>();
+ Set<String> oldLSDs = new LinkedHashSet<>();
Schema.readConcatenatedSchema(concatFilePath, oldATs, oldOCs, oldNFs,
oldDCRs, oldDSRs, oldMRUs,oldLSDs);
// Create a list of modifications and add any differences between the old
// and new schema into them.
- List<Modification> mods = new LinkedList<Modification>();
+ List<Modification> mods = new LinkedList<>();
Schema.compareConcatenatedSchema(oldATs, newATs, attributeTypesType, mods);
Schema.compareConcatenatedSchema(oldOCs, newOCs, objectClassesType, mods);
Schema.compareConcatenatedSchema(oldNFs, newNFs, nameFormsType, mods);
@@ -630,11 +626,8 @@
private Entry getSchemaEntry(DN entryDN, boolean includeSchemaFile,
boolean ignoreShowAllOption)
{
- Map<AttributeType, List<Attribute>> userAttrs =
- new LinkedHashMap<AttributeType, List<Attribute>>();
-
- Map<AttributeType, List<Attribute>> operationalAttrs =
- new LinkedHashMap<AttributeType, List<Attribute>>();
+ Map<AttributeType, List<Attribute>> userAttrs = new LinkedHashMap<>();
+ Map<AttributeType, List<Attribute>> operationalAttrs = new LinkedHashMap<>();
// Add the RDN attribute(s) for the provided entry.
RDN rdn = entryDN.rdn();
@@ -731,7 +724,7 @@
List<Attribute> attrs = attrsMap.get(type);
if (attrs == null)
{
- attrs = new ArrayList<Attribute>(1);
+ attrs = new ArrayList<>(1);
attrsMap.put(type, attrs);
}
attrs.add(attribute);
@@ -791,7 +784,7 @@
private ArrayList<Attribute> newArrayList(Attribute a)
{
- ArrayList<Attribute> attrList = new ArrayList<Attribute>(1);
+ ArrayList<Attribute> attrList = new ArrayList<>(1);
attrList.add(a);
return attrList;
}
@@ -810,7 +803,6 @@
return true;
}
}
-
return false;
}
@@ -849,8 +841,7 @@
}
- ArrayList<Modification> mods =
- new ArrayList<Modification>(modifyOperation.getModifications());
+ ArrayList<Modification> mods = new ArrayList<>(modifyOperation.getModifications());
if (mods.isEmpty())
{
// There aren't any modifications, so we don't need to do anything.
@@ -858,7 +849,7 @@
}
Schema newSchema = DirectoryServer.getSchema().duplicate();
- TreeSet<String> modifiedSchemaFiles = new TreeSet<String>();
+ TreeSet<String> modifiedSchemaFiles = new TreeSet<>();
int pos = -1;
for (Modification m : mods)
@@ -1280,7 +1271,7 @@
// impacted schema files by first creating them in a temporary location
// and then replacing the existing schema files with the new versions.
// If all that goes successfully, then activate the new schema.
- HashMap<String,File> tempSchemaFiles = new HashMap<String,File>();
+ HashMap<String, File> tempSchemaFiles = new HashMap<>();
try
{
for (String schemaFile : modifiedSchemaFiles)
@@ -2909,26 +2900,20 @@
*/
private Entry createEmptySchemaEntry()
{
- Map<ObjectClass,String> objectClasses =
- new LinkedHashMap<ObjectClass,String>();
+ Map<ObjectClass,String> objectClasses = new LinkedHashMap<>();
objectClasses.put(DirectoryServer.getTopObjectClass(), OC_TOP);
- objectClasses.put(DirectoryServer.getObjectClass(OC_LDAP_SUBENTRY_LC, true),
- OC_LDAP_SUBENTRY);
- objectClasses.put(DirectoryServer.getObjectClass(OC_SUBSCHEMA, true),
- OC_SUBSCHEMA);
+ objectClasses.put(DirectoryServer.getObjectClass(OC_LDAP_SUBENTRY_LC, true), OC_LDAP_SUBENTRY);
+ objectClasses.put(DirectoryServer.getObjectClass(OC_SUBSCHEMA, true), OC_SUBSCHEMA);
- Map<AttributeType,List<Attribute>> userAttributes =
- new LinkedHashMap<AttributeType,List<Attribute>>();
-
- Map<AttributeType,List<Attribute>> operationalAttributes =
- new LinkedHashMap<AttributeType,List<Attribute>>();
+ Map<AttributeType,List<Attribute>> userAttributes = new LinkedHashMap<>();
+ Map<AttributeType,List<Attribute>> operationalAttributes = new LinkedHashMap<>();
DN dn = DirectoryServer.getSchemaDN();
RDN rdn = dn.rdn();
for (int i=0; i < rdn.getNumValues(); i++)
{
AttributeType type = rdn.getAttributeType(i);
- List<Attribute> attrList = new LinkedList<Attribute>();
+ List<Attribute> attrList = new LinkedList<>();
attrList.add(Attributes.create(type, rdn.getAttributeValue(i)));
if (type.isOperational())
{
@@ -2974,7 +2959,7 @@
* this only for the real part of the ldapsyntaxes attribute. The real part
* is read and write to/from the schema files.
*/
- Set<ByteString> values = new LinkedHashSet<ByteString>();
+ Set<ByteString> values = new LinkedHashSet<>();
for (LDAPSyntaxDescription ldapSyntax :
schema.getLdapSyntaxDescriptions().values())
{
@@ -2994,8 +2979,8 @@
// Add all of the appropriate attribute types to the schema entry. We need
// to be careful of the ordering to ensure that any superior types in the
// same file are written before the subordinate types.
- Set<AttributeType> addedTypes = new HashSet<AttributeType>();
- values = new LinkedHashSet<ByteString>();
+ Set<AttributeType> addedTypes = new HashSet<>();
+ values = new LinkedHashSet<>();
for (AttributeType at : schema.getAttributeTypes().values())
{
if (schemaFile.equals(getSchemaFile(at)))
@@ -3015,8 +3000,8 @@
// Add all of the appropriate objectclasses to the schema entry. We need
// to be careful of the ordering to ensure that any superior classes in the
// same file are written before the subordinate classes.
- Set<ObjectClass> addedClasses = new HashSet<ObjectClass>();
- values = new LinkedHashSet<ByteString>();
+ Set<ObjectClass> addedClasses = new HashSet<>();
+ values = new LinkedHashSet<>();
for (ObjectClass oc : schema.getObjectClasses().values())
{
if (schemaFile.equals(getSchemaFile(oc)))
@@ -3037,7 +3022,7 @@
// Add all of the appropriate name forms to the schema entry. Since there
// is no hierarchical relationship between name forms, we don't need to
// worry about ordering.
- values = new LinkedHashSet<ByteString>();
+ values = new LinkedHashSet<>();
for (List<NameForm> forms : schema.getNameFormsByObjectClass().values())
{
for(NameForm nf : forms)
@@ -3060,7 +3045,7 @@
// Add all of the appropriate DIT content rules to the schema entry. Since
// there is no hierarchical relationship between DIT content rules, we don't
// need to worry about ordering.
- values = new LinkedHashSet<ByteString>();
+ values = new LinkedHashSet<>();
for (DITContentRule dcr : schema.getDITContentRules().values())
{
if (schemaFile.equals(getSchemaFile(dcr)))
@@ -3080,8 +3065,8 @@
// Add all of the appropriate DIT structure rules to the schema entry. We
// need to be careful of the ordering to ensure that any superior rules in
// the same file are written before the subordinate rules.
- Set<DITStructureRule> addedDSRs = new HashSet<DITStructureRule>();
- values = new LinkedHashSet<ByteString>();
+ Set<DITStructureRule> addedDSRs = new HashSet<>();
+ values = new LinkedHashSet<>();
for (DITStructureRule dsr : schema.getDITStructureRulesByID().values())
{
if (schemaFile.equals(getSchemaFile(dsr)))
@@ -3102,7 +3087,7 @@
// Add all of the appropriate matching rule uses to the schema entry. Since
// there is no hierarchical relationship between matching rule uses, we
// don't need to worry about ordering.
- values = new LinkedHashSet<ByteString>();
+ values = new LinkedHashSet<>();
for (MatchingRuleUse mru : schema.getMatchingRuleUses().values())
{
if (schemaFile.equals(getSchemaFile(mru)))
@@ -3309,9 +3294,9 @@
// Create lists that will hold the three types of files we'll be dealing
// with (the temporary files that will be installed, the installed schema
// files, and the previously-installed schema files).
- ArrayList<File> installedFileList = new ArrayList<File>();
- ArrayList<File> tempFileList = new ArrayList<File>();
- ArrayList<File> origFileList = new ArrayList<File>();
+ ArrayList<File> installedFileList = new ArrayList<>();
+ ArrayList<File> tempFileList = new ArrayList<>();
+ ArrayList<File> origFileList = new ArrayList<>();
File schemaInstanceDir =
new File(SchemaConfigManager.getSchemaDirectoryPath());
@@ -3738,7 +3723,7 @@
{
Schema schema = DirectoryServer.getSchema();
Schema newSchema = DirectoryServer.getSchema().duplicate();
- TreeSet<String> modifiedSchemaFiles = new TreeSet<String>();
+ TreeSet<String> modifiedSchemaFiles = new TreeSet<>();
// Get the attributeTypes attribute from the entry.
Syntax attrTypeSyntax = schema.getSyntax(SYNTAX_ATTRIBUTE_TYPE_OID);
@@ -3758,12 +3743,12 @@
// loop on the attribute types in the entry just received
// and add them in the existing schema.
List<Attribute> attrList = newSchemaEntry.getAttribute(attributeAttrType);
- Set<String> oidList = new HashSet<String>(1000);
+ Set<String> oidList = new HashSet<>(1000);
if (attrList != null && !attrList.isEmpty())
{
for (Attribute a : attrList)
{
- // Look for attributetypes that could have been added to the schema
+ // Look for attribute types that could have been added to the schema
// or modified in the schema
for (ByteString v : a)
{
@@ -3975,7 +3960,7 @@
Set<DN> newBaseDNs;
try
{
- newBaseDNs = new HashSet<DN>(backendCfg.getSchemaEntryDN());
+ newBaseDNs = new HashSet<>(backendCfg.getSchemaEntryDN());
if (newBaseDNs.isEmpty())
{
newBaseDNs.add(DN.valueOf(DN_DEFAULT_SCHEMA_ROOT));
@@ -3998,7 +3983,7 @@
// Check to see if there is a new set of user-defined attributes.
- ArrayList<Attribute> newUserAttrs = new ArrayList<Attribute>();
+ ArrayList<Attribute> newUserAttrs = new ArrayList<>();
try
{
ConfigEntry configEntry = DirectoryServer.getConfigEntry(configEntryDN);
@@ -4046,7 +4031,7 @@
// deleteBaseDNs will contain the set of DNs that should no longer be used
// and should be deregistered from the server, and the newBaseDNs set will
// just contain the set of DNs to add.
- Set<DN> deleteBaseDNs = new HashSet<DN>(baseDNs.length);
+ Set<DN> deleteBaseDNs = new HashSet<>(baseDNs.length);
for (DN baseDN : baseDNs)
{
if (! newBaseDNs.remove(baseDN))
@@ -4149,7 +4134,7 @@
@Override
public Map<String, String> getAlerts()
{
- Map<String, String> alerts = new LinkedHashMap<String, String>();
+ Map<String, String> alerts = new LinkedHashMap<>();
alerts.put(ALERT_TYPE_CANNOT_COPY_SCHEMA_FILES,
ALERT_DESCRIPTION_CANNOT_COPY_SCHEMA_FILES);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/TrustStoreBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/TrustStoreBackend.java
index 69e304d..93e9099 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/TrustStoreBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/TrustStoreBackend.java
@@ -300,32 +300,27 @@
generateInstanceCertificateIfAbsent();
// Construct the trust store base entry.
- LinkedHashMap<ObjectClass,String> objectClasses =
- new LinkedHashMap<ObjectClass,String>(2);
+ LinkedHashMap<ObjectClass,String> objectClasses = new LinkedHashMap<>(2);
objectClasses.put(DirectoryServer.getTopObjectClass(), OC_TOP);
ObjectClass branchOC =
DirectoryServer.getObjectClass("ds-cfg-branch", true);
objectClasses.put(branchOC, "ds-cfg-branch");
- LinkedHashMap<AttributeType,List<Attribute>> opAttrs =
- new LinkedHashMap<AttributeType,List<Attribute>>(0);
- LinkedHashMap<AttributeType,List<Attribute>> userAttrs =
- new LinkedHashMap<AttributeType,List<Attribute>>(1);
+ LinkedHashMap<AttributeType,List<Attribute>> opAttrs = new LinkedHashMap<>(0);
+ LinkedHashMap<AttributeType,List<Attribute>> userAttrs = new LinkedHashMap<>(1);
RDN rdn = baseDN.rdn();
int numAVAs = rdn.getNumValues();
for (int i=0; i < numAVAs; i++)
{
AttributeType attrType = rdn.getAttributeType(i);
- ArrayList<Attribute> attrList = new ArrayList<Attribute>(1);
+ ArrayList<Attribute> attrList = new ArrayList<>(1);
attrList.add(Attributes.create(attrType, rdn.getAttributeValue(i)));
userAttrs.put(attrType, attrList);
}
- baseEntry = new Entry(baseDN, objectClasses, userAttrs,
- opAttrs);
-
+ baseEntry = new Entry(baseDN, objectClasses, userAttrs, opAttrs);
// Register this as a change listener.
configuration.addTrustStoreChangeListener(this);
@@ -481,33 +476,24 @@
}
// Construct the certificate entry to return.
- LinkedHashMap<ObjectClass,String> ocMap =
- new LinkedHashMap<ObjectClass,String>(2);
+ LinkedHashMap<ObjectClass,String> ocMap = new LinkedHashMap<>(2);
ocMap.put(DirectoryServer.getTopObjectClass(), OC_TOP);
ObjectClass objectClass =
DirectoryServer.getObjectClass(OC_CRYPTO_INSTANCE_KEY, true);
ocMap.put(objectClass, OC_CRYPTO_INSTANCE_KEY);
- LinkedHashMap<AttributeType,List<Attribute>> opAttrs =
- new LinkedHashMap<AttributeType,List<Attribute>>(0);
- LinkedHashMap<AttributeType,List<Attribute>> userAttrs =
- new LinkedHashMap<AttributeType,List<Attribute>>(3);
+ LinkedHashMap<AttributeType,List<Attribute>> opAttrs = new LinkedHashMap<>(0);
+ LinkedHashMap<AttributeType,List<Attribute>> userAttrs = new LinkedHashMap<>(3);
+
+ userAttrs.put(t, asList(Attributes.create(t, v)));
- ArrayList<Attribute> attrList = new ArrayList<Attribute>(1);
- attrList.add(Attributes.create(t, v));
- userAttrs.put(t, attrList);
-
-
- t = DirectoryServer.getAttributeType(ATTR_CRYPTO_PUBLIC_KEY_CERTIFICATE,
- true);
+ t = DirectoryServer.getAttributeType(ATTR_CRYPTO_PUBLIC_KEY_CERTIFICATE, true);
AttributeBuilder builder = new AttributeBuilder(t);
builder.setOption("binary");
builder.add(certValue);
- attrList = new ArrayList<Attribute>(1);
- attrList.add(builder.toAttribute());
- userAttrs.put(t, attrList);
+ userAttrs.put(t, asList(builder.toAttribute()));
Entry e = new Entry(entryDN, ocMap, userAttrs, opAttrs);
@@ -515,6 +501,13 @@
return e;
}
+ private ArrayList<Attribute> asList(Attribute create)
+ {
+ ArrayList<Attribute> attrList = new ArrayList<>(1);
+ attrList.add(create);
+ return attrList;
+ }
+
/** {@inheritDoc} */
@Override
public void addEntry(Entry entry, AddOperation addOperation)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/VerifyConfig.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/VerifyConfig.java
index 08094fd..3a094fc 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/VerifyConfig.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/VerifyConfig.java
@@ -40,9 +40,9 @@
/** The base DN to be verified. */
private DN baseDN;
/** The names of indexes to be verified for completeness. */
- private ArrayList<String> completeList = new ArrayList<String>();
+ private ArrayList<String> completeList = new ArrayList<>();
/** The names of indexes to be verified for cleanliness. */
- private ArrayList<String> cleanList = new ArrayList<String>();
+ private ArrayList<String> cleanList = new ArrayList<>();
/**
* Get the base DN to be verified.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/AttributeIndex.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/AttributeIndex.java
index 0616d10..30effd8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/AttributeIndex.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/AttributeIndex.java
@@ -418,7 +418,7 @@
// Sorting the keys will ensure database record locks are acquired
// in a consistent order and help prevent transaction deadlocks between
// concurrent writers.
- Set<ByteString> set = new HashSet<ByteString>();
+ Set<ByteString> set = new HashSet<>();
int substrLength = indexConfig.getSubstringLength();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/BackendImpl.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/BackendImpl.java
index 7108658..b9f18ad 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/BackendImpl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/BackendImpl.java
@@ -134,7 +134,7 @@
/**
* The controls supported by this backend.
*/
- private static final Set<String> supportedControls = new HashSet<String>(Arrays.asList(
+ private static final Set<String> supportedControls = new HashSet<>(Arrays.asList(
OID_SUBTREE_DELETE_CONTROL,
OID_PAGED_RESULTS_CONTROL,
OID_MANAGE_DSAIT_CONTROL,
@@ -1018,7 +1018,7 @@
try
{
List<Path> allFiles = BackupManager.getFiles(rootDirectory, new JELogFileFilter(), backendID);
- List<Path> compare = new ArrayList<Path>(files);
+ List<Path> compare = new ArrayList<>(files);
compare.removeAll(allFiles);
if (!compare.isEmpty())
{
@@ -1369,7 +1369,7 @@
@Override
public Map<String, String> getAlerts()
{
- Map<String, String> alerts = new LinkedHashMap<String, String>();
+ Map<String, String> alerts = new LinkedHashMap<>();
alerts.put(ALERT_TYPE_BACKEND_ENVIRONMENT_UNUSABLE,
ALERT_DESCRIPTION_BACKEND_ENVIRONMENT_UNUSABLE);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ConfigurableEnvironment.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ConfigurableEnvironment.java
index 6994018..49774fa 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ConfigurableEnvironment.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ConfigurableEnvironment.java
@@ -204,25 +204,18 @@
ConfigConstants.NAME_PREFIX_CFG + "je-property";
- /**
- * A map of JE property names to the corresponding configuration attribute.
- */
- private static HashMap<String, String> attrMap =
- new HashMap<String, String>();
-
+ /** A map of JE property names to the corresponding configuration attribute. */
+ private static HashMap<String, String> attrMap = new HashMap<>();
/**
* A map of configuration attribute names to the corresponding configuration
* object getter method.
*/
- private static HashMap<String,Method> methodMap =
- new HashMap<String, Method>();
-
+ private static HashMap<String, Method> methodMap = new HashMap<>();
/**
* A map of configuration attribute names to the corresponding configuration
* PropertyDefinition.
*/
- private static HashMap<String,PropertyDefinition> defnMap =
- new HashMap<String, PropertyDefinition>();
+ private static HashMap<String, PropertyDefinition> defnMap = new HashMap<>();
/** Pulled from resource/admin/ABBREVIATIONS.xsl. db is mose common. */
@@ -550,7 +543,7 @@
}
// Set to catch duplicate properties.
- HashSet<String> uniqueJEProperties = new HashSet<String>();
+ HashSet<String> uniqueJEProperties = new HashSet<>();
// Iterate through the config values associated with a JE property.
for (String jeEntry : jeProperties)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/DBTest.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/DBTest.java
index cc74cac..f3f94c8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/DBTest.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/DBTest.java
@@ -767,7 +767,7 @@
private int appendDatabaseContainerRows(TableBuilder builder, EntryContainer ec, int count)
{
- ArrayList<DatabaseContainer> databaseContainers = new ArrayList<DatabaseContainer>();
+ ArrayList<DatabaseContainer> databaseContainers = new ArrayList<>();
ec.listDatabases(databaseContainers);
String toReplace = ec.getDatabasePrefix() + "_";
for(DatabaseContainer dc : databaseContainers)
@@ -917,10 +917,8 @@
return 1;
}
- ArrayList<DatabaseContainer> databaseContainers =
- new ArrayList<DatabaseContainer>();
- Map<Index, StringBuilder> undefinedKeys =
- new HashMap<Index, StringBuilder>();
+ ArrayList<DatabaseContainer> databaseContainers = new ArrayList<>();
+ Map<Index, StringBuilder> undefinedKeys = new HashMap<>();
ec.listDatabases(databaseContainers);
String toReplace = ec.getDatabasePrefix() + "_";
for(DatabaseContainer dc : databaseContainers)
@@ -1103,8 +1101,7 @@
}
DatabaseContainer databaseContainer = null;
- ArrayList<DatabaseContainer> databaseContainers =
- new ArrayList<DatabaseContainer>();
+ ArrayList<DatabaseContainer> databaseContainers = new ArrayList<>();
ec.listDatabases(databaseContainers);
String toReplace = ec.getDatabasePrefix() + "_";
for(DatabaseContainer dc : databaseContainers)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/DN2URI.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/DN2URI.java
index f000991..a59d618 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/DN2URI.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/DN2URI.java
@@ -450,7 +450,7 @@
private void throwReferralException(DN targetDN, DN referralDN, Set<String> labeledURIs, SearchScope searchScope)
throws DirectoryException
{
- ArrayList<String> URIList = new ArrayList<String>(labeledURIs.size());
+ ArrayList<String> URIList = new ArrayList<>(labeledURIs.size());
for (String labeledURI : labeledURIs)
{
// Remove the label part of the labeled URI if there is a label.
@@ -558,7 +558,7 @@
if (status == OperationStatus.SUCCESS)
{
// Construct a set of all the labeled URIs in the referral.
- Set<String> labeledURIs = new LinkedHashSet<String>(cursor.count());
+ Set<String> labeledURIs = new LinkedHashSet<>(cursor.count());
do
{
final Pair<String, DN> uriAndDN = decodeURIAndDN(data.getData());
@@ -662,7 +662,7 @@
}
// Construct a list of all the URIs in the referral.
- ArrayList<String> URIList = new ArrayList<String>(cursor.count());
+ ArrayList<String> URIList = new ArrayList<>(cursor.count());
do
{
// Remove the label part of the labeled URI if there is a label.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/DatabaseEnvironmentMonitor.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/DatabaseEnvironmentMonitor.java
index d8d93ee..5039cbe 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/DatabaseEnvironmentMonitor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/DatabaseEnvironmentMonitor.java
@@ -90,21 +90,15 @@
}
}
- /**
- * The name of this monitor instance.
- */
+ /** The name of this monitor instance. */
private String name;
-
- /**
- * The root container to be monitored.
- */
+ /** The root container to be monitored. */
private RootContainer rootContainer;
private int maxEntries = 1024;
private boolean filterUseEnabled;
private String startTimeStamp;
- private final HashMap<SearchFilter, FilterStats> filterToStats =
- new HashMap<SearchFilter, FilterStats>();
+ private final HashMap<SearchFilter, FilterStats> filterToStats = new HashMap<>();
private final AtomicInteger indexedSearchCount = new AtomicInteger();
private final AtomicInteger unindexedSearchCount = new AtomicInteger();
@@ -120,8 +114,6 @@
this.rootContainer = rootContainer;
}
-
-
/** {@inheritDoc} */
@Override
public void initializeMonitorProvider(MonitorProviderCfg configuration)
@@ -221,7 +213,7 @@
return Collections.emptyList();
}
- ArrayList<Attribute> monitorAttrs = new ArrayList<Attribute>();
+ ArrayList<Attribute> monitorAttrs = new ArrayList<>();
String jeVersion = JEVersion.CURRENT_VERSION.getVersionString();
AttributeType versionType =
DirectoryServer.getDefaultAttributeType("JEVersion");
@@ -233,7 +225,7 @@
AttributeBuilder needReindex = new AttributeBuilder("need-reindex");
for(EntryContainer ec : rootContainer.getEntryContainers())
{
- List<DatabaseContainer> databases = new ArrayList<DatabaseContainer>();
+ List<DatabaseContainer> databases = new ArrayList<>();
ec.listDatabases(databases);
for(DatabaseContainer dc : databases)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryContainer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryContainer.java
index 9371eb4..58220f8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryContainer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryContainer.java
@@ -124,10 +124,9 @@
private State state;
/** The set of attribute indexes. */
- private final HashMap<AttributeType, AttributeIndex> attrIndexMap = new HashMap<AttributeType, AttributeIndex>();
-
+ private final HashMap<AttributeType, AttributeIndex> attrIndexMap = new HashMap<>();
/** The set of VLV (Virtual List View) indexes. */
- private final HashMap<String, VLVIndex> vlvIndexMap = new HashMap<String, VLVIndex>();
+ private final HashMap<String, VLVIndex> vlvIndexMap = new HashMap<>();
/**
* Prevents name clashes for common indexes (like id2entry) across multiple suffixes.
@@ -2753,7 +2752,7 @@
*/
void delete() throws DatabaseException
{
- List<DatabaseContainer> databases = new ArrayList<DatabaseContainer>();
+ List<DatabaseContainer> databases = new ArrayList<>();
listDatabases(databases);
if(env.getConfig().getTransactional())
@@ -2888,7 +2887,7 @@
throws DatabaseException, JebException
{
- List<DatabaseContainer> databases = new ArrayList<DatabaseContainer>();
+ List<DatabaseContainer> databases = new ArrayList<>();
listDatabases(databases);
newDatabasePrefix = preparePrefix(newDatabasePrefix);
@@ -3085,7 +3084,7 @@
*/
public void clear() throws DatabaseException
{
- List<DatabaseContainer> databases = new ArrayList<DatabaseContainer>();
+ List<DatabaseContainer> databases = new ArrayList<>();
listDatabases(databases);
for(DatabaseContainer db : databases)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryIDSetSorter.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryIDSetSorter.java
index 2a2740c..af1031d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryIDSetSorter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryIDSetSorter.java
@@ -83,7 +83,7 @@
SearchScope scope = searchOperation.getScope();
SearchFilter filter = searchOperation.getFilter();
- TreeMap<SortValues,EntryID> sortMap = new TreeMap<SortValues,EntryID>();
+ TreeMap<SortValues,EntryID> sortMap = new TreeMap<>();
for (EntryID id : entryIDSet)
{
try
@@ -193,7 +193,7 @@
int includedBeforeCount = 0;
int includedAfterCount = 0;
int listSize = 0;
- LinkedList<EntryID> idList = new LinkedList<EntryID>();
+ LinkedList<EntryID> idList = new LinkedList<>();
for (Map.Entry<SortValues, EntryID> entry : sortMap.entrySet())
{
SortValues sortValues = entry.getKey();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ExportJob.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ExportJob.java
index 091446b..06165e0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ExportJob.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ExportJob.java
@@ -94,14 +94,12 @@
throws IOException, LDIFException, DatabaseException, JebException
{
List<DN> includeBranches = exportConfig.getIncludeBranches();
- DN baseDN;
- ArrayList<EntryContainer> exportContainers =
- new ArrayList<EntryContainer>();
+ ArrayList<EntryContainer> exportContainers = new ArrayList<>();
for (EntryContainer entryContainer : rootContainer.getEntryContainers())
{
// Skip containers that are not covered by the include branches.
- baseDN = entryContainer.getBaseDN();
+ DN baseDN = entryContainer.getBaseDN();
if (includeBranches == null || includeBranches.isEmpty())
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ImportLDIFReader.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ImportLDIFReader.java
index 6f9f2dc..f4f6c1a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ImportLDIFReader.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/ImportLDIFReader.java
@@ -106,7 +106,7 @@
return null;
}
lastEntryBodyLines = lines;
- lastEntryHeaderLines = new LinkedList<StringBuilder>();
+ lastEntryHeaderLines = new LinkedList<>();
// Read the DN of the entry and see if it is one that should be included
// in the import.
@@ -168,11 +168,9 @@
private Entry createEntry(List<StringBuilder> lines, DN entryDN, boolean checkSchema, Suffix suffix)
{
// Read the set of attributes from the entry.
- Map<ObjectClass, String> objectClasses = new HashMap<ObjectClass, String>();
- Map<AttributeType, List<AttributeBuilder>> userAttrBuilders =
- new HashMap<AttributeType, List<AttributeBuilder>>();
- Map<AttributeType, List<AttributeBuilder>> operationalAttrBuilders =
- new HashMap<AttributeType, List<AttributeBuilder>>();
+ Map<ObjectClass, String> objectClasses = new HashMap<>();
+ Map<AttributeType, List<AttributeBuilder>> userAttrBuilders = new HashMap<>();
+ Map<AttributeType, List<AttributeBuilder>> operationalAttrBuilders = new HashMap<>();
try
{
for (StringBuilder line : lines)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Importer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Importer.java
index ac49c00..429c384 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Importer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Importer.java
@@ -217,20 +217,18 @@
private ExecutorService scratchFileWriterService;
/** Queue of free index buffers -- used to re-cycle index buffers. */
- private final BlockingQueue<IndexOutputBuffer> freeBufferQueue =
- new LinkedBlockingQueue<IndexOutputBuffer>();
+ private final BlockingQueue<IndexOutputBuffer> freeBufferQueue = new LinkedBlockingQueue<>();
/**
* Map of index keys to index buffers. Used to allocate sorted index buffers
* to a index writer thread.
*/
- private final Map<IndexKey, BlockingQueue<IndexOutputBuffer>> indexKeyQueueMap =
- new ConcurrentHashMap<IndexKey, BlockingQueue<IndexOutputBuffer>>();
+ private final Map<IndexKey, BlockingQueue<IndexOutputBuffer>> indexKeyQueueMap = new ConcurrentHashMap<>();
/** Map of DB containers to index managers. Used to start phase 2. */
- private final List<IndexManager> indexMgrList = new LinkedList<IndexManager>();
+ private final List<IndexManager> indexMgrList = new LinkedList<>();
/** Map of DB containers to DN-based index managers. Used to start phase 2. */
- private final List<IndexManager> DNIndexMgrList = new LinkedList<IndexManager>();
+ private final List<IndexManager> DNIndexMgrList = new LinkedList<>();
/**
* Futures used to indicate when the index file writers are done flushing
@@ -244,12 +242,11 @@
private final List<ScratchFileWriterTask> scratchFileWriterList;
/** Map of DNs to Suffix objects. */
- private final Map<DN, Suffix> dnSuffixMap = new LinkedHashMap<DN, Suffix>();
+ private final Map<DN, Suffix> dnSuffixMap = new LinkedHashMap<>();
/** Map of container ids to database containers. */
- private final ConcurrentHashMap<Integer, Index> idContainerMap = new ConcurrentHashMap<Integer, Index>();
+ private final ConcurrentHashMap<Integer, Index> idContainerMap = new ConcurrentHashMap<>();
/** Map of container ids to entry containers. */
- private final ConcurrentHashMap<Integer, EntryContainer> idECMap =
- new ConcurrentHashMap<Integer, EntryContainer>();
+ private final ConcurrentHashMap<Integer, EntryContainer> idECMap = new ConcurrentHashMap<>();
/** Used to synchronize when a scratch file index writer is first setup. */
private final Object synObj = new Object();
@@ -309,9 +306,8 @@
this.rebuildManager = new RebuildIndexManager(rebuildConfig, cfg);
this.indexCount = rebuildManager.getIndexCount();
this.clearedBackend = false;
- this.scratchFileWriterList =
- new ArrayList<ScratchFileWriterTask>(indexCount);
- this.scratchFileWriterFutures = new CopyOnWriteArrayList<Future<Void>>();
+ this.scratchFileWriterList = new ArrayList<>(indexCount);
+ this.scratchFileWriterFutures = new CopyOnWriteArrayList<>();
this.tempDir = getTempDir(cfg, rebuildConfig.getTmpDirectory());
recursiveDelete(tempDir);
@@ -363,9 +359,8 @@
this.indexCount = getTotalIndexCount(localDBBackendCfg);
this.clearedBackend = mustClearBackend(importConfiguration, localDBBackendCfg);
- this.scratchFileWriterList =
- new ArrayList<ScratchFileWriterTask>(indexCount);
- this.scratchFileWriterFutures = new CopyOnWriteArrayList<Future<Void>>();
+ this.scratchFileWriterList = new ArrayList<>(indexCount);
+ this.scratchFileWriterFutures = new CopyOnWriteArrayList<>();
this.tempDir = getTempDir(localDBBackendCfg, importConfiguration.getTmpDirectory());
recursiveDelete(tempDir);
@@ -712,8 +707,8 @@
{
DN baseDN = entryContainer.getBaseDN();
EntryContainer sourceEntryContainer = null;
- List<DN> includeBranches = new ArrayList<DN>();
- List<DN> excludeBranches = new ArrayList<DN>();
+ List<DN> includeBranches = new ArrayList<>();
+ List<DN> excludeBranches = new ArrayList<>();
if (!importConfiguration.appendToExistingData()
&& !importConfiguration.clearBackend())
@@ -1041,7 +1036,7 @@
bufferSortService = Executors.newFixedThreadPool(threadCount);
final ExecutorService execService = Executors.newFixedThreadPool(threadCount);
- final List<Callable<Void>> tasks = new ArrayList<Callable<Void>>(threadCount);
+ final List<Callable<Void>> tasks = new ArrayList<>(threadCount);
tasks.add(new MigrateExistingTask());
getAll(execService.invokeAll(tasks));
tasks.clear();
@@ -1134,7 +1129,7 @@
int buffers;
while (true)
{
- final List<IndexManager> allIndexMgrs = new ArrayList<IndexManager>(DNIndexMgrList);
+ final List<IndexManager> allIndexMgrs = new ArrayList<>(DNIndexMgrList);
allIndexMgrs.addAll(indexMgrList);
Collections.sort(allIndexMgrs, Collections.reverseOrder());
@@ -1180,7 +1175,7 @@
logger.info(NOTE_IMPORT_LDIF_PHASE_TWO_MEM_REPORT, availableMemory, readAheadSize, buffers);
// Start indexing tasks.
- List<Future<Void>> futures = new LinkedList<Future<Void>>();
+ List<Future<Void>> futures = new LinkedList<>();
ExecutorService dbService = Executors.newFixedThreadPool(dbThreads);
Semaphore permits = new Semaphore(buffers);
@@ -1354,7 +1349,7 @@
private List<byte[]> includeBranchesAsBytes(Suffix suffix)
{
- List<byte[]> includeBranches = new ArrayList<byte[]>(suffix.getIncludeBranches().size());
+ List<byte[]> includeBranches = new ArrayList<>(suffix.getIncludeBranches().size());
for (DN includeBranch : suffix.getIncludeBranches())
{
if (includeBranch.isDescendantOf(suffix.getBaseDN()))
@@ -1383,8 +1378,8 @@
*/
private class AppendReplaceTask extends ImportTask
{
- private final Set<ByteString> insertKeySet = new HashSet<ByteString>();
- private final Set<ByteString> deleteKeySet = new HashSet<ByteString>();
+ private final Set<ByteString> insertKeySet = new HashSet<>();
+ private final Set<ByteString> deleteKeySet = new HashSet<>();
private final EntryInformation entryInfo = new EntryInformation();
private Entry oldEntry;
private EntryID entryID;
@@ -1499,8 +1494,8 @@
*/
private class ImportTask implements Callable<Void>
{
- private final Map<IndexKey, IndexOutputBuffer> indexBufferMap = new HashMap<IndexKey, IndexOutputBuffer>();
- private final Set<ByteString> insertKeySet = new HashSet<ByteString>();
+ private final Map<IndexKey, IndexOutputBuffer> indexBufferMap = new HashMap<>();
+ private final Set<ByteString> insertKeySet = new HashSet<>();
private final EntryInformation entryInfo = new EntryInformation();
private final IndexKey dnIndexKey = new IndexKey(dnType, ImportIndexType.DN.toString(), 1);
private DatabaseEntry keyEntry = new DatabaseEntry();
@@ -1650,7 +1645,7 @@
void flushIndexBuffers() throws InterruptedException, ExecutionException
{
- final ArrayList<Future<Void>> futures = new ArrayList<Future<Void>>();
+ final ArrayList<Future<Void>> futures = new ArrayList<>();
Iterator<Map.Entry<IndexKey, IndexOutputBuffer>> it = indexBufferMap.entrySet().iterator();
while (it.hasNext())
{
@@ -1744,7 +1739,7 @@
private final IndexManager indexMgr;
private final DatabaseEntry dbKey, dbValue;
private final int cacheSize;
- private final Map<Integer, DNState> dnStateMap = new HashMap<Integer, DNState>();
+ private final Map<Integer, DNState> dnStateMap = new HashMap<>();
private final Semaphore permits;
private final int maxPermits;
private final AtomicLong bytesRead = new AtomicLong();
@@ -1843,7 +1838,7 @@
batchNumber.incrementAndGet();
// Create all the index buffers for the next batch.
- final NavigableSet<IndexInputBuffer> buffers = new TreeSet<IndexInputBuffer>();
+ final NavigableSet<IndexInputBuffer> buffers = new TreeSet<>();
for (int i = 0; i < permitRequest; i++)
{
final long bufferBegin = bufferIndexFile.readLong();
@@ -2394,7 +2389,7 @@
private final DataOutputStream bufferStream;
private final DataOutputStream bufferIndexStream;
private final byte[] tmpArray = new byte[8];
- private final TreeSet<IndexOutputBuffer> indexSortedSet = new TreeSet<IndexOutputBuffer>();
+ private final TreeSet<IndexOutputBuffer> indexSortedSet = new TreeSet<>();
private int insertKeyCount, deleteKeyCount;
private int bufferCount;
private boolean poisonSeen;
@@ -2418,7 +2413,7 @@
public Void call() throws IOException, InterruptedException
{
long offset = 0;
- List<IndexOutputBuffer> l = new LinkedList<IndexOutputBuffer>();
+ List<IndexOutputBuffer> l = new LinkedList<>();
try
{
while (true)
@@ -2732,8 +2727,7 @@
{
indexMgrList.add(indexMgr);
}
- BlockingQueue<IndexOutputBuffer> newQueue =
- new ArrayBlockingQueue<IndexOutputBuffer>(phaseOneBufferCount);
+ BlockingQueue<IndexOutputBuffer> newQueue = new ArrayBlockingQueue<>(phaseOneBufferCount);
ScratchFileWriterTask indexWriter = new ScratchFileWriterTask(newQueue, indexMgr);
scratchFileWriterList.add(indexWriter);
scratchFileWriterFutures.add(scratchFileWriterService.submit(indexWriter));
@@ -2880,24 +2874,18 @@
/** Rebuild index configuration. */
private final RebuildConfig rebuildConfig;
-
/** Local DB backend configuration. */
private final LocalDBBackendCfg cfg;
/** Map of index keys to indexes. */
- private final Map<IndexKey, Index> indexMap =
- new LinkedHashMap<IndexKey, Index>();
-
+ private final Map<IndexKey, Index> indexMap = new LinkedHashMap<>();
/** Map of index keys to extensible indexes. */
- private final Map<IndexKey, Collection<Index>> extensibleIndexMap =
- new LinkedHashMap<IndexKey, Collection<Index>>();
-
+ private final Map<IndexKey, Collection<Index>> extensibleIndexMap = new LinkedHashMap<>();
/** List of VLV indexes. */
- private final List<VLVIndex> vlvIndexes = new LinkedList<VLVIndex>();
+ private final List<VLVIndex> vlvIndexes = new LinkedList<>();
/** The DN2ID index. */
private DN2ID dn2id;
-
/** The DN2URI index. */
private DN2URI dn2uri;
@@ -3267,7 +3255,7 @@
scratchFileWriterService = Executors.newFixedThreadPool(2 * indexCount);
bufferSortService = Executors.newFixedThreadPool(threadCount);
ExecutorService rebuildIndexService = Executors.newFixedThreadPool(threadCount);
- List<Callable<Void>> tasks = new ArrayList<Callable<Void>>(threadCount);
+ List<Callable<Void>> tasks = new ArrayList<>(threadCount);
for (int i = 0; i < threadCount; i++)
{
tasks.add(this);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Index.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Index.java
index e3fe279..516622e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Index.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Index.java
@@ -589,7 +589,7 @@
DatabaseEntry data = new DatabaseEntry();
DatabaseEntry key;
- ArrayList<EntryIDSet> lists = new ArrayList<EntryIDSet>();
+ ArrayList<EntryIDSet> lists = new ArrayList<>();
Cursor cursor = openCursor(null, CursorConfig.READ_COMMITTED);
try
@@ -736,7 +736,7 @@
List<Modification> mods)
throws DatabaseException
{
- final Map<ByteString, Boolean> modifiedKeys = new TreeMap<ByteString, Boolean>(indexer.getBSComparator());
+ final Map<ByteString, Boolean> modifiedKeys = new TreeMap<>(indexer.getBSComparator());
indexer.modifyEntry(oldEntry, newEntry, mods, modifiedKeys);
for (Map.Entry<ByteString, Boolean> modifiedKey : modifiedKeys.entrySet())
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/IndexBuffer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/IndexBuffer.java
index 20d3e8c..c718f32 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/IndexBuffer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/IndexBuffer.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.backends.jeb;
@@ -51,12 +51,9 @@
* The buffered records stored as a map from the record key to the
* buffered value for that key for each index.
*/
- private final LinkedHashMap<Index, TreeMap<ByteString, BufferedIndexValues>> bufferedIndexes =
- new LinkedHashMap<Index, TreeMap<ByteString, BufferedIndexValues>>();
-
+ private final LinkedHashMap<Index, TreeMap<ByteString, BufferedIndexValues>> bufferedIndexes = new LinkedHashMap<>();
/** The buffered records stored as a set of buffered VLV values for each index. */
- private final LinkedHashMap<VLVIndex, BufferedVLVValues> bufferedVLVIndexes =
- new LinkedHashMap<VLVIndex, BufferedVLVValues>();
+ private final LinkedHashMap<VLVIndex, BufferedVLVValues> bufferedVLVIndexes = new LinkedHashMap<>();
/** A simple class representing a pair of added and deleted indexed IDs. */
static class BufferedIndexValues
@@ -128,7 +125,7 @@
{
if (this.addedValues == null)
{
- this.addedValues = new TreeSet<SortValues>();
+ this.addedValues = new TreeSet<>();
}
this.addedValues.add(sortValues);
}
@@ -145,7 +142,7 @@
{
if (this.deletedValues == null)
{
- this.deletedValues = new TreeSet<SortValues>();
+ this.deletedValues = new TreeSet<>();
}
this.deletedValues.add(sortValues);
}
@@ -210,7 +207,7 @@
TreeMap<ByteString, BufferedIndexValues> bufferedOperations = bufferedIndexes.get(index);
if (bufferedOperations == null)
{
- bufferedOperations = new TreeMap<ByteString, BufferedIndexValues>(bsComparator);
+ bufferedOperations = new TreeMap<>(bsComparator);
bufferedIndexes.put(index, bufferedOperations);
}
else
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/IndexFilter.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/IndexFilter.java
index 061b394..ed5c111 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/IndexFilter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/IndexFilter.java
@@ -201,10 +201,9 @@
// into a hash map, the faster components (equality, presence, approx)
// into one list and the remainder into another list.
- ArrayList<SearchFilter> fastComps = new ArrayList<SearchFilter>();
- ArrayList<SearchFilter> otherComps = new ArrayList<SearchFilter>();
- HashMap<AttributeType, ArrayList<SearchFilter>> rangeComps =
- new HashMap<AttributeType, ArrayList<SearchFilter>>();
+ ArrayList<SearchFilter> fastComps = new ArrayList<>();
+ ArrayList<SearchFilter> otherComps = new ArrayList<>();
+ HashMap<AttributeType, ArrayList<SearchFilter>> rangeComps = new HashMap<>();
for (SearchFilter filter : andFilter.getFilterComponents())
{
@@ -216,7 +215,7 @@
rangeList = rangeComps.get(filter.getAttributeType());
if (rangeList == null)
{
- rangeList = new ArrayList<SearchFilter>();
+ rangeList = new ArrayList<>();
rangeComps.put(filter.getAttributeType(), rangeList);
}
rangeList.add(filter);
@@ -244,7 +243,7 @@
}
// Next, process range component pairs like (cn>=A)(cn<=B).
- ArrayList<SearchFilter> remainComps = new ArrayList<SearchFilter>();
+ ArrayList<SearchFilter> remainComps = new ArrayList<>();
for (Map.Entry<AttributeType, ArrayList<SearchFilter>> rangeEntry : rangeComps.entrySet())
{
ArrayList<SearchFilter> rangeList = rangeEntry.getValue();
@@ -325,8 +324,7 @@
*/
private EntryIDSet evaluateLogicalOrFilter(SearchFilter orFilter)
{
- ArrayList<EntryIDSet> candidateSets = new ArrayList<EntryIDSet>(
- orFilter.getFilterComponents().size());
+ ArrayList<EntryIDSet> candidateSets = new ArrayList<>(orFilter.getFilterComponents().size());
for (SearchFilter filter : orFilter.getFilterComponents())
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JECompressedSchema.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JECompressedSchema.java
index 68f5c90..7ff41aa 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JECompressedSchema.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JECompressedSchema.java
@@ -215,7 +215,7 @@
final byte[] encodedObjectClasses = keyEntry.getData();
final ASN1Reader reader = ASN1.getReader(valueEntry.getData());
reader.readStartSequence();
- final List<String> objectClassNames = new LinkedList<String>();
+ final List<String> objectClassNames = new LinkedList<>();
while (reader.hasNextElement())
{
objectClassNames.add(reader.readOctetStringAsString());
@@ -250,7 +250,7 @@
final ASN1Reader reader = ASN1.getReader(valueEntry.getData());
reader.readStartSequence();
final String attributeName = reader.readOctetStringAsString();
- final List<String> attributeOptions = new LinkedList<String>();
+ final List<String> attributeOptions = new LinkedList<>();
while (reader.hasNextElement())
{
attributeOptions.add(reader.readOctetStringAsString());
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/RootContainer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/RootContainer.java
index 38fcc75..8f8952f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/RootContainer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/RootContainer.java
@@ -77,7 +77,7 @@
private DatabaseEnvironmentMonitor monitor;
/** The base DNs contained in this root container. */
- private final ConcurrentHashMap<DN, EntryContainer> entryContainers = new ConcurrentHashMap<DN, EntryContainer>();
+ private final ConcurrentHashMap<DN, EntryContainer> entryContainers = new ConcurrentHashMap<>();
/** The cached value of the next entry identifier to be assigned. */
private AtomicLong nextid = new AtomicLong(1);
@@ -342,7 +342,7 @@
if (timeLimit > 0)
{
// Get a list of all the databases used by the backend.
- ArrayList<DatabaseContainer> dbList = new ArrayList<DatabaseContainer>();
+ ArrayList<DatabaseContainer> dbList = new ArrayList<>();
for (EntryContainer ec : entryContainers.values())
{
ec.sharedLock.lock();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Suffix.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Suffix.java
index c84ee64..a310a81 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Suffix.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Suffix.java
@@ -57,9 +57,8 @@
private final EntryContainer entryContainer;
private final Object synchObject = new Object();
private static final int PARENT_ID_SET_SIZE = 16 * 1024;
- private final ConcurrentHashMap<DN, CountDownLatch> pendingMap =
- new ConcurrentHashMap<DN, CountDownLatch>();
- private final Set<DN> parentSet = new HashSet<DN>(PARENT_ID_SET_SIZE);
+ private final ConcurrentHashMap<DN, CountDownLatch> pendingMap = new ConcurrentHashMap<>();
+ private final Set<DN> parentSet = new HashSet<>(PARENT_ID_SET_SIZE);
/**
* Creates a suffix instance using the specified parameters.
@@ -81,7 +80,7 @@
}
else
{
- this.includeBranches = new ArrayList<DN>(0);
+ this.includeBranches = new ArrayList<>(0);
}
if (excludeBranches != null)
{
@@ -89,7 +88,7 @@
}
else
{
- this.excludeBranches = new ArrayList<DN>(0);
+ this.excludeBranches = new ArrayList<>(0);
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/VLVIndex.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/VLVIndex.java
index 6bc539f..fd72593 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/VLVIndex.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/VLVIndex.java
@@ -864,7 +864,7 @@
int targetOffset = 0;
int includedBeforeCount = 0;
int includedAfterCount = 0;
- LinkedList<EntryID> idList = new LinkedList<EntryID>();
+ LinkedList<EntryID> idList = new LinkedList<>();
DatabaseEntry key = new DatabaseEntry();
DatabaseEntry data = new DatabaseEntry();
@@ -993,7 +993,7 @@
}
else
{
- LinkedList<long[]> idSets = new LinkedList<long[]>();
+ LinkedList<long[]> idSets = new LinkedList<>();
int currentCount = 0;
DatabaseEntry key = new DatabaseEntry();
DatabaseEntry data = new DatabaseEntry();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/VerifyJob.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/VerifyJob.java
index 43bf75e..c51ac72 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/VerifyJob.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/VerifyJob.java
@@ -75,8 +75,7 @@
* This map is used to gather some statistics about values that have
* exceeded the entry limit.
*/
- private IdentityHashMap<Index, HashMap<ByteString, Long>> entryLimitMap =
- new IdentityHashMap<Index, HashMap<ByteString, Long>>();
+ private IdentityHashMap<Index, HashMap<ByteString, Long>> entryLimitMap = new IdentityHashMap<>();
/** Indicates whether the DN database is to be verified. */
private boolean verifyDN2ID;
@@ -95,9 +94,9 @@
private Index id2s;
/** A list of the attribute indexes to be verified. */
- private final ArrayList<AttributeIndex> attrIndexList = new ArrayList<AttributeIndex>();
+ private final ArrayList<AttributeIndex> attrIndexList = new ArrayList<>();
/** A list of the VLV indexes to be verified. */
- private final ArrayList<VLVIndex> vlvIndexList = new ArrayList<VLVIndex>();
+ private final ArrayList<VLVIndex> vlvIndexList = new ArrayList<>();
/**
* Construct a VerifyJob.
@@ -220,7 +219,7 @@
}
}
- entryLimitMap = new IdentityHashMap<Index, HashMap<ByteString, Long>>(attrIndexList.size());
+ entryLimitMap = new IdentityHashMap<>(attrIndexList.size());
// We will be updating these files independently of the indexes
// so we need direct access to them rather than going through
@@ -794,7 +793,7 @@
HashMap<ByteString,Long> hashMap = entryLimitMap.get(index);
if (hashMap == null)
{
- hashMap = new HashMap<ByteString, Long>();
+ hashMap = new HashMap<>();
entryLimitMap.put(index, hashMap);
}
ByteString octetString = ByteString.wrap(key);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendMonitor.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendMonitor.java
index c2109e1..0fcf950 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendMonitor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendMonitor.java
@@ -136,7 +136,7 @@
@Override
public ArrayList<Attribute> getMonitorData()
{
- ArrayList<Attribute> monitorAttrs = new ArrayList<Attribute>();
+ ArrayList<Attribute> monitorAttrs = new ArrayList<>();
AttributeBuilder needReindex = new AttributeBuilder("need-reindex");
for(EntryContainer ec : rootContainer.getEntryContainers())
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/CursorTransformer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/CursorTransformer.java
index b4add9d..e047250 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/CursorTransformer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/CursorTransformer.java
@@ -80,7 +80,7 @@
Function<KI, KO, ? extends Exception> keyTransformer,
ValueTransformer<KI, VI, VO, ? extends Exception> valueTransformer)
{
- return new CursorTransformer<KI, VI, KO, VO>(input, keyTransformer, valueTransformer);
+ return new CursorTransformer<>(input, keyTransformer, valueTransformer);
}
@SuppressWarnings("unchecked")
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ExportJob.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ExportJob.java
index f3f81c4..aac2c4d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ExportJob.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/ExportJob.java
@@ -96,7 +96,7 @@
throws IOException, LDIFException, StorageRuntimeException
{
List<DN> includeBranches = exportConfig.getIncludeBranches();
- final ArrayList<EntryContainer> exportContainers = new ArrayList<EntryContainer>();
+ final ArrayList<EntryContainer> exportContainers = new ArrayList<>();
for (EntryContainer entryContainer : rootContainer.getEntryContainers())
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexFilter.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexFilter.java
index c67e4f0..b34f645 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexFilter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexFilter.java
@@ -186,10 +186,9 @@
// into a hash map, the faster components (equality, presence, approx)
// into one list and the remainder into another list.
- ArrayList<SearchFilter> fastComps = new ArrayList<SearchFilter>();
- ArrayList<SearchFilter> otherComps = new ArrayList<SearchFilter>();
- HashMap<AttributeType, ArrayList<SearchFilter>> rangeComps =
- new HashMap<AttributeType, ArrayList<SearchFilter>>();
+ ArrayList<SearchFilter> fastComps = new ArrayList<>();
+ ArrayList<SearchFilter> otherComps = new ArrayList<>();
+ HashMap<AttributeType, ArrayList<SearchFilter>> rangeComps = new HashMap<>();
for (SearchFilter filter : andFilter.getFilterComponents())
{
@@ -201,7 +200,7 @@
rangeList = rangeComps.get(filter.getAttributeType());
if (rangeList == null)
{
- rangeList = new ArrayList<SearchFilter>();
+ rangeList = new ArrayList<>();
rangeComps.put(filter.getAttributeType(), rangeList);
}
rangeList.add(filter);
@@ -229,7 +228,7 @@
}
// Next, process range component pairs like (cn>=A)(cn<=B).
- ArrayList<SearchFilter> remainComps = new ArrayList<SearchFilter>();
+ ArrayList<SearchFilter> remainComps = new ArrayList<>();
for (Map.Entry<AttributeType, ArrayList<SearchFilter>> rangeEntry : rangeComps.entrySet())
{
ArrayList<SearchFilter> rangeList = rangeEntry.getValue();
@@ -296,8 +295,7 @@
*/
private EntryIDSet evaluateLogicalOrFilter(SearchFilter orFilter)
{
- ArrayList<EntryIDSet> candidateSets = new ArrayList<EntryIDSet>(
- orFilter.getFilterComponents().size());
+ ArrayList<EntryIDSet> candidateSets = new ArrayList<>(orFilter.getFilterComponents().size());
for (SearchFilter filter : orFilter.getFilterComponents())
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexQueryFactoryImpl.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexQueryFactoryImpl.java
index 7b1ae32..4e29004 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexQueryFactoryImpl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/IndexQueryFactoryImpl.java
@@ -151,7 +151,7 @@
{
// Total number of IDs found so far.
int totalIDCount = 0;
- ArrayList<EntryIDSet> sets = new ArrayList<EntryIDSet>();
+ ArrayList<EntryIDSet> sets = new ArrayList<>();
Cursor<ByteString, EntryIDSet> cursor = index.openCursor(txn);
try
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeStorageImporter.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeStorageImporter.java
index 0893e5a..d4b7f06 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeStorageImporter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeStorageImporter.java
@@ -438,8 +438,8 @@
lastPos = bufferPos;
}
}
- Cursor<ByteString, ByteString> composite = new CompositeCursor<ByteString, ByteString>(cursors);
- return new ProgressCursor<ByteString, ByteString>(composite, this, cursors);
+ Cursor<ByteString, ByteString> composite = new CompositeCursor<>(cursors);
+ return new ProgressCursor<>(composite, this, cursors);
}
private void readBufferPositions() throws IOException
@@ -1660,8 +1660,7 @@
public Void run(ReadableTransaction txn) throws Exception
{
try (Cursor<ByteString, ByteString> cursor0 = txn.openCursor(treeName);
- SequentialCursor<ByteString, ByteString> cursor =
- new MergingCursor<ByteString, ByteString>(cursor0, getMerger(treeName)))
+ SequentialCursor<ByteString, ByteString> cursor = new MergingCursor<>(cursor0, getMerger(treeName)))
{
progressTask.addCursor(cursor0);
while (cursor.next())
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/PersistentCompressedSchema.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/PersistentCompressedSchema.java
index 719b4be..99fded9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/PersistentCompressedSchema.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/PersistentCompressedSchema.java
@@ -172,7 +172,7 @@
final byte[] encodedObjectClasses = ocCursor.getKey().toByteArray();
final ASN1Reader reader = ASN1.getReader(ocCursor.getValue());
reader.readStartSequence();
- final List<String> objectClassNames = new LinkedList<String>();
+ final List<String> objectClassNames = new LinkedList<>();
while (reader.hasNextElement())
{
objectClassNames.add(reader.readOctetStringAsString());
@@ -202,7 +202,7 @@
final ASN1Reader reader = ASN1.getReader(adCursor.getValue());
reader.readStartSequence();
final String attributeName = reader.readOctetStringAsString();
- final List<String> attributeOptions = new LinkedList<String>();
+ final List<String> attributeOptions = new LinkedList<>();
while (reader.hasNextElement())
{
attributeOptions.add(reader.readOctetStringAsString());
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/task/Task.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/task/Task.java
index e82a6bd..c6717fa 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/task/Task.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/task/Task.java
@@ -447,15 +447,13 @@
private LinkedList<String> getAttributeValues(String attributeName)
throws InitializationException
{
- LinkedList<String> valueStrings = new LinkedList<String>();
+ LinkedList<String> valueStrings = new LinkedList<>();
- List<Attribute> attrList =
- taskEntry.getAttribute(attributeName.toLowerCase());
- if ((attrList == null) || attrList.isEmpty())
+ List<Attribute> attrList = taskEntry.getAttribute(attributeName.toLowerCase());
+ if (attrList == null || attrList.isEmpty())
{
return valueStrings;
}
-
if (attrList.size() > 1)
{
throw new InitializationException(ERR_TASK_MULTIPLE_ATTRS_FOR_TYPE.get(attributeName, taskEntry.getName()));
@@ -607,9 +605,8 @@
try
{
this.taskState = taskState;
- Attribute attr = Attributes.create(ATTR_TASK_STATE,
- taskState.toString());
- ArrayList<Attribute> attrList = new ArrayList<Attribute>(1);
+ Attribute attr = Attributes.create(ATTR_TASK_STATE, taskState.toString());
+ ArrayList<Attribute> attrList = new ArrayList<>(1);
attrList.add(attr);
taskEntry.putAttribute(attr.getAttributeType(), attrList);
}
@@ -625,7 +622,7 @@
/**
* Sets a state for this task that is the result of a call to
- * {@link #interruptTask(TaskState, org.opends.messages.LocalizableMessage)}.
+ * {@link #interruptTask(TaskState, LocalizableMessage)}.
* It may take this task some time to actually cancel to that
* actual state may differ until quiescence.
*
@@ -639,8 +636,7 @@
/**
* Gets the interrupt state for this task that was set as a
- * result of a call to {@link #interruptTask(TaskState,
- * org.opends.messages.LocalizableMessage)}.
+ * result of a call to {@link #interruptTask(TaskState, LocalizableMessage)}.
*
* @return interrupt state for this task
*/
@@ -653,8 +649,8 @@
/**
* Returns a state for this task after processing has completed.
* If the task was interrupted with a call to
- * {@link #interruptTask(TaskState, org.opends.messages.LocalizableMessage)}
- * then that method's interruptState is returned here. Otherwse
+ * {@link #interruptTask(TaskState, LocalizableMessage)}
+ * then that method's interruptState is returned here. Otherwise
* this method returns TaskState.COMPLETED_SUCCESSFULLY. It is
* assumed that if there were errors during task processing that
* task state will have been derived in some other way.
@@ -698,7 +694,7 @@
{
Entry taskEntry = getTaskEntry();
- ArrayList<Modification> modifications = new ArrayList<Modification>();
+ ArrayList<Modification> modifications = new ArrayList<>();
modifications.add(new Modification(ModificationType.REPLACE,
Attributes.create(name, value)));
@@ -768,7 +764,7 @@
String startTimeStr = StaticUtils.formatDateTimeString(d);
Attribute attr = Attributes.create(ATTR_TASK_ACTUAL_START_TIME,
startTimeStr);
- ArrayList<Attribute> attrList = new ArrayList<Attribute>(1);
+ ArrayList<Attribute> attrList = new ArrayList<>(1);
attrList.add(attr);
taskEntry.putAttribute(attr.getAttributeType(), attrList);
}
@@ -824,7 +820,7 @@
Date d = new Date(completionTime);
Attribute attr = Attributes.create(ATTR_TASK_COMPLETION_TIME,
dateFormat.format(d));
- ArrayList<Attribute> attrList = new ArrayList<Attribute>(1);
+ ArrayList<Attribute> attrList = new ArrayList<>(1);
attrList.add(attr);
taskEntry.putAttribute(attr.getAttributeType(), attrList);
}
@@ -906,7 +902,7 @@
*/
public final List<LocalizableMessage> getLogMessages()
{
- List<LocalizableMessage> msgList = new ArrayList<LocalizableMessage>();
+ List<LocalizableMessage> msgList = new ArrayList<>();
for(String logString : logMessages) {
// TODO: a better job or recreating the message
msgList.add(LocalizableMessage.raw(logString));
@@ -997,7 +993,7 @@
ByteString value = ByteString.valueOf(messageString);
if (attrList == null)
{
- attrList = new ArrayList<Attribute>();
+ attrList = new ArrayList<>();
attrList.add(Attributes.create(type, value));
taskEntry.putAttribute(type, attrList);
}
@@ -1170,7 +1166,7 @@
{
if (DirectoryServer.mailServerConfigured())
{
- LinkedHashSet<String> recipients = new LinkedHashSet<String>(notifyOnCompletion);
+ LinkedHashSet<String> recipients = new LinkedHashSet<>(notifyOnCompletion);
if (! TaskState.isSuccessful(taskState))
{
recipients.addAll(notifyOnError);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskScheduler.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskScheduler.java
index 41660e0..bd334d6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskScheduler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskScheduler.java
@@ -79,39 +79,33 @@
private static long MAX_SLEEP_TIME = 5000;
-
/** Indicates whether the scheduler is currently running. */
private boolean isRunning;
-
/** Indicates whether a request has been received to stop the scheduler. */
private boolean stopRequested;
/** The entry that serves as the immediate parent for recurring tasks. */
private Entry recurringTaskParentEntry;
-
/** The entry that serves as the immediate parent for scheduled tasks. */
private Entry scheduledTaskParentEntry;
-
/** The top-level entry at the root of the task tree. */
private Entry taskRootEntry;
/** The set of recurring tasks defined in the server. */
- private HashMap<String,RecurringTask> recurringTasks;
-
+ private final HashMap<String,RecurringTask> recurringTasks = new HashMap<>();
/** The set of tasks associated with this scheduler. */
- private HashMap<String,Task> tasks;
-
+ private final HashMap<String,Task> tasks = new HashMap<>();
/** The set of worker threads that are actively busy processing tasks. */
- private HashMap<String,TaskThread> activeThreads;
+ private final HashMap<String,TaskThread> activeThreads = new HashMap<>();
/** The thread ID for the next task thread to be created;. */
- private int nextThreadID;
+ private int nextThreadID = 1;
/** The set of worker threads that may be used to process tasks. */
- private LinkedList<TaskThread> idleThreads;
+ private final LinkedList<TaskThread> idleThreads = new LinkedList<>();
/** The lock used to provide threadsafe access to the scheduler. */
- private final ReentrantLock schedulerLock;
+ private final ReentrantLock schedulerLock = new ReentrantLock();
/** The task backend with which this scheduler is associated. */
private TaskBackend taskBackend;
@@ -120,13 +114,11 @@
private Thread schedulerThread;
/** The set of recently-completed tasks that need to be retained. */
- private TreeSet<Task> completedTasks;
-
+ private final TreeSet<Task> completedTasks = new TreeSet<>();
/** The set of tasks that have been scheduled but not yet arrived. */
- private TreeSet<Task> pendingTasks;
-
+ private final TreeSet<Task> pendingTasks = new TreeSet<>();
/** The set of tasks that are currently running. */
- private TreeSet<Task> runningTasks;
+ private final TreeSet<Task> runningTasks = new TreeSet<>();
private ServerContext serverContext;
@@ -147,25 +139,8 @@
super("Task Scheduler Thread");
this.serverContext = serverContext;
-
this.taskBackend = taskBackend;
- schedulerLock = new ReentrantLock();
- isRunning = false;
- stopRequested = false;
- schedulerThread = null;
- nextThreadID = 1;
- recurringTasks = new HashMap<String,RecurringTask>();
- tasks = new HashMap<String,Task>();
- activeThreads = new HashMap<String,TaskThread>();
- idleThreads = new LinkedList<TaskThread>();
- completedTasks = new TreeSet<Task>();
- pendingTasks = new TreeSet<Task>();
- runningTasks = new TreeSet<Task>();
- taskRootEntry = null;
- recurringTaskParentEntry = null;
- scheduledTaskParentEntry = null;
-
DirectoryServer.registerAlertGenerator(this);
initializeTasksFromBackingFile();
@@ -223,9 +198,8 @@
throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS, message);
}
- Attribute attr = Attributes.create(ATTR_TASK_STATE,
- TaskState.RECURRING.toString());
- ArrayList<Attribute> attrList = new ArrayList<Attribute>(1);
+ Attribute attr = Attributes.create(ATTR_TASK_STATE, TaskState.RECURRING.toString());
+ ArrayList<Attribute> attrList = new ArrayList<>(1);
attrList.add(attr);
Entry recurringTaskEntry = recurringTask.getRecurringTaskEntry();
recurringTaskEntry.putAttribute(attr.getAttributeType(), attrList);
@@ -278,7 +252,7 @@
try
{
RecurringTask recurringTask = recurringTasks.remove(recurringTaskID);
- HashMap<String,Task> iterationsMap = new HashMap<String,Task>();
+ HashMap<String,Task> iterationsMap = new HashMap<>();
for (Task t : tasks.values())
{
@@ -753,10 +727,9 @@
{
// Grab a copy of the running threads so that we can operate on them without
// holding the lock.
- LinkedList<TaskThread> threadList = new LinkedList<TaskThread>();
+ LinkedList<TaskThread> threadList = new LinkedList<>();
schedulerLock.lock();
-
try
{
threadList.addAll(activeThreads.values());
@@ -2000,7 +1973,7 @@
@Override
public LinkedHashMap<String,String> getAlerts()
{
- LinkedHashMap<String,String> alerts = new LinkedHashMap<String,String>();
+ LinkedHashMap<String, String> alerts = new LinkedHashMap<>();
alerts.put(ALERT_TYPE_CANNOT_SCHEDULE_RECURRING_ITERATION,
ALERT_DESCRIPTION_CANNOT_SCHEDULE_RECURRING_ITERATION);
@@ -2014,4 +1987,3 @@
return alerts;
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/config/BooleanConfigAttribute.java b/opendj-server-legacy/src/main/java/org/opends/server/config/BooleanConfigAttribute.java
index 96478fd..641f414 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/config/BooleanConfigAttribute.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/config/BooleanConfigAttribute.java
@@ -233,7 +233,7 @@
*/
private static LinkedHashSet<ByteString> getValueSet(boolean booleanValue)
{
- LinkedHashSet<ByteString> valueSet = new LinkedHashSet<ByteString>(1);
+ LinkedHashSet<ByteString> valueSet = new LinkedHashSet<>(1);
valueSet.add(ByteString.valueOf(
booleanValue ? CONFIG_VALUE_TRUE : CONFIG_VALUE_FALSE));
return valueSet;
@@ -357,41 +357,35 @@
*/
public List<String> activeValuesToStrings()
{
- ArrayList<String> valueStrings = new ArrayList<String>(1);
- valueStrings.add(String.valueOf(activeValue));
-
- return valueStrings;
+ return asList(String.valueOf(activeValue));
}
-
-
/**
* Converts the set of pending values for this configuration attribute into a
* set of strings that may be stored in the configuration or represented over
* protocol. The string representation used by this method should be
- * compatible with the decoding used by the <CODE>stringsToValues</CODE>
+ * compatible with the decoding used by the {@link #stringsToValues(List, boolean)}
* method.
*
* @return The string representations of the set of pending values for this
- * configuration attribute, or <CODE>null</CODE> if there are no
+ * configuration attribute, or {@code null} if there are no
* pending values.
*/
public List<String> pendingValuesToStrings()
{
if (hasPendingValues())
{
- ArrayList<String> valueStrings = new ArrayList<String>(1);
- valueStrings.add(String.valueOf(pendingValue));
-
- return valueStrings;
+ return asList(String.valueOf(pendingValue));
}
- else
- {
- return null;
- }
+ return null;
}
-
+ private List<String> asList(String s)
+ {
+ ArrayList<String> result = new ArrayList<>(1);
+ result.add(s);
+ return result;
+ }
/**
* Retrieves a new configuration attribute of this type that will contain the
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/config/ConfigAttribute.java b/opendj-server-legacy/src/main/java/org/opends/server/config/ConfigAttribute.java
index 1891782..a2d586d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/config/ConfigAttribute.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/config/ConfigAttribute.java
@@ -118,7 +118,7 @@
this.requiresAdminAction = requiresAdminAction;
hasPendingValues = false;
- activeValues = new LinkedHashSet<ByteString>();
+ activeValues = new LinkedHashSet<>();
pendingValues = activeValues;
}
@@ -152,15 +152,7 @@
this.requiresAdminAction = requiresAdminAction;
this.hasPendingValues = false;
- if (activeValues == null)
- {
- this.activeValues = new LinkedHashSet<ByteString>();
- }
- else
- {
- this.activeValues = activeValues;
- }
-
+ this.activeValues = notNull(activeValues);
this.pendingValues = this.activeValues;
}
@@ -204,29 +196,15 @@
this.requiresAdminAction = requiresAdminAction;
this.hasPendingValues = hasPendingValues;
- if (activeValues == null)
- {
- this.activeValues = new LinkedHashSet<ByteString>();
- }
- else
- {
- this.activeValues = activeValues;
- }
+ this.activeValues = notNull(activeValues);
- if (! hasPendingValues)
+ if (!hasPendingValues)
{
this.pendingValues = this.activeValues;
}
else
{
- if (pendingValues == null)
- {
- this.pendingValues = new LinkedHashSet<ByteString>();
- }
- else
- {
- this.pendingValues = pendingValues;
- }
+ this.pendingValues = notNull(pendingValues);
}
}
@@ -418,27 +396,13 @@
{
if (requiresAdminAction)
{
- if (values == null)
- {
- pendingValues = new LinkedHashSet<ByteString>();
- }
- else
- {
- pendingValues = values;
- }
+ pendingValues = notNull(values);
hasPendingValues = true;
}
else
{
- if (values == null)
- {
- activeValues = new LinkedHashSet<ByteString>();
- }
- else
- {
- activeValues = values;
- }
+ activeValues = notNull(values);
pendingValues = activeValues;
hasPendingValues = false;
@@ -498,7 +462,10 @@
}
}
-
+ private LinkedHashSet<ByteString> notNull(LinkedHashSet<ByteString> values)
+ {
+ return values != null ? values : new LinkedHashSet<ByteString>();
+ }
/**
* Specifies the set of active values for this configuration attribute. No
@@ -572,7 +539,7 @@
// Create a temporary set of values that we will use for this change. It
// may not actually be applied if an error occurs for some reason.
final LinkedHashSet<ByteString> vals = getValues();
- LinkedHashSet<ByteString> tempValues = new LinkedHashSet<ByteString>(vals.size() + numValues);
+ LinkedHashSet<ByteString> tempValues = new LinkedHashSet<>(vals.size() + numValues);
// Iterate through all of the provided values. Make sure that each is
// acceptable for use and that it is not already contained in the value set.
@@ -629,7 +596,7 @@
{
// Create a temporary set of values that we will use for this change. It
// may not actually be applied if an error occurs for some reason.
- LinkedHashSet<ByteString> tempValues = new LinkedHashSet<ByteString>(getValues());
+ LinkedHashSet<ByteString> tempValues = new LinkedHashSet<>(getValues());
// Iterate through all the provided values and make sure that they are
// contained in the list. If not, then throw an exception. If so, then
@@ -689,7 +656,7 @@
{
if (pendingValues == null)
{
- pendingValues = new LinkedHashSet<ByteString>();
+ pendingValues = new LinkedHashSet<>();
}
else
{
@@ -722,7 +689,7 @@
{
if (values == null)
{
- values = new LinkedHashSet<ByteString>();
+ values = new LinkedHashSet<>();
}
activeValues = values;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/config/ConfigEntry.java b/opendj-server-legacy/src/main/java/org/opends/server/config/ConfigEntry.java
index 977fd6b..5c2aaed 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/config/ConfigEntry.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/config/ConfigEntry.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.config;
@@ -96,10 +96,10 @@
this.entry = entry;
this.parent = parent;
- children = new ConcurrentHashMap<DN,ConfigEntry>();
- addListeners = new CopyOnWriteArrayList<ConfigAddListener>();
- changeListeners = new CopyOnWriteArrayList<ConfigChangeListener>();
- deleteListeners = new CopyOnWriteArrayList<ConfigDeleteListener>();
+ children = new ConcurrentHashMap<>();
+ addListeners = new CopyOnWriteArrayList<>();
+ changeListeners = new CopyOnWriteArrayList<>();
+ deleteListeners = new CopyOnWriteArrayList<>();
entryLock = new Object();
}
@@ -227,7 +227,7 @@
DirectoryServer.getDefaultAttributeType(name, attribute.getSyntax());
}
- List<Attribute> attrs = new ArrayList<Attribute>(2);
+ List<Attribute> attrs = new ArrayList<>(2);
AttributeBuilder builder = new AttributeBuilder(attrType, name);
builder.addAll(attribute.getActiveValues());
attrs.add(builder.toAttribute());
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/config/DNConfigAttribute.java b/opendj-server-legacy/src/main/java/org/opends/server/config/DNConfigAttribute.java
index d45f7b6..767b4f9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/config/DNConfigAttribute.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/config/DNConfigAttribute.java
@@ -89,7 +89,7 @@
super(name, description, isRequired, isMultiValued, requiresAdminAction);
- activeValues = new ArrayList<DN>();
+ activeValues = new ArrayList<>();
pendingValues = activeValues;
}
@@ -121,11 +121,11 @@
if (value == null)
{
- activeValues = new ArrayList<DN>();
+ activeValues = new ArrayList<>();
}
else
{
- activeValues = new ArrayList<DN>(1);
+ activeValues = new ArrayList<>(1);
activeValues.add(value);
}
@@ -194,7 +194,7 @@
if (activeValues == null)
{
- this.activeValues = new ArrayList<DN>();
+ this.activeValues = new ArrayList<>();
}
else
{
@@ -354,7 +354,7 @@
if (requiresAdminAction())
{
- pendingValues = new ArrayList<DN>(1);
+ pendingValues = new ArrayList<>(1);
pendingValues.add(value);
setPendingValues(getValueSet(value));
}
@@ -393,7 +393,7 @@
if (requiresAdminAction())
{
setPendingValues(new LinkedHashSet<ByteString>(0));
- pendingValues = new ArrayList<DN>();
+ pendingValues = new ArrayList<>();
}
else
{
@@ -416,7 +416,7 @@
// Iterate through all the provided values, make sure that they are
// acceptable, and build the value set.
- LinkedHashSet<ByteString> valueSet = new LinkedHashSet<ByteString>(numValues);
+ LinkedHashSet<ByteString> valueSet = new LinkedHashSet<>(numValues);
for (DN value : values)
{
if (value == null)
@@ -465,11 +465,11 @@
LinkedHashSet<ByteString> valueSet;
if (value == null)
{
- valueSet = new LinkedHashSet<ByteString>(0);
+ valueSet = new LinkedHashSet<>(0);
}
else
{
- valueSet = new LinkedHashSet<ByteString>(1);
+ valueSet = new LinkedHashSet<>(1);
valueSet.add(ByteString.valueOf(value.toString()));
}
return valueSet;
@@ -491,7 +491,7 @@
return null;
}
- LinkedHashSet<ByteString> valueSet = new LinkedHashSet<ByteString>(values.size());
+ LinkedHashSet<ByteString> valueSet = new LinkedHashSet<>(values.size());
for (DN value : values)
{
valueSet.add(ByteString.valueOf(value.toString()));
@@ -591,7 +591,7 @@
}
else
{
- return new LinkedHashSet<ByteString>();
+ return new LinkedHashSet<>();
}
}
@@ -605,7 +605,7 @@
}
- LinkedHashSet<ByteString> valueSet = new LinkedHashSet<ByteString>(numValues);
+ LinkedHashSet<ByteString> valueSet = new LinkedHashSet<>(numValues);
for (String valueString : valueStrings)
{
if (valueString == null)
@@ -676,7 +676,7 @@
*/
public List<String> activeValuesToStrings()
{
- ArrayList<String> valueStrings = new ArrayList<String>(activeValues.size());
+ ArrayList<String> valueStrings = new ArrayList<>(activeValues.size());
for (DN dn : activeValues)
{
valueStrings.add(dn.toString());
@@ -702,13 +702,11 @@
{
if (hasPendingValues())
{
- ArrayList<String> valueStrings =
- new ArrayList<String>(pendingValues.size());
+ ArrayList<String> valueStrings = new ArrayList<>(pendingValues.size());
for (DN dn : pendingValues)
{
valueStrings.add(dn.toString());
}
-
return valueStrings;
}
else
@@ -773,7 +771,7 @@
else
{
// This is fine. The pending value set can be empty.
- pendingValues = new ArrayList<DN>(0);
+ pendingValues = new ArrayList<>(0);
}
}
else
@@ -787,7 +785,7 @@
throw new ConfigException(message);
}
- pendingValues = new ArrayList<DN>(numValues);
+ pendingValues = new ArrayList<>(numValues);
for (ByteString v : a)
{
DN dn;
@@ -838,7 +836,7 @@
else
{
// This is fine. The active value set can be empty.
- activeValues = new ArrayList<DN>(0);
+ activeValues = new ArrayList<>(0);
}
}
else
@@ -852,7 +850,7 @@
throw new ConfigException(message);
}
- activeValues = new ArrayList<DN>(numValues);
+ activeValues = new ArrayList<>(numValues);
for (ByteString v : a)
{
DN dn;
@@ -1167,7 +1165,7 @@
if (componentType.equals(DN.class.getName()))
{
- ArrayList<DN> dnList = new ArrayList<DN>(length);
+ ArrayList<DN> dnList = new ArrayList<>(length);
for (int i=0; i < length; i++)
{
dnList.add((DN) Array.get(value, i));
@@ -1179,7 +1177,7 @@
{
try
{
- ArrayList<DN> values = new ArrayList<DN>(length);
+ ArrayList<DN> values = new ArrayList<>(length);
for (int i=0; i < length; i++)
{
String valueStr = (String) Array.get(value, i);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/config/IntegerConfigAttribute.java b/opendj-server-legacy/src/main/java/org/opends/server/config/IntegerConfigAttribute.java
index 22036e2..d36be29 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/config/IntegerConfigAttribute.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/config/IntegerConfigAttribute.java
@@ -119,7 +119,7 @@
this.hasUpperBound = hasUpperBound;
this.upperBound = upperBound;
- activeValues = new ArrayList<Long>();
+ activeValues = new ArrayList<>();
pendingValues = activeValues;
}
@@ -166,7 +166,7 @@
this.hasUpperBound = hasUpperBound;
this.upperBound = upperBound;
- activeValues = new ArrayList<Long>(1);
+ activeValues = new ArrayList<>(1);
activeValues.add(value);
pendingValues = activeValues;
@@ -268,7 +268,7 @@
if (activeValues == null)
{
- this.activeValues = new ArrayList<Long>();
+ this.activeValues = new ArrayList<>();
}
else
{
@@ -582,7 +582,7 @@
if (requiresAdminAction())
{
- pendingValues = new ArrayList<Long>(1);
+ pendingValues = new ArrayList<>(1);
pendingValues.add(value);
setPendingValues(getValueSet(value));
}
@@ -621,7 +621,7 @@
if (requiresAdminAction())
{
setPendingValues(new LinkedHashSet<ByteString>(0));
- pendingValues = new ArrayList<Long>();
+ pendingValues = new ArrayList<>();
}
else
{
@@ -644,7 +644,7 @@
// Iterate through all the provided values, make sure that they are
// acceptable, and build the value set.
- LinkedHashSet<ByteString> valueSet = new LinkedHashSet<ByteString>(numValues);
+ LinkedHashSet<ByteString> valueSet = new LinkedHashSet<>(numValues);
for (long value : values)
{
if (hasLowerBound && (value < lowerBound))
@@ -699,7 +699,7 @@
*/
private static LinkedHashSet<ByteString> getValueSet(long value)
{
- LinkedHashSet<ByteString> valueSet = new LinkedHashSet<ByteString>(1);
+ LinkedHashSet<ByteString> valueSet = new LinkedHashSet<>(1);
valueSet.add(ByteString.valueOf(String.valueOf(value)));
return valueSet;
}
@@ -720,7 +720,7 @@
return null;
}
- LinkedHashSet<ByteString> valueSet = new LinkedHashSet<ByteString>(values.size());
+ LinkedHashSet<ByteString> valueSet = new LinkedHashSet<>(values.size());
for (long value : values)
{
valueSet.add(ByteString.valueOf(String.valueOf(value)));
@@ -833,7 +833,7 @@
}
else
{
- return new LinkedHashSet<ByteString>();
+ return new LinkedHashSet<>();
}
}
@@ -847,7 +847,7 @@
}
- LinkedHashSet<ByteString> valueSet = new LinkedHashSet<ByteString>(numValues);
+ LinkedHashSet<ByteString> valueSet = new LinkedHashSet<>(numValues);
for (String valueString : valueStrings)
{
long longValue;
@@ -936,14 +936,7 @@
*/
public List<String> activeValuesToStrings()
{
- ArrayList<String> valueStrings =
- new ArrayList<String>(activeValues.size());
- for (long l : activeValues)
- {
- valueStrings.add(String.valueOf(l));
- }
-
- return valueStrings;
+ return toListOfString(activeValues);
}
@@ -963,14 +956,7 @@
{
if (hasPendingValues())
{
- ArrayList<String> valueStrings =
- new ArrayList<String>(pendingValues.size());
- for (long l : pendingValues)
- {
- valueStrings.add(String.valueOf(l));
- }
-
- return valueStrings;
+ return toListOfString(pendingValues);
}
else
{
@@ -981,6 +967,22 @@
/**
+ * @param pendingValues2
+ * @return
+ */
+ private List<String> toListOfString(List<Long> pendingValues2)
+ {
+ ArrayList<String> valueStrings = new ArrayList<>(pendingValues2.size());
+ for (long l : pendingValues2)
+ {
+ valueStrings.add(String.valueOf(l));
+ }
+ return valueStrings;
+ }
+
+
+
+ /**
* Retrieves a new configuration attribute of this type that will contain the
* values from the provided attribute.
*
@@ -1034,7 +1036,7 @@
else
{
// This is fine. The pending value set can be empty.
- pendingValues = new ArrayList<Long>(0);
+ pendingValues = new ArrayList<>(0);
}
}
else
@@ -1048,7 +1050,7 @@
throw new ConfigException(message);
}
- pendingValues = new ArrayList<Long>(numValues);
+ pendingValues = new ArrayList<>(numValues);
for (ByteString v : a)
{
long longValue;
@@ -1116,7 +1118,7 @@
else
{
// This is fine. The active value set can be empty.
- activeValues = new ArrayList<Long>(0);
+ activeValues = new ArrayList<>(0);
}
}
else
@@ -1130,7 +1132,7 @@
throw new ConfigException(message);
}
- activeValues = new ArrayList<Long>(numValues);
+ activeValues = new ArrayList<>(numValues);
for (ByteString v : a)
{
long longValue;
@@ -1459,7 +1461,7 @@
{
if (componentType.equals(Long.class.getName()))
{
- ArrayList<Long> values = new ArrayList<Long>();
+ ArrayList<Long> values = new ArrayList<>();
for (int i=0; i < length; i++)
{
@@ -1470,7 +1472,7 @@
}
else if (componentType.equals(Integer.class.getName()))
{
- ArrayList<Long> values = new ArrayList<Long>();
+ ArrayList<Long> values = new ArrayList<>();
for (int i=0; i < length; i++)
{
@@ -1481,7 +1483,7 @@
}
else if (componentType.equals(String.class.getName()))
{
- ArrayList<Long> values = new ArrayList<Long>();
+ ArrayList<Long> values = new ArrayList<>();
for (int i=0; i < length; i++)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/config/IntegerWithUnitConfigAttribute.java b/opendj-server-legacy/src/main/java/org/opends/server/config/IntegerWithUnitConfigAttribute.java
index e293e32..cd2f0ee 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/config/IntegerWithUnitConfigAttribute.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/config/IntegerWithUnitConfigAttribute.java
@@ -598,7 +598,7 @@
return null;
}
- LinkedHashSet<ByteString> valueSet = new LinkedHashSet<ByteString>(1);
+ LinkedHashSet<ByteString> valueSet = new LinkedHashSet<>(1);
valueSet.add(ByteString.valueOf(intValue + " " + unit));
return valueSet;
}
@@ -760,7 +760,7 @@
}
else
{
- return new LinkedHashSet<ByteString>();
+ return new LinkedHashSet<>();
}
}
@@ -774,7 +774,7 @@
}
- LinkedHashSet<ByteString> valueSet = new LinkedHashSet<ByteString>(numValues);
+ LinkedHashSet<ByteString> valueSet = new LinkedHashSet<>(numValues);
for (String valueString : valueStrings)
{
if ((valueString == null) || (valueString.length() == 0))
@@ -839,7 +839,7 @@
*/
public List<String> activeValuesToStrings()
{
- ArrayList<String> valueStrings = new ArrayList<String>(1);
+ ArrayList<String> valueStrings = new ArrayList<>(1);
valueStrings.add(activeIntValue + " " + activeUnit);
return valueStrings;
@@ -862,9 +862,8 @@
{
if (hasPendingValues())
{
- ArrayList<String> valueStrings = new ArrayList<String>(1);
+ ArrayList<String> valueStrings = new ArrayList<>(1);
valueStrings.add(pendingIntValue + " " + pendingUnit);
-
return valueStrings;
}
else
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/config/JMXMBean.java b/opendj-server-legacy/src/main/java/org/opends/server/config/JMXMBean.java
index 71b8a4f..eba058b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/config/JMXMBean.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/config/JMXMBean.java
@@ -179,11 +179,9 @@
{
this.configEntryDN = configEntryDN;
- alertGenerators = new CopyOnWriteArrayList<AlertGenerator>();
- invokableComponents = new CopyOnWriteArrayList<InvokableComponent>();
- monitorProviders =
- new CopyOnWriteArrayList<MonitorProvider<
- ? extends MonitorProviderCfg>>();
+ alertGenerators = new CopyOnWriteArrayList<>();
+ invokableComponents = new CopyOnWriteArrayList<>();
+ monitorProviders = new CopyOnWriteArrayList<>();
MBeanServer mBeanServer = DirectoryServer.getJMXMBeanServer();
if (mBeanServer != null)
@@ -423,7 +421,7 @@
if (iterator.hasNext())
{
- List<String> stringValues = new ArrayList<String>();
+ List<String> stringValues = new ArrayList<>();
stringValues.add(value.toString());
while (iterator.hasNext())
@@ -615,7 +613,7 @@
if (iterator.hasNext())
{
- List<String> stringValues = new ArrayList<String>();
+ List<String> stringValues = new ArrayList<>();
stringValues.add(value.toString());
while (iterator.hasNext())
@@ -749,9 +747,8 @@
return new MBeanInfo(CLASS_NAME, null, null, null, null, null);
}
- List<MBeanAttributeInfo> attrs = new ArrayList<MBeanAttributeInfo>();
- for (MonitorProvider<? extends MonitorProviderCfg> monitor :
- monitorProviders)
+ List<MBeanAttributeInfo> attrs = new ArrayList<>();
+ for (MonitorProvider<? extends MonitorProviderCfg> monitor : monitorProviders)
{
for (org.opends.server.types.Attribute a : monitor.getMonitorData())
{
@@ -760,12 +757,9 @@
}
}
- MBeanAttributeInfo[] mBeanAttributes = new MBeanAttributeInfo[attrs.size()];
- attrs.toArray(mBeanAttributes);
+ MBeanAttributeInfo[] mBeanAttributes = attrs.toArray(new MBeanAttributeInfo[attrs.size()]);
-
- List<MBeanNotificationInfo> notifications =
- new ArrayList<MBeanNotificationInfo>();
+ List<MBeanNotificationInfo> notifications = new ArrayList<>();
for (AlertGenerator generator : alertGenerators)
{
String className = generator.getClassName();
@@ -775,18 +769,16 @@
{
String[] types = { type };
String description = alerts.get(type);
- notifications.add(new MBeanNotificationInfo(types, className,
- description));
+ notifications.add(new MBeanNotificationInfo(types, className, description));
}
}
- MBeanNotificationInfo[] mBeanNotifications =
- new MBeanNotificationInfo[notifications.size()];
+ MBeanNotificationInfo[] mBeanNotifications = new MBeanNotificationInfo[notifications.size()];
notifications.toArray(mBeanNotifications);
- List<MBeanOperationInfo> ops = new ArrayList<MBeanOperationInfo>();
+ List<MBeanOperationInfo> ops = new ArrayList<>();
for (InvokableComponent component : invokableComponents)
{
for (InvokableMethod method : component.getOperationSignatures())
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/config/MultiChoiceConfigAttribute.java b/opendj-server-legacy/src/main/java/org/opends/server/config/MultiChoiceConfigAttribute.java
index f5ba3ee..755ca49 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/config/MultiChoiceConfigAttribute.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/config/MultiChoiceConfigAttribute.java
@@ -101,7 +101,7 @@
this.allowedValues = allowedValues;
- activeValues = new ArrayList<String>();
+ activeValues = new ArrayList<>();
pendingValues = activeValues;
}
@@ -141,11 +141,11 @@
if (value == null)
{
- activeValues = new ArrayList<String>();
+ activeValues = new ArrayList<>();
}
else
{
- activeValues = new ArrayList<String>(1);
+ activeValues = new ArrayList<>(1);
activeValues.add(value);
}
@@ -232,7 +232,7 @@
if (activeValues == null)
{
- this.activeValues = new ArrayList<String>();
+ this.activeValues = new ArrayList<>();
}
else
{
@@ -412,7 +412,7 @@
if (requiresAdminAction())
{
- pendingValues = new ArrayList<String>(1);
+ pendingValues = new ArrayList<>(1);
pendingValues.add(value);
setPendingValues(getValueSet(value));
}
@@ -451,7 +451,7 @@
if (requiresAdminAction())
{
setPendingValues(new LinkedHashSet<ByteString>(0));
- pendingValues = new ArrayList<String>();
+ pendingValues = new ArrayList<>();
}
else
{
@@ -474,7 +474,7 @@
// Iterate through all the provided values, make sure that they are
// acceptable, and build the value set.
- LinkedHashSet<ByteString> valueSet = new LinkedHashSet<ByteString>(numValues);
+ LinkedHashSet<ByteString> valueSet = new LinkedHashSet<>(numValues);
for (String value : values)
{
if ((value == null) || (value.length() == 0))
@@ -528,7 +528,7 @@
*/
private static LinkedHashSet<ByteString> getValueSet(String value)
{
- LinkedHashSet<ByteString> valueSet = new LinkedHashSet<ByteString>(1);
+ LinkedHashSet<ByteString> valueSet = new LinkedHashSet<>(1);
valueSet.add(ByteString.valueOf(value));
return valueSet;
}
@@ -549,7 +549,7 @@
return null;
}
- LinkedHashSet<ByteString> valueSet = new LinkedHashSet<ByteString>(values.size());
+ LinkedHashSet<ByteString> valueSet = new LinkedHashSet<>(values.size());
for (String value : values)
{
valueSet.add(ByteString.valueOf(value));
@@ -645,7 +645,7 @@
LocalizableMessage message = ERR_CONFIG_ATTR_IS_REQUIRED.get(getName());
throw new ConfigException(message);
}
- return new LinkedHashSet<ByteString>();
+ return new LinkedHashSet<>();
}
@@ -658,7 +658,7 @@
}
- LinkedHashSet<ByteString> valueSet = new LinkedHashSet<ByteString>(numValues);
+ LinkedHashSet<ByteString> valueSet = new LinkedHashSet<>(numValues);
for (String valueString : valueStrings)
{
if ((valueString == null) || (valueString.length() == 0))
@@ -799,7 +799,7 @@
throw new ConfigException(ERR_CONFIG_ATTR_IS_REQUIRED.get(a.getName()));
}
// This is fine. The pending value set can be empty.
- pendingValues = new ArrayList<String>(0);
+ pendingValues = new ArrayList<>(0);
}
else
{
@@ -812,7 +812,7 @@
throw new ConfigException(message);
}
- pendingValues = new ArrayList<String>(numValues);
+ pendingValues = new ArrayList<>(numValues);
for (ByteString v : a)
{
String lowerValue = v.toString().toLowerCase();
@@ -857,7 +857,7 @@
throw new ConfigException(message);
}
// This is fine. The active value set can be empty.
- activeValues = new ArrayList<String>(0);
+ activeValues = new ArrayList<>(0);
}
else
{
@@ -870,7 +870,7 @@
throw new ConfigException(message);
}
- activeValues = new ArrayList<String>(numValues);
+ activeValues = new ArrayList<>(numValues);
for (ByteString v : a)
{
String lowerValue = v.toString().toLowerCase();
@@ -1148,7 +1148,7 @@
{
try
{
- ArrayList<String> values = new ArrayList<String>(length);
+ ArrayList<String> values = new ArrayList<>(length);
for (int i=0; i < length; i++)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/config/ReadOnlyConfigAttribute.java b/opendj-server-legacy/src/main/java/org/opends/server/config/ReadOnlyConfigAttribute.java
index 751bd09..f183bdd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/config/ReadOnlyConfigAttribute.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/config/ReadOnlyConfigAttribute.java
@@ -75,7 +75,7 @@
super(name, description, false, isMultiValued, false);
- values = new ArrayList<String>();
+ values = new ArrayList<>();
}
@@ -95,11 +95,11 @@
if (value == null)
{
- values = new ArrayList<String>(0);
+ values = new ArrayList<>(0);
}
else
{
- values = new ArrayList<String>(1);
+ values = new ArrayList<>(1);
values.add(value);
}
}
@@ -122,7 +122,7 @@
if (values == null)
{
- this.values = new ArrayList<String>();
+ this.values = new ArrayList<>();
}
else
{
@@ -275,7 +275,7 @@
*/
private static LinkedHashSet<ByteString> getValueSet(String value)
{
- LinkedHashSet<ByteString> valueSet = new LinkedHashSet<ByteString>(1);
+ LinkedHashSet<ByteString> valueSet = new LinkedHashSet<>(1);
valueSet.add(ByteString.valueOf(value));
return valueSet;
}
@@ -356,14 +356,14 @@
{
if ((valueStrings == null) || valueStrings.isEmpty())
{
- return new LinkedHashSet<ByteString>();
+ return new LinkedHashSet<>();
}
return toByteStrings(valueStrings);
}
private static LinkedHashSet<ByteString> toByteStrings(List<String> strings)
{
- LinkedHashSet<ByteString> valueSet = new LinkedHashSet<ByteString>(strings.size());
+ LinkedHashSet<ByteString> valueSet = new LinkedHashSet<>(strings.size());
for (String valueString : strings)
{
valueSet.add(ByteString.valueOf(valueString));
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/config/StringConfigAttribute.java b/opendj-server-legacy/src/main/java/org/opends/server/config/StringConfigAttribute.java
index b3b7b0f..fcf7b66 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/config/StringConfigAttribute.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/config/StringConfigAttribute.java
@@ -90,7 +90,7 @@
super(name, description, isRequired, isMultiValued, requiresAdminAction);
- activeValues = new ArrayList<String>();
+ activeValues = new ArrayList<>();
pendingValues = activeValues;
}
@@ -123,11 +123,11 @@
if (value == null)
{
- activeValues = new ArrayList<String>();
+ activeValues = new ArrayList<>();
}
else
{
- activeValues = new ArrayList<String>(1);
+ activeValues = new ArrayList<>(1);
activeValues.add(value);
}
@@ -199,7 +199,7 @@
if (activeValues == null)
{
- this.activeValues = new ArrayList<String>();
+ this.activeValues = new ArrayList<>();
}
else
{
@@ -357,7 +357,7 @@
if (requiresAdminAction())
{
- pendingValues = new ArrayList<String>(1);
+ pendingValues = new ArrayList<>(1);
pendingValues.add(value);
setPendingValues(getValueSet(value));
}
@@ -396,7 +396,7 @@
if (requiresAdminAction())
{
setPendingValues(new LinkedHashSet<ByteString>(0));
- pendingValues = new ArrayList<String>();
+ pendingValues = new ArrayList<>();
}
else
{
@@ -419,7 +419,7 @@
// Iterate through all the provided values, make sure that they are
// acceptable, and build the value set.
- LinkedHashSet<ByteString> valueSet = new LinkedHashSet<ByteString>(numValues);
+ LinkedHashSet<ByteString> valueSet = new LinkedHashSet<>(numValues);
for (String value : values)
{
if ((value == null) || (value.length() == 0))
@@ -465,7 +465,7 @@
*/
private static LinkedHashSet<ByteString> getValueSet(String value)
{
- LinkedHashSet<ByteString> valueSet = new LinkedHashSet<ByteString>(1);
+ LinkedHashSet<ByteString> valueSet = new LinkedHashSet<>(1);
valueSet.add(ByteString.valueOf(value));
return valueSet;
}
@@ -486,7 +486,7 @@
return null;
}
- LinkedHashSet<ByteString> valueSet = new LinkedHashSet<ByteString>(values.size());
+ LinkedHashSet<ByteString> valueSet = new LinkedHashSet<>(values.size());
for (String value : values)
{
valueSet.add(ByteString.valueOf(value));
@@ -573,7 +573,7 @@
}
else
{
- return new LinkedHashSet<ByteString>();
+ return new LinkedHashSet<>();
}
}
@@ -587,7 +587,7 @@
}
- LinkedHashSet<ByteString> valueSet = new LinkedHashSet<ByteString>(numValues);
+ LinkedHashSet<ByteString> valueSet = new LinkedHashSet<>(numValues);
for (String valueString : valueStrings)
{
if ((valueString == null) || (valueString.length() == 0))
@@ -718,7 +718,7 @@
else
{
// This is fine. The pending value set can be empty.
- pendingValues = new ArrayList<String>(0);
+ pendingValues = new ArrayList<>(0);
}
}
else
@@ -732,7 +732,7 @@
throw new ConfigException(message);
}
- pendingValues = new ArrayList<String>(numValues);
+ pendingValues = new ArrayList<>(numValues);
for (ByteString v : a)
{
pendingValues.add(v.toString());
@@ -771,7 +771,7 @@
else
{
// This is fine. The active value set can be empty.
- activeValues = new ArrayList<String>(0);
+ activeValues = new ArrayList<>(0);
}
}
else
@@ -785,7 +785,7 @@
throw new ConfigException(message);
}
- activeValues = new ArrayList<String>(numValues);
+ activeValues = new ArrayList<>(numValues);
for (ByteString v : a)
{
activeValues.add(v.toString());
@@ -1058,7 +1058,7 @@
{
try
{
- ArrayList<String> values = new ArrayList<String>(length);
+ ArrayList<String> values = new ArrayList<>(length);
for (int i=0; i < length; i++)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/GetEffectiveRightsRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/GetEffectiveRightsRequestControl.java
index cf122ea..3b09708 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/GetEffectiveRightsRequestControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/GetEffectiveRightsRequestControl.java
@@ -109,7 +109,7 @@
}
//There is an sequence containing an attribute list, try to decode it.
if(reader.hasNextElement()) {
- attrs = new LinkedList<AttributeType>();
+ attrs = new LinkedList<>();
reader.readStartSequence();
while(reader.hasNextElement()) {
//Decode as an octet string.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPostReadRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPostReadRequestControl.java
index 67fcead..7b93ba2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPostReadRequestControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPostReadRequestControl.java
@@ -73,7 +73,7 @@
}
ASN1Reader reader = ASN1.getReader(value);
- LinkedHashSet<String> rawAttributes = new LinkedHashSet<String>();
+ LinkedHashSet<String> rawAttributes = new LinkedHashSet<>();
try
{
reader.readStartSequence();
@@ -138,7 +138,7 @@
super(OID_LDAP_READENTRY_POSTREAD, isCritical);
if (rawAttributes == null)
{
- this.rawAttributes = new LinkedHashSet<String>(0);
+ this.rawAttributes = new LinkedHashSet<>(0);
}
else
{
@@ -168,7 +168,7 @@
super(oid, isCritical);
if (rawAttributes == null)
{
- this.rawAttributes = new LinkedHashSet<String>(0);
+ this.rawAttributes = new LinkedHashSet<>(0);
}
else
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPreReadRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPreReadRequestControl.java
index 957cb8a..5211775 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPreReadRequestControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPreReadRequestControl.java
@@ -73,7 +73,7 @@
}
ASN1Reader reader = ASN1.getReader(value);
- LinkedHashSet<String> rawAttributes = new LinkedHashSet<String>();
+ LinkedHashSet<String> rawAttributes = new LinkedHashSet<>();
try
{
reader.readStartSequence();
@@ -138,7 +138,7 @@
super(OID_LDAP_READENTRY_PREREAD, isCritical);
if (rawAttributes == null)
{
- this.rawAttributes = new LinkedHashSet<String>(0);
+ this.rawAttributes = new LinkedHashSet<>(0);
}
else
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/MatchedValuesControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/MatchedValuesControl.java
index 17936de..90f87ae 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/MatchedValuesControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/MatchedValuesControl.java
@@ -79,7 +79,7 @@
throw new DirectoryException(ResultCode.PROTOCOL_ERROR, message);
}
- filters = new ArrayList<MatchedValuesFilter>();
+ filters = new ArrayList<>();
while(reader.hasNextElement())
{
filters.add(MatchedValuesFilter.decode(reader));
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/MatchedValuesFilter.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/MatchedValuesFilter.java
index 1226920..1c1ec6b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/MatchedValuesFilter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/MatchedValuesFilter.java
@@ -763,7 +763,7 @@
{
if(subAny == null)
{
- subAny = new ArrayList<ByteString>();
+ subAny = new ArrayList<>();
}
subAny.add(reader.readOctetString());
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyErrorType.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyErrorType.java
index 5259120..6725f85 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyErrorType.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyErrorType.java
@@ -126,13 +126,10 @@
/** A lookup table for resolving an error type from its integer value. */
- private static final Map<Integer, PasswordPolicyErrorType> TABLE;
+ private static final Map<Integer, PasswordPolicyErrorType> TABLE = new HashMap<>();
static
{
- TABLE = new HashMap<Integer, PasswordPolicyErrorType>();
-
- for (PasswordPolicyErrorType type : PasswordPolicyErrorType
- .values())
+ for (PasswordPolicyErrorType type : PasswordPolicyErrorType.values())
{
TABLE.put(type.value, type);
TABLE.put(type.value, type);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyWarningType.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyWarningType.java
index 497f648..69eb66e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyWarningType.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyWarningType.java
@@ -61,13 +61,10 @@
/** A lookup table for resolving a warning type from its BER type. */
- private static final Map<Byte, PasswordPolicyWarningType> TABLE;
+ private static final Map<Byte, PasswordPolicyWarningType> TABLE = new HashMap<>();
static
{
- TABLE = new HashMap<Byte, PasswordPolicyWarningType>();
-
- for (PasswordPolicyWarningType value : PasswordPolicyWarningType
- .values())
+ for (PasswordPolicyWarningType value : PasswordPolicyWarningType.values())
{
TABLE.put(value.type, value);
TABLE.put(value.type, value);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/PersistentSearchChangeType.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/PersistentSearchChangeType.java
index 90a63e4..6130048 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/PersistentSearchChangeType.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/PersistentSearchChangeType.java
@@ -159,8 +159,7 @@
public static Set<PersistentSearchChangeType> intToTypes(int intValue)
throws LDAPException
{
- Set<PersistentSearchChangeType> changeTypes =
- new HashSet<PersistentSearchChangeType>(4);
+ Set<PersistentSearchChangeType> changeTypes = new HashSet<>(4);
switch (intValue)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortRequestControl.java
index e3153fa..c7eb98c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortRequestControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortRequestControl.java
@@ -100,7 +100,7 @@
throw new DirectoryException(ResultCode.PROTOCOL_ERROR, message);
}
- ArrayList<SortKey> sortKeys = new ArrayList<SortKey>();
+ ArrayList<SortKey> sortKeys = new ArrayList<>();
while(reader.hasNextElement())
{
reader.readStartSequence();
@@ -224,7 +224,7 @@
StringTokenizer tokenizer = new StringTokenizer(sortOrderString, ",");
- decodedKeyList = new ArrayList<String[]>();
+ decodedKeyList = new ArrayList<>();
while (tokenizer.hasMoreTokens())
{
String token = tokenizer.nextToken().trim();
@@ -437,7 +437,7 @@
private SortOrder decodeSortOrderFromString() throws DirectoryException
{
- ArrayList<SortKey> sortKeys = new ArrayList<SortKey>();
+ ArrayList<SortKey> sortKeys = new ArrayList<>();
for(String[] decodedKey : decodedKeyList)
{
AttributeType attrType =
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/AccessControlConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/AccessControlConfigManager.java
index 903b598..6b21eb7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/AccessControlConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/AccessControlConfigManager.java
@@ -385,7 +385,7 @@
@Override
public LinkedHashMap<String,String> getAlerts()
{
- LinkedHashMap<String,String> alerts = new LinkedHashMap<String,String>();
+ LinkedHashMap<String,String> alerts = new LinkedHashMap<>();
alerts.put(ALERT_TYPE_ACCESS_CONTROL_DISABLED,
ALERT_DESCRIPTION_ACCESS_CONTROL_DISABLED);
@@ -438,7 +438,7 @@
}
else
{
- List<LocalizableMessage> unacceptableReasons = new ArrayList<LocalizableMessage>();
+ List<LocalizableMessage> unacceptableReasons = new ArrayList<>();
if (!provider.isConfigurationAcceptable(configuration, unacceptableReasons))
{
String reasons = Utils.joinAsString(". ", unacceptableReasons);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java
index 3194eaf..8140b02 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java
@@ -80,7 +80,7 @@
public AccountStatusNotificationHandlerConfigManager(ServerContext serverContext)
{
this.serverContext = serverContext;
- notificationHandlers = new ConcurrentHashMap<DN,AccountStatusNotificationHandler>();
+ notificationHandlers = new ConcurrentHashMap<>();
}
@@ -401,7 +401,7 @@
}
else
{
- List<LocalizableMessage> unacceptableReasons = new ArrayList<LocalizableMessage>();
+ List<LocalizableMessage> unacceptableReasons = new ArrayList<>();
if (!notificationHandler.isConfigurationAcceptable(configuration,
unacceptableReasons))
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/AddOperationBasis.java b/opendj-server-legacy/src/main/java/org/opends/server/core/AddOperationBasis.java
index dbf5acc..4c92712 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/AddOperationBasis.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/AddOperationBasis.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2007-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.core;
@@ -118,7 +118,7 @@
this.rawEntryDN = rawEntryDN;
this.rawAttributes = rawAttributes;
- responseControls = new ArrayList<Control>();
+ responseControls = new ArrayList<>();
cancelRequest = null;
entryDN = null;
userAttributes = null;
@@ -160,9 +160,9 @@
rawEntryDN = ByteString.valueOf(entryDN.toString());
- rawAttributes = new ArrayList<RawAttribute>();
+ rawAttributes = new ArrayList<>();
- ArrayList<ByteString> ocValues = new ArrayList<ByteString>();
+ ArrayList<ByteString> ocValues = new ArrayList<>();
for (String s : objectClasses.values())
{
ocValues.add(ByteString.valueOf(s));
@@ -187,7 +187,7 @@
}
}
- responseControls = new ArrayList<Control>();
+ responseControls = new ArrayList<>();
proxiedAuthorizationDN = null;
cancelRequest = null;
}
@@ -314,9 +314,9 @@
&& (objectClasses == null || userAttributes == null
|| operationalAttributes == null))
{
- objectClasses = new HashMap<ObjectClass,String>();
- userAttributes = new HashMap<AttributeType,List<Attribute>>();
- operationalAttributes = new HashMap<AttributeType,List<Attribute>>();
+ objectClasses = new HashMap<>();
+ userAttributes = new HashMap<>();
+ operationalAttributes = new HashMap<>();
for (RawAttribute a : rawAttributes)
{
@@ -373,7 +373,7 @@
List<Attribute> attrs = operationalAttributes.get(attrType);
if (attrs == null)
{
- attrs = new ArrayList<Attribute>(1);
+ attrs = new ArrayList<>(1);
attrs.add(attr);
operationalAttributes.put(attrType, attrs);
}
@@ -387,7 +387,7 @@
List<Attribute> attrs = userAttributes.get(attrType);
if (attrs == null)
{
- attrs = new ArrayList<Attribute>(1);
+ attrs = new ArrayList<>(1);
attrs.add(attr);
userAttributes.put(attrType, attrs);
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/AlertHandlerConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/AlertHandlerConfigManager.java
index a76bf1d..0897d9e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/AlertHandlerConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/AlertHandlerConfigManager.java
@@ -80,7 +80,7 @@
public AlertHandlerConfigManager(ServerContext serverContext)
{
this.serverContext = serverContext;
- alertHandlers = new ConcurrentHashMap<DN, AlertHandler>();
+ alertHandlers = new ConcurrentHashMap<>();
}
/**
@@ -365,7 +365,7 @@
}
else
{
- List<LocalizableMessage> unacceptableReasons = new ArrayList<LocalizableMessage>();
+ List<LocalizableMessage> unacceptableReasons = new ArrayList<>();
if (!handler.isConfigurationAcceptable(configuration, unacceptableReasons))
{
String reasons = Utils.joinAsString(". ", unacceptableReasons);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/AttributeSyntaxConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/AttributeSyntaxConfigManager.java
index a08130f..80ad1af 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/AttributeSyntaxConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/AttributeSyntaxConfigManager.java
@@ -85,7 +85,7 @@
public AttributeSyntaxConfigManager(final ServerContext serverContext)
{
this.serverContext = serverContext;
- syntaxes = new ConcurrentHashMap<DN,AttributeSyntax>();
+ syntaxes = new ConcurrentHashMap<>();
}
@@ -441,7 +441,7 @@
}
else
{
- List<LocalizableMessage> unacceptableReasons = new ArrayList<LocalizableMessage>();
+ List<LocalizableMessage> unacceptableReasons = new ArrayList<>();
if (!syntax.isConfigurationAcceptable(configuration, unacceptableReasons))
{
String reasons = Utils.joinAsString(". ", unacceptableReasons);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/AuthenticatedUsers.java b/opendj-server-legacy/src/main/java/org/opends/server/core/AuthenticatedUsers.java
index c4bfed8..b184316 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/AuthenticatedUsers.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/AuthenticatedUsers.java
@@ -86,7 +86,7 @@
// can not be authenticated as a user that does not exist yet.
POST_RESPONSE_MODIFY, POST_RESPONSE_MODIFY_DN, POST_RESPONSE_DELETE),
true);
- userMap = new DITCacheMap<CopyOnWriteArraySet<ClientConnection>>();
+ userMap = new DITCacheMap<>();
lock = new ReentrantReadWriteLock();
DirectoryServer.registerInternalPlugin(this);
@@ -120,7 +120,7 @@
CopyOnWriteArraySet<ClientConnection> connectionSet = userMap.get(userDN);
if (connectionSet == null)
{
- connectionSet = new CopyOnWriteArraySet<ClientConnection>();
+ connectionSet = new CopyOnWriteArraySet<>();
connectionSet.add(clientConnection);
userMap.put(userDN, connectionSet);
}
@@ -203,8 +203,7 @@
final DN entryDN = op.getEntryDN();
// Identify any client connections that may be authenticated
// or authorized as the user whose entry has been deleted and terminate them
- Set<CopyOnWriteArraySet<ClientConnection>> arraySet =
- new HashSet<CopyOnWriteArraySet<ClientConnection>>();
+ Set<CopyOnWriteArraySet<ClientConnection>> arraySet = new HashSet<>();
lock.writeLock().lock();
try
{
@@ -279,8 +278,7 @@
lock.writeLock().lock();
try
{
- final Set<CopyOnWriteArraySet<ClientConnection>> arraySet =
- new HashSet<CopyOnWriteArraySet<ClientConnection>>();
+ final Set<CopyOnWriteArraySet<ClientConnection>> arraySet = new HashSet<>();
userMap.removeSubtree(oldEntry.getName(), arraySet);
for (CopyOnWriteArraySet<ClientConnection> connectionSet : arraySet)
{
@@ -322,7 +320,7 @@
{
if (newAuthNSet == null)
{
- newAuthNSet = new CopyOnWriteArraySet<ClientConnection>();
+ newAuthNSet = new CopyOnWriteArraySet<>();
}
conn.getAuthenticationInfo().setAuthenticationDN(newAuthNDN);
newAuthNSet.add(conn);
@@ -331,7 +329,7 @@
{
if (newAuthZSet == null)
{
- newAuthZSet = new CopyOnWriteArraySet<ClientConnection>();
+ newAuthZSet = new CopyOnWriteArraySet<>();
}
conn.getAuthenticationInfo().setAuthorizationDN(newAuthZDN);
newAuthZSet.add(conn);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/BaseDnRegistry.java b/opendj-server-legacy/src/main/java/org/opends/server/core/BaseDnRegistry.java
index 91bd1b5..0d6873a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/BaseDnRegistry.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/BaseDnRegistry.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2007-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.core;
@@ -47,13 +47,11 @@
public class BaseDnRegistry {
/** The set of base DNs registered with the server. */
- private final TreeMap<DN, Backend> baseDNs = new TreeMap<DN, Backend>();
-
+ private final TreeMap<DN, Backend> baseDNs = new TreeMap<>();
/** The set of private naming contexts registered with the server. */
- private final TreeMap<DN, Backend> privateNamingContexts = new TreeMap<DN, Backend>();
-
+ private final TreeMap<DN, Backend> privateNamingContexts = new TreeMap<>();
/** The set of public naming contexts registered with the server. */
- private final TreeMap<DN, Backend> publicNamingContexts = new TreeMap<DN, Backend>();
+ private final TreeMap<DN, Backend> publicNamingContexts = new TreeMap<>();
/**
* Indicates whether or not this base DN registry is in test mode.
@@ -89,7 +87,7 @@
// Check to see if the backend is already registered with the server for
// any other base DN(s). The new base DN must not have any hierarchical
// relationship with any other base Dns for the same backend.
- LinkedList<DN> otherBaseDNs = new LinkedList<DN>();
+ LinkedList<DN> otherBaseDNs = new LinkedList<>();
for (DN dn : baseDNs.keySet())
{
Backend<?> b = baseDNs.get(dn);
@@ -121,8 +119,8 @@
// Check to see if the new base DN should be the superior base DN for any
// other base DN(s) already defined.
- LinkedList<Backend<?>> subordinateBackends = new LinkedList<Backend<?>>();
- LinkedList<DN> subordinateBaseDNs = new LinkedList<DN>();
+ LinkedList<Backend<?>> subordinateBackends = new LinkedList<>();
+ LinkedList<DN> subordinateBaseDNs = new LinkedList<>();
for (DN dn : baseDNs.keySet())
{
Backend<?> b = baseDNs.get(dn);
@@ -147,7 +145,7 @@
// If we've gotten here, then the new base DN is acceptable. If we should
// actually apply the changes then do so now.
- final List<LocalizableMessage> errors = new LinkedList<LocalizableMessage>();
+ final List<LocalizableMessage> errors = new LinkedList<>();
// Check to see if any of the registered backends already contain an
// entry with the DN specified as the base DN. This could happen if
@@ -269,7 +267,7 @@
// Check to see if the backend has a parent backend, and whether it has
// any subordinates with base DNs that are below the base DN to remove.
Backend<?> superiorBackend = backend.getParentBackend();
- LinkedList<Backend<?>> subordinateBackends = new LinkedList<Backend<?>>();
+ LinkedList<Backend<?>> subordinateBackends = new LinkedList<>();
if (backend.getSubordinateBackends() != null)
{
for (Backend<?> b : backend.getSubordinateBackends())
@@ -287,7 +285,7 @@
// See if there are any other base DNs registered within the same backend.
- LinkedList<DN> otherBaseDNs = new LinkedList<DN>();
+ LinkedList<DN> otherBaseDNs = new LinkedList<>();
for (DN dn : baseDNs.keySet())
{
if (dn.equals(baseDN))
@@ -311,7 +309,7 @@
publicNamingContexts.remove(baseDN);
privateNamingContexts.remove(baseDN);
- final LinkedList<LocalizableMessage> errors = new LinkedList<LocalizableMessage>();
+ final LinkedList<LocalizableMessage> errors = new LinkedList<>();
if (superiorBackend == null)
{
// If there were any subordinate backends, then all of their base DNs
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/BindOperationBasis.java b/opendj-server-legacy/src/main/java/org/opends/server/core/BindOperationBasis.java
index b2e7b38..517bdae 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/BindOperationBasis.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/BindOperationBasis.java
@@ -93,7 +93,7 @@
private Entry saslAuthUserEntry;
/** The set of response controls for this bind operation. */
- private final List<Control> responseControls = new ArrayList<Control>(0);
+ private final List<Control> responseControls = new ArrayList<>(0);
/** A message explaining the reason for the authentication failure. */
private LocalizableMessage authFailureReason;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/CertificateMapperConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/CertificateMapperConfigManager.java
index af6c52e..96e300e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/CertificateMapperConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/CertificateMapperConfigManager.java
@@ -84,7 +84,7 @@
public CertificateMapperConfigManager(ServerContext serverContext)
{
this.serverContext = serverContext;
- certificateMappers = new ConcurrentHashMap<DN, CertificateMapper>();
+ certificateMappers = new ConcurrentHashMap<>();
}
/**
@@ -370,7 +370,7 @@
}
else
{
- List<LocalizableMessage> unacceptableReasons = new ArrayList<LocalizableMessage>();
+ List<LocalizableMessage> unacceptableReasons = new ArrayList<>();
if (!mapper.isConfigurationAcceptable(configuration, unacceptableReasons))
{
String reasons = Utils.joinAsString(". ", unacceptableReasons);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/CompareOperationBasis.java b/opendj-server-legacy/src/main/java/org/opends/server/core/CompareOperationBasis.java
index 87fc848..70204c4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/CompareOperationBasis.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/CompareOperationBasis.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2007-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.core;
@@ -112,7 +112,7 @@
this.rawAttributeType = rawAttributeType;
this.assertionValue = assertionValue;
- responseControls = new ArrayList<Control>();
+ responseControls = new ArrayList<>();
entryDN = null;
attributeType = null;
attributeOptions = null;
@@ -148,12 +148,12 @@
this.attributeType = attributeType;
this.assertionValue = assertionValue;
- responseControls = new ArrayList<Control>();
+ responseControls = new ArrayList<>();
rawEntryDN = ByteString.valueOf(entryDN.toString());
rawAttributeType = attributeType.getNameOrOID();
cancelRequest = null;
proxiedAuthorizationDN = null;
- attributeOptions = new HashSet<String>();
+ attributeOptions = new HashSet<>();
}
/** {@inheritDoc} */
@@ -215,7 +215,7 @@
if (semicolonPos > 0) {
baseName = toLowerCase(rawAttributeType.substring(0, semicolonPos));
- attributeOptions = new HashSet<String>();
+ attributeOptions = new HashSet<>();
int nextPos = rawAttributeType.indexOf(';', semicolonPos+1);
while (nextPos > 0)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/ConfigurationHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ConfigurationHandler.java
index 1fe53a9..bf3c007 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/ConfigurationHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/ConfigurationHandler.java
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Copyright 2014 ForgeRock AS
+ * Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.core;
@@ -99,7 +99,7 @@
private Entry rootEntry;
/** The add/delete/change listeners on configuration entries. */
- private final ConcurrentHashMap<DN, EntryListeners> listeners = new ConcurrentHashMap<DN, EntryListeners>();
+ private final ConcurrentHashMap<DN, EntryListeners> listeners = new ConcurrentHashMap<>();
/** Schema with configuration-related elements. */
private Schema configEnabledSchema;
@@ -135,16 +135,11 @@
private static class EntryListeners {
/** The set of add listeners that have been registered with this entry. */
- private final CopyOnWriteArrayList<ConfigAddListener> addListeners =
- new CopyOnWriteArrayList<ConfigAddListener>();
-
+ private final CopyOnWriteArrayList<ConfigAddListener> addListeners = new CopyOnWriteArrayList<>();
/** The set of change listeners that have been registered with this entry. */
- private final CopyOnWriteArrayList<ConfigChangeListener> changeListeners =
- new CopyOnWriteArrayList<ConfigChangeListener>();
-
+ private final CopyOnWriteArrayList<ConfigChangeListener> changeListeners = new CopyOnWriteArrayList<>();
/** The set of delete listeners that have been registered with this entry. */
- private final CopyOnWriteArrayList<ConfigDeleteListener> deleteListeners =
- new CopyOnWriteArrayList<ConfigDeleteListener>();
+ private final CopyOnWriteArrayList<ConfigDeleteListener> deleteListeners = new CopyOnWriteArrayList<>();
CopyOnWriteArrayList<ConfigChangeListener> getChangeListeners()
{
@@ -231,7 +226,7 @@
/** Handler for search results. */
private static final class ConfigSearchHandler implements SearchResultHandler
{
- private final Set<Entry> entries = new HashSet<Entry>();
+ private final Set<Entry> entries = new HashSet<>();
Set<Entry> getEntries()
{
@@ -324,7 +319,7 @@
if (resultHandler.hasCompletedSuccessfully())
{
- final Set<DN> children = new HashSet<DN>();
+ final Set<DN> children = new HashSet<>();
for (final Entry entry : searchHandler.getEntries())
{
children.add(entry.getName());
@@ -422,7 +417,7 @@
// Notify all the add listeners to apply the new configuration entry.
ResultCode resultCode = ResultCode.SUCCESS;
- final List<LocalizableMessage> messages = new LinkedList<LocalizableMessage>();
+ final List<LocalizableMessage> messages = new LinkedList<>();
for (final ConfigAddListener listener : addListeners)
{
final ConfigChangeResult result = listener.applyConfigurationAdd(entry);
@@ -509,7 +504,7 @@
// Notify all the delete listeners that the entry has been removed.
ResultCode resultCode = ResultCode.SUCCESS;
- final List<LocalizableMessage> messages = new LinkedList<LocalizableMessage>();
+ final List<LocalizableMessage> messages = new LinkedList<>();
for (final ConfigDeleteListener listener : deleteListeners)
{
final ConfigChangeResult result = listener.applyConfigurationDelete(entry);
@@ -594,7 +589,7 @@
// Notify all the change listeners of the update.
ResultCode resultCode = ResultCode.SUCCESS;
- final List<LocalizableMessage> messages = new LinkedList<LocalizableMessage>();
+ final List<LocalizableMessage> messages = new LinkedList<>();
for (final ConfigChangeListener listener : changeListeners)
{
final ConfigChangeResult result = listener.applyConfigurationChange(newEntry);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/ConnectionHandlerConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ConnectionHandlerConfigManager.java
index 1293520..3664da4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/ConnectionHandlerConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/ConnectionHandlerConfigManager.java
@@ -83,7 +83,7 @@
*/
public ConnectionHandlerConfigManager(ServerContext serverContext) {
this.serverContext = serverContext;
- connectionHandlers = new ConcurrentHashMap<DN, ConnectionHandler<?>>();
+ connectionHandlers = new ConcurrentHashMap<>();
}
/** {@inheritDoc} */
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/CoreConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/CoreConfigManager.java
index 1d7971b..67122ba 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/CoreConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/CoreConfigManager.java
@@ -219,7 +219,7 @@
private static List<Properties> getMailServerProperties(Set<String> smtpServers)
{
- List<Properties> mailServerProperties = new ArrayList<Properties>();
+ List<Properties> mailServerProperties = new ArrayList<>();
if (smtpServers != null && !smtpServers.isEmpty())
{
for (String smtpServer : smtpServers)
@@ -250,7 +250,7 @@
private static HashSet<Privilege> convert(Set<DisabledPrivilege> configuredDisabledPrivs)
{
- HashSet<Privilege> disabledPrivileges = new HashSet<Privilege>();
+ HashSet<Privilege> disabledPrivileges = new HashSet<>();
if (configuredDisabledPrivs != null)
{
for (DisabledPrivilege p : configuredDisabledPrivs)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/DefaultCompressedSchema.java b/opendj-server-legacy/src/main/java/org/opends/server/core/DefaultCompressedSchema.java
index 4180eec..285eec2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/DefaultCompressedSchema.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/DefaultCompressedSchema.java
@@ -123,7 +123,7 @@
reader.readStartSequence();
final byte[] encodedObjectClasses = reader.readOctetString()
.toByteArray();
- final List<String> objectClassNames = new LinkedList<String>();
+ final List<String> objectClassNames = new LinkedList<>();
while (reader.hasNextElement())
{
objectClassNames.add(reader.readOctetStringAsString());
@@ -148,7 +148,7 @@
reader.readStartSequence();
final byte[] encodedAttribute = reader.readOctetString().toByteArray();
final String attributeName = reader.readOctetStringAsString();
- final List<String> attributeOptions = new LinkedList<String>();
+ final List<String> attributeOptions = new LinkedList<>();
while (reader.hasNextElement())
{
attributeOptions.add(reader.readOctetStringAsString());
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/DeleteOperationBasis.java b/opendj-server-legacy/src/main/java/org/opends/server/core/DeleteOperationBasis.java
index d4b0eb5..54bf497 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/DeleteOperationBasis.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/DeleteOperationBasis.java
@@ -90,7 +90,7 @@
this.rawEntryDN = rawEntryDN;
entryDN = null;
- responseControls = new ArrayList<Control>();
+ responseControls = new ArrayList<>();
cancelRequest = null;
}
@@ -118,7 +118,7 @@
this.entryDN = entryDN;
rawEntryDN = ByteString.valueOf(entryDN.toString());
- responseControls = new ArrayList<Control>();
+ responseControls = new ArrayList<>();
cancelRequest = null;
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/EntryCacheConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/EntryCacheConfigManager.java
index 367d1a9..1172c4a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/EntryCacheConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/EntryCacheConfigManager.java
@@ -72,11 +72,10 @@
/** The entry cache order map sorted by the cache level. */
@SuppressWarnings("rawtypes")
- private SortedMap<Integer, EntryCache> cacheOrderMap =
- new TreeMap<Integer, EntryCache>();
+ private SortedMap<Integer, EntryCache> cacheOrderMap = new TreeMap<>();
/** The entry cache to level map. */
- private Map<DN,Integer> cacheNameToLevelMap = new HashMap<DN, Integer>();
+ private Map<DN,Integer> cacheNameToLevelMap = new HashMap<>();
/** Global entry cache monitor provider name. */
private static final String
@@ -578,7 +577,7 @@
// change listener registered to invoke and verify on its own.
else if (!configuration.isEnabled())
{
- List<LocalizableMessage> unacceptableReasons = new ArrayList<LocalizableMessage>();
+ List<LocalizableMessage> unacceptableReasons = new ArrayList<>();
if (!cache.isConfigurationAcceptable(configuration, unacceptableReasons))
{
String buffer = Utils.joinAsString(". ", unacceptableReasons);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationBasis.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationBasis.java
index a4355b0..1a95eef 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationBasis.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationBasis.java
@@ -104,7 +104,7 @@
responseOID = null;
responseValue = null;
- responseControls = new ArrayList<Control>();
+ responseControls = new ArrayList<>();
cancelRequest = null;
if (requestOID.equals(OID_CANCEL_REQUEST))
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationConfigManager.java
index 21383f0..a4de132 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationConfigManager.java
@@ -79,7 +79,7 @@
public ExtendedOperationConfigManager(ServerContext serverContext)
{
this.serverContext = serverContext;
- handlers = new ConcurrentHashMap<DN,ExtendedOperationHandler>();
+ handlers = new ConcurrentHashMap<>();
}
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/IdentityMapperConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/IdentityMapperConfigManager.java
index 1f60896..54514ad 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/IdentityMapperConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/IdentityMapperConfigManager.java
@@ -80,7 +80,7 @@
public IdentityMapperConfigManager(ServerContext serverContext)
{
this.serverContext = serverContext;
- identityMappers = new ConcurrentHashMap<DN,IdentityMapper>();
+ identityMappers = new ConcurrentHashMap<>();
}
@@ -391,7 +391,7 @@
}
else
{
- List<LocalizableMessage> unacceptableReasons = new ArrayList<LocalizableMessage>();
+ List<LocalizableMessage> unacceptableReasons = new ArrayList<>();
if (!mapper.isConfigurationAcceptable(configuration, unacceptableReasons))
{
String reasons = Utils.joinAsString(". ", unacceptableReasons);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/KeyManagerProviderConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/KeyManagerProviderConfigManager.java
index f6be0f0..41a3843 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/KeyManagerProviderConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/KeyManagerProviderConfigManager.java
@@ -85,7 +85,7 @@
public KeyManagerProviderConfigManager(ServerContext serverContext)
{
this.serverContext = serverContext;
- providers = new ConcurrentHashMap<DN,KeyManagerProvider>();
+ providers = new ConcurrentHashMap<>();
}
/**
@@ -378,7 +378,7 @@
}
else
{
- List<LocalizableMessage> unacceptableReasons = new ArrayList<LocalizableMessage>();
+ List<LocalizableMessage> unacceptableReasons = new ArrayList<>();
if (!provider.isConfigurationAcceptable(configuration, unacceptableReasons))
{
String reasons = Utils.joinAsString(". ", unacceptableReasons);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/LockFileManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/LockFileManager.java
index 87d91fb..16addf7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/LockFileManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/LockFileManager.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.core;
@@ -50,16 +50,11 @@
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
/** A map between the filenames and the lock files for exclusive locks. */
- private static Map<String, FileLock> exclusiveLocks =
- new HashMap<String,FileLock>();
-
+ private static Map<String, FileLock> exclusiveLocks = new HashMap<>();
/** A map between the filenames and the lock files for shared locks. */
- private static Map<String, FileLock> sharedLocks =
- new HashMap<String,FileLock>();
-
+ private static Map<String, FileLock> sharedLocks = new HashMap<>();
/** A map between the filenames and reference counts for shared locks. */
- private static Map<String, Integer> sharedLockReferences =
- new HashMap<String,Integer>();
+ private static Map<String, Integer> sharedLockReferences = new HashMap<>();
/** The lock providing threadsafe access to the lock map data. */
private static Object mapLock = new Object();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/LoggerConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/LoggerConfigManager.java
index c3d1df8..adc0177 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/LoggerConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/LoggerConfigManager.java
@@ -101,17 +101,10 @@
root.addLogPublisherAddListener(this);
root.addLogPublisherDeleteListener(this);
- List<DebugLogPublisherCfg> debugPublisherCfgs =
- new ArrayList<DebugLogPublisherCfg>();
-
- List<AccessLogPublisherCfg> accessPublisherCfgs =
- new ArrayList<AccessLogPublisherCfg>();
-
- List<HTTPAccessLogPublisherCfg> httpAccessPublisherCfgs =
- new ArrayList<HTTPAccessLogPublisherCfg>();
-
- List<ErrorLogPublisherCfg> errorPublisherCfgs =
- new ArrayList<ErrorLogPublisherCfg>();
+ List<DebugLogPublisherCfg> debugPublisherCfgs = new ArrayList<>();
+ List<AccessLogPublisherCfg> accessPublisherCfgs = new ArrayList<>();
+ List<HTTPAccessLogPublisherCfg> httpAccessPublisherCfgs = new ArrayList<>();
+ List<ErrorLogPublisherCfg> errorPublisherCfgs = new ArrayList<>();
for (String name : root.listLogPublishers())
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/MatchingRuleConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/MatchingRuleConfigManager.java
index e01897e..c4fcdc7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/MatchingRuleConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/MatchingRuleConfigManager.java
@@ -79,7 +79,7 @@
/** Creates a new instance of this matching rule config manager. */
public MatchingRuleConfigManager()
{
- matchingRuleFactories = new ConcurrentHashMap<DN,MatchingRuleFactory>();
+ matchingRuleFactories = new ConcurrentHashMap<>();
}
@@ -495,7 +495,7 @@
}
else
{
- List<LocalizableMessage> unacceptableReasons = new ArrayList<LocalizableMessage>();
+ List<LocalizableMessage> unacceptableReasons = new ArrayList<>();
if (!factory.isConfigurationAcceptable(configuration, unacceptableReasons))
{
String reasons = Utils.joinAsString(". ", unacceptableReasons);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/ModifyDNOperationBasis.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ModifyDNOperationBasis.java
index 05cbbab..cdda8dd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/ModifyDNOperationBasis.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/ModifyDNOperationBasis.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS.
+ * Portions Copyright 2011-2015 ForgeRock AS.
*/
package org.opends.server.core;
@@ -132,7 +132,7 @@
entryDN = null;
newRDN = null;
newSuperior = null;
- responseControls = new ArrayList<Control>();
+ responseControls = new ArrayList<>();
cancelRequest = null;
modifications = null;
}
@@ -181,7 +181,7 @@
rawNewSuperior = ByteString.valueOf(newSuperior.toString());
}
- responseControls = new ArrayList<Control>();
+ responseControls = new ArrayList<>();
cancelRequest = null;
modifications = null;
}
@@ -332,7 +332,7 @@
{
if (modifications == null)
{
- modifications = new ArrayList<Modification>();
+ modifications = new ArrayList<>();
}
if (modification != null)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/ModifyOperationBasis.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ModifyOperationBasis.java
index 2584508..6eaa221 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/ModifyOperationBasis.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/ModifyOperationBasis.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2007-2010 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS.
+ * Portions Copyright 2012-2015 ForgeRock AS.
*/
package org.opends.server.core;
@@ -104,7 +104,7 @@
entryDN = null;
modifications = null;
- responseControls = new ArrayList<Control>();
+ responseControls = new ArrayList<>();
cancelRequest = null;
}
@@ -134,14 +134,14 @@
rawEntryDN = ByteString.valueOf(entryDN.toString());
- rawModifications = new ArrayList<RawModification>(modifications.size());
+ rawModifications = new ArrayList<>(modifications.size());
for (Modification m : modifications)
{
rawModifications.add(new LDAPModification(m.getModificationType(),
new LDAPAttribute(m.getAttribute())));
}
- responseControls = new ArrayList<Control>();
+ responseControls = new ArrayList<>();
cancelRequest = null;
}
@@ -210,7 +210,7 @@
{
if (modifications == null)
{
- modifications = new ArrayList<Modification>(rawModifications.size());
+ modifications = new ArrayList<>(rawModifications.size());
try {
for (RawModification m : rawModifications)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/MonitorConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/MonitorConfigManager.java
index 0172520..ddb64a5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/MonitorConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/MonitorConfigManager.java
@@ -81,7 +81,7 @@
public MonitorConfigManager(ServerContext serverContext)
{
this.serverContext = serverContext;
- monitors = new ConcurrentHashMap<DN,MonitorProvider<?>>();
+ monitors = new ConcurrentHashMap<>();
}
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordGeneratorConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordGeneratorConfigManager.java
index 2c9ee5c..ead741b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordGeneratorConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordGeneratorConfigManager.java
@@ -83,7 +83,7 @@
public PasswordGeneratorConfigManager(ServerContext serverContext)
{
this.serverContext = serverContext;
- passwordGenerators = new ConcurrentHashMap<DN,PasswordGenerator>();
+ passwordGenerators = new ConcurrentHashMap<>();
}
/**
@@ -374,7 +374,7 @@
}
else
{
- List<LocalizableMessage> unacceptableReasons = new ArrayList<LocalizableMessage>();
+ List<LocalizableMessage> unacceptableReasons = new ArrayList<>();
if (!generator.isConfigurationAcceptable(configuration, unacceptableReasons))
{
String reasons = Utils.joinAsString(". ", unacceptableReasons);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyFactory.java
index f920173..3244556 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyFactory.java
@@ -233,8 +233,7 @@
// Get the default storage schemes. They must all reference valid storage
// schemes that support the syntax for the specified password attribute.
- List<PasswordStorageScheme<?>> defaultStorageSchemes =
- new LinkedList<PasswordStorageScheme<?>>();
+ List<PasswordStorageScheme<?>> defaultStorageSchemes = new LinkedList<>();
for (DN schemeDN : configuration.getDefaultPasswordStorageSchemeDNs())
{
PasswordStorageScheme<?> scheme = DirectoryServer
@@ -250,7 +249,7 @@
}
// Get the names of the deprecated storage schemes.
- Set<String> deprecatedStorageSchemes = new LinkedHashSet<String>();
+ Set<String> deprecatedStorageSchemes = new LinkedHashSet<>();
for (DN schemeDN : configuration.getDeprecatedPasswordStorageSchemeDNs())
{
PasswordStorageScheme<?> scheme = DirectoryServer
@@ -275,8 +274,7 @@
}
// Get the password validators.
- Map<DN, PasswordValidator<?>> passwordValidators =
- new HashMap<DN, PasswordValidator<?>>();
+ Map<DN, PasswordValidator<?>> passwordValidators = new HashMap<>();
for (DN validatorDN : configuration.getPasswordValidatorDNs())
{
passwordValidators.put(validatorDN,
@@ -284,10 +282,8 @@
}
// Get the status notification handlers.
- Map<DN, AccountStatusNotificationHandler<?>> notificationHandlers =
- new HashMap<DN, AccountStatusNotificationHandler<?>>();
- for (DN handlerDN : configuration
- .getAccountStatusNotificationHandlerDNs())
+ Map<DN, AccountStatusNotificationHandler<?>> notificationHandlers = new HashMap<>();
+ for (DN handlerDN : configuration.getAccountStatusNotificationHandlerDNs())
{
AccountStatusNotificationHandler<?> handler = DirectoryServer
.getAccountStatusNotificationHandler(handlerDN);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyState.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyState.java
index eb1c788..73de5fb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyState.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyState.java
@@ -154,7 +154,7 @@
private long warnedTime = Long.MIN_VALUE;
/** The set of modifications that should be applied to the user's entry. */
- private LinkedList<Modification> modifications = new LinkedList<Modification>();
+ private LinkedList<Modification> modifications = new LinkedList<>();
@@ -238,7 +238,7 @@
private List<Long> getGeneralizedTimes(AttributeType attributeType)
throws DirectoryException
{
- ArrayList<Long> timeValues = new ArrayList<Long>();
+ ArrayList<Long> timeValues = new ArrayList<>();
List<Attribute> attrList = userEntry.getAttribute(attributeType);
if (attrList != null)
@@ -391,7 +391,7 @@
final Attribute attr = getFirstAttributeNotEmpty(passwordPolicy.getPasswordAttribute());
if (attr != null)
{
- Set<ByteString> values = new LinkedHashSet<ByteString>(attr.size());
+ Set<ByteString> values = new LinkedHashSet<>(attr.size());
for (ByteString value : attr)
{
values.add(value);
@@ -670,7 +670,7 @@
{
logger.traceException(e, "Error while processing auth failure times for user %s", userDNString);
- authFailureTimes = new ArrayList<Long>();
+ authFailureTimes = new ArrayList<>();
modifications.add(new Modification(ModificationType.REPLACE, Attributes.empty(type), true));
return authFailureTimes;
}
@@ -707,7 +707,7 @@
if (valuesToRemove == null)
{
- valuesToRemove = new LinkedHashSet<ByteString>();
+ valuesToRemove = new LinkedHashSet<>();
}
valuesToRemove.add(ByteString.valueOf(GeneralizedTimeSyntax.format(l)));
@@ -2058,7 +2058,7 @@
{
logger.traceException(e, "Error while processing grace login times for user %s", userDNString);
- graceLoginTimes = new ArrayList<Long>();
+ graceLoginTimes = new ArrayList<>();
modifications.add(new Modification(ModificationType.REPLACE, Attributes.empty(type), true));
}
@@ -2197,7 +2197,7 @@
*/
public List<ByteString> getClearPasswords()
{
- LinkedList<ByteString> clearPasswords = new LinkedList<ByteString>();
+ LinkedList<ByteString> clearPasswords = new LinkedList<>();
List<Attribute> attrList = userEntry.getAttribute(passwordPolicy.getPasswordAttribute());
@@ -2387,7 +2387,7 @@
throws DirectoryException
{
List<PasswordStorageScheme<?>> schemes = passwordPolicy.getDefaultPasswordStorageSchemes();
- List<ByteString> encodedPasswords = new ArrayList<ByteString>(schemes.size());
+ List<ByteString> encodedPasswords = new ArrayList<>(schemes.size());
if (passwordPolicy.isAuthPasswordSyntax())
{
@@ -2474,9 +2474,9 @@
}
- HashSet<String> existingDefaultSchemes = new HashSet<String>();
- LinkedHashSet<ByteString> removedValues = new LinkedHashSet<ByteString>();
- LinkedHashSet<ByteString> updatedValues = new LinkedHashSet<ByteString>();
+ HashSet<String> existingDefaultSchemes = new HashSet<>();
+ LinkedHashSet<ByteString> removedValues = new LinkedHashSet<>();
+ LinkedHashSet<ByteString> updatedValues = new LinkedHashSet<>();
boolean usesAuthPasswordSyntax = passwordPolicy.isAuthPasswordSyntax();
@@ -2529,7 +2529,7 @@
return;
}
- LinkedHashSet<ByteString> addedValues = new LinkedHashSet<ByteString>();
+ LinkedHashSet<ByteString> addedValues = new LinkedHashSet<>();
for (PasswordStorageScheme<?> s : passwordPolicy.getDefaultPasswordStorageSchemes())
{
if (! existingDefaultSchemes.contains(toLowerCase(s.getStorageSchemeName())))
@@ -2696,7 +2696,7 @@
*/
private TreeMap<Long,ByteString> getSortedHistoryValues(List<Attribute> removeAttrs)
{
- TreeMap<Long, ByteString> historyMap = new TreeMap<Long, ByteString>();
+ TreeMap<Long, ByteString> historyMap = new TreeMap<>();
AttributeType historyType = DirectoryServer.getAttributeType(OP_ATTR_PWPOLICY_HISTORY_LC, true);
List<Attribute> attrList = userEntry.getAttribute(historyType);
if (attrList != null)
@@ -2924,7 +2924,7 @@
// Get a sorted list of the existing values to see if there are any that should be removed.
- LinkedList<Attribute> removeAttrs = new LinkedList<Attribute>();
+ LinkedList<Attribute> removeAttrs = new LinkedList<>();
TreeMap<Long, ByteString> historyMap = getSortedHistoryValues(removeAttrs);
@@ -2935,7 +2935,7 @@
if (historyCount > 0 && historyMap.size() >= historyCount)
{
int numToDelete = historyMap.size() - historyCount + 1;
- LinkedHashSet<ByteString> removeValues = new LinkedHashSet<ByteString>(numToDelete);
+ LinkedHashSet<ByteString> removeValues = new LinkedHashSet<>(numToDelete);
Iterator<ByteString> iterator = historyMap.values().iterator();
while (iterator.hasNext() && numToDelete > 0)
{
@@ -2965,7 +2965,7 @@
{
long minAgeToKeep = currentTime - 1000L * historyDuration;
Iterator<Long> iterator = historyMap.keySet().iterator();
- LinkedHashSet<ByteString> removeValues = new LinkedHashSet<ByteString>();
+ LinkedHashSet<ByteString> removeValues = new LinkedHashSet<>();
while (iterator.hasNext())
{
long timestamp = iterator.next();
@@ -3031,7 +3031,7 @@
*/
public String[] getPasswordHistoryValues()
{
- ArrayList<String> historyValues = new ArrayList<String>();
+ ArrayList<String> historyValues = new ArrayList<>();
AttributeType historyType = DirectoryServer.getAttributeType(OP_ATTR_PWPOLICY_HISTORY_LC, true);
List<Attribute> attrList = userEntry.getAttribute(historyType);
if (attrList != null)
@@ -3153,7 +3153,7 @@
}
// Convert the set of modifications to a set of LDAP modifications.
- ArrayList<RawModification> modList = new ArrayList<RawModification>();
+ ArrayList<RawModification> modList = new ArrayList<>();
for (Modification m : modifications)
{
modList.add(RawModification.create(m.getModificationType(), new LDAPAttribute(m.getAttribute())));
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordStorageSchemeConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordStorageSchemeConfigManager.java
index ff31a85..6c6459d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordStorageSchemeConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordStorageSchemeConfigManager.java
@@ -78,7 +78,7 @@
public PasswordStorageSchemeConfigManager(ServerContext serverContext)
{
this.serverContext = serverContext;
- storageSchemes = new ConcurrentHashMap<DN,PasswordStorageScheme>();
+ storageSchemes = new ConcurrentHashMap<>();
}
@@ -398,7 +398,7 @@
}
else
{
- List<LocalizableMessage> unacceptableReasons = new ArrayList<LocalizableMessage>();
+ List<LocalizableMessage> unacceptableReasons = new ArrayList<>();
if (!passwordStorageScheme.isConfigurationAcceptable(configuration, unacceptableReasons))
{
String reasons = Utils.joinAsString(". ", unacceptableReasons);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordValidatorConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordValidatorConfigManager.java
index 5ecff6b..bcd54cd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordValidatorConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordValidatorConfigManager.java
@@ -84,7 +84,7 @@
public PasswordValidatorConfigManager(ServerContext serverContext)
{
this.serverContext = serverContext;
- passwordValidators = new ConcurrentHashMap<DN,PasswordValidator>();
+ passwordValidators = new ConcurrentHashMap<>();
}
/**
@@ -386,7 +386,7 @@
}
else
{
- List<LocalizableMessage> unacceptableReasons = new ArrayList<LocalizableMessage>();
+ List<LocalizableMessage> unacceptableReasons = new ArrayList<>();
if (!validator.isConfigurationAcceptable(configuration, unacceptableReasons))
{
String reasons = Utils.joinAsString(". ", unacceptableReasons);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/PersistentSearch.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PersistentSearch.java
index 585ff0b..bd09c84 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/PersistentSearch.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/PersistentSearch.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.core;
@@ -126,19 +126,13 @@
}
}
- /**
- * Cancellation callbacks which should be run when this persistent search is
- * cancelled.
- */
- private final List<CancellationCallback> cancellationCallbacks =
- new CopyOnWriteArrayList<CancellationCallback>();
+ /** Cancellation callbacks which should be run when this persistent search is cancelled. */
+ private final List<CancellationCallback> cancellationCallbacks = new CopyOnWriteArrayList<>();
/** The set of change types to send to the client. */
private final Set<PersistentSearchChangeType> changeTypes;
- /**
- * Indicates whether or not this persistent search has already been aborted.
- */
+ /** Indicates whether or not this persistent search has already been aborted. */
private boolean isCancelled;
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/PluginConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PluginConfigManager.java
index 53ed225..ff8d0ba 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/PluginConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/PluginConfigManager.java
@@ -222,12 +222,8 @@
subordinateModifyDNPlugins = new DirectoryServerPlugin[0];
subordinateDeletePlugins = new DirectoryServerPlugin[0];
intermediateResponsePlugins = new DirectoryServerPlugin[0];
- registeredPlugins =
- new ConcurrentHashMap<DN,
- DirectoryServerPlugin<? extends PluginCfg>>();
- skippedPreOperationPlugins =
- new ConcurrentHashMap<PluginOperation,
- ArrayList<DirectoryServerPlugin>>();
+ registeredPlugins = new ConcurrentHashMap<>();
+ skippedPreOperationPlugins = new ConcurrentHashMap<>();
}
@@ -295,9 +291,8 @@
}
// Create a set of plugin types for the plugin.
- HashSet<PluginType> initTypes = new HashSet<PluginType>();
- for (PluginCfgDefn.PluginType pluginType :
- pluginConfiguration.getPluginType())
+ HashSet<PluginType> initTypes = new HashSet<>();
+ for (PluginCfgDefn.PluginType pluginType : pluginConfiguration.getPluginType())
{
PluginType t = getPluginType(pluginType);
if ((pluginTypes == null) || pluginTypes.contains(t))
@@ -374,7 +369,7 @@
}
else
{
- List<LocalizableMessage> unacceptableReasons = new ArrayList<LocalizableMessage>();
+ List<LocalizableMessage> unacceptableReasons = new ArrayList<>();
if (!plugin.isConfigurationAcceptable(configuration, unacceptableReasons))
{
String buffer = Utils.joinAsString(". ", unacceptableReasons);
@@ -923,8 +918,8 @@
{
// Parse the plugin order into initial and final plugin names.
boolean starFound = false;
- LinkedHashSet<String> initialPluginNames = new LinkedHashSet<String>();
- LinkedHashSet<String> finalPluginNames = new LinkedHashSet<String>();
+ LinkedHashSet<String> initialPluginNames = new LinkedHashSet<>();
+ LinkedHashSet<String> finalPluginNames = new LinkedHashSet<>();
StringTokenizer tokenizer = new StringTokenizer(pluginOrder, ",");
while (tokenizer.hasMoreTokens())
@@ -1009,12 +1004,9 @@
// Parse the array of already registered plugins to sort them accordingly.
- HashMap<String,DirectoryServerPlugin> initialPlugins =
- new HashMap<String,DirectoryServerPlugin>(initialPluginNames.size());
- HashMap<String,DirectoryServerPlugin> finalPlugins =
- new HashMap<String,DirectoryServerPlugin>(finalPluginNames.size());
- ArrayList<DirectoryServerPlugin> otherPlugins =
- new ArrayList<DirectoryServerPlugin>();
+ HashMap<String,DirectoryServerPlugin> initialPlugins = new HashMap<>(initialPluginNames.size());
+ HashMap<String,DirectoryServerPlugin> finalPlugins = new HashMap<>(finalPluginNames.size());
+ ArrayList<DirectoryServerPlugin> otherPlugins = new ArrayList<>();
for (DirectoryServerPlugin p : pluginArray)
{
DN dn = p.getPluginEntryDN();
@@ -1054,8 +1046,7 @@
// Compile a list of all the plugins in the correct order, convert it to
// an array, and return it.
- ArrayList<DirectoryServerPlugin> newList =
- new ArrayList<DirectoryServerPlugin>(pluginArray.length+1);
+ ArrayList<DirectoryServerPlugin> newList = new ArrayList<>(pluginArray.length + 1);
for (String name : initialPluginNames)
{
DirectoryServerPlugin p = initialPlugins.get(name);
@@ -4721,16 +4712,9 @@
{
if (configuration.isEnabled())
{
- // Create a set of plugin types for the plugin.
- HashSet<PluginType> pluginTypes = new HashSet<PluginType>();
- for (PluginCfgDefn.PluginType pluginType :
- configuration.getPluginType())
- {
- pluginTypes.add(getPluginType(pluginType));
- }
+ HashSet<PluginType> pluginTypes = getPluginTypes(configuration);
- // Get the name of the class and make sure we can instantiate it as a
- // plugin.
+ // Get the name of the class and make sure we can instantiate it as a plugin.
String className = configuration.getJavaClass();
try
{
@@ -4763,16 +4747,9 @@
return ccr;
}
- // Create a set of plugin types for the plugin.
- HashSet<PluginType> pluginTypes = new HashSet<PluginType>();
- for (PluginCfgDefn.PluginType pluginType :
- configuration.getPluginType())
- {
- pluginTypes.add(getPluginType(pluginType));
- }
+ HashSet<PluginType> pluginTypes = getPluginTypes(configuration);
- // Get the name of the class and make sure we can instantiate it as a
- // plugin.
+ // Get the name of the class and make sure we can instantiate it as a plugin.
DirectoryServerPlugin<? extends PluginCfg> plugin = null;
String className = configuration.getJavaClass();
try
@@ -4829,16 +4806,9 @@
{
if (configuration.isEnabled())
{
- // Create a set of plugin types for the plugin.
- HashSet<PluginType> pluginTypes = new HashSet<PluginType>();
- for (PluginCfgDefn.PluginType pluginType :
- configuration.getPluginType())
- {
- pluginTypes.add(getPluginType(pluginType));
- }
+ HashSet<PluginType> pluginTypes = getPluginTypes(configuration);
- // Get the name of the class and make sure we can instantiate it as a
- // plugin.
+ // Get the name of the class and make sure we can instantiate it as a plugin.
String className = configuration.getJavaClass();
try
{
@@ -4904,12 +4874,7 @@
}
// Create a set of plugin types for the plugin.
- HashSet<PluginType> pluginTypes = new HashSet<PluginType>();
- for (PluginCfgDefn.PluginType pluginType :
- configuration.getPluginType())
- {
- pluginTypes.add(getPluginType(pluginType));
- }
+ HashSet<PluginType> pluginTypes = getPluginTypes(configuration);
DirectoryServerPlugin<? extends PluginCfg> plugin = null;
try
@@ -4930,12 +4895,21 @@
return ccr;
}
+ private HashSet<PluginType> getPluginTypes(PluginCfg configuration)
+ {
+ HashSet<PluginType> pluginTypes = new HashSet<>();
+ for (PluginCfgDefn.PluginType pluginType : configuration.getPluginType())
+ {
+ pluginTypes.add(getPluginType(pluginType));
+ }
+ return pluginTypes;
+ }
+
private void registerSkippedPreOperationPlugins(int i,
DirectoryServerPlugin[] plugins,
PluginOperation operation)
{
- ArrayList<DirectoryServerPlugin> skippedPlugins =
- new ArrayList<DirectoryServerPlugin>(plugins.length - i);
+ ArrayList<DirectoryServerPlugin> skippedPlugins = new ArrayList<>(plugins.length - i);
for(int j = i; j < plugins.length; j++)
{
skippedPlugins.add(plugins[j]);
@@ -4950,7 +4924,7 @@
skippedPreOperationPlugins.get(operation);
if(existingList == null)
{
- existingList = new ArrayList<DirectoryServerPlugin>();
+ existingList = new ArrayList<>();
}
existingList.add(plugin);
skippedPreOperationPlugins.put(operation, existingList);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/RootDNConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/RootDNConfigManager.java
index db69b9b..605f540 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/RootDNConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/RootDNConfigManager.java
@@ -80,7 +80,7 @@
public RootDNConfigManager(ServerContext serverContext)
{
this.serverContext = serverContext;
- alternateBindDNs = new ConcurrentHashMap<DN, HashSet<DN>>();
+ alternateBindDNs = new ConcurrentHashMap<>();
rootPrivilegeChangeListener = new RootPrivilegeChangeListener();
}
@@ -127,7 +127,7 @@
rootUserCfg.addChangeListener(this);
DirectoryServer.registerRootDN(rootUserCfg.dn());
- HashSet<DN> altBindDNs = new HashSet<DN>();
+ HashSet<DN> altBindDNs = new HashSet<>();
for (DN alternateBindDN : rootUserCfg.getAlternateBindDN())
{
try
@@ -194,7 +194,7 @@
final ConfigChangeResult ccr = new ConfigChangeResult();
- HashSet<DN> altBindDNs = new HashSet<DN>();
+ HashSet<DN> altBindDNs = new HashSet<>();
for (DN altBindDN : configuration.getAlternateBindDN())
{
try
@@ -295,10 +295,9 @@
{
final ConfigChangeResult ccr = new ConfigChangeResult();
- HashSet<DN> setDNs = new HashSet<DN>();
- HashSet<DN> addDNs = new HashSet<DN>();
- HashSet<DN> delDNs =
- new HashSet<DN>(alternateBindDNs.get(configuration.dn()));
+ HashSet<DN> setDNs = new HashSet<>();
+ HashSet<DN> addDNs = new HashSet<>();
+ HashSet<DN> delDNs = new HashSet<>(alternateBindDNs.get(configuration.dn()));
for (DN altBindDN : configuration.getAlternateBindDN())
{
@@ -315,7 +314,7 @@
DirectoryServer.deregisterAlternateRootBindDN(dn);
}
- HashSet<DN> addedDNs = new HashSet<DN>(addDNs.size());
+ HashSet<DN> addedDNs = new HashSet<>(addDNs.size());
for (DN dn : addDNs)
{
try
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/RootPrivilegeChangeListener.java b/opendj-server-legacy/src/main/java/org/opends/server/core/RootPrivilegeChangeListener.java
index 74d1357..850b28d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/RootPrivilegeChangeListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/RootPrivilegeChangeListener.java
@@ -97,7 +97,7 @@
Set<RootDNCfgDefn.DefaultRootPrivilegeName> configPrivSet =
configuration.getDefaultRootPrivilegeName();
- HashSet<Privilege> privSet = new HashSet<Privilege>(configPrivSet.size());
+ HashSet<Privilege> privSet = new HashSet<>(configPrivSet.size());
for (RootDNCfgDefn.DefaultRootPrivilegeName p : configPrivSet)
{
privSet.add(Privilege.privilegeForName(p.toString()));
@@ -106,4 +106,3 @@
defaultRootPrivileges = privSet;
}
}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/SASLConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/SASLConfigManager.java
index ca7b045..57b4570 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/SASLConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/SASLConfigManager.java
@@ -83,13 +83,13 @@
public SASLConfigManager(ServerContext serverContext)
{
this.serverContext = serverContext;
- handlers = new ConcurrentHashMap<DN,SASLMechanismHandler>();
+ handlers = new ConcurrentHashMap<>();
}
/**
- * Initializes all SASL mechanism hanlders currently defined in the Directory
+ * Initializes all SASL mechanism handlers currently defined in the Directory
* Server configuration. This should only be called at Directory Server
* startup.
*
@@ -375,7 +375,7 @@
}
else
{
- List<LocalizableMessage> unacceptableReasons = new ArrayList<LocalizableMessage>();
+ List<LocalizableMessage> unacceptableReasons = new ArrayList<>();
if (!handler.isConfigurationAcceptable(configuration, unacceptableReasons))
{
String reasons = Utils.joinAsString(". ", unacceptableReasons);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/SchemaConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/SchemaConfigManager.java
index 7157a4d..f322cda 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/SchemaConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/SchemaConfigManager.java
@@ -236,7 +236,7 @@
File[] schemaInstanceDirFiles =
schemaInstanceDir.listFiles(filter);
int fileNumber = schemaInstanceDirFiles.length ;
- ArrayList<String> fileList = new ArrayList<String>(fileNumber);
+ ArrayList<String> fileList = new ArrayList<>(fileNumber);
for (File f : schemaInstanceDirFiles)
{
@@ -400,7 +400,7 @@
{
// The file was empty -- skip it.
reader.close();
- return new LinkedList<Modification>();
+ return new LinkedList<>();
}
}
catch (Exception e)
@@ -443,19 +443,16 @@
}
// Get the attributeTypes attribute from the entry.
- List<Modification> mods = new LinkedList<Modification>();
+ List<Modification> mods = new LinkedList<>();
//parse the syntaxes first because attributes rely on these.
- List<Attribute> ldapSyntaxList =
- getLdapSyntaxesAttributes(schema, entry, mods);
+ List<Attribute> ldapSyntaxList = getLdapSyntaxesAttributes(schema, entry, mods);
List<Attribute> attrList = getAttributeTypeAttributes(schema, entry, mods);
List<Attribute> ocList = getObjectClassesAttributes(schema, entry, mods);
List<Attribute> nfList = getNameFormsAttributes(schema, entry, mods);
List<Attribute> dcrList = getDITContentRulesAttributes(schema, entry, mods);
- List<Attribute> dsrList =
- getDITStructureRulesAttributes(schema, entry, mods);
- List<Attribute> mruList =
- getMatchingRuleUsesAttributes(schema, entry, mods);
+ List<Attribute> dsrList = getDITStructureRulesAttributes(schema, entry, mods);
+ List<Attribute> mruList = getMatchingRuleUsesAttributes(schema, entry, mods);
// Loop on all the attribute of the schema entry to
// find the extra attribute that should be loaded in the Schema.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/SchemaHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/core/SchemaHandler.java
index 59fd1aa..7095a39 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/SchemaHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/SchemaHandler.java
@@ -164,7 +164,7 @@
provider.initialize(config, schemaBuilder, schemaUpdater);
}
else {
- final List<LocalizableMessage> unacceptableReasons = new ArrayList<LocalizableMessage>();
+ final List<LocalizableMessage> unacceptableReasons = new ArrayList<>();
final boolean isAcceptable = provider.isConfigurationAcceptable(config, unacceptableReasons);
if (!isAcceptable)
{
@@ -250,7 +250,7 @@
try
{
final File[] schemaFiles = schemaDirectory.listFiles(new SchemaFileFilter());
- final List<String> schemaFileNames = new ArrayList<String>(schemaFiles.length);
+ final List<String> schemaFileNames = new ArrayList<>(schemaFiles.length);
for (final File f : schemaFiles)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/SearchOperationBasis.java b/opendj-server-legacy/src/main/java/org/opends/server/core/SearchOperationBasis.java
index 91ed994..cfe43af 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/SearchOperationBasis.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/SearchOperationBasis.java
@@ -159,7 +159,7 @@
private Set<String> attributes;
/** The set of response controls for this search operation. */
- private final List<Control> responseControls = new ArrayList<Control>();
+ private final List<Control> responseControls = new ArrayList<>();
/** The time that the search time limit has expired. */
private long timeLimitExpiration;
@@ -545,7 +545,7 @@
{
if (controls == null)
{
- controls = new ArrayList<Control>(1);
+ controls = new ArrayList<>(1);
}
try
@@ -642,8 +642,7 @@
{
AttributeType t = e.getKey();
List<Attribute> oldAttributes = e.getValue();
- List<Attribute> newAttributes =
- new ArrayList<Attribute>(oldAttributes.size());
+ List<Attribute> newAttributes = new ArrayList<>(oldAttributes.size());
for (Attribute a : oldAttributes)
{
@@ -669,8 +668,7 @@
{
AttributeType t = e.getKey();
List<Attribute> oldAttributes = e.getValue();
- List<Attribute> newAttributes =
- new ArrayList<Attribute>(oldAttributes.size());
+ List<Attribute> newAttributes = new ArrayList<>(oldAttributes.size());
for (Attribute a : oldAttributes)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/ServerShutdownMonitor.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ServerShutdownMonitor.java
index 44b55d0..0d59d9b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/ServerShutdownMonitor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/ServerShutdownMonitor.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions copyright 2012-2014 ForgeRock AS.
+ * Portions copyright 2012-2015 ForgeRock AS.
*/
package org.opends.server.core;
@@ -79,7 +79,7 @@
// threads that are currently active. This can be an inexact science, so
// we'll make sure to allocate enough room for double the threads that we
// think are currently running.
- threadList = new LinkedList<Thread>();
+ threadList = new LinkedList<>();
ThreadGroup threadGroup = DirectoryThread.DIRECTORY_THREAD_GROUP;
Thread[] threadArray = new Thread[threadGroup.activeCount() * 2];
int numThreads = threadGroup.enumerate(threadArray, true);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/SubentryPasswordPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/core/SubentryPasswordPolicy.java
index c8c8dfa..80eaaf4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/SubentryPasswordPolicy.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/SubentryPasswordPolicy.java
@@ -110,7 +110,7 @@
/** Indicates if the password attribute uses auth password syntax. */
private final Boolean pAuthPasswordSyntax;
/** The set of password validators if any. */
- private final Set<DN> pValidatorNames = new HashSet<DN>();
+ private final Set<DN> pValidatorNames = new HashSet<>();
/** Used when logging errors due to invalid validator reference. */
private AtomicBoolean isAlreadyLogged = new AtomicBoolean();
@@ -654,11 +654,9 @@
{
if (!pValidatorNames.isEmpty())
{
- Collection<PasswordValidator<?>> values =
- new HashSet<PasswordValidator<?>>();
+ Collection<PasswordValidator<?>> values = new HashSet<>();
for (DN validatorDN : pValidatorNames){
- PasswordValidator<?> validator = DirectoryServer
- .getPasswordValidator(validatorDN);
+ PasswordValidator<?> validator = DirectoryServer.getPasswordValidator(validatorDN);
if (validator == null) {
PasswordValidator<?> errorValidator = new RejectPasswordValidator(
validatorDN.toString(), passwordPolicySubentryDN.toString());
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/SynchronizationProviderConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/SynchronizationProviderConfigManager.java
index 1ede4ec..17205c1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/SynchronizationProviderConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/SynchronizationProviderConfigManager.java
@@ -79,7 +79,7 @@
public SynchronizationProviderConfigManager(ServerContext serverContext)
{
this.serverContext = serverContext;
- registeredProviders = new ConcurrentHashMap<DN,SynchronizationProvider<SynchronizationProviderCfg>>();
+ registeredProviders = new ConcurrentHashMap<>();
}
/**
@@ -106,7 +106,7 @@
// Register as an add and delete listener so that we can
// be notified when new synchronization providers are added or existing
- // sycnhronization providers are removed.
+ // synchronization providers are removed.
root.addSynchronizationProviderAddListener(this);
root.addSynchronizationProviderDeleteListener(this);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/TrustManagerProviderConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/TrustManagerProviderConfigManager.java
index c4c1bae..c979af9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/TrustManagerProviderConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/TrustManagerProviderConfigManager.java
@@ -85,7 +85,7 @@
public TrustManagerProviderConfigManager(ServerContext serverContext)
{
this.serverContext = serverContext;
- providers = new ConcurrentHashMap<DN,TrustManagerProvider>();
+ providers = new ConcurrentHashMap<>();
}
/**
@@ -377,7 +377,7 @@
}
else
{
- List<LocalizableMessage> unacceptableReasons = new ArrayList<LocalizableMessage>();
+ List<LocalizableMessage> unacceptableReasons = new ArrayList<>();
if (!provider.isConfigurationAcceptable(configuration, unacceptableReasons))
{
String reasons = Utils.joinAsString(". ", unacceptableReasons);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/VirtualAttributeConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/VirtualAttributeConfigManager.java
index 2dc835e..ad1aee5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/VirtualAttributeConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/VirtualAttributeConfigManager.java
@@ -70,8 +70,7 @@
* A mapping between the DNs of the config entries and the associated virtual
* attribute rules.
*/
- private final ConcurrentMap<DN, VirtualAttributeRule> rules =
- new ConcurrentHashMap<DN, VirtualAttributeRule>();
+ private final ConcurrentMap<DN, VirtualAttributeRule> rules = new ConcurrentHashMap<>();
private final ServerContext serverContext;
@@ -130,7 +129,7 @@
loadProvider(className, cfg, true);
Map<LocalizableMessage, DirectoryException> reasons =
- new LinkedHashMap<LocalizableMessage, DirectoryException>();
+ new LinkedHashMap<>();
Set<SearchFilter> filters = buildFilters(cfg, reasons);
if (!reasons.isEmpty())
{
@@ -211,7 +210,7 @@
private Set<SearchFilter> buildFilters(VirtualAttributeCfg cfg,
Map<LocalizableMessage, DirectoryException> unacceptableReasons)
{
- Set<SearchFilter> filters = new LinkedHashSet<SearchFilter>();
+ Set<SearchFilter> filters = new LinkedHashSet<>();
for (String filterString : cfg.getFilter())
{
try
@@ -246,7 +245,7 @@
// Make sure that we can parse all of the search filters.
Map<LocalizableMessage, DirectoryException> reasons =
- new LinkedHashMap<LocalizableMessage, DirectoryException>();
+ new LinkedHashMap<>();
Set<SearchFilter> filters = buildFilters(configuration, reasons);
if (!reasons.isEmpty())
{
@@ -337,7 +336,7 @@
List<LocalizableMessage> unacceptableReasons)
{
Map<LocalizableMessage, DirectoryException> reasons =
- new LinkedHashMap<LocalizableMessage, DirectoryException>();
+ new LinkedHashMap<>();
buildFilters(cfg, reasons);
if (!reasons.isEmpty())
{
@@ -375,7 +374,7 @@
// Make sure that we can parse all of the search filters.
Map<LocalizableMessage, DirectoryException> reasons =
- new LinkedHashMap<LocalizableMessage, DirectoryException>();
+ new LinkedHashMap<>();
Set<SearchFilter> filters = buildFilters(configuration, reasons);
if (!reasons.isEmpty())
{
@@ -455,7 +454,7 @@
}
else
{
- List<LocalizableMessage> unacceptableReasons = new ArrayList<LocalizableMessage>();
+ List<LocalizableMessage> unacceptableReasons = new ArrayList<>();
if (!provider.isConfigurationAcceptable(cfg, unacceptableReasons))
{
String reasons = Utils.joinAsString(". ", unacceptableReasons);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/common/CSNTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/common/CSNTest.java
index 8feacb6..8e9dbc1 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/common/CSNTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/common/CSNTest.java
@@ -333,13 +333,13 @@
@DataProvider
public Iterator<Object[]> createCSNPairsToCompare()
{
- final List<Object> allCSNs = new ArrayList<Object>();
+ final List<Object> allCSNs = new ArrayList<>();
for (Object[] csnData : createCSNData())
{
allCSNs.addAll(Arrays.asList(csnData));
}
- final List<Object[]> results = new ArrayList<Object[]>();
+ final List<Object[]> results = new ArrayList<>();
for (Object csn1 : allCSNs)
{
for (Object csn2 : allCSNs)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/JEReplicaDBTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/JEReplicaDBTest.java
index 7b0012d..47aed25 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/JEReplicaDBTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/JEReplicaDBTest.java
@@ -115,7 +115,7 @@
// but use only 4 of them for update msg
// beforeCsn, middleCsn and afterCsn are not used
// in order to test cursor generation from a key not present in the log (before, in the middle, after)
- final List<CSN> usedCsns = new ArrayList<CSN>(Arrays.asList(sevenCsns));
+ final List<CSN> usedCsns = new ArrayList<>(Arrays.asList(sevenCsns));
usedCsns.remove(beforeCsn);
usedCsns.remove(middleCsn);
usedCsns.remove(afterCsn);
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/ReplicationDbEnvTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/ReplicationDbEnvTest.java
index 2ebaf16..b3c4b7f 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/ReplicationDbEnvTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/je/ReplicationDbEnvTest.java
@@ -20,7 +20,7 @@
*
* CDDL HEADER END
*
- * Copyright 2014 ForgeRock AS
+ * Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.replication.server.changelog.je;
@@ -117,7 +117,7 @@
final ReplicationDbEnv changelogStateDB = new TestableReplicationDbEnv();
// encode data
- final Map<byte[], byte[]> wholeState = new LinkedHashMap<byte[], byte[]>();
+ final Map<byte[], byte[]> wholeState = new LinkedHashMap<>();
put(wholeState, toGenIdEntry(baseDN, generationId));
for (Integer serverId : replicas)
{
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tasks/LdifFileWriter.java b/opendj-server-legacy/src/test/java/org/opends/server/tasks/LdifFileWriter.java
index ccad90a..f1a1899 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tasks/LdifFileWriter.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tasks/LdifFileWriter.java
@@ -79,7 +79,7 @@
throws IOException, InitializationException, MakeLDIFException
{
TemplateFile template = new TemplateFile(resourcePath, new Random(1));
- ArrayList<LocalizableMessage> warnings = new ArrayList<LocalizableMessage>();
+ ArrayList<LocalizableMessage> warnings = new ArrayList<>();
template.parse(templatePath, warnings);
makeLdif(ldifPath, template);
}
@@ -103,7 +103,7 @@
throws IOException, InitializationException, MakeLDIFException
{
TemplateFile template = new TemplateFile(resourcePath, new Random(1));
- ArrayList<LocalizableMessage> warnings = new ArrayList<LocalizableMessage>();
+ ArrayList<LocalizableMessage> warnings = new ArrayList<>();
template.parse(templateLines, warnings);
makeLdif(ldifPath, template);
}
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tasks/TestBackupAndRestore.java b/opendj-server-legacy/src/test/java/org/opends/server/tasks/TestBackupAndRestore.java
index 42399a7..fac4d71 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tasks/TestBackupAndRestore.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tasks/TestBackupAndRestore.java
@@ -160,7 +160,7 @@
private String[] backupTask(String... additionalLdif)
{
- final ArrayList<String> l = new ArrayList<String>(Arrays.asList(
+ final ArrayList<String> l = new ArrayList<>(Arrays.asList(
"dn: ds-task-id=" + UUID.randomUUID() + ",cn=Scheduled Tasks,cn=Tasks",
"objectclass: top",
"objectclass: ds-task",
@@ -173,7 +173,7 @@
private String[] restoreTask(String... additionalLdif)
{
- final ArrayList<String> l = new ArrayList<String>(Arrays.asList(
+ final ArrayList<String> l = new ArrayList<>(Arrays.asList(
"dn: ds-task-id=" + UUID.randomUUID() + ",cn=Scheduled Tasks,cn=Tasks",
"objectclass: top",
"objectclass: ds-task",
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tools/makeldif/MakeLDIFTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/tools/makeldif/MakeLDIFTestCase.java
index 411a2b9..95cb9c7 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tools/makeldif/MakeLDIFTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tools/makeldif/MakeLDIFTestCase.java
@@ -87,7 +87,7 @@
// Previous behaviour showed "missingVar" on line 5.
TemplateFile templateFile = new TemplateFile(resourcePath);
- List<LocalizableMessage> warns = new ArrayList<LocalizableMessage>();
+ List<LocalizableMessage> warns = new ArrayList<>();
try
{
@@ -160,7 +160,7 @@
throws Exception
{
TemplateFile templateFile = new TemplateFile(resourcePath);
- List<LocalizableMessage> warns = new ArrayList<LocalizableMessage>();
+ List<LocalizableMessage> warns = new ArrayList<>();
templateFile.parse(lines, warns);
assertTrue(warns.isEmpty(),"Warnings in parsing test template " + testName );
}
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElementTest.java b/opendj-server-legacy/src/test/java/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElementTest.java
index 655eb47..4782f75 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElementTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElementTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS.
+ * Portions Copyright 2011-2015 ForgeRock AS.
*/
package org.opends.server.workflowelement.localbackend;
@@ -272,10 +272,10 @@
private void modifyAttribute(String baseDN, ModificationType modType, String attributeName, String attributeValue)
throws Exception
{
- ArrayList<Modification> mods = new ArrayList<Modification>();
+ ArrayList<Modification> mods = new ArrayList<>();
Attribute attributeToModify = Attributes.create(attributeName, attributeValue);
mods.add(new Modification(modType, attributeToModify));
ModifyOperation modifyOperation = getRootConnection().processModify(DN.valueOf(baseDN), mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
}
-}
\ No newline at end of file
+}
--
Gitblit v1.10.0