You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wink.apache.org by ng...@apache.org on 2009/07/02 05:31:46 UTC
svn commit: r790456 - in /incubator/wink/trunk:
wink-client/src/main/java/org/apache/wink/client/
wink-client/src/test/java/org/apache/wink/client/
wink-common/src/main/java/org/apache/wink/common/internal/application/
wink-common/src/main/java/org/apa...
Author: ngallardo
Date: Thu Jul 2 03:31:43 2009
New Revision: 790456
URL: http://svn.apache.org/viewvc?rev=790456&view=rev
Log:
WINK-9 Initial changes to use SLF4J.
Modified:
incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/RestClient.java
incubator/wink/trunk/wink-client/src/test/java/org/apache/wink/client/ConfigurationTest.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/SimpleSymphonyApplication.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/StringProvider.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/atom/AbstractAtomEntryProvider.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/atom/AbstractAtomFeedProvider.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/JsonJAXBProvider.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/registry/ProvidersRegistry.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/ResourceMetadataCollector.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/FileLoader.java
incubator/wink/trunk/wink-component-test-support/src/main/java/org/apache/wink/test/mock/MockServletInvocationTest.java
incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/resources/DefectTestsResource.java
incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/resources/DefectsResource.java
incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/resources/TestsResource.java
incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/src/main/java/org/apache/wink/example/qadefect/store/DataStore.java
incubator/wink/trunk/wink-examples/apps/SimpleDefects/src/main/java/org/apache/wink/example/simpledefects/resources/DefectsResource.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/MediaTypeMapper.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/handlers/FindRootResourceHandler.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/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/servlet/RestServlet.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/utils/ServletFileLoader.java
incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/html/HtmlMockRequestDispatcher.java
incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/DependenciesInjectionPostProcessor.java
incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringOFFactory.java
incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/server/WebDAVResponseBuilder.java
Modified: incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/RestClient.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/RestClient.java?rev=790456&r1=790455&r2=790456&view=diff
==============================================================================
--- incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/RestClient.java (original)
+++ incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/RestClient.java Thu Jul 2 03:31:43 2009
@@ -151,7 +151,7 @@
if (ProviderMetadataCollector.isProvider(cls)) {
providersRegistry.addProvider(cls);
} else {
- logger.warn(String.format("%s is not a provider. Ignoring.", String.valueOf(cls)));
+ logger.warn("{} is not a provider. Ignoring.", cls);
}
}
}
@@ -162,7 +162,7 @@
if (ProviderMetadataCollector.isProvider(cls)) {
providersRegistry.addProvider(obj);
} else {
- logger.warn(String.format("%s is not a provider. Ignoring.", String.valueOf(obj)));
+ logger.warn("{} is not a provider. Ignoring.", obj);
}
}
}
@@ -179,7 +179,7 @@
if (ProviderMetadataCollector.isProvider(cls)) {
providersRegistry.addProvider(obj, priority);
} else {
- logger.warn(String.format("%s is not a provider. Ignoring.", String.valueOf(obj)));
+ logger.warn("{} is not a provider. Ignoring.", obj);
}
}
}
Modified: incubator/wink/trunk/wink-client/src/test/java/org/apache/wink/client/ConfigurationTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-client/src/test/java/org/apache/wink/client/ConfigurationTest.java?rev=790456&r1=790455&r2=790456&view=diff
==============================================================================
--- incubator/wink/trunk/wink-client/src/test/java/org/apache/wink/client/ConfigurationTest.java (original)
+++ incubator/wink/trunk/wink-client/src/test/java/org/apache/wink/client/ConfigurationTest.java Thu Jul 2 03:31:43 2009
@@ -213,7 +213,7 @@
MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws IOException,
WebApplicationException {
- logger.debug(String.format("Writing %s to stream using %s", t, getClass().getName()));
+ logger.debug("Writing {} to stream using {}", t, getClass().getName());
entityStream.write(t.foo.getBytes(ProviderUtils.getCharset(mediaType)));
}
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=790456&r1=790455&r2=790456&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 Thu Jul 2 03:31:43 2009
@@ -105,11 +105,10 @@
if (ResourceMetadataCollector.isStaticResource(cls) || ProviderMetadataCollector.isProvider(cls)) {
classes.add(cls);
} else {
- logger.warn(String.format(
- "The %s is neither resource nor provider. Ignoring.", cls));
+ logger.warn("The {} is neither resource nor provider. Ignoring.", cls);
}
} catch (ClassNotFoundException e) {
- logger.error(String.format("%s is not a class. Ignoring.", line));
+ logger.error("{} is not a class. Ignoring.", line);
}
}
} catch (IOException e) {
@@ -118,7 +117,7 @@
try {
is.close();
} catch (IOException e) {
- logger.info(String.format("Exception when closing file "), e);
+ logger.info("Exception when closing file", e);
}
}
}
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=790456&r1=790455&r2=790456&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 Thu Jul 2 03:31:43 2009
@@ -79,8 +79,7 @@
private boolean classUnique(Class<? extends Object> cls) {
if (!singletonClasses.add(cls)) {
// the singleton of this class already exists
- logger.warn(String.format("The class %s was already added. Ignored.",
- String.valueOf(cls)));
+ logger.warn("The class {} was already added. Ignored.", cls);
return false;
}
return true;
@@ -107,10 +106,12 @@
boolean valid = counter <= 1;
if (!valid) {
- logger.warn(String.format(
- "The class %s may only have one of the following declarations: %s, %s, %s",
- String.valueOf(cls), Path.class.getName(), DynamicResource.class.getName(),
- Provider.class.getName()));
+ logger.warn("The class {} may only have one of the following declarations: {}, {}, {}", new Object[] {
+ cls,
+ 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/SimpleSymphonyApplication.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/SimpleSymphonyApplication.java?rev=790456&r1=790455&r2=790456&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/SimpleSymphonyApplication.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/SimpleSymphonyApplication.java Thu Jul 2 03:31:43 2009
@@ -63,7 +63,7 @@
try {
jaxRSClasses.addAll(getApplicationFileLoader(getFileStream(applicationConfigFile)).getClasses());
} catch (FileNotFoundException e) {
- logger.warn(String.format("Could not find %s. Ignoring.", applicationConfigFile));
+ logger.warn("Could not find {}. Ignoring.", applicationConfigFile);
}
}
}
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=790456&r1=790455&r2=790456&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 Thu Jul 2 03:31:43 2009
@@ -96,13 +96,13 @@
writer.writeTo(object, method.getTypeClass(), method.getType(), annotations, mediaType, httpHeaders,
entityStream);
} catch (IllegalArgumentException e) {
- logger.error("Error invoking asset method " + method.getMethod().getName());
+ logger.error("Error invoking asset method {}", method.getMethod().getName());
throw new WebApplicationException(e);
} catch (IllegalAccessException e) {
- logger.error("Error invoking asset method " + method.getMethod().getName());
+ logger.error("Error invoking asset method {}", method.getMethod().getName());
throw new WebApplicationException(e);
} catch (InvocationTargetException e) {
- logger.error("Error invoking asset method " + method.getMethod().getName());
+ logger.error("Error invoking asset method {}", method.getMethod().getName());
throw new WebApplicationException(e);
}
}
@@ -132,17 +132,16 @@
method.getMethod().invoke(asset, args);
return asset;
} catch (IllegalArgumentException e) {
- logger.error("Error invoking asset method " + method.getMethod().getName());
+ logger.error("Error invoking asset method {}", method.getMethod().getName());
throw new WebApplicationException(e);
} catch (IllegalAccessException e) {
- logger.error("Error invoking asset method " + method.getMethod().getName());
+ logger.error("Error invoking asset method {}", method.getMethod().getName());
throw new WebApplicationException(e);
} catch (InvocationTargetException e) {
- logger.error("Error invoking asset method " + method.getMethod().getName());
+ logger.error("Error invoking asset method {}", method.getMethod().getName());
throw new WebApplicationException(e);
} catch (InstantiationException e) {
- logger.error("Failed to instantiate asset " + type.getName()
- + ". Assets must have a default public contructor.");
+ logger.error("Failed to instantiate asset {}. Assets must have a default public contructor.", type.getName());
throw new WebApplicationException(e);
}
}
@@ -182,14 +181,14 @@
// verify that the asset has a default public constructor
try {
if (assetType.getConstructor() == null) {
- logger.info("Cannot instantiate asset " + assetType.getName());
+ logger.info("Cannot instantiate asset {}", assetType.getName());
return false;
}
} catch (SecurityException e) {
- logger.info("Cannot instantiate asset " + assetType.getName());
+ logger.info("Cannot instantiate asset {}", assetType.getName());
return false;
} catch (NoSuchMethodException e) {
- logger.info("Cannot instantiate asset " + assetType.getName());
+ logger.info("Cannot instantiate asset {}", assetType.getName());
return false;
}
@@ -352,7 +351,7 @@
if (type != null) {
// we allow to have only one entity parameter
String methodName = method.getDeclaringClass().getName() + "." + method.getName();
- logger.error("Asset locator method " + methodName + " has more than one entity parameter");
+ logger.error("Asset locator method {} has more than one entity parameter", methodName);
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=790456&r1=790455&r2=790456&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 Thu Jul 2 03:31:43 2009
@@ -68,10 +68,7 @@
OutputStream entityStream) throws IOException,
WebApplicationException {
if(!t.canRead() || t.isDirectory()){
- if (logger.isWarnEnabled()) {
- logger.warn(String.format("Can not write file %s to response, file is not readable or a Directory ", t.getAbsoluteFile()));
-
- }
+ logger.warn("Can not write file {} to response, file is not readable or a Directory ", t.getAbsoluteFile());
throw new WebApplicationException();
}else{
FileInputStream fis = new FileInputStream(t);
@@ -97,10 +94,8 @@
dir = new File(uploadDir);
if(!dir.exists() || !dir.isDirectory()){
dir = null;
- if (logger.isWarnEnabled()) {
- logger.warn(String.format("Upload directory \"%s\" does not exist or not a directory, uploading entity to deafult temporary directory", uploadDir));
- }
- throw new WebApplicationException();
+ logger.warn("Upload directory '{}' does not exist or not a directory, uploading entity to deafult temporary directory", uploadDir);
+ throw new WebApplicationException();
}
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/StringProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/StringProvider.java?rev=790456&r1=790455&r2=790456&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/StringProvider.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/StringProvider.java Thu Jul 2 03:31:43 2009
@@ -69,11 +69,9 @@
public void writeTo(String t, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType,
MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws IOException,
WebApplicationException {
-
- if (logger.isDebugEnabled()) {
- logger.debug(String.format("Writing %s to stream using %s", t, getClass().getName()));
- }
-
+
+ logger.debug("Writing {} to stream using {}", t, getClass().getName());
+
entityStream.write(t.getBytes(ProviderUtils.getCharset(mediaType)));
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/atom/AbstractAtomEntryProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/atom/AbstractAtomEntryProvider.java?rev=790456&r1=790455&r2=790456&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/atom/AbstractAtomEntryProvider.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/atom/AbstractAtomEntryProvider.java Thu Jul 2 03:31:43 2009
@@ -79,8 +79,7 @@
if (object instanceof AtomEntry) {
entry = (AtomEntry)object;
} else {
- logger.error(String.format("request entity is not an atom entry (it was unmarshalled as %s)", object
- .getClass()));
+ logger.error("request entity is not an atom entry (it was unmarshalled as {})", object.getClass());
throw new WebApplicationException(Status.BAD_REQUEST);
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/atom/AbstractAtomFeedProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/atom/AbstractAtomFeedProvider.java?rev=790456&r1=790455&r2=790456&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/atom/AbstractAtomFeedProvider.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/atom/AbstractAtomFeedProvider.java Thu Jul 2 03:31:43 2009
@@ -79,8 +79,7 @@
if (object instanceof AtomFeed) {
feed = (AtomFeed)object;
} else {
- logger.error(String.format("request entity is not an atom feed (it was unmarshalled as %s)", object
- .getClass()));
+ logger.error("request entity is not an atom feed (it was unmarshalled as {})", object.getClass());
throw new WebApplicationException(Status.BAD_REQUEST);
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/JsonJAXBProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/JsonJAXBProvider.java?rev=790456&r1=790455&r2=790456&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/JsonJAXBProvider.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/JsonJAXBProvider.java Thu Jul 2 03:31:43 2009
@@ -98,7 +98,7 @@
marshaller.marshal(jaxbObject, handler);
return handler.getJsonResult();
} catch (JAXBException e) {
- logger.error("Failed to convert JAXB object " + type.getName() + " to JSONObject");
+ logger.error("Failed to convert JAXB object {} to JSONObject", type.getName());
throw new WebApplicationException(e);
}
}
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=790456&r1=790455&r2=790456&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 Thu Jul 2 03:31:43 2009
@@ -113,7 +113,7 @@
if (type.getAnnotation(XmlRootElement.class) == null && type.getAnnotation(XmlType.class) != null) {
JAXBElement<?> wrappedJAXBElement = wrapInJAXBElement(jaxbObject, type);
if (wrappedJAXBElement == null) {
- logger.error("Failed to find ObjectFactory for " + type.getName());
+ logger.error("Failed to find ObjectFactory for {}", type.getName());
throw new WebApplicationException();
}
return wrappedJAXBElement;
@@ -143,10 +143,10 @@
}
return null;
}
- logger.warn("Failed to instantiate object factory for " + type.getName());
+ logger.warn("Failed to instantiate object factory for {}", type.getName());
return defaultWrapInJAXBElement(jaxbObject, type);
} catch (Exception e) {
- logger.error("Failed to build JAXBElement for " + type.getName());
+ logger.error("Failed to build JAXBElement for {}", type.getName());
return null;
}
@@ -156,7 +156,7 @@
// XmlType typeAnnotation = type.getAnnotation(XmlType.class);
// // Check that class factory method uses
// if (!typeAnnotation.factoryClass().equals(XmlType.DEFAULT.class)) {
- // logger.error("Failed to build JAXBElement for " + type.getName());
+ // logger.error("Failed to build JAXBElement for {}", type.getName());
// return null;
// }
// Search for Factory
@@ -166,23 +166,21 @@
try {
factoryClass = Thread.currentThread().getContextClassLoader().loadClass(b.toString());
} catch (ClassNotFoundException e) {
- logger.error("ObjectFactory for " + type.getName() + " was not found");
+ logger.error("ObjectFactory for {} was not found", type.getName());
return null;
}
if (!factoryClass.isAnnotationPresent(XmlRegistry.class)) {
- logger.error("Found ObjectFactory for " + type.getName() + " is not annotated with XmlRegistry.class");
+ logger.error("Found ObjectFactory for {} is not annotated with XmlRegistry.class", type.getName());
return null;
}
-
-
return factoryClass;
}
@SuppressWarnings("unchecked")
private JAXBElement<?> defaultWrapInJAXBElement(Object jaxbObject, Class<?> type) {
- logger.info("Creating default JAXBElement for " + type.getName());
+ logger.info("Creating default JAXBElement for {}", type.getName());
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=790456&r1=790455&r2=790456&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 Thu Jul 2 03:31:43 2009
@@ -70,7 +70,7 @@
unmarshaller = getUnmarshaller(classToFill, mediaType);
unmarshaledResource = unmarshaller.unmarshal(new StreamSource(entityStream), classToFill);
} catch (JAXBException e) {
- logger.error("Failed to unmarshal " + type.getName());
+ logger.error("Failed to unmarshal {}", type.getName());
throw new WebApplicationException(e, Response.Status.BAD_REQUEST);
}
return unmarshaledResource;
@@ -92,7 +92,7 @@
marshaller.marshal(t, writer);
writer.flush();
} catch (JAXBException e) {
- logger.error("Failed to marshal " + t.getName());
+ logger.error("Failed to marshal {}", t.getName());
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=790456&r1=790455&r2=790456&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 Thu Jul 2 03:31:43 2009
@@ -71,7 +71,7 @@
unmarshaledResource = unmarshaller.unmarshal(new StreamSource(entityStream), type).getValue();
} catch (JAXBException e) {
- logger.error("Failed to unmarshal " + type.getName());
+ logger.error("Failed to unmarshal {}", type.getName());
throw new WebApplicationException(e, Response.Status.BAD_REQUEST);
}
return unmarshaledResource;
@@ -94,7 +94,7 @@
marshaller.marshal(entityToMarshal, writer);
writer.flush();
} catch (JAXBException e) {
- logger.error("Failed to marshal " + type.getName());
+ logger.error("Failed to marshal {}", type.getName());
throw new WebApplicationException(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=790456&r1=790455&r2=790456&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 Thu Jul 2 03:31:43 2009
@@ -113,9 +113,7 @@
private boolean addProvider(ObjectFactory<?> objectFactory) {
Class<? extends Object> cls = objectFactory.getInstanceClass();
- if (logger.isDebugEnabled()) {
- logger.debug(String.format("Processing provider of type %s", String.valueOf(cls)));
- }
+ logger.debug("Processing provider of type {}", cls);
boolean retValue = false;
@@ -140,7 +138,7 @@
retValue = true;
}
if (retValue == false) {
- logger.warn(String.format("Unknown provider: %s", String.valueOf(cls)));
+ logger.warn("Unknown provider: {}", cls);
}
return retValue;
@@ -405,8 +403,7 @@
data.put(key, set);
}
if (!set.add(objectFactory)) {
- logger.warn(String.format("The set already contains %s. Skipping...",
- String.valueOf(objectFactory)));
+ logger.warn("The set already contains {}. Skipping...", objectFactory);
}
}
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=790456&r1=790455&r2=790456&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 Thu Jul 2 03:31:43 2009
@@ -170,13 +170,13 @@
String methodName = String.format("%s.%s", declaringClass.getName(), method.getName());
for (Injectable id : methodMetadata.getFormalParameters()) {
if (id.getParamType() == Injectable.ParamType.ENTITY) {
- logger.warn(String.format("Sub-Resource locator %s contains an illegal entity parameter. The locator will be ignored.", methodName));
+ logger.warn("Sub-Resource locator {} contains an illegal entity parameter. The locator will be ignored.", methodName);
continue F1;
}
}
// log a warning if the locator has a Produces or Consumes annotation
if (!methodMetadata.getConsumes().isEmpty() || !methodMetadata.getProduces().isEmpty()) {
- logger.warn(String.format("Sub-Resource locator %s is annotated with Consumes/Produces. These annotations are ignored for sub-resource locators", methodName));
+ logger.warn("Sub-Resource locator {} is annotated with Consumes/Produces. These annotations are ignored for sub-resource locators", methodName);
}
getMetadata().getSubResourceLocators().add(methodMetadata);
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/FileLoader.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/FileLoader.java?rev=790456&r1=790455&r2=790456&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/FileLoader.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/FileLoader.java Thu Jul 2 03:31:43 2009
@@ -70,17 +70,12 @@
throw new NullPointerException("fileName");
}
- boolean debugEnabled = logger.isDebugEnabled();
+ logger.debug("Searching for {} in file system.", fileName);
- if (debugEnabled) {
- logger.debug("Searching for " + fileName + " in file system.");
- }
File file = new File(fileName);
if (file.isFile()) {
// since file is a normal file, return it
- if (debugEnabled) {
- logger.debug("File " + fileName + " found in file system.");
- }
+ logger.debug("File {} found in file system.", fileName);
return new FileInputStream(file);
}
@@ -114,32 +109,28 @@
* @throws FileNotFoundException
*/
public static URL loadFileUsingClassLoaders(String filename) throws FileNotFoundException {
- boolean debugEnabled = logger.isDebugEnabled();
- if (debugEnabled) {
- logger.debug("Searching for " + filename + " using thread context classloader.");
- }
+ logger.debug("Searching for {} using thread context classloader.", filename);
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
URL url = loadFileUsingClassLoader(classLoader, filename);
if (url != null) {
return url;
}
- if (debugEnabled) {
- logger.debug("Searching for " + filename + " using current classloader.");
- }
+
+ logger.debug("Searching for {} using current classloader.", filename);
classLoader = FileLoader.class.getClassLoader();
url = loadFileUsingClassLoader(classLoader, filename);
if (url != null) {
return url;
}
- if (debugEnabled) {
- logger.debug("Searching for " + filename + " using system classloader.");
- }
+
+ logger.debug("Searching for {} using system classloader.", filename);
url = ClassLoader.getSystemResource(filename);
if (url == null) {
// well, the last attempt has failed! throw FileNotFoundException
logger.error("Failed to find file using classloaders");
throw new FileNotFoundException(filename);
}
+
return url;
}
Modified: incubator/wink/trunk/wink-component-test-support/src/main/java/org/apache/wink/test/mock/MockServletInvocationTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-component-test-support/src/main/java/org/apache/wink/test/mock/MockServletInvocationTest.java?rev=790456&r1=790455&r2=790456&view=diff
==============================================================================
--- incubator/wink/trunk/wink-component-test-support/src/main/java/org/apache/wink/test/mock/MockServletInvocationTest.java (original)
+++ incubator/wink/trunk/wink-component-test-support/src/main/java/org/apache/wink/test/mock/MockServletInvocationTest.java Thu Jul 2 03:31:43 2009
@@ -195,11 +195,11 @@
// symphonyInstances.add(cls.newInstance());
// }
// } catch (ClassNotFoundException e) {
-// logger.error(String.format("%s is not a class", line));
+// logger.error("{} is not a class", line);
// } catch (InstantiationException e) {
-// logger.error(String.format("Failed to instantiate %s", String.valueOf(cls)));
+// logger.error("Failed to instantiate {}", cls);
// } catch (IllegalAccessException e) {
-// logger.error(String.format("Illegal access to %s", String.valueOf(cls)));
+// logger.error("Illegal access to {}", cls);
// }
// }
// } catch (IOException e) {
@@ -208,7 +208,7 @@
// try {
// is.close();
// } catch (IOException e) {
-// logger.info(String.format("Exception when closing file "), e);
+// logger.info("Exception when closing file", e);
// }
// }
// }
Modified: incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/resources/DefectTestsResource.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/resources/DefectTestsResource.java?rev=790456&r1=790455&r2=790456&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/resources/DefectTestsResource.java (original)
+++ incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/resources/DefectTestsResource.java Thu Jul 2 03:31:43 2009
@@ -73,13 +73,13 @@
// create data object (populated with store data)
DefectBean defect = store.getDefect(defectId);
if (defect == null) {
- logger.error("Defect " + defectId + " was not found");
+ logger.error("Defect {} was not found", defectId);
throw new WebApplicationException(Response.Status.NOT_FOUND);
}
List<TestBean> tests = defect.getTests();
if (tests == null || tests.isEmpty()) {
- logger.error("Defect " + defectId + " has not tests");
+ logger.error("Defect {} has not tests", defectId);
throw new WebApplicationException(Response.Status.NOT_FOUND);
}
Modified: incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/resources/DefectsResource.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/resources/DefectsResource.java?rev=790456&r1=790455&r2=790456&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/resources/DefectsResource.java (original)
+++ incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/resources/DefectsResource.java Thu Jul 2 03:31:43 2009
@@ -211,7 +211,7 @@
DataStore store = DataStore.getInstance();
DefectBean defect = store.getDefect(defectId);
if (defect == null) {
- logger.info("Defect " + defectId + " does not exist");
+ logger.info("Defect {} does not exist", defectId);
throw new WebApplicationException(Response.Status.NOT_FOUND);
}
@@ -239,7 +239,7 @@
// create data object (populated with store data)
DefectBean defect = store.getDefect(defectId);
if (defect == null) {
- logger.info("Defect " + defectId + " does not exist");
+ logger.info("Defect {} does not exist", defectId);
throw new WebApplicationException(Response.Status.NOT_FOUND);
}
@@ -263,7 +263,7 @@
// verify Defect exist in the store, return 404 otherwise
DefectBean bean = store.getDefect(defectId);
if (bean == null) {
- logger.info("Defect " + defectId + " does not exist");
+ logger.info("Defect {} does not exist", defectId);
throw new WebApplicationException(Response.Status.NOT_FOUND);
}
Modified: incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/resources/TestsResource.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/resources/TestsResource.java?rev=790456&r1=790455&r2=790456&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/resources/TestsResource.java (original)
+++ incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/resources/TestsResource.java Thu Jul 2 03:31:43 2009
@@ -101,7 +101,7 @@
// create data object (populated with store data)
TestBean test = store.getTest(testId);
if (test == null) {
- logger.error("Test " + testId + " was not found");
+ logger.error("Test {} was not found", testId);
throw new WebApplicationException(Response.Status.NOT_FOUND);
}
Modified: incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/src/main/java/org/apache/wink/example/qadefect/store/DataStore.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/src/main/java/org/apache/wink/example/qadefect/store/DataStore.java?rev=790456&r1=790455&r2=790456&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/src/main/java/org/apache/wink/example/qadefect/store/DataStore.java (original)
+++ incubator/wink/trunk/wink-examples/apps/QADefectWithSpring/src/main/java/org/apache/wink/example/qadefect/store/DataStore.java Thu Jul 2 03:31:43 2009
@@ -303,7 +303,7 @@
}
// defect matched all filters
// add it to result collection
- logger.debug("Defect " + defect.getId() + " was added to result.");
+ logger.debug("Defect {} was added to result.", defect.getId());
hashSet.add(defect);
}
}
Modified: incubator/wink/trunk/wink-examples/apps/SimpleDefects/src/main/java/org/apache/wink/example/simpledefects/resources/DefectsResource.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/apps/SimpleDefects/src/main/java/org/apache/wink/example/simpledefects/resources/DefectsResource.java?rev=790456&r1=790455&r2=790456&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/apps/SimpleDefects/src/main/java/org/apache/wink/example/simpledefects/resources/DefectsResource.java (original)
+++ incubator/wink/trunk/wink-examples/apps/SimpleDefects/src/main/java/org/apache/wink/example/simpledefects/resources/DefectsResource.java Thu Jul 2 03:31:43 2009
@@ -126,7 +126,7 @@
// create data object (populated with store data)
DefectBean defect = store.getDefect(defectId);
if (defect == null) {
- logger.error("Defect " + defectId + " was not found");
+ logger.error("Defect {} was not found", defectId);
throw new WebApplicationException(Response.Status.NOT_FOUND);
}
// create a new instance of a defect asset
@@ -146,7 +146,7 @@
// verify the defect exists in the store
DefectBean defect = store.getDefect(defectId);
if (defect == null) {
- logger.error("Defect " + defectId + " was not found");
+ logger.error("Defect {} was not found", defectId);
throw new WebApplicationException(Response.Status.NOT_FOUND);
}
@@ -180,7 +180,7 @@
// obtain data object from memory store
DefectBean defect = store.getDefect(defectId);
if (defect == null) {
- logger.error("Defect " + defectId + " was not found");
+ logger.error("Defect {} was not found", defectId);
throw new WebApplicationException(Response.Status.NOT_FOUND);
}
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=790456&r1=790455&r2=790456&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 Thu Jul 2 03:31:43 2009
@@ -270,8 +270,7 @@
is.close();
}
} catch (IOException e) {
- logger.info(String.format("Exception when closing file %s",
- ALTERNATIVE_SHORTCUTS), e);
+ logger.info("Exception when closing file " + ALTERNATIVE_SHORTCUTS, e);
}
}
}
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/MediaTypeMapper.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/MediaTypeMapper.java?rev=790456&r1=790455&r2=790456&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/MediaTypeMapper.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/MediaTypeMapper.java Thu Jul 2 03:31:43 2009
@@ -85,7 +85,7 @@
public void addMapping(String userAgent, String resultMimeType, String typeToSend) {
if (userAgent == null || resultMimeType == null || typeToSend == null) {
- logger.warn(String.format("Record %s is not complete => ignored", userAgent));
+ logger.warn("Record {} is not complete => ignored", userAgent);
return;
}
this.mappings.add(new AgentStartsWith(userAgent, resultMimeType, typeToSend));
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=790456&r1=790455&r2=790456&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 Thu Jul 2 03:31:43 2009
@@ -108,7 +108,7 @@
handleRequestWithoutFaultBarrier(request, response);
} catch (Throwable t) {
// exception was not handled properly
- logger.error("Unhandled exception: ", t);
+ logger.error("Unhandled exception", t);
if (t instanceof RuntimeException) {
// let the servlet container to handle the runtime exception
throw (RuntimeException) t;
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=790456&r1=790455&r2=790456&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 Thu Jul 2 03:31:43 2009
@@ -61,10 +61,7 @@
}
public void process() {
-
- if (logger.isDebugEnabled()) {
- logger.debug("Processing Application:");
- }
+ logger.debug("Processing Application:");
// process singletons
Set<Object> singletons = application.getSingletons();
@@ -82,10 +79,7 @@
processSymphonyApplication((SymphonyApplication) application);
}
- if (logger.isDebugEnabled()) {
- logger.debug("Processing of Application completed.");
- }
-
+ logger.debug("Processing of Application completed.");
}
private void processSymphonyApplication(SymphonyApplication sApplication) {
@@ -97,9 +91,7 @@
}
for (Object obj : instances) {
- if (logger.isDebugEnabled()) {
- logger.debug(String.format("Processing instance: %s", String.valueOf(obj)));
- }
+ logger.debug("Processing instance: {}", obj);
Class<?> cls = obj.getClass();
@@ -112,7 +104,7 @@
} else if (ProviderMetadataCollector.isProvider(cls)) {
providersRegistry.addProvider(obj, priority);
} else {
- logger.warn(String.format("Cannot handle %s. Ignoring.", String.valueOf(obj)));
+ logger.warn("Cannot handle {}. Ignoring.", obj);
}
}
}
@@ -120,10 +112,7 @@
private void processClasses(Set<Class<?>> classes) {
for (Class<?> cls : classes) {
-
- if (logger.isDebugEnabled()) {
- logger.debug(String.format("Processing class: %s", String.valueOf(cls)));
- }
+ logger.debug("Processing class: {}", cls);
// the validations were moved to registry
@@ -132,8 +121,7 @@
} else if (ProviderMetadataCollector.isProvider(cls)) {
providersRegistry.addProvider(cls);
} else {
- logger.warn(String.format("%s is not a resource or a provider. Ignored.",
- String.valueOf(cls)));
+ logger.warn("{} is not a resource or a provider. Ignored.", cls);
}
}
}
@@ -142,10 +130,7 @@
// add singletons
for (Object obj : singletons) {
-
- if (logger.isDebugEnabled()) {
- logger.debug(String.format("Processing singleton: %s", String.valueOf(obj)));
- }
+ logger.debug("Processing singleton: {}", obj);
Class<?> cls = obj.getClass();
@@ -154,8 +139,7 @@
} else if (ProviderMetadataCollector.isProvider(cls)) {
providersRegistry.addProvider(obj);
} else {
- logger.warn(String.format("%s is not a resource or a provider. Ignoring.",
- String.valueOf(obj)));
+ logger.warn("{} is not a resource or a provider. Ignoring.", obj);
}
}
}
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/FindRootResourceHandler.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/FindRootResourceHandler.java?rev=790456&r1=790455&r2=790456&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/FindRootResourceHandler.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/FindRootResourceHandler.java Thu Jul 2 03:31:43 2009
@@ -55,7 +55,7 @@
// get a list of root resources that can handle the request
List<ResourceInstance> matchedResources = registry.getMatchingRootResources(strippedPath);
if (matchedResources.size() == 0) {
- logger.warn("No resource found matching " + context.getUriInfo().getPath(false));
+ logger.warn("No resource found matching {}", context.getUriInfo().getPath(false));
SearchResult result = new SearchResult(new WebApplicationException(Response.Status.NOT_FOUND));
context.setAttribute(SearchResult.class, result);
return;
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=790456&r1=790455&r2=790456&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 Thu Jul 2 03:31:43 2009
@@ -59,18 +59,14 @@
// assert status code is valid
int statusCode = context.getResponseStatusCode();
if (statusCode < 0) {
- if (logger.isDebugEnabled()) {
- logger.debug("Status code was not set. Nothing to do.");
- }
+ logger.debug("Status code was not set. Nothing to do.");
return;
}
// assert response is not committed
final HttpServletResponse httpResponse = context.getAttribute(HttpServletResponse.class);
if (httpResponse.isCommitted()) {
- if (logger.isDebugEnabled()) {
- logger.debug("The response is already committed. Nothing to do.");
- }
+ logger.debug("The response is already committed. Nothing to do.");
return;
}
@@ -136,9 +132,7 @@
// use the provider to write the entity
if (messageBodyWriter != null) {
- if (logger.isDebugEnabled()) {
- logger.debug(String.format("Serialization using provider %s", messageBodyWriter.getClass().getName()));
- }
+ logger.debug("Serialization using provider {}", messageBodyWriter.getClass().getName());
final MultivaluedMap<String,Object> headers = httpHeaders;
@@ -151,8 +145,7 @@
httpHeaders, new FlushHeadersOutputStream(httpResponse, headers));
} else {
- logger.error(String.format("Could not find a writer for %s and %s", entity.getClass().getName(),
- responseMediaType));
+ logger.error("Could not find a writer for {} and {}", entity.getClass().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=790456&r1=790455&r2=790456&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 Thu Jul 2 03:31:43 2009
@@ -40,11 +40,12 @@
Object[] parameters = searchResult.getInvocationParameters();
Object instance = searchResult.getResource().getInstance(context);
if (logger.isDebugEnabled()) {
- logger.debug(String.format(
- "Invoking method %s of declaring class %s on the instance of a class %s with parameters %s",
- javaMethod.getName(), javaMethod.getDeclaringClass().getName(),
- instance.getClass().getName(), Arrays.toString(parameters)));
-
+ logger.debug("Invoking method {} of declaring class {} on the instance of a class {} with parameters {}", new Object[] {
+ javaMethod.getName(),
+ javaMethod.getDeclaringClass().getName(),
+ instance.getClass().getName(),
+ Arrays.toString(parameters)
+ });
}
Object result = javaMethod.invoke(instance, parameters);
context.setResponseEntity(result);
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=790456&r1=790455&r2=790456&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 Thu Jul 2 03:31:43 2009
@@ -203,7 +203,7 @@
if (dispatchedPath != null) {
classMetadata.addPaths(Arrays.asList(dispatchedPath));
if (logger.isDebugEnabled()) {
- logger.debug(String.format("Adding dispatched path from instance: %s", Arrays.toString(dispatchedPath)));
+ logger.debug("Adding dispatched path from instance: {}", Arrays.toString(dispatchedPath));
}
}
@@ -211,7 +211,7 @@
if (parents != null) {
classMetadata.getParentInstances().addAll(Arrays.asList(parents));
if (logger.isDebugEnabled()) {
- logger.debug(String.format("Adding parent beans from instance: %s", Arrays.toString(parents)));
+ logger.debug("Adding parent beans from instance: {}", Arrays.toString(parents));
}
}
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=790456&r1=790455&r2=790456&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 Thu Jul 2 03:31:43 2009
@@ -107,17 +107,12 @@
* priority of the resource
*/
public void addResource(Object instance, double priority) {
- if (logger.isDebugEnabled()) {
- logger.debug(String.format("Adding resource instance: %s with priority: %f", String.valueOf(instance),
- priority));
- }
+ logger.debug("Adding resource instance: {} with priority: {}", instance, priority);
writersLock.lock();
try {
-
if (!applicationValidator.isValidResource(instance.getClass())) {
- logger.warn(String.format("The resource %s is not a valid resource. Ignoring.", String
- .valueOf(instance)));
+ logger.warn("The resource {} is not a valid resource. Ignoring.", instance);
return;
}
@@ -139,15 +134,12 @@
* priority of the resource
*/
public void addResource(Class<?> clazz, double priority) {
- if (logger.isDebugEnabled()) {
- logger.debug(String.format("Adding resource class: %s with priority: %f", String.valueOf(clazz), priority));
- }
+ logger.debug("Adding resource class: {} with priority: {}", clazz, priority);
writersLock.lock();
try {
if (!applicationValidator.isValidResource(clazz)) {
- logger.warn(String.format("The resource class %s is not a valid resource. Ignoring.", String
- .valueOf(clazz)));
+ logger.warn("The resource class {} is not a valid resource. Ignoring.", clazz);
return;
}
ResourceRecord record = resourceRecordsFactory.getResourceRecord(clazz);
@@ -368,7 +360,7 @@
}
}
if (methodRecords.size() == 0) {
- logger.info("Could not find any method supporting " + context.getRequest().getMethod());
+ logger.info("Could not find any method supporting {}", context.getRequest().getMethod());
throw new WebApplicationException(HttpStatus.METHOD_NOT_ALLOWED.getCode());
}
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java?rev=790456&r1=790455&r2=790456&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java Thu Jul 2 03:31:43 2009
@@ -166,7 +166,7 @@
is.close();
}
} catch (IOException e) {
- logger.warn(String.format("Exception when closing file %s", resourceName), e);
+ logger.warn("Exception when closing file " + resourceName, e);
}
}
return properties;
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/utils/ServletFileLoader.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/utils/ServletFileLoader.java?rev=790456&r1=790455&r2=790456&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/utils/ServletFileLoader.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/utils/ServletFileLoader.java Thu Jul 2 03:31:43 2009
@@ -39,9 +39,8 @@
}
if (servletContext != null) {
- if (logger.isDebugEnabled()) {
- logger.debug(String.format("Searching for %s using servlet context.", fileName));
- }
+ logger.debug("Searching for {} using servlet context.", fileName);
+
InputStream is = servletContext.getResourceAsStream(fileName);
if (is != null) {
return is;
Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/html/HtmlMockRequestDispatcher.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/html/HtmlMockRequestDispatcher.java?rev=790456&r1=790455&r2=790456&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/html/HtmlMockRequestDispatcher.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/providers/entity/html/HtmlMockRequestDispatcher.java Thu Jul 2 03:31:43 2009
@@ -70,7 +70,6 @@
Assert.isTrue(false);
}
- if (logger.isDebugEnabled())
- logger.debug("MockRequestDispatcher: including URL [" + url + "]");
+ logger.debug("MockRequestDispatcher: including URL [{}]", url);
}
}
Modified: incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/DependenciesInjectionPostProcessor.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/DependenciesInjectionPostProcessor.java?rev=790456&r1=790455&r2=790456&view=diff
==============================================================================
--- incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/DependenciesInjectionPostProcessor.java (original)
+++ incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/DependenciesInjectionPostProcessor.java Thu Jul 2 03:31:43 2009
@@ -44,8 +44,7 @@
try {
CreationUtils.injectFields(bean, classMetadata, RuntimeContextTLS.getRuntimeContext());
} catch (Exception e) {
- logger.error("Exception occured during the fields injection for bean " + beanName,
- e);
+ logger.error("Exception occured during the fields injection for bean " + beanName, e);
throw new WebApplicationException(e);
}
}
Modified: incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringOFFactory.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringOFFactory.java?rev=790456&r1=790455&r2=790456&view=diff
==============================================================================
--- incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringOFFactory.java (original)
+++ incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringOFFactory.java Thu Jul 2 03:31:43 2009
@@ -82,11 +82,10 @@
if (ResourceMetadataCollector.isStaticResource(cls) || ProviderMetadataCollector.isProvider(cls)) {
SpringObjectFactory old = class2factory.put(cls, objectFactory);
if (old != null) {
- logger.warn(String.format("The %s was replaced by a newer object factory.", cls));
+ logger.warn("The {} was replaced by a newer object factory.", cls);
}
} else {
- logger.warn(String.format("The bean %s of class %s is neither resource nor provider",
- beanName, String.valueOf(cls)));
+ logger.warn("The bean {} of class {} is neither resource nor provider", beanName, cls);
}
}
@@ -97,12 +96,10 @@
dynResource.setBeanName(beanName);
SpringObjectFactory old = id2factory.put(beanName, objectFactory);
if (old != null) {
- logger.warn(String.format("The %s was replaced by a newer object factory.",
- beanName));
+ logger.warn("The {} was replaced by a newer object factory.", beanName);
}
} else {
- logger.warn(String.format("The bean %s of class %s is not a DynamicResource.",
- beanName, String.valueOf(cls)));
+ logger.warn("The bean {} of class {} is not a DynamicResource.", beanName, cls);
}
}
Modified: incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/server/WebDAVResponseBuilder.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/server/WebDAVResponseBuilder.java?rev=790456&r1=790455&r2=790456&view=diff
==============================================================================
--- incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/server/WebDAVResponseBuilder.java (original)
+++ incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/server/WebDAVResponseBuilder.java Thu Jul 2 03:31:43 2009
@@ -374,7 +374,7 @@
}
if (link == null) {
// no link in the resource
- logger.error("The resource " + synd.getId() + " has set no edit or self link");
+ logger.error("The resource {} has set no edit or self link", synd.getId());
throw new WebApplicationException();
}