Merge branch 'master' into feature/datamodel-diagrams

Evolveum · Jun 8, 2021 · dc92f9d · dc92f9d
2 parents ae0c318 + 70e3199
commit dc92f9d
Show file tree

Hide file tree

Showing 232 changed files with 11,436 additions and 2,154 deletions.
diff --git a/config/sql/postgresql-4.3-all.sql b/config/sql/postgresql-4.3-all.sql
@@ -1399,5 +1399,3 @@ create index idx_qrtz_ft_j_g on qrtz_fired_triggers(SCHED_NAME,JOB_NAME,JOB_GROU
 create index idx_qrtz_ft_jg on qrtz_fired_triggers(SCHED_NAME,JOB_GROUP);
 create index idx_qrtz_ft_t_g on qrtz_fired_triggers(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP);
 create index idx_qrtz_ft_tg on qrtz_fired_triggers(SCHED_NAME,TRIGGER_GROUP);
-
-commit;
diff --git a/dist/javadoc/pom.xml b/dist/javadoc/pom.xml
@@ -24,11 +24,11 @@
     <properties>
         <!-- see notes in main midPoint POM -->
         <!--  MID-5666: For some reason deploying of javadoc was disabled -->
-        <!--  
+        <!--
         <maven.install.skip>true</maven.install.skip>
         <maven.deploy.skip>true</maven.deploy.skip>
-        <maven.test.skip>true</maven.test.skip>
         -->
+        <maven.test.skip>true</maven.test.skip>
     </properties>
 
     <dependencies>

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
@@ -1,18 +1,12 @@
 /*
- * Copyright (c) 2010-2019 Evolveum and contributors
+ * Copyright (C) 2010-2021 Evolveum and contributors
  *
  * 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.web.application;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.function.Consumer;
 
 import org.apache.commons.lang3.StringUtils;
@@ -62,6 +56,7 @@ public final class DescriptorLoader implements DebugDumpable {
             "com.evolveum.midpoint.web.component.prism.show"
     };
 
+    // All could be final, but then Checkstyle complains about lower-case, although these are not constants.
     private static Map<String, DisplayableValue<String>[]> actions = new HashMap<>();
     private static List<String> permitAllUrls = new ArrayList<>();
     private static List<String> loginPages = new ArrayList<>();
@@ -94,18 +89,16 @@ public void loadData(MidPointApplication application) {
             }
         } catch (InstantiationException | IllegalAccessException e) {
             LOGGER.error("Error scanning packages for pages: {}", e.getMessage(), e);
-            throw new SystemException("Error scanning packages for pages: "+e.getMessage(), e);
+            throw new SystemException("Error scanning packages for pages: " + e.getMessage(), e);
         }
 
-
-
     }
 
     private void scanPackagesForPages(MidPointApplication application)
             throws InstantiationException, IllegalAccessException {
 
         for (String pac : PACKAGES_TO_SCAN) {
-            LOGGER.debug("Scanning package package {} for page annotations", pac);
+            LOGGER.debug("Scanning package {} for page annotations", pac);
 
             Set<Class<?>> classes = ClassPathUtil.listClasses(pac);
             for (Class<?> clazz : classes) {
@@ -126,7 +119,7 @@ private void scanPackagesForPages(MidPointApplication application)
 
     private void loadActions(PageDescriptor descriptor) {
 
-        if(descriptor.loginPage()) {
+        if (descriptor.loginPage()) {
             foreachUrl(descriptor, url -> loginPages.add(url));
         }
 
@@ -154,13 +147,11 @@ private void loadActions(PageDescriptor descriptor) {
 
         //add http://.../..#guiAll authorization only for displayable pages, not for pages used for development..
         if (canAccess) {
-
-//            actions.add(new AuthorizationActionValue(AuthorizationConstants.AUTZ_GUI_ALL_LABEL, AuthorizationConstants.AUTZ_GUI_ALL_DESCRIPTION));
             actions.add(new AuthorizationActionValue(AuthorizationConstants.AUTZ_GUI_ALL_URL,
                     AuthorizationConstants.AUTZ_GUI_ALL_LABEL, AuthorizationConstants.AUTZ_GUI_ALL_DESCRIPTION));
         }
 
-        foreachUrl(descriptor, url -> this.actions.put(url, actions.toArray(new DisplayableValue[actions.size()])));
+        foreachUrl(descriptor, url -> DescriptorLoader.actions.put(url, actions.toArray(new DisplayableValue[actions.size()])));
     }
 
     private void foreachUrl(PageDescriptor descriptor, Consumer<String> urlConsumer) {

diff --git a/...om/evolveum/midpoint/web/page/admin/reports/component/SearchFilterConfigurationPanel.java b/...om/evolveum/midpoint/web/page/admin/reports/component/SearchFilterConfigurationPanel.java
@@ -122,6 +122,7 @@ private void initLayout() {
 
         WebMarkupContainer textFieldContainer = new WebMarkupContainer(ID_TEXT_DNS_CONTAINER);
         textFieldContainer.setOutputMarkupId(true);
+        textFieldContainer.add(new VisibleBehaviour(() -> FiledType.QUERY.equals(fieldType)));
         textFieldContainer.add(AttributeAppender.append("class", classGridModel));
         textFieldContainer.add(AttributeAppender.append("style", (IModel<?>) () -> {
             if (FiledType.QUERY.equals(fieldType)) {

diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/web/util/SchrodingerComponentInitListener.java b/...in-gui/src/main/java/com/evolveum/midpoint/web/util/SchrodingerComponentInitListener.java
@@ -18,6 +18,7 @@
 import org.apache.wicket.Page;
 import org.apache.wicket.application.IComponentInitializationListener;
 import org.apache.wicket.behavior.Behavior;
+import org.apache.wicket.markup.html.image.Image;
 import org.apache.wicket.model.PropertyModel;
 import org.apache.wicket.model.StringResourceModel;
 import org.apache.wicket.request.Response;
@@ -54,11 +55,7 @@ public void onInitialize(Component component) {
     }
 
     private void handleId(Component component) {
-        if (component instanceof CaptchaPanel) {
-            writeDataAttribute(component, ATTR_ID, component.getId() + ((CaptchaPanel) component).getRandomText());
-        } else {
-            writeDataAttribute(component, ATTR_ID, component.getId());
-        }
+        writeDataAttribute(component, ATTR_ID, component.getId());
     }
 
     private void writeDataAttribute(Component component, String key, String value) {

diff --git a/gui/admin-gui/src/main/resources/logback.xml b/gui/admin-gui/src/main/resources/logback.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2010-2017 Evolveum and contributors
+  ~ Copyright (C) 2010-2021 Evolveum and contributors
   ~
   ~ This work is dual-licensed under the Apache License 2.0
   ~ and European Union Public License. See LICENSE file for details.
@@ -10,7 +10,7 @@
 
     <if condition='"true".equals(property("midpoint.logging.alt.enabled"))'>
         <then>
-            <include resource="logback-alt.xml" />
+            <include resource="logback-alt.xml"/>
         </then>
     </if>
 
@@ -60,16 +60,16 @@
     <logger name="org.hibernate.engine.jdbc.batch.internal.BatchingBatch" level="OFF"/>
     <logger name="org.hibernate.engine.jdbc.batch.internal.AbstractBatchImpl" level="WARN"/>
 
-    <!-- MID-6512: 
-        JAXPParser only logs configuration exception it - is causing (it proactivelly tries to 
-        disable secure entity processing), but works fine even if exception is thrown.
+    <!-- MID-6512:
+        JAXPParser only logs configuration exception it is causing. It proactively tries to
+        disable secure entity processing, but works fine even if exception is thrown.
         Behaviour is hardcoded, and can not be prevented, so we mute it off in logs to not cause
         unnecessary concern.
     -->
-    <logger name="com.sun.xml.xsom.parser.JAXPParser" level="OFF" />
+    <logger name="com.sun.xml.xsom.parser.JAXPParser" level="OFF"/>
 
     <logger name="PROFILING" level="INFO"/>
-    <logger name="com.evolveum.midpoint" level="INFO" />
+    <logger name="com.evolveum.midpoint" level="INFO"/>
     <logger name="com.evolveum.midpoint.web.util.MidPointProfilingServletFilter" level="TRACE">
         <appender-ref ref="MIDPOINT_PROFILE_LOG"/>
     </logger>