add example app for java client & update testcontainers to OS 2.19.1 (opensearch-project#438)

* add `TestMarketplaceApplication` also to java client example

this allows easily launching a test application for the java client. the
code has been copied from the RHLC based example.

Signed-off-by: Ralph Ursprung <Ralph.Ursprung@avaloq.com>

* update all testcontainers to OpenSearch 2.19.1

this aligns them all to one version, making future version updates
easier (simple search & replace). 2.19.1 is the latest available version
at the moment.

Signed-off-by: Ralph Ursprung <Ralph.Ursprung@avaloq.com>

---------

Signed-off-by: Ralph Ursprung <Ralph.Ursprung@avaloq.com>

Author: rursprung

README.md

@@ -302,7 +302,7 @@ See https://docs.spring.io/spring-boot/reference/testing/testcontainers.html#tes
 ```java
 @Container
 @ServiceConnection
-static final OpenSearchContainer<?> container = new OpenSearchContainer<>("opensearchproject/opensearch:2.15.0");
+static final OpenSearchContainer<?> container = new OpenSearchContainer<>("opensearchproject/opensearch:2.19.1");
 ```
 
 So, the client will take values from the `OpenSearchContainer` configuration.

spring-data-opensearch-examples/spring-boot-gradle/README.md

@@ -2,6 +2,7 @@ Spring Data OpenSearch Spring Boot Example Project
 === 
 
 This sample project demonstrates the usage of the [Spring Data OpenSearch](https://github.com/opensearch-project/spring-data-opensearch/) in the typical Spring Boot web application. The application assumes that there is an [OpenSearch](https://opensearch.org) service up and running on the local machine.
+This example uses the [`RestHighLevelClient`](https://opensearch.org/docs/latest/clients/java-rest-high-level/).
 
 ## Pre-requisites
 
@@ -40,4 +41,4 @@ docker run -p 9200:9200 -e "discovery.type=single-node" -e OPENSEARCH_INITIAL_AD
 
    - Fetch all products: `curl 'http://localhost:8080/marketplace/search'`
    - Search products by name: `curl 'http://localhost:8080/marketplace/search?name=pillow'`
-   - Search products by name and price greater than: `curl 'http://localhost:8080/marketplace/search?name=pillow&price=35.0'`
+   - Search products by name and price greater than: `curl 'http://localhost:8080/marketplace/search?name=pillow&price=35.0'`

spring-data-opensearch-examples/spring-boot-gradle/src/test/java/org/opensearch/data/example/repository/MarketplaceRepositoryIntegrationTests.java

@@ -28,7 +28,7 @@
 @Tag("integration-test")
 public class MarketplaceRepositoryIntegrationTests {
     @Container
-    static final OpensearchContainer<?> opensearch = new OpensearchContainer<>("opensearchproject/opensearch:2.11.1")
+    static final OpensearchContainer<?> opensearch = new OpensearchContainer<>("opensearchproject/opensearch:2.19.1")
             .withStartupAttempts(5)
             .withStartupTimeout(Duration.ofMinutes(2));
 

spring-data-opensearch-examples/spring-boot-gradle/src/test/java/org/opensearch/data/example/repository/TestMarketplaceApplication.java

@@ -21,7 +21,7 @@ static class ContainerConfig {
         @Bean
         @ServiceConnection
         OpensearchContainer<?> opensearchContainer() {
-            return new OpensearchContainer<>("opensearchproject/opensearch:2.15.0");
+            return new OpensearchContainer<>("opensearchproject/opensearch:2.19.1");
         }
 
     }

spring-data-opensearch-examples/spring-boot-java-client-gradle/README.md

@@ -1,9 +1,17 @@
 Spring Data OpenSearch Java Client Spring Boot Example Project
 === 
 
-This sample project demonstrates the usage of the [Spring Data OpenSearch](https://github.com/opensearch-project/spring-data-opensearch/) in the typical Spring Boot web application using [opensearch-java](https://github.com/opensearch-project/opensearch-java) client. The application assumes that there is an [OpenSearch](https://opensearch.org) service up and running on the local machine, available at `https://localhost:9200` (protected by basic authentication with default credentials).
+This sample project demonstrates the usage of the [Spring Data OpenSearch](https://github.com/opensearch-project/spring-data-opensearch/) in the typical Spring Boot web application. The application assumes that there is an [OpenSearch](https://opensearch.org) service up and running on the local machine.
+This example uses the [`opensearch-java` client](https://opensearch.org/docs/latest/clients/java/).
 
-1. The easiest way to get [OpenSearch](https://opensearch.org) service up and running is by using [Docker](https://www.docker.com/):
+## Pre-requisites
+
+* [Docker](https://www.docker.com/)
+* Java 17
+
+## Using Docker CLI
+
+1. Start [OpenSearch](https://opensearch.org) using
 
 ```shell
 docker run -p 9200:9200 -e "discovery.type=single-node" -e OPENSEARCH_INITIAL_ADMIN_PASSWORD=<strong-password> opensearchproject/opensearch:2.15.0
@@ -12,11 +20,25 @@ docker run -p 9200:9200 -e "discovery.type=single-node" -e OPENSEARCH_INITIAL_AD
 2. Build and run the project using [Gradle](https://gradle.org/):
 
 ```shell
-./gradlew :spring-data-opensearch-examples:spring-boot-java-client-gradle:bootRun
+./gradlew :spring-data-opensearch-examples:spring-boot-gradle:bootRun
 ```
 
 3. Exercise the REST endpoint available at: `http://localhost:8080/marketplace`
 
    - Fetch all products: `curl 'http://localhost:8080/marketplace/search'`
    - Search products by name: `curl 'http://localhost:8080/marketplace/search?name=pillow'`
-   - Search products by name and price greater than: `curl 'http://localhost:8080/marketplace/search?name=pillow&price=35.0'`
+   - Search products by name and price greater than: `curl 'http://localhost:8080/marketplace/search?name=pillow&price=35.0'`
+
+## Using Spring Boot Testcontainers integration
+
+1. Build and run the project using [Gradle](https://gradle.org/):
+
+```shell
+./gradlew :spring-data-opensearch-examples:spring-boot-gradle:bootTestRun
+```
+
+2. Exercise the REST endpoint available at: `http://localhost:8080/marketplace`
+
+   - Fetch all products: `curl 'http://localhost:8080/marketplace/search'`
+   - Search products by name: `curl 'http://localhost:8080/marketplace/search?name=pillow'`
+   - Search products by name and price greater than: `curl 'http://localhost:8080/marketplace/search?name=pillow&price=35.0'`

spring-data-opensearch-examples/spring-boot-java-client-gradle/build.gradle.kts

@@ -32,7 +32,11 @@ dependencies {
   testImplementation(springLibs.test)
   testImplementation(springLibs.boot.test)
   testImplementation(springLibs.boot.test.autoconfigure)
+  testImplementation(springLibs.boot.testcontainers)
   testImplementation(opensearchLibs.testcontainers)
+  testImplementation(project(":spring-data-opensearch-testcontainers")) {
+    exclude("org.opensearch.client", "opensearch-rest-high-level-client")
+  }
   testImplementation(project(":spring-data-opensearch-test-autoconfigure")) {
     exclude("org.opensearch.client", "opensearch-rest-high-level-client")
   }

spring-data-opensearch-examples/spring-boot-java-client-gradle/src/test/java/org/opensearch/data/example/repository/MarketplaceRepositoryIntegrationTests.java

@@ -28,7 +28,7 @@
 @Tag("integration-test")
 public class MarketplaceRepositoryIntegrationTests {
     @Container
-    static final OpensearchContainer<?> opensearch = new OpensearchContainer<>("opensearchproject/opensearch:2.11.1")
+    static final OpensearchContainer<?> opensearch = new OpensearchContainer<>("opensearchproject/opensearch:2.19.1")
             .withStartupAttempts(5)
             .withStartupTimeout(Duration.ofMinutes(2));
 

spring-data-opensearch-examples/spring-boot-java-client-gradle/src/test/java/org/opensearch/data/example/repository/TestMarketplaceApplication.java

@@ -0,0 +1,28 @@
+package org.opensearch.data.example.repository;
+
+import org.opensearch.data.example.MarketplaceApplication;
+import org.opensearch.testcontainers.OpensearchContainer;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
+import org.springframework.context.annotation.Bean;
+
+public class TestMarketplaceApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.from(MarketplaceApplication::main)
+                .with(ContainerConfig.class)
+                .run(args);
+    }
+
+    @TestConfiguration(proxyBeanMethods = false)
+    static class ContainerConfig {
+
+        @Bean
+        @ServiceConnection
+        OpensearchContainer<?> opensearchContainer() {
+            return new OpensearchContainer<>("opensearchproject/opensearch:2.19.1");
+        }
+
+    }
+}

spring-data-opensearch-testcontainers/src/test/java/org/opensearch/spring/boot/testcontainers/service/connection/OpenSearchContainerConnectionDetailsFactoryIntegrationTests.java

@@ -34,7 +34,7 @@ class OpenSearchContainerConnectionDetailsFactoryIntegrationTests {
 
     @Container
     @ServiceConnection
-    static final OpensearchContainer<?> opensearch = new OpensearchContainer<>("opensearchproject/opensearch:2.15.0")
+    static final OpensearchContainer<?> opensearch = new OpensearchContainer<>("opensearchproject/opensearch:2.19.1")
             .withStartupAttempts(5)
             .withStartupTimeout(Duration.ofMinutes(10));
 
@@ -48,7 +48,7 @@ void restClientOpensearchNodeVersion() throws IOException {
         try (InputStream input = response.getEntity().getContent()) {
             JsonNode result = new ObjectMapper().readTree(input);
             assertThat(result.path("version").path("number").asText())
-                    .isEqualTo("2.15.0");
+                    .isEqualTo("2.19.1");
         }
     }
 

spring-data-opensearch-testcontainers/src/test/java/org/opensearch/spring/boot/testcontainers/service/connection/SecureOpenSearchContainerConnectionDetailsFactoryIntegrationTests.java

@@ -43,7 +43,7 @@ class SecureOpenSearchContainerConnectionDetailsFactoryIntegrationTests {
 
     @Container
     @ServiceConnection
-    static final OpensearchContainer<?> opensearch = new OpensearchContainer<>("opensearchproject/opensearch:2.15.0")
+    static final OpensearchContainer<?> opensearch = new OpensearchContainer<>("opensearchproject/opensearch:2.19.1")
             .withSecurityEnabled()
             .withEnv("OPENSEARCH_INITIAL_ADMIN_PASSWORD", "D3v3l0p-ment");
 
@@ -57,7 +57,7 @@ void restClientOpensearchNodeVersion() throws IOException {
         try (InputStream input = response.getEntity().getContent()) {
             JsonNode result = new ObjectMapper().readTree(input);
             assertThat(result.path("version").path("number").asText())
-                    .isEqualTo("2.15.0");
+                    .isEqualTo("2.19.1");
         }
     }