You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wink.apache.org by ro...@apache.org on 2010/07/08 18:12:54 UTC
svn commit: r961830 [1/4] - in /incubator/wink/trunk:
wink-client/src/main/java/org/apache/wink/client/
wink-client/src/main/java/org/apache/wink/client/handlers/
wink-client/src/main/java/org/apache/wink/client/internal/
wink-client/src/main/java/org/...
Author: rott
Date: Thu Jul 8 16:12:52 2010
New Revision: 961830
URL: http://svn.apache.org/viewvc?rev=961830&view=rev
Log:
WINK-296: change debug calls to trace calls where appropriate, add wire trace, change MessagesTest to accommodate change
Modified:
incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/ClientConfig.java
incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/handlers/BasicAuthSecurityHandler.java
incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/ResourceImpl.java
incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/handlers/AcceptHeaderHandler.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/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/lifecycle/DefaultLifecycleManager.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/properties/WinkSystemProperties.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/JAXBArrayJSONProvider.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/JAXBXmlProvider.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/AcceptEncodingHeaderDelegate.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/utils/ClassUtils.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/FileLoader.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/UriHelper.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/utils/ProviderUtils.java
incubator/wink/trunk/wink-common/src/main/resources/org/apache/wink/common/internal/i18n/resource.properties
incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/i18n/MessagesTest.java
incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/legacy/DataStore.java
incubator/wink/trunk/wink-providers/wink-json-provider/src/main/java/org/apache/wink/providers/json/JsonArrayProvider.java
incubator/wink/trunk/wink-providers/wink-json-provider/src/main/java/org/apache/wink/providers/json/JsonProvider.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/handlers/AbstractHandlersChain.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/contexts/HttpHeadersImpl.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/RequestImpl.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/ServerMediaTypeCharsetAdjuster.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/FindResourceMethodHandler.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/HeadMethodHandler.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/OptionsMethodHandler.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/PopulateErrorResponseHandler.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/handlers/PopulateResponseStatusHandler.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/AbstractRestServlet.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestFilter.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/servlet/contentencode/ContentEncodingRequestFilter.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/contentencode/ContentEncodingResponseFilter.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
Modified: incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/ClientConfig.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/ClientConfig.java?rev=961830&r1=961829&r2=961830&view=diff
==============================================================================
--- incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/ClientConfig.java (original)
+++ incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/ClientConfig.java Thu Jul 8 16:12:52 2010
@@ -181,7 +181,7 @@ public class ClientConfig implements Clo
try {
return Integer.valueOf(getProperties().getProperty(WINK_CLIENT_CONNECTTIMEOUT)).intValue();
} catch (NumberFormatException e) {
- logger.debug("Value in properties for key {} is invalid. Reverting to default: {}", WINK_CLIENT_CONNECTTIMEOUT, WINK_CLIENT_CONNECTTIMEOUT_DEFAULT); //$NON-NLS-1$
+ logger.trace("Value in properties for key {} is invalid. Reverting to default: {}", WINK_CLIENT_CONNECTTIMEOUT, WINK_CLIENT_CONNECTTIMEOUT_DEFAULT); //$NON-NLS-1$
getProperties().setProperty(WINK_CLIENT_CONNECTTIMEOUT, String.valueOf(WINK_CLIENT_CONNECTTIMEOUT_DEFAULT));
return getReadTimeout(); // this is safe, because it's unit tested. :)
}
@@ -211,7 +211,7 @@ public class ClientConfig implements Clo
try {
return Integer.valueOf(getProperties().getProperty(WINK_CLIENT_READTIMEOUT)).intValue();
} catch (NumberFormatException e) {
- logger.debug("Value in properties for key {} is invalid. Reverting to default: {}", WINK_CLIENT_READTIMEOUT, WINK_CLIENT_READTIMEOUT_DEFAULT); //$NON-NLS-1$
+ logger.trace("Value in properties for key {} is invalid. Reverting to default: {}", WINK_CLIENT_READTIMEOUT, WINK_CLIENT_READTIMEOUT_DEFAULT); //$NON-NLS-1$
getProperties().setProperty(WINK_CLIENT_READTIMEOUT, String.valueOf(WINK_CLIENT_READTIMEOUT_DEFAULT));
return getReadTimeout(); // this is safe, because it's unit tested. :)
}
@@ -438,25 +438,25 @@ public class ClientConfig implements Clo
String connectTimeoutString = System.getProperty(WINK_CLIENT_CONNECTTIMEOUT, String.valueOf(WINK_CLIENT_CONNECTTIMEOUT_DEFAULT));
int toSet = Integer.parseInt(connectTimeoutString);
properties.put(WINK_CLIENT_CONNECTTIMEOUT, String.valueOf(toSet));
- logger.debug("Wink client connectTimeout default value is {}.", toSet); //$NON-NLS-1$
+ logger.trace("Wink client connectTimeout default value is {}.", toSet); //$NON-NLS-1$
} catch (Exception e) {
- logger.debug("Error processing {} system property: {}", WINK_CLIENT_CONNECTTIMEOUT, e); //$NON-NLS-1$
+ logger.trace("Error processing {} system property: {}", WINK_CLIENT_CONNECTTIMEOUT, e); //$NON-NLS-1$
}
try {
String readTimeoutString = System.getProperty(WINK_CLIENT_READTIMEOUT, String.valueOf(WINK_CLIENT_READTIMEOUT_DEFAULT));
int toSet = Integer.parseInt(readTimeoutString);
properties.put(WINK_CLIENT_READTIMEOUT, String.valueOf(toSet));
- logger.debug("Wink client readTimeout default value is {}.", toSet); //$NON-NLS-1$
+ logger.trace("Wink client readTimeout default value is {}.", toSet); //$NON-NLS-1$
} catch (Exception e) {
- logger.debug("Error processing {} system property: {}", WINK_CLIENT_READTIMEOUT, e); //$NON-NLS-1$
+ logger.trace("Error processing {} system property: {}", WINK_CLIENT_READTIMEOUT, e); //$NON-NLS-1$
}
try {
String supportDTD = System.getProperty(WINK_SUPPORT_DTD_EXPANSION, String.valueOf(WINK_CLIENT_SUPPORT_DTD_EXPANSION_DEFAULT));
boolean toSet = Boolean.valueOf(supportDTD); // require "true" or "false", not "yes" or "no" or other variants (see parseBoolean vs. valueOf javadoc)
properties.put(WINK_SUPPORT_DTD_EXPANSION, String.valueOf(toSet));
- logger.debug("Wink client readTimeout default value is {}.", String.valueOf(toSet)); //$NON-NLS-1$
+ logger.trace("Wink client readTimeout default value is {}.", String.valueOf(toSet)); //$NON-NLS-1$
} catch (Exception e) {
- logger.debug("Error processing {} system property: {}", WINK_SUPPORT_DTD_EXPANSION, e); //$NON-NLS-1$
+ logger.trace("Error processing {} system property: {}", WINK_SUPPORT_DTD_EXPANSION, e); //$NON-NLS-1$
}
}
return properties;
Modified: incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/handlers/BasicAuthSecurityHandler.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/handlers/BasicAuthSecurityHandler.java?rev=961830&r1=961829&r2=961830&view=diff
==============================================================================
--- incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/handlers/BasicAuthSecurityHandler.java (original)
+++ incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/handlers/BasicAuthSecurityHandler.java Thu Jul 8 16:12:52 2010
@@ -60,7 +60,7 @@ public class BasicAuthSecurityHandler im
* @param aUserName the user name
*/
public void setUserName(String aUserName) {
- logger.debug("Setting the username to {}", aUserName); //$NON-NLS-1$
+ logger.trace("Setting the username to {}", aUserName); //$NON-NLS-1$
this.handlerUsername = aUserName;
}
@@ -70,7 +70,7 @@ public class BasicAuthSecurityHandler im
* @param aPassword the password to use
*/
public void setPassword(String aPassword) {
- logger.debug("Setting the password"); //$NON-NLS-1$
+ logger.trace("Setting the password"); //$NON-NLS-1$
this.handlerPassword = aPassword;
}
@@ -83,24 +83,24 @@ public class BasicAuthSecurityHandler im
* header
*/
public ClientResponse handle(ClientRequest request, HandlerContext context) throws Exception {
- logger.debug("Entering BasicAuthSecurityHandler.doChain()"); //$NON-NLS-1$
+ logger.trace("Entering BasicAuthSecurityHandler.doChain()"); //$NON-NLS-1$
ClientResponse response = context.doChain(request);
int statusCode = response.getStatusCode();
- logger.debug("Response status code was {}", statusCode); //$NON-NLS-1$
+ logger.trace("Response status code was {}", statusCode); //$NON-NLS-1$
if (statusCode != 401) {
- logger.debug("Status code was not 401 so no need to re-issue request."); //$NON-NLS-1$
+ logger.trace("Status code was not 401 so no need to re-issue request."); //$NON-NLS-1$
return response;
} else {
String userid = handlerUsername;
String password = handlerPassword;
- if (logger.isDebugEnabled()) {
- logger.debug("The 'username' property was set to: {}", userid); //$NON-NLS-1$
- logger.debug("Was the 'password' property set: {}", password != null); //$NON-NLS-1$
+ if (logger.isTraceEnabled()) {
+ logger.trace("The 'username' property was set to: {}", userid); //$NON-NLS-1$
+ logger.trace("Was the 'password' property set: {}", password != null); //$NON-NLS-1$
}
if (!(userid == null || userid.equals("") || password == null || password.equals(""))) { //$NON-NLS-1$ //$NON-NLS-2$
- logger.debug("userid and password set so setting Authorization header"); //$NON-NLS-1$
+ logger.trace("userid and password set so setting Authorization header"); //$NON-NLS-1$
// we have a user credential
String credential = userid + ":" + password; //$NON-NLS-1$
byte[] credBytes = credential.getBytes();
@@ -108,19 +108,19 @@ public class BasicAuthSecurityHandler im
// id and password needs to be base64 encoded
String credEncodedString = "Basic " + new String(encodedCredBytes); //$NON-NLS-1$
request.getHeaders().putSingle(HttpHeaders.AUTHORIZATION, credEncodedString);
- logger.debug("Issuing request again with Authorization header"); //$NON-NLS-1$
+ logger.trace("Issuing request again with Authorization header"); //$NON-NLS-1$
response = context.doChain(request);
if (response.getStatusCode() == 401) {
logger
- .debug("After sending request with Authorization header, still got 401 response"); //$NON-NLS-1$
+ .trace("After sending request with Authorization header, still got 401 response"); //$NON-NLS-1$
throw new ClientAuthenticationException(Messages
.getMessage("serviceFailedToAuthenticateUser", userid)); //$NON-NLS-1$
} else {
- logger.debug("Got a non-401 response, so returning response"); //$NON-NLS-1$
+ logger.trace("Got a non-401 response, so returning response"); //$NON-NLS-1$
return response;
}
} else {
- logger.debug("userid and/or password were not set so throwing exception"); //$NON-NLS-1$
+ logger.trace("userid and/or password were not set so throwing exception"); //$NON-NLS-1$
// no user credential available
throw new ClientAuthenticationException(Messages
.getMessage("missingClientAuthenticationCredentialForUser", userid)); //$NON-NLS-1$
Modified: incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/ResourceImpl.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/ResourceImpl.java?rev=961830&r1=961829&r2=961830&view=diff
==============================================================================
--- incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/ResourceImpl.java (original)
+++ incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/ResourceImpl.java Thu Jul 8 16:12:52 2010
@@ -217,7 +217,7 @@ public class ResourceImpl implements Res
ClientResponse response = context.doChain(request);
int statusCode = response.getStatusCode();
if (ClientUtils.isErrorCode(statusCode)) {
- logger.debug(Messages.getMessage("clientResponseIsErrorCode", String //$NON-NLS-1$
+ logger.trace(Messages.getMessage("clientResponseIsErrorCode", String //$NON-NLS-1$
.valueOf(statusCode)));
throw new ClientWebException(request, response);
}
@@ -243,10 +243,10 @@ public class ResourceImpl implements Res
request.setURI(requestURI);
request.setMethod(method);
request.getHeaders().putAll(headers);
- if (logger.isDebugEnabled()) {
+ if (logger.isTraceEnabled()) {
Integer requestEntityInfo =
(requestEntity == null) ? null : System.identityHashCode(requestEntity);
- logger.debug(Messages.getMessage("clientIssueRequest", new Object[] {method, //$NON-NLS-1$
+ logger.trace(Messages.getMessage("clientIssueRequest", new Object[] {method, //$NON-NLS-1$
requestURI, requestEntityInfo, headers.keySet()}));
}
if (headers.getFirst(HttpHeaders.USER_AGENT) == null) {
Modified: incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/handlers/AcceptHeaderHandler.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/handlers/AcceptHeaderHandler.java?rev=961830&r1=961829&r2=961830&view=diff
==============================================================================
--- incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/handlers/AcceptHeaderHandler.java (original)
+++ incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/handlers/AcceptHeaderHandler.java Thu Jul 8 16:12:52 2010
@@ -49,13 +49,13 @@ public class AcceptHeaderHandler impleme
request.getAttributes().get(ClientRequestImpl.RESPONSE_ENTITY_CLASS_TYPE);
if (responseEntityClassType != null) {
Class<?> classType = (Class<?>)responseEntityClassType;
- logger.debug("Response entity class is: {}", classType); //$NON-NLS-1$
+ logger.trace("Response entity class is: {}", classType); //$NON-NLS-1$
Set<MediaType> mediaTypes =
request.getAttribute(ProvidersRegistry.class)
.getMessageBodyReaderMediaTypesLimitByIsReadable(classType,
RuntimeContextTLS
.getRuntimeContext());
- logger.debug("Found media types: {}", mediaTypes); //$NON-NLS-1$
+ logger.trace("Found media types: {}", mediaTypes); //$NON-NLS-1$
StringBuffer acceptHeader = new StringBuffer();
boolean isFirst = true;
for (MediaType mt : mediaTypes) {
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=961830&r1=961829&r2=961830&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 8 16:12:52 2010
@@ -282,7 +282,7 @@ public class ConfigurationTest extends B
MultivaluedMap<String, Object> httpHeaders,
OutputStream entityStream) throws IOException, WebApplicationException {
- logger.debug("Writing {} to stream using {}", t, getClass().getName());
+ logger.trace("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/UriBuilderImpl.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/UriBuilderImpl.java?rev=961830&r1=961829&r2=961830&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 Thu Jul 8 16:12:52 2010
@@ -63,29 +63,29 @@ public class UriBuilderImpl extends UriB
}
public void reset() {
- logger.debug("Entered reset"); //$NON-NLS-1$
+ logger.trace("Entered reset"); //$NON-NLS-1$
scheme = null;
resetSchemeSpecificPart();
query = null;
fragment = null;
- logger.debug("Exit reset"); //$NON-NLS-1$
+ logger.trace("Exit reset"); //$NON-NLS-1$
}
private void resetSchemeSpecificPart() {
- logger.debug("Entered resetSchemeSpecificPart"); //$NON-NLS-1$
+ logger.trace("Entered resetSchemeSpecificPart"); //$NON-NLS-1$
schemeSpecificPart = null;
userInfo = null;
host = null;
port = -1;
segments = null;
- logger.debug("Exit resetSchemeSpecificPart"); //$NON-NLS-1$
+ logger.trace("Exit resetSchemeSpecificPart"); //$NON-NLS-1$
}
private List<PathSegment> getPathSegments() {
if (segments == null) {
segments = new ArrayList<PathSegment>();
}
- logger.debug("getPathSegments returning {}", segments); //$NON-NLS-1$
+ logger.trace("getPathSegments returning {}", segments); //$NON-NLS-1$
return segments;
}
@@ -93,13 +93,13 @@ public class UriBuilderImpl extends UriB
if (query == null) {
query = new MultivaluedMapImpl<String, String>();
}
- logger.debug("getQuery returning {}", query); //$NON-NLS-1$
+ logger.trace("getQuery returning {}", query); //$NON-NLS-1$
return query;
}
private String constructPathString() {
if (segments == null) {
- logger.debug("constructPathString() returning null because null segments"); //$NON-NLS-1$
+ logger.trace("constructPathString() returning null because null segments"); //$NON-NLS-1$
return null;
}
@@ -108,30 +108,30 @@ public class UriBuilderImpl extends UriB
String segmentStr = segment.toString();
path.append("/"); //$NON-NLS-1$
path.append(segmentStr);
- logger.debug("appending {} from path segment to path", segmentStr); //$NON-NLS-1$
+ logger.trace("appending {} from path segment to path", segmentStr); //$NON-NLS-1$
}
String str = path.toString();
- logger.debug("constructPathString() returning {}", str); //$NON-NLS-1$
+ logger.trace("constructPathString() returning {}", str); //$NON-NLS-1$
return str;
}
private String constructQueryString() {
if (query == null) {
- logger.debug("constructQueryString returning null beause null"); //$NON-NLS-1$
+ logger.trace("constructQueryString returning null beause null"); //$NON-NLS-1$
return null;
}
if (query.size() == 0) {
- logger.debug("constructQueryString returning empty string because string size is 0"); //$NON-NLS-1$
+ logger.trace("constructQueryString returning empty string because string size is 0"); //$NON-NLS-1$
return ""; //$NON-NLS-1$
}
String queryStr = "?" + MultivaluedMapImpl.toString(query, "&"); //$NON-NLS-1$ //$NON-NLS-2$
- logger.debug("constructQueryString returning {}", queryStr); //$NON-NLS-1$
+ logger.trace("constructQueryString returning {}", queryStr); //$NON-NLS-1$
return queryStr;
}
private Set<String> getVariableNamesList() {
- logger.debug("getVariableNamesList() entry"); //$NON-NLS-1$
+ logger.trace("getVariableNamesList() entry"); //$NON-NLS-1$
String constructedPath = constructPathString();
String constructedQuery = constructQueryString();
String uriStr =
@@ -144,14 +144,14 @@ public class UriBuilderImpl extends UriB
fragment);
JaxRsUriTemplateProcessor uriTemplate = new JaxRsUriTemplateProcessor(uriStr);
Set<String> ret = uriTemplate.getVariableNames();
- logger.debug("getVariableNamesList() returning {}", ret); //$NON-NLS-1$
+ logger.trace("getVariableNamesList() returning {}", ret); //$NON-NLS-1$
return ret;
}
private URI buildInternal(Map<String, ? extends Object> values)
throws IllegalArgumentException, UriBuilderException {
- if (logger.isDebugEnabled()) {
- logger.debug("buildInternal({}) entry", values //$NON-NLS-1$
+ if (logger.isTraceEnabled()) {
+ logger.trace("buildInternal({}) entry", values //$NON-NLS-1$
);
}
StringBuilder out = new StringBuilder();
@@ -162,7 +162,7 @@ public class UriBuilderImpl extends UriB
buildFragment(values, out);
String uriString = out.toString();
try {
- logger.debug("buildInternal() exit", uriString); //$NON-NLS-1$
+ logger.trace("buildInternal() exit", uriString); //$NON-NLS-1$
return new URI(uriString);
} catch (URISyntaxException e) {
throw new UriBuilderException(e);
@@ -170,22 +170,22 @@ public class UriBuilderImpl extends UriB
}
private void buildScheme(Map<String, ? extends Object> values, StringBuilder out) {
- logger.debug("buildScheme({}, {}) entry", values, out); //$NON-NLS-1$
+ logger.trace("buildScheme({}, {}) entry", values, out); //$NON-NLS-1$
if (scheme == null) {
- logger.debug("buildScheme() is null so returning"); //$NON-NLS-1$
+ logger.trace("buildScheme() is null so returning"); //$NON-NLS-1$
return;
}
JaxRsUriTemplateProcessor.expand(scheme,
MultivaluedMapImpl.toMultivaluedMapString(values),
out);
out.append(':');
- logger.debug("buildScheme() exit changed out to {}", out); //$NON-NLS-1$
+ logger.trace("buildScheme() exit changed out to {}", out); //$NON-NLS-1$
}
private void buildAuthority(Map<String, ? extends Object> values, StringBuilder out) {
- logger.debug("buildAuthority({}, {}) entry", values, out); //$NON-NLS-1$
+ logger.trace("buildAuthority({}, {}) entry", values, out); //$NON-NLS-1$
if (userInfo == null && host == null && port == -1) {
- logger.debug("buildAuthority() is null so returning"); //$NON-NLS-1$
+ logger.trace("buildAuthority() is null so returning"); //$NON-NLS-1$
return;
}
out.append("//"); //$NON-NLS-1$
@@ -205,16 +205,16 @@ public class UriBuilderImpl extends UriB
out.append(':');
out.append(port);
}
- logger.debug("buildAuthority() exit changed out to {}", out); //$NON-NLS-1$
+ logger.trace("buildAuthority() exit changed out to {}", out); //$NON-NLS-1$
}
private void buildPath(Map<String, ? extends Object> values, StringBuilder out) {
- if (logger.isDebugEnabled()) {
- logger.debug("buildPath({}, {}) entry", new Object[] {values, out //$NON-NLS-1$
+ if (logger.isTraceEnabled()) {
+ logger.trace("buildPath({}, {}) entry", new Object[] {values, out //$NON-NLS-1$
});
}
if (segments == null || segments.size() == 0) {
- logger.debug("buildPath() segments is null or empty so returning"); //$NON-NLS-1$
+ logger.trace("buildPath() segments is null or empty so returning"); //$NON-NLS-1$
return;
}
@@ -270,17 +270,17 @@ public class UriBuilderImpl extends UriB
}
}
}
- if (logger.isDebugEnabled()) {
- logger.debug("buildPath() exit changes out to {} ", out); //$NON-NLS-1$
+ if (logger.isTraceEnabled()) {
+ logger.trace("buildPath() exit changes out to {} ", out); //$NON-NLS-1$
}
}
private void buildQuery(Map<String, ? extends Object> values, StringBuilder out) {
- if (logger.isDebugEnabled()) {
- logger.debug("buildQuery({}, {}) entry", values, out); //$NON-NLS-1$
+ if (logger.isTraceEnabled()) {
+ logger.trace("buildQuery({}, {}) entry", values, out); //$NON-NLS-1$
}
if (query == null || query.size() == 0) {
- logger.debug("buildQuery() exit - query is null"); //$NON-NLS-1$
+ logger.trace("buildQuery() exit - query is null"); //$NON-NLS-1$
return;
}
char delim = '?';
@@ -307,11 +307,11 @@ public class UriBuilderImpl extends UriB
out.append(eQueryValue);
}
}
- logger.debug("buildQuery() exit - changes out to {}", out); //$NON-NLS-1$
+ logger.trace("buildQuery() exit - changes out to {}", out); //$NON-NLS-1$
}
private void buildFragment(Map<String, ? extends Object> values, StringBuilder out) {
- logger.debug("buildFragment({}, {})", values, out); //$NON-NLS-1$
+ logger.trace("buildFragment({}, {})", values, out); //$NON-NLS-1$
if (fragment == null) {
return;
}
@@ -321,7 +321,7 @@ public class UriBuilderImpl extends UriB
eFragment = UriEncoder.encodeFragment(eFragment, true);
out.append('#');
out.append(eFragment);
- logger.debug("buildFragment() exit - changes out to {}", out); //$NON-NLS-1$
+ logger.trace("buildFragment() exit - changes out to {}", out); //$NON-NLS-1$
}
@Override
@@ -337,16 +337,16 @@ public class UriBuilderImpl extends UriB
private URI build(boolean escapePercent, Object... values) throws IllegalArgumentException,
UriBuilderException {
- if (logger.isDebugEnabled()) {
- logger.debug("build({}, {}) enFtry", Boolean.valueOf(escapePercent), Arrays //$NON-NLS-1$
+ if (logger.isTraceEnabled()) {
+ logger.trace("build({}, {}) enFtry", Boolean.valueOf(escapePercent), Arrays //$NON-NLS-1$
.asList(values));
}
if (schemeSpecificPart != null) {
try {
// uri templates will be automatically encoded
URI uri = new URI(scheme, schemeSpecificPart, fragment);
- if (logger.isDebugEnabled()) {
- logger.debug("build() returning {}", uri.toString()); //$NON-NLS-1$
+ if (logger.isTraceEnabled()) {
+ logger.trace("build() returning {}", uri.toString()); //$NON-NLS-1$
}
return uri;
} catch (URISyntaxException e) {
@@ -372,7 +372,7 @@ public class UriBuilderImpl extends UriB
value = escapePercent(value);
}
valuesMap.put(name, value);
- logger.debug("name: {} has value : {}", name, value); //$NON-NLS-1$
+ logger.trace("name: {} has value : {}", name, value); //$NON-NLS-1$
}
++i;
}
@@ -399,14 +399,14 @@ public class UriBuilderImpl extends UriB
private URI buildFromMap(boolean escapePercent, Map<String, ? extends Object> values)
throws IllegalArgumentException, UriBuilderException {
- if (logger.isDebugEnabled()) {
- logger.debug("buildFromMap({}, {})", Boolean.valueOf(escapePercent), values); //$NON-NLS-1$
+ if (logger.isTraceEnabled()) {
+ logger.trace("buildFromMap({}, {})", Boolean.valueOf(escapePercent), values); //$NON-NLS-1$
}
Set<String> names = getVariableNamesList();
if (values == null || (names.size() > values.size())) {
throw new IllegalArgumentException(Messages.getMessage("missingVariable", "values")); //$NON-NLS-1$ //$NON-NLS-2$
}
- logger.debug("names are {}", names); //$NON-NLS-1$
+ logger.trace("names are {}", names); //$NON-NLS-1$
Map<String, Object> valuesMap = new HashMap<String, Object>();
for (String name : names) {
Object value = values.get(name);
@@ -420,14 +420,14 @@ public class UriBuilderImpl extends UriB
valueToPut = escapePercent(valueToPut);
}
valuesMap.put(name, valueToPut);
- logger.debug("name {} set to value {}", name, valueToPut); //$NON-NLS-1$
+ logger.trace("name {} set to value {}", name, valueToPut); //$NON-NLS-1$
}
}
return buildInternal(valuesMap);
}
private String escapePercent(String string) {
- logger.debug("escapePercent({}) entry", string); //$NON-NLS-1$
+ logger.trace("escapePercent({}) entry", string); //$NON-NLS-1$
StringBuilder out = new StringBuilder(string.length());
for (int i = 0; i < string.length(); ++i) {
char c = string.charAt(i);
@@ -438,13 +438,13 @@ public class UriBuilderImpl extends UriB
}
}
String ret = out.toString();
- logger.debug("escapePercent() return {}", ret); //$NON-NLS-1$
+ logger.trace("escapePercent() return {}", ret); //$NON-NLS-1$
return ret;
}
@Override
public UriBuilder clone() {
- logger.debug("clone() entry"); //$NON-NLS-1$
+ logger.trace("clone() entry"); //$NON-NLS-1$
UriBuilderImpl uriBuilder = new UriBuilderImpl();
uriBuilder.scheme(this.scheme);
uriBuilder.userInfo(this.userInfo);
@@ -453,56 +453,56 @@ public class UriBuilderImpl extends UriB
uriBuilder.fragment(this.fragment);
uriBuilder.segments(this.segments);
uriBuilder.query(this.query);
- logger.debug("clone() exit returning {}", uriBuilder); //$NON-NLS-1$
+ logger.trace("clone() exit returning {}", uriBuilder); //$NON-NLS-1$
return uriBuilder;
}
private void query(MultivaluedMap<String, String> query) {
- logger.debug("query({}) entry", query); //$NON-NLS-1$
+ logger.trace("query({}) entry", query); //$NON-NLS-1$
if (query == null) {
- logger.debug("query exit"); //$NON-NLS-1$
+ logger.trace("query exit"); //$NON-NLS-1$
return;
}
this.query = ((MultivaluedMapImpl<String, String>)query).clone();
- logger.debug("query exit"); //$NON-NLS-1$
+ logger.trace("query exit"); //$NON-NLS-1$
}
private void segments(List<PathSegment> pathSegments) {
- logger.debug("segments({}) entry", pathSegments); //$NON-NLS-1$
+ logger.trace("segments({}) entry", pathSegments); //$NON-NLS-1$
if (pathSegments == null) {
- logger.debug("segments() exit"); //$NON-NLS-1$
+ logger.trace("segments() exit"); //$NON-NLS-1$
return;
}
this.segments = new ArrayList<PathSegment>();
for (PathSegment segment : pathSegments) {
this.segments.add(((PathSegmentImpl)segment).clone());
}
- logger.debug("segments() exit"); //$NON-NLS-1$
+ logger.trace("segments() exit"); //$NON-NLS-1$
}
@Override
public UriBuilder fragment(String fragment) {
- logger.debug("fragment({}) entry", fragment); //$NON-NLS-1$
+ logger.trace("fragment({}) entry", fragment); //$NON-NLS-1$
this.fragment = fragment;
- logger.debug("fragment() exit"); //$NON-NLS-1$
+ logger.trace("fragment() exit"); //$NON-NLS-1$
return this;
}
@Override
public UriBuilder host(String host) throws IllegalArgumentException {
- logger.debug("host({}) entry", host); //$NON-NLS-1$
+ logger.trace("host({}) entry", host); //$NON-NLS-1$
if ("".equals(host)) { //$NON-NLS-1$
throw new IllegalArgumentException(Messages.getMessage("variableIsEmpty", "host")); //$NON-NLS-1$ //$NON-NLS-2$
}
this.host = host;
- logger.debug("host() exit"); //$NON-NLS-1$
+ logger.trace("host() exit"); //$NON-NLS-1$
return this;
}
@Override
public UriBuilder matrixParam(String name, Object... values) throws IllegalArgumentException {
- if (logger.isDebugEnabled()) {
- logger.debug("matrixParam({}, {}) entry", name, (values == null) ? null : Arrays //$NON-NLS-1$
+ if (logger.isTraceEnabled()) {
+ logger.trace("matrixParam({}, {}) entry", name, (values == null) ? null : Arrays //$NON-NLS-1$
.asList(values));
}
if (name == null) {
@@ -514,18 +514,18 @@ public class UriBuilderImpl extends UriB
PathSegmentImpl lastSegment = getLastPathSegment();
for (Object value : values) {
lastSegment.getMatrixParameters().add(name, value.toString());
- if (logger.isDebugEnabled()) {
- logger.debug("lastSegment add({}, {})", name, value.toString()); //$NON-NLS-1$
+ if (logger.isTraceEnabled()) {
+ logger.trace("lastSegment add({}, {})", name, value.toString()); //$NON-NLS-1$
}
}
- logger.debug("matrixParam exit"); //$NON-NLS-1$
+ logger.trace("matrixParam exit"); //$NON-NLS-1$
return this;
}
private PathSegmentImpl getLastPathSegment() {
- logger.debug("getLastPathSegment() entry"); //$NON-NLS-1$
+ logger.trace("getLastPathSegment() entry"); //$NON-NLS-1$
List<PathSegment> pathSegments = getPathSegments();
- logger.debug("getPathSegments() is {}", pathSegments); //$NON-NLS-1$
+ logger.trace("getPathSegments() is {}", pathSegments); //$NON-NLS-1$
PathSegmentImpl lastSegment = null;
int lastSegmentIndex = pathSegments.size() - 1;
if (lastSegmentIndex >= 0) {
@@ -534,13 +534,13 @@ public class UriBuilderImpl extends UriB
lastSegment = new PathSegmentImpl(""); //$NON-NLS-1$
pathSegments.add(lastSegment);
}
- logger.debug("getLastPathSegment() returning {}", lastSegment); //$NON-NLS-1$
+ logger.trace("getLastPathSegment() returning {}", lastSegment); //$NON-NLS-1$
return lastSegment;
}
@Override
public UriBuilder path(String path) throws IllegalArgumentException {
- logger.debug("path({}) entry", path); //$NON-NLS-1$
+ logger.trace("path({}) entry", path); //$NON-NLS-1$
if (path == null) {
throw new IllegalArgumentException(Messages.getMessage("variableIsNull", "path")); //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -567,7 +567,7 @@ public class UriBuilderImpl extends UriB
scheme(scheme);
schemeSpecificPart(schemeSpecificPart);
fragment(fragment);
- logger.debug("replacePath() exit"); //$NON-NLS-1$
+ logger.trace("replacePath() exit"); //$NON-NLS-1$
return this;
}
}
@@ -582,13 +582,13 @@ public class UriBuilderImpl extends UriB
_path = path.substring(2);
getPathSegments().add(new PathSegmentImpl("/")); //$NON-NLS-1$
} else {
- logger.debug("path() exit"); //$NON-NLS-1$
+ logger.trace("path() exit"); //$NON-NLS-1$
return this;
}
}
List<PathSegment> list = UriHelper.parsePath(_path);
- logger.debug("path is {}", list); //$NON-NLS-1$
+ logger.trace("path is {}", list); //$NON-NLS-1$
for (PathSegment segment : list) {
segment(segment.getPath());
MultivaluedMap<String, String> matrixParameters = segment.getMatrixParameters();
@@ -596,14 +596,14 @@ public class UriBuilderImpl extends UriB
matrixParam(matrix, matrixParameters.get(matrix).toArray());
}
}
- logger.debug("path() exit"); //$NON-NLS-1$
+ logger.trace("path() exit"); //$NON-NLS-1$
return this;
}
@SuppressWarnings("unchecked")
@Override
public UriBuilder path(Class resource) throws IllegalArgumentException {
- logger.debug("path({}) entry", resource); //$NON-NLS-1$
+ logger.trace("path({}) entry", resource); //$NON-NLS-1$
if (resource == null) {
throw new IllegalArgumentException(Messages.getMessage("variableIsNull", "resource")); //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -613,15 +613,15 @@ public class UriBuilderImpl extends UriB
throw new IllegalArgumentException(Messages.getMessage("resourceNotAnnotated", "Path")); //$NON-NLS-1$ //$NON-NLS-2$
}
String path = pathAnnotation.value();
- logger.debug("path annotation value is {}", path); //$NON-NLS-1$
+ logger.trace("path annotation value is {}", path); //$NON-NLS-1$
path(path);
- logger.debug("path() exit"); //$NON-NLS-1$
+ logger.trace("path() exit"); //$NON-NLS-1$
return this;
}
@Override
public UriBuilder path(Method method) throws IllegalArgumentException {
- logger.debug("path({}) entry", method); //$NON-NLS-1$
+ logger.trace("path({}) entry", method); //$NON-NLS-1$
if (method == null) {
throw new IllegalArgumentException(Messages.getMessage("variableIsNull", "method")); //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -630,16 +630,16 @@ public class UriBuilderImpl extends UriB
throw new IllegalArgumentException(Messages.getMessage("methodNotAnnotated", "Path")); //$NON-NLS-1$ //$NON-NLS-2$
}
String path = pathAnnotation.value();
- logger.debug("path method annotation is {}", path); //$NON-NLS-1$
+ logger.trace("path method annotation is {}", path); //$NON-NLS-1$
path(path);
- logger.debug("path() exit"); //$NON-NLS-1$
+ logger.trace("path() exit"); //$NON-NLS-1$
return this;
}
@SuppressWarnings("unchecked")
@Override
public UriBuilder path(Class resource, String method) throws IllegalArgumentException {
- logger.debug("path({}, {}) entry", resource, method); //$NON-NLS-1$
+ logger.trace("path({}, {}) entry", resource, method); //$NON-NLS-1$
if (resource == null) {
throw new IllegalArgumentException(Messages.getMessage("variableIsNull", "resource")); //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -665,27 +665,27 @@ public class UriBuilderImpl extends UriB
throw new IllegalArgumentException(Messages.getMessage("noMethodAnnotated", "Path")); //$NON-NLS-1$ //$NON-NLS-2$
}
path(foundMethod);
- logger.debug("path() exit"); //$NON-NLS-1$
+ logger.trace("path() exit"); //$NON-NLS-1$
return this;
}
@Override
public UriBuilder port(int port) throws IllegalArgumentException {
- if (logger.isDebugEnabled()) {
- logger.debug("port({}) entry", port); //$NON-NLS-1$
+ if (logger.isTraceEnabled()) {
+ logger.trace("port({}) entry", port); //$NON-NLS-1$
}
if (port < -1) {
throw new IllegalArgumentException(Messages.getMessage("invalidPort")); //$NON-NLS-1$
}
this.port = port;
- logger.debug("port() exit"); //$NON-NLS-1$
+ logger.trace("port() exit"); //$NON-NLS-1$
return this;
}
@Override
public UriBuilder queryParam(String name, Object... values) throws IllegalArgumentException {
- if (logger.isDebugEnabled()) {
- logger.debug("queryParam({}, {}) entry", name, (values == null) ? null : Arrays //$NON-NLS-1$
+ if (logger.isTraceEnabled()) {
+ logger.trace("queryParam({}, {}) entry", name, (values == null) ? null : Arrays //$NON-NLS-1$
.asList(values));
}
if (name == null) {
@@ -695,20 +695,20 @@ public class UriBuilderImpl extends UriB
throw new IllegalArgumentException(Messages.getMessage("variableIsNull", "values")); //$NON-NLS-1$ //$NON-NLS-2$
}
MultivaluedMap<String, String> query = getQuery();
- logger.debug("query map is {}", query); //$NON-NLS-1$
+ logger.trace("query map is {}", query); //$NON-NLS-1$
for (Object value : values) {
if (value == null) {
throw new IllegalArgumentException(Messages.getMessage("variableIsNull", "value")); //$NON-NLS-1$ //$NON-NLS-2$
}
query.add(name, value != null ? value.toString() : null);
}
- logger.debug("queryParam() exit"); //$NON-NLS-1$
+ logger.trace("queryParam() exit"); //$NON-NLS-1$
return this;
}
@Override
public UriBuilder replaceMatrix(String matrix) throws IllegalArgumentException {
- logger.debug("replaceMatrix({}) entry", matrix); //$NON-NLS-1$
+ logger.trace("replaceMatrix({}) entry", matrix); //$NON-NLS-1$
// clear all matrix parameters from existing last segment
PathSegmentImpl lastPathSegment = getLastPathSegment();
lastPathSegment.clearAllMatrixParameters();
@@ -721,15 +721,15 @@ public class UriBuilderImpl extends UriB
// add the matrix parameter and its values
matrixParam(param, matrixValues.toArray());
}
- logger.debug("replaceMatrix() exit"); //$NON-NLS-1$
+ logger.trace("replaceMatrix() exit"); //$NON-NLS-1$
return this;
}
@Override
public UriBuilder replaceMatrixParam(String name, Object... values)
throws IllegalArgumentException {
- if (logger.isDebugEnabled()) {
- logger.debug("replaceMatrixParam({}, {})", name, (values == null) ? null : Arrays //$NON-NLS-1$
+ if (logger.isTraceEnabled()) {
+ logger.trace("replaceMatrixParam({}, {})", name, (values == null) ? null : Arrays //$NON-NLS-1$
.asList(values));
}
if (name == null) {
@@ -745,13 +745,13 @@ public class UriBuilderImpl extends UriB
}
matrixParam(name, values);
}
- logger.debug("replaceMatrixParam() exit"); //$NON-NLS-1$
+ logger.trace("replaceMatrixParam() exit"); //$NON-NLS-1$
return this;
}
@Override
public UriBuilder replacePath(String path) {
- logger.debug("replacePath({}) entry", path); //$NON-NLS-1$
+ logger.trace("replacePath({}) entry", path); //$NON-NLS-1$
if (isFirstCall) {
if (path == null) {
throw new IllegalArgumentException(Messages.getMessage("variableIsNull", "path")); //$NON-NLS-1$ //$NON-NLS-2$
@@ -759,9 +759,9 @@ public class UriBuilderImpl extends UriB
isFirstCall = false;
}
if (path == null) {
- logger.debug("path is null. resetting"); //$NON-NLS-1$
+ logger.trace("path is null. resetting"); //$NON-NLS-1$
reset();
- logger.debug("replacePath() exit"); //$NON-NLS-1$
+ logger.trace("replacePath() exit"); //$NON-NLS-1$
return this;
}
getPathSegments().clear();
@@ -781,7 +781,7 @@ public class UriBuilderImpl extends UriB
scheme(scheme);
schemeSpecificPart(schemeSpecificPart);
fragment(fragment);
- logger.debug("replacePath() exit"); //$NON-NLS-1$
+ logger.trace("replacePath() exit"); //$NON-NLS-1$
return this;
}
}
@@ -789,20 +789,20 @@ public class UriBuilderImpl extends UriB
if (path != null && !"".equals(path)) { //$NON-NLS-1$
path(path);
}
- logger.debug("replacePath() exit"); //$NON-NLS-1$
+ logger.trace("replacePath() exit"); //$NON-NLS-1$
return this;
}
@Override
public UriBuilder replaceQuery(String query) throws IllegalArgumentException {
- logger.debug("replaceQuery({}) entry", query); //$NON-NLS-1$
+ logger.trace("replaceQuery({}) entry", query); //$NON-NLS-1$
getQuery().clear();
if (query != null) {
query = query.replaceAll(" ", "%20"); //$NON-NLS-1$ //$NON-NLS-2$
MultivaluedMap<String, String> queries = UriHelper.parseQuery(query);
// should values be URL encoded or query encoded?
- logger.debug("queries after parsing: {}", queries); //$NON-NLS-1$
+ logger.trace("queries after parsing: {}", queries); //$NON-NLS-1$
MultivaluedMap<String, String> queryValues = getQuery();
for (String name : queries.keySet()) {
List<String> values = queries.get(name);
@@ -815,15 +815,15 @@ public class UriBuilderImpl extends UriB
}
}
}
- logger.debug("replaceQuery() exit"); //$NON-NLS-1$
+ logger.trace("replaceQuery() exit"); //$NON-NLS-1$
return this;
}
@Override
public UriBuilder replaceQueryParam(String name, Object... values)
throws IllegalArgumentException {
- if (logger.isDebugEnabled()) {
- logger.debug("replaceQueryParam({}, {}) entry", name, (values == null) ? null : Arrays //$NON-NLS-1$
+ if (logger.isTraceEnabled()) {
+ logger.trace("replaceQueryParam({}, {}) entry", name, (values == null) ? null : Arrays //$NON-NLS-1$
.asList(values));
}
if (name == null) {
@@ -835,21 +835,21 @@ public class UriBuilderImpl extends UriB
if (values != null) {
queryParam(name, values);
}
- logger.debug("replaceQueryParam() exit"); //$NON-NLS-1$
+ logger.trace("replaceQueryParam() exit"); //$NON-NLS-1$
return this;
}
@Override
public UriBuilder scheme(String scheme) throws IllegalArgumentException {
- logger.debug("scheme({}) entry", scheme); //$NON-NLS-1$
+ logger.trace("scheme({}) entry", scheme); //$NON-NLS-1$
this.scheme = scheme;
- logger.debug("scheme() exit"); //$NON-NLS-1$
+ logger.trace("scheme() exit"); //$NON-NLS-1$
return this;
}
@Override
public UriBuilder schemeSpecificPart(String ssp) throws IllegalArgumentException {
- logger.debug("schemeSpecificPart({}) entry", ssp); //$NON-NLS-1$
+ logger.trace("schemeSpecificPart({}) entry", ssp); //$NON-NLS-1$
if (ssp == null) {
throw new IllegalArgumentException(Messages.getMessage("variableIsNull", "ssp")); //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -889,14 +889,14 @@ public class UriBuilderImpl extends UriB
path = UriEncoder.decodeString(uri.getRawAuthority()) + "/" + path; //$NON-NLS-1$
path(UriEncoder.decodeString(path));
}
- logger.debug("schemeSpecificPart() exit"); //$NON-NLS-1$
+ logger.trace("schemeSpecificPart() exit"); //$NON-NLS-1$
return this;
}
@Override
public UriBuilder segment(String... segments) throws IllegalArgumentException {
- if (logger.isDebugEnabled()) {
- logger.debug("segment({}) entry", (segments == null) ? null : Arrays.asList(segments)); //$NON-NLS-1$
+ if (logger.isTraceEnabled()) {
+ logger.trace("segment({}) entry", (segments == null) ? null : Arrays.asList(segments)); //$NON-NLS-1$
}
if (segments == null) {
throw new IllegalArgumentException(Messages.getMessage("variableIsNull", "segments")); //$NON-NLS-1$ //$NON-NLS-2$
@@ -915,21 +915,21 @@ public class UriBuilderImpl extends UriB
pathSegments.add(new PathSegmentImpl(segments[i]));
}
}
- logger.debug("segment() exit"); //$NON-NLS-1$
+ logger.trace("segment() exit"); //$NON-NLS-1$
return this;
}
@Override
public UriBuilder userInfo(String ui) {
- logger.debug("userInfo({}) entry", ui); //$NON-NLS-1$
+ logger.trace("userInfo({}) entry", ui); //$NON-NLS-1$
userInfo = ui;
- logger.debug("userInfo() exit"); //$NON-NLS-1$
+ logger.trace("userInfo() exit"); //$NON-NLS-1$
return this;
}
@Override
public UriBuilder uri(URI uri) throws IllegalArgumentException {
- logger.debug("Entering uri({})", uri); //$NON-NLS-1$
+ logger.trace("Entering uri({})", uri); //$NON-NLS-1$
if (uri == null) {
throw new IllegalArgumentException(Messages.getMessage("variableIsNull", "uri")); //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -937,38 +937,38 @@ public class UriBuilderImpl extends UriB
isFirstCall = false;
if (uri.getScheme() != null) {
- logger.debug("Constructing scheme"); //$NON-NLS-1$
+ logger.trace("Constructing scheme"); //$NON-NLS-1$
scheme(uri.getScheme());
}
if (uri.getRawUserInfo() != null) {
- logger.debug("Constructing userInfo"); //$NON-NLS-1$
+ logger.trace("Constructing userInfo"); //$NON-NLS-1$
userInfo(uri.getRawUserInfo());
}
if (uri.getHost() != null) {
- logger.debug("Constructing host"); //$NON-NLS-1$
+ logger.trace("Constructing host"); //$NON-NLS-1$
host(uri.getHost());
}
if (uri.getPort() != -1) {
- logger.debug("Constructing port"); //$NON-NLS-1$
+ logger.trace("Constructing port"); //$NON-NLS-1$
port(uri.getPort());
}
if (uri.getRawPath() != null) {
- logger.debug("Constructing rawPath"); //$NON-NLS-1$
+ logger.trace("Constructing rawPath"); //$NON-NLS-1$
path(uri.getRawPath());
}
if (uri.getRawQuery() != null) {
- logger.debug("Constructing rawQuery"); //$NON-NLS-1$
+ logger.trace("Constructing rawQuery"); //$NON-NLS-1$
replaceQuery(uri.getRawQuery());
}
if (uri.getRawFragment() != null) {
- logger.debug("Constructing fragment"); //$NON-NLS-1$
+ logger.trace("Constructing fragment"); //$NON-NLS-1$
fragment(uri.getRawFragment());
}
if (uri.getRawSchemeSpecificPart() != null) {
- logger.debug("Constructing schemeSpecificPart"); //$NON-NLS-1$
+ logger.trace("Constructing schemeSpecificPart"); //$NON-NLS-1$
schemeSpecificPart(uri.getRawSchemeSpecificPart());
}
- logger.debug("uri() exit"); //$NON-NLS-1$
+ logger.trace("uri() exit"); //$NON-NLS-1$
return this;
}
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=961830&r1=961829&r2=961830&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 8 16:12:52 2010
@@ -91,8 +91,8 @@ public class ApplicationFileLoader {
* @throws FileNotFoundException - if file is not found
*/
public ApplicationFileLoader(String appConfigFile) throws FileNotFoundException {
- if (logger.isDebugEnabled()) {
- logger.debug(Messages.getMessage("loadingApplication", appConfigFile)); //$NON-NLS-1$
+ if (logger.isTraceEnabled()) {
+ logger.trace(Messages.getMessage("loadingApplication", appConfigFile)); //$NON-NLS-1$
}
loadClasses(FileLoader.loadFileAsStream(appConfigFile));
}
@@ -131,8 +131,8 @@ public class ApplicationFileLoader {
cls = ClassUtils.loadClass(line);
if (ResourceMetadataCollector.isStaticResource(cls) || ProviderMetadataCollector
.isProvider(cls)) {
- if (logger.isDebugEnabled()) {
- logger.debug(Messages.getMessage("loadingClassToApplication", line)); //$NON-NLS-1$
+ if (logger.isTraceEnabled()) {
+ logger.trace(Messages.getMessage("loadingClassToApplication", line)); //$NON-NLS-1$
}
classes.add(cls);
} else {
@@ -142,12 +142,12 @@ public class ApplicationFileLoader {
}
}
} catch (ClassNotFoundException e) {
- if (logger.isDebugEnabled()) {
- logger.debug("ClassNotFoundException while loading class", e); //$NON-NLS-1$
+ if (logger.isTraceEnabled()) {
+ logger.trace("ClassNotFoundException while loading class", e); //$NON-NLS-1$
}
} catch (NoClassDefFoundError e) {
- if (logger.isDebugEnabled()) {
- logger.debug(Messages
+ if (logger.isTraceEnabled()) {
+ logger.trace(Messages
.getMessage("classInstantiationExceptionWithMsgFormat", line), e); //$NON-NLS-1$
}
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/DefaultLifecycleManager.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/DefaultLifecycleManager.java?rev=961830&r1=961829&r2=961830&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/DefaultLifecycleManager.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/DefaultLifecycleManager.java Thu Jul 8 16:12:52 2010
@@ -59,7 +59,7 @@ class DefaultLifecycleManager<T> impleme
throw new NullPointerException(Messages.getMessage("variableIsNull", "object")); //$NON-NLS-1$ //$NON-NLS-2$
}
- logger.debug("Creating a {} for {}", SingletonObjectFactory.class, object); //$NON-NLS-1$
+ logger.trace("Creating a {} for {}", SingletonObjectFactory.class, object); //$NON-NLS-1$
return LifecycleManagerUtils.createSingletonObjectFactory(object);
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/properties/WinkSystemProperties.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/properties/WinkSystemProperties.java?rev=961830&r1=961829&r2=961830&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/properties/WinkSystemProperties.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/properties/WinkSystemProperties.java Thu Jul 8 16:12:52 2010
@@ -57,11 +57,11 @@ public class WinkSystemProperties {
systemProperties.setProperty(key, value);
}
} else {
- logger.debug("Property {} is already defined with value {}", key, value); //$NON-NLS-1$
+ logger.trace("Property {} is already defined with value {}", key, value); //$NON-NLS-1$
}
}
} else {
- logger.debug("Properties are null"); //$NON-NLS-1$
+ logger.trace("Properties are null"); //$NON-NLS-1$
}
return systemProperties;
}
@@ -73,7 +73,7 @@ public class WinkSystemProperties {
String value = AccessController.doPrivileged(new PrivilegedAction<String>() {
public String run() {
String v = System.getProperty(key);
- logger.debug(key + " = " + v); //$NON-NLS-1$
+ logger.trace(key + " = " + v); //$NON-NLS-1$
return v;
}
});
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/JAXBArrayJSONProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/JAXBArrayJSONProvider.java?rev=961830&r1=961829&r2=961830&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/JAXBArrayJSONProvider.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/JAXBArrayJSONProvider.java Thu Jul 8 16:12:52 2010
@@ -96,7 +96,7 @@ public class JAXBArrayJSONProvider exten
theType,
annotations,
mediaType);
- logger.debug("readerProvider was {} of type {}", System.identityHashCode(readerProvider), readerProvider.getClass().getName()); //$NON-NLS-1$
+ logger.trace("readerProvider was {} of type {}", System.identityHashCode(readerProvider), readerProvider.getClass().getName()); //$NON-NLS-1$
}
Queue<String> queue = new LinkedList<String>();
List<Object> collection = new ArrayList<Object>();
@@ -167,7 +167,7 @@ public class JAXBArrayJSONProvider exten
theType,
annotations,
mediaType);
- logger.debug("writerProvider was {} of type {}", System.identityHashCode(writerProvider), writerProvider.getClass().getName()); //$NON-NLS-1$
+ logger.trace("writerProvider was {} of type {}", System.identityHashCode(writerProvider), writerProvider.getClass().getName()); //$NON-NLS-1$
}
entityStream.write("[".getBytes()); //$NON-NLS-1$
int i = 0;
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=961830&r1=961829&r2=961830&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 8 16:12:52 2010
@@ -114,7 +114,7 @@ public abstract class AbstractJAXBProvid
private int hashCode = -1;
public JAXBContextResolverKey(ContextResolver<JAXBContext> resolver, Type type) {
- logger.debug("Constructing JAXBContextResolverKey with {} and {}", resolver, type); //$NON-NLS-1$
+ logger.trace("Constructing JAXBContextResolverKey with {} and {}", resolver, type); //$NON-NLS-1$
// resolver may be null, which is ok; we'll protect against NPEs in
// equals and hashCode overrides
_resolver = resolver;
@@ -123,27 +123,27 @@ public abstract class AbstractJAXBProvid
@Override
public boolean equals(Object o) {
- logger.debug("equals({}) entry", o); //$NON-NLS-1$
+ logger.trace("equals({}) entry", o); //$NON-NLS-1$
if ((o == null) || (!(o instanceof JAXBContextResolverKey))) {
- logger.debug("equals() exit due to null or not instance of JAXBContextResolverKey"); //$NON-NLS-1$
+ logger.trace("equals() exit due to null or not instance of JAXBContextResolverKey"); //$NON-NLS-1$
return false;
}
JAXBContextResolverKey obj = (JAXBContextResolverKey)o;
// check for both null or both NOT null
boolean result =
((obj._resolver == null) && (_resolver == null)) || ((obj._resolver != null) && (_resolver != null));
- logger.debug("null check result is {}", result); //$NON-NLS-1$
+ logger.trace("null check result is {}", result); //$NON-NLS-1$
// we can use hashCode() to compare _resolver
boolean finalResult = result && (obj.hashCode() == hashCode()) && (obj._type.equals(_type));
- logger.debug("final result is {}", finalResult); //$NON-NLS-1$
+ logger.trace("final result is {}", finalResult); //$NON-NLS-1$
return finalResult;
}
@Override
public int hashCode() {
- logger.debug("hashCode() entry"); //$NON-NLS-1$
+ logger.trace("hashCode() entry"); //$NON-NLS-1$
if (hashCode != -1) {
- logger.debug("returning hashCode {}", hashCode); //$NON-NLS-1$
+ logger.trace("returning hashCode {}", hashCode); //$NON-NLS-1$
return hashCode;
}
if (_resolver == null) {
@@ -152,7 +152,7 @@ public abstract class AbstractJAXBProvid
hashCode = 0; // don't use _type's hashCode, as the instances
// may differ between JAXBContextResolverKey
// instances
- logger.debug("resolver is null so returning hashCode {}", hashCode); //$NON-NLS-1$
+ logger.trace("resolver is null so returning hashCode {}", hashCode); //$NON-NLS-1$
return hashCode;
}
// Resolver instances may be unique due to the way we proxy the call
@@ -164,12 +164,12 @@ public abstract class AbstractJAXBProvid
// transaction level, rather than at the application, or worse, JVM
// level.
String resolverName = _resolver.getClass().getName();
- logger.debug("resolverName is {}", resolverName); //$NON-NLS-1$
+ logger.trace("resolverName is {}", resolverName); //$NON-NLS-1$
byte[] bytes = resolverName.getBytes();
for (int i = 0; i < bytes.length; i++) {
hashCode += bytes[i];
}
- logger.debug("returning hashCode to be {}", hashCode); //$NON-NLS-1$
+ logger.trace("returning hashCode to be {}", hashCode); //$NON-NLS-1$
return hashCode;
}
@@ -211,13 +211,13 @@ public abstract class AbstractJAXBProvid
MediaType mediaType) throws JAXBException {
Unmarshaller unm = upool.get(context);
if (unm == null) {
- if (logger.isDebugEnabled()) {
- logger.debug("Unmarshaller created [not in pool]"); //$NON-NLS-1$
+ if (logger.isTraceEnabled()) {
+ logger.trace("Unmarshaller created [not in pool]"); //$NON-NLS-1$
}
unm = internalCreateUnmarshaller(context);
} else {
- if (logger.isDebugEnabled()) {
- logger.debug("Unmarshaller obtained [from pool]"); //$NON-NLS-1$
+ if (logger.isTraceEnabled()) {
+ logger.trace("Unmarshaller obtained [from pool]"); //$NON-NLS-1$
}
}
@@ -267,7 +267,7 @@ public abstract class AbstractJAXBProvid
if (!supportDTD) {
throw new XMLStreamException(Messages.getMessage("entityRefsNotSupported")); //$NON-NLS-1$
} else {
- logger.debug("DTD entity reference expansion is enabled. This may present a security risk."); //$NON-NLS-1$
+ logger.trace("DTD entity reference expansion is enabled. This may present a security risk."); //$NON-NLS-1$
}
}
}
@@ -319,9 +319,9 @@ public abstract class AbstractJAXBProvid
try {
xmlStreamReader.close();
} catch (XMLStreamException e) {
- logger.debug("XMLStreamReader already closed.", e); //$NON-NLS-1$
+ logger.trace("XMLStreamReader already closed.", e); //$NON-NLS-1$
} catch (RuntimeException e) {
- logger.debug("RuntimeException occurred: ", e); //$NON-NLS-1$
+ logger.trace("RuntimeException occurred: ", e); //$NON-NLS-1$
}
}
}
@@ -349,8 +349,8 @@ public abstract class AbstractJAXBProvid
* @param unmarshaller the unmarshaller to put back in the pool
*/
protected void releaseJAXBUnmarshaller(JAXBContext context, Unmarshaller unmarshaller) {
- if (logger.isDebugEnabled()) {
- logger.debug("Unmarshaller placed back into pool"); //$NON-NLS-1$
+ if (logger.isTraceEnabled()) {
+ logger.trace("Unmarshaller placed back into pool"); //$NON-NLS-1$
}
unmarshaller.setAttachmentUnmarshaller(null);
upool.put(context, unmarshaller);
@@ -384,13 +384,13 @@ public abstract class AbstractJAXBProvid
Marshaller m = mpool.get(context);
if (m == null) {
- if (logger.isDebugEnabled()) {
- logger.debug("Marshaller created [not in pool]"); //$NON-NLS-1$
+ if (logger.isTraceEnabled()) {
+ logger.trace("Marshaller created [not in pool]"); //$NON-NLS-1$
}
m = internalCreateMarshaller(context);
} else {
- if (logger.isDebugEnabled()) {
- logger.debug("Marshaller obtained [from pool]"); //$NON-NLS-1$
+ if (logger.isTraceEnabled()) {
+ logger.trace("Marshaller obtained [from pool]"); //$NON-NLS-1$
}
}
@@ -418,8 +418,8 @@ public abstract class AbstractJAXBProvid
* @param marshaller Marshaller
*/
protected void releaseJAXBMarshaller(JAXBContext context, Marshaller marshaller) {
- if (logger.isDebugEnabled()) {
- logger.debug("Marshaller placed back into pool"); //$NON-NLS-1$
+ if (logger.isTraceEnabled()) {
+ logger.trace("Marshaller placed back into pool"); //$NON-NLS-1$
}
marshaller.setAttachmentMarshaller(null);
@@ -477,7 +477,7 @@ public abstract class AbstractJAXBProvid
protected JAXBContext getContext(Class<?> type, Type genericType, MediaType mediaType)
throws JAXBException {
- logger.debug("getContext({}, {}, {}) entry", new Object[] { type, genericType, mediaType }); //$NON-NLS-1$
+ logger.trace("getContext({}, {}, {}) entry", new Object[] { type, genericType, mediaType }); //$NON-NLS-1$
ContextResolver<JAXBContext> contextResolver =
providers.getContextResolver(JAXBContext.class, mediaType);
@@ -485,16 +485,16 @@ public abstract class AbstractJAXBProvid
JAXBContextResolverKey key = null;
if (contextCacheOn) {
- logger.debug("contextCacheOn is true"); //$NON-NLS-1$
+ logger.trace("contextCacheOn is true"); //$NON-NLS-1$
// it's ok and safe for contextResolver to be null at this point.
// JAXBContextResolverKey can handle it
key = new JAXBContextResolverKey(contextResolver, type);
- logger.debug("created JAXBContextResolverKey {} for ({}, {}, {})", new Object[] { key, type, genericType, mediaType }); //$NON-NLS-1$
+ logger.trace("created JAXBContextResolverKey {} for ({}, {}, {})", new Object[] { key, type, genericType, mediaType }); //$NON-NLS-1$
context = jaxbContextCache.get(key);
- logger.debug("retrieved context {}", context); //$NON-NLS-1$
+ logger.trace("retrieved context {}", context); //$NON-NLS-1$
if (context != null) {
- logger.debug("retrieved context {}@{}", context.getClass().getName(), System.identityHashCode(context)); //$NON-NLS-1$
- logger.debug("returned context {}", context); //$NON-NLS-1$
+ logger.trace("retrieved context {}@{}", context.getClass().getName(), System.identityHashCode(context)); //$NON-NLS-1$
+ logger.trace("returned context {}", context); //$NON-NLS-1$
return context;
}
}
@@ -508,17 +508,17 @@ public abstract class AbstractJAXBProvid
}
if (contextCacheOn) {
- logger.debug("put key {} and context {} into jaxbContextCache", key, context); //$NON-NLS-1$
+ logger.trace("put key {} and context {} into jaxbContextCache", key, context); //$NON-NLS-1$
jaxbContextCache.put(key, context);
}
- logger.debug("returned context {}", context); //$NON-NLS-1$
- logger.debug("retrieved context {}@{}", context.getClass().getName(), System.identityHashCode(context)); //$NON-NLS-1$
+ logger.trace("returned context {}", context); //$NON-NLS-1$
+ logger.trace("retrieved context {}@{}", context.getClass().getName(), System.identityHashCode(context)); //$NON-NLS-1$
return context;
}
private JAXBContext getDefaultContext(Class<?> type, Type genericType) throws JAXBException {
- logger.debug("getDefaultContext({}, {}) entry", type, genericType); //$NON-NLS-1$
+ logger.trace("getDefaultContext({}, {}) entry", type, genericType); //$NON-NLS-1$
JAXBContext context = jaxbDefaultContexts.get(type);
if (context == null) {
@@ -533,17 +533,17 @@ public abstract class AbstractJAXBProvid
// If that fails,
// we'll know
// soon enough
- logger.debug("Using genericType to create context"); //$NON-NLS-1$
+ logger.trace("Using genericType to create context"); //$NON-NLS-1$
context = JAXBContext.newInstance((Class<?>)genericType);
} else {
- logger.debug("Using type to create context"); //$NON-NLS-1$
+ logger.trace("Using type to create context"); //$NON-NLS-1$
context = JAXBContext.newInstance(type);
}
jaxbDefaultContexts.put(type, context);
}
- logger.debug("getDefaultContext() exit returning", context); //$NON-NLS-1$
- logger.debug("returning context {}@{}", context.getClass().getName(), System.identityHashCode(context)); //$NON-NLS-1$
+ logger.trace("getDefaultContext() exit returning", context); //$NON-NLS-1$
+ logger.trace("returning context {}@{}", context.getClass().getName(), System.identityHashCode(context)); //$NON-NLS-1$
return context;
}
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=961830&r1=961829&r2=961830&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 8 16:12:52 2010
@@ -146,7 +146,7 @@ public class JAXBXmlProvider extends Abs
try {
if (isJAXBObject(type)) {
JAXBContext context = getContext(type, genericType, mediaType);
- logger.debug("using context {}@{} to get marshaller", context.getClass().getName(), System.identityHashCode(context)); //$NON-NLS-1$
+ logger.trace("using context {}@{} to get marshaller", context.getClass().getName(), System.identityHashCode(context)); //$NON-NLS-1$
Marshaller marshaller = getJAXBMarshaller(type, context, mediaType);
Object entityToMarshal = getEntityToMarshal(t, type);
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/AcceptEncodingHeaderDelegate.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/AcceptEncodingHeaderDelegate.java?rev=961830&r1=961829&r2=961830&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/AcceptEncodingHeaderDelegate.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/AcceptEncodingHeaderDelegate.java Thu Jul 8 16:12:52 2010
@@ -45,25 +45,25 @@ public class AcceptEncodingHeaderDelegat
List<AcceptEncoding.ValuedEncoding> vEncodings = parseAcceptEncoding(value);
for (AcceptEncoding.ValuedEncoding qEncoding : vEncodings) {
- logger.debug("Processing {} with qValue {}", qEncoding.encoding, qEncoding.qValue); //$NON-NLS-1$
+ logger.trace("Processing {} with qValue {}", qEncoding.encoding, qEncoding.qValue); //$NON-NLS-1$
if (anyAllowed) {
- logger.debug("anyAllowed is true"); //$NON-NLS-1$
+ logger.trace("anyAllowed is true"); //$NON-NLS-1$
if (qEncoding.qValue == 0 && !qEncoding.isWildcard()) {
- logger.debug("qValue is 0 and qEncoding is not a wildcard so {} is banned", //$NON-NLS-1$
+ logger.trace("qValue is 0 and qEncoding is not a wildcard so {} is banned", //$NON-NLS-1$
qEncoding.encoding);
banned.add(qEncoding.encoding);
}
} else {
- logger.debug("anyAllowed is still false"); //$NON-NLS-1$
+ logger.trace("anyAllowed is still false"); //$NON-NLS-1$
if (qEncoding.qValue == 0) {
- logger.debug("qValue is 0 so breaking out of loop"); //$NON-NLS-1$
+ logger.trace("qValue is 0 so breaking out of loop"); //$NON-NLS-1$
break; // gone through all acceptable languages
}
if (qEncoding.isWildcard()) {
- logger.debug("qEncoding is a wildcard so everything afterwards is allowable"); //$NON-NLS-1$
+ logger.trace("qEncoding is a wildcard so everything afterwards is allowable"); //$NON-NLS-1$
anyAllowed = true;
} else {
- logger.debug("qEncoding is not a wildcard so adding to acceptable list"); //$NON-NLS-1$
+ logger.trace("qEncoding is not a wildcard so adding to acceptable list"); //$NON-NLS-1$
acceptable.add(qEncoding.encoding);
}
}
@@ -72,16 +72,16 @@ public class AcceptEncodingHeaderDelegat
}
private List<AcceptEncoding.ValuedEncoding> parseAcceptEncoding(String acceptableEncodingValue) {
- logger.debug("parseAcceptEncoding({}) entry", acceptableEncodingValue); //$NON-NLS-1$
+ logger.trace("parseAcceptEncoding({}) entry", acceptableEncodingValue); //$NON-NLS-1$
List<AcceptEncoding.ValuedEncoding> qEncodings =
new LinkedList<AcceptEncoding.ValuedEncoding>();
if (acceptableEncodingValue == null) {
- logger.debug("parseAcceptEncoding() exit - return empty list"); //$NON-NLS-1$
+ logger.trace("parseAcceptEncoding() exit - return empty list"); //$NON-NLS-1$
return qEncodings;
}
for (String encodingRange : acceptableEncodingValue.split(",")) { //$NON-NLS-1$
- logger.debug("Parsing encodingRange as {}", encodingRange); //$NON-NLS-1$
+ logger.trace("Parsing encodingRange as {}", encodingRange); //$NON-NLS-1$
int semicolonIndex = encodingRange.indexOf(';');
double qValue;
String encodingSpec;
@@ -101,22 +101,22 @@ public class AcceptEncodingHeaderDelegat
qValue = 1.0d;
}
}
- logger.debug("encodingSpec before trim is {}", encodingSpec); //$NON-NLS-1$
- logger.debug("qValue is {}", qValue); //$NON-NLS-1$
+ logger.trace("encodingSpec before trim is {}", encodingSpec); //$NON-NLS-1$
+ logger.trace("qValue is {}", qValue); //$NON-NLS-1$
encodingSpec = encodingSpec.trim();
if (encodingSpec.length() == 0) {
// ignore empty encoding specifications
- logger.debug("ignoring empty encodingSpec"); //$NON-NLS-1$
+ logger.trace("ignoring empty encodingSpec"); //$NON-NLS-1$
continue;
} else if (encodingSpec.equals("*")) { //$NON-NLS-1$
- logger.debug("Wildcard spec so adding as wildcard"); //$NON-NLS-1$
+ logger.trace("Wildcard spec so adding as wildcard"); //$NON-NLS-1$
qEncodings.add(new AcceptEncoding.ValuedEncoding(qValue, null));
} else {
qEncodings.add(new AcceptEncoding.ValuedEncoding(qValue, encodingSpec));
}
}
Collections.sort(qEncodings, Collections.reverseOrder());
- logger.debug("parseAcceptEncoding exit() returning {}", qEncodings); //$NON-NLS-1$
+ logger.trace("parseAcceptEncoding exit() returning {}", qEncodings); //$NON-NLS-1$
return qEncodings;
}