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/api/CompressedSchema.java | 49 +++++++++----------------------------------------
1 files changed, 9 insertions(+), 40 deletions(-)
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);
--
Gitblit v1.10.0