Merge remote-tracking branch 'refs/remotes/origin/master'

Evolveum · Jan 22, 2020 · c5d9f9b · c5d9f9b
2 parents 45dec07 + c56855a
commit c5d9f9b
Show file tree

Hide file tree

Showing 358 changed files with 425 additions and 1,143 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiConstants.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiConstants.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2017 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiFeature.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiFeature.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2017 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-2019 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0

diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ChooseOrgMemberPopup.java b/...admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ChooseOrgMemberPopup.java
@@ -8,12 +8,7 @@
 
 import com.evolveum.midpoint.gui.api.component.tabs.CountablePanelTab;
 
-/**
- * Created by honchar
- */
-
 import com.evolveum.midpoint.web.component.util.SelectableBean;
-import com.evolveum.midpoint.web.component.util.SelectableBeanImpl;
 import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
 import com.evolveum.midpoint.web.page.admin.roles.AvailableRelationDto;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
@@ -26,6 +21,9 @@
 import javax.xml.namespace.QName;
 import java.util.List;
 
+/**
+ * @author honchar
+ */
 public abstract class ChooseOrgMemberPopup<O extends ObjectType> extends ChooseMemberPopup<O, OrgType> {
     private static final long serialVersionUID = 1L;
 

diff --git a/.../java/com/evolveum/midpoint/gui/api/component/autocomplete/AbstractAutoCompletePanel.java b/.../java/com/evolveum/midpoint/gui/api/component/autocomplete/AbstractAutoCompletePanel.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0

diff --git a/.../evolveum/midpoint/gui/api/component/autocomplete/AutoCompleteItemDefinitionRenderer.java b/.../evolveum/midpoint/gui/api/component/autocomplete/AutoCompleteItemDefinitionRenderer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2010-2019 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0

diff --git a/...in/java/com/evolveum/midpoint/gui/api/component/autocomplete/ItemDefinitionConverter.java b/...in/java/com/evolveum/midpoint/gui/api/component/autocomplete/ItemDefinitionConverter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2010-2019 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0

diff --git a/.../src/main/java/com/evolveum/midpoint/gui/api/component/button/CsvDownloadButtonPanel.java b/.../src/main/java/com/evolveum/midpoint/gui/api/component/button/CsvDownloadButtonPanel.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2010-2019 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0
@@ -10,12 +10,10 @@
 import java.io.OutputStream;
 import java.util.List;
 
-import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.web.component.data.BaseSortableDataProvider;
 import com.evolveum.midpoint.web.component.dialog.ConfirmationPanel;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.AdminGuiConfigurationType;
 import com.evolveum.midpoint.web.component.data.SelectableBeanObjectDataProvider;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;

diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/captcha/CaptchaPanel.java b/...admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/captcha/CaptchaPanel.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2010-2019 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathDto.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2010-2019 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathPanel.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2010-2019 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0

diff --git a/...-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathSegmentPanel.java b/...-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathSegmentPanel.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2010-2019 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0

diff --git a/...min-gui/src/main/java/com/evolveum/midpoint/gui/api/component/tabs/CountablePanelTab.java b/...min-gui/src/main/java/com/evolveum/midpoint/gui/api/component/tabs/CountablePanelTab.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016 Evolveum and contributors
  * <p>
  * This work is dual-licensed under the Apache License 2.0

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/model/CountModelProvider.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/model/CountModelProvider.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/model/DisplayNameModel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/model/DisplayNameModel.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2017 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0

diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/gui/api/util/FeatureVisibleEnableBehaviour.java b/...n-gui/src/main/java/com/evolveum/midpoint/gui/api/util/FeatureVisibleEnableBehaviour.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2017-2018 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/box/InfoBoxPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/box/InfoBoxPanel.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2010-2019 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0

diff --git a/...-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/ConstructionWrapperFactory.java b/...-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/ConstructionWrapperFactory.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2010-2019 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0
@@ -7,10 +7,8 @@
 package com.evolveum.midpoint.gui.impl.factory;
 
 import com.evolveum.midpoint.gui.api.prism.PrismContainerWrapper;
-import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils;
 import com.evolveum.midpoint.gui.impl.prism.ConstructionValueWrapper;
 import com.evolveum.midpoint.gui.impl.prism.PrismContainerValueWrapper;
-import com.evolveum.midpoint.gui.impl.prism.PrismContainerValueWrapperImpl;
 import com.evolveum.midpoint.model.api.ModelService;
 import com.evolveum.midpoint.prism.ItemDefinition;
 import com.evolveum.midpoint.prism.PrismContainerValue;

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/ItemPanelContext.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/ItemPanelContext.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2010-2019 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0
@@ -11,7 +11,6 @@
 import org.apache.commons.lang.ClassUtils;
 import org.apache.wicket.Component;
 import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.panel.FeedbackPanel;
 import org.apache.wicket.model.IModel;
 
 import com.evolveum.midpoint.gui.api.page.PageBase;
@@ -21,7 +20,6 @@
 import com.evolveum.midpoint.prism.PrismReferenceValue;
 import com.evolveum.midpoint.prism.PrismValue;
 import com.evolveum.midpoint.prism.path.ItemName;
-import com.evolveum.midpoint.web.component.message.FeedbackAlerts;
 
 public abstract class ItemPanelContext<T, IW extends ItemWrapper> implements Serializable {
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/ItemPanelSettings.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/ItemPanelSettings.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2010-2019 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0

diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/ItemPanelSettingsBuilder.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/ItemPanelSettingsBuilder.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2010-2019 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0

diff --git a/...in/java/com/evolveum/midpoint/gui/impl/prism/component/ExpressionPropertyHeaderPanel.java b/...in/java/com/evolveum/midpoint/gui/impl/prism/component/ExpressionPropertyHeaderPanel.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2010-2019 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0
@@ -8,7 +8,6 @@
 
 import com.evolveum.midpoint.gui.api.GuiStyleConstants;
 import com.evolveum.midpoint.gui.api.component.togglebutton.ToggleIconButton;
-import com.evolveum.midpoint.gui.api.prism.PrismContainerWrapper;
 import com.evolveum.midpoint.gui.impl.prism.*;
 import com.evolveum.midpoint.prism.PrismProperty;
 import com.evolveum.midpoint.prism.PrismPropertyDefinition;

diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/gui/impl/registry/GuiComponentRegistryImpl.java b/...n-gui/src/main/java/com/evolveum/midpoint/gui/impl/registry/GuiComponentRegistryImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2010-2019 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/util/GuiImplUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/util/GuiImplUtil.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2017 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/DescriptorLoader.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/DescriptorLoader.java
@@ -105,13 +105,13 @@ private void scanPackagesForPages(MidPointApplication application)
         for (String pac : PACKAGES_TO_SCAN) {
             LOGGER.debug("Scanning package package {} for page annotations", new Object[]{pac});
 
-            Set<Class> classes = ClassPathUtil.listClasses(pac);
-            for (Class clazz : classes) {
+            Set<Class<?>> classes = ClassPathUtil.listClasses(pac);
+            for (Class<?> clazz : classes) {
                 if (!WebPage.class.isAssignableFrom(clazz)) {
                     continue;
                 }
 
-                PageDescriptor descriptor = (PageDescriptor) clazz.getAnnotation(PageDescriptor.class);
+                PageDescriptor descriptor = clazz.getAnnotation(PageDescriptor.class);
                 if (descriptor == null) {
                     continue;
                 }

diff --git a/...min-gui/src/main/java/com/evolveum/midpoint/web/boot/EmbeddedTomcatAutoConfiguration.java b/...min-gui/src/main/java/com/evolveum/midpoint/web/boot/EmbeddedTomcatAutoConfiguration.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2018 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/MidPointSpringApplication.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/MidPointSpringApplication.java
@@ -10,9 +10,9 @@
 import com.evolveum.midpoint.common.configuration.api.MidpointConfiguration;
 import com.evolveum.midpoint.gui.impl.factory.TextAreaPanelFactory;
 import com.evolveum.midpoint.gui.impl.registry.GuiComponentRegistryImpl;
-import com.evolveum.midpoint.task.api.TaskManager;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
+
 import org.apache.catalina.Context;
 import org.apache.catalina.Manager;
 import org.apache.catalina.Valve;
@@ -21,7 +21,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.Banner;
-import org.springframework.boot.ExitCodeGenerator;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.autoconfigure.web.ServerProperties;
@@ -46,8 +45,6 @@
 import org.springframework.scheduling.concurrent.ConcurrentTaskScheduler;
 import org.springframework.stereotype.Component;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
 import java.lang.management.ManagementFactory;
 import java.time.Duration;
 import java.util.ArrayList;
@@ -83,7 +80,7 @@
 })
 @Profile("!test")
 @SpringBootConfiguration
-@ComponentScan(basePackages = {"com.evolveum.midpoint.web.security.factory","com.evolveum.midpoint.gui","com.evolveum.midpoint.gui.api"}, basePackageClasses = {TextAreaPanelFactory.class, GuiComponentRegistryImpl.class})
+@ComponentScan(basePackages = {"com.evolveum.midpoint.web.security.factory", "com.evolveum.midpoint.gui", "com.evolveum.midpoint.gui.api"}, basePackageClasses = {TextAreaPanelFactory.class, GuiComponentRegistryImpl.class})
 @EnableScheduling
 public class MidPointSpringApplication extends AbstractSpringBootApplication {
 
@@ -93,7 +90,7 @@ public class MidPointSpringApplication extends AbstractSpringBootApplication {
     private Context tomcatContext;
 
     public static void main(String[] args) {
-        System.out.println("ClassPath: "+ System.getProperty("java.class.path"));
+        System.out.println("ClassPath: " + System.getProperty("java.class.path"));
 
         System.setProperty("xml.catalog.className", "com.evolveum.midpoint.prism.impl.schema.CatalogImpl");
         String mode = args != null && args.length > 0 ? args[0] : null;
@@ -103,15 +100,8 @@ public static void main(String[] args) {
                     " Application mode:" + mode + " context:" + applicationContext);
         }
 
-        if (applicationContext != null && mode != null && "stop".equals(mode)) {
-            System.exit(SpringApplication.exit(applicationContext, new ExitCodeGenerator() {
-
-                @Override
-                public int getExitCode() {
-
-                    return 0;
-                }
-            }));
+        if (applicationContext != null && "stop".equals(mode)) {
+            System.exit(SpringApplication.exit(applicationContext, () -> 0));
 
         } else {
 
@@ -232,7 +222,7 @@ public void customize(Context context) {
                     setTomcatContext(context);
                 }
             };
-            List<TomcatContextCustomizer> contextCustomizers = new ArrayList<TomcatContextCustomizer>();
+            List<TomcatContextCustomizer> contextCustomizers = new ArrayList<>();
             contextCustomizers.add(contextCustomizer);
             tomcatFactory.setTomcatContextCustomizers(contextCustomizers);
 
@@ -243,16 +233,16 @@ public void customize(Context context) {
 
             if (useForwardHeaders) {
                 RemoteIpValve remoteIpValve = new RemoteIpValve();
-                if(StringUtils.isNotEmpty(internalProxies)) {
+                if (StringUtils.isNotEmpty(internalProxies)) {
                     remoteIpValve.setInternalProxies(internalProxies);
                 }
-                if(StringUtils.isNotEmpty(protocolHeader)) {
+                if (StringUtils.isNotEmpty(protocolHeader)) {
                     remoteIpValve.setProtocolHeader(protocolHeader);
                 }
-                if(StringUtils.isNotEmpty(protocolHeaderHttpsValue)) {
+                if (StringUtils.isNotEmpty(protocolHeaderHttpsValue)) {
                     remoteIpValve.setProtocolHeaderHttpsValue(protocolHeaderHttpsValue);
                 }
-                if(StringUtils.isNotEmpty(portHeader)) {
+                if (StringUtils.isNotEmpty(portHeader)) {
                     remoteIpValve.setPortHeader(portHeader);
                 }
                 tomcatFactory.addEngineValves(remoteIpValve);

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxButton.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxButton.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2010-2019 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxSubmitButton.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxSubmitButton.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2010-2019 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/FocusSummaryPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/FocusSummaryPanel.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2015-2019 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0

diff --git a/...main/java/com/evolveum/midpoint/web/component/assignment/ApplicablePolicyConfigPanel.java b/...main/java/com/evolveum/midpoint/web/component/assignment/ApplicablePolicyConfigPanel.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2015-2018 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0

diff --git a/.../main/java/com/evolveum/midpoint/web/component/assignment/ApplicablePolicyGroupPanel.java b/.../main/java/com/evolveum/midpoint/web/component/assignment/ApplicablePolicyGroupPanel.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2015-2018 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0

diff --git a/.../src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentDetailsPanel.java b/.../src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentDetailsPanel.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2010-2019 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0

diff --git a/...main/java/com/evolveum/midpoint/web/component/assignment/ConstructionAssignmentPanel.java b/...main/java/com/evolveum/midpoint/web/component/assignment/ConstructionAssignmentPanel.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2010-2019 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0
@@ -15,15 +15,13 @@
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 
-import com.evolveum.midpoint.gui.api.prism.ItemWrapper;
 import com.evolveum.midpoint.gui.api.prism.PrismContainerWrapper;
 import com.evolveum.midpoint.gui.impl.component.data.column.AbstractItemWrapperColumn.ColumnType;
 import com.evolveum.midpoint.gui.impl.component.data.column.PrismPropertyWrapperColumn;
 import com.evolveum.midpoint.gui.impl.prism.PrismContainerValueWrapper;
 import com.evolveum.midpoint.prism.PrismContainerDefinition;
 import com.evolveum.midpoint.prism.path.ItemPath;
 import com.evolveum.midpoint.prism.query.ObjectQuery;
-import com.evolveum.midpoint.web.component.prism.ItemVisibility;
 import com.evolveum.midpoint.web.component.search.SearchFactory;
 import com.evolveum.midpoint.web.component.search.SearchItemDefinition;
 import com.evolveum.midpoint.web.model.PrismContainerWrapperModel;