You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2017/10/23 12:38:37 UTC

logging-log4j2 git commit: Use explicit cast to suppress spurious compiler warnings

Repository: logging-log4j2
Updated Branches:
  refs/heads/master fa71e1525 -> 8f196c19f


Use explicit cast to suppress spurious compiler warnings


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8f196c19
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8f196c19
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8f196c19

Branch: refs/heads/master
Commit: 8f196c19fe9a0f297fd56bd1af539e0e84aafa12
Parents: fa71e15
Author: rpopma <rp...@apache.org>
Authored: Mon Oct 23 21:38:37 2017 +0900
Committer: rpopma <rp...@apache.org>
Committed: Mon Oct 23 21:38:37 2017 +0900

----------------------------------------------------------------------
 .../log4j/message/FormattedMessageTest.java       |  2 +-
 .../log4j/message/ParameterizedMessageTest.java   |  6 +++---
 .../message/ReusableParameterizedMessageTest.java | 18 +++++++++---------
 .../config/plugins/convert/Base64Converter.java   |  4 ++--
 4 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8f196c19/log4j-api/src/test/java/org/apache/logging/log4j/message/FormattedMessageTest.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/message/FormattedMessageTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/message/FormattedMessageTest.java
index cd24b51..937d659 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/message/FormattedMessageTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/FormattedMessageTest.java
@@ -123,7 +123,7 @@ public class FormattedMessageTest {
     @Test
     public void testParamNoArgs() {
         final String testMsg = "Test message {}";
-        FormattedMessage msg = new FormattedMessage(testMsg, null);
+        FormattedMessage msg = new FormattedMessage(testMsg, (Object[]) null);
         String result = msg.getFormattedMessage();
         assertEquals(testMsg, result);
         final Object[] array = null;

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8f196c19/log4j-api/src/test/java/org/apache/logging/log4j/message/ParameterizedMessageTest.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/message/ParameterizedMessageTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/message/ParameterizedMessageTest.java
index c9dc152..2a5bac6 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/message/ParameterizedMessageTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/ParameterizedMessageTest.java
@@ -29,7 +29,7 @@ public class ParameterizedMessageTest {
     @Test
     public void testNoArgs() {
         final String testMsg = "Test message {}";
-        ParameterizedMessage msg = new ParameterizedMessage(testMsg, null);
+        ParameterizedMessage msg = new ParameterizedMessage(testMsg, (Object[]) null);
         String result = msg.getFormattedMessage();
         assertEquals(testMsg, result);
         final Object[] array = null;
@@ -41,7 +41,7 @@ public class ParameterizedMessageTest {
     @Test
     public void testZeroLength() {
         final String testMsg = "";
-        ParameterizedMessage msg = new ParameterizedMessage(testMsg, new String[]{"arg"});
+        ParameterizedMessage msg = new ParameterizedMessage(testMsg, new Object[]{"arg"});
         String result = msg.getFormattedMessage();
         assertEquals(testMsg, result);
         final Object[] array = null;
@@ -53,7 +53,7 @@ public class ParameterizedMessageTest {
     @Test
     public void testOneCharLength() {
         final String testMsg = "d";
-        ParameterizedMessage msg = new ParameterizedMessage(testMsg, new String[]{"arg"});
+        ParameterizedMessage msg = new ParameterizedMessage(testMsg, new Object[]{"arg"});
         String result = msg.getFormattedMessage();
         assertEquals(testMsg, result);
         final Object[] array = null;

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8f196c19/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableParameterizedMessageTest.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableParameterizedMessageTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableParameterizedMessageTest.java
index 9f1cdff..b89677c 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableParameterizedMessageTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableParameterizedMessageTest.java
@@ -40,7 +40,7 @@ public class ReusableParameterizedMessageTest {
         String result = msg.getFormattedMessage();
         assertEquals(testMsg, result);
 
-        msg.set(testMsg, null);
+        msg.set(testMsg, (Object) null);
         result = msg.getFormattedMessage();
         assertEquals(testMsg, result);
 
@@ -53,7 +53,7 @@ public class ReusableParameterizedMessageTest {
     public void testFormat3StringArgs() {
         final String testMsg = "Test message {}{} {}";
         final String[] args = { "a", "b", "c" };
-        final String result = new ReusableParameterizedMessage().set(testMsg, args).getFormattedMessage();
+        final String result = new ReusableParameterizedMessage().set(testMsg, (Object[]) args).getFormattedMessage();
         assertEquals("Test message ab c", result);
     }
 
@@ -61,7 +61,7 @@ public class ReusableParameterizedMessageTest {
     public void testFormatNullArgs() {
         final String testMsg = "Test message {} {} {} {} {} {}";
         final String[] args = { "a", null, "c", null, null, null };
-        final String result = new ReusableParameterizedMessage().set(testMsg, args).getFormattedMessage();
+        final String result = new ReusableParameterizedMessage().set(testMsg, (Object[]) args).getFormattedMessage();
         assertEquals("Test message a null c null null null", result);
     }
 
@@ -69,7 +69,7 @@ public class ReusableParameterizedMessageTest {
     public void testFormatStringArgsIgnoresSuperfluousArgs() {
         final String testMsg = "Test message {}{} {}";
         final String[] args = { "a", "b", "c", "unnecessary", "superfluous" };
-        final String result = new ReusableParameterizedMessage().set(testMsg, args).getFormattedMessage();
+        final String result = new ReusableParameterizedMessage().set(testMsg, (Object[]) args).getFormattedMessage();
         assertEquals("Test message ab c", result);
     }
 
@@ -77,7 +77,7 @@ public class ReusableParameterizedMessageTest {
     public void testFormatStringArgsWithEscape() {
         final String testMsg = "Test message \\{}{} {}";
         final String[] args = { "a", "b", "c" };
-        final String result = new ReusableParameterizedMessage().set(testMsg, args).getFormattedMessage();
+        final String result = new ReusableParameterizedMessage().set(testMsg, (Object[]) args).getFormattedMessage();
         assertEquals("Test message {}a b", result);
     }
 
@@ -85,7 +85,7 @@ public class ReusableParameterizedMessageTest {
     public void testFormatStringArgsWithTrailingEscape() {
         final String testMsg = "Test message {}{} {}\\";
         final String[] args = { "a", "b", "c" };
-        final String result = new ReusableParameterizedMessage().set(testMsg, args).getFormattedMessage();
+        final String result = new ReusableParameterizedMessage().set(testMsg, (Object[]) args).getFormattedMessage();
         assertEquals("Test message ab c\\", result);
     }
 
@@ -93,7 +93,7 @@ public class ReusableParameterizedMessageTest {
     public void testFormatStringArgsWithTrailingText() {
         final String testMsg = "Test message {}{} {}Text";
         final String[] args = { "a", "b", "c" };
-        final String result = new ReusableParameterizedMessage().set(testMsg, args).getFormattedMessage();;
+        final String result = new ReusableParameterizedMessage().set(testMsg, (Object[]) args).getFormattedMessage();;
         assertEquals("Test message ab cText", result);
     }
 
@@ -101,7 +101,7 @@ public class ReusableParameterizedMessageTest {
     public void testFormatStringArgsWithTrailingEscapedEscape() {
         final String testMsg = "Test message {}{} {}\\\\";
         final String[] args = { "a", "b", "c" };
-        final String result = new ReusableParameterizedMessage().set(testMsg, args).getFormattedMessage();
+        final String result = new ReusableParameterizedMessage().set(testMsg, (Object[]) args).getFormattedMessage();
         assertEquals("Test message ab c\\\\", result);
     }
 
@@ -109,7 +109,7 @@ public class ReusableParameterizedMessageTest {
     public void testFormatStringArgsWithEscapedEscape() {
         final String testMsg = "Test message \\\\{}{} {}";
         final String[] args = { "a", "b", "c" };
-        final String result = new ReusableParameterizedMessage().set(testMsg, args).getFormattedMessage();
+        final String result = new ReusableParameterizedMessage().set(testMsg, (Object[]) args).getFormattedMessage();
         assertEquals("Test message \\ab c", result);
     }
 

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8f196c19/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/Base64Converter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/Base64Converter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/Base64Converter.java
index b4387b6..f4e421f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/Base64Converter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/Base64Converter.java
@@ -36,8 +36,8 @@ public class Base64Converter {
         try {
             // Base64 is available in Java 8 and up.
             Class<?> clazz = LoaderUtil.loadClass("java.util.Base64");
-            final Method getDecoder = clazz.getMethod("getDecoder", null);
-            decoder = getDecoder.invoke(null, null);
+            final Method getDecoder = clazz.getMethod("getDecoder", (Class[]) null);
+            decoder = getDecoder.invoke(null, (Object[]) null);
             clazz = decoder.getClass();
             method = clazz.getMethod("decode", String.class);
         } catch (final ClassNotFoundException ex) {