Skip to content

Commit

Permalink
Fix broken method declaration indenting
Browse files Browse the repository at this point in the history
  • Loading branch information
mederly committed Sep 28, 2021
1 parent 4768a79 commit 0de7d5a
Show file tree
Hide file tree
Showing 15 changed files with 45 additions and 37 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -368,8 +368,10 @@ <T extends Containerable> Integer countContainers(Class<T> type, ObjectQuery que
* wrong query format
*/
<T extends ObjectType> SearchResultMetadata searchObjectsIterative(Class<T> type, ObjectQuery query,
ResultHandler<T> handler, Collection<SelectorOptions<GetOperationOptions>> options, Task task, OperationResult parentResult)
throws SchemaException, ObjectNotFoundException, CommunicationException, ConfigurationException, SecurityViolationException, ExpressionEvaluationException;
ResultHandler<T> handler, Collection<SelectorOptions<GetOperationOptions>> options, Task task,
OperationResult parentResult)
throws SchemaException, ObjectNotFoundException, CommunicationException, ConfigurationException,
SecurityViolationException, ExpressionEvaluationException;

/**
* <p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,9 @@ <T extends ObjectType> List<T> searchObjects(Class<T> type, ObjectQuery query) t
* wrong query format
*/
<T extends ObjectType> void searchObjectsIterative(Class<T> type, ObjectQuery query,
ResultHandler<T> handler, Collection<SelectorOptions<GetOperationOptions>> options) throws SchemaException, ObjectNotFoundException, CommunicationException, ConfigurationException, SecurityViolationException, ExpressionEvaluationException;
ResultHandler<T> handler, Collection<SelectorOptions<GetOperationOptions>> options) throws SchemaException,
ObjectNotFoundException, CommunicationException, ConfigurationException, SecurityViolationException,
ExpressionEvaluationException;

/**
* <p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1154,8 +1154,10 @@ protected void logQuery(ObjectQuery query) {

@Override
public <T extends ObjectType> SearchResultMetadata searchObjectsIterative(Class<T> type, ObjectQuery origQuery,
final ResultHandler<T> handler, final Collection<SelectorOptions<GetOperationOptions>> rawOptions,
final Task task, OperationResult parentResult) throws SchemaException, ObjectNotFoundException, CommunicationException, ConfigurationException, SecurityViolationException, ExpressionEvaluationException {
ResultHandler<T> handler, Collection<SelectorOptions<GetOperationOptions>> rawOptions,
Task task, OperationResult parentResult)
throws SchemaException, ObjectNotFoundException, CommunicationException, ConfigurationException,
SecurityViolationException, ExpressionEvaluationException {

Validate.notNull(type, "Object type must not be null.");
Validate.notNull(parentResult, "Result type must not be null.");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@
public class ReportDataCreationActivityExecution
extends ContainerSearchBasedActivityExecution
<Containerable,
DistributedReportExportWorkDefinition,
DistributedReportExportActivityHandler,
ReportExportWorkStateType> {
DistributedReportExportWorkDefinition,
DistributedReportExportActivityHandler,
ReportExportWorkStateType> {

private static final Trace LOGGER = TraceManager.getTrace(ReportDataCreationActivityExecution.class);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -273,9 +273,11 @@ <T extends ObjectType> Integer countObjects(Class<T> type, ObjectQuery query, Co
* @throws SecurityViolationException
* Security violation while communicating with the connector or processing provisioning policies
*/
<T extends ObjectType> SearchResultMetadata searchObjectsIterative(Class<T> type, ObjectQuery query, Collection<SelectorOptions<GetOperationOptions>> options,
final ResultHandler<T> handler, Task task, final OperationResult parentResult)
throws SchemaException, ObjectNotFoundException, CommunicationException, ConfigurationException, SecurityViolationException, ExpressionEvaluationException;
<T extends ObjectType> SearchResultMetadata searchObjectsIterative(Class<T> type, ObjectQuery query,
Collection<SelectorOptions<GetOperationOptions>> options, ResultHandler<T> handler, Task task,
OperationResult parentResult)
throws SchemaException, ObjectNotFoundException, CommunicationException, ConfigurationException,
SecurityViolationException, ExpressionEvaluationException;

/**
* Modifies object using relative change description. Must fail if user with
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -802,9 +802,9 @@ public void refreshShadow(PrismObject<ShadowType> shadow, ProvisioningOperationO

// TODO: move to ResourceManager and ConnectorManager
// the shadow-related code is already in the ShadowCache
private <T extends ObjectType> boolean handleRepoObject(final Class<T> type, PrismObject<T> object,
final Collection<SelectorOptions<GetOperationOptions>> options,
final ResultHandler<T> handler, Task task, final OperationResult objResult) {
private <T extends ObjectType> boolean handleRepoObject(Class<T> type, PrismObject<T> object,
Collection<SelectorOptions<GetOperationOptions>> options,
ResultHandler<T> handler, Task task, OperationResult objResult) {

PrismObject<T> completeObject;
try {
Expand Down Expand Up @@ -833,8 +833,8 @@ private <T extends ObjectType> boolean handleRepoObject(final Class<T> type, Pri
@SuppressWarnings({ "unchecked" })
@Override
public <T extends ObjectType> SearchResultMetadata searchObjectsIterative(Class<T> type, ObjectQuery query,
Collection<SelectorOptions<GetOperationOptions>> options, ResultHandler<T> handler, Task task,
OperationResult parentResult) throws SchemaException, ObjectNotFoundException, CommunicationException,
Collection<SelectorOptions<GetOperationOptions>> options, ResultHandler<T> handler, Task task,
OperationResult parentResult) throws SchemaException, ObjectNotFoundException, CommunicationException,
ConfigurationException, SecurityViolationException, ExpressionEvaluationException {

Validate.notNull(parentResult, "Operation result must not be null.");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -385,9 +385,9 @@ public Integer countObjects(ObjectQuery query, Task task, final OperationResult
}
}

private SearchResultMetadata searchShadowsInRepositoryIteratively(final ProvisioningContext ctx,
ObjectQuery query, Collection<SelectorOptions<GetOperationOptions>> originalOptions,
final ResultHandler<ShadowType> shadowHandler, OperationResult parentResult)
private SearchResultMetadata searchShadowsInRepositoryIteratively(ProvisioningContext ctx,
ObjectQuery query, Collection<SelectorOptions<GetOperationOptions>> originalOptions,
ResultHandler<ShadowType> shadowHandler, OperationResult parentResult)
throws SchemaException, ConfigurationException, ObjectNotFoundException,
CommunicationException, ExpressionEvaluationException {
// This is because we need to apply definitions later
Expand All @@ -398,7 +398,7 @@ private SearchResultMetadata searchShadowsInRepositoryIteratively(final Provisio

@NotNull
private ResultHandler<ShadowType> createRepoShadowHandler(ProvisioningContext ctx,
Collection<SelectorOptions<GetOperationOptions>> options, ResultHandler<ShadowType> shadowHandler) {
Collection<SelectorOptions<GetOperationOptions>> options, ResultHandler<ShadowType> shadowHandler) {
return (PrismObject<ShadowType> shadow, OperationResult objResult) -> {
try {
processRepoShadow(ctx, shadow, options, objResult);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ public <T extends ObjectType> SearchResultList<PrismObject<T>> searchObjects(@No

@Override
public <T extends ObjectType> SearchResultMetadata searchObjectsIterative(Class<T> type, ObjectQuery query,
ResultHandler<T> handler, Collection<SelectorOptions<GetOperationOptions>> options,
boolean strictlySequential, OperationResult parentResult) throws SchemaException {
ResultHandler<T> handler, Collection<SelectorOptions<GetOperationOptions>> options,
boolean strictlySequential, OperationResult parentResult) throws SchemaException {
return searchOpHandler.searchObjectsIterative(type, query, handler, options, strictlySequential, parentResult);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ final class CachingResultHandler<T extends ObjectType> implements ResultHandler<
private final List<PrismObject<T>> objects = new ArrayList<>();

CachingResultHandler(ResultHandler<T> handler, boolean queryCacheable, boolean readOnly, long started,
Class<T> type, CacheUpdater cacheUpdater) {
Class<T> type, CacheUpdater cacheUpdater) {
this.originalHandler = handler;
this.queryCacheable = queryCacheable;
this.readOnly = readOnly;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ public <T extends ObjectType> SearchResultList<PrismObject<T>> searchObjects(Cla
}

public <T extends ObjectType> SearchResultMetadata searchObjectsIterative(Class<T> type, ObjectQuery query,
ResultHandler<T> handler, Collection<SelectorOptions<GetOperationOptions>> options,
boolean strictlySequential, OperationResult parentResult) throws SchemaException {
ResultHandler<T> handler, Collection<SelectorOptions<GetOperationOptions>> options,
boolean strictlySequential, OperationResult parentResult) throws SchemaException {

SearchOpExecution<T> exec = initializeExecution(type, query, options, parentResult, SEARCH_OBJECTS_ITERATIVE);
ReportingResultHandler<T> reportingHandler = new ReportingResultHandler<>(handler, exec);
Expand Down Expand Up @@ -262,8 +262,8 @@ private <T extends ObjectType> SearchResultList<PrismObject<T>> searchObjectsInt
}

private <T extends ObjectType> SearchResultMetadata searchObjectsIterativeInternal(Class<T> type, ObjectQuery query,
ResultHandler<T> handler, Collection<SelectorOptions<GetOperationOptions>> options,
boolean strictlySequential, OperationResult parentResult) throws SchemaException {
ResultHandler<T> handler, Collection<SelectorOptions<GetOperationOptions>> options,
boolean strictlySequential, OperationResult parentResult) throws SchemaException {
Long startTime = repoOpStart();
try {
return repositoryService.searchObjectsIterative(type, query, handler, options, strictlySequential, parentResult);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ public class RepoObjectResolver implements ObjectResolver {

@Override
public <O extends ObjectType> void searchIterative(Class<O> type, ObjectQuery query,
Collection<SelectorOptions<GetOperationOptions>> options, ResultHandler<O> handler, Task task,
OperationResult parentResult)
Collection<SelectorOptions<GetOperationOptions>> options, ResultHandler<O> handler, Task task,
OperationResult parentResult)
throws SchemaException {
cacheRepositoryService.searchObjectsIterative(type, query, handler, options, true, parentResult);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -873,8 +873,8 @@ public <T extends ObjectType> String getVersion(

@Override
public <T extends ObjectType> SearchResultMetadata searchObjectsIterative(Class<T> type, ObjectQuery query,
ResultHandler<T> handler, Collection<SelectorOptions<GetOperationOptions>> options, boolean strictlySequential,
OperationResult result) throws SchemaException {
ResultHandler<T> handler, Collection<SelectorOptions<GetOperationOptions>> options, boolean strictlySequential,
OperationResult result) throws SchemaException {
Validate.notNull(type, "Object type must not be null.");
Validate.notNull(handler, "Result handler must not be null.");
Validate.notNull(result, "Operation result must not be null.");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -865,7 +865,7 @@ public <T extends ObjectType> void searchObjectsIterativeAttempt(Class<T> type,
}

public <T extends ObjectType> void searchObjectsIterativeByPaging(Class<T> type, ObjectQuery query,
ResultHandler<T> handler, Collection<SelectorOptions<GetOperationOptions>> options, OperationResult result)
ResultHandler<T> handler, Collection<SelectorOptions<GetOperationOptions>> options, OperationResult result)
throws SchemaException {

try {
Expand Down Expand Up @@ -987,7 +987,7 @@ public <T extends ObjectType> void searchObjectsIterativeByPagingStrictlySequent
}

public <T extends ObjectType> void searchObjectsIterativeByFetchAll(Class<T> type, ObjectQuery query,
ResultHandler<T> handler, Collection<SelectorOptions<GetOperationOptions>> options, OperationResult result)
ResultHandler<T> handler, Collection<SelectorOptions<GetOperationOptions>> options, OperationResult result)
throws SchemaException {
try {
SearchResultList<PrismObject<T>> objects = repositoryService.searchObjects(type, query, options, result);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ public <O extends ObjectType> PrismObject<O> getObject(Class<O> expectedType, St
}

public <O extends ObjectType> void searchIterative(Class<O> type, ObjectQuery query,
Collection<SelectorOptions<GetOperationOptions>> options, ResultHandler<O> handler, Object task,
OperationResult parentResult)
Collection<SelectorOptions<GetOperationOptions>> options, ResultHandler<O> handler, Object task,
OperationResult parentResult)
throws SchemaException {
cacheRepositoryService.searchObjectsIterative(type, query, handler, options, true, parentResult);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -629,8 +629,8 @@ public <T extends ObjectType> SearchResultList<PrismObject<T>> searchObjects(Cla

@Override
public <T extends ObjectType> SearchResultMetadata searchObjectsIterative(Class<T> type,
ObjectQuery query, Collection<SelectorOptions<GetOperationOptions>> options,
ResultHandler<T> handler, OperationResult parentResult) throws SchemaException {
ObjectQuery query, Collection<SelectorOptions<GetOperationOptions>> options,
ResultHandler<T> handler, OperationResult parentResult) throws SchemaException {
OperationResult result = parentResult.createMinorSubresult(DOT_INTERFACE + "searchObjects");
result.addParam("objectType", type);
result.addParam("query", query);
Expand Down

0 comments on commit 0de7d5a

Please sign in to comment.