You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2017/09/19 12:46:18 UTC
svn commit: r1808873 - in
/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima:
internal/util/Misc.java util/impl/JSR47Logger_impl.java
util/impl/Logger_impl.java util/impl/Slf4jLogger_impl.java
Author: schor
Date: Tue Sep 19 12:46:18 2017
New Revision: 1808873
URL: http://svn.apache.org/viewvc?rev=1808873&view=rev
Log:
[UIMA-5579] fixes for logging style handling
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/Misc.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/JSR47Logger_impl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_impl.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Slf4jLogger_impl.java
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/Misc.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/Misc.java?rev=1808873&r1=1808872&r2=1808873&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/Misc.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/Misc.java Tue Sep 19 12:46:18 2017
@@ -645,7 +645,7 @@ public class Misc {
}
/**
- * Get item from array list. If index is > length, expande the array, and return null
+ * Get item from array list. If index is > length, expand the array, and return null
* @param a the list
* @param i the index
* @param <T> the type of the items in the list
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/JSR47Logger_impl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/JSR47Logger_impl.java?rev=1808873&r1=1808872&r2=1808873&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/JSR47Logger_impl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/JSR47Logger_impl.java Tue Sep 19 12:46:18 2017
@@ -300,6 +300,7 @@ public class JSR47Logger_impl extends Lo
@Override
public void log2(Marker m, String aFqcn, Level level, String msg, Object[] args, Throwable throwable) {
+ // this version of MessageFormatter does the {} style
log(m, aFqcn, level, MessageFormatter.format(msg, args).getMessage(), zeroLengthArray, throwable);
}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_impl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_impl.java?rev=1808873&r1=1808872&r2=1808873&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_impl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_impl.java Tue Sep 19 12:46:18 2017
@@ -163,6 +163,7 @@ public class Logger_impl extends Logger_
if (mOut != null) {
mOut.print(new Date());
mOut.print(": " + level.toString() + ": ");
+ // this version of MessageFormatter handles {} style
mOut.println(MessageFormatter.format(message, args).getMessage());
if (null != thrown) {
thrown.printStackTrace(mOut);
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Slf4jLogger_impl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Slf4jLogger_impl.java?rev=1808873&r1=1808872&r2=1808873&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Slf4jLogger_impl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Slf4jLogger_impl.java Tue Sep 19 12:46:18 2017
@@ -222,6 +222,7 @@ public class Slf4jLogger_impl extends Lo
// allow nop operation
}
+ // does the uima-logger style of message formatting
public void log(Marker m, String aFqcn, Level level, String message, Object[] args, Throwable thrown) {
m = (m == null)
? getMarkerForLevel(level)
@@ -232,6 +233,8 @@ public class Slf4jLogger_impl extends Lo
} else {
switch(level.toInteger()) {
case Level.SEVERE_INT:
+ // all of these calls to MessageFormat are to the java.text.MessageFormat
+ // to do {n} style format substitution
logger.error(m, MessageFormat.format(message, args), thrown);
break;
case Level.WARNING_INT:
@@ -257,8 +260,48 @@ public class Slf4jLogger_impl extends Lo
}
}
+ // does the slf4j style of message formatting
public void log2(Marker m, String aFqcn, Level level, String message, Object[] args, Throwable thrown) {
- log(m, aFqcn, level, message, args, thrown);
+ m = (m == null)
+ ? getMarkerForLevel(level)
+ : m;
+
+ if (isLocationCapable) { // slf4j simple logger is not
+ ((org.slf4j.spi.LocationAwareLogger)logger).log(m, aFqcn, getSlf4jLevel(level), message, args, thrown);
+ } else {
+ if (thrown != null) {
+ Object[] args1 = (args == null) ? new Object[1] : new Object[args.length + 1];
+ if (args != null) {
+ System.arraycopy(args, 0, args1, 0, args.length);
+ }
+ args1[args1.length - 1] = thrown;
+ args = args1;
+ }
+ switch(level.toInteger()) {
+ case Level.SEVERE_INT:
+ logger.error(m, message, args);
+ break;
+ case Level.WARNING_INT:
+ logger.warn(m, message, args);
+ break;
+ case Level.INFO_INT:
+ logger.info(m, message, args);
+ break;
+ case Level.CONFIG_INT:
+ logger.info(m, message, args);
+ break;
+ case Level.FINE_INT:
+ logger.debug(m, message, args);
+ break;
+ case Level.FINER_INT:
+ logger.trace(m, message, args);
+ break;
+ case Level.FINEST_INT:
+ logger.trace(m, message, args);
+ break;
+ default: Misc.internalError();
+ }
+ }
}
/**