[jackrabbit-oak] branch trunk updated: OAK-10154: Guava deprecations: set minimal logging level to 'error' (#949)

[reschke]

This is an automated email from the ASF dual-hosted git repository.

reschke pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git


The following commit(s) were added to refs/heads/trunk by this push:
     new b82e801485 OAK-10154: Guava deprecations: set minimal logging level to 
'error' (#949)
b82e801485 is described below

commit b82e8014854c1767f2fa2369a80e1809b2c62994
Author: Julian Reschke <resc...@apache.org>
AuthorDate: Mon May 22 16:32:50 2023 +0200

    OAK-10154: Guava deprecations: set minimal logging level to 'error' (#949)
---
 .../jackrabbit/oak/commons/GuavaDeprecation.java   | 24 +---------------------
 .../jackrabbit/oak/spi/GuavaDeprecation.java       | 23 +--------------------
 .../jackrabbit/oak/core/GuavaDeprecation.java      | 24 +---------------------
 3 files changed, 3 insertions(+), 68 deletions(-)

diff --git 
a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/GuavaDeprecation.java
 
b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/GuavaDeprecation.java
index dd648980d9..4ab701df4b 100644
--- 
a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/GuavaDeprecation.java
+++ 
b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/GuavaDeprecation.java
@@ -17,8 +17,6 @@
 
 package org.apache.jackrabbit.oak.commons;
 
-import java.util.Locale;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -26,27 +24,7 @@ public class GuavaDeprecation {
 
     private static final Logger LOG = 
LoggerFactory.getLogger(GuavaDeprecation.class);
 
-    private static final String DEFAULT = "error";
-
-    private static final String TLOGLEVEL = 
System.getProperty(GuavaDeprecation.class + ".LOGLEVEL", DEFAULT);
-
-    private static String LOGLEVEL;
-
-    static {
-        String t;
-
-        switch (TLOGLEVEL.toLowerCase(Locale.ENGLISH)) {
-            case "error":
-            case "warn":
-                t = TLOGLEVEL.toLowerCase(Locale.ENGLISH);
-                break;
-            default:
-                t = DEFAULT;
-                break;
-        }
-
-        LOGLEVEL = t;
-    }
+    private static String LOGLEVEL = "error";
 
     private GuavaDeprecation() {
     }
diff --git 
a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/GuavaDeprecation.java
 
b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/GuavaDeprecation.java
index b97d07c45c..b287d5467a 100644
--- 
a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/GuavaDeprecation.java
+++ 
b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/GuavaDeprecation.java
@@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.spi;
 
 import java.util.Collections;
 import java.util.List;
-import java.util.Locale;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,27 +26,7 @@ public class GuavaDeprecation {
 
     private static final Logger LOG = 
LoggerFactory.getLogger(GuavaDeprecation.class);
 
-    private static final String DEFAULT = "error";
-
-    private static final String TLOGLEVEL = 
System.getProperty(GuavaDeprecation.class + ".LOGLEVEL", DEFAULT);
-
-    private static String LOGLEVEL;
-
-    static {
-        String t;
-
-        switch (TLOGLEVEL.toLowerCase(Locale.ENGLISH)) {
-            case "error":
-            case "warn":
-                t = TLOGLEVEL.toLowerCase(Locale.ENGLISH);
-                break;
-            default:
-                t = DEFAULT;
-                break;
-        }
-
-        LOGLEVEL = t;
-    }
+    private static String LOGLEVEL = "error";
 
     private GuavaDeprecation() {
     }
diff --git 
a/oak-core/src/main/java/org/apache/jackrabbit/oak/core/GuavaDeprecation.java 
b/oak-core/src/main/java/org/apache/jackrabbit/oak/core/GuavaDeprecation.java
index 9fe75c07f0..14e9d490d6 100644
--- 
a/oak-core/src/main/java/org/apache/jackrabbit/oak/core/GuavaDeprecation.java
+++ 
b/oak-core/src/main/java/org/apache/jackrabbit/oak/core/GuavaDeprecation.java
@@ -16,8 +16,6 @@
  */
 package org.apache.jackrabbit.oak.core;
 
-import java.util.Locale;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -25,27 +23,7 @@ public class GuavaDeprecation {
 
     private static final Logger LOG = 
LoggerFactory.getLogger(GuavaDeprecation.class);
 
-    private static final String DEFAULT = "error";
-
-    private static final String TLOGLEVEL = 
System.getProperty(GuavaDeprecation.class + ".LOGLEVEL", DEFAULT);
-
-    private static String LOGLEVEL;
-
-    static {
-        String t;
-
-        switch (TLOGLEVEL.toLowerCase(Locale.ENGLISH)) {
-            case "error":
-            case "warn":
-                t = TLOGLEVEL.toLowerCase(Locale.ENGLISH);
-                break;
-            default:
-                t = DEFAULT;
-                break;
-        }
-
-        LOGLEVEL = t;
-    }
+    private static String LOGLEVEL = "error";
 
     private GuavaDeprecation() {
     }