BXMSPROD-1845: removed ElasticSearch dependency (#1365)

* [BXMSPROD-1845] elasticsearch removed from appformer * [BXMSPROD-1845] elasticsearch removed from appformer (#1312) * [BXMSPROD-1845] removing the rest of ES references * test errors fixed * Adding a mock repository service to fix Dashbuilder WebApp (#4) Co-authored-by: Enrique Mingorance Cano <[email protected]> Co-authored-by: William Antônio Siqueira <[email protected]>
kiegroup · Dec 10, 2022 · 98c6ecf · 98c6ecf
1 parent cfb9fc2
commit 98c6ecf
Show file tree

Hide file tree

Showing 65 changed files with 173 additions and 1,472 deletions.
diff --git a/dashbuilder/README.md b/dashbuilder/README.md
@@ -29,7 +29,7 @@ Architecture
 
 * Not tied to any chart rendering technology. Pluggable renderers.
 * No tied to any data storage.
-* Ability to read data from: CSV files, Databases, Elastic Search orJava generators.
+* Ability to read data from: CSV files, Databases or Java generators.
 * Decoupled client & server layers. Ability to build pure lightweight client dashboards.
 * Ability to push & handle data sets on client for better performance.
 * Based on <a href="http://www.uberfireframework.org" target="_blank">Uberfire</a>, a framework for building rich workbench styled apps on the web.

diff --git a/dashbuilder/dashbuilder-backend/dashbuilder-dataset-cdi/pom.xml b/dashbuilder/dashbuilder-backend/dashbuilder-dataset-cdi/pom.xml
@@ -87,11 +87,6 @@
       <artifactId>kie-soup-dataset-sql</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.kie.soup</groupId>
-      <artifactId>kie-soup-dataset-elasticsearch</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.kie.soup</groupId>
       <artifactId>kie-soup-dataset-prometheus</artifactId>

diff --git a/...er-dataset-cdi/src/main/java/org/dashbuilder/dataprovider/DataSetProviderRegistryCDI.java b/...er-dataset-cdi/src/main/java/org/dashbuilder/dataprovider/DataSetProviderRegistryCDI.java
@@ -39,9 +39,6 @@ public class DataSetProviderRegistryCDI extends DataSetProviderRegistryImpl {
     @Inject
     private SQLDataSetProviderCDI sqlDataSetProviderCDI;
 
-    @Inject
-    private ElasticSearchDataSetProviderCDI elasticSearchDataSetProviderCDI;
-
     @Inject
     private PrometheusDataSetProviderCDI prometheusDataSetProviderCDI;
 
@@ -69,7 +66,6 @@ public void init() {
         super.registerDataProvider(beanDataSetProviderCDI);
         super.registerDataProvider(csvDataSetProviderCDI);
         super.registerDataProvider(sqlDataSetProviderCDI);
-        super.registerDataProvider(elasticSearchDataSetProviderCDI);
         super.registerDataProvider(prometheusDataSetProviderCDI);
         super.registerDataProvider(kafkaDataSetProviderCDI);
     }
@@ -90,10 +86,6 @@ public SQLDataSetProviderCDI getSqlDataSetProviderCDI() {
         return sqlDataSetProviderCDI;
     }
 
-    public ElasticSearchDataSetProviderCDI getElasticSearchDataSetProviderCDI() {
-        return elasticSearchDataSetProviderCDI;
-    }
-
     public PrometheusDataSetProviderCDI getPrometheusDataSetProviderCDI() {
         return prometheusDataSetProviderCDI;
     }

diff --git a/...taset-cdi/src/main/java/org/dashbuilder/dataprovider/ElasticSearchDataSetProviderCDI.java b/...taset-cdi/src/main/java/org/dashbuilder/dataprovider/ElasticSearchDataSetProviderCDI.java
diff --git a/...der-dataset-cdi/src/test/java/org/dashbuilder/dataset/DataSetProviderRegistryCDITest.java b/...der-dataset-cdi/src/test/java/org/dashbuilder/dataset/DataSetProviderRegistryCDITest.java
@@ -48,7 +48,6 @@ public void testRegistryDataSetDef() throws Exception {
         assertTrue(typeList.contains(DataSetProviderType.BEAN));
         assertTrue(typeList.contains(DataSetProviderType.CSV));
         assertTrue(typeList.contains(DataSetProviderType.SQL));
-        assertTrue(typeList.contains(DataSetProviderType.ELASTICSEARCH));
 
         // In CDI contexts, DataSetProvider implementations are automatically registered
         assertTrue(typeList.contains(CustomDataSetProvider.TYPE));

diff --git a/...n-client/src/test/java/org/dashbuilder/common/client/editor/list/ImageListEditorTest.java b/...n-client/src/test/java/org/dashbuilder/common/client/editor/list/ImageListEditorTest.java
@@ -28,7 +28,7 @@ public abstract class ImageListEditorTest extends AbstractEditorTest {
 
     @Mock EventSourceMock<ValueChangeEvent<DataSetProviderType>> valueChangeEvent;
 
-    protected final Collection<DataSetProviderType> expectedTypes = new ArrayList<DataSetProviderType>(4);
+    protected final Collection<DataSetProviderType> expectedTypes = new ArrayList<DataSetProviderType>(3);
     protected final List<ImageListEditor<DataSetProviderType>.Entry> expectedEntries = new ArrayList<ImageListEditor<org.dashbuilder.dataprovider.DataSetProviderType>.Entry>(4);
     protected ImageListEditor<DataSetProviderType> presenter;
     protected ImageListEditorView<DataSetProviderType> view;
@@ -39,7 +39,6 @@ public void initExpectedValues() {
         expectedTypes.add(DataSetProviderType.BEAN);
         expectedTypes.add(DataSetProviderType.CSV);
         expectedTypes.add(DataSetProviderType.SQL);
-        expectedTypes.add(DataSetProviderType.ELASTICSEARCH);
         expectedEntries.addAll(mockEntries());
     }
 
@@ -148,7 +147,7 @@ protected void assertShowElements() {
         verify(view, times(0)).clearError();
         verify(view, times(0)).showError(any(SafeHtml.class));
         verify(view, times(1)).clear();
-        verify(view, times(4)).add(any(SafeUri.class), anyString(), anyString(), any(SafeHtml.class),
+        verify(view, times(3)).add(any(SafeUri.class), anyString(), anyString(), any(SafeHtml.class),
                 any(SafeHtml.class), anyBoolean(), any(Command.class));
         Assert.assertEquals(expectedEntries, presenter.entries);
     }
@@ -158,7 +157,6 @@ protected List<ImageListEditor<DataSetProviderType>.Entry> mockEntries() {
         result.add(mockEntry(DataSetProviderType.BEAN));
         result.add(mockEntry(DataSetProviderType.CSV));
         result.add(mockEntry(DataSetProviderType.SQL));
-        result.add(mockEntry(DataSetProviderType.ELASTICSEARCH));
         return result;
     }
 

diff --git a/...n/java/org/dashbuilder/dataset/client/editor/ElasticSearchDataSetDefAttributesEditor.java b/...n/java/org/dashbuilder/dataset/client/editor/ElasticSearchDataSetDefAttributesEditor.java
diff --git a/...nt/src/main/java/org/dashbuilder/dataset/client/editor/ElasticSearchDataSetDefEditor.java b/...nt/src/main/java/org/dashbuilder/dataset/client/editor/ElasticSearchDataSetDefEditor.java
diff --git a/...der-renderer-chartjs/src/main/java/org/dashbuilder/renderer/chartjs/lib/options/Type.java b/...der-renderer-chartjs/src/main/java/org/dashbuilder/renderer/chartjs/lib/options/Type.java
@@ -23,9 +23,6 @@ public enum Type {
     EASE_IN_CIRC("easeInCirc"),
     EASE_OUT_CIRC("easeOutCirc"),
     EASE_IN_OUT_CIRC("easeInOutCirc"),
-    EASE_IN_ELASTIC("easeInElastic"),
-    EASE_OUT_ELASTIC("easeOutElastic"),
-    EASE_IN_OUT_ELASTIC("easeInOutElastic"),
     EASE_IN_BACK("easeInBack"),
     EASE_OUT_BACK("easeOutBack"),
     EASE_IN_OUT_BACK("easeInOutBack"),

diff --git a/...main/java/org/dashbuilder/client/widgets/dataset/editor/DataSetDefProviderTypeEditor.java b/...main/java/org/dashbuilder/client/widgets/dataset/editor/DataSetDefProviderTypeEditor.java
@@ -17,7 +17,6 @@
 
 import static org.dashbuilder.dataprovider.DataSetProviderType.BEAN;
 import static org.dashbuilder.dataprovider.DataSetProviderType.CSV;
-import static org.dashbuilder.dataprovider.DataSetProviderType.ELASTICSEARCH;
 import static org.dashbuilder.dataprovider.DataSetProviderType.PROMETHEUS;
 import static org.dashbuilder.dataprovider.DataSetProviderType.SQL;
 import static org.dashbuilder.dataprovider.DataSetProviderType.KAFKA;
@@ -124,7 +123,7 @@ public HorizImageListEditor<DataSetProviderType> provider() {
     /**
      * The provider types supported by this editor
      */
-    DataSetProviderType[] CORE_TYPES = new DataSetProviderType[]{BEAN, CSV, SQL, ELASTICSEARCH, PROMETHEUS, KAFKA};
+    DataSetProviderType[] CORE_TYPES = new DataSetProviderType[]{BEAN, CSV, SQL, PROMETHEUS, KAFKA};
 
     protected Collection<ImageListEditor<DataSetProviderType>.Entry> getDefaultEntries() {
         final DataSetProviderType[] providerTypes = CORE_TYPES;
@@ -167,9 +166,6 @@ String getTypeSelectorTitle(final DataSetProviderType type) {
         if (SQL.equals(type)) {
             return DataSetEditorConstants.INSTANCE.sql();
         }
-        if (ELASTICSEARCH.equals(type)) {
-            return DataSetEditorConstants.INSTANCE.elasticSearch();
-        }
         if (PROMETHEUS.equals(type)) {
             return DataSetEditorConstants.INSTANCE.prometheus();
         }
@@ -189,9 +185,6 @@ String getTypeSelectorText(final DataSetProviderType type) {
         if (SQL.equals(type)) {
             return DataSetEditorConstants.INSTANCE.sql_description();
         }
-        if (ELASTICSEARCH.equals(type)) {
-            return DataSetEditorConstants.INSTANCE.elasticSearch_description();
-        }
         if (PROMETHEUS.equals(type)) {
             return DataSetEditorConstants.INSTANCE.prometheus_description();
         }
@@ -211,9 +204,6 @@ SafeUri getTypeSelectorImageUri(final DataSetProviderType type) {
         if (SQL.equals(type)) {
             return DataSetClientResources.INSTANCE.images().sqlIcon160().getSafeUri();
         }
-        if (ELASTICSEARCH.equals(type)) {
-            return DataSetClientResources.INSTANCE.images().elIcon160().getSafeUri();
-        }
         if (PROMETHEUS.equals(type)) {
             return DataSetClientResources.INSTANCE.images().prometheusIcon160().getSafeUri();
         }

diff --git a/...er-widgets/src/main/java/org/dashbuilder/client/widgets/dataset/editor/DataSetEditor.java b/...er-widgets/src/main/java/org/dashbuilder/client/widgets/dataset/editor/DataSetEditor.java
@@ -358,9 +358,6 @@ private String getTypeTitle(final DataSetProviderType type) {
         if (SQL.equals(type)) {
             return DataSetEditorConstants.INSTANCE.sql();
         }
-        if (ELASTICSEARCH.equals(type)) {
-            return DataSetEditorConstants.INSTANCE.elasticSearch();
-        }
         return "";
     }
 

diff --git a/...java/org/dashbuilder/client/widgets/dataset/editor/driver/DataSetEditorDriverFactory.java b/...java/org/dashbuilder/client/widgets/dataset/editor/driver/DataSetEditorDriverFactory.java
@@ -15,14 +15,12 @@ public class DataSetEditorDriverFactory {
     final DataSetDefBasicAttributesDriver dataSetDefBasicAttributesDriver = GWT.create(DataSetDefBasicAttributesDriver.class);
     final SQLDataSetDefAttributesDriver sqlDataSetDefAttributesDriver = GWT.create(SQLDataSetDefAttributesDriver.class);
     final BeanDataSetDefAttributesDriver beanDataSetDefAttributesDriver = GWT.create(BeanDataSetDefAttributesDriver.class);
-    final ElasticSearchDataSetDefAttributesDriver elasticSearchDataSetDefAttributesDriver = GWT.create(ElasticSearchDataSetDefAttributesDriver.class);
     final PrometheusDataSetDefAttributesDriver prometheusSearchDataSetDefAttributesDriver = GWT.create(PrometheusDataSetDefAttributesDriver.class);
     final KafkaDataSetDefAttributesDriver kafkaSearchDataSetDefAttributesDriver = GWT.create(KafkaDataSetDefAttributesDriver.class);
     final CSVDataSetDefAttributesDriver csvDataSetDefAttributesDriver = GWT.create(CSVDataSetDefAttributesDriver.class);
     final SQLDataSetDefDriver sqlDataSetDefDriver = GWT.create(SQLDataSetDefDriver.class);
     final BeanDataSetDefDriver beanDataSetDefDriver = GWT.create(BeanDataSetDefDriver.class);
     final CSVDataSetDefDriver csvDataSetDefDriver = GWT.create(CSVDataSetDefDriver.class);
-    final ElasticSearchDataSetDefDriver elasticSearchDataSetDefDriver = GWT.create(ElasticSearchDataSetDefDriver.class);
     final PrometheusDataSetDefDriver prometheusSearchDataSetDefDriver = GWT.create(PrometheusDataSetDefDriver.class);
     final KafkaDataSetDefDriver kafkaSearchDataSetDefDriver = GWT.create(KafkaDataSetDefDriver.class);
     final DataColumnDefDriver dataColumnDefDriver = GWT.create(DataColumnDefDriver.class);
@@ -72,16 +70,6 @@ public BeanDataSetDefDriver beanDataSetDefDriver() {
         return beanDataSetDefDriver;
     }
 
-    @Produces
-    public ElasticSearchDataSetDefAttributesDriver elasticSearchDataSetDefAttributesDriver() {
-        return elasticSearchDataSetDefAttributesDriver;
-    }
-
-    @Produces
-    public ElasticSearchDataSetDefDriver elasticSearchDataSetDefDriver() {
-        return elasticSearchDataSetDefDriver;
-    }
-
     @Produces
     public PrometheusDataSetDefAttributesDriver prometheusDataSetDefAttributesDriver() {
         return prometheusSearchDataSetDefAttributesDriver;

diff --git a/...builder/client/widgets/dataset/editor/driver/ElasticSearchDataSetDefAttributesDriver.java b/...builder/client/widgets/dataset/editor/driver/ElasticSearchDataSetDefAttributesDriver.java
diff --git a/...a/org/dashbuilder/client/widgets/dataset/editor/driver/ElasticSearchDataSetDefDriver.java b/...a/org/dashbuilder/client/widgets/dataset/editor/driver/ElasticSearchDataSetDefDriver.java