Merge remote-tracking branch 'origin/master'

.editorconfig

@@ -143,7 +143,7 @@ ij_java_for_statement_wrap = off
 ij_java_generate_final_locals = false
 ij_java_generate_final_parameters = false
 ij_java_if_brace_force = if_multiline
-ij_java_imports_layout = *,|,javax.**,java.**,|,$*
+ij_java_imports_layout = $*,|,$com.evolveum.**,|,java.**,javax.**,|,*,|,com.evolveum.**,|
 ij_java_indent_case_from_switch = true
 ij_java_insert_inner_class_imports = false
 ij_java_insert_override_annotation = true
@@ -1112,9 +1112,9 @@ ij_kotlin_wrap_first_method_in_call_chain = false
 
 [{*.sht,*.htm,*.html,*.shtm,*.shtml,*.ng}]
 ij_html_add_new_line_before_tags = body,div,p,form,h1,h2,h3
-ij_html_align_attributes = true
+ij_html_align_attributes = false
 ij_html_align_text = false
-ij_html_attribute_wrap = normal
+ij_html_attribute_wrap = off
 ij_html_block_comment_at_first_column = true
 ij_html_do_not_align_children_of_min_lines = 0
 ij_html_do_not_break_if_inline_tags = title,h1,h2,h3,h4,h5,h6,p
@@ -1135,7 +1135,7 @@ ij_html_remove_new_line_before_tags = br
 ij_html_space_after_tag_name = false
 ij_html_space_around_equality_in_attribute = false
 ij_html_space_inside_empty_tag = false
-ij_html_text_wrap = normal
+ij_html_text_wrap = off
 
 [{*.ts,*.ats}]
 ij_continuation_indent_size = 4

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

@@ -2084,24 +2084,22 @@ private MainMenuItem createHomeItems() {
 
         OperationResult result = new OperationResult("Search Dashboard");
         List<PrismObject<DashboardType>> dashboards = WebModelServiceUtils.searchObjects(DashboardType.class, null, result, this);
-        if(dashboards != null) {
-            dashboards.forEach(prismObject -> {
-                Validate.notNull(prismObject, "PrismObject<Dashboard> is null");
-                DashboardType dashboard = prismObject.getRealValue();
-                Validate.notNull(dashboard, "Dashboard object is null");
-
-                StringResourceModel label = null;
-                if(dashboard.getDisplay() != null && dashboard.getDisplay().getLabel() != null) {
-                    label = createStringResource(dashboard.getDisplay().getLabel().getOrig());
-                } else {
-                    label = createStringResource(dashboard.getName());
-                }
-                PageParameters pageParameters = new PageParameters();
-                pageParameters.add(OnePageParameterEncoder.PARAMETER, dashboard.getOid());
-                MenuItem menu = new MenuItem(label, "", PageDashboardConfigurable.class, pageParameters, null, null);
-                item.getItems().add(menu);
-            });
-        }
+        dashboards.forEach(prismObject -> {
+            Validate.notNull(prismObject, "PrismObject<Dashboard> is null");
+            DashboardType dashboard = prismObject.getRealValue();
+            Validate.notNull(dashboard, "Dashboard object is null");
+
+            StringResourceModel label;
+            if(dashboard.getDisplay() != null && dashboard.getDisplay().getLabel() != null) {
+                label = createStringResource(dashboard.getDisplay().getLabel().getOrig());
+            } else {
+                label = createStringResource(dashboard.getName());
+            }
+            PageParameters pageParameters = new PageParameters();
+            pageParameters.add(OnePageParameterEncoder.PARAMETER, dashboard.getOid());
+            MenuItem menu = new MenuItem(label, "", PageDashboardConfigurable.class, pageParameters, null, null);
+            item.getItems().add(menu);
+        });
 
         return item;
     }

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

@@ -4,7 +4,6 @@
  * 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.api.util;
 
 import static com.evolveum.midpoint.schema.GetOperationOptions.createNoFetchCollection;
@@ -24,6 +23,7 @@
 import org.apache.wicket.RestartResponseException;
 import org.apache.wicket.Session;
 import org.apache.wicket.ThreadContext;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import com.evolveum.midpoint.common.LocalizationService;
@@ -160,19 +160,17 @@ public static <O extends ObjectType> List<ObjectReferenceType> createObjectRefer
         OperationResult result = new OperationResult(OPERATION_LOAD_OBJECT_REFS);
 //        Task task = page.createSimpleTask(OPERATION_LOAD_PASSWORD_POLICIES);
 
-        try{
+        try {
             List<PrismObject<O>> objects = searchObjects(type, null, result, page);
             result.recomputeStatus();
-            if(objects != null){
-                List<ObjectReferenceType> references = new ArrayList<>();
+            List<ObjectReferenceType> references = new ArrayList<>();
 
-                for(PrismObject<O> object: objects){
-                    referenceMap.put(object.getOid(), WebComponentUtil.getName(object));
-                    references.add(ObjectTypeUtil.createObjectRef(object, page.getPrismContext()));
+            for(PrismObject<O> object: objects){
+                referenceMap.put(object.getOid(), WebComponentUtil.getName(object));
+                references.add(ObjectTypeUtil.createObjectRef(object, page.getPrismContext()));
 
-                }
-                return references;
             }
+            return references;
         } catch (Exception e){
             result.recordFatalError(page.createStringResource("WebModelUtils.couldntLoadPasswordPolicies").getString(), e);
             LoggingUtils.logUnexpectedException(LOGGER, "Couldn't load password policies", e);
@@ -184,7 +182,6 @@ public static <O extends ObjectType> List<ObjectReferenceType> createObjectRefer
         // }
 
         return null;
-
     }
 
     public static String runTask(TaskType taskToRun, Task operationalTask, OperationResult parentResult, PageBase pageBase){
@@ -388,22 +385,24 @@ public static boolean isNoFetch(Collection<SelectorOptions<GetOperationOptions>>
         return GetOperationOptions.isNoFetch(rootOptions);
     }
 
-    public static <T extends ObjectType> List<PrismObject<T>> searchObjects(Class<T> type, ObjectQuery query,
-                                                                            OperationResult result, PageBase page) {
+    @NotNull
+    public static <T extends ObjectType> List<PrismObject<T>> searchObjects(
+            Class<T> type, ObjectQuery query, OperationResult result, PageBase page) {
         return searchObjects(type, query, null, result, page, null);
     }
 
+    @NotNull
     public static <T extends ObjectType> List<PrismObject<T>> searchObjects(Class<T> type, ObjectQuery query,
             Collection<SelectorOptions<GetOperationOptions>> options,
             OperationResult result, PageBase page) {
         return searchObjects(type, query, options, result, page, null);
     }
 
-    public static <T extends ObjectType> List<PrismObject<T>> searchObjects(Class<T> type, ObjectQuery query,
-                                                                            Collection<SelectorOptions<GetOperationOptions>> options,
-                                                                            OperationResult result, PageBase page,
-                                                                            PrismObject<UserType> principal) {
-        LOGGER.debug("Searching {} with oid {}, options {}", new Object[]{type.getSimpleName(), query, options});
+    @NotNull
+    public static <T extends ObjectType> List<PrismObject<T>> searchObjects(
+            Class<T> type, ObjectQuery query, Collection<SelectorOptions<GetOperationOptions>> options,
+            OperationResult result, PageBase page, PrismObject<UserType> principal) {
+        LOGGER.debug("Searching {} with oid {}, options {}", type.getSimpleName(), query, options);
 
         OperationResult subResult;
         if (result != null) {
@@ -429,7 +428,7 @@ public static <T extends ObjectType> List<PrismObject<T>> searchObjects(Class<T>
             page.showResult(subResult);
         }
 
-        LOGGER.debug("Loaded ({}) with result {}", new Object[]{objects.size(), subResult});
+        LOGGER.debug("Loaded ({}) with result {}", objects.size(), subResult);
 
         return objects;
     }
@@ -447,7 +446,7 @@ public static <T extends ObjectType> int countObjects(Class<T> type, ObjectQuery
             LoggingUtils.logUnexpectedException(LOGGER, "Couldn't count objects", ex);
         }
 
-         LOGGER.debug("Count objects with result {}", new Object[]{parentResult});
+         LOGGER.debug("Count objects with result {}", parentResult);
          return count;
     }
 
@@ -464,7 +463,7 @@ public static <T extends ObjectType> void deleteObject(Class<T> type, String oid
     public static <T extends ObjectType> void deleteObject(Class<T> type, String oid, ModelExecuteOptions options,
                                                            OperationResult result, PageBase page,
                                                            PrismObject<UserType> principal) {
-        LOGGER.debug("Deleting {} with oid {}, options {}", new Object[]{type.getSimpleName(), oid, options});
+        LOGGER.debug("Deleting {} with oid {}, options {}", type.getSimpleName(), oid, options);
 
         OperationResult subResult;
         if (result != null) {
@@ -490,7 +489,7 @@ public static <T extends ObjectType> void deleteObject(Class<T> type, String oid
             page.showResult(subResult);
         }
 
-        LOGGER.debug("Deleted with result {}", new Object[]{result});
+        LOGGER.debug("Deleted with result {}", result);
     }
 
     public static Collection<SelectorOptions<GetOperationOptions>> createOptionsForParentOrgRefs(GetOperationOptionsBuilder builder) {
@@ -514,7 +513,7 @@ public static void save(ObjectDelta delta, ModelExecuteOptions options, Operatio
 
     public static void save(Collection<ObjectDelta<? extends ObjectType>> deltas, ModelExecuteOptions options,
                             OperationResult result, Task task, PageBase page) {
-        LOGGER.debug("Saving deltas {}, options {}", new Object[]{deltas, options});
+        LOGGER.debug("Saving deltas {}, options {}", deltas, options);
 
         OperationResult subResult;
         if (result != null) {
@@ -540,7 +539,7 @@ public static void save(Collection<ObjectDelta<? extends ObjectType>> deltas, Mo
             page.showResult(subResult);
         }
 
-        LOGGER.debug("Saved with result {}", new Object[]{subResult});
+        LOGGER.debug("Saved with result {}", subResult);
     }
 
     public static <T extends ObjectType> ObjectDelta<T> createActivationAdminStatusDelta(

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

@@ -30,7 +30,7 @@
  */
 public class WebPrismUtil {
 
-    private static final transient Trace LOGGER = TraceManager.getTrace(WebPrismUtil.class);
+    private static final Trace LOGGER = TraceManager.getTrace(WebPrismUtil.class);
 
     private static final String DOT_CLASS = WebPrismUtil.class.getName() + ".";
     private static final String OPERATION_CREATE_NEW_VALUE = DOT_CLASS + "createNewValue";

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/data/column/PrismContainerWrapperColumn.java

@@ -13,28 +13,20 @@
 import com.evolveum.midpoint.gui.api.prism.ItemWrapper;
 import com.evolveum.midpoint.gui.api.prism.PrismContainerWrapper;
 import com.evolveum.midpoint.gui.impl.prism.PrismContainerColumnHeaderPanel;
-import com.evolveum.midpoint.gui.impl.prism.PrismContainerHeaderPanel;
 import com.evolveum.midpoint.gui.impl.prism.PrismContainerValueWrapper;
 import com.evolveum.midpoint.prism.Containerable;
 import com.evolveum.midpoint.prism.PrismContainerDefinition;
 import com.evolveum.midpoint.prism.path.ItemPath;
-import com.evolveum.midpoint.util.logging.Trace;
-import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.web.model.PrismContainerWrapperHeaderModel;
 import com.evolveum.midpoint.web.model.PrismContainerWrapperModel;
 
 /**
  * @author katka
- *
  */
 public class PrismContainerWrapperColumn<C extends Containerable> extends AbstractItemWrapperColumn<C, PrismContainerValueWrapper<C>>{
 
-    private static final transient Trace LOGGER = TraceManager.getTrace(PrismContainerWrapperColumn.class);
-
     private static final long serialVersionUID = 1L;
 
-    private static final String ID_HEADER = "header";
-
     private PageBase pageBase;
 
     public PrismContainerWrapperColumn(IModel<? extends PrismContainerDefinition<C>> rowModel, ItemPath itemName, PageBase pageBase) {

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/data/column/PrismContainerWrapperColumnPanel.java

@@ -49,7 +49,7 @@
 public class PrismContainerWrapperColumnPanel<C extends Containerable> extends AbstractItemWrapperColumnPanel<PrismContainerWrapper<C>, PrismContainerValueWrapper<C>> {
 
     private static final long serialVersionUID = 1L;
-    private static final transient Trace LOGGER = TraceManager.getTrace(PrismContainerWrapperColumn.class);
+    private static final Trace LOGGER = TraceManager.getTrace(PrismContainerWrapperColumn.class);
 
     PrismContainerWrapperColumnPanel(String id, IModel<PrismContainerWrapper<C>> model, ColumnType columnType) {
         super(id, model, columnType);

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/data/column/PrismPropertyWrapperColumnPanel.java

@@ -28,7 +28,7 @@
 public class PrismPropertyWrapperColumnPanel<T> extends AbstractItemWrapperColumnPanel<PrismPropertyWrapper<T>, PrismPropertyValueWrapper<T>> {
 
     private static final long serialVersionUID = 1L;
-    private static final transient Trace LOGGER = TraceManager.getTrace(PrismPropertyWrapperColumnPanel.class);
+    private static final Trace LOGGER = TraceManager.getTrace(PrismPropertyWrapperColumnPanel.class);
 
     PrismPropertyWrapperColumnPanel(String id, IModel<PrismPropertyWrapper<T>> model, ColumnType columnType) {
         super(id, model, columnType);

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/data/column/PrismReferenceWrapperColumnPanel.java

@@ -33,7 +33,7 @@
 public class PrismReferenceWrapperColumnPanel<R extends Referencable> extends AbstractItemWrapperColumnPanel<PrismReferenceWrapper<R>, PrismValueWrapper<R, PrismReferenceValue>> {
 
     private static final long serialVersionUID = 1L;
-    private static final transient Trace LOGGER = TraceManager.getTrace(PrismReferenceWrapperColumnPanel.class);
+    private static final Trace LOGGER = TraceManager.getTrace(PrismReferenceWrapperColumnPanel.class);
 
     PrismReferenceWrapperColumnPanel(String id, IModel<PrismReferenceWrapper<R>> model, ColumnType columnType) {
         super(id, model, columnType);

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

@@ -27,8 +27,6 @@
 @Component
 public class AppendersWrapperFactoryImpl<C extends Containerable> extends PrismContainerWrapperFactoryImpl<C>{
 
-    private static final transient Trace LOGGER = TraceManager.getTrace(AppendersWrapperFactoryImpl.class);
-
     @Override
     public boolean match(ItemDefinition<?> def) {
         return QNameUtil.match(def.getTypeName(), AppenderConfigurationType.COMPLEX_TYPE);

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

@@ -11,19 +11,14 @@
 import com.evolveum.midpoint.prism.Containerable;
 import com.evolveum.midpoint.prism.ItemDefinition;
 import com.evolveum.midpoint.prism.PrismContainerValue;
-import com.evolveum.midpoint.util.logging.Trace;
-import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ClassLoggerConfigurationType;
 
 /**
  * @author skublik
- *
  */
 @Component
 public class ClassLoggerWrapperFactoryImpl<C extends Containerable> extends PrismContainerWrapperFactoryImpl<C>{
 
-    private static final transient Trace LOGGER = TraceManager.getTrace(ClassLoggerWrapperFactoryImpl.class);
-
     @Override
     public boolean match(ItemDefinition<?> def) {
         return false;

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

@@ -28,7 +28,7 @@
 @Component
 public class ConstructionWrapperFactory extends AssignmentDetailsWrapperFactoryImpl<ConstructionType> {
 
-    private static final transient Trace LOGGER = TraceManager.getTrace(ConstructionWrapperFactory.class);
+    private static final Trace LOGGER = TraceManager.getTrace(ConstructionWrapperFactory.class);
 
     @Autowired private ModelService model;
 

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

@@ -38,12 +38,11 @@
 
 /**
  * @author katka
- *
  */
 @Component
 public class HeterogenousContainerWrapperFactory<C extends Containerable> implements PrismContainerWrapperFactory<C> {
 
-    private static final transient Trace LOGGER = TraceManager.getTrace(HeterogenousContainerWrapperFactory.class);
+    private static final Trace LOGGER = TraceManager.getTrace(HeterogenousContainerWrapperFactory.class);
 
     @Autowired private GuiComponentRegistry registry;
 
@@ -122,8 +121,6 @@ private boolean containsEmphasizedItems(List<? extends ItemDefinition> definitio
     protected List<PrismContainerValueWrapper<C>> createValuesWrapper(PrismContainerWrapper<C> itemWrapper, PrismContainer<C> item, WrapperContext context) throws SchemaException {
         List<PrismContainerValueWrapper<C>> pvWrappers = new ArrayList<>();
 
-//        PrismContainerDefinition<C> definition = item.getDefinition();
-
         if (item.getValues() == null || item.getValues().isEmpty()) {
             PrismContainerValueWrapper<C> valueWrapper = createValueWrapper(itemWrapper, item.createNewValue(), ValueStatus.ADDED, context);
             pvWrappers.add(valueWrapper);

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

@@ -10,14 +10,6 @@
 import java.util.Collection;
 import java.util.List;
 
-import com.evolveum.midpoint.model.api.authentication.CompiledUserProfile;
-import com.evolveum.midpoint.prism.*;
-import com.evolveum.midpoint.prism.path.ItemPath;
-import com.evolveum.midpoint.prism.util.ItemPathTypeUtil;
-import com.evolveum.midpoint.util.QNameUtil;
-import com.evolveum.midpoint.util.exception.*;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
-import com.evolveum.prism.xml.ns._public.types_3.ItemPathType;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -28,21 +20,26 @@
 import com.evolveum.midpoint.gui.impl.prism.PrismValueWrapper;
 import com.evolveum.midpoint.gui.impl.registry.GuiComponentRegistryImpl;
 import com.evolveum.midpoint.model.api.ModelInteractionService;
+import com.evolveum.midpoint.prism.*;
 import com.evolveum.midpoint.prism.path.ItemName;
-import com.evolveum.midpoint.schema.processor.ResourceAttribute;
+import com.evolveum.midpoint.prism.path.ItemPath;
+import com.evolveum.midpoint.util.QNameUtil;
+import com.evolveum.midpoint.util.exception.SchemaException;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
-import com.evolveum.midpoint.web.component.prism.ContainerStatus;
 import com.evolveum.midpoint.web.component.prism.ValueStatus;
-import com.evolveum.prism.xml.ns._public.query_3.SearchFilterType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.FocusType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.VirtualContainerItemSpecificationType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.VirtualContainersSpecificationType;
+import com.evolveum.prism.xml.ns._public.types_3.ItemPathType;
 
 /**
  * @author katka
  *
  */
 public abstract class ItemWrapperFactoryImpl<IW extends ItemWrapper, PV extends PrismValue, I extends Item, VW extends PrismValueWrapper> implements ItemWrapperFactory<IW, VW, PV> {
 
-    private static final transient Trace LOGGER = TraceManager.getTrace(ItemWrapperFactoryImpl.class);
+    private static final Trace LOGGER = TraceManager.getTrace(ItemWrapperFactoryImpl.class);
 
     @Autowired private GuiComponentRegistryImpl registry;
     @Autowired private PrismContext prismContext;