Skip to content

Commit 973213f

Browse files
committed
Release 1.30.0
1 parent 9ff1e3e commit 973213f

File tree

4 files changed

+57
-26
lines changed

4 files changed

+57
-26
lines changed

Diff for: README.md

+23-21
Original file line numberDiff line numberDiff line change
@@ -4,40 +4,42 @@ languages:
44
- java
55
products:
66
- azure
7-
- azure-sql-database
8-
description: "Getting Started with Sql - Manage Sql Databases Across Different Data Centers - in Java"
9-
urlFragment: sql-database-java-manage-sql-databases-across-regions
7+
extensions:
8+
- services: Sql
9+
- platforms: java
1010
---
1111

12-
# Manage Azure SQL Databases Across Different Data Centers (Java)
12+
# Getting Started with Sql - Manage Sql Databases Across Different Data Centers - in Java #
1313

14-
Azure SQL sample for managing SQL Database.
1514

16-
- Create 3 SQL Servers in different region.
17-
- Create a master database in master SQL Server.
18-
- Create 2 more SQL Servers in different azure regions
19-
- Create secondary read only databases in these server with source as database in server created in step 1.
20-
- Create 5 virtual networks in different regions.
21-
- Create one VM in each of the virtual network.
22-
- Update all three databases to have firewall rules with range of each of the virtual network.
15+
Azure SQL sample for managing SQL Database -
16+
- Create 3 SQL Servers in different region.
17+
- Create a master database in master SQL Server.
18+
- Create 2 more SQL Servers in different azure regions
19+
- Create secondary read only databases in these server with source as database in server created in step 1.
20+
- Create 5 virtual networks in different regions.
21+
- Create one VM in each of the virtual network.
22+
- Update all three databases to have firewall rules with range of each of the virtual network.
2323

2424

25-
## Running this sample
25+
## Running this Sample ##
2626

2727
To run this sample:
2828

2929
Set the environment variable `AZURE_AUTH_LOCATION` with the full path for an auth file. See [how to create an auth file](https://github.com/Azure/azure-libraries-for-java/blob/master/AUTH.md).
3030

31-
```bash
32-
git clone https://github.com/Azure-Samples/sql-database-java-manage-sql-databases-across-regions.git
33-
cd sql-database-java-manage-sql-databases-across-regions
34-
mvn clean compile exec:java
35-
```
31+
git clone https://github.com/Azure-Samples/sql-database-java-manage-sql-databases-across-regions.git
3632

37-
## More information
33+
cd sql-database-java-manage-sql-databases-across-regions
34+
35+
mvn clean compile exec:java
36+
37+
## More information ##
3838

3939
[http://azure.com/java](http://azure.com/java)
4040

41-
If you don't have a Microsoft Azure subscription you can get a FREE trial account [here](http://go.microsoft.com/fwlink/?LinkId=330212).
41+
If you don't have a Microsoft Azure subscription you can get a FREE trial account [here](http://go.microsoft.com/fwlink/?LinkId=330212)
42+
43+
---
4244

43-
This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.
45+
This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.

Diff for: pom.xml

+11-1
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,22 @@
5353
<dependency>
5454
<groupId>com.microsoft.azure</groupId>
5555
<artifactId>azure</artifactId>
56-
<version>1.24.1</version>
56+
<version>1.30.0</version>
5757
</dependency>
5858
<dependency>
5959
<groupId>commons-net</groupId>
6060
<artifactId>commons-net</artifactId>
6161
<version>3.3</version>
6262
</dependency>
63+
<dependency>
64+
<groupId>commons-lang</groupId>
65+
<artifactId>commons-lang</artifactId>
66+
<version>2.6</version>
67+
</dependency>
68+
<dependency>
69+
<groupId>org.apache.commons</groupId>
70+
<artifactId>commons-lang3</artifactId>
71+
<version>3.7</version>
72+
</dependency>
6373
</dependencies>
6474
</project>

Diff for: src/main/java/com/microsoft/azure/management/samples/Utils.java

+20-1
Original file line numberDiff line numberDiff line change
@@ -739,6 +739,24 @@ public static void print(LoadBalancer resource) {
739739
}
740740
}
741741

742+
// Show HTTPS probes
743+
info.append("\n\tHTTPS probes: ")
744+
.append(resource.httpsProbes().size());
745+
for (LoadBalancerHttpProbe probe : resource.httpsProbes().values()) {
746+
info.append("\n\t\tProbe name: ").append(probe.name())
747+
.append("\n\t\t\tPort: ").append(probe.port())
748+
.append("\n\t\t\tInterval in seconds: ").append(probe.intervalInSeconds())
749+
.append("\n\t\t\tRetries before unhealthy: ").append(probe.numberOfProbes())
750+
.append("\n\t\t\tHTTPS request path: ").append(probe.requestPath());
751+
752+
// Show associated load balancing rules
753+
info.append("\n\t\t\tReferenced from load balancing rules: ")
754+
.append(probe.loadBalancingRules().size());
755+
for (LoadBalancingRule rule : probe.loadBalancingRules().values()) {
756+
info.append("\n\t\t\t\tName: ").append(rule.name());
757+
}
758+
}
759+
742760
// Show load balancing rules
743761
info.append("\n\tLoad balancing rules: ")
744762
.append(resource.loadBalancingRules().size());
@@ -994,7 +1012,7 @@ public static void print(AppServicePlan resource) {
9941012
*/
9951013
public static void print(WebAppBase resource) {
9961014
StringBuilder builder = new StringBuilder().append("Web app: ").append(resource.id())
997-
.append("Name: ").append(resource.name())
1015+
.append("\n\tName: ").append(resource.name())
9981016
.append("\n\tState: ").append(resource.state())
9991017
.append("\n\tResource group: ").append(resource.resourceGroupName())
10001018
.append("\n\tRegion: ").append(resource.region())
@@ -1377,6 +1395,7 @@ public static String createRandomName(String namePrefix) {
13771395
*/
13781396
public static void createCertificate(String certPath, String pfxPath,
13791397
String alias, String password, String cnName) throws Exception {
1398+
SdkContext.prepareFileLocation(new File(pfxPath), new File(certPath));
13801399
if (new File(pfxPath).exists()) {
13811400
return;
13821401
}

Diff for: src/main/java/com/microsoft/azure/management/sql/samples/ManageSqlDatabasesAcrossDifferentDataCenters.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import com.microsoft.azure.management.resources.fluentcore.model.Creatable;
2020
import com.microsoft.azure.management.samples.Utils;
2121
import com.microsoft.azure.management.sql.CreateMode;
22-
import com.microsoft.azure.management.sql.DatabaseEditions;
22+
import com.microsoft.azure.management.sql.DatabaseEdition;
2323
import com.microsoft.azure.management.sql.SqlDatabase;
2424
import com.microsoft.azure.management.sql.SqlFirewallRule;
2525
import com.microsoft.azure.management.sql.SqlServer;
@@ -82,7 +82,7 @@ public static boolean runSample(Azure azure) {
8282
System.out.println("Creating a database");
8383

8484
SqlDatabase masterDatabase = masterSqlServer.databases().define(databaseName)
85-
.withEdition(DatabaseEditions.BASIC)
85+
.withEdition(DatabaseEdition.BASIC)
8686
.create();
8787
Utils.print(masterDatabase);
8888

@@ -92,7 +92,7 @@ public static boolean runSample(Azure azure) {
9292

9393
SqlServer sqlServerInSecondaryLocation = azure.sqlServers()
9494
.define(Utils.createRandomName(slaveSqlServer1Name))
95-
.withRegion(masterDatabase.defaultSecondaryLocation())
95+
.withRegion(Region.US_EAST2)
9696
.withExistingResourceGroup(rgName)
9797
.withAdministratorLogin(administratorLogin)
9898
.withAdministratorPassword(administratorPassword)

0 commit comments

Comments
 (0)