Updated version to 2.2.4 for release (#525)

* Updated version to 2.2.4 for release

* Added PageableEntities for concurrent test issues

* Added specific scoping

* More testing improvements

* Provided bean name

* Separated internal class to its own parent class

* Testing dynamicContainer bean registration

* Removed testing logs

* Added new Sorted Project repository

* Updated setup() to setUp() because of codacy

README.md

@@ -100,7 +100,7 @@ If you are using Maven, add the following dependency.
 <dependency>
     <groupId>com.microsoft.azure</groupId>
     <artifactId>spring-data-cosmosdb</artifactId>
-    <version>2.2.3.FIX1</version>
+    <version>2.2.4</version>
 </dependency>
 ```
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.microsoft.azure</groupId>
     <artifactId>spring-data-cosmosdb</artifactId>
-    <version>2.2.4-SNAPSHOT</version>
+    <version>2.2.4</version>
 
     <name>Spring Data for Azure Cosmos DB SQL API</name>
     <description>Spring Data for Azure Cosmos DB SQL API</description>

samplecode/example/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.microsoft.azure</groupId>
 		<artifactId>spring-data-cosmosdb-samples</artifactId>
-		<version>2.2.4-SNAPSHOT</version>
+		<version>2.2.4</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -20,7 +20,7 @@
 		<dependency>
 			<groupId>com.microsoft.azure</groupId>
 			<artifactId>spring-data-cosmosdb</artifactId>
-			<version>2.2.4-SNAPSHOT</version>
+			<version>2.2.4</version>
 		</dependency>
 
 		<dependency>

samplecode/pom.xml

@@ -8,7 +8,7 @@
 
 	<groupId>com.microsoft.azure</groupId>
 	<artifactId>spring-data-cosmosdb-samples</artifactId>
-	<version>2.2.4-SNAPSHOT</version>
+	<version>2.2.4</version>
 	<packaging>pom</packaging>
 
 	<parent>

src/test/java/com/microsoft/azure/spring/data/cosmosdb/common/DynamicContainer.java

@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See LICENSE in the project root for
+ * license information.
+ */
+
+package com.microsoft.azure.spring.data.cosmosdb.common;
+
+public class DynamicContainer {
+    private String containerName;
+
+    public DynamicContainer(String containerName) {
+        this.containerName = containerName;
+    }
+
+    public String getContainerName() {
+        return this.containerName;
+    }
+}

src/test/java/com/microsoft/azure/spring/data/cosmosdb/core/CosmosTemplateIT.java

@@ -94,7 +94,7 @@ public class CosmosTemplateIT {
     private ResponseDiagnosticsTestUtils responseDiagnosticsTestUtils;
 
     @Before
-    public void setup() throws ClassNotFoundException {
+    public void setUp() throws ClassNotFoundException {
         if (!initialized) {
             final CosmosDbFactory cosmosDbFactory = new CosmosDbFactory(dbConfig);
 

src/test/java/com/microsoft/azure/spring/data/cosmosdb/core/CosmosTemplatePartitionIT.java

@@ -63,7 +63,7 @@ public class CosmosTemplatePartitionIT {
     private CosmosDBConfig dbConfig;
 
     @Before
-    public void setup() throws ClassNotFoundException {
+    public void setUp() throws ClassNotFoundException {
         if (!initialized) {
             final CosmosDbFactory cosmosDbFactory = new CosmosDbFactory(dbConfig);
             final CosmosMappingContext mappingContext = new CosmosMappingContext();

src/test/java/com/microsoft/azure/spring/data/cosmosdb/core/converter/MappingCosmosConverterUnitTest.java

@@ -38,7 +38,7 @@ public class MappingCosmosConverterUnitTest {
     ApplicationContext applicationContext;
 
     @Before
-    public void setup() {
+    public void setUp() {
         final CosmosMappingContext mappingContext = new CosmosMappingContext();
         final ObjectMapper objectMapper = new ObjectMapper();
 

src/test/java/com/microsoft/azure/spring/data/cosmosdb/domain/PageableAddress.java

@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See LICENSE in the project root for
+ * license information.
+ */
+package com.microsoft.azure.spring.data.cosmosdb.domain;
+
+import com.microsoft.azure.spring.data.cosmosdb.core.mapping.Document;
+import com.microsoft.azure.spring.data.cosmosdb.core.mapping.PartitionKey;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import org.springframework.data.annotation.Id;
+
+import java.util.Objects;
+
+@Document()
+@Data
+@AllArgsConstructor
+public class PageableAddress {
+    @Id
+    private String postalCode;
+    private String street;
+    @PartitionKey
+    private String city;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        final PageableAddress address = (PageableAddress) o;
+        return Objects.equals(postalCode, address.postalCode) &&
+            Objects.equals(street, address.street) &&
+            Objects.equals(city, address.city);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(postalCode, street, city);
+    }
+}

src/test/java/com/microsoft/azure/spring/data/cosmosdb/domain/PageableMemo.java

@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See LICENSE in the project root for
+ * license information.
+ */
+package com.microsoft.azure.spring.data.cosmosdb.domain;
+
+import com.microsoft.azure.spring.data.cosmosdb.core.mapping.Document;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * For testing date and enum purpose
+ */
+@Document()
+@Data
+@AllArgsConstructor
+public class PageableMemo {
+    private String id;
+    private String message;
+    private Date date;
+    private Importance importance;
+}

src/test/java/com/microsoft/azure/spring/data/cosmosdb/domain/PageablePerson.java

@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See LICENSE in the project root for
+ * license information.
+ */
+
+package com.microsoft.azure.spring.data.cosmosdb.domain;
+
+import com.microsoft.azure.spring.data.cosmosdb.common.TestConstants;
+import com.microsoft.azure.spring.data.cosmosdb.core.mapping.Document;
+import com.microsoft.azure.spring.data.cosmosdb.core.mapping.DocumentIndexingPolicy;
+import com.microsoft.azure.spring.data.cosmosdb.core.mapping.PartitionKey;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.Version;
+
+import java.util.List;
+
+@Document()
+@Data
+@EqualsAndHashCode(exclude = "_etag")
+@NoArgsConstructor
+@DocumentIndexingPolicy(includePaths = TestConstants.ORDER_BY_STRING_PATH)
+public class PageablePerson {
+    private String id;
+    private String firstName;
+
+    @PartitionKey
+    private String lastName;
+    private List<String> hobbies;
+    private List<Address> shippingAddresses;
+    @Version
+    private String _etag;
+
+    public PageablePerson(String id, String firstName, String lastName,
+                          List<String> hobbies, List<Address> shippingAddresses) {
+        this.id = id;
+        this.firstName = firstName;
+        this.lastName = lastName;
+        this.hobbies = hobbies;
+        this.shippingAddresses = shippingAddresses;
+    }
+}

src/test/java/com/microsoft/azure/spring/data/cosmosdb/domain/SortedProject.java

@@ -0,0 +1,35 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See LICENSE in the project root for
+ * license information.
+ */
+package com.microsoft.azure.spring.data.cosmosdb.domain;
+
+import com.microsoft.azure.spring.data.cosmosdb.common.TestConstants;
+import com.microsoft.azure.spring.data.cosmosdb.core.mapping.Document;
+import com.microsoft.azure.spring.data.cosmosdb.core.mapping.DocumentIndexingPolicy;
+import com.microsoft.azure.spring.data.cosmosdb.core.mapping.PartitionKey;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import org.springframework.data.annotation.Id;
+
+@Document()
+@Data
+@AllArgsConstructor
+@DocumentIndexingPolicy(includePaths = TestConstants.ORDER_BY_STRING_PATH)
+public class SortedProject {
+
+    @Id
+    private String id;
+
+    private String name;
+
+    @PartitionKey
+    private String creator;
+
+    private Boolean hasReleased;
+
+    private Long starCount;
+
+    private Long forkCount;
+}

src/test/java/com/microsoft/azure/spring/data/cosmosdb/domain/SpELBeanStudent.java

@@ -14,7 +14,7 @@
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@Document(collection = "#{@dynamicCollectionContainer.getContainerName()}")
+@Document(collection = "#{@dynamicContainer.getContainerName()}")
 public class SpELBeanStudent {
     private String id;
     private String firstName;

src/test/java/com/microsoft/azure/spring/data/cosmosdb/performance/PerformanceCompare.java

@@ -69,7 +69,7 @@ public class PerformanceCompare {
     private static PerformanceReport report = new PerformanceReport();
 
     @Before
-    public void setup() throws CosmosClientException {
+    public void setUp() throws CosmosClientException {
         if (!hasInit) {
             DatabaseUtils.createDatabase(cosmosSyncClient, Constants.PERF_DATABASE_NAME);
             DatabaseUtils.createContainer(cosmosSyncClient, Constants.PERF_DATABASE_NAME,

src/test/java/com/microsoft/azure/spring/data/cosmosdb/repository/TestRepositoryConfig.java

@@ -7,6 +7,7 @@
 
 import com.azure.data.cosmos.ConsistencyLevel;
 import com.azure.data.cosmos.internal.RequestOptions;
+import com.microsoft.azure.spring.data.cosmosdb.common.DynamicContainer;
 import com.microsoft.azure.spring.data.cosmosdb.common.ResponseDiagnosticsTestUtils;
 import com.microsoft.azure.spring.data.cosmosdb.common.TestConstants;
 import com.microsoft.azure.spring.data.cosmosdb.config.AbstractCosmosConfiguration;
@@ -72,19 +73,7 @@ public CosmosDBConfig getConfig() {
     }
 
     @Bean
-    public DynamicCollectionContainer dynamicCollectionContainer() {
-        return new DynamicCollectionContainer("spel-bean-collection");
-    }
-
-    public class DynamicCollectionContainer {
-        private String containerName;
-
-        public DynamicCollectionContainer(String containerName) {
-            this.containerName = containerName;
-        }
-
-        public String getContainerName() {
-            return this.containerName;
-        }
+    public DynamicContainer dynamicContainer() {
+        return new DynamicContainer(TestConstants.DYNAMIC_BEAN_COLLECTION_NAME);
     }
 }

src/test/java/com/microsoft/azure/spring/data/cosmosdb/repository/integration/AddressRepositoryIT.java

@@ -63,7 +63,7 @@ public class AddressRepositoryIT {
     public ExpectedException expectedException = ExpectedException.none();
 
     @Before
-    public void setup() {
+    public void setUp() {
         if (!isSetupDone) {
             staticTemplate = template;
             template.createContainerIfNotExists(entityInformation);

src/test/java/com/microsoft/azure/spring/data/cosmosdb/repository/integration/ContactRepositoryIT.java

@@ -49,7 +49,7 @@ public class ContactRepositoryIT {
     private CosmosTemplate template;
 
     @Before
-    public void setup() {
+    public void setUp() {
         if (!isSetupDone) {
             staticTemplate = template;
             template.createContainerIfNotExists(entityInformation);

src/test/java/com/microsoft/azure/spring/data/cosmosdb/repository/integration/CustomerRepositoryIT.java

@@ -64,7 +64,7 @@ public class CustomerRepositoryIT {
     private CosmosTemplate template;
 
     @Before
-    public void setup() {
+    public void setUp() {
         if (!isSetupDone) {
             staticTemplate = template;
             template.createContainerIfNotExists(entityInformation);

src/test/java/com/microsoft/azure/spring/data/cosmosdb/repository/integration/IntegerIdDomainRepositoryIT.java

@@ -56,7 +56,7 @@ public class IntegerIdDomainRepositoryIT {
     private IntegerIdDomainRepository repository;
 
     @Before
-    public void setup() {
+    public void setUp() {
         if (!isSetupDone) {
             staticTemplate = template;
             template.createContainerIfNotExists(entityInformation);

src/test/java/com/microsoft/azure/spring/data/cosmosdb/repository/integration/MemoRepositoryIT.java

@@ -75,7 +75,7 @@ public static void init() throws ParseException {
     }
 
     @Before
-    public void setup() {
+    public void setUp() {
         if (!isSetupDone) {
             staticTemplate = template;
             template.createContainerIfNotExists(entityInformation);