You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ni...@apache.org on 2013/08/20 22:42:59 UTC

svn commit: r1515961 - in /logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter: ContextMapJsonAttributeConverter.java ContextStackJsonAttributeConverter.java StackTraceElementAttributeConverter.java

Author: nickwilliams
Date: Tue Aug 20 20:42:59 2013
New Revision: 1515961

URL: http://svn.apache.org/r1515961
Log:
Adding missing @Converter annotations to a few AttributeConverters.

Modified:
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/ContextMapJsonAttributeConverter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/ContextStackJsonAttributeConverter.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/StackTraceElementAttributeConverter.java

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/ContextMapJsonAttributeConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/ContextMapJsonAttributeConverter.java?rev=1515961&r1=1515960&r2=1515961&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/ContextMapJsonAttributeConverter.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/ContextMapJsonAttributeConverter.java Tue Aug 20 20:42:59 2013
@@ -20,6 +20,7 @@ import java.io.IOException;
 import java.util.Map;
 
 import javax.persistence.AttributeConverter;
+import javax.persistence.Converter;
 import javax.persistence.PersistenceException;
 
 import org.apache.logging.log4j.core.helpers.Strings;
@@ -35,6 +36,7 @@ import com.fasterxml.jackson.databind.Ob
  * In addition to other optional dependencies required by the JPA appender, this converter requires the Jackson Data
  * Processor.
  */
+@Converter(autoApply = false)
 public class ContextMapJsonAttributeConverter implements AttributeConverter<Map<String, String>, String> {
     static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
 

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/ContextStackJsonAttributeConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/ContextStackJsonAttributeConverter.java?rev=1515961&r1=1515960&r2=1515961&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/ContextStackJsonAttributeConverter.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/ContextStackJsonAttributeConverter.java Tue Aug 20 20:42:59 2013
@@ -20,6 +20,7 @@ import java.io.IOException;
 import java.util.List;
 
 import javax.persistence.AttributeConverter;
+import javax.persistence.Converter;
 import javax.persistence.PersistenceException;
 
 import org.apache.logging.log4j.ThreadContext;
@@ -36,6 +37,7 @@ import com.fasterxml.jackson.core.type.T
  * In addition to other optional dependencies required by the JPA appender, this converter requires the Jackson Data
  * Processor.
  */
+@Converter(autoApply = false)
 public class ContextStackJsonAttributeConverter implements AttributeConverter<ThreadContext.ContextStack, String> {
     @Override
     public String convertToDatabaseColumn(final ThreadContext.ContextStack contextStack) {

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/StackTraceElementAttributeConverter.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/StackTraceElementAttributeConverter.java?rev=1515961&r1=1515960&r2=1515961&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/StackTraceElementAttributeConverter.java (original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/StackTraceElementAttributeConverter.java Tue Aug 20 20:42:59 2013
@@ -17,6 +17,7 @@
 package org.apache.logging.log4j.core.appender.db.jpa.converter;
 
 import javax.persistence.AttributeConverter;
+import javax.persistence.Converter;
 
 import org.apache.logging.log4j.core.helpers.Strings;
 
@@ -24,6 +25,7 @@ import org.apache.logging.log4j.core.hel
  * A JPA 2.1 attribute converter for {@link StackTraceElement}s in {@link org.apache.logging.log4j.core.LogEvent}s. This
  * converter is capable of converting both to and from {@link String}s.
  */
+@Converter(autoApply = false)
 public class StackTraceElementAttributeConverter implements AttributeConverter<StackTraceElement, String> {
     private static final int UNKNOWN_SOURCE = -1;