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:40 UTC
[35/51] [partial] cxf git commit: Remove all trailing whitespaces
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/transform/ElementProperty.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/transform/ElementProperty.java b/core/src/main/java/org/apache/cxf/staxutils/transform/ElementProperty.java
index 32df9cb..3af57f8 100755
--- a/core/src/main/java/org/apache/cxf/staxutils/transform/ElementProperty.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/transform/ElementProperty.java
@@ -22,34 +22,34 @@ package org.apache.cxf.staxutils.transform;
import javax.xml.namespace.QName;
/**
- *
+ *
*/
class ElementProperty {
private QName name;
private String text;
private boolean child;
-
+
ElementProperty(QName name, String text, boolean child) {
this.name = name;
this.text = text;
this.child = child;
}
- /**
+ /**
* @return Returns the name.
*/
public QName getName() {
return name;
}
- /**
+ /**
* @return Returns the text.
*/
public String getText() {
return text;
}
- /**
+ /**
* @return Returns the child.
*/
public boolean isChild() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/transform/IgnoreNamespacesWriter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/transform/IgnoreNamespacesWriter.java b/core/src/main/java/org/apache/cxf/staxutils/transform/IgnoreNamespacesWriter.java
index c6187ba..8d80a6d 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/transform/IgnoreNamespacesWriter.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/transform/IgnoreNamespacesWriter.java
@@ -34,7 +34,7 @@ public class IgnoreNamespacesWriter extends DelegatingXMLStreamWriter {
this.ignoreXsiAttributes = ignoreXsiAttributes;
}
- public void writeAttribute(String prefix, String uri,
+ public void writeAttribute(String prefix, String uri,
String local, String value) throws XMLStreamException {
if (ignoreXsiAttributes && XSI_PREFIX.equals(prefix)
&& ("type".equals(local) || "nil".equals(local))) {
@@ -46,19 +46,19 @@ public class IgnoreNamespacesWriter extends DelegatingXMLStreamWriter {
public void writeAttribute(String uri, String local, String value) throws XMLStreamException {
super.writeAttribute(local, value);
}
-
+
public void writeStartElement(String prefix, String local, String uri) throws XMLStreamException {
super.writeStartElement(local);
}
-
+
public void writeStartElement(String uri, String local) throws XMLStreamException {
super.writeStartElement(local);
}
-
+
public void setPrefix(String pfx, String uri) throws XMLStreamException {
// completed
}
-
+
public void setDefaultNamespace(String uri) throws XMLStreamException {
// completed
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java b/core/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java
index 765713d..3a115ff 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java
@@ -43,7 +43,7 @@ public class InTransformReader extends DepthXMLStreamReader {
private static final String INTERN_NAMES = "org.codehaus.stax2.internNames";
private static final String INTERN_NS = "org.codehaus.stax2.internNsUris";
-
+
private QNamesMap inElementsMap;
private QNamesMap inAttributesMap;
private Map<QName, ElementProperty> inAppendMap = new HashMap<QName, ElementProperty>(5);
@@ -53,20 +53,20 @@ public class InTransformReader extends DepthXMLStreamReader {
private List<List<ParsingEvent>> pushedAheadEvents = new LinkedList<List<ParsingEvent>>();
private String replaceText;
private ParsingEvent currentEvent;
- private List<Integer> attributesIndexes = new ArrayList<>();
+ private List<Integer> attributesIndexes = new ArrayList<>();
private boolean blockOriginalReader = true;
private boolean attributesIndexed;
private DelegatingNamespaceContext namespaceContext;
- public InTransformReader(XMLStreamReader reader,
+ public InTransformReader(XMLStreamReader reader,
Map<String, String> inMap,
Map<String, String> appendMap,
boolean blockOriginalReader) {
-
+
this(reader, inMap, appendMap, null, null, blockOriginalReader);
}
-
- public InTransformReader(XMLStreamReader reader,
+
+ public InTransformReader(XMLStreamReader reader,
Map<String, String> inEMap,
Map<String, String> appendMap,
List<String> dropESet,
@@ -78,20 +78,20 @@ public class InTransformReader extends DepthXMLStreamReader {
this.blockOriginalReader = blockOriginalReader;
TransformUtils.convertToQNamesMap(inEMap, inElementsMap, nsMap);
TransformUtils.convertToQNamesMap(inAMap, inAttributesMap, null);
-
+
TransformUtils.convertToMapOfElementProperties(appendMap, inAppendMap);
TransformUtils.convertToSetOfQNames(dropESet, inDropSet);
namespaceContext = new DelegatingNamespaceContext(
reader.getNamespaceContext(), nsMap);
}
-
+
@Override
- // If JAXB schema validation is disabled then returning
+ // If JAXB schema validation is disabled then returning
// the native reader and thus bypassing this reader may work
public XMLStreamReader getReader() {
return blockOriginalReader ? this : super.getReader();
}
-
+
public int next() throws XMLStreamException {
final boolean doDebug = LOG.isLoggable(Level.FINE);
@@ -107,7 +107,7 @@ public class InTransformReader extends DepthXMLStreamReader {
LOG.fine("no pushed event");
}
}
-
+
int event = super.next();
if (event == XMLStreamConstants.START_ELEMENT) {
attributesIndexed = false;
@@ -118,7 +118,7 @@ public class InTransformReader extends DepthXMLStreamReader {
if (doDebug) {
LOG.fine("read StartElement " + theName + " at " + getDepth());
}
-
+
final boolean dropped = inDropSet.contains(theName);
QName expected = inElementsMap.get(theName);
if (expected == null) {
@@ -143,7 +143,7 @@ public class InTransformReader extends DepthXMLStreamReader {
} else if (replaceContent) {
replaceText = appendProp.getText();
if (doDebug) {
- LOG.fine("replacing content with " + replaceText);
+ LOG.fine("replacing content with " + replaceText);
}
currentEvent = TransformUtils.createStartElementEvent(expected);
pushedAheadEvents.add(0, null);
@@ -168,39 +168,39 @@ public class InTransformReader extends DepthXMLStreamReader {
if (doDebug) {
LOG.fine("read EndElement " + theName + " at " + getDepth());
}
-
+
namespaceContext.up();
final boolean dropped = inDropSet.contains(theName);
if (!dropped) {
List<ParsingEvent> pe = pushedAheadEvents.remove(0);
if (null != pe) {
if (doDebug) {
- LOG.fine("pushed event found");
+ LOG.fine("pushed event found");
}
pushedBackEvents.addAll(0, pe);
currentEvent = pushedBackEvents.remove(0);
event = currentEvent.getEvent();
} else {
if (doDebug) {
- LOG.fine("no pushed event found");
+ LOG.fine("no pushed event found");
}
}
} else {
if (doDebug) {
- LOG.fine("shallow-dropping end " + theName);
+ LOG.fine("shallow-dropping end " + theName);
}
event = next();
}
} else {
if (doDebug) {
- LOG.fine("read other event " + event);
+ LOG.fine("read other event " + event);
}
currentEvent = null;
}
return event;
}
-
+
private void handleAppendMode(QName expected, ElementProperty appendProp) {
final boolean doDebug = LOG.isLoggable(Level.FINE);
if (appendProp.isChild()) {
@@ -225,7 +225,7 @@ public class InTransformReader extends DepthXMLStreamReader {
pe.add(TransformUtils.createEndElementEvent(expected));
pushedAheadEvents.add(0, pe);
}
- } else {
+ } else {
// ap-pre-*
if (null == appendProp.getText()) {
// ap-pre-wrap
@@ -249,7 +249,7 @@ public class InTransformReader extends DepthXMLStreamReader {
}
}
}
-
+
private void handleDefaultMode(QName name, QName expected) {
currentEvent = TransformUtils.createStartElementEvent(expected);
if (!name.equals(expected)) {
@@ -260,7 +260,7 @@ public class InTransformReader extends DepthXMLStreamReader {
pushedAheadEvents.add(0, null);
}
}
-
+
private void handleDeepDrop() throws XMLStreamException {
final int depth = getDepth();
while (depth != getDepth() || super.next() != XMLStreamConstants.END_ELEMENT) {
@@ -278,7 +278,7 @@ public class InTransformReader extends DepthXMLStreamReader {
public String getLocalName() {
if (currentEvent != null) {
- return currentEvent.getName().getLocalPart();
+ return currentEvent.getName().getLocalPart();
} else {
return super.getLocalName();
}
@@ -300,7 +300,7 @@ public class InTransformReader extends DepthXMLStreamReader {
}
return prefix;
}
-
+
public String getNamespaceURI(int index) {
String ns = super.getNamespaceURI(index);
String actualNs = nsMap.get(ns);
@@ -312,7 +312,7 @@ public class InTransformReader extends DepthXMLStreamReader {
return ns;
}
}
-
+
public String getNamespacePrefix(int index) {
String ns = super.getNamespaceURI(index);
String actualNs = nsMap.get(ns);
@@ -328,7 +328,7 @@ public class InTransformReader extends DepthXMLStreamReader {
return namespaceContext.getPrefix(ns);
}
}
-
+
public String getNamespaceURI(String prefix) {
String ns = super.getNamespaceURI(prefix);
@@ -357,8 +357,8 @@ public class InTransformReader extends DepthXMLStreamReader {
String prefix = super.getPrefix();
return new QName(ns, name, prefix == null ? "" : prefix);
}
-
- public QName getName() {
+
+ public QName getName() {
return new QName(getNamespaceURI(), getLocalName());
}
@@ -375,7 +375,7 @@ public class InTransformReader extends DepthXMLStreamReader {
throwIndexException(arg0, 0);
}
checkAttributeIndexRange(arg0);
-
+
return getAttributeName(arg0).getLocalPart();
}
@@ -386,7 +386,7 @@ public class InTransformReader extends DepthXMLStreamReader {
checkAttributeIndexRange(arg0);
QName aname = super.getAttributeName(attributesIndexes.get(arg0));
QName expected = inAttributesMap.get(aname);
-
+
return expected == null ? aname : expected;
}
@@ -440,7 +440,7 @@ public class InTransformReader extends DepthXMLStreamReader {
}
checkAttributeIndexRange(-1);
//TODO need reverse lookup
- return super.getAttributeValue(namespace, localName);
+ return super.getAttributeValue(namespace, localName);
}
public String getText() {
@@ -467,7 +467,7 @@ public class InTransformReader extends DepthXMLStreamReader {
return superChars;
}
- public int getTextCharacters(int sourceStart, char[] target, int targetStart, int length)
+ public int getTextCharacters(int sourceStart, char[] target, int targetStart, int length)
throws XMLStreamException {
if (currentEvent != null && currentEvent.getValue() != null) {
int len = currentEvent.getValue().length() - sourceStart;
@@ -491,7 +491,7 @@ public class InTransformReader extends DepthXMLStreamReader {
/**
* Checks the index range for the current attributes set.
* If the attributes are not indexed for the current element context, they
- * will be indexed.
+ * will be indexed.
* @param index
*/
private void checkAttributeIndexRange(int index) {
@@ -513,7 +513,7 @@ public class InTransformReader extends DepthXMLStreamReader {
}
private void throwIndexException(int index, int size) {
- throw new IllegalArgumentException("Invalid index " + index
+ throw new IllegalArgumentException("Invalid index " + index
+ "; current element has only " + size + " attributes");
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java b/core/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java
index f3d5b0b..56da591 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java
@@ -44,7 +44,7 @@ public class OutTransformWriter extends DelegatingXMLStreamWriter {
private Map<QName, ElementProperty> appendMap = new HashMap<QName, ElementProperty>(5);
private Map<String, String> nsMap = new HashMap<String, String>(5);
private List<Set<String>> writtenUris = new LinkedList<Set<String>>();
-
+
private Set<QName> dropElements;
private List<List<ParsingEvent>> pushedAheadEvents = new LinkedList<List<ParsingEvent>>();
private List<QName> elementsStack = new LinkedList<QName>();
@@ -55,12 +55,12 @@ public class OutTransformWriter extends DelegatingXMLStreamWriter {
private boolean attributesToElements;
private DelegatingNamespaceContext namespaceContext;
- public OutTransformWriter(XMLStreamWriter writer,
+ public OutTransformWriter(XMLStreamWriter writer,
Map<String, String> outMap) {
this(writer, outMap, null, null, null, false, null);
}
-
- public OutTransformWriter(XMLStreamWriter writer,
+
+ public OutTransformWriter(XMLStreamWriter writer,
Map<String, String> outMap,
Map<String, String> append,
List<String> dropEls,
@@ -68,8 +68,8 @@ public class OutTransformWriter extends DelegatingXMLStreamWriter {
String defaultNamespace) {
this(writer, outMap, append, dropEls, null, attributesToElements, defaultNamespace);
}
-
- public OutTransformWriter(XMLStreamWriter writer,
+
+ public OutTransformWriter(XMLStreamWriter writer,
Map<String, String> outEMap,
Map<String, String> append,
List<String> dropEls,
@@ -104,14 +104,14 @@ public class OutTransformWriter extends DelegatingXMLStreamWriter {
|| uri.equals(replaceNamespace)) {
return;
}
-
+
uri = value != null ? value : uri;
-
- if (writtenUris.get(0).contains(uri)
+
+ if (writtenUris.get(0).contains(uri)
&& (prefix.length() == 0 || prefix.equals(namespaceContext.getPrefix(uri)))) {
return;
}
-
+
if (defaultNamespace != null && defaultNamespace.equals(uri)) {
super.writeDefaultNamespace(uri);
namespaceContext.addPrefix("", uri);
@@ -124,7 +124,7 @@ public class OutTransformWriter extends DelegatingXMLStreamWriter {
}
writtenUris.get(0).add(uri);
}
-
+
@Override
public void writeDefaultNamespace(String uri) throws XMLStreamException {
@@ -132,14 +132,14 @@ public class OutTransformWriter extends DelegatingXMLStreamWriter {
return;
}
String value = nsMap.get(uri);
- if ((value != null && value.length() == 0)
+ if ((value != null && value.length() == 0)
|| (isDefaultNamespaceRedefined() && !isDefaultNamespaceRedefined(uri))
|| uri.equals(replaceNamespace)) {
return;
}
-
+
uri = value != null ? value : uri;
-
+
if (writtenUris.get(0).contains(uri) && "".equals(namespaceContext.getPrefix(uri))) {
return;
}
@@ -158,7 +158,7 @@ public class OutTransformWriter extends DelegatingXMLStreamWriter {
|| (isDefaultNamespaceRedefined() && !isDefaultNamespaceRedefined(uri))) {
return;
}
-
+
uri = value != null ? value : uri;
super.setDefaultNamespace(uri);
@@ -178,7 +178,7 @@ public class OutTransformWriter extends DelegatingXMLStreamWriter {
s = new HashSet<>(writtenUris.get(0));
}
writtenUris.add(0, s);
-
+
final QName theName = new QName(uri, local, prefix);
final ElementProperty appendProp = appendMap.remove(theName);
final boolean replaceContent = appendProp != null && theName.equals(appendProp.getName());
@@ -190,7 +190,7 @@ public class OutTransformWriter extends DelegatingXMLStreamWriter {
} else {
if (prefix.length() == 0 && expected.getNamespaceURI().length() > 0
&& theName.getNamespaceURI().length() == 0) {
- // if the element is promoted to a qualified element, use the prefix bound
+ // if the element is promoted to a qualified element, use the prefix bound
// to that namespace. If the namespace is unbound, generate a new prefix and
// write its declaration later.
prefix = namespaceContext.getPrefix(expected.getNamespaceURI());
@@ -208,13 +208,13 @@ public class OutTransformWriter extends DelegatingXMLStreamWriter {
if (!appendProp.isChild()) {
// ap-pre-*
QName appendQName = appendProp.getName();
- String theprefix = namespaceContext.getPrefix(appendQName.getNamespaceURI());
+ String theprefix = namespaceContext.getPrefix(appendQName.getNamespaceURI());
boolean nsadded = false;
if (theprefix == null) {
nsadded = true;
theprefix = namespaceContext.getPrefix(appendQName.getNamespaceURI());
- if (theprefix == null
- && (appendQName.getNamespaceURI().equals(expected.getNamespaceURI())
+ if (theprefix == null
+ && (appendQName.getNamespaceURI().equals(expected.getNamespaceURI())
&& expected.getPrefix().length() > 0)) {
theprefix = expected.getPrefix();
} else if (theprefix == null) {
@@ -261,17 +261,17 @@ public class OutTransformWriter extends DelegatingXMLStreamWriter {
}
pushedAheadEvents.add(0, pe);
elementsStack.add(0, expected);
- replaceNamespace = expected.getNamespaceURI().equals(theName.getNamespaceURI())
+ replaceNamespace = expected.getNamespaceURI().equals(theName.getNamespaceURI())
? null : theName.getNamespaceURI();
if (appendProp != null && !replaceContent && appendProp.isChild()) {
// ap-post-*
QName appendQName = appendProp.getName();
String theprefix = namespaceContext.getPrefix(appendQName.getNamespaceURI());
-
+
if (appendProp.getText() == null) {
// ap-post-wrap
- write(new QName(appendQName.getNamespaceURI(), appendQName.getLocalPart(),
+ write(new QName(appendQName.getNamespaceURI(), appendQName.getLocalPart(),
theprefix == null ? "" : theprefix), false);
if (namespaceContext.getPrefix(appendQName.getNamespaceURI()) == null) {
this.writeNamespace(theprefix, uri);
@@ -295,7 +295,7 @@ public class OutTransformWriter extends DelegatingXMLStreamWriter {
}
}
-
+
@Override
public void writeStartElement(String uri, String local) throws XMLStreamException {
/*
@@ -349,7 +349,7 @@ public class OutTransformWriter extends DelegatingXMLStreamWriter {
}
}
}
-
+
@Override
public void writeCharacters(String text) throws XMLStreamException {
if (matchesDropped(false)) {
@@ -361,14 +361,14 @@ public class OutTransformWriter extends DelegatingXMLStreamWriter {
}
super.writeCharacters(text);
}
-
+
private void write(QName qname, boolean replacePrefix) throws XMLStreamException {
boolean writeNs = false;
String prefix = "";
if (qname.getNamespaceURI().length() > 0) {
- if ((replacePrefix || isDefaultNamespaceRedefined())
+ if ((replacePrefix || isDefaultNamespaceRedefined())
&& qname.getPrefix().length() == 0) {
- // if the default namespace is configured to be replaced, a non-empty prefix must be assigned
+ // if the default namespace is configured to be replaced, a non-empty prefix must be assigned
prefix = namespaceContext.getPrefix(qname.getNamespaceURI());
if (prefix == null) {
prefix = namespaceContext.findUniquePrefix(qname.getNamespaceURI());
@@ -377,44 +377,44 @@ public class OutTransformWriter extends DelegatingXMLStreamWriter {
} else {
prefix = qname.getPrefix();
}
-
- }
+
+ }
if (isDefaultNamespaceRedefined(qname.getNamespaceURI())) {
prefix = "";
}
super.writeStartElement(prefix, qname.getLocalPart(), qname.getNamespaceURI());
- if (writeNs
+ if (writeNs
|| !qname.getNamespaceURI().equals(namespaceContext.getNamespaceURI(prefix))) {
this.writeNamespace(prefix, qname.getNamespaceURI());
}
}
-
+
private boolean isDefaultNamespaceRedefined() {
return defaultNamespace != null;
}
-
+
private boolean isDefaultNamespaceRedefined(String uri) {
return isDefaultNamespaceRedefined() && defaultNamespace.equals(uri);
}
private boolean matchesDropped(boolean shallow) {
- return (dropDepth > 0 && dropDepth <= currentDepth)
+ return (dropDepth > 0 && dropDepth <= currentDepth)
|| (shallow && (elementsStack.size() > 0 && dropElements.contains(elementsStack.get(0))));
}
-
-
+
+
@Override
public NamespaceContext getNamespaceContext() {
- return namespaceContext;
+ return namespaceContext;
}
-
+
@Override
- public void writeAttribute(String prefix, String uri, String local, String value)
+ public void writeAttribute(String prefix, String uri, String local, String value)
throws XMLStreamException {
if (matchesDropped(false)) {
return;
}
-
+
QName expected = attributesMap.get(new QName(uri, local, prefix));
if (expected != null) {
if (TransformUtils.isEmptyQName(expected)) {
@@ -448,13 +448,13 @@ public class OutTransformWriter extends DelegatingXMLStreamWriter {
if (uri.length() > 0) {
super.writeAttribute(uri, local, value);
} else {
- super.writeAttribute(local, value);
+ super.writeAttribute(local, value);
}
} else {
writeAttributeAsElement(uri, local, value);
}
}
-
+
private void writeAttributeAsElement(String uri, String local, String value)
throws XMLStreamException {
this.writeStartElement(uri, local);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/transform/ParsingEvent.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/transform/ParsingEvent.java b/core/src/main/java/org/apache/cxf/staxutils/transform/ParsingEvent.java
index 72edc37..e46bb5d 100755
--- a/core/src/main/java/org/apache/cxf/staxutils/transform/ParsingEvent.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/transform/ParsingEvent.java
@@ -22,19 +22,19 @@ package org.apache.cxf.staxutils.transform;
import javax.xml.namespace.QName;
/**
- *
+ *
*/
class ParsingEvent {
private int event;
private QName name;
private String value;
-
+
ParsingEvent(int event, QName name, String value) {
this.event = event;
this.name = name;
this.value = value;
}
-
+
public String toString() {
return new StringBuilder().append("Event(").
append(event).append(", ").append(name).append(", ").append(value).append(")").
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/transform/QNamesMap.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/transform/QNamesMap.java b/core/src/main/java/org/apache/cxf/staxutils/transform/QNamesMap.java
index ad09e92..8f634ea 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/transform/QNamesMap.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/transform/QNamesMap.java
@@ -25,18 +25,18 @@ class QNamesMap {
private QName[] keys;
private QName[] values;
private int index;
-
+
QNamesMap(int size) {
keys = new QName[size];
values = new QName[size];
}
-
+
public void put(QName key, QName value) {
keys[index] = key;
values[index] = value;
index++;
}
-
+
public QName get(QName key) {
for (int i = 0; i < keys.length; i++) {
if (keys[i].getNamespaceURI().equals(key.getNamespaceURI())) {
@@ -49,10 +49,10 @@ class QNamesMap {
}
}
}
- return null;
+ return null;
}
-
+
public int size() {
- return index;
+ return index;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/transform/TransformUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/transform/TransformUtils.java b/core/src/main/java/org/apache/cxf/staxutils/transform/TransformUtils.java
index 9dc2649..49d9aca 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/transform/TransformUtils.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/transform/TransformUtils.java
@@ -35,17 +35,17 @@ import org.apache.cxf.staxutils.StaxUtils;
public final class TransformUtils {
private TransformUtils() {
-
+
}
-
+
public static XMLStreamReader createNewReaderIfNeeded(XMLStreamReader reader, InputStream is) {
return reader == null ? StaxUtils.createXMLStreamReader(is) : reader;
}
-
+
public static XMLStreamWriter createNewWriterIfNeeded(XMLStreamWriter writer, OutputStream os) {
return writer == null ? StaxUtils.createXMLStreamWriter(os) : writer;
}
-
+
public static XMLStreamWriter createTransformWriterIfNeeded(XMLStreamWriter writer,
OutputStream os,
Map<String, String> outElementsMap,
@@ -53,7 +53,7 @@ public final class TransformUtils {
Map<String, String> outAppendMap,
boolean attributesToElements,
String defaultNamespace) {
- if (outElementsMap != null || outDropElements != null
+ if (outElementsMap != null || outDropElements != null
|| outAppendMap != null || attributesToElements) {
writer = createNewWriterIfNeeded(writer, os);
writer = new OutTransformWriter(writer, outElementsMap, outAppendMap,
@@ -71,7 +71,7 @@ public final class TransformUtils {
Map<String, String> outAttributesMap,
boolean attributesToElements,
String defaultNamespace) {
- if (outElementsMap != null || outDropElements != null
+ if (outElementsMap != null || outDropElements != null
|| outAppendMap != null || attributesToElements) {
writer = createNewWriterIfNeeded(writer, os);
writer = new OutTransformWriter(writer, outElementsMap, outAppendMap,
@@ -81,33 +81,33 @@ public final class TransformUtils {
}
//CHECKSTYLE:ON
- public static XMLStreamReader createTransformReaderIfNeeded(XMLStreamReader reader,
+ public static XMLStreamReader createTransformReaderIfNeeded(XMLStreamReader reader,
InputStream is,
List<String> inDropElements,
Map<String, String> inElementsMap,
Map<String, String> inAppendMap,
boolean blockOriginalReader) {
- return createTransformReaderIfNeeded(reader, is,
+ return createTransformReaderIfNeeded(reader, is,
inDropElements, inElementsMap, inAppendMap, null, blockOriginalReader);
}
-
- public static XMLStreamReader createTransformReaderIfNeeded(XMLStreamReader reader,
+
+ public static XMLStreamReader createTransformReaderIfNeeded(XMLStreamReader reader,
InputStream is,
List<String> inDropElements,
Map<String, String> inElementsMap,
Map<String, String> inAppendMap,
Map<String, String> inAttributesMap,
boolean blockOriginalReader) {
- if (inElementsMap != null || inAppendMap != null || inDropElements != null
+ if (inElementsMap != null || inAppendMap != null || inDropElements != null
|| inAttributesMap != null) {
reader = new InTransformReader(createNewReaderIfNeeded(reader, is),
- inElementsMap, inAppendMap, inDropElements,
+ inElementsMap, inAppendMap, inDropElements,
inAttributesMap, blockOriginalReader);
}
return reader;
}
-
+
protected static void convertToQNamesMap(Map<String, String> map,
QNamesMap elementsMap,
Map<String, String> nsMap) {
@@ -123,7 +123,7 @@ public final class TransformUtils {
}
}
}
-
+
static void convertToMapOfElementProperties(Map<String, String> map,
Map<QName, ElementProperty> elementsMap) {
if (map != null) {
@@ -132,7 +132,7 @@ public final class TransformUtils {
String value = entry.getValue();
String text = null;
boolean child = false;
-
+
// if the content delimiter is present in the value, extract the content
int d = value.indexOf('}');
d = value.indexOf('=', d < 0 ? 0 : d);
@@ -140,7 +140,7 @@ public final class TransformUtils {
text = value.substring(d + 1);
value = value.substring(0, d);
}
-
+
// if the trailer delimiter is present in the key, remove it
if (key.endsWith("/")) {
key = key.substring(0, key.length() - 1);
@@ -148,13 +148,13 @@ public final class TransformUtils {
}
QName lname = DOMUtils.convertStringToQName(key);
QName rname = DOMUtils.convertStringToQName(value);
-
- ElementProperty desc = new ElementProperty(rname, text, child);
+
+ ElementProperty desc = new ElementProperty(rname, text, child);
elementsMap.put(lname, desc);
}
}
}
-
+
protected static void convertToSetOfQNames(List<String> set,
Set<QName> elementsSet) {
if (set != null) {
@@ -164,7 +164,7 @@ public final class TransformUtils {
}
}
}
-
+
static boolean isEmptyQName(QName qname) {
return XMLConstants.NULL_NS_URI.equals(qname.getNamespaceURI()) && "".equals(qname.getLocalPart());
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/validation/EmbeddedSchema.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/validation/EmbeddedSchema.java b/core/src/main/java/org/apache/cxf/staxutils/validation/EmbeddedSchema.java
index cafe17c..b769396 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/validation/EmbeddedSchema.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/validation/EmbeddedSchema.java
@@ -30,7 +30,7 @@ public class EmbeddedSchema {
/**
* Create object to represent one of the schemas in a WSDL
- *
+ *
* @param systemId schema system Id.
* @param schemaElement Element for the schema.
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/validation/Stax2ValidationUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/validation/Stax2ValidationUtils.java b/core/src/main/java/org/apache/cxf/staxutils/validation/Stax2ValidationUtils.java
index 6cde540..40d996c 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/validation/Stax2ValidationUtils.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/validation/Stax2ValidationUtils.java
@@ -65,7 +65,7 @@ class Stax2ValidationUtils {
}
HAS_WOODSTOX = hasw;
}
-
+
Stax2ValidationUtils() {
if (!HAS_WOODSTOX) {
throw new RuntimeException("Could not load woodstox");
@@ -74,12 +74,12 @@ class Stax2ValidationUtils {
/**
* {@inheritDoc}
- *
+ *
* @throws XMLStreamException
*/
- public boolean setupValidation(XMLStreamReader reader, Endpoint endpoint, ServiceInfo serviceInfo)
+ public boolean setupValidation(XMLStreamReader reader, Endpoint endpoint, ServiceInfo serviceInfo)
throws XMLStreamException {
-
+
// Gosh, this is bad, but I don't know a better solution, unless we're willing
// to require the stax2 API no matter what.
XMLStreamReader effectiveReader = reader;
@@ -102,9 +102,9 @@ class Stax2ValidationUtils {
return true;
}
- public boolean setupValidation(XMLStreamWriter writer, Endpoint endpoint, ServiceInfo serviceInfo)
+ public boolean setupValidation(XMLStreamWriter writer, Endpoint endpoint, ServiceInfo serviceInfo)
throws XMLStreamException {
-
+
XMLStreamWriter2 writer2 = (XMLStreamWriter2)writer;
XMLValidationSchema vs = getValidator(endpoint, serviceInfo);
if (vs == null) {
@@ -122,7 +122,7 @@ class Stax2ValidationUtils {
/**
* Create woodstox validator for a schema set.
- *
+ *
* @param schemas
* @return
* @throws XMLStreamException
@@ -135,24 +135,24 @@ class Stax2ValidationUtils {
return null;
}
Map<String, EmbeddedSchema> sources = new TreeMap<String, EmbeddedSchema>();
-
+
for (SchemaInfo schemaInfo : serviceInfo.getSchemas()) {
XmlSchema sch = schemaInfo.getSchema();
String uri = sch.getTargetNamespace();
if (XMLConstants.W3C_XML_SCHEMA_NS_URI.equals(uri)) {
continue;
}
-
+
Element serialized = schemaInfo.getElement();
String schemaSystemId = sch.getSourceURI();
if (null == schemaSystemId) {
schemaSystemId = sch.getTargetNamespace();
}
-
+
EmbeddedSchema embeddedSchema = new EmbeddedSchema(schemaSystemId, serialized);
sources.put(sch.getTargetNamespace(), embeddedSchema);
}
-
+
W3CMultiSchemaFactory factory = new W3CMultiSchemaFactory();
// I don't think that we need the baseURI.
try {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/validation/StaxSchemaValidationInInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/validation/StaxSchemaValidationInInterceptor.java b/core/src/main/java/org/apache/cxf/staxutils/validation/StaxSchemaValidationInInterceptor.java
index 7ccea58..03db30b 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/validation/StaxSchemaValidationInInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/validation/StaxSchemaValidationInInterceptor.java
@@ -35,7 +35,7 @@ import org.apache.cxf.phase.Phase;
public class StaxSchemaValidationInInterceptor extends AbstractPhaseInterceptor<Message> {
private static final Logger LOG = LogUtils.getL7dLogger(StaxSchemaValidationInInterceptor.class);
-
+
public StaxSchemaValidationInInterceptor() {
super(Phase.PRE_UNMARSHAL);
}
@@ -46,11 +46,11 @@ public class StaxSchemaValidationInInterceptor extends AbstractPhaseInterceptor<
try {
setSchemaInMessage(message, xmlReader);
} catch (XMLStreamException e) {
- throw new Fault(new org.apache.cxf.common.i18n.Message("SCHEMA_ERROR", LOG),
+ throw new Fault(new org.apache.cxf.common.i18n.Message("SCHEMA_ERROR", LOG),
e);
}
}
-
+
private void setSchemaInMessage(Message message, XMLStreamReader reader) throws XMLStreamException {
if (ServiceUtils.isSchemaValidationEnabled(SchemaValidationType.IN, message)) {
try {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/validation/StaxSchemaValidationOutInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/validation/StaxSchemaValidationOutInterceptor.java b/core/src/main/java/org/apache/cxf/staxutils/validation/StaxSchemaValidationOutInterceptor.java
index 82a6096..1865d91 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/validation/StaxSchemaValidationOutInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/validation/StaxSchemaValidationOutInterceptor.java
@@ -35,7 +35,7 @@ import org.apache.cxf.phase.Phase;
public class StaxSchemaValidationOutInterceptor extends AbstractPhaseInterceptor<Message> {
private static final Logger LOG = LogUtils.getL7dLogger(StaxSchemaValidationOutInterceptor.class);
-
+
public StaxSchemaValidationOutInterceptor() {
super(Phase.PRE_MARSHAL);
}
@@ -46,11 +46,11 @@ public class StaxSchemaValidationOutInterceptor extends AbstractPhaseInterceptor
try {
setSchemaInMessage(message, writer);
} catch (XMLStreamException e) {
- throw new Fault(new org.apache.cxf.common.i18n.Message("SCHEMA_ERROR", LOG),
+ throw new Fault(new org.apache.cxf.common.i18n.Message("SCHEMA_ERROR", LOG),
e);
}
}
-
+
private void setSchemaInMessage(Message message, XMLStreamWriter writer) throws XMLStreamException {
if (ServiceUtils.isSchemaValidationEnabled(SchemaValidationType.OUT, message)) {
try {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/validation/W3CMultiSchemaFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/validation/W3CMultiSchemaFactory.java b/core/src/main/java/org/apache/cxf/staxutils/validation/W3CMultiSchemaFactory.java
index 7e981f9..f616890 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/validation/W3CMultiSchemaFactory.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/validation/W3CMultiSchemaFactory.java
@@ -17,7 +17,7 @@
* under the License.
*/
/*
- * Code in this file derives from source code in Woodstox which
+ * Code in this file derives from source code in Woodstox which
* carries a ASL 2.0 license.
*/
@@ -49,18 +49,18 @@ import com.sun.msv.reader.xmlschema.XMLSchemaReader;
import org.codehaus.stax2.validation.XMLValidationSchema;
/**
- *
+ *
*/
public class W3CMultiSchemaFactory extends BaseSchemaFactory {
-
- private MultiSchemaReader multiSchemaReader;
+
+ private MultiSchemaReader multiSchemaReader;
private SAXParserFactory parserFactory;
private RecursiveAllowedXMLSchemaReader xmlSchemaReader;
public W3CMultiSchemaFactory() {
super(XMLValidationSchema.SCHEMA_ID_W3C_SCHEMA);
}
-
+
static class RecursiveAllowedXMLSchemaReader extends XMLSchemaReader {
Set<String> sysIds = new TreeSet<String>();
RecursiveAllowedXMLSchemaReader(GrammarReaderController controller,
@@ -75,7 +75,7 @@ public class W3CMultiSchemaFactory extends BaseSchemaFactory {
r.currentSchema = old;
}
protected void onTargetNamespaceResolved(String targetNs, boolean ignoreContents) {
-
+
RecursiveAllowedXMLSchemaReader r = (RecursiveAllowedXMLSchemaReader)reader;
// sets new XMLSchemaGrammar object.
old = r.currentSchema;
@@ -88,10 +88,10 @@ public class W3CMultiSchemaFactory extends BaseSchemaFactory {
}
}
};
- }
+ }
}, new ExpressionPool());
}
-
+
public void setLocator(Locator locator) {
if (locator == null && getLocator() != null && getLocator().getSystemId() != null) {
sysIds.add(getLocator().getSystemId());
@@ -105,13 +105,13 @@ public class W3CMultiSchemaFactory extends BaseSchemaFactory {
}
super.switchSource(source, newState);
}
-
+
}
-
- public XMLValidationSchema loadSchemas(String baseURI,
+
+ public XMLValidationSchema loadSchemas(String baseURI,
Map<String, EmbeddedSchema> sources) throws XMLStreamException {
parserFactory = getSaxFactory();
-
+
ResolvingGrammarReaderController ctrl = new ResolvingGrammarReaderController(baseURI, sources);
xmlSchemaReader = new RecursiveAllowedXMLSchemaReader(ctrl, parserFactory);
multiSchemaReader = new MultiSchemaReader(xmlSchemaReader);
@@ -120,12 +120,12 @@ public class W3CMultiSchemaFactory extends BaseSchemaFactory {
domSource.setSystemId(source.getSystemId());
multiSchemaReader.parse(domSource);
}
-
+
XMLSchemaGrammar grammar = multiSchemaReader.getResult();
if (grammar == null) {
throw new XMLStreamException("Failed to load schemas");
}
- return new W3CSchema(grammar);
+ return new W3CSchema(grammar);
}
@Override
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/validation/WoodstoxValidationImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/validation/WoodstoxValidationImpl.java b/core/src/main/java/org/apache/cxf/staxutils/validation/WoodstoxValidationImpl.java
index d948cdd..588c391 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/validation/WoodstoxValidationImpl.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/validation/WoodstoxValidationImpl.java
@@ -31,14 +31,14 @@ import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.service.model.ServiceInfo;
/**
- *
+ *
*/
public class WoodstoxValidationImpl {
private static final Logger LOG = LogUtils.getL7dLogger(WoodstoxValidationImpl.class);
-
+
private Stax2ValidationUtils utils;
-
+
public WoodstoxValidationImpl() {
try {
utils = new Stax2ValidationUtils();
@@ -60,7 +60,7 @@ public class WoodstoxValidationImpl {
}
}
- public void setupValidation(XMLStreamWriter writer,
+ public void setupValidation(XMLStreamWriter writer,
Endpoint endpoint,
ServiceInfo serviceInfo) throws XMLStreamException {
if (utils != null && writer != null && !utils.setupValidation(writer, endpoint, serviceInfo)) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/AbstractConduit.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/AbstractConduit.java b/core/src/main/java/org/apache/cxf/transport/AbstractConduit.java
index 5ff3bd4..44319fd 100644
--- a/core/src/main/java/org/apache/cxf/transport/AbstractConduit.java
+++ b/core/src/main/java/org/apache/cxf/transport/AbstractConduit.java
@@ -31,7 +31,7 @@ import org.apache.cxf.ws.addressing.EndpointReferenceType;
* allowing non-decoupled transports to be written without any
* regard for the decoupled back-channel or partial response logic.
*/
-public abstract class AbstractConduit
+public abstract class AbstractConduit
extends AbstractObservable implements Conduit {
protected final EndpointReferenceType target;
@@ -42,14 +42,14 @@ public abstract class AbstractConduit
/**
* @return the reference associated with the target Destination
- */
+ */
public EndpointReferenceType getTarget() {
return target;
}
/**
* @param msg for which content should be closed.
- */
+ */
public void close(Message msg) throws IOException {
OutputStream os = msg.getContent(OutputStream.class);
if (os != null) {
@@ -60,14 +60,14 @@ public abstract class AbstractConduit
in.close();
}
}
-
+
/**
* Close the conduit.
*/
public void close() {
// nothing to do by default
}
-
+
public String toString() {
return "conduit: " + this.getClass() + System.identityHashCode(this)
+ "target: "
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/AbstractDestination.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/AbstractDestination.java b/core/src/main/java/org/apache/cxf/transport/AbstractDestination.java
index a308f07..91abb63 100644
--- a/core/src/main/java/org/apache/cxf/transport/AbstractDestination.java
+++ b/core/src/main/java/org/apache/cxf/transport/AbstractDestination.java
@@ -29,22 +29,22 @@ import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
/**
- * Abstract base class factoring out common Destination logic,
+ * Abstract base class factoring out common Destination logic,
* allowing non-decoupled transports to be written without any
* regard for the decoupled back-channel or partial response logic.
*/
public abstract class AbstractDestination
extends AbstractObservable implements Destination, DestinationWithEndpoint {
-
+
protected final EndpointReferenceType reference;
protected final EndpointInfo endpointInfo;
protected final Bus bus;
-
+
public AbstractDestination(EndpointReferenceType ref,
EndpointInfo ei) {
this(null, ref, ei);
}
-
+
public AbstractDestination(Bus b,
EndpointReferenceType ref,
EndpointInfo ei) {
@@ -52,10 +52,10 @@ public abstract class AbstractDestination
endpointInfo = ei;
bus = b;
}
-
+
/**
* @return the reference associated with this Destination
- */
+ */
public EndpointReferenceType getAddress() {
return reference;
}
@@ -65,17 +65,17 @@ public abstract class AbstractDestination
* with the current Message and associated Destination. For example
* compatible Quality of Protection must be asserted on the back-channel.
* This would generally only be an issue if the back-channel is decoupled.
- *
- * @param inMessage the current inbound message (null to indicate a
+ *
+ * @param inMessage the current inbound message (null to indicate a
* disassociated back-channel)
* @return a suitable Conduit
*/
public Conduit getBackChannel(Message inMessage)
throws IOException {
-
+
return getInbuiltBackChannel(inMessage);
}
-
+
/**
* Shutdown the Destination, i.e. stop accepting incoming messages.
*/
@@ -88,7 +88,7 @@ public abstract class AbstractDestination
* @return the inbuilt backchannel
*/
protected abstract Conduit getInbuiltBackChannel(Message inMessage);
-
+
/**
* Backchannel conduit.
*/
@@ -100,13 +100,13 @@ public abstract class AbstractDestination
/**
* Register a message observer for incoming messages.
- *
+ *
* @param observer the observer to notify on receipt of incoming
*/
public void setMessageObserver(MessageObserver observer) {
// shouldn't be called for a back channel conduit
}
-
+
protected Logger getLogger() {
return AbstractDestination.this.getLogger();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/AbstractMultiplexDestination.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/AbstractMultiplexDestination.java b/core/src/main/java/org/apache/cxf/transport/AbstractMultiplexDestination.java
index ecc690b..4974f81 100644
--- a/core/src/main/java/org/apache/cxf/transport/AbstractMultiplexDestination.java
+++ b/core/src/main/java/org/apache/cxf/transport/AbstractMultiplexDestination.java
@@ -42,26 +42,26 @@ public abstract class AbstractMultiplexDestination extends AbstractDestination i
}
/**
- * Builds an new endpoint reference using the current target reference as a template.
+ * Builds an new endpoint reference using the current target reference as a template.
* The supplied id is endcoded using a reference parameter.
* This requires the ws-a interceptors to propagate the reference parameters
* on subsequent invokes using the returned reference.
* @param id the id to encode in the new reference
* @return the new reference with the id encoded as a reference parameter
* @see org.apache.cxf.transport.MultiplexDestination#getAddressWithId(java.lang.String)
-
+
*/
public EndpointReferenceType getAddressWithId(String id) {
EndpointReferenceType epr = EndpointReferenceUtils.duplicate(
EndpointReferenceUtils.mint(reference, bus));
ReferenceParametersType newParams = new org.apache.cxf.ws.addressing.ObjectFactory()
.createReferenceParametersType();
-
+
ReferenceParametersType existingParams = epr.getReferenceParameters();
if (null != existingParams) {
newParams.getAny().addAll(existingParams.getAny());
}
-
+
newParams.getAny().add(new JAXBElement<String>(MULTIPLEX_ID_QNAME, String.class, id));
epr.setReferenceParameters(newParams);
return epr;
@@ -69,7 +69,7 @@ public abstract class AbstractMultiplexDestination extends AbstractDestination i
/**
* Obtain id from reference parameters of the ws-a to address
- * Requires the existance of ws-a interceptors on dispatch path to provide access
+ * Requires the existance of ws-a interceptors on dispatch path to provide access
* to the ws-a headers
* @param contextMap the current invocation or message context
* @return the id from the reference parameters of the ws-a-to address or null if not found
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/AbstractObservable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/AbstractObservable.java b/core/src/main/java/org/apache/cxf/transport/AbstractObservable.java
index 35a2f16..75eaa1d 100644
--- a/core/src/main/java/org/apache/cxf/transport/AbstractObservable.java
+++ b/core/src/main/java/org/apache/cxf/transport/AbstractObservable.java
@@ -34,7 +34,7 @@ public abstract class AbstractObservable implements Observable {
/**
* Register a message observer for incoming messages.
- *
+ *
* @param observer the observer to notify on receipt of incoming
* message
*/
@@ -68,7 +68,7 @@ public abstract class AbstractObservable implements Observable {
}
}
}
-
+
/**
* @return the observer to notify on receipt of incoming message
*/
@@ -78,17 +78,17 @@ public abstract class AbstractObservable implements Observable {
/**
* Get the target reference .
- *
+ *
* @param ei the corresponding EndpointInfo
* @return the actual target
*/
protected static EndpointReferenceType getTargetReference(EndpointInfo ei, Bus bus) {
return getTargetReference(ei, null, bus);
}
-
+
/**
* Get the target endpoint reference.
- *
+ *
* @param ei the corresponding EndpointInfo
* @param t the given target EPR if available
* @param bus the Bus
@@ -104,8 +104,8 @@ public abstract class AbstractObservable implements Observable {
address.setValue(ei.getAddress());
ref.setAddress(address);
if (ei.getService() != null) {
- EndpointReferenceUtils.setServiceAndPortName(ref,
- ei.getService().getName(),
+ EndpointReferenceUtils.setServiceAndPortName(ref,
+ ei.getService().getName(),
ei.getName().getLocalPart());
}
} else {
@@ -113,7 +113,7 @@ public abstract class AbstractObservable implements Observable {
}
return ref;
}
-
+
/**
* Activate messages flow.
*/
@@ -125,9 +125,9 @@ public abstract class AbstractObservable implements Observable {
* Deactivate messages flow.
*/
protected void deactivate() {
- // nothing to do by default
+ // nothing to do by default
}
-
+
/**
* @return the logger to use
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/AbstractTransportFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/AbstractTransportFactory.java b/core/src/main/java/org/apache/cxf/transport/AbstractTransportFactory.java
index 8d57f68..984b47d 100644
--- a/core/src/main/java/org/apache/cxf/transport/AbstractTransportFactory.java
+++ b/core/src/main/java/org/apache/cxf/transport/AbstractTransportFactory.java
@@ -29,13 +29,13 @@ import org.apache.cxf.helpers.CastUtils;
*/
public abstract class AbstractTransportFactory {
private List<String> transportIds;
-
+
public AbstractTransportFactory() {
}
public AbstractTransportFactory(List<String> ids) {
transportIds = ids;
}
-
+
public final List<String> getTransportIds() {
return transportIds;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/Assertor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/Assertor.java b/core/src/main/java/org/apache/cxf/transport/Assertor.java
index 3ec915b..3e2869c 100644
--- a/core/src/main/java/org/apache/cxf/transport/Assertor.java
+++ b/core/src/main/java/org/apache/cxf/transport/Assertor.java
@@ -28,8 +28,8 @@ import org.apache.cxf.message.Message;
* assert its capabilities for the underlying message.
*/
public interface Assertor {
-
+
void assertMessage(Message message);
-
+
boolean canAssert(QName type);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java b/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java
index 74a2af1..fd6c34f 100644
--- a/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java
+++ b/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java
@@ -48,7 +48,7 @@ public class ChainInitiationObserver implements MessageObserver {
protected Endpoint endpoint;
protected Bus bus;
protected ClassLoader loader;
-
+
private PhaseChainCache chainCache = new PhaseChainCache();
public ChainInitiationObserver(Endpoint endpoint, Bus bus) {
@@ -68,19 +68,19 @@ public class ChainInitiationObserver implements MessageObserver {
origLoader = ClassLoaderUtils.setThreadContextClassloader(loader);
}
InterceptorChain phaseChain = null;
-
+
if (m.getInterceptorChain() != null) {
phaseChain = m.getInterceptorChain();
// To make sure the phase chain is run by one thread once
synchronized (phaseChain) {
- if (phaseChain.getState() == InterceptorChain.State.PAUSED
+ if (phaseChain.getState() == InterceptorChain.State.PAUSED
|| phaseChain.getState() == InterceptorChain.State.SUSPENDED) {
phaseChain.resume();
return;
}
}
}
-
+
Message message = getBinding().createMessage(m);
Exchange exchange = message.getExchange();
if (exchange == null) {
@@ -89,7 +89,7 @@ public class ChainInitiationObserver implements MessageObserver {
}
exchange.setInMessage(message);
setExchangeProperties(exchange, message);
-
+
InterceptorProvider dbp = null;
if (endpoint.getService().getDataBinding() instanceof InterceptorProvider) {
dbp = (InterceptorProvider)endpoint.getService().getDataBinding();
@@ -109,17 +109,17 @@ public class ChainInitiationObserver implements MessageObserver {
getBinding().getInInterceptors(),
dbp.getInInterceptors());
}
-
-
-
+
+
+
message.setInterceptorChain(phaseChain);
-
+
phaseChain.setFaultObserver(endpoint.getOutFaultObserver());
-
+
addToChain(phaseChain, message);
-
+
phaseChain.doIntercept(message);
-
+
} finally {
if (origBus != bus) {
BusFactory.setThreadDefaultBus(origBus);
@@ -130,14 +130,14 @@ public class ChainInitiationObserver implements MessageObserver {
}
}
private void addToChain(InterceptorChain chain, Message m) {
- Collection<InterceptorProvider> providers
+ Collection<InterceptorProvider> providers
= CastUtils.cast((Collection<?>)m.get(Message.INTERCEPTOR_PROVIDERS));
if (providers != null) {
for (InterceptorProvider p : providers) {
chain.add(p.getInInterceptors());
}
}
- Collection<Interceptor<? extends Message>> is
+ Collection<Interceptor<? extends Message>> is
= CastUtils.cast((Collection<?>)m.get(Message.IN_INTERCEPTORS));
if (is != null) {
chain.add(is);
@@ -150,7 +150,7 @@ public class ChainInitiationObserver implements MessageObserver {
protected Binding getBinding() {
return endpoint.getBinding();
}
-
+
protected void setExchangeProperties(Exchange exchange, Message m) {
exchange.put(Endpoint.class, endpoint);
exchange.put(Binding.class, getBinding());
@@ -193,5 +193,5 @@ public class ChainInitiationObserver implements MessageObserver {
public Endpoint getEndpoint() {
return endpoint;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/Conduit.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/Conduit.java b/core/src/main/java/org/apache/cxf/transport/Conduit.java
index 51e8b9b..49c682f 100644
--- a/core/src/main/java/org/apache/cxf/transport/Conduit.java
+++ b/core/src/main/java/org/apache/cxf/transport/Conduit.java
@@ -34,10 +34,10 @@ import org.apache.cxf.ws.addressing.EndpointReferenceType;
* are received. Alternatively the back-channel destination may be decoupled,
* in which case the response it is received via a separate Conduit.
* The crucial distinction is whether the Conduit can itself correlate
- * the response (which may be synchronous, or may be delivered via
- * a dedicated destination).
+ * the response (which may be synchronous, or may be delivered via
+ * a dedicated destination).
* <p>
- * Conduits may be used for multiple messages, either serially or
+ * Conduits may be used for multiple messages, either serially or
* concurrently, with the implementation taking care of mapping onto
* multiple transport resources (e.g. connections) if neccessary to
* support concurrency.
@@ -45,25 +45,25 @@ import org.apache.cxf.ws.addressing.EndpointReferenceType;
* Binding-level MEPs may be realized over one or more Conduits.
*/
public interface Conduit extends Observable {
-
+
/**
* Prepare the message for sending. This will typically involve setting
* an OutputStream on the message, but it may do nothing at all.
- *
+ *
* @param message the message to be sent.
*/
void prepare(Message message) throws IOException;
-
+
/**
* Close the connections associated with the message
*/
void close(Message message) throws IOException;
-
+
/**
* @return the reference associated with the target Destination
- */
+ */
EndpointReferenceType getTarget();
-
+
/**
* Close the conduit
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/ConduitInitiator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/ConduitInitiator.java b/core/src/main/java/org/apache/cxf/transport/ConduitInitiator.java
index 20f37b0..8bd13c3 100644
--- a/core/src/main/java/org/apache/cxf/transport/ConduitInitiator.java
+++ b/core/src/main/java/org/apache/cxf/transport/ConduitInitiator.java
@@ -33,8 +33,8 @@ import org.apache.cxf.ws.addressing.EndpointReferenceType;
public interface ConduitInitiator {
/**
* Initiate an outbound Conduit.
- *
- * @param targetInfo the endpoint info of the target
+ *
+ * @param targetInfo the endpoint info of the target
* @return a suitable new or pre-existing Conduit
*/
Conduit getConduit(EndpointInfo targetInfo,
@@ -42,7 +42,7 @@ public interface ConduitInitiator {
/**
* Initiate an outbound Conduit.
- *
+ *
* @param localInfo the endpoint info for a local endpoint on which the
* the configuration should be based
* @param target the target EPR
@@ -51,7 +51,7 @@ public interface ConduitInitiator {
Conduit getConduit(EndpointInfo localInfo,
EndpointReferenceType target,
Bus bus) throws IOException;
-
+
Set<String> getUriPrefixes();
List<String> getTransportIds();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/ConduitInitiatorManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/ConduitInitiatorManager.java b/core/src/main/java/org/apache/cxf/transport/ConduitInitiatorManager.java
index 8762000..eecb4e8 100644
--- a/core/src/main/java/org/apache/cxf/transport/ConduitInitiatorManager.java
+++ b/core/src/main/java/org/apache/cxf/transport/ConduitInitiatorManager.java
@@ -42,16 +42,16 @@ public interface ConduitInitiatorManager {
* <code>ConduitInitiator</code>.
*/
void deregisterConduitInitiator(String name);
-
+
/**
- * Returns the <code>ConduitInitiator</code> registered with the specified name,
+ * Returns the <code>ConduitInitiator</code> registered with the specified name,
* loading the appropriate plugin if necessary.
- *
+ *
* @param name
* @return the registered <code>ConduitInitiator</code>
* @throws BusException
*/
ConduitInitiator getConduitInitiator(String name) throws BusException;
-
+
ConduitInitiator getConduitInitiatorForUri(String uri);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/Destination.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/Destination.java b/core/src/main/java/org/apache/cxf/transport/Destination.java
index 148e22b..205c391 100644
--- a/core/src/main/java/org/apache/cxf/transport/Destination.java
+++ b/core/src/main/java/org/apache/cxf/transport/Destination.java
@@ -29,17 +29,17 @@ import org.apache.cxf.ws.addressing.EndpointReferenceType;
* unsolicited incoming messages from different peers.
*/
public interface Destination extends Observable {
-
+
/**
* @return the reference associated with this Destination
- */
+ */
EndpointReferenceType getAddress();
-
+
/**
* Retreive a back-channel Conduit, which must be policy-compatible
* with the current Message and associated Destination. For example
* compatible Quality of Protection must be asserted on the back-channel.
- *
+ *
* @param inMessage the current message
* @return a suitable Conduit
*/
@@ -50,6 +50,6 @@ public interface Destination extends Observable {
* Shutdown the Destination, i.e. stop accepting incoming messages.
*/
void shutdown();
-
+
MessageObserver getMessageObserver();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/DestinationFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/DestinationFactory.java b/core/src/main/java/org/apache/cxf/transport/DestinationFactory.java
index d35d7e0..cbe00b0 100644
--- a/core/src/main/java/org/apache/cxf/transport/DestinationFactory.java
+++ b/core/src/main/java/org/apache/cxf/transport/DestinationFactory.java
@@ -30,16 +30,16 @@ import org.apache.cxf.service.model.EndpointInfo;
* Factory for Destinations.
*/
public interface DestinationFactory {
-
+
/**
* Create a destination.
- *
+ *
* @param ei the endpoint info of the destination.
* @return the created Destination.
*/
Destination getDestination(EndpointInfo ei, Bus bus) throws IOException;
-
+
Set<String> getUriPrefixes();
-
+
List<String> getTransportIds();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/DestinationFactoryManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/DestinationFactoryManager.java b/core/src/main/java/org/apache/cxf/transport/DestinationFactoryManager.java
index 9232d30..41c69f4 100644
--- a/core/src/main/java/org/apache/cxf/transport/DestinationFactoryManager.java
+++ b/core/src/main/java/org/apache/cxf/transport/DestinationFactoryManager.java
@@ -42,11 +42,11 @@ public interface DestinationFactoryManager {
* <code>DestinationFactory</code>.
*/
void deregisterDestinationFactory(String name);
-
+
/**
- * Returns the <code>DestinationFactory</code> registered with the specified name,
+ * Returns the <code>DestinationFactory</code> registered with the specified name,
* loading the appropriate plugin if necessary.
- *
+ *
* @param name
* @return the registered <code>DestinationFactory</code>
* @throws BusException
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/HttpUriMapper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/HttpUriMapper.java b/core/src/main/java/org/apache/cxf/transport/HttpUriMapper.java
index 86940d6..f5c3822 100644
--- a/core/src/main/java/org/apache/cxf/transport/HttpUriMapper.java
+++ b/core/src/main/java/org/apache/cxf/transport/HttpUriMapper.java
@@ -20,20 +20,20 @@
package org.apache.cxf.transport;
public final class HttpUriMapper {
-
+
private HttpUriMapper() {
// Util class doesn't need public constructor
}
-
+
public static String getContextName(String path) {
- String contextName = "";
+ String contextName = "";
int idx = path.lastIndexOf('/');
if (idx >= 0) {
- contextName = path.substring(0, idx);
+ contextName = path.substring(0, idx);
}
return contextName;
}
-
+
public static String getResourceBase(String path) {
String servletMap = "";
int idx = path.lastIndexOf('/');
@@ -42,7 +42,7 @@ public final class HttpUriMapper {
}
if ("".equals(servletMap) || "".equals(path)) {
servletMap = "/";
- }
+ }
return servletMap;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/MessageObserver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/MessageObserver.java b/core/src/main/java/org/apache/cxf/transport/MessageObserver.java
index 7770946..5ceaa30 100644
--- a/core/src/main/java/org/apache/cxf/transport/MessageObserver.java
+++ b/core/src/main/java/org/apache/cxf/transport/MessageObserver.java
@@ -29,7 +29,7 @@ public interface MessageObserver {
/**
* Called for an incoming message, i.e. where the content format(s)
* is/are source(s).
- *
+ *
* @param message
*/
void onMessage(Message message);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/MultipleEndpointObserver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/MultipleEndpointObserver.java b/core/src/main/java/org/apache/cxf/transport/MultipleEndpointObserver.java
index b539884..30d41834 100644
--- a/core/src/main/java/org/apache/cxf/transport/MultipleEndpointObserver.java
+++ b/core/src/main/java/org/apache/cxf/transport/MultipleEndpointObserver.java
@@ -43,9 +43,9 @@ import org.apache.cxf.phase.PhaseManager;
*
*/
public class MultipleEndpointObserver implements MessageObserver {
-
+
public static final String ENDPOINTS = "multipleEndpointObserver.endpoints";
-
+
protected Bus bus;
protected List<Interceptor<? extends Message>> bindingInterceptors
= new CopyOnWriteArrayList<Interceptor<? extends Message>>();
@@ -53,7 +53,7 @@ public class MultipleEndpointObserver implements MessageObserver {
= new CopyOnWriteArrayList<Interceptor<? extends Message>>();
private Set<Endpoint> endpoints = new CopyOnWriteArraySet<Endpoint>();
private ClassLoader loader;
-
+
public MultipleEndpointObserver(Bus bus) {
super();
this.bus = bus;
@@ -74,15 +74,15 @@ public class MultipleEndpointObserver implements MessageObserver {
message.setExchange(exchange);
}
message = createMessage(message);
- message.setExchange(exchange);
+ message.setExchange(exchange);
exchange.setInMessage(message);
setExchangeProperties(exchange, message);
-
+
// setup chain
PhaseInterceptorChain chain = createChain();
-
+
message.setInterceptorChain(chain);
-
+
chain.add(bus.getInInterceptors());
if (bindingInterceptors != null) {
chain.add(bindingInterceptors);
@@ -90,11 +90,11 @@ public class MultipleEndpointObserver implements MessageObserver {
if (routingInterceptors != null) {
chain.add(routingInterceptors);
}
-
+
if (endpoints != null) {
exchange.put(ENDPOINTS, endpoints);
}
-
+
chain.doIntercept(message);
} finally {
if (origBus != bus) {
@@ -118,7 +118,7 @@ public class MultipleEndpointObserver implements MessageObserver {
.getInPhases());
return chain;
}
-
+
protected void setExchangeProperties(Exchange exchange, Message m) {
exchange.put(Bus.class, bus);
if (exchange.getDestination() == null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/MultiplexDestination.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/MultiplexDestination.java b/core/src/main/java/org/apache/cxf/transport/MultiplexDestination.java
index 2f91f21..e34bade 100644
--- a/core/src/main/java/org/apache/cxf/transport/MultiplexDestination.java
+++ b/core/src/main/java/org/apache/cxf/transport/MultiplexDestination.java
@@ -25,24 +25,24 @@ import org.apache.cxf.ws.addressing.EndpointReferenceType;
/**
* A MultiplexDestination is a transport-level endpoint capable of receiving
- * unsolicited incoming messages from different peers for multiple targets
+ * unsolicited incoming messages from different peers for multiple targets
* identified by a unique id.
* The disambiguation of targets is handled by higher layers as the target
* address is made available as a context property or as a WS-A-To header
*/
public interface MultiplexDestination extends Destination {
-
+
/**
- * @return the a reference containing the id that is
+ * @return the a reference containing the id that is
* associated with this Destination
*/
EndpointReferenceType getAddressWithId(String id);
-
+
/**
- * @param contextMap for this invocation. Obtained for example from
+ * @param contextMap for this invocation. Obtained for example from
* JAX-WS WebServiceContext.getMessageContext(). The context will
- * either contain the WS-A To content and/or some property that
+ * either contain the WS-A To content and/or some property that
* identifies the target address, eg MessageContext.PATH_INFO for
* the current invocation
* @return the id associated with the current invocation
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/Observable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/Observable.java b/core/src/main/java/org/apache/cxf/transport/Observable.java
index ab7a748..435f484 100644
--- a/core/src/main/java/org/apache/cxf/transport/Observable.java
+++ b/core/src/main/java/org/apache/cxf/transport/Observable.java
@@ -25,12 +25,12 @@ package org.apache.cxf.transport;
public interface Observable {
/**
* Register a message observer for incoming messages.
- *
+ *
* @param observer the observer to notify on receipt of incoming
*/
void setMessageObserver(MessageObserver observer);
-
-
+
+
/**
* Retrieves the message observer for incoming messages
* @return the MessageObserver for incoming messages
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/Session.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/Session.java b/core/src/main/java/org/apache/cxf/transport/Session.java
index 19ab868..3c7a2f8 100644
--- a/core/src/main/java/org/apache/cxf/transport/Session.java
+++ b/core/src/main/java/org/apache/cxf/transport/Session.java
@@ -25,7 +25,7 @@ package org.apache.cxf.transport;
public interface Session {
/**
* Get a variable from the session by the key.
- *
+ *
* @param key
* @return Value
*/
@@ -33,7 +33,7 @@ public interface Session {
/**
* Put a variable into the session with a key.
- *
+ *
* @param key
* @param value
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/TransportFinder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/TransportFinder.java b/core/src/main/java/org/apache/cxf/transport/TransportFinder.java
index d5df81e..a6ff31f 100644
--- a/core/src/main/java/org/apache/cxf/transport/TransportFinder.java
+++ b/core/src/main/java/org/apache/cxf/transport/TransportFinder.java
@@ -30,14 +30,14 @@ import org.apache.cxf.configuration.ConfiguredBeanLocator;
import org.apache.cxf.helpers.CastUtils;
/**
- *
+ *
*/
public class TransportFinder<T> {
Map<String, T> map;
Set<String> loaded;
Class<T> cls;
ConfiguredBeanLocator locator;
-
+
public TransportFinder(Bus b,
Map<String, T> m,
Set<String> l,
@@ -47,7 +47,7 @@ public class TransportFinder<T> {
locator = b.getExtension(ConfiguredBeanLocator.class);
loaded = l;
}
-
+
public T findTransportForNamespace(final String namespace) {
if (locator == null) {
return null;
@@ -65,7 +65,7 @@ public class TransportFinder<T> {
}
return factory;
}
-
+
public T findTransportForURI(String uri) {
if (locator == null) {
@@ -79,7 +79,7 @@ public class TransportFinder<T> {
if (factory == null) {
//didn't find, now well need to search
factory = loadDefaultURIs(uri);
-
+
if (factory == null) {
loadAll();
factory = checkForURI(uri);
@@ -87,7 +87,7 @@ public class TransportFinder<T> {
}
return factory;
}
-
+
private static Set<String> getPrefixes(Object t) {
Set<String> prefixes = null;
if (t instanceof AbstractTransportFactory) {
@@ -95,10 +95,10 @@ public class TransportFinder<T> {
prefixes = atf.getUriPrefixes();
} else if (t instanceof DestinationFactory) {
DestinationFactory atf = (DestinationFactory)t;
- prefixes = atf.getUriPrefixes();
+ prefixes = atf.getUriPrefixes();
} else if (t instanceof ConduitInitiator) {
ConduitInitiator atf = (ConduitInitiator)t;
- prefixes = atf.getUriPrefixes();
+ prefixes = atf.getUriPrefixes();
}
return prefixes;
}
@@ -122,9 +122,9 @@ public class TransportFinder<T> {
}
return null;
}
-
+
private void loadAll() {
- ConfiguredBeanLocator.BeanLoaderListener<T> listener
+ ConfiguredBeanLocator.BeanLoaderListener<T> listener
= new ConfiguredBeanLocator.BeanLoaderListener<T>() {
public boolean beanLoaded(String name, T bean) {
loaded.add(name);
@@ -139,9 +139,9 @@ public class TransportFinder<T> {
}
private void registerBean(T bean) {
- if (bean instanceof AbstractTransportFactory) {
+ if (bean instanceof AbstractTransportFactory) {
if (((AbstractTransportFactory)bean).getTransportIds() != null) {
- for (String ns
+ for (String ns
: ((AbstractTransportFactory)bean).getTransportIds()) {
if (!map.containsKey(ns)) {
map.put(ns, bean);
@@ -163,16 +163,16 @@ public class TransportFinder<T> {
}
}
-
+
private T loadActivationNamespaces(final String namespace) {
- //Try old method of having activationNamespaces configured in.
- ConfiguredBeanLocator.BeanLoaderListener<T> listener
+ //Try old method of having activationNamespaces configured in.
+ ConfiguredBeanLocator.BeanLoaderListener<T> listener
= new ConfiguredBeanLocator.BeanLoaderListener<T>() {
public boolean beanLoaded(String name, T bean) {
loaded.add(name);
if (!map.containsKey(namespace)) {
registerBean(bean);
- }
+ }
return map.containsKey(namespace);
}
@@ -185,14 +185,14 @@ public class TransportFinder<T> {
locator.loadBeansOfType(cls, listener);
return map.get(namespace);
}
-
-
+
+
private T loadDefaultURIs(final String uri) {
//First attempt will be to examine the factory class
//for a DEFAULT_URIS field and use it
- URIBeanLoaderListener listener
+ URIBeanLoaderListener listener
= new URIBeanLoaderListener(uri) {
public boolean loadBean(String name, Class<? extends T> type) {
@@ -208,19 +208,19 @@ public class TransportFinder<T> {
}
return false;
}
- };
+ };
locator.loadBeansOfType(cls, listener);
return listener.getFactory();
}
-
+
abstract class URIBeanLoaderListener implements ConfiguredBeanLocator.BeanLoaderListener<T> {
T factory;
String uri;
-
+
URIBeanLoaderListener(String u) {
uri = u;
}
-
+
public T getFactory() {
return factory;
}
@@ -232,13 +232,13 @@ public class TransportFinder<T> {
}
return false;
}
-
+
}
-
+
private T loadDefaultNamespace(final String namespace) {
//First attempt will be to examine the factory class
//for a DEFAULT_NAMESPACES field and use it
- ConfiguredBeanLocator.BeanLoaderListener<T> listener
+ ConfiguredBeanLocator.BeanLoaderListener<T> listener
= new ConfiguredBeanLocator.BeanLoaderListener<T>() {
public boolean beanLoaded(String name, T bean) {
loaded.add(name);
@@ -262,16 +262,16 @@ public class TransportFinder<T> {
}
return false;
}
- };
+ };
locator.loadBeansOfType(cls, listener);
-
+
return map.get(namespace);
}
private T loadNoDefaultNamespace(final String namespace) {
//Second attempt will be to examine the factory class
- //for a DEFAULT_NAMESPACES field and if it doesn't exist, try
+ //for a DEFAULT_NAMESPACES field and if it doesn't exist, try
//loading. This will then load most of the "older" things
- ConfiguredBeanLocator.BeanLoaderListener<T> listener
+ ConfiguredBeanLocator.BeanLoaderListener<T> listener
= new ConfiguredBeanLocator.BeanLoaderListener<T>() {
public boolean beanLoaded(String name, T bean) {
loaded.add(name);
@@ -291,9 +291,9 @@ public class TransportFinder<T> {
}
return true;
}
- };
+ };
locator.loadBeansOfType(cls, listener);
-
+
return map.get(namespace);
}