Rename SchemaHelper to SchemaService

This is the first step towards providing static SchemaService
instance, e.g. to fix MID-6890.

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/BasePanel.java

@@ -6,9 +6,6 @@
  */
 package com.evolveum.midpoint.gui.api.component;
 
-import com.evolveum.midpoint.task.api.Task;
-import com.evolveum.midpoint.task.api.TaskManager;
-
 import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.model.IModel;
@@ -19,7 +16,7 @@
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.prism.PrismContext;
 import com.evolveum.midpoint.prism.polystring.PolyString;
-import com.evolveum.midpoint.schema.SchemaHelper;
+import com.evolveum.midpoint.schema.SchemaService;
 import com.evolveum.midpoint.web.security.MidPointApplication;
 import com.evolveum.midpoint.web.security.MidPointAuthWebSession;
 import com.evolveum.midpoint.web.security.WebApplicationConfiguration;
@@ -140,8 +137,8 @@ public PrismContext getPrismContext() {
         return getPageBase().getPrismContext();
     }
 
-    public SchemaHelper getSchemaHelper() {
-        return getPageBase().getSchemaHelper();
+    public SchemaService getSchemaService() {
+        return getPageBase().getSchemaService();
     }
 
     protected String createComponentPath(String... components) {

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectBrowserPanel.java

@@ -249,7 +249,7 @@ protected void addPerformed(AjaxRequestTarget target, QName type, List<O> select
 
     private Collection<SelectorOptions<GetOperationOptions>> getOptions() {
         if (ObjectTypes.SHADOW.getTypeQName().equals(typeModel.getObject() != null ? typeModel.getObject().getTypeQName() : null)) {
-            return getSchemaHelper().getOperationOptionsBuilder().noFetch().build();
+            return getSchemaService().getOperationOptionsBuilder().noFetch().build();
         }
         return null;
     }

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java

@@ -31,8 +31,6 @@
 import org.apache.wicket.feedback.FeedbackMessages;
 import org.apache.wicket.injection.Injector;
 import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.markup.html.TransparentWebMarkupContainer;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.WebPage;
@@ -46,8 +44,6 @@
 import org.apache.wicket.model.StringResourceModel;
 import org.apache.wicket.protocol.http.WebSession;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.request.resource.CssResourceReference;
-import org.apache.wicket.resource.CoreLibrariesContributor;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
@@ -406,12 +402,12 @@ public PrismContext getPrismContext() {
         return getMidpointApplication().getPrismContext();
     }
 
-    public SchemaHelper getSchemaHelper() {
-        return getMidpointApplication().getSchemaHelper();
+    public SchemaService getSchemaService() {
+        return getMidpointApplication().getSchemaService();
     }
 
     public GetOperationOptionsBuilder getOperationOptionsBuilder() {
-        return getSchemaHelper().getOperationOptionsBuilder();
+        return getSchemaService().getOperationOptionsBuilder();
     }
 
     public QueryConverter getQueryConverter() {

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java

@@ -127,7 +127,6 @@
 import com.evolveum.midpoint.web.application.PageDescriptor;
 import com.evolveum.midpoint.web.component.DateLabelComponent;
 import com.evolveum.midpoint.web.component.TabbedPanel;
-import com.evolveum.midpoint.web.component.assignment.AssignmentsUtil;
 import com.evolveum.midpoint.web.component.breadcrumbs.Breadcrumb;
 import com.evolveum.midpoint.web.component.breadcrumbs.BreadcrumbPageClass;
 import com.evolveum.midpoint.web.component.breadcrumbs.BreadcrumbPageInstance;
@@ -4801,7 +4800,7 @@ public static <I extends Item> PrismObject<LookupTableType> findLookupTable(Pris
         Task task = page.createSimpleTask("loadLookupTable");
         OperationResult result = task.getResult();
 
-        Collection<SelectorOptions<GetOperationOptions>> options = WebModelServiceUtils.createLookupTableRetrieveOptions(page.getSchemaHelper());
+        Collection<SelectorOptions<GetOperationOptions>> options = WebModelServiceUtils.createLookupTableRetrieveOptions(page.getSchemaService());
         return WebModelServiceUtils.loadObject(LookupTableType.class, lookupTableUid, options, page, task, result);
     }
 

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java

@@ -713,8 +713,8 @@ public static <O extends ObjectType> PrismObject<O> reconstructObject(Class<O> t
         return null;
     }
 
-    public static Collection<SelectorOptions<GetOperationOptions>> createLookupTableRetrieveOptions(SchemaHelper schemaHelper) {
-        return schemaHelper.getOperationOptionsBuilder()
+    public static Collection<SelectorOptions<GetOperationOptions>> createLookupTableRetrieveOptions(SchemaService schemaService) {
+        return schemaService.getOperationOptionsBuilder()
                 .item(LookupTableType.F_ROW)
                 .retrieveQuery()
                 .asc(LookupTableRowType.F_LABEL)

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/ContainerableListPanel.java

@@ -655,7 +655,7 @@ private PrismObject<LookupTableType> loadLookupTable(Item<?, ?> item) {
         OperationResult result = task.getResult();
 
         Collection<SelectorOptions<GetOperationOptions>> options = WebModelServiceUtils
-                .createLookupTableRetrieveOptions(getPageBase().getSchemaHelper());
+                .createLookupTableRetrieveOptions(getPageBase().getSchemaService());
         return WebModelServiceUtils.loadObject(LookupTableType.class,
                 lookupTableOid, options, getPageBase(), task, result);
     }

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/wrapper/PrismPropertyWrapperFactoryImpl.java

@@ -22,7 +22,7 @@
 import com.evolveum.midpoint.gui.impl.prism.wrapper.PrismPropertyWrapperImpl;
 import com.evolveum.midpoint.prism.*;
 import com.evolveum.midpoint.schema.GetOperationOptions;
-import com.evolveum.midpoint.schema.SchemaHelper;
+import com.evolveum.midpoint.schema.SchemaService;
 import com.evolveum.midpoint.schema.SelectorOptions;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.task.api.Task;
@@ -41,7 +41,7 @@ public class PrismPropertyWrapperFactoryImpl<T>
 
     private static final Trace LOGGER = TraceManager.getTrace(PrismPropertyWrapperFactoryImpl.class);
 
-    @Autowired protected SchemaHelper schemaHelper;
+    @Autowired protected SchemaService schemaService;
 
     private static final String DOT_CLASS = PrismPropertyWrapperFactoryImpl.class.getSimpleName() + ".";
     private static final String OPERATION_LOAD_LOOKUP_TABLE = DOT_CLASS + "loadLookupTable";
@@ -86,7 +86,7 @@ protected LookupTableType getPredefinedValues(PrismProperty<T> item, WrapperCont
         Task task = wrapperContext.getTask();
         OperationResult result = wrapperContext.getResult().createSubresult(OPERATION_LOAD_LOOKUP_TABLE);
         Collection<SelectorOptions<GetOperationOptions>> options = WebModelServiceUtils
-                .createLookupTableRetrieveOptions(schemaHelper);
+                .createLookupTableRetrieveOptions(schemaService);
 
         try {
             PrismObject<LookupTableType> lookupTable = getModelService().getObject(LookupTableType.class, valueEnumerationRef.getOid(), options, task, result);

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java

@@ -12,7 +12,6 @@
 import java.util.*;
 import javax.xml.namespace.QName;
 
-import com.evolveum.midpoint.web.component.search.Search;
 import com.evolveum.midpoint.web.session.PageStorage;
 
 import org.apache.commons.lang3.Validate;
@@ -35,14 +34,12 @@
 import com.evolveum.midpoint.prism.query.ObjectPaging;
 import com.evolveum.midpoint.prism.query.ObjectQuery;
 import com.evolveum.midpoint.prism.query.OrderDirection;
-import com.evolveum.midpoint.repo.api.RepositoryService;
 import com.evolveum.midpoint.schema.*;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.task.api.TaskManager;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.web.security.MidPointApplication;
-import com.evolveum.midpoint.wf.api.WorkflowManager;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.DistinctSearchOptionType;
 
 /**
@@ -98,17 +95,17 @@ protected PrismContext getPrismContext() {
         return application.getPrismContext();
     }
 
-    protected SchemaHelper getSchemaHelper() {
+    protected SchemaService getSchemaService() {
         MidPointApplication application = MidPointApplication.get();
-        return application.getSchemaHelper();
+        return application.getSchemaService();
     }
 
     protected GetOperationOptionsBuilder getOperationOptionsBuilder() {
-        return getSchemaHelper().getOperationOptionsBuilder();
+        return getSchemaService().getOperationOptionsBuilder();
     }
 
     protected GetOperationOptionsBuilder getOperationOptionsBuilder(Collection<SelectorOptions<GetOperationOptions>> createFrom) {
-        return getSchemaHelper().getOperationOptionsBuilder().setFrom(createFrom);
+        return getSchemaService().getOperationOptionsBuilder().setFrom(createFrom);
     }
 
     protected RelationRegistry getRelationRegistry() {

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/DeleteAllPanel.java

@@ -233,7 +233,7 @@ private String createDeleteUsersMessage(){
         Task task = getPagebase().createSimpleTask(OPERATION_COUNT_TASK);
         OperationResult result = new OperationResult(OPERATION_COUNT_TASK);
 
-        Collection<SelectorOptions<GetOperationOptions>> options = getPagebase().getSchemaHelper().getOperationOptionsBuilder()
+        Collection<SelectorOptions<GetOperationOptions>> options = getPagebase().getSchemaService().getOperationOptionsBuilder()
                 .raw().build();
 
         try {
@@ -259,7 +259,7 @@ private String createDeleteOrgUnitsMessage(){
         Task task = getPagebase().createSimpleTask(OPERATION_COUNT_TASK);
         OperationResult result = new OperationResult(OPERATION_COUNT_TASK);
 
-        Collection<SelectorOptions<GetOperationOptions>> options = getPagebase().getSchemaHelper().getOperationOptionsBuilder().raw().build();
+        Collection<SelectorOptions<GetOperationOptions>> options = getPagebase().getSchemaService().getOperationOptionsBuilder().raw().build();
 
         try {
             dto.setOrgUnitCount(getPagebase().getModelService().countObjects(OrgType.class, null, options, task, result));
@@ -278,7 +278,7 @@ private void countShadows(boolean isAccountShadow){
         Task task = getPagebase().createSimpleTask(OPERATION_SEARCH_ITERATIVE_TASK);
         OperationResult result = new OperationResult(OPERATION_SEARCH_ITERATIVE_TASK);
 
-        Collection<SelectorOptions<GetOperationOptions>> options = getPagebase().getSchemaHelper().getOperationOptionsBuilder().raw().build();
+        Collection<SelectorOptions<GetOperationOptions>> options = getPagebase().getSchemaService().getOperationOptionsBuilder().raw().build();
 
         try {
             PrismContext prismContext = getPagebase().getPrismContext();

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java

@@ -10,8 +10,6 @@
 
 import com.evolveum.midpoint.gui.api.prism.wrapper.*;
 import com.evolveum.midpoint.gui.api.util.WebPrismUtil;
-import com.evolveum.midpoint.gui.impl.factory.wrapper.AssignmentWrapperFactoryImpl;
-import com.evolveum.midpoint.gui.impl.prism.wrapper.AssignmentValueWrapperImpl;
 import com.evolveum.midpoint.prism.equivalence.EquivalenceStrategy;
 
 import com.evolveum.midpoint.web.component.prism.ValueStatus;
@@ -55,8 +53,6 @@
 import com.evolveum.midpoint.web.util.validation.SimpleValidationError;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 
-import org.jetbrains.annotations.NotNull;
-
 public abstract class PageAdminFocus<F extends FocusType> extends PageAdminObjectDetails<F>
         implements ProgressReportingAwarePage {
     private static final long serialVersionUID = 1L;
@@ -193,7 +189,7 @@ private List<ShadowWrapper> loadShadowWrappers(boolean noFetch) {
     }
 
     private Collection<SelectorOptions<GetOperationOptions>> createLoadOptionForShadowWrapper() {
-        return getSchemaHelper().getOperationOptionsBuilder()
+        return getSchemaService().getOperationOptionsBuilder()
                 .item(ShadowType.F_RESOURCE_REF).resolve().readOnly()
                 .build();
     }

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java

@@ -132,7 +132,7 @@ protected ObjectViewDto<?> load() {
 
                     Class<? extends ObjectType> type = getTypeFromParameters();
 
-                    GetOperationOptionsBuilder optionsBuilder = getSchemaHelper().getOperationOptionsBuilder()
+                    GetOperationOptionsBuilder optionsBuilder = getSchemaService().getOperationOptionsBuilder()
                             .raw()
                             .resolveNames()
                             .tolerateRawData();

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/PageDebugDownloadBehaviour.java

@@ -176,7 +176,7 @@ private void dumpObjectsToStream(final Writer writer, OperationResult result) th
         };
 
         ModelService service = page.getModelService();
-        GetOperationOptionsBuilder optionsBuilder = page.getSchemaHelper().getOperationOptionsBuilder()
+        GetOperationOptionsBuilder optionsBuilder = page.getSchemaService().getOperationOptionsBuilder()
                 .raw()
                 .resolveNames();
         if (showAllItems) {

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java

@@ -189,7 +189,7 @@ private Collection<SelectorOptions<GetOperationOptions>> createOperationOptions(
         propertiesToGet.add(TaskType.F_NEXT_RETRY_TIMESTAMP);
         propertiesToGet.add(TaskType.F_SUBTASK_REF);
 
-        GetOperationOptionsBuilder getOperationOptionsBuilder = getSchemaHelper().getOperationOptionsBuilder();
+        GetOperationOptionsBuilder getOperationOptionsBuilder = getSchemaService().getOperationOptionsBuilder();
         getOperationOptionsBuilder = getOperationOptionsBuilder.resolveNames();
         return getOperationOptionsBuilder
                 .items(propertiesToGet.toArray(new Object[0])).retrieve()

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSubtasksAndThreadsTabPanel.java

@@ -132,7 +132,7 @@ private Collection<SelectorOptions<GetOperationOptions>> createOperationOptions(
         propertiesToGet.add(TaskType.F_SUBTASK_REF);
         propertiesToGet.add(TaskType.F_NODE_AS_OBSERVED);
 
-        GetOperationOptionsBuilder getOperationOptionsBuilder = getSchemaHelper().getOperationOptionsBuilder();
+        GetOperationOptionsBuilder getOperationOptionsBuilder = getSchemaService().getOperationOptionsBuilder();
         getOperationOptionsBuilder = getOperationOptionsBuilder.resolveNames();
         return getOperationOptionsBuilder
                 .items(propertiesToGet.toArray(new Object[0])).retrieve()

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java

@@ -179,7 +179,7 @@ protected List<PrismObject<FocusType>> load() {
                 ObjectQuery managersQuery = createManagerQuery(getTreePanel().getSelected().getValue());
 
                 OperationResult searchManagersResult = new OperationResult(OPERATION_SEARCH_MANAGERS);
-                Collection<SelectorOptions<GetOperationOptions>> options = getSchemaHelper().getOperationOptionsBuilder()
+                Collection<SelectorOptions<GetOperationOptions>> options = getSchemaService().getOperationOptionsBuilder()
                         .distinct()
                         .item(FocusType.F_JPEG_PHOTO).retrieve()
                         .build();

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java

@@ -79,7 +79,7 @@
 import com.evolveum.midpoint.prism.polystring.PolyString;
 import com.evolveum.midpoint.repo.common.expression.ExpressionFactory;
 import com.evolveum.midpoint.schema.RelationRegistry;
-import com.evolveum.midpoint.schema.SchemaHelper;
+import com.evolveum.midpoint.schema.SchemaService;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.schema.util.SchemaDebugUtil;
 import com.evolveum.midpoint.security.api.AuthorizationConstants;
@@ -164,7 +164,7 @@ public class MidPointApplication extends AuthenticatedWebApplication implements
     @Autowired private RelationRegistry relationRegistry;
     @Autowired private TaskService taskService;
     @Autowired private PrismContext prismContext;
-    @Autowired private SchemaHelper schemaHelper;
+    @Autowired private SchemaService schemaService;
     @Autowired private ExpressionFactory expressionFactory;
     @Autowired private TaskManager taskManager;
     @Autowired private ModelAuditService auditService;
@@ -492,8 +492,8 @@ public PrismContext getPrismContext() {
         return prismContext;
     }
 
-    public SchemaHelper getSchemaHelper() {
-        return schemaHelper;
+    public SchemaService getSchemaService() {
+        return schemaService;
     }
 
     public ExpressionFactory getExpressionFactory() {

infra/schema/src/main/java/com/evolveum/midpoint/schema/SchemaHelper.java → infra/schema/src/main/java/com/evolveum/midpoint/schema/SchemaService.java

@@ -22,15 +22,13 @@
  * The purpose is rather practical, to avoid too many injections.
  * Most used methods are provided directly.
  */
-// TODO rename SchemaService, wait for Palo's signal ;-)
 @Component
-public class SchemaHelper {
+public class SchemaService {
 
     @Autowired private PrismContext prismContext;
     @Autowired private RelationRegistry relationRegistry;
 
-    // TODO rename to prismContext() without get
-    public PrismContext getPrismContext() {
+    public PrismContext prismContext() {
         return prismContext;
     }
 

model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/AbstractCertificationTest.java

@@ -557,7 +557,7 @@ protected AccessCertificationCampaignType getCampaignWithCases(String campaignOi
         Task task = taskManager.createTaskInstance(AbstractCertificationTest.class.getName() + ".getObject");
         OperationResult result = task.getResult();
         Collection<SelectorOptions<GetOperationOptions>> options =
-                schemaHelper.getOperationOptionsBuilder().item(F_CASE).retrieve().build();
+                schemaService.getOperationOptionsBuilder().item(F_CASE).retrieve().build();
         AccessCertificationCampaignType campaign = modelService.getObject(AccessCertificationCampaignType.class, campaignOid, options, task, result).asObjectable();
         result.computeStatus();
         TestUtil.assertSuccess(result);

model/certification-impl/src/test/java/com/evolveum/midpoint/certification/test/complex/TestPolicyDrivenRoleLifecycle.java

@@ -222,7 +222,7 @@ public void test050ActivateCorrectRole() throws Exception {
         assertEquals("Wrong policy situation", emptyList(), roleAfter.asObjectable().getPolicySituation());
         assertEquals("Wrong triggered policy rules", emptyList(), roleAfter.asObjectable().getTriggeredPolicyRule());
 
-//        Collection<SelectorOptions<GetOperationOptions>> options = schemaHelper.getOperationOptionsBuilder()
+//        Collection<SelectorOptions<GetOperationOptions>> options = schemaService.getOperationOptionsBuilder()
 //                .item(TaskType.F_WORKFLOW_CONTEXT, WfContextType.F_WORK_ITEM).retrieve()
 //                .build();
         List<PrismObject<CaseType>> cases = getCasesForObject(roleCorrectOid, RoleType.COMPLEX_TYPE, null, task, result);
@@ -298,7 +298,7 @@ public void test070ActivateCorrectHighRiskRole() throws Exception {
         assertEquals("Wrong policy situation", emptyList(), roleAfter.asObjectable().getPolicySituation());
         assertEquals("Wrong triggered policy rules", emptyList(), roleAfter.asObjectable().getTriggeredPolicyRule());
 
-        Collection<SelectorOptions<GetOperationOptions>> options = schemaHelper.getOperationOptionsBuilder()
+        Collection<SelectorOptions<GetOperationOptions>> options = schemaService.getOperationOptionsBuilder()
                 .build();
         List<PrismObject<CaseType>> cases = getCasesForObject(roleCorrectHighRiskOid, RoleType.COMPLEX_TYPE, options, task, result);
         display("cases for role", cases);