Fixed project.version conflict in spring data cosmos (Azure#27311)

* Fixed project.version conflict in  spring data cosmos

* Added integration tests

* Updated project properties file name

Author: kushagraThapar

sdk/cosmos/azure-spring-data-cosmos-test/src/test/java/com/azure/spring/data/cosmos/core/CosmosTemplateIT.java

@@ -11,9 +11,11 @@
 import com.azure.cosmos.models.PartitionKey;
 import com.azure.cosmos.models.SqlQuerySpec;
 import com.azure.cosmos.models.ThroughputResponse;
+import com.azure.spring.data.cosmos.Constants;
 import com.azure.spring.data.cosmos.CosmosFactory;
 import com.azure.spring.data.cosmos.IntegrationTestCollectionManager;
 import com.azure.spring.data.cosmos.common.PageTestUtils;
+import com.azure.spring.data.cosmos.common.PropertyLoader;
 import com.azure.spring.data.cosmos.common.ResponseDiagnosticsTestUtils;
 import com.azure.spring.data.cosmos.common.TestConstants;
 import com.azure.spring.data.cosmos.common.TestUtils;
@@ -50,6 +52,8 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -704,6 +708,16 @@ public void createDatabaseWithThroughput() throws ClassNotFoundException {
         assertEquals(expectedRequestUnits, response.getProperties().getManualThroughput());
     }
 
+    @Test
+    public void userAgentSpringDataCosmosSuffix() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+        //  getUserAgentSuffix method from CosmosClientBuilder
+        Method getUserAgentSuffix = CosmosClientBuilder.class.getDeclaredMethod("getUserAgentSuffix");
+        getUserAgentSuffix.setAccessible(true);
+        String userAgentSuffix = (String) getUserAgentSuffix.invoke(cosmosClientBuilder);
+        assertThat(userAgentSuffix).contains(Constants.USER_AGENT_SUFFIX);
+        assertThat(userAgentSuffix).contains(PropertyLoader.getProjectVersion());
+    }
+
     private void deleteDatabaseIfExists(String dbName) {
         CosmosAsyncDatabase database = client.getDatabase(dbName);
         try {

sdk/cosmos/azure-spring-data-cosmos-test/src/test/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplateIT.java

@@ -12,8 +12,10 @@
 import com.azure.cosmos.models.PartitionKey;
 import com.azure.cosmos.models.SqlQuerySpec;
 import com.azure.cosmos.models.ThroughputResponse;
+import com.azure.spring.data.cosmos.Constants;
 import com.azure.spring.data.cosmos.CosmosFactory;
 import com.azure.spring.data.cosmos.ReactiveIntegrationTestCollectionManager;
+import com.azure.spring.data.cosmos.common.PropertyLoader;
 import com.azure.spring.data.cosmos.common.ResponseDiagnosticsTestUtils;
 import com.azure.spring.data.cosmos.common.TestConstants;
 import com.azure.spring.data.cosmos.config.CosmosConfig;
@@ -50,6 +52,8 @@
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -570,6 +574,16 @@ public void createDatabaseWithThroughput() throws ClassNotFoundException {
         assertEquals(expectedRequestUnits, response.getProperties().getManualThroughput());
     }
 
+    @Test
+    public void userAgentSpringDataCosmosSuffix() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+        //  getUserAgentSuffix method from CosmosClientBuilder
+        Method getUserAgentSuffix = CosmosClientBuilder.class.getDeclaredMethod("getUserAgentSuffix");
+        getUserAgentSuffix.setAccessible(true);
+        String userAgentSuffix = (String) getUserAgentSuffix.invoke(cosmosClientBuilder);
+        assertThat(userAgentSuffix).contains(Constants.USER_AGENT_SUFFIX);
+        assertThat(userAgentSuffix).contains(PropertyLoader.getProjectVersion());
+    }
+
     private void deleteDatabaseIfExists(String dbName) {
         CosmosAsyncDatabase database = client.getDatabase(dbName);
         try {

sdk/cosmos/azure-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/common/PropertyLoader.java

@@ -13,7 +13,7 @@
  */
 public final class PropertyLoader {
 
-    private static final String PROJECT_PROPERTY_FILE = "/META-INF/project.properties";
+    private static final String PROJECT_PROPERTY_FILE = "/META-INF/azure-spring-data-cosmos.properties";
 
     private static final String APPLICATION_PROPERTY_FILE = "/application.properties";
 
@@ -23,7 +23,7 @@ private PropertyLoader() {
     }
 
     /**
-     * Get project version from /META-INF/project.properties
+     * Get project version from /META-INF/azure-spring-data-cosmos.properties
      *
      * @return String project version
      */

sdk/cosmos/azure-spring-data-cosmos/src/main/resources/META-INF/project.properties renamed to sdk/cosmos/azure-spring-data-cosmos/src/main/resources/META-INF/azure-spring-data-cosmos.properties

@@ -0,0 +1,43 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.spring.data.cosmos.core;
+
+import com.azure.cosmos.CosmosClientBuilder;
+import com.azure.spring.data.cosmos.Constants;
+import com.azure.spring.data.cosmos.CosmosFactory;
+import com.azure.spring.data.cosmos.common.PropertyLoader;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@RunWith(MockitoJUnitRunner.class)
+public class CosmosFactoryUnitTest {
+
+    @Test
+    public void userAgentSpringDataCosmosSuffix() {
+        CosmosClientBuilder cosmosClientBuilder = new CosmosClientBuilder();
+        try {
+            Method updateCosmosClientBuilderWithUASuffix = CosmosFactory.class.getDeclaredMethod(
+                "updateCosmosClientBuilderWithUASuffix", CosmosClientBuilder.class);
+
+            //  static method invoke call
+            updateCosmosClientBuilderWithUASuffix.setAccessible(true);
+            updateCosmosClientBuilderWithUASuffix.invoke(null, cosmosClientBuilder);
+
+            //  getUserAgentSuffix method from CosmosClientBuilder
+            Method getUserAgentSuffix = CosmosClientBuilder.class.getDeclaredMethod("getUserAgentSuffix");
+            getUserAgentSuffix.setAccessible(true);
+            String userAgentSuffix = (String) getUserAgentSuffix.invoke(cosmosClientBuilder);
+            assertThat(userAgentSuffix).contains(Constants.USER_AGENT_SUFFIX);
+            assertThat(userAgentSuffix).contains(PropertyLoader.getProjectVersion());
+        } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
+            e.printStackTrace();
+        }
+    }
+}