You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wink.apache.org by bl...@apache.org on 2010/05/31 18:29:46 UTC
svn commit: r949797 [1/2] - in /incubator/wink/trunk:
wink-common/src/main/java/org/apache/wink/common/internal/
wink-common/src/main/java/org/apache/wink/common/internal/application/
wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/...
Author: bluk
Date: Mon May 31 16:29:45 2010
New Revision: 949797
URL: http://svn.apache.org/viewvc?rev=949797&view=rev
Log:
Fixes to the single Messages.getMessage("") method
Add guards to logger calls when there are Messages
Thanks to Jason Dillon for reporting the issue.
Modified:
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/UriBuilderImpl.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationFileLoader.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationValidator.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/SimpleWinkApplication.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/LifecycleManagerUtils.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/AnyContentHandler.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/ModelUtils.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/AssetProvider.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/FileProvider.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/AbstractJAXBProvider.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBElementXmlProvider.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBXmlProvider.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/MediaTypeHeaderDelegate.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ProvidersRegistry.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/ProviderMetadataCollector.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/ResourceMetadataCollector.java
incubator/wink/trunk/wink-guice-server/src/main/java/org/apache/wink/guice/server/internal/lifecycle/WinkGuiceModule.java
incubator/wink/trunk/wink-guice-server/src/main/java/org/apache/wink/guice/server/internal/servlet/GuiceRestServlet.java
incubator/wink/trunk/wink-providers/wink-jettison-provider/src/main/java/org/apache/wink/providers/jettison/JettisonJAXBElementProvider.java
incubator/wink/trunk/wink-providers/wink-jettison-provider/src/main/java/org/apache/wink/providers/jettison/JettisonJAXBProvider.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/RequestProcessor.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/application/ApplicationProcessor.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/UriInfoImpl.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/CreateInvocationParametersHandler.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/FlushResultHandler.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/InvokeMethodHandler.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/PopulateResponseMediaTypeHandler.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRecordFactory.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRegistry.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ServletContextAccessor.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/AdminServlet.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java
incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringLifecycleManager.java
incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/server/WebDAVResponseBuilder.java
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/UriBuilderImpl.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/UriBuilderImpl.java?rev=949797&r1=949796&r2=949797&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/UriBuilderImpl.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/UriBuilderImpl.java Mon May 31 16:29:45 2010
@@ -150,7 +150,7 @@ public class UriBuilderImpl extends UriB
private URI buildInternal(Map<String, ? extends Object> values)
throws IllegalArgumentException, UriBuilderException {
if (logger.isDebugEnabled()) {
- logger.debug("buildInternal({}, {}) entry", values //$NON-NLS-1$
+ logger.debug("buildInternal({}) entry", values //$NON-NLS-1$
);
}
StringBuilder out = new StringBuilder();
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationFileLoader.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationFileLoader.java?rev=949797&r1=949796&r2=949797&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationFileLoader.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationFileLoader.java Mon May 31 16:29:45 2010
@@ -48,11 +48,11 @@ import org.apache.wink.common.internal.u
*/
public class ApplicationFileLoader {
- private static final String WINK_APPLICATION = "META-INF/wink-application"; //$NON-NLS-1$
+ private static final String WINK_APPLICATION = "META-INF/wink-application"; //$NON-NLS-1$
private static final Logger logger =
LoggerFactory
.getLogger(ApplicationFileLoader.class);
- private static final String CORE_APPLICATION = "META-INF/core/wink-providers"; //$NON-NLS-1$
+ private static final String CORE_APPLICATION = "META-INF/core/wink-providers"; //$NON-NLS-1$
private final Set<Class<?>> classes = new LinkedHashSet<Class<?>>();
/**
@@ -72,7 +72,10 @@ public class ApplicationFileLoader {
FileLoader.loadFileUsingClassLoaders(WINK_APPLICATION);
while (applications.hasMoreElements()) {
URL url = applications.nextElement();
- logger.info(Messages.getMessage("loadingApplication", url.toExternalForm())); //$NON-NLS-1$
+ if (logger.isInfoEnabled()) {
+ logger
+ .info(Messages.getMessage("loadingApplication", url.toExternalForm())); //$NON-NLS-1$
+ }
loadClasses(url.openStream());
}
}
@@ -88,7 +91,9 @@ public class ApplicationFileLoader {
* @throws FileNotFoundException - if file is not found
*/
public ApplicationFileLoader(String appConfigFile) throws FileNotFoundException {
- logger.debug(Messages.getMessage("loadingApplication"), appConfigFile); //$NON-NLS-1$
+ if (logger.isDebugEnabled()) {
+ logger.debug(Messages.getMessage("loadingApplication", appConfigFile)); //$NON-NLS-1$
+ }
loadClasses(FileLoader.loadFileAsStream(appConfigFile));
}
@@ -126,15 +131,25 @@ public class ApplicationFileLoader {
cls = ClassUtils.loadClass(line);
if (ResourceMetadataCollector.isStaticResource(cls) || ProviderMetadataCollector
.isProvider(cls)) {
- logger.debug(Messages.getMessage("loadingClassToApplication"), line);
+ if (logger.isDebugEnabled()) {
+ logger.debug(Messages.getMessage("loadingClassToApplication", line));
+ }
classes.add(cls);
} else {
- logger.warn(Messages.getMessage("classNotAResourceNorProvider"), cls);
+ if (logger.isWarnEnabled()) {
+ logger.warn(Messages.getMessage("classNotAResourceNorProvider", cls
+ .getName()));
+ }
}
} catch (ClassNotFoundException e) {
- logger.debug("ClassNotFoundException while loading class", e); //$NON-NLS-1$
+ if (logger.isDebugEnabled()) {
+ logger.debug("ClassNotFoundException while loading class", e); //$NON-NLS-1$
+ }
} catch (NoClassDefFoundError e) {
- logger.debug(Messages.getMessage("classInstantiationExceptionWithMsgFormat", e), e); //$NON-NLS-1$
+ if (logger.isDebugEnabled()) {
+ logger.debug(Messages
+ .getMessage("classInstantiationExceptionWithMsgFormat", line), e); //$NON-NLS-1$
+ }
}
}
} catch (IOException e) {
@@ -143,7 +158,9 @@ public class ApplicationFileLoader {
try {
is.close();
} catch (IOException e) {
- logger.info(Messages.getMessage("exceptionClosingFile"), e); //$NON-NLS-1$
+ if (logger.isInfoEnabled()) {
+ logger.info(Messages.getMessage("exceptionClosingFile"), e); //$NON-NLS-1$
+ }
}
}
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationValidator.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationValidator.java?rev=949797&r1=949796&r2=949797&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationValidator.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationValidator.java Mon May 31 16:29:45 2010
@@ -81,7 +81,9 @@ public class ApplicationValidator {
private boolean classUnique(Class<? extends Object> cls) {
if (!singletonClasses.add(cls)) {
// the singleton of this class already exists
- logger.warn(Messages.getMessage("classAlreadyAdded", cls)); //$NON-NLS-1$
+ if (logger.isWarnEnabled()) {
+ logger.warn(Messages.getMessage("classAlreadyAdded", cls.getName())); //$NON-NLS-1$
+ }
return false;
}
return true;
@@ -108,9 +110,12 @@ public class ApplicationValidator {
boolean valid = counter <= 1;
if (!valid) {
- logger.warn(Messages.getMessage("classNotValid", //$NON-NLS-1$
- new Object[] {cls, Path.class.getName(), DynamicResource.class.getName(),
- Provider.class.getName()}));
+ if (logger.isWarnEnabled()) {
+ logger.warn(Messages.getMessage("classNotValid", //$NON-NLS-1$
+ cls.getName(), Path.class.getName(),
+ DynamicResource.class.getName(),
+ Provider.class.getName()));
+ }
}
return valid;
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/SimpleWinkApplication.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/SimpleWinkApplication.java?rev=949797&r1=949796&r2=949797&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/SimpleWinkApplication.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/SimpleWinkApplication.java Mon May 31 16:29:45 2010
@@ -51,7 +51,7 @@ public class SimpleWinkApplication exten
private static final Logger logger =
LoggerFactory
.getLogger(SimpleWinkApplication.class);
- private static final String FILE_SEPARATOR = ";"; //$NON-NLS-1$
+ private static final String FILE_SEPARATOR = ";"; //$NON-NLS-1$
private final String applicationConfigFiles;
private Set<Class<?>> jaxRSClasses;
@@ -79,7 +79,9 @@ public class SimpleWinkApplication exten
.addAll(getApplicationFileLoader(getFileStream(applicationConfigFile))
.getClasses());
} catch (FileNotFoundException e) {
- logger.warn(Messages.getMessage("configNotFound", applicationConfigFile)); //$NON-NLS-1$
+ if (logger.isWarnEnabled()) {
+ logger.warn(Messages.getMessage("configNotFound", applicationConfigFile)); //$NON-NLS-1$
+ }
}
}
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/LifecycleManagerUtils.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/LifecycleManagerUtils.java?rev=949797&r1=949796&r2=949797&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/LifecycleManagerUtils.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/LifecycleManagerUtils.java Mon May 31 16:29:45 2010
@@ -43,10 +43,14 @@ public class LifecycleManagerUtils {
CreationUtils.injectFields(object, classMetadata, null);
return new SingletonObjectFactory<T>(object);
} catch (IOException e) {
- logger.error(Messages.getMessage("injectionFailureSingleton", cls)); //$NON-NLS-1$
+ if (logger.isErrorEnabled()) {
+ logger.error(Messages.getMessage("injectionFailureSingleton", cls.getName())); //$NON-NLS-1$
+ }
throw new ObjectCreationException(e);
} catch (PrivilegedActionException e) {
- logger.error(Messages.getMessage("injectionFailureSingleton", cls)); //$NON-NLS-1$
+ if (logger.isErrorEnabled()) {
+ logger.error(Messages.getMessage("injectionFailureSingleton", cls.getName())); //$NON-NLS-1$
+ }
throw new ObjectCreationException(e);
}
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/AnyContentHandler.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/AnyContentHandler.java?rev=949797&r1=949796&r2=949797&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/AnyContentHandler.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/AnyContentHandler.java Mon May 31 16:29:45 2010
@@ -82,7 +82,9 @@ public class AnyContentHandler implement
(MessageBodyWriter<Object>)providers.getMessageBodyWriter(cls, cls, null, type);
if (writer == null) {
- logger.error(Messages.getMessage("noWriterFound", cls.getName(), type.toString())); //$NON-NLS-1$
+ if (logger.isErrorEnabled()) {
+ logger.error(Messages.getMessage("noWriterFound", cls.getName(), type.toString())); //$NON-NLS-1$
+ }
throw new WebApplicationException(500);
}
@@ -101,11 +103,10 @@ public class AnyContentHandler implement
byte[] result;
if (contentType.equals("xhtml")) { //$NON-NLS-1$
try {
- result =
- new StringBuilder().append("<div xmlns=\"") //$NON-NLS-1$
- .append(RestConstants.NAMESPACE_XHTML).append("\">").append(os //$NON-NLS-1$
- .toString(ProviderUtils.getCharset(type))).append("</div>").toString() //$NON-NLS-1$
- .getBytes();
+ result = new StringBuilder().append("<div xmlns=\"") //$NON-NLS-1$
+ .append(RestConstants.NAMESPACE_XHTML).append("\">").append(os //$NON-NLS-1$
+ .toString(ProviderUtils.getCharset(type))).append("</div>").toString() //$NON-NLS-1$
+ .getBytes();
} catch (UnsupportedEncodingException e) {
throw new WebApplicationException(e);
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/ModelUtils.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/ModelUtils.java?rev=949797&r1=949796&r2=949797&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/ModelUtils.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/ModelUtils.java Mon May 31 16:29:45 2010
@@ -332,10 +332,11 @@ public class ModelUtils {
mediaType,
httpHeaders,
new ByteArrayInputStream((byte[])value));
-
- // Reset RuntimeContext from temporary above. tempRuntimeContext may be null here, which is ok.
+
+ // Reset RuntimeContext from temporary above. tempRuntimeContext may
+ // be null here, which is ok.
RuntimeContextTLS.setRuntimeContext(tempRuntimeContext);
-
+
return read;
}
throw new ClassCastException("Cannot cast " + value.getClass().getName()
@@ -425,7 +426,9 @@ public class ModelUtils {
if (ProviderMetadataCollector.isProvider(cls)) {
providersRegistry.addProvider(cls);
} else {
- logger.warn(Messages.getMessage("classNotAProvider", cls)); //$NON-NLS-1$
+ if (logger.isWarnEnabled()) {
+ logger.warn(Messages.getMessage("classNotAProvider", cls)); //$NON-NLS-1$
+ }
}
}
}
@@ -437,7 +440,9 @@ public class ModelUtils {
if (ProviderMetadataCollector.isProvider(cls)) {
providersRegistry.addProvider(obj);
} else {
- logger.warn(Messages.getMessage("classNotAProvider", obj.getClass())); //$NON-NLS-1$
+ if (logger.isWarnEnabled()) {
+ logger.warn(Messages.getMessage("classNotAProvider", obj.getClass())); //$NON-NLS-1$
+ }
}
}
}
@@ -455,7 +460,9 @@ public class ModelUtils {
if (ProviderMetadataCollector.isProvider(cls)) {
providersRegistry.addProvider(obj, priority);
} else {
- logger.warn(Messages.getMessage("classNotAProvider", obj.getClass())); //$NON-NLS-1$
+ if (logger.isWarnEnabled()) {
+ logger.warn(Messages.getMessage("classNotAProvider", obj.getClass())); //$NON-NLS-1$
+ }
}
}
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/AssetProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/AssetProvider.java?rev=949797&r1=949796&r2=949797&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/AssetProvider.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/AssetProvider.java Mon May 31 16:29:45 2010
@@ -113,20 +113,26 @@ public class AssetProvider implements Me
httpHeaders,
entityStream);
} catch (IllegalArgumentException e) {
- logger.error(Messages
- .getMessage("assetMethodInvokeError", method.getMethod().getName())); //$NON-NLS-1$
+ if (logger.isErrorEnabled()) {
+ logger.error(Messages
+ .getMessage("assetMethodInvokeError", method.getMethod().getName())); //$NON-NLS-1$
+ }
throw new WebApplicationException(e);
} catch (IllegalAccessException e) {
- logger.error(Messages
- .getMessage("assetMethodInvokeError", method.getMethod().getName())); //$NON-NLS-1$
+ if (logger.isErrorEnabled()) {
+ logger.error(Messages
+ .getMessage("assetMethodInvokeError", method.getMethod().getName())); //$NON-NLS-1$
+ }
throw new WebApplicationException(e);
} catch (InvocationTargetException e) {
Throwable targetException = e.getTargetException();
if (targetException instanceof RuntimeException) {
throw (RuntimeException)targetException;
}
- logger.error(Messages
- .getMessage("assetMethodInvokeError", method.getMethod().getName())); //$NON-NLS-1$
+ if (logger.isErrorEnabled()) {
+ logger.error(Messages
+ .getMessage("assetMethodInvokeError", method.getMethod().getName())); //$NON-NLS-1$
+ }
throw new WebApplicationException(targetException);
}
}
@@ -171,16 +177,22 @@ public class AssetProvider implements Me
if (targetException instanceof RuntimeException) {
throw (RuntimeException)targetException;
}
- logger.error(Messages
- .getMessage("assetMethodInvokeError", method.getMethod().getName())); //$NON-NLS-1$
+ if (logger.isErrorEnabled()) {
+ logger.error(Messages
+ .getMessage("assetMethodInvokeError", method.getMethod().getName())); //$NON-NLS-1$
+ }
throw new WebApplicationException(e);
} catch (InstantiationException e) {
- logger.error(Messages.getMessage("assetMustHavePublicConstructor", type.getName())); //$NON-NLS-1$
+ if (logger.isErrorEnabled()) {
+ logger.error(Messages.getMessage("assetMustHavePublicConstructor", type.getName())); //$NON-NLS-1$
+ }
throw new WebApplicationException(e);
} catch (Exception e) {
- logger.error(Messages
- .getMessage("assetMethodInvokeError", method.getMethod().getName())); //$NON-NLS-1$
+ if (logger.isErrorEnabled()) {
+ logger.error(Messages
+ .getMessage("assetMethodInvokeError", method.getMethod().getName())); //$NON-NLS-1$
+ }
throw new WebApplicationException(e);
}
}
@@ -228,14 +240,20 @@ public class AssetProvider implements Me
// verify that the asset has a default public constructor
try {
if (assetType.getConstructor() == null) {
- logger.info(Messages.getMessage("assetCannotInstantiate", assetType.getName())); //$NON-NLS-1$
+ if (logger.isInfoEnabled()) {
+ logger.info(Messages.getMessage("assetCannotInstantiate", assetType.getName())); //$NON-NLS-1$
+ }
return false;
}
} catch (SecurityException e) {
- logger.info(Messages.getMessage("assetCannotInstantiate", assetType.getName())); //$NON-NLS-1$
+ if (logger.isInfoEnabled()) {
+ logger.info(Messages.getMessage("assetCannotInstantiate", assetType.getName())); //$NON-NLS-1$
+ }
return false;
} catch (NoSuchMethodException e) {
- logger.info(Messages.getMessage("assetCannotInstantiate", assetType.getName())); //$NON-NLS-1$
+ if (logger.isInfoEnabled()) {
+ logger.info(Messages.getMessage("assetCannotInstantiate", assetType.getName())); //$NON-NLS-1$
+ }
return false;
}
@@ -415,8 +433,11 @@ public class AssetProvider implements Me
// we allow to have only one entity parameter
String methodName =
method.getDeclaringClass().getName() + "." + method.getName(); //$NON-NLS-1$
- logger.error(Messages
- .getMessage("assetLocatorMethodMoreThanOneEntityParam", methodName)); //$NON-NLS-1$
+ if (logger.isErrorEnabled()) {
+ logger
+ .error(Messages
+ .getMessage("assetLocatorMethodMoreThanOneEntityParam", methodName)); //$NON-NLS-1$
+ }
throw new WebApplicationException();
}
type = fp.getGenericType();
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/FileProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/FileProvider.java?rev=949797&r1=949796&r2=949797&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/FileProvider.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/FileProvider.java Mon May 31 16:29:45 2010
@@ -46,9 +46,9 @@ import org.slf4j.LoggerFactory;
@Consumes("*/*")
public class FileProvider implements MessageBodyWriter<File>, MessageBodyReader<File> {
private static final Logger logger = LoggerFactory.getLogger(FileProvider.class);
- private String prefix = "FP_PRE"; //$NON-NLS-1$
+ private String prefix = "FP_PRE"; //$NON-NLS-1$
private String uploadDir = null;
- private String suffix = "FP_SUF"; //$NON-NLS-1$
+ private String suffix = "FP_SUF"; //$NON-NLS-1$
/********************** Writer **************************************/
@@ -75,7 +75,9 @@ public class FileProvider implements Mes
MultivaluedMap<String, Object> httpHeaders,
OutputStream entityStream) throws IOException, WebApplicationException {
if (!t.canRead() || t.isDirectory()) {
- logger.warn(Messages.getMessage("cannotUseFileAsResponse"), t.getAbsoluteFile());
+ if (logger.isWarnEnabled()) {
+ logger.warn(Messages.getMessage("cannotUseFileAsResponse", t.getAbsoluteFile()));
+ }
throw new WebApplicationException();
} else {
FileInputStream fis = new FileInputStream(t);
@@ -108,7 +110,9 @@ public class FileProvider implements Mes
dir = new File(uploadDir);
if (!dir.exists() || !dir.isDirectory()) {
dir = null;
- logger.warn(Messages.getMessage("uploadDirDoesNotExist", uploadDir)); //$NON-NLS-1$
+ if (logger.isWarnEnabled()) {
+ logger.warn(Messages.getMessage("uploadDirDoesNotExist", uploadDir)); //$NON-NLS-1$
+ }
throw new WebApplicationException();
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/AbstractJAXBProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/AbstractJAXBProvider.java?rev=949797&r1=949796&r2=949797&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/AbstractJAXBProvider.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/AbstractJAXBProvider.java Mon May 31 16:29:45 2010
@@ -431,7 +431,9 @@ public abstract class AbstractJAXBProvid
if (!isXMLRootElement(type) && isXMLType(type)) {
JAXBElement<?> wrappedJAXBElement = wrapInJAXBElement(jaxbObject, type);
if (wrappedJAXBElement == null) {
- logger.error(Messages.getMessage("jaxbObjectFactoryNotFound", type.getName())); //$NON-NLS-1$
+ if (logger.isErrorEnabled()) {
+ logger.error(Messages.getMessage("jaxbObjectFactoryNotFound", type.getName())); //$NON-NLS-1$
+ }
throw new WebApplicationException();
}
return wrappedJAXBElement;
@@ -463,10 +465,14 @@ public abstract class AbstractJAXBProvid
}
return null;
}
- logger.warn(Messages.getMessage("jaxbObjectFactoryInstantiate", type.getName())); //$NON-NLS-1$
+ if (logger.isWarnEnabled()) {
+ logger.warn(Messages.getMessage("jaxbObjectFactoryInstantiate", type.getName())); //$NON-NLS-1$
+ }
return defaultWrapInJAXBElement(jaxbObject, type);
} catch (Exception e) {
- logger.error(Messages.getMessage("jaxbElementFailToBuild", type.getName())); //$NON-NLS-1$
+ if (logger.isErrorEnabled()) {
+ logger.error(Messages.getMessage("jaxbElementFailToBuild", type.getName())); //$NON-NLS-1$
+ }
return null;
}
@@ -486,13 +492,17 @@ public abstract class AbstractJAXBProvid
try {
factoryClass = Thread.currentThread().getContextClassLoader().loadClass(b.toString());
} catch (ClassNotFoundException e) {
- logger.error(Messages.getMessage("jaxbObjectFactoryNotFound", type.getName())); //$NON-NLS-1$
+ if (logger.isErrorEnabled()) {
+ logger.error(Messages.getMessage("jaxbObjectFactoryNotFound", type.getName())); //$NON-NLS-1$
+ }
return null;
}
if (!factoryClass.isAnnotationPresent(XmlRegistry.class)) {
- logger.error(Messages.getMessage("jaxbObjectFactoryNotAnnotatedXMLRegistry", type //$NON-NLS-1$
- .getName()));
+ if (logger.isErrorEnabled()) {
+ logger.error(Messages.getMessage("jaxbObjectFactoryNotAnnotatedXMLRegistry", type //$NON-NLS-1$
+ .getName()));
+ }
return null;
}
@@ -501,7 +511,9 @@ public abstract class AbstractJAXBProvid
@SuppressWarnings("unchecked")
private JAXBElement<?> defaultWrapInJAXBElement(Object jaxbObject, Class<?> type) {
- logger.info(Messages.getMessage("jaxbCreateDefaultJAXBElement", type.getName())); //$NON-NLS-1$
+ if (logger.isInfoEnabled()) {
+ logger.info(Messages.getMessage("jaxbCreateDefaultJAXBElement", type.getName())); //$NON-NLS-1$
+ }
String typeStr = type.getAnnotation(XmlType.class).name();
return new JAXBElement(new QName(typeStr), type, jaxbObject);
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBElementXmlProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBElementXmlProvider.java?rev=949797&r1=949796&r2=949797&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBElementXmlProvider.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBElementXmlProvider.java Mon May 31 16:29:45 2010
@@ -97,7 +97,9 @@ public class JAXBElementXmlProvider exte
releaseJAXBUnmarshaller(context, unmarshaller);
} catch (JAXBException e) {
- logger.error(Messages.getMessage("jaxbFailToUnmarshal", type.getName()), e); //$NON-NLS-1$
+ if (logger.isErrorEnabled()) {
+ logger.error(Messages.getMessage("jaxbFailToUnmarshal", type.getName()), e); //$NON-NLS-1$
+ }
throw new WebApplicationException(e, Response.Status.BAD_REQUEST);
}
return unmarshaledResource;
@@ -138,7 +140,9 @@ public class JAXBElementXmlProvider exte
releaseJAXBMarshaller(context, marshaller);
} catch (JAXBException e) {
- logger.error(Messages.getMessage("jaxbFailToMarshal", t.getName()), e); //$NON-NLS-1$
+ if (logger.isErrorEnabled()) {
+ logger.error(Messages.getMessage("jaxbFailToMarshal", t.getName()), e); //$NON-NLS-1$
+ }
throw new WebApplicationException(e, Response.Status.INTERNAL_SERVER_ERROR);
}
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBXmlProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBXmlProvider.java?rev=949797&r1=949796&r2=949797&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBXmlProvider.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBXmlProvider.java Mon May 31 16:29:45 2010
@@ -96,7 +96,9 @@ public class JAXBXmlProvider extends Abs
releaseJAXBUnmarshaller(context, unmarshaller);
} catch (JAXBException e) {
- logger.error(Messages.getMessage("jaxbFailToUnmarshal", type.getName()), e); //$NON-NLS-1$
+ if (logger.isErrorEnabled()) {
+ logger.error(Messages.getMessage("jaxbFailToUnmarshal", type.getName()), e); //$NON-NLS-1$
+ }
throw new WebApplicationException(e, Response.Status.BAD_REQUEST);
}
return unmarshaledResource;
@@ -151,7 +153,9 @@ public class JAXBXmlProvider extends Abs
releaseJAXBMarshaller(context, marshaller);
}
} catch (JAXBException e) {
- logger.error(Messages.getMessage("jaxbFailToMarshal", type.getName()), e); //$NON-NLS-1$
+ if (logger.isErrorEnabled()) {
+ logger.error(Messages.getMessage("jaxbFailToMarshal", type.getName()), e); //$NON-NLS-1$
+ }
throw new WebApplicationException(e);
}
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/MediaTypeHeaderDelegate.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/MediaTypeHeaderDelegate.java?rev=949797&r1=949796&r2=949797&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/MediaTypeHeaderDelegate.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/MediaTypeHeaderDelegate.java Mon May 31 16:29:45 2010
@@ -63,7 +63,7 @@ public class MediaTypeHeaderDelegate imp
String[] mainArray = SLASH.split(main);
type = mainArray[0];
if ("".equals(type)) {
- String errMsg = String.format(Messages.getMessage("mediaTypeWrongFormat"), value);
+ String errMsg = Messages.getMessage("mediaTypeWrongFormat", value);
logger.error(errMsg);
throw new IllegalArgumentException(errMsg);
}
@@ -82,7 +82,7 @@ public class MediaTypeHeaderDelegate imp
}
}
} catch (ArrayIndexOutOfBoundsException e) {
- String errMsg = String.format(Messages.getMessage("mediaTypeWrongFormat"), value);
+ String errMsg = Messages.getMessage("mediaTypeWrongFormat", value);
logger.error(errMsg, e);
throw new IllegalArgumentException(errMsg, e);
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ProvidersRegistry.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ProvidersRegistry.java?rev=949797&r1=949796&r2=949797&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ProvidersRegistry.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ProvidersRegistry.java Mon May 31 16:29:45 2010
@@ -157,7 +157,9 @@ public class ProvidersRegistry {
retValue = true;
}
if (retValue == false) {
- logger.warn(Messages.getMessage("classIsUnknownProvider", cls)); //$NON-NLS-1$
+ if (logger.isWarnEnabled()) {
+ logger.warn(Messages.getMessage("classIsUnknownProvider", cls)); //$NON-NLS-1$
+ }
}
return retValue;
@@ -471,7 +473,7 @@ public class ProvidersRegistry {
}
public MediaType getMessageBodyWriterMediaTypeLimitByIsWritable(Class<?> type,
- RuntimeContext runtimeContext) {
+ RuntimeContext runtimeContext) {
List<MediaType> mediaTypes = new ArrayList<MediaType>();
logger.debug("Searching MessageBodyWriters media types limited by class type {}", type); //$NON-NLS-1$
@@ -676,7 +678,9 @@ public class ProvidersRegistry {
}
copyOfMap.put(key, set);
if (!set.add(objectFactory)) {
- logger.warn(Messages.getMessage("mediaTypeSetAlreadyContains", objectFactory)); //$NON-NLS-1$
+ if (logger.isWarnEnabled()) {
+ logger.warn(Messages.getMessage("mediaTypeSetAlreadyContains", objectFactory)); //$NON-NLS-1$
+ }
} else {
// need to resort the entry set
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/ProviderMetadataCollector.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/ProviderMetadataCollector.java?rev=949797&r1=949796&r2=949797&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/ProviderMetadataCollector.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/ProviderMetadataCollector.java Mon May 31 16:29:45 2010
@@ -54,7 +54,9 @@ public class ProviderMetadataCollector e
}
if (Modifier.isInterface(cls.getModifiers()) || Modifier.isAbstract(cls.getModifiers())) {
- logger.warn(Messages.getMessage("providerIsInterfaceOrAbstract", cls));
+ if (logger.isWarnEnabled()) {
+ logger.warn(Messages.getMessage("providerIsInterfaceOrAbstract", cls));
+ }
return false;
}
@@ -68,8 +70,9 @@ public class ProviderMetadataCollector e
// try a superclass
Class<?> superclass = declaringClass.getSuperclass();
if (superclass != null && superclass.getAnnotation(Provider.class) != null) {
- // issue warning
- logger.warn(Messages.getMessage("providerShouldBeAnnotatedDirectly", cls));
+ if (logger.isWarnEnabled()) {
+ logger.warn(Messages.getMessage("providerShouldBeAnnotatedDirectly", cls));
+ }
return true;
}
@@ -77,8 +80,9 @@ public class ProviderMetadataCollector e
Class<?>[] interfaces = declaringClass.getInterfaces();
for (Class<?> interfaceClass : interfaces) {
if (interfaceClass.getAnnotation(Provider.class) != null) {
- // issue warning
- logger.warn(Messages.getMessage("providerShouldBeAnnotatedDirectly", cls));
+ if (logger.isWarnEnabled()) {
+ logger.warn(Messages.getMessage("providerShouldBeAnnotatedDirectly", cls));
+ }
return true;
}
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/ResourceMetadataCollector.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/ResourceMetadataCollector.java?rev=949797&r1=949796&r2=949797&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/ResourceMetadataCollector.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/ResourceMetadataCollector.java Mon May 31 16:29:45 2010
@@ -62,10 +62,10 @@ public class ResourceMetadataCollector e
}
public static boolean isStaticResource(Class<?> cls) {
- if(Modifier.isInterface(cls.getModifiers()) || Modifier.isAbstract(cls.getModifiers())) {
+ if (Modifier.isInterface(cls.getModifiers()) || Modifier.isAbstract(cls.getModifiers())) {
return false;
}
-
+
if (cls.getAnnotation(Path.class) != null) {
return true;
}
@@ -76,8 +76,9 @@ public class ResourceMetadataCollector e
// try a superclass
Class<?> superclass = declaringClass.getSuperclass();
if (superclass.getAnnotation(Path.class) != null) {
- // issue warning
- logger.warn(Messages.getMessage("rootResourceShouldBeAnnotatedDirectly", cls));
+ if (logger.isWarnEnabled()) {
+ logger.warn(Messages.getMessage("rootResourceShouldBeAnnotatedDirectly", cls));
+ }
return true;
}
@@ -85,8 +86,10 @@ public class ResourceMetadataCollector e
Class<?>[] interfaces = declaringClass.getInterfaces();
for (Class<?> interfaceClass : interfaces) {
if (interfaceClass.getAnnotation(Path.class) != null) {
- // issue warning
- logger.warn(Messages.getMessage("rootResourceShouldBeAnnotatedDirectly", cls));
+ if (logger.isWarnEnabled()) {
+ logger.warn(Messages.getMessage("rootResourceShouldBeAnnotatedDirectly",
+ cls));
+ }
return true;
}
}
@@ -217,10 +220,11 @@ public class ResourceMetadataCollector e
String.format("%s.%s", declaringClass.getName(), method.getName());
for (Injectable id : methodMetadata.getFormalParameters()) {
if (id.getParamType() == Injectable.ParamType.ENTITY) {
- logger
- .warn(Messages
- .getMessage("subresourceLocatorIllegalEntityParameter"),
- methodName);
+ if (logger.isWarnEnabled()) {
+ logger.warn(Messages
+ .getMessage("subresourceLocatorIllegalEntityParameter",
+ methodName));
+ }
continue F1;
}
}
@@ -228,10 +232,11 @@ public class ResourceMetadataCollector e
// Consumes annotation
if (!methodMetadata.getConsumes().isEmpty() || !methodMetadata
.getProduces().isEmpty()) {
- logger
- .warn(Messages
- .getMessage("subresourceLocatorAnnotatedConsumesProduces"),
- methodName);
+ if (logger.isWarnEnabled()) {
+ logger.warn(Messages
+ .getMessage("subresourceLocatorAnnotatedConsumesProduces",
+ methodName));
+ }
}
getMetadata().getSubResourceLocators().add(methodMetadata);
}
@@ -332,9 +337,11 @@ public class ResourceMetadataCollector e
// are not HTTP methods/paths
return null;
}
- logger.warn(Messages.getMessage("methodNotAnnotatedCorrectly"),
- method.getName(),
- method.getDeclaringClass().getCanonicalName());
+ if (logger.isWarnEnabled()) {
+ logger.warn(Messages.getMessage("methodNotAnnotatedCorrectly",
+ method.getName(),
+ method.getDeclaringClass().getCanonicalName()));
+ }
return null;
}
Modified: incubator/wink/trunk/wink-guice-server/src/main/java/org/apache/wink/guice/server/internal/lifecycle/WinkGuiceModule.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-guice-server/src/main/java/org/apache/wink/guice/server/internal/lifecycle/WinkGuiceModule.java?rev=949797&r1=949796&r2=949797&view=diff
==============================================================================
--- incubator/wink/trunk/wink-guice-server/src/main/java/org/apache/wink/guice/server/internal/lifecycle/WinkGuiceModule.java (original)
+++ incubator/wink/trunk/wink-guice-server/src/main/java/org/apache/wink/guice/server/internal/lifecycle/WinkGuiceModule.java Mon May 31 16:29:45 2010
@@ -68,12 +68,19 @@ public class WinkGuiceModule extends Abs
public void injectMembers(T instance) {
try {
- CreationUtils.injectFields(instance, classMetaData, RuntimeContextTLS.getRuntimeContext());
+ CreationUtils.injectFields(instance, classMetaData, RuntimeContextTLS
+ .getRuntimeContext());
} catch (IOException e) {
- logger.error(Messages.getMessage("injectionFailureSingleton"), instance.getClass());
+ if (logger.isErrorEnabled()) {
+ logger.error(Messages.getMessage("injectionFailureSingleton", instance
+ .getClass().getName()));
+ }
throw new ObjectCreationException(e);
} catch (PrivilegedActionException e) {
- logger.error(Messages.getMessage("injectionFailureSingleton"), instance.getClass());
+ if (logger.isErrorEnabled()) {
+ logger.error(Messages.getMessage("injectionFailureSingleton", instance
+ .getClass().getName()));
+ }
throw new ObjectCreationException(e);
}
}
Modified: incubator/wink/trunk/wink-guice-server/src/main/java/org/apache/wink/guice/server/internal/servlet/GuiceRestServlet.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-guice-server/src/main/java/org/apache/wink/guice/server/internal/servlet/GuiceRestServlet.java?rev=949797&r1=949796&r2=949797&view=diff
==============================================================================
--- incubator/wink/trunk/wink-guice-server/src/main/java/org/apache/wink/guice/server/internal/servlet/GuiceRestServlet.java (original)
+++ incubator/wink/trunk/wink-guice-server/src/main/java/org/apache/wink/guice/server/internal/servlet/GuiceRestServlet.java Mon May 31 16:29:45 2010
@@ -42,9 +42,11 @@ public class GuiceRestServlet extends Re
throws ClassNotFoundException, InstantiationException, IllegalAccessException {
String initParameter = getInitParameter(DEPLYMENT_CONF_PARAM);
if (initParameter != null) {
- logger.info(Messages.getMessage("restServletUseDeploymentConfigurationParam"),
- initParameter,
- DEPLYMENT_CONF_PARAM);
+ if (logger.isInfoEnabled()) {
+ logger.info(Messages.getMessage("restServletUseDeploymentConfigurationParam",
+ initParameter,
+ DEPLYMENT_CONF_PARAM));
+ }
// use ClassUtils.loadClass instead of Class.forName so we have
// classloader visibility into the Web module in J2EE environments
Class<?> confClass = ClassUtils.loadClass(initParameter);
Modified: incubator/wink/trunk/wink-providers/wink-jettison-provider/src/main/java/org/apache/wink/providers/jettison/JettisonJAXBElementProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-providers/wink-jettison-provider/src/main/java/org/apache/wink/providers/jettison/JettisonJAXBElementProvider.java?rev=949797&r1=949796&r2=949797&view=diff
==============================================================================
--- incubator/wink/trunk/wink-providers/wink-jettison-provider/src/main/java/org/apache/wink/providers/jettison/JettisonJAXBElementProvider.java (original)
+++ incubator/wink/trunk/wink-providers/wink-jettison-provider/src/main/java/org/apache/wink/providers/jettison/JettisonJAXBElementProvider.java Mon May 31 16:29:45 2010
@@ -150,10 +150,14 @@ public class JettisonJAXBElementProvider
unmarshaledResource = unmarshaller.unmarshal(xsr, classToFill);
} catch (JAXBException e) {
- logger.error(Messages.getMessage("jaxbFailToUnmarshal"), type.getName()); //$NON-NLS-1$
+ if (logger.isErrorEnabled()) {
+ logger.error(Messages.getMessage("jaxbFailToUnmarshal", type.getName())); //$NON-NLS-1$
+ }
throw new WebApplicationException(e, Response.Status.BAD_REQUEST);
} catch (XMLStreamException e) {
- logger.error(Messages.getMessage("jaxbFailToUnmarshal"), type.getName()); //$NON-NLS-1$
+ if (logger.isErrorEnabled()) {
+ logger.error(Messages.getMessage("jaxbFailToUnmarshal", type.getName())); //$NON-NLS-1$
+ }
throw new WebApplicationException(e, Response.Status.BAD_REQUEST);
}
return unmarshaledResource;
@@ -199,7 +203,9 @@ public class JettisonJAXBElementProvider
new MappedXMLOutputFactory(outputConfiguration)
.createXMLStreamWriter(writer);
} catch (XMLStreamException e) {
- logger.error(Messages.getMessage("jaxbFailToMarshal"), t.getName()); //$NON-NLS-1$
+ if (logger.isErrorEnabled()) {
+ logger.error(Messages.getMessage("jaxbFailToMarshal", t.getName())); //$NON-NLS-1$
+ }
throw new WebApplicationException(e, Response.Status.INTERNAL_SERVER_ERROR);
}
}
@@ -207,7 +213,9 @@ public class JettisonJAXBElementProvider
marshaller.marshal(t, xsw);
writer.flush();
} catch (JAXBException e) {
- logger.error(Messages.getMessage("jaxbFailToMarshal"), t.getName()); //$NON-NLS-1$
+ if (logger.isErrorEnabled()) {
+ logger.error(Messages.getMessage("jaxbFailToMarshal", t.getName())); //$NON-NLS-1$
+ }
throw new WebApplicationException(e, Response.Status.INTERNAL_SERVER_ERROR);
}
Modified: incubator/wink/trunk/wink-providers/wink-jettison-provider/src/main/java/org/apache/wink/providers/jettison/JettisonJAXBProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-providers/wink-jettison-provider/src/main/java/org/apache/wink/providers/jettison/JettisonJAXBProvider.java?rev=949797&r1=949796&r2=949797&view=diff
==============================================================================
--- incubator/wink/trunk/wink-providers/wink-jettison-provider/src/main/java/org/apache/wink/providers/jettison/JettisonJAXBProvider.java (original)
+++ incubator/wink/trunk/wink-providers/wink-jettison-provider/src/main/java/org/apache/wink/providers/jettison/JettisonJAXBProvider.java Mon May 31 16:29:45 2010
@@ -163,10 +163,14 @@ public class JettisonJAXBProvider extend
unmarshaledResource = unmarshaller.unmarshal(xsr, type).getValue();
}
} catch (JAXBException e) {
- logger.error(Messages.getMessage("jaxbFailToUnmarshal"), type.getName()); //$NON-NLS-1$
+ if (logger.isErrorEnabled()) {
+ logger.error(Messages.getMessage("jaxbFailToUnmarshal", type.getName())); //$NON-NLS-1$
+ }
throw new WebApplicationException(e, Response.Status.BAD_REQUEST);
} catch (XMLStreamException e) {
- logger.error(Messages.getMessage("jaxbFailToUnmarshal"), type.getName()); //$NON-NLS-1$
+ if (logger.isErrorEnabled()) {
+ logger.error(Messages.getMessage("jaxbFailToUnmarshal", type.getName())); //$NON-NLS-1$
+ }
throw new WebApplicationException(e, Response.Status.BAD_REQUEST);
}
return unmarshaledResource;
@@ -209,7 +213,9 @@ public class JettisonJAXBProvider extend
}
marshaller.marshal(entityToMarshal, xsw);
} catch (JAXBException e) {
- logger.error(Messages.getMessage("jaxbFailToMarshal"), type.getName()); //$NON-NLS-1$
+ if (logger.isErrorEnabled()) {
+ logger.error(Messages.getMessage("jaxbFailToMarshal", type.getName())); //$NON-NLS-1$
+ }
throw new WebApplicationException(e);
}
}
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java?rev=949797&r1=949796&r2=949797&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java Mon May 31 16:29:45 2010
@@ -85,17 +85,17 @@ public class DeploymentConfiguration {
private static final String ALTERNATIVE_SHORTCUTS =
"META-INF/wink-alternate-shortcuts.properties"; //$NON-NLS-1$
private static final String HTTP_METHOD_OVERRIDE_HEADERS_PROP =
- "wink.httpMethodOverrideHeaders"; //$NON-NLS-1$
+ "wink.httpMethodOverrideHeaders"; //$NON-NLS-1$
private static final String HANDLERS_FACTORY_CLASS_PROP =
- "wink.handlersFactoryClass"; //$NON-NLS-1$
+ "wink.handlersFactoryClass"; //$NON-NLS-1$
private static final String MEDIATYPE_MAPPER_FACTORY_CLASS_PROP =
- "wink.mediaTypeMapperFactoryClass"; //$NON-NLS-1$
+ "wink.mediaTypeMapperFactoryClass"; //$NON-NLS-1$
private static final String VALIDATE_LOCATION_HEADER =
- "wink.validateLocationHeader"; //$NON-NLS-1$
+ "wink.validateLocationHeader"; //$NON-NLS-1$
private static final String DEFAULT_RESPONSE_CHARSET =
- "wink.response.defaultCharset"; // $NON-NLS-1$
+ "wink.response.defaultCharset"; // $NON-NLS-1$
private static final String USE_ACCEPT_CHARSET =
- "wink.response.useAcceptCharset"; // $NON-NLS-1$
+ "wink.response.useAcceptCharset"; // $NON-NLS-1$
// handler chains
private RequestHandlersChain requestHandlersChain;
private ResponseHandlersChain responseHandlersChain;
@@ -352,14 +352,21 @@ public class DeploymentConfiguration {
MediaTypeMapperFactory handlersFactory = handlerFactoryClass.newInstance();
mediaTypeMapper.addMappings(handlersFactory.getMediaTypeMappings());
} catch (ClassNotFoundException e) {
- logger.error(Messages.getMessage("isNotAClassWithMsgFormat",
- mediaTypeMapperFactoryClassName), e);
+ if (logger.isErrorEnabled()) {
+ logger.error(Messages.getMessage("isNotAClassWithMsgFormat",
+ mediaTypeMapperFactoryClassName), e);
+ }
} catch (InstantiationException e) {
- logger.error(Messages.getMessage("classInstantiationExceptionWithMsgFormat",
- mediaTypeMapperFactoryClassName), e);
+ if (logger.isErrorEnabled()) {
+ logger.error(Messages
+ .getMessage("classInstantiationExceptionWithMsgFormat",
+ mediaTypeMapperFactoryClassName), e);
+ }
} catch (IllegalAccessException e) {
- logger.error(Messages.getMessage("classIllegalAccessWithMsgFormat",
- mediaTypeMapperFactoryClassName), e);
+ if (logger.isErrorEnabled()) {
+ logger.error(Messages.getMessage("classIllegalAccessWithMsgFormat",
+ mediaTypeMapperFactoryClassName), e);
+ }
}
}
}
@@ -561,32 +568,37 @@ public class DeploymentConfiguration {
public String[] getHttpMethodOverrideHeaders() {
return httpMethodOverrideHeaders;
}
-
+
/**
- * isDefaultResponseCharset will write charset=UTF-8 to the response Content-Type header if a response
- * charset is not already explicitly defined.
+ * isDefaultResponseCharset will write charset=UTF-8 to the response
+ * Content-Type header if a response charset is not already explicitly
+ * defined.
+ *
* @return boolean
*/
public boolean isDefaultResponseCharset() {
String val = properties.getProperty(DEFAULT_RESPONSE_CHARSET);
return Boolean.valueOf(val).booleanValue();
}
-
+
public void setDefaultResponseCharset(boolean val) {
properties.setProperty(DEFAULT_RESPONSE_CHARSET, Boolean.toString(val));
}
-
+
/**
- * isUseAcceptCharset will use the Accept-Charset header, if present, to write a charset to the response Content-Type
- * header if a response charset is not already explicitly defined. This setting will override the isDefaultResponseCharset
- * setting when the Accept-Charset header is present.
+ * isUseAcceptCharset will use the Accept-Charset header, if present, to
+ * write a charset to the response Content-Type header if a response charset
+ * is not already explicitly defined. This setting will override the
+ * isDefaultResponseCharset setting when the Accept-Charset header is
+ * present.
+ *
* @return
*/
public boolean isUseAcceptCharset() {
String val = properties.getProperty(USE_ACCEPT_CHARSET);
return Boolean.valueOf(val).booleanValue();
}
-
+
public void setUseAcceptCharset(boolean val) {
properties.setProperty(USE_ACCEPT_CHARSET, Boolean.toString(val));
}
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/RequestProcessor.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/RequestProcessor.java?rev=949797&r1=949796&r2=949797&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/RequestProcessor.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/RequestProcessor.java Mon May 31 16:29:45 2010
@@ -52,16 +52,16 @@ public class RequestProcessor {
private static final Logger logger =
LoggerFactory
.getLogger(RequestProcessor.class);
- private static final String PROPERTY_ROOT_RESOURCE_NONE = "none"; //$NON-NLS-1$
- private static final String PROPERTY_ROOT_RESOURCE_ATOM = "atom"; //$NON-NLS-1$
- private static final String PROPERTY_ROOT_RESOURCE_ATOM_HTML = "atom+html"; //$NON-NLS-1$
+ private static final String PROPERTY_ROOT_RESOURCE_NONE = "none"; //$NON-NLS-1$
+ private static final String PROPERTY_ROOT_RESOURCE_ATOM = "atom"; //$NON-NLS-1$
+ private static final String PROPERTY_ROOT_RESOURCE_ATOM_HTML = "atom+html"; //$NON-NLS-1$
private static final String PROPERTY_ROOT_RESOURCE_DEFAULT =
PROPERTY_ROOT_RESOURCE_ATOM_HTML;
- private static final String PROPERTY_ROOT_RESOURCE = "wink.rootResource"; //$NON-NLS-1$
+ private static final String PROPERTY_ROOT_RESOURCE = "wink.rootResource"; //$NON-NLS-1$
private static final String PROPERTY_ROOT_RESOURCE_CSS =
- "wink.serviceDocumentCssPath"; //$NON-NLS-1$
+ "wink.serviceDocumentCssPath"; //$NON-NLS-1$
private static final String PROPERTY_LOAD_WINK_APPLICATIONS =
- "wink.loadApplications"; //$NON-NLS-1$
+ "wink.loadApplications"; //$NON-NLS-1$
private final DeploymentConfiguration configuration;
@@ -136,7 +136,9 @@ public class RequestProcessor {
if (logger.isDebugEnabled()) {
logger.debug(Messages.getMessage("unhandledExceptionToContainer"), t); //$NON-NLS-1$
} else {
- logger.info(Messages.getMessage("unhandledExceptionToContainer")); //$NON-NLS-1$
+ if (logger.isInfoEnabled()) {
+ logger.info(Messages.getMessage("unhandledExceptionToContainer")); //$NON-NLS-1$
+ }
}
if (t instanceof RuntimeException) {
// let the servlet container to handle the runtime exception
@@ -175,8 +177,8 @@ public class RequestProcessor {
}
private void logException(Throwable t) {
- String messageFormat = Messages.getMessage("exceptionOccurredDuringInvocation");
String exceptionName = t.getClass().getSimpleName();
+ String messageFormat = Messages.getMessage("exceptionOccurredDuringInvocation", exceptionName);
if (t instanceof WebApplicationException) {
WebApplicationException wae = (WebApplicationException)t;
int statusCode = wae.getResponse().getStatus();
@@ -196,7 +198,8 @@ public class RequestProcessor {
logger.info(String.format(messageFormat, exceptionName));
}
} else {
- // don't log the whole call stack for sub-500 return codes unless debugging
+ // don't log the whole call stack for sub-500 return codes
+ // unless debugging
if (logger.isDebugEnabled()) {
logger.debug(String.format(messageFormat, exceptionName), t);
} else {
@@ -212,7 +215,7 @@ public class RequestProcessor {
}
}
- private ServerMessageContext createMessageContext(HttpServletRequest request,
+ private ServerMessageContext createMessageContext(HttpServletRequest request,
HttpServletResponse response) {
ServerMessageContext messageContext =
new ServerMessageContext(request, response, configuration);
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/application/ApplicationProcessor.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/application/ApplicationProcessor.java?rev=949797&r1=949796&r2=949797&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/application/ApplicationProcessor.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/application/ApplicationProcessor.java Mon May 31 16:29:45 2010
@@ -116,16 +116,19 @@ public class ApplicationProcessor {
} else if (ProviderMetadataCollector.isProvider(cls)) {
providersRegistry.addProvider(obj, priority, isSystemApplication);
} else {
- logger.warn(Messages
- .getMessage("classNotADynamicResourceNorResourceNorProvider"), obj);
+ if (logger.isWarnEnabled()) {
+ logger.warn(Messages
+ .getMessage("classNotADynamicResourceNorResourceNorProvider", obj
+ .getClass().getName()));
+ }
}
} catch (Exception e) {
- logger.warn(Messages.getMessage("exceptionOccurredDuringInstanceProcessing"), obj
- .getClass().getCanonicalName());
+ logger.warn(Messages.getMessage("exceptionOccurredDuringInstanceProcessing", obj
+ .getClass().getCanonicalName()));
logger.warn(Messages.getMessage("listExceptionDuringInstanceProcessing"), e);
} catch (NoClassDefFoundError e) {
- logger.warn(Messages.getMessage("exceptionOccurredDuringInstanceProcessing"), obj
- .getClass().getCanonicalName());
+ logger.warn(Messages.getMessage("exceptionOccurredDuringInstanceProcessing", obj
+ .getClass().getCanonicalName()));
logger.warn(Messages.getMessage("listExceptionDuringInstanceProcessing"), e);
}
}
@@ -144,15 +147,23 @@ public class ApplicationProcessor {
} else if (ProviderMetadataCollector.isProvider(cls)) {
providersRegistry.addProvider(cls, priority, isSystemApplication);
} else {
- logger.warn(Messages.getMessage("classNotAResourceNorProvider"), cls);
+ if (logger.isWarnEnabled()) {
+ logger.warn(Messages.getMessage("classNotAResourceNorProvider", cls
+ .getName()));
+ }
}
} catch (Exception e) {
- logger.warn(Messages.getMessage("exceptionOccurredDuringClassProcessing"), cls);
- logger.warn(Messages.getMessage("listExceptionDuringClassProcessing"), e);
+ if (logger.isWarnEnabled()) {
+ logger.warn(Messages.getMessage("exceptionOccurredDuringClassProcessing", cls
+ .getName()));
+ logger.warn(Messages.getMessage("listExceptionDuringClassProcessing"), e);
+ }
} catch (NoClassDefFoundError e) {
- logger.warn(Messages.getMessage("exceptionOccurredDuringClassProcessing"), cls
- .getCanonicalName());
- logger.warn(Messages.getMessage("listExceptionDuringClassProcessing"), e);
+ if (logger.isWarnEnabled()) {
+ logger.warn(Messages.getMessage("exceptionOccurredDuringClassProcessing", cls
+ .getCanonicalName()));
+ logger.warn(Messages.getMessage("listExceptionDuringClassProcessing"), e);
+ }
}
}
}
@@ -171,16 +182,23 @@ public class ApplicationProcessor {
} else if (ProviderMetadataCollector.isProvider(cls)) {
providersRegistry.addProvider(obj, priority, isSystemApplication);
} else {
- logger.warn(Messages.getMessage("classNotAResourceNorProvider"), obj);
+ if (logger.isWarnEnabled()) {
+ logger.warn(Messages.getMessage("classNotAResourceNorProvider", obj
+ .getClass().getName()));
+ }
}
} catch (Exception e) {
- logger.warn(Messages.getMessage("exceptionOccurredDuringSingletonProcessing"), obj
- .getClass().getCanonicalName());
- logger.warn(Messages.getMessage("listExceptionDuringSingletonProcessing"), e);
+ if (logger.isWarnEnabled()) {
+ logger.warn(Messages.getMessage("exceptionOccurredDuringSingletonProcessing",
+ obj.getClass().getCanonicalName()));
+ logger.warn(Messages.getMessage("listExceptionDuringSingletonProcessing"), e);
+ }
} catch (NoClassDefFoundError e) {
- logger.warn(Messages.getMessage("exceptionOccurredDuringSingletonProcessing"), obj
- .getClass().getCanonicalName());
- logger.warn(Messages.getMessage("listExceptionDuringSingletonProcessing"), e);
+ if (logger.isWarnEnabled()) {
+ logger.warn(Messages.getMessage("exceptionOccurredDuringSingletonProcessing",
+ obj.getClass().getCanonicalName()));
+ logger.warn(Messages.getMessage("listExceptionDuringSingletonProcessing"), e);
+ }
}
}
}
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/UriInfoImpl.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/UriInfoImpl.java?rev=949797&r1=949796&r2=949797&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/UriInfoImpl.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/UriInfoImpl.java Mon May 31 16:29:45 2010
@@ -103,7 +103,9 @@ public class UriInfoImpl implements UriI
try {
baseUri = new URI(baseUriString);
} catch (URISyntaxException e) {
- logger.error(Messages.getMessage("uriBadBaseURI", baseUriString), e); //$NON-NLS-1$
+ if (logger.isErrorEnabled()) {
+ logger.error(Messages.getMessage("uriBadBaseURI", baseUriString), e); //$NON-NLS-1$
+ }
}
}
logger.debug("getBaseUri() returning: {}", baseUri); //$NON-NLS-1$
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/CreateInvocationParametersHandler.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/CreateInvocationParametersHandler.java?rev=949797&r1=949796&r2=949797&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/CreateInvocationParametersHandler.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/CreateInvocationParametersHandler.java Mon May 31 16:29:45 2010
@@ -42,7 +42,13 @@ public class CreateInvocationParametersH
List<Injectable> formal = result.getMethod().getMetadata().getFormalParameters();
logger.debug("Formal Injectable parameters list is: {}", formal); //$NON-NLS-1$
Object[] parameters = InjectableFactory.getInstance().instantiate(formal, context);
- logger.debug("Actual parameters list to inject is: {}", parameters); //$NON-NLS-1$
+ if(logger.isDebugEnabled()) {
+ if(parameters == null) {
+ logger.debug("Actual parameters list to inject is: {}", parameters); //$NON-NLS-1$
+ } else {
+ logger.debug("Actual parameters list to inject is: null"); //$NON-NLS-1$
+ }
+ }
result.setInvocationParameters(parameters);
chain.doChain(context);
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/FlushResultHandler.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/FlushResultHandler.java?rev=949797&r1=949796&r2=949797&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/FlushResultHandler.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/FlushResultHandler.java Mon May 31 16:29:45 2010
@@ -206,8 +206,10 @@ public class FlushResultHandler extends
.getDefaultCommandMap()
.createDataContentHandler(responseMediaType.getType() + "/" + responseMediaType.getSubtype()); //$NON-NLS-1$
if (dataContentHandler == null) {
- logger.error(Messages.getMessage("noWriterOrDataSourceProvider", entity.getClass() //$NON-NLS-1$
- .getName(), responseMediaType));
+ if (logger.isErrorEnabled()) {
+ logger.error(Messages.getMessage("noWriterOrDataSourceProvider", entity.getClass() //$NON-NLS-1$
+ .getName(), responseMediaType));
+ }
throw new WebApplicationException(500);
}
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/InvokeMethodHandler.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/InvokeMethodHandler.java?rev=949797&r1=949796&r2=949797&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/InvokeMethodHandler.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/InvokeMethodHandler.java Mon May 31 16:29:45 2010
@@ -51,7 +51,7 @@ public class InvokeMethodHandler extends
Object result = javaMethod.invoke(instance, parameters);
context.setResponseEntity(result);
} catch (InvocationTargetException ite) {
- logger.debug("Exception encountered during invocation: {}", ite.getTargetException()); //$NON-NLS-1$
+ logger.debug("Exception encountered during invocation:", ite.getTargetException()); //$NON-NLS-1$
throw ite.getTargetException(); // unpack the original exception
}
}
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/PopulateResponseMediaTypeHandler.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/PopulateResponseMediaTypeHandler.java?rev=949797&r1=949796&r2=949797&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/PopulateResponseMediaTypeHandler.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/PopulateResponseMediaTypeHandler.java Mon May 31 16:29:45 2010
@@ -44,7 +44,7 @@ public class PopulateResponseMediaTypeHa
LoggerFactory
.getLogger(PopulateResponseMediaTypeHandler.class);
- private static final MediaType APPLICATION_TYPE = new MediaType("application", "*"); //$NON-NLS-1$ //$NON-NLS-2$
+ private static final MediaType APPLICATION_TYPE = new MediaType("application", "*"); //$NON-NLS-1$ //$NON-NLS-2$
private boolean errorFlow = false;
@@ -100,9 +100,11 @@ public class PopulateResponseMediaTypeHa
* This is to inform the application developer that they should
* specify the Content-Type.
*/
- logger
- .info(Messages
- .getMessage("populateResponseMediaTypeHandlerFromCompatibleMessageBodyWriters")); //$NON-NLS-1$
+ if (logger.isInfoEnabled()) {
+ logger
+ .info(Messages
+ .getMessage("populateResponseMediaTypeHandlerFromCompatibleMessageBodyWriters")); //$NON-NLS-1$
+ }
logger
.debug("Determining Content-Type from compatible generic type to {} from MessageBodyWriters: {}", //$NON-NLS-1$
result.getClass(),
@@ -151,8 +153,10 @@ public class PopulateResponseMediaTypeHa
logger.debug("Error flow and no candidates so not going to set a Content-Type"); //$NON-NLS-1$
return;
}
- logger.info(Messages
- .getMessage("populateResponseMediaTypeHandlerNoAcceptableResponse")); //$NON-NLS-1$
+ if (logger.isInfoEnabled()) {
+ logger.info(Messages
+ .getMessage("populateResponseMediaTypeHandlerNoAcceptableResponse")); //$NON-NLS-1$
+ }
throw new WebApplicationException(Response.Status.NOT_ACCEPTABLE);
}
@@ -212,8 +216,10 @@ public class PopulateResponseMediaTypeHa
logger.debug("Error flow so not going to set a response Content-Type"); //$NON-NLS-1$
return;
}
- logger.info(Messages
- .getMessage("populateResponseMediaTypeHandlerNoAcceptableResponse")); //$NON-NLS-1$
+ if (logger.isInfoEnabled()) {
+ logger.info(Messages
+ .getMessage("populateResponseMediaTypeHandlerNoAcceptableResponse")); //$NON-NLS-1$
+ }
throw new WebApplicationException(Response.Status.NOT_ACCEPTABLE);
}
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRecordFactory.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRecordFactory.java?rev=949797&r1=949796&r2=949797&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRecordFactory.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRecordFactory.java Mon May 31 16:29:45 2010
@@ -137,9 +137,9 @@ public class ResourceRecordFactory {
readersLock.lock();
}
} else {
- throw new IllegalArgumentException(String
- .format(Messages.getMessage("rootResourceInstanceIsAnInvalidResource"), instance
- .getClass().getCanonicalName()));
+ throw new IllegalArgumentException(Messages
+ .getMessage("rootResourceInstanceIsAnInvalidResource", instance.getClass()
+ .getCanonicalName()));
}
} else {
// if this is a sub-resource, don't use cache, and don't use the
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRegistry.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRegistry.java?rev=949797&r1=949796&r2=949797&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRegistry.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRegistry.java Mon May 31 16:29:45 2010
@@ -121,7 +121,10 @@ public class ResourceRegistry {
writersLock.lock();
try {
if (!applicationValidator.isValidResource(instance.getClass())) {
- logger.warn(Messages.getMessage("resourceClassNotValid", instance.getClass())); //$NON-NLS-1$
+ if (logger.isWarnEnabled()) {
+ logger.warn(Messages
+ .getMessage("resourceClassNotValid", instance.getClass().getName())); //$NON-NLS-1$
+ }
return;
}
@@ -146,7 +149,9 @@ public class ResourceRegistry {
writersLock.lock();
try {
if (!applicationValidator.isValidResource(clazz)) {
- logger.warn(Messages.getMessage("resourceClassNotValid", clazz)); //$NON-NLS-1$
+ if (logger.isWarnEnabled()) {
+ logger.warn(Messages.getMessage("resourceClassNotValid", clazz.getName())); //$NON-NLS-1$
+ }
return;
}
ResourceRecord record = getRecord(clazz);
@@ -421,8 +426,10 @@ public class ResourceRegistry {
}
}
if (methodRecords.size() == 0) {
- logger.info(Messages.getMessage("noMethodInClassSupportsHTTPMethod"), resource
- .getResourceClass().getName(), context.getRequest().getMethod());
+ if (logger.isInfoEnabled()) {
+ logger.info(Messages.getMessage("noMethodInClassSupportsHTTPMethod", resource
+ .getResourceClass().getName(), context.getRequest().getMethod()));
+ }
Set<String> httpMethods = getOptions(resource);
ResponseBuilder builder = Response.status(HttpStatus.METHOD_NOT_ALLOWED.getCode());
// add 'Allow' header to the response
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ServletContextAccessor.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ServletContextAccessor.java?rev=949797&r1=949796&r2=949797&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ServletContextAccessor.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ServletContextAccessor.java Mon May 31 16:29:45 2010
@@ -69,7 +69,7 @@ public class ServletContextAccessor exte
return (T)new HttpServletResponseWrapperImpl();
}
- throw new IllegalArgumentException(String
- .format(Messages.getMessage("invalidServletContextAccessor"), contextClass));
+ throw new IllegalArgumentException(Messages
+ .getMessage("invalidServletContextAccessor", contextClass));
}
}