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/LDAPCollectionResourceProvider.java | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/LDAPCollectionResourceProvider.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/LDAPCollectionResourceProvider.java
index 32d91f2..c738021 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/LDAPCollectionResourceProvider.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/LDAPCollectionResourceProvider.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;
@@ -264,11 +264,9 @@
public void handleResult(final DN dn) {
// Convert the patch operations to LDAP modifications.
List<Promise<List<Modification>, ResourceException>> promises =
- new ArrayList<Promise<List<Modification>, ResourceException>>(
- request.getPatchOperations().size());
+ new ArrayList<>(request.getPatchOperations().size());
for (final PatchOperation operation : request.getPatchOperations()) {
- final ResultHandlerFromPromise<List<Modification>> handler =
- new ResultHandlerFromPromise<List<Modification>>();
+ final ResultHandlerFromPromise<List<Modification>> handler = new ResultHandlerFromPromise<>();
attributeMapper.patch(c, new JsonPointer(), operation, handler);
promises.add(handler.promise);
}
@@ -735,12 +733,12 @@
final Set<String> requestedLDAPAttributes;
if (requestedAttributes.isEmpty()) {
// Full read.
- requestedLDAPAttributes = new LinkedHashSet<String>();
+ requestedLDAPAttributes = new LinkedHashSet<>();
attributeMapper.getLDAPAttributes(c, new JsonPointer(), new JsonPointer(),
requestedLDAPAttributes);
} else {
// Partial read.
- requestedLDAPAttributes = new LinkedHashSet<String>(requestedAttributes.size());
+ requestedLDAPAttributes = new LinkedHashSet<>(requestedAttributes.size());
for (final JsonPointer requestedAttribute : requestedAttributes) {
attributeMapper.getLDAPAttributes(c, new JsonPointer(), requestedAttribute,
requestedLDAPAttributes);
@@ -760,10 +758,9 @@
new QueryFilterVisitor<Void, ResultHandler<Filter>>() {
@Override
public Void visitAndFilter(final ResultHandler<Filter> p, final List<QueryFilter> subFilters) {
- List<Promise<Filter, ResourceException>> promises =
- new ArrayList<Promise<Filter, ResourceException>>(subFilters.size());
+ List<Promise<Filter, ResourceException>> promises = new ArrayList<>(subFilters.size());
for (final QueryFilter subFilter : subFilters) {
- final ResultHandlerFromPromise<Filter> handler = new ResultHandlerFromPromise<Filter>();
+ final ResultHandlerFromPromise<Filter> handler = new ResultHandlerFromPromise<>();
subFilter.accept(this, handler);
promises.add(handler.promise);
}
@@ -891,10 +888,9 @@
@Override
public Void visitOrFilter(final ResultHandler<Filter> p, final List<QueryFilter> subFilters) {
- List<Promise<Filter, ResourceException>> promises =
- new ArrayList<Promise<Filter, ResourceException>>(subFilters.size());
+ List<Promise<Filter, ResourceException>> promises = new ArrayList<>(subFilters.size());
for (final QueryFilter subFilter : subFilters) {
- final ResultHandlerFromPromise<Filter> handler = new ResultHandlerFromPromise<Filter>();
+ final ResultHandlerFromPromise<Filter> handler = new ResultHandlerFromPromise<>();
subFilter.accept(this, handler);
promises.add(handler.promise);
}
--
Gitblit v1.10.0