kie-issues#1012: Removing kie-soup-commons dependency in DashBuilder (

#2199)
apache · Mar 15, 2024 · 013f7f7 · 013f7f7
1 parent 5831ab7
commit 013f7f7
Show file tree

Hide file tree

Showing 43 changed files with 181 additions and 148 deletions.
diff --git a/packages/dashbuilder/appformer/uberfire-api/pom.xml b/packages/dashbuilder/appformer/uberfire-api/pom.xml
@@ -43,11 +43,6 @@
       <artifactId>uberfire-commons</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.kie.soup</groupId>
-      <artifactId>kie-soup-commons</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.jboss.errai</groupId>
       <artifactId>errai-common</artifactId>

diff --git a/...ages/dashbuilder/appformer/uberfire-api/src/main/java/org/uberfire/plugin/PluginUtil.java b/...ages/dashbuilder/appformer/uberfire-api/src/main/java/org/uberfire/plugin/PluginUtil.java
@@ -24,13 +24,12 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
 import jsinterop.annotations.JsIgnore;
 import jsinterop.annotations.JsType;
 
-import static org.kie.soup.commons.validation.PortablePreconditions.checkNotNull;
-
 /**
  * Utilities for working with external (GWT-compiled) plugins.
  */
@@ -61,6 +60,10 @@ public static <T> List<T> ensureIterable(List<T> externalList) {
         return Collections.unmodifiableList(tmp);
     }
 
+    private static <T> T checkNotNull(String objName, T obj) {
+        return Objects.requireNonNull(obj, "Parameter named '" + objName + "' should be not null!");
+    }
+
     /**
      * {@link Set} is a {@link JsType} but {@link Collection#iterator()} is
      * {@link JsIgnore}d and therefore not exported to JavaScript.

diff --git a/...lder/appformer/uberfire-api/src/main/java/org/uberfire/workbench/model/NamedPosition.java b/...lder/appformer/uberfire-api/src/main/java/org/uberfire/workbench/model/NamedPosition.java
@@ -20,11 +20,11 @@
 
 package org.uberfire.workbench.model;
 
+import java.util.Objects;
+
 import org.jboss.errai.common.client.api.annotations.MapsTo;
 import org.jboss.errai.common.client.api.annotations.Portable;
 
-import static org.kie.soup.commons.validation.PortablePreconditions.checkNotNull;
-
 /**
  * Represents the position of a child panel by name. For example, within a templated perspective, panels are positioned
  * by ErraiUI DataField names.
@@ -54,6 +54,10 @@ public NamedPosition(@MapsTo("fieldName") String fieldName) {
                                       fieldName);
     }
 
+    private static <T> T checkNotNull(String objName, T obj) {
+        return Objects.requireNonNull(obj, "Parameter named '" + objName + "' should be not null!");
+    }
+
     /**
      * Returns the data field name this Position refers to.
      *

diff --git a/...mer/uberfire-api/src/main/java/org/uberfire/workbench/model/impl/PanelDefinitionImpl.java b/...mer/uberfire-api/src/main/java/org/uberfire/workbench/model/impl/PanelDefinitionImpl.java
@@ -24,6 +24,7 @@
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
 import jsinterop.annotations.JsIgnore;
@@ -37,7 +38,6 @@
 import org.uberfire.workbench.model.PartDefinition;
 import org.uberfire.workbench.model.Position;
 
-import static org.kie.soup.commons.validation.PortablePreconditions.checkNotNull;
 import static org.uberfire.workbench.model.ContextDisplayMode.SHOW;
 
 /**
@@ -242,6 +242,10 @@ public void setPanelType(String fqcn) {
                                       fqcn);
     }
 
+    private static <T> T checkNotNull(String objName, T obj) {
+        return Objects.requireNonNull(obj, "Parameter named '" + objName + "' should be not null!");
+    }
+
     @Override
     @JsIgnore
     public Integer getHeight() {

diff --git a/...erfire-api/src/main/java/org/uberfire/workbench/model/impl/PerspectiveDefinitionImpl.java b/...erfire-api/src/main/java/org/uberfire/workbench/model/impl/PerspectiveDefinitionImpl.java
@@ -19,13 +19,14 @@
 
 package org.uberfire.workbench.model.impl;
 
+import java.util.Objects;
+
 import org.jboss.errai.common.client.api.annotations.Portable;
 import org.uberfire.workbench.model.ContextDefinition;
 import org.uberfire.workbench.model.ContextDisplayMode;
 import org.uberfire.workbench.model.PanelDefinition;
 import org.uberfire.workbench.model.PerspectiveDefinition;
 
-import static org.kie.soup.commons.validation.PortablePreconditions.checkNotNull;
 import static org.uberfire.workbench.model.ContextDisplayMode.SHOW;
 
 /**
@@ -53,6 +54,10 @@ public PerspectiveDefinitionImpl(final String panelType) {
         this.root = root;
     }
 
+    private static <T> T checkNotNull(String objName, T obj) {
+        return Objects.requireNonNull(obj, "Parameter named '" + objName + "' should be not null!");
+    }
+
     @Override
     public String getName() {
         return name;

diff --git a/packages/dashbuilder/appformer/uberfire-client-api/pom.xml b/packages/dashbuilder/appformer/uberfire-client-api/pom.xml
@@ -65,11 +65,6 @@
       <artifactId>errai-ioc</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.kie.soup</groupId>
-      <artifactId>kie-soup-commons</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>com.google.elemental2</groupId>
       <artifactId>elemental2-dom</artifactId>

diff --git a/packages/dashbuilder/appformer/uberfire-commons/pom.xml b/packages/dashbuilder/appformer/uberfire-commons/pom.xml
@@ -42,10 +42,6 @@
       <groupId>jakarta.annotation</groupId>
       <artifactId>jakarta.annotation-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.kie.soup</groupId>
-      <artifactId>kie-soup-commons</artifactId>
-    </dependency>
     <dependency>
       <groupId>jakarta.enterprise</groupId>
       <artifactId>jakarta.enterprise.cdi-api</artifactId>

diff --git a/...ppformer/uberfire-commons/src/main/resources/org/uberfire/commons/UberfireCommons.gwt.xml b/...ppformer/uberfire-commons/src/main/resources/org/uberfire/commons/UberfireCommons.gwt.xml
@@ -21,8 +21,6 @@
   "http://google-web-toolkit.googlecode.com/svn/tags/2.5.0/distro-source/core/src/gwt-module.dtd">
 <module>
 
-  <inherits name='org.kie.soup.commons.KIESoupCommons' />
-
   <source path='data' />
   <source path='lifecycle' />
   <source path='uuid' />

diff --git a/...shbuilder/appformer/uberfire-extensions/uberfire-widgets/uberfire-widgets-commons/pom.xml b/...shbuilder/appformer/uberfire-extensions/uberfire-widgets/uberfire-widgets-commons/pom.xml
@@ -53,11 +53,6 @@
       <artifactId>uberfire-commons</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.kie.soup</groupId>
-      <artifactId>kie-soup-commons</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.uberfire</groupId>
       <artifactId>uberfire-workbench-client</artifactId>

diff --git a/.../widgets/common/client/common/popups/footers/ModalFooterForceSaveReOpenCancelButtons.java b/.../widgets/common/client/common/popups/footers/ModalFooterForceSaveReOpenCancelButtons.java
@@ -19,6 +19,8 @@
 
 package org.uberfire.ext.widgets.common.client.common.popups.footers;
 
+import java.util.Objects;
+
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.uibinder.client.UiBinder;
@@ -30,8 +32,6 @@
 import org.gwtbootstrap3.client.ui.ModalFooter;
 import org.uberfire.mvp.Command;
 
-import static org.kie.soup.commons.validation.PortablePreconditions.checkNotNull;
-
 /**
  * A Modal Footer with OK and Cancel buttons
  */
@@ -66,6 +66,10 @@ public ModalFooterForceSaveReOpenCancelButtons(final Modal panel,
         add(uiBinder.createAndBindUi(this));
     }
 
+    private static <T> T checkNotNull(String objName, T obj) {
+        return Objects.requireNonNull(obj, "Parameter named '" + objName + "' should be not null!");
+    }
+
     @UiHandler("forceSaveButton")
     public void onForceSaveButtonClick(final ClickEvent e) {
         if (forceSaveCommand != null) {

diff --git a/...ava/org/uberfire/ext/widgets/common/client/common/popups/footers/ModalFooterOKButton.java b/...ava/org/uberfire/ext/widgets/common/client/common/popups/footers/ModalFooterOKButton.java
@@ -19,6 +19,8 @@
 
 package org.uberfire.ext.widgets.common.client.common.popups.footers;
 
+import java.util.Objects;
+
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.uibinder.client.UiBinder;
@@ -28,7 +30,7 @@
 import com.google.gwt.user.client.ui.Widget;
 import org.gwtbootstrap3.client.ui.Button;
 import org.gwtbootstrap3.client.ui.ModalFooter;
-import org.kie.soup.commons.validation.PortablePreconditions;
+
 
 /**
  * A Modal Footer with a single OK button
@@ -42,11 +44,14 @@ public class ModalFooterOKButton extends ModalFooter {
     Button okButton;
 
     public ModalFooterOKButton(final Command okCommand) {
-        this.okCommand = PortablePreconditions.checkNotNull("okCommand",
-                                                            okCommand);
+        this.okCommand = checkNotNull("okCommand", okCommand);
         add(uiBinder.createAndBindUi(this));
     }
 
+    private static <T> T checkNotNull(String objName, T obj) {
+        return Objects.requireNonNull(obj, "Parameter named '" + objName + "' should be not null!");
+    }
+
     public void enableOkButton(final boolean enabled) {
         okButton.setEnabled(enabled);
     }

diff --git a/.../uberfire/ext/widgets/common/client/common/popups/footers/ModalFooterOKCancelButtons.java b/.../uberfire/ext/widgets/common/client/common/popups/footers/ModalFooterOKCancelButtons.java
@@ -19,6 +19,8 @@
 
 package org.uberfire.ext.widgets.common.client.common.popups.footers;
 
+import java.util.Objects;
+
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.uibinder.client.UiBinder;
@@ -28,7 +30,6 @@
 import com.google.gwt.user.client.ui.Widget;
 import org.gwtbootstrap3.client.ui.Button;
 import org.gwtbootstrap3.client.ui.ModalFooter;
-import org.kie.soup.commons.validation.PortablePreconditions;
 
 /**
  * A Modal Footer with OK and Cancel buttons
@@ -46,13 +47,15 @@ public class ModalFooterOKCancelButtons extends ModalFooter {
 
     public ModalFooterOKCancelButtons(final Command okCommand,
                                       final Command cancelCommand) {
-        this.okCommand = PortablePreconditions.checkNotNull("okCommand",
-                                                            okCommand);
-        this.cancelCommand = PortablePreconditions.checkNotNull("cancelCommand",
-                                                                cancelCommand);
+        this.okCommand = checkNotNull("okCommand", okCommand);
+        this.cancelCommand = checkNotNull("cancelCommand", cancelCommand);
         add(uiBinder.createAndBindUi(this));
     }
 
+    private static <T> T checkNotNull(String objName, T obj) {
+        return Objects.requireNonNull(obj, "Parameter named '" + objName + "' should be not null!");
+    }
+
     public void enableOkButton(final boolean enabled) {
         okButton.setEnabled(enabled);
     }

diff --git a/...rfire/ext/widgets/common/client/common/popups/footers/ModalFooterReOpenIgnoreButtons.java b/...rfire/ext/widgets/common/client/common/popups/footers/ModalFooterReOpenIgnoreButtons.java
@@ -19,6 +19,8 @@
 
 package org.uberfire.ext.widgets.common.client.common.popups.footers;
 
+import java.util.Objects;
+
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.uibinder.client.UiBinder;
@@ -30,8 +32,6 @@
 import org.gwtbootstrap3.client.ui.ModalFooter;
 import org.uberfire.mvp.Command;
 
-import static org.kie.soup.commons.validation.PortablePreconditions.checkNotNull;
-
 /**
  * A Modal Footer with OK and Cancel buttons
  */
@@ -61,6 +61,10 @@ public ModalFooterReOpenIgnoreButtons(final Modal panel,
         this.actionButton.setText(buttonText);
     }
 
+    private static <T> T checkNotNull(String objName, T obj) {
+        return Objects.requireNonNull(obj, "Parameter named '" + objName + "' should be not null!");
+    }
+
     @UiHandler("actionButton")
     public void onActionButtonClick(final ClickEvent e) {
         if (actionCommand != null) {

diff --git a/...commons/src/main/java/org/uberfire/ext/widgets/common/client/select/SelectOptionImpl.java b/...commons/src/main/java/org/uberfire/ext/widgets/common/client/select/SelectOptionImpl.java
@@ -20,8 +20,6 @@
 
 package org.uberfire.ext.widgets.common.client.select;
 
-import static org.kie.soup.commons.validation.PortablePreconditions.checkNotEmpty;
-
 public class SelectOptionImpl implements SelectOption {
 
     private final String selector;
@@ -35,6 +33,13 @@ public SelectOptionImpl(String selector,
         this.name = name;
     }
 
+    private static String checkNotEmpty(String name, String parameter) {
+        if (parameter == null || parameter.trim().isEmpty()) {
+            throw new IllegalArgumentException("Parameter named '" + name + "' should be filled!");
+        }
+        return parameter;
+    }
+
     public String getSelector() {
         return selector;
     }

diff --git a/...re-extensions/uberfire-widgets/uberfire-widgets-core/uberfire-widgets-core-client/pom.xml b/...re-extensions/uberfire-widgets/uberfire-widgets-core/uberfire-widgets-core-client/pom.xml
@@ -67,11 +67,6 @@
       <artifactId>uberfire-commons</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.kie.soup</groupId>
-      <artifactId>kie-soup-commons</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.uberfire</groupId>
       <artifactId>uberfire-workbench-client</artifactId>

diff --git a/...dgets-core-client/src/main/java/org/uberfire/ext/widgets/core/client/tree/FSTreeItem.java b/...dgets-core-client/src/main/java/org/uberfire/ext/widgets/core/client/tree/FSTreeItem.java
@@ -20,14 +20,13 @@
 
 package org.uberfire.ext.widgets.core.client.tree;
 
+import java.util.Objects;
 import java.util.function.Supplier;
 
 import com.google.gwt.user.client.ui.FlowPanel;
 import org.gwtbootstrap3.client.ui.Icon;
 import org.gwtbootstrap3.client.ui.constants.IconType;
 
-import static org.kie.soup.commons.validation.PortablePreconditions.checkNotNull;
-
 public class FSTreeItem extends TreeItem<FSTreeItem> {
 
     private final FSType fstype;
@@ -54,6 +53,10 @@ public FSTreeItem(final FSType type,
                                    type);
     }
 
+    private static <T> T checkNotNull(String objName, T obj) {
+        return Objects.requireNonNull(obj, "Parameter named '" + objName + "' should be not null!");
+    }
+
     private static final Type createType(final FSType type) {
         switch (type) {
             case ITEM:

diff --git a/...widgets-core-client/src/main/java/org/uberfire/ext/widgets/core/client/tree/TreeItem.java b/...widgets-core-client/src/main/java/org/uberfire/ext/widgets/core/client/tree/TreeItem.java
@@ -21,6 +21,7 @@
 package org.uberfire.ext.widgets.core.client.tree;
 
 import java.util.Iterator;
+import java.util.Objects;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
@@ -40,8 +41,6 @@
 import org.uberfire.client.workbench.ouia.OuiaComponentTypeAttribute;
 import org.uberfire.ext.widgets.core.client.resources.TreeNavigatorResources;
 
-import static org.kie.soup.commons.validation.PortablePreconditions.checkNotNull;
-
 public class TreeItem<I extends TreeItem> extends Composite implements OuiaComponent {
 
     private static final String OUIA_COMPONENT_TYPE = "tree-item";
@@ -59,6 +58,10 @@ public class TreeItem<I extends TreeItem> extends Composite implements OuiaCompo
     private IsWidget icon;
     private FlowPanel item;
 
+    private static <T> T checkNotNull(String objName, T obj) {
+        return Objects.requireNonNull(obj, "Parameter named '" + objName + "' should be not null!");
+    }
+
     public TreeItem(final Type type,
                     final String value,
                     final String label,