You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2017/02/14 09:49:08 UTC
[03/51] [partial] cxf git commit: Remove all trailing whitespaces
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/AttachmentBuilder.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/AttachmentBuilder.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/AttachmentBuilder.java
index b32d5f7..bca6532 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/AttachmentBuilder.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/AttachmentBuilder.java
@@ -28,43 +28,43 @@ import org.apache.cxf.jaxrs.impl.MetadataMap;
* Fluid builder class for {@link Attachment} objects.
*/
public class AttachmentBuilder {
- private MultivaluedMap<String, String> headers =
+ private MultivaluedMap<String, String> headers =
new MetadataMap<String, String>(false, true);
private Object object;
private DataHandler dataHandler;
private ContentDisposition contentDisposition;
-
+
public AttachmentBuilder() {
//
}
-
+
public AttachmentBuilder id(String id) {
headers.putSingle("Content-Id", id);
return this;
-
+
}
-
+
public AttachmentBuilder mediaType(String mediaType) {
headers.putSingle("Content-Type", mediaType);
return this;
}
-
+
public AttachmentBuilder object(Object theObject) {
this.object = theObject;
return this;
}
-
+
public AttachmentBuilder dataHandler(DataHandler newDataHandler) {
this.dataHandler = newDataHandler;
return this;
}
-
-
+
+
public AttachmentBuilder header(String key, String value) {
headers.putSingle(key, value);
return this;
}
-
+
/**
* Set all of the headers. This will overwrite any content ID,
* media type, ContentDisposition, or other header set by previous calls.
@@ -76,12 +76,12 @@ public class AttachmentBuilder {
contentDisposition = null;
return this;
}
-
+
public AttachmentBuilder contentDisposition(ContentDisposition newContentDisposition) {
this.contentDisposition = newContentDisposition;
return this;
}
-
+
public Attachment build() {
if (contentDisposition != null) {
headers.putSingle("Content-Disposition", contentDisposition.toString());
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/ContentDisposition.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/ContentDisposition.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/ContentDisposition.java
index 4536bca..dcb2899 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/ContentDisposition.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/ContentDisposition.java
@@ -21,7 +21,7 @@ package org.apache.cxf.jaxrs.ext.multipart;
public class ContentDisposition extends org.apache.cxf.attachment.ContentDisposition {
-
+
public ContentDisposition(String value) {
super(value);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/InputStreamDataSource.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/InputStreamDataSource.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/InputStreamDataSource.java
index 114875b..4a351ba 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/InputStreamDataSource.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/InputStreamDataSource.java
@@ -30,18 +30,18 @@ public class InputStreamDataSource implements DataSource {
private InputStream is;
private String contentType;
private String name;
-
+
public InputStreamDataSource(InputStream is, String contentType) {
this.is = is;
this.contentType = contentType;
}
-
+
public InputStreamDataSource(InputStream is, String contentType, String name) {
this.is = is;
this.contentType = contentType;
this.name = name;
}
-
+
public String getContentType() {
return contentType;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/Multipart.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/Multipart.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/Multipart.java
index 8aa95e6..f956b0e 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/Multipart.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/Multipart.java
@@ -41,10 +41,10 @@ public @interface Multipart {
String type() default "*/*";
/**
* How to handle a missing part. By default, if no part matches,
- * the {@link org.apache.cxf.jaxrs.provider.MultipartProvider}
+ * the {@link org.apache.cxf.jaxrs.provider.MultipartProvider}
* throws a {@link javax.ws.rs.WebApplicationException}
* with status 400. If this option is set to <strong>false</strong>,
* the parameter is set to <strong>null</strong> instead.
*/
- boolean required() default true;
+ boolean required() default true;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/MultipartBody.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/MultipartBody.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/MultipartBody.java
index 7fe7b71..bafc333 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/MultipartBody.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/MultipartBody.java
@@ -27,49 +27,49 @@ import javax.ws.rs.core.MediaType;
import org.apache.cxf.jaxrs.utils.JAXRSUtils;
public class MultipartBody {
-
+
public static final String INBOUND_MESSAGE_ATTACHMENTS = "org.apache.cxf.jaxrs.attachments.inbound";
public static final String OUTBOUND_MESSAGE_ATTACHMENTS = "org.apache.cxf.jaxrs.attachments.outbound";
-
- private static final MediaType MULTIPART_RELATED_TYPE = JAXRSUtils.toMediaType("multipart/related");
+
+ private static final MediaType MULTIPART_RELATED_TYPE = JAXRSUtils.toMediaType("multipart/related");
private boolean outbound;
private List<Attachment> atts;
- private MediaType mt;
-
+ private MediaType mt;
+
public MultipartBody(List<Attachment> atts, MediaType mt, boolean outbound) {
this.atts = atts;
this.outbound = outbound;
this.mt = mt == null ? MULTIPART_RELATED_TYPE : mt;
}
-
+
public MultipartBody(List<Attachment> atts, boolean outbound) {
this(atts, MULTIPART_RELATED_TYPE, outbound);
}
-
+
public MultipartBody(Attachment att) {
atts = new ArrayList<>();
atts.add(att);
outbound = true;
this.mt = MULTIPART_RELATED_TYPE;
}
-
+
public MultipartBody(List<Attachment> atts) {
this(atts, MULTIPART_RELATED_TYPE, false);
}
-
+
public MultipartBody(boolean outbound) {
this(new ArrayList<>(), MULTIPART_RELATED_TYPE, outbound);
}
-
+
public MediaType getType() {
return mt;
}
-
+
public List<Attachment> getAllAttachments() {
-
+
return outbound ? atts : Collections.unmodifiableList(atts);
}
-
+
public List<Attachment> getChildAttachments() {
List<Attachment> childAtts = new ArrayList<>();
for (int i = 1; i < atts.size(); i++) {
@@ -77,11 +77,11 @@ public class MultipartBody {
}
return childAtts;
}
-
+
public Attachment getRootAttachment() {
return atts.size() > 0 ? atts.get(0) : null;
}
-
+
public Attachment getAttachment(String contentId) {
for (Attachment a : atts) {
if (contentId.equalsIgnoreCase(a.getContentId())) {
@@ -94,7 +94,7 @@ public class MultipartBody {
}
return null;
}
-
+
public <T> T getAttachmentObject(String contentId, Class<T> cls) {
Attachment att = getAttachment(contentId);
if (att != null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/ElementClass.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/ElementClass.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/ElementClass.java
index 65abc34..0cf9807 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/ElementClass.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/ElementClass.java
@@ -25,7 +25,7 @@ import java.lang.annotation.Target;
/**
* Can be applied to methods returning a JAX-RS {@link Response}
- *
+ *
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD })
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLInstruction.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLInstruction.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLInstruction.java
index 0b698b4..37f6a4a 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLInstruction.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLInstruction.java
@@ -24,8 +24,8 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
- * Can be used to add custom XML processing
- * instructions to out-bound XML messages
+ * Can be used to add custom XML processing
+ * instructions to out-bound XML messages
*/
@Target({ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME)
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLName.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLName.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLName.java
index 8b94958..e3282e0 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLName.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLName.java
@@ -26,8 +26,8 @@ import java.lang.annotation.Target;
/**
* Can be used to assign qualified XML names to arbitrary classes
- * for the purpose of matching them with external schema definitions
- *
+ * for the purpose of matching them with external schema definitions
+ *
*/
@Target({ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER })
@Retention(RetentionPolicy.RUNTIME)
@@ -37,7 +37,7 @@ public @interface XMLName {
*/
String value() default "";
/**
- * Optional prefix
+ * Optional prefix
**/
String prefix() default "";
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java
index b3f4d9b..0b2cb53 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java
@@ -58,16 +58,16 @@ import org.apache.cxf.staxutils.StaxUtils;
*
*/
public class XMLSource {
-
- private static final String XML_NAMESPACE = "http://www.w3.org/XML/1998/namespace";
-
+
+ private static final String XML_NAMESPACE = "http://www.w3.org/XML/1998/namespace";
+
private InputStream stream;
- private Document doc;
-
+ private Document doc;
+
public XMLSource(InputStream is) {
stream = is;
}
-
+
/**
* Allows for multiple queries against the same stream by buffering to DOM
*/
@@ -80,11 +80,11 @@ public class XMLSource {
e.printStackTrace();
}
}
-
+
/**
* Find the matching XML node and convert it into an instance of the provided class.
* The default JAXB MessageBodyReader is currently used in case of non-primitive types.
- *
+ *
* @param expression XPath expression
* @param cls class of the node
* @return the instance representing the matching node
@@ -92,11 +92,11 @@ public class XMLSource {
public <T> T getNode(String expression, Class<T> cls) {
return getNode(expression, CastUtils.cast(Collections.emptyMap(), String.class, String.class), cls);
}
-
+
/**
* Find the matching XML node and convert it into an instance of the provided class.
* The default JAXB MessageBodyReader is currently used in case of non-primitive types.
- *
+ *
* @param expression XPath expression
* @param namespaces the namespaces map, prefixes which are used in the XPath expression
* are the keys, namespace URIs are the values; note, the prefixes do not have to match
@@ -113,19 +113,19 @@ public class XMLSource {
if (obj instanceof Node) {
Node node = (Node)obj;
if (cls.isPrimitive() || cls == String.class) {
- return (T)readPrimitiveValue(node, cls);
+ return (T)readPrimitiveValue(node, cls);
} else {
return readNode(node, cls);
}
}
return cls.cast(evaluate(expression, namespaces, XPathConstants.STRING));
}
-
+
/**
* Find the list of matching XML nodes and convert them into
* an array of instances of the provided class.
* The default JAXB MessageBodyReader is currently used in case of non-primitive types.
- *
+ *
* @param expression XPath expression
* @param cls class of the node
* @return the array of instances representing the matching nodes
@@ -133,12 +133,12 @@ public class XMLSource {
public <T> T[] getNodes(String expression, Class<T> cls) {
return getNodes(expression, CastUtils.cast(Collections.emptyMap(), String.class, String.class), cls);
}
-
+
/**
* Find the list of matching XML nodes and convert them into
* an array of instances of the provided class.
* The default JAXB MessageBodyReader is currently used in case of non-primitive types.
- *
+ *
* @param expression XPath expression
* @param namespaces the namespaces map, prefixes which are used in the XPath expression
* are the keys, namespace URIs are the values; note, the prefixes do not have to match
@@ -148,7 +148,7 @@ public class XMLSource {
*/
@SuppressWarnings("unchecked")
public <T> T[] getNodes(String expression, Map<String, String> namespaces, Class<T> cls) {
-
+
NodeList nodes = (NodeList)evaluate(expression, namespaces, XPathConstants.NODESET);
if (nodes == null || nodes.getLength() == 0) {
return null;
@@ -174,7 +174,7 @@ public class XMLSource {
public URI getLink(String expression) {
return getLink(expression, CastUtils.cast(Collections.emptyMap(), String.class, String.class));
}
-
+
/**
* Find an attribute or text node representing
* an absolute or relative link and convert it to URI
@@ -188,7 +188,7 @@ public class XMLSource {
String value = getValue(expression, namespaces);
return value == null ? null : URI.create(value);
}
-
+
/**
* Find attributes or text nodes representing
* absolute or relative links and convert them to URIs
@@ -209,12 +209,12 @@ public class XMLSource {
}
return uris;
}
-
+
/**
* Returns the value of the xml:base attribute, if any.
- * This can be used to calculate an absolute URI provided
- * the links in the actual XML instance are relative.
- *
+ * This can be used to calculate an absolute URI provided
+ * the links in the actual XML instance are relative.
+ *
* @return the xml:base value
*/
public URI getBaseURI() {
@@ -222,7 +222,7 @@ public class XMLSource {
map.put("xml", XML_NAMESPACE);
return getLink("/*/@xml:base", map);
}
-
+
/**
* Find the attribute or simple/text node
* @param expression the XPath expression
@@ -231,7 +231,7 @@ public class XMLSource {
public String getValue(String expression) {
return getValue(expression, CastUtils.cast(Collections.emptyMap(), String.class, String.class));
}
-
+
/**
* Find the attribute or simple/text node
* @param expression the XPath expression
@@ -243,7 +243,7 @@ public class XMLSource {
public String getValue(String expression, Map<String, String> namespaces) {
return getValue(expression, namespaces, String.class);
}
-
+
/**
* Find the attributes or simple/text nodes
* @param expression the XPath expression
@@ -252,7 +252,7 @@ public class XMLSource {
public String[] getValues(String expression) {
return getValues(expression, CastUtils.cast(Collections.emptyMap(), String.class, String.class));
}
-
+
/**
* Find the attributes or simple/text nodes
* @param expression the XPath expression
@@ -264,10 +264,10 @@ public class XMLSource {
public String[] getValues(String expression, Map<String, String> namespaces) {
return getNodes(expression, namespaces, String.class);
}
-
+
/**
* Find the attribute or simple/text node and convert the string value to the
- * instance of the provided class, example, Integer.class.
+ * instance of the provided class, example, Integer.class.
* @param expression the XPath expression
* @param namespaces the namespaces map, prefixes which are used in the XPath expression
* are the keys, namespace URIs are the values; note, the prefixes do not have to match
@@ -278,10 +278,10 @@ public class XMLSource {
@SuppressWarnings("unchecked")
public <T> T getValue(String expression, Map<String, String> namespaces, Class<T> cls) {
Object result = evaluate(expression, namespaces, XPathConstants.STRING);
- return result == null ? null : (T)InjectionUtils.convertStringToPrimitive(result.toString(), cls);
+ return result == null ? null : (T)InjectionUtils.convertStringToPrimitive(result.toString(), cls);
}
-
-
+
+
private Object evaluate(String expression, Map<String, String> namespaces, QName type) {
XPathFactory factory = XPathFactory.newInstance();
try {
@@ -294,10 +294,10 @@ public class XMLSource {
boolean releaseDoc = false;
try {
if (stream != null) {
- //xalan xpath evaluate parses to a DOM via a DocumentBuilderFactory, but doesn't
- //set the SecureProcessing on that. Since a DOM is always created, might as well
- //do it via stax and avoid the service factory performance hits that the
- //DocumentBuilderFactory will entail as well as get the extra security
+ //xalan xpath evaluate parses to a DOM via a DocumentBuilderFactory, but doesn't
+ //set the SecureProcessing on that. Since a DOM is always created, might as well
+ //do it via stax and avoid the service factory performance hits that the
+ //DocumentBuilderFactory will entail as well as get the extra security
//that woodstox provides
setBuffering();
releaseDoc = true;
@@ -312,14 +312,14 @@ public class XMLSource {
}
}
}
-
-
+
+
private static class NamespaceContextImpl implements NamespaceContext {
-
+
private Map<String, String> namespaces;
-
+
NamespaceContextImpl(Map<String, String> namespaces) {
- this.namespaces = namespaces;
+ this.namespaces = namespaces;
}
public String getNamespaceURI(String prefix) {
@@ -343,7 +343,7 @@ public class XMLSource {
return Collections.singletonList(prefix).iterator();
}
}
-
+
private <T> Object readPrimitiveValue(Node node, Class<T> cls) {
if (String.class == cls) {
if (node.getNodeType() == Node.ELEMENT_NODE) {
@@ -351,25 +351,25 @@ public class XMLSource {
} else {
return cls.cast(node.getNodeValue());
}
- }
-
+ }
+
return InjectionUtils.convertStringToPrimitive(node.getNodeValue(), cls);
}
-
-
+
+
private <T> T readNode(Node node, Class<T> cls) {
-
+
if (Node.class.isAssignableFrom(cls)) {
return cls.cast(node);
}
-
+
DOMSource s = new DOMSource(node);
if (Source.class == cls || DOMSource.class == cls) {
return cls.cast(s);
}
-
+
try {
-
+
JAXBElementProvider<?> provider = new JAXBElementProvider<Object>();
JAXBContext c = provider.getPackageContext(cls);
if (c == null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XSISchemaLocation.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XSISchemaLocation.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XSISchemaLocation.java
index 4cd6b39..113273e 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XSISchemaLocation.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XSISchemaLocation.java
@@ -24,24 +24,24 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
- * This annotation can be used to simplify adding
+ * This annotation can be used to simplify adding
* xsi:schemaLocation attributes
*/
@Target({ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME)
public @interface XSISchemaLocation {
/**
- * Schema location
+ * Schema location
* By default it is assumed to be relative to a base URI of the web application
*/
String value();
-
+
/**
- * If the location is relative and this property is set to true then
+ * If the location is relative and this property is set to true then
* the location will be resolved against the base URI of the web application
*/
boolean resolve() default true;
-
+
/**
* Can be used to get xsi:noNamespaceSchemaLocation produced.
* By default, xsi:schemaLocation will be set.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XSLTTransform.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XSLTTransform.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XSLTTransform.java
index 71c9a30..032e5e1 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XSLTTransform.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XSLTTransform.java
@@ -25,8 +25,8 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
- * Can be used to enable server-side XSLT transformations
- *
+ * Can be used to enable server-side XSLT transformations
+ *
*/
@Target({ElementType.METHOD, ElementType.PARAMETER })
@Retention(RetentionPolicy.RUNTIME)
@@ -39,7 +39,7 @@ public @interface XSLTTransform {
*/
String value();
/**
- * Supported media types
+ * Supported media types
**/
String[] mediaTypes() default { };
TransformType type() default TransformType.SERVER;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractInterceptorContextImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractInterceptorContextImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractInterceptorContextImpl.java
index 6781356..d5fa076 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractInterceptorContextImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractInterceptorContextImpl.java
@@ -38,11 +38,11 @@ public class AbstractInterceptorContextImpl extends AbstractPropertiesImpl {
this.type = type;
this.anns = anns;
}
-
+
public Class<?> getType() {
return cls;
}
-
+
public Annotation[] getAnnotations() {
return anns;
}
@@ -69,7 +69,7 @@ public class AbstractInterceptorContextImpl extends AbstractPropertiesImpl {
}
cls = ctype;
}
-
+
protected void providerSelectionPropertyChanged() {
m.put(ProviderFactory.PROVIDER_SELECTION_PROPERTY_CHANGED, Boolean.TRUE);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractPropertiesImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractPropertiesImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractPropertiesImpl.java
index caf8139..bf34a35 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractPropertiesImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractPropertiesImpl.java
@@ -30,7 +30,7 @@ public abstract class AbstractPropertiesImpl {
holder = PropertyHolderFactory.getPropertyHolder(message);
this.m = message;
}
-
+
public Object getProperty(String name) {
return holder.getProperty(name);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractRequestContextImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractRequestContextImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractRequestContextImpl.java
index 7d54415..944c132 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractRequestContextImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractRequestContextImpl.java
@@ -41,7 +41,7 @@ public abstract class AbstractRequestContextImpl extends AbstractPropertiesImpl
this.h = new HttpHeadersImpl(message);
this.responseContext = responseContext;
}
-
+
public void abortWith(Response response) {
checkContext();
m.getExchange().put(Response.class, JAXRSUtils.copyResponseIfNeeded(response));
@@ -92,7 +92,7 @@ public abstract class AbstractRequestContextImpl extends AbstractPropertiesImpl
protected HttpHeaders getHttpHeaders() {
return h != null ? h : new HttpHeadersImpl(m);
}
-
+
protected void checkContext() {
if (responseContext) {
throw new IllegalStateException();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractResponseContextImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractResponseContextImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractResponseContextImpl.java
index de1b96d..94f7fa8 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractResponseContextImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractResponseContextImpl.java
@@ -45,7 +45,7 @@ public abstract class AbstractResponseContextImpl {
this.m = m;
this.r = r;
}
-
+
public Set<String> getAllowedMethods() {
return r.getAllowedMethods();
}
@@ -62,7 +62,7 @@ public abstract class AbstractResponseContextImpl {
return r.getEntity();
}
-
+
public EntityTag getEntityTag() {
return r.getEntityTag();
}
@@ -130,16 +130,16 @@ public abstract class AbstractResponseContextImpl {
m.put(Message.CONTENT_TYPE, mt.toString());
}
}
-
+
public void setEntity(Object entity) {
((ResponseImpl)r).setEntity(entity, getResponseEntityAnnotations());
}
-
+
protected Annotation[] getResponseEntityAnnotations() {
return ((ResponseImpl)r).getEntityAnnotations();
}
-
-
+
+
public void setStatus(int status) {
m.getExchange().put(Message.RESPONSE_CODE, status);
m.put(Message.RESPONSE_CODE, status);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
index f1606c9..ace39eac 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
@@ -46,7 +46,7 @@ import org.apache.cxf.message.Message;
public class AsyncResponseImpl implements AsyncResponse, ContinuationCallback {
-
+
private Continuation cont;
private Message inMessage;
private TimeoutHandler timeoutHandler;
@@ -55,19 +55,19 @@ public class AsyncResponseImpl implements AsyncResponse, ContinuationCallback {
private volatile boolean done;
private volatile boolean resumedByApplication;
private volatile Long pendingTimeout;
-
+
private List<CompletionCallback> completionCallbacks = new LinkedList<CompletionCallback>();
private List<ConnectionCallback> connectionCallbacks = new LinkedList<ConnectionCallback>();
private Throwable unmappedThrowable;
-
+
public AsyncResponseImpl(Message inMessage) {
inMessage.put(AsyncResponse.class, this);
inMessage.getExchange().put(ContinuationCallback.class, this);
this.inMessage = inMessage;
-
+
initContinuation();
}
-
+
@Override
public boolean resume(Object response) {
return doResume(response);
@@ -77,11 +77,11 @@ public class AsyncResponseImpl implements AsyncResponse, ContinuationCallback {
public boolean resume(Throwable response) {
return doResume(response);
}
-
+
private boolean isCancelledOrNotSuspended() {
return isCancelled() || !isSuspended();
}
-
+
private boolean doResume(Object response) {
if (isCancelledOrNotSuspended()) {
return false;
@@ -99,7 +99,7 @@ public class AsyncResponseImpl implements AsyncResponse, ContinuationCallback {
}
return true;
}
-
+
@Override
public boolean cancel() {
return doCancel(null);
@@ -114,7 +114,7 @@ public class AsyncResponseImpl implements AsyncResponse, ContinuationCallback {
public boolean cancel(Date retryAfter) {
return doCancel(HttpUtils.getHttpDateFormat().format(retryAfter));
}
-
+
private boolean doCancel(String retryAfterHeader) {
if (cancelled) {
return true;
@@ -182,20 +182,20 @@ public class AsyncResponseImpl implements AsyncResponse, ContinuationCallback {
}
@Override
- public Map<Class<?>, Collection<Class<?>>> register(Class<?> callback, Class<?>... callbacks)
+ public Map<Class<?>, Collection<Class<?>>> register(Class<?> callback, Class<?>... callbacks)
throws NullPointerException {
try {
Object[] extraCallbacks = new Object[callbacks.length];
for (int i = 0; i < callbacks.length; i++) {
extraCallbacks[i] = callbacks[i].newInstance();
}
- return register(callback.newInstance(), extraCallbacks);
+ return register(callback.newInstance(), extraCallbacks);
} catch (NullPointerException e) {
throw e;
} catch (Throwable t) {
return Collections.emptyMap();
}
-
+
}
@Override
@@ -204,15 +204,15 @@ public class AsyncResponseImpl implements AsyncResponse, ContinuationCallback {
}
@Override
- public Map<Class<?>, Collection<Class<?>>> register(Object callback, Object... callbacks)
+ public Map<Class<?>, Collection<Class<?>>> register(Object callback, Object... callbacks)
throws NullPointerException {
- Map<Class<?>, Collection<Class<?>>> map =
+ Map<Class<?>, Collection<Class<?>>> map =
new HashMap<Class<?>, Collection<Class<?>>>();
-
+
Object[] allCallbacks = new Object[1 + callbacks.length];
allCallbacks[0] = callback;
System.arraycopy(callbacks, 0, allCallbacks, 1, callbacks.length);
-
+
for (int i = 0; i < allCallbacks.length; i++) {
if (allCallbacks[i] == null) {
throw new NullPointerException();
@@ -223,18 +223,18 @@ public class AsyncResponseImpl implements AsyncResponse, ContinuationCallback {
knownCallbacks = new HashSet<Class<?>>();
map.put(callbackCls, knownCallbacks);
}
-
+
if (allCallbacks[i] instanceof CompletionCallback) {
knownCallbacks.add(CompletionCallback.class);
- completionCallbacks.add((CompletionCallback)allCallbacks[i]);
+ completionCallbacks.add((CompletionCallback)allCallbacks[i]);
} else if (allCallbacks[i] instanceof ConnectionCallback) {
knownCallbacks.add(ConnectionCallback.class);
- connectionCallbacks.add((ConnectionCallback)allCallbacks[i]);
+ connectionCallbacks.add((ConnectionCallback)allCallbacks[i]);
}
}
return map;
}
-
+
@Override
public void onComplete() {
done = true;
@@ -245,21 +245,21 @@ public class AsyncResponseImpl implements AsyncResponse, ContinuationCallback {
public void onError(Throwable error) {
updateCompletionCallbacks(error);
}
-
+
private void updateCompletionCallbacks(Throwable error) {
Throwable actualError = error instanceof Fault ? ((Fault)error).getCause() : error;
for (CompletionCallback completionCallback : completionCallbacks) {
completionCallback.onComplete(actualError);
}
}
-
+
@Override
public void onDisconnect() {
for (ConnectionCallback connectionCallback : connectionCallbacks) {
connectionCallback.onDisconnect(this);
}
}
-
+
public synchronized boolean suspendContinuationIfNeeded() {
if (!resumedByApplication && !cont.isPending() && !cont.isResumed()) {
cont.suspend(AsyncResponse.NO_TIMEOUT);
@@ -269,7 +269,7 @@ public class AsyncResponseImpl implements AsyncResponse, ContinuationCallback {
return false;
}
}
-
+
public Object getResponseObject() {
Object obj = cont.getObject();
if (!(obj instanceof Response) && !(obj instanceof Throwable)) {
@@ -281,11 +281,11 @@ public class AsyncResponseImpl implements AsyncResponse, ContinuationCallback {
}
return obj;
}
-
+
public boolean isResumedByApplication() {
return resumedByApplication;
}
-
+
public synchronized void handleTimeout() {
if (!resumedByApplication) {
if (pendingTimeout != null) {
@@ -301,21 +301,21 @@ public class AsyncResponseImpl implements AsyncResponse, ContinuationCallback {
}
private void initContinuation() {
- ContinuationProvider provider =
+ ContinuationProvider provider =
(ContinuationProvider)inMessage.get(ContinuationProvider.class.getName());
cont = provider.getContinuation();
initialSuspend = true;
}
-
+
public void prepareContinuation() {
initContinuation();
}
-
+
public void setUnmappedThrowable(Throwable t) {
unmappedThrowable = t;
}
public void reset() {
cont.reset();
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CacheControlHeaderProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CacheControlHeaderProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CacheControlHeaderProvider.java
index 7887101..5e2e56e 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CacheControlHeaderProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CacheControlHeaderProvider.java
@@ -36,16 +36,16 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.phase.PhaseInterceptorChain;
public class CacheControlHeaderProvider implements HeaderDelegate<CacheControl> {
-
+
public static final String CACHE_CONTROL_SEPARATOR_PROPERTY =
"org.apache.cxf.http.cache-control.separator";
private static final String DEFAULT_SEPARATOR = ",";
-
- private static final String COMPLEX_HEADER_EXPRESSION =
+
+ private static final String COMPLEX_HEADER_EXPRESSION =
"(([\\w-]+=\"[^\"]*\")|([\\w-]+=[\\w]+)|([\\w-]+))";
private static final Pattern COMPLEX_HEADER_PATTERN =
Pattern.compile(COMPLEX_HEADER_EXPRESSION);
-
+
private static final String PUBLIC = "public";
private static final String PRIVATE = "private";
private static final String NO_CACHE = "no-cache";
@@ -68,7 +68,7 @@ public class CacheControlHeaderProvider implements HeaderDelegate<CacheControl>
int maxAge = -1;
int sMaxAge = -1;
Map<String, String> extensions = new HashMap<String, String>();
-
+
String[] tokens = getTokens(c);
for (String rawToken : tokens) {
String token = rawToken.trim();
@@ -98,7 +98,7 @@ public class CacheControlHeaderProvider implements HeaderDelegate<CacheControl>
extensions.put(extPair[0], value);
}
}
-
+
CacheControl cc = new CacheControl();
cc.setMaxAge(maxAge);
cc.setSMaxAge(sMaxAge);
@@ -111,7 +111,7 @@ public class CacheControlHeaderProvider implements HeaderDelegate<CacheControl>
cc.setNoStore(noStore);
cc.setNoTransform(noTransform);
cc.getCacheExtension().putAll(extensions);
-
+
return cc;
}
@@ -134,10 +134,10 @@ public class CacheControlHeaderProvider implements HeaderDelegate<CacheControl>
return StringUtils.split(c, separator);
}
}
-
+
public String toString(CacheControl c) {
String separator = getSeparator();
-
+
StringBuilder sb = new StringBuilder();
if (c.isPrivate()) {
sb.append(PRIVATE);
@@ -182,9 +182,9 @@ public class CacheControlHeaderProvider implements HeaderDelegate<CacheControl>
sb.append(separator);
}
String s = sb.toString();
- return s.endsWith(separator) ? s.substring(0, s.length() - 1) : s;
+ return s.endsWith(separator) ? s.substring(0, s.length() - 1) : s;
}
-
+
private static void addFields(List<String> fields, String token) {
int i = token.indexOf('=');
if (i != -1) {
@@ -201,7 +201,7 @@ public class CacheControlHeaderProvider implements HeaderDelegate<CacheControl>
}
}
}
-
+
}
private static void handleFields(List<String> fields, StringBuilder sb) {
@@ -218,13 +218,13 @@ public class CacheControlHeaderProvider implements HeaderDelegate<CacheControl>
}
sb.append('\"');
}
-
+
protected String getSeparator() {
-
+
String separator = DEFAULT_SEPARATOR;
-
+
Message message = getCurrentMessage();
-
+
if (message != null) {
Object sepProperty = message.getContextualProperty(CACHE_CONTROL_SEPARATOR_PROPERTY);
if (sepProperty != null) {
@@ -236,7 +236,7 @@ public class CacheControlHeaderProvider implements HeaderDelegate<CacheControl>
}
return separator;
}
-
+
protected Message getCurrentMessage() {
return PhaseInterceptorChain.getCurrentMessage();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ConfigurableImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ConfigurableImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ConfigurableImpl.java
index 6d5c9dc..9be144d 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ConfigurableImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ConfigurableImpl.java
@@ -36,22 +36,22 @@ public class ConfigurableImpl<C extends Configurable<C>> implements Configurable
public ConfigurableImpl(C configurable, RuntimeType rt, Class<?>[] supportedProviderClasses) {
this(configurable, supportedProviderClasses, new ConfigurationImpl(rt));
}
-
+
public ConfigurableImpl(C configurable, Class<?>[] supportedProviderClasses, Configuration config) {
this(configurable, supportedProviderClasses);
- this.config = config instanceof ConfigurationImpl
+ this.config = config instanceof ConfigurationImpl
? (ConfigurationImpl)config : new ConfigurationImpl(config, supportedProviderClasses);
}
-
+
private ConfigurableImpl(C configurable, Class<?>[] supportedProviderClasses) {
this.configurable = configurable;
this.supportedProviderClasses = supportedProviderClasses;
}
-
+
protected C getConfigurable() {
return configurable;
}
-
+
@Override
public Configuration getConfiguration() {
return config;
@@ -72,25 +72,25 @@ public class ConfigurableImpl<C extends Configurable<C>> implements Configurable
public C register(Object provider, int bindingPriority) {
return doRegister(provider, bindingPriority, supportedProviderClasses);
}
-
+
@Override
public C register(Object provider, Class<?>... contracts) {
return doRegister(provider, Priorities.USER, contracts);
}
-
+
@Override
public C register(Object provider, Map<Class<?>, Integer> contracts) {
if (provider instanceof Feature) {
Feature feature = (Feature)provider;
boolean enabled = feature.configure(new FeatureContextImpl(this));
config.setFeature(feature, enabled);
-
+
return configurable;
}
config.register(provider, contracts);
return configurable;
}
-
+
@Override
public C register(Class<?> providerClass) {
return register(providerClass, AnnotationUtils.getBindingPriority(providerClass));
@@ -98,7 +98,7 @@ public class ConfigurableImpl<C extends Configurable<C>> implements Configurable
@Override
public C register(Class<?> providerClass, int bindingPriority) {
- return doRegister(ConfigurationImpl.createProvider(providerClass),
+ return doRegister(ConfigurationImpl.createProvider(providerClass),
bindingPriority, supportedProviderClasses);
}
@@ -111,7 +111,7 @@ public class ConfigurableImpl<C extends Configurable<C>> implements Configurable
public C register(Class<?> providerClass, Map<Class<?>, Integer> contracts) {
return register(ConfigurationImpl.createProvider(providerClass), contracts);
}
-
+
private C doRegister(Object provider, int bindingPriority, Class<?>... contracts) {
return register(provider, ConfigurationImpl.initContractsMap(bindingPriority, contracts));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ConfigurationImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ConfigurationImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ConfigurationImpl.java
index 9c0a8e6..0fc667d 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ConfigurationImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ConfigurationImpl.java
@@ -39,19 +39,19 @@ public class ConfigurationImpl implements Configuration {
private static final Logger LOG = LogUtils.getL7dLogger(ConfigurationImpl.class);
private Map<String, Object> props = new HashMap<String, Object>();
private RuntimeType runtimeType;
- private Map<Object, Map<Class<?>, Integer>> providers =
- new LinkedHashMap<Object, Map<Class<?>, Integer>>();
+ private Map<Object, Map<Class<?>, Integer>> providers =
+ new LinkedHashMap<Object, Map<Class<?>, Integer>>();
private Map<Feature, Boolean> features = new LinkedHashMap<Feature, Boolean>();
-
+
public ConfigurationImpl(RuntimeType rt) {
this.runtimeType = rt;
}
-
+
public ConfigurationImpl(Configuration parent, Class<?>[] defaultContracts) {
if (parent != null) {
this.props.putAll(parent.getProperties());
this.runtimeType = parent.getRuntimeType();
-
+
Set<Class<?>> providerClasses = new HashSet<Class<?>>(parent.getClasses());
for (Object o : parent.getInstances()) {
if (!(o instanceof Feature)) {
@@ -65,10 +65,10 @@ public class ConfigurationImpl implements Configuration {
for (Class<?> cls : providerClasses) {
registerParentProvider(createProvider(cls), parent, defaultContracts);
}
-
+
}
}
-
+
private void registerParentProvider(Object o, Configuration parent, Class<?>[] defaultContracts) {
Map<Class<?>, Integer> contracts = parent.getContracts(o.getClass());
if (contracts != null) {
@@ -77,7 +77,7 @@ public class ConfigurationImpl implements Configuration {
register(o, AnnotationUtils.getBindingPriority(o.getClass()), defaultContracts);
}
}
-
+
@Override
public Set<Class<?>> getClasses() {
Set<Class<?>> classes = new HashSet<Class<?>>();
@@ -167,17 +167,17 @@ public class ConfigurationImpl implements Configuration {
props.put(name, value);
}
}
-
+
public void setFeature(Feature f, boolean enabled) {
features.put(f, enabled);
}
-
-
+
+
private void register(Object provider, int bindingPriority, Class<?>... contracts) {
register(provider, initContractsMap(bindingPriority, contracts));
}
-
- public boolean register(Object provider, Map<Class<?>, Integer> contracts) {
+
+ public boolean register(Object provider, Map<Class<?>, Integer> contracts) {
if (provider.getClass() == Class.class) {
if (isRegistered((Class<?>)provider)) {
LOG.warning("Provider class " + ((Class<?>)provider).getName() + " has already been registered");
@@ -189,7 +189,7 @@ public class ConfigurationImpl implements Configuration {
LOG.warning("Provider " + provider.getClass().getName() + " has already been registered");
return false;
}
-
+
Map<Class<?>, Integer> metadata = providers.get(provider);
if (metadata == null) {
metadata = new HashMap<Class<?>, Integer>();
@@ -202,7 +202,7 @@ public class ConfigurationImpl implements Configuration {
}
return true;
}
-
+
public static Map<Class<?>, Integer> initContractsMap(int bindingPriority, Class<?>... contracts) {
Map<Class<?>, Integer> metadata = new HashMap<Class<?>, Integer>();
for (Class<?> contract : contracts) {
@@ -210,12 +210,12 @@ public class ConfigurationImpl implements Configuration {
}
return metadata;
}
-
+
public static Object createProvider(Class<?> cls) {
try {
return cls.newInstance();
} catch (Throwable ex) {
- throw new RuntimeException(ex);
+ throw new RuntimeException(ex);
}
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java
index 94a8ce6..3dd0479 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java
@@ -33,11 +33,11 @@ import org.apache.cxf.jaxrs.utils.ExceptionUtils;
import org.apache.cxf.jaxrs.utils.HttpUtils;
import org.apache.cxf.message.Message;
-public class ContainerRequestContextImpl extends AbstractRequestContextImpl
+public class ContainerRequestContextImpl extends AbstractRequestContextImpl
implements ContainerRequestContext {
private static final String ENDPOINT_ADDRESS_PROPERTY = "org.apache.cxf.transport.endpoint.address";
-
+
private boolean preMatch;
public ContainerRequestContextImpl(Message message, boolean preMatch, boolean responseContext) {
super(message, responseContext);
@@ -110,11 +110,11 @@ public class ContainerRequestContextImpl extends AbstractRequestContextImpl
}
requestUri = URI.create(requestUriString);
}
-
+
}
doSetRequestUri(requestUri);
}
-
+
protected void doSetRequestUri(URI requestUri) throws IllegalStateException {
checkNotPreMatch();
HttpUtils.resetRequestURI(m, requestUri.getRawPath());
@@ -139,7 +139,7 @@ public class ContainerRequestContextImpl extends AbstractRequestContextImpl
checkContext();
m.put(SecurityContext.class, sc);
if (sc instanceof org.apache.cxf.security.SecurityContext) {
- m.put(org.apache.cxf.security.SecurityContext.class,
+ m.put(org.apache.cxf.security.SecurityContext.class,
(org.apache.cxf.security.SecurityContext)sc);
}
}
@@ -149,8 +149,8 @@ public class ContainerRequestContextImpl extends AbstractRequestContextImpl
throw new IllegalStateException();
}
}
-
- @Override
+
+ @Override
public void setMethod(String method) throws IllegalStateException {
checkNotPreMatch();
super.setMethod(method);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerResponseContextImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerResponseContextImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerResponseContextImpl.java
index 44fc249..47f4708 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerResponseContextImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerResponseContextImpl.java
@@ -29,13 +29,13 @@ import javax.ws.rs.core.MultivaluedMap;
import org.apache.cxf.jaxrs.utils.InjectionUtils;
import org.apache.cxf.message.Message;
-public class ContainerResponseContextImpl extends AbstractResponseContextImpl
+public class ContainerResponseContextImpl extends AbstractResponseContextImpl
implements ContainerResponseContext {
private Class<?> serviceCls;
private Method invoked;
-
- public ContainerResponseContextImpl(ResponseImpl r,
+
+ public ContainerResponseContextImpl(ResponseImpl r,
Message m,
Class<?> serviceCls,
Method invoked) {
@@ -43,7 +43,7 @@ public class ContainerResponseContextImpl extends AbstractResponseContextImpl
this.serviceCls = serviceCls;
this.invoked = invoked;
}
-
+
@Override
public Annotation[] getEntityAnnotations() {
return super.getResponseEntityAnnotations();
@@ -57,17 +57,17 @@ public class ContainerResponseContextImpl extends AbstractResponseContextImpl
@Override
public Type getEntityType() {
return InjectionUtils.getGenericResponseType(invoked,
- serviceCls,
- super.r.getActualEntity(),
- getEntityClass(),
+ serviceCls,
+ super.r.getActualEntity(),
+ getEntityClass(),
super.m.getExchange());
}
-
+
@Override
public MultivaluedMap<String, Object> getHeaders() {
return r.getMetadata();
}
-
+
@Override
public OutputStream getEntityStream() {
return m.getContent(OutputStream.class);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CookieHeaderProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CookieHeaderProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CookieHeaderProvider.java
index 89df061..2ef296e 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CookieHeaderProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CookieHeaderProvider.java
@@ -28,19 +28,19 @@ public class CookieHeaderProvider implements HeaderDelegate<Cookie> {
private static final String VERSION = "$Version";
private static final String PATH = "$Path";
private static final String DOMAIN = "$Domain";
-
+
public Cookie fromString(String c) {
-
+
if (c == null) {
throw new IllegalArgumentException("Cookie value can not be null");
}
-
+
int version = 0;
String name = null;
String value = null;
String path = null;
String domain = null;
-
+
// ignore the fact the possible version may be seperated by ','
String[] tokens = StringUtils.split(c, ";");
for (String token : tokens) {
@@ -56,22 +56,22 @@ public class CookieHeaderProvider implements HeaderDelegate<Cookie> {
int i = theToken.indexOf('=');
if (i != -1) {
name = theToken.substring(0, i);
- value = i == theToken.length() + 1 ? ""
+ value = i == theToken.length() + 1 ? ""
: NewCookieHeaderProvider.stripQuotes(theToken.substring(i + 1));
}
}
}
-
+
if (name == null || value == null) {
throw new IllegalArgumentException("Cookie is malformed : " + c);
}
-
+
return new Cookie(name, value, path, domain, version);
}
public String toString(Cookie c) {
StringBuilder sb = new StringBuilder();
-
+
if (c.getVersion() != 0) {
sb.append(VERSION).append('=').append(c.getVersion()).append(';');
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/DateHeaderProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/DateHeaderProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/DateHeaderProvider.java
index 2d2e046..c1ac24f 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/DateHeaderProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/DateHeaderProvider.java
@@ -26,9 +26,9 @@ import javax.ws.rs.ext.RuntimeDelegate.HeaderDelegate;
import org.apache.cxf.jaxrs.utils.HttpUtils;
public class DateHeaderProvider implements HeaderDelegate<Date> {
-
+
public Date fromString(String value) {
-
+
if (value == null) {
throw new IllegalArgumentException("Date value can not be null");
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/EntityTagHeaderProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/EntityTagHeaderProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/EntityTagHeaderProvider.java
index 4cfa6fb..9d5a58a 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/EntityTagHeaderProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/EntityTagHeaderProvider.java
@@ -25,18 +25,18 @@ import javax.ws.rs.ext.RuntimeDelegate.HeaderDelegate;
public class EntityTagHeaderProvider implements HeaderDelegate<EntityTag> {
private static final String WEAK_PREFIX = "W/";
-
+
public EntityTag fromString(String header) {
-
-
+
+
if (header == null) {
throw new IllegalArgumentException("ETag value can not be null");
}
-
+
if ("*".equals(header)) {
return new EntityTag("*");
}
-
+
String tag = null;
boolean weak = false;
int i = header.indexOf(WEAK_PREFIX);
@@ -56,7 +56,7 @@ public class EntityTagHeaderProvider implements HeaderDelegate<EntityTag> {
if (tag.length() < 2 || !tag.startsWith("\"") || !tag.endsWith("\"")) {
throw new IllegalArgumentException("Misformatted ETag : " + header);
}
- tag = tag.length() == 2 ? "" : tag.substring(1, tag.length() - 1);
+ tag = tag.length() == 2 ? "" : tag.substring(1, tag.length() - 1);
return new EntityTag(tag, weak);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/FeatureContextImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/FeatureContextImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/FeatureContextImpl.java
index 3ee6379..33211c3 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/FeatureContextImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/FeatureContextImpl.java
@@ -31,7 +31,7 @@ public class FeatureContextImpl implements FeatureContext {
}
public FeatureContextImpl() {
}
-
+
@Override
public Configuration getConfiguration() {
return cfg.getConfiguration();
@@ -95,5 +95,5 @@ public class FeatureContextImpl implements FeatureContext {
}
public void setConfigurable(Configurable<?> configurable) {
this.cfg = configurable;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java
index 042ce89..f4b9a28 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java
@@ -61,8 +61,8 @@ public class HttpHeadersImpl implements HttpHeaders {
private static final String COOKIE_VERSION_PARAM = DOLLAR_CHAR + "Version";
private static final String COOKIE_PATH_PARAM = DOLLAR_CHAR + "Path";
private static final String COOKIE_DOMAIN_PARAM = DOLLAR_CHAR + "Domain";
-
- private static final String COMPLEX_HEADER_EXPRESSION =
+
+ private static final String COMPLEX_HEADER_EXPRESSION =
"(([\\w]+=\"[^\"]*\")|([\\w]+=[\\w]+)|([\\w]+))(;(([\\w]+=\"[^\"]*\")|([\\w]+=[\\w]+)|([\\w]+)))?";
private static final Pattern COMPLEX_HEADER_PATTERN =
Pattern.compile(COMPLEX_HEADER_EXPRESSION);
@@ -78,8 +78,8 @@ public class HttpHeadersImpl implements HttpHeaders {
HEADERS_WITH_POSSIBLE_QUOTES.add(HttpHeaders.COOKIE);
HEADERS_WITH_POSSIBLE_QUOTES.add(HttpHeaders.SET_COOKIE);
}
-
-
+
+
private Message message;
private Map<String, List<String>> headers;
public HttpHeadersImpl(Message message) {
@@ -89,7 +89,7 @@ public class HttpHeadersImpl implements HttpHeaders {
headers = Collections.emptyMap();
}
}
-
+
public List<MediaType> getAcceptableMediaTypes() {
List<String> lValues = headers.get(HttpHeaders.ACCEPT);
if (lValues == null || lValues.isEmpty() || lValues.get(0) == null) {
@@ -99,7 +99,7 @@ public class HttpHeadersImpl implements HttpHeaders {
for (String value : lValues) {
mediaTypes.addAll(JAXRSUtils.parseMediaTypes(value));
}
- sortMediaTypesUsingQualityFactor(mediaTypes);
+ sortMediaTypesUsingQualityFactor(mediaTypes);
return mediaTypes;
}
@@ -108,15 +108,15 @@ public class HttpHeadersImpl implements HttpHeaders {
if (values == null || values.isEmpty()) {
return Collections.emptyMap();
}
-
+
Map<String, Cookie> cl = new HashMap<String, Cookie>();
for (String value : values) {
if (value == null) {
continue;
}
-
-
- List<String> cs = getHeaderValues(HttpHeaders.COOKIE, value,
+
+
+ List<String> cs = getHeaderValues(HttpHeaders.COOKIE, value,
getCookieSeparator(value));
for (String c : cs) {
Cookie cookie = Cookie.valueOf(c);
@@ -137,7 +137,7 @@ public class HttpHeadersImpl implements HttpHeaders {
|| value.contains(COOKIE_DOMAIN_PARAM))) {
return DEFAULT_SEPARATOR;
}
-
+
return DEFAULT_COOKIE_SEPARATOR;
}
}
@@ -155,8 +155,8 @@ public class HttpHeadersImpl implements HttpHeaders {
} else {
return null;
}
- }
-
+ }
+
public Locale getLanguage() {
List<String> values = getListValues(HttpHeaders.CONTENT_LANGUAGE);
return values.size() == 0 ? null : HttpUtils.getLocale(values.get(0).trim());
@@ -168,10 +168,10 @@ public class HttpHeadersImpl implements HttpHeaders {
}
public MultivaluedMap<String, String> getRequestHeaders() {
- boolean splitIndividualValue
+ boolean splitIndividualValue
= MessageUtils.isTrue(message.getContextualProperty(HEADER_SPLIT_PROPERTY));
if (splitIndividualValue) {
- Map<String, List<String>> newHeaders =
+ Map<String, List<String>> newHeaders =
new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
newHeaders.put(entry.getKey(), getRequestHeader(entry.getKey()));
@@ -187,14 +187,14 @@ public class HttpHeadersImpl implements HttpHeaders {
if (ls.isEmpty()) {
return Collections.singletonList(new Locale("*"));
}
-
- List<Locale> newLs = new ArrayList<>();
+
+ List<Locale> newLs = new ArrayList<>();
Map<Locale, Float> prefs = new HashMap<Locale, Float>();
for (String l : ls) {
String[] pair = StringUtils.split(l, ";");
-
+
Locale locale = HttpUtils.getLocale(pair[0].trim());
-
+
newLs.add(locale);
if (pair.length > 1) {
String[] pair2 = StringUtils.split(pair[1], "=");
@@ -210,23 +210,23 @@ public class HttpHeadersImpl implements HttpHeaders {
if (newLs.size() <= 1) {
return newLs;
}
-
+
Collections.sort(newLs, new AcceptLanguageComparator(prefs));
return newLs;
-
+
}
public List<String> getRequestHeader(String name) {
- boolean splitIndividualValue
+ boolean splitIndividualValue
= MessageUtils.isTrue(message.getContextualProperty(HEADER_SPLIT_PROPERTY));
-
+
List<String> values = headers.get(name);
if (!splitIndividualValue
|| values == null
|| HttpUtils.isDateRelatedHeader(name)) {
return values;
}
-
+
List<String> ls = new LinkedList<String>();
for (String value : values) {
if (value == null) {
@@ -252,11 +252,11 @@ public class HttpHeadersImpl implements HttpHeaders {
}
return actualValues;
}
-
+
private List<String> getHeaderValues(String headerName, String originalValue) {
return getHeaderValues(headerName, originalValue, DEFAULT_SEPARATOR);
}
-
+
private List<String> getHeaderValues(String headerName, String originalValue, String sep) {
if (!originalValue.contains(QUOTE)
|| HEADERS_WITH_POSSIBLE_QUOTES.contains(headerName)) {
@@ -272,7 +272,7 @@ public class HttpHeadersImpl implements HttpHeaders {
}
}
if (originalValue.startsWith("\"") && originalValue.endsWith("\"")) {
- String actualValue = originalValue.length() == 2 ? ""
+ String actualValue = originalValue.length() == 2 ? ""
: originalValue.substring(1, originalValue.length() - 1);
return Collections.singletonList(actualValue);
}
@@ -286,10 +286,10 @@ public class HttpHeadersImpl implements HttpHeaders {
}
return values;
}
-
+
private static class AcceptLanguageComparator implements Comparator<Locale> {
private Map<Locale, Float> prefs;
-
+
AcceptLanguageComparator(Map<Locale, Float> prefs) {
this.prefs = prefs;
}
@@ -300,7 +300,7 @@ public class HttpHeadersImpl implements HttpHeaders {
return Float.compare(p1, p2) * -1;
}
}
-
+
private void sortMediaTypesUsingQualityFactor(List<MediaType> types) {
if (types.size() > 1) {
Collections.sort(types, new Comparator<MediaType>() {
@@ -308,7 +308,7 @@ public class HttpHeadersImpl implements HttpHeaders {
public int compare(MediaType mt1, MediaType mt2) {
return JAXRSUtils.compareMediaTypesQualityFactors(mt1, mt2);
}
-
+
});
}
}
@@ -332,5 +332,5 @@ public class HttpHeadersImpl implements HttpHeaders {
}
return HttpUtils.getContentLength(values.get(0));
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java
index eb1758a..b1724f3 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java
@@ -109,10 +109,10 @@ public class HttpServletRequestFilter extends HttpServletRequestWrapper {
public String nextElement() {
return it.next();
}
-
+
};
}
-
+
private void readFromParamsIfNeeded() {
if (formParams == null) {
formParams = new MetadataMap<String, String>();
@@ -121,7 +121,7 @@ public class HttpServletRequestFilter extends HttpServletRequestWrapper {
String body = FormUtils.readBody(m.getContent(InputStream.class), enc);
FormUtils.populateMapFromString(formParams, m, body, enc, true);
}
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletResponseFilter.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletResponseFilter.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletResponseFilter.java
index e9b1e1f..1a64f16 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletResponseFilter.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletResponseFilter.java
@@ -39,13 +39,13 @@ public class HttpServletResponseFilter extends HttpServletResponseWrapper {
super.setStatus(sc);
m.getExchange().put(Message.RESPONSE_CODE, sc);
}
-
+
@Override
public void setContentType(String ct) {
super.setContentType(ct);
m.getExchange().put(Message.CONTENT_TYPE, ct);
}
-
+
@Override
public void addHeader(String name, String value) {
if (Message.CONTENT_TYPE.equals(name)) {
@@ -54,7 +54,7 @@ public class HttpServletResponseFilter extends HttpServletResponseWrapper {
super.addHeader(name, value);
}
}
-
+
@Override
public ServletOutputStream getOutputStream() throws IOException {
return new ServletOutputStreamFilter(super.getOutputStream(), m);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkBuilderImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkBuilderImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkBuilderImpl.java
index 2b99c98..0e23048 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkBuilderImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkBuilderImpl.java
@@ -40,7 +40,7 @@ public class LinkBuilderImpl implements Builder {
private UriBuilder ub;
private URI baseUri;
private Map<String, String> params = new HashMap<String, String>(6);
-
+
@Override
public Link build(Object... values) {
URI resolvedLinkUri = getResolvedUri(values);
@@ -58,20 +58,20 @@ public class LinkBuilderImpl implements Builder {
if (ub == null) {
ub = new UriBuilderImpl();
if (baseUri != null) {
- ub.uri(baseUri);
+ ub.uri(baseUri);
}
-
+
}
URI uri = ub.build(values);
-
+
if (!uri.isAbsolute() && baseUri != null && baseUri.isAbsolute()) {
UriBuilder linkUriBuilder = UriBuilder.fromUri(baseUri);
- return HttpUtils.resolve(linkUriBuilder, uri);
+ return HttpUtils.resolve(linkUriBuilder, uri);
} else {
return uri;
}
}
-
+
@Override
public Builder link(Link link) {
ub = UriBuilder.fromLink(link);
@@ -81,7 +81,7 @@ public class LinkBuilderImpl implements Builder {
@Override
public Builder link(String link) {
-
+
link = link.trim();
if (link.length() > 1 && link.startsWith("<")) {
int index = link.lastIndexOf(">", link.length());
@@ -95,7 +95,7 @@ public class LinkBuilderImpl implements Builder {
}
}
}
-
+
String[] tokens = StringUtils.split(link, ";");
for (String token : tokens) {
String theToken = token.trim();
@@ -122,7 +122,7 @@ public class LinkBuilderImpl implements Builder {
@Override
public Builder rel(String rel) {
String exisingRel = params.get(Link.REL);
- String newRel = exisingRel == null ? rel : exisingRel + " " + rel;
+ String newRel = exisingRel == null ? rel : exisingRel + " " + rel;
return param(Link.REL, newRel);
}
@@ -163,18 +163,18 @@ public class LinkBuilderImpl implements Builder {
throw new IllegalArgumentException(value);
}
}
-
+
static class LinkImpl extends Link {
- private static final Set<String> MAIN_PARAMETERS =
+ private static final Set<String> MAIN_PARAMETERS =
new HashSet<>(Arrays.asList(Link.REL, Link.TITLE, Link.TYPE));
-
+
private URI uri;
private Map<String, String> params;
LinkImpl(URI uri, Map<String, String> params) {
this.uri = uri;
this.params = params;
}
-
+
@Override
public Map<String, String> getParams() {
return Collections.unmodifiableMap(params);
@@ -243,18 +243,18 @@ public class LinkBuilderImpl implements Builder {
}
}
return sb.toString();
- }
-
+ }
+
@Override
public int hashCode() {
return uri.hashCode() + 37 * params.hashCode();
}
-
+
@Override
public boolean equals(Object o) {
if (o instanceof Link) {
Link other = (Link)o;
- return uri.equals(other.getUri())
+ return uri.equals(other.getUri())
&& getParams().equals(other.getParams());
} else {
return false;
@@ -271,6 +271,6 @@ public class LinkBuilderImpl implements Builder {
@Override
public Builder baseUri(String uri) {
baseUri = URI.create(uri);
- return this;
+ return this;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkHeaderProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkHeaderProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkHeaderProvider.java
index 36c22dd..5bcc2f6 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkHeaderProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkHeaderProvider.java
@@ -34,14 +34,14 @@ public class LinkHeaderProvider implements HeaderDelegate<Link> {
private static final String REL = "rel";
private static final String TYPE = "type";
private static final String TITLE = "title";
-
+
private static final Set<String> KNOWN_PARAMETERS;
static {
KNOWN_PARAMETERS = new HashSet<>(Arrays.asList(REL, TYPE, TITLE));
}
-
+
public Link fromString(String value) {
-
+
if (value == null) {
throw new IllegalArgumentException("Link value can not be null");
}
@@ -53,7 +53,7 @@ public class LinkHeaderProvider implements HeaderDelegate<Link> {
Link.Builder builder = new LinkBuilderImpl();
builder.uri(value.substring(1, closeIndex).trim());
if (closeIndex < value.length() - 1) {
-
+
String[] tokens = StringUtils.split(value.substring(closeIndex + 1), ";");
for (String token : tokens) {
String theToken = token.trim();
@@ -82,7 +82,7 @@ public class LinkHeaderProvider implements HeaderDelegate<Link> {
}
}
return builder.build();
-
+
}
private String removeQuotesIfNeeded(String value) {
@@ -92,14 +92,14 @@ public class LinkHeaderProvider implements HeaderDelegate<Link> {
return value;
}
}
-
+
public String toString(Link link) {
StringBuilder sb = new StringBuilder();
-
+
sb.append('<');
sb.append(link.getUri());
sb.append('>');
-
+
String rels = link.getRel();
if (!rels.isEmpty()) {
sb.append(";").append(REL).append('=');
@@ -118,9 +118,9 @@ public class LinkHeaderProvider implements HeaderDelegate<Link> {
sb.append(";").append(entry.getKey()).append('=');
writeListParamValues(sb, entry.getValue());
}
-
+
return sb.toString();
-
+
}
private void writeListParamValues(StringBuilder sb, String value) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
index 5d297b6..281d0ca 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
@@ -41,17 +41,17 @@ import org.apache.cxf.phase.PhaseInterceptorChain;
public class MediaTypeHeaderProvider implements HeaderDelegate<MediaType> {
private static final Logger LOG = LogUtils.getL7dLogger(MediaTypeHeaderProvider.class);
- private static final String STRICT_MEDIA_TYPE_CHECK =
+ private static final String STRICT_MEDIA_TYPE_CHECK =
"org.apache.cxf.jaxrs.mediaTypeCheck.strict";
- private static final Pattern COMPLEX_PARAMETERS =
+ private static final Pattern COMPLEX_PARAMETERS =
Pattern.compile("(([\\w-]+=\"[^\"]*\")|([\\w-]+=[\\w-/\\+]+))");
-
+
private static Map<String, MediaType> map = new ConcurrentHashMap<String, MediaType>();
- private static final int MAX_MT_CACHE_SIZE =
+ private static final int MAX_MT_CACHE_SIZE =
Integer.getInteger("org.apache.cxf.jaxrs.max_mediatype_cache_size", 200);
public MediaType fromString(String mType) {
-
+
return valueOf(mType);
}
@@ -59,7 +59,7 @@ public class MediaTypeHeaderProvider implements HeaderDelegate<MediaType> {
if (mType == null) {
throw new IllegalArgumentException("Media type value can not be null");
}
-
+
MediaType result = map.get(mType);
if (result == null) {
result = internalValueOf(mType);
@@ -73,28 +73,28 @@ public class MediaTypeHeaderProvider implements HeaderDelegate<MediaType> {
}
public static MediaType internalValueOf(String mType) {
-
+
int i = mType.indexOf('/');
if (i == -1) {
return handleMediaTypeWithoutSubtype(mType.trim());
} else if (i == 0) {
throw new IllegalArgumentException("Invalid media type string: " + mType);
}
-
+
int paramsStart = mType.indexOf(';', i + 1);
int end = paramsStart == -1 ? mType.length() : paramsStart;
-
- String type = mType.substring(0, i);
+
+ String type = mType.substring(0, i);
String subtype = mType.substring(i + 1, end);
if (subtype.indexOf("/") != -1) {
throw new IllegalArgumentException("Invalid media type string: " + mType);
}
-
+
Map<String, String> parameters = Collections.emptyMap();
if (paramsStart != -1) {
parameters = new LinkedHashMap<String, String>();
-
+
String paramString = mType.substring(paramsStart + 1);
if (paramString.contains("\"")) {
Matcher m = COMPLEX_PARAMETERS.matcher(paramString);
@@ -109,28 +109,28 @@ public class MediaTypeHeaderProvider implements HeaderDelegate<MediaType> {
}
}
}
-
- return new MediaType(type.trim().toLowerCase(),
- subtype.trim().toLowerCase(),
+
+ return new MediaType(type.trim().toLowerCase(),
+ subtype.trim().toLowerCase(),
parameters);
}
-
+
private static void addParameter(Map<String, String> parameters, String token) {
int equalSign = token.indexOf('=');
if (equalSign == -1) {
throw new IllegalArgumentException("Wrong media type parameter, separator is missing");
}
- parameters.put(token.substring(0, equalSign).trim().toLowerCase(),
+ parameters.put(token.substring(0, equalSign).trim().toLowerCase(),
token.substring(equalSign + 1).trim());
}
-
+
public String toString(MediaType type) {
return typeToString(type);
}
public static String typeToString(MediaType type) {
return typeToString(type, null);
}
- // Max number of parameters that may be ignored is 3, at least as known
+ // Max number of parameters that may be ignored is 3, at least as known
// to the implementation
public static String typeToString(MediaType type, List<String> ignoreParams) {
if (type == null) {
@@ -138,7 +138,7 @@ public class MediaTypeHeaderProvider implements HeaderDelegate<MediaType> {
}
StringBuilder sb = new StringBuilder();
sb.append(type.getType()).append('/').append(type.getSubtype());
-
+
Map<String, String> params = type.getParameters();
if (params != null) {
for (Iterator<Map.Entry<String, String>> iter = params.entrySet().iterator();
@@ -150,7 +150,7 @@ public class MediaTypeHeaderProvider implements HeaderDelegate<MediaType> {
sb.append(';').append(entry.getKey()).append('=').append(entry.getValue());
}
}
-
+
return sb.toString();
}
@@ -168,14 +168,14 @@ public class MediaTypeHeaderProvider implements HeaderDelegate<MediaType> {
return new MediaType(MediaType.MEDIA_TYPE_WILDCARD,
MediaType.MEDIA_TYPE_WILDCARD,
parameters);
- } else {
+ } else {
return MediaType.WILDCARD_TYPE;
}
-
+
}
}
Message message = PhaseInterceptorChain.getCurrentMessage();
- if (message != null
+ if (message != null
&& !MessageUtils.isTrue(message.getContextualProperty(STRICT_MEDIA_TYPE_CHECK))) {
MediaType mt = null;
if (mType.equals(MediaType.TEXT_PLAIN_TYPE.getType())) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MetadataMap.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MetadataMap.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MetadataMap.java
index abd88dc..f228737 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MetadataMap.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MetadataMap.java
@@ -37,36 +37,36 @@ public class MetadataMap<K, V> implements MultivaluedMap<K, V> {
private boolean caseInsensitive;
private boolean readOnly;
private Map<K, List<V>> m;
-
+
public MetadataMap() {
this.m = new LinkedHashMap<K, List<V>>();
}
-
+
public MetadataMap(int size) {
this.m = new LinkedHashMap<K, List<V>>(size);
}
-
+
public MetadataMap(Map<K, List<V>> store) {
this(store, true);
}
-
+
public MetadataMap(Map<K, List<V>> store, boolean copy) {
this(store, copy, false, false);
}
-
+
public MetadataMap(boolean readOnly, boolean caseInsensitive) {
this(null, readOnly, caseInsensitive);
}
-
+
public MetadataMap(Map<K, List<V>> store, boolean readOnly, boolean caseInsensitive) {
-
+
this (store, true, readOnly, caseInsensitive);
-
+
}
-
- public MetadataMap(Map<K, List<V>> store, boolean copyStore,
+
+ public MetadataMap(Map<K, List<V>> store, boolean copyStore,
boolean readOnly, boolean caseInsensitive) {
-
+
if (copyStore) {
this.m = new LinkedHashMap<K, List<V>>();
if (store != null) {
@@ -83,13 +83,13 @@ public class MetadataMap<K, V> implements MultivaluedMap<K, V> {
}
this.caseInsensitive = caseInsensitive;
this.readOnly = readOnly;
-
+
}
-
+
public void add(K key, V value) {
addValue(key, value, true);
}
-
+
private void addValue(K key, V value, boolean last) {
List<V> data = getList(key);
try {
@@ -113,12 +113,12 @@ public class MetadataMap<K, V> implements MultivaluedMap<K, V> {
private List<V> getList(K key) {
List<V> data = this.get(key);
if (data == null) {
- data = new ArrayList<>();
+ data = new ArrayList<>();
m.put(key, data);
}
return readOnly ? Collections.unmodifiableList(data) : data;
}
-
+
public V getFirst(K key) {
List<V> data = this.get(key);
return data == null || data.isEmpty() ? null : data.get(0);
@@ -156,7 +156,7 @@ public class MetadataMap<K, V> implements MultivaluedMap<K, V> {
K realKey = getMatchingKey(key);
return realKey == null ? null : m.get(realKey);
}
-
+
private K getMatchingKey(Object key) {
for (K entry : m.keySet()) {
if (entry != null && entry.toString().equalsIgnoreCase(key.toString())
@@ -217,16 +217,16 @@ public class MetadataMap<K, V> implements MultivaluedMap<K, V> {
public int hashCode() {
return m.hashCode();
}
-
+
@Override
public boolean equals(Object o) {
return m.equals(o);
}
-
+
public String toString() {
return m.toString();
}
-
+
private static class KeyComparator<K> implements Comparator<K> {
public int compare(K k1, K k2) {
@@ -234,7 +234,7 @@ public class MetadataMap<K, V> implements MultivaluedMap<K, V> {
String s2 = k2.toString();
return s1.compareToIgnoreCase(s2);
}
-
+
}
@SafeVarargs
@@ -255,7 +255,7 @@ public class MetadataMap<K, V> implements MultivaluedMap<K, V> {
}
getList(key).addAll(newValues);
}
-
+
public void addFirst(K key, V value) {
addValue(key, value, false);
}
@@ -265,11 +265,11 @@ public class MetadataMap<K, V> implements MultivaluedMap<K, V> {
if (mapKeys.size() != m.keySet().size()) {
return false;
}
-
+
for (K key : mapKeys) {
List<V> localValues = this.get(key);
List<V> mapValues = map.get(key);
- if (localValues == null
+ if (localValues == null
|| localValues.size() != mapValues.size()
|| !localValues.containsAll(mapValues)) {
return false;