You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2011/08/12 11:45:41 UTC
svn commit: r1157026 - in /myfaces/extensions/cdi/trunk:
core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/startup/
core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/logging/
jee-modules/bv-module/impl/src/main/java/or...
Author: gpetracek
Date: Fri Aug 12 09:45:40 2011
New Revision: 1157026
URL: http://svn.apache.org/viewvc?rev=1157026&view=rev
Log:
EXTCDI-214 cleanup #defaultReadObject
Modified:
myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/startup/CodiStartupBroadcaster.java
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/logging/DefaultLogger.java
myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableConstraintValidatorFactory.java
myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableMessageInterpolator.java
myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidator.java
myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidatorFactory.java
myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/DefaultTransactionalInterceptorStrategy.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/resolver/SerializableValidatorFactory.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigDescriptor.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/message/JsfAwareMessageHandler.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/BeanStorage.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/InjectableConversation.java
myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultFormatterFactory.java
Modified: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/startup/CodiStartupBroadcaster.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/startup/CodiStartupBroadcaster.java?rev=1157026&r1=1157025&r2=1157026&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/startup/CodiStartupBroadcaster.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/startup/CodiStartupBroadcaster.java Fri Aug 12 09:45:40 2011
@@ -31,8 +31,6 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
-import java.io.ObjectInputStream;
-import java.io.IOException;
/**
* This broadcaster has to be part of the api module because
@@ -51,7 +49,7 @@ public abstract class CodiStartupBroadca
private static volatile Map<ClassLoader, Boolean> initialized = new HashMap<ClassLoader, Boolean>();
- private static transient Map<ClassLoader, List<Class<? extends StartupEventBroadcaster>>> broadcasterFilter =
+ private static Map<ClassLoader, List<Class<? extends StartupEventBroadcaster>>> broadcasterFilter =
new ConcurrentHashMap<ClassLoader, List<Class<? extends StartupEventBroadcaster>>>();
@@ -112,10 +110,4 @@ public abstract class CodiStartupBroadca
initialized.put(classLoader, Boolean.TRUE);
}
-
- @SuppressWarnings({"UnusedDeclaration"})
- private void readObject(ObjectInputStream objectInputStream) throws IOException, ClassNotFoundException
- {
- objectInputStream.defaultReadObject();
- }
}
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/logging/DefaultLogger.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/logging/DefaultLogger.java?rev=1157026&r1=1157025&r2=1157026&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/logging/DefaultLogger.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/logging/DefaultLogger.java Fri Aug 12 09:45:40 2011
@@ -21,8 +21,6 @@ package org.apache.myfaces.extensions.cd
import org.apache.myfaces.extensions.cdi.core.api.logging.Logger;
import javax.enterprise.inject.Typed;
-import java.io.IOException;
-import java.io.ObjectInputStream;
import java.util.ResourceBundle;
import java.util.logging.Filter;
import java.util.logging.Handler;
@@ -464,12 +462,6 @@ public class DefaultLogger implements Lo
return new DefaultLoggerFactory();
}
- @SuppressWarnings({"UnusedDeclaration"})
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException
- {
- in.defaultReadObject();
- }
-
private void lazyInitLogger()
{
if(this.anonymous)
Modified: myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableConstraintValidatorFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableConstraintValidatorFactory.java?rev=1157026&r1=1157025&r2=1157026&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableConstraintValidatorFactory.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableConstraintValidatorFactory.java Fri Aug 12 09:45:40 2011
@@ -21,8 +21,6 @@ package org.apache.myfaces.extensions.cd
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorFactory;
import java.io.Serializable;
-import java.io.ObjectInputStream;
-import java.io.IOException;
import static org.apache.myfaces.extensions.cdi.core.impl.util.CodiUtils.injectFields;
@@ -61,10 +59,4 @@ class InjectableConstraintValidatorFacto
return injectFields(validator, false);
}
-
- @SuppressWarnings({"UnusedDeclaration"})
- private void readObject(ObjectInputStream objectInputStream) throws IOException, ClassNotFoundException
- {
- objectInputStream.defaultReadObject();
- }
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableMessageInterpolator.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableMessageInterpolator.java?rev=1157026&r1=1157025&r2=1157026&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableMessageInterpolator.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableMessageInterpolator.java Fri Aug 12 09:45:40 2011
@@ -20,8 +20,6 @@ package org.apache.myfaces.extensions.cd
import javax.validation.MessageInterpolator;
import java.io.Serializable;
-import java.io.ObjectInputStream;
-import java.io.IOException;
import java.util.Locale;
/**
@@ -69,10 +67,4 @@ class InjectableMessageInterpolator impl
{
return getMessageInterpolator().interpolate(s, context, locale);
}
-
- @SuppressWarnings({"UnusedDeclaration"})
- private void readObject(ObjectInputStream objectInputStream) throws IOException, ClassNotFoundException
- {
- objectInputStream.defaultReadObject();
- }
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidator.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidator.java?rev=1157026&r1=1157025&r2=1157026&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidator.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidator.java Fri Aug 12 09:45:40 2011
@@ -22,8 +22,6 @@ import javax.validation.ConstraintViolat
import javax.validation.Validator;
import javax.validation.metadata.BeanDescriptor;
import java.io.Serializable;
-import java.io.ObjectInputStream;
-import java.io.IOException;
import java.util.Set;
/**
@@ -95,10 +93,4 @@ class InjectableValidator implements Val
{
return getValidator().unwrap(tClass);
}
-
- @SuppressWarnings({"UnusedDeclaration"})
- private void readObject(ObjectInputStream objectInputStream) throws IOException, ClassNotFoundException
- {
- objectInputStream.defaultReadObject();
- }
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidatorFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidatorFactory.java?rev=1157026&r1=1157025&r2=1157026&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidatorFactory.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/bv/impl/InjectableValidatorFactory.java Fri Aug 12 09:45:40 2011
@@ -25,8 +25,6 @@ import javax.validation.MessageInterpola
import javax.validation.TraversableResolver;
import javax.validation.ConstraintValidatorFactory;
import java.io.Serializable;
-import java.io.ObjectInputStream;
-import java.io.IOException;
/**
* @author Gerhard Petracek
@@ -105,10 +103,4 @@ class InjectableValidatorFactory impleme
{
return getValidatorFactory().unwrap(tClass);
}
-
- @SuppressWarnings({"UnusedDeclaration"})
- private void readObject(ObjectInputStream objectInputStream) throws IOException, ClassNotFoundException
- {
- objectInputStream.defaultReadObject();
- }
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/DefaultTransactionalInterceptorStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/DefaultTransactionalInterceptorStrategy.java?rev=1157026&r1=1157025&r2=1157026&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/DefaultTransactionalInterceptorStrategy.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/DefaultTransactionalInterceptorStrategy.java Fri Aug 12 09:45:40 2011
@@ -43,8 +43,6 @@ import java.util.Set;
import java.util.HashSet;
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
-import java.io.ObjectInputStream;
-import java.io.IOException;
/**
* @author Mark Struberg
@@ -64,7 +62,7 @@ public class DefaultTransactionalInterce
private static transient ThreadLocal<AtomicInteger> refCount = new ThreadLocal<AtomicInteger>();
- private transient Logger logger = Logger.getLogger(getClass().getName());
+ private static final Logger LOGGER = Logger.getLogger(DefaultTransactionalInterceptorStrategy.class.getName());
/** key=qualifier name, value= EntityManager */
private static transient ThreadLocal<HashMap<String, EntityManager>> entityManagerMap =
@@ -240,7 +238,7 @@ public class DefaultTransactionalInterce
}
catch (Exception eRollback)
{
- this.logger.log(Level.SEVERE, "Got additional Exception while subsequently " +
+ LOGGER.log(Level.SEVERE, "Got additional Exception while subsequently " +
"rolling back other SQL transactions", eRollback);
}
}
@@ -492,10 +490,4 @@ public class DefaultTransactionalInterce
"Hint: @Transactional just allows one qualifier -> using multiple Entity-Managers " +
"(-> different qualifiers) within ONE intercepted method isn't supported.");
}
-
- @SuppressWarnings({"UnusedDeclaration"})
- private void readObject(ObjectInputStream objectInputStream) throws IOException, ClassNotFoundException
- {
- objectInputStream.defaultReadObject();
- }
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/resolver/SerializableValidatorFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/resolver/SerializableValidatorFactory.java?rev=1157026&r1=1157025&r2=1157026&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/resolver/SerializableValidatorFactory.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/bv/resolver/SerializableValidatorFactory.java Fri Aug 12 09:45:40 2011
@@ -28,8 +28,6 @@ import javax.validation.MessageInterpola
import javax.validation.TraversableResolver;
import javax.validation.ConstraintValidatorFactory;
import java.io.Serializable;
-import java.io.ObjectInputStream;
-import java.io.IOException;
import java.util.Map;
/**
@@ -160,10 +158,4 @@ class SerializableValidatorFactory imple
return this.currentValidatorFactory;
}
-
- @SuppressWarnings({"UnusedDeclaration"})
- private void readObject(ObjectInputStream objectInputStream) throws IOException, ClassNotFoundException
- {
- objectInputStream.defaultReadObject();
- }
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigDescriptor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigDescriptor.java?rev=1157026&r1=1157025&r2=1157026&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigDescriptor.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigDescriptor.java Fri Aug 12 09:45:40 2011
@@ -37,8 +37,6 @@ import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import java.io.ObjectInputStream;
-import java.io.IOException;
import static org.apache.myfaces.extensions.cdi.core.impl.util.CodiUtils.getContextualReferenceByName;
@@ -416,10 +414,4 @@ public class DefaultViewConfigDescriptor
{
return viewId.hashCode();
}
-
- @SuppressWarnings({"UnusedDeclaration"})
- private void readObject(ObjectInputStream objectInputStream) throws IOException, ClassNotFoundException
- {
- objectInputStream.defaultReadObject();
- }
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/message/JsfAwareMessageHandler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/message/JsfAwareMessageHandler.java?rev=1157026&r1=1157025&r2=1157026&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/message/JsfAwareMessageHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/message/JsfAwareMessageHandler.java Fri Aug 12 09:45:40 2011
@@ -31,8 +31,6 @@ import javax.faces.context.FacesContext;
import javax.faces.application.FacesMessage;
import java.util.List;
import java.util.logging.Logger;
-import java.io.ObjectInputStream;
-import java.io.IOException;
/**
* @author Gerhard Petracek
@@ -147,10 +145,4 @@ class JsfAwareMessageHandler extends Abs
{
throw new UnsupportedOperationException("not implemented");
}
-
- @SuppressWarnings({"UnusedDeclaration"})
- private void readObject(ObjectInputStream objectInputStream) throws IOException, ClassNotFoundException
- {
- objectInputStream.defaultReadObject();
- }
}
\ No newline at end of file
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/BeanStorage.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/BeanStorage.java?rev=1157026&r1=1157025&r2=1157026&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/BeanStorage.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/BeanStorage.java Fri Aug 12 09:45:40 2011
@@ -28,8 +28,6 @@ import javax.enterprise.inject.Any;
import javax.enterprise.inject.Default;
import javax.inject.Named;
import java.io.Serializable;
-import java.io.ObjectInputStream;
-import java.io.IOException;
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
@@ -157,10 +155,4 @@ class BeanStorage implements Serializabl
return result.toString();
}
-
- @SuppressWarnings({"UnusedDeclaration"})
- private void readObject(ObjectInputStream objectInputStream) throws IOException, ClassNotFoundException
- {
- objectInputStream.defaultReadObject();
- }
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/InjectableConversation.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/InjectableConversation.java?rev=1157026&r1=1157025&r2=1157026&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/InjectableConversation.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/InjectableConversation.java Fri Aug 12 09:45:40 2011
@@ -28,8 +28,6 @@ import javax.enterprise.inject.Typed;
import javax.enterprise.inject.spi.Bean;
import java.lang.annotation.Annotation;
import java.util.Set;
-import java.io.ObjectInputStream;
-import java.io.IOException;
/**
* @author Gerhard Petracek
@@ -134,10 +132,4 @@ public class InjectableConversation impl
return this.editableWindowContext.getConversation(this.conversationGroup,
this.qualifiers.toArray(new Annotation[qualifiers.size()]));
}
-
- @SuppressWarnings({"UnusedDeclaration"})
- private void readObject(ObjectInputStream objectInputStream) throws IOException, ClassNotFoundException
- {
- objectInputStream.defaultReadObject();
- }
}
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultFormatterFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultFormatterFactory.java?rev=1157026&r1=1157025&r2=1157026&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultFormatterFactory.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultFormatterFactory.java Fri Aug 12 09:45:40 2011
@@ -28,9 +28,8 @@ import java.util.Collections;
import java.util.Locale;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.logging.Level;
import java.util.logging.Logger;
-import java.io.ObjectInputStream;
-import java.io.IOException;
/**
* TODO change to producer
@@ -42,7 +41,7 @@ public class DefaultFormatterFactory imp
{
private static final long serialVersionUID = -7462205386564870045L;
- private transient Logger logger = getLogger();
+ private static final Logger LOGGER = Logger.getLogger(DefaultFormatterFactory.class.getName());
private CopyOnWriteArrayList<Formatter> formatters = new CopyOnWriteArrayList<Formatter>();
private ConcurrentHashMap<Class<?>, Formatter> formatterCache = null;
@@ -95,7 +94,10 @@ public class DefaultFormatterFactory imp
if (found == null)
{
- getLogger().info("default formatter used for: " + type.getName());
+ if(LOGGER.isLoggable(Level.INFO))
+ {
+ LOGGER.info("default formatter used for: " + type.getName());
+ }
found = FormatterBuilder.createFormatter(type);
}
@@ -153,19 +155,4 @@ public class DefaultFormatterFactory imp
{
return new FormatterConfigKey(type, locale);
}
-
- protected Logger getLogger()
- {
- if(this.logger == null)
- {
- this.logger = Logger.getLogger(getClass().getName());
- }
- return this.logger;
- }
-
- @SuppressWarnings({"UnusedDeclaration"})
- private void readObject(ObjectInputStream objectInputStream) throws IOException, ClassNotFoundException
- {
- objectInputStream.defaultReadObject();
- }
}