Fix OPENDJ-1137: ConnectionEntryReader does not provide a means for accessi...

Matthew Swift

13.57.2013 7241cc815fc69f64b867d7b0250b616d8fadf0f4

Fix OPENDJ-1137: ConnectionEntryReader does not provide a means for accessing controls in the search result

* fixed checkstyle failure (ran with -Dprecommit instead of -Pprecommit!).

 opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryReaderTestCase.java

@@ -253,38 +253,39 @@

    private ConnectionEntryReader newReader(final Object... responses) {
        final Connection connection = mock(Connection.class);
        when(
                connection.searchAsync(same(SEARCH), (IntermediateResponseHandler) isNull(),
                        any(SearchResultHandler.class))).thenAnswer(
                new Answer<FutureResult<Result>>() {
                    @Override
                    public FutureResult<Result> answer(final InvocationOnMock invocation)
                            throws Throwable {
                        // Execute handler and return future.
                        final SearchResultHandler handler =
                                (SearchResultHandler) invocation.getArguments()[2];
                        if (handler != null) {
                            for (int i = 0; i < responses.length; i++) {
                                final Object response = responses[i];
                                if (response instanceof SearchResultEntry) {
                                    handler.handleEntry((SearchResultEntry) response);
                                } else if (response instanceof SearchResultReference) {
                                    handler.handleReference((SearchResultReference) response);
                                } else if (((Result) response).isSuccess()) {
                                    handler.handleResult((Result) response);
        // @formatter:off
        when(connection.searchAsync(same(SEARCH), (IntermediateResponseHandler) isNull(),
                any(SearchResultHandler.class))).thenAnswer(
                        new Answer<FutureResult<Result>>() {
                            @Override
                            public FutureResult<Result> answer(final InvocationOnMock invocation)
                                    throws Throwable {
                                // Execute handler and return future.
                                final SearchResultHandler handler =
                                        (SearchResultHandler) invocation.getArguments()[2];
                                if (handler != null) {
                                    for (int i = 0; i < responses.length; i++) {
                                        final Object response = responses[i];
                                        if (response instanceof SearchResultEntry) {
                                            handler.handleEntry((SearchResultEntry) response);
                                        } else if (response instanceof SearchResultReference) {
                                            handler.handleReference((SearchResultReference) response);
                                        } else if (((Result) response).isSuccess()) {
                                            handler.handleResult((Result) response);
                                        } else {
                                            handler.handleErrorResult(newErrorResult((Result) response));
                                        }
                                    }
                                }
                                final Result result = (Result) responses[responses.length - 1];
                                if (result.isSuccess()) {
                                    return new CompletedFutureResult<Result>(result);
                                } else {
                                    handler.handleErrorResult(newErrorResult((Result) response));
                                    return new CompletedFutureResult<Result>(newErrorResult(result));
                                }
                            }
                        }
                        final Result result = (Result) responses[responses.length - 1];
                        if (result.isSuccess()) {
                            return new CompletedFutureResult<Result>(result);
                        } else {
                            return new CompletedFutureResult<Result>(newErrorResult(result));
                        }
                    }
                });
                        });
        // @formatter:on
        return new ConnectionEntryReader(connection, SEARCH);
    }