wrapper cleanup WIP :

- moving classes and interfaces to correct packages, - cleanup interfaces - extracting visible behavior for wrappers from ItemWrapper
Evolveum · Apr 22, 2020 · 13f63d2 · 13f63d2
1 parent 83a7426
commit 13f63d2
Show file tree

Hide file tree

Showing 288 changed files with 7,852 additions and 8,076 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/AssignmentPopup.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/AssignmentPopup.java
@@ -25,7 +25,7 @@
 import com.evolveum.midpoint.gui.api.component.tabs.CountablePanelTab;
 import com.evolveum.midpoint.gui.api.component.tabs.PanelTab;
 import com.evolveum.midpoint.gui.api.model.LoadableModel;
-import com.evolveum.midpoint.gui.api.prism.PrismContainerWrapper;
+import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerWrapper;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.prism.query.ObjectFilter;
 import com.evolveum.midpoint.schema.constants.ObjectTypes;

diff --git a/...min-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ContainerableListPanel.java b/...min-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ContainerableListPanel.java
@@ -7,7 +7,7 @@
 package com.evolveum.midpoint.gui.api.component;
 
 import com.evolveum.midpoint.gui.api.model.LoadableModel;
-import com.evolveum.midpoint.gui.impl.prism.PrismContainerValueWrapper;
+import com.evolveum.midpoint.gui.impl.prism.wrapper.PrismContainerValueWrapper;
 import com.evolveum.midpoint.prism.Containerable;
 import com.evolveum.midpoint.prism.query.ObjectFilter;
 import com.evolveum.midpoint.prism.query.ObjectPaging;

diff --git a/...c/main/java/com/evolveum/midpoint/gui/api/component/FocusTypeAssignmentPopupTabPanel.java b/...c/main/java/com/evolveum/midpoint/gui/api/component/FocusTypeAssignmentPopupTabPanel.java
@@ -16,8 +16,8 @@
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.panel.Fragment;
 
-import com.evolveum.midpoint.gui.api.prism.PrismContainerWrapper;
-import com.evolveum.midpoint.gui.api.prism.PrismObjectWrapper;
+import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerWrapper;
+import com.evolveum.midpoint.gui.api.prism.wrapper.PrismObjectWrapper;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.prism.query.ObjectFilter;

diff --git a/...src/main/java/com/evolveum/midpoint/gui/api/component/password/PasswordPropertyPanel.java b/...src/main/java/com/evolveum/midpoint/gui/api/component/password/PasswordPropertyPanel.java
@@ -7,10 +7,14 @@
 package com.evolveum.midpoint.gui.api.component.password;
 
 import com.evolveum.midpoint.gui.api.factory.GuiComponentFactory;
-import com.evolveum.midpoint.gui.impl.factory.ItemRealValueModel;
-import com.evolveum.midpoint.gui.impl.prism.*;
+import com.evolveum.midpoint.gui.api.prism.wrapper.ItemEditabilityHandler;
+import com.evolveum.midpoint.gui.api.prism.wrapper.ItemVisibilityHandler;
+import com.evolveum.midpoint.gui.impl.factory.panel.ItemRealValueModel;
+import com.evolveum.midpoint.gui.impl.prism.panel.ItemHeaderPanel;
+import com.evolveum.midpoint.gui.impl.prism.panel.PrismPropertyPanel;
+import com.evolveum.midpoint.gui.impl.prism.wrapper.PrismPropertyValueWrapper;
+import com.evolveum.midpoint.gui.impl.prism.wrapper.PrismPropertyWrapper;
 import com.evolveum.midpoint.web.component.prism.ValueStatus;
-import com.evolveum.midpoint.web.page.admin.users.PageUser;
 import com.evolveum.prism.xml.ns._public.types_3.ProtectedStringType;
 import org.apache.wicket.Component;
 import org.apache.wicket.markup.html.list.ListItem;
@@ -19,12 +23,12 @@
 /**
  * Created by honchar
  */
-public class PasswordPropertyPanel  extends PrismPropertyPanel<ProtectedStringType>{
+public class PasswordPropertyPanel  extends PrismPropertyPanel<ProtectedStringType> {
     private static final long serialVersionUID = 1L;
 
     private static final String ID_PASSWORD_PANEL= "passwordPanel";
 
-    public PasswordPropertyPanel(String id, IModel<PrismPropertyWrapper<ProtectedStringType>> model, ItemPanelSettings settings){
+    public PasswordPropertyPanel(String id, IModel<PrismPropertyWrapper<ProtectedStringType>> model, ItemHeaderPanel.ItemPanelSettings settings){
         super(id, model, settings);
     }
 

diff --git a/...-gui/src/main/java/com/evolveum/midpoint/gui/api/factory/AbstractGuiComponentFactory.java b/...-gui/src/main/java/com/evolveum/midpoint/gui/api/factory/AbstractGuiComponentFactory.java
@@ -7,21 +7,15 @@
 
 package com.evolveum.midpoint.gui.api.factory;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import com.evolveum.midpoint.common.LocalizationService;
 import com.evolveum.midpoint.gui.api.registry.GuiComponentRegistry;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
-import com.evolveum.midpoint.prism.polystring.PolyString;
-import com.evolveum.prism.xml.ns._public.types_3.PolyStringTranslationType;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.wicket.feedback.ComponentFeedbackMessageFilter;
+
 import org.apache.wicket.markup.html.panel.Panel;
 
-import com.evolveum.midpoint.gui.impl.factory.PrismPropertyPanelContext;
-import com.evolveum.midpoint.web.component.prism.InputPanel;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.LookupTableRowType;
+import com.evolveum.midpoint.gui.impl.factory.panel.PrismPropertyPanelContext;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.LookupTableType;
 import org.springframework.beans.factory.annotation.Autowired;
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/factory/GuiComponentFactory.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/factory/GuiComponentFactory.java
@@ -9,8 +9,8 @@
 
 import org.apache.wicket.markup.html.panel.Panel;
 
-import com.evolveum.midpoint.gui.api.prism.ItemWrapper;
-import com.evolveum.midpoint.gui.impl.factory.ItemPanelContext;
+import com.evolveum.midpoint.gui.api.prism.wrapper.ItemWrapper;
+import com.evolveum.midpoint.gui.impl.factory.panel.ItemPanelContext;
 
 public interface GuiComponentFactory<T extends ItemPanelContext>{
 //    public void register();

diff --git a/.../gui/impl/factory/ItemWrapperFactory.java → ...i/factory/wrapper/ItemWrapperFactory.java b/.../gui/impl/factory/ItemWrapperFactory.java → ...i/factory/wrapper/ItemWrapperFactory.java
@@ -4,12 +4,12 @@
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
  */
-package com.evolveum.midpoint.gui.impl.factory;
+package com.evolveum.midpoint.gui.api.factory.wrapper;
 
 import com.evolveum.midpoint.gui.api.prism.ItemStatus;
-import com.evolveum.midpoint.gui.api.prism.ItemWrapper;
-import com.evolveum.midpoint.gui.impl.prism.PrismContainerValueWrapper;
-import com.evolveum.midpoint.gui.impl.prism.PrismValueWrapper;
+import com.evolveum.midpoint.gui.api.prism.wrapper.ItemWrapper;
+import com.evolveum.midpoint.gui.impl.prism.wrapper.PrismContainerValueWrapper;
+import com.evolveum.midpoint.gui.impl.prism.wrapper.PrismValueWrapper;
 import com.evolveum.midpoint.prism.Item;
 import com.evolveum.midpoint.prism.ItemDefinition;
 import com.evolveum.midpoint.prism.PrismValue;

diff --git a/...oint/gui/impl/factory/WrapperContext.java → ...i/api/factory/wrapper/WrapperContext.java b/...oint/gui/impl/factory/WrapperContext.java → ...i/api/factory/wrapper/WrapperContext.java
@@ -4,7 +4,7 @@
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
  */
-package com.evolveum.midpoint.gui.impl.factory;
+package com.evolveum.midpoint.gui.api.factory.wrapper;
 
 import com.evolveum.midpoint.gui.api.prism.ItemStatus;
 import com.evolveum.midpoint.prism.PrismObject;
@@ -16,9 +16,6 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.VirtualContainerItemSpecificationType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.VirtualContainersSpecificationType;
 
-import org.jetbrains.annotations.NotNull;
-
-import javax.xml.namespace.QName;
 import java.util.Collection;
 import java.util.List;
 

diff --git a/...oint/gui/impl/factory/WrapperFactory.java → ...i/api/factory/wrapper/WrapperFactory.java b/...oint/gui/impl/factory/WrapperFactory.java → ...i/api/factory/wrapper/WrapperFactory.java
@@ -4,7 +4,7 @@
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
  */
-package com.evolveum.midpoint.gui.impl.factory;
+package com.evolveum.midpoint.gui.api.factory.wrapper;
 
 import com.evolveum.midpoint.prism.ItemDefinition;
 

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
@@ -15,6 +15,7 @@
 import javax.management.ObjectName;
 import javax.xml.namespace.QName;
 
+import com.evolveum.midpoint.gui.impl.prism.panel.ItemHeaderPanel;
 import com.evolveum.midpoint.web.page.admin.PageAdminObjectDetails;
 
 import com.evolveum.midpoint.web.page.admin.certification.*;
@@ -71,19 +72,18 @@
 import com.evolveum.midpoint.gui.api.component.result.OpResult;
 import com.evolveum.midpoint.gui.api.model.LoadableModel;
 import com.evolveum.midpoint.gui.api.prism.ItemStatus;
-import com.evolveum.midpoint.gui.api.prism.ItemWrapper;
+import com.evolveum.midpoint.gui.api.prism.wrapper.ItemWrapper;
 import com.evolveum.midpoint.gui.api.registry.GuiComponentRegistry;
 import com.evolveum.midpoint.gui.api.util.ModelServiceLocator;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils;
 import com.evolveum.midpoint.gui.impl.error.ErrorPanel;
-import com.evolveum.midpoint.gui.impl.factory.ItemWrapperFactory;
-import com.evolveum.midpoint.gui.impl.factory.PrismObjectWrapperFactory;
-import com.evolveum.midpoint.gui.impl.factory.WrapperContext;
-import com.evolveum.midpoint.gui.impl.prism.ItemPanelSettings;
-import com.evolveum.midpoint.gui.impl.prism.PrismContainerValuePanel;
-import com.evolveum.midpoint.gui.impl.prism.PrismContainerValueWrapper;
-import com.evolveum.midpoint.gui.impl.prism.PrismValueWrapper;
+import com.evolveum.midpoint.gui.api.factory.wrapper.ItemWrapperFactory;
+import com.evolveum.midpoint.gui.impl.factory.wrapper.PrismObjectWrapperFactory;
+import com.evolveum.midpoint.gui.api.factory.wrapper.WrapperContext;
+import com.evolveum.midpoint.gui.impl.prism.panel.PrismContainerValuePanel;
+import com.evolveum.midpoint.gui.impl.prism.wrapper.PrismContainerValueWrapper;
+import com.evolveum.midpoint.gui.impl.prism.wrapper.PrismValueWrapper;
 import com.evolveum.midpoint.model.api.*;
 import com.evolveum.midpoint.model.api.authentication.CompiledGuiProfile;
 import com.evolveum.midpoint.model.api.authentication.CompiledObjectCollectionView;
@@ -2726,7 +2726,7 @@ private Class<?> getWrapperPanel(QName typeName) {
     }
 
 
-    public <IW extends ItemWrapper> Panel initItemPanel(String panelId, QName typeName, IModel<IW> wrapperModel, ItemPanelSettings itemPanelSettings) throws SchemaException{
+    public <IW extends ItemWrapper> Panel initItemPanel(String panelId, QName typeName, IModel<IW> wrapperModel, ItemHeaderPanel.ItemPanelSettings itemPanelSettings) throws SchemaException{
         Class<?> panelClass = getWrapperPanel(typeName);
         if (panelClass == null) {
             ErrorPanel errorPanel = new ErrorPanel(panelId, () -> "Cannot create panel for " + typeName);
@@ -2736,7 +2736,7 @@ public <IW extends ItemWrapper> Panel initItemPanel(String panelId, QName typeNa
 
         Constructor<?> constructor;
         try {
-            constructor = panelClass.getConstructor(String.class, IModel.class, ItemPanelSettings.class);
+            constructor = panelClass.getConstructor(String.class, IModel.class, ItemHeaderPanel.ItemPanelSettings.class);
             Panel panel = (Panel) constructor.newInstance(panelId, wrapperModel, itemPanelSettings);
             return panel;
         } catch (NoSuchMethodException | SecurityException | InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
@@ -2745,7 +2745,7 @@ public <IW extends ItemWrapper> Panel initItemPanel(String panelId, QName typeNa
     }
 
     public <CVW extends PrismContainerValueWrapper<C>, C extends Containerable> Panel initContainerValuePanel(String id, IModel<CVW> model,
-            ItemPanelSettings settings) {
+            ItemHeaderPanel.ItemPanelSettings settings) {
         //TODO find from registry first
         return new PrismContainerValuePanel<>(id, model, settings);
     }

diff --git a/...ui/impl/prism/ItemEditabilityHandler.java → ...prism/wrapper/ItemEditabilityHandler.java b/...ui/impl/prism/ItemEditabilityHandler.java → ...prism/wrapper/ItemEditabilityHandler.java
@@ -4,14 +4,10 @@
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
  */
-package com.evolveum.midpoint.gui.impl.prism;
+package com.evolveum.midpoint.gui.api.prism.wrapper;
 
 import java.io.Serializable;
 
-import com.evolveum.midpoint.gui.api.model.LoadableModel;
-import com.evolveum.midpoint.gui.api.prism.ItemWrapper;
-import com.evolveum.midpoint.web.component.prism.ItemVisibility;
-
 /**
  * @author honchar
  *

diff --git a/.../gui/impl/prism/ItemMandatoryHandler.java → ...i/prism/wrapper/ItemMandatoryHandler.java b/.../gui/impl/prism/ItemMandatoryHandler.java → ...i/prism/wrapper/ItemMandatoryHandler.java
@@ -4,15 +4,13 @@
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
  */
-package com.evolveum.midpoint.gui.impl.prism;
-
-import com.evolveum.midpoint.gui.api.prism.ItemWrapper;
+package com.evolveum.midpoint.gui.api.prism.wrapper;
 
 import java.io.Serializable;
 
 @FunctionalInterface
 public interface ItemMandatoryHandler extends Serializable {
 
-    boolean isMandatory(ItemWrapper<?, ?, ?, ?> itemWrapper);
+    boolean isMandatory(ItemWrapper<?, ?> itemWrapper);
 
 }
diff --git a/...gui/impl/prism/ItemVisibilityHandler.java → .../prism/wrapper/ItemVisibilityHandler.java b/...gui/impl/prism/ItemVisibilityHandler.java → .../prism/wrapper/ItemVisibilityHandler.java
@@ -4,11 +4,10 @@
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
  */
-package com.evolveum.midpoint.gui.impl.prism;
+package com.evolveum.midpoint.gui.api.prism.wrapper;
 
 import java.io.Serializable;
 
-import com.evolveum.midpoint.gui.api.prism.ItemWrapper;
 import com.evolveum.midpoint.web.component.prism.ItemVisibility;
 
 /**