You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ch...@apache.org on 2005/02/10 04:13:03 UTC
svn commit: r153149 - in
webservices/axis/trunk/java/dev/scratch/prototype2/src:
java/org/apache/axis/clientapi/ java/org/apache/axis/context/
java/org/apache/axis/deployment/ java/org/apache/axis/deployment/listener/
java/org/apache/axis/deployment/repository/utill/
java/org/apache/axis/engine/ java/org/apache/axis/impl/description/
java/org/apache/axis/impl/llom/ java/org/apache/axis/impl/llom/builder/
java/org/apache/axis/impl/llom/util/
java/org/apache/axis/impl/transport/http/ java/org/apache/axis/om/
java/org/apache/axis/phaseresolver/ java/org/apache/axis/transport/
test/org/apache/axis/clientapi/ test/org/apache/axis/deployment/
test/org/apache/axis/engine/ test/org/apache/axis/om/factory/
Author: chinthaka
Date: Wed Feb 9 19:12:57 2005
New Revision: 153149
URL: http://svn.apache.org/viewcvs?view=rev&rev=153149
Log:
Changing some code after analysing using IDEA
Modified:
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/clientapi/Correlator.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/clientapi/Invoker.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/context/GlobalContext.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentParser.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/listener/RepositoryListenerImpl.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/repository/utill/WSInfoList.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/AxisFault.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/description/FlowImpl.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/OMAttributeImpl.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/OMNavigator.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/OMStAXWrapper.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/SOAPFaultImpl.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/builder/ObjectToOMBuilder.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/builder/StAXSOAPModelBuilder.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/util/StreamWriterToContentHandlerConverter.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/SimpleHTTPReceiver.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/OMConstants.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/phaseresolver/PhaseMetaData.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/AbstractTransportReceiver.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/clientapi/TestSendReceive.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/clientapi/TestSendReceiveAsync.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/deployment/DeploymentotalTest.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/CallUnregisterdServiceTest.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoRawXMLTest.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoTest.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineTest.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/HandlerFaliureTest.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/MessageWithServerTest.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/SimpleAxisServerTest.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/factory/OMLinkedListImplFactoryTest.java
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/clientapi/Correlator.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/clientapi/Correlator.java?view=diff&r1=153148&r2=153149
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/clientapi/Correlator.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/clientapi/Correlator.java Wed Feb 9 19:12:57 2005
@@ -13,17 +13,16 @@
* KIND, either express or implied. See the License for the specific language
* governing permissions and limitations under the License.
*
- * @author Deepal Jayasinghe Dec 16, 2004 2:38:51 PM
*/
public class Correlator {
- private static Correlator instance = null;
+ private static Correlator instance;
- private static HashMap correlationHash = null;
+ private static HashMap correlationHash;
private Correlator() {
// Exists only to defeat instantiation.
- correlationHash = new HashMap();
+ correlationHash = new HashMap(10);
}
public static Correlator getInstance() {
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/clientapi/Invoker.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/clientapi/Invoker.java?view=diff&r1=153148&r2=153149
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/clientapi/Invoker.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/clientapi/Invoker.java Wed Feb 9 19:12:57 2005
@@ -21,12 +21,12 @@
public class Invoker extends AbstractCall implements Runnable {
- private AxisEngine engine = null;
- private EngineRegistry registry = null;
+ private AxisEngine engine;
+ private EngineRegistry registry;
- private MessageContext reqMsgContext = null;
+ private MessageContext reqMsgContext;
- private Callback callback = null;
+ private Callback callback;
public Invoker(MessageContext msgContext, AxisEngine engine,EngineRegistry reg, Callback callback) {
this.engine = engine;
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/context/GlobalContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/context/GlobalContext.java?view=diff&r1=153148&r2=153149
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/context/GlobalContext.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/context/GlobalContext.java Wed Feb 9 19:12:57 2005
@@ -25,7 +25,7 @@
*/
public class GlobalContext {
private EngineRegistry registry;
- private HashMap map = new HashMap();
+ private HashMap map = new HashMap(10);
public GlobalContext(EngineRegistry er) {
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java?view=diff&r1=153148&r2=153149
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java Wed Feb 9 19:12:57 2005
@@ -52,11 +52,11 @@
private Log log = LogFactory.getLog(getClass());
private final Scheduler scheduler = new Scheduler();
/**
- * This will store all the web Services to deploye
+ * This will store all the web Services to deploy
*/
private List wsToDeploy = new ArrayList();
/**
- * this will store all the web Services to undeploye
+ * this will store all the web Services to undeploy
*/
private List wsToUnDeploy = new ArrayList();
@@ -65,7 +65,7 @@
* this ref will pass to engine when it call start()
* method
*/
- private EngineRegistry engineRegistry = null;
+ private EngineRegistry engineRegistry;
/**
* this constaructor for the testing
@@ -82,7 +82,7 @@
private AxisGlobal server;
- private HDFileItem currentFileItem = null;
+ private HDFileItem currentFileItem;
/**
* This the constructor which is used by Engine inorder to start
@@ -132,7 +132,7 @@
}
}
- this.serverconfigName = RepositaryName + "/" + serverXMLFile;
+ this.serverconfigName = RepositaryName + '/' + serverXMLFile;
}
// public DeploymentEngine(String RepositaryName , String configFileName) {
@@ -373,40 +373,36 @@
UnZipJAR unZipJAR = new UnZipJAR();
switch (type) {
case SERVICE:
- {
- try {
+ try {
//
- AxisService service = new AxisService();
- unZipJAR.unzipService(currentFileItem.getAbsolutePath(), this, service);
- addnewService(service);
- log.info("Deployement WS Name " + currentFileItem.getName());
- }catch (DeploymentException de){
- throw new RuntimeException(de.getMessage());
- }catch (AxisFault axisFault) {
- throw new RuntimeException(axisFault.getMessage());
- } catch (Exception e){
- throw new RuntimeException(e.getMessage());
- } finally{
- currentFileItem = null;
- }
- break;
+ AxisService service = new AxisService();
+ unZipJAR.unzipService(currentFileItem.getAbsolutePath(), this, service);
+ addnewService(service);
+ log.info("Deployement WS Name " + currentFileItem.getName());
+ } catch (DeploymentException de) {
+ throw new RuntimeException(de.getMessage());
+ } catch (AxisFault axisFault) {
+ throw new RuntimeException(axisFault.getMessage());
+ } catch (Exception e) {
+ throw new RuntimeException(e.getMessage());
+ } finally {
+ currentFileItem = null;
}
+ break;
case MODULE:
- {
- try {
- AxisModule metaData = new AxisModule();
- unZipJAR.unzipModule(currentFileItem.getAbsolutePath(), this,metaData);
- addNewModule(metaData);
- log.info("Moduel WS Name " + currentFileItem.getName() + " modulename :" + metaData.getName());
- } catch (DeploymentException e) {
- throw new RuntimeException(e.getMessage());
- } catch (AxisFault axisFault) {
- throw new RuntimeException(axisFault.getMessage());
- }finally{
- currentFileItem = null;
- }
- break;
+ try {
+ AxisModule metaData = new AxisModule();
+ unZipJAR.unzipModule(currentFileItem.getAbsolutePath(), this, metaData);
+ addNewModule(metaData);
+ log.info("Moduel WS Name " + currentFileItem.getName() + " modulename :" + metaData.getName());
+ } catch (DeploymentException e) {
+ throw new RuntimeException(e.getMessage());
+ } catch (AxisFault axisFault) {
+ throw new RuntimeException(axisFault.getMessage());
+ } finally {
+ currentFileItem = null;
}
+ break;
}
}
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentParser.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentParser.java?view=diff&r1=153148&r2=153149
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentParser.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentParser.java Wed Feb 9 19:12:57 2005
@@ -50,7 +50,7 @@
// service.xml strating tag
private static final String SERVICEXMLST = "service";
//to get the input stream
- private InputStream inputStream = null;
+ private InputStream inputStream;
// Referance to XMLPullPasrser
// private XmlPullParser pullparser;
@@ -207,7 +207,7 @@
break;
}
} else if (eventType == XMLStreamConstants.CHARACTERS) {
- text = text + pullparser.getText();
+ text += pullparser.getText();
}
}
} catch (XMLStreamException e) {
@@ -365,7 +365,7 @@
break;
}
} else if (eventType == XMLStreamConstants.CHARACTERS) {
- element = element + pullparser.getText();
+ element += pullparser.getText();
}
}
} catch (XMLStreamException e) {
@@ -470,7 +470,7 @@
break;
}
} else if (eventType == XMLStreamConstants.CHARACTERS) {
- element = element + pullparser.getText();
+ element += pullparser.getText();
}
}
} catch (XMLStreamException e) {
@@ -509,7 +509,7 @@
break;
}
} else if (eventType == XMLStreamConstants.CHARACTERS) {
- text = text + pullparser.getText();
+ text += pullparser.getText();
}
}
} catch (XMLStreamException e) {
@@ -574,7 +574,7 @@
break;
}
} else if (eventType == XMLStreamConstants.CHARACTERS) {
- text = text + pullparser.getText();
+ text += pullparser.getText();
}
}
} catch (XMLStreamException e) {
@@ -610,7 +610,7 @@
break;
}
} else if (eventType == XMLStreamConstants.CHARACTERS) {
- text = text + pullparser.getText();
+ text += pullparser.getText();
}
}
} catch (XMLStreamException e) {
@@ -682,7 +682,7 @@
break;
}
} else if (eventType == XMLStreamConstants.CHARACTERS) {
- text = text + pullparser.getText();
+ text += pullparser.getText();
}
}
} catch (XMLStreamException e) {
@@ -720,7 +720,7 @@
break;
}
} else if (eventType == XMLStreamConstants.CHARACTERS) {
- text = text + pullparser.getText();
+ text += pullparser.getText();
}
}
} catch (XMLStreamException e) {
@@ -758,7 +758,7 @@
break;
}
} else if (eventType == XMLStreamConstants.CHARACTERS) {
- text = text + pullparser.getText();
+ text += pullparser.getText();
}
}
} catch (XMLStreamException e) {
@@ -797,7 +797,7 @@
break;
}
} else if (eventType == XMLStreamConstants.CHARACTERS) {
- text = text + pullparser.getText();
+ text += pullparser.getText();
}
}
} catch (XMLStreamException e) {
@@ -836,7 +836,7 @@
break;
}
} else if (eventType == XMLStreamConstants.CHARACTERS) {
- text = text + pullparser.getText();
+ text += pullparser.getText();
}
}
} catch (XMLStreamException e) {
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/listener/RepositoryListenerImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/listener/RepositoryListenerImpl.java?view=diff&r1=153148&r2=153149
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/listener/RepositoryListenerImpl.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/listener/RepositoryListenerImpl.java Wed Feb 9 19:12:57 2005
@@ -142,10 +142,7 @@
*/
private boolean isJarFile(String filename) {
// to check whether the file is a jar file
- if (!filename.endsWith(".jar")) {
- return false;
- } else
- return true;
+ return filename.endsWith(".jar");
}
}
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/repository/utill/WSInfoList.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/repository/utill/WSInfoList.java?view=diff&r1=153148&r2=153149
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/repository/utill/WSInfoList.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/repository/utill/WSInfoList.java Wed Feb 9 19:12:57 2005
@@ -153,10 +153,7 @@
* @return
*/
public boolean isFileExist(String filename) {
- if (getFileItem(filename) == null) {
- return false;
- } else
- return true;
+ return !(getFileItem(filename) == null);
}
/**
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/AxisFault.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/AxisFault.java?view=diff&r1=153148&r2=153149
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/AxisFault.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/AxisFault.java Wed Feb 9 19:12:57 2005
@@ -36,7 +36,6 @@
*
*/
public AxisFault() {
- super();
// TODO Auto-generated constructor stub
}
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/description/FlowImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/description/FlowImpl.java?view=diff&r1=153148&r2=153149
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/description/FlowImpl.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/description/FlowImpl.java Wed Feb 9 19:12:57 2005
@@ -24,7 +24,7 @@
import java.util.ArrayList;
public class FlowImpl implements Flow {
- protected List list = null;
+ protected List list;
public FlowImpl(){
list = new ArrayList();
}
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/OMAttributeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/OMAttributeImpl.java?view=diff&r1=153148&r2=153149
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/OMAttributeImpl.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/OMAttributeImpl.java Wed Feb 9 19:12:57 2005
@@ -39,7 +39,7 @@
setOMNamespace(ns);
}
- synchronized static String replaceQuoteWithEntity(String value) {
+ private static String replaceQuoteWithEntity(String value) {
matcher.reset(value);
return matcher.replaceAll(QUOTE_ENTITY);
}
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/OMNavigator.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/OMNavigator.java?view=diff&r1=153148&r2=153149
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/OMNavigator.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/OMNavigator.java Wed Feb 9 19:12:57 2005
@@ -139,10 +139,7 @@
public boolean isNavigable() {
if (end)
return false;
- else if (next == null)
- return false;
- else
- return true;
+ else return !(next == null);
}
/**
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/OMStAXWrapper.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/OMStAXWrapper.java?view=diff&r1=153148&r2=153149
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/OMStAXWrapper.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/OMStAXWrapper.java Wed Feb 9 19:12:57 2005
@@ -785,7 +785,7 @@
switch (nodeType) {
case OMNode.ELEMENT_NODE:
OMElement element = (OMElement) node;
- log.info("Generating events from element {" + element.getNamespaceName()+ "}" + element.getLocalName() + " Generated OM tree");
+ log.info("Generating events from element {" + element.getNamespaceName()+ '}' + element.getLocalName() + " Generated OM tree");
returnEvent = generateElementEvents(element);
break;
case OMNode.TEXT_NODE:
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/SOAPFaultImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/SOAPFaultImpl.java?view=diff&r1=153148&r2=153149
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/SOAPFaultImpl.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/SOAPFaultImpl.java Wed Feb 9 19:12:57 2005
@@ -64,7 +64,7 @@
}
faultCodeElement = new OMElementImpl(OMConstants.SOAPFAULT_CODE_LOCAL_NAME, this.ns);
this.addChild(faultCodeElement);
- faultCodeElement.addChild(new OMTextImpl(faultCodeElement, faultCode.getPrefix() + ":" + faultCode.getLocalPart()));
+ faultCodeElement.addChild(new OMTextImpl(faultCodeElement, faultCode.getPrefix() + ':' + faultCode.getLocalPart()));
}
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/builder/ObjectToOMBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/builder/ObjectToOMBuilder.java?view=diff&r1=153148&r2=153149
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/builder/ObjectToOMBuilder.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/builder/ObjectToOMBuilder.java Wed Feb 9 19:12:57 2005
@@ -43,10 +43,10 @@
private OMFactory omFactory;
private boolean buildStarted = false;
private boolean cache = true;
- private ContentHandler externalContentHandler = null;
+ private ContentHandler externalContentHandler;
// ============= For content handler ============
- private OMNode lastNode = null;
+ private OMNode lastNode;
private List nameSpaces = new ArrayList();
// ==============================================
@@ -182,7 +182,7 @@
}
public void startElement(String namespaceURI, String localName, String qName, Attributes atts) throws SAXException {
- log.info("Building OM for Element {"+namespaceURI+"}"+ localName +" for the ObjectPusher");
+ log.info("Building OM for Element {"+namespaceURI+'}'+ localName +" for the ObjectPusher");
if (localName.length() == 0)
localName = qName;
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/builder/StAXSOAPModelBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/builder/StAXSOAPModelBuilder.java?view=diff&r1=153148&r2=153149
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/builder/StAXSOAPModelBuilder.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/builder/StAXSOAPModelBuilder.java Wed Feb 9 19:12:57 2005
@@ -83,7 +83,7 @@
//fill in the attributes
processAttributes(node);
- log.info("Build the OMElelment {" + node.getNamespaceName()+ "}" + node.getLocalName() + "By the StaxSOAPModelBuilder");
+ log.info("Build the OMElelment {" + node.getNamespaceName()+ '}' + node.getLocalName() + "By the StaxSOAPModelBuilder");
return node;
}
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/util/StreamWriterToContentHandlerConverter.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/util/StreamWriterToContentHandlerConverter.java?view=diff&r1=153148&r2=153149
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/util/StreamWriterToContentHandlerConverter.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/llom/util/StreamWriterToContentHandlerConverter.java Wed Feb 9 19:12:57 2005
@@ -97,7 +97,7 @@
public void startElement(String namespaceURI, String localName, String qName, Attributes atts) throws SAXException {
try {
- log.info("writing element {"+namespaceURI+"}"+ localName +" directly to stream ");
+ log.info("writing element {"+namespaceURI+'}'+ localName +" directly to stream ");
String prefix = getPrefix(qName);
//it is only the prefix we want to learn from the QName! so we can get rid of the
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/SimpleHTTPReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/SimpleHTTPReceiver.java?view=diff&r1=153148&r2=153149
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/SimpleHTTPReceiver.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/impl/transport/http/SimpleHTTPReceiver.java Wed Feb 9 19:12:57 2005
@@ -360,7 +360,7 @@
// positive numbers
while (value > 0) {
buf[--offset] = (byte) (value % 10 + '0');
- value = value / 10;
+ value /= 10;
len++;
}
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/OMConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/OMConstants.java?view=diff&r1=153148&r2=153149
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/OMConstants.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/om/OMConstants.java Wed Feb 9 19:12:57 2005
@@ -52,5 +52,5 @@
public static final String ARRAY_ITEM_NSURI = "http://axis.apache.org/encoding/Arrays";
public static final String ARRAY_ITEM_LOCALNAME = "item";
public static final String ARRAY_ITEM_NS_PREFIX = "arrays";
- public static final String ARRAY_ITEM_QNAME = OMConstants.ARRAY_ITEM_NS_PREFIX + ":" +OMConstants.ARRAY_ITEM_LOCALNAME;
+ public static final String ARRAY_ITEM_QNAME = OMConstants.ARRAY_ITEM_NS_PREFIX + ':' +OMConstants.ARRAY_ITEM_LOCALNAME;
}
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/phaseresolver/PhaseMetaData.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/phaseresolver/PhaseMetaData.java?view=diff&r1=153148&r2=153149
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/phaseresolver/PhaseMetaData.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/phaseresolver/PhaseMetaData.java Wed Feb 9 19:12:57 2005
@@ -23,10 +23,10 @@
public class PhaseMetaData {
- private final int BOTH_BEFORE_AFTER = 0;
- private final int BEORE = 1;
- private final int AFTER = 2;
- private final int ANYWHERE = 3;
+ private static final int BOTH_BEFORE_AFTER = 0;
+ private static final int BEORE = 1;
+ private static final int AFTER = 2;
+ private static final int ANYWHERE = 3;
private String name;
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/AbstractTransportReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/AbstractTransportReceiver.java?view=diff&r1=153148&r2=153149
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/AbstractTransportReceiver.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/transport/AbstractTransportReceiver.java Wed Feb 9 19:12:57 2005
@@ -43,9 +43,9 @@
public abstract class AbstractTransportReceiver implements Runnable {
protected Log log =
LogFactory.getLog(AbstractTransportReceiver.class.getName());
- protected EngineRegistry engineReg = null;
+ protected EngineRegistry engineReg;
protected ServerSocket serverSocket;
- protected Socket socket = null;
+ protected Socket socket;
/**
* are we stopped?
* latch to true if stop() is called
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/clientapi/TestSendReceive.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/clientapi/TestSendReceive.java?view=diff&r1=153148&r2=153149
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/clientapi/TestSendReceive.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/clientapi/TestSendReceive.java Wed Feb 9 19:12:57 2005
@@ -46,7 +46,7 @@
private MessageContext mc;
- private Thread thisThread = null;
+ private Thread thisThread;
private SimpleHTTPReceiver sas;
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/clientapi/TestSendReceiveAsync.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/clientapi/TestSendReceiveAsync.java?view=diff&r1=153148&r2=153149
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/clientapi/TestSendReceiveAsync.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/clientapi/TestSendReceiveAsync.java Wed Feb 9 19:12:57 2005
@@ -49,7 +49,7 @@
private MessageContext mc;
- private Thread thisThread = null;
+ private Thread thisThread;
private SimpleHTTPReceiver sas;
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/deployment/DeploymentotalTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/deployment/DeploymentotalTest.java?view=diff&r1=153148&r2=153149
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/deployment/DeploymentotalTest.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/deployment/DeploymentotalTest.java Wed Feb 9 19:12:57 2005
@@ -25,7 +25,7 @@
*
*/
public class DeploymentotalTest extends TestCase {
- EngineRegistry er = null;
+ EngineRegistry er;
public void testparseService1() throws PhaseException ,DeploymentException, AxisFault, XMLStreamException{
String filename = "./target/test-resources/deployment" ;
DeploymentEngine deploymentEngine = new DeploymentEngine(filename);
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/CallUnregisterdServiceTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/CallUnregisterdServiceTest.java?view=diff&r1=153148&r2=153149
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/CallUnregisterdServiceTest.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/CallUnregisterdServiceTest.java Wed Feb 9 19:12:57 2005
@@ -41,7 +41,7 @@
private EngineRegistry engineRegistry;
private MessageContext mc;
- private Thread thisThread = null;
+ private Thread thisThread;
private SimpleHTTPReceiver sas;
public CallUnregisterdServiceTest(){
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoRawXMLTest.java?view=diff&r1=153148&r2=153149
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoRawXMLTest.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoRawXMLTest.java Wed Feb 9 19:12:57 2005
@@ -48,7 +48,7 @@
private EngineRegistry engineRegistry;
private MessageContext mc;
- private Thread thisThread = null;
+ private Thread thisThread;
private SimpleHTTPReceiver sas;
private boolean finish=false;
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoTest.java?view=diff&r1=153148&r2=153149
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoTest.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EchoTest.java Wed Feb 9 19:12:57 2005
@@ -38,7 +38,7 @@
private EngineRegistry engineRegistry;
private MessageContext mc;
- private Thread thisThread = null;
+ private Thread thisThread;
private SimpleHTTPReceiver sas;
public EchoTest(){
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineTest.java?view=diff&r1=153148&r2=153149
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineTest.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineTest.java Wed Feb 9 19:12:57 2005
@@ -33,7 +33,6 @@
private MessageContext mc;
public EngineTest() {
- super();
}
public EngineTest(String arg0) {
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/HandlerFaliureTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/HandlerFaliureTest.java?view=diff&r1=153148&r2=153149
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/HandlerFaliureTest.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/HandlerFaliureTest.java Wed Feb 9 19:12:57 2005
@@ -51,7 +51,7 @@
private MessageContext mc;
- private Thread thisThread = null;
+ private Thread thisThread;
private SimpleHTTPReceiver sas;
public HandlerFaliureTest() {
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/MessageWithServerTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/MessageWithServerTest.java?view=diff&r1=153148&r2=153149
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/MessageWithServerTest.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/MessageWithServerTest.java Wed Feb 9 19:12:57 2005
@@ -47,7 +47,7 @@
private EngineRegistry engineRegistry;
private MessageContext mc;
- private Thread thisThread = null;
+ private Thread thisThread;
private SimpleHTTPReceiver sas;
public MessageWithServerTest(String testName) {
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/SimpleAxisServerTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/SimpleAxisServerTest.java?view=diff&r1=153148&r2=153149
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/SimpleAxisServerTest.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/SimpleAxisServerTest.java Wed Feb 9 19:12:57 2005
@@ -32,13 +32,8 @@
private QName transportName = new QName("http://localhost/my","NullTransport");
private EngineRegistry engineRegistry;
- private MessageContext mc;
- private Thread thisThread = null;
- private SimpleHTTPReceiver sas;
- private int testingPort = 7777;
- private int testCount = 0;
private AxisEngine engine;
-
+
public SimpleAxisServerTest(){
super(SimpleAxisServerTest.class.getName());
}
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/factory/OMLinkedListImplFactoryTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/factory/OMLinkedListImplFactoryTest.java?view=diff&r1=153148&r2=153149
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/factory/OMLinkedListImplFactoryTest.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/om/factory/OMLinkedListImplFactoryTest.java Wed Feb 9 19:12:57 2005
@@ -53,7 +53,7 @@
public void testCreateOMElementWithNoBuilder() {
OMElement omElement = omFactory.createOMElement("chinthaka", namespace);
- assertTrue("Programatically created OMElement should have done = true ", omElement.isComplete() == true);
+ assertTrue("Programatically created OMElement should have done = true ", omElement.isComplete());
}
@@ -63,7 +63,7 @@
OMElement documentElement = omBuilder.getDocumentElement();
OMElement child = omFactory.createOMElement("child", namespace, documentElement, omBuilder);
- assertTrue("OMElement with a builder should start with done = false ", child.isComplete() == false);
+ assertTrue("OMElement with a builder should start with done = false ", !child.isComplete());
assertTrue("This OMElement must have a builder ", child.getBuilder() instanceof OMXMLParserWrapper);
} catch (Exception e) {
@@ -81,7 +81,7 @@
OMElement omElement = omFactory.createOMElement("chinthaka", namespace);
String text = "sampleText";
OMText omText = omFactory.createText(omElement, text);
- assertTrue("Programatically created OMText should have done = true ", omText.isComplete() == true);
+ assertTrue("Programatically created OMText should have done = true ", omText.isComplete());
assertTrue("Programatically created OMText should have correct text value ", text.equals(omText.getValue()));
}
@@ -92,11 +92,11 @@
SOAPEnvelope soapEnvelope = (SOAPEnvelope) omBuilder.getDocumentElement();
SOAPBody soapBodyOne = omFactory.createSOAPBody(soapEnvelope);
- assertTrue("Programatically created SOAPBody should have done = true ", soapBodyOne.isComplete() == true);
+ assertTrue("Programatically created SOAPBody should have done = true ", soapBodyOne.isComplete());
soapBodyOne.detach();
SOAPBody soapBodyTwo = omFactory.createSOAPBody(soapEnvelope, omBuilder);
- assertTrue("SOAPBody with a builder should start with done = false ", soapBodyTwo.isComplete() == false);
+ assertTrue("SOAPBody with a builder should start with done = false ", !soapBodyTwo.isComplete());
assertTrue("This SOAPBody must have a builder ", soapBodyTwo.getBuilder() instanceof OMXMLParserWrapper);
@@ -110,10 +110,10 @@
OMNamespace soapNamespace = omFactory.createOMNamespace(OMConstants.SOAP_ENVELOPE_NAMESPACE_URI, OMConstants.SOAPENVELOPE_NAMESPACE_PREFIX);
SOAPEnvelope soapEnvelopeTwo = omFactory.createSOAPEnvelope(soapNamespace);
- assertTrue("Programatically created SOAPEnvelope should have done = true ", soapEnvelopeTwo.isComplete() == true);
+ assertTrue("Programatically created SOAPEnvelope should have done = true ", soapEnvelopeTwo.isComplete());
SOAPEnvelope soapEnvelope = omFactory.createSOAPEnvelope(soapNamespace, OMTestUtils.getOMBuilder(getTestResourceFile("soap/minimalMessage.xml")));
- assertTrue("SOAPEnvelope with a builder should start with done = false ", soapEnvelope.isComplete() == false);
+ assertTrue("SOAPEnvelope with a builder should start with done = false ", !soapEnvelope.isComplete());
assertTrue("This SOAPEnvelope must have a builder ", soapEnvelope.getBuilder() instanceof OMXMLParserWrapper);
@@ -129,11 +129,11 @@
SOAPEnvelope soapEnvelope = (SOAPEnvelope) omBuilder.getDocumentElement();
SOAPHeader soapHeader = omFactory.createSOAPHeader(soapEnvelope);
- assertTrue("Programatically created SOAPHeader should have done = true ", soapHeader.isComplete() == true);
+ assertTrue("Programatically created SOAPHeader should have done = true ", soapHeader.isComplete());
soapHeader.detach();
SOAPHeader soapHeaderTwo = omFactory.createSOAPHeader(soapEnvelope, omBuilder);
- assertTrue("SOAPHeader with a builder should start with done = false ", soapHeaderTwo.isComplete() == false);
+ assertTrue("SOAPHeader with a builder should start with done = false ", !soapHeaderTwo.isComplete());
assertTrue("This SOAPHeader must have a builder ", soapHeaderTwo.getBuilder() instanceof OMXMLParserWrapper);
@@ -150,10 +150,10 @@
SOAPHeader soapHeader = soapEnvelope.getHeader();
SOAPHeaderBlock soapHeaderBlock = omFactory.createSOAPHeaderBlock("soapHeaderBlockOne", namespace);
- assertTrue("Programatically created SOAPHeaderBlock should have done = true ", soapHeaderBlock.isComplete() == true);
+ assertTrue("Programatically created SOAPHeaderBlock should have done = true ", soapHeaderBlock.isComplete());
SOAPHeaderBlock soapHeaderBlockTwo = omFactory.createSOAPHeaderBlock("soapHeaderBlockOne", namespace, soapHeader, omBuilder);
- assertTrue("SOAPHeaderBlock with a builder should start with done = false ", soapHeaderBlockTwo.isComplete() == false);
+ assertTrue("SOAPHeaderBlock with a builder should start with done = false ", !soapHeaderBlockTwo.isComplete());
assertTrue("This SOAPHeaderBlock must have a builder ", soapHeaderBlockTwo.getBuilder() instanceof OMXMLParserWrapper);
@@ -169,11 +169,11 @@
SOAPBody soapBody = soapEnvelope.getBody();
SOAPFault soapFault = omFactory.createSOAPFault(soapBody, new Exception(" this is just a test "));
- assertTrue("Programatically created SOAPFault should have done = true ", soapFault.isComplete() == true);
+ assertTrue("Programatically created SOAPFault should have done = true ", soapFault.isComplete());
soapFault.detach();
SOAPFault soapFaultTwo = omFactory.createSOAPFault(namespace, soapBody, omBuilder);
- assertTrue("SOAPFault with a builder should start with done = false ", soapFaultTwo.isComplete() == false);
+ assertTrue("SOAPFault with a builder should start with done = false ", !soapFaultTwo.isComplete());
assertTrue("This SOAPFault must have a builder ", soapFaultTwo.getBuilder() instanceof OMXMLParserWrapper);