Author: chamikara
Date: Wed Jul 4 16:33:47 2007
New Revision: 553346
URL: http://svn.apache.org/viewvc?view=rev&rev=553346
Log:
A correction to the Sandesha2 API. Changed returntypes ArrayList->List
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/client/SandeshaClient.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/client/SandeshaReport.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/client/SequenceReport.java
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaReportsTest.java
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SquenceOfferTest.java
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/scenarios/RMScenariosTest.java
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/client/SandeshaClient.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/client/SandeshaClient.java?view=diff&rev=553346&r1=553345&r2=553346
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/client/SandeshaClient.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/client/SandeshaClient.java
Wed Jul 4 16:33:47 2007
@@ -212,10 +212,10 @@
* @return
* @throws SandeshaException
*/
- public static ArrayList getIncomingSequenceReports(ConfigurationContext
configCtx) throws SandeshaException {
+ public static List getIncomingSequenceReports(ConfigurationContext
configCtx) throws SandeshaException {
SandeshaReport report = getSandeshaReport(configCtx);
- ArrayList incomingSequenceIDs =
report.getIncomingSequenceList();
+ List incomingSequenceIDs = report.getIncomingSequenceList();
Iterator incomingSequenceIDIter =
incomingSequenceIDs.iterator();
ArrayList incomingSequenceReports = new ArrayList();
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/client/SandeshaReport.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/client/SandeshaReport.java?view=diff&rev=553346&r1=553345&r2=553346
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/client/SandeshaReport.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/client/SandeshaReport.java
Wed Jul 4 16:33:47 2007
@@ -18,6 +18,7 @@
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
@@ -49,11 +50,11 @@
return lng.longValue();
}
- public ArrayList getIncomingSequenceList() {
+ public List getIncomingSequenceList() {
return incomingSequenceList;
}
- public ArrayList getOutgoingSequenceList() {
+ public List getOutgoingSequenceList() {
return outgoingSequenceList;
}
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/client/SequenceReport.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/client/SequenceReport.java?view=diff&rev=553346&r1=553345&r2=553346
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/client/SequenceReport.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/client/SequenceReport.java
Wed Jul 4 16:33:47 2007
@@ -17,6 +17,7 @@
package org.apache.sandesha2.client;
import java.util.ArrayList;
+import java.util.List;
/**
*This report will contain details of a specific sequence.
@@ -75,7 +76,7 @@
this.sequenceID = sequenceID;
}
- public ArrayList getCompletedMessages () {
+ public List getCompletedMessages () {
return completedMessages;
}
Modified:
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaReportsTest.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaReportsTest.java?view=diff&rev=553346&r1=553345&r2=553346
==============================================================================
---
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaReportsTest.java
(original)
+++
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaReportsTest.java
Wed Jul 4 16:33:47 2007
@@ -19,6 +19,7 @@
import java.io.File;
import java.util.ArrayList;
import java.util.Iterator;
+import java.util.List;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
@@ -110,7 +111,7 @@
assertEquals(sequenceReport.getSequenceDirection(),SequenceReport.SEQUENCE_DIRECTION_OUT);
//testing incoming sequence reports
- ArrayList incomingSequenceReports =
SandeshaClient.getIncomingSequenceReports(configContext);
+ List incomingSequenceReports =
SandeshaClient.getIncomingSequenceReports(configContext);
assertEquals(incomingSequenceReports.size(),1);
SequenceReport incomingSequenceReport =
(SequenceReport) incomingSequenceReports.get(0);
assertEquals(incomingSequenceReport.getCompletedMessages().size(),2);
Modified:
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SquenceOfferTest.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SquenceOfferTest.java?view=diff&rev=553346&r1=553345&r2=553346
==============================================================================
---
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SquenceOfferTest.java
(original)
+++
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SquenceOfferTest.java
Wed Jul 4 16:33:47 2007
@@ -18,6 +18,7 @@
import java.io.File;
import java.util.ArrayList;
+import java.util.List;
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
@@ -101,7 +102,7 @@
//checking weather the incomingSequenceReport
has the offered sequence ID
SandeshaReport rmReport =
SandeshaClient.getSandeshaReport(configContext);
- ArrayList incomingSeqList =
rmReport.getIncomingSequenceList();
+ List incomingSeqList =
rmReport.getIncomingSequenceList();
assertEquals(incomingSeqList.size(),1);
assertEquals(incomingSeqList.get(0),offeredSequenceID);
Modified:
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/scenarios/RMScenariosTest.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/scenarios/RMScenariosTest.java?view=diff&rev=553346&r1=553345&r2=553346
==============================================================================
---
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/scenarios/RMScenariosTest.java
(original)
+++
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/scenarios/RMScenariosTest.java
Wed Jul 4 16:33:47 2007
@@ -20,6 +20,7 @@
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.List;
import junit.framework.AssertionFailedError;
@@ -204,7 +205,7 @@
}
// Establish a baseline count for inbound sequences
- ArrayList oldIncomingReports =
SandeshaClient.getIncomingSequenceReports(configContext);
+ List oldIncomingReports =
SandeshaClient.getIncomingSequenceReports(configContext);
TestCallback callback1 = new TestCallback ("Callback 1");
serviceClient.sendReceiveNonBlocking
(getEchoOMBlock("echo1",sequenceKey),callback1);
@@ -245,7 +246,7 @@
//assertions for the inbound sequence. The one
we care about is a new sequence,
//so it will not exist in the oldSequences list.
- ArrayList incomingSequences =
SandeshaClient.getIncomingSequenceReports(configContext);
+ List incomingSequences =
SandeshaClient.getIncomingSequenceReports(configContext);
SequenceReport incomingSequenceReport =
getNewReport(incomingSequences, oldIncomingReports);
System.out.println("Checking Inbound Sequence:
" + incomingSequenceReport.getSequenceID());
String offer = (String)
clientOptions.getProperty(SandeshaClientConstants.OFFERED_SEQUENCE_ID);
@@ -286,7 +287,7 @@
// Scan through lists of old and new incoming sequences, to find the
sequence that
// was established by this test. Note that some of the old sequences
may have timed out.
- private SequenceReport getNewReport(ArrayList incomingSequences,
ArrayList oldIncomingReports) {
+ private SequenceReport getNewReport(List incomingSequences, List
oldIncomingReports) {
HashSet sequenceIds = new HashSet();
for(Iterator oldSequences = oldIncomingReports.iterator();
oldSequences.hasNext(); ) {
SequenceReport report = (SequenceReport)
oldSequences.next();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
