From 30310f5e5e798ac072725e60d8b2e09ab3130dd5 Mon Sep 17 00:00:00 2001 From: Pavol Mederly Date: Wed, 14 Dec 2016 11:56:30 +0100 Subject: [PATCH] Minor refactorings. --- .../midpoint/prism/delta/PropertyDelta.java | 26 +++++++------------ .../provisioning/impl/ConstraintsChecker.java | 2 +- .../impl/ProvisioningServiceImpl.java | 16 +++--------- .../ucf/impl/ConnectorInstanceIcfImpl.java | 6 ++--- 4 files changed, 17 insertions(+), 33 deletions(-) diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/PropertyDelta.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/PropertyDelta.java index 97484253ef8..f46a2403753 100644 --- a/infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/PropertyDelta.java +++ b/infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/PropertyDelta.java @@ -282,28 +282,22 @@ public PropertyDelta narrow(PrismObject object) { } public PropertyDelta narrow(PrismObject object, final MatchingRule matchingRule) { - Comparator> comparator = new Comparator>() { - @Override - public int compare(PrismPropertyValue o1, PrismPropertyValue o2) { - if (o1.equalsComplex(o2, true, false, matchingRule)) { - return 0; - } else { - return 1; - } + Comparator> comparator = (o1, o2) -> { + if (o1.equalsComplex(o2, true, false, matchingRule)) { + return 0; + } else { + return 1; } }; return (PropertyDelta) super.narrow(object, comparator); } public boolean isRedundant(PrismObject object, final MatchingRule matchingRule) { - Comparator> comparator = new Comparator>() { - @Override - public int compare(PrismPropertyValue o1, PrismPropertyValue o2) { - if (o1.equalsComplex(o2, true, false, matchingRule)) { - return 0; - } else { - return 1; - } + Comparator> comparator = (o1, o2) -> { + if (o1.equalsComplex(o2, true, false, matchingRule)) { + return 0; + } else { + return 1; } }; return super.isRedundant(object, comparator); diff --git a/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConstraintsChecker.java b/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConstraintsChecker.java index cacd6e83fbd..7967a8b3bba 100644 --- a/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConstraintsChecker.java +++ b/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConstraintsChecker.java @@ -195,7 +195,7 @@ private boolean checkUniqueness(String oid, PrismProperty identifier, ObjectQuer List> foundObjects = provisioningService.searchObjects(ShadowType.class, query, options, task, result); if (LOGGER.isTraceEnabled()) { LOGGER.trace("Uniqueness check of {} resulted in {} results, using query:\n{}", - new Object[]{identifier, foundObjects.size(), query.debugDump()}); + identifier, foundObjects.size(), query.debugDump()); } if (foundObjects.isEmpty()) { Cache.setOk(resourceType.getOid(), oid, shadowDefinition.getTypeName(), identifier.getDefinition().getName(), identifier.getValues()); diff --git a/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java b/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java index 5e512f092be..8470aa6f5f2 100644 --- a/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java +++ b/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java @@ -501,7 +501,7 @@ public SearchResultList> searchObjects(Cla result.addParam("query", query); result.addContext(OperationResult.CONTEXT_IMPLEMENTATION_CLASS, ProvisioningServiceImpl.class); - final SearchResultList> objListType = new SearchResultList(new ArrayList>()); + final SearchResultList> objListType = new SearchResultList<>(new ArrayList>()); SearchResultMetadata metadata; try { @@ -514,12 +514,7 @@ public SearchResultList> searchObjects(Cla return objects; } - final ResultHandler handler = new ResultHandler() { - @Override - public boolean handle(PrismObject object, OperationResult parentResult) { - return objListType.add(object); - } - }; + final ResultHandler handler = (object, parentResult1) -> objListType.add(object); metadata = searchObjectsIterative(type, query, options, handler, task, result); @@ -1146,12 +1141,7 @@ public SearchResultMetadata searchObjectsIterative(final if (!ShadowType.class.isAssignableFrom(type)){ - ResultHandler internalHandler = new ResultHandler() { - @Override - public boolean handle(PrismObject object, OperationResult objResult) { - return handleRepoObject(type, object, options, handler, objResult); - } - }; + ResultHandler internalHandler = (object, objResult) -> handleRepoObject(type, object, options, handler, objResult); Collection> repoOptions = null; if (GetOperationOptions.isReadOnly(rootOptions)) { diff --git a/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java b/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java index 08bb463b34c..3c7a451a456 100644 --- a/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java +++ b/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java @@ -789,9 +789,9 @@ private void parseResourceSchema(org.identityconnectors.framework.common.objects QName attrXsdType = icfTypeToXsdType(attributeInfo.getType(), false); if (LOGGER.isTraceEnabled()) { - LOGGER.trace("Attr conversion ICF: {}({}) -> XSD: {}({})", - new Object[]{icfName, attributeInfo.getType().getSimpleName(), - PrettyPrinter.prettyPrint(attrXsdName), PrettyPrinter.prettyPrint(attrXsdType)}); + LOGGER.trace("Attr conversion ICF: {}({}) -> XSD: {}({})", + icfName, attributeInfo.getType().getSimpleName(), + PrettyPrinter.prettyPrint(attrXsdName), PrettyPrinter.prettyPrint(attrXsdType)); } // Create ResourceObjectAttributeDefinition, which is midPoint