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 [3/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-common/src/main/java/org/apache/wink/common/internal/registry/ProvidersRegistry.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ProvidersRegistry.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ProvidersRegistry.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ProvidersRegistry.java Wed Mar 3 21:21:51 2010
@@ -101,7 +101,7 @@
@SuppressWarnings("unchecked")
public boolean addProvider(Class<?> cls, double priority, boolean isSystemProvider) {
if (cls == null) {
- throw new NullPointerException("cls");
+ throw new NullPointerException(Messages.getMessage("variableIsNull", "cls")); //$NON-NLS-1$ //$NON-NLS-2$
}
ObjectFactory<?> objectFactory = factoryFactoryRegistry.getObjectFactory(cls);
return addProvider(new PriorityObjectFactory(objectFactory, priority, isSystemProvider));
@@ -115,7 +115,7 @@
@SuppressWarnings("unchecked")
public boolean addProvider(Object provider, double priority, boolean isSystemProvider) {
if (provider == null) {
- throw new NullPointerException("provider");
+ throw new NullPointerException(Messages.getMessage("variableIsNull", "provider")); //$NON-NLS-1$ //$NON-NLS-2$
}
ObjectFactory<?> objectFactory = factoryFactoryRegistry.getObjectFactory(provider);
return addProvider(new PriorityObjectFactory(objectFactory, priority, isSystemProvider));
@@ -125,7 +125,7 @@
private synchronized boolean addProvider(PriorityObjectFactory<?> objectFactory) {
Class<? extends Object> cls = objectFactory.getInstanceClass();
- logger.debug("Processing provider of type {}", cls);
+ logger.debug("Processing provider of type {}", cls); //$NON-NLS-1$
boolean retValue = false;
@@ -138,7 +138,7 @@
retValue = true;
}
if (ExceptionMapper.class.isAssignableFrom(cls)) {
- logger.debug("Adding type {} to ExceptionMappers list", cls);
+ logger.debug("Adding type {} to ExceptionMappers list", cls); //$NON-NLS-1$
TreeSet<ObjectFactory<ExceptionMapper<?>>> exceptionMappersCopy =
new TreeSet<ObjectFactory<ExceptionMapper<?>>>(Collections.reverseOrder());
exceptionMappersCopy.addAll(exceptionMappers);
@@ -157,7 +157,7 @@
retValue = true;
}
if (retValue == false) {
- logger.warn(Messages.getMessage("classIsUnknownProvider", cls));
+ logger.warn(Messages.getMessage("classIsUnknownProvider", cls)); //$NON-NLS-1$
}
return retValue;
@@ -176,9 +176,9 @@
MediaType mediaType,
RuntimeContext runtimeContext) {
if (contextType == null) {
- throw new NullPointerException("contextType");
+ throw new NullPointerException(Messages.getMessage("variableIsNull", "contextType")); //$NON-NLS-1$ //$NON-NLS-2$
}
- logger.debug("Getting ContextResolver for {} which has @Produces compatible with {}",
+ logger.debug("Getting ContextResolver for {} which has @Produces compatible with {}", //$NON-NLS-1$
contextType,
mediaType);
if (mediaType == null) {
@@ -190,7 +190,7 @@
* performance improvement
*/
if (contextResolvers.isMapEmpty()) {
- logger.debug("ContextResolvers MediaTypeMap was empty so returning null");
+ logger.debug("ContextResolvers MediaTypeMap was empty so returning null"); //$NON-NLS-1$
return null;
}
@@ -199,7 +199,7 @@
if (factories.isEmpty()) {
logger
- .debug("Did not find a ContextResolver for {} which has @Produces compatible with {}",
+ .debug("Did not find a ContextResolver for {} which has @Produces compatible with {}", //$NON-NLS-1$
contextType,
mediaType);
return null;
@@ -208,7 +208,7 @@
if (factories.size() == 1) {
ObjectFactory<ContextResolver<?>> factory = factories.get(0);
logger
- .debug("Found ContextResolver ObjectFactory {} for {} which has @Produces compatible with {}",
+ .debug("Found ContextResolver ObjectFactory {} for {} which has @Produces compatible with {}", //$NON-NLS-1$
new Object[] {factory, contextType, mediaType});
return (ContextResolver<T>)factory.getInstance(runtimeContext);
}
@@ -226,7 +226,7 @@
}
logger
- .debug("Found multiple ContextResolver ObjectFactories {} for {} which has @Produces compatible with {} . Using Proxy object which will call all matching ContextResolvers to find correct context.",
+ .debug("Found multiple ContextResolver ObjectFactories {} for {} which has @Produces compatible with {} . Using Proxy object which will call all matching ContextResolvers to find correct context.", //$NON-NLS-1$
new Object[] {providers, contextType, mediaType});
final MediaType mt = mediaType;
return (ContextResolver<T>)Proxy.newProxyInstance(getClass().getClassLoader(),
@@ -238,7 +238,7 @@
Object[] args)
throws Throwable {
if (method.getName()
- .equals("getContext") && args != null
+ .equals("getContext") && args != null //$NON-NLS-1$
&& args.length == 1
&& (args[0] == null || args[0]
.getClass()
@@ -249,7 +249,7 @@
if (logger
.isDebugEnabled()) {
logger
- .debug("Calling {}.getContext({}) to find context for {} with @Produces media type compatible with {}",
+ .debug("Calling {}.getContext({}) to find context for {} with @Produces media type compatible with {}", //$NON-NLS-1$
new Object[] {
resolver,
arg0,
@@ -263,7 +263,7 @@
if (logger
.isDebugEnabled()) {
logger
- .debug("Returning {} from calling {}.getContext({}) to find context for {} with @Produces media type compatible with {}",
+ .debug("Returning {} from calling {}.getContext({}) to find context for {} with @Produces media type compatible with {}", //$NON-NLS-1$
new Object[] {
context,
resolver,
@@ -276,7 +276,7 @@
}
if (logger.isDebugEnabled()) {
logger
- .debug("Did not find context for {} with @Produces media type compatible with {}",
+ .debug("Did not find context for {} with @Produces media type compatible with {}", //$NON-NLS-1$
new Object[] {
contextType,
mt});
@@ -294,9 +294,9 @@
public <T extends Throwable> ExceptionMapper<T> getExceptionMapper(Class<T> type,
RuntimeContext runtimeContext) {
if (type == null) {
- throw new NullPointerException("type");
+ throw new NullPointerException(Messages.getMessage("variableIsNull", "type")); //$NON-NLS-1$ //$NON-NLS-2$
}
- logger.debug("Getting ExceptionMapper for {} ", type);
+ logger.debug("Getting ExceptionMapper for {} ", type); //$NON-NLS-1$
List<ExceptionMapper<?>> matchingMappers = new ArrayList<ExceptionMapper<?>>();
for (ObjectFactory<ExceptionMapper<?>> factory : exceptionMappers) {
@@ -311,11 +311,11 @@
}
if (matchingMappers.isEmpty()) {
- logger.debug("Did not find an ExceptionMapper for {} ", type);
+ logger.debug("Did not find an ExceptionMapper for {} ", type); //$NON-NLS-1$
return null;
}
- logger.debug("Found matching ExceptionMappers {} for type {} ", matchingMappers, type);
+ logger.debug("Found matching ExceptionMappers {} for type {} ", matchingMappers, type); //$NON-NLS-1$
while (matchingMappers.size() > 1) {
Type first =
GenericsUtils.getGenericInterfaceParamType(matchingMappers.get(0).getClass(),
@@ -337,7 +337,7 @@
}
ExceptionMapper<T> mapper = (ExceptionMapper<T>)matchingMappers.get(0);
- logger.debug("Found best matching ExceptionMapper {} for type {} ", mapper, type);
+ logger.debug("Found best matching ExceptionMapper {} for type {} ", mapper, type); //$NON-NLS-1$
return mapper;
}
@@ -348,34 +348,34 @@
MediaType mediaType,
RuntimeContext runtimeContext) {
if (type == null) {
- throw new NullPointerException("type");
+ throw new NullPointerException(Messages.getMessage("variableIsNull", "type")); //$NON-NLS-1$ //$NON-NLS-2$
}
if (mediaType == null) {
- throw new NullPointerException("mediaType");
+ throw new NullPointerException(Messages.getMessage("variableIsNull", "mediaType")); //$NON-NLS-1$ //$NON-NLS-2$
}
if (logger.isDebugEnabled()) {
List<Annotation> anns = (annotations == null) ? null : Arrays.asList(annotations);
logger
- .debug("Getting MessageBodyReader for class type {}, genericType {}, annotations {}, and media type {}",
+ .debug("Getting MessageBodyReader for class type {}, genericType {}, annotations {}, and media type {}", //$NON-NLS-1$
new Object[] {type, genericType, anns, mediaType});
}
List<MediaTypeMap<MessageBodyReader<?>>.OFHolder<MessageBodyReader<?>>> factories =
messageBodyReaders.getProvidersByMediaType(mediaType, type);
- logger.debug("Found possible MessageBodyReader ObjectFactories {}", factories);
+ logger.debug("Found possible MessageBodyReader ObjectFactories {}", factories); //$NON-NLS-1$
for (ObjectFactory<MessageBodyReader<?>> factory : factories) {
MessageBodyReader<?> reader = factory.getInstance(runtimeContext);
if (logger.isDebugEnabled()) {
List<Annotation> anns = (annotations == null) ? null : Arrays.asList(annotations);
- logger.debug("Calling {}.isReadable( {}, {}, {}, {} )", new Object[] {reader, type,
+ logger.debug("Calling {}.isReadable( {}, {}, {}, {} )", new Object[] {reader, type, //$NON-NLS-1$
genericType, anns, mediaType});
}
if (reader.isReadable(type, genericType, annotations, mediaType)) {
if (logger.isDebugEnabled()) {
List<Annotation> anns =
(annotations == null) ? null : Arrays.asList(annotations);
- logger.debug("{}.isReadable( {}, {}, {}, {} ) returned true", new Object[] {
- reader, type, genericType, anns, mediaType});
+ logger.debug("{}.isReadable( {}, {}, {}, {} ) returned true", new Object[] { //$NON-NLS-1$
+ reader, type, genericType, anns, mediaType});
}
return (MessageBodyReader<T>)reader;
}
@@ -390,42 +390,43 @@
MediaType mediaType,
RuntimeContext runtimeContext) {
if (type == null) {
- throw new NullPointerException("type");
+ throw new NullPointerException(Messages.getMessage("variableIsNull", "type")); //$NON-NLS-1$ //$NON-NLS-2$
}
if (mediaType == null) {
- throw new NullPointerException("mediaType");
+ throw new NullPointerException(Messages.getMessage("variableIsNull", "mediaType")); //$NON-NLS-1$ //$NON-NLS-2$
}
if (logger.isDebugEnabled()) {
List<Annotation> anns = (annotations == null) ? null : Arrays.asList(annotations);
logger
- .debug("Getting MessageBodyWriter for class type {}, genericType {}, annotations {}, and media type {}",
+ .debug("Getting MessageBodyWriter for class type {}, genericType {}, annotations {}, and media type {}", //$NON-NLS-1$
new Object[] {type, genericType, anns, mediaType});
}
List<MediaTypeMap<MessageBodyWriter<?>>.OFHolder<MessageBodyWriter<?>>> writersFactories =
messageBodyWriters.getProvidersByMediaType(mediaType, type);
- logger.debug("Found possible MessageBodyWriter ObjectFactories {}", writersFactories);
+ logger.debug("Found possible MessageBodyWriter ObjectFactories {}", writersFactories); //$NON-NLS-1$
for (ObjectFactory<MessageBodyWriter<?>> factory : writersFactories) {
MessageBodyWriter<?> writer = factory.getInstance(runtimeContext);
if (logger.isDebugEnabled()) {
List<Annotation> anns = (annotations == null) ? null : Arrays.asList(annotations);
- logger.debug("Calling {}.isWriteable( {}, {}, {}, {} )", new Object[] {writer, type,
- genericType, anns, mediaType});
+ logger
+ .debug("Calling {}.isWriteable( {}, {}, {}, {} )", new Object[] {writer, type, //$NON-NLS-1$
+ genericType, anns, mediaType});
}
if (writer.isWriteable(type, genericType, annotations, mediaType)) {
if (logger.isDebugEnabled()) {
List<Annotation> anns =
(annotations == null) ? null : Arrays.asList(annotations);
- logger.debug("{}.isWriteable( {}, {}, {}, {} ) returned true", new Object[] {
- writer, type, genericType, anns, mediaType});
+ logger.debug("{}.isWriteable( {}, {}, {}, {} ) returned true", new Object[] { //$NON-NLS-1$
+ writer, type, genericType, anns, mediaType});
}
return (MessageBodyWriter<T>)writer;
}
}
if (logger.isDebugEnabled()) {
- List<Annotation> anns =
- (annotations == null) ? null : Arrays.asList(annotations);
- logger.debug("No MessageBodyWriter returned true for isWriteable( {}, {}, {}, {} )", new Object[] {
- type, genericType, anns, mediaType});
+ List<Annotation> anns = (annotations == null) ? null : Arrays.asList(annotations);
+ logger
+ .debug("No MessageBodyWriter returned true for isWriteable( {}, {}, {}, {} )", new Object[] { //$NON-NLS-1$
+ type, genericType, anns, mediaType});
}
return null;
}
@@ -433,11 +434,11 @@
public Set<MediaType> getMessageBodyReaderMediaTypesLimitByIsReadable(Class<?> type,
RuntimeContext runtimeContext) {
Set<MediaType> mediaTypes = new HashSet<MediaType>();
- logger.debug("Searching MessageBodyReaders media types limited by class type {}", type);
+ logger.debug("Searching MessageBodyReaders media types limited by class type {}", type); //$NON-NLS-1$
List<MediaTypeMap<MessageBodyReader<?>>.OFHolder<MessageBodyReader<?>>> readerFactories =
messageBodyReaders.getProvidersByMediaType(MediaType.WILDCARD_TYPE, type);
- logger.debug("Found all MessageBodyReader ObjectFactories limited by class type {}",
+ logger.debug("Found all MessageBodyReader ObjectFactories limited by class type {}", //$NON-NLS-1$
readerFactories);
Annotation[] ann = new Annotation[0];
for (ObjectFactory<MessageBodyReader<?>> factory : readerFactories) {
@@ -453,17 +454,17 @@
MediaType mt = MediaType.valueOf(v);
if (logger.isDebugEnabled()) {
List<Annotation> anns = (ann == null) ? null : Arrays.asList(ann);
- logger.debug("Calling {}.isReadable( {}, {}, {}, {} )", new Object[] {reader,
+ logger.debug("Calling {}.isReadable( {}, {}, {}, {} )", new Object[] {reader, //$NON-NLS-1$
type, type, anns, mt});
}
if (reader.isReadable(type, type, ann, mt)) {
- logger.debug("Adding {} to media type set", mt);
+ logger.debug("Adding {} to media type set", mt); //$NON-NLS-1$
mediaTypes.add(mt);
}
}
}
logger
- .debug("Found {} from @Consumes values from all MessageBodyReader ObjectFactories compatible with Java type {}",
+ .debug("Found {} from @Consumes values from all MessageBodyReader ObjectFactories compatible with Java type {}", //$NON-NLS-1$
mediaTypes,
type);
return mediaTypes;
@@ -471,7 +472,7 @@
public Set<MediaType> getMessageBodyWriterMediaTypes(Class<?> type) {
if (type == null) {
- throw new NullPointerException("type");
+ throw new NullPointerException(Messages.getMessage("variableIsNull", "type")); //$NON-NLS-1$ //$NON-NLS-2$
}
Set<MediaType> mediaTypes = messageBodyWriters.getProvidersMediaTypes(type);
return mediaTypes;
@@ -553,14 +554,14 @@
}
logger
- .debug("Getting providers by media type by calling getProvidersByMediaType({}, {})",
+ .debug("Getting providers by media type by calling getProvidersByMediaType({}, {})", //$NON-NLS-1$
mediaType,
cls);
SoftConcurrentMap<MediaType, List<OFHolder<T>>> mediaTypeToProvidersCache =
providersCache.get(cls);
if (mediaTypeToProvidersCache == null) {
logger
- .debug("MediaType to providers cache for class {} does not exist so creating",
+ .debug("MediaType to providers cache for class {} does not exist so creating", //$NON-NLS-1$
cls);
mediaTypeToProvidersCache = new SoftConcurrentMap<MediaType, List<OFHolder<T>>>();
providersCache.put(cls, mediaTypeToProvidersCache);
@@ -568,7 +569,7 @@
List<OFHolder<T>> list = mediaTypeToProvidersCache.get(mediaType);
- logger.debug("Get media type to providers cache for media type {} resulted in {}",
+ logger.debug("Get media type to providers cache for media type {} resulted in {}", //$NON-NLS-1$
mediaType,
list);
if (list == null) {
@@ -640,7 +641,7 @@
}
copyOfMap.put(key, set);
if (!set.add(objectFactory)) {
- logger.warn(Messages.getMessage("mediaTypeSetAlreadyContains", objectFactory));
+ logger.warn(Messages.getMessage("mediaTypeSetAlreadyContains", objectFactory)); //$NON-NLS-1$
} else {
// need to resort the entry set
@@ -661,52 +662,52 @@
}));
if (logger.isDebugEnabled()) {
- logger.debug("Added ObjectFactory {} with MediaType {} to MediaTypeMap {}",
+ logger.debug("Added ObjectFactory {} with MediaType {} to MediaTypeMap {}", //$NON-NLS-1$
new Object[] {objectFactory, key, this});
- logger.debug("EntrySet is {}", newEntrySet);
+ logger.debug("EntrySet is {}", newEntrySet); //$NON-NLS-1$
}
entrySet = newEntrySet;
data = copyOfMap;
// the set of providers has been changed so must clear the cache
providersCache.clear();
- logger.debug("Cleared the providers cache");
+ logger.debug("Cleared the providers cache"); //$NON-NLS-1$
}
}
@Override
public String toString() {
- return toString(" ");
+ return toString(" "); //$NON-NLS-1$
}
protected String toString(String indent) {
StringBuffer sb = new StringBuffer();
- sb.append("\nRawType: ");
+ sb.append("\nRawType: "); //$NON-NLS-1$
sb.append(String.valueOf(rawType));
- sb.append("\nData Map: ");
+ sb.append("\nData Map: "); //$NON-NLS-1$
if (data.isEmpty()) {
- sb.append("{empty}");
+ sb.append("{empty}"); //$NON-NLS-1$
} else {
- sb.append("\n");
+ sb.append("\n"); //$NON-NLS-1$
}
// The data Map can be huge. Separate entries
// to make it more understandable
for (MediaType k : data.keySet()) {
- sb.append("MediaType key = ");
+ sb.append("MediaType key = "); //$NON-NLS-1$
sb.append(k);
- sb.append("\n");
- sb.append("ObjectFactory Set value = {\n");
+ sb.append("\n"); //$NON-NLS-1$
+ sb.append("ObjectFactory Set value = {\n"); //$NON-NLS-1$
// Separate each ObjectFactory entry in the Set
// into its own line
for (ObjectFactory<T> of : data.get(k)) {
sb.append(indent);
sb.append(of);
- sb.append("\n");
+ sb.append("\n"); //$NON-NLS-1$
}
- sb.append("}\n");
+ sb.append("}\n"); //$NON-NLS-1$
}
return sb.toString();
}
@@ -732,11 +733,11 @@
@Override
public String toString() {
- return "OFHolder [" + (genericType != null ? "genericType=" + genericType + ", "
- : "")
- + (mediaType != null ? "mediaType=" + mediaType + ", " : "")
- + (of != null ? "of=" + of : "")
- + "]";
+ return "OFHolder [" + (genericType != null ? "genericType=" + genericType + ", " //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ : "") //$NON-NLS-1$
+ + (mediaType != null ? "mediaType=" + mediaType + ", " : "") //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ + (of != null ? "of=" + of : "") //$NON-NLS-1$ //$NON-NLS-2$
+ + "]"; //$NON-NLS-1$
}
@Override
@@ -847,7 +848,7 @@
@Override
public String toString() {
- return String.format("Priority: %f, ObjectFactory: %s", priority, String.valueOf(of));
+ return String.format("Priority: %f, ObjectFactory: %s", priority, String.valueOf(of)); //$NON-NLS-1$
}
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ValueConvertor.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ValueConvertor.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ValueConvertor.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ValueConvertor.java Wed Mar 3 21:21:51 2010
@@ -180,7 +180,7 @@
}
try {
- Method valueOf = classType.getDeclaredMethod("valueOf", String.class);
+ Method valueOf = classType.getDeclaredMethod("valueOf", String.class); //$NON-NLS-1$
return new ValueOfConvertor(valueOf);
} catch (SecurityException e) {
} catch (NoSuchMethodException e) {
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/AbstractMetadata.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/AbstractMetadata.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/AbstractMetadata.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/AbstractMetadata.java Wed Mar 3 21:21:51 2010
@@ -82,10 +82,10 @@
@Override
public String toString() {
- return "[" + (consumes != null ? "consumes=" + consumes + ", " : "")
- + (paths != null ? "paths=" + paths + ", " : "")
- + (produces != null ? "produces=" + produces : "")
- + "]";
+ return "[" + (consumes != null ? "consumes=" + consumes + ", " : "") //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ + (paths != null ? "paths=" + paths + ", " : "") //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ + (produces != null ? "produces=" + produces : "") //$NON-NLS-1$ //$NON-NLS-2$
+ + "]"; //$NON-NLS-1$
}
public void setEncoded(boolean encoded) {
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/ClassMetadata.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/ClassMetadata.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/ClassMetadata.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/ClassMetadata.java Wed Mar 3 21:21:51 2010
@@ -147,7 +147,7 @@
@Override
public String toString() {
- return String.format("Class: %s", String.valueOf(resourceClass));
+ return String.format("Class: %s", String.valueOf(resourceClass)); //$NON-NLS-1$
}
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/MethodMetadata.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/MethodMetadata.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/MethodMetadata.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/MethodMetadata.java Wed Mar 3 21:21:51 2010
@@ -83,12 +83,12 @@
@Override
public String toString() {
- return "MethodMetadata [" + super.toString()
- + (formalParameters != null ? "formalParameters=" + formalParameters + ", " : "")
- + (httpMethod != null ? "httpMethod=" + httpMethod + ", " : "")
- + (parent != null ? "parent=" + parent + ", " : "")
- + (reflectionMethod != null ? "reflectionMethod=" + reflectionMethod : "")
- + "]";
+ return "MethodMetadata [" + super.toString() //$NON-NLS-1$
+ + (formalParameters != null ? "formalParameters=" + formalParameters + ", " : "") //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ + (httpMethod != null ? "httpMethod=" + httpMethod + ", " : "") //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ + (parent != null ? "parent=" + parent + ", " : "") //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ + (reflectionMethod != null ? "reflectionMethod=" + reflectionMethod : "") //$NON-NLS-1$ //$NON-NLS-2$
+ + "]"; //$NON-NLS-1$
}
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/uri/UriEncoder.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/uri/UriEncoder.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/uri/UriEncoder.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/uri/UriEncoder.java Wed Mar 3 21:21:51 2010
@@ -34,7 +34,7 @@
*/
public final class UriEncoder {
- private static final Charset CHARSET_UTF_8 = Charset.forName("UTF-8");
+ private static final Charset CHARSET_UTF_8 = Charset.forName("UTF-8"); //$NON-NLS-1$
private UriEncoder() {
// no instances
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/uri/UriPathNormalizer.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/uri/UriPathNormalizer.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/uri/UriPathNormalizer.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/uri/UriPathNormalizer.java Wed Mar 3 21:21:51 2010
@@ -41,7 +41,7 @@
* @return normalize path
*/
public static String normalize(String path) {
- if ((path != null) && (path.indexOf(".") == -1) && (path.indexOf("//") == -1)) {
+ if ((path != null) && (path.indexOf(".") == -1) && (path.indexOf("//") == -1)) { //$NON-NLS-1$ //$NON-NLS-2$
return path;
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/uritemplate/BitWorkingUriTemplateProcessor.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/uritemplate/BitWorkingUriTemplateProcessor.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/uritemplate/BitWorkingUriTemplateProcessor.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/uritemplate/BitWorkingUriTemplateProcessor.java Wed Mar 3 21:21:51 2010
@@ -28,6 +28,7 @@
import javax.ws.rs.core.MultivaluedMap;
+import org.apache.wink.common.internal.i18n.Messages;
import org.apache.wink.common.internal.uri.UriEncoder;
import org.apache.wink.common.internal.utils.StringUtils;
@@ -43,48 +44,42 @@
* pct-encoded) var = varname [ "=" vardefault ] vars = var [("," var) ]
* operator = "-" op "|" arg "|" vars expansion = "{" ( var / operator ) "}"
*/
- private static final String HEX = "[0-9A-Fa-f]";
- private static final String RESERVED = "[;/?:@&=+$,]";
- private static final String UNRESERVED = "[\\w\\.!~*'()-]";
- private static final String PCT_ENCONDED = "(?:%" + HEX + HEX + ")";
- private static final String ALPHA = "[a-zA-Z]";
-
- private static final String BITWORKING_OP = "(" + ALPHA + "+)";
- private static final String BITWORKING_ARG =
- "((?:" + RESERVED
- + "|"
- + UNRESERVED
- + "|"
- + PCT_ENCONDED
- + ")*)";
- private static final String BITWORKING_VARNAME = "\\w[\\w\\.-]*";
- private static final String BITWORKING_VARDEFAULT =
- "((?:" + UNRESERVED
- + "|"
- + PCT_ENCONDED
- + ")*)";
- private static final String BITWORKING_VAR =
- "(" + BITWORKING_VARNAME
- + ")(?:="
- + BITWORKING_VARDEFAULT
- + ")?";
- private static final String BITWORKING_VARS =
- "(" + BITWORKING_VAR
- + "(?:,"
- + BITWORKING_VAR
- + ")*)";
- private static final String BITWORKING_OPERATOR =
- "(?:-" + BITWORKING_OP
- + "[|]"
- + BITWORKING_ARG
- + "[|]"
- + BITWORKING_VARS
- + ")";
- private static final String BITWORKING_EXPANSION =
- "\\{(?:" + BITWORKING_VAR
- + "|"
- + BITWORKING_OPERATOR
- + ")\\}";
+ private static final String HEX = "[0-9A-Fa-f]"; //$NON-NLS-1$
+ private static final String RESERVED = "[;/?:@&=+$,]"; //$NON-NLS-1$
+ private static final String UNRESERVED = "[\\w\\.!~*'()-]"; //$NON-NLS-1$
+ private static final String PCT_ENCONDED = "(?:%" + HEX + HEX + ")"; //$NON-NLS-1$ //$NON-NLS-2$
+ private static final String ALPHA = "[a-zA-Z]"; //$NON-NLS-1$
+
+ private static final String BITWORKING_OP = "(" + ALPHA + "+)"; //$NON-NLS-1$ //$NON-NLS-2$
+ private static final String BITWORKING_ARG = "((?:" + RESERVED //$NON-NLS-1$
+ + "|" //$NON-NLS-1$
+ + UNRESERVED
+ + "|" //$NON-NLS-1$
+ + PCT_ENCONDED
+ + ")*)"; //$NON-NLS-1$
+ private static final String BITWORKING_VARNAME = "\\w[\\w\\.-]*"; //$NON-NLS-1$
+ private static final String BITWORKING_VARDEFAULT = "((?:" + UNRESERVED //$NON-NLS-1$
+ + "|" //$NON-NLS-1$
+ + PCT_ENCONDED
+ + ")*)"; //$NON-NLS-1$
+ private static final String BITWORKING_VAR = "(" + BITWORKING_VARNAME //$NON-NLS-1$
+ + ")(?:=" //$NON-NLS-1$
+ + BITWORKING_VARDEFAULT
+ + ")?"; //$NON-NLS-1$
+ private static final String BITWORKING_VARS = "(" + BITWORKING_VAR //$NON-NLS-1$
+ + "(?:," //$NON-NLS-1$
+ + BITWORKING_VAR
+ + ")*)"; //$NON-NLS-1$
+ private static final String BITWORKING_OPERATOR = "(?:-" + BITWORKING_OP //$NON-NLS-1$
+ + "[|]" //$NON-NLS-1$
+ + BITWORKING_ARG
+ + "[|]" //$NON-NLS-1$
+ + BITWORKING_VARS
+ + ")"; //$NON-NLS-1$
+ private static final String BITWORKING_EXPANSION = "\\{(?:" + BITWORKING_VAR //$NON-NLS-1$
+ + "|" //$NON-NLS-1$
+ + BITWORKING_OPERATOR
+ + ")\\}"; //$NON-NLS-1$
private static final Pattern BITWORKING_VARIABLE_PATTERN =
Pattern
.compile(BITWORKING_EXPANSION);
@@ -122,14 +117,14 @@
*/
public static void compile(String template, BitWorkingCompilationHandler handler) {
if (template == null) {
- throw new NullPointerException("uriTemplate");
+ throw new NullPointerException(Messages.getMessage("variableIsNull", "template")); //$NON-NLS-1$ //$NON-NLS-2$
}
if (handler == null) {
- throw new NullPointerException("handler");
+ throw new NullPointerException(Messages.getMessage("variableIsNull", "handler")); //$NON-NLS-1$ //$NON-NLS-2$
}
int start = 0;
- String literal = "";
+ String literal = ""; //$NON-NLS-1$
// fire start
handler.startCompile(template);
@@ -167,7 +162,7 @@
String vars = matcher.group(5);
// extract the variable names of the operator
- String[] arrayVars = StringUtils.fastSplit(vars, ",");
+ String[] arrayVars = StringUtils.fastSplit(vars, ","); //$NON-NLS-1$
Map<String, String> varsMap = new LinkedHashMap<String, String>();
for (String var : arrayVars) {
String defaultValue = null;
@@ -291,7 +286,7 @@
// get a new operator
BitWorkingOperator operator = BitWorkingOperator.forName(name);
if (operator == null) {
- throw new IllegalArgumentException("unsupported operator '" + name + "'");
+ throw new IllegalArgumentException(Messages.getMessage("unsupportedOperator", name)); //$NON-NLS-1$
}
// set the arg and vars of the operator
operator.setArg(arg);
@@ -357,22 +352,22 @@
if (name == null) {
return null;
}
- if (name.equals("neg")) {
+ if (name.equals("neg")) { //$NON-NLS-1$
return new Neg();
}
- if (name.equals("opt")) {
+ if (name.equals("opt")) { //$NON-NLS-1$
return new Opt();
}
- if (name.equals("prefix")) {
+ if (name.equals("prefix")) { //$NON-NLS-1$
return new Prefix();
}
- if (name.equals("suffix")) {
+ if (name.equals("suffix")) { //$NON-NLS-1$
return new Suffix();
}
- if (name.equals("list")) {
+ if (name.equals("list")) { //$NON-NLS-1$
return new List();
}
- if (name.equals("join")) {
+ if (name.equals("join")) { //$NON-NLS-1$
return new Join();
}
return null;
@@ -383,13 +378,13 @@
*/
private static class Neg extends BitWorkingOperator {
public Neg() {
- super("neg");
+ super("neg"); //$NON-NLS-1$
}
public void build(StringBuilder builder) {
- builder.append("(");
+ builder.append("("); //$NON-NLS-1$
builder.append(Pattern.quote(arg));
- builder.append(")?");
+ builder.append(")?"); //$NON-NLS-1$
}
@Override
@@ -417,13 +412,13 @@
*/
private static class Opt extends BitWorkingOperator {
public Opt() {
- super("opt");
+ super("opt"); //$NON-NLS-1$
}
public void build(StringBuilder builder) {
- builder.append("(");
+ builder.append("("); //$NON-NLS-1$
builder.append(Pattern.quote(arg));
- builder.append(")?");
+ builder.append(")?"); //$NON-NLS-1$
}
@Override
@@ -451,19 +446,19 @@
*/
private static class Prefix extends BitWorkingOperator {
public Prefix() {
- super("prefix");
+ super("prefix"); //$NON-NLS-1$
}
public void build(StringBuilder builder) {
if (vars.size() != 1) {
- throw new IllegalArgumentException(
- "The prefix operator MUST only have one variable");
+ throw new IllegalArgumentException(Messages
+ .getMessage("prefixOperatorMustHaveOnlyOneVariable")); //$NON-NLS-1$
}
- builder.append("((?:");
+ builder.append("((?:"); //$NON-NLS-1$
builder.append(Pattern.quote(arg));
builder.append(REGEX0);
- builder.append(")*)");
+ builder.append(")*)"); //$NON-NLS-1$
}
@Override
@@ -479,8 +474,8 @@
}
if (!matched.startsWith(arg)) {
- throw new IllegalArgumentException("The matched prefix must start with '" + arg
- + "'");
+ throw new IllegalArgumentException(Messages
+ .getMessage("matchedSuffixMustStartWith", arg)); //$NON-NLS-1$
}
// clear the previous values
@@ -516,18 +511,18 @@
*/
private static class Suffix extends BitWorkingOperator {
public Suffix() {
- super("suffix");
+ super("suffix"); //$NON-NLS-1$
}
public void build(StringBuilder builder) {
if (vars.size() != 1) {
- throw new IllegalArgumentException(
- "The suffix operator MUST only have one variable");
+ throw new IllegalArgumentException(Messages
+ .getMessage("suffixOperatorMustOnlyHaveOneVariable")); //$NON-NLS-1$
}
- builder.append("((?:");
+ builder.append("((?:"); //$NON-NLS-1$
builder.append(REGEX0);
builder.append(Pattern.quote(arg));
- builder.append(")*)");
+ builder.append(")*)"); //$NON-NLS-1$
}
@Override
@@ -543,8 +538,8 @@
}
if (!matched.endsWith(arg)) {
- throw new IllegalArgumentException("The matched suffix must end with '" + arg
- + "'");
+ throw new IllegalArgumentException(Messages
+ .getMessage("matchedSuffixMustEndWith", arg)); //$NON-NLS-1$
}
// clear the previous values
@@ -581,20 +576,20 @@
*/
private static class List extends BitWorkingOperator {
public List() {
- super("list");
+ super("list"); //$NON-NLS-1$
}
public void build(StringBuilder builder) {
if (vars.size() != 1) {
- throw new IllegalArgumentException(
- "The list operator MUST only have one variable");
+ throw new IllegalArgumentException(Messages
+ .getMessage("listOperatorMustHaveOnlyOneVariable")); //$NON-NLS-1$
}
- builder.append("(");
+ builder.append("("); //$NON-NLS-1$
builder.append(REGEX0);
- builder.append("(?:");
+ builder.append("(?:"); //$NON-NLS-1$
builder.append(Pattern.quote(arg));
builder.append(REGEX0);
- builder.append(")*)");
+ builder.append(")*)"); //$NON-NLS-1$
}
@Override
@@ -605,7 +600,7 @@
String var = vars.keySet().iterator().next();
if (matched == null || matched.length() == 0) {
- values.putSingle(var, "");
+ values.putSingle(var, ""); //$NON-NLS-1$
indices.putSingle(var, startIndex);
return;
}
@@ -624,7 +619,7 @@
StringBuilder builder) {
// we have only one var
String var = vars.keySet().iterator().next();
- String delim = "";
+ String delim = ""; //$NON-NLS-1$
java.util.List<String> varValues = values.get(var);
if (varValues != null) {
for (String value : varValues) {
@@ -644,31 +639,31 @@
*/
private static class Join extends BitWorkingOperator {
public Join() {
- super("join");
+ super("join"); //$NON-NLS-1$
}
public void build(StringBuilder builder) {
- String orSign = "";
+ String orSign = ""; //$NON-NLS-1$
StringBuilder keysAndValuesPattern = new StringBuilder();
- keysAndValuesPattern.append("(?:");
+ keysAndValuesPattern.append("(?:"); //$NON-NLS-1$
for (String var : vars.keySet()) {
keysAndValuesPattern.append(orSign);
- keysAndValuesPattern.append("(?:");
+ keysAndValuesPattern.append("(?:"); //$NON-NLS-1$
keysAndValuesPattern.append(var);
- keysAndValuesPattern.append("=");
+ keysAndValuesPattern.append("="); //$NON-NLS-1$
keysAndValuesPattern.append(REGEX0);
- keysAndValuesPattern.append(")");
- orSign = "|";
+ keysAndValuesPattern.append(")"); //$NON-NLS-1$
+ orSign = "|"; //$NON-NLS-1$
}
- keysAndValuesPattern.append(")");
+ keysAndValuesPattern.append(")"); //$NON-NLS-1$
// with a capturing group
- builder.append("(");
+ builder.append("("); //$NON-NLS-1$
builder.append(keysAndValuesPattern.toString());
- builder.append("(?:");
+ builder.append("(?:"); //$NON-NLS-1$
builder.append(Pattern.quote(arg));
builder.append(keysAndValuesPattern.toString());
- builder.append(")*)?");
+ builder.append(")*)?"); //$NON-NLS-1$
}
@Override
@@ -682,7 +677,7 @@
String[] array = StringUtils.fastSplit(matched, arg);
for (int i = 0; i < array.length; ++i) {
String var = array[i];
- String value = "";
+ String value = ""; //$NON-NLS-1$
int index = var.indexOf('=');
if (index != -1) {
value = var.substring(index + 1);
@@ -703,14 +698,14 @@
public void expand(MultivaluedMap<String, String> values,
boolean encode,
StringBuilder builder) {
- String delim = "";
+ String delim = ""; //$NON-NLS-1$
for (String var : vars.keySet()) {
java.util.List<String> varValues = values.get(var);
- String value = "";
+ String value = ""; //$NON-NLS-1$
if (varValues != null) {
if (varValues.size() > 1) {
- throw new IllegalArgumentException("variable '" + var
- + "' contains more than one value for join operator");
+ throw new IllegalArgumentException(Messages
+ .getMessage("variableContainsMoreThanOneValueForJoinOperator", var)); //$NON-NLS-1$
}
if (varValues.size() == 1) {
value = varValues.get(0);
@@ -719,7 +714,7 @@
}
builder.append(delim);
builder.append(var);
- builder.append("=");
+ builder.append("="); //$NON-NLS-1$
if (encode) {
value = UriEncoder.encodeString(value);
}
@@ -745,7 +740,7 @@
public void variable(String name, String defaultValue) {
if (values == null) {
- throw new NullPointerException("variable '" + name + "' was not supplied a value");
+ throw new NullPointerException(Messages.getMessage("variableIsNull", name)); //$NON-NLS-1$
}
Variable expander = new Variable(name, null, defaultValue);
expander.expand(values, false, out);
@@ -753,11 +748,11 @@
public void operator(String name, String arg, Map<String, String> vars) {
if (values == null) {
- throw new NullPointerException("variable '" + name + "' was not supplied a value");
+ throw new NullPointerException(Messages.getMessage("variableIsNull", name)); //$NON-NLS-1$
}
BitWorkingOperator expander = BitWorkingOperator.forName(name);
if (expander == null) {
- throw new IllegalArgumentException("unsupported operator '" + name + "'");
+ throw new IllegalArgumentException(Messages.getMessage("unsupportedOperator", name)); //$NON-NLS-1$
}
expander.expand(values, false, out);
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/uritemplate/JaxRsUriTemplateProcessor.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/uritemplate/JaxRsUriTemplateProcessor.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/uritemplate/JaxRsUriTemplateProcessor.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/uritemplate/JaxRsUriTemplateProcessor.java Wed Mar 3 21:21:51 2010
@@ -39,23 +39,23 @@
* "-" ) ; \w[\w\.-] regex =( nonbrace / "{" nonbrace "}" ) ; where nonbrace
* is any char other than "{" and "}"
*/
- private static final String JAXRS_VARIABLE_PATTERN_WSP = "[ \\t]*";
- private static final String JAXRS_VARIABLE_PATTERN_NAME = "(\\w[\\w\\.-]*)";
- private static final String JAXRS_VARIABLE_PATTERN_NONBRACE = "[^{}]";
+ private static final String JAXRS_VARIABLE_PATTERN_WSP = "[ \\t]*"; //$NON-NLS-1$
+ private static final String JAXRS_VARIABLE_PATTERN_NAME = "(\\w[\\w\\.-]*)"; //$NON-NLS-1$
+ private static final String JAXRS_VARIABLE_PATTERN_NONBRACE = "[^{}]"; //$NON-NLS-1$
private static final String JAXRS_VARIABLE_PATTERN_REGEX =
- "((?:(?:" + JAXRS_VARIABLE_PATTERN_NONBRACE
- + ")|(?:\\{"
+ "((?:(?:" + JAXRS_VARIABLE_PATTERN_NONBRACE //$NON-NLS-1$
+ + ")|(?:\\{" //$NON-NLS-1$
+ JAXRS_VARIABLE_PATTERN_NONBRACE
- + "*\\}))*)";
+ + "*\\}))*)"; //$NON-NLS-1$
private static final String JAXRS_VARIABLE_PATTERN_PARAM =
- "\\{" + JAXRS_VARIABLE_PATTERN_WSP
+ "\\{" + JAXRS_VARIABLE_PATTERN_WSP //$NON-NLS-1$
+ JAXRS_VARIABLE_PATTERN_NAME
+ JAXRS_VARIABLE_PATTERN_WSP
- + "(?::"
+ + "(?::" //$NON-NLS-1$
+ JAXRS_VARIABLE_PATTERN_WSP
+ JAXRS_VARIABLE_PATTERN_REGEX
+ JAXRS_VARIABLE_PATTERN_WSP
- + ")?\\}";
+ + ")?\\}"; //$NON-NLS-1$
private static final Pattern JAXRS_VARIABLE_PATTERN =
Pattern
.compile(JAXRS_VARIABLE_PATTERN_PARAM);
@@ -102,14 +102,14 @@
*/
public static void compile(String template, JaxRsCompilationHandler handler) {
if (template == null) {
- throw new NullPointerException("uriTemplate");
+ throw new NullPointerException("uriTemplate"); //$NON-NLS-1$
}
if (handler == null) {
- throw new NullPointerException("handler");
+ throw new NullPointerException("handler"); //$NON-NLS-1$
}
int start = 0;
- String literal = "";
+ String literal = ""; //$NON-NLS-1$
// fire start
handler.startCompile(template);
@@ -261,9 +261,9 @@
// if we don't do this and there's a resource with @Path("/") and a
// sub-resource @Path("hello"), then a request to "/hello" will not
// be picked up becuase the default tail is "(/.*)?"
- if (processor.template.equals("")) {
+ if (processor.template.equals("")) { //$NON-NLS-1$
// let the tail catch all characters, whether there is a / or not
- processor.tail = createVariable(TEMPLATE_TAIL_NAME, "(.*)?", null);
+ processor.tail = createVariable(TEMPLATE_TAIL_NAME, "(.*)?", null); //$NON-NLS-1$
} else {
// normal behavior
super.createTail();
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/uritemplate/UriTemplateMatcher.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/uritemplate/UriTemplateMatcher.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/uritemplate/UriTemplateMatcher.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/uritemplate/UriTemplateMatcher.java Wed Mar 3 21:21:51 2010
@@ -29,6 +29,7 @@
import javax.ws.rs.core.PathSegment;
import org.apache.wink.common.internal.MultivaluedMapImpl;
+import org.apache.wink.common.internal.i18n.Messages;
import org.apache.wink.common.internal.uri.UriEncoder;
import org.apache.wink.common.internal.uritemplate.UriTemplateProcessor.CapturingGroup;
@@ -44,7 +45,7 @@
@Override
public String toString() {
- return String.format("Parent: %s; URI: %s; Matcher: %s; Matches: %b", String
+ return String.format("Parent: %s; URI: %s; Matcher: %s; Matches: %b", String //$NON-NLS-1$
.valueOf(parent), uri, String.valueOf(matcher), matches);
}
@@ -104,7 +105,7 @@
*/
public boolean matches(String uri) {
if (uri == null) {
- throw new NullPointerException("uri");
+ throw new NullPointerException(Messages.getMessage("variableIsNull", "uri")); //$NON-NLS-1$ //$NON-NLS-2$
}
this.uri = uri;
this.variables = null;
@@ -123,7 +124,7 @@
public boolean isExactMatch() {
assertMatchState();
String tail = getTail();
- return (tail == null || tail.length() == 0 || tail.equals("/"));
+ return (tail == null || tail.length() == 0 || tail.equals("/")); //$NON-NLS-1$
}
/**
@@ -149,7 +150,7 @@
public String getTail(boolean decode) {
assertMatchState();
if (parent.tail == null) {
- return "";
+ return ""; //$NON-NLS-1$
}
String value = matcher.group(parent.tail.getCapturingGroupId());
@@ -191,7 +192,7 @@
// then add it to the head because the tail has caught it but it
// should be part of the head
String tail = getTail(false);
- if (parent.template.endsWith("/") && tail != null && tail.equals("/")) {
+ if (parent.template.endsWith("/") && tail != null && tail.equals("/")) { //$NON-NLS-1$ //$NON-NLS-2$
head += tail;
}
return head;
@@ -441,15 +442,16 @@
variableSegments.add(segments.get(segmentIndex));
}
break L1; // found all the segments of this variable
- // value
+ // value
} else if (variableValueStartIndex == pathLength) {
- // no PathParam was provided... only matrix params or empty
+ // no PathParam was provided... only matrix params or
+ // empty
// just use what we have
variableSegments.add(segments.get(segmentIndex));
break L1;
} else {
pathLength += 1; // to count for the '/' between the
- // segments
+ // segments
}
}
variablesPathSegments.add(name, variableSegments);
@@ -485,7 +487,7 @@
protected void assertMatchState() {
if (!matches) {
- throw new IllegalStateException("last match was unsuccessful");
+ throw new IllegalStateException(Messages.getMessage("lastMatchWasUnsuccessful")); //$NON-NLS-1$
}
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/uritemplate/UriTemplateProcessor.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/uritemplate/UriTemplateProcessor.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/uritemplate/UriTemplateProcessor.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/uritemplate/UriTemplateProcessor.java Wed Mar 3 21:21:51 2010
@@ -41,9 +41,9 @@
*/
public abstract class UriTemplateProcessor implements Comparable<UriTemplateProcessor>, Cloneable {
- protected static final String TEMPLATE_TAIL_NAME = "wink.TemplateTail";
- protected static final String TEMPLATE_HEAD_NAME = "wink.TemplateHead";
- protected static final String TEMPLATE_TAIL_PATTERN = "(/.*)?";
+ protected static final String TEMPLATE_TAIL_NAME = "wink.TemplateTail"; //$NON-NLS-1$
+ protected static final String TEMPLATE_HEAD_NAME = "wink.TemplateHead"; //$NON-NLS-1$
+ protected static final String TEMPLATE_TAIL_PATTERN = "(/.*)?"; //$NON-NLS-1$
protected String template;
protected Pattern pattern;
@@ -290,9 +290,9 @@
if (uri != null) {
normalizedUri = UriHelper.normalize(uri);
} else {
- normalizedUri = "";
+ normalizedUri = ""; //$NON-NLS-1$
}
- if (normalizedUri.startsWith("/")) {
+ if (normalizedUri.startsWith("/")) { //$NON-NLS-1$
normalizedUri = normalizedUri.substring(1);
}
@@ -397,8 +397,8 @@
* template uri.
*/
protected abstract static class CapturingGroup implements TemplateElement {
- protected static final String REGEX0 = "[^/]*?";
- protected static final String REGEX1 = "[^/]+?";
+ protected static final String REGEX0 = "[^/]*?"; //$NON-NLS-1$
+ protected static final String REGEX1 = "[^/]+?"; //$NON-NLS-1$
protected int capturingGroupId = -1;
@@ -482,9 +482,9 @@
// are building,
// so we convert all the capturing groups into non-capturing groups
regex = convertAllGroupsToNonCapturing(regex);
- builder.append("(");
+ builder.append("("); //$NON-NLS-1$
builder.append(regex);
- builder.append(")");
+ builder.append(")"); //$NON-NLS-1$
}
@Override
@@ -530,7 +530,7 @@
// then this is a capturing group, so replace it with
// a non-capturing group
if ((ch == '(') && (i + 1 < regexLen) && (regex.charAt(i + 1) != '?')) {
- sb.append("?:");
+ sb.append("?:"); //$NON-NLS-1$
}
}
return sb.toString();
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/AnnotationUtils.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/AnnotationUtils.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/AnnotationUtils.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/AnnotationUtils.java Wed Mar 3 21:21:51 2010
@@ -39,7 +39,7 @@
public static String[] parseConsumesProducesValues(String[] values) {
ArrayList<String> strings = new ArrayList<String>();
for (String v : values) {
- StringTokenizer tokenizer = new StringTokenizer(v, ",");
+ StringTokenizer tokenizer = new StringTokenizer(v, ","); //$NON-NLS-1$
while (tokenizer.hasMoreTokens()) {
strings.add(tokenizer.nextToken().trim());
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/ClassUtils.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/ClassUtils.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/ClassUtils.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/ClassUtils.java Wed Mar 3 21:21:51 2010
@@ -33,15 +33,15 @@
// Class.forName does not support primitives, so we have to account for that
private static HashMap<String, Class<?>> loadClassMap = new HashMap<String, Class<?>>();
static {
- loadClassMap.put("byte", byte.class);
- loadClassMap.put("int", int.class);
- loadClassMap.put("short", short.class);
- loadClassMap.put("long", long.class);
- loadClassMap.put("float", float.class);
- loadClassMap.put("double", double.class);
- loadClassMap.put("boolean", boolean.class);
- loadClassMap.put("char", char.class);
- loadClassMap.put("void", void.class);
+ loadClassMap.put("byte", byte.class); //$NON-NLS-1$
+ loadClassMap.put("int", int.class); //$NON-NLS-1$
+ loadClassMap.put("short", short.class); //$NON-NLS-1$
+ loadClassMap.put("long", long.class); //$NON-NLS-1$
+ loadClassMap.put("float", float.class); //$NON-NLS-1$
+ loadClassMap.put("double", double.class); //$NON-NLS-1$
+ loadClassMap.put("boolean", boolean.class); //$NON-NLS-1$
+ loadClassMap.put("char", char.class); //$NON-NLS-1$
+ loadClassMap.put("void", void.class); //$NON-NLS-1$
}
/**
@@ -69,20 +69,20 @@
try {
// try context class loader first
- logger.debug("Loading class {} using thread context classloader.", className);
+ logger.debug("Loading class {} using thread context classloader.", className); //$NON-NLS-1$
return Class.forName(className,
true,
Thread.currentThread().getContextClassLoader());
} catch (ClassNotFoundException cnfe) {
try {
// fallback to current classloader
- logger.debug("Loading class {} using current classloader.", className);
+ logger.debug("Loading class {} using current classloader.", className); //$NON-NLS-1$
return Class.forName(className,
true,
ClassUtils.class.getClassLoader());
} catch (ClassNotFoundException cnfe2) {
// fallback to system classloader
- logger.debug("Loading class {} using system classloader.", className);
+ logger.debug("Loading class {} using system classloader.", className); //$NON-NLS-1$
try {
return Class.forName(className);
} catch (ClassNotFoundException cnfe3) {
@@ -105,7 +105,7 @@
// Class.forName does not support primitives, so do a last check:
Class cls = (Class) loadClassMap.get(className);
if (cls != null) {
- logger.debug("Returning class {}", className);
+ logger.debug("Returning class {}", className); //$NON-NLS-1$
return cls;
}
throw (ClassNotFoundException) ret;
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/DomHelper.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/DomHelper.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/DomHelper.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/DomHelper.java Wed Mar 3 21:21:51 2010
@@ -36,7 +36,7 @@
public final class DomHelper {
- private static final String XMLNS_PREFIX = "xmlns";
+ private static final String XMLNS_PREFIX = "xmlns"; //$NON-NLS-1$
private static final String XMLNS_PREFIX_COLON = XMLNS_PREFIX + ':';
private static final int XMLNS_PREFIX_COLON_LENGTH = XMLNS_PREFIX_COLON.length();
@@ -128,7 +128,7 @@
// default namespace
if (element.getNamespaceURI() != null) {
- ret.put("", element.getNamespaceURI());
+ ret.put("", element.getNamespaceURI()); //$NON-NLS-1$
}
// other namespaces
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/ExceptionHelper.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/ExceptionHelper.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/ExceptionHelper.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/ExceptionHelper.java Wed Mar 3 21:21:51 2010
@@ -45,7 +45,7 @@
public static String toString(Throwable t) {
String s = stackTraceToString(t);
if (s == null)
- s = "Exception " + t.getClass().getName() + " : " + t.getMessage();
+ s = "Exception " + t.getClass().getName() + " : " + t.getMessage(); //$NON-NLS-1$ //$NON-NLS-2$
return s;
}
@@ -82,7 +82,7 @@
private boolean canWrite() {
if (writeOK && this.getBuffer().length() > MAX_CHARS) {
- super.write(" ... [ too long - truncated ]");
+ super.write(" ... [ too long - truncated ]"); //$NON-NLS-1$
writeOK = false;
}
return writeOK;
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/FileLoader.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/FileLoader.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/FileLoader.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/FileLoader.java Wed Mar 3 21:21:51 2010
@@ -29,6 +29,7 @@
import java.net.URL;
import java.util.Enumeration;
+import org.apache.wink.common.internal.i18n.Messages;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -76,16 +77,16 @@
*/
public static InputStream loadFileAsStream(String fileName) throws FileNotFoundException {
- if (fileName == null || fileName.trim().equals("")) {
- throw new NullPointerException("fileName");
+ if (fileName == null || fileName.trim().equals("")) { //$NON-NLS-1$
+ throw new NullPointerException(Messages.getMessage("variableIsNull", "fileName")); //$NON-NLS-1$ //$NON-NLS-2$
}
- logger.debug("Searching for {} in file system.", fileName);
+ logger.debug("Searching for {} in file system.", fileName); //$NON-NLS-1$
File file = new File(fileName);
if (file.isFile()) {
// since file is a normal file, return it
- logger.debug("File {} found in file system.", fileName);
+ logger.debug("File {} found in file system.", fileName); //$NON-NLS-1$
return new FileInputStream(file);
}
@@ -117,26 +118,27 @@
* @throws IOException
*/
public static Enumeration<URL> loadFileUsingClassLoaders(String filename) throws IOException {
-
+
/*
- * TODO: perhaps desirable to move this code to org.apache.wink.common.internal.utils.ClassUtils?
+ * TODO: perhaps desirable to move this code to
+ * org.apache.wink.common.internal.utils.ClassUtils?
*/
-
- logger.debug("Searching for {} using thread context classloader.", filename);
+
+ logger.debug("Searching for {} using thread context classloader.", filename); //$NON-NLS-1$
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
Enumeration<URL> resources = loadFileUsingClassLoader(classLoader, filename);
if (resources.hasMoreElements()) {
return resources;
}
- logger.debug("Searching for {} using current classloader.", filename);
+ logger.debug("Searching for {} using current classloader.", filename); //$NON-NLS-1$
classLoader = FileLoader.class.getClassLoader();
resources = loadFileUsingClassLoader(classLoader, filename);
if (resources.hasMoreElements()) {
return resources;
}
- logger.debug("Searching for {} using system classloader.", filename);
+ logger.debug("Searching for {} using system classloader.", filename); //$NON-NLS-1$
return ClassLoader.getSystemResources(filename);
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/HeaderUtils.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/HeaderUtils.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/HeaderUtils.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/HeaderUtils.java Wed Mar 3 21:21:51 2010
@@ -30,9 +30,9 @@
public class HeaderUtils {
public static Locale languageToLocale(String language) {
- String[] languageSplit = language.split("-", 3);
+ String[] languageSplit = language.split("-", 3); //$NON-NLS-1$
return new Locale(languageSplit[0].trim(), languageSplit.length > 1 ? languageSplit[1]
- .trim() : "", languageSplit.length > 2 ? languageSplit[2].trim() : "");
+ .trim() : "", languageSplit.length > 2 ? languageSplit[2].trim() : ""); //$NON-NLS-1$ //$NON-NLS-2$
}
public static String localeToLanguage(Locale locale) {
@@ -41,11 +41,11 @@
String variant = locale.getVariant();
StringBuffer result = new StringBuffer(language);
if (country != null && country.length() > 0) {
- result.append("-");
+ result.append("-"); //$NON-NLS-1$
result.append(country);
}
if (variant != null && variant.length() > 0) {
- result.append("-");
+ result.append("-"); //$NON-NLS-1$
result.append(variant);
}
return result.toString();
@@ -61,12 +61,12 @@
// build 'Allow' header for the response
StringBuilder builder = new StringBuilder(30);
- String delimit = "";
+ String delimit = ""; //$NON-NLS-1$
for (String httpMethod : httpMethods) {
builder.append(delimit);
builder.append(httpMethod);
- delimit = ", ";
+ delimit = ", "; //$NON-NLS-1$
}
return builder.toString();
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/HttpDateParser.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/HttpDateParser.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/HttpDateParser.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/HttpDateParser.java Wed Mar 3 21:21:51 2010
@@ -31,10 +31,10 @@
*/
public final class HttpDateParser {
- private static final String RFC_1123_DATE_FORMAT = "EEE, dd MMM yyyy HH:mm:ss zzz";
- private static final String RFC_1036_DATE_FORMAT = "EEEE, dd-MMM-yy HH:mm:ss zzz";
- private static final String ANSIC_DATE_FORMAT = "EEE MMM d HH:mm:ss yyyy";
- private static final TimeZone tz = TimeZone.getTimeZone("GMT");
+ private static final String RFC_1123_DATE_FORMAT = "EEE, dd MMM yyyy HH:mm:ss zzz"; //$NON-NLS-1$
+ private static final String RFC_1036_DATE_FORMAT = "EEEE, dd-MMM-yy HH:mm:ss zzz"; //$NON-NLS-1$
+ private static final String ANSIC_DATE_FORMAT = "EEE MMM d HH:mm:ss yyyy"; //$NON-NLS-1$
+ private static final TimeZone tz = TimeZone.getTimeZone("GMT"); //$NON-NLS-1$
// no instances
private HttpDateParser() {