You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wink.apache.org by jr...@apache.org on 2010/03/03 22:21:55 UTC
svn commit: r918698 [5/7] - in /incubator/wink/trunk: ibm-jaxrs-server/
ibm-jaxrs-server/src/ ibm-jaxrs-server/src/main/
ibm-jaxrs-server/src/main/java/ ibm-jaxrs-server/src/main/java/com/
ibm-jaxrs-server/src/main/java/com/ibm/ ibm-jaxrs-server/src/ma...
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=918698&r1=918697&r2=918698&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 Wed Mar 3 21:21:51 2010
@@ -52,16 +52,16 @@
private static final Logger logger =
LoggerFactory
.getLogger(RequestProcessor.class);
- private static final String PROPERTY_ROOT_RESOURCE_NONE = "none";
- private static final String PROPERTY_ROOT_RESOURCE_ATOM = "atom";
- private static final String PROPERTY_ROOT_RESOURCE_ATOM_HTML = "atom+html";
+ private static final String PROPERTY_ROOT_RESOURCE_NONE = "none"; //$NON-NLS-1$
+ private static final String PROPERTY_ROOT_RESOURCE_ATOM = "atom"; //$NON-NLS-1$
+ private static final String PROPERTY_ROOT_RESOURCE_ATOM_HTML = "atom+html"; //$NON-NLS-1$
private static final String PROPERTY_ROOT_RESOURCE_DEFAULT =
PROPERTY_ROOT_RESOURCE_ATOM_HTML;
- private static final String PROPERTY_ROOT_RESOURCE = "wink.rootResource";
+ private static final String PROPERTY_ROOT_RESOURCE = "wink.rootResource"; //$NON-NLS-1$
private static final String PROPERTY_ROOT_RESOURCE_CSS =
- "wink.serviceDocumentCssPath";
+ "wink.serviceDocumentCssPath"; //$NON-NLS-1$
private static final String PROPERTY_LOAD_WINK_APPLICATIONS =
- "wink.loadApplications";
+ "wink.loadApplications"; //$NON-NLS-1$
private final DeploymentConfiguration configuration;
@@ -76,7 +76,7 @@
String loadWinkApplicationsProperty =
configuration.getProperties().getProperty(PROPERTY_LOAD_WINK_APPLICATIONS,
Boolean.toString(true));
- logger.debug("{} property is set to: {}",
+ logger.debug("{} property is set to: {}", //$NON-NLS-1$
PROPERTY_LOAD_WINK_APPLICATIONS,
loadWinkApplicationsProperty);
final Set<Class<?>> classes =
@@ -95,7 +95,7 @@
Properties properties = configuration.getProperties();
String registerRootResource =
properties.getProperty(PROPERTY_ROOT_RESOURCE, PROPERTY_ROOT_RESOURCE_DEFAULT);
- logger.debug("{} property is set to: {}", PROPERTY_ROOT_RESOURCE, registerRootResource);
+ logger.debug("{} property is set to: {}", PROPERTY_ROOT_RESOURCE, registerRootResource); //$NON-NLS-1$
if (registerRootResource.equals(PROPERTY_ROOT_RESOURCE_ATOM)) {
RegistrationUtils.InnerApplication application =
new RegistrationUtils.InnerApplication(RootResource.class);
@@ -105,7 +105,7 @@
// do nothing
} else {
String css = properties.getProperty(PROPERTY_ROOT_RESOURCE_CSS);
- logger.debug("{} property is set to: {}", PROPERTY_ROOT_RESOURCE_CSS, css);
+ logger.debug("{} property is set to: {}", PROPERTY_ROOT_RESOURCE_CSS, css); //$NON-NLS-1$
HtmlServiceDocumentResource instance = new HtmlServiceDocumentResource();
if (css != null) {
instance.setServiceDocumentCssPath(css);
@@ -134,9 +134,9 @@
} catch (Throwable t) {
// exception was not handled properly
if (logger.isDebugEnabled()) {
- logger.debug(Messages.getMessage("unhandledExceptionToContainer"), t);
+ logger.debug(Messages.getMessage("unhandledExceptionToContainer"), t); //$NON-NLS-1$
} else {
- logger.info(Messages.getMessage("unhandledExceptionToContainer"));
+ logger.info(Messages.getMessage("unhandledExceptionToContainer")); //$NON-NLS-1$
}
if (t instanceof RuntimeException) {
// let the servlet container to handle the runtime exception
@@ -152,11 +152,11 @@
try {
ServerMessageContext msgContext = createMessageContext(request, response);
RuntimeContextTLS.setRuntimeContext(msgContext);
- logger.debug("Set message context and starting request handlers chain: {}", msgContext);
+ logger.debug("Set message context and starting request handlers chain: {}", msgContext); //$NON-NLS-1$
// run the request handler chain
configuration.getRequestHandlersChain().run(msgContext);
logger
- .debug("Finished request handlers chain and starting response handlers chain: {}",
+ .debug("Finished request handlers chain and starting response handlers chain: {}", //$NON-NLS-1$
msgContext);
// run the response handler chain
configuration.getResponseHandlersChain().run(msgContext);
@@ -166,10 +166,10 @@
RuntimeContextTLS.setRuntimeContext(msgContext);
msgContext.setResponseEntity(t);
// run the error handler chain
- logger.debug("Exception occured, starting error handlers chain: {}", msgContext);
+ logger.debug("Exception occured, starting error handlers chain: {}", msgContext); //$NON-NLS-1$
configuration.getErrorHandlersChain().run(msgContext);
} finally {
- logger.debug("Finished response handlers chain");
+ logger.debug("Finished response handlers chain"); //$NON-NLS-1$
RuntimeContextTLS.setRuntimeContext(null);
}
}
@@ -231,7 +231,7 @@
RequestProcessor requestProcessor =
(RequestProcessor)servletContext.getAttribute(attributeName);
logger
- .debug("Retrieving request processor {} using attribute name {} in servlet context {}",
+ .debug("Retrieving request processor {} using attribute name {} in servlet context {}", //$NON-NLS-1$
new Object[] {requestProcessor, attributeName, servletContext});
return requestProcessor;
}
@@ -241,7 +241,7 @@
if (attributeName == null || attributeName.length() == 0) {
attributeName = RequestProcessor.class.getName();
}
- logger.debug("Storing request processor {} using attribute name {} in servlet context {}",
+ logger.debug("Storing request processor {} using attribute name {} in servlet context {}", //$NON-NLS-1$
new Object[] {this, attributeName, servletContext});
servletContext.setAttribute(attributeName, this);
}
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=918698&r1=918697&r2=918698&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 Wed Mar 3 21:21:51 2010
@@ -65,12 +65,12 @@
}
public void process() {
- logger.debug("Processing Application: {}", application);
+ logger.debug("Processing Application: {}", application); //$NON-NLS-1$
double priority = WinkApplication.DEFAULT_PRIORITY;
if (application instanceof WinkApplication) {
priority = ((WinkApplication)application).getPriority();
- logger.debug("WinkApplication priority is set to: {}", priority);
+ logger.debug("WinkApplication priority is set to: {}", priority); //$NON-NLS-1$
}
// process singletons
@@ -89,7 +89,7 @@
processWinkApplication((WinkApplication)application);
}
- logger.debug("Processing of Application completed.");
+ logger.debug("Processing of Application completed."); //$NON-NLS-1$
}
private void processWinkApplication(WinkApplication sApplication) {
@@ -97,13 +97,13 @@
double priority = sApplication.getPriority();
if (instances == null) {
- logger.debug("WinkApplication.getInstances() returned null");
+ logger.debug("WinkApplication.getInstances() returned null"); //$NON-NLS-1$
return;
}
for (Object obj : instances) {
try {
- logger.debug("Processing instance: {}", obj);
+ logger.debug("Processing instance: {}", obj); //$NON-NLS-1$
Class<?> cls = obj.getClass();
@@ -135,7 +135,7 @@
for (Class<?> cls : classes) {
try {
- logger.debug("Processing class: {}", cls);
+ logger.debug("Processing class: {}", cls); //$NON-NLS-1$
// the validations were moved to registry
@@ -162,7 +162,7 @@
// add singletons
for (Object obj : singletons) {
try {
- logger.debug("Processing singleton: {}", obj);
+ logger.debug("Processing singleton: {}", obj); //$NON-NLS-1$
Class<?> cls = obj.getClass();
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/application/ServletApplicationFileLoader.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/application/ServletApplicationFileLoader.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/application/ServletApplicationFileLoader.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/application/ServletApplicationFileLoader.java Wed Mar 3 21:21:51 2010
@@ -28,7 +28,7 @@
public class ServletApplicationFileLoader extends ApplicationFileLoader {
- private static final String SERVER_CORE_APPLICATION = "META-INF/server/wink-providers";
+ private static final String SERVER_CORE_APPLICATION = "META-INF/server/wink-providers"; //$NON-NLS-1$
public ServletApplicationFileLoader(boolean loadWinkApplication) throws FileNotFoundException {
super(loadWinkApplication);
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/HttpHeadersImpl.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/HttpHeadersImpl.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/HttpHeadersImpl.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/HttpHeadersImpl.java Wed Mar 3 21:21:51 2010
@@ -81,16 +81,16 @@
StringBuilder acceptLanguageTemp = new StringBuilder();
acceptLanguageTemp.append(requestHeader.get(0));
for (int c = 1; c < requestHeader.size(); ++c) {
- acceptLanguageTemp.append(",");
+ acceptLanguageTemp.append(","); //$NON-NLS-1$
acceptLanguageTemp.append(requestHeader.get(c));
}
String acceptLanguage = acceptLanguageTemp.toString();
- logger.debug("Accept-Language combined header is {}", acceptLanguage);
+ logger.debug("Accept-Language combined header is {}", acceptLanguage); //$NON-NLS-1$
AcceptLanguage acceptLanguages = AcceptLanguage.valueOf(acceptLanguage);
acceptableLanguages = acceptLanguages.getAcceptableLanguages();
}
}
- logger.debug("getAcceptableLanguages() returns {}", acceptableLanguages);
+ logger.debug("getAcceptableLanguages() returns {}", acceptableLanguages); //$NON-NLS-1$
return acceptableLanguages;
}
@@ -99,7 +99,7 @@
Accept acceptHeader = getAcceptHeader();
acceptableMediaTypes = acceptHeader.getSortedMediaTypes();
}
- logger.debug("getAcceptableMediaTypes() returns {}", acceptableMediaTypes);
+ logger.debug("getAcceptableMediaTypes() returns {}", acceptableMediaTypes); //$NON-NLS-1$
return acceptableMediaTypes;
}
@@ -108,21 +108,21 @@
msgContext.getUriInfo().getQueryParameters()
.getFirst(RestConstants.REST_PARAM_MEDIA_TYPE);
String acceptValue = null;
- logger.debug("alternateParameter is {}", alternateParameter);
+ logger.debug("alternateParameter is {}", alternateParameter); //$NON-NLS-1$
if (alternateParameter != null) {
// try to map alternate parameter shortcut to a real media type
DeploymentConfiguration deploymentConfiguration =
msgContext.getAttribute(DeploymentConfiguration.class);
Map<String, String> alternateShortcutMap =
deploymentConfiguration.getAlternateShortcutMap();
- logger.debug("alternateShortcutMap is {}", alternateShortcutMap);
+ logger.debug("alternateShortcutMap is {}", alternateShortcutMap); //$NON-NLS-1$
if (alternateShortcutMap != null) {
acceptValue = alternateShortcutMap.get(alternateParameter);
}
if (acceptValue == null) {
acceptValue = alternateParameter;
}
- logger.debug("acceptValue set via alternateParameter is {}", acceptValue);
+ logger.debug("acceptValue set via alternateParameter is {}", acceptValue); //$NON-NLS-1$
} else {
List<String> requestHeader = getRequestHeader(HttpHeaders.ACCEPT);
if (requestHeader == null || requestHeader.isEmpty()) {
@@ -131,7 +131,7 @@
StringBuilder acceptValueTemp = new StringBuilder();
acceptValueTemp.append(requestHeader.get(0));
for (int c = 1; c < requestHeader.size(); ++c) {
- acceptValueTemp.append(",");
+ acceptValueTemp.append(","); //$NON-NLS-1$
acceptValueTemp.append(requestHeader.get(c));
}
acceptValue = acceptValueTemp.toString();
@@ -140,12 +140,12 @@
}
}
try {
- logger.debug("Accept header is: {}", acceptValue);
+ logger.debug("Accept header is: {}", acceptValue); //$NON-NLS-1$
Accept acceptHeader = Accept.valueOf(acceptValue);
- logger.debug("getAcceptHeader() returns {}", acceptHeader);
+ logger.debug("getAcceptHeader() returns {}", acceptHeader); //$NON-NLS-1$
return acceptHeader;
} catch (IllegalArgumentException e) {
- logger.debug("Illegal Accept request header: {}", e);
+ logger.debug("Illegal Accept request header: {}", e); //$NON-NLS-1$
throw new WebApplicationException(e, 400);
}
}
@@ -161,7 +161,7 @@
}
}
}
- logger.debug("Cookies are: {}", cookies);
+ logger.debug("Cookies are: {}", cookies); //$NON-NLS-1$
return cookies;
}
@@ -176,15 +176,15 @@
languageStr = s.get(0);
}
}
- logger.debug("Language string is {}", languageStr);
+ logger.debug("Language string is {}", languageStr); //$NON-NLS-1$
if (languageStr == null) {
- logger.debug("getLanguage() returning null");
+ logger.debug("getLanguage() returning null"); //$NON-NLS-1$
return null;
}
- String[] locales = StringUtils.fastSplit(languageStr, ",");
+ String[] locales = StringUtils.fastSplit(languageStr, ","); //$NON-NLS-1$
language = HeaderUtils.languageToLocale(locales[0].trim());
}
- logger.debug("getLanguage() returning {}", language);
+ logger.debug("getLanguage() returning {}", language); //$NON-NLS-1$
return language;
}
@@ -194,23 +194,23 @@
if (contentType == null) {
List<String> s = getRequestHeaderInternal(HttpHeaders.CONTENT_TYPE);
if (s == null || s.isEmpty()) {
- logger.debug("getMediaType() returning null");
+ logger.debug("getMediaType() returning null"); //$NON-NLS-1$
return null;
} else {
contentType = s.get(0);
}
}
- logger.debug("Content-type is {}", contentType);
+ logger.debug("Content-type is {}", contentType); //$NON-NLS-1$
mediaType = MediaType.valueOf(contentType);
}
- logger.debug("getMediaType() returning {}", mediaType);
+ logger.debug("getMediaType() returning {}", mediaType); //$NON-NLS-1$
return mediaType;
}
private List<String> getRequestHeaderInternal(String name) {
if (allHeaders != null) {
List<String> value = allHeaders.get(name);
- logger.debug("Returning {} header value from allHeaders cache: {}", name, value);
+ logger.debug("Returning {} header value from allHeaders cache: {}", name, value); //$NON-NLS-1$
return value;
}
@@ -226,34 +226,34 @@
}
}
logger
- .debug("HttpServletRequest.getHeaders({}) returned {} so putting into headers cache",
+ .debug("HttpServletRequest.getHeaders({}) returned {} so putting into headers cache", //$NON-NLS-1$
name,
list);
headers.put(name, list);
}
- logger.debug("getRequestHeaderInternal({}) returning {}", name, list);
+ logger.debug("getRequestHeaderInternal({}) returning {}", name, list); //$NON-NLS-1$
return list;
}
public List<String> getRequestHeader(String name) {
if (name == null) {
- logger.debug("getRequestHeader({}) returns null", name);
+ logger.debug("getRequestHeader({}) returns null", name); //$NON-NLS-1$
return null;
}
List<String> list = getRequestHeaderInternal(name);
if (list == null || list.isEmpty()) {
- logger.debug("getRequestHeader({}) returns null due to empty or non-existent header",
+ logger.debug("getRequestHeader({}) returns null due to empty or non-existent header", //$NON-NLS-1$
name);
return null;
}
- logger.debug("getRequestHeader({}) returns {}", name, list);
+ logger.debug("getRequestHeader({}) returns {}", name, list); //$NON-NLS-1$
return Collections.unmodifiableList(list);
}
public MultivaluedMap<String, String> getRequestHeaders() {
if (allHeaders == null) {
allHeaders = buildRequestHeaders();
- logger.debug("getRequests() called so building allHeaders cache", allHeaders);
+ logger.debug("getRequests() called so building allHeaders cache", allHeaders); //$NON-NLS-1$
}
return allHeaders;
@@ -278,7 +278,7 @@
values.add(val);
}
}
- logger.debug("buildRequestHeaders() adding {} header with values {}", name, values);
+ logger.debug("buildRequestHeaders() adding {} header with values {}", name, values); //$NON-NLS-1$
map.put(name, values);
}
return new UnmodifiableMultivaluedMap<String, String>(map);
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/RequestImpl.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/RequestImpl.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/RequestImpl.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/RequestImpl.java Wed Mar 3 21:21:51 2010
@@ -76,7 +76,7 @@
}
public ResponseBuilder evaluatePreconditions(EntityTag tag) {
- logger.debug("evaluatePreconditions({}) called", tag);
+ logger.debug("evaluatePreconditions({}) called", tag); //$NON-NLS-1$
String ifMatch = getHeaderValue(HttpHeaders.IF_MATCH);
if (ifMatch != null) {
return evaluateIfMatch(tag, ifMatch);
@@ -92,11 +92,11 @@
* returns ResponseBuilder if none of the tags matched
*/
private ResponseBuilder evaluateIfMatch(EntityTag tag, String headerValue) {
- logger.debug("evaluateIfMatch({}, {}) called", tag, headerValue);
+ logger.debug("evaluateIfMatch({}, {}) called", tag, headerValue); //$NON-NLS-1$
EntityTagMatchHeader ifMatchHeader = null;
try {
ifMatchHeader = ifMatchHeaderDelegate.fromString(headerValue);
- logger.debug("ifMatchHeaderDelegate returned {}", ifMatchHeader);
+ logger.debug("ifMatchHeaderDelegate returned {}", ifMatchHeader); //$NON-NLS-1$
} catch (IllegalArgumentException e) {
throw new WebApplicationException(e, Response.Status.BAD_REQUEST);
}
@@ -105,10 +105,10 @@
// none of the tags matches the etag
ResponseBuilder responseBuilder = delegate.createResponseBuilder();
responseBuilder.status(HttpServletResponse.SC_PRECONDITION_FAILED).tag(tag);
- logger.debug("evaluateIfMatch returning built response because there was no match");
+ logger.debug("evaluateIfMatch returning built response because there was no match"); //$NON-NLS-1$
return responseBuilder;
}
- logger.debug("evaluateIfMatch returning null because there was a match");
+ logger.debug("evaluateIfMatch returning null because there was a match"); //$NON-NLS-1$
return null;
}
@@ -116,11 +116,11 @@
* returns ResponseBuilder if any of the tags matched
*/
private ResponseBuilder evaluateIfNoneMatch(EntityTag tag, String headerValue) {
- logger.debug("evaluateIfNoneMatch({}, {}) called", tag, headerValue);
+ logger.debug("evaluateIfNoneMatch({}, {}) called", tag, headerValue); //$NON-NLS-1$
EntityTagMatchHeader ifNoneMatchHeader = null;
try {
ifNoneMatchHeader = ifMatchHeaderDelegate.fromString(headerValue);
- logger.debug("ifMatchHeaderDelegate returned {}", ifNoneMatchHeader);
+ logger.debug("ifMatchHeaderDelegate returned {}", ifNoneMatchHeader); //$NON-NLS-1$
} catch (IllegalArgumentException e) {
throw new WebApplicationException(e, Response.Status.BAD_REQUEST);
}
@@ -129,26 +129,26 @@
// some tag matched
ResponseBuilder responseBuilder = delegate.createResponseBuilder();
String method = getMethod();
- if (method.equalsIgnoreCase("GET") || method.equalsIgnoreCase("HEAD")) {
+ if (method.equalsIgnoreCase("GET") || method.equalsIgnoreCase("HEAD")) { //$NON-NLS-1$ //$NON-NLS-2$
logger
- .debug("evaluateIfNoneMatch returning 304 Not Modified because the {} method matched",
+ .debug("evaluateIfNoneMatch returning 304 Not Modified because the {} method matched", //$NON-NLS-1$
method);
responseBuilder.status(HttpServletResponse.SC_NOT_MODIFIED).tag(tag);
} else {
logger
- .debug("evaluateIfNoneMatch returning 412 Precondition Failed because the {} method matched",
+ .debug("evaluateIfNoneMatch returning 412 Precondition Failed because the {} method matched", //$NON-NLS-1$
method);
responseBuilder.status(HttpServletResponse.SC_PRECONDITION_FAILED).tag(tag);
}
return responseBuilder;
}
- logger.debug("evaluateIfNoneMatch returning null because there was no match");
+ logger.debug("evaluateIfNoneMatch returning null because there was no match"); //$NON-NLS-1$
return null;
}
public ResponseBuilder evaluatePreconditions(Date lastModified) {
if (logger.isDebugEnabled()) {
- logger.debug("evaluatePreconditions({}) called with {} date",
+ logger.debug("evaluatePreconditions({}) called with {} date", //$NON-NLS-1$
lastModified,
lastModified.getTime());
}
@@ -167,17 +167,17 @@
Date date = dateHeaderDelegate.fromString(headerValue);
if (logger.isDebugEnabled()) {
logger
- .debug("evalueateIfUnmodifiedSince({}, {}) got Date {} from header so comparing {} is after {}",
+ .debug("evalueateIfUnmodifiedSince({}, {}) got Date {} from header so comparing {} is after {}", //$NON-NLS-1$
new Object[] {lastModified, headerValue, date, lastModified.getTime(),
date.getTime()});
}
if (lastModified.after(date)) {
ResponseBuilder responseBuilder = delegate.createResponseBuilder();
responseBuilder.status(HttpServletResponse.SC_PRECONDITION_FAILED);
- logger.debug("evalueateIfUnmodifiedSince returning 412 Precondition Failed");
+ logger.debug("evalueateIfUnmodifiedSince returning 412 Precondition Failed"); //$NON-NLS-1$
return responseBuilder;
}
- logger.debug("evalueateIfUnmodifiedSince returning null");
+ logger.debug("evalueateIfUnmodifiedSince returning null"); //$NON-NLS-1$
return null;
}
@@ -185,23 +185,23 @@
Date date = dateHeaderDelegate.fromString(headerValue);
if (logger.isDebugEnabled()) {
logger
- .debug("evaluateIfModifiedSince({}, {}) got Date {} from header so comparing {} is after {}",
+ .debug("evaluateIfModifiedSince({}, {}) got Date {} from header so comparing {} is after {}", //$NON-NLS-1$
new Object[] {lastModified, headerValue, date, lastModified.getTime(),
date.getTime()});
}
if (lastModified.after(date)) {
- logger.debug("evaluateIfModifiedSince returning null");
+ logger.debug("evaluateIfModifiedSince returning null"); //$NON-NLS-1$
return null;
}
ResponseBuilder responseBuilder = delegate.createResponseBuilder();
responseBuilder.status(HttpServletResponse.SC_NOT_MODIFIED);
- logger.debug("evaluateIfModifiedSince returning 304 Not Modified");
+ logger.debug("evaluateIfModifiedSince returning 304 Not Modified"); //$NON-NLS-1$
return responseBuilder;
}
public ResponseBuilder evaluatePreconditions(Date lastModified, EntityTag tag) {
if (logger.isDebugEnabled()) {
- logger.debug("evaluatePreconditions({}, {}) called with date {} as a long type",
+ logger.debug("evaluatePreconditions({}, {}) called with date {} as a long type", //$NON-NLS-1$
new Object[] {lastModified, tag, lastModified.getTime()});
}
String ifMatch = getHeaderValue(HttpHeaders.IF_MATCH);
@@ -238,13 +238,13 @@
}
public Variant selectVariant(List<Variant> variants) throws IllegalArgumentException {
- logger.debug("selectVariant({}) called", variants);
+ logger.debug("selectVariant({}) called", variants); //$NON-NLS-1$
if (variants == null) {
throw new IllegalArgumentException();
}
if (variants.size() == 0) {
- logger.debug("No variants so returning null");
+ logger.debug("No variants so returning null"); //$NON-NLS-1$
return null;
}
@@ -263,7 +263,7 @@
StringBuilder acceptLanguageTemp = new StringBuilder();
acceptLanguageTemp.append(acceptableLanguages.get(0));
for (int c = 1; c < acceptableLanguages.size(); ++c) {
- acceptLanguageTemp.append(",");
+ acceptLanguageTemp.append(","); //$NON-NLS-1$
acceptLanguageTemp.append(acceptableLanguages.get(c));
}
String acceptLanguage = acceptLanguageTemp.toString();
@@ -277,7 +277,7 @@
StringBuilder acceptEncodingsTemp = new StringBuilder();
acceptEncodingsTemp.append(acceptableEncodings.get(0));
for (int c = 1; c < acceptableEncodings.size(); ++c) {
- acceptEncodingsTemp.append(",");
+ acceptEncodingsTemp.append(","); //$NON-NLS-1$
acceptEncodingsTemp.append(acceptableEncodings.get(c));
}
String acceptEncodings = acceptEncodingsTemp.toString();
@@ -291,7 +291,7 @@
StringBuilder acceptCharsetsTemp = new StringBuilder();
acceptCharsetsTemp.append(acceptableCharsets.get(0));
for (int c = 1; c < acceptableCharsets.size(); ++c) {
- acceptCharsetsTemp.append(",");
+ acceptCharsetsTemp.append(","); //$NON-NLS-1$
acceptCharsetsTemp.append(acceptableCharsets.get(c));
}
String acceptCharsets = acceptCharsetsTemp.toString();
@@ -304,25 +304,25 @@
for (Iterator<Variant> iter = variants.iterator(); iter.hasNext();) {
double acceptQFactor = -1.0d;
Variant v = iter.next();
- logger.debug("Variant being evaluated is: {}", v);
+ logger.debug("Variant being evaluated is: {}", v); //$NON-NLS-1$
MediaType vMediaType = v.getMediaType();
if (vMediaType != null && acceptableMediaTypes != null) {
boolean isCompatible = false;
boolean isAcceptable = true; // explicitly denied by the client
for (MediaType mt : acceptableMediaTypes) {
- logger.debug("Checking variant media type {} against Accept media type {}",
+ logger.debug("Checking variant media type {} against Accept media type {}", //$NON-NLS-1$
vMediaType,
mt);
if (mt.isCompatible(vMediaType)) {
Map<String, String> params = mt.getParameters();
- String q = params.get("q");
+ String q = params.get("q"); //$NON-NLS-1$
if (q != null) {
try {
Double qAsDouble = Double.valueOf(q);
if (qAsDouble.equals(0.0)) {
isAcceptable = false;
logger
- .debug("Accept Media Type: {} is NOT compatible with q-factor {}",
+ .debug("Accept Media Type: {} is NOT compatible with q-factor {}", //$NON-NLS-1$
mt,
qAsDouble);
break;
@@ -330,7 +330,7 @@
acceptQFactor = qAsDouble;
} catch (NumberFormatException e) {
logger
- .debug("NumberFormatException during MediaType q-factor evaluation: {}",
+ .debug("NumberFormatException during MediaType q-factor evaluation: {}", //$NON-NLS-1$
e);
}
} else {
@@ -338,13 +338,13 @@
}
isCompatible = true;
- logger.debug("Accept Media Type: {} is compatible with q-factor {}",
+ logger.debug("Accept Media Type: {} is compatible with q-factor {}", //$NON-NLS-1$
mt,
acceptQFactor);
}
}
if (!isCompatible || !isAcceptable) {
- logger.debug("Variant {} is not compatible or not acceptable", vMediaType);
+ logger.debug("Variant {} is not compatible or not acceptable", vMediaType); //$NON-NLS-1$
continue;
}
}
@@ -352,7 +352,7 @@
if (bestVariant != null) {
if (acceptQFactor < bestVariant.acceptMediaTypeQFactor) {
logger
- .debug("Best variant's media type {} q-factor {} is greater than current variant {} q-factor {}",
+ .debug("Best variant's media type {} q-factor {} is greater than current variant {} q-factor {}", //$NON-NLS-1$
new Object[] {bestVariant.variant,
bestVariant.acceptMediaTypeQFactor, vMediaType, acceptQFactor});
continue;
@@ -363,25 +363,25 @@
Locale vLocale = v.getLanguage();
if (vLocale != null && languages != null) {
boolean isCompatible = false;
- logger.debug("Checking variant locale {}", vLocale);
+ logger.debug("Checking variant locale {}", vLocale); //$NON-NLS-1$
if (languages.getBannedLanguages().contains(vLocale)) {
- logger.debug("Variant locale {} was in unacceptable languages", vLocale);
+ logger.debug("Variant locale {} was in unacceptable languages", vLocale); //$NON-NLS-1$
continue;
}
for (AcceptLanguage.ValuedLocale locale : languages.getValuedLocales()) {
logger
- .debug("Checking against Accept-Language locale {} with quality factor {}",
+ .debug("Checking against Accept-Language locale {} with quality factor {}", //$NON-NLS-1$
locale.locale,
locale.qValue);
if (locale.isWildcard() || vLocale.equals(locale.locale)) {
- logger.debug("Locale is compatible {}", locale.locale);
+ logger.debug("Locale is compatible {}", locale.locale); //$NON-NLS-1$
isCompatible = true;
acceptLanguageQFactor = locale.qValue;
break;
}
}
if (!isCompatible) {
- logger.debug("Variant locale is not compatible {}", vLocale);
+ logger.debug("Variant locale is not compatible {}", vLocale); //$NON-NLS-1$
continue;
}
}
@@ -389,7 +389,7 @@
if (bestVariant != null) {
if (acceptLanguageQFactor < bestVariant.acceptLanguageQFactor) {
logger
- .debug("Best variant's language {} q-factor {} is greater than current variant {} q-factor {}",
+ .debug("Best variant's language {} q-factor {} is greater than current variant {} q-factor {}", //$NON-NLS-1$
new Object[] {bestVariant.variant,
bestVariant.acceptLanguageQFactor, v, acceptLanguageQFactor});
continue;
@@ -404,18 +404,18 @@
hasCharSet = false;
} else if (vCharset != null && charsets != null) {
boolean isCompatible = false;
- logger.debug("Checking variant charset: {}", vCharset);
+ logger.debug("Checking variant charset: {}", vCharset); //$NON-NLS-1$
if (charsets.getBannedCharsets().contains(vCharset)) {
- logger.debug("Variant charset {} was in unacceptable charsets", vCharset);
+ logger.debug("Variant charset {} was in unacceptable charsets", vCharset); //$NON-NLS-1$
continue;
}
for (AcceptCharset.ValuedCharset charset : charsets.getValuedCharsets()) {
logger
- .debug("Checking against Accept-Charset charset {} with quality factor {}",
+ .debug("Checking against Accept-Charset charset {} with quality factor {}", //$NON-NLS-1$
charset.charset,
charset.qValue);
if (charset.isWildcard() || vCharset.equalsIgnoreCase(charset.charset)) {
- logger.debug("Charset is compatible with {}", charset.charset);
+ logger.debug("Charset is compatible with {}", charset.charset); //$NON-NLS-1$
isCompatible = true;
acceptCharsetQFactor = charset.qValue;
break;
@@ -423,7 +423,7 @@
}
if (!isCompatible) {
- logger.debug("Variant charset is not compatible {}", vCharset);
+ logger.debug("Variant charset is not compatible {}", vCharset); //$NON-NLS-1$
/*
* do not remove this from the acceptable list even if not
* compatible but set to -1.0d for now. according to HTTP
@@ -435,7 +435,7 @@
if (bestVariant != null) {
if (acceptCharsetQFactor < bestVariant.acceptCharsetQFactor && hasCharSet) {
logger
- .debug("Best variant's charset {} q-factor {} is greater than current variant {} q-factor {}",
+ .debug("Best variant's charset {} q-factor {} is greater than current variant {} q-factor {}", //$NON-NLS-1$
new Object[] {bestVariant.variant, bestVariant.acceptCharsetQFactor,
v, acceptCharsetQFactor});
continue;
@@ -445,12 +445,12 @@
double acceptEncodingQFactor = -1.0d;
String vEncoding = v.getEncoding();
if (vEncoding != null) {
- logger.debug("Checking variant encoding {}", vEncoding);
+ logger.debug("Checking variant encoding {}", vEncoding); //$NON-NLS-1$
if (encodings == null || encodings.isAnyEncodingAllowed()) {
- logger.debug("Accept-Encoding is null or wildcard");
- if (!v.getEncoding().equalsIgnoreCase("identity")) {
+ logger.debug("Accept-Encoding is null or wildcard"); //$NON-NLS-1$
+ if (!v.getEncoding().equalsIgnoreCase("identity")) { //$NON-NLS-1$
logger
- .debug("Variant encoding {} does not equal identity so not acceptable",
+ .debug("Variant encoding {} does not equal identity so not acceptable", //$NON-NLS-1$
vEncoding);
// if there is no Accept Encoding, only identity is
// acceptable
@@ -462,9 +462,9 @@
} else {
boolean isAcceptable = true;
for (String encoding : encodings.getBannedEncodings()) {
- logger.debug("Checking against not acceptable encoding: {}", encoding);
+ logger.debug("Checking against not acceptable encoding: {}", encoding); //$NON-NLS-1$
if (encoding.equalsIgnoreCase(vEncoding)) {
- logger.debug("Encoding was not acceptable: {}", vEncoding);
+ logger.debug("Encoding was not acceptable: {}", vEncoding); //$NON-NLS-1$
isAcceptable = false;
break;
}
@@ -475,18 +475,18 @@
boolean isCompatible = false;
for (AcceptEncoding.ValuedEncoding encoding : encodings.getValuedEncodings()) {
- logger.debug("Checking against acceptable encoding: {}", encoding.encoding);
+ logger.debug("Checking against acceptable encoding: {}", encoding.encoding); //$NON-NLS-1$
if (encoding.isWildcard() || encoding.encoding.equalsIgnoreCase(vEncoding)) {
isCompatible = true;
acceptEncodingQFactor = encoding.qValue;
- logger.debug("Encoding {} was acceptable with q-factor {}",
+ logger.debug("Encoding {} was acceptable with q-factor {}", //$NON-NLS-1$
encoding.encoding,
encoding.qValue);
break;
}
}
if (!isCompatible) {
- logger.debug("Variant encoding {} was not compatible", vEncoding);
+ logger.debug("Variant encoding {} was not compatible", vEncoding); //$NON-NLS-1$
continue;
}
}
@@ -495,7 +495,7 @@
if (bestVariant != null) {
if (acceptEncodingQFactor < bestVariant.acceptEncodingQFactor) {
logger
- .debug("Best variant's encoding {} q-factor {} is greater than current variant {} q-factor {}",
+ .debug("Best variant's encoding {} q-factor {} is greater than current variant {} q-factor {}", //$NON-NLS-1$
new Object[] {bestVariant.variant,
bestVariant.acceptEncodingQFactor, v, acceptEncodingQFactor});
continue;
@@ -523,27 +523,27 @@
}
if (bestVariant.acceptLanguageQFactor > 0) {
if (isValueWritten) {
- varyHeaderValue.append(", ");
+ varyHeaderValue.append(", "); //$NON-NLS-1$
}
varyHeaderValue.append(HttpHeaders.ACCEPT_LANGUAGE);
isValueWritten = true;
}
if (isIdentityEncodingChecked || bestVariant.acceptEncodingQFactor > 0) {
if (isValueWritten) {
- varyHeaderValue.append(", ");
+ varyHeaderValue.append(", "); //$NON-NLS-1$
}
varyHeaderValue.append(HttpHeaders.ACCEPT_ENCODING);
isValueWritten = true;
}
if (bestVariant.acceptCharsetQFactor > 0) {
if (isValueWritten) {
- varyHeaderValue.append(", ");
+ varyHeaderValue.append(", "); //$NON-NLS-1$
}
varyHeaderValue.append(HttpHeaders.ACCEPT_CHARSET);
isValueWritten = true;
}
String varyHeaderValueStr = varyHeaderValue.toString().trim();
- logger.debug("Vary Header value should be set to {}", varyHeaderValueStr);
+ logger.debug("Vary Header value should be set to {}", varyHeaderValueStr); //$NON-NLS-1$
msgContext.setAttribute(RequestImpl.VaryHeader.class, new VaryHeader(varyHeaderValueStr));
return bestVariant.variant;
}
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/UriInfoImpl.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/UriInfoImpl.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/UriInfoImpl.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/UriInfoImpl.java Wed Mar 3 21:21:51 2010
@@ -87,13 +87,13 @@
String requestPath = getPath(false);
absolutePath = getBaseUri().resolve(requestPath);
}
- logger.debug("getAbsolutePath() returning: {}", absolutePath);
+ logger.debug("getAbsolutePath() returning: {}", absolutePath); //$NON-NLS-1$
return absolutePath;
}
public UriBuilder getAbsolutePathBuilder() {
UriBuilder builder = UriBuilder.fromUri(getAbsolutePath());
- logger.debug("getAbsolutePathBuilder() returning: {}", builder);
+ logger.debug("getAbsolutePathBuilder() returning: {}", builder); //$NON-NLS-1$
return builder;
}
@@ -103,16 +103,16 @@
try {
baseUri = new URI(baseUriString);
} catch (URISyntaxException e) {
- logger.error(Messages.getMessage("uriBadBaseURI", baseUriString), e);
+ logger.error(Messages.getMessage("uriBadBaseURI", baseUriString), e); //$NON-NLS-1$
}
}
- logger.debug("getBaseUri() returning: {}", baseUri);
+ logger.debug("getBaseUri() returning: {}", baseUri); //$NON-NLS-1$
return baseUri;
}
public UriBuilder getBaseUriBuilder() {
UriBuilder builder = UriBuilder.fromUri(getBaseUri());
- logger.debug("getBaseUriBuilder() returning: {}", builder);
+ logger.debug("getBaseUriBuilder() returning: {}", builder); //$NON-NLS-1$
return builder;
}
@@ -120,7 +120,7 @@
List<ResourceInstance> resources =
Collections.unmodifiableList(messageContext.getAttribute(SearchResult.class).getData()
.getMatchedResources());
- logger.debug("getMatchedResourceInstances() returning: {}", resources);
+ logger.debug("getMatchedResourceInstances() returning: {}", resources); //$NON-NLS-1$
return resources;
}
@@ -131,7 +131,7 @@
for (ResourceInstance resourceInstance : matchedResources) {
resourceList.add(resourceInstance.getInstance(messageContext));
}
- logger.debug("getMatchedResources() returning: {}", resourceList);
+ logger.debug("getMatchedResources() returning: {}", resourceList); //$NON-NLS-1$
return Collections.unmodifiableList(resourceList);
}
@@ -140,7 +140,7 @@
}
public List<String> getMatchedURIs(boolean decode) {
- logger.debug("getMatchedURIs({}) called", decode);
+ logger.debug("getMatchedURIs({}) called", decode); //$NON-NLS-1$
List<List<PathSegment>> matchedURIs =
messageContext.getAttribute(SearchResult.class).getData().getMatchedURIs();
if (matchedURIsStrings != null && matchedURIsStrings.size() != matchedURIs.size()) {
@@ -151,7 +151,7 @@
if (matchedURIsStrings == null) {
matchedURIsStrings = new ArrayList<String>(matchedURIs.size());
for (List<PathSegment> segments : matchedURIs) {
- logger.debug("Adding matched URI: {}", segments);
+ logger.debug("Adding matched URI: {}", segments); //$NON-NLS-1$
matchedURIsStrings.add(PathSegmentImpl.toString(segments));
}
}
@@ -163,12 +163,12 @@
for (String uri : matchedURIsStrings) {
String decodedUri = UriEncoder.decodeString(uri);
decodedMatchedURIsStrings.add(decodedUri);
- logger.debug("Adding decoded URI: {} from URI: {}", decodedUri, uri);
+ logger.debug("Adding decoded URI: {} from URI: {}", decodedUri, uri); //$NON-NLS-1$
}
}
list = decodedMatchedURIsStrings;
}
- logger.debug("getMatchedURIs({}) returning {}", decode, list);
+ logger.debug("getMatchedURIs({}) returning {}", decode, list); //$NON-NLS-1$
return Collections.unmodifiableList(list);
}
@@ -177,17 +177,17 @@
}
public String getPath(boolean decode) {
- logger.debug("getPath({}) called", decode);
+ logger.debug("getPath({}) called", decode); //$NON-NLS-1$
if (path == null) {
path = buildRequestPath(messageContext.getAttribute(HttpServletRequest.class));
}
if (decode) {
String decodedPath = UriEncoder.decodeString(path);
- logger.debug("getPath({}) returning {}", decode, decodedPath);
+ logger.debug("getPath({}) returning {}", decode, decodedPath); //$NON-NLS-1$
return decodedPath;
}
- logger.debug("getPath({}) returning {}", decode, path);
+ logger.debug("getPath({}) returning {}", decode, path); //$NON-NLS-1$
return path;
}
@@ -196,16 +196,16 @@
}
public MultivaluedMap<String, String> getPathParameters(boolean decode) {
- logger.debug("getPathParameters({}) called", decode);
+ logger.debug("getPathParameters({}) called", decode); //$NON-NLS-1$
if (pathParameters == null) {
pathParameters = new MultivaluedMapImpl<String, String>();
SearchResult searchResult = messageContext.getAttribute(SearchResult.class);
if (searchResult == null) {
throw new IllegalStateException(Messages
- .getMessage("methodCallOutsideScopeOfRequestContext"));
+ .getMessage("methodCallOutsideScopeOfRequestContext")); //$NON-NLS-1$
}
MultivaluedMapImpl.copy(searchResult.getData().getMatchedVariables(), pathParameters);
- logger.debug("getPathParameters({}) encoded path parameters are: {}",
+ logger.debug("getPathParameters({}) encoded path parameters are: {}", //$NON-NLS-1$
decode,
pathParameters);
}
@@ -218,7 +218,7 @@
map = decodedPathParameters;
}
- logger.debug("getPathParameters({}) returning {}", decode, map);
+ logger.debug("getPathParameters({}) returning {}", decode, map); //$NON-NLS-1$
return map;
}
@@ -231,10 +231,10 @@
}
public List<PathSegment> getPathSegments(boolean decode) {
- logger.debug("getPathSegments({}) called", decode);
+ logger.debug("getPathSegments({}) called", decode); //$NON-NLS-1$
if (pathSegments == null) {
pathSegments = UriHelper.parsePath(getPath(false));
- logger.debug("getPathSegments({}) encoded path parameters are: {}",
+ logger.debug("getPathSegments({}) encoded path parameters are: {}", //$NON-NLS-1$
decode,
pathSegments);
}
@@ -246,7 +246,7 @@
}
list = decodedPathSegments;
}
- logger.debug("getPathSegments({}) returning {}", decode, list);
+ logger.debug("getPathSegments({}) returning {}", decode, list); //$NON-NLS-1$
return list;
}
@@ -255,13 +255,13 @@
}
public MultivaluedMap<String, String> getQueryParameters(boolean decode) {
- logger.debug("getQueryParameters({}) called", decode);
+ logger.debug("getQueryParameters({}) called", decode); //$NON-NLS-1$
if (queryParameters == null) {
queryParameters = new MultivaluedMapImpl<String, String>();
String query = messageContext.getAttribute(HttpServletRequest.class).getQueryString();
- logger.debug("getQueryParameters({}) query string is: {}", decode, query);
+ logger.debug("getQueryParameters({}) query string is: {}", decode, query); //$NON-NLS-1$
queryParameters = UriHelper.parseQuery(query);
- logger.debug("getQueryParameters({}) encoded query parameters are: {}",
+ logger.debug("getQueryParameters({}) encoded query parameters are: {}", //$NON-NLS-1$
decode,
queryParameters);
}
@@ -273,25 +273,25 @@
}
map = decodedQueryParameters;
}
- logger.debug("getQueryParameters({}) returning {}", decode, map);
+ logger.debug("getQueryParameters({}) returning {}", decode, map); //$NON-NLS-1$
return map;
}
public URI getRequestUri() {
- logger.debug("getRequestUri() called");
+ logger.debug("getRequestUri() called"); //$NON-NLS-1$
UriBuilder builder = getAbsolutePathBuilder();
String query = messageContext.getAttribute(HttpServletRequest.class).getQueryString();
- logger.debug("getRequestUri() query string: {}", query);
+ logger.debug("getRequestUri() query string: {}", query); //$NON-NLS-1$
builder.replaceQuery(query);
- logger.debug("getRequestUri() build after query replacement: {}", builder);
+ logger.debug("getRequestUri() build after query replacement: {}", builder); //$NON-NLS-1$
URI uri = builder.build();
- logger.debug("getRequestUri() returning: {}", uri);
+ logger.debug("getRequestUri() returning: {}", uri); //$NON-NLS-1$
return uri;
}
public UriBuilder getRequestUriBuilder() {
UriBuilder builder = UriBuilder.fromUri(getRequestUri());
- logger.debug("getRequestUriBuilder() returning: {}", builder);
+ logger.debug("getRequestUriBuilder() returning: {}", builder); //$NON-NLS-1$
return builder;
}
@@ -301,60 +301,60 @@
buildBaseUriString(messageContext.getAttribute(HttpServletRequest.class),
messageContext.getProperties());
}
- logger.debug("getBaseUriString() returned {}", baseUriString);
+ logger.debug("getBaseUriString() returned {}", baseUriString); //$NON-NLS-1$
return baseUriString;
}
private String buildBaseUriString(HttpServletRequest request, Properties properties) {
- String httpURI = getURI(properties, "wink.http.uri");
- String httpsURI = getURI(properties, "wink.https.uri");
+ String httpURI = getURI(properties, "wink.http.uri"); //$NON-NLS-1$
+ String httpsURI = getURI(properties, "wink.https.uri"); //$NON-NLS-1$
if (httpURI != null || httpsURI != null) {
if (httpsURI == null) {
throw new IllegalStateException(Messages
- .getMessage("parameterHttpsIsEmptyOrNotInitialized"));
+ .getMessage("parameterHttpsIsEmptyOrNotInitialized")); //$NON-NLS-1$
}
if (httpURI == null) {
throw new IllegalStateException(Messages
- .getMessage("parameterHttpIsEmptyOrNotInitialized"));
+ .getMessage("parameterHttpIsEmptyOrNotInitialized")); //$NON-NLS-1$
}
} else {
- logger.debug("Endpoint is not set up in the configuration; using request detection");
+ logger.debug("Endpoint is not set up in the configuration; using request detection"); //$NON-NLS-1$
}
String baseURI = httpURI;
if (request.isSecure()) {
- logger.debug("buildBaseUriString request is secure");
+ logger.debug("buildBaseUriString request is secure"); //$NON-NLS-1$
baseURI = httpsURI;
}
- logger.debug("buildBaseUriString baseURI from properties is: {}", baseURI);
+ logger.debug("buildBaseUriString baseURI from properties is: {}", baseURI); //$NON-NLS-1$
if (baseURI == null) {
baseURI = autodetectBaseUri(request);
- logger.debug("buildBaseUriString baseURI from autodetectBaseUri is: {}", baseURI);
+ logger.debug("buildBaseUriString baseURI from autodetectBaseUri is: {}", baseURI); //$NON-NLS-1$
}
return appendContextAndServletPath(baseURI, request, properties);
}
private String getURI(Properties properties, String propertyName) {
String uri = properties.getProperty(propertyName);
- logger.debug("getURI({}, {}) called", properties, propertyName);
+ logger.debug("getURI({}, {}) called", properties, propertyName); //$NON-NLS-1$
if (uri != null && uri.length() != 0) {
try {
URI uriParsed = new URI(uri);
- logger.debug("getURI({}, {}) returning {}", new Object[] {properties, propertyName,
+ logger.debug("getURI({}, {}) returning {}", new Object[] {properties, propertyName, //$NON-NLS-1$
uriParsed});
return uriParsed.toString();
} catch (URISyntaxException e) {
- throw new IllegalArgumentException(Messages.getMessage("uriInfoInvalidURI"), e);
+ throw new IllegalArgumentException(Messages.getMessage("uriInfoInvalidURI"), e); //$NON-NLS-1$
}
}
- logger.debug("getURI({}, {}) returning null", properties, propertyName);
+ logger.debug("getURI({}, {}) returning null", properties, propertyName); //$NON-NLS-1$
return null;
}
private static String autodetectBaseUri(HttpServletRequest request) {
try {
return new URI(request.getScheme(), null, request.getServerName(), request
- .getServerPort(), "/", null, null).toString();
+ .getServerPort(), "/", null, null).toString(); //$NON-NLS-1$
} catch (URISyntaxException e) {
throw new IllegalStateException(e);
}
@@ -363,34 +363,34 @@
private String appendContextAndServletPath(String basePath,
HttpServletRequest request,
Properties properties) {
- logger.debug("appendContextAndServletPath({}, {}, {}) called", new Object[] {basePath,
+ logger.debug("appendContextAndServletPath({}, {}, {}) called", new Object[] {basePath, //$NON-NLS-1$
request, properties});
StringBuilder builder = new StringBuilder(basePath);
if (builder.charAt(builder.length() - 1) == '/') {
builder.deleteCharAt(builder.length() - 1);
}
- String contextURI = properties.getProperty("wink.context.uri");
+ String contextURI = properties.getProperty("wink.context.uri"); //$NON-NLS-1$
String contextPath =
((contextURI != null && contextURI.length() > 0) ? contextURI : request
.getContextPath());
if (contextPath != null) {
builder.append(contextPath);
- logger.debug("appendContextAndServletPath after contextPath called is: {} ", builder);
+ logger.debug("appendContextAndServletPath after contextPath called is: {} ", builder); //$NON-NLS-1$
}
boolean isServlet =
RuntimeContextTLS.getRuntimeContext().getAttribute(FilterConfig.class) == null;
- logger.debug("appendContextAndServletPath isServlet: {} ", isServlet);
+ logger.debug("appendContextAndServletPath isServlet: {} ", isServlet); //$NON-NLS-1$
if (request.getServletPath() != null && isServlet) {
builder.append(request.getServletPath());
logger
- .debug("appendContextAndServletPath after getServletPath called is: {} ", builder);
+ .debug("appendContextAndServletPath after getServletPath called is: {} ", builder); //$NON-NLS-1$
}
if (builder.charAt(builder.length() - 1) != '/') {
builder.append('/');
}
String builderStr = builder.toString();
- logger.debug("appendContextAndServletPath returning: {} ", builderStr);
+ logger.debug("appendContextAndServletPath returning: {} ", builderStr); //$NON-NLS-1$
return builderStr;
}
@@ -398,24 +398,24 @@
// we cannot use request.getPathInfo() since it cuts off the ';'
// parameters on Tomcat
String requestPath = request.getRequestURI();
- logger.debug("buildRequestPath requestPath is: {}", requestPath);
+ logger.debug("buildRequestPath requestPath is: {}", requestPath); //$NON-NLS-1$
// Syntax-Based Normalization (RFC 3986, section 6.2.2)
requestPath = UriHelper.normalize(requestPath);
- logger.debug("buildRequestPath requestPath normalized is: {}", requestPath);
+ logger.debug("buildRequestPath requestPath normalized is: {}", requestPath); //$NON-NLS-1$
// cut off the context path from the beginning
if (request.getContextPath() != null) {
requestPath = requestPath.substring(request.getContextPath().length());
- logger.debug("buildRequestPath after context path removed: {}", requestPath);
+ logger.debug("buildRequestPath after context path removed: {}", requestPath); //$NON-NLS-1$
}
// cut off the servlet path from the beginning
boolean isServlet =
RuntimeContextTLS.getRuntimeContext().getAttribute(FilterConfig.class) == null;
- logger.debug("buildRequestPath isServlet: {}", isServlet);
+ logger.debug("buildRequestPath isServlet: {}", isServlet); //$NON-NLS-1$
if (request.getServletPath() != null && isServlet) {
requestPath = requestPath.substring(request.getServletPath().length());
logger
- .debug("buildRequestPath requestPath after servlet path removed: {}", requestPath);
+ .debug("buildRequestPath requestPath after servlet path removed: {}", requestPath); //$NON-NLS-1$
}
// cut off all leading /
@@ -424,7 +424,7 @@
++index;
}
requestPath = requestPath.substring(index);
- logger.debug("buildRequestPath returning requestPath: {}", requestPath);
+ logger.debug("buildRequestPath returning requestPath: {}", requestPath); //$NON-NLS-1$
return requestPath;
}
}
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/CheckLocationHeaderHandler.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/CheckLocationHeaderHandler.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/CheckLocationHeaderHandler.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/CheckLocationHeaderHandler.java Wed Mar 3 21:21:51 2010
@@ -41,7 +41,7 @@
Response clientResponse = (Response)result;
if (!clientResponse.getMetadata().containsKey(HttpHeaders.LOCATION)) {
throw new IllegalStateException(Messages
- .getMessage("checkLocationHeaderHandlerIllegalArg", statusCode));
+ .getMessage("checkLocationHeaderHandlerIllegalArg", statusCode)); //$NON-NLS-1$
}
}
}
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/CreateInvocationParametersHandler.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/CreateInvocationParametersHandler.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/CreateInvocationParametersHandler.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/CreateInvocationParametersHandler.java Wed Mar 3 21:21:51 2010
@@ -40,9 +40,9 @@
// create and save the invocation parameters for the found method
List<Injectable> formal = result.getMethod().getMetadata().getFormalParameters();
- logger.debug("Formal Injectable parameters list is: {}", formal);
+ logger.debug("Formal Injectable parameters list is: {}", formal); //$NON-NLS-1$
Object[] parameters = InjectableFactory.getInstance().instantiate(formal, context);
- logger.debug("Actual parameters list to inject is: {}", parameters);
+ logger.debug("Actual parameters list to inject is: {}", parameters); //$NON-NLS-1$
result.setInvocationParameters(parameters);
chain.doChain(context);
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/FindResourceMethodHandler.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/FindResourceMethodHandler.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/FindResourceMethodHandler.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/FindResourceMethodHandler.java Wed Mar 3 21:21:51 2010
@@ -61,7 +61,7 @@
// resource method
if (resource.isExactMatch()) {
logger
- .debug("Root resource @Path matches exactly so finding root resource method in {}",
+ .debug("Root resource @Path matches exactly so finding root resource method in {}", //$NON-NLS-1$
resource.getResourceClass().getName());
handleResourceMethod(context, chain);
return;
@@ -70,11 +70,11 @@
// sub-resource method or locator
UriTemplateMatcher templateMatcher = resource.getMatcher();
String tail = UriTemplateProcessor.normalizeUri(templateMatcher.getTail(false));
- logger.debug("Unmatched tail to the URI: {}", tail);
+ logger.debug("Unmatched tail to the URI: {}", tail); //$NON-NLS-1$
// get a sorted list of all the sub-resources (methods and locators)
List<SubResourceInstance> subResources = resource.getRecord().getMatchingSubResources(tail);
- logger.debug("Possible subresources found: {}", subResources);
+ logger.debug("Possible subresources found: {}", subResources); //$NON-NLS-1$
if (subResources.size() == 0) {
result.setError(new WebApplicationException(Response.Status.NOT_FOUND));
return;
@@ -82,7 +82,7 @@
// get all the searchable sub-resources
List<SubResourceInstance> searchableSubResources = getSearchableSubResources(subResources);
- logger.debug("Possible searchable subresources found: {}", searchableSubResources);
+ logger.debug("Possible searchable subresources found: {}", searchableSubResources); //$NON-NLS-1$
// save the current data in case we need to role back the information if
// the search fails and we will need to continue to the next
// sub-resource
@@ -141,7 +141,7 @@
// continue the chain to invoke the method
if (logger.isDebugEnabled()) {
MethodMetadata metadata = (method == null) ? null : method.getMetadata();
- logger.debug("Found root resource method to invoke: {} ", metadata);
+ logger.debug("Found root resource method to invoke: {} ", metadata); //$NON-NLS-1$
}
chain.doChain(context);
}
@@ -173,7 +173,7 @@
// continue the chain to invoke the method
if (logger.isDebugEnabled()) {
MethodMetadata metadata = (method == null) ? null : method.getMetadata();
- logger.debug("Found subresource method to invoke: {} ", metadata);
+ logger.debug("Found subresource method to invoke: {} ", metadata); //$NON-NLS-1$
}
chain.doChain(context);
}
@@ -200,7 +200,7 @@
if (logger.isDebugEnabled()) {
MethodMetadata metadata =
(subResourceInstance == null) ? null : subResourceInstance.getMetadata();
- logger.debug("Found subresource locator to invoke: {} ", metadata);
+ logger.debug("Found subresource locator to invoke: {} ", metadata); //$NON-NLS-1$
}
chain.doChain(context);
@@ -208,7 +208,7 @@
// continue the search in it
Object subResource = context.getResponseEntity();
if (subResource == null) {
- logger.debug("Subresource returned was null so returning a 404 Not Found");
+ logger.debug("Subresource returned was null so returning a 404 Not Found"); //$NON-NLS-1$
result.setError(new WebApplicationException(Status.NOT_FOUND));
return;
}
@@ -220,7 +220,7 @@
// call recursively to search in the sub-resource
result.setFound(false);
logger
- .debug("Re-invoking the chain (due to hitting a subresource locator method) with the new subresource instance {}",
+ .debug("Re-invoking the chain (due to hitting a subresource locator method) with the new subresource instance {}", //$NON-NLS-1$
resourceInstance);
handleRequest(context, chain);
}
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=918698&r1=918697&r2=918698&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 Wed Mar 3 21:21:51 2010
@@ -38,7 +38,7 @@
public class FindRootResourceHandler implements RequestHandler {
public static final String SEARCH_POLICY_CONTINUED_SEARCH_KEY =
- "wink.searchPolicyContinuedSearch";
+ "wink.searchPolicyContinuedSearch"; //$NON-NLS-1$
private static final Logger logger =
LoggerFactory
.getLogger(FindRootResourceHandler.class);
@@ -50,9 +50,9 @@
// create a path stripped from all matrix parameters to use for matching
List<PathSegment> segments = context.getUriInfo().getPathSegments(false);
- logger.debug("Getting URI Info path segments: {}", segments);
+ logger.debug("Getting URI Info path segments: {}", segments); //$NON-NLS-1$
String strippedPath = buildPathForMatching(segments);
- logger.debug("Getting stripped path from segments: {}", strippedPath);
+ logger.debug("Getting stripped path from segments: {}", strippedPath); //$NON-NLS-1$
// get a list of root resources that can handle the request
// JAX-RS specification requires to search only the first matching
@@ -61,9 +61,9 @@
// matching resources
List<ResourceInstance> matchedResources =
registry.getMatchingRootResources(strippedPath, isContinuedSearchPolicy);
- logger.debug("Found resource instances: {}", matchedResources);
+ logger.debug("Found resource instances: {}", matchedResources); //$NON-NLS-1$
if (matchedResources.size() == 0) {
- logger.debug("No resource found matching {}", context.getUriInfo().getPath(false));
+ logger.debug("No resource found matching {}", context.getUriInfo().getPath(false)); //$NON-NLS-1$
SearchResult result =
new SearchResult(new WebApplicationException(Response.Status.NOT_FOUND));
context.setAttribute(SearchResult.class, result);
@@ -84,7 +84,7 @@
headSegmentsCount,
result.getData().getMatchedVariablesPathSegments());
- logger.debug("Using SearchResult: {}", result);
+ logger.debug("Using SearchResult: {}", result); //$NON-NLS-1$
// continue that chain to find the actual resource that will handle
// the request.
@@ -101,11 +101,11 @@
private String buildPathForMatching(List<PathSegment> segments) {
StringBuilder strippedPathBuilder = new StringBuilder();
- String delim = "";
+ String delim = ""; //$NON-NLS-1$
for (PathSegment segment : segments) {
strippedPathBuilder.append(delim);
strippedPathBuilder.append(segment.getPath());
- delim = "/";
+ delim = "/"; //$NON-NLS-1$
}
String strippedPath = strippedPathBuilder.toString();
return strippedPath;
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=918698&r1=918697&r2=918698&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 Wed Mar 3 21:21:51 2010
@@ -65,19 +65,19 @@
// assert status code is valid
int statusCode = context.getResponseStatusCode();
if (statusCode < 0) {
- logger.debug("Status code was not set. Nothing to do.");
+ logger.debug("Status code was not set. Nothing to do."); //$NON-NLS-1$
return;
}
// assert response is not committed
final HttpServletResponse httpResponse = context.getAttribute(HttpServletResponse.class);
if (httpResponse.isCommitted()) {
- logger.debug("The response is already committed. Nothing to do.");
+ logger.debug("The response is already committed. Nothing to do."); //$NON-NLS-1$
return;
}
// set the status code
- logger.debug("Response status code set to: {}", statusCode);
+ logger.debug("Response status code set to: {}", statusCode); //$NON-NLS-1$
httpResponse.setStatus(statusCode);
// get the entity
@@ -128,7 +128,7 @@
// we're done if the actual entity is null
if (entity == null) {
- logger.debug("No entity so writing only the headers");
+ logger.debug("No entity so writing only the headers"); //$NON-NLS-1$
flushHeaders(httpResponse, httpHeaders);
return;
}
@@ -136,7 +136,7 @@
// we have an entity, set the response media type
MediaType responseMediaType = context.getResponseMediaType();
if (responseMediaType != null) {
- logger.debug("Set response Content-Type to: {} ", responseMediaType);
+ logger.debug("Set response Content-Type to: {} ", responseMediaType); //$NON-NLS-1$
httpResponse.setContentType(responseMediaType.toString());
}
@@ -150,7 +150,7 @@
// use the provider to write the entity
if (messageBodyWriter != null) {
- logger.debug("Serialization using provider {}", messageBodyWriter.getClass().getName());
+ logger.debug("Serialization using provider {}", messageBodyWriter.getClass().getName()); //$NON-NLS-1$
final MultivaluedMap<String, Object> headers = httpHeaders;
@@ -161,7 +161,7 @@
declaredAnnotations,
responseMediaType);
if (logger.isDebugEnabled()) {
- logger.debug("{}@{}.getSize({}, {}, {}, {}, {}) returned {}", new Object[] {
+ logger.debug("{}@{}.getSize({}, {}, {}, {}, {}) returned {}", new Object[] { //$NON-NLS-1$
messageBodyWriter.getClass().getName(), Integer.toHexString(System.identityHashCode(messageBodyWriter)), entity,
rawType, genericType, declaredAnnotations, responseMediaType, size});
}
@@ -172,7 +172,7 @@
FlushHeadersOutputStream outputStream =
new FlushHeadersOutputStream(httpResponse, headers);
if (logger.isDebugEnabled()) {
- logger.debug("{}@{}.writeTo({}, {}, {}, {}, {}, {}, {}) being called", new Object[] {
+ logger.debug("{}@{}.writeTo({}, {}, {}, {}, {}, {}, {}) being called", new Object[] { //$NON-NLS-1$
messageBodyWriter.getClass().getName(), Integer.toHexString(System.identityHashCode(messageBodyWriter)), entity,
rawType, genericType, declaredAnnotations, responseMediaType, httpHeaders,
outputStream});
@@ -184,13 +184,13 @@
responseMediaType,
httpHeaders,
outputStream);
- logger.debug("Flushing headers if not written");
+ logger.debug("Flushing headers if not written"); //$NON-NLS-1$
outputStream.flushHeaders();
return;
} else {
logger
- .debug("Could not find a writer for {} and {}. Try to find JAF DataSourceProvider",
+ .debug("Could not find a writer for {} and {}. Try to find JAF DataSourceProvider", //$NON-NLS-1$
entity.getClass().getName(),
responseMediaType);
}
@@ -205,23 +205,23 @@
.createDataContentHandler(responseMediaType.toString());
if (dataContentHandler == null) {
- logger.error(Messages.getMessage("noWriterOrDataSourceProvider", entity.getClass()
+ logger.error(Messages.getMessage("noWriterOrDataSourceProvider", entity.getClass() //$NON-NLS-1$
.getName(), responseMediaType));
throw new WebApplicationException(500);
}
- logger.debug("Serialization using data content handler {}", dataContentHandler.getClass()
+ logger.debug("Serialization using data content handler {}", dataContentHandler.getClass() //$NON-NLS-1$
.getName());
FlushHeadersOutputStream outputStream =
new FlushHeadersOutputStream(httpResponse, httpHeaders);
if (logger.isDebugEnabled()) {
- logger.debug("{}.writeTo({}, {}, {}) being called", new Object[] {
+ logger.debug("{}.writeTo({}, {}, {}) being called", new Object[] { //$NON-NLS-1$
Integer.toHexString(System.identityHashCode(dataContentHandler)), entity, rawType,
responseMediaType.toString(), outputStream});
}
dataContentHandler.writeTo(entity, responseMediaType.toString(), outputStream);
- logger.debug("Flushing headers if not written");
+ logger.debug("Flushing headers if not written"); //$NON-NLS-1$
outputStream.flushHeaders();
}
@@ -232,12 +232,12 @@
RequestImpl.VaryHeader varyHeader =
RuntimeContextTLS.getRuntimeContext().getAttribute(RequestImpl.VaryHeader.class);
if (varyHeader != null) {
- logger.debug("Vary header automatically set by a call to RequestImpl");
+ logger.debug("Vary header automatically set by a call to RequestImpl"); //$NON-NLS-1$
headers.putSingle(HttpHeaders.VARY, varyHeader.getVaryHeaderValue());
}
}
- logger.debug("Flushing headers: {}", headers);
+ logger.debug("Flushing headers: {}", headers); //$NON-NLS-1$
for (Entry<String, List<Object>> entry : headers.entrySet()) {
String key = entry.getKey();
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/HeadMethodHandler.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/HeadMethodHandler.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/HeadMethodHandler.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/HeadMethodHandler.java Wed Mar 3 21:21:51 2010
@@ -45,7 +45,7 @@
.getLogger(HeadMethodHandler.class);
private static final String ORIGINAL_RESPONSE_ATT_NAME =
- HeadMethodHandler.class.getName() + "_original_response";
+ HeadMethodHandler.class.getName() + "_original_response"; //$NON-NLS-1$
public void handleRequest(MessageContext context, HandlersChain chain) throws Throwable {
@@ -61,7 +61,7 @@
.getCode()
&& context.getHttpMethod().equalsIgnoreCase(HttpMethod.HEAD)) {
logger
- .debug("No HEAD method so trying GET method while not sending the response entity");
+ .debug("No HEAD method so trying GET method while not sending the response entity"); //$NON-NLS-1$
context.setHttpMethod(HttpMethod.GET);
HttpServletResponse originalResponse = context.getAttribute(HttpServletResponse.class);
NoBodyResponse noBodyResponse = new NoBodyResponse(originalResponse);
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=918698&r1=918697&r2=918698&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 Wed Mar 3 21:21:51 2010
@@ -41,7 +41,7 @@
Object instance = searchResult.getResource().getInstance(context);
if (logger.isDebugEnabled()) {
logger
- .debug("Invoking method {} of declaring class {} on the instance of a class {}@{} with parameters {}",
+ .debug("Invoking method {} of declaring class {} on the instance of a class {}@{} with parameters {}", //$NON-NLS-1$
new Object[] {javaMethod.getName(),
javaMethod.getDeclaringClass().getName(),
instance.getClass().getName(),
@@ -51,7 +51,7 @@
Object result = javaMethod.invoke(instance, parameters);
context.setResponseEntity(result);
} catch (InvocationTargetException ite) {
- logger.debug("Exception encountered during invocation: {}", ite.getTargetException());
+ logger.debug("Exception encountered during invocation: {}", ite.getTargetException()); //$NON-NLS-1$
throw ite.getTargetException(); // unpack the original exception
}
}
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/OptionsMethodHandler.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/OptionsMethodHandler.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/OptionsMethodHandler.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/OptionsMethodHandler.java Wed Mar 3 21:21:51 2010
@@ -56,7 +56,7 @@
ResourceRegistry resourceRegistry = context.getAttribute(ResourceRegistry.class);
Set<String> httpMethods = resourceRegistry.getOptions(searchResult.getResource());
logger
- .debug("Invoking OPTIONS request handled by runtime with {} resource and {} HTTP methods",
+ .debug("Invoking OPTIONS request handled by runtime with {} resource and {} HTTP methods", //$NON-NLS-1$
searchResult.getResource(),
httpMethods);
if (httpMethods.size() > 0) {
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/PopulateErrorResponseHandler.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/PopulateErrorResponseHandler.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/PopulateErrorResponseHandler.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/PopulateErrorResponseHandler.java Wed Mar 3 21:21:51 2010
@@ -47,7 +47,7 @@
ExceptionMapper<Throwable> provider =
(ExceptionMapper<Throwable>)findProvider(context, exception);
if (provider != null) {
- logger.debug("Using provider {} to map exception {}", provider, exception);
+ logger.debug("Using provider {} to map exception {}", provider, exception); //$NON-NLS-1$
context.setResponseEntity(executeProvider(exception, provider));
} else {
throw exception;
@@ -59,7 +59,7 @@
try {
return provider.toResponse(exception);
} catch (Throwable e) {
- logger.error(Messages.getMessage("exceptionOccurredDuringExceptionMapper"), e);
+ logger.error(Messages.getMessage("exceptionOccurredDuringExceptionMapper"), e); //$NON-NLS-1$
return RUNTIME_DELEGATE.createResponseBuilder().status(500).build();
}
}
@@ -80,10 +80,10 @@
(ExceptionMapper<WebApplicationException>)findProvider(msgContext, exception);
}
if (provider != null) {
- logger.debug("Using ExceptionMapper to map response from WebApplicationException");
+ logger.debug("Using ExceptionMapper to map response from WebApplicationException"); //$NON-NLS-1$
msgContext.setResponseEntity(provider.toResponse(exception));
} else {
- logger.debug("Getting response directly from WebApplicationException");
+ logger.debug("Getting response directly from WebApplicationException"); //$NON-NLS-1$
msgContext.setResponseEntity(exception.getResponse());
}
}