MID-6393: Backport changes for differences between 4.4 and 4.6

Evolveum · Jun 27, 2022 · 0806b7f · 0806b7f
1 parent b3ce31e
commit 0806b7f
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 27 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
@@ -69,6 +69,7 @@
 import com.evolveum.midpoint.gui.api.prism.wrapper.ItemWrapper;
 import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerValueWrapper;
 import com.evolveum.midpoint.gui.api.prism.wrapper.PrismValueWrapper;
+import com.evolveum.midpoint.gui.api.registry.DataProviderRegistry;
 import com.evolveum.midpoint.gui.api.registry.GuiComponentRegistry;
 import com.evolveum.midpoint.gui.api.util.ModelServiceLocator;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
@@ -290,6 +291,8 @@ public abstract class PageBase extends WebPage implements ModelServiceLocator {
     private MidpointFunctions midpointFunctions;
 
     @SpringBean private GuiComponentRegistry registry;
+    @SpringBean private DataProviderRegistry dataProviderRegistry;
+
     @SpringBean private DefaultGuiConfigurationCompiler guiConfigurationRegistry;
 
     @SpringBean private ClusterExecutionHelper clusterExecutionHelper;
@@ -398,6 +401,7 @@ public LocalizationService getLocalizationService() {
         return localizationService;
     }
 
+    @Override
     @Contract(pure = true)
     public PrismContext getPrismContext() {
         return getMidpointApplication().getPrismContext();
@@ -423,6 +427,7 @@ public RepositoryService getRepositoryService() {
         return getMidpointApplication().getRepositoryService();
     }
 
+    @Override
     public ExpressionFactory getExpressionFactory() {
         return getMidpointApplication().getExpressionFactory();
     }
@@ -501,14 +506,20 @@ public ModelDiagnosticService getModelDiagnosticService() {
         return modelDiagnosticService;
     }
 
+    @Override
     public GuiComponentRegistry getRegistry() {
         return registry;
     }
 
+    public DataProviderRegistry getDataProviderRegistry() {
+        return dataProviderRegistry;
+    }
+
     public CacheDispatcher getCacheDispatcher() {
         return cacheDispatcher;
     }
 
+    @Override
     public AdminGuiConfigurationMergeManager getAdminGuiConfigurationMergeManager() {
         return adminGuiConfigurationMergeManager;
     }
@@ -582,6 +593,7 @@ public <O extends ObjectType, T extends ObjectType> void authorize(String operat
         getSecurityEnforcer().authorize(operationUrl, phase, params, ownerResolver, getPageTask(), result);
     }
 
+    @Override
     public MidpointFormValidatorRegistry getFormValidatorRegistry() {
         return formValidatorRegistry;
     }
@@ -635,6 +647,7 @@ public Task createAnonymousTask(String operation) {
         return task;
     }
 
+    @Override
     public Task createSimpleTask(String operation) {
         return createSimpleTask(operation, null);
     }
@@ -1802,6 +1815,7 @@ public <C extends Containerable> PrismContainerWrapperFactory<C> findContainerWr
         return registry.findContainerWrapperFactory(def);
     }
 
+    @Override
     public <IW extends ItemWrapper, VW extends PrismValueWrapper, PV extends PrismValue> VW createValueWrapper(IW parentWrapper, PV newValue, ValueStatus status, WrapperContext context) throws SchemaException {
 
         PrismContainerValue<?> parentValue = null;
@@ -1824,6 +1838,7 @@ public <ID extends ItemDefinition, IW extends ItemWrapper> IW createItemWrapper(
         return factory.createWrapper(parent, def, ctx);
     }
 
+    @Override
     public <I extends Item, IW extends ItemWrapper> IW createItemWrapper(I item, ItemStatus status, WrapperContext ctx) throws SchemaException {
 
         ItemWrapperFactory<IW, ?, ?> factory = registry.findWrapperFactory(item.getDefinition(), null);

diff --git a/...va/com/evolveum/midpoint/gui/impl/factory/data/InMemoryAssignmentDataProviderFactory.java b/...va/com/evolveum/midpoint/gui/impl/factory/data/InMemoryAssignmentDataProviderFactory.java
@@ -14,7 +14,7 @@
 
 import com.evolveum.midpoint.gui.api.page.PageBase;
 import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerValueWrapper;
-import com.evolveum.midpoint.gui.impl.component.search.Search;
+import com.evolveum.midpoint.web.component.search.Search;
 import com.evolveum.midpoint.model.api.authentication.CompiledObjectCollectionView;
 import com.evolveum.midpoint.prism.Objectable;
 import com.evolveum.midpoint.prism.path.ItemPath;

diff --git a/.../com/evolveum/midpoint/gui/impl/factory/data/RepositoryAssignmentDataProviderFactory.java b/.../com/evolveum/midpoint/gui/impl/factory/data/RepositoryAssignmentDataProviderFactory.java
@@ -13,7 +13,7 @@
 import org.springframework.stereotype.Component;
 
 import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerValueWrapper;
-import com.evolveum.midpoint.gui.impl.component.search.Search;
+import com.evolveum.midpoint.web.component.search.Search;
 import com.evolveum.midpoint.model.api.authentication.CompiledObjectCollectionView;
 import com.evolveum.midpoint.prism.Objectable;
 import com.evolveum.midpoint.prism.path.ItemPath;

diff --git a/...ignmentholder/component/assignmentType/assignment/GenericAbstractRoleAssignmentPanel.java b/...ignmentholder/component/assignmentType/assignment/GenericAbstractRoleAssignmentPanel.java
@@ -19,7 +19,6 @@
 import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils;
 import com.evolveum.midpoint.gui.impl.page.admin.assignmentholder.component.AssignmentHolderAssignmentPanel;
 import com.evolveum.midpoint.prism.PrismObject;
-import com.evolveum.midpoint.prism.impl.query.builder.QueryBuilder;
 import com.evolveum.midpoint.prism.query.ObjectFilter;
 import com.evolveum.midpoint.prism.query.ObjectQuery;
 import com.evolveum.midpoint.schema.util.FocusTypeUtil;
@@ -53,7 +52,7 @@ protected ObjectQuery getCustomizeQuery() {
             return null;
         }
         // This should do customPostSearch on repository level.
-        return QueryBuilder.queryFor(AssignmentType.class, getPrismContext())
+        return getPrismContext().queryFor(AssignmentType.class)
             .ref(AssignmentType.F_TARGET_REF, OrgType.COMPLEX_TYPE, null)
             .item(ObjectType.F_SUBTYPE).contains("access")
             .build();

diff --git a/...dmin/assignmentholder/component/assignmentType/assignment/PolicyRuleAssignmentsPanel.java b/...dmin/assignmentholder/component/assignmentType/assignment/PolicyRuleAssignmentsPanel.java
@@ -25,7 +25,6 @@
 import com.evolveum.midpoint.web.application.PanelType;
 import com.evolveum.midpoint.web.component.search.SearchFactory;
 import com.evolveum.midpoint.web.component.search.SearchItemDefinition;
-import com.evolveum.midpoint.gui.impl.component.search.AbstractSearchItemWrapper;
 import com.evolveum.midpoint.web.session.UserProfileStorage;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 
@@ -116,20 +115,6 @@ protected List<SearchItemDefinition> createSearchableItems(PrismContainerDefinit
         return defs;
     }
 
-    @Override
-    protected List<? super AbstractSearchItemWrapper> createSearchableItemWrappers(PrismContainerDefinition<AssignmentType> containerDef) {
-        List<? super AbstractSearchItemWrapper> defs = new ArrayList<>();
-        SearchFactory.addSearchPropertyWrapper(containerDef, ItemPath.create(AssignmentType.F_ACTIVATION, ActivationType.F_ADMINISTRATIVE_STATUS), defs);
-        SearchFactory.addSearchPropertyWrapper(containerDef, ItemPath.create(AssignmentType.F_ACTIVATION, ActivationType.F_EFFECTIVE_STATUS), defs);
-        SearchFactory.addSearchPropertyWrapper(containerDef, ItemPath.create(AssignmentType.F_POLICY_RULE, PolicyRuleType.F_NAME), defs, "AssignmentPanel.search.policyRule.name");
-        SearchFactory.addSearchRefWrapper(containerDef,
-                ItemPath.create(AssignmentType.F_POLICY_RULE, PolicyRuleType.F_POLICY_CONSTRAINTS,
-                        PolicyConstraintsType.F_EXCLUSION, ExclusionPolicyConstraintType.F_TARGET_REF), defs, AreaCategoryType.POLICY, getPageBase());
-
-        defs.addAll(SearchFactory.createSearchableExtensionWrapperList(containerDef));
-        return defs;
-    }
-
     @Override
     protected ObjectQuery getCustomizeQuery() {
         // CustomizeQuery is not repo indexed

diff --git a/.../admin/assignmentholder/component/assignmentType/inducement/InducedEntitlementsPanel.java b/.../admin/assignmentholder/component/assignmentType/inducement/InducedEntitlementsPanel.java
@@ -15,7 +15,6 @@
 import com.evolveum.midpoint.gui.impl.component.data.column.PrismPropertyWrapperColumn;
 import com.evolveum.midpoint.gui.impl.page.admin.abstractrole.component.AbstractRoleInducementPanel;
 import com.evolveum.midpoint.prism.*;
-import com.evolveum.midpoint.prism.impl.query.builder.QueryBuilder;
 import com.evolveum.midpoint.prism.path.ItemPath;
 import com.evolveum.midpoint.prism.query.ObjectFilter;
 import com.evolveum.midpoint.prism.query.ObjectQuery;

diff --git a/...main/java/com/evolveum/midpoint/web/component/data/ContainerValueDataProviderFactory.java b/...main/java/com/evolveum/midpoint/web/component/data/ContainerValueDataProviderFactory.java
@@ -14,7 +14,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerValueWrapper;
-import com.evolveum.midpoint.gui.impl.component.search.Search;
+import com.evolveum.midpoint.web.component.search.Search;
 import com.evolveum.midpoint.model.api.authentication.CompiledObjectCollectionView;
 import com.evolveum.midpoint.prism.Containerable;
 import com.evolveum.midpoint.prism.Objectable;

diff --git a/...ui/src/main/java/com/evolveum/midpoint/web/component/util/RepoAssignmentListProvider.java b/...ui/src/main/java/com/evolveum/midpoint/web/component/util/RepoAssignmentListProvider.java
@@ -11,7 +11,6 @@
 import com.evolveum.midpoint.prism.Objectable;
 import com.evolveum.midpoint.prism.PrismConstants;
 import com.evolveum.midpoint.prism.PrismObject;
-import com.evolveum.midpoint.prism.impl.query.builder.QueryBuilder;
 import com.evolveum.midpoint.prism.path.ItemPath;
 import com.evolveum.midpoint.prism.query.ObjectFilter;
 import com.evolveum.midpoint.prism.query.ObjectOrdering;
@@ -21,7 +20,7 @@
 import com.evolveum.midpoint.task.api.Task;
 import com.evolveum.midpoint.util.exception.SchemaException;
 import com.evolveum.midpoint.web.component.prism.ValueStatus;
-import com.evolveum.midpoint.gui.impl.component.search.Search;
+import com.evolveum.midpoint.web.component.search.Search;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.AssignmentType;
 
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType;
@@ -80,7 +79,7 @@ protected ObjectFilter postFilterIds() {
             // No filtering were done
             return null;
         }
-        var builder = QueryBuilder.queryFor(AssignmentType.class, getPrismContext());
+        var builder = getPrismContext().queryFor(AssignmentType.class);
         if (filtered.isEmpty()) {
             return builder.none().buildFilter();
         }
@@ -211,7 +210,7 @@ public ObjectQuery getQuery() {
             // We have user entered filter
             if (idFilter != null) {
                 // PostFilter filtered data, so we need to search only in these data
-                filter = QueryBuilder.queryFor(getType(), getPrismContext())
+                filter = getPrismContext().queryFor(getType())
                         .filter(orig.getFilter())
                         .and().filter(idFilter)
                         .buildFilter();
@@ -225,14 +224,14 @@ public ObjectQuery getQuery() {
         }
 
         if (filter != null) {
-            return QueryBuilder.queryFor(AssignmentType.class, getPrismContext())
+            return getPrismContext().queryFor(AssignmentType.class)
                 .filter(filter)
                 .and()
                     .ownedBy(objectType, path)
                     .id(oid)
                 .build();
         }
-        return QueryBuilder.queryFor(AssignmentType.class, getPrismContext())
+        return getPrismContext().queryFor(AssignmentType.class)
                 .ownedBy(objectType, path)
                     .id(oid)
                 .build();