Upgrade python and java to 4.x. Change docker-compose to separate out the batch load. (#95)

Author: jphaugla

docs/001-introduction.md

@@ -1,6 +1,6 @@
 # Introduction
 
-In this tutorial you will learn how to install and use the [RediSearch](https://redisearch.io) module that provides an indexing and full text search engine for Redis.
+In this tutorial you will learn how to use the [redis-stack](https://redis.io/docs/stack/get-started/install/docker/) image to use the [redisearch module](https://redis.io/docs/stack/search/) that provides an indexing and full text search engine for Redis.
 
 RediSearch provides a simple and fast way to index and query data using any field (secondary index), and do search and aggregation on an indexed dataset.
 

docs/002-install-redisearch.md

@@ -5,17 +5,17 @@ You have multiple ways to run RediSearch:
 * building from [sources](https://github.com/RediSearch/RediSearch) and installing it inside an existing Redis Instance
 * using [Redis Cloud](https://redislabs.com/redis-enterprise-cloud/) _(when RediSearch module 2.0 available)_
 * using [Redis Enterprise](https://redislabs.com/redis-enterprise-software/) _(when RediSearch module 2.0 available)_
-* using [Docker](https://hub.docker.com/r/redislabs/redisearch/)
+* using [Docker](https://hub.docker.com/r/redis/redis-stack)
 
 Let's use Docker for now.
 
 **1.1 Open a terminal an run the following command**
 
 
 ```
-> docker run -it --rm --name redis-search-2 \
+> docker run -it --rm --name redis-stack \
    -p 6379:6379 \
-   redislabs/redisearch:2.0.2
+   redis/redis-stack:latest
 ```
 
 *Note: The container will automatically be removed when it exits (`--rm` parameter).*

docs/010-application-development.md

@@ -40,9 +40,10 @@ To run the application:
 
 This Docker Compose will start:
 
-1. RediSearch instance on port 6380, and import all movies, actors and create indexes
+1. A Redis Stack container on port 6379.  The redis-cli can be used with this container once the ports are exposed
 1. The Java, Node and Python REST Services available on port 8085, 8086, 8087
 1. The frontend on port 8084
+1. A second RediStack container will start on port 6380 just to load the sample data to the redis stack instance running on port 6379.  This container exits once the sample data has been loaded to the 6379 container
 
 Once started you can access the application and its services using the following URLs:
 

sample-app/docker-compose.yaml

@@ -1,68 +1,89 @@
-version: '3.7'
+version: '3.10'
 services:
 
-    # Start RediSearch and import data/indexes
-    redisearch:
-        build:
-            context: ./redisearch-docker
-            dockerfile: Dockerfile
+    # Start RediSearch 
+    redis-stack:
+        image:  redis/redis-stack:latest
+        container_name: redis-stack
+        ports:
+            - "6379:6379" 
+            - "8001:8001" 
+        networks:
+            - redisearch-gettingstarted
+        volumes:
+            - ./redisearch-docker/dataset:/dataset
+            - ./redis:/data`
+            
+    # Start redis-stack to run load script and exit 
+    redis-stack-2:
+        image:  redis/redis-stack:latest
+        container_name: redis-stack-2
         ports:
-            # using 6380 as public port to avoid conflict with local process
             - "6380:6379" 
         networks:
             - redisearch-gettingstarted
-        restart: always
-
+        volumes:
+            - ./redisearch-docker/dataset:/dataset
+        command:
+            [ "sh", "./dataset/import-data.sh" ]
+        depends_on:
+            - redis-stack    
+            
     rest-java:
         build:
             context: ./redisearch-jedis-rest
             dockerfile: Dockerfile
+        container_name: rest-java
         ports:
             - "8085:8085" 
         environment:
-            - REDIS_URL=redis://redisearch:6379
+            - REDIS_URL=redis://redis-stack:6379
             - REDIS_INDEX=idx:movie
         networks:
             - redisearch-gettingstarted
         restart: always
         depends_on:
-            - redisearch    
+            - redis-stack    
 
     rest-node:
         build:
             context: ./redisearch-node-rest
             dockerfile: Dockerfile
+        container_name: rest-node
         ports:
             - "8086:8086" 
         environment:
-            - REDIS_URL=redis://redisearch:6379
+            - REDIS_URL=redis://redis-stack:6379
             - REDIS_INDEX=idx:movie
         networks:
             - redisearch-gettingstarted
         restart: always
         depends_on:
-            - redisearch   
+            - redis-stack   
 
 
     rest-python:
         build:
             context: ./redisearch-python-rest
             dockerfile: Dockerfile
+        container_name: rest-python
         ports:
             - "8087:8087" 
         environment:
-            - REDIS_URL=redis://redisearch:6379
+            - REDIS_SERVER=redis-stack
+            - REDIS_PORT=6379
             - REDIS_INDEX=idx:movie
         networks:
             - redisearch-gettingstarted
         restart: always
         depends_on:
-            - redisearch  
+            - redis-stack  
 
     search-frontend:
         build:
             context: ./front-end
             dockerfile: Dockerfile
+        container_name: search-frontend
         ports:
             - "8084:8084" 
         environment:
@@ -73,11 +94,11 @@ services:
             - redisearch-gettingstarted
         restart: always
         depends_on:
-            - redisearch  
+            - redis-stack  
             - rest-java
             - rest-node
             - rest-python
 
 networks:
     redisearch-gettingstarted:
-        driver: bridge
+        driver: bridge

sample-app/redisearch-docker/Dockerfile

@@ -0,0 +1,5 @@
+sleep 15
+redis-cli -h redis-stack -p 6379 < /dataset/import_actors.redis
+redis-cli -h redis-stack -p 6379 < /dataset/import_movies.redis
+redis-cli -h redis-stack -p 6379 < /dataset/import_users.redis
+redis-cli -h redis-stack -p 6379 < /dataset/import_create_index.redis

sample-app/redisearch-docker/dataset/import-data.sh

@@ -18,4 +18,4 @@ COPY --from=build ${DEPENDENCY}/BOOT-INF/classes /app
 
 EXPOSE 8085
 
-ENTRYPOINT ["java","-cp","app:app/lib/*","com.redislabs.search.demo.jedis.RedisearchJedisRestApplication"]
+ENTRYPOINT ["java","-cp","app:app/lib/*","com.redislabs.search.demo.jedis.RedisearchJedisRestApplication"]

sample-app/redisearch-docker/import-data.sh

@@ -28,13 +28,13 @@ This command will create a new image and build the maven project into it.
 
 ```shell script
 > docker run --rm  \
-     --env "REDIS_URL=redis://host.docker.internal:6379" \
+     --env "REDIS_URL=redis://redis-stack:6379" \
      --env "REDIS_INDEX=idx:movie" \
      --name "redisearch-backend-java"\
      -p 8085:8085 redis/search-backend-java
 ```
 
 You can now access the REST Search service using the following URL:
 
-* http://localhost:8085/api/1.0/search?q=man&limit=10&offset=20
+* http://localhost:8085/api/1.0/movies/search?q=man&limit=10&offset=20
 

sample-app/redisearch-jedis-rest/Dockerfile

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.3.RELEASE</version>
+		<version>2.7.0</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.redislabs.search</groupId>
@@ -16,7 +16,7 @@
 
 	<properties>
 		<java.version>1.8</java.version>
-		<version.jredisearch>2.0.0</version.jredisearch>
+		<version.jedis>4.2.2</version.jedis>
 		<version.javax.inject>1</version.javax.inject>
 	</properties>
 
@@ -30,9 +30,9 @@
 	<dependencies>
 
 		<dependency>
-			<groupId>com.redislabs</groupId>
-			<artifactId>jredisearch</artifactId>
-			<version>${version.jredisearch}</version>
+			<groupId>redis.clients</groupId>
+			<artifactId>jedis</artifactId>
+			<version>${version.jedis}</version>
 		</dependency>
 
 
@@ -78,7 +78,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.8.1</version>
+				<version>3.10.1</version>
 				<configuration>
 					<source>1.8</source>
 					<target>1.8</target>
@@ -87,7 +87,7 @@
 						<path>
 							<groupId>org.projectlombok</groupId>
 							<artifactId>lombok</artifactId>
-							<version>1.18.12</version>
+							<version>1.18.24</version>
 						</path>
 					</annotationProcessorPaths>
 				</configuration>