You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2016/12/29 18:55:58 UTC
svn commit: r1776465 [2/13] - in /webservices/axiom/trunk:
aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/
aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/
aspects/om-aspects/src/main/java/org/apache/axiom/om/...
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomSemantics.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomSemantics.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomSemantics.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/AxiomSemantics.java Thu Dec 29 18:55:52 2016
@@ -38,14 +38,17 @@ public final class AxiomSemantics implem
private AxiomSemantics() {}
+ @Override
public DetachPolicy getDetachPolicy() {
return DetachPolicy.NEW_DOCUMENT;
}
+ @Override
public boolean isUseStrictNamespaceLookup() {
return true;
}
+ @Override
public boolean isParentNode(NodeType nodeType) {
return nodeType == NodeType.DOCUMENT || nodeType == NodeType.NS_AWARE_ELEMENT;
}
@@ -58,6 +61,7 @@ public final class AxiomSemantics implem
public static final AttributeMatcher NAMESPACE_DECLARATION_MATCHER = new NamespaceDeclarationMatcher(INSTANCE);
public static final ClonePolicy<OMCloneOptions> CLONE_POLICY = new ClonePolicy<OMCloneOptions>() {
+ @Override
public Class<? extends CoreNode> getTargetNodeClass(OMCloneOptions options, CoreNode node) {
if (options != null && options.isPreserveModel()) {
return node.coreGetNodeClass();
@@ -68,18 +72,22 @@ public final class AxiomSemantics implem
}
}
+ @Override
public boolean repairNamespaces(OMCloneOptions options) {
return true;
}
+ @Override
public boolean cloneAttributes(OMCloneOptions options) {
return true;
}
+ @Override
public boolean cloneChildren(OMCloneOptions options, NodeType nodeType) {
return true;
}
+ @Override
public void postProcess(OMCloneOptions options, CoreNode clone) {
if (clone instanceof AxiomElement && ((AxiomElement)clone).isExpanded()) {
// Repair namespaces
@@ -96,6 +104,7 @@ public final class AxiomSemantics implem
}
};
+ @Override
public RuntimeException toUncheckedException(CoreModelException ex) {
return AxiomExceptionTranslator.translate(ex);
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/DeferredNamespace.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/DeferredNamespace.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/DeferredNamespace.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/DeferredNamespace.java Thu Dec 29 18:55:52 2016
@@ -31,6 +31,7 @@ public final class DeferredNamespace imp
this.uri = ns;
}
+ @Override
public boolean equals(String uri, String prefix) {
String thisPrefix = getPrefix();
return (this.uri.equals(uri) &&
@@ -38,14 +39,17 @@ public final class DeferredNamespace imp
thisPrefix.equals(prefix)));
}
+ @Override
public String getName() {
return uri;
}
+ @Override
public String getNamespaceURI() {
return uri;
}
+ @Override
public String getPrefix() {
if (!element.isExpanded()) {
element.forceExpand();
@@ -54,11 +58,13 @@ public final class DeferredNamespace imp
return actualNS == null ? "" : actualNS.getPrefix();
}
+ @Override
public int hashCode() {
String thisPrefix = getPrefix();
return uri.hashCode() ^ (thisPrefix != null ? thisPrefix.hashCode() : 0);
}
+ @Override
public boolean equals(Object obj) {
if (!(obj instanceof OMNamespace)) {
return false;
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/LiveNamespaceContext.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/LiveNamespaceContext.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/LiveNamespaceContext.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/LiveNamespaceContext.java Thu Dec 29 18:55:52 2016
@@ -35,16 +35,19 @@ public final class LiveNamespaceContext
this.element = element;
}
+ @Override
protected String doGetNamespaceURI(String prefix) {
OMNamespace ns = element.findNamespaceURI(prefix);
return ns == null ? XMLConstants.NULL_NS_URI : ns.getNamespaceURI();
}
+ @Override
protected String doGetPrefix(String namespaceURI) {
OMNamespace ns = element.findNamespace(namespaceURI, null);
return ns == null ? null : ns.getPrefix();
}
+ @Override
protected Iterator<String> doGetPrefixes(String namespaceURI) {
List<String> prefixes = new ArrayList<String>();
for (Iterator<OMNamespace> it = element.getNamespacesInScope(); it.hasNext(); ) {
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/NamespaceDeclarationMapper.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/NamespaceDeclarationMapper.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/NamespaceDeclarationMapper.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/NamespaceDeclarationMapper.java Thu Dec 29 18:55:52 2016
@@ -27,6 +27,7 @@ public class NamespaceDeclarationMapper
private NamespaceDeclarationMapper() {}
+ @Override
public OMNamespace map(AxiomNamespaceDeclaration namespaceDeclaration) {
return namespaceDeclaration.getDeclaredNamespace();
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/NamespaceIterator.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/NamespaceIterator.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/NamespaceIterator.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/NamespaceIterator.java Thu Dec 29 18:55:52 2016
@@ -41,6 +41,7 @@ public final class NamespaceIterator imp
this.element = element;
}
+ @Override
public boolean hasNext() {
if (!hasNextCalled) {
while (true) {
@@ -74,6 +75,7 @@ public final class NamespaceIterator imp
return next != null;
}
+ @Override
public OMNamespace next() {
if (hasNext()) {
OMNamespace result = next;
@@ -86,6 +88,7 @@ public final class NamespaceIterator imp
}
// TODO: document that remove is not supported
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/OMNamespaceImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/OMNamespaceImpl.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/OMNamespaceImpl.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/OMNamespaceImpl.java Thu Dec 29 18:55:52 2016
@@ -49,6 +49,7 @@ public class OMNamespaceImpl implements
* @param prefix
* @return Returns boolean.
*/
+ @Override
public boolean equals(String uri, String prefix) {
return (this.uri.equals(uri) &&
(this.prefix == null ? prefix == null :
@@ -56,6 +57,7 @@ public class OMNamespaceImpl implements
}
+ @Override
public boolean equals(Object obj) {
if (!(obj instanceof OMNamespace)) return false;
OMNamespace other = (OMNamespace)obj;
@@ -70,6 +72,7 @@ public class OMNamespaceImpl implements
*
* @return Returns String.
*/
+ @Override
public String getPrefix() {
return prefix;
}
@@ -79,14 +82,17 @@ public class OMNamespaceImpl implements
*
* @return Returns String.
*/
+ @Override
public String getName() {
return uri;
}
+ @Override
public String getNamespaceURI() {
return uri;
}
+ @Override
public int hashCode() {
return uri.hashCode() ^ (prefix != null ? prefix.hashCode() : 0);
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/SAXResultContentHandler.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/SAXResultContentHandler.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/SAXResultContentHandler.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/SAXResultContentHandler.java Thu Dec 29 18:55:52 2016
@@ -61,9 +61,11 @@ public final class SAXResultContentHandl
throw new UnsupportedOperationException();
}
+ @Override
public void completed() {
}
+ @Override
public void processDocumentTypeDeclaration(String rootName, String publicId,
String systemId, String internalSubset) {
if (target instanceof OMDocument) {
@@ -71,11 +73,13 @@ public final class SAXResultContentHandl
}
}
+ @Override
public void startElement(String namespaceURI, String localName, String prefix) {
// TODO: inefficient: we should not create a new OMNamespace instance every time
target = factory.createOMElement(localName, factory.createOMNamespace(namespaceURI, prefix), target);
}
+ @Override
public void endElement() {
target = ((OMNode)target).getParent();
}
@@ -158,6 +162,7 @@ public final class SAXResultContentHandl
factory.createOMComment(target, stopBuffering());
}
+ @Override
public void processEntityReference(String name, String replacementText) {
if (replacementText == null) {
factory.createOMEntityReference(target, name);
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/DetachableInputStream.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/DetachableInputStream.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/DetachableInputStream.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/DetachableInputStream.java Thu Dec 29 18:55:52 2016
@@ -36,30 +36,37 @@ final class DetachableInputStream extend
this.closeOnDetach = closeOnDetach;
}
+ @Override
public int read() throws IOException {
return target.read();
}
+ @Override
public int read(byte[] b) throws IOException {
return target.read(b);
}
+ @Override
public int read(byte[] b, int off, int len) throws IOException {
return target.read(b, off, len);
}
+ @Override
public long skip(long n) throws IOException {
return target.skip(n);
}
+ @Override
public int available() throws IOException {
return target.available();
}
+ @Override
public void close() throws IOException {
target.close();
}
+ @Override
public void detach() throws OMException {
MemoryBlob blob = Blobs.createMemoryBlob();
try {
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/DetachableReader.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/DetachableReader.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/DetachableReader.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/DetachableReader.java Thu Dec 29 18:55:52 2016
@@ -40,34 +40,42 @@ final class DetachableReader extends Rea
this.target = target;
}
+ @Override
public int read(CharBuffer target) throws IOException {
return target.read(target);
}
+ @Override
public int read() throws IOException {
return target.read();
}
+ @Override
public int read(char[] cbuf) throws IOException {
return target.read(cbuf);
}
+ @Override
public int read(char[] cbuf, int off, int len) throws IOException {
return target.read(cbuf, off, len);
}
+ @Override
public long skip(long n) throws IOException {
return target.skip(n);
}
+ @Override
public boolean ready() throws IOException {
return target.ready();
}
+ @Override
public void close() throws IOException {
target.close();
}
+ @Override
public void detach() {
MemoryBlob blob = Blobs.createMemoryBlob();
Writer out = new OutputStreamWriter(blob.getOutputStream(), UTF8);
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java Thu Dec 29 18:55:52 2016
@@ -79,18 +79,22 @@ public class OMFactoryImpl implements OM
protected void initNode(CoreNode node) {
}
+ @Override
public final OMMetaFactory getMetaFactory() {
return metaFactory;
}
+ @Override
public final OMNamespace createOMNamespace(String uri, String prefix) {
return new OMNamespaceImpl(uri, prefix);
}
+ @Override
public final OMDocument createOMDocument() {
return createNode(AxiomDocument.class);
}
+ @Override
public final OMDocType createOMDocType(OMContainer parent, String rootName,
String publicId, String systemId, String internalSubset) {
AxiomDocType node = createNode(AxiomDocType.class);
@@ -135,26 +139,32 @@ public class OMFactoryImpl implements OM
return node;
}
+ @Override
public final OMText createOMText(String s, int type) {
return createAxiomText(null, s, type);
}
+ @Override
public final OMText createOMText(String s) {
return createAxiomText(null, s, OMNode.TEXT_NODE);
}
+ @Override
public final OMText createOMText(OMContainer parent, String text, int type) {
return createAxiomText(parent, text, type);
}
+ @Override
public final OMText createOMText(OMContainer parent, String text) {
return createAxiomText(parent, text, OMNode.TEXT_NODE);
}
+ @Override
public final OMText createOMText(OMContainer parent, char[] charArray, int type) {
return createAxiomText(parent, new String(charArray), type);
}
+ @Override
public final OMText createOMText(OMContainer parent, QName text, int type) {
if (text == null) {
throw new IllegalArgumentException("QName text arg cannot be null!");
@@ -163,18 +173,22 @@ public class OMFactoryImpl implements OM
return createAxiomText(parent, ns == null ? text.getLocalPart() : ns.getPrefix() + ":" + text.getLocalPart(), type);
}
+ @Override
public final OMText createOMText(OMContainer parent, QName text) {
return createAxiomText(parent, text, OMNode.TEXT_NODE);
}
+ @Override
public final OMText createOMText(OMContainer parent, String s, String mimeType, boolean optimize) {
return createAxiomText(parent, new TextContent(s, mimeType, optimize), OMNode.TEXT_NODE);
}
+ @Override
public final OMText createOMText(String s, String mimeType, boolean optimize) {
return createOMText(null, s, mimeType, optimize);
}
+ @Override
public final OMText createOMText(OMContainer parent, OMText source) {
try {
// TODO: this doesn't necessarily produce a node with the expected OMFactory
@@ -184,14 +198,17 @@ public class OMFactoryImpl implements OM
}
}
+ @Override
public final OMText createOMText(DataHandler dataHandler, boolean optimize) {
return createAxiomText(null, new TextContent(null, dataHandler, optimize), OMNode.TEXT_NODE);
}
+ @Override
public final OMText createOMText(String contentID, DataHandlerProvider dataHandlerProvider, boolean optimize) {
return createAxiomText(null, new TextContent(contentID, dataHandlerProvider, optimize), OMNode.TEXT_NODE);
}
+ @Override
public final OMProcessingInstruction createOMProcessingInstruction(
OMContainer parent, String piTarget, String piData) {
AxiomProcessingInstruction node = createNode(AxiomProcessingInstruction.class);
@@ -207,6 +224,7 @@ public class OMFactoryImpl implements OM
return node;
}
+ @Override
public final OMEntityReference createOMEntityReference(OMContainer parent, String name) {
AxiomEntityReference node = createNode(AxiomEntityReference.class);
node.coreSetName(name);
@@ -216,6 +234,7 @@ public class OMFactoryImpl implements OM
return node;
}
+ @Override
public final OMComment createOMComment(OMContainer parent, String content) {
AxiomComment node = createNode(AxiomComment.class);
try {
@@ -229,6 +248,7 @@ public class OMFactoryImpl implements OM
return node;
}
+ @Override
public final OMElement createOMElement(String localName, OMNamespace ns) {
return createOMElement(localName, ns, null);
}
@@ -243,10 +263,12 @@ public class OMFactoryImpl implements OM
return element;
}
+ @Override
public final OMElement createOMElement(String localName, OMNamespace ns, OMContainer parent) {
return createAxiomElement(AxiomElement.class, parent, localName, ns);
}
+ @Override
public final OMElement createOMElement(QName qname, OMContainer parent) {
AxiomElement element = createNode(AxiomElement.class);
if (parent != null) {
@@ -278,10 +300,12 @@ public class OMFactoryImpl implements OM
return element;
}
+ @Override
public final OMElement createOMElement(QName qname) {
return createOMElement(qname, null);
}
+ @Override
public final OMElement createOMElement(String localName, String namespaceURI, String prefix) {
if (namespaceURI == null) {
throw new IllegalArgumentException("namespaceURI must not be null");
@@ -295,24 +319,28 @@ public class OMFactoryImpl implements OM
}
}
+ @Override
public final OMSourcedElement createOMElement(OMDataSource source) {
AxiomSourcedElement element = createNode(AxiomSourcedElement.class);
element.init(source);
return element;
}
+ @Override
public final OMSourcedElement createOMElement(OMDataSource source, String localName, OMNamespace ns) {
AxiomSourcedElement element = createNode(AxiomSourcedElement.class);
element.init(localName, ns, source);
return element;
}
+ @Override
public final OMSourcedElement createOMElement(OMDataSource source, QName qname) {
AxiomSourcedElement element = createNode(AxiomSourcedElement.class);
element.init(qname, source);
return element;
}
+ @Override
public final OMAttribute createOMAttribute(String localName, OMNamespace ns, String value) {
if (ns != null && ns.getPrefix() == null) {
String namespaceURI = ns.getNamespaceURI();
@@ -346,6 +374,7 @@ public class OMFactoryImpl implements OM
}
// <old-and-buggy-code>
+ @Override
public final OMNode importNode(OMNode child) {
int type = child.getType();
switch (type) {
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/TextContent.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/TextContent.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/TextContent.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/intf/TextContent.java Thu Dec 29 18:55:52 2016
@@ -157,6 +157,7 @@ public final class TextContent implement
}
}
+ @Override
public <T> CharacterData clone(ClonePolicy<T> policy, T options) {
if (binary && options instanceof OMCloneOptions && ((OMCloneOptions)options).isFetchDataHandlers()) {
// Force loading of the reference to the DataHandler and ensure that its content is
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/ds/PushOMDataSourceStreamWriter.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/ds/PushOMDataSourceStreamWriter.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/ds/PushOMDataSourceStreamWriter.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/ds/PushOMDataSourceStreamWriter.java Thu Dec 29 18:55:52 2016
@@ -38,38 +38,47 @@ public final class PushOMDataSourceStrea
return super.getParent();
}
+ @Override
public void writeStartDocument() {
throw new UnsupportedOperationException("OMDataSource#serialize(XMLStreamWriter) MUST NOT use XMLStreamWriter#writeStartDocument()");
}
+ @Override
public void writeStartDocument(String encoding, String version) {
throw new UnsupportedOperationException("OMDataSource#serialize(XMLStreamWriter) MUST NOT use XMLStreamWriter#writeStartDocument(String, String)");
}
+ @Override
public void writeStartDocument(String version) {
throw new UnsupportedOperationException("OMDataSource#serialize(XMLStreamWriter) MUST NOT use XMLStreamWriter#writeStartDocument(String)");
}
+ @Override
public void writeEndDocument() {
throw new UnsupportedOperationException("OMDataSource#serialize(XMLStreamWriter) MUST NOT use XMLStreamWriter#writeEndDocument()");
}
+ @Override
public void writeDTD(String dtd) throws XMLStreamException {
throw new XMLStreamException("A DTD must not appear in element content");
}
+ @Override
public void writeStartElement(String localName) throws XMLStreamException {
throw new UnsupportedOperationException("OMDataSource#serialize(XMLStreamWriter) MUST NOT use XMLStreamWriter#writeStartElement(String)");
}
+ @Override
public void writeEmptyElement(String localName) throws XMLStreamException {
throw new UnsupportedOperationException("OMDataSource#serialize(XMLStreamWriter) MUST NOT use XMLStreamWriter#writeEmptyElement(String)");
}
+ @Override
public void flush() throws XMLStreamException {
// Do nothing
}
+ @Override
public void close() throws XMLStreamException {
throw new UnsupportedOperationException("OMDataSource#serialize(XMLStreamWriter) MUST NOT call XMLStreamWriter#close()");
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/sax/XMLReaderImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/sax/XMLReaderImpl.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/sax/XMLReaderImpl.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/sax/XMLReaderImpl.java Thu Dec 29 18:55:52 2016
@@ -40,10 +40,12 @@ public class XMLReaderImpl extends Abstr
this.cache = cache;
}
+ @Override
public void parse(InputSource input) throws IOException, SAXException {
parse();
}
+ @Override
public void parse(String systemId) throws IOException, SAXException {
parse();
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/stax/push/XMLStreamWriterHandler.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/stax/push/XMLStreamWriterHandler.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/stax/push/XMLStreamWriterHandler.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/stax/push/XMLStreamWriterHandler.java Thu Dec 29 18:55:52 2016
@@ -73,6 +73,7 @@ public class XMLStreamWriterHandler impl
public void startFragment() throws StreamException {
}
+ @Override
public void processDocumentTypeDeclaration(String rootName, String publicId, String systemId, String internalSubset) throws StreamException {
StringWriter sw = new StringWriter();
Serializer serializer = new Serializer(sw);
@@ -86,6 +87,7 @@ public class XMLStreamWriterHandler impl
}
}
+ @Override
public void startElement(String namespaceURI, String localName, String prefix) throws StreamException {
try {
writer.writeStartElement(prefix, localName, namespaceURI);
@@ -94,6 +96,7 @@ public class XMLStreamWriterHandler impl
}
}
+ @Override
public void processNamespaceDeclaration(String prefix, String namespaceURI) throws StreamException {
try {
if (prefix.length() != 0) {
@@ -106,6 +109,7 @@ public class XMLStreamWriterHandler impl
}
}
+ @Override
public void processAttribute(String namespaceURI, String localName, String prefix, String value, String type, boolean specified) throws StreamException {
try {
writer.writeAttribute(prefix, namespaceURI, localName, value);
@@ -123,10 +127,12 @@ public class XMLStreamWriterHandler impl
}
}
+ @Override
public void attributesCompleted() throws StreamException {
// Nothing to do here
}
+ @Override
public void endElement() throws StreamException {
try {
writer.writeEndElement();
@@ -135,6 +141,7 @@ public class XMLStreamWriterHandler impl
}
}
+ @Override
public void processCharacterData(Object data, boolean ignorable) throws StreamException {
if (buffering) {
buffer.append(data);
@@ -205,6 +212,7 @@ public class XMLStreamWriterHandler impl
}
}
+ @Override
public void processEntityReference(String name, String replacementText) throws StreamException {
try {
writer.writeEntityRef(name);
@@ -221,6 +229,7 @@ public class XMLStreamWriterHandler impl
return dataHandlerWriter;
}
+ @Override
public void completed() throws StreamException {
// TODO: the original StAX serialization code newer called writeEndDocument; this is probably a mistake
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/stax/push/XmlHandlerStreamWriter.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/stax/push/XmlHandlerStreamWriter.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/stax/push/XmlHandlerStreamWriter.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/stax/push/XmlHandlerStreamWriter.java Thu Dec 29 18:55:52 2016
@@ -60,6 +60,7 @@ public class XmlHandlerStreamWriter exte
}
}
+ @Override
public Object getProperty(String name) throws IllegalArgumentException {
if (DataHandlerWriter.PROPERTY.equals(name)) {
return this;
@@ -68,6 +69,7 @@ public class XmlHandlerStreamWriter exte
}
}
+ @Override
protected void doWriteStartDocument() throws XMLStreamException {
try {
handler.startDocument(null, "1.0", null, null);
@@ -76,6 +78,7 @@ public class XmlHandlerStreamWriter exte
}
}
+ @Override
protected void doWriteStartDocument(String encoding, String version) throws XMLStreamException {
try {
handler.startDocument(null, version, encoding, null);
@@ -84,6 +87,7 @@ public class XmlHandlerStreamWriter exte
}
}
+ @Override
protected void doWriteStartDocument(String version) throws XMLStreamException {
try {
handler.startDocument(null, version, null, null);
@@ -92,6 +96,7 @@ public class XmlHandlerStreamWriter exte
}
}
+ @Override
protected void doWriteEndDocument() throws XMLStreamException {
try {
handler.completed();
@@ -100,6 +105,7 @@ public class XmlHandlerStreamWriter exte
}
}
+ @Override
protected void doWriteDTD(String dtd) throws XMLStreamException {
if (serializer != null) {
try {
@@ -112,6 +118,7 @@ public class XmlHandlerStreamWriter exte
}
}
+ @Override
protected void doWriteStartElement(String prefix, String localName, String namespaceURI) throws XMLStreamException {
finishStartElement();
try {
@@ -122,10 +129,12 @@ public class XmlHandlerStreamWriter exte
inStartElement = true;
}
+ @Override
protected void doWriteStartElement(String localName) throws XMLStreamException {
throw new UnsupportedOperationException();
}
+ @Override
protected void doWriteEndElement() throws XMLStreamException {
finishStartElement();
try {
@@ -146,16 +155,19 @@ public class XmlHandlerStreamWriter exte
}
}
+ @Override
protected void doWriteEmptyElement(String prefix, String localName, String namespaceURI) throws XMLStreamException {
doWriteStartElement(prefix, localName, namespaceURI);
finishStartElement();
doWriteEndElement();
}
+ @Override
protected void doWriteEmptyElement(String localName) throws XMLStreamException {
throw new UnsupportedOperationException();
}
+ @Override
protected void doWriteAttribute(String prefix, String namespaceURI, String localName, String value) throws XMLStreamException {
try {
handler.processAttribute(normalize(namespaceURI), localName, normalize(prefix), value, OMConstants.XMLATTRTYPE_CDATA, true);
@@ -164,10 +176,12 @@ public class XmlHandlerStreamWriter exte
}
}
+ @Override
protected void doWriteAttribute(String localName, String value) throws XMLStreamException {
doWriteAttribute(null, null, localName, value);
}
+ @Override
protected void doWriteNamespace(String prefix, String namespaceURI) throws XMLStreamException {
try {
handler.processNamespaceDeclaration(normalize(prefix), normalize(namespaceURI));
@@ -176,14 +190,17 @@ public class XmlHandlerStreamWriter exte
}
}
+ @Override
protected void doWriteDefaultNamespace(String namespaceURI) throws XMLStreamException {
doWriteNamespace(null, namespaceURI);
}
+ @Override
protected void doWriteCharacters(char[] text, int start, int len) throws XMLStreamException {
doWriteCharacters(new String(text, start, len));
}
+ @Override
protected void doWriteCharacters(String text) throws XMLStreamException {
finishStartElement();
try {
@@ -193,6 +210,7 @@ public class XmlHandlerStreamWriter exte
}
}
+ @Override
protected void doWriteCData(String data) throws XMLStreamException {
finishStartElement();
try {
@@ -204,6 +222,7 @@ public class XmlHandlerStreamWriter exte
}
}
+ @Override
protected void doWriteComment(String data) throws XMLStreamException {
finishStartElement();
try {
@@ -215,6 +234,7 @@ public class XmlHandlerStreamWriter exte
}
}
+ @Override
protected void doWriteEntityRef(String name) throws XMLStreamException {
finishStartElement();
try {
@@ -224,6 +244,7 @@ public class XmlHandlerStreamWriter exte
}
}
+ @Override
protected void doWriteProcessingInstruction(String piTarget, String data) throws XMLStreamException {
finishStartElement();
try {
@@ -235,10 +256,12 @@ public class XmlHandlerStreamWriter exte
}
}
+ @Override
protected void doWriteProcessingInstruction(String target) throws XMLStreamException {
doWriteProcessingInstruction(target, "");
}
+ @Override
public void flush() throws XMLStreamException {
if (serializer != null) {
try {
@@ -249,10 +272,12 @@ public class XmlHandlerStreamWriter exte
}
}
+ @Override
public void close() throws XMLStreamException {
flush();
}
+ @Override
public void writeDataHandler(DataHandler dataHandler, String contentID, boolean optimize)
throws IOException, XMLStreamException {
finishStartElement();
@@ -263,6 +288,7 @@ public class XmlHandlerStreamWriter exte
}
}
+ @Override
public void writeDataHandler(DataHandlerProvider dataHandlerProvider, String contentID,
boolean optimize) throws IOException, XMLStreamException {
finishStartElement();
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/xop/ContentIDGenerator.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/xop/ContentIDGenerator.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/xop/ContentIDGenerator.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/xop/ContentIDGenerator.java Thu Dec 29 18:55:52 2016
@@ -31,6 +31,7 @@ public interface ContentIDGenerator {
* Default content ID generator that preserves any existing content ID.
*/
ContentIDGenerator DEFAULT = new ContentIDGenerator() {
+ @Override
public String generateContentID(String existingContentID) {
if (existingContentID == null) {
return UIDGenerator.generateContentId();
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/xop/OptimizationPolicy.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/xop/OptimizationPolicy.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/xop/OptimizationPolicy.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/xop/OptimizationPolicy.java Thu Dec 29 18:55:52 2016
@@ -40,10 +40,12 @@ public interface OptimizationPolicy {
* Policy implementation that optimizes all binary content marked as eligible for optimization.
*/
OptimizationPolicy DEFAULT = new OptimizationPolicy() {
+ @Override
public boolean isOptimized(DataHandler dataHandler, boolean optimize) {
return optimize;
}
+ @Override
public boolean isOptimized(DataHandlerProvider dataHandlerProvider, boolean optimize) {
return optimize;
}
@@ -54,10 +56,12 @@ public interface OptimizationPolicy {
* marked as eligible for optimization.
*/
OptimizationPolicy ALL = new OptimizationPolicy() {
+ @Override
public boolean isOptimized(DataHandler dataHandler, boolean optimize) {
return true;
}
+ @Override
public boolean isOptimized(DataHandlerProvider dataHandlerProvider, boolean optimize) {
return true;
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/xop/OptimizationPolicyImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/xop/OptimizationPolicyImpl.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/xop/OptimizationPolicyImpl.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/xop/OptimizationPolicyImpl.java Thu Dec 29 18:55:52 2016
@@ -44,6 +44,7 @@ public final class OptimizationPolicyImp
this.format = format;
}
+ @Override
public boolean isOptimized(DataHandler dataHandler, boolean optimize) {
if (!optimize) {
return false;
@@ -60,6 +61,7 @@ public final class OptimizationPolicyImp
}
}
+ @Override
public boolean isOptimized(DataHandlerProvider dataHandlerProvider, boolean optimize)
throws IOException {
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/xop/XOPDecodingFilterHandler.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/xop/XOPDecodingFilterHandler.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/xop/XOPDecodingFilterHandler.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/xop/XOPDecodingFilterHandler.java Thu Dec 29 18:55:52 2016
@@ -38,10 +38,12 @@ final class XOPDecodingFilterHandler ext
this.contentID = contentID;
}
+ @Override
public boolean isLoaded() {
return mimePartProvider.isLoaded(contentID);
}
+ @Override
public DataHandler getDataHandler() throws IOException {
return mimePartProvider.getDataHandler(contentID);
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAP11BuilderHelper.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAP11BuilderHelper.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAP11BuilderHelper.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAP11BuilderHelper.java Thu Dec 29 18:55:52 2016
@@ -33,6 +33,7 @@ public class SOAP11BuilderHelper extends
private boolean faultcodePresent = false;
private boolean faultstringPresent = false;
+ @Override
public Class<? extends AxiomElement> handleEvent(OMElement parent, int elementLevel,
String namespaceURI, String localName) throws SOAPProcessingException {
Class<? extends AxiomElement> elementType = null;
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAP12BuilderHelper.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAP12BuilderHelper.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAP12BuilderHelper.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAP12BuilderHelper.java Thu Dec 29 18:55:52 2016
@@ -51,6 +51,7 @@ public class SOAP12BuilderHelper extends
private boolean processingDetailElements = false;
private Vector<String> detailElementNames;
+ @Override
public Class<? extends AxiomElement> handleEvent(OMElement parent, int elementLevel,
String namespaceURI, String localName) throws SOAPProcessingException {
Class<? extends AxiomElement> elementType = null;
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPModelBuilderImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPModelBuilderImpl.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPModelBuilderImpl.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/common/builder/SOAPModelBuilderImpl.java Thu Dec 29 18:55:52 2016
@@ -35,10 +35,12 @@ public class SOAPModelBuilderImpl extend
super(builder, detachable);
}
+ @Override
public SOAPEnvelope getSOAPEnvelope() throws OMException {
return (SOAPEnvelope)getDocumentElement();
}
+ @Override
public SOAPMessage getSOAPMessage() {
return (SOAPMessage)getDocument();
}
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/factory/SOAP11Factory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/factory/SOAP11Factory.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/factory/SOAP11Factory.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/factory/SOAP11Factory.java Thu Dec 29 18:55:52 2016
@@ -35,50 +35,62 @@ public class SOAP11Factory extends SOAPF
super(metaFactory, nodeFactory);
}
+ @Override
public final SOAPHelper getSOAPHelper() {
return SOAPHelper.SOAP11;
}
+ @Override
public final SOAPFaultValue createSOAPFaultValue(SOAPFaultCode parent) {
throw new UnsupportedOperationException();
}
+ @Override
public final SOAPFaultValue createSOAPFaultValue(SOAPFaultSubCode parent) {
throw new UnsupportedOperationException();
}
+ @Override
public final SOAPFaultValue createSOAPFaultValue() {
throw new UnsupportedOperationException();
}
+ @Override
public final SOAPFaultSubCode createSOAPFaultSubCode(SOAPFaultCode parent) {
throw new UnsupportedOperationException();
}
+ @Override
public final SOAPFaultSubCode createSOAPFaultSubCode(SOAPFaultSubCode parent) {
throw new UnsupportedOperationException();
}
+ @Override
public final SOAPFaultSubCode createSOAPFaultSubCode() {
throw new UnsupportedOperationException();
}
+ @Override
public final SOAPFaultText createSOAPFaultText(SOAPFaultReason parent) {
throw new UnsupportedOperationException();
}
+ @Override
public final SOAPFaultText createSOAPFaultText() {
throw new UnsupportedOperationException();
}
+ @Override
public final SOAPFaultNode createSOAPFaultNode(SOAPFault parent) {
throw new UnsupportedOperationException();
}
+ @Override
public final SOAPFaultNode createSOAPFaultNode() {
throw new UnsupportedOperationException();
}
+ @Override
public final SOAPEnvelope getDefaultFaultEnvelope() {
SOAPEnvelope defaultEnvelope = getDefaultEnvelope();
SOAPFault fault = createSOAPFault(defaultEnvelope.getBody());
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/factory/SOAP12Factory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/factory/SOAP12Factory.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/factory/SOAP12Factory.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/factory/SOAP12Factory.java Thu Dec 29 18:55:52 2016
@@ -41,6 +41,7 @@ public class SOAP12Factory extends SOAPF
super(metaFactory, nodeFactory);
}
+ @Override
public final SOAPHelper getSOAPHelper() {
return SOAPHelper.SOAP12;
}
@@ -49,14 +50,17 @@ public class SOAP12Factory extends SOAPF
return createSOAPElement(AxiomSOAP12FaultValue.class, parent, SOAP12Constants.QNAME_FAULT_VALUE);
}
+ @Override
public final SOAPFaultValue createSOAPFaultValue(SOAPFaultCode parent) {
return internalCreateSOAPFaultValue(parent);
}
+ @Override
public final SOAPFaultValue createSOAPFaultValue(SOAPFaultSubCode parent) {
return internalCreateSOAPFaultValue(parent);
}
+ @Override
public final SOAPFaultValue createSOAPFaultValue() {
return internalCreateSOAPFaultValue(null);
}
@@ -65,34 +69,42 @@ public class SOAP12Factory extends SOAPF
return createSOAPElement(AxiomSOAP12FaultSubCode.class, parent, SOAP12Constants.QNAME_FAULT_SUBCODE);
}
+ @Override
public final SOAPFaultSubCode createSOAPFaultSubCode(SOAPFaultCode parent) {
return internalCreateSOAPFaultSubCode(parent);
}
+ @Override
public final SOAPFaultSubCode createSOAPFaultSubCode(SOAPFaultSubCode parent) {
return internalCreateSOAPFaultSubCode(parent);
}
+ @Override
public final SOAPFaultSubCode createSOAPFaultSubCode() {
return internalCreateSOAPFaultSubCode(null);
}
+ @Override
public final SOAPFaultText createSOAPFaultText(SOAPFaultReason parent) {
return createSOAPElement(AxiomSOAP12FaultText.class, parent, SOAP12Constants.QNAME_FAULT_TEXT);
}
+ @Override
public final SOAPFaultText createSOAPFaultText() {
return createSOAPFaultText(null);
}
+ @Override
public final SOAPFaultNode createSOAPFaultNode(SOAPFault parent) {
return createSOAPElement(AxiomSOAP12FaultNode.class, parent, SOAP12Constants.QNAME_FAULT_NODE);
}
+ @Override
public final SOAPFaultNode createSOAPFaultNode() {
return createSOAPFaultNode(null);
}
+ @Override
public final SOAPEnvelope getDefaultFaultEnvelope() {
SOAPEnvelope defaultEnvelope = getDefaultEnvelope();
SOAPFault fault = createSOAPFault(defaultEnvelope.getBody());
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/factory/SOAPFactoryImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/factory/SOAPFactoryImpl.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/factory/SOAPFactoryImpl.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/soap/impl/factory/SOAPFactoryImpl.java Thu Dec 29 18:55:52 2016
@@ -55,14 +55,17 @@ public abstract class SOAPFactoryImpl ex
public abstract SOAPHelper getSOAPHelper();
+ @Override
public final String getSoapVersionURI() {
return getSOAPHelper().getEnvelopeURI();
}
+ @Override
public final SOAPVersion getSOAPVersion() {
return getSOAPHelper().getVersion();
}
+ @Override
public final OMNamespace getNamespace() {
return getSOAPHelper().getNamespace();
}
@@ -90,109 +93,132 @@ public abstract class SOAPFactoryImpl ex
return element;
}
+ @Override
public final SOAPMessage createSOAPMessage() {
AxiomSOAPMessage message = createNode(AxiomSOAPMessage.class);
message.initSOAPFactory(this);
return message;
}
+ @Override
public final SOAPEnvelope createSOAPEnvelope() {
return createSOAPEnvelope(getNamespace());
}
+ @Override
public final SOAPEnvelope createSOAPEnvelope(OMNamespace ns) {
return createAxiomElement(getSOAPHelper().getEnvelopeClass(), null, SOAPConstants.SOAPENVELOPE_LOCAL_NAME, ns);
}
+ @Override
public final SOAPHeader createSOAPHeader(SOAPEnvelope parent) {
SOAPHelper helper = getSOAPHelper();
return createSOAPElement(helper.getHeaderClass(), parent, helper.getHeaderQName(), envelopeSequence, 0);
}
+ @Override
public final SOAPHeader createSOAPHeader() {
return createSOAPHeader(null);
}
+ @Override
public final SOAPHeaderBlock createSOAPHeaderBlock(String localName, OMNamespace ns, SOAPHeader parent) {
return createAxiomElement(getSOAPHelper().getHeaderBlockClass(), parent, localName, ns);
}
+ @Override
public final SOAPHeaderBlock createSOAPHeaderBlock(String localName, OMNamespace ns) {
return createAxiomElement(getSOAPHelper().getHeaderBlockClass(), null, localName, ns);
}
+ @Override
public final SOAPHeaderBlock createSOAPHeaderBlock(OMDataSource source) {
AxiomSOAPHeaderBlock element = createNode(getSOAPHelper().getHeaderBlockClass());
element.init(source);
return element;
}
+ @Override
public final SOAPHeaderBlock createSOAPHeaderBlock(String localName, OMNamespace ns, OMDataSource ds) {
AxiomSOAPHeaderBlock element = createNode(getSOAPHelper().getHeaderBlockClass());
element.init(localName, ns, ds);
return element;
}
+ @Override
public final SOAPBody createSOAPBody(SOAPEnvelope parent) {
SOAPHelper helper = getSOAPHelper();
return createSOAPElement(helper.getBodyClass(), parent, helper.getBodyQName(), envelopeSequence, 1);
}
+ @Override
public final SOAPBody createSOAPBody() {
return createSOAPBody(null);
}
+ @Override
public final SOAPFault createSOAPFault(SOAPBody parent) {
SOAPHelper helper = getSOAPHelper();
return createSOAPElement(helper.getFaultClass(), parent, helper.getFaultQName());
}
+ @Override
public final SOAPFault createSOAPFault() {
return createSOAPFault(null);
}
+ @Override
public final SOAPFault createSOAPFault(SOAPBody parent, Exception e) {
SOAPFault fault = createSOAPFault(parent);
fault.setException(e);
return fault;
}
+ @Override
public final SOAPFaultCode createSOAPFaultCode(SOAPFault parent) {
SOAPHelper helper = getSOAPHelper();
return createSOAPElement(helper.getFaultCodeClass(), parent, helper.getFaultCodeQName());
}
+ @Override
public final SOAPFaultCode createSOAPFaultCode() {
return createSOAPFaultCode(null);
}
+ @Override
public final SOAPFaultReason createSOAPFaultReason(SOAPFault parent) {
SOAPHelper helper = getSOAPHelper();
return createSOAPElement(helper.getFaultReasonClass(), parent, helper.getFaultReasonQName());
}
+ @Override
public final SOAPFaultReason createSOAPFaultReason() {
return createSOAPFaultReason(null);
}
+ @Override
public final SOAPFaultRole createSOAPFaultRole(SOAPFault parent) {
SOAPHelper helper = getSOAPHelper();
return createSOAPElement(helper.getFaultRoleClass(), parent, helper.getFaultRoleQName());
}
+ @Override
public final SOAPFaultRole createSOAPFaultRole() {
return createSOAPFaultRole(null);
}
+ @Override
public final SOAPFaultDetail createSOAPFaultDetail(SOAPFault parent) {
SOAPHelper helper = getSOAPHelper();
return createSOAPElement(helper.getFaultDetailClass(), parent, helper.getFaultDetailQName());
}
+ @Override
public final SOAPFaultDetail createSOAPFaultDetail() {
return createSOAPFaultDetail(null);
}
+ @Override
public final SOAPMessage createDefaultSOAPMessage() {
SOAPMessage message = createSOAPMessage();
SOAPEnvelope env = createSOAPEnvelope();
@@ -201,6 +227,7 @@ public abstract class SOAPFactoryImpl ex
return message;
}
+ @Override
public final SOAPEnvelope getDefaultEnvelope() {
SOAPEnvelope env = createSOAPEnvelope();
createSOAPHeader(env);
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/AttachmentCacheMonitor.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/AttachmentCacheMonitor.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/AttachmentCacheMonitor.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/AttachmentCacheMonitor.java Thu Dec 29 18:55:52 2016
@@ -256,6 +256,7 @@ public final class AttachmentCacheMonito
private boolean deleteFile(final String fileName ) {
return AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
+ @Override
public Boolean run() {
return _deleteFile(fileName);
}
@@ -297,6 +298,7 @@ public final class AttachmentCacheMonito
/**
* Trigger a checkForAgedFiles event
*/
+ @Override
public void run() {
checkForAgedFiles();
}
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/AttachmentSet.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/AttachmentSet.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/AttachmentSet.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/AttachmentSet.java Thu Dec 29 18:55:52 2016
@@ -38,48 +38,59 @@ import org.apache.axiom.om.OMException;
class AttachmentSet extends AttachmentsDelegate {
private final Map<String,DataHandler> attachmentsMap = new LinkedHashMap<String,DataHandler>();
+ @Override
ContentType getContentType() {
return null;
}
+ @Override
DataHandler getDataHandler(String contentID) {
return attachmentsMap.get(contentID);
}
+ @Override
void addDataHandler(String contentID, DataHandler dataHandler) {
attachmentsMap.put(contentID, dataHandler);
}
+ @Override
void removeDataHandler(String blobContentID) {
attachmentsMap.remove(blobContentID);
}
+ @Override
InputStream getRootPartInputStream(boolean preserve) throws OMException {
throw new OMException("Invalid operation. Attachments are created programatically.");
}
+ @Override
String getRootPartContentID() {
return null;
}
+ @Override
String getRootPartContentType() {
throw new OMException(
"The attachments map was created programatically. Unsupported operation.");
}
+ @Override
IncomingAttachmentStreams getIncomingAttachmentStreams() {
throw new IllegalStateException(
"The attachments map was created programatically. No streams are available.");
}
+ @Override
Set<String> getContentIDs(boolean fetchAll) {
return attachmentsMap.keySet();
}
+ @Override
Map<String,DataHandler> getMap() {
return Collections.unmodifiableMap(attachmentsMap);
}
+ @Override
long getContentLength() throws IOException {
return -1;
}
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/Attachments.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/Attachments.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/Attachments.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/Attachments.java Thu Dec 29 18:55:52 2016
@@ -106,6 +106,7 @@ public class Attachments {
final WritableBlobFactory<?> tempFileBlobFactory = new LegacyTempFileBlobFactory(this, attachmentRepoDir);
if (fileStorageThreshold > 0) {
attachmentBlobFactory = new WritableBlobFactory<WritableBlob>() {
+ @Override
public WritableBlob createBlob() {
return Blobs.createOverflowableBlob(fileStorageThreshold, tempFileBlobFactory);
}
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/ByteArrayDataSource.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/ByteArrayDataSource.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/ByteArrayDataSource.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/ByteArrayDataSource.java Thu Dec 29 18:55:52 2016
@@ -45,6 +45,7 @@ public class ByteArrayDataSource impleme
this.type = type;
}
+ @Override
public String getContentType() {
if (type == null)
return "application/octet-stream";
@@ -52,19 +53,23 @@ public class ByteArrayDataSource impleme
return type;
}
+ @Override
public InputStream getInputStream() throws IOException {
return new ByteArrayInputStream(data == null ? new byte[0] : data);
}
+ @Override
public String getName() {
return "ByteArrayDataSource";
}
+ @Override
public OutputStream getOutputStream() throws IOException {
throw new IOException("Not Supported");
}
+ @Override
public long getSize() {
return data == null ? 0 : data.length;
}
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/CachedFileDataSource.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/CachedFileDataSource.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/CachedFileDataSource.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/CachedFileDataSource.java Thu Dec 29 18:55:52 2016
@@ -63,6 +63,7 @@ public class CachedFileDataSource extend
}
}
+ @Override
public String getContentType() {
if (this.contentType != null) {
return contentType;
@@ -75,6 +76,7 @@ public class CachedFileDataSource extend
this.contentType = contentType;
}
+ @Override
public long getSize() {
return getFile().length();
}
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/ConfigurableDataHandler.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/ConfigurableDataHandler.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/ConfigurableDataHandler.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/ConfigurableDataHandler.java Thu Dec 29 18:55:52 2016
@@ -61,6 +61,7 @@ public class ConfigurableDataHandler ext
// this.contentID = contentID;
// }
+ @Override
public String getContentType() {
if (contentType != null) {
return contentType;
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/CountingInputStream.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/CountingInputStream.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/CountingInputStream.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/CountingInputStream.java Thu Dec 29 18:55:52 2016
@@ -33,6 +33,7 @@ final class CountingInputStream extends
return count;
}
+ @Override
public int read() throws IOException {
int b = parent.read();
if (b != -1) {
@@ -41,6 +42,7 @@ final class CountingInputStream extends
return b;
}
+ @Override
public int read(byte[] b) throws IOException {
int read = parent.read(b);
if (read != -1) {
@@ -49,6 +51,7 @@ final class CountingInputStream extends
return read;
}
+ @Override
public int read(byte[] b, int off, int len) throws IOException {
int read = parent.read(b, off, len);
if (read != -1) {
@@ -57,16 +60,19 @@ final class CountingInputStream extends
return read;
}
+ @Override
public long skip(long n) throws IOException {
long skipped = parent.skip(n);
count += skipped;
return skipped;
}
+ @Override
public int available() throws IOException {
return parent.available();
}
+ @Override
public void close() throws IOException {
parent.close();
}
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/IncomingAttachmentInputStream.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/IncomingAttachmentInputStream.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/IncomingAttachmentInputStream.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/IncomingAttachmentInputStream.java Thu Dec 29 18:55:52 2016
@@ -99,30 +99,36 @@ public class IncomingAttachmentInputStre
* Don't want to support mark and reset since this may get us into concurrency problem when
* different pieces of software may have a handle to the underlying InputStream.
*/
+ @Override
public boolean markSupported() {
return false;
}
+ @Override
public void reset() throws IOException {
throw new IOException("markNotSupported");
}
+ @Override
public void mark(int readLimit) {
// do nothing
}
+ @Override
public int read() throws IOException {
int retval = _stream.read();
parentContainer.setReadyToGetNextStream(retval == -1);
return retval;
}
+ @Override
public int read(byte[] b) throws IOException {
int retval = _stream.read(b);
parentContainer.setReadyToGetNextStream(retval == -1);
return retval;
}
+ @Override
public int read(byte[] b, int off, int len) throws IOException {
int retval = _stream.read(b, off, len);
parentContainer.setReadyToGetNextStream(retval == -1);
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/LegacyPartDataHandler.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/LegacyPartDataHandler.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/LegacyPartDataHandler.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/LegacyPartDataHandler.java Thu Dec 29 18:55:52 2016
@@ -43,14 +43,17 @@ final class LegacyPartDataHandler extend
}
}
+ @Override
public InputStream readOnce() throws IOException {
return getPart().getInputStream(false);
}
+ @Override
public void purgeDataSource() throws IOException {
getPart().discard();
}
+ @Override
public void deleteWhenReadOnce() throws IOException {
// As shown in AXIOM-381, in all released versions of Axiom, deleteWhenReadOnce
// always has the same effect as purgeDataSource
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/LegacyTempFileBlob.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/LegacyTempFileBlob.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/LegacyTempFileBlob.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/LegacyTempFileBlob.java Thu Dec 29 18:55:52 2016
@@ -38,11 +38,13 @@ final class LegacyTempFileBlob extends A
this.attachmentDir = attachmentDir;
}
+ @Override
public OutputStream getOutputStream() throws IOException {
fileAccessor = lifecycleManager.create(attachmentDir);
return fileAccessor.getOutputStream();
}
+ @Override
public InputStream getInputStream() throws IOException {
return fileAccessor.getInputStream();
}
@@ -53,10 +55,12 @@ final class LegacyTempFileBlob extends A
return ds;
}
+ @Override
public long getSize() {
return fileAccessor.getSize();
}
+ @Override
public void release() throws IOException {
lifecycleManager.delete(fileAccessor.getFile());
}
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/LegacyTempFileBlobFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/LegacyTempFileBlobFactory.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/LegacyTempFileBlobFactory.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/LegacyTempFileBlobFactory.java Thu Dec 29 18:55:52 2016
@@ -29,6 +29,7 @@ final class LegacyTempFileBlobFactory im
this.attachmentDir = attachmentDir;
}
+ @Override
public LegacyTempFileBlob createBlob() {
return new LegacyTempFileBlob(attachments.getLifecycleManager(), attachmentDir);
}
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/lifecycle/impl/DataHandlerExtImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/lifecycle/impl/DataHandlerExtImpl.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/lifecycle/impl/DataHandlerExtImpl.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/lifecycle/impl/DataHandlerExtImpl.java Thu Dec 29 18:55:52 2016
@@ -51,12 +51,14 @@ public class DataHandlerExtImpl extends
this.manager = manager;
}
+ @Override
public InputStream readOnce() throws IOException {
// Instances of DataHandlerExtImpl are only created by legacy code, so it's OK to
// throw an UnsupportedOperationException here.
throw new UnsupportedOperationException();
}
+ @Override
public void deleteWhenReadOnce() throws IOException {
deleteOnreadOnce = true;
FileAccessor fa =manager.getFileAccessor(getName());
@@ -71,6 +73,7 @@ public class DataHandlerExtImpl extends
}
}
+ @Override
public void purgeDataSource() throws IOException {
if(log.isDebugEnabled()){
log.debug("Start purgeDataSource");
@@ -90,6 +93,7 @@ public class DataHandlerExtImpl extends
}
}
+ @Override
public void update(Observable o, Object arg) {
try{
if(log.isDebugEnabled()){
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/lifecycle/impl/LifecycleManagerImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/lifecycle/impl/LifecycleManagerImpl.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/lifecycle/impl/LifecycleManagerImpl.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/lifecycle/impl/LifecycleManagerImpl.java Thu Dec 29 18:55:52 2016
@@ -44,6 +44,7 @@ public class LifecycleManagerImpl implem
/* (non-Javadoc)
* @see org.apache.axiom.lifecycle.LifecycleManager#create(java.lang.String)
*/
+ @Override
public FileAccessor create(String attachmentDir) throws IOException {
if(log.isDebugEnabled()){
log.debug("Start Create()");
@@ -80,6 +81,7 @@ public class LifecycleManagerImpl implem
/* (non-Javadoc)
* @see org.apache.axiom.lifecycle.LifecycleManager#delete(java.io.File)
*/
+ @Override
public void delete(File file) throws IOException {
if(log.isDebugEnabled()){
log.debug("Start delete()");
@@ -119,6 +121,7 @@ public class LifecycleManagerImpl implem
/* (non-Javadoc)
* @see org.apache.axiom.lifecycle.LifecycleManager#deleteOnExit(java.io.File)
*/
+ @Override
public void deleteOnExit(File file) throws IOException {
if(log.isDebugEnabled()){
log.debug("Start deleteOnExit()");
@@ -142,6 +145,7 @@ public class LifecycleManagerImpl implem
/* (non-Javadoc)
* @see org.apache.axiom.lifecycle.LifecycleManager#deleteOnTimeInterval(int)
*/
+ @Override
public void deleteOnTimeInterval(int interval, File file) throws IOException {
if(log.isDebugEnabled()){
log.debug("Start deleteOnTimeInterval()");
@@ -161,6 +165,7 @@ public class LifecycleManagerImpl implem
}
try{
hook = AccessController.doPrivileged(new PrivilegedExceptionAction<VMShutdownHook>() {
+ @Override
public VMShutdownHook run() throws SecurityException, IllegalStateException, IllegalArgumentException {
VMShutdownHook hook = VMShutdownHook.hook();
if(!hook.isRegistered()){
@@ -193,6 +198,7 @@ public class LifecycleManagerImpl implem
this._file = file;
}
+ @Override
public void run() {
try{
Thread.sleep(interval*1000);
@@ -209,6 +215,7 @@ public class LifecycleManagerImpl implem
}
}
+ @Override
public FileAccessor getFileAccessor(String fileName) throws IOException {
return table.get(fileName);
}
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/lifecycle/impl/VMShutdownHook.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/lifecycle/impl/VMShutdownHook.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/lifecycle/impl/VMShutdownHook.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/lifecycle/impl/VMShutdownHook.java Thu Dec 29 18:55:52 2016
@@ -70,6 +70,7 @@ public class VMShutdownHook extends Thre
files.add(file);
}
+ @Override
public void run() {
if(log.isDebugEnabled()){
log.debug("JVM running VM Shutdown Hook");
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/AbstractWritableBlob.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/AbstractWritableBlob.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/AbstractWritableBlob.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/AbstractWritableBlob.java Thu Dec 29 18:55:52 2016
@@ -31,6 +31,7 @@ import org.apache.axiom.util.io.IOUtils;
* {@link WritableBlob#writeTo(OutputStream)} using {@link WritableBlob#getInputStream()}.
*/
public abstract class AbstractWritableBlob implements WritableBlob {
+ @Override
public long readFrom(InputStream in) throws StreamCopyException {
OutputStream out;
try {
@@ -49,6 +50,7 @@ public abstract class AbstractWritableBl
}
}
+ @Override
public void writeTo(OutputStream out) throws StreamCopyException {
InputStream in;
try {
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/BlobDataSource.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/BlobDataSource.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/BlobDataSource.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/BlobDataSource.java Thu Dec 29 18:55:52 2016
@@ -37,22 +37,27 @@ public class BlobDataSource implements S
this.contentType = contentType;
}
+ @Override
public InputStream getInputStream() throws IOException {
return blob.getInputStream();
}
+ @Override
public String getContentType() {
return contentType;
}
+ @Override
public String getName() {
return null;
}
+ @Override
public OutputStream getOutputStream() throws IOException {
throw new UnsupportedOperationException();
}
+ @Override
public long getSize() {
return blob.getSize();
}
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/MemoryBlob.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/MemoryBlob.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/MemoryBlob.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/MemoryBlob.java Thu Dec 29 18:55:52 2016
@@ -39,9 +39,16 @@ public interface MemoryBlob extends Writ
}
};
+ @Override
InputStream getInputStream();
+
+ @Override
OutputStream getOutputStream();
+
+ @Override
long getSize();
+
+ @Override
void release();
/**
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/MemoryBlobImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/MemoryBlobImpl.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/MemoryBlobImpl.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/MemoryBlobImpl.java Thu Dec 29 18:55:52 2016
@@ -28,6 +28,7 @@ final class MemoryBlobImpl implements Me
private MemoryBlobChunk firstChunk;
private boolean committed;
+ @Override
public long getSize() {
if (firstChunk == null || !committed) {
throw new IllegalStateException();
@@ -42,6 +43,7 @@ final class MemoryBlobImpl implements Me
}
}
+ @Override
public OutputStream getOutputStream() {
return internalGetOutputStream();
}
@@ -58,6 +60,7 @@ final class MemoryBlobImpl implements Me
committed = true;
}
+ @Override
public long readFrom(InputStream in) throws StreamCopyException {
MemoryBlobOutputStream out = internalGetOutputStream();
try {
@@ -67,15 +70,17 @@ final class MemoryBlobImpl implements Me
}
}
+ @Override
public InputStream getInputStream() {
return getInputStream(true);
}
+ @Override
public InputStream readOnce() {
return getInputStream(false);
}
- public InputStream getInputStream(boolean preserve) {
+ private InputStream getInputStream(boolean preserve) {
if (firstChunk == null || !committed) {
throw new IllegalStateException();
}
@@ -86,6 +91,7 @@ final class MemoryBlobImpl implements Me
return in;
}
+ @Override
public void writeTo(OutputStream os) throws StreamCopyException {
if (firstChunk == null || !committed) {
throw new IllegalStateException();
@@ -103,6 +109,7 @@ final class MemoryBlobImpl implements Me
}
}
+ @Override
public void release() {
firstChunk = null;
}
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/MemoryBlobOutputStream.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/MemoryBlobOutputStream.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/MemoryBlobOutputStream.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/MemoryBlobOutputStream.java Thu Dec 29 18:55:52 2016
@@ -65,6 +65,7 @@ final class MemoryBlobOutputStream exten
chunk.buffer[chunk.size++] = (byte)b;
}
+ @Override
public long readFrom(InputStream in, long length) throws StreamCopyException {
if (chunk == null) {
throw new IllegalStateException();
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/OverflowableBlobImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/OverflowableBlobImpl.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/OverflowableBlobImpl.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/OverflowableBlobImpl.java Thu Dec 29 18:55:52 2016
@@ -32,6 +32,7 @@ final class OverflowableBlobImpl impleme
private OutputStream overflowOutputStream;
+ @Override
public void write(byte[] b, int off, int len) throws IOException {
if (state != State.UNCOMMITTED) {
throw new IllegalStateException();
@@ -70,14 +71,17 @@ final class OverflowableBlobImpl impleme
}
}
+ @Override
public void write(byte[] b) throws IOException {
write(b, 0, b.length);
}
+ @Override
public void write(int b) throws IOException {
write(new byte[] { (byte)b }, 0, 1);
}
+ @Override
public void close() throws IOException {
if (overflowOutputStream != null) {
overflowOutputStream.close();
@@ -85,6 +89,7 @@ final class OverflowableBlobImpl impleme
state = State.COMMITTED;
}
+ @Override
public long readFrom(InputStream in, long length) throws StreamCopyException {
return OverflowableBlobImpl.this.readFrom(in, length, false);
}
@@ -97,10 +102,12 @@ final class OverflowableBlobImpl impleme
private int markChunkIndex;
private int markChunkOffset;
+ @Override
public int available() throws IOException {
return (chunkIndex-currentChunkIndex)*chunkSize + chunkOffset - currentChunkOffset;
}
+ @Override
public int read(byte[] b, int off, int len) throws IOException {
if (len == 0) {
@@ -141,29 +148,35 @@ final class OverflowableBlobImpl impleme
}
}
+ @Override
public int read(byte[] b) throws IOException {
return read(b, 0, b.length);
}
+ @Override
public int read() throws IOException {
byte[] b = new byte[1];
return read(b) == -1 ? -1 : b[0] & 0xFF;
}
+ @Override
public boolean markSupported() {
return true;
}
+ @Override
public void mark(int readlimit) {
markChunkIndex = currentChunkIndex;
markChunkOffset = currentChunkOffset;
}
+ @Override
public void reset() throws IOException {
currentChunkIndex = markChunkIndex;
currentChunkOffset = markChunkOffset;
}
+ @Override
public long skip(long n) throws IOException {
int available = available();
@@ -175,6 +188,7 @@ final class OverflowableBlobImpl impleme
return c;
}
+ @Override
public void close() throws IOException {
}
}
@@ -263,6 +277,7 @@ final class OverflowableBlobImpl impleme
return outputStream;
}
+ @Override
public OutputStream getOutputStream() {
if (state != State.NEW) {
throw new IllegalStateException();
@@ -320,6 +335,7 @@ final class OverflowableBlobImpl impleme
return read;
}
+ @Override
public long readFrom(InputStream in) throws StreamCopyException {
if (state != State.NEW) {
throw new IllegalStateException();
@@ -327,6 +343,7 @@ final class OverflowableBlobImpl impleme
return readFrom(in, -1, true);
}
+ @Override
public InputStream getInputStream() throws IOException {
if (state != State.COMMITTED) {
throw new IllegalStateException();
@@ -337,6 +354,7 @@ final class OverflowableBlobImpl impleme
}
}
+ @Override
public void writeTo(OutputStream out) throws StreamCopyException {
if (state != State.COMMITTED) {
throw new IllegalStateException();
@@ -357,6 +375,7 @@ final class OverflowableBlobImpl impleme
}
}
+ @Override
public long getSize() {
if (state != State.COMMITTED) {
throw new IllegalStateException();
@@ -368,6 +387,7 @@ final class OverflowableBlobImpl impleme
}
}
+ @Override
public void release() throws IOException {
if (overflowBlob != null) {
overflowBlob.release();
@@ -376,6 +396,7 @@ final class OverflowableBlobImpl impleme
state = State.RELEASED;
}
+ @Override
public WritableBlob getOverflowBlob() {
return overflowBlob;
}
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/TempFileBlobFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/TempFileBlobFactory.java?rev=1776465&r1=1776464&r2=1776465&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/TempFileBlobFactory.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/TempFileBlobFactory.java Thu Dec 29 18:55:52 2016
@@ -32,6 +32,7 @@ final class TempFileBlobFactory implemen
this.tempDirectory = tempDirectory;
}
+ @Override
public WritableBlob createBlob() {
return new TempFileBlobImpl(this);
}