From 1b0224c69a6c4a9f4c92805801e12690aaa521a2 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Mon, 31 Jul 2017 14:28:09 +0000 Subject: [PATCH 1/3] Replace explicit types with <> (The diamond operator). This removes duplicated information when instantiating variables, and increases the readability. For example: ```Java EnumMap handleMap = new EnumMap(CallableHandles.class); ``` becomes ```Java EnumMap handleMap = new EnumMap<>(CallableHandles.class); ``` and ```Java private static final EnumMap> conversionMap = new EnumMap>(SSType.Category.class); ``` becomes ```Java private static final EnumMap> conversionMap = new EnumMap<>(SSType.Category.class); ``` --- .../java/com/microsoft/sqlserver/jdbc/AE.java | 2 +- .../microsoft/sqlserver/jdbc/DataTypes.java | 10 ++++---- .../sqlserver/jdbc/FailOverMapSingleton.java | 2 +- .../microsoft/sqlserver/jdbc/IOBuffer.java | 12 +++++----- .../sqlserver/jdbc/JaasConfiguration.java | 6 ++--- .../sqlserver/jdbc/SQLCollation.java | 4 ++-- .../SQLServerAeadAes256CbcHmac256Factory.java | 2 +- .../sqlserver/jdbc/SQLServerBlob.java | 2 +- .../jdbc/SQLServerBulkCSVFileRecord.java | 4 ++-- .../sqlserver/jdbc/SQLServerBulkCopy.java | 8 +++---- .../jdbc/SQLServerCallableStatement.java | 2 +- .../sqlserver/jdbc/SQLServerClob.java | 2 +- .../sqlserver/jdbc/SQLServerConnection.java | 14 +++++------ .../sqlserver/jdbc/SQLServerDataTable.java | 4 ++-- .../jdbc/SQLServerDatabaseMetaData.java | 2 +- ...LServerEncryptionAlgorithmFactoryList.java | 2 +- .../jdbc/SQLServerParameterMetaData.java | 4 ++-- .../jdbc/SQLServerPooledConnection.java | 2 +- .../jdbc/SQLServerPreparedStatement.java | 8 +++---- .../sqlserver/jdbc/SQLServerStatement.java | 6 ++--- .../jdbc/SQLServerSymmetricKeyCache.java | 2 +- .../sqlserver/jdbc/SQLServerXAResource.java | 2 +- .../com/microsoft/sqlserver/jdbc/TVP.java | 2 +- .../sqlserver/jdbc/dns/DNSUtilities.java | 4 ++-- .../com/microsoft/sqlserver/jdbc/dtv.java | 2 +- .../jdbc/bulkCopy/BulkCopyConnectionTest.java | 4 ++-- .../BulkCopyISQLServerBulkRecordTest.java | 4 ++-- .../jdbc/bulkCopy/BulkCopyTestWrapper.java | 2 +- .../ImpISQLServerBulkRecord_IssuesTest.java | 24 +++++++++---------- .../jdbc/unit/statement/LimitEscapeTest.java | 2 +- .../jdbc/unit/statement/StatementTest.java | 2 +- .../sqlserver/testframework/DBCoercions.java | 2 +- .../sqlserver/testframework/DBColumn.java | 2 +- .../sqlserver/testframework/DBSchema.java | 2 +- .../sqlserver/testframework/DBTable.java | 6 ++--- .../sqlserver/testframework/Utils.java | 2 +- 36 files changed, 81 insertions(+), 81 deletions(-) diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/AE.java b/src/main/java/com/microsoft/sqlserver/jdbc/AE.java index c6345d25b..1b5b2543f 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/AE.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/AE.java @@ -88,7 +88,7 @@ byte[] getCekMdVersion() { cekId = 0; cekVersion = 0; cekMdVersion = null; - columnEncryptionKeyValues = new ArrayList(); + columnEncryptionKeyValues = new ArrayList<>(); } int getSize() { diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/DataTypes.java b/src/main/java/com/microsoft/sqlserver/jdbc/DataTypes.java index 914e382a2..3f6ebdbea 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/DataTypes.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/DataTypes.java @@ -382,7 +382,7 @@ private GetterConversion(SSType.Category from, this.to = to; } - private static final EnumMap> conversionMap = new EnumMap>( + private static final EnumMap> conversionMap = new EnumMap<>( SSType.Category.class); static { @@ -776,7 +776,7 @@ private SetterConversionAE(JavaType from, this.to = to; } - private static final EnumMap> setterConversionAEMap = new EnumMap>(JavaType.class); + private static final EnumMap> setterConversionAEMap = new EnumMap<>(JavaType.class); static { for (JavaType javaType : JavaType.values()) @@ -1086,7 +1086,7 @@ private SetterConversion(JDBCType.Category from, this.to = to; } - private static final EnumMap> conversionMap = new EnumMap>( + private static final EnumMap> conversionMap = new EnumMap<>( JDBCType.Category.class); static { @@ -1305,7 +1305,7 @@ private UpdaterConversion(JDBCType.Category from, this.to = to; } - private static final EnumMap> conversionMap = new EnumMap>( + private static final EnumMap> conversionMap = new EnumMap<>( JDBCType.Category.class); static { @@ -1616,7 +1616,7 @@ private NormalizationAE(JDBCType from, this.to = to; } - private static final EnumMap> normalizationMapAE = new EnumMap>(JDBCType.class); + private static final EnumMap> normalizationMapAE = new EnumMap<>(JDBCType.class); static { for (JDBCType jdbcType : JDBCType.values()) diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/FailOverMapSingleton.java b/src/main/java/com/microsoft/sqlserver/jdbc/FailOverMapSingleton.java index f3146d926..8bebf1f0e 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/FailOverMapSingleton.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/FailOverMapSingleton.java @@ -13,7 +13,7 @@ final class FailoverMapSingleton { private static int INITIALHASHMAPSIZE = 5; - private static HashMap failoverMap = new HashMap(INITIALHASHMAPSIZE); + private static HashMap failoverMap = new HashMap<>(INITIALHASHMAPSIZE); private FailoverMapSingleton() { /* hide the constructor to stop the instantiation of this class. */} diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/IOBuffer.java b/src/main/java/com/microsoft/sqlserver/jdbc/IOBuffer.java index 01ad48256..61faa0cec 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/IOBuffer.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/IOBuffer.java @@ -2338,8 +2338,8 @@ else if (!useTnir) { findSocketUsingJavaNIO(inetAddrs, portNumber, timeoutInMilliSeconds); } else { - LinkedList inet4Addrs = new LinkedList(); - LinkedList inet6Addrs = new LinkedList(); + LinkedList inet4Addrs = new LinkedList<>(); + LinkedList inet6Addrs = new LinkedList<>(); for (InetAddress inetAddr : inetAddrs) { if (inetAddr instanceof Inet4Address) { @@ -2467,7 +2467,7 @@ private void findSocketUsingJavaNIO(InetAddress[] inetAddrs, assert inetAddrs.length != 0 : "Number of inetAddresses should not be zero in this function"; Selector selector = null; - LinkedList socketChannels = new LinkedList(); + LinkedList socketChannels = new LinkedList<>(); SocketChannel selectedChannel = null; try { @@ -2646,8 +2646,8 @@ private void findSocketUsingThreading(LinkedList inetAddrs, assert inetAddrs.isEmpty() == false : "Number of inetAddresses should not be zero in this function"; - LinkedList sockets = new LinkedList(); - LinkedList socketConnectors = new LinkedList(); + LinkedList sockets = new LinkedList<>(); + LinkedList socketConnectors = new LinkedList<>(); try { @@ -5164,7 +5164,7 @@ void writeTvpOrderUnique(TVP value) throws SQLServerException { Map columnMetadata = value.getColumnMetadata(); Iterator> columnsIterator = columnMetadata.entrySet().iterator(); - LinkedList columnList = new LinkedList(); + LinkedList columnList = new LinkedList<>(); while (columnsIterator.hasNext()) { byte flags = 0; diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/JaasConfiguration.java b/src/main/java/com/microsoft/sqlserver/jdbc/JaasConfiguration.java index f080ae14e..6443724fd 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/JaasConfiguration.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/JaasConfiguration.java @@ -23,9 +23,9 @@ public class JaasConfiguration extends Configuration { private static AppConfigurationEntry[] generateDefaultConfiguration() { if (Util.isIBM()) { - Map confDetailsWithoutPassword = new HashMap(); + Map confDetailsWithoutPassword = new HashMap<>(); confDetailsWithoutPassword.put("useDefaultCcache", "true"); - Map confDetailsWithPassword = new HashMap(); + Map confDetailsWithPassword = new HashMap<>(); // We generated a two configurations fallback that is suitable for password and password-less authentication // See https://www.ibm.com/support/knowledgecenter/SSYKE2_8.0.0/com.ibm.java.security.component.80.doc/security-component/jgssDocs/jaas_login_user.html final String ibmLoginModule = "com.ibm.security.auth.module.Krb5LoginModule"; @@ -34,7 +34,7 @@ private static AppConfigurationEntry[] generateDefaultConfiguration() { new AppConfigurationEntry(ibmLoginModule, AppConfigurationEntry.LoginModuleControlFlag.SUFFICIENT, confDetailsWithPassword)}; } else { - Map confDetails = new HashMap(); + Map confDetails = new HashMap<>(); confDetails.put("useTicketCache", "true"); return new AppConfigurationEntry[] {new AppConfigurationEntry("com.sun.security.auth.module.Krb5LoginModule", AppConfigurationEntry.LoginModuleControlFlag.REQUIRED, confDetails)}; diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLCollation.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLCollation.java index 7a47b6fec..d89a95e11 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLCollation.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLCollation.java @@ -530,11 +530,11 @@ private Encoding encodingFromSortId() throws UnsupportedEncodingException { static { // Populate the windows locale and sort order indices - localeIndex = new HashMap(); + localeIndex = new HashMap<>(); for (WindowsLocale locale : EnumSet.allOf(WindowsLocale.class)) localeIndex.put(locale.langID, locale); - sortOrderIndex = new HashMap(); + sortOrderIndex = new HashMap<>(); for (SortOrder sortOrder : EnumSet.allOf(SortOrder.class)) sortOrderIndex.put(sortOrder.sortId, sortOrder); } diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerAeadAes256CbcHmac256Factory.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerAeadAes256CbcHmac256Factory.java index 13c8dc3fb..8f71ec6b6 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerAeadAes256CbcHmac256Factory.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerAeadAes256CbcHmac256Factory.java @@ -21,7 +21,7 @@ class SQLServerAeadAes256CbcHmac256Factory extends SQLServerEncryptionAlgorithmFactory { // In future we can have more private byte algorithmVersion = 0x1; - private ConcurrentHashMap encryptionAlgorithms = new ConcurrentHashMap(); + private ConcurrentHashMap encryptionAlgorithms = new ConcurrentHashMap<>(); @Override SQLServerEncryptionAlgorithm create(SQLServerSymmetricKey columnEncryptionKey, diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBlob.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBlob.java index ef74f5c48..47927d6a6 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBlob.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBlob.java @@ -40,7 +40,7 @@ public final class SQLServerBlob implements java.sql.Blob, java.io.Serializable // Initial size of the array is based on an assumption that a Blob object is // typically used either for input or output, and then only once. The array size // grows automatically if multiple streams are used. - ArrayList activeStreams = new ArrayList(1); + ArrayList activeStreams = new ArrayList<>(1); static private final Logger logger = Logger.getLogger("com.microsoft.sqlserver.jdbc.internals.SQLServerBlob"); diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBulkCSVFileRecord.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBulkCSVFileRecord.java index f208f7656..c2704b315 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBulkCSVFileRecord.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBulkCSVFileRecord.java @@ -158,7 +158,7 @@ else if (null == delimiter) { catch (Exception e) { throw new SQLServerException(null, e.getMessage(), null, 0, false); } - columnMetadata = new HashMap(); + columnMetadata = new HashMap<>(); loggerExternal.exiting(loggerClassName, "SQLServerBulkCSVFileRecord"); } @@ -215,7 +215,7 @@ else if (null == delimiter) { catch (Exception e) { throw new SQLServerException(null, e.getMessage(), null, 0, false); } - columnMetadata = new HashMap(); + columnMetadata = new HashMap<>(); loggerExternal.exiting(loggerClassName, "SQLServerBulkCSVFileRecord"); } diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBulkCopy.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBulkCopy.java index 3076c9017..1073a5353 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBulkCopy.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBulkCopy.java @@ -675,7 +675,7 @@ public void writeToServer(ISQLServerBulkRecord sourceData) throws SQLServerExcep * Initializes the defaults for member variables that require it. */ private void initializeDefaults() { - columnMappings = new LinkedList(); + columnMappings = new LinkedList<>(); destinationTableName = null; sourceBulkRecord = null; sourceResultSet = null; @@ -1471,7 +1471,7 @@ private String getDestTypeFromSrcType(int srcColIndx, private String createInsertBulkCommand(TDSWriter tdsWriter) throws SQLServerException { StringBuilder bulkCmd = new StringBuilder(); - List bulkOptions = new ArrayList(); + List bulkOptions = new ArrayList<>(); String endColumn = " , "; bulkCmd.append("INSERT BULK " + destinationTableName + " ("); @@ -1747,7 +1747,7 @@ private void getDestinationMetadata() throws SQLServerException { .executeQueryInternal("SET FMTONLY ON SELECT * FROM " + destinationTableName + " SET FMTONLY OFF "); destColumnCount = rs.getMetaData().getColumnCount(); - destColumnMetadata = new HashMap(); + destColumnMetadata = new HashMap<>(); destCekTable = rs.getCekTable(); if (!connection.getServerSupportsColumnEncryption()) { @@ -1793,7 +1793,7 @@ private void getDestinationMetadata() throws SQLServerException { * source metadata from the same place for both ResultSet and File. */ private void getSourceMetadata() throws SQLServerException { - srcColumnMetadata = new HashMap(); + srcColumnMetadata = new HashMap<>(); int currentColumn; if (null != sourceResultSet) { try { diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerCallableStatement.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerCallableStatement.java index e5eaa7ccf..8c9fdd976 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerCallableStatement.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerCallableStatement.java @@ -1431,7 +1431,7 @@ public NClob getNClob(String parameterName) throws SQLException { } ResultSet rs = s.executeQueryInternal(metaQuery.toString()); - paramNames = new ArrayList(); + paramNames = new ArrayList<>(); while (rs.next()) { String sCol = rs.getString(4); paramNames.add(sCol.trim()); diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerClob.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerClob.java index f933727cf..a9556baf3 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerClob.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerClob.java @@ -88,7 +88,7 @@ abstract class SQLServerClobBase implements Serializable { // Initial size of the array is based on an assumption that a Clob/NClob object is // typically used either for input or output, and then only once. The array size // grows automatically if multiple streams are used. - private ArrayList activeStreams = new ArrayList(1); + private ArrayList activeStreams = new ArrayList<>(1); transient SQLServerConnection con; private static Logger logger; diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java index 487c99c38..874565aa6 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java @@ -100,7 +100,7 @@ public class SQLServerConnection implements ISQLServerConnection { private Boolean enablePrepareOnFirstPreparedStatementCall = null; // Current limit for this particular connection. // Handle the actual queue of discarded prepared statements. - private ConcurrentLinkedQueue discardedPreparedStatementHandles = new ConcurrentLinkedQueue(); + private ConcurrentLinkedQueue discardedPreparedStatementHandles = new ConcurrentLinkedQueue<>(); private AtomicInteger discardedPreparedStatementHandleCount = new AtomicInteger(0); private boolean fedAuthRequiredByUser = false; @@ -525,7 +525,7 @@ boolean getServerSupportsColumnEncryption() { } static boolean isWindows; - static Map globalSystemColumnEncryptionKeyStoreProviders = new HashMap(); + static Map globalSystemColumnEncryptionKeyStoreProviders = new HashMap<>(); static { if (System.getProperty("os.name").toLowerCase(Locale.ENGLISH).startsWith("windows")) { isWindows = true; @@ -538,7 +538,7 @@ boolean getServerSupportsColumnEncryption() { } static Map globalCustomColumnEncryptionKeyStoreProviders = null; // This is a per-connection store provider. It can be JKS or AKV. - Map systemColumnEncryptionKeyStoreProvider = new HashMap(); + Map systemColumnEncryptionKeyStoreProvider = new HashMap<>(); /** * Registers key store providers in the globalCustomColumnEncryptionKeyStoreProviders. @@ -561,7 +561,7 @@ public static synchronized void registerColumnEncryptionKeyStoreProviders( throw new SQLServerException(null, SQLServerException.getErrString("R_CustomKeyStoreProviderSetOnce"), null, 0, false); } - globalCustomColumnEncryptionKeyStoreProviders = new HashMap(); + globalCustomColumnEncryptionKeyStoreProviders = new HashMap<>(); for (Map.Entry entry : clientKeyStoreProviders.entrySet()) { String providerName = entry.getKey(); @@ -625,7 +625,7 @@ synchronized SQLServerColumnEncryptionKeyStoreProvider getSystemColumnEncryption } private String trustedServerNameAE = null; - private static Map> columnEncryptionTrustedMasterKeyPaths = new HashMap>(); + private static Map> columnEncryptionTrustedMasterKeyPaths = new HashMap<>(); /** * Sets Trusted Master Key Paths in the columnEncryptionTrustedMasterKeyPaths. @@ -691,7 +691,7 @@ public static synchronized void removeColumnEncryptionTrustedMasterKeyPaths(Stri public static synchronized Map> getColumnEncryptionTrustedMasterKeyPaths() { loggerExternal.entering(SQLServerConnection.class.getName(), "getColumnEncryptionTrustedMasterKeyPaths", "Getting Trusted Master Key Paths"); - Map> masterKeyPathCopy = new HashMap>(); + Map> masterKeyPathCopy = new HashMap<>(); for (Map.Entry> entry : columnEncryptionTrustedMasterKeyPaths.entrySet()) { masterKeyPathCopy.put(entry.getKey(), entry.getValue()); @@ -3217,7 +3217,7 @@ public CallableStatement prepareCall(String sql, public java.util.Map> getTypeMap() throws SQLServerException { loggerExternal.entering(getClassNameLogging(), "getTypeMap"); checkClosed(); - java.util.Map> mp = new java.util.HashMap>(); + java.util.Map> mp = new java.util.HashMap<>(); loggerExternal.exiting(getClassNameLogging(), "getTypeMap", mp); return mp; } diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDataTable.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDataTable.java index f1436ceb5..0bf3ece03 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDataTable.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDataTable.java @@ -36,8 +36,8 @@ public final class SQLServerDataTable { */ // Name used in CREATE TYPE public SQLServerDataTable() throws SQLServerException { - columnMetadata = new LinkedHashMap(); - rows = new HashMap(); + columnMetadata = new LinkedHashMap<>(); + rows = new HashMap<>(); } /** diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDatabaseMetaData.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDatabaseMetaData.java index 25e7a7c14..e45245724 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDatabaseMetaData.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDatabaseMetaData.java @@ -89,7 +89,7 @@ final void close() throws SQLServerException { } } - EnumMap handleMap = new EnumMap(CallableHandles.class); + EnumMap handleMap = new EnumMap<>(CallableHandles.class); // Returns unique id for each instance. private static int nextInstanceID() { diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerEncryptionAlgorithmFactoryList.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerEncryptionAlgorithmFactoryList.java index 91c9a3973..a7eb1c0de 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerEncryptionAlgorithmFactoryList.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerEncryptionAlgorithmFactoryList.java @@ -21,7 +21,7 @@ final class SQLServerEncryptionAlgorithmFactoryList { private static final SQLServerEncryptionAlgorithmFactoryList instance = new SQLServerEncryptionAlgorithmFactoryList(); private SQLServerEncryptionAlgorithmFactoryList() { - encryptionAlgoFactoryMap = new ConcurrentHashMap(); + encryptionAlgoFactoryMap = new ConcurrentHashMap<>(); encryptionAlgoFactoryMap.putIfAbsent(SQLServerAeadAes256CbcHmac256Algorithm.algorithmName, new SQLServerAeadAes256CbcHmac256Factory()); } diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerParameterMetaData.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerParameterMetaData.java index 04df112ea..3a1991d12 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerParameterMetaData.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerParameterMetaData.java @@ -601,7 +601,7 @@ private void checkClosed() throws SQLServerException { // procedure "sp_describe_undeclared_parameters" to retrieve parameter meta data // if SQL server version is 2008, then use FMTONLY else { - queryMetaMap = new HashMap(); + queryMetaMap = new HashMap<>(); if (con.getServerMajorVersion() >= SQL_SERVER_2012_VERSION) { // new implementation for SQL verser 2012 and above @@ -616,7 +616,7 @@ private void checkClosed() throws SQLServerException { else { // old implementation for SQL server 2008 stringToParse = sProcString; - ArrayList metaInfoList = new ArrayList(); + ArrayList metaInfoList = new ArrayList<>(); while (stringToParse.length() > 0) { MetaInfo metaInfo = parseStatement(stringToParse); diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPooledConnection.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPooledConnection.java index f407dff11..cc059434d 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPooledConnection.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPooledConnection.java @@ -38,7 +38,7 @@ public class SQLServerPooledConnection implements PooledConnection { SQLServerPooledConnection(SQLServerDataSource ds, String user, String password) throws SQLException { - listeners = new Vector(); + listeners = new Vector<>(); // Piggyback SQLServerDataSource logger for now. pcLogger = SQLServerDataSource.dsLogger; diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement.java index 2b9350e49..32c65cac6 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement.java @@ -338,7 +338,7 @@ private String buildParamTypeDefinitions(Parameter[] params, StringBuilder sb = new StringBuilder(); int nCols = params.length; char cParamName[] = new char[10]; - parameterNames = new ArrayList(); + parameterNames = new ArrayList<>(); for (int i = 0; i < nCols; i++) { if (i > 0) @@ -795,7 +795,7 @@ private void getParameterEncryptionMetadata(Parameter[] params) throws SQLServer return; } - Map cekList = new HashMap(); + Map cekList = new HashMap<>(); CekTableEntry cekEntry = null; try { while (rs.next()) { @@ -2376,7 +2376,7 @@ public final void addBatch() throws SQLServerException { // Create the list of batch parameter values first time through if (batchParamValues == null) - batchParamValues = new ArrayList(); + batchParamValues = new ArrayList<>(); final int numParams = inOutParam.length; Parameter paramValues[] = new Parameter[numParams]; @@ -2538,7 +2538,7 @@ final void doExecutePreparedStatementBatch(PrepStmtBatchExecCmd batchCommand) th int numBatchesPrepared = 0; int numBatchesExecuted = 0; - Vector cryptoMetaBatch = new Vector(); + Vector cryptoMetaBatch = new Vector<>(); if (isSelect(userSQL)) { SQLServerException.makeFromDriverError(connection, this, SQLServerException.getErrString("R_selectNotPermittedinBatch"), null, true); diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerStatement.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerStatement.java index 632edf9e6..7f6d8e1d2 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerStatement.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerStatement.java @@ -429,7 +429,7 @@ boolean onDone(TDSReader tdsReader) throws SQLServerException { * The array of objects in a batched call. Applicable to statements and prepared statements When the iterativeBatching property is turned on. */ /** The buffer that accumulates batchable statements */ - private final ArrayList batchStatementBuffer = new ArrayList(); + private final ArrayList batchStatementBuffer = new ArrayList<>(); /** logging init at the construction */ static final private java.util.logging.Logger stmtlogger = java.util.logging.Logger @@ -1512,7 +1512,7 @@ boolean onInfo(TDSReader tdsReader) throws SQLServerException { infoToken.msg.getErrorNumber()); if (sqlWarnings == null) { - sqlWarnings = new Vector(); + sqlWarnings = new Vector<>(); } else { int n = sqlWarnings.size(); @@ -2384,7 +2384,7 @@ int translateLimit(StringBuffer sql, Matcher offsetMatcher = limitSyntaxWithOffset.matcher(sql); int startIndx = indx; - Stack topPosition = new Stack(); + Stack topPosition = new Stack<>(); State nextState = State.START; while (indx < sql.length()) { diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerSymmetricKeyCache.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerSymmetricKeyCache.java index 5799251d8..76b886786 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerSymmetricKeyCache.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerSymmetricKeyCache.java @@ -68,7 +68,7 @@ public Thread newThread(Runnable r) { .getLogger("com.microsoft.sqlserver.jdbc.SQLServerSymmetricKeyCache"); private SQLServerSymmetricKeyCache() { - cache = new ConcurrentHashMap(); + cache = new ConcurrentHashMap<>(); } static SQLServerSymmetricKeyCache getInstance() { diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerXAResource.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerXAResource.java index 60c710bcc..4440ad56f 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerXAResource.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerXAResource.java @@ -792,7 +792,7 @@ else if (-1 != version.indexOf('.')) { /* L0 */ public Xid[] recover(int flags) throws XAException { XAReturnValue r = DTC_XA_Interface(XA_RECOVER, null, flags | tightlyCoupled); int offset = 0; - ArrayList al = new ArrayList(); + ArrayList al = new ArrayList<>(); // If no XID's found, return zero length XID array (don't return null). // diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/TVP.java b/src/main/java/com/microsoft/sqlserver/jdbc/TVP.java index 5113f1fc0..ca1883859 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/TVP.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/TVP.java @@ -62,7 +62,7 @@ enum MPIState { void initTVP(TVPType type, String tvpPartName) throws SQLServerException { tvpType = type; - columnMetadata = new LinkedHashMap(); + columnMetadata = new LinkedHashMap<>(); parseTypeName(tvpPartName); } diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/dns/DNSUtilities.java b/src/main/java/com/microsoft/sqlserver/jdbc/dns/DNSUtilities.java index 3a91a3071..483ad3635 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/dns/DNSUtilities.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/dns/DNSUtilities.java @@ -36,13 +36,13 @@ public class DNSUtilities { * if DNS is not available */ public static Set findSrvRecords(final String dnsSrvRecordToFind) throws NamingException { - Hashtable env = new Hashtable(); + Hashtable env = new Hashtable<>(); env.put("java.naming.factory.initial", "com.sun.jndi.dns.DnsContextFactory"); env.put("java.naming.provider.url", "dns:"); DirContext ctx = new InitialDirContext(env); Attributes attrs = ctx.getAttributes(dnsSrvRecordToFind, new String[] {"SRV"}); NamingEnumeration allServers = attrs.getAll(); - TreeSet records = new TreeSet(); + TreeSet records = new TreeSet<>(); while (allServers.hasMoreElements()) { Attribute a = allServers.nextElement(); NamingEnumeration srvRecord = a.getAll(); diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/dtv.java b/src/main/java/com/microsoft/sqlserver/jdbc/dtv.java index c836c031d..9cb58e241 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/dtv.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/dtv.java @@ -3328,7 +3328,7 @@ boolean supportsFastAsciiConversion() { } } - private static final Map builderMap = new EnumMap(TDSType.class); + private static final Map builderMap = new EnumMap<>(TDSType.class); static { for (Builder builder : Builder.values()) diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyConnectionTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyConnectionTest.java index 0e2718fe3..c4bc2489e 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyConnectionTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyConnectionTest.java @@ -161,7 +161,7 @@ void testEmptyBulkCopyOptions() { */ List createTestData_testBulkCopyConstructor() { String testCaseName = "BulkCopyConstructor "; - List testData = new ArrayList(); + List testData = new ArrayList<>(); BulkCopyTestWrapper bulkWrapper1 = new BulkCopyTestWrapper(connectionString); bulkWrapper1.testName = testCaseName; bulkWrapper1.setUsingConnection(true); @@ -182,7 +182,7 @@ List createTestData_testBulkCopyConstructor() { */ private List createTestData_testBulkCopyOption() { String testCaseName = "BulkCopyOption "; - List testData = new ArrayList(); + List testData = new ArrayList<>(); Class bulkOptions = SQLServerBulkCopyOptions.class; Method[] methods = bulkOptions.getDeclaredMethods(); diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyISQLServerBulkRecordTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyISQLServerBulkRecordTest.java index f33a3bb60..60e7e3da4 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyISQLServerBulkRecordTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyISQLServerBulkRecordTest.java @@ -99,7 +99,7 @@ private class ColumnMetadata { List data; BulkData() { - columnMetadata = new HashMap(); + columnMetadata = new HashMap<>(); totalColumn = dstTable.totalColumns(); // add metadata @@ -116,7 +116,7 @@ private class ColumnMetadata { // add data rowCount = dstTable.getTotalRows(); - data = new ArrayList(rowCount); + data = new ArrayList<>(rowCount); for (int i = 0; i < rowCount; i++) { Object[] CurrentRow = new Object[totalColumn]; for (int j = 0; j < totalColumn; j++) { diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyTestWrapper.java b/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyTestWrapper.java index 2eaa7f6ab..c6be7261c 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyTestWrapper.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyTestWrapper.java @@ -35,7 +35,7 @@ class BulkCopyTestWrapper { */ private boolean isUsingColumnMapping = false; - public LinkedList cm = new LinkedList(); + public LinkedList cm = new LinkedList<>(); private SQLServerBulkCopyOptions bulkOptions; diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/ImpISQLServerBulkRecord_IssuesTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/ImpISQLServerBulkRecord_IssuesTest.java index 19106b002..5ba59f853 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/ImpISQLServerBulkRecord_IssuesTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/ImpISQLServerBulkRecord_IssuesTest.java @@ -289,53 +289,53 @@ private class ColumnMetadata { BulkDat(String variation) { if (variation.equalsIgnoreCase("testVarchar")) { isStringData = true; - columnMetadata = new HashMap(); + columnMetadata = new HashMap<>(); columnMetadata.put(1, new ColumnMetadata("varchar(2)", java.sql.Types.VARCHAR, 0, 0)); - stringData = new ArrayList(); + stringData = new ArrayList<>(); stringData.add(new String("aaa")); rowCount = stringData.size(); } else if (variation.equalsIgnoreCase("testSmalldatetime")) { isStringData = false; - columnMetadata = new HashMap(); + columnMetadata = new HashMap<>(); columnMetadata.put(1, new ColumnMetadata("smallDatetime", java.sql.Types.TIMESTAMP, 0, 0)); - dateData = new ArrayList(); + dateData = new ArrayList<>(); dateData.add(Timestamp.valueOf("1954-05-22 02:43:37.123")); rowCount = dateData.size(); } else if (variation.equalsIgnoreCase("testSmalldatetimeOutofRange")) { isStringData = false; - columnMetadata = new HashMap(); + columnMetadata = new HashMap<>(); columnMetadata.put(1, new ColumnMetadata("smallDatetime", java.sql.Types.TIMESTAMP, 0, 0)); - dateData = new ArrayList(); + dateData = new ArrayList<>(); dateData.add(Timestamp.valueOf("1954-05-22 02:43:37.1234")); rowCount = dateData.size(); } else if (variation.equalsIgnoreCase("testBinaryColumnAsByte")) { isStringData = false; - columnMetadata = new HashMap(); + columnMetadata = new HashMap<>(); columnMetadata.put(1, new ColumnMetadata("binary(5)", java.sql.Types.BINARY, 5, 0)); - byteData = new ArrayList(); + byteData = new ArrayList<>(); byteData.add("helloo".getBytes()); rowCount = byteData.size(); } else if (variation.equalsIgnoreCase("testBinaryColumnAsString")) { isStringData = true; - columnMetadata = new HashMap(); + columnMetadata = new HashMap<>(); columnMetadata.put(1, new ColumnMetadata("binary(5)", java.sql.Types.BINARY, 5, 0)); - stringData = new ArrayList(); + stringData = new ArrayList<>(); stringData.add("616368697412"); rowCount = stringData.size(); @@ -343,11 +343,11 @@ else if (variation.equalsIgnoreCase("testBinaryColumnAsString")) { else if (variation.equalsIgnoreCase("testSendValidValueforBinaryColumnAsString")) { isStringData = true; - columnMetadata = new HashMap(); + columnMetadata = new HashMap<>(); columnMetadata.put(1, new ColumnMetadata("binary(5)", java.sql.Types.BINARY, 5, 0)); - stringData = new ArrayList(); + stringData = new ArrayList<>(); stringData.add("010101"); rowCount = stringData.size(); diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/LimitEscapeTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/LimitEscapeTest.java index bd6bccd2c..cc9e0e69f 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/LimitEscapeTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/LimitEscapeTest.java @@ -40,7 +40,7 @@ @RunWith(JUnitPlatform.class) public class LimitEscapeTest extends AbstractTest { public static final Logger log = Logger.getLogger("LimitEscape"); - private static Vector offsetQuery = new Vector(); + private static Vector offsetQuery = new Vector<>(); private static Connection conn = null; static class Query { diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/StatementTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/StatementTest.java index 4418a797e..abeb8e046 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/StatementTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/StatementTest.java @@ -2097,7 +2097,7 @@ public void testNBCROWWithRandomAccess() throws Exception { Random r = new Random(); // randomly generate columns whose values would be set to a non null value - ArrayList nonNullColumns = new ArrayList(); + ArrayList nonNullColumns = new ArrayList<>(); nonNullColumns.add(1);// this is always non-null // Add approximately 10 non-null columns. The number should be low diff --git a/src/test/java/com/microsoft/sqlserver/testframework/DBCoercions.java b/src/test/java/com/microsoft/sqlserver/testframework/DBCoercions.java index c333d71df..ff8e03f8f 100644 --- a/src/test/java/com/microsoft/sqlserver/testframework/DBCoercions.java +++ b/src/test/java/com/microsoft/sqlserver/testframework/DBCoercions.java @@ -19,7 +19,7 @@ public class DBCoercions extends DBItems { * constructor */ public DBCoercions() { - coercionsList = new ArrayList(); + coercionsList = new ArrayList<>(); } public DBCoercions(DBCoercion coercion) { diff --git a/src/test/java/com/microsoft/sqlserver/testframework/DBColumn.java b/src/test/java/com/microsoft/sqlserver/testframework/DBColumn.java index 7528e9e5d..f44744983 100644 --- a/src/test/java/com/microsoft/sqlserver/testframework/DBColumn.java +++ b/src/test/java/com/microsoft/sqlserver/testframework/DBColumn.java @@ -78,7 +78,7 @@ void setSqlType(SqlType sqlType) { * number of rows */ void populateValues(int rows) { - columnValues = new ArrayList(); + columnValues = new ArrayList<>(); for (int i = 0; i < rows; i++) columnValues.add(sqlType.createdata()); } diff --git a/src/test/java/com/microsoft/sqlserver/testframework/DBSchema.java b/src/test/java/com/microsoft/sqlserver/testframework/DBSchema.java index 826098913..e08995346 100644 --- a/src/test/java/com/microsoft/sqlserver/testframework/DBSchema.java +++ b/src/test/java/com/microsoft/sqlserver/testframework/DBSchema.java @@ -52,7 +52,7 @@ public class DBSchema { * @param autoGenerateSchema */ DBSchema(boolean autoGenerateSchema) { - sqlTypes = new ArrayList(); + sqlTypes = new ArrayList<>(); if (autoGenerateSchema) { // Exact Numeric sqlTypes.add(new SqlBigInt()); diff --git a/src/test/java/com/microsoft/sqlserver/testframework/DBTable.java b/src/test/java/com/microsoft/sqlserver/testframework/DBTable.java index 90d6ae3bc..e3c9b174f 100644 --- a/src/test/java/com/microsoft/sqlserver/testframework/DBTable.java +++ b/src/test/java/com/microsoft/sqlserver/testframework/DBTable.java @@ -85,7 +85,7 @@ public DBTable(boolean autoGenerateSchema, addColumns(); } else { - this.columns = new ArrayList(); + this.columns = new ArrayList<>(); } this.totalColumns = columns.size(); } @@ -108,7 +108,7 @@ private DBTable(DBTable sourceTable) { */ private void addColumns() { totalColumns = schema.getNumberOfSqlTypes(); - columns = new ArrayList(totalColumns); + columns = new ArrayList<>(totalColumns); for (int i = 0; i < totalColumns; i++) { SqlType sqlType = schema.getSqlType(i); @@ -122,7 +122,7 @@ private void addColumns() { */ private void addColumns(boolean unicode) { totalColumns = schema.getNumberOfSqlTypes(); - columns = new ArrayList(totalColumns); + columns = new ArrayList<>(totalColumns); for (int i = 0; i < totalColumns; i++) { SqlType sqlType = schema.getSqlType(i); diff --git a/src/test/java/com/microsoft/sqlserver/testframework/Utils.java b/src/test/java/com/microsoft/sqlserver/testframework/Utils.java index 8db5e96e5..a222043ab 100644 --- a/src/test/java/com/microsoft/sqlserver/testframework/Utils.java +++ b/src/test/java/com/microsoft/sqlserver/testframework/Utils.java @@ -164,7 +164,7 @@ public static SqlType find(String name) { */ public static ArrayList types() { if (null == types) { - types = new ArrayList(); + types = new ArrayList<>(); types.add(new SqlInt()); types.add(new SqlSmallInt()); From e277087c0601e1e293d8cbb8cb5373ee54fcb385 Mon Sep 17 00:00:00 2001 From: Peter Bae Date: Thu, 31 Aug 2017 16:30:55 -0700 Subject: [PATCH 2/3] Replace explicit types with <> --- .../java/com/microsoft/sqlserver/jdbc/AE.java | 2 +- .../microsoft/sqlserver/jdbc/DataTypes.java | 10 ++++---- .../sqlserver/jdbc/FailOverMapSingleton.java | 2 +- .../microsoft/sqlserver/jdbc/IOBuffer.java | 12 +++++----- .../sqlserver/jdbc/JaasConfiguration.java | 6 ++--- .../sqlserver/jdbc/SQLCollation.java | 4 ++-- .../SQLServerAeadAes256CbcHmac256Factory.java | 2 +- .../sqlserver/jdbc/SQLServerBlob.java | 2 +- .../jdbc/SQLServerBulkCSVFileRecord.java | 4 ++-- .../sqlserver/jdbc/SQLServerBulkCopy.java | 8 +++---- .../jdbc/SQLServerCallableStatement.java | 2 +- .../sqlserver/jdbc/SQLServerClob.java | 2 +- .../sqlserver/jdbc/SQLServerConnection.java | 14 +++++------ .../sqlserver/jdbc/SQLServerDataTable.java | 4 ++-- .../jdbc/SQLServerDatabaseMetaData.java | 2 +- ...LServerEncryptionAlgorithmFactoryList.java | 2 +- .../jdbc/SQLServerParameterMetaData.java | 4 ++-- .../jdbc/SQLServerPooledConnection.java | 2 +- .../jdbc/SQLServerPreparedStatement.java | 8 +++---- .../sqlserver/jdbc/SQLServerStatement.java | 6 ++--- .../jdbc/SQLServerSymmetricKeyCache.java | 2 +- .../sqlserver/jdbc/SQLServerXAResource.java | 2 +- .../com/microsoft/sqlserver/jdbc/TVP.java | 2 +- .../sqlserver/jdbc/dns/DNSUtilities.java | 4 ++-- .../com/microsoft/sqlserver/jdbc/dtv.java | 2 +- .../jdbc/bulkCopy/BulkCopyConnectionTest.java | 4 ++-- .../BulkCopyISQLServerBulkRecordTest.java | 4 ++-- .../jdbc/bulkCopy/BulkCopyTestWrapper.java | 2 +- .../ISQLServerBulkRecordIssuesTest.java | 24 +++++++++---------- .../jdbc/unit/statement/LimitEscapeTest.java | 2 +- .../jdbc/unit/statement/StatementTest.java | 2 +- .../sqlserver/testframework/DBCoercions.java | 2 +- .../sqlserver/testframework/DBColumn.java | 2 +- .../sqlserver/testframework/DBSchema.java | 2 +- .../sqlserver/testframework/DBTable.java | 6 ++--- .../sqlserver/testframework/Utils.java | 2 +- 36 files changed, 81 insertions(+), 81 deletions(-) diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/AE.java b/src/main/java/com/microsoft/sqlserver/jdbc/AE.java index c6345d25b..1b5b2543f 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/AE.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/AE.java @@ -88,7 +88,7 @@ byte[] getCekMdVersion() { cekId = 0; cekVersion = 0; cekMdVersion = null; - columnEncryptionKeyValues = new ArrayList(); + columnEncryptionKeyValues = new ArrayList<>(); } int getSize() { diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/DataTypes.java b/src/main/java/com/microsoft/sqlserver/jdbc/DataTypes.java index 914e382a2..3f6ebdbea 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/DataTypes.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/DataTypes.java @@ -382,7 +382,7 @@ private GetterConversion(SSType.Category from, this.to = to; } - private static final EnumMap> conversionMap = new EnumMap>( + private static final EnumMap> conversionMap = new EnumMap<>( SSType.Category.class); static { @@ -776,7 +776,7 @@ private SetterConversionAE(JavaType from, this.to = to; } - private static final EnumMap> setterConversionAEMap = new EnumMap>(JavaType.class); + private static final EnumMap> setterConversionAEMap = new EnumMap<>(JavaType.class); static { for (JavaType javaType : JavaType.values()) @@ -1086,7 +1086,7 @@ private SetterConversion(JDBCType.Category from, this.to = to; } - private static final EnumMap> conversionMap = new EnumMap>( + private static final EnumMap> conversionMap = new EnumMap<>( JDBCType.Category.class); static { @@ -1305,7 +1305,7 @@ private UpdaterConversion(JDBCType.Category from, this.to = to; } - private static final EnumMap> conversionMap = new EnumMap>( + private static final EnumMap> conversionMap = new EnumMap<>( JDBCType.Category.class); static { @@ -1616,7 +1616,7 @@ private NormalizationAE(JDBCType from, this.to = to; } - private static final EnumMap> normalizationMapAE = new EnumMap>(JDBCType.class); + private static final EnumMap> normalizationMapAE = new EnumMap<>(JDBCType.class); static { for (JDBCType jdbcType : JDBCType.values()) diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/FailOverMapSingleton.java b/src/main/java/com/microsoft/sqlserver/jdbc/FailOverMapSingleton.java index f3146d926..8bebf1f0e 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/FailOverMapSingleton.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/FailOverMapSingleton.java @@ -13,7 +13,7 @@ final class FailoverMapSingleton { private static int INITIALHASHMAPSIZE = 5; - private static HashMap failoverMap = new HashMap(INITIALHASHMAPSIZE); + private static HashMap failoverMap = new HashMap<>(INITIALHASHMAPSIZE); private FailoverMapSingleton() { /* hide the constructor to stop the instantiation of this class. */} diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/IOBuffer.java b/src/main/java/com/microsoft/sqlserver/jdbc/IOBuffer.java index e54e09b80..a9af8068b 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/IOBuffer.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/IOBuffer.java @@ -2316,8 +2316,8 @@ else if (!useTnir) { findSocketUsingJavaNIO(inetAddrs, portNumber, timeoutInMilliSeconds); } else { - LinkedList inet4Addrs = new LinkedList(); - LinkedList inet6Addrs = new LinkedList(); + LinkedList inet4Addrs = new LinkedList<>(); + LinkedList inet6Addrs = new LinkedList<>(); for (InetAddress inetAddr : inetAddrs) { if (inetAddr instanceof Inet4Address) { @@ -2445,7 +2445,7 @@ private void findSocketUsingJavaNIO(InetAddress[] inetAddrs, assert inetAddrs.length != 0 : "Number of inetAddresses should not be zero in this function"; Selector selector = null; - LinkedList socketChannels = new LinkedList(); + LinkedList socketChannels = new LinkedList<>(); SocketChannel selectedChannel = null; try { @@ -2624,8 +2624,8 @@ private void findSocketUsingThreading(LinkedList inetAddrs, assert inetAddrs.isEmpty() == false : "Number of inetAddresses should not be zero in this function"; - LinkedList sockets = new LinkedList(); - LinkedList socketConnectors = new LinkedList(); + LinkedList sockets = new LinkedList<>(); + LinkedList socketConnectors = new LinkedList<>(); try { @@ -5143,7 +5143,7 @@ void writeTvpOrderUnique(TVP value) throws SQLServerException { Map columnMetadata = value.getColumnMetadata(); Iterator> columnsIterator = columnMetadata.entrySet().iterator(); - LinkedList columnList = new LinkedList(); + LinkedList columnList = new LinkedList<>(); while (columnsIterator.hasNext()) { byte flags = 0; diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/JaasConfiguration.java b/src/main/java/com/microsoft/sqlserver/jdbc/JaasConfiguration.java index f080ae14e..6443724fd 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/JaasConfiguration.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/JaasConfiguration.java @@ -23,9 +23,9 @@ public class JaasConfiguration extends Configuration { private static AppConfigurationEntry[] generateDefaultConfiguration() { if (Util.isIBM()) { - Map confDetailsWithoutPassword = new HashMap(); + Map confDetailsWithoutPassword = new HashMap<>(); confDetailsWithoutPassword.put("useDefaultCcache", "true"); - Map confDetailsWithPassword = new HashMap(); + Map confDetailsWithPassword = new HashMap<>(); // We generated a two configurations fallback that is suitable for password and password-less authentication // See https://www.ibm.com/support/knowledgecenter/SSYKE2_8.0.0/com.ibm.java.security.component.80.doc/security-component/jgssDocs/jaas_login_user.html final String ibmLoginModule = "com.ibm.security.auth.module.Krb5LoginModule"; @@ -34,7 +34,7 @@ private static AppConfigurationEntry[] generateDefaultConfiguration() { new AppConfigurationEntry(ibmLoginModule, AppConfigurationEntry.LoginModuleControlFlag.SUFFICIENT, confDetailsWithPassword)}; } else { - Map confDetails = new HashMap(); + Map confDetails = new HashMap<>(); confDetails.put("useTicketCache", "true"); return new AppConfigurationEntry[] {new AppConfigurationEntry("com.sun.security.auth.module.Krb5LoginModule", AppConfigurationEntry.LoginModuleControlFlag.REQUIRED, confDetails)}; diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLCollation.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLCollation.java index 7a47b6fec..d89a95e11 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLCollation.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLCollation.java @@ -530,11 +530,11 @@ private Encoding encodingFromSortId() throws UnsupportedEncodingException { static { // Populate the windows locale and sort order indices - localeIndex = new HashMap(); + localeIndex = new HashMap<>(); for (WindowsLocale locale : EnumSet.allOf(WindowsLocale.class)) localeIndex.put(locale.langID, locale); - sortOrderIndex = new HashMap(); + sortOrderIndex = new HashMap<>(); for (SortOrder sortOrder : EnumSet.allOf(SortOrder.class)) sortOrderIndex.put(sortOrder.sortId, sortOrder); } diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerAeadAes256CbcHmac256Factory.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerAeadAes256CbcHmac256Factory.java index 13c8dc3fb..8f71ec6b6 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerAeadAes256CbcHmac256Factory.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerAeadAes256CbcHmac256Factory.java @@ -21,7 +21,7 @@ class SQLServerAeadAes256CbcHmac256Factory extends SQLServerEncryptionAlgorithmFactory { // In future we can have more private byte algorithmVersion = 0x1; - private ConcurrentHashMap encryptionAlgorithms = new ConcurrentHashMap(); + private ConcurrentHashMap encryptionAlgorithms = new ConcurrentHashMap<>(); @Override SQLServerEncryptionAlgorithm create(SQLServerSymmetricKey columnEncryptionKey, diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBlob.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBlob.java index ef74f5c48..47927d6a6 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBlob.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBlob.java @@ -40,7 +40,7 @@ public final class SQLServerBlob implements java.sql.Blob, java.io.Serializable // Initial size of the array is based on an assumption that a Blob object is // typically used either for input or output, and then only once. The array size // grows automatically if multiple streams are used. - ArrayList activeStreams = new ArrayList(1); + ArrayList activeStreams = new ArrayList<>(1); static private final Logger logger = Logger.getLogger("com.microsoft.sqlserver.jdbc.internals.SQLServerBlob"); diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBulkCSVFileRecord.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBulkCSVFileRecord.java index 59824cf6d..4ff063dab 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBulkCSVFileRecord.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBulkCSVFileRecord.java @@ -159,7 +159,7 @@ else if (null == delimiter) { catch (Exception e) { throw new SQLServerException(null, e.getMessage(), null, 0, false); } - columnMetadata = new HashMap(); + columnMetadata = new HashMap<>(); loggerExternal.exiting(loggerClassName, "SQLServerBulkCSVFileRecord"); } @@ -216,7 +216,7 @@ else if (null == delimiter) { catch (Exception e) { throw new SQLServerException(null, e.getMessage(), null, 0, false); } - columnMetadata = new HashMap(); + columnMetadata = new HashMap<>(); loggerExternal.exiting(loggerClassName, "SQLServerBulkCSVFileRecord"); } diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBulkCopy.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBulkCopy.java index a4e1b2be3..6e13ad187 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBulkCopy.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBulkCopy.java @@ -675,7 +675,7 @@ public void writeToServer(ISQLServerBulkRecord sourceData) throws SQLServerExcep * Initializes the defaults for member variables that require it. */ private void initializeDefaults() { - columnMappings = new LinkedList(); + columnMappings = new LinkedList<>(); destinationTableName = null; sourceBulkRecord = null; sourceResultSet = null; @@ -1471,7 +1471,7 @@ private String getDestTypeFromSrcType(int srcColIndx, private String createInsertBulkCommand(TDSWriter tdsWriter) throws SQLServerException { StringBuilder bulkCmd = new StringBuilder(); - List bulkOptions = new ArrayList(); + List bulkOptions = new ArrayList<>(); String endColumn = " , "; bulkCmd.append("INSERT BULK " + destinationTableName + " ("); @@ -1747,7 +1747,7 @@ private void getDestinationMetadata() throws SQLServerException { .executeQueryInternal("SET FMTONLY ON SELECT * FROM " + destinationTableName + " SET FMTONLY OFF "); destColumnCount = rs.getMetaData().getColumnCount(); - destColumnMetadata = new HashMap(); + destColumnMetadata = new HashMap<>(); destCekTable = rs.getCekTable(); if (!connection.getServerSupportsColumnEncryption()) { @@ -1793,7 +1793,7 @@ private void getDestinationMetadata() throws SQLServerException { * source metadata from the same place for both ResultSet and File. */ private void getSourceMetadata() throws SQLServerException { - srcColumnMetadata = new HashMap(); + srcColumnMetadata = new HashMap<>(); int currentColumn; if (null != sourceResultSet) { try { diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerCallableStatement.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerCallableStatement.java index 794b8f743..40a77be15 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerCallableStatement.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerCallableStatement.java @@ -1432,7 +1432,7 @@ public NClob getNClob(String parameterName) throws SQLException { } ResultSet rs = s.executeQueryInternal(metaQuery.toString()); - paramNames = new ArrayList(); + paramNames = new ArrayList<>(); while (rs.next()) { String sCol = rs.getString(4); paramNames.add(sCol.trim()); diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerClob.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerClob.java index f933727cf..a9556baf3 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerClob.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerClob.java @@ -88,7 +88,7 @@ abstract class SQLServerClobBase implements Serializable { // Initial size of the array is based on an assumption that a Clob/NClob object is // typically used either for input or output, and then only once. The array size // grows automatically if multiple streams are used. - private ArrayList activeStreams = new ArrayList(1); + private ArrayList activeStreams = new ArrayList<>(1); transient SQLServerConnection con; private static Logger logger; diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java index cf0eb5728..42c050ab6 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java @@ -100,7 +100,7 @@ public class SQLServerConnection implements ISQLServerConnection { private Boolean enablePrepareOnFirstPreparedStatementCall = null; // Current limit for this particular connection. // Handle the actual queue of discarded prepared statements. - private ConcurrentLinkedQueue discardedPreparedStatementHandles = new ConcurrentLinkedQueue(); + private ConcurrentLinkedQueue discardedPreparedStatementHandles = new ConcurrentLinkedQueue<>(); private AtomicInteger discardedPreparedStatementHandleCount = new AtomicInteger(0); private boolean fedAuthRequiredByUser = false; @@ -525,7 +525,7 @@ boolean getServerSupportsColumnEncryption() { } static boolean isWindows; - static Map globalSystemColumnEncryptionKeyStoreProviders = new HashMap(); + static Map globalSystemColumnEncryptionKeyStoreProviders = new HashMap<>(); static { if (System.getProperty("os.name").toLowerCase(Locale.ENGLISH).startsWith("windows")) { isWindows = true; @@ -538,7 +538,7 @@ boolean getServerSupportsColumnEncryption() { } static Map globalCustomColumnEncryptionKeyStoreProviders = null; // This is a per-connection store provider. It can be JKS or AKV. - Map systemColumnEncryptionKeyStoreProvider = new HashMap(); + Map systemColumnEncryptionKeyStoreProvider = new HashMap<>(); /** * Registers key store providers in the globalCustomColumnEncryptionKeyStoreProviders. @@ -561,7 +561,7 @@ public static synchronized void registerColumnEncryptionKeyStoreProviders( throw new SQLServerException(null, SQLServerException.getErrString("R_CustomKeyStoreProviderSetOnce"), null, 0, false); } - globalCustomColumnEncryptionKeyStoreProviders = new HashMap(); + globalCustomColumnEncryptionKeyStoreProviders = new HashMap<>(); for (Map.Entry entry : clientKeyStoreProviders.entrySet()) { String providerName = entry.getKey(); @@ -625,7 +625,7 @@ synchronized SQLServerColumnEncryptionKeyStoreProvider getSystemColumnEncryption } private String trustedServerNameAE = null; - private static Map> columnEncryptionTrustedMasterKeyPaths = new HashMap>(); + private static Map> columnEncryptionTrustedMasterKeyPaths = new HashMap<>(); /** * Sets Trusted Master Key Paths in the columnEncryptionTrustedMasterKeyPaths. @@ -691,7 +691,7 @@ public static synchronized void removeColumnEncryptionTrustedMasterKeyPaths(Stri public static synchronized Map> getColumnEncryptionTrustedMasterKeyPaths() { loggerExternal.entering(SQLServerConnection.class.getName(), "getColumnEncryptionTrustedMasterKeyPaths", "Getting Trusted Master Key Paths"); - Map> masterKeyPathCopy = new HashMap>(); + Map> masterKeyPathCopy = new HashMap<>(); for (Map.Entry> entry : columnEncryptionTrustedMasterKeyPaths.entrySet()) { masterKeyPathCopy.put(entry.getKey(), entry.getValue()); @@ -3230,7 +3230,7 @@ public CallableStatement prepareCall(String sql, public java.util.Map> getTypeMap() throws SQLServerException { loggerExternal.entering(getClassNameLogging(), "getTypeMap"); checkClosed(); - java.util.Map> mp = new java.util.HashMap>(); + java.util.Map> mp = new java.util.HashMap<>(); loggerExternal.exiting(getClassNameLogging(), "getTypeMap", mp); return mp; } diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDataTable.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDataTable.java index 53284f372..d69d3e274 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDataTable.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDataTable.java @@ -36,8 +36,8 @@ public final class SQLServerDataTable { */ // Name used in CREATE TYPE public SQLServerDataTable() throws SQLServerException { - columnMetadata = new LinkedHashMap(); - rows = new HashMap(); + columnMetadata = new LinkedHashMap<>(); + rows = new HashMap<>(); } /** diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDatabaseMetaData.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDatabaseMetaData.java index f960151cc..06fbab527 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDatabaseMetaData.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDatabaseMetaData.java @@ -89,7 +89,7 @@ final void close() throws SQLServerException { } } - EnumMap handleMap = new EnumMap(CallableHandles.class); + EnumMap handleMap = new EnumMap<>(CallableHandles.class); // Returns unique id for each instance. private static int nextInstanceID() { diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerEncryptionAlgorithmFactoryList.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerEncryptionAlgorithmFactoryList.java index 91c9a3973..a7eb1c0de 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerEncryptionAlgorithmFactoryList.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerEncryptionAlgorithmFactoryList.java @@ -21,7 +21,7 @@ final class SQLServerEncryptionAlgorithmFactoryList { private static final SQLServerEncryptionAlgorithmFactoryList instance = new SQLServerEncryptionAlgorithmFactoryList(); private SQLServerEncryptionAlgorithmFactoryList() { - encryptionAlgoFactoryMap = new ConcurrentHashMap(); + encryptionAlgoFactoryMap = new ConcurrentHashMap<>(); encryptionAlgoFactoryMap.putIfAbsent(SQLServerAeadAes256CbcHmac256Algorithm.algorithmName, new SQLServerAeadAes256CbcHmac256Factory()); } diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerParameterMetaData.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerParameterMetaData.java index c9425d016..1d11e61af 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerParameterMetaData.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerParameterMetaData.java @@ -603,7 +603,7 @@ private void checkClosed() throws SQLServerException { // procedure "sp_describe_undeclared_parameters" to retrieve parameter meta data // if SQL server version is 2008, then use FMTONLY else { - queryMetaMap = new HashMap(); + queryMetaMap = new HashMap<>(); if (con.getServerMajorVersion() >= SQL_SERVER_2012_VERSION) { // new implementation for SQL verser 2012 and above @@ -618,7 +618,7 @@ private void checkClosed() throws SQLServerException { else { // old implementation for SQL server 2008 stringToParse = sProcString; - ArrayList metaInfoList = new ArrayList(); + ArrayList metaInfoList = new ArrayList<>(); while (stringToParse.length() > 0) { MetaInfo metaInfo = parseStatement(stringToParse); diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPooledConnection.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPooledConnection.java index f407dff11..cc059434d 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPooledConnection.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPooledConnection.java @@ -38,7 +38,7 @@ public class SQLServerPooledConnection implements PooledConnection { SQLServerPooledConnection(SQLServerDataSource ds, String user, String password) throws SQLException { - listeners = new Vector(); + listeners = new Vector<>(); // Piggyback SQLServerDataSource logger for now. pcLogger = SQLServerDataSource.dsLogger; diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement.java index 45021e508..bed20903e 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement.java @@ -353,7 +353,7 @@ private String buildParamTypeDefinitions(Parameter[] params, StringBuilder sb = new StringBuilder(); int nCols = params.length; char cParamName[] = new char[10]; - parameterNames = new ArrayList(); + parameterNames = new ArrayList<>(); for (int i = 0; i < nCols; i++) { if (i > 0) @@ -810,7 +810,7 @@ private void getParameterEncryptionMetadata(Parameter[] params) throws SQLServer return; } - Map cekList = new HashMap(); + Map cekList = new HashMap<>(); CekTableEntry cekEntry = null; try { while (rs.next()) { @@ -2391,7 +2391,7 @@ public final void addBatch() throws SQLServerException { // Create the list of batch parameter values first time through if (batchParamValues == null) - batchParamValues = new ArrayList(); + batchParamValues = new ArrayList<>(); final int numParams = inOutParam.length; Parameter paramValues[] = new Parameter[numParams]; @@ -2551,7 +2551,7 @@ final void doExecutePreparedStatementBatch(PrepStmtBatchExecCmd batchCommand) th int numBatchesPrepared = 0; int numBatchesExecuted = 0; - Vector cryptoMetaBatch = new Vector(); + Vector cryptoMetaBatch = new Vector<>(); if (isSelect(userSQL)) { SQLServerException.makeFromDriverError(connection, this, SQLServerException.getErrString("R_selectNotPermittedinBatch"), null, true); diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerStatement.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerStatement.java index 632edf9e6..7f6d8e1d2 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerStatement.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerStatement.java @@ -429,7 +429,7 @@ boolean onDone(TDSReader tdsReader) throws SQLServerException { * The array of objects in a batched call. Applicable to statements and prepared statements When the iterativeBatching property is turned on. */ /** The buffer that accumulates batchable statements */ - private final ArrayList batchStatementBuffer = new ArrayList(); + private final ArrayList batchStatementBuffer = new ArrayList<>(); /** logging init at the construction */ static final private java.util.logging.Logger stmtlogger = java.util.logging.Logger @@ -1512,7 +1512,7 @@ boolean onInfo(TDSReader tdsReader) throws SQLServerException { infoToken.msg.getErrorNumber()); if (sqlWarnings == null) { - sqlWarnings = new Vector(); + sqlWarnings = new Vector<>(); } else { int n = sqlWarnings.size(); @@ -2384,7 +2384,7 @@ int translateLimit(StringBuffer sql, Matcher offsetMatcher = limitSyntaxWithOffset.matcher(sql); int startIndx = indx; - Stack topPosition = new Stack(); + Stack topPosition = new Stack<>(); State nextState = State.START; while (indx < sql.length()) { diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerSymmetricKeyCache.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerSymmetricKeyCache.java index 5799251d8..76b886786 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerSymmetricKeyCache.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerSymmetricKeyCache.java @@ -68,7 +68,7 @@ public Thread newThread(Runnable r) { .getLogger("com.microsoft.sqlserver.jdbc.SQLServerSymmetricKeyCache"); private SQLServerSymmetricKeyCache() { - cache = new ConcurrentHashMap(); + cache = new ConcurrentHashMap<>(); } static SQLServerSymmetricKeyCache getInstance() { diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerXAResource.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerXAResource.java index 63114f769..8e72d0f35 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerXAResource.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerXAResource.java @@ -802,7 +802,7 @@ else if (-1 != version.indexOf('.')) { /* L0 */ public Xid[] recover(int flags) throws XAException { XAReturnValue r = DTC_XA_Interface(XA_RECOVER, null, flags | tightlyCoupled); int offset = 0; - ArrayList al = new ArrayList(); + ArrayList al = new ArrayList<>(); // If no XID's found, return zero length XID array (don't return null). // diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/TVP.java b/src/main/java/com/microsoft/sqlserver/jdbc/TVP.java index 6088b7595..6f68d685a 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/TVP.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/TVP.java @@ -62,7 +62,7 @@ enum MPIState { void initTVP(TVPType type, String tvpPartName) throws SQLServerException { tvpType = type; - columnMetadata = new LinkedHashMap(); + columnMetadata = new LinkedHashMap<>(); parseTypeName(tvpPartName); } diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/dns/DNSUtilities.java b/src/main/java/com/microsoft/sqlserver/jdbc/dns/DNSUtilities.java index 3a91a3071..483ad3635 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/dns/DNSUtilities.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/dns/DNSUtilities.java @@ -36,13 +36,13 @@ public class DNSUtilities { * if DNS is not available */ public static Set findSrvRecords(final String dnsSrvRecordToFind) throws NamingException { - Hashtable env = new Hashtable(); + Hashtable env = new Hashtable<>(); env.put("java.naming.factory.initial", "com.sun.jndi.dns.DnsContextFactory"); env.put("java.naming.provider.url", "dns:"); DirContext ctx = new InitialDirContext(env); Attributes attrs = ctx.getAttributes(dnsSrvRecordToFind, new String[] {"SRV"}); NamingEnumeration allServers = attrs.getAll(); - TreeSet records = new TreeSet(); + TreeSet records = new TreeSet<>(); while (allServers.hasMoreElements()) { Attribute a = allServers.nextElement(); NamingEnumeration srvRecord = a.getAll(); diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/dtv.java b/src/main/java/com/microsoft/sqlserver/jdbc/dtv.java index 9c86c0842..0ac8eb108 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/dtv.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/dtv.java @@ -3334,7 +3334,7 @@ boolean supportsFastAsciiConversion() { } } - private static final Map builderMap = new EnumMap(TDSType.class); + private static final Map builderMap = new EnumMap<>(TDSType.class); static { for (Builder builder : Builder.values()) diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyConnectionTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyConnectionTest.java index c8c855644..340dbb3eb 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyConnectionTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyConnectionTest.java @@ -161,7 +161,7 @@ void testEmptyBulkCopyOptions() { */ List createTestDatatestBulkCopyConstructor() { String testCaseName = "BulkCopyConstructor "; - List testData = new ArrayList(); + List testData = new ArrayList<>(); BulkCopyTestWrapper bulkWrapper1 = new BulkCopyTestWrapper(connectionString); bulkWrapper1.testName = testCaseName; bulkWrapper1.setUsingConnection(true); @@ -182,7 +182,7 @@ List createTestDatatestBulkCopyConstructor() { */ private List createTestDatatestBulkCopyOption() { String testCaseName = "BulkCopyOption "; - List testData = new ArrayList(); + List testData = new ArrayList<>(); Class bulkOptions = SQLServerBulkCopyOptions.class; Method[] methods = bulkOptions.getDeclaredMethods(); diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyISQLServerBulkRecordTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyISQLServerBulkRecordTest.java index f33a3bb60..60e7e3da4 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyISQLServerBulkRecordTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyISQLServerBulkRecordTest.java @@ -99,7 +99,7 @@ private class ColumnMetadata { List data; BulkData() { - columnMetadata = new HashMap(); + columnMetadata = new HashMap<>(); totalColumn = dstTable.totalColumns(); // add metadata @@ -116,7 +116,7 @@ private class ColumnMetadata { // add data rowCount = dstTable.getTotalRows(); - data = new ArrayList(rowCount); + data = new ArrayList<>(rowCount); for (int i = 0; i < rowCount; i++) { Object[] CurrentRow = new Object[totalColumn]; for (int j = 0; j < totalColumn; j++) { diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyTestWrapper.java b/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyTestWrapper.java index 2eaa7f6ab..c6be7261c 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyTestWrapper.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyTestWrapper.java @@ -35,7 +35,7 @@ class BulkCopyTestWrapper { */ private boolean isUsingColumnMapping = false; - public LinkedList cm = new LinkedList(); + public LinkedList cm = new LinkedList<>(); private SQLServerBulkCopyOptions bulkOptions; diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/ISQLServerBulkRecordIssuesTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/ISQLServerBulkRecordIssuesTest.java index a32f3c367..1b45d54a5 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/ISQLServerBulkRecordIssuesTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/ISQLServerBulkRecordIssuesTest.java @@ -289,53 +289,53 @@ private class ColumnMetadata { BulkDat(String variation) { if (variation.equalsIgnoreCase("testVarchar")) { isStringData = true; - columnMetadata = new HashMap(); + columnMetadata = new HashMap<>(); columnMetadata.put(1, new ColumnMetadata("varchar(2)", java.sql.Types.VARCHAR, 0, 0)); - stringData = new ArrayList(); + stringData = new ArrayList<>(); stringData.add(new String("aaa")); rowCount = stringData.size(); } else if (variation.equalsIgnoreCase("testSmalldatetime")) { isStringData = false; - columnMetadata = new HashMap(); + columnMetadata = new HashMap<>(); columnMetadata.put(1, new ColumnMetadata("smallDatetime", java.sql.Types.TIMESTAMP, 0, 0)); - dateData = new ArrayList(); + dateData = new ArrayList<>(); dateData.add(Timestamp.valueOf("1954-05-22 02:43:37.123")); rowCount = dateData.size(); } else if (variation.equalsIgnoreCase("testSmalldatetimeOutofRange")) { isStringData = false; - columnMetadata = new HashMap(); + columnMetadata = new HashMap<>(); columnMetadata.put(1, new ColumnMetadata("smallDatetime", java.sql.Types.TIMESTAMP, 0, 0)); - dateData = new ArrayList(); + dateData = new ArrayList<>(); dateData.add(Timestamp.valueOf("1954-05-22 02:43:37.1234")); rowCount = dateData.size(); } else if (variation.equalsIgnoreCase("testBinaryColumnAsByte")) { isStringData = false; - columnMetadata = new HashMap(); + columnMetadata = new HashMap<>(); columnMetadata.put(1, new ColumnMetadata("binary(5)", java.sql.Types.BINARY, 5, 0)); - byteData = new ArrayList(); + byteData = new ArrayList<>(); byteData.add("helloo".getBytes()); rowCount = byteData.size(); } else if (variation.equalsIgnoreCase("testBinaryColumnAsString")) { isStringData = true; - columnMetadata = new HashMap(); + columnMetadata = new HashMap<>(); columnMetadata.put(1, new ColumnMetadata("binary(5)", java.sql.Types.BINARY, 5, 0)); - stringData = new ArrayList(); + stringData = new ArrayList<>(); stringData.add("616368697412"); rowCount = stringData.size(); @@ -343,11 +343,11 @@ else if (variation.equalsIgnoreCase("testBinaryColumnAsString")) { else if (variation.equalsIgnoreCase("testSendValidValueforBinaryColumnAsString")) { isStringData = true; - columnMetadata = new HashMap(); + columnMetadata = new HashMap<>(); columnMetadata.put(1, new ColumnMetadata("binary(5)", java.sql.Types.BINARY, 5, 0)); - stringData = new ArrayList(); + stringData = new ArrayList<>(); stringData.add("010101"); rowCount = stringData.size(); diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/LimitEscapeTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/LimitEscapeTest.java index bd6bccd2c..cc9e0e69f 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/LimitEscapeTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/LimitEscapeTest.java @@ -40,7 +40,7 @@ @RunWith(JUnitPlatform.class) public class LimitEscapeTest extends AbstractTest { public static final Logger log = Logger.getLogger("LimitEscape"); - private static Vector offsetQuery = new Vector(); + private static Vector offsetQuery = new Vector<>(); private static Connection conn = null; static class Query { diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/StatementTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/StatementTest.java index 88b6c5427..715f1c457 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/StatementTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/StatementTest.java @@ -2097,7 +2097,7 @@ public void testNBCROWWithRandomAccess() throws Exception { Random r = new Random(); // randomly generate columns whose values would be set to a non null value - ArrayList nonNullColumns = new ArrayList(); + ArrayList nonNullColumns = new ArrayList<>(); nonNullColumns.add(1);// this is always non-null // Add approximately 10 non-null columns. The number should be low diff --git a/src/test/java/com/microsoft/sqlserver/testframework/DBCoercions.java b/src/test/java/com/microsoft/sqlserver/testframework/DBCoercions.java index c333d71df..ff8e03f8f 100644 --- a/src/test/java/com/microsoft/sqlserver/testframework/DBCoercions.java +++ b/src/test/java/com/microsoft/sqlserver/testframework/DBCoercions.java @@ -19,7 +19,7 @@ public class DBCoercions extends DBItems { * constructor */ public DBCoercions() { - coercionsList = new ArrayList(); + coercionsList = new ArrayList<>(); } public DBCoercions(DBCoercion coercion) { diff --git a/src/test/java/com/microsoft/sqlserver/testframework/DBColumn.java b/src/test/java/com/microsoft/sqlserver/testframework/DBColumn.java index 7528e9e5d..f44744983 100644 --- a/src/test/java/com/microsoft/sqlserver/testframework/DBColumn.java +++ b/src/test/java/com/microsoft/sqlserver/testframework/DBColumn.java @@ -78,7 +78,7 @@ void setSqlType(SqlType sqlType) { * number of rows */ void populateValues(int rows) { - columnValues = new ArrayList(); + columnValues = new ArrayList<>(); for (int i = 0; i < rows; i++) columnValues.add(sqlType.createdata()); } diff --git a/src/test/java/com/microsoft/sqlserver/testframework/DBSchema.java b/src/test/java/com/microsoft/sqlserver/testframework/DBSchema.java index 826098913..e08995346 100644 --- a/src/test/java/com/microsoft/sqlserver/testframework/DBSchema.java +++ b/src/test/java/com/microsoft/sqlserver/testframework/DBSchema.java @@ -52,7 +52,7 @@ public class DBSchema { * @param autoGenerateSchema */ DBSchema(boolean autoGenerateSchema) { - sqlTypes = new ArrayList(); + sqlTypes = new ArrayList<>(); if (autoGenerateSchema) { // Exact Numeric sqlTypes.add(new SqlBigInt()); diff --git a/src/test/java/com/microsoft/sqlserver/testframework/DBTable.java b/src/test/java/com/microsoft/sqlserver/testframework/DBTable.java index 90d6ae3bc..e3c9b174f 100644 --- a/src/test/java/com/microsoft/sqlserver/testframework/DBTable.java +++ b/src/test/java/com/microsoft/sqlserver/testframework/DBTable.java @@ -85,7 +85,7 @@ public DBTable(boolean autoGenerateSchema, addColumns(); } else { - this.columns = new ArrayList(); + this.columns = new ArrayList<>(); } this.totalColumns = columns.size(); } @@ -108,7 +108,7 @@ private DBTable(DBTable sourceTable) { */ private void addColumns() { totalColumns = schema.getNumberOfSqlTypes(); - columns = new ArrayList(totalColumns); + columns = new ArrayList<>(totalColumns); for (int i = 0; i < totalColumns; i++) { SqlType sqlType = schema.getSqlType(i); @@ -122,7 +122,7 @@ private void addColumns() { */ private void addColumns(boolean unicode) { totalColumns = schema.getNumberOfSqlTypes(); - columns = new ArrayList(totalColumns); + columns = new ArrayList<>(totalColumns); for (int i = 0; i < totalColumns; i++) { SqlType sqlType = schema.getSqlType(i); diff --git a/src/test/java/com/microsoft/sqlserver/testframework/Utils.java b/src/test/java/com/microsoft/sqlserver/testframework/Utils.java index 3c3509c20..229f7f4c6 100644 --- a/src/test/java/com/microsoft/sqlserver/testframework/Utils.java +++ b/src/test/java/com/microsoft/sqlserver/testframework/Utils.java @@ -162,7 +162,7 @@ public static SqlType find(String name) { */ public static ArrayList types() { if (null == types) { - types = new ArrayList(); + types = new ArrayList<>(); types.add(new SqlInt()); types.add(new SqlSmallInt()); From b31ec7cae9369a73e3306eba12615af4b0cd363b Mon Sep 17 00:00:00 2001 From: Peter Bae Date: Thu, 31 Aug 2017 16:31:33 -0700 Subject: [PATCH 3/3] Revert "Replace explicit types with <>" This reverts commit e277087c0601e1e293d8cbb8cb5373ee54fcb385. --- .../java/com/microsoft/sqlserver/jdbc/AE.java | 2 +- .../microsoft/sqlserver/jdbc/DataTypes.java | 10 ++++---- .../sqlserver/jdbc/FailOverMapSingleton.java | 2 +- .../microsoft/sqlserver/jdbc/IOBuffer.java | 12 +++++----- .../sqlserver/jdbc/JaasConfiguration.java | 6 ++--- .../sqlserver/jdbc/SQLCollation.java | 4 ++-- .../SQLServerAeadAes256CbcHmac256Factory.java | 2 +- .../sqlserver/jdbc/SQLServerBlob.java | 2 +- .../jdbc/SQLServerBulkCSVFileRecord.java | 4 ++-- .../sqlserver/jdbc/SQLServerBulkCopy.java | 8 +++---- .../jdbc/SQLServerCallableStatement.java | 2 +- .../sqlserver/jdbc/SQLServerClob.java | 2 +- .../sqlserver/jdbc/SQLServerConnection.java | 14 +++++------ .../sqlserver/jdbc/SQLServerDataTable.java | 4 ++-- .../jdbc/SQLServerDatabaseMetaData.java | 2 +- ...LServerEncryptionAlgorithmFactoryList.java | 2 +- .../jdbc/SQLServerParameterMetaData.java | 4 ++-- .../jdbc/SQLServerPooledConnection.java | 2 +- .../jdbc/SQLServerPreparedStatement.java | 8 +++---- .../sqlserver/jdbc/SQLServerStatement.java | 6 ++--- .../jdbc/SQLServerSymmetricKeyCache.java | 2 +- .../sqlserver/jdbc/SQLServerXAResource.java | 2 +- .../com/microsoft/sqlserver/jdbc/TVP.java | 2 +- .../sqlserver/jdbc/dns/DNSUtilities.java | 4 ++-- .../com/microsoft/sqlserver/jdbc/dtv.java | 2 +- .../jdbc/bulkCopy/BulkCopyConnectionTest.java | 4 ++-- .../BulkCopyISQLServerBulkRecordTest.java | 4 ++-- .../jdbc/bulkCopy/BulkCopyTestWrapper.java | 2 +- .../ISQLServerBulkRecordIssuesTest.java | 24 +++++++++---------- .../jdbc/unit/statement/LimitEscapeTest.java | 2 +- .../jdbc/unit/statement/StatementTest.java | 2 +- .../sqlserver/testframework/DBCoercions.java | 2 +- .../sqlserver/testframework/DBColumn.java | 2 +- .../sqlserver/testframework/DBSchema.java | 2 +- .../sqlserver/testframework/DBTable.java | 6 ++--- .../sqlserver/testframework/Utils.java | 2 +- 36 files changed, 81 insertions(+), 81 deletions(-) diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/AE.java b/src/main/java/com/microsoft/sqlserver/jdbc/AE.java index 1b5b2543f..c6345d25b 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/AE.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/AE.java @@ -88,7 +88,7 @@ byte[] getCekMdVersion() { cekId = 0; cekVersion = 0; cekMdVersion = null; - columnEncryptionKeyValues = new ArrayList<>(); + columnEncryptionKeyValues = new ArrayList(); } int getSize() { diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/DataTypes.java b/src/main/java/com/microsoft/sqlserver/jdbc/DataTypes.java index 3f6ebdbea..914e382a2 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/DataTypes.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/DataTypes.java @@ -382,7 +382,7 @@ private GetterConversion(SSType.Category from, this.to = to; } - private static final EnumMap> conversionMap = new EnumMap<>( + private static final EnumMap> conversionMap = new EnumMap>( SSType.Category.class); static { @@ -776,7 +776,7 @@ private SetterConversionAE(JavaType from, this.to = to; } - private static final EnumMap> setterConversionAEMap = new EnumMap<>(JavaType.class); + private static final EnumMap> setterConversionAEMap = new EnumMap>(JavaType.class); static { for (JavaType javaType : JavaType.values()) @@ -1086,7 +1086,7 @@ private SetterConversion(JDBCType.Category from, this.to = to; } - private static final EnumMap> conversionMap = new EnumMap<>( + private static final EnumMap> conversionMap = new EnumMap>( JDBCType.Category.class); static { @@ -1305,7 +1305,7 @@ private UpdaterConversion(JDBCType.Category from, this.to = to; } - private static final EnumMap> conversionMap = new EnumMap<>( + private static final EnumMap> conversionMap = new EnumMap>( JDBCType.Category.class); static { @@ -1616,7 +1616,7 @@ private NormalizationAE(JDBCType from, this.to = to; } - private static final EnumMap> normalizationMapAE = new EnumMap<>(JDBCType.class); + private static final EnumMap> normalizationMapAE = new EnumMap>(JDBCType.class); static { for (JDBCType jdbcType : JDBCType.values()) diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/FailOverMapSingleton.java b/src/main/java/com/microsoft/sqlserver/jdbc/FailOverMapSingleton.java index 8bebf1f0e..f3146d926 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/FailOverMapSingleton.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/FailOverMapSingleton.java @@ -13,7 +13,7 @@ final class FailoverMapSingleton { private static int INITIALHASHMAPSIZE = 5; - private static HashMap failoverMap = new HashMap<>(INITIALHASHMAPSIZE); + private static HashMap failoverMap = new HashMap(INITIALHASHMAPSIZE); private FailoverMapSingleton() { /* hide the constructor to stop the instantiation of this class. */} diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/IOBuffer.java b/src/main/java/com/microsoft/sqlserver/jdbc/IOBuffer.java index a9af8068b..e54e09b80 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/IOBuffer.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/IOBuffer.java @@ -2316,8 +2316,8 @@ else if (!useTnir) { findSocketUsingJavaNIO(inetAddrs, portNumber, timeoutInMilliSeconds); } else { - LinkedList inet4Addrs = new LinkedList<>(); - LinkedList inet6Addrs = new LinkedList<>(); + LinkedList inet4Addrs = new LinkedList(); + LinkedList inet6Addrs = new LinkedList(); for (InetAddress inetAddr : inetAddrs) { if (inetAddr instanceof Inet4Address) { @@ -2445,7 +2445,7 @@ private void findSocketUsingJavaNIO(InetAddress[] inetAddrs, assert inetAddrs.length != 0 : "Number of inetAddresses should not be zero in this function"; Selector selector = null; - LinkedList socketChannels = new LinkedList<>(); + LinkedList socketChannels = new LinkedList(); SocketChannel selectedChannel = null; try { @@ -2624,8 +2624,8 @@ private void findSocketUsingThreading(LinkedList inetAddrs, assert inetAddrs.isEmpty() == false : "Number of inetAddresses should not be zero in this function"; - LinkedList sockets = new LinkedList<>(); - LinkedList socketConnectors = new LinkedList<>(); + LinkedList sockets = new LinkedList(); + LinkedList socketConnectors = new LinkedList(); try { @@ -5143,7 +5143,7 @@ void writeTvpOrderUnique(TVP value) throws SQLServerException { Map columnMetadata = value.getColumnMetadata(); Iterator> columnsIterator = columnMetadata.entrySet().iterator(); - LinkedList columnList = new LinkedList<>(); + LinkedList columnList = new LinkedList(); while (columnsIterator.hasNext()) { byte flags = 0; diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/JaasConfiguration.java b/src/main/java/com/microsoft/sqlserver/jdbc/JaasConfiguration.java index 6443724fd..f080ae14e 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/JaasConfiguration.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/JaasConfiguration.java @@ -23,9 +23,9 @@ public class JaasConfiguration extends Configuration { private static AppConfigurationEntry[] generateDefaultConfiguration() { if (Util.isIBM()) { - Map confDetailsWithoutPassword = new HashMap<>(); + Map confDetailsWithoutPassword = new HashMap(); confDetailsWithoutPassword.put("useDefaultCcache", "true"); - Map confDetailsWithPassword = new HashMap<>(); + Map confDetailsWithPassword = new HashMap(); // We generated a two configurations fallback that is suitable for password and password-less authentication // See https://www.ibm.com/support/knowledgecenter/SSYKE2_8.0.0/com.ibm.java.security.component.80.doc/security-component/jgssDocs/jaas_login_user.html final String ibmLoginModule = "com.ibm.security.auth.module.Krb5LoginModule"; @@ -34,7 +34,7 @@ private static AppConfigurationEntry[] generateDefaultConfiguration() { new AppConfigurationEntry(ibmLoginModule, AppConfigurationEntry.LoginModuleControlFlag.SUFFICIENT, confDetailsWithPassword)}; } else { - Map confDetails = new HashMap<>(); + Map confDetails = new HashMap(); confDetails.put("useTicketCache", "true"); return new AppConfigurationEntry[] {new AppConfigurationEntry("com.sun.security.auth.module.Krb5LoginModule", AppConfigurationEntry.LoginModuleControlFlag.REQUIRED, confDetails)}; diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLCollation.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLCollation.java index d89a95e11..7a47b6fec 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLCollation.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLCollation.java @@ -530,11 +530,11 @@ private Encoding encodingFromSortId() throws UnsupportedEncodingException { static { // Populate the windows locale and sort order indices - localeIndex = new HashMap<>(); + localeIndex = new HashMap(); for (WindowsLocale locale : EnumSet.allOf(WindowsLocale.class)) localeIndex.put(locale.langID, locale); - sortOrderIndex = new HashMap<>(); + sortOrderIndex = new HashMap(); for (SortOrder sortOrder : EnumSet.allOf(SortOrder.class)) sortOrderIndex.put(sortOrder.sortId, sortOrder); } diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerAeadAes256CbcHmac256Factory.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerAeadAes256CbcHmac256Factory.java index 8f71ec6b6..13c8dc3fb 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerAeadAes256CbcHmac256Factory.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerAeadAes256CbcHmac256Factory.java @@ -21,7 +21,7 @@ class SQLServerAeadAes256CbcHmac256Factory extends SQLServerEncryptionAlgorithmFactory { // In future we can have more private byte algorithmVersion = 0x1; - private ConcurrentHashMap encryptionAlgorithms = new ConcurrentHashMap<>(); + private ConcurrentHashMap encryptionAlgorithms = new ConcurrentHashMap(); @Override SQLServerEncryptionAlgorithm create(SQLServerSymmetricKey columnEncryptionKey, diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBlob.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBlob.java index 47927d6a6..ef74f5c48 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBlob.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBlob.java @@ -40,7 +40,7 @@ public final class SQLServerBlob implements java.sql.Blob, java.io.Serializable // Initial size of the array is based on an assumption that a Blob object is // typically used either for input or output, and then only once. The array size // grows automatically if multiple streams are used. - ArrayList activeStreams = new ArrayList<>(1); + ArrayList activeStreams = new ArrayList(1); static private final Logger logger = Logger.getLogger("com.microsoft.sqlserver.jdbc.internals.SQLServerBlob"); diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBulkCSVFileRecord.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBulkCSVFileRecord.java index 4ff063dab..59824cf6d 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBulkCSVFileRecord.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBulkCSVFileRecord.java @@ -159,7 +159,7 @@ else if (null == delimiter) { catch (Exception e) { throw new SQLServerException(null, e.getMessage(), null, 0, false); } - columnMetadata = new HashMap<>(); + columnMetadata = new HashMap(); loggerExternal.exiting(loggerClassName, "SQLServerBulkCSVFileRecord"); } @@ -216,7 +216,7 @@ else if (null == delimiter) { catch (Exception e) { throw new SQLServerException(null, e.getMessage(), null, 0, false); } - columnMetadata = new HashMap<>(); + columnMetadata = new HashMap(); loggerExternal.exiting(loggerClassName, "SQLServerBulkCSVFileRecord"); } diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBulkCopy.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBulkCopy.java index 6e13ad187..a4e1b2be3 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBulkCopy.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBulkCopy.java @@ -675,7 +675,7 @@ public void writeToServer(ISQLServerBulkRecord sourceData) throws SQLServerExcep * Initializes the defaults for member variables that require it. */ private void initializeDefaults() { - columnMappings = new LinkedList<>(); + columnMappings = new LinkedList(); destinationTableName = null; sourceBulkRecord = null; sourceResultSet = null; @@ -1471,7 +1471,7 @@ private String getDestTypeFromSrcType(int srcColIndx, private String createInsertBulkCommand(TDSWriter tdsWriter) throws SQLServerException { StringBuilder bulkCmd = new StringBuilder(); - List bulkOptions = new ArrayList<>(); + List bulkOptions = new ArrayList(); String endColumn = " , "; bulkCmd.append("INSERT BULK " + destinationTableName + " ("); @@ -1747,7 +1747,7 @@ private void getDestinationMetadata() throws SQLServerException { .executeQueryInternal("SET FMTONLY ON SELECT * FROM " + destinationTableName + " SET FMTONLY OFF "); destColumnCount = rs.getMetaData().getColumnCount(); - destColumnMetadata = new HashMap<>(); + destColumnMetadata = new HashMap(); destCekTable = rs.getCekTable(); if (!connection.getServerSupportsColumnEncryption()) { @@ -1793,7 +1793,7 @@ private void getDestinationMetadata() throws SQLServerException { * source metadata from the same place for both ResultSet and File. */ private void getSourceMetadata() throws SQLServerException { - srcColumnMetadata = new HashMap<>(); + srcColumnMetadata = new HashMap(); int currentColumn; if (null != sourceResultSet) { try { diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerCallableStatement.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerCallableStatement.java index 40a77be15..794b8f743 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerCallableStatement.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerCallableStatement.java @@ -1432,7 +1432,7 @@ public NClob getNClob(String parameterName) throws SQLException { } ResultSet rs = s.executeQueryInternal(metaQuery.toString()); - paramNames = new ArrayList<>(); + paramNames = new ArrayList(); while (rs.next()) { String sCol = rs.getString(4); paramNames.add(sCol.trim()); diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerClob.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerClob.java index a9556baf3..f933727cf 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerClob.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerClob.java @@ -88,7 +88,7 @@ abstract class SQLServerClobBase implements Serializable { // Initial size of the array is based on an assumption that a Clob/NClob object is // typically used either for input or output, and then only once. The array size // grows automatically if multiple streams are used. - private ArrayList activeStreams = new ArrayList<>(1); + private ArrayList activeStreams = new ArrayList(1); transient SQLServerConnection con; private static Logger logger; diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java index 42c050ab6..cf0eb5728 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java @@ -100,7 +100,7 @@ public class SQLServerConnection implements ISQLServerConnection { private Boolean enablePrepareOnFirstPreparedStatementCall = null; // Current limit for this particular connection. // Handle the actual queue of discarded prepared statements. - private ConcurrentLinkedQueue discardedPreparedStatementHandles = new ConcurrentLinkedQueue<>(); + private ConcurrentLinkedQueue discardedPreparedStatementHandles = new ConcurrentLinkedQueue(); private AtomicInteger discardedPreparedStatementHandleCount = new AtomicInteger(0); private boolean fedAuthRequiredByUser = false; @@ -525,7 +525,7 @@ boolean getServerSupportsColumnEncryption() { } static boolean isWindows; - static Map globalSystemColumnEncryptionKeyStoreProviders = new HashMap<>(); + static Map globalSystemColumnEncryptionKeyStoreProviders = new HashMap(); static { if (System.getProperty("os.name").toLowerCase(Locale.ENGLISH).startsWith("windows")) { isWindows = true; @@ -538,7 +538,7 @@ boolean getServerSupportsColumnEncryption() { } static Map globalCustomColumnEncryptionKeyStoreProviders = null; // This is a per-connection store provider. It can be JKS or AKV. - Map systemColumnEncryptionKeyStoreProvider = new HashMap<>(); + Map systemColumnEncryptionKeyStoreProvider = new HashMap(); /** * Registers key store providers in the globalCustomColumnEncryptionKeyStoreProviders. @@ -561,7 +561,7 @@ public static synchronized void registerColumnEncryptionKeyStoreProviders( throw new SQLServerException(null, SQLServerException.getErrString("R_CustomKeyStoreProviderSetOnce"), null, 0, false); } - globalCustomColumnEncryptionKeyStoreProviders = new HashMap<>(); + globalCustomColumnEncryptionKeyStoreProviders = new HashMap(); for (Map.Entry entry : clientKeyStoreProviders.entrySet()) { String providerName = entry.getKey(); @@ -625,7 +625,7 @@ synchronized SQLServerColumnEncryptionKeyStoreProvider getSystemColumnEncryption } private String trustedServerNameAE = null; - private static Map> columnEncryptionTrustedMasterKeyPaths = new HashMap<>(); + private static Map> columnEncryptionTrustedMasterKeyPaths = new HashMap>(); /** * Sets Trusted Master Key Paths in the columnEncryptionTrustedMasterKeyPaths. @@ -691,7 +691,7 @@ public static synchronized void removeColumnEncryptionTrustedMasterKeyPaths(Stri public static synchronized Map> getColumnEncryptionTrustedMasterKeyPaths() { loggerExternal.entering(SQLServerConnection.class.getName(), "getColumnEncryptionTrustedMasterKeyPaths", "Getting Trusted Master Key Paths"); - Map> masterKeyPathCopy = new HashMap<>(); + Map> masterKeyPathCopy = new HashMap>(); for (Map.Entry> entry : columnEncryptionTrustedMasterKeyPaths.entrySet()) { masterKeyPathCopy.put(entry.getKey(), entry.getValue()); @@ -3230,7 +3230,7 @@ public CallableStatement prepareCall(String sql, public java.util.Map> getTypeMap() throws SQLServerException { loggerExternal.entering(getClassNameLogging(), "getTypeMap"); checkClosed(); - java.util.Map> mp = new java.util.HashMap<>(); + java.util.Map> mp = new java.util.HashMap>(); loggerExternal.exiting(getClassNameLogging(), "getTypeMap", mp); return mp; } diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDataTable.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDataTable.java index d69d3e274..53284f372 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDataTable.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDataTable.java @@ -36,8 +36,8 @@ public final class SQLServerDataTable { */ // Name used in CREATE TYPE public SQLServerDataTable() throws SQLServerException { - columnMetadata = new LinkedHashMap<>(); - rows = new HashMap<>(); + columnMetadata = new LinkedHashMap(); + rows = new HashMap(); } /** diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDatabaseMetaData.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDatabaseMetaData.java index 06fbab527..f960151cc 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDatabaseMetaData.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDatabaseMetaData.java @@ -89,7 +89,7 @@ final void close() throws SQLServerException { } } - EnumMap handleMap = new EnumMap<>(CallableHandles.class); + EnumMap handleMap = new EnumMap(CallableHandles.class); // Returns unique id for each instance. private static int nextInstanceID() { diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerEncryptionAlgorithmFactoryList.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerEncryptionAlgorithmFactoryList.java index a7eb1c0de..91c9a3973 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerEncryptionAlgorithmFactoryList.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerEncryptionAlgorithmFactoryList.java @@ -21,7 +21,7 @@ final class SQLServerEncryptionAlgorithmFactoryList { private static final SQLServerEncryptionAlgorithmFactoryList instance = new SQLServerEncryptionAlgorithmFactoryList(); private SQLServerEncryptionAlgorithmFactoryList() { - encryptionAlgoFactoryMap = new ConcurrentHashMap<>(); + encryptionAlgoFactoryMap = new ConcurrentHashMap(); encryptionAlgoFactoryMap.putIfAbsent(SQLServerAeadAes256CbcHmac256Algorithm.algorithmName, new SQLServerAeadAes256CbcHmac256Factory()); } diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerParameterMetaData.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerParameterMetaData.java index 1d11e61af..c9425d016 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerParameterMetaData.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerParameterMetaData.java @@ -603,7 +603,7 @@ private void checkClosed() throws SQLServerException { // procedure "sp_describe_undeclared_parameters" to retrieve parameter meta data // if SQL server version is 2008, then use FMTONLY else { - queryMetaMap = new HashMap<>(); + queryMetaMap = new HashMap(); if (con.getServerMajorVersion() >= SQL_SERVER_2012_VERSION) { // new implementation for SQL verser 2012 and above @@ -618,7 +618,7 @@ private void checkClosed() throws SQLServerException { else { // old implementation for SQL server 2008 stringToParse = sProcString; - ArrayList metaInfoList = new ArrayList<>(); + ArrayList metaInfoList = new ArrayList(); while (stringToParse.length() > 0) { MetaInfo metaInfo = parseStatement(stringToParse); diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPooledConnection.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPooledConnection.java index cc059434d..f407dff11 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPooledConnection.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPooledConnection.java @@ -38,7 +38,7 @@ public class SQLServerPooledConnection implements PooledConnection { SQLServerPooledConnection(SQLServerDataSource ds, String user, String password) throws SQLException { - listeners = new Vector<>(); + listeners = new Vector(); // Piggyback SQLServerDataSource logger for now. pcLogger = SQLServerDataSource.dsLogger; diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement.java index bed20903e..45021e508 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement.java @@ -353,7 +353,7 @@ private String buildParamTypeDefinitions(Parameter[] params, StringBuilder sb = new StringBuilder(); int nCols = params.length; char cParamName[] = new char[10]; - parameterNames = new ArrayList<>(); + parameterNames = new ArrayList(); for (int i = 0; i < nCols; i++) { if (i > 0) @@ -810,7 +810,7 @@ private void getParameterEncryptionMetadata(Parameter[] params) throws SQLServer return; } - Map cekList = new HashMap<>(); + Map cekList = new HashMap(); CekTableEntry cekEntry = null; try { while (rs.next()) { @@ -2391,7 +2391,7 @@ public final void addBatch() throws SQLServerException { // Create the list of batch parameter values first time through if (batchParamValues == null) - batchParamValues = new ArrayList<>(); + batchParamValues = new ArrayList(); final int numParams = inOutParam.length; Parameter paramValues[] = new Parameter[numParams]; @@ -2551,7 +2551,7 @@ final void doExecutePreparedStatementBatch(PrepStmtBatchExecCmd batchCommand) th int numBatchesPrepared = 0; int numBatchesExecuted = 0; - Vector cryptoMetaBatch = new Vector<>(); + Vector cryptoMetaBatch = new Vector(); if (isSelect(userSQL)) { SQLServerException.makeFromDriverError(connection, this, SQLServerException.getErrString("R_selectNotPermittedinBatch"), null, true); diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerStatement.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerStatement.java index 7f6d8e1d2..632edf9e6 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerStatement.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerStatement.java @@ -429,7 +429,7 @@ boolean onDone(TDSReader tdsReader) throws SQLServerException { * The array of objects in a batched call. Applicable to statements and prepared statements When the iterativeBatching property is turned on. */ /** The buffer that accumulates batchable statements */ - private final ArrayList batchStatementBuffer = new ArrayList<>(); + private final ArrayList batchStatementBuffer = new ArrayList(); /** logging init at the construction */ static final private java.util.logging.Logger stmtlogger = java.util.logging.Logger @@ -1512,7 +1512,7 @@ boolean onInfo(TDSReader tdsReader) throws SQLServerException { infoToken.msg.getErrorNumber()); if (sqlWarnings == null) { - sqlWarnings = new Vector<>(); + sqlWarnings = new Vector(); } else { int n = sqlWarnings.size(); @@ -2384,7 +2384,7 @@ int translateLimit(StringBuffer sql, Matcher offsetMatcher = limitSyntaxWithOffset.matcher(sql); int startIndx = indx; - Stack topPosition = new Stack<>(); + Stack topPosition = new Stack(); State nextState = State.START; while (indx < sql.length()) { diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerSymmetricKeyCache.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerSymmetricKeyCache.java index 76b886786..5799251d8 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerSymmetricKeyCache.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerSymmetricKeyCache.java @@ -68,7 +68,7 @@ public Thread newThread(Runnable r) { .getLogger("com.microsoft.sqlserver.jdbc.SQLServerSymmetricKeyCache"); private SQLServerSymmetricKeyCache() { - cache = new ConcurrentHashMap<>(); + cache = new ConcurrentHashMap(); } static SQLServerSymmetricKeyCache getInstance() { diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerXAResource.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerXAResource.java index 8e72d0f35..63114f769 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerXAResource.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerXAResource.java @@ -802,7 +802,7 @@ else if (-1 != version.indexOf('.')) { /* L0 */ public Xid[] recover(int flags) throws XAException { XAReturnValue r = DTC_XA_Interface(XA_RECOVER, null, flags | tightlyCoupled); int offset = 0; - ArrayList al = new ArrayList<>(); + ArrayList al = new ArrayList(); // If no XID's found, return zero length XID array (don't return null). // diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/TVP.java b/src/main/java/com/microsoft/sqlserver/jdbc/TVP.java index 6f68d685a..6088b7595 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/TVP.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/TVP.java @@ -62,7 +62,7 @@ enum MPIState { void initTVP(TVPType type, String tvpPartName) throws SQLServerException { tvpType = type; - columnMetadata = new LinkedHashMap<>(); + columnMetadata = new LinkedHashMap(); parseTypeName(tvpPartName); } diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/dns/DNSUtilities.java b/src/main/java/com/microsoft/sqlserver/jdbc/dns/DNSUtilities.java index 483ad3635..3a91a3071 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/dns/DNSUtilities.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/dns/DNSUtilities.java @@ -36,13 +36,13 @@ public class DNSUtilities { * if DNS is not available */ public static Set findSrvRecords(final String dnsSrvRecordToFind) throws NamingException { - Hashtable env = new Hashtable<>(); + Hashtable env = new Hashtable(); env.put("java.naming.factory.initial", "com.sun.jndi.dns.DnsContextFactory"); env.put("java.naming.provider.url", "dns:"); DirContext ctx = new InitialDirContext(env); Attributes attrs = ctx.getAttributes(dnsSrvRecordToFind, new String[] {"SRV"}); NamingEnumeration allServers = attrs.getAll(); - TreeSet records = new TreeSet<>(); + TreeSet records = new TreeSet(); while (allServers.hasMoreElements()) { Attribute a = allServers.nextElement(); NamingEnumeration srvRecord = a.getAll(); diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/dtv.java b/src/main/java/com/microsoft/sqlserver/jdbc/dtv.java index 0ac8eb108..9c86c0842 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/dtv.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/dtv.java @@ -3334,7 +3334,7 @@ boolean supportsFastAsciiConversion() { } } - private static final Map builderMap = new EnumMap<>(TDSType.class); + private static final Map builderMap = new EnumMap(TDSType.class); static { for (Builder builder : Builder.values()) diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyConnectionTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyConnectionTest.java index 340dbb3eb..c8c855644 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyConnectionTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyConnectionTest.java @@ -161,7 +161,7 @@ void testEmptyBulkCopyOptions() { */ List createTestDatatestBulkCopyConstructor() { String testCaseName = "BulkCopyConstructor "; - List testData = new ArrayList<>(); + List testData = new ArrayList(); BulkCopyTestWrapper bulkWrapper1 = new BulkCopyTestWrapper(connectionString); bulkWrapper1.testName = testCaseName; bulkWrapper1.setUsingConnection(true); @@ -182,7 +182,7 @@ List createTestDatatestBulkCopyConstructor() { */ private List createTestDatatestBulkCopyOption() { String testCaseName = "BulkCopyOption "; - List testData = new ArrayList<>(); + List testData = new ArrayList(); Class bulkOptions = SQLServerBulkCopyOptions.class; Method[] methods = bulkOptions.getDeclaredMethods(); diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyISQLServerBulkRecordTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyISQLServerBulkRecordTest.java index 60e7e3da4..f33a3bb60 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyISQLServerBulkRecordTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyISQLServerBulkRecordTest.java @@ -99,7 +99,7 @@ private class ColumnMetadata { List data; BulkData() { - columnMetadata = new HashMap<>(); + columnMetadata = new HashMap(); totalColumn = dstTable.totalColumns(); // add metadata @@ -116,7 +116,7 @@ private class ColumnMetadata { // add data rowCount = dstTable.getTotalRows(); - data = new ArrayList<>(rowCount); + data = new ArrayList(rowCount); for (int i = 0; i < rowCount; i++) { Object[] CurrentRow = new Object[totalColumn]; for (int j = 0; j < totalColumn; j++) { diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyTestWrapper.java b/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyTestWrapper.java index c6be7261c..2eaa7f6ab 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyTestWrapper.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyTestWrapper.java @@ -35,7 +35,7 @@ class BulkCopyTestWrapper { */ private boolean isUsingColumnMapping = false; - public LinkedList cm = new LinkedList<>(); + public LinkedList cm = new LinkedList(); private SQLServerBulkCopyOptions bulkOptions; diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/ISQLServerBulkRecordIssuesTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/ISQLServerBulkRecordIssuesTest.java index 1b45d54a5..a32f3c367 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/ISQLServerBulkRecordIssuesTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/ISQLServerBulkRecordIssuesTest.java @@ -289,53 +289,53 @@ private class ColumnMetadata { BulkDat(String variation) { if (variation.equalsIgnoreCase("testVarchar")) { isStringData = true; - columnMetadata = new HashMap<>(); + columnMetadata = new HashMap(); columnMetadata.put(1, new ColumnMetadata("varchar(2)", java.sql.Types.VARCHAR, 0, 0)); - stringData = new ArrayList<>(); + stringData = new ArrayList(); stringData.add(new String("aaa")); rowCount = stringData.size(); } else if (variation.equalsIgnoreCase("testSmalldatetime")) { isStringData = false; - columnMetadata = new HashMap<>(); + columnMetadata = new HashMap(); columnMetadata.put(1, new ColumnMetadata("smallDatetime", java.sql.Types.TIMESTAMP, 0, 0)); - dateData = new ArrayList<>(); + dateData = new ArrayList(); dateData.add(Timestamp.valueOf("1954-05-22 02:43:37.123")); rowCount = dateData.size(); } else if (variation.equalsIgnoreCase("testSmalldatetimeOutofRange")) { isStringData = false; - columnMetadata = new HashMap<>(); + columnMetadata = new HashMap(); columnMetadata.put(1, new ColumnMetadata("smallDatetime", java.sql.Types.TIMESTAMP, 0, 0)); - dateData = new ArrayList<>(); + dateData = new ArrayList(); dateData.add(Timestamp.valueOf("1954-05-22 02:43:37.1234")); rowCount = dateData.size(); } else if (variation.equalsIgnoreCase("testBinaryColumnAsByte")) { isStringData = false; - columnMetadata = new HashMap<>(); + columnMetadata = new HashMap(); columnMetadata.put(1, new ColumnMetadata("binary(5)", java.sql.Types.BINARY, 5, 0)); - byteData = new ArrayList<>(); + byteData = new ArrayList(); byteData.add("helloo".getBytes()); rowCount = byteData.size(); } else if (variation.equalsIgnoreCase("testBinaryColumnAsString")) { isStringData = true; - columnMetadata = new HashMap<>(); + columnMetadata = new HashMap(); columnMetadata.put(1, new ColumnMetadata("binary(5)", java.sql.Types.BINARY, 5, 0)); - stringData = new ArrayList<>(); + stringData = new ArrayList(); stringData.add("616368697412"); rowCount = stringData.size(); @@ -343,11 +343,11 @@ else if (variation.equalsIgnoreCase("testBinaryColumnAsString")) { else if (variation.equalsIgnoreCase("testSendValidValueforBinaryColumnAsString")) { isStringData = true; - columnMetadata = new HashMap<>(); + columnMetadata = new HashMap(); columnMetadata.put(1, new ColumnMetadata("binary(5)", java.sql.Types.BINARY, 5, 0)); - stringData = new ArrayList<>(); + stringData = new ArrayList(); stringData.add("010101"); rowCount = stringData.size(); diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/LimitEscapeTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/LimitEscapeTest.java index cc9e0e69f..bd6bccd2c 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/LimitEscapeTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/LimitEscapeTest.java @@ -40,7 +40,7 @@ @RunWith(JUnitPlatform.class) public class LimitEscapeTest extends AbstractTest { public static final Logger log = Logger.getLogger("LimitEscape"); - private static Vector offsetQuery = new Vector<>(); + private static Vector offsetQuery = new Vector(); private static Connection conn = null; static class Query { diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/StatementTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/StatementTest.java index 715f1c457..88b6c5427 100644 --- a/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/StatementTest.java +++ b/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/StatementTest.java @@ -2097,7 +2097,7 @@ public void testNBCROWWithRandomAccess() throws Exception { Random r = new Random(); // randomly generate columns whose values would be set to a non null value - ArrayList nonNullColumns = new ArrayList<>(); + ArrayList nonNullColumns = new ArrayList(); nonNullColumns.add(1);// this is always non-null // Add approximately 10 non-null columns. The number should be low diff --git a/src/test/java/com/microsoft/sqlserver/testframework/DBCoercions.java b/src/test/java/com/microsoft/sqlserver/testframework/DBCoercions.java index ff8e03f8f..c333d71df 100644 --- a/src/test/java/com/microsoft/sqlserver/testframework/DBCoercions.java +++ b/src/test/java/com/microsoft/sqlserver/testframework/DBCoercions.java @@ -19,7 +19,7 @@ public class DBCoercions extends DBItems { * constructor */ public DBCoercions() { - coercionsList = new ArrayList<>(); + coercionsList = new ArrayList(); } public DBCoercions(DBCoercion coercion) { diff --git a/src/test/java/com/microsoft/sqlserver/testframework/DBColumn.java b/src/test/java/com/microsoft/sqlserver/testframework/DBColumn.java index f44744983..7528e9e5d 100644 --- a/src/test/java/com/microsoft/sqlserver/testframework/DBColumn.java +++ b/src/test/java/com/microsoft/sqlserver/testframework/DBColumn.java @@ -78,7 +78,7 @@ void setSqlType(SqlType sqlType) { * number of rows */ void populateValues(int rows) { - columnValues = new ArrayList<>(); + columnValues = new ArrayList(); for (int i = 0; i < rows; i++) columnValues.add(sqlType.createdata()); } diff --git a/src/test/java/com/microsoft/sqlserver/testframework/DBSchema.java b/src/test/java/com/microsoft/sqlserver/testframework/DBSchema.java index e08995346..826098913 100644 --- a/src/test/java/com/microsoft/sqlserver/testframework/DBSchema.java +++ b/src/test/java/com/microsoft/sqlserver/testframework/DBSchema.java @@ -52,7 +52,7 @@ public class DBSchema { * @param autoGenerateSchema */ DBSchema(boolean autoGenerateSchema) { - sqlTypes = new ArrayList<>(); + sqlTypes = new ArrayList(); if (autoGenerateSchema) { // Exact Numeric sqlTypes.add(new SqlBigInt()); diff --git a/src/test/java/com/microsoft/sqlserver/testframework/DBTable.java b/src/test/java/com/microsoft/sqlserver/testframework/DBTable.java index e3c9b174f..90d6ae3bc 100644 --- a/src/test/java/com/microsoft/sqlserver/testframework/DBTable.java +++ b/src/test/java/com/microsoft/sqlserver/testframework/DBTable.java @@ -85,7 +85,7 @@ public DBTable(boolean autoGenerateSchema, addColumns(); } else { - this.columns = new ArrayList<>(); + this.columns = new ArrayList(); } this.totalColumns = columns.size(); } @@ -108,7 +108,7 @@ private DBTable(DBTable sourceTable) { */ private void addColumns() { totalColumns = schema.getNumberOfSqlTypes(); - columns = new ArrayList<>(totalColumns); + columns = new ArrayList(totalColumns); for (int i = 0; i < totalColumns; i++) { SqlType sqlType = schema.getSqlType(i); @@ -122,7 +122,7 @@ private void addColumns() { */ private void addColumns(boolean unicode) { totalColumns = schema.getNumberOfSqlTypes(); - columns = new ArrayList<>(totalColumns); + columns = new ArrayList(totalColumns); for (int i = 0; i < totalColumns; i++) { SqlType sqlType = schema.getSqlType(i); diff --git a/src/test/java/com/microsoft/sqlserver/testframework/Utils.java b/src/test/java/com/microsoft/sqlserver/testframework/Utils.java index 229f7f4c6..3c3509c20 100644 --- a/src/test/java/com/microsoft/sqlserver/testframework/Utils.java +++ b/src/test/java/com/microsoft/sqlserver/testframework/Utils.java @@ -162,7 +162,7 @@ public static SqlType find(String name) { */ public static ArrayList types() { if (null == types) { - types = new ArrayList<>(); + types = new ArrayList(); types.add(new SqlInt()); types.add(new SqlSmallInt());