Author: veithen
Date: Mon May 2 08:24:33 2016
New Revision: 1741929
URL: http://svn.apache.org/viewvc?rev=1741929&view=rev
Log:
Some code cleanup.
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/headershandler/TestHeaders.java
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/api/MessageAccessor.java
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/core/MessageContext.java
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/headershandler/TestHeaders.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/headershandler/TestHeaders.java?rev=1741929&r1=1741928&r2=1741929&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/headershandler/TestHeaders.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/headershandler/TestHeaders.java
Mon May 2 08:24:33 2016
@@ -98,7 +98,7 @@ public class TestHeaders {
*
* @param clazz the currently executing handler class
*/
- public TestHeaders(Class clazz) {
+ public TestHeaders(Class<?> clazz) {
className = clazz.getSimpleName();
}
@@ -178,10 +178,10 @@ public class TestHeaders {
public void confirmMessageAsString(MessageContext mc) {
String text = null;
if (mc != null) {
- Object accessor = mc.get(Constants.JAXWS_MESSAGE_ACCESSOR);
+ MessageAccessor accessor = (MessageAccessor)
mc.get(Constants.JAXWS_MESSAGE_ACCESSOR);
if (accessor != null) {
Boolean preMessageAccessed = (Boolean)
mc.get("jaxws.isMessageAccessed");
- text = accessor.toString();
+ text = accessor.getMessageAsString();
Boolean postMessageAccessed = (Boolean)
mc.get("jaxws.isMessageAccessed");
if (preMessageAccessed != postMessageAccessed) {
throw new WebServiceException("The message was accessed
when toString was called.");
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/api/MessageAccessor.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/api/MessageAccessor.java?rev=1741929&r1=1741928&r2=1741929&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/api/MessageAccessor.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/api/MessageAccessor.java
Mon May 2 08:24:33 2016
@@ -19,11 +19,6 @@
package org.apache.axis2.jaxws.api;
import java.io.ByteArrayOutputStream;
-import java.io.UnsupportedEncodingException;
-
-import javax.xml.stream.FactoryConfigurationError;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.ws.WebServiceException;
import org.apache.axiom.om.OMOutputFormat;
import org.apache.axiom.om.impl.MTOMXMLStreamWriter;
@@ -34,7 +29,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/**
- * Value of the Constants.JAXWS_MESSAGE_ACCESSOR property
+ * Value of the {@link
org.apache.axis2.jaxws.Constants#JAXWS_MESSAGE_ACCESSOR} property.
* Allows a user to gain access to certain Message information
* that are not exposed by the Message on the
* javax.xml.ws.handler.MessageContext
@@ -84,11 +79,4 @@ public class MessageAccessor {
}
return text;
}
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- public String toString() {
- return getMessageAsString();
- }
}
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/core/MessageContext.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/core/MessageContext.java?rev=1741929&r1=1741928&r2=1741929&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/core/MessageContext.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/core/MessageContext.java
Mon May 2 08:24:33 2016
@@ -21,7 +21,6 @@ package org.apache.axis2.jaxws.core;
import org.apache.axis2.AxisFault;
import org.apache.axis2.description.AxisService;
-import org.apache.axis2.jaxws.api.MessageAccessor;
import org.apache.axis2.jaxws.api.MessageAccessorFactory;
import org.apache.axis2.jaxws.description.EndpointDescription;
import org.apache.axis2.jaxws.description.OperationDescription;
@@ -30,8 +29,6 @@ import org.apache.axis2.jaxws.message.Me
import org.apache.axis2.jaxws.message.util.MessageUtils;
import org.apache.axis2.jaxws.registry.FactoryRegistry;
import org.apache.axis2.transport.TransportUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import javax.xml.namespace.QName;
import javax.xml.ws.BindingProvider;
@@ -55,9 +52,6 @@ import java.util.Map;
* is available.
*/
public class MessageContext {
-
- private static Log log = LogFactory.getLog(MessageContext.class);
-
private InvocationContext invocationCtx;
private org.apache.axis2.context.MessageContext axisMsgCtx;
private EndpointDescription endpointDesc;
@@ -144,10 +138,10 @@ public class MessageContext {
public Map<String, Object> getProperties() {
// only use properties that are local to the axis2 MC,
// not the options bag. See org.apache.axis2.context.AbstractContext
- Iterator names = axisMsgCtx.getPropertyNames();
- HashMap tempProps = new HashMap<String, Object>();
+ Iterator<String> names = axisMsgCtx.getPropertyNames();
+ HashMap<String, Object> tempProps = new HashMap<String, Object>();
for (; names.hasNext();) {
- String name = (String)names.next();
+ String name = names.next();
tempProps.put(name, axisMsgCtx.getProperty(name));
}
//return new ReadOnlyProperties(tempProps);
