Merge pull request #24237 from David-Engel/encrypt2

Make Encrypt option explicit in connection string samples

Author: prmerger-automator[bot]

docs/connect/jdbc/building-the-connection-url.md

@@ -42,44 +42,44 @@ For a detailed list of properties that can be set in the connection string, see
 
 Connect to the default database on the local computer by using a user name and password:
 
-`jdbc:sqlserver://localhost;user=MyUserName;password=*****;`
+`jdbc:sqlserver://localhost;encrypt=true;user=MyUserName;password=*****;`
 
 > [!NOTE]
 > Although the previous example uses a username and password in the connection string, you should use integrated security as it is more secure. For more information, see the [Connecting with Integrated Authentication](#Connectingintegrated) section later in this topic.
 
 The following connection string shows an example of how to connect to a [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] database using integrated authentication and Kerberos from an application running on any operating system supported by the [!INCLUDE[jdbcNoVersion](../../includes/jdbcnoversion_md.md)]:
 
 ```java
-jdbc:sqlserver://;servername=server_name;integratedSecurity=true;authenticationScheme=JavaKerberos
+jdbc:sqlserver://;servername=server_name;encrypt=true;integratedSecurity=true;authenticationScheme=JavaKerberos
 ```
 
 Connect to the default database on the local computer by using integrated authentication:
 
-`jdbc:sqlserver://localhost;integratedSecurity=true;`
+`jdbc:sqlserver://localhost;encrypt=true;integratedSecurity=true;`
 
 Connect to a named database on a remote server:
 
-`jdbc:sqlserver://localhost;databaseName=AdventureWorks;integratedSecurity=true;`
+`jdbc:sqlserver://localhost;encrypt=true;databaseName=AdventureWorks;integratedSecurity=true;`
 
 Connect on the default port to the remote server:
 
-`jdbc:sqlserver://localhost:1433;databaseName=AdventureWorks;integratedSecurity=true;`
+`jdbc:sqlserver://localhost:1433;encrypt=true;databaseName=AdventureWorks;integratedSecurity=true;`
 
 Connect by specifying a customized application name:
 
-`jdbc:sqlserver://localhost;databaseName=AdventureWorks;integratedSecurity=true;applicationName=MyApp;`
+`jdbc:sqlserver://localhost;encrypt=true;databaseName=AdventureWorks;integratedSecurity=true;applicationName=MyApp;`
 
 ## Named and multiple SQL Server instances
 
 [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] allows for the installation of multiple database instances per server. Each instance is identified by a specific name. To connect to a named instance of [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)], you can either specify the port number of the named instance (preferred), or you can specify the instance name as a JDBC URL property or a **datasource** property. If no instance name or port number property is specified, a connection to the default instance is created. See the following examples:
 
 To specify a port number, use the following format:
 
-`jdbc:sqlserver://localhost:1433;integratedSecurity=true;<more properties as required>;`
+`jdbc:sqlserver://localhost:1433;encrypt=true;integratedSecurity=true;<more properties as required>;`
 
 To use a JDBC URL property, use the following format:
 
-`jdbc:sqlserver://localhost;instanceName=instance1;integratedSecurity=true;<more properties as required>;`
+`jdbc:sqlserver://localhost;encrypt=true;instanceName=instance1;integratedSecurity=true;<more properties as required>;`
 
 ## Escaping values in the connection URL
 
@@ -89,7 +89,7 @@ Before version 8.4, escaped values can contain special characters (especially '=
 
 In version 8.4 and above, escaped values can contain special characters, including braces. However, closing braces must be escaped. For example, with a password of `pass";{}word`, a connection string would need to escape the password as follows:
 
-`jdbc:sqlserver://localhost;username=MyUsername;password={pass";{}}word};`
+`jdbc:sqlserver://localhost;encrypt=true;username=MyUsername;password={pass";{}}word};`
 
 > [!NOTE]
 > White space inside the braces is literal and not trimmed.
@@ -117,15 +117,15 @@ The JDBC driver supports the use of IPv6 addresses with the connection propertie
 
 **To use the serverName property:**
 
-`jdbc:sqlserver://;serverName=3ffe:8311:eeee:f70f:0:5eae:10.203.31.9\\instance1;integratedSecurity=true;`
+`jdbc:sqlserver://;serverName=3ffe:8311:eeee:f70f:0:5eae:10.203.31.9\\instance1;encrypt=true;integratedSecurity=true;`
 
 **To use the properties collection:**
 
 `Properties pro = new Properties();`
 
 `pro.setProperty("serverName", "serverName=3ffe:8311:eeee:f70f:0:5eae:10.203.31.9\\instance1");`
 
-`Connection con = DriverManager.getConnection("jdbc:sqlserver://;integratedSecurity=true;", pro);`
+`Connection con = DriverManager.getConnection("jdbc:sqlserver://;encrypt=true;integratedSecurity=true;", pro);`
 
 ## See also
 

docs/connect/jdbc/caching-result-set-data-sample.md

@@ -60,7 +60,7 @@ public class CacheResultSet {
     public static void main(String[] args) {
 
         // Create a variable for the connection string.
-        String connectionUrl = "jdbc:sqlserver://<server>:<port>;databaseName=AdventureWorks;user=<user>;password=<password>";
+        String connectionUrl = "jdbc:sqlserver://<server>:<port>;encrypt=true;databaseName=AdventureWorks;user=<user>;password=<password>";
 
         try (Connection con = DriverManager.getConnection(connectionUrl);
                 Statement stmt = con.createStatement(SQLServerResultSet.TYPE_SS_SERVER_CURSOR_FORWARD_ONLY, SQLServerResultSet.CONCUR_READ_ONLY);) {

docs/connect/jdbc/connection-url-sample.md

@@ -47,7 +47,7 @@ public class ConnectURL {
     public static void main(String[] args) {
 
         // Create a variable for the connection string.
-        String connectionUrl = "jdbc:sqlserver://<server>:<port>;databaseName=AdventureWorks;user=<user>;password=<password>";
+        String connectionUrl = "jdbc:sqlserver://<server>:<port>;encrypt=true;databaseName=AdventureWorks;user=<user>;password=<password>";
 
         try (Connection con = DriverManager.getConnection(connectionUrl); Statement stmt = con.createStatement();) {
             String SQL = "SELECT TOP 10 * FROM Person.Contact";

docs/connect/jdbc/data-discovery-classification-sample.md

@@ -45,7 +45,7 @@ public class DataDiscoveryAndClassification {
         String tableName = "JDBC_SQL_DATA_DISCOVERY_CLASSIFICATION";
 
         // Create a variable for the connection string.
-        String connectionUrl = "jdbc:sqlserver://<server>:<port>;databaseName=<database>;username=<user>;password=<password>;";
+        String connectionUrl = "jdbc:sqlserver://<server>:<port>;encrypt=true;databaseName=<database>;username=<user>;password=<password>;";
 
         // Establish the connection.
         try (Connection con = DriverManager.getConnection(connectionUrl); Statement stmt = con.createStatement()) {

docs/connect/jdbc/modifying-result-set-data-sample.md

@@ -50,7 +50,7 @@ public class UpdateResultSet {
     public static void main(String[] args) {
 
         // Create a variable for the connection string.
-        String connectionUrl = "jdbc:sqlserver://<server>:<port>;databaseName=AdventureWorks;user=<user>;password=<password>";
+        String connectionUrl = "jdbc:sqlserver://<server>:<port>;encrypt=true;databaseName=AdventureWorks;user=<user>;password=<password>";
 
         try (Connection con = DriverManager.getConnection(connectionUrl);
                 Statement stmt = con.createStatement(ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_UPDATABLE);) {

docs/connect/jdbc/reference/getcolumns-method-sqlserverdatabasemetadata.md

@@ -166,7 +166,7 @@ public java.sql.ResultSet getColumns(java.lang.String catalog,
 import java.sql.*;  
 public class c1 {  
    public static void main(String[] args) {  
-      String connectionUrl = "jdbc:sqlserver://localhost:1433;databaseName=AdventureWorks;integratedsecurity=true";  
+      String connectionUrl = "jdbc:sqlserver://localhost:1433;encrypt=true;databaseName=AdventureWorks;integratedsecurity=true";  
   
       Connection con = null;  
       Statement stmt = null;  

docs/connect/jdbc/release-notes-for-the-jdbc-driver.md

@@ -780,7 +780,7 @@ Microsoft JDBC Driver 6.0 for SQL Server is fully compliant with JDBC specificat
 To ensure that you have the right sqljdbc42.jar or sqljdbc41.jar file, run the following lines of code. If the output is "Driver version: 6.0.7507.100", you have the JDBC Driver 6.0 package.
 
 ```java
-Connection conn = DriverManager.getConnection("jdbc:sqlserver://<server>;user=<user>;password=<password>;");
+Connection conn = DriverManager.getConnection("jdbc:sqlserver://<server>;encrypt=true;user=<user>;password=<password>;");
 System.out.println("Driver version: " + conn.getMetaData().getDriverVersion());
 ```
 
@@ -827,7 +827,7 @@ Microsoft JDBC Driver 4.2 for SQL Server is fully compliant with JDBC specificat
 To ensure you have the right sqljdbc42.jar or sqljdbc41.jar file, run the following lines of code. If the output is "Driver version: 4.2.6420.100", you have the JDBC Driver 4.2 package.
 
 ```java
-Connection conn = DriverManager.getConnection("jdbc:sqlserver://<server>;user=<user>;password=<password>;");
+Connection conn = DriverManager.getConnection("jdbc:sqlserver://<server>;encrypt=true;user=<user>;password=<password>;");
 System.out.println("Driver version: " + conn.getMetaData().getDriverVersion());
 ```
 

docs/connect/jdbc/retrieving-result-set-data-sample.md

@@ -46,7 +46,7 @@ public class RetrieveResultSet {
     public static void main(String[] args) {
 
         // Create a variable for the connection string.
-        String connectionUrl = "jdbc:sqlserver://<server>:<port>;databaseName=AdventureWorks;user=<user>;password=<password>";
+        String connectionUrl = "jdbc:sqlserver://<server>:<port>;encrypt=true;databaseName=AdventureWorks;user=<user>;password=<password>";
 
         try (Connection con = DriverManager.getConnection(connectionUrl); Statement stmt = con.createStatement();) {
             createTable(stmt);

docs/connect/jdbc/sparse-columns.md

@@ -58,7 +58,7 @@ public class SparseColumns {
     public static void main(String args[]) {
 
         // Create a variable for the connection string.
-        String connectionUrl = "jdbc:sqlserver://<server>:<port>;databaseName=AdventureWorks;user=<user>;password=<password>";
+        String connectionUrl = "jdbc:sqlserver://<server>:<port>;encrypt=true;databaseName=AdventureWorks;user=<user>;password=<password>";
 
         try (Connection con = DriverManager.getConnection(connectionUrl); Statement stmt = con.createStatement()) {
 

docs/connect/jdbc/spatial-data-types-sample.md

@@ -52,7 +52,7 @@ public class SpatialDataTypes {
     public static void main(String[] args) {
 
         // Create a variable for the connection string.
-        String connectionUrl = "jdbc:sqlserver://<server>:<port>;databaseName=<database>;user=<user>;password=<password>";
+        String connectionUrl = "jdbc:sqlserver://<server>:<port>;encrypt=true;databaseName=<database>;user=<user>;password=<password>";
         // Establish the connection.
         try (Connection con = DriverManager.getConnection(connectionUrl); Statement stmt = con.createStatement();) {
             dropAndCreateTable(stmt);