Merge remote-tracking branch 'origin/master' into feature/adminlte3-u…

…pgrade
Evolveum · Apr 19, 2022 · af08c3a · af08c3a
2 parents 0f55a8b + 81ae316
commit af08c3a
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 18 deletions.
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
@@ -1,17 +1,15 @@
 /*
- * Copyright (C) 2010-2021 Evolveum and contributors
+ * Copyright (C) 2010-2022 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.boot;
 
-import com.evolveum.midpoint.common.configuration.api.MidpointConfiguration;
-import com.evolveum.midpoint.gui.impl.factory.panel.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 java.lang.management.ManagementFactory;
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+import java.util.Collections;
 
 import org.apache.catalina.Context;
 import org.apache.catalina.Manager;
@@ -44,10 +42,12 @@
 import org.springframework.scheduling.concurrent.ConcurrentTaskScheduler;
 import org.springframework.stereotype.Component;
 
-import java.lang.management.ManagementFactory;
-import java.time.Duration;
-import java.time.temporal.ChronoUnit;
-import java.util.Collections;
+import com.evolveum.midpoint.common.configuration.api.MidpointConfiguration;
+import com.evolveum.midpoint.gui.impl.factory.panel.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;
 
 /**
  * Created by Viliam Repan (lazyman).
@@ -83,7 +83,6 @@
 @SpringBootConfiguration
 @ComponentScan(
         basePackages = {
-                "com.evolveum.midpoint.web.security.factory",
                 "com.evolveum.midpoint.gui",
                 "com.evolveum.midpoint.gui.api",
         },
@@ -148,8 +147,8 @@ private static SpringApplicationBuilder configureApplication(SpringApplicationBu
 
         application.bannerMode(Banner.Mode.LOG);
 
-        // cglib used by wicket unsupport java 15+ so we need use byte buddy generation for wicket
-        // We can remove this after cglib(wicket) fix issue with java 15+ or when wicket will use byte buddy as default
+        // cglib used by wicket does not support Java 15+ so we need use byte buddy generation for wicket.
+        // We can remove this after cglib(wicket) fix issue with java 15+ or when wicket will use byte buddy as default.
         System.setProperty("wicket.ioc.useByteBuddy", "true");
 
         return application.sources(MidPointSpringApplication.class);

diff --git a/...admin-gui/src/test/java/com/evolveum/midpoint/gui/test/TestMidPointSpringApplication.java b/...admin-gui/src/test/java/com/evolveum/midpoint/gui/test/TestMidPointSpringApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2020 Evolveum and contributors
+ * Copyright (C) 2010-2022 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
@@ -62,7 +62,15 @@
 })
 @Profile({ "test", "!default" })
 @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.gui",
+                "com.evolveum.midpoint.gui.api"
+        },
+        basePackageClasses = {
+                TextAreaPanelFactory.class,
+                GuiComponentRegistryImpl.class
+        })
 public class TestMidPointSpringApplication extends AbstractSpringBootApplication {
 
     private static final Trace LOGGER = TraceManager.getTrace(TestMidPointSpringApplication.class);
@@ -128,8 +136,8 @@ private static SpringApplicationBuilder configureApplication(SpringApplicationBu
 
         application.bannerMode(Banner.Mode.LOG);
 
-        // cglib used by wicket unsupport java 15+ so we need use byte buddy generation for wicket
-        // We can remove this after cglib(wicket) fix issue with java 15+ or when wicket will use byte buddy as default
+        // cglib used by wicket does not support Java 15+ so we need use byte buddy generation for wicket.
+        // We can remove this after cglib(wicket) fix issue with java 15+ or when wicket will use byte buddy as default.
         System.setProperty("wicket.ioc.useByteBuddy", "true");
 
         return application.sources(TestMidPointSpringApplication.class);