Merge pull request #6687 from cheenamalhotra/release-docs

Documentation updates for RTW 7.0 release

Author: itechedit

docs/connect/jdbc/azure-key-vault-sample-version-6.0.0.md

@@ -1,7 +1,7 @@
 ---
 title: "Azure Key Vault Sample Version 6.0.0 | Microsoft Docs"
 ms.custom: ""
-ms.date: "02/28/2018"
+ms.date: "07/31/2018"
 ms.prod: sql
 ms.prod_service: connectivity
 ms.reviewer: ""
@@ -16,10 +16,12 @@ ms.author: genemi
 manager: craigg
 ---
 # Azure Key Vault Sample Version 6.0.0
+
 [!INCLUDE[Driver_JDBC_Download](../../includes/driver_jdbc_download.md)]
 
-##  Sample application using Azure Key Vault feature
-This application is runnable using JDBC Driver 6.0.0 and Azure-Keyvault (version 0.9.7),  Adal4j (version 1.3.0), and their dependencies.  The underlying dependencies can be resolved by adding these libraries to the pom file of the project as described [here](../../connect/jdbc/feature-dependencies-of-microsoft-jdbc-driver-for-sql-server.md): 
+## Sample application using Azure Key Vault feature
+
+This application is runnable using JDBC Driver 6.0.0 and Azure-Keyvault (version 0.9.7),  Adal4j (version 1.3.0), and their dependencies.  The underlying dependencies can be resolved by adding these libraries to the pom file of the project as described [here](../../connect/jdbc/feature-dependencies-of-microsoft-jdbc-driver-for-sql-server.md):
 
 ```java
 import java.net.URISyntaxException;
@@ -45,17 +47,18 @@ import com.microsoft.sqlserver.jdbc.SQLServerConnection;
 import com.microsoft.sqlserver.jdbc.SQLServerException;
 import com.microsoft.sqlserver.jdbc.SQLServerKeyVaultAuthenticationCallback;
 
-public class AE_AKV_Maven {
+public class AKV_600 {
 
 	private static String connectionUrl = "jdbc:sqlserver://localhost;integratedSecurity=true;database=test;columnEncryptionSetting=enabled";
-	static String applicationClientID = "Your Client ID"; 
+	static String applicationClientID = "Your Client ID";
 	static String applicationKey = "Your Application Key";
-	static String keyID = "Your Key ID"; 
+	static String keyID = "Your Key ID";
 	static String cmkName = "AKV_CMK_JDBC";
 	static String cekName = "AKV_CEK_JDBC";
 	static String akvTable = "akvTable";
 
-	static String createTableSQL = "create table " + akvTable + " (" + "PlainNvarcharMax nvarchar(max) null,"
+	static String createTableSQL = "create table " + akvTable + " ("
+			+ "PlainNvarcharMax nvarchar(max) null,"
 			+ "RandomizedNvarcharMax nvarchar(max) COLLATE Latin1_General_BIN2 ENCRYPTED WITH (ENCRYPTION_TYPE = RANDOMIZED, ALGORITHM = 'AEAD_AES_256_CBC_HMAC_SHA_256', COLUMN_ENCRYPTION_KEY = "
 			+ cekName + ") NULL,"
 			+ "DeterministicNvarcharMax nvarchar(max) COLLATE Latin1_General_BIN2 ENCRYPTED WITH (ENCRYPTION_TYPE = DETERMINISTIC, ALGORITHM = 'AEAD_AES_256_CBC_HMAC_SHA_256', COLUMN_ENCRYPTION_KEY = "
@@ -68,13 +71,16 @@ public class AE_AKV_Maven {
 		SQLServerKeyVaultAuthenticationCallback authenticationCallback = new SQLServerKeyVaultAuthenticationCallback() {
 
 			@Override
-			public String getAccessToken(String authority, String resource, String scope) {
+			public String getAccessToken(String authority, String resource,
+					String scope) {
 				AuthenticationResult result = null;
 				try {
-					AuthenticationContext context = new AuthenticationContext(authority, false, service);
-					ClientCredential cred = new ClientCredential(applicationClientID, applicationKey);
-
-					Future<AuthenticationResult> future = context.acquireToken(resource, cred, null);
+					AuthenticationContext context = new AuthenticationContext(
+							authority, false, service);
+					ClientCredential cred = new ClientCredential(
+							applicationClientID, applicationKey);
+					Future<AuthenticationResult> future = context
+							.acquireToken(resource, cred, null);
 					result = future.get();
 				} catch (Exception e) {
 					e.printStackTrace();
@@ -88,28 +94,24 @@ public class AE_AKV_Maven {
 		return akvProvider;
 	}
 
-	public static void main(String[] args) throws ClassNotFoundException, Exception {
+	public static void main(String[] args)
+			throws ClassNotFoundException, Exception {
 		Class.forName("com.microsoft.sqlserver.jdbc.SQLServerDriver");
 		try (Connection connection = DriverManager.getConnection(connectionUrl);
 				Statement statement = connection.createStatement()) {
-
 			statement.execute("DBCC FREEPROCCACHE");
-
 			SQLServerColumnEncryptionAzureKeyVaultProvider akvProvider = tryAuthenticationCallback();
-
 			setupKeyStoreProviders(akvProvider.getName(), akvProvider);
-
-			testAKV(akvProvider.getName(), akvProvider, statement);
-
-			connection.close();
+			testAKV(akvProvider.getName(), akvProvider, connection, statement);
 		}
 	}
 
-	private static void testAKV(String CUSTOM_AKV_PROVIDER_NAME, SQLServerColumnEncryptionKeyStoreProvider akvProvider,
-			Statement statement) throws SQLException, SQLServerException, InterruptedException {
+	private static void testAKV(String CUSTOM_AKV_PROVIDER_NAME,
+			SQLServerColumnEncryptionKeyStoreProvider akvProvider,
+			Connection connection, Statement statement)
+			throws SQLException, SQLServerException, InterruptedException {
 
 		dropTable(statement);
-
 		dropKeys(statement);
 
 		System.out.println("createCMK");
@@ -122,10 +124,10 @@ public class AE_AKV_Maven {
 		statement.execute(createTableSQL);
 
 		System.out.println("populate");
-		populateCharNormalCase();
+		populateCharNormalCase(connection);
 
-		System.out.println("test");
-		testChar();
+		System.out.println("run the test");
+		testChar(statement);
 	}
 
 	/**
@@ -136,7 +138,8 @@ public class AE_AKV_Maven {
 	 * @throws SQLServerException
 	 */
 	private static void setupKeyStoreProviders(String CUSTOM_AKV_PROVIDER_NAME,
-			SQLServerColumnEncryptionKeyStoreProvider akvProvider) throws SQLServerException {
+			SQLServerColumnEncryptionKeyStoreProvider akvProvider)
+			throws SQLServerException {
 		Map<String, SQLServerColumnEncryptionKeyStoreProvider> map1 = new HashMap<String, SQLServerColumnEncryptionKeyStoreProvider>();
 		map1.put(CUSTOM_AKV_PROVIDER_NAME, akvProvider);
 		SQLServerConnection.registerColumnEncryptionKeyStoreProviders(map1);
@@ -148,7 +151,8 @@ public class AE_AKV_Maven {
 	 * @throws SQLException
 	 */
 	private static void dropTable(Statement statement) throws SQLException {
-		statement.executeUpdate("if object_id('" + akvTable + "','U') is not null" + " drop table " + akvTable);
+		statement.executeUpdate("if object_id('" + akvTable
+				+ "','U') is not null" + " drop table " + akvTable);
 	}
 
 	/**
@@ -157,11 +161,14 @@ public class AE_AKV_Maven {
 	 * @throws SQLException
 	 */
 	private static void dropKeys(Statement statement) throws SQLException {
-		statement.executeUpdate("if exists (SELECT name from sys.column_encryption_keys where name='" + cekName + "')"
-				+ " begin" + " drop column encryption key " + cekName + " end");
-
-		statement.executeUpdate("if exists (SELECT name from sys.column_master_keys where name='" + cmkName + "')"
-				+ " begin" + " drop column master key " + cmkName + " end");
+		statement.executeUpdate(
+				"if exists (SELECT name from sys.column_encryption_keys where name='"
+						+ cekName + "')" + " begin"
+						+ " drop column encryption key " + cekName + " end");
+		statement.executeUpdate(
+				"if exists (SELECT name from sys.column_master_keys where name='"
+						+ cmkName + "')" + " begin" + " drop column master key "
+						+ cmkName + " end");
 	}
 
 	/**
@@ -170,10 +177,11 @@ public class AE_AKV_Maven {
 	 * @param CUSTOM_AKV_PROVIDER_NAME
 	 * @throws SQLException
 	 */
-	private static void createCMK(String CUSTOM_AKV_PROVIDER_NAME, Statement statement) throws SQLException {
+	private static void createCMK(String CUSTOM_AKV_PROVIDER_NAME,
+			Statement statement) throws SQLException {
 		String _createColumnMasterKeyTemplate = String.format(
-				"CREATE COLUMN MASTER KEY [%s] WITH ( KEY_STORE_PROVIDER_NAME = '%s', KEY_PATH = '%s');", cmkName,
-				CUSTOM_AKV_PROVIDER_NAME, keyID);
+				"CREATE COLUMN MASTER KEY [%s] WITH ( KEY_STORE_PROVIDER_NAME = '%s', KEY_PATH = '%s');",
+				cmkName, CUSTOM_AKV_PROVIDER_NAME, keyID);
 		statement.execute(_createColumnMasterKeyTemplate);
 	}
 
@@ -184,19 +192,18 @@ public class AE_AKV_Maven {
 	 * @throws SQLServerException
 	 * @throws SQLException
 	 */
-	private static void createCEK(SQLServerColumnEncryptionKeyStoreProvider storeProvider, Statement statement)
-			throws SQLServerException, SQLException {
-
+	private static void createCEK(
+			SQLServerColumnEncryptionKeyStoreProvider storeProvider,
+			Statement statement) throws SQLServerException, SQLException {
 		String letters = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
 		byte[] valuesDefault = letters.getBytes();
-
-		byte[] key = storeProvider.encryptColumnEncryptionKey(keyID, "RSA_OAEP", valuesDefault);
-
-		String cekSql = "CREATE COLUMN ENCRYPTION KEY " + cekName + " WITH VALUES " + "(COLUMN_MASTER_KEY = " + cmkName
-				+ ", ALGORITHM = 'RSA_OAEP', ENCRYPTED_VALUE = 0x" + bytesToHexString(key, key.length) + ")" + ";";
-
+		byte[] key = storeProvider.encryptColumnEncryptionKey(keyID, "RSA_OAEP",
+				valuesDefault);
+		String cekSql = "CREATE COLUMN ENCRYPTION KEY " + cekName
+				+ " WITH VALUES " + "(COLUMN_MASTER_KEY = " + cmkName
+				+ ", ALGORITHM = 'RSA_OAEP', ENCRYPTED_VALUE = 0x"
+				+ bytesToHexString(key, key.length) + ")" + ";";
 		statement.execute(cekSql);
-
 	}
 
 	/**
@@ -207,7 +214,8 @@ public class AE_AKV_Maven {
 	 *            length of the array
 	 * @return
 	 */
-	final static char[] hexChars = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
+	final static char[] hexChars = {'0', '1', '2', '3', '4', '5', '6', '7', '8',
+			'9', 'A', 'B', 'C', 'D', 'E', 'F'};
 
 	private static String bytesToHexString(byte[] b, int length) {
 		StringBuilder sb = new StringBuilder(length * 2);
@@ -224,15 +232,13 @@ public class AE_AKV_Maven {
 	 * 
 	 * @throws SQLException
 	 */
-	private static void populateCharNormalCase() throws SQLException {
+	private static void populateCharNormalCase(Connection connection)
+			throws SQLException {
 		String sql = "insert into " + akvTable + " values(?,?,?)";
-		try (Connection connection = DriverManager.getConnection(connectionUrl);
-				PreparedStatement pstmt = connection.prepareStatement(sql)) {
-
+		try (PreparedStatement pstmt = connection.prepareStatement(sql)) {
 			for (int i = 1; i <= 3; i++) {
 				pstmt.setNString(i, "hello world");
 			}
-
 			pstmt.execute();
 		}
 	}
@@ -242,15 +248,13 @@ public class AE_AKV_Maven {
 	 * 
 	 * @throws SQLException
 	 */
-	private static void testChar() throws SQLException {
-		try (Connection connection = DriverManager.getConnection(connectionUrl);
-				ResultSet rs = connection.createStatement().executeQuery("select * from " + akvTable);) {
+	private static void testChar(Statement statement) throws SQLException {
+		try (ResultSet rs = statement
+				.executeQuery("select * from " + akvTable);) {
 			int numberOfColumns = rs.getMetaData().getColumnCount();
-
 			while (rs.next()) {
 				testGetString(rs, numberOfColumns);
 			}
-
 		}
 	}
 
@@ -261,23 +265,21 @@ public class AE_AKV_Maven {
 	 * @param numberOfColumns
 	 * @throws SQLException
 	 */
-	private static void testGetString(ResultSet rs, int numberOfColumns) throws SQLException {
+	private static void testGetString(ResultSet rs, int numberOfColumns)
+			throws SQLException {
 		for (int i = 1; i <= numberOfColumns; i = i + 3) {
 			String stringValue1 = "" + rs.getString(i);
 			String stringValue2 = "" + rs.getString(i + 1);
 			String stringValue3 = "" + rs.getString(i + 2);
-
 			System.out.println(stringValue1);
 			System.out.println(stringValue2);
 			System.out.println(stringValue3);
 		}
 	}
-
 }
-
-
-
 ```
 
-## See Also  
- [Azure Key Vault Sample Version 6.2.2](../../connect/jdbc/azure-key-vault-sample-version-6.2.2.md)  
+## See Also
+
+[Azure Key Vault Sample Version 7.0.0](../../connect/jdbc/azure-key-vault-sample-version-7-0-0.md)  
+[Azure Key Vault Sample Version 6.2.2](../../connect/jdbc/azure-key-vault-sample-version-6.2.2.md)