From 0b84d2442ea178dc9989a239f26be28327476c48 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 28 Apr 2015 09:24:26 +0000
Subject: [PATCH] AutoRefactor'ed use diamond operator
---
opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ObjectAttributeMapper.java | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ObjectAttributeMapper.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ObjectAttributeMapper.java
index 8a53292..b33026f 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ObjectAttributeMapper.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ObjectAttributeMapper.java
@@ -11,7 +11,7 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions Copyright [year] [name of copyright owner]".
*
- * Copyright 2012-2014 ForgeRock AS.
+ * Copyright 2012-2015 ForgeRock AS.
*/
package org.forgerock.opendj.rest2ldap;
@@ -61,7 +61,7 @@
}
}
- private final Map<String, Mapping> mappings = new LinkedHashMap<String, Mapping>();
+ private final Map<String, Mapping> mappings = new LinkedHashMap<>();
ObjectAttributeMapper() {
// Nothing to do.
@@ -226,12 +226,8 @@
*/
return null;
} else {
- /*
- * Combine the sub-attributes into a single
- * JSON object.
- */
- final Map<String, Object> result =
- new LinkedHashMap<String, Object>(value.size());
+ // Combine the sub-attributes into a single JSON object.
+ final Map<String, Object> result = new LinkedHashMap<>(value.size());
for (final Map.Entry<String, JsonValue> e : value) {
result.put(e.getKey(), e.getValue().getObject());
}
@@ -297,7 +293,7 @@
case 1:
return value.get(0);
default:
- final List<T> attributes = new ArrayList<T>(value.size());
+ final List<T> attributes = new ArrayList<>(value.size());
for (final List<T> a : value) {
attributes.addAll(a);
}
@@ -313,7 +309,7 @@
*/
private Map<String, Mapping> checkMapping(final JsonPointer path, final JsonValue v)
throws ResourceException {
- final Map<String, Mapping> missingMappings = new LinkedHashMap<String, Mapping>(mappings);
+ final Map<String, Mapping> missingMappings = new LinkedHashMap<>(mappings);
if (v != null && !v.isNull()) {
if (v.isMap()) {
for (final String attribute : v.asMap().keySet()) {
--
Gitblit v1.10.0