Minor changes.

Evolveum · Apr 3, 2017 · cc161f2 · cc161f2
1 parent c20baa5
commit cc161f2
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 37 deletions.
diff --git a/...main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCaseDtoProvider.java b/...main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCaseDtoProvider.java
@@ -42,6 +42,9 @@
 import java.util.Iterator;
 import java.util.List;
 
+import static com.evolveum.midpoint.schema.GetOperationOptions.*;
+import static com.evolveum.midpoint.schema.SelectorOptions.createCollection;
+
 /**
  * @author lazyman
  * @author mederly
@@ -53,7 +56,7 @@ public class CertCaseDtoProvider extends BaseSortableDataProvider<CertCaseOrWork
     private static final String OPERATION_SEARCH_OBJECTS = DOT_CLASS + "searchObjects";
     private static final String OPERATION_COUNT_OBJECTS = DOT_CLASS + "countObjects";
 
-    String campaignOid;
+    private String campaignOid;
     // case query is stored in super.query
 
     public CertCaseDtoProvider(Component component) {
@@ -69,12 +72,8 @@ public Iterator<CertCaseOrWorkItemDto> internalIterator(long first, long count)
         OperationResult result = task.getResult();
         try {
             ObjectPaging paging = createPaging(first, count);
-
-            Collection<SelectorOptions<GetOperationOptions>> resolveNames =
-                    SelectorOptions.createCollection(GetOperationOptions.createResolveNames());
-
+            Collection<SelectorOptions<GetOperationOptions>> resolveNames = createCollection(createResolveNames());
             List<AccessCertificationCaseType> caseList = searchCases(campaignOid, paging, resolveNames, task, result);
-
             for (AccessCertificationCaseType _case : caseList) {
                 getAvailableData().add(new CertCaseDto(_case, getPage(), task, result));
             }
@@ -93,7 +92,7 @@ public Iterator<CertCaseOrWorkItemDto> internalIterator(long first, long count)
         return getAvailableData().iterator();
     }
 
-    protected void handleNotSuccessOrHandledErrorInIterator(OperationResult result){
+    private void handleNotSuccessOrHandledErrorInIterator(OperationResult result){
         getPage().showResult(result);
         throw new RestartResponseException(PageError.class);
     }
@@ -124,6 +123,7 @@ protected int internalSize() {
         return count;
     }
 
+    @SuppressWarnings("unused")
     public String getCampaignOid() {
         return campaignOid;
     }

diff --git a/...in/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCaseOrWorkItemDto.java b/...in/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCaseOrWorkItemDto.java
@@ -42,6 +42,7 @@ public class CertCaseOrWorkItemDto extends Selectable {
 
     public static final String F_OBJECT_NAME = "objectName";
     public static final String F_TARGET_NAME = "targetName";
+	@SuppressWarnings("unused")
     public static final String F_TARGET_TYPE = "targetType";
     public static final String F_CAMPAIGN_NAME = "campaignName";
     public static final String F_REVIEW_REQUESTED = "reviewRequested";
@@ -53,7 +54,7 @@ public class CertCaseOrWorkItemDto extends Selectable {
     private String targetName;
     private String deadlineAsString;
 
-    public CertCaseOrWorkItemDto(@NotNull AccessCertificationCaseType _case, PageBase page) {
+    CertCaseOrWorkItemDto(@NotNull AccessCertificationCaseType _case, PageBase page) {
         this.certCase = _case;
         this.objectName = getName(_case.getObjectRef());
         this.targetName = getName(_case.getTargetRef());
@@ -128,7 +129,8 @@ public Integer getCampaignStageCount() {
         return CertCampaignTypeUtil.getNumberOfStages(campaign);
     }
 
-    public Date getReviewRequested() {
+    @SuppressWarnings("unused")
+	public Date getReviewRequested() {
         XMLGregorianCalendar date = certCase.getCurrentReviewRequestedTimestamp();
         return XmlTypeConverter.toDate(date);
     }
@@ -188,13 +190,15 @@ private String computeDeadlineAsString(PageBase page) {
         }
     }
 
+	@SuppressWarnings("unused")
     public String getDeadlineAsString() {
         return deadlineAsString;
     }
 
 	/**
 	 * Preliminary implementation. Eventually we will create a list of hyperlinks pointing to the actual objects.
 	 */
+	@SuppressWarnings("unused")
 	public String getConflictingTargets() {
     	if (!(certCase instanceof AccessCertificationAssignmentCaseType)) {
     		return "";

diff --git a/.../java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDecisionDtoProvider.java b/.../java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDecisionDtoProvider.java
@@ -37,6 +37,9 @@
 import java.util.Iterator;
 import java.util.List;
 
+import static com.evolveum.midpoint.schema.GetOperationOptions.createResolveNames;
+import static com.evolveum.midpoint.schema.SelectorOptions.createCollection;
+
 /**
  * @author lazyman
  * @author mederly
@@ -69,20 +72,13 @@ public Iterator<CertWorkItemDto> internalIterator(long first, long count) {
             Task task = getPage().createSimpleTask(OPERATION_SEARCH_OBJECTS);
 
             ObjectQuery caseQuery = getQuery();
-            if (caseQuery == null) {
-            	caseQuery = new ObjectQuery();
-            } else {
-                caseQuery = caseQuery.clone();
-            }
+            caseQuery = caseQuery != null ? caseQuery.clone() : new ObjectQuery();
             caseQuery.setPaging(paging);
             SearchingUtils.hackPaging(caseQuery);
 
-            Collection<SelectorOptions<GetOperationOptions>> resolveNames =
-                    SelectorOptions.createCollection(GetOperationOptions.createResolveNames());
-
+            Collection<SelectorOptions<GetOperationOptions>> resolveNames = createCollection(createResolveNames());
             AccessCertificationService acs = getPage().getCertificationService();
             List<AccessCertificationWorkItemType> workitems = acs.searchOpenWorkItems(caseQuery, notDecidedOnly, resolveNames, task, result);
-
             for (AccessCertificationWorkItemType workItem : workitems) {
                 getAvailableData().add(new CertWorkItemDto(workItem, getPage()));
             }

diff --git a/...o-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/NameResolutionHelper.java b/...o-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/NameResolutionHelper.java
@@ -48,25 +48,22 @@ public <C extends Containerable> void resolveNamesIfRequested(Session session, P
         GetOperationOptions rootOptions = SelectorOptions.findRootOptions(options);
         if (GetOperationOptions.isResolveNames(rootOptions)) {
             final List<String> oidsToResolve = new ArrayList<>();
-            Visitor oidExtractor = new Visitor() {
-                @Override
-                public void visit(Visitable visitable) {
-                    if (visitable instanceof PrismReferenceValue) {
-                        PrismReferenceValue value = (PrismReferenceValue) visitable;
-                        if (value.getTargetName() != null) {    // just for sure
-                            return;
-                        }
-                        if (value.getObject() != null) {        // improbable but possible
-                            value.setTargetName(value.getObject().getName());
-                            return;
-                        }
-                        if (value.getOid() == null) {           // shouldn't occur as well
-                            return;
-                        }
-                        oidsToResolve.add(value.getOid());
-                    }
-                }
-            };
+            Visitor oidExtractor = visitable -> {
+				if (visitable instanceof PrismReferenceValue) {
+					PrismReferenceValue value = (PrismReferenceValue) visitable;
+					if (value.getTargetName() != null) {    // just for sure
+						return;
+					}
+					if (value.getObject() != null) {        // improbable but possible
+						value.setTargetName(value.getObject().getName());
+						return;
+					}
+					if (value.getOid() == null) {           // shouldn't occur as well
+						return;
+					}
+					oidsToResolve.add(value.getOid());
+				}
+			};
             containerValue.accept(oidExtractor);
 
 			if (!oidsToResolve.isEmpty()) {