upgrade to redis-om-spring 0.8.0-SNAPSHOT and Spring 3.x

Author: bsbodden

README.md

@@ -235,8 +235,8 @@ spring.redis.password=5uper53cret
 
 ## 📝 Prerequisites
 
-* Java 11 or higher
-* Spring Boot 2.6.4 (included by Redis OM Spring)
+* Java 17 or higher
+* Spring Boot 3.0.2 
 * A [Redis](https://redis.io) database with the [RediSearch](https://redisearch.io) module version TODO or higher installed. We've provided a `docker-compose.yml` with Redis Stack for this. You can also [sign up for a free 30Mb database with Redis Enterprise Cloud](https://redis.com/try-free/) - be sure to check the box to configure a Redis Stack instance, follow [this guide](https://developer.redis.com/create/rediscloud/).
 * [curl](https://curl.se/), or [Postman](https://www.postman.com/) - to send HTTP requests to the application. We'll provide examples using curl in this document.
 * Optional: [RedisInsight](https://redis.com/redis-enterprise/redis-insight/), a free data visualization and database management tool for Redis. When downloading RedisInsight, be sure to select version 2.x.
@@ -249,4 +249,4 @@ spring.redis.password=5uper53cret
 
 ### 🧭Interact with the API
 
-You can interact with the API directly with CURL or through the [Swagger interface](http://localhost:8080/swagger-ui/).
+You can interact with the API directly with CURL or through the [Swagger interface](http://localhost:8080/swagger-ui/index.html).

docs/01_app_walkthrough.md

@@ -0,0 +1,29 @@
+# 🍀 Redis OM Spring Skeleton App
+
+## What is this?
+
+## Creating the application
+
+## Adding Redis OM Spring Dependencies
+
+## Enabling Document Repositories
+
+## Creating the models
+
+## Creating the repositories
+
+## Loading some seed data
+
+## Exploring the data with RedisInsight
+
+## Custom querying with Spring Repositories
+
+## Adding a controller
+
+## Testing our endpoints with Postman
+
+## Using Entity Streams for Querying
+
+### Create a service class
+
+### Testing Entity Streams

pom.xml

@@ -6,7 +6,7 @@
  <parent>
  <groupId>org.springframework.boot</groupId>
  <artifactId>spring-boot-starter-parent</artifactId>
- <version>2.6.4</version>
+ <version>3.0.2</version>
  <relativePath /> <!-- lookup parent from repository -->
  </parent>
  <groupId>com.redis.om</groupId>
@@ -15,7 +15,7 @@
  <name>skeleton</name>
  <description>Skeleton App for Redis OM Spring</description>
  <properties>
- <java.version>11</java.version>
+ <java.version>17</java.version>
  </properties>
  <dependencies>
  <dependency>
@@ -25,7 +25,7 @@
  <dependency>
  <groupId>com.redis.om</groupId>
  <artifactId>redis-om-spring</artifactId>
- <version>0.3.0-SNAPSHOT</version>
+ <version>0.8.0-SNAPSHOT</version>
  </dependency>
 
  <dependency>
@@ -40,14 +40,9 @@
  <optional>true</optional>
  </dependency>
  <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-boot-starter</artifactId>
- <version>3.0.0</version>
- </dependency>
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger-ui</artifactId>
- <version>3.0.0</version>
+ <groupId>org.springdoc</groupId>
+ <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+ <version>2.0.2</version>
  </dependency>
  <dependency>
  <groupId>org.springframework.boot</groupId>
@@ -80,4 +75,4 @@
  </plugins>
  </build>
 
-</project>
+</project>

src/main/java/com/redis/om/skeleton/SkeletonApplication.java

@@ -3,26 +3,23 @@
 import java.util.List;
 import java.util.Set;
 
+import org.springdoc.core.models.GroupedOpenApi;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
 import org.springframework.data.geo.Point;
 
-import springfox.documentation.builders.PathSelectors;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
 import com.redis.om.skeleton.models.Address;
 import com.redis.om.skeleton.models.Person;
 import com.redis.om.skeleton.repositories.PeopleRepository;
 import com.redis.om.spring.annotations.EnableRedisDocumentRepositories;
 
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.info.Info;
+
 @SpringBootApplication
-@EnableSwagger2
 @EnableRedisDocumentRepositories(basePackages = "com.redis.om.skeleton.*")
 public class SkeletonApplication {
 
@@ -45,7 +42,7 @@ CommandLineRunner loadTestData(PeopleRepository repo) {
  Address thorsAddress = Address.of("248", "Seven Mile Beach Rd", "Broken Head", "NSW", "2481", "Australia");
 
  // 11 Commerce Dr, Riverhead, NY 11901
- Address ironmansAddress = Address.of("11", "Commerce Dr", "Riverhead", "NY",  "11901", "US");
+ Address ironmansAddress = Address.of("11", "Commerce Dr", "Riverhead", "NY", "11901", "US");
 
  // 605 W 48th St, New York, NY 10019
  Address blackWidowAddress = Address.of("605", "48th St", "New York", "NY", "10019", "US");
@@ -59,23 +56,33 @@ CommandLineRunner loadTestData(PeopleRepository repo) {
  // 11461 Sunset Blvd, Los Angeles, CA 90049
  Address nickFuryAddress = Address.of("11461", "Sunset Blvd", "Los Angeles", "CA", "90049", "US");
 
- Person thor = Person.of("Chris", "Hemsworth", 38, thorSays, new Point(153.616667, -28.716667), thorsAddress, Set.of("hammer", "biceps", "hair", "heart"));
- Person ironman = Person.of("Robert", "Downey", 56, ironmanSays, new Point(40.9190747, -72.5371874), ironmansAddress, Set.of("tech", "money", "one-liners", "intelligence", "resources"));
- Person blackWidow = Person.of("Scarlett", "Johansson", 37, blackWidowSays, new Point(40.7215259, -74.0129994), blackWidowAddress, Set.of("deception", "martial_arts"));
- Person wandaMaximoff = Person.of("Elizabeth", "Olsen", 32, wandaMaximoffSays, new Point(40.6976701, -74.2598641), wandaMaximoffsAddress, Set.of("magic", "loyalty"));
- Person gamora = Person.of("Zoe", "Saldana", 43, gamoraSays, new Point(-118.399968, 34.073087), gamorasAddress, Set.of("skills", "martial_arts"));
- Person nickFury = Person.of("Samuel L.", "Jackson", 73, nickFurySays, new Point(-118.4345534, 34.082615), nickFuryAddress, Set.of("planning", "deception", "resources"));
+ Person thor = Person.of("Chris", "Hemsworth", 38, thorSays, new Point(153.616667, -28.716667), thorsAddress,
+ Set.of("hammer", "biceps", "hair", "heart"));
+ Person ironman = Person.of("Robert", "Downey", 56, ironmanSays, new Point(40.9190747, -72.5371874),
+ ironmansAddress, Set.of("tech", "money", "one-liners", "intelligence", "resources"));
+ Person blackWidow = Person.of("Scarlett", "Johansson", 37, blackWidowSays, new Point(40.7215259, -74.0129994),
+ blackWidowAddress, Set.of("deception", "martial_arts"));
+ Person wandaMaximoff = Person.of("Elizabeth", "Olsen", 32, wandaMaximoffSays, new Point(40.6976701, -74.2598641),
+ wandaMaximoffsAddress, Set.of("magic", "loyalty"));
+ Person gamora = Person.of("Zoe", "Saldana", 43, gamoraSays, new Point(-118.399968, 34.073087), gamorasAddress,
+ Set.of("skills", "martial_arts"));
+ Person nickFury = Person.of("Samuel L.", "Jackson", 73, nickFurySays, new Point(-118.4345534, 34.082615),
+ nickFuryAddress, Set.of("planning", "deception", "resources"));
 
  repo.saveAll(List.of(thor, ironman, blackWidow, wandaMaximoff, gamora, nickFury));
  };
  }
 
  @Bean
- public Docket api() {
- return new Docket(DocumentationType.SWAGGER_2)
- .select()
- .apis(RequestHandlerSelectors.any())
- .paths(PathSelectors.any())
+ public OpenAPI apiInfo() {
+ return new OpenAPI().info(new Info().title("Redis OM Spring Skeleton").version("1.0.0"));
+ }
+
+ @Bean
+ public GroupedOpenApi httpApi() {
+ return GroupedOpenApi.builder()
+ .group("http")
+ .pathsToMatch("/**")
  .build();
  }
 

src/main/java/com/redis/om/skeleton/services/PeopleService.java

@@ -11,7 +11,7 @@
 import com.redis.om.skeleton.models.Person$;
 import com.redis.om.spring.search.stream.EntityStream;
 
-import io.redisearch.aggregation.SortedField.SortOrder;
+import redis.clients.jedis.search.aggr.SortedField.SortOrder;
 
 @Service
 public class PeopleService {