You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ch...@apache.org on 2006/09/12 13:32:28 UTC
svn commit: r442565 - in /webservices/axis2/trunk/java/modules:
adb-codegen/src/org/apache/axis2/schema/writer/
kernel/src/org/apache/axis2/description/ kernel/src/org/apache/axis2/i18n/
kernel/src/org/apache/axis2/transport/jms/ rahas/src/org/apache/r...
Author: chinthaka
Date: Tue Sep 12 04:32:27 2006
New Revision: 442565
URL: http://svn.apache.org/viewvc?view=rev&rev=442565
Log:
removing redundant local variables.
Modified:
webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ClientUtils.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/i18n/Messages.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/jms/SimpleJMSListener.java
webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SCTIssuer.java
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/util/SAAJDataSource.java
webservices/axis2/trunk/java/modules/samples/src/sample/eventing/Client.java
webservices/axis2/trunk/java/modules/samples/src/sample/sgccalculator/CalcClient.java
webservices/axis2/trunk/java/modules/savan/src/org/apache/savan/eventing/EventingSubscriptionProcessor.java
webservices/axis2/trunk/java/modules/savan/src/org/apache/savan/util/ProtocolManager.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/Rampart.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/conversation/ConversationConfiguration.java
webservices/axis2/trunk/java/modules/webapp/HappyAxis.jsp
Modified: webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java?view=diff&rev=442565&r1=442564&r2=442565
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java Tue Sep 12 04:32:27 2006
@@ -331,9 +331,8 @@
basePackageName = URLProcessor.makePackageName(namespaceURI);
}
- String packageName = this.packageName == null ? basePackageName
+ return this.packageName == null ? basePackageName
: this.packageName + basePackageName;
- return packageName;
}
/**
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ClientUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ClientUtils.java?view=diff&rev=442565&r1=442564&r2=442565
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ClientUtils.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/ClientUtils.java Tue Sep 12 04:32:27 2006
@@ -76,8 +76,7 @@
if (replyTo != null) {
try {
URI uri = new URI(replyTo.getAddress());
- String scheme = uri.getScheme();
- listenerTransportProtocol = scheme;
+ listenerTransportProtocol = uri.getScheme();
} catch (URISyntaxException e) {
//need to ignore
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/i18n/Messages.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/i18n/Messages.java?view=diff&rev=442565&r1=442564&r2=442565
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/i18n/Messages.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/i18n/Messages.java Tue Sep 12 04:32:27 2006
@@ -165,13 +165,11 @@
}
public static MessageBundle getMessageBundle() {
- MessageBundle messageBundle = getMessageBundle (DEFAULT_MESSAGE_BUNDLE_KEY);
- return messageBundle;
+ return getMessageBundle (DEFAULT_MESSAGE_BUNDLE_KEY);
}
public static MessageBundle getMessageBundle(String messageBundleKey) {
- MessageBundle messageBundle = (MessageBundle) messageBundleMap.get (messageBundleKey);
- return messageBundle;
+ return (MessageBundle) messageBundleMap.get (messageBundleKey);
}
/**
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/jms/SimpleJMSListener.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/jms/SimpleJMSListener.java?view=diff&rev=442565&r1=442564&r2=442565
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/jms/SimpleJMSListener.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/jms/SimpleJMSListener.java Tue Sep 12 04:32:27 2006
@@ -102,8 +102,7 @@
}
Properties cfProps = new Properties();
cfProps.load(new BufferedInputStream(new FileInputStream(cfFile)));
- HashMap cfMap = new HashMap(cfProps);
- return cfMap;
+ return new HashMap(cfProps);
}
public static final HashMap createConnectorMap(
Modified: webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SCTIssuer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SCTIssuer.java?view=diff&rev=442565&r1=442564&r2=442565
==============================================================================
--- webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SCTIssuer.java (original)
+++ webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SCTIssuer.java Tue Sep 12 04:32:27 2006
@@ -102,11 +102,9 @@
}
if (ENCRYPTED_KEY.equals(config.proofTokenType)) {
- SOAPEnvelope responseEnv = this.doEncryptedKey(config,data);
- return responseEnv;
+ return this.doEncryptedKey(config,data);
} else if (BINARY_SECRET.equals(config.proofTokenType)) {
- SOAPEnvelope responseEnv = this.doBinarySecret(config, data);
- return responseEnv;
+ return this.doBinarySecret(config, data);
} else if (COMPUTED_KEY.equals(config.proofTokenType)) {
// TODO
throw new UnsupportedOperationException("TODO");
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/util/SAAJDataSource.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/util/SAAJDataSource.java?view=diff&rev=442565&r1=442564&r2=442565
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/util/SAAJDataSource.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/util/SAAJDataSource.java Tue Sep 12 04:32:27 2006
@@ -423,8 +423,7 @@
if (readClosed) {
throw new java.io.IOException("streamClosed");
}
- int ret = new Long(Math.min(Integer.MAX_VALUE, totalsz - bread)).intValue();
- return ret;
+ return new Long(Math.min(Integer.MAX_VALUE, totalsz - bread)).intValue();
}
/**
Modified: webservices/axis2/trunk/java/modules/samples/src/sample/eventing/Client.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/src/sample/eventing/Client.java?view=diff&rev=442565&r1=442564&r2=442565
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/eventing/Client.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/eventing/Client.java Tue Sep 12 04:32:27 2006
@@ -181,8 +181,7 @@
private int getIntInput () throws IOException {
String option = reader.readLine();
try {
- int param = Integer.parseInt(option);
- return param;
+ return Integer.parseInt(option);
} catch (NumberFormatException e) {
//invalid option
return -1;
@@ -256,11 +255,9 @@
String subscribingAddress = null;
if (SUBSCRIBER_1_ID.equals(ID)) {
- String listner1Address = "http://" + serverIP + ":" + port + listner1AddressPart;
- subscribingAddress = listner1Address;
+ subscribingAddress = "http://" + serverIP + ":" + port + listner1AddressPart;
} else if (SUBSCRIBER_2_ID.equals(ID)) {
- String listner2Address = "http://" + serverIP + ":" + port + listner2AddressPart;
- subscribingAddress = listner2Address;
+ subscribingAddress = "http://" + serverIP + ":" + port + listner2AddressPart;
}
bean.setDeliveryEPR(new EndpointReference (subscribingAddress));
@@ -290,9 +287,7 @@
private OMElement getDummyMethodRequestElement() {
OMFactory fac = OMAbstractFactory.getOMFactory();
OMNamespace namespace = fac.createOMNamespace(applicationNamespaceName,"ns1");
- OMElement dummyMethodElem = fac.createOMElement(dummyMethod, namespace);
-
- return dummyMethodElem;
+ return fac.createOMElement(dummyMethod, namespace);
}
}
Modified: webservices/axis2/trunk/java/modules/samples/src/sample/sgccalculator/CalcClient.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/samples/src/sample/sgccalculator/CalcClient.java?view=diff&rev=442565&r1=442564&r2=442565
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/sgccalculator/CalcClient.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/sgccalculator/CalcClient.java Tue Sep 12 04:32:27 2006
@@ -240,10 +240,9 @@
}
public static String getServiceGroupContextId(SOAPEnvelope resultEnvelope) {
- String serviceGroupContextId = resultEnvelope.getHeader()
+ return resultEnvelope.getHeader()
.getFirstChildWithName(new QName("ReplyTo"))
.getFirstChildWithName(new QName("ReferenceParameters"))
.getFirstChildWithName(new QName("ServiceGroupId")).getText();
- return serviceGroupContextId;
}
}
Modified: webservices/axis2/trunk/java/modules/savan/src/org/apache/savan/eventing/EventingSubscriptionProcessor.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/savan/src/org/apache/savan/eventing/EventingSubscriptionProcessor.java?view=diff&rev=442565&r1=442564&r2=442565
==============================================================================
--- webservices/axis2/trunk/java/modules/savan/src/org/apache/savan/eventing/EventingSubscriptionProcessor.java (original)
+++ webservices/axis2/trunk/java/modules/savan/src/org/apache/savan/eventing/EventingSubscriptionProcessor.java Tue Sep 12 04:32:27 2006
@@ -241,8 +241,7 @@
return null;
}
- String identifier = ideltifierElement.getText().trim();
- return identifier;
+ return ideltifierElement.getText().trim();
}
private ExpirationBean getExpirationBeanFromString (String expiresStr) throws SavanException {
Modified: webservices/axis2/trunk/java/modules/savan/src/org/apache/savan/util/ProtocolManager.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/savan/src/org/apache/savan/util/ProtocolManager.java?view=diff&rev=442565&r1=442564&r2=442565
==============================================================================
--- webservices/axis2/trunk/java/modules/savan/src/org/apache/savan/util/ProtocolManager.java (original)
+++ webservices/axis2/trunk/java/modules/savan/src/org/apache/savan/util/ProtocolManager.java Tue Sep 12 04:32:27 2006
@@ -35,9 +35,8 @@
if (configurationManager==null)
throw new SavanException ("Cant find the Configuration Manager");
- Protocol protocol = (Protocol) configurationManager.getProtocolMap().get("eventing");
+ return (Protocol) configurationManager.getProtocolMap().get("eventing");
- return protocol;
}
}
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/Rampart.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/Rampart.java?view=diff&rev=442565&r1=442564&r2=442565
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/Rampart.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/Rampart.java Tue Sep 12 04:32:27 2006
@@ -133,9 +133,8 @@
InflowConfiguration mergedInConf = mergeInflowConfiguration(
staticInflowConfig, moduleInflowConfig);
- InflowConfiguration finalInConf = mergeInflowConfiguration(mergedInConf,policyInflowConfig);
- return finalInConf;
- }
+ return mergeInflowConfiguration(mergedInConf,policyInflowConfig);
+ }
private OutflowConfiguration calcuateCurrentOutflowConfiguration(
OutflowConfiguration policyOutflowConfig,
@@ -152,8 +151,7 @@
OutflowConfiguration mergedOutFlowConf = mergeOutflowConfiguration(
staticOutflowConfig, moduleOutflowConfig);
- OutflowConfiguration finalOutFlowConf = mergeOutflowConfiguration(mergedOutFlowConf,policyOutflowConfig);
- return finalOutFlowConf;
+ return mergeOutflowConfiguration(mergedOutFlowConf,policyOutflowConfig);
}
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/conversation/ConversationConfiguration.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/conversation/ConversationConfiguration.java?view=diff&rev=442565&r1=442564&r2=442565
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/conversation/ConversationConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/conversation/ConversationConfiguration.java Tue Sep 12 04:32:27 2006
@@ -293,8 +293,7 @@
*/
private static String getStringValue(OMElement elem) throws RampartException {
if(elem != null) {
- String tempVal = elem.getText();
- return tempVal;
+ return elem.getText();
}
return null;
}
Modified: webservices/axis2/trunk/java/modules/webapp/HappyAxis.jsp
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/webapp/HappyAxis.jsp?view=diff&rev=442565&r1=442564&r2=442565
==============================================================================
--- webservices/axis2/trunk/java/modules/webapp/HappyAxis.jsp (original)
+++ webservices/axis2/trunk/java/modules/webapp/HappyAxis.jsp Tue Sep 12 04:32:27 2006
@@ -67,11 +67,9 @@
*/
public String getInstallHints(HttpServletRequest request) {
- String hint =
- "<B><I>Note:</I></B> On Tomcat 4.x and Java1.4, you may need to put libraries that contain "
+ return "<B><I>Note:</I></B> On Tomcat 4.x and Java1.4, you may need to put libraries that contain "
+ "java.* or javax.* packages into CATALINA_HOME/common/lib"
+ "<br>jaxrpc.jar and saaj.jar are two such libraries.";
- return hint;
}
/**
@@ -288,8 +286,7 @@
}
// check to what is in the classname
- String saxParserName = saxParser.getClass().getName();
- return saxParserName;
+ return saxParser.getClass().getName();
}
/**
@@ -319,8 +316,7 @@
if (saxParser == null) {
return null;
}
- String location = getLocation(out, saxParser.getClass());
- return location;
+ return getLocation(out, saxParser.getClass());
}
private String value;
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org