From b1c124f77009ccee6d33f670839ba1f6f20327ca Mon Sep 17 00:00:00 2001
From: Xiaolu Dai <xiada@microsoft.com>
Date: Wed, 25 Sep 2019 14:17:19 +0800
Subject: [PATCH] upgrade to 2.2.0

---
 pom.xml                                        | 16 ++++++++++++----
 .../config/GremlinConfigurationSupport.java    | 18 ++++--------------
 .../GremlinConfigurationSupportUnitTest.java   |  5 -----
 3 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/pom.xml b/pom.xml
index 856c6c5c..91a4546f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.microsoft.spring.data.gremlin</groupId>
     <artifactId>spring-data-gremlin</artifactId>
-    <version>2.1.8-SNAPSHOT</version>
+    <version>2.2.0.M1</version>
 
     <name>Spring Data Gremlin</name>
     <description>Gremlin support for Spring Data</description>
@@ -39,9 +39,9 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <spring.springframework.version>5.1.0.RELEASE</spring.springframework.version>
-        <spring.data.version>2.1.10.RELEASE</spring.data.version>
-        <spring.boot.test.version>2.0.4.RELEASE</spring.boot.test.version>
+        <spring.springframework.version>5.2.0.RC2</spring.springframework.version>
+        <spring.data.version>2.2.0.RC3</spring.data.version>
+        <spring.boot.test.version>2.2.0.M6</spring.boot.test.version>
 
         <org.apache.tinkerpop.gremlin.driver.version>3.2.4</org.apache.tinkerpop.gremlin.driver.version>
         <apache.commons.lang3.version>3.7</apache.commons.lang3.version>
@@ -324,4 +324,12 @@
         </profile>
 
     </profiles>
+
+    <repositories>
+        <repository>
+            <id>spring-milestone</id>
+            <name>Spring Portfolio Milestone Repository</name>
+            <url>http://maven.springframework.org/milestone</url>
+        </repository>
+    </repositories>
 </project>
diff --git a/src/main/java/com/microsoft/spring/data/gremlin/config/GremlinConfigurationSupport.java b/src/main/java/com/microsoft/spring/data/gremlin/config/GremlinConfigurationSupport.java
index 112a9847..32eeeb80 100644
--- a/src/main/java/com/microsoft/spring/data/gremlin/config/GremlinConfigurationSupport.java
+++ b/src/main/java/com/microsoft/spring/data/gremlin/config/GremlinConfigurationSupport.java
@@ -11,17 +11,15 @@
 import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
 import org.springframework.core.type.filter.AnnotationTypeFilter;
 import org.springframework.data.annotation.Persistent;
-import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.data.mapping.context.MappingContextIsNewStrategyFactory;
-import org.springframework.data.mapping.context.PersistentEntities;
-import org.springframework.data.support.CachingIsNewStrategyFactory;
-import org.springframework.data.support.IsNewStrategyFactory;
 import org.springframework.lang.NonNull;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
 
 public abstract class GremlinConfigurationSupport {
 
@@ -71,13 +69,5 @@ public GremlinMappingContext gremlinMappingContext() throws ClassNotFoundExcepti
         return context;
     }
 
-    @Bean
-    public IsNewStrategyFactory isNewStrategyFactory() throws ClassNotFoundException {
-        final PersistentEntities entities;
-
-        entities = new PersistentEntities(Arrays.<MappingContext<?, ?>>asList(gremlinMappingContext()));
-
-        return new CachingIsNewStrategyFactory(new MappingContextIsNewStrategyFactory(entities));
-    }
 }
 
diff --git a/src/test/java/com/microsoft/spring/data/gremlin/config/GremlinConfigurationSupportUnitTest.java b/src/test/java/com/microsoft/spring/data/gremlin/config/GremlinConfigurationSupportUnitTest.java
index 53f1b503..bc12b674 100644
--- a/src/test/java/com/microsoft/spring/data/gremlin/config/GremlinConfigurationSupportUnitTest.java
+++ b/src/test/java/com/microsoft/spring/data/gremlin/config/GremlinConfigurationSupportUnitTest.java
@@ -42,11 +42,6 @@ public void testGremlinMappingContext() throws ClassNotFoundException {
         Assert.assertNotNull(this.config.gremlinMappingContext());
     }
 
-    @Test
-    public void testIsNewStrategyFactory() throws ClassNotFoundException {
-        Assert.assertNotNull(this.config.isNewStrategyFactory());
-    }
-
     @Test
     @SneakyThrows
     public void testScanEntity() {