You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by an...@apache.org on 2019/06/26 12:24:11 UTC

svn commit: r1862129 - in /jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi: security/authentication/ security/privilege/ security/user/util/ xml/

Author: angela
Date: Wed Jun 26 12:24:11 2019
New Revision: 1862129

URL: http://svn.apache.org/viewvc?rev=1862129&view=rev
Log:
OAK-8321 : Use format specifier for log output

Modified:
    jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java
    jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProvider.java
    jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/util/PasswordUtil.java
    jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/xml/ImportBehavior.java

Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java?rev=1862129&r1=1862128&r2=1862129&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java Wed Jun 26 12:24:11 2019
@@ -293,7 +293,7 @@ public abstract class AbstractLoginModul
             if (sc instanceof Credentials) {
                 shared = (Credentials) sc;
             } else {
-                log.debug("Login: Invalid value for share state entry " + SHARED_KEY_CREDENTIALS + ". Credentials expected.");
+                log.debug("Login: Invalid value for share state entry {}. Credentials expected.", SHARED_KEY_CREDENTIALS);
             }
         }
 

Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProvider.java?rev=1862129&r1=1862128&r2=1862129&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProvider.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProvider.java Wed Jun 26 12:24:11 2019
@@ -111,7 +111,7 @@ public final class PrivilegeBitsProvider
                     nameToBits.put(privilegeName, bitsFromDefTree);
                     bits.add(bitsFromDefTree);
                 } else {
-                    log.debug("Ignoring privilege name " + privilegeName);
+                    log.debug("Ignoring privilege name {}", privilegeName);
                 }
             }
         }

Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/util/PasswordUtil.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/util/PasswordUtil.java?rev=1862129&r1=1862128&r2=1862129&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/util/PasswordUtil.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/util/PasswordUtil.java Wed Jun 26 12:24:11 2019
@@ -337,7 +337,7 @@ public final class PasswordUtil {
                     }
                     return algorithm;
                 } catch (NoSuchAlgorithmException e) {
-                    log.debug("Invalid algorithm detected " + algorithm, e);
+                    log.debug("Invalid algorithm detected {}", algorithm, e);
                 }
             }
         }
@@ -364,7 +364,7 @@ public final class PasswordUtil {
             try {
                 return Integer.parseInt(str);
             } catch (NumberFormatException e) {
-                log.debug("Expected number of iterations. Found: " + str, e);
+                log.debug("Expected number of iterations. Found: {}", str, e);
             }
         }
         // no extra iterations

Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/xml/ImportBehavior.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/xml/ImportBehavior.java?rev=1862129&r1=1862128&r2=1862129&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/xml/ImportBehavior.java (original)
+++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/xml/ImportBehavior.java Wed Jun 26 12:24:11 2019
@@ -63,7 +63,7 @@ public final class ImportBehavior {
         } else if (NAME_ABORT.equalsIgnoreCase(behaviorString)) {
             return ABORT;
         } else {
-            log.error("Invalid behavior " + behaviorString + " -> Using default: ABORT.");
+            log.error("Invalid behavior {} -> Using default: ABORT.", behaviorString);
             return ABORT;
         }
     }