Release/2.2.0 (#748)
* provision for GA 2.2.0 * provision for GA 2.2.0 sequel * Updated cosmosdb starter to include query metrics and response diagnostics string (#746) * update storage sample properties * update storage sample
This commit is contained in:
Zhou Liu
GitHub
Родитель
11b980ff63
Коммит
d098597cee
24
README.md
24
README.md
|
|
@ -23,18 +23,18 @@ Below starters are available with latest release version. We recommend users to
|
|||
You can find them in [Maven Central Repository](https://search.maven.org/).
|
||||
The first three starters are also available in [Spring Initializr](http://start.spring.io/).
|
||||
|
||||
Starter Name | Version for Spring Boot 2.1.x | Version for Spring Boot 2.0.x
|
||||
---|:---:|:---:
|
||||
[azure-active-directory-spring-boot-starter](azure-spring-boot-starters/azure-active-directory-spring-boot-starter/README.md) | [](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.microsoft.azure%22%20AND%20a%3A%22azure-active-directory-spring-boot-starter%22) | [](https://search.maven.org/search?q=g:com.microsoft.azure%20AND%20a:azure-active-directory-spring-boot-starter%20AND%20v:2.0.*)
|
||||
[azure-storage-spring-boot-starter](azure-spring-boot-starters/azure-storage-spring-boot-starter/README.md) | [](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.microsoft.azure%22%20AND%20a%3A%22azure-storage-spring-boot-starter%22) | [](https://search.maven.org/search?q=g:com.microsoft.azure%20AND%20a:azure-storage-spring-boot-starter%20AND%20v:2.0.*)
|
||||
[azure-keyvault-secrets-spring-boot-starter](azure-spring-boot-starters/azure-keyvault-secrets-spring-boot-starter/README.md) | [](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.microsoft.azure%22%20AND%20a%3A%22azure-keyvault-secrets-spring-boot-starter%22) | [](https://search.maven.org/search?q=g:com.microsoft.azure%20AND%20a:azure-keyvault-secrets-spring-boot-starter%20AND%20v:2.0.*)
|
||||
[azure-active-directory-b2c-spring-boot-starter](azure-spring-boot-starters/azure-active-directory-b2c-spring-boot-starter/README.md) | [](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.microsoft.azure%22%20AND%20a%3A%22azure-active-directory-b2c-spring-boot-starter%22) | N/A
|
||||
[azure-cosmosdb-spring-boot-starter](azure-spring-boot-starters/azure-cosmosdb-spring-boot-starter/README.md) | [](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.microsoft.azure%22%20AND%20a%3A%22azure-cosmosdb-spring-boot-starter%22) | [](https://search.maven.org/search?q=g:com.microsoft.azure%20AND%20a:azure-cosmosdb-spring-boot-starter%20AND%20v:2.0.*)
|
||||
[azure-mediaservices-spring-boot-starter](azure-spring-boot-starters/azure-mediaservices-spring-boot-starter/README.md) | [](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.microsoft.azure%22%20AND%20a%3A%22azure-mediaservices-spring-boot-starter%22) | [](https://search.maven.org/search?q=g:com.microsoft.azure%20AND%20a:azure-mediaservices-spring-boot-starter%20AND%20v:2.0.*)
|
||||
[azure-servicebus-spring-boot-starter](azure-spring-boot-starters/azure-servicebus-spring-boot-starter/README.md) | [](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.microsoft.azure%22%20AND%20a%3A%22azure-servicebus-spring-boot-starter%22) | [](https://search.maven.org/search?q=g:com.microsoft.azure%20AND%20a:azure-servicebus-spring-boot-starter%20AND%20v:2.0.*)
|
||||
[spring-data-gremlin-boot-starter](azure-spring-boot-starters/spring-data-gremlin-boot-starter/README.md) | [](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.microsoft.azure%22%20AND%20a%3A%22spring-data-gremlin-boot-starter%22) | [](https://search.maven.org/search?q=g:com.microsoft.azure%20AND%20a:spring-data-gremlin-boot-starter%20AND%20v:2.0.*)
|
||||
[azure-spring-boot-metrics-starter](azure-spring-boot-starters/azure-spring-boot-metrics-starter) | [](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.microsoft.azure%22%20AND%20a%3A%22azure-spring-boot-metrics-starter%22) | [](https://search.maven.org/search?q=g:com.microsoft.azure%20AND%20a:azure-spring-boot-metrics-starter%20AND%20v:2.0.*)
|
||||
[azure-servicebus-jms-spring-boot-starter](azure-spring-boot-starters/azure-servicebus-jms-spring-boot-starter/README.md) | [](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.microsoft.azure%22%20AND%20a%3A%22azure-servicebus-jms-spring-boot-starter%22) | N/A
|
||||
Starter Name | Version for Spring Boot 2.2.x | Version for Spring Boot 2.1.x | Version for Spring Boot 2.0.x
|
||||
---|:---:|:---:|:---:
|
||||
[azure-active-directory-spring-boot-starter](azure-spring-boot-starters/azure-active-directory-spring-boot-starter/README.md) | [](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.microsoft.azure%22%20AND%20a%3A%22azure-active-directory-spring-boot-starter%22) | [](https://search.maven.org/search?q=g:com.microsoft.azure%20AND%20a:azure-active-directory-spring-boot-starter%20AND%20v:2.1.*) | [](https://search.maven.org/search?q=g:com.microsoft.azure%20AND%20a:azure-active-directory-spring-boot-starter%20AND%20v:2.0.*)
|
||||
[azure-storage-spring-boot-starter](azure-spring-boot-starters/azure-storage-spring-boot-starter/README.md) | [](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.microsoft.azure%22%20AND%20a%3A%22azure-storage-spring-boot-starter%22) | [](https://search.maven.org/search?q=g:com.microsoft.azure%20AND%20a:azure-storage-spring-boot-starter%20AND%20v:2.1.*) | [](https://search.maven.org/search?q=g:com.microsoft.azure%20AND%20a:azure-storage-spring-boot-starter%20AND%20v:2.0.*)
|
||||
[azure-keyvault-secrets-spring-boot-starter](azure-spring-boot-starters/azure-keyvault-secrets-spring-boot-starter/README.md) | [](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.microsoft.azure%22%20AND%20a%3A%22azure-keyvault-secrets-spring-boot-starter%22) | [](https://search.maven.org/search?q=g:com.microsoft.azure%20AND%20a:azure-keyvault-secrets-spring-boot-starter%20AND%20v:2.1.*) | [](https://search.maven.org/search?q=g:com.microsoft.azure%20AND%20a:azure-keyvault-secrets-spring-boot-starter%20AND%20v:2.0.*)
|
||||
[azure-active-directory-b2c-spring-boot-starter](azure-spring-boot-starters/azure-active-directory-b2c-spring-boot-starter/README.md) | [](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.microsoft.azure%22%20AND%20a%3A%22azure-active-directory-b2c-spring-boot-starter%22) | [](https://search.maven.org/search?q=g:com.microsoft.azure%20AND%20a:azure-active-directory-b2c-spring-boot-starter%20AND%20v:2.1.*) | N/A
|
||||
[azure-cosmosdb-spring-boot-starter](azure-spring-boot-starters/azure-cosmosdb-spring-boot-starter/README.md) | [](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.microsoft.azure%22%20AND%20a%3A%22azure-cosmosdb-spring-boot-starter%22) | [](https://search.maven.org/search?q=g:com.microsoft.azure%20AND%20a:azure-cosmosdb-spring-boot-starter%20AND%20v:2.1.*) | [](https://search.maven.org/search?q=g:com.microsoft.azure%20AND%20a:azure-cosmosdb-spring-boot-starter%20AND%20v:2.0.*)
|
||||
[azure-mediaservices-spring-boot-starter](azure-spring-boot-starters/azure-mediaservices-spring-boot-starter/README.md) | [](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.microsoft.azure%22%20AND%20a%3A%22azure-mediaservices-spring-boot-starter%22) | [](https://search.maven.org/search?q=g:com.microsoft.azure%20AND%20a:azure-mediaservices-spring-boot-starter%20AND%20v:2.1.*) | [](https://search.maven.org/search?q=g:com.microsoft.azure%20AND%20a:azure-mediaservices-spring-boot-starter%20AND%20v:2.0.*)
|
||||
[azure-servicebus-spring-boot-starter](azure-spring-boot-starters/azure-servicebus-spring-boot-starter/README.md) | [](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.microsoft.azure%22%20AND%20a%3A%22azure-servicebus-spring-boot-starter%22) | [](https://search.maven.org/search?q=g:com.microsoft.azure%20AND%20a:azure-servicebus-spring-boot-starter%20AND%20v:2.1.*) | [](https://search.maven.org/search?q=g:com.microsoft.azure%20AND%20a:azure-servicebus-spring-boot-starter%20AND%20v:2.0.*)
|
||||
[spring-data-gremlin-boot-starter](azure-spring-boot-starters/spring-data-gremlin-boot-starter/README.md) | [](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.microsoft.azure%22%20AND%20a%3A%22spring-data-gremlin-boot-starter%22) | [](https://search.maven.org/search?q=g:com.microsoft.azure%20AND%20a:spring-data-gremlin-boot-starter%20AND%20v:2.1.*) | [](https://search.maven.org/search?q=g:com.microsoft.azure%20AND%20a:spring-data-gremlin-boot-starter%20AND%20v:2.0.*)
|
||||
[azure-spring-boot-metrics-starter](azure-spring-boot-starters/azure-spring-boot-metrics-starter) | [](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.microsoft.azure%22%20AND%20a%3A%22azure-spring-boot-metrics-starter%22) | [](https://search.maven.org/search?q=g:com.microsoft.azure%20AND%20a:azure-spring-boot-metrics-starter%20AND%20v:2.1.*) | [](https://search.maven.org/search?q=g:com.microsoft.azure%20AND%20a:azure-spring-boot-metrics-starter%20AND%20v:2.0.*)
|
||||
[azure-servicebus-jms-spring-boot-starter](azure-spring-boot-starters/azure-servicebus-jms-spring-boot-starter/README.md) | [](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.microsoft.azure%22%20AND%20a%3A%22azure-servicebus-jms-spring-boot-starter%22) | [](https://search.maven.org/search?q=g:com.microsoft.azure%20AND%20a:azure-servicebus-jms-spring-boot-starter%20AND%20v:2.1.*) | N/A
|
||||
|
||||
### Snapshots
|
||||
[](https://oss.sonatype.org/content/repositories/snapshots/com/microsoft/azure/azure-spring-boot/)
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
<groupId>com.microsoft.azure</groupId>
|
||||
<artifactId>azure-spring-boot-bom</artifactId>
|
||||
<version>2.2.0-SNAPSHOT</version>
|
||||
<version>2.2.0</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<name>Azure Spring Boot BOM</name>
|
||||
|
|
@ -46,10 +46,10 @@
|
|||
</scm>
|
||||
|
||||
<properties>
|
||||
<azure.spring.boot.version>2.2.0-SNAPSHOT</azure.spring.boot.version>
|
||||
<azure.dependencies.bom.version>2.2.0.M1</azure.dependencies.bom.version>
|
||||
<spring.data.cosmosdb.version>2.2.0.M1</spring.data.cosmosdb.version>
|
||||
<spring.data.gremlin.version>2.2.0.M1</spring.data.gremlin.version>
|
||||
<azure.spring.boot.version>2.2.0</azure.spring.boot.version>
|
||||
<azure.dependencies.bom.version>2.2.0.M2</azure.dependencies.bom.version>
|
||||
<spring.data.cosmosdb.version>2.2.0</spring.data.cosmosdb.version>
|
||||
<spring.data.gremlin.version>2.2.0</spring.data.gremlin.version>
|
||||
</properties>
|
||||
|
||||
<dependencyManagement>
|
||||
|
|
@ -135,12 +135,4 @@
|
|||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>spring-milestone</id>
|
||||
<name>Spring Portfolio Milestone Repository</name>
|
||||
<url>http://maven.springframework.org/milestone</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<parent>
|
||||
<groupId>com.microsoft.azure</groupId>
|
||||
<artifactId>azure-spring-boot-bom</artifactId>
|
||||
<version>2.2.0-SNAPSHOT</version>
|
||||
<version>2.2.0</version>
|
||||
<relativePath>../azure-spring-boot-bom/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
@ -27,8 +27,8 @@
|
|||
<maven.compiler.target>1.8</maven.compiler.target>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
|
||||
<spring.boot.version>2.2.0.M6</spring.boot.version>
|
||||
<spring.springframework.version>5.2.0.RC2</spring.springframework.version>
|
||||
<spring.boot.version>2.2.0.RELEASE</spring.boot.version>
|
||||
<spring.springframework.version>5.2.0.RELEASE</spring.springframework.version>
|
||||
<findbugs.annotations.version>2.0.1</findbugs.annotations.version>
|
||||
<nimbus.jose.jwt.version>4.39.2</nimbus.jose.jwt.version>
|
||||
<mockito.core.version>2.8.9</mockito.core.version>
|
||||
|
|
@ -41,7 +41,6 @@
|
|||
<javax.jms-api.version>2.0.1</javax.jms-api.version>
|
||||
<qpid-jms-client.version>0.43.0</qpid-jms-client.version>
|
||||
<junit-params.version>1.1.1</junit-params.version>
|
||||
<reactor-netty.version>0.8.3.RELEASE</reactor-netty.version>
|
||||
</properties>
|
||||
|
||||
<profiles>
|
||||
|
|
@ -138,12 +137,6 @@
|
|||
<artifactId>JUnitParams</artifactId>
|
||||
<version>${junit-params.version}</version>
|
||||
</dependency>
|
||||
<!-- the version include from Spring-Boot is not compatible with which Cosmos SDK depends on -->
|
||||
<dependency>
|
||||
<groupId>io.projectreactor.netty</groupId>
|
||||
<artifactId>reactor-netty</artifactId>
|
||||
<version>${reactor-netty.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
|
||||
|
|
|
|||
|
|
@ -27,11 +27,6 @@
|
|||
<artifactId>lombok</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.projectreactor.netty</groupId>
|
||||
<artifactId>reactor-netty</artifactId>
|
||||
<version>0.8.3.RELEASE</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<properties>
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
azure.cosmosdb.uri=put-your-cosmosdb-uri-here
|
||||
azure.cosmosdb.key=put-your-cosmosdb-key-here
|
||||
azure.cosmosdb.database=put-your-cosmosdb-databasename-here
|
||||
azure.cosmosdb.populateQueryMetrics=true
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
azure.storage.account-name=put-your-azure-storage-account-name-here
|
||||
azure.storage.account-key=put-your-azure-storage-account-key-here
|
||||
azure.storage.container-name=put-your-azure-storage-container-name-here
|
||||
azure.storage.enable-https=true
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
buildscript {
|
||||
ext {
|
||||
springBootVersion = '2.2.0.M6'
|
||||
springBootVersion = '2.2.0.RELEASE'
|
||||
}
|
||||
repositories {
|
||||
maven { url "http://repo.spring.io/libs-milestone" }
|
||||
|
|
@ -19,7 +19,7 @@ allprojects {
|
|||
version = '0.0.1-SNAPSHOT'
|
||||
|
||||
ext {
|
||||
azureSpringBootStartersVersion = '2.2.0-SNAPSHOT'
|
||||
azureSpringBootStartersVersion = '2.2.0'
|
||||
commonsioVersion = '2.3'
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<parent>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-parent</artifactId>
|
||||
<version>2.2.0.M6</version>
|
||||
<version>2.2.0.RELEASE</version>
|
||||
<relativePath/> <!-- lookup parent from repository -->
|
||||
</parent>
|
||||
|
||||
|
|
@ -66,7 +66,7 @@
|
|||
<dependency>
|
||||
<groupId>com.microsoft.azure</groupId>
|
||||
<artifactId>azure-spring-boot-bom</artifactId>
|
||||
<version>2.2.0-SNAPSHOT</version>
|
||||
<version>2.2.0</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
|
|
@ -159,14 +159,6 @@
|
|||
<module>azure-servicebus-jms-topic-spring-boot-sample</module>
|
||||
</modules>
|
||||
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>spring-milestone</id>
|
||||
<name>Spring Portfolio Milestone Repository</name>
|
||||
<url>http://maven.springframework.org/milestone</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
|
||||
<pluginRepositories>
|
||||
<pluginRepository>
|
||||
<id>spring-milestones</id>
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ respectively. Specify your user flow **Name** and **User attributes and claims**
|
|||
<dependency>
|
||||
<groupId>com.microsoft.azure</groupId>
|
||||
<artifactId>azure-active-directory-b2c-spring-boot-starter</artifactId>
|
||||
<version>2.1.6.M1</version>
|
||||
<version>2.1.7</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
|
|
|
|||
|
|
@ -7,12 +7,12 @@
|
|||
<parent>
|
||||
<groupId>com.microsoft.azure</groupId>
|
||||
<artifactId>azure-spring-boot-parent</artifactId>
|
||||
<version>2.2.0-SNAPSHOT</version>
|
||||
<version>2.2.0</version>
|
||||
<relativePath>../../azure-spring-boot-parent/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<artifactId>azure-active-directory-b2c-spring-boot-starter</artifactId>
|
||||
<version>2.2.0-SNAPSHOT</version>
|
||||
<version>2.2.0</version>
|
||||
|
||||
<name>Azure AD B2C Spring Security Integration Spring Boot Starter</name>
|
||||
<description>Spring Boot Starter for Azure AD B2C and Spring Security Integration</description>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<parent>
|
||||
<groupId>com.microsoft.azure</groupId>
|
||||
<artifactId>azure-spring-boot-parent</artifactId>
|
||||
<version>2.2.0-SNAPSHOT</version>
|
||||
<version>2.2.0</version>
|
||||
<relativePath>../../azure-spring-boot-parent/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ If you are using Maven, add the following dependency.
|
|||
<dependency>
|
||||
<groupId>com.microsoft.azure</groupId>
|
||||
<artifactId>azure-cosmosdb-spring-boot-starter</artifactId>
|
||||
<version>2.2.0.M1</version>
|
||||
<version>2.2.0</version>
|
||||
</dependency>
|
||||
```
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<parent>
|
||||
<groupId>com.microsoft.azure</groupId>
|
||||
<artifactId>azure-spring-boot-parent</artifactId>
|
||||
<version>2.2.0-SNAPSHOT</version>
|
||||
<version>2.2.0</version>
|
||||
<relativePath>../../azure-spring-boot-parent/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
@ -30,10 +30,6 @@
|
|||
<groupId>com.microsoft.azure</groupId>
|
||||
<artifactId>spring-data-cosmosdb</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.projectreactor.netty</groupId>
|
||||
<artifactId>reactor-netty</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
</project>
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
<parent>
|
||||
<groupId>com.microsoft.azure</groupId>
|
||||
<artifactId>azure-spring-boot-parent</artifactId>
|
||||
<version>2.2.0-SNAPSHOT</version>
|
||||
<version>2.2.0</version>
|
||||
<relativePath>../../azure-spring-boot-parent/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<parent>
|
||||
<groupId>com.microsoft.azure</groupId>
|
||||
<artifactId>azure-spring-boot-parent</artifactId>
|
||||
<version>2.2.0-SNAPSHOT</version>
|
||||
<version>2.2.0</version>
|
||||
<relativePath>../../azure-spring-boot-parent/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<parent>
|
||||
<groupId>com.microsoft.azure</groupId>
|
||||
<artifactId>azure-spring-boot-parent</artifactId>
|
||||
<version>2.2.0-SNAPSHOT</version>
|
||||
<version>2.2.0</version>
|
||||
<relativePath>../../azure-spring-boot-parent/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<parent>
|
||||
<groupId>com.microsoft.azure</groupId>
|
||||
<artifactId>azure-spring-boot-parent</artifactId>
|
||||
<version>2.2.0-SNAPSHOT</version>
|
||||
<version>2.2.0</version>
|
||||
<relativePath>../../azure-spring-boot-parent/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<parent>
|
||||
<groupId>com.microsoft.azure</groupId>
|
||||
<artifactId>azure-spring-boot-parent</artifactId>
|
||||
<version>2.2.0-SNAPSHOT</version>
|
||||
<version>2.2.0</version>
|
||||
<relativePath>../../azure-spring-boot-parent/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<parent>
|
||||
<groupId>com.microsoft.azure</groupId>
|
||||
<artifactId>azure-spring-boot-parent</artifactId>
|
||||
<version>2.2.0-SNAPSHOT</version>
|
||||
<version>2.2.0</version>
|
||||
<relativePath>../../azure-spring-boot-parent/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ If you are using Maven, add the following dependency.
|
|||
<dependency>
|
||||
<groupId>com.microsoft.azure</groupId>
|
||||
<artifactId>azure-storage-spring-boot-starter</artifactId>
|
||||
<version>2.2.0.M1</version>
|
||||
<version>2.2.0</version>
|
||||
</dependency>
|
||||
```
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<parent>
|
||||
<groupId>com.microsoft.azure</groupId>
|
||||
<artifactId>azure-spring-boot-parent</artifactId>
|
||||
<version>2.2.0-SNAPSHOT</version>
|
||||
<version>2.2.0</version>
|
||||
<relativePath>../../azure-spring-boot-parent/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<parent>
|
||||
<groupId>com.microsoft.azure</groupId>
|
||||
<artifactId>azure-spring-boot-parent</artifactId>
|
||||
<version>2.2.0-SNAPSHOT</version>
|
||||
<version>2.2.0</version>
|
||||
<relativePath>../azure-spring-boot-parent/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<parent>
|
||||
<groupId>com.microsoft.azure</groupId>
|
||||
<artifactId>azure-spring-boot-parent</artifactId>
|
||||
<version>2.2.0-SNAPSHOT</version>
|
||||
<version>2.2.0</version>
|
||||
<relativePath>../../azure-spring-boot-parent/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<artifactId>azure-spring-boot-tests</artifactId>
|
||||
<groupId>com.microsoft.azure</groupId>
|
||||
<version>2.2.0-SNAPSHOT</version>
|
||||
<version>2.2.0</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<artifactId>azure-spring-boot-tests</artifactId>
|
||||
<groupId>com.microsoft.azure</groupId>
|
||||
<version>2.2.0-SNAPSHOT</version>
|
||||
<version>2.2.0</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
|
@ -21,10 +21,6 @@
|
|||
<groupId>com.microsoft.azure</groupId>
|
||||
<artifactId>azure-cosmosdb-spring-boot-starter</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.projectreactor.netty</groupId>
|
||||
<artifactId>reactor-netty</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
|
|
|
|||
|
|
@ -61,6 +61,7 @@ public class CosmosDBTest {
|
|||
app.property("azure.cosmosdb.uri", endPoint);
|
||||
app.property("azure.cosmosdb.key", masterKey);
|
||||
app.property("azure.cosmosdb.database", cosmosdbTool.DATABASE_ID);
|
||||
app.property("azure.cosmosdb.populateQueryMetrics", String.valueOf(true));
|
||||
|
||||
//start app
|
||||
app.start();
|
||||
|
|
@ -78,6 +79,7 @@ public class CosmosDBTest {
|
|||
app.property("azure.cosmosdb.uri", endPoint);
|
||||
app.property("azure.cosmosdb.key", masterKey);
|
||||
app.property("azure.cosmosdb.database", cosmosdbTool.DATABASE_ID);
|
||||
app.property("azure.cosmosdb.populateQueryMetrics", String.valueOf(true));
|
||||
|
||||
//start app
|
||||
app.start();
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<artifactId>azure-spring-boot-tests</artifactId>
|
||||
<groupId>com.microsoft.azure</groupId>
|
||||
<version>2.2.0-SNAPSHOT</version>
|
||||
<version>2.2.0</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>com.microsoft.azure</groupId>
|
||||
<artifactId>azure-spring-boot-parent</artifactId>
|
||||
<version>2.2.0-SNAPSHOT</version>
|
||||
<version>2.2.0</version>
|
||||
<relativePath>../azure-spring-boot-parent/pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
|
@ -23,11 +23,10 @@
|
|||
</modules>
|
||||
|
||||
<properties>
|
||||
<spring.boot.version>2.2.0.M6</spring.boot.version>
|
||||
<azure.spring.boot.version>2.2.0-SNAPSHOT</azure.spring.boot.version>
|
||||
<spring.boot.version>2.2.0.RELEASE</spring.boot.version>
|
||||
<azure.spring.boot.version>2.2.0</azure.spring.boot.version>
|
||||
<azure.mgmt.keyvault.version>1.26.0</azure.mgmt.keyvault.version>
|
||||
<azure.documentdb.version>1.9.4</azure.documentdb.version>
|
||||
<reactor.netty.version>0.8.3.RELEASE</reactor.netty.version>
|
||||
<cobertura.version>2.1.1</cobertura.version>
|
||||
</properties>
|
||||
|
||||
|
|
@ -68,11 +67,6 @@
|
|||
<artifactId>azure-cosmosdb-spring-boot-starter</artifactId>
|
||||
<version>${azure.spring.boot.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.projectreactor.netty</groupId>
|
||||
<artifactId>reactor-netty</artifactId>
|
||||
<version>${reactor.netty.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>net.sourceforge.cobertura</groupId>
|
||||
<artifactId>cobertura</artifactId>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<parent>
|
||||
<groupId>com.microsoft.azure</groupId>
|
||||
<artifactId>azure-spring-boot-parent</artifactId>
|
||||
<version>2.2.0-SNAPSHOT</version>
|
||||
<version>2.2.0</version>
|
||||
<relativePath>../azure-spring-boot-parent/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -33,14 +33,15 @@ public class CosmosAutoConfiguration extends AbstractCosmosConfiguration {
|
|||
|
||||
@Bean
|
||||
public CosmosDBConfig cosmosDBConfig() {
|
||||
final CosmosDBConfig config = CosmosDBConfig.builder(
|
||||
properties.getUri(), properties.getKey(), properties.getDatabase())
|
||||
.consistencyLevel(properties.getConsistencyLevel())
|
||||
.allowTelemetry(properties.isAllowTelemetry())
|
||||
.connectionPolicy(properties.getConnectionPolicy())
|
||||
.build();
|
||||
|
||||
return config;
|
||||
return CosmosDBConfig.builder(
|
||||
properties.getUri(), properties.getKey(), properties.getDatabase())
|
||||
.consistencyLevel(properties.getConsistencyLevel())
|
||||
.allowTelemetry(properties.isAllowTelemetry())
|
||||
.connectionPolicy(properties.getConnectionPolicy())
|
||||
.responseDiagnosticsProcessor(properties.getResponseDiagnosticsProcessor())
|
||||
.populateQueryMetrics(properties.isPopulateQueryMetrics())
|
||||
.build();
|
||||
}
|
||||
|
||||
private void configConnectionPolicy(CosmosDBProperties properties, ConnectionPolicy connectionPolicy) {
|
||||
|
|
|
|||
|
|
@ -8,14 +8,16 @@ package com.microsoft.azure.spring.autoconfigure.cosmosdb;
|
|||
|
||||
import com.azure.data.cosmos.ConnectionPolicy;
|
||||
import com.azure.data.cosmos.ConsistencyLevel;
|
||||
|
||||
import javax.validation.constraints.NotEmpty;
|
||||
|
||||
import com.microsoft.azure.spring.data.cosmosdb.core.ResponseDiagnosticsProcessor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
|
||||
import javax.validation.constraints.NotEmpty;
|
||||
|
||||
@Validated
|
||||
@ConfigurationProperties("azure.cosmosdb")
|
||||
@Slf4j
|
||||
public class CosmosDBProperties {
|
||||
/**
|
||||
* Document DB URI.
|
||||
|
|
@ -40,11 +42,27 @@ public class CosmosDBProperties {
|
|||
@NotEmpty
|
||||
private String database;
|
||||
|
||||
/**
|
||||
* Populate Diagnostics Strings and Query metrics
|
||||
*/
|
||||
private boolean populateQueryMetrics;
|
||||
|
||||
/**
|
||||
* Whether allow Microsoft to collect telemetry data.
|
||||
*/
|
||||
private boolean allowTelemetry = true;
|
||||
|
||||
/**
|
||||
* Response Diagnostics processor
|
||||
* Default implementation is to log the response diagnostics string
|
||||
*/
|
||||
private ResponseDiagnosticsProcessor responseDiagnosticsProcessor =
|
||||
responseDiagnostics -> {
|
||||
if (populateQueryMetrics) {
|
||||
log.info("Response Diagnostics {}", responseDiagnostics);
|
||||
}
|
||||
};
|
||||
|
||||
private ConnectionPolicy connectionPolicy = ConnectionPolicy.defaultPolicy();
|
||||
|
||||
public String getUri() {
|
||||
|
|
@ -94,4 +112,20 @@ public class CosmosDBProperties {
|
|||
public void setConnectionPolicy(ConnectionPolicy connectionPolicy) {
|
||||
this.connectionPolicy = connectionPolicy;
|
||||
}
|
||||
|
||||
public boolean isPopulateQueryMetrics() {
|
||||
return populateQueryMetrics;
|
||||
}
|
||||
|
||||
public void setPopulateQueryMetrics(boolean populateQueryMetrics) {
|
||||
this.populateQueryMetrics = populateQueryMetrics;
|
||||
}
|
||||
|
||||
public ResponseDiagnosticsProcessor getResponseDiagnosticsProcessor() {
|
||||
return responseDiagnosticsProcessor;
|
||||
}
|
||||
|
||||
public void setResponseDiagnosticsProcessor(ResponseDiagnosticsProcessor responseDiagnosticsProcessor) {
|
||||
this.responseDiagnosticsProcessor = responseDiagnosticsProcessor;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@ public class CosmosDBPropertiesTest {
|
|||
assertThat(properties.getKey()).isEqualTo(PropertySettingUtil.KEY);
|
||||
assertThat(properties.getConsistencyLevel()).isEqualTo(PropertySettingUtil.CONSISTENCY_LEVEL);
|
||||
assertThat(properties.isAllowTelemetry()).isEqualTo(PropertySettingUtil.ALLOW_TELEMETRY_TRUE);
|
||||
assertThat(properties.isPopulateQueryMetrics()).isEqualTo(PropertySettingUtil.POPULATE_QUERY_METRICS);
|
||||
}
|
||||
|
||||
PropertySettingUtil.unsetProperties();
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ public class PropertySettingUtil {
|
|||
public static final String DATABASE_NAME = "test";
|
||||
public static final boolean ALLOW_TELEMETRY_TRUE = true;
|
||||
public static final boolean ALLOW_TELEMETRY_FALSE = false;
|
||||
public static final boolean POPULATE_QUERY_METRICS = true;
|
||||
public static final ConsistencyLevel CONSISTENCY_LEVEL = ConsistencyLevel.STRONG;
|
||||
public static final int REQUEST_TIMEOUT = 4;
|
||||
public static final int MEDIA_REQUEST_TIMEOUT = 3;
|
||||
|
|
@ -35,6 +36,7 @@ public class PropertySettingUtil {
|
|||
private static final String PROPERTY_DBNAME = "azure.cosmosdb.database";
|
||||
private static final String PROPERTY_CONSISTENCY_LEVEL = "azure.cosmosdb.consistency-level";
|
||||
private static final String PROPERTY_ALLOW_TELEMETRY = "azure.cosmosdb.allow-telemetry";
|
||||
private static final String PROPERTY_POPULATE_QUERY_METRICS = "azure.cosmosdb.populateQueryMetrics";
|
||||
|
||||
public static void setProperties() {
|
||||
System.setProperty(PROPERTY_URI, URI);
|
||||
|
|
@ -42,6 +44,7 @@ public class PropertySettingUtil {
|
|||
System.setProperty(PROPERTY_DBNAME, DATABASE_NAME);
|
||||
System.setProperty(PROPERTY_CONSISTENCY_LEVEL, CONSISTENCY_LEVEL.name());
|
||||
System.setProperty(PROPERTY_ALLOW_TELEMETRY, Boolean.toString(ALLOW_TELEMETRY_TRUE));
|
||||
System.setProperty(PROPERTY_POPULATE_QUERY_METRICS, Boolean.toString(POPULATE_QUERY_METRICS));
|
||||
}
|
||||
|
||||
public static void setAllowTelemetryFalse() {
|
||||
|
|
@ -55,6 +58,7 @@ public class PropertySettingUtil {
|
|||
System.clearProperty(PROPERTY_DBNAME);
|
||||
System.clearProperty(PROPERTY_CONSISTENCY_LEVEL);
|
||||
System.clearProperty(PROPERTY_ALLOW_TELEMETRY);
|
||||
System.clearProperty(PROPERTY_POPULATE_QUERY_METRICS);
|
||||
}
|
||||
|
||||
public static void unsetAllowTelemetry() {
|
||||
|
|
|
|||
2
pom.xml
2
pom.xml
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
<groupId>com.microsoft.azure</groupId>
|
||||
<artifactId>azure-spring-boot-build</artifactId>
|
||||
<version>2.2.0-SNAPSHOT</version>
|
||||
<version>2.2.0</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<name>Azure Spring Boot Build</name>
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче