appender and class logger - lookup table support

Evolveum · Mar 16, 2022 · 1559aeb · 1559aeb
1 parent e52ed82
commit 1559aeb
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 16 deletions.
diff --git a/...main/java/com/evolveum/midpoint/gui/api/component/autocomplete/AutoCompleteTextPanel.java b/...main/java/com/evolveum/midpoint/gui/api/component/autocomplete/AutoCompleteTextPanel.java
@@ -125,7 +125,13 @@ protected <C> IConverter<C> getAutoCompleteConverter(Class<C> type, IConverter<C
             return originConverter;
         }
 
-        return new LookupTableConverter<>(originConverter, lookupTableType, getBaseFormComponent(), strict);
+        return new LookupTableConverter<>(originConverter, lookupTableType, getBaseFormComponent(), strict) {
+
+            @Override
+            protected LookupTableType getLookupTable() {
+                return AutoCompleteTextPanel.this.getLookupTable();
+            }
+        };
     }
 
     protected LookupTableType getLookupTable() {

diff --git a/.../main/java/com/evolveum/midpoint/gui/api/component/autocomplete/LookupTableConverter.java b/.../main/java/com/evolveum/midpoint/gui/api/component/autocomplete/LookupTableConverter.java
@@ -81,7 +81,7 @@ public String convertToString(C key, Locale arg1) {
         return key.toString();
     }
 
-    private LookupTableType getLookupTable() {
+    protected LookupTableType getLookupTable() {
         if (lookupTableOid != null) {
             Task task = getPageBase().createSimpleTask("Load lookup table");
             OperationResult result = task.getResult();

diff --git a/...c/main/java/com/evolveum/midpoint/gui/impl/factory/panel/LoggingAppenderPanelFactory.java b/...c/main/java/com/evolveum/midpoint/gui/impl/factory/panel/LoggingAppenderPanelFactory.java
@@ -17,8 +17,15 @@
 import com.evolveum.midpoint.web.component.prism.InputPanel;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ClassLoggerConfigurationType;
 
+import javax.annotation.PostConstruct;
+
 @Component
-public abstract class LoggingAppenderPanelFactory extends AbstractInputGuiComponentFactory<String> {
+public class LoggingAppenderPanelFactory extends AbstractInputGuiComponentFactory<String> {
+
+    @PostConstruct
+    public void register() {
+        getRegistry().addToRegistry(this);
+    }
 
     @Override
     protected InputPanel getPanel(PrismPropertyPanelContext<String> panelCtx) {
@@ -34,6 +41,6 @@ protected InputPanel getPanel(PrismPropertyPanelContext<String> panelCtx) {
 
     @Override
     public Integer getOrder() {
-        return 90;
+        return 1;
     }
 }
diff --git a/...rc/main/java/com/evolveum/midpoint/gui/impl/factory/panel/LoggingPackagePanelFactory.java b/...rc/main/java/com/evolveum/midpoint/gui/impl/factory/panel/LoggingPackagePanelFactory.java
@@ -15,8 +15,15 @@
 import com.evolveum.midpoint.web.component.prism.InputPanel;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ClassLoggerConfigurationType;
 
+import javax.annotation.PostConstruct;
+
 @Component
-public abstract class LoggingPackagePanelFactory extends AbstractInputGuiComponentFactory<String> {
+public class LoggingPackagePanelFactory extends AbstractInputGuiComponentFactory<String> {
+
+    @PostConstruct
+    public void register() {
+        getRegistry().addToRegistry(this);
+    }
 
     @Override
     protected InputPanel getPanel(PrismPropertyPanelContext<String> panelCtx) {
@@ -32,6 +39,6 @@ protected InputPanel getPanel(PrismPropertyPanelContext<String> panelCtx) {
 
     @Override
     public Integer getOrder() {
-        return 90;
+        return 1;
     }
 }
diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/TextPanelFactory.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/TextPanelFactory.java
@@ -9,30 +9,22 @@
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.annotation.PostConstruct;
 import javax.xml.namespace.QName;
 
-import com.evolveum.midpoint.gui.api.component.autocomplete.LookupAutocompletePanel;
-import com.evolveum.midpoint.util.DisplayableValue;
-
-import com.evolveum.midpoint.web.component.search.FilterSearchItem;
-import com.evolveum.midpoint.web.page.admin.configuration.component.EmptyOnChangeAjaxFormUpdatingBehavior;
-
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
-import org.apache.wicket.model.PropertyModel;
 import org.springframework.stereotype.Component;
 
 import com.evolveum.midpoint.common.LocalizationService;
-import com.evolveum.midpoint.gui.api.component.autocomplete.AutoCompleteTextPanel;
+import com.evolveum.midpoint.gui.api.component.autocomplete.LookupAutocompletePanel;
 import com.evolveum.midpoint.gui.api.prism.wrapper.ItemWrapper;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.util.DOMUtil;
+import com.evolveum.midpoint.util.DisplayableValue;
 import com.evolveum.midpoint.web.component.input.TextPanel;
 import com.evolveum.midpoint.web.component.prism.InputPanel;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.LookupTableType;