From e1138146e85e9ad71acceedc05ae2797e6cc0feb Mon Sep 17 00:00:00 2001
From: Rustam_Lotsmanenko <rustam_lotsmanenko@epam.com>
Date: Fri, 18 Oct 2024 15:00:43 +0300
Subject: [PATCH] delete license-violating dependencies from poms
---
pom.xml | 13 ---
provider/search-gc/pom.xml | 12 ---
search-core/pom.xml | 23 -----
.../search/smart/models/AttributesTest.java | 83 +++----------------
.../DetailedBadRequestMessageUtilTest.java | 8 +-
.../integration-tests/search-test-aws/pom.xml | 1 -
.../search-test-azure/pom.xml | 1 -
.../search-test-baremetal/pom.xml | 1 -
.../search-test-core/pom.xml | 1 -
.../integration-tests/search-test-gc/pom.xml | 1 -
.../integration-tests/search-test-ibm/pom.xml | 1 -
11 files changed, 16 insertions(+), 129 deletions(-)
diff --git a/pom.xml b/pom.xml
index 70ae9522b..6fbb07508 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,6 @@
<jackson.version>2.17.1</jackson.version>
<resteasy-jaxrs.version>4.0.0.Beta5</resteasy-jaxrs.version>
<resteasy-jackson2.version>6.2.9.Final</resteasy-jackson2.version>
- <elasticsearch.version>7.8.1</elasticsearch.version>
<snakeyaml.version>2.0</snakeyaml.version>
<commons-codec.version>1.14</commons-codec.version>
<woodstox-core.version>5.3.0</woodstox-core.version>
@@ -115,18 +114,6 @@
</exclusion>
</exclusions>
</dependency>
-
- <dependency>
- <groupId>co.elastic.clients</groupId>
- <artifactId>elasticsearch-java</artifactId>
- <version>7.17.22</version>
- </dependency>
- <dependency>
- <groupId>org.elasticsearch.client</groupId>
- <artifactId>elasticsearch-rest-client</artifactId>
- <version>7.17.22</version>
- </dependency>
-
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
diff --git a/provider/search-gc/pom.xml b/provider/search-gc/pom.xml
index 3fff3a393..6b769316a 100644
--- a/provider/search-gc/pom.xml
+++ b/provider/search-gc/pom.xml
@@ -103,18 +103,6 @@
<version>5.2.0</version>
<scope>test</scope>
</dependency>
- <!--Elasticsearch-->
- <dependency>
- <groupId>co.elastic.clients</groupId>
- <artifactId>elasticsearch-java</artifactId>
- <version>7.17.22</version>
- </dependency>
- <dependency>
- <groupId>org.elasticsearch.client</groupId>
- <artifactId>elasticsearch-rest-client</artifactId>
- <version>7.17.22</version>
- </dependency>
-
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
diff --git a/search-core/pom.xml b/search-core/pom.xml
index c29abd3c3..ab9cbc98b 100644
--- a/search-core/pom.xml
+++ b/search-core/pom.xml
@@ -35,7 +35,6 @@
<failOnMissingWebXml>false</failOnMissingWebXml>
<project.main.basedir>${project.basedir}</project.main.basedir>
<nimbus-jose-jwt.version>9.1.2</nimbus-jose-jwt.version>
- <elasticsearch.version>7.17.22</elasticsearch.version>
<jts-io-common.version>1.15.0</jts-io-common.version>
</properties>
@@ -200,12 +199,6 @@
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</dependency>
- <!--Elasticsearch-->
- <dependency>
- <groupId>org.elasticsearch.client</groupId>
- <artifactId>elasticsearch-rest-high-level-client</artifactId>
- <version>${elasticsearch.version}</version>
- </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
@@ -242,22 +235,6 @@
<artifactId>jakarta.inject-api</artifactId>
<version>2.0.1</version>
</dependency>
- <dependency>
- <groupId>org.elasticsearch</groupId>
- <artifactId>elasticsearch</artifactId>
- <version>${elasticsearch.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.dataformat</groupId>
- <artifactId>jackson-dataformat-cbor</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.elasticsearch.client</groupId>
- <artifactId>elasticsearch-rest-client</artifactId>
- <version>${elasticsearch.version}</version>
- </dependency>
</dependencies>
</project>
diff --git a/search-core/src/test/java/org/opengroup/osdu/search/smart/models/AttributesTest.java b/search-core/src/test/java/org/opengroup/osdu/search/smart/models/AttributesTest.java
index 218b36085..debe7f204 100644
--- a/search-core/src/test/java/org/opengroup/osdu/search/smart/models/AttributesTest.java
+++ b/search-core/src/test/java/org/opengroup/osdu/search/smart/models/AttributesTest.java
@@ -16,48 +16,33 @@
*/
package org.opengroup.osdu.search.smart.models;
-import org.elasticsearch.action.admin.indices.mapping.get.GetFieldMappingsRequest;
-import org.elasticsearch.action.admin.indices.mapping.get.GetFieldMappingsResponse;
-import org.elasticsearch.action.admin.indices.mapping.get.GetFieldMappingsResponse.FieldMappingMetadata;
-import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.client.IndicesClient;
-import org.elasticsearch.client.RequestOptions;
-import org.elasticsearch.client.RestHighLevelClient;
-import org.elasticsearch.common.bytes.BytesReference;
-//import org.elasticsearch.common.xcontent.XContentBuilder;
-//import org.elasticsearch.common.xcontent.XContentFactory;
-import org.elasticsearch.search.aggregations.Aggregations;
-import org.elasticsearch.search.aggregations.bucket.terms.Terms;
+import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mockStatic;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.MockedStatic;
+import org.mockito.junit.MockitoJUnitRunner;
import org.mockito.stubbing.Answer;
import org.opengroup.osdu.core.common.http.IUrlFetchService;
import org.opengroup.osdu.core.common.logging.JaxRsDpsLog;
import org.opengroup.osdu.core.common.model.http.DpsHeaders;
-import org.opengroup.osdu.core.common.model.http.HttpResponse;
import org.opengroup.osdu.core.common.provider.interfaces.IAttributesCache;
import org.opengroup.osdu.search.config.SearchConfigurationProperties;
import org.opengroup.osdu.search.smart.attributes.AttributeLoader;
import org.opengroup.osdu.search.util.ElasticClientHandler;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import static org.junit.Assert.fail;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.*;
@RunWith(MockitoJUnitRunner.class)
public class AttributesTest {
@@ -75,14 +60,6 @@ public class AttributesTest {
private DpsHeaders dpsHeaders;
@Mock
private IAttributesCache<String, Set<String>> cache;
- @Mock
- private HttpResponse response;
- @Mock
- private SearchResponse searchResponse;
- @Mock
- private Aggregations aggregations;
- @Mock
- private Terms keywordAggregation;
@InjectMocks
private AttributeCollection sut;
@@ -100,42 +77,6 @@ public class AttributesTest {
mockedSettings.close();
}
-// @Test
-// public void should_not_throw_exception_cache_all_Results_when_CacheSync_is_called()
-// throws IOException, URISyntaxException {
-//
-// List<Attribute> ls = new ArrayList<Attribute>();
-// List<String> schemaMapping = new ArrayList<String>();
-// schemaMapping.add("data.Field");
-// Attribute attribute = new Attribute();
-// attribute.setName("Operataor");
-// attribute.setSchemaMapping(schemaMapping);
-// ls.add(attribute);
-//
-// GetFieldMappingsResponse getFieldMappingsResponse = mock(GetFieldMappingsResponse.class);
-// XContentBuilder builder = XContentFactory.jsonBuilder();
-// builder.startObject();
-// Map<String, Object> fields = new HashMap();
-// fields.put("fields", new HashMap());
-// builder.field("Field", fields);
-// builder.endObject();
-// BytesReference bytesReference = BytesReference.bytes(builder);
-// FieldMappingMetadata mappingMetaData = new FieldMappingMetadata(index, bytesReference);
-// Map<String, FieldMappingMetadata> mapBuilder = new HashMap<>();
-// mapBuilder.put("data.Field", mappingMetaData);
-// Map<String, Map<String, FieldMappingMetadata>> mappingBuilder = new HashMap<>();
-// mappingBuilder.put("any index 1", mapBuilder);
-// mappingBuilder.put("any index 2", mapBuilder);
-// Map<String, Map<String, Map<String, FieldMappingMetadata>>> mapping = new HashMap<>();
-// mapping.put("indices 1", mappingBuilder);
-//
-// try {
-// sut.cacheSync();
-// } catch (Exception e) {
-// fail("Should not throw this exception" + e.getMessage());
-// }
-// }
-
@Test
public void should_get_all_attributes_when_acoountId_and_attribute_name_is_provided() {
try {
diff --git a/search-core/src/test/java/org/opengroup/osdu/search/util/DetailedBadRequestMessageUtilTest.java b/search-core/src/test/java/org/opengroup/osdu/search/util/DetailedBadRequestMessageUtilTest.java
index 84105c960..c36c82c39 100644
--- a/search-core/src/test/java/org/opengroup/osdu/search/util/DetailedBadRequestMessageUtilTest.java
+++ b/search-core/src/test/java/org/opengroup/osdu/search/util/DetailedBadRequestMessageUtilTest.java
@@ -3,12 +3,12 @@ package org.opengroup.osdu.search.util;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.when;
+import co.elastic.clients.elasticsearch._types.ElasticsearchException;
import co.elastic.clients.elasticsearch.core.SearchRequest;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.io.IOException;
import java.io.InputStream;
import org.apache.http.HttpEntity;
-import org.elasticsearch.ElasticsearchStatusException;
import org.elasticsearch.client.Response;
import org.elasticsearch.client.ResponseException;
import org.junit.Before;
@@ -42,7 +42,7 @@ public class DetailedBadRequestMessageUtilTest {
ResponseException responseExceptionMock = Mockito.mock(ResponseException.class);
Response responseMock = Mockito.mock(Response.class);
HttpEntity httpEntityMock = Mockito.mock(HttpEntity.class);
- ElasticsearchStatusException elasticsearchStatusExceptionMock = Mockito.mock(ElasticsearchStatusException.class);
+ ElasticsearchException elasticsearchStatusExceptionMock = Mockito.mock(ElasticsearchException.class);
throwable = new Throwable[]{responseExceptionMock};
@@ -73,7 +73,7 @@ public class DetailedBadRequestMessageUtilTest {
when(secondResponseMock.getEntity()).thenReturn(secondHttpEntityMock);
when(secondHttpEntityMock.getContent()).thenReturn(getResponseContent("geofieldfail.json"));
- ElasticsearchStatusException elasticsearchStatusExceptionMock = Mockito.mock(ElasticsearchStatusException.class);
+ ElasticsearchException elasticsearchStatusExceptionMock = Mockito.mock(ElasticsearchException.class);
throwable = new Throwable[]{responseExceptionMock, secondResponseExceptionMock};
@@ -87,4 +87,4 @@ public class DetailedBadRequestMessageUtilTest {
private InputStream getResponseContent(String fileName) {
return this.getClass().getResourceAsStream("/errorresponses/" + fileName);
}
-}
\ No newline at end of file
+}
diff --git a/testing/integration-tests/search-test-aws/pom.xml b/testing/integration-tests/search-test-aws/pom.xml
index 052a7691e..a8ca38e8b 100644
--- a/testing/integration-tests/search-test-aws/pom.xml
+++ b/testing/integration-tests/search-test-aws/pom.xml
@@ -32,7 +32,6 @@
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<cucumber.version>1.2.6</cucumber.version>
- <elasticsearch.version>7.17.15</elasticsearch.version>
<jackson-databind.version>2.15.2</jackson-databind.version>
<jackson.version>2.15.1</jackson.version>
</properties>
diff --git a/testing/integration-tests/search-test-azure/pom.xml b/testing/integration-tests/search-test-azure/pom.xml
index 3f57ba43a..c354d75aa 100644
--- a/testing/integration-tests/search-test-azure/pom.xml
+++ b/testing/integration-tests/search-test-azure/pom.xml
@@ -33,7 +33,6 @@
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<cucumber.version>1.2.5</cucumber.version>
- <elasticsearch.version>7.8.1</elasticsearch.version>
<argLine>
--add-opens=java.base/java.util=ALL-UNNAMED
--add-opens java.base/java.lang=ALL-UNNAMED
diff --git a/testing/integration-tests/search-test-baremetal/pom.xml b/testing/integration-tests/search-test-baremetal/pom.xml
index 1d46aba9e..da86c8e5b 100644
--- a/testing/integration-tests/search-test-baremetal/pom.xml
+++ b/testing/integration-tests/search-test-baremetal/pom.xml
@@ -33,7 +33,6 @@
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<cucumber.version>1.2.5</cucumber.version>
- <elasticsearch.version>7.8.1</elasticsearch.version>
<argLine>
--add-opens=java.base/java.util=ALL-UNNAMED
--add-opens java.base/java.lang=ALL-UNNAMED
diff --git a/testing/integration-tests/search-test-core/pom.xml b/testing/integration-tests/search-test-core/pom.xml
index 19103f86c..637df1e27 100644
--- a/testing/integration-tests/search-test-core/pom.xml
+++ b/testing/integration-tests/search-test-core/pom.xml
@@ -18,7 +18,6 @@
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<cucumber.version>1.2.5</cucumber.version>
- <elasticsearch.version>7.8.1</elasticsearch.version>
<osdu.oscorecommon.version>0.27.2</osdu.oscorecommon.version>
<jackson-databind.version>2.15.2</jackson-databind.version>
<jackson.version>2.13.2</jackson.version>
diff --git a/testing/integration-tests/search-test-gc/pom.xml b/testing/integration-tests/search-test-gc/pom.xml
index f39a5e8c5..50ab12e0a 100644
--- a/testing/integration-tests/search-test-gc/pom.xml
+++ b/testing/integration-tests/search-test-gc/pom.xml
@@ -17,7 +17,6 @@
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<cucumber.version>1.2.5</cucumber.version>
- <elasticsearch.version>7.8.1</elasticsearch.version>
<argLine>
--add-opens=java.base/java.util=ALL-UNNAMED
--add-opens java.base/java.lang=ALL-UNNAMED
diff --git a/testing/integration-tests/search-test-ibm/pom.xml b/testing/integration-tests/search-test-ibm/pom.xml
index 5fa359ef2..f9131a2c4 100644
--- a/testing/integration-tests/search-test-ibm/pom.xml
+++ b/testing/integration-tests/search-test-ibm/pom.xml
@@ -18,7 +18,6 @@
<maven.compiler.source>17</maven.compiler.source>
<cucumber.version>1.2.5</cucumber.version>
<os-core-lib-ibm.version>0.25.1</os-core-lib-ibm.version>
- <elasticsearch.version>7.8.1</elasticsearch.version>
<argLine>
--add-opens=java.base/java.util=ALL-UNNAMED
--add-opens java.base/java.lang=ALL-UNNAMED
--
GitLab