Formatting and java doc fix (#2350)

microsoft · Mar 18, 2024 · 00a2556 · 00a2556
1 parent 26803d2
commit 00a2556
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java
@@ -3509,8 +3509,7 @@ private void login(String primary, String primaryInstanceName, int primaryPortNu
             // Whereas for dbMirroring, we sleep for every two attempts as each attempt is to a different server.
             // Make sure there's enough time to do another retry
             if (!isDBMirroring || (isDBMirroring && (0 == attemptNumber % 2))
-                    && (attemptNumber < connectRetryCount && connectRetryCount != 0) 
-                    && timerRemaining(
+                    && (attemptNumber < connectRetryCount && connectRetryCount != 0) && timerRemaining(
                             timerExpire) > (TimeUnit.SECONDS.toMillis(connectRetryInterval) + 2 * timeForFirstTry)) {
 
                 // don't wait for TNIR

diff --git a/src/main/java/microsoft/sql/DateTimeOffset.java b/src/main/java/microsoft/sql/DateTimeOffset.java
@@ -74,12 +74,12 @@ private DateTimeOffset(java.sql.Timestamp timestamp, int minutesOffset) {
 
     /**
      * Constructs a DateTimeOffset from an existing java.time.OffsetDateTime
+     * DateTimeOffset represents values to 100 nanosecond precision. If the java.time.OffsetDateTime instance
+     * represents a value that is more precise, the value is rounded to the nearest multiple of 100 nanoseconds. Values
+     * within 50 nanoseconds of the next second are rounded up to the next second.
      *
      * @param offsetDateTime
      *        A java.time.OffsetDateTime value
-     * @apiNote DateTimeOffset represents values to 100 nanosecond precision. If the java.time.OffsetDateTime instance
-     * represents a value that is more precise,  the value is rounded to the nearest multiple of 100 nanoseconds. Values
-     * within 50 nanoseconds of the next second are rounded up to the next second.
      */
     private DateTimeOffset(java.time.OffsetDateTime offsetDateTime) {
         int hundredNanos = ((offsetDateTime.getNano() + 50) / 100);
@@ -123,13 +123,13 @@ public static DateTimeOffset valueOf(java.sql.Timestamp timestamp, Calendar cale
 
     /**
      * Directly converts a {@link java.time.OffsetDateTime} value to an equivalent {@link DateTimeOffset} value
+     * DateTimeOffset represents values to 100 nanosecond precision. If the java.time.OffsetDateTime instance
+     * represents a value that is more precise, the value is rounded to the nearest multiple of 100 nanoseconds. Values
+     * within 50 nanoseconds of the next second are rounded up to the next second.
      *
      * @param offsetDateTime
      *        A java.time.OffsetDateTime value
      * @return The DateTimeOffset value of the input java.time.OffsetDateTime
-     * @apiNote DateTimeOffset represents values to 100 nanosecond precision. If the java.time.OffsetDateTime instance
-     * represents a value that is more precise,  the value is rounded to the nearest multiple of 100 nanoseconds. Values
-     * within 50 nanoseconds of the next second are rounded up to the next second.
      */
     public static DateTimeOffset valueOf(java.time.OffsetDateTime offsetDateTime) {
         return new DateTimeOffset(offsetDateTime);

diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/SQLServerConnectionTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/SQLServerConnectionTest.java
@@ -515,8 +515,8 @@ public void testConnectNoTnir() {
         org.junit.Assume.assumeTrue(isWindows);
 
         // no retries no TNIR should fail even tho host is defined in host file
-        try (Connection con = PrepUtil.getConnection(
-                connectionString + ";transparentNetworkIPResolution=false;connectRetryCount=0;serverName=" + tnirHost);) {
+        try (Connection con = PrepUtil.getConnection(connectionString
+                + ";transparentNetworkIPResolution=false;connectRetryCount=0;serverName=" + tnirHost);) {
             assertTrue(con == null, TestResource.getResource("R_shouldNotConnect"));
         } catch (Exception e) {
             assertTrue(e.getMessage().matches(TestUtils.formatErrorMsg("R_tcpipConnectionFailed"))

diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/TestResource.java b/src/test/java/com/microsoft/sqlserver/jdbc/TestResource.java
@@ -213,5 +213,6 @@ protected Object[][] getContents() {
             {"R_noLoginModulesConfiguredForJdbcDriver",
                     "javax.security.auth.login.LoginException (No LoginModules configured for SQLJDBCDriver)"},
             {"R_unexpectedThreadCount", "Thread count is higher than expected."},
-            {"R_expectedClassDoesNotMatchActualClass", "Expected column class {0} does not match actual column class {1} for column {2}."}};
+            {"R_expectedClassDoesNotMatchActualClass",
+                    "Expected column class {0} does not match actual column class {1} for column {2}."}};
 }