Fix quality flaws

3 files changed, 3 insertions, 3 deletions

diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/profiling/ProfiledDataSource.java b/sonar-core/src/main/java/org/sonar/core/persistence/profiling/ProfiledDataSource.java
index 5fbc4d49dab..0a48c71c5b2 100644
--- a/sonar-core/src/main/java/org/sonar/core/persistence/profiling/ProfiledDataSource.java
+++ b/sonar-core/src/main/java/org/sonar/core/persistence/profiling/ProfiledDataSource.java
@@ -31,7 +31,7 @@ import java.util.Collection;
 
 public class ProfiledDataSource extends BasicDataSource {
 
-  public static final Logger SQL_LOGGER = Loggers.get("sql");
+  static final Logger SQL_LOGGER = Loggers.get("sql");
 
   private final BasicDataSource delegate;
 
diff --git a/sonar-core/src/main/java/org/sonar/core/util/NonNullInputFunction.java b/sonar-core/src/main/java/org/sonar/core/util/NonNullInputFunction.java
index bf312d68d25..a99652beb58 100644
--- a/sonar-core/src/main/java/org/sonar/core/util/NonNullInputFunction.java
+++ b/sonar-core/src/main/java/org/sonar/core/util/NonNullInputFunction.java
@@ -32,7 +32,7 @@ public abstract class NonNullInputFunction<F,T> implements Function<F, T> {
 
   @Override
   public final T apply(@Nullable F input) {
-    Preconditions.checkNotNull(input, "Null inputs are not allowed in this function");
+    Preconditions.checkArgument(input != null, "Null inputs are not allowed in this function");
     return doApply(input);
   }
 
diff --git a/sonar-core/src/test/java/org/sonar/core/util/NonNullInputFunctionTest.java b/sonar-core/src/test/java/org/sonar/core/util/NonNullInputFunctionTest.java
index f7417d0ce48..45f4ae03548 100644
--- a/sonar-core/src/test/java/org/sonar/core/util/NonNullInputFunctionTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/util/NonNullInputFunctionTest.java
@@ -33,7 +33,7 @@ public class NonNullInputFunctionTest {
     try {
       sut.apply(null);
       fail();
-    } catch (NullPointerException e) {
+    } catch (IllegalArgumentException e) {
       assertThat(e).hasMessage("Null inputs are not allowed in this function");
     }
   }