This is an automated email from the ASF dual-hosted git repository. rec pushed a commit to branch refactoring/UIMA-6373-Format-UIMA-Core-Java-SDK-codebase in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit f30abaad14d8c1f86c46a64fa8eca1b65a95d897 Author: Richard Eckart de Castilho <[email protected]> AuthorDate: Thu Feb 10 14:59:15 2022 +0100 [UIMA-6373] Format UIMA Core Java SDK codebase - Auto-format --- .../soap/AxisAnalysisEngineServiceStub.java | 27 ++++---- .../soap/AxisAnalysisEngineService_impl.java | 16 +++-- .../adapter/soap/AxisResourceServiceManager.java | 13 ++-- .../uima/adapter/soap/AxisResourceServiceStub.java | 4 +- .../uima/adapter/soap/BinaryDeserializer.java | 57 ++++++++++------ .../adapter/soap/BinaryDeserializerFactory.java | 9 ++- .../apache/uima/adapter/soap/BinarySerializer.java | 36 ++++++---- .../uima/adapter/soap/BinarySerializerFactory.java | 12 ++-- .../soap/SoapAnalysisEngineServiceAdapter.java | 26 ++++---- .../apache/uima/adapter/soap/XmlDeserializer.java | 67 ++++++++++++------- .../uima/adapter/soap/XmlDeserializerFactory.java | 9 ++- .../apache/uima/adapter/soap/XmlSerializer.java | 77 ++++++++++++++-------- .../uima/adapter/soap/XmlSerializerFactory.java | 9 ++- .../soap/axis11/BinaryDeserializer_Axis11.java | 56 ++++++++++------ .../soap/axis11/BinarySerializer_Axis11.java | 35 ++++++---- .../soap/axis11/XmlDeserializer_Axis11.java | 66 ++++++++++++------- .../adapter/soap/axis11/XmlSerializer_Axis11.java | 76 +++++++++++++-------- 17 files changed, 384 insertions(+), 211 deletions(-) diff --git a/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisAnalysisEngineServiceStub.java b/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisAnalysisEngineServiceStub.java index 8e6e92c..ce65ecb 100644 --- a/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisAnalysisEngineServiceStub.java +++ b/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisAnalysisEngineServiceStub.java @@ -41,15 +41,14 @@ import org.apache.uima.cas.CASException; import org.apache.uima.resource.ResourceServiceException; import org.apache.uima.resource.ResourceServiceStub; - /** - * Proxy to an {@link AnalysisEngineService_impl} that makes use of Axis SOAP to communicate with the - * service. + * Proxy to an {@link AnalysisEngineService_impl} that makes use of Axis SOAP to communicate with + * the service. * * */ -public class AxisAnalysisEngineServiceStub extends AxisResourceServiceStub implements - AnalysisEngineServiceStub { +public class AxisAnalysisEngineServiceStub extends AxisResourceServiceStub + implements AnalysisEngineServiceStub { /** Whether attachments should be used to send binary-serialized data. */ private boolean mUseAttachments; @@ -92,8 +91,10 @@ public class AxisAnalysisEngineServiceStub extends AxisResourceServiceStub imple /** * Call process. * - * @param aCAS the a CAS - * @throws ResourceServiceException the resource service exception + * @param aCAS + * the a CAS + * @throws ResourceServiceException + * the resource service exception * @see AnalysisEngineServiceStub#callProcess(CAS) */ @Override @@ -152,8 +153,8 @@ public class AxisAnalysisEngineServiceStub extends AxisResourceServiceStub imple resultCargo = (ServiceDataCargo) result; } else { throw new ResourceServiceException( - ResourceServiceException.UNEXPECTED_SERVICE_RETURN_VALUE_TYPE, new Object[] { - ServiceDataCargo.class.getName(), + ResourceServiceException.UNEXPECTED_SERVICE_RETURN_VALUE_TYPE, + new Object[] { ServiceDataCargo.class.getName(), resultCargo == null ? "null" : resultCargo.getClass().getName() }); } @@ -180,7 +181,9 @@ public class AxisAnalysisEngineServiceStub extends AxisResourceServiceStub imple // no resources to clean up } - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see org.apache.uima.analysis_engine.AnalysisEngineServiceStub#callBatchProcessComplete() */ @Override @@ -188,7 +191,9 @@ public class AxisAnalysisEngineServiceStub extends AxisResourceServiceStub imple // currently not implemented for SOAP services } - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see org.apache.uima.analysis_engine.AnalysisEngineServiceStub#callCollectionProcessComplete() */ @Override diff --git a/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisAnalysisEngineService_impl.java b/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisAnalysisEngineService_impl.java index 6ff8377..053785f 100644 --- a/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisAnalysisEngineService_impl.java +++ b/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisAnalysisEngineService_impl.java @@ -28,7 +28,6 @@ import org.apache.uima.resource.ResourceServiceException; import org.apache.uima.resource.metadata.ResourceMetaData; import org.apache.uima.util.Level; - /** * A class used to deploy a {@link AnalysisEngineService_impl} as an Axis (SOAP) service. */ @@ -41,7 +40,8 @@ public class AxisAnalysisEngineService_impl { /** * Constructor, responsible for initializing the service. * - * @throws AxisFault the axis fault + * @throws AxisFault + * the axis fault */ public AxisAnalysisEngineService_impl() throws AxisFault { mServiceImpl = (AnalysisEngineService_impl) AxisResourceServiceManager @@ -52,7 +52,8 @@ public class AxisAnalysisEngineService_impl { * Gets metadata for this Resource service. * * @return metadata - * @throws ResourceServiceException the resource service exception + * @throws ResourceServiceException + * the resource service exception */ public ResourceMetaData getMetaData() throws ResourceServiceException { try { @@ -69,10 +70,13 @@ public class AxisAnalysisEngineService_impl { /** * Processes an entity. * - * @param aData data to be processed - * @param aResultSpec specifies which results the Analysis Engine should produce + * @param aData + * data to be processed + * @param aResultSpec + * specifies which results the Analysis Engine should produce * @return the results of analysis - * @throws ResourceServiceException the resource service exception + * @throws ResourceServiceException + * the resource service exception */ public ServiceDataCargo process(ServiceDataCargo aData, ResultSpecification aResultSpec) throws ResourceServiceException { diff --git a/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisResourceServiceManager.java b/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisResourceServiceManager.java index e15633a..b3ef4ef 100644 --- a/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisResourceServiceManager.java +++ b/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisResourceServiceManager.java @@ -34,7 +34,6 @@ import org.apache.uima.util.Level; import org.apache.uima.util.Logger; import org.apache.uima.util.XMLInputSource; - /** * Utility class for deploying Resources as Axis (SOAP) services. This class mantains a map between * Axis service names and the {@link ResourceService_impl} classes that provide the implementation @@ -84,10 +83,12 @@ public class AxisResourceServiceManager { * returned. Otherwise, a new <code>ResourceService_impl</code> object will be created from the * information in the MessageContext. * - * @param aServiceImplClass the class that will be instantiated when a new <code>ResourceService_impl</code> is - * to be created. This must be a subclass of ResourceService_impl. + * @param aServiceImplClass + * the class that will be instantiated when a new <code>ResourceService_impl</code> is to + * be created. This must be a subclass of ResourceService_impl. * @return the service impl - * @throws AxisFault if the configuration information could not be read + * @throws AxisFault + * if the configuration information could not be read */ public static ResourceService_impl getServiceImpl(Class aServiceImplClass) throws AxisFault { try { @@ -121,8 +122,8 @@ public class AxisResourceServiceManager { + " not Defined. Check your deployment descriptor file (WSDD)"); } // parse ResourceSpecifier - ResourceSpecifier resourceSpecifier = UIMAFramework.getXMLParser().parseResourceSpecifier( - new XMLInputSource(resourceSpecifierPath)); + ResourceSpecifier resourceSpecifier = UIMAFramework.getXMLParser() + .parseResourceSpecifier(new XMLInputSource(resourceSpecifierPath)); // Get the number of instances to create String numInstancesStr = (String) self.getOption(PARAM_NUM_INSTANCES); diff --git a/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisResourceServiceStub.java b/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisResourceServiceStub.java index d522262..8c45a6c 100644 --- a/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisResourceServiceStub.java +++ b/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisResourceServiceStub.java @@ -32,7 +32,6 @@ import org.apache.uima.resource.ResourceServiceStub; import org.apache.uima.resource.metadata.ResourceMetaData; import org.apache.uima.resource.service.impl.ResourceService_impl; - /** * Proxy to a {@link ResourceService_impl} that uses Axis SOAP to communicate with the service. * @@ -70,7 +69,8 @@ public abstract class AxisResourceServiceStub implements ResourceServiceStub { * Call get meta data. * * @return the resource meta data - * @throws ResourceServiceException the resource service exception + * @throws ResourceServiceException + * the resource service exception * @see ResourceService_impl#getMetaData() */ @Override diff --git a/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinaryDeserializer.java b/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinaryDeserializer.java index 3619f98..3d2ccfb 100644 --- a/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinaryDeserializer.java +++ b/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinaryDeserializer.java @@ -38,7 +38,6 @@ import org.apache.uima.internal.util.SerializationUtils; import org.xml.sax.Attributes; import org.xml.sax.SAXException; - /** * An Axis deserializer for {@link Serializable} objects. The serialized bytes are Base-64 encoded * for transport via SOAP. @@ -53,12 +52,15 @@ public class BinaryDeserializer extends DeserializerImpl { /** The buf. */ private StringBuffer buf = new StringBuffer(); - /* (non-Javadoc) - * @see org.apache.axis.encoding.DeserializerImpl#startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes, org.apache.axis.encoding.DeserializationContext) + /* + * (non-Javadoc) + * + * @see org.apache.axis.encoding.DeserializerImpl#startElement(java.lang.String, java.lang.String, + * java.lang.String, org.xml.sax.Attributes, org.apache.axis.encoding.DeserializationContext) */ @Override - public void startElement(String namespace, String localName, String prefix, - Attributes attributes, DeserializationContext context) throws SAXException { + public void startElement(String namespace, String localName, String prefix, Attributes attributes, + DeserializationContext context) throws SAXException { // System.out.println("startElement(" + namespace + "," + localName + "," + prefix + ")"); if (!context.isDoneParsing()) { @@ -122,13 +124,20 @@ public class BinaryDeserializer extends DeserializerImpl { /** * On start element. * - * @param namespace the namespace - * @param localName the local name - * @param prefix the prefix - * @param attributes the attributes - * @param context the context - * @throws SAXException the SAX exception - * @see org.apache.axis.message.SOAPHandler#onStartChild(String, String, String, Attributes, DeserializationContext) + * @param namespace + * the namespace + * @param localName + * the local name + * @param prefix + * the prefix + * @param attributes + * the attributes + * @param context + * the context + * @throws SAXException + * the SAX exception + * @see org.apache.axis.message.SOAPHandler#onStartChild(String, String, String, Attributes, + * DeserializationContext) */ @Override public void onStartElement(String namespace, String localName, String prefix, @@ -139,10 +148,14 @@ public class BinaryDeserializer extends DeserializerImpl { /** * On end element. * - * @param arg0 the arg 0 - * @param arg1 the arg 1 - * @param arg2 the arg 2 - * @throws SAXException the SAX exception + * @param arg0 + * the arg 0 + * @param arg1 + * the arg 1 + * @param arg2 + * the arg 2 + * @throws SAXException + * the SAX exception * @see org.apache.axis.encoding.Deserializer#onEndElement(java.lang.String, java.lang.String, * org.apache.axis.encoding.DeserializationContext) */ @@ -171,10 +184,14 @@ public class BinaryDeserializer extends DeserializerImpl { /** * Characters. * - * @param ch the ch - * @param start the start - * @param length the length - * @throws SAXException the SAX exception + * @param ch + * the ch + * @param start + * the start + * @param length + * the length + * @throws SAXException + * the SAX exception * @see org.xml.sax.ContentHandler#characters(char[], int, int) */ @Override diff --git a/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinaryDeserializerFactory.java b/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinaryDeserializerFactory.java index 05ac1f4..2abf1d2 100644 --- a/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinaryDeserializerFactory.java +++ b/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinaryDeserializerFactory.java @@ -27,7 +27,6 @@ import org.apache.axis.Version; import org.apache.axis.encoding.DeserializerFactory; import org.apache.uima.adapter.soap.axis11.BinaryDeserializer_Axis11; - /** * An Axis deserializer factory that constructs instances of {@link BinaryDeserializer}. * @@ -41,7 +40,9 @@ public class BinaryDeserializerFactory implements DeserializerFactory { /** The mechanisms. */ private Vector mechanisms; - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see javax.xml.rpc.encoding.DeserializerFactory#getDeserializerAs(java.lang.String) */ @Override @@ -59,7 +60,9 @@ public class BinaryDeserializerFactory implements DeserializerFactory { } } - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see javax.xml.rpc.encoding.DeserializerFactory#getSupportedMechanismTypes() */ @Override diff --git a/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinarySerializer.java b/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinarySerializer.java index 8d8ecf6..76030f7 100644 --- a/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinarySerializer.java +++ b/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinarySerializer.java @@ -41,7 +41,6 @@ import org.w3c.dom.Element; import org.xml.sax.Attributes; import org.xml.sax.helpers.AttributesImpl; - /** * An Axis serializer for {@link Serializable} objects. The serialized bytes are Base-64 encoded for * transport via SOAP. @@ -66,7 +65,8 @@ public class BinarySerializer implements Serializer { /** * Instantiates a new binary serializer. * - * @param aUseAttachments the a use attachments + * @param aUseAttachments + * the a use attachments */ public BinarySerializer(boolean aUseAttachments) { mUseAttachments = aUseAttachments; @@ -75,11 +75,16 @@ public class BinarySerializer implements Serializer { /** * Serialize an element named name, with the indicated attributes and value. * - * @param name is the element name - * @param attributes are the attributes...serializer is free to add more. - * @param value is the value - * @param context is the SerializationContext - * @throws IOException Signals that an I/O exception has occurred. + * @param name + * is the element name + * @param attributes + * are the attributes...serializer is free to add more. + * @param value + * is the value + * @param context + * is the SerializationContext + * @throws IOException + * Signals that an I/O exception has occurred. */ @Override public void serialize(QName name, Attributes attributes, Object value, @@ -102,8 +107,8 @@ public class BinarySerializer implements Serializer { if (useAttachments) { // System.out.println("Creating attachment"); //DEBUG SOAPConstants soapConstants = context.getMessageContext().getSOAPConstants(); - DataHandler dataHandler = new DataHandler(new OctetStreamDataSource("test", - new OctetStream(bytes))); + DataHandler dataHandler = new DataHandler( + new OctetStreamDataSource("test", new OctetStream(bytes))); Part attachmentPart = attachments.createAttachmentPart(dataHandler); AttributesImpl attrs = new AttributesImpl(); @@ -135,7 +140,9 @@ public class BinarySerializer implements Serializer { } } - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see javax.xml.rpc.encoding.Serializer#getMechanismType() */ @Override @@ -146,10 +153,13 @@ public class BinarySerializer implements Serializer { /** * Write schema. * - * @param javaType the java type - * @param types the types + * @param javaType + * the java type + * @param types + * the types * @return the element - * @throws Exception the exception + * @throws Exception + * the exception * @see org.apache.axis.encoding.Serializer#writeSchema(java.lang.Class, * org.apache.axis.wsdl.fromJava.Types) */ diff --git a/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinarySerializerFactory.java b/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinarySerializerFactory.java index 9e978ff..b2b56ed 100644 --- a/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinarySerializerFactory.java +++ b/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinarySerializerFactory.java @@ -29,7 +29,6 @@ import org.apache.axis.Version; import org.apache.axis.encoding.SerializerFactory; import org.apache.uima.adapter.soap.axis11.BinarySerializer_Axis11; - /** * An Axis serializer factory that constructs instances of {@link BinarySerializer}. * @@ -53,13 +52,16 @@ public class BinarySerializerFactory implements SerializerFactory { /** * Instantiates a new binary serializer factory. * - * @param aUseAttachments the a use attachments + * @param aUseAttachments + * the a use attachments */ public BinarySerializerFactory(boolean aUseAttachments) { // TODO: attachments never used? } - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see javax.xml.rpc.encoding.SerializerFactory#getSerializerAs(java.lang.String) */ @Override @@ -77,7 +79,9 @@ public class BinarySerializerFactory implements SerializerFactory { } } - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see javax.xml.rpc.encoding.SerializerFactory#getSupportedMechanismTypes() */ @Override diff --git a/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/SoapAnalysisEngineServiceAdapter.java b/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/SoapAnalysisEngineServiceAdapter.java index 6fb4cd8..a968dc7 100644 --- a/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/SoapAnalysisEngineServiceAdapter.java +++ b/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/SoapAnalysisEngineServiceAdapter.java @@ -29,7 +29,6 @@ import org.apache.uima.resource.ResourceInitializationException; import org.apache.uima.resource.ResourceSpecifier; import org.apache.uima.resource.URISpecifier; - /** * Reference implementation of {@link AnalysisEngineServiceAdapter} for SOAP. * @@ -40,10 +39,13 @@ public class SoapAnalysisEngineServiceAdapter extends AnalysisEngineServiceAdapt /** * Initialize. * - * @param aSpecifier the a specifier - * @param aAdditionalParams the a additional params + * @param aSpecifier + * the a specifier + * @param aAdditionalParams + * the a additional params * @return true, if successful - * @throws ResourceInitializationException the resource initialization exception + * @throws ResourceInitializationException + * the resource initialization exception * @see org.apache.uima.resource.Resource#initialize(ResourceSpecifier, Map) */ @Override @@ -66,8 +68,9 @@ public class SoapAnalysisEngineServiceAdapter extends AnalysisEngineServiceAdapt try { // create proxy to service - AnalysisEngineServiceStub stub = new AxisAnalysisEngineServiceStub(uriSpec.getUri(), uriSpec - .getTimeout(), uriSpec.getProtocol().equals(Constants.PROTOCOL_SOAP_WITH_ATTACHMENTS)); + AnalysisEngineServiceStub stub = new AxisAnalysisEngineServiceStub(uriSpec.getUri(), + uriSpec.getTimeout(), + uriSpec.getProtocol().equals(Constants.PROTOCOL_SOAP_WITH_ATTACHMENTS)); setStub(stub); // finish initialization. This requires access to metadata, so must be called @@ -78,13 +81,14 @@ public class SoapAnalysisEngineServiceAdapter extends AnalysisEngineServiceAdapt throw new ResourceInitializationException(ResourceInitializationException.MALFORMED_URL, new Object[] { uriSpec.getUri(), uriSpec.getSourceUrlString() }, e); } - - // Sofa mappings are currently not implemented for remote AEs. Catch this + + // Sofa mappings are currently not implemented for remote AEs. Catch this // and report an error. if (getUimaContextAdmin().getSofaMap().size() > 0) { - throw new ResourceInitializationException(ResourceInitializationException.SOFA_MAPPING_NOT_SUPPORTED_FOR_REMOTE, - new Object[]{getMetaData().getName()}); - } + throw new ResourceInitializationException( + ResourceInitializationException.SOFA_MAPPING_NOT_SUPPORTED_FOR_REMOTE, + new Object[] { getMetaData().getName() }); + } return true; } diff --git a/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlDeserializer.java b/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlDeserializer.java index 22a99de..fe45013 100644 --- a/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlDeserializer.java +++ b/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlDeserializer.java @@ -33,7 +33,6 @@ import org.xml.sax.Attributes; import org.xml.sax.SAXException; import org.xml.sax.helpers.LocatorImpl; - /** * An Axis deserializer for any {@link XMLizable} object. * @@ -70,13 +69,19 @@ public class XmlDeserializer extends DeserializerImpl { /** * This method is invoked when an element start tag is encountered. * - * @param namespace is the namespace of the element - * @param localName is the name of the element - * @param prefix is the element's prefix - * @param attributes are the attributes on the element...used to get the type - * @param context is the DeserializationContext + * @param namespace + * is the namespace of the element + * @param localName + * is the name of the element + * @param prefix + * is the element's prefix + * @param attributes + * are the attributes on the element...used to get the type + * @param context + * is the DeserializationContext * @return the SOAP handler - * @throws SAXException the SAX exception + * @throws SAXException + * the SAX exception */ @Override public SOAPHandler onStartChild(String namespace, String localName, String prefix, @@ -87,13 +92,20 @@ public class XmlDeserializer extends DeserializerImpl { /** * On start element. * - * @param arg0 the arg 0 - * @param arg1 the arg 1 - * @param arg2 the arg 2 - * @param arg3 the arg 3 - * @param arg4 the arg 4 - * @throws SAXException the SAX exception - * @see org.apache.axis.message.SOAPHandler#onStartChild(String, String, String, Attributes, DeserializationContext) + * @param arg0 + * the arg 0 + * @param arg1 + * the arg 1 + * @param arg2 + * the arg 2 + * @param arg3 + * the arg 3 + * @param arg4 + * the arg 4 + * @throws SAXException + * the SAX exception + * @see org.apache.axis.message.SOAPHandler#onStartChild(String, String, String, Attributes, + * DeserializationContext) */ @Override public void onStartElement(String arg0, String arg1, String arg2, Attributes arg3, @@ -112,10 +124,14 @@ public class XmlDeserializer extends DeserializerImpl { /** * Characters. * - * @param ch the ch - * @param start the start - * @param length the length - * @throws SAXException the SAX exception + * @param ch + * the ch + * @param start + * the start + * @param length + * the length + * @throws SAXException + * the SAX exception * @see org.xml.sax.ContentHandler#characters(char[], int, int) */ @Override @@ -128,10 +144,14 @@ public class XmlDeserializer extends DeserializerImpl { /** * On end element. * - * @param arg0 the arg 0 - * @param arg1 the arg 1 - * @param arg2 the arg 2 - * @throws SAXException the SAX exception + * @param arg0 + * the arg 0 + * @param arg1 + * the arg 1 + * @param arg2 + * the arg 2 + * @throws SAXException + * the SAX exception * @see org.apache.axis.encoding.Deserializer#onEndElement(java.lang.String, java.lang.String, * org.apache.axis.encoding.DeserializationContext) */ @@ -149,7 +169,8 @@ public class XmlDeserializer extends DeserializerImpl { /** * Value complete. * - * @throws SAXException the SAX exception + * @throws SAXException + * the SAX exception * @see org.apache.axis.encoding.Deserializer#valueComplete() */ @Override diff --git a/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlDeserializerFactory.java b/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlDeserializerFactory.java index 071ddd4..c72c679 100644 --- a/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlDeserializerFactory.java +++ b/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlDeserializerFactory.java @@ -27,7 +27,6 @@ import org.apache.axis.Version; import org.apache.axis.encoding.DeserializerFactory; import org.apache.uima.adapter.soap.axis11.XmlDeserializer_Axis11; - /** * An Axis deserializer factory that constructs instances of {@link XmlDeserializer}. * @@ -41,7 +40,9 @@ public class XmlDeserializerFactory implements DeserializerFactory { /** The mechanisms. */ private Vector mechanisms; - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see javax.xml.rpc.encoding.DeserializerFactory#getDeserializerAs(java.lang.String) */ @Override @@ -59,7 +60,9 @@ public class XmlDeserializerFactory implements DeserializerFactory { } } - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see javax.xml.rpc.encoding.DeserializerFactory#getSupportedMechanismTypes() */ @Override diff --git a/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlSerializer.java b/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlSerializer.java index 9728725..ef7a4d4 100644 --- a/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlSerializer.java +++ b/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlSerializer.java @@ -33,7 +33,6 @@ import org.xml.sax.Attributes; import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; - /** * An Axis serializer for any {@link XMLizable} object. * @@ -47,11 +46,16 @@ public class XmlSerializer implements Serializer { /** * Serialize an element named name, with the indicated attributes and value. * - * @param name is the element name - * @param attributes are the attributes...serializer is free to add more. - * @param value is the value - * @param context is the SerializationContext - * @throws IOException Signals that an I/O exception has occurred. + * @param name + * is the element name + * @param attributes + * are the attributes...serializer is free to add more. + * @param value + * is the value + * @param context + * is the SerializationContext + * @throws IOException + * Signals that an I/O exception has occurred. */ @Override public void serialize(QName name, Attributes attributes, Object value, @@ -68,12 +72,14 @@ public class XmlSerializer implements Serializer { throw new IOException("SAXException: " + e.getMessage()); } } else { - throw new IOException("Can't serialize a " + value.getClass().getName() - + " with an XmlSerializer."); + throw new IOException( + "Can't serialize a " + value.getClass().getName() + " with an XmlSerializer."); } } - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see javax.xml.rpc.encoding.Serializer#getMechanismType() */ @Override @@ -84,10 +90,13 @@ public class XmlSerializer implements Serializer { /** * Write schema. * - * @param javaType the java type - * @param types the types + * @param javaType + * the java type + * @param types + * the types * @return the element - * @throws Exception the exception + * @throws Exception + * the exception * @see org.apache.axis.encoding.Serializer#writeSchema(java.lang.Class, * org.apache.axis.wsdl.fromJava.Types) */ @@ -103,14 +112,15 @@ public class XmlSerializer implements Serializer { * */ static class SerializerContentHandler extends DefaultHandler { - + /** The m context. */ private SerializationContext mContext; /** * Instantiates a new serializer content handler. * - * @param aContext the a context + * @param aContext + * the a context */ SerializerContentHandler(SerializationContext aContext) { mContext = aContext; @@ -119,10 +129,14 @@ public class XmlSerializer implements Serializer { /** * Characters. * - * @param ch the ch - * @param start the start - * @param length the length - * @throws SAXException the SAX exception + * @param ch + * the ch + * @param start + * the start + * @param length + * the length + * @throws SAXException + * the SAX exception * @see org.xml.sax.ContentHandler#characters(char[], int, int) */ @Override @@ -138,10 +152,14 @@ public class XmlSerializer implements Serializer { /** * End element. * - * @param uri the uri - * @param localName the local name - * @param qName the q name - * @throws SAXException the SAX exception + * @param uri + * the uri + * @param localName + * the local name + * @param qName + * the q name + * @throws SAXException + * the SAX exception * @see org.xml.sax.ContentHandler#endElement(java.lang.String, java.lang.String, * java.lang.String) */ @@ -158,11 +176,16 @@ public class XmlSerializer implements Serializer { /** * Start element. * - * @param uri the uri - * @param localName the local name - * @param qName the q name - * @param attributes the attributes - * @throws SAXException the SAX exception + * @param uri + * the uri + * @param localName + * the local name + * @param qName + * the q name + * @param attributes + * the attributes + * @throws SAXException + * the SAX exception * @see org.xml.sax.ContentHandler#startElement(java.lang.String, java.lang.String, * java.lang.String, org.xml.sax.Attributes) */ diff --git a/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlSerializerFactory.java b/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlSerializerFactory.java index 48cfca7..d8cd0dd 100644 --- a/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlSerializerFactory.java +++ b/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlSerializerFactory.java @@ -29,7 +29,6 @@ import org.apache.axis.Version; import org.apache.axis.encoding.SerializerFactory; import org.apache.uima.adapter.soap.axis11.XmlSerializer_Axis11; - /** * An AxisSerializer factory that constructs instances of {@link XmlSerializer}. * @@ -43,7 +42,9 @@ public class XmlSerializerFactory implements SerializerFactory { /** The mechanisms. */ private Vector mechanisms; - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see javax.xml.rpc.encoding.SerializerFactory#getSerializerAs(java.lang.String) */ @Override @@ -61,7 +62,9 @@ public class XmlSerializerFactory implements SerializerFactory { } } - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see javax.xml.rpc.encoding.SerializerFactory#getSupportedMechanismTypes() */ @Override diff --git a/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/BinaryDeserializer_Axis11.java b/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/BinaryDeserializer_Axis11.java index ebd034a..986f5cb 100644 --- a/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/BinaryDeserializer_Axis11.java +++ b/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/BinaryDeserializer_Axis11.java @@ -52,12 +52,15 @@ public class BinaryDeserializer_Axis11 extends DeserializerImpl { /** The buf. */ private StringBuffer buf = new StringBuffer(); - /* (non-Javadoc) - * @see org.apache.axis.encoding.DeserializerImpl#startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes, org.apache.axis.encoding.DeserializationContext) + /* + * (non-Javadoc) + * + * @see org.apache.axis.encoding.DeserializerImpl#startElement(java.lang.String, java.lang.String, + * java.lang.String, org.xml.sax.Attributes, org.apache.axis.encoding.DeserializationContext) */ @Override - public void startElement(String namespace, String localName, String prefix, - Attributes attributes, DeserializationContext context) throws SAXException { + public void startElement(String namespace, String localName, String prefix, Attributes attributes, + DeserializationContext context) throws SAXException { // System.out.println("startElement(" + namespace + "," + localName + "," + prefix + ")"); if (!context.isDoneParsing()) { @@ -121,13 +124,20 @@ public class BinaryDeserializer_Axis11 extends DeserializerImpl { /** * On start element. * - * @param namespace the namespace - * @param localName the local name - * @param prefix the prefix - * @param attributes the attributes - * @param context the context - * @throws SAXException the SAX exception - * @see org.apache.axis.message.SOAPHandler#onStartChild(String, String, String, Attributes, DeserializationContext) + * @param namespace + * the namespace + * @param localName + * the local name + * @param prefix + * the prefix + * @param attributes + * the attributes + * @param context + * the context + * @throws SAXException + * the SAX exception + * @see org.apache.axis.message.SOAPHandler#onStartChild(String, String, String, Attributes, + * DeserializationContext) */ @Override public void onStartElement(String namespace, String localName, String prefix, @@ -138,10 +148,14 @@ public class BinaryDeserializer_Axis11 extends DeserializerImpl { /** * On end element. * - * @param arg0 the arg 0 - * @param arg1 the arg 1 - * @param arg2 the arg 2 - * @throws SAXException the SAX exception + * @param arg0 + * the arg 0 + * @param arg1 + * the arg 1 + * @param arg2 + * the arg 2 + * @throws SAXException + * the SAX exception * @see org.apache.axis.encoding.Deserializer#onEndElement(java.lang.String, java.lang.String, * org.apache.axis.encoding.DeserializationContext) */ @@ -170,10 +184,14 @@ public class BinaryDeserializer_Axis11 extends DeserializerImpl { /** * Characters. * - * @param ch the ch - * @param start the start - * @param length the length - * @throws SAXException the SAX exception + * @param ch + * the ch + * @param start + * the start + * @param length + * the length + * @throws SAXException + * the SAX exception * @see org.xml.sax.ContentHandler#characters(char[], int, int) */ @Override diff --git a/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/BinarySerializer_Axis11.java b/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/BinarySerializer_Axis11.java index 4f5e8f4..1d983ab 100644 --- a/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/BinarySerializer_Axis11.java +++ b/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/BinarySerializer_Axis11.java @@ -65,7 +65,8 @@ public class BinarySerializer_Axis11 implements Serializer { /** * Instantiates a new binary serializer axis 11. * - * @param aUseAttachments the a use attachments + * @param aUseAttachments + * the a use attachments */ public BinarySerializer_Axis11(boolean aUseAttachments) { mUseAttachments = aUseAttachments; @@ -74,11 +75,16 @@ public class BinarySerializer_Axis11 implements Serializer { /** * Serialize an element named name, with the indicated attributes and value. * - * @param name is the element name - * @param attributes are the attributes...serializer is free to add more. - * @param value is the value - * @param context is the SerializationContext - * @throws IOException Signals that an I/O exception has occurred. + * @param name + * is the element name + * @param attributes + * are the attributes...serializer is free to add more. + * @param value + * is the value + * @param context + * is the SerializationContext + * @throws IOException + * Signals that an I/O exception has occurred. */ @Override public void serialize(QName name, Attributes attributes, Object value, @@ -101,8 +107,8 @@ public class BinarySerializer_Axis11 implements Serializer { if (useAttachments) { // System.out.println("Creating attachment"); //DEBUG SOAPConstants soapConstants = context.getMessageContext().getSOAPConstants(); - DataHandler dataHandler = new DataHandler(new OctetStreamDataSource("test", - new OctetStream(bytes))); + DataHandler dataHandler = new DataHandler( + new OctetStreamDataSource("test", new OctetStream(bytes))); Part attachmentPart = attachments.createAttachmentPart(dataHandler); AttributesImpl attrs = new AttributesImpl(); @@ -134,7 +140,9 @@ public class BinarySerializer_Axis11 implements Serializer { } } - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see javax.xml.rpc.encoding.Serializer#getMechanismType() */ @Override @@ -145,10 +153,13 @@ public class BinarySerializer_Axis11 implements Serializer { /** * Write schema. * - * @param javaType the java type - * @param types the types + * @param javaType + * the java type + * @param types + * the types * @return the element - * @throws Exception the exception + * @throws Exception + * the exception * @see org.apache.axis.encoding.Serializer#writeSchema(java.lang.Class, * org.apache.axis.wsdl.fromJava.Types) */ diff --git a/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/XmlDeserializer_Axis11.java b/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/XmlDeserializer_Axis11.java index 4e935e1..09e6a9f 100644 --- a/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/XmlDeserializer_Axis11.java +++ b/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/XmlDeserializer_Axis11.java @@ -69,10 +69,14 @@ public class XmlDeserializer_Axis11 extends DeserializerImpl { /** * Characters. * - * @param ch the ch - * @param start the start - * @param length the length - * @throws SAXException the SAX exception + * @param ch + * the ch + * @param start + * the start + * @param length + * the length + * @throws SAXException + * the SAX exception * @see org.xml.sax.ContentHandler#characters(char[], int, int) */ @Override @@ -85,10 +89,14 @@ public class XmlDeserializer_Axis11 extends DeserializerImpl { /** * On end element. * - * @param arg0 the arg 0 - * @param arg1 the arg 1 - * @param arg2 the arg 2 - * @throws SAXException the SAX exception + * @param arg0 + * the arg 0 + * @param arg1 + * the arg 1 + * @param arg2 + * the arg 2 + * @throws SAXException + * the SAX exception * @see org.apache.axis.encoding.Deserializer#onEndElement(java.lang.String, java.lang.String, * org.apache.axis.encoding.DeserializationContext) */ @@ -106,13 +114,19 @@ public class XmlDeserializer_Axis11 extends DeserializerImpl { /** * This method is invoked when an element start tag is encountered. * - * @param namespace is the namespace of the element - * @param localName is the name of the element - * @param prefix is the element's prefix - * @param attributes are the attributes on the element...used to get the type - * @param context is the DeserializationContext + * @param namespace + * is the namespace of the element + * @param localName + * is the name of the element + * @param prefix + * is the element's prefix + * @param attributes + * are the attributes on the element...used to get the type + * @param context + * is the DeserializationContext * @return the SOAP handler - * @throws SAXException the SAX exception + * @throws SAXException + * the SAX exception */ @Override public SOAPHandler onStartChild(String namespace, String localName, String prefix, @@ -123,13 +137,20 @@ public class XmlDeserializer_Axis11 extends DeserializerImpl { /** * On start element. * - * @param arg0 the arg 0 - * @param arg1 the arg 1 - * @param arg2 the arg 2 - * @param arg3 the arg 3 - * @param arg4 the arg 4 - * @throws SAXException the SAX exception - * @see org.apache.axis.message.SOAPHandler#onStartChild(String, String, String, Attributes, DeserializationContext) + * @param arg0 + * the arg 0 + * @param arg1 + * the arg 1 + * @param arg2 + * the arg 2 + * @param arg3 + * the arg 3 + * @param arg4 + * the arg 4 + * @throws SAXException + * the SAX exception + * @see org.apache.axis.message.SOAPHandler#onStartChild(String, String, String, Attributes, + * DeserializationContext) */ @Override public void onStartElement(String arg0, String arg1, String arg2, Attributes arg3, @@ -148,7 +169,8 @@ public class XmlDeserializer_Axis11 extends DeserializerImpl { /** * Value complete. * - * @throws SAXException the SAX exception + * @throws SAXException + * the SAX exception * @see org.apache.axis.encoding.Deserializer#valueComplete() */ @Override diff --git a/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/XmlSerializer_Axis11.java b/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/XmlSerializer_Axis11.java index e5f709a..6d074d2 100644 --- a/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/XmlSerializer_Axis11.java +++ b/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/XmlSerializer_Axis11.java @@ -46,11 +46,16 @@ public class XmlSerializer_Axis11 implements Serializer { /** * Serialize an element named name, with the indicated attributes and value. * - * @param name is the element name - * @param attributes are the attributes...serializer is free to add more. - * @param value is the value - * @param context is the SerializationContext - * @throws IOException Signals that an I/O exception has occurred. + * @param name + * is the element name + * @param attributes + * are the attributes...serializer is free to add more. + * @param value + * is the value + * @param context + * is the SerializationContext + * @throws IOException + * Signals that an I/O exception has occurred. */ @Override public void serialize(QName name, Attributes attributes, Object value, @@ -67,12 +72,14 @@ public class XmlSerializer_Axis11 implements Serializer { throw new IOException("SAXException: " + e.getMessage()); } } else { - throw new IOException("Can't serialize a " + value.getClass().getName() - + " with an XmlSerializer."); + throw new IOException( + "Can't serialize a " + value.getClass().getName() + " with an XmlSerializer."); } } - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see javax.xml.rpc.encoding.Serializer#getMechanismType() */ @Override @@ -83,10 +90,13 @@ public class XmlSerializer_Axis11 implements Serializer { /** * Write schema. * - * @param javaType the java type - * @param types the types + * @param javaType + * the java type + * @param types + * the types * @return the element - * @throws Exception the exception + * @throws Exception + * the exception * @see org.apache.axis.encoding.Serializer#writeSchema(java.lang.Class, * org.apache.axis.wsdl.fromJava.Types) */ @@ -102,14 +112,15 @@ public class XmlSerializer_Axis11 implements Serializer { * */ static class SerializerContentHandler extends DefaultHandler { - + /** The m context. */ private SerializationContext mContext; /** * Instantiates a new serializer content handler. * - * @param aContext the a context + * @param aContext + * the a context */ SerializerContentHandler(SerializationContext aContext) { mContext = aContext; @@ -118,10 +129,14 @@ public class XmlSerializer_Axis11 implements Serializer { /** * Characters. * - * @param ch the ch - * @param start the start - * @param length the length - * @throws SAXException the SAX exception + * @param ch + * the ch + * @param start + * the start + * @param length + * the length + * @throws SAXException + * the SAX exception * @see org.xml.sax.ContentHandler#characters(char[], int, int) */ @Override @@ -137,10 +152,14 @@ public class XmlSerializer_Axis11 implements Serializer { /** * End element. * - * @param uri the uri - * @param localName the local name - * @param qName the q name - * @throws SAXException the SAX exception + * @param uri + * the uri + * @param localName + * the local name + * @param qName + * the q name + * @throws SAXException + * the SAX exception * @see org.xml.sax.ContentHandler#endElement(java.lang.String, java.lang.String, * java.lang.String) */ @@ -157,11 +176,16 @@ public class XmlSerializer_Axis11 implements Serializer { /** * Start element. * - * @param uri the uri - * @param localName the local name - * @param qName the q name - * @param attributes the attributes - * @throws SAXException the SAX exception + * @param uri + * the uri + * @param localName + * the local name + * @param qName + * the q name + * @param attributes + * the attributes + * @throws SAXException + * the SAX exception * @see org.xml.sax.ContentHandler#startElement(java.lang.String, java.lang.String, * java.lang.String, org.xml.sax.Attributes) */
