Author: davidillsley
Date: Fri Nov 14 08:43:52 2008
New Revision: 714066
URL: http://svn.apache.org/viewvc?rev=714066&view=rev
Log:
Fix up a bunch of java5 warnings and remove the 'never' from the pom for the SNAPSHOT repo - that makes no sense
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/RMMsgContext.java
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/core/src/main/java/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CloseSequenceProcessor.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/MakeConnectionProcessor.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/policy/SandeshaPolicyBean.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/policy/builders/RMAssertionBuilder.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/polling/PollingManager.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beanmanagers/InvokerBeanMgr.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beanmanagers/RMDBeanMgr.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beanmanagers/RMSBeanMgr.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beanmanagers/SenderBeanMgr.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryBeanMgr.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryInvokerBeanMgr.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryRMDBeanMgr.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryRMSBeanMgr.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemorySenderBeanMgr.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryTransaction.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/AcknowledgementManager.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/FaultManager.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/MsgInitializer.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/PropertyManager.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/RMMsgCreator.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/RangeString.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/TerminateManager.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/Invoker.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/SandeshaThread.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/Sender.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/WorkerLock.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java
webservices/sandesha/trunk/java/modules/persistence/src/test/java/org/apache/sandesha2/RMScenariosTest.java
webservices/sandesha/trunk/java/modules/samples/src/main/java/sandesha2/samples/userguide/AsyncPingClient.java
webservices/sandesha/trunk/java/modules/samples/src/main/java/sandesha2/samples/userguide/MTOMPingClient.java
webservices/sandesha/trunk/java/modules/samples/src/main/java/sandesha2/samples/userguide/RMSampleService.java
webservices/sandesha/trunk/java/pom.xml
Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/RMMsgContext.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/RMMsgContext.java?rev=714066&r1=714065&r2=714066&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/RMMsgContext.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/RMMsgContext.java Fri Nov 14 08:43:52 2008
@@ -135,11 +135,11 @@
sequence.toHeader(header);
}
//there can be more than one sequence ack or ack request in a single message.
- for (Iterator iter=sequenceAcknowledgements.iterator();iter.hasNext();) {
+ for (Iterator<SequenceAcknowledgement> iter=sequenceAcknowledgements.iterator();iter.hasNext();) {
SequenceAcknowledgement sequenceAck = (SequenceAcknowledgement) iter.next();
sequenceAck.toHeader(header);
}
- for (Iterator iter=ackRequests.iterator();iter.hasNext();) {
+ for (Iterator<AckRequested> iter=ackRequests.iterator();iter.hasNext();) {
AckRequested ackReq = (AckRequested) iter.next();
ackReq.toHeader(header);
}
@@ -353,8 +353,8 @@
private Sequence sequence = null;
//there can be more than one sequence ack or ack request in a single message.
- private ArrayList sequenceAcknowledgements = new ArrayList();
- private ArrayList ackRequests = new ArrayList();
+ private ArrayList<SequenceAcknowledgement> sequenceAcknowledgements = new ArrayList<SequenceAcknowledgement>();
+ private ArrayList<AckRequested> ackRequests = new ArrayList<AckRequested>();
private CreateSequence createSequence = null;
private CreateSequenceResponse createSequenceResponse = null;
@@ -379,7 +379,7 @@
return sequence;
}
- public Iterator getSequenceAcknowledgements() {
+ public Iterator<SequenceAcknowledgement> getSequenceAcknowledgements() {
return sequenceAcknowledgements.iterator();
}
@@ -405,7 +405,7 @@
}
public void setSequenceAcknowledgements(
- ArrayList sequenceAcknowledgements) {
+ ArrayList<SequenceAcknowledgement> sequenceAcknowledgements) {
this.sequenceAcknowledgements = sequenceAcknowledgements;
}
@@ -421,11 +421,11 @@
this.terminateSequenceResponse = terminateSequenceResponse;
}
- public Iterator getAckRequests() {
+ public Iterator<AckRequested> getAckRequests() {
return ackRequests.iterator();
}
- public void setAckRequested(ArrayList ackRequests) {
+ public void setAckRequested(ArrayList<AckRequested> ackRequests) {
this.ackRequests = ackRequests;
}
@@ -499,7 +499,7 @@
}
}
- private static HashSet bodyLocalNames = new HashSet();
+ private static HashSet<String> bodyLocalNames = new HashSet<String>();
static{
bodyLocalNames.add(Sandesha2Constants.WSRM_COMMON.CREATE_SEQUENCE);
bodyLocalNames.add(Sandesha2Constants.WSRM_COMMON.CREATE_SEQUENCE_RESPONSE);
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?rev=714066&r1=714065&r2=714066&view=diff
==============================================================================
--- 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 Fri Nov 14 08:43:52 2008
@@ -199,9 +199,9 @@
StorageManager storageManager) {
report.setSequenceID(rmsBean.getSequenceID());
- List completedMessageList = rmsBean.getClientCompletedMessages().getContainedElementsAsNumbersList();
+ List<Long> completedMessageList = rmsBean.getClientCompletedMessages().getContainedElementsAsNumbersList();
- Iterator iter = completedMessageList.iterator();
+ Iterator<Long> iter = completedMessageList.iterator();
while (iter.hasNext()) {
report.addCompletedMessage((Long)iter.next());
}
@@ -217,13 +217,13 @@
* @return
* @throws SandeshaException
*/
- public static List getIncomingSequenceReports(ConfigurationContext configCtx) throws SandeshaException {
+ public static List<SequenceReport> getIncomingSequenceReports(ConfigurationContext configCtx) throws SandeshaException {
SandeshaReport report = getSandeshaReport(configCtx);
- List incomingSequenceIDs = report.getIncomingSequenceList();
- Iterator incomingSequenceIDIter = incomingSequenceIDs.iterator();
+ List<String> incomingSequenceIDs = report.getIncomingSequenceList();
+ Iterator<String> incomingSequenceIDIter = incomingSequenceIDs.iterator();
- ArrayList incomingSequenceReports = new ArrayList();
+ ArrayList<SequenceReport> incomingSequenceReports = new ArrayList<SequenceReport>();
while (incomingSequenceIDIter.hasNext()) {
String sequenceID = (String) incomingSequenceIDIter.next();
@@ -257,8 +257,8 @@
try {
reportTransaction = storageManager.getTransaction();
- List rmsBeans = storageManager.getRMSBeanMgr().find(null);
- Iterator iterator = rmsBeans.iterator();
+ List<RMSBean> rmsBeans = storageManager.getRMSBeanMgr().find(null);
+ Iterator<RMSBean> iterator = rmsBeans.iterator();
while (iterator.hasNext()) {
RMSBean bean = (RMSBean) iterator.next();
String sequenceID = bean.getSequenceID();
@@ -272,9 +272,9 @@
}
// incoming sequences
- Collection rmdBeans = storageManager.getRMDBeanMgr().find(null);
+ Collection<RMDBean> rmdBeans = storageManager.getRMDBeanMgr().find(null);
- Iterator iter = rmdBeans.iterator();
+ Iterator<RMDBean> iter = rmdBeans.iterator();
while (iter.hasNext()) {
RMDBean serverCompletedMsgsBean = (RMDBean) iter.next();
String sequenceID = serverCompletedMsgsBean.getSequenceID();
@@ -1079,9 +1079,9 @@
RMDBean rmdBean = SandeshaUtil.getRMDBeanFromSequenceId(storageManager, sequenceID);
- List completedMessageList = rmdBean.getServerCompletedMessages().getContainedElementsAsNumbersList();
+ List<Long> completedMessageList = rmdBean.getServerCompletedMessages().getContainedElementsAsNumbersList();
- Iterator iter = completedMessageList.iterator();
+ Iterator<Long> iter = completedMessageList.iterator();
while (iter.hasNext()) {
sequenceReport.addCompletedMessage((Long) iter.next());
}
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?rev=714066&r1=714065&r2=714066&view=diff
==============================================================================
--- 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 Fri Nov 14 08:43:52 2008
@@ -31,18 +31,18 @@
*/
public class SandeshaReport {
- private ArrayList incomingSequenceList = null;
- private ArrayList outgoingSequenceList = null;
- private HashMap sequenceStatusMap = null;
- private HashMap noOfCompletedMessagesMap = null;
- private HashMap outgoingInternalSequenceIDMap = null;
+ private ArrayList<String> incomingSequenceList = null;
+ private ArrayList<String> outgoingSequenceList = null;
+ private HashMap<String, Byte> sequenceStatusMap = null;
+ private HashMap<String, Long> noOfCompletedMessagesMap = null;
+ private HashMap<String, String> outgoingInternalSequenceIDMap = null;
public SandeshaReport () {
- incomingSequenceList = new ArrayList ();
- outgoingSequenceList = new ArrayList ();
- sequenceStatusMap = new HashMap ();
- noOfCompletedMessagesMap = new HashMap ();
- outgoingInternalSequenceIDMap = new HashMap ();
+ incomingSequenceList = new ArrayList<String>();
+ outgoingSequenceList = new ArrayList<String>();
+ sequenceStatusMap = new HashMap<String, Byte>();
+ noOfCompletedMessagesMap = new HashMap<String, Long>();
+ outgoingInternalSequenceIDMap = new HashMap<String, String>();
}
public long getCompletedMessagesCount(String sequenceID) {
@@ -58,7 +58,7 @@
*
* @return A list of Strings. Each giving the SequenceID of an Incoming Sequence.
*/
- public List getIncomingSequenceList() {
+ public List<String> getIncomingSequenceList() {
return incomingSequenceList;
}
@@ -67,7 +67,7 @@
*
* @return A list of Strings. Each giving the SequenceID of an Outgoing Sequence.
*/
- public List getOutgoingSequenceList() {
+ public List<String> 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?rev=714066&r1=714065&r2=714066&view=diff
==============================================================================
--- 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 Fri Nov 14 08:43:52 2008
@@ -44,11 +44,11 @@
private byte sequenceDirection = SEQUENCE_DIRECTION_UNKNOWN;
private String sequenceID = null;
private String internalSequenceID = null; //only for outgoing sequences
- private ArrayList completedMessages = null; //no of messages acked (both for incoming and outgoing)
+ private ArrayList<Long> completedMessages = null; //no of messages acked (both for incoming and outgoing)
private boolean secureSequence = false;
public SequenceReport () {
- completedMessages = new ArrayList ();
+ completedMessages = new ArrayList<Long>();
}
public void setSequenceStatus (byte sequenceStatus) {
@@ -79,7 +79,7 @@
this.sequenceID = sequenceID;
}
- public List getCompletedMessages () {
+ public List<Long> getCompletedMessages () {
return completedMessages;
}
@@ -87,7 +87,7 @@
completedMessages.add(messageNo);
}
- public void setCompletedMessages (ArrayList completedMessages) {
+ public void setCompletedMessages (ArrayList<Long> completedMessages) {
this.completedMessages = completedMessages;
}
Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java?rev=714066&r1=714065&r2=714066&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/handlers/SandeshaGlobalInHandler.java Fri Nov 14 08:43:52 2008
@@ -225,7 +225,7 @@
InvokerBean finderBean = new InvokerBean();
finderBean.setMsgNo(msgNo);
finderBean.setSequenceID(sequenceId);
- List invokerBeanList = storageManager.getInvokerBeanMgr().find(finderBean);
+ List<InvokerBean> invokerBeanList = storageManager.getInvokerBeanMgr().find(finderBean);
if((invokerBeanList==null || invokerBeanList.size()==0)
&& bean.getNextMsgNoToProcess()<=msgNo){
isDuplicate = false;
Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java?rev=714066&r1=714065&r2=714066&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/AckRequestedProcessor.java Fri Nov 14 08:43:52 2008
@@ -69,7 +69,7 @@
log.debug("Enter: AckRequestedProcessor::processAckRequestHeaders");
boolean msgCtxPaused = false;
- Iterator ackRequests = message.getAckRequests();
+ Iterator<AckRequested> ackRequests = message.getAckRequests();
while(ackRequests.hasNext()){
AckRequested ackReq = (AckRequested)ackRequests.next();
boolean paused = processAckRequestedHeader(message, ackReq.getOriginalAckRequestedElement(), ackReq);
@@ -234,8 +234,8 @@
// removing old acks.
SenderBean findBean = new SenderBean();
findBean.setMessageType(Sandesha2Constants.MessageTypes.ACK);
- Collection coll = senderBeanMgr.find(findBean);
- Iterator it = coll.iterator();
+ Collection<SenderBean> coll = senderBeanMgr.find(findBean);
+ Iterator<SenderBean> it = coll.iterator();
if (it.hasNext()) {
SenderBean oldAckBean = (SenderBean) it.next();
@@ -290,7 +290,7 @@
getConfigurationContext().registerOperationContext(ackRequestRMMsg.getMessageId(), opcontext);
getMsgContext().setOperationContext(opcontext);
- Iterator iterator = ackRequestRMMsg.getAckRequests();
+ Iterator<AckRequested> iterator = ackRequestRMMsg.getAckRequests();
AckRequested ackRequested = null;
while (iterator.hasNext()) {
Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java?rev=714066&r1=714065&r2=714066&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/AcknowledgementProcessor.java Fri Nov 14 08:43:52 2008
@@ -65,7 +65,7 @@
if (log.isDebugEnabled())
log.debug("Enter: AcknowledgementProcessor::processAckHeaders");
- Iterator iter = message.getSequenceAcknowledgements();
+ Iterator<SequenceAcknowledgement> iter = message.getSequenceAcknowledgements();
while(iter.hasNext()){
SequenceAcknowledgement sa = (SequenceAcknowledgement)iter.next();
processAckHeader(message, sa.getOriginalSequenceAckElement(), sa);
@@ -123,7 +123,7 @@
SandeshaUtil.assertProofOfPossession(rmsBean, msgCtx, soapHeader);
if(log.isDebugEnabled()) log.debug("Got Ack for RM Sequence: " + outSequenceId + ", internalSeqId: " + internalSequenceId);
- Iterator ackRangeIterator = sequenceAck.getAcknowledgementRanges().iterator();
+ Iterator<Range> ackRangeIterator = sequenceAck.getAcknowledgementRanges().iterator();
if (FaultManager.checkForInvalidAcknowledgement(rmMsgCtx, sequenceAck, storageManager, rmsBean, piggybackedAck)) {
if (log.isDebugEnabled())
@@ -135,8 +135,6 @@
boolean anonReplyTo = replyTo==null || replyTo.isWSAddressingAnonymous(); //if this is wsa anonymous
//then we might be using replay
- String rmVersion = rmMsgCtx.getRMSpecVersion();
-
// Compare the clientCompletedMessages with the range we just got, to work out if there
// is any new information in this ack message
RangeString completedMessages = rmsBean.getClientCompletedMessages();
Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CloseSequenceProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CloseSequenceProcessor.java?rev=714066&r1=714065&r2=714066&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CloseSequenceProcessor.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CloseSequenceProcessor.java Fri Nov 14 08:43:52 2008
@@ -95,7 +95,7 @@
}
rmBean.setClosed(true);
- Iterator sequenceAckIter = null;
+ Iterator<SequenceAcknowledgement> sequenceAckIter = null;
if(rmBean instanceof RMDBean){
storageManager.getRMDBeanMgr().update((RMDBean)rmBean);
RMMsgContext ackRMMsgCtx = AcknowledgementManager.generateAckMessage(rmMsgCtx, (RMDBean)rmBean, sequenceId, storageManager, true);
Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java?rev=714066&r1=714065&r2=714066&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/CreateSeqResponseMsgProcessor.java Fri Nov 14 08:43:52 2008
@@ -247,7 +247,7 @@
target.setInternalSequenceID(internalSequenceId);
target.setSend(false);
- Iterator iterator = retransmitterMgr.find(target).iterator();
+ Iterator<SenderBean> iterator = retransmitterMgr.find(target).iterator();
while (iterator.hasNext()) {
SenderBean tempBean = (SenderBean) iterator.next();
Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/MakeConnectionProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/MakeConnectionProcessor.java?rev=714066&r1=714065&r2=714066&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/MakeConnectionProcessor.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/MakeConnectionProcessor.java Fri Nov 14 08:43:52 2008
@@ -116,7 +116,7 @@
//try looking for RMD beans too
RMDBean finderRMD = new RMDBean();
finderRMD.setSecurityTokenData(data);
- List tempList = storageManager.getRMDBeanMgr().find(finderRMD);
+ List<RMDBean> tempList = storageManager.getRMDBeanMgr().find(finderRMD);
//combine these two into one list
possibleBeans.addAll(tempList);
@@ -163,10 +163,10 @@
//finding the beans that go with the criteria of the passed SenderBean
//The reSend flag is ignored for this selection, so there is no need to
//set it.
- Collection collection = senderBeanMgr.find(findSenderBean);
+ Collection<SenderBean> collection = senderBeanMgr.find(findSenderBean);
//removing beans that does not pass the resend test
- for (Iterator it=collection.iterator();it.hasNext();) {
+ for (Iterator<SenderBean> it=collection.iterator();it.hasNext();) {
SenderBean bean = (SenderBean) it.next();
if (!bean.isReSend() && bean.getSentCount()>0)
it.remove();
@@ -186,7 +186,7 @@
pending = true; //there are more than one message to be delivered using the makeConnection.
//So the MessagePending header should have value true;
- Iterator it = collection.iterator();
+ Iterator<SenderBean> it = collection.iterator();
senderBean = null;
for (int item=0;item<size;item++) {
Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java?rev=714066&r1=714065&r2=714066&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java Fri Nov 14 08:43:52 2008
@@ -332,7 +332,7 @@
sequenceId, storageManager, true);
// copy over the ack parts
- Iterator iter = ackRMMessage.getSequenceAcknowledgements();
+ Iterator<SequenceAcknowledgement> iter = ackRMMessage.getSequenceAcknowledgements();
while (iter.hasNext()) {
SequenceAcknowledgement seqAck = (SequenceAcknowledgement) iter.next();
terminateSeqResponseRMMsg.addSequenceAcknowledgement(seqAck);
Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/policy/SandeshaPolicyBean.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/policy/SandeshaPolicyBean.java?rev=714066&r1=714065&r2=714066&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/policy/SandeshaPolicyBean.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/policy/SandeshaPolicyBean.java Fri Nov 14 08:43:52 2008
@@ -47,7 +47,7 @@
boolean inOrder = true;
private boolean inOrderSet = false;
- ArrayList msgTypesToDrop = null;
+ ArrayList<Integer> msgTypesToDrop = null;
private String inMemoryStorageManagerClass = null;
@@ -174,11 +174,11 @@
setInOrderSet(true);
}
- public ArrayList getMsgTypesToDrop() {
+ public ArrayList<Integer> getMsgTypesToDrop() {
return msgTypesToDrop;
}
- public void setMsgTypesToDrop(ArrayList msgTypesToDrop) {
+ public void setMsgTypesToDrop(ArrayList<Integer> msgTypesToDrop) {
this.msgTypesToDrop = msgTypesToDrop;
}
@@ -186,7 +186,7 @@
if (typeNo != null) {
if (msgTypesToDrop == null)
- msgTypesToDrop = new ArrayList();
+ msgTypesToDrop = new ArrayList<Integer>();
msgTypesToDrop.add(typeNo);
}
Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/policy/builders/RMAssertionBuilder.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/policy/builders/RMAssertionBuilder.java?rev=714066&r1=714065&r2=714066&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/policy/builders/RMAssertionBuilder.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/policy/builders/RMAssertionBuilder.java Fri Nov 14 08:43:52 2008
@@ -110,7 +110,7 @@
propertyBean.setMaximumRetransmissionCount (Integer.parseInt(element.getText().trim()));
} else if (Sandesha2Constants.Assertions.ELEM_MSG_TYPES_TO_DROP
.equals(name)) {
- ArrayList types = new ArrayList ();
+ ArrayList<Integer> types = new ArrayList<Integer>();
String str = element.getText().trim();
String[] items = str.split(Sandesha2Constants.LIST_SEPERATOR);
if (items!=null) {
Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/polling/PollingManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/polling/PollingManager.java?rev=714066&r1=714065&r2=714066&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/polling/PollingManager.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/polling/PollingManager.java Fri Nov 14 08:43:52 2008
@@ -61,11 +61,11 @@
/**
* By adding an entry to this, the PollingManager will be asked to do a polling request on this sequence.
*/
- private LinkedList scheduledPollingRequests = new LinkedList();
+ private LinkedList<SequenceEntry> scheduledPollingRequests = new LinkedList<SequenceEntry>();
private static final int POLLING_MANAGER_WAIT_TIME = 3000;
- private HashMap pollTimes = new HashMap();
+ private HashMap<String, Long> pollTimes = new HashMap<String, Long>();
public PollingManager() {
super(POLLING_MANAGER_WAIT_TIME);
@@ -87,7 +87,7 @@
}
}
if(entry == null) {
- ArrayList allSequencesList = getSequences();
+ ArrayList<SequenceEntry> allSequencesList = getSequences();
int size = allSequencesList.size();
if(log.isDebugEnabled()) log.debug("Choosing one from " + size + " sequences");
if(nextIndex >= size) {
Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beanmanagers/InvokerBeanMgr.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beanmanagers/InvokerBeanMgr.java?rev=714066&r1=714065&r2=714066&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beanmanagers/InvokerBeanMgr.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beanmanagers/InvokerBeanMgr.java Fri Nov 14 08:43:52 2008
@@ -37,7 +37,7 @@
public InvokerBean retrieve(String key) throws SandeshaStorageException;
- public List find(InvokerBean bean) throws SandeshaStorageException;
+ public List<InvokerBean> find(InvokerBean bean) throws SandeshaStorageException;
public InvokerBean findUnique (InvokerBean bean) throws SandeshaException;
Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beanmanagers/RMDBeanMgr.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beanmanagers/RMDBeanMgr.java?rev=714066&r1=714065&r2=714066&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beanmanagers/RMDBeanMgr.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beanmanagers/RMDBeanMgr.java Fri Nov 14 08:43:52 2008
@@ -37,7 +37,7 @@
public boolean insert(RMDBean bean) throws SandeshaStorageException;
- public List find(RMDBean bean) throws SandeshaStorageException;
+ public List<RMDBean> find(RMDBean bean) throws SandeshaStorageException;
public boolean update(RMDBean bean) throws SandeshaStorageException;
Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beanmanagers/RMSBeanMgr.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beanmanagers/RMSBeanMgr.java?rev=714066&r1=714065&r2=714066&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beanmanagers/RMSBeanMgr.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beanmanagers/RMSBeanMgr.java Fri Nov 14 08:43:52 2008
@@ -40,7 +40,7 @@
public boolean update(RMSBean bean) throws SandeshaStorageException;
- public List find(RMSBean bean) throws SandeshaStorageException;
+ public List<RMSBean> find(RMSBean bean) throws SandeshaStorageException;
public RMSBean findUnique (RMSBean bean) throws SandeshaException;
Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beanmanagers/SenderBeanMgr.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beanmanagers/SenderBeanMgr.java?rev=714066&r1=714065&r2=714066&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beanmanagers/SenderBeanMgr.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beanmanagers/SenderBeanMgr.java Fri Nov 14 08:43:52 2008
@@ -36,9 +36,9 @@
public boolean insert(SenderBean bean) throws SandeshaStorageException;
- public List find(SenderBean bean) throws SandeshaStorageException;
+ public List<SenderBean> find(SenderBean bean) throws SandeshaStorageException;
- public List find(String internalSequenceID) throws SandeshaStorageException;
+ public List<SenderBean> find(String internalSequenceID) throws SandeshaStorageException;
public SenderBean findUnique (SenderBean bean) throws SandeshaException;
Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryBeanMgr.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryBeanMgr.java?rev=714066&r1=714065&r2=714066&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryBeanMgr.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryBeanMgr.java Fri Nov 14 08:43:52 2008
@@ -35,27 +35,28 @@
import java.util.concurrent.ConcurrentHashMap;;
-abstract class InMemoryBeanMgr {
+abstract class InMemoryBeanMgr<T extends RMBean> {
private static final Log log = LogFactory.getLog(InMemoryBeanMgr.class);
- protected ConcurrentHashMap table;
+ protected ConcurrentHashMap<String, T> table;
protected InMemoryStorageManager mgr;
+ @SuppressWarnings("unchecked")
protected InMemoryBeanMgr(InMemoryStorageManager mgr, AbstractContext context, String key) {
if(LoggingControl.isAnyTracingEnabled() && log.isDebugEnabled()) log.debug("Entry: InMemoryBeanMgr " + this.getClass() + " <innit> " + mgr + ", "
+ context + ", " + key);
this.mgr = mgr;
Object obj = context.getProperty(key);
if (obj != null) {
- table = (ConcurrentHashMap) obj;
+ table = (ConcurrentHashMap<String, T>) obj;
} else {
- table = new ConcurrentHashMap();
+ table = new ConcurrentHashMap<String, T>();
context.setProperty(key, table);
}
if(LoggingControl.isAnyTracingEnabled() && log.isDebugEnabled()) log.debug("Exit: InMemoryBeanMgr " + this.getClass() + " <init> " + this);
}
- protected boolean insert(Object key, RMBean bean) throws SandeshaStorageException {
+ protected boolean insert(String key, T bean) throws SandeshaStorageException {
if(LoggingControl.isAnyTracingEnabled() && log.isDebugEnabled()) log.debug("Entry: InMemoryBeanMgr " + this.getClass() + " insert " + key + ", " + bean);
mgr.enlistBean(bean);
@@ -66,9 +67,9 @@
return wasInserted;
}
- protected RMBean delete(Object key) throws SandeshaStorageException {
+ protected T delete(Object key) throws SandeshaStorageException {
if(LoggingControl.isAnyTracingEnabled() && log.isDebugEnabled()) log.debug("Entry: InMemoryBeanMgr " + this.getClass() + " delete " + key);
- RMBean bean = (RMBean) table.remove(key);
+ T bean = table.remove(key);
if(bean != null) {
mgr.enlistBean(bean);
}
@@ -76,18 +77,18 @@
return bean;
}
- protected RMBean retrieve(Object key) throws SandeshaStorageException {
+ protected T retrieve(Object key) throws SandeshaStorageException {
if(LoggingControl.isAnyTracingEnabled() && log.isDebugEnabled()) log.debug("Entry: InMemoryBeanMgr " + this.getClass() + " retrieve " + key);
- RMBean bean = (RMBean) table.get(key);
+ T bean = table.get(key);
if(bean != null) {
mgr.enlistBean(bean);
- bean = (RMBean) table.get(key);
+ bean = table.get(key);
}
if(LoggingControl.isAnyTracingEnabled() && log.isDebugEnabled()) log.debug("Exit: InMemoryBeanMgr " + this.getClass() + " retrieve " + bean);
return bean;
}
- protected boolean update(Object key, RMBean bean) throws SandeshaStorageException {
+ protected boolean update(String key, T bean) throws SandeshaStorageException {
if(LoggingControl.isAnyTracingEnabled() && log.isDebugEnabled()) log.debug("Entry: InMemoryBeanMgr " + this.getClass() + " update " + key + ", " + bean);
mgr.enlistBean(bean);
RMBean oldBean = (RMBean) table.put(key, bean);
@@ -97,17 +98,17 @@
return true;
}
- protected List find(RMBean matchInfo) throws SandeshaStorageException {
+ protected List<T> find(T matchInfo) throws SandeshaStorageException {
if(LoggingControl.isAnyTracingEnabled() && log.isDebugEnabled()) log.debug("Entry: InMemoryBeanMgr " + this.getClass() + " find " + matchInfo);
- ArrayList beans = new ArrayList();
+ ArrayList<T> beans = new ArrayList<T>();
if(matchInfo == null) {
beans.addAll(table.values());
} else {
- Iterator i = table.entrySet().iterator();
+ Iterator<Entry<String, T>> i = table.entrySet().iterator();
while(i.hasNext()) {
- Entry e = (Entry)i.next();
- RMBean candidate = (RMBean)e.getValue();
+ Entry<String, T> e = i.next();
+ T candidate = e.getValue();
if(candidate.match(matchInfo)) {
mgr.enlistBean(candidate);
// Only return beans which are still in the table
@@ -122,17 +123,17 @@
return beans;
}
- protected List findNoLock(RMBean matchInfo) throws SandeshaStorageException {
+ protected List<T> findNoLock(T matchInfo) throws SandeshaStorageException {
if(LoggingControl.isAnyTracingEnabled() && log.isDebugEnabled()) log.debug("Entry: InMemoryBeanMgr " + this.getClass() + " find " + matchInfo);
- ArrayList beans = new ArrayList();
+ ArrayList<T> beans = new ArrayList<T>();
if(matchInfo == null) {
beans.addAll(table.values());
} else {
- Iterator i = table.entrySet().iterator();
+ Iterator<Entry<String, T>> i = table.entrySet().iterator();
while(i.hasNext()) {
- Entry e = (Entry)i.next();
- RMBean candidate = (RMBean)e.getValue();
+ Entry<String, T> e = i.next();
+ T candidate = e.getValue();
if(candidate.match(matchInfo)) {
beans.add(candidate);
}
@@ -142,9 +143,9 @@
return beans;
}
- protected RMBean findUnique (RMBean matchInfo) throws SandeshaStorageException {
+ protected T findUnique (T matchInfo) throws SandeshaStorageException {
if(LoggingControl.isAnyTracingEnabled() && log.isDebugEnabled()) log.debug("Entry: InMemoryBeanMgr " + this.getClass() + " findUnique " + matchInfo);
- RMBean result = findUniqueNoLock(matchInfo);
+ T result = findUniqueNoLock(matchInfo);
// Now we have a point-in-time view of the bean, lock it, and double
// check that it is still in the table
if(result != null) {
@@ -156,11 +157,11 @@
return result;
}
- protected RMBean findUniqueNoLock (RMBean matchInfo) throws SandeshaStorageException {
- RMBean result = null;
- Iterator i = table.values().iterator();
+ protected T findUniqueNoLock (RMBean matchInfo) throws SandeshaStorageException {
+ T result = null;
+ Iterator<T> i = table.values().iterator();
while(i.hasNext()) {
- RMBean candidate = (RMBean)i.next();
+ T candidate = i.next();
if(candidate.match(matchInfo)) {
if(result == null) {
result = candidate;
Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryInvokerBeanMgr.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryInvokerBeanMgr.java?rev=714066&r1=714065&r2=714066&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryInvokerBeanMgr.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryInvokerBeanMgr.java Fri Nov 14 08:43:52 2008
@@ -27,14 +27,13 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.sandesha2.Sandesha2Constants;
-import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.storage.SandeshaStorageException;
import org.apache.sandesha2.storage.beanmanagers.InvokerBeanMgr;
import org.apache.sandesha2.storage.beans.InvokerBean;
import org.apache.sandesha2.util.LoggingControl;
-public class InMemoryInvokerBeanMgr extends InMemoryBeanMgr implements InvokerBeanMgr {
+public class InMemoryInvokerBeanMgr extends InMemoryBeanMgr<InvokerBean> implements InvokerBeanMgr {
private static final Log log = LogFactory.getLog(InMemoryInvokerBeanMgr.class);
@@ -73,7 +72,7 @@
return (InvokerBean) super.retrieve(key);
}
- public List find(InvokerBean bean) throws SandeshaStorageException {
+ public List<InvokerBean> find(InvokerBean bean) throws SandeshaStorageException {
return super.find(bean);
}
@@ -81,7 +80,7 @@
return super.update(bean.getMessageContextRefKey(), bean);
}
- public InvokerBean findUnique(InvokerBean bean) throws SandeshaException {
+ public InvokerBean findUnique(InvokerBean bean) throws SandeshaStorageException {
return (InvokerBean) super.findUnique(bean);
}
Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryRMDBeanMgr.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryRMDBeanMgr.java?rev=714066&r1=714065&r2=714066&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryRMDBeanMgr.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryRMDBeanMgr.java Fri Nov 14 08:43:52 2008
@@ -24,12 +24,11 @@
import org.apache.axis2.context.AbstractContext;
import org.apache.sandesha2.Sandesha2Constants;
-import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.storage.SandeshaStorageException;
import org.apache.sandesha2.storage.beanmanagers.RMDBeanMgr;
import org.apache.sandesha2.storage.beans.RMDBean;
-public class InMemoryRMDBeanMgr extends InMemoryBeanMgr implements RMDBeanMgr {
+public class InMemoryRMDBeanMgr extends InMemoryBeanMgr<RMDBean> implements RMDBeanMgr {
public InMemoryRMDBeanMgr(InMemoryStorageManager mgr, AbstractContext context) {
super(mgr, context, Sandesha2Constants.BeanMAPs.NEXT_MESSAGE);
@@ -48,7 +47,7 @@
return super.insert(bean.getSequenceID(), bean);
}
- public List find(RMDBean bean) throws SandeshaStorageException {
+ public List<RMDBean> find(RMDBean bean) throws SandeshaStorageException {
return super.find(bean);
}
@@ -56,11 +55,11 @@
return super.update(bean.getSequenceID(), bean);
}
- public Collection retrieveAll() throws SandeshaStorageException {
+ public Collection<RMDBean> retrieveAll() throws SandeshaStorageException {
return super.find(null);
}
- public RMDBean findUnique(RMDBean bean) throws SandeshaException {
+ public RMDBean findUnique(RMDBean bean) throws SandeshaStorageException {
return (RMDBean) super.findUnique(bean);
}
}
Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryRMSBeanMgr.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryRMSBeanMgr.java?rev=714066&r1=714065&r2=714066&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryRMSBeanMgr.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryRMSBeanMgr.java Fri Nov 14 08:43:52 2008
@@ -30,13 +30,13 @@
import org.apache.sandesha2.storage.beanmanagers.RMSBeanMgr;
import org.apache.sandesha2.storage.beans.RMSBean;
-public class InMemoryRMSBeanMgr extends InMemoryBeanMgr implements RMSBeanMgr {
+public class InMemoryRMSBeanMgr extends InMemoryBeanMgr<RMSBean> implements RMSBeanMgr {
private Lock lock = new ReentrantLock();
- private ConcurrentHashMap seqID2csm = new ConcurrentHashMap();
- private ConcurrentHashMap intSeqID2csm = new ConcurrentHashMap();
- private ConcurrentHashMap inUseSeqIDs = new ConcurrentHashMap();
+ private ConcurrentHashMap<String, String> seqID2csm = new ConcurrentHashMap<String, String>();
+ private ConcurrentHashMap<String, String> intSeqID2csm = new ConcurrentHashMap<String, String>();
+ private ConcurrentHashMap<String, String> inUseSeqIDs = new ConcurrentHashMap<String, String>();
public InMemoryRMSBeanMgr(InMemoryStorageManager mgr, AbstractContext context) {
super(mgr, context, Sandesha2Constants.BeanMAPs.CREATE_SEQUECE);
@@ -111,7 +111,7 @@
return result;
}
- public List find(RMSBean bean) throws SandeshaStorageException {
+ public List<RMSBean> find(RMSBean bean) throws SandeshaStorageException {
return super.find(bean);
}
Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemorySenderBeanMgr.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemorySenderBeanMgr.java?rev=714066&r1=714065&r2=714066&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemorySenderBeanMgr.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemorySenderBeanMgr.java Fri Nov 14 08:43:52 2008
@@ -27,7 +27,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.sandesha2.Sandesha2Constants;
-import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.i18n.SandeshaMessageHelper;
import org.apache.sandesha2.i18n.SandeshaMessageKeys;
import org.apache.sandesha2.storage.SandeshaStorageException;
@@ -35,11 +34,11 @@
import org.apache.sandesha2.storage.beans.SenderBean;
import org.apache.sandesha2.util.LoggingControl;
-public class InMemorySenderBeanMgr extends InMemoryBeanMgr implements SenderBeanMgr {
+public class InMemorySenderBeanMgr extends InMemoryBeanMgr<SenderBean> implements SenderBeanMgr {
private static final Log log = LogFactory.getLog(InMemorySenderBeanMgr.class);
- ConcurrentHashMap sequenceIdandMessNum2MessageId = new ConcurrentHashMap();
+ ConcurrentHashMap<String, String> sequenceIdandMessNum2MessageId = new ConcurrentHashMap<String, String>();
public InMemorySenderBeanMgr(InMemoryStorageManager mgr, AbstractContext context) {
super(mgr, context, Sandesha2Constants.BeanMAPs.RETRANSMITTER);
@@ -79,13 +78,13 @@
return result;
}
- public List find(String internalSequenceID) throws SandeshaStorageException {
+ public List<SenderBean> find(String internalSequenceID) throws SandeshaStorageException {
SenderBean temp = new SenderBean();
temp.setInternalSequenceID(internalSequenceID);
return super.find(temp);
}
- public List find(SenderBean bean) throws SandeshaStorageException {
+ public List<SenderBean> find(SenderBean bean) throws SandeshaStorageException {
return super.find(bean);
}
@@ -99,12 +98,12 @@
matcher.setTimeToSend(System.currentTimeMillis());
matcher.setTransportAvailable(true);
- List matches = super.findNoLock(matcher);
+ List<SenderBean> matches = super.findNoLock(matcher);
if(LoggingControl.isAnyTracingEnabled() && log.isDebugEnabled()) log.debug("Found " + matches.size() + " messages");
// Look for the message with the lowest send time, and send that one.
SenderBean result = null;
- Iterator i = matches.iterator();
+ Iterator<SenderBean> i = matches.iterator();
while(i.hasNext()) {
SenderBean bean = (SenderBean) i.next();
if (bean.getTimeToSend()<0)
@@ -145,8 +144,8 @@
return result;
}
- public SenderBean findUnique(SenderBean bean) throws SandeshaException {
- return (SenderBean) super.findUnique(bean);
+ public SenderBean findUnique(SenderBean bean) throws SandeshaStorageException {
+ return super.findUnique(bean);
}
public SenderBean retrieveFromMessageRefKey(String messageContextRefKey) {
Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java?rev=714066&r1=714065&r2=714066&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java Fri Nov 14 08:43:52 2008
@@ -65,9 +65,9 @@
private InvokerBeanMgr invokerBeanMgr = null;
private Sender sender = null;
private PollingManager pollingManager = null;
- private ConcurrentHashMap transactions = new ConcurrentHashMap();
+ private ConcurrentHashMap<Thread, InMemoryTransaction> transactions = new ConcurrentHashMap<Thread, InMemoryTransaction>();
private boolean useSerialization = false;
- private ConcurrentHashMap storageMap = new ConcurrentHashMap();
+ private ConcurrentHashMap<String, Object> storageMap = new ConcurrentHashMap<String, Object>();
public InMemoryStorageManager(ConfigurationContext context)
throws SandeshaException
Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryTransaction.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryTransaction.java?rev=714066&r1=714065&r2=714066&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryTransaction.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryTransaction.java Fri Nov 14 08:43:52 2008
@@ -44,7 +44,7 @@
private InMemoryStorageManager manager;
private String threadName;
- private ArrayList enlistedBeans = new ArrayList();
+ private ArrayList<RMBean> enlistedBeans = new ArrayList<RMBean>();
private boolean sentMessages = false;
private boolean active = true;
private Thread thread;
@@ -138,9 +138,9 @@
if(LoggingControl.isAnyTracingEnabled() && log.isDebugEnabled()) log.debug("Entry: InMemoryTransaction::releaseLocks, " + this);
manager.removeTransaction(this);
- Iterator beans = enlistedBeans.iterator();
+ Iterator<RMBean> beans = enlistedBeans.iterator();
while(beans.hasNext()) {
- RMBean bean = (RMBean) beans.next();
+ RMBean bean = beans.next();
DummyTransaction tran = (DummyTransaction) bean.getTransaction();
tran.unlock();
}
Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/AcknowledgementManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/AcknowledgementManager.java?rev=714066&r1=714065&r2=714066&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/AcknowledgementManager.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/AcknowledgementManager.java Fri Nov 14 08:43:52 2008
@@ -122,8 +122,8 @@
RMDBean findRMDBean = new RMDBean();
findRMDBean.setAcksToEndpointReference(target);
findRMDBean.setTerminated(false);
- Collection rmdBeans = storageManager.getRMDBeanMgr().find(findRMDBean);
- Iterator sequences = rmdBeans.iterator();
+ Collection<RMDBean> rmdBeans = storageManager.getRMDBeanMgr().find(findRMDBean);
+ Iterator<RMDBean> sequences = rmdBeans.iterator();
while (sequences.hasNext()) {
RMDBean sequence = (RMDBean) sequences.next();
if (SandeshaUtil.hasReferenceParameters(sequence.getAcksToEndpointReference())) {
@@ -268,8 +268,8 @@
findBean.setSend(true);
findBean.setReSend(false);
findBean.setSequenceID(sequenceId);
- Collection coll = retransmitterBeanMgr.find(findBean);
- Iterator it = coll.iterator();
+ Collection<SenderBean> coll = retransmitterBeanMgr.find(findBean);
+ Iterator<SenderBean> it = coll.iterator();
while (it.hasNext()) {
SenderBean oldAckBean = (SenderBean) it.next();
Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/FaultManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/FaultManager.java?rev=714066&r1=714065&r2=714066&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/FaultManager.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/FaultManager.java Fri Nov 14 08:43:52 2008
@@ -229,8 +229,8 @@
log.debug("Enter: FaultManager::checkForInvalidAcknowledgement");
boolean invalidAck = false;
- List sequenceAckList = sequenceAcknowledgement.getAcknowledgementRanges();
- Iterator it = sequenceAckList.iterator();
+ List<Range> sequenceAckList = sequenceAcknowledgement.getAcknowledgementRanges();
+ Iterator<Range> it = sequenceAckList.iterator();
while (it.hasNext()) {
Range acknowledgementRange = (Range) it.next();
@@ -1044,7 +1044,7 @@
SenderBean target = new SenderBean();
target.setInternalSequenceID(internalSequenceId);
- Iterator iterator = storageManager.getSenderBeanMgr().find(target).iterator();
+ Iterator<SenderBean> iterator = storageManager.getSenderBeanMgr().find(target).iterator();
while (iterator.hasNext()) {
SenderBean tempBean = (SenderBean) iterator.next();
Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/MsgInitializer.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/MsgInitializer.java?rev=714066&r1=714065&r2=714066&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/MsgInitializer.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/MsgInitializer.java Fri Nov 14 08:43:52 2008
@@ -82,9 +82,9 @@
CreateSequenceResponse createSequenceResponse = rmMsgContext.getCreateSequenceResponse();
TerminateSequence terminateSequence = rmMsgContext.getTerminateSequence();
TerminateSequenceResponse terminateSequenceResponse = rmMsgContext.getTerminateSequenceResponse();
- Iterator sequenceAcknowledgementsIter = rmMsgContext.getSequenceAcknowledgements();
+ Iterator<SequenceAcknowledgement> sequenceAcknowledgementsIter = rmMsgContext.getSequenceAcknowledgements();
Sequence sequence = rmMsgContext.getSequence();
- Iterator ackRequestedIter = rmMsgContext.getAckRequests();
+ Iterator<AckRequested> ackRequestedIter = rmMsgContext.getAckRequests();
CloseSequence closeSequence = rmMsgContext.getCloseSequence();
CloseSequenceResponse closeSequenceResponse = rmMsgContext.getCloseSequenceResponse();
MakeConnection makeConnection = rmMsgContext.getMakeConnection();
Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/PropertyManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/PropertyManager.java?rev=714066&r1=714065&r2=714066&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/PropertyManager.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/PropertyManager.java Fri Nov 14 08:43:52 2008
@@ -410,9 +410,9 @@
&& !Sandesha2Constants.VALUE_NONE.equals(messageTypesToDrop)) {
messageTypesToDrop = messageTypesToDrop.trim();
messageTypesToDrop = "[" + messageTypesToDrop + "]";
- ArrayList messageTypesLst = SandeshaUtil.getArrayListFromString(messageTypesToDrop);
+ ArrayList<String> messageTypesLst = SandeshaUtil.getArrayListFromString(messageTypesToDrop);
- Iterator itr = messageTypesLst.iterator();
+ Iterator<String> itr = messageTypesLst.iterator();
while (itr.hasNext()) {
String typeStr = (String) itr.next();
Integer typeNo = new Integer(typeStr);
Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/RMMsgCreator.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/RMMsgCreator.java?rev=714066&r1=714065&r2=714066&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/RMMsgCreator.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/RMMsgCreator.java Fri Nov 14 08:43:52 2008
@@ -498,7 +498,7 @@
String rmVersion = rmdBean.getRMVersion();
String rmNamespaceValue = SpecSpecificConstants.getRMNamespaceValue(rmVersion);
- ArrayList ackRangeArrayList = SandeshaUtil.getAckRangeArrayList(rmdBean.getServerCompletedMessages(), rmNamespaceValue);
+ ArrayList<Range> ackRangeArrayList = SandeshaUtil.getAckRangeArrayList(rmdBean.getServerCompletedMessages(), rmNamespaceValue);
if(ackRangeArrayList!=null && ackRangeArrayList.size()!=0){
if(LoggingControl.isAnyTracingEnabled() && log.isDebugEnabled())
log.debug("RMMsgCreator::addAckMessage : there are messages to ack " + ackRangeArrayList);
Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/RangeString.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/RangeString.java?rev=714066&r1=714065&r2=714066&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/RangeString.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/RangeString.java Fri Nov 14 08:43:52 2008
@@ -41,7 +41,7 @@
public class RangeString implements Serializable{
private static final long serialVersionUID = -3487094584241136861L;
- private final SortedMap rangeMap;
+ private final SortedMap<Long, Range> rangeMap;
/**
* Creates an empty range string
@@ -57,7 +57,7 @@
*/
public RangeString(String s){
- rangeMap = new TreeMap();
+ rangeMap = new TreeMap<Long, Range>();
if(s!=null && !s.equals("")){
//Walk the string building range objects as we go, and
@@ -73,11 +73,11 @@
}
public RangeString(RangeString rs){
- rangeMap = new TreeMap();
- Iterator iter = rs.rangeMap.entrySet().iterator();
+ rangeMap = new TreeMap<Long, Range>();
+ Iterator<Entry<Long, Range>> iter = rs.rangeMap.entrySet().iterator();
while(iter.hasNext()){
- Entry e = (Entry)iter.next(); // Long, Range
- Range sr = (Range)e.getValue();
+ Entry<Long, Range> e = iter.next(); // Long, Range
+ Range sr = e.getValue();
rangeMap.put(e.getKey(), new Range(sr.lowerValue, sr.upperValue));
}
}
@@ -93,7 +93,7 @@
else{
//start at the specified index and work down the list of ranges
//utill we find one
- Iterator iterator = rangeMap.keySet().iterator();
+ Iterator<Long> iterator = rangeMap.keySet().iterator();
while (iterator.hasNext()) {
long key = ((Long)iterator.next()).longValue();
@@ -222,8 +222,8 @@
// for(int i=0; i<sortedList.size(); i++){
// returnString = returnString + (rangeMap.get(sortedList.get(i))).toString();
// }
- for(Iterator iter = rangeMap.entrySet().iterator();iter.hasNext();){
- Entry e = (Entry)iter.next();
+ for(Iterator<Entry<Long, Range>> iter = rangeMap.entrySet().iterator();iter.hasNext();){
+ Entry<Long, Range> e = iter.next();
returnString = returnString + e.getValue();
}
@@ -234,11 +234,11 @@
* @return ordered array of each range object in the string
*/
public Range[] getRanges(){
- Set entrySet = rangeMap.entrySet();
+ Set<Entry<Long, Range>> entrySet = rangeMap.entrySet();
Range[] ranges = new Range[entrySet.size()];
int i=0;
- for(Iterator iter = entrySet.iterator();iter.hasNext();){
- ranges[i] = (Range)((Entry)iter.next()).getValue();
+ for(Iterator<Entry<Long, Range>> iter = entrySet.iterator();iter.hasNext();){
+ ranges[i] = iter.next().getValue();
i++;
}
return ranges;
@@ -250,8 +250,8 @@
* in order
* NOTE: inefficient, should be avoided
*/
- public List getContainedElementsAsNumbersList(){
- List returnList = new LinkedList();
+ public List<Long> getContainedElementsAsNumbersList(){
+ List<Long> returnList = new LinkedList<Long>();
Range[] ranges = getRanges();
for(int i=0; i<ranges.length; i++){
for(long current = ranges[i].lowerValue; current<=ranges[i].upperValue; current++){
Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java?rev=714066&r1=714065&r2=714066&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java Fri Nov 14 08:43:52 2008
@@ -133,9 +133,9 @@
* @return
* @throws SandeshaException
*/
- public static ArrayList getAckRangeArrayList(RangeString completedMessageRanges, String rmNamespaceValue) {
+ public static ArrayList<Range> getAckRangeArrayList(RangeString completedMessageRanges, String rmNamespaceValue) {
- ArrayList ackRanges = new ArrayList(); //the final ack ranges that we will build up
+ ArrayList<Range> ackRanges = new ArrayList<Range>(); //the final ack ranges that we will build up
Range[] ranges = completedMessageRanges.getRanges();
for(int i=0; i<ranges.length; i++){
@@ -552,10 +552,10 @@
}
//TODO change this method.
- public static ArrayList getArrayListFromString(String str) {
+ public static ArrayList<String> getArrayListFromString(String str) {
if (str == null || "".equals(str))
- return new ArrayList();
+ return new ArrayList<String>();
if (str.length() < 2) {
String message = SandeshaMessageHelper.getMessage(
@@ -576,7 +576,7 @@
throw new IllegalArgumentException(message);
}
- ArrayList retArr = new ArrayList();
+ ArrayList<String> retArr = new ArrayList<String>();
String subStr = str.substring(1, length - 1);
@@ -647,8 +647,8 @@
return sequeunceID;
}
- public static String getExecutionChainString(ArrayList executionChain) {
- Iterator iter = executionChain.iterator();
+ public static String getExecutionChainString(ArrayList<Handler> executionChain) {
+ Iterator<Handler> iter = executionChain.iterator();
String executionChainStr = "";
while (iter.hasNext()) {
@@ -709,7 +709,7 @@
Sequence sequence = rmMessageContext.getSequence();
sequenceID = sequence.getIdentifier().getIdentifier();
} else if (messageType == Sandesha2Constants.MessageTypes.ACK) {
- Iterator sequenceAckIter = rmMessageContext
+ Iterator<SequenceAcknowledgement> sequenceAckIter = rmMessageContext
.getSequenceAcknowledgements();
//In case of ack messages sequenceId is decided based on the sequenceId of the first
@@ -719,7 +719,7 @@
SequenceAcknowledgement sequenceAcknowledgement = (SequenceAcknowledgement) sequenceAckIter.next();
sequenceID = sequenceAcknowledgement.getIdentifier().getIdentifier();
} else if (messageType == Sandesha2Constants.MessageTypes.ACK_REQUEST) {
- Iterator ackRequestIter = rmMessageContext
+ Iterator<AckRequested> ackRequestIter = rmMessageContext
.getAckRequests();
//In case of ack request messages sequenceId is decided based on the sequenceId of the first
@@ -969,12 +969,12 @@
if (!(transportOutDescription instanceof Sandesha2TransportOutDesc))
return; //This message is aimed to be stored only if, Sandesha2TransportOutDescription is set.
- ArrayList executionChain = message.getExecutionChain();
- ArrayList retransmittablePhases = new ArrayList ();
+ List<Handler> executionChain = message.getExecutionChain();
+ ArrayList<Handler> retransmittablePhases = new ArrayList<Handler>();
int executionChainLength = executionChain.size();
for(int i=0;i<executionChainLength;i++){
- Handler handler = (Handler)executionChain.get(i);
+ Handler handler = executionChain.get(i);
if("Security".equals(handler.getName())){
retransmittablePhases.add(handler);
}
@@ -1030,7 +1030,7 @@
return targetEnv;
}
- public static void reallocateMessagesToNewSequence(StorageManager storageManager, RMSBean oldRMSBean, List msgsToSend)throws AxisFault{
+ public static void reallocateMessagesToNewSequence(StorageManager storageManager, RMSBean oldRMSBean, List<MessageContext> msgsToSend)throws AxisFault{
if (LoggingControl.isAnyTracingEnabled() && log.isDebugEnabled())
log.debug("Enter: SandeshaUtil::reallocateMessagesToNewSequence");
@@ -1056,7 +1056,7 @@
options.setProperty(AddressingConstants.DISABLE_ADDRESSING_FOR_OUT_MESSAGES, Boolean.FALSE);
//send the msgs - this will setup a new sequence to the same endpoint
- Iterator it = msgsToSend.iterator();
+ Iterator<MessageContext> it = msgsToSend.iterator();
while(it.hasNext()){
MessageContext msgCtx = (MessageContext)it.next();
client.getOptions().setAction(msgCtx.getWSAAction());
Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/TerminateManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/TerminateManager.java?rev=714066&r1=714065&r2=714066&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/TerminateManager.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/TerminateManager.java Fri Nov 14 08:43:52 2008
@@ -61,7 +61,7 @@
private static String CLEANED_AFTER_INVOCATION = "CleanedAfterInvocation";
- private static HashMap receivingSideCleanMap = new HashMap();
+ private static HashMap<String, String> receivingSideCleanMap = new HashMap<String, String>();
public static void checkAndTerminate(ConfigurationContext configurationContext, StorageManager storageManager, RMSBean rmsBean)
throws SandeshaStorageException, AxisFault {
@@ -85,7 +85,7 @@
findBean.setToEndpointReference(replyTo);
RMDBeanMgr rmdBeanMgr = storageManager.getRMDBeanMgr();
- List beans = rmdBeanMgr.find(findBean);
+ List<RMDBean> beans = rmdBeanMgr.find(findBean);
if(beans.isEmpty()) {
rmsBean.setTerminationPauserForCS(true);
storageManager.getRMSBeanMgr().update(rmsBean);
@@ -101,7 +101,7 @@
matcher.setMessageType(Sandesha2Constants.MessageTypes.APPLICATION);
matcher.setSequenceID(rmsBean.getSequenceID());
- List matches = storageManager.getSenderBeanMgr().find(matcher);
+ List<SenderBean> matches = storageManager.getSenderBeanMgr().find(matcher);
if(!matches.isEmpty()) complete = false;
}
@@ -150,7 +150,7 @@
findAckBean.setMessageType(Sandesha2Constants.MessageTypes.ACK);
SenderBeanMgr senderBeanMgr = storageManager.getSenderBeanMgr();
- Iterator ackBeans = senderBeanMgr.find(findAckBean).iterator();
+ Iterator<SenderBean> ackBeans = senderBeanMgr.find(findAckBean).iterator();
while (ackBeans.hasNext()) {
SenderBean ackBean = (SenderBean) ackBeans.next();
senderBeanMgr.delete(ackBean.getMessageID());
@@ -198,8 +198,8 @@
// removing InvokerBean entries
InvokerBean invokerFindBean = new InvokerBean();
invokerFindBean.setSequenceID(sequenceId);
- Collection collection = invokerBeanMgr.find(invokerFindBean);
- Iterator iterator = collection.iterator();
+ Collection<InvokerBean> collection = invokerBeanMgr.find(invokerFindBean);
+ Iterator<InvokerBean> iterator = collection.iterator();
while (iterator.hasNext()) {
InvokerBean invokerBean = (InvokerBean) iterator.next();
String messageStoreKey = invokerBean.getMessageContextRefKey();
@@ -262,11 +262,11 @@
SenderBeanMgr retransmitterBeanMgr = storageManager.getSenderBeanMgr();
// removing retransmitterMgr entries and corresponding message contexts.
- Collection collection = retransmitterBeanMgr.find(internalSequenceId);
- Iterator iterator = collection.iterator();
- List msgsToReallocate = null;
+ Collection<SenderBean> collection = retransmitterBeanMgr.find(internalSequenceId);
+ Iterator<SenderBean> iterator = collection.iterator();
+ List<MessageContext> msgsToReallocate = null;
if(reallocateIfPossible){
- msgsToReallocate = new LinkedList();
+ msgsToReallocate = new LinkedList<MessageContext>();
}
Range[] ranges = rmsBean.getClientCompletedMessages().getRanges();
long lastAckedMsg = -1;
Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/Invoker.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/Invoker.java?rev=714066&r1=714065&r2=714066&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/Invoker.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/Invoker.java Fri Nov 14 08:43:52 2008
@@ -91,7 +91,7 @@
InvokerBean selector = new InvokerBean();
selector.setSequenceID(sequenceID);
- Iterator stMapIt = storageMapMgr.find(selector).iterator();
+ Iterator<InvokerBean> stMapIt = storageMapMgr.find(selector).iterator();
long highestMsgNumberInvoked = 0;
Transaction transaction = null;
@@ -175,7 +175,7 @@
}
private void addOutOfOrderInvokerBeansToList(String sequenceID,
- StorageManager storageManager, List list)throws SandeshaException{
+ StorageManager storageManager, List<InvokerBean> list)throws SandeshaException{
if (log.isDebugEnabled())
log.debug("Enter: InOrderInvoker::addOutOfOrderInvokerBeansToList " + sequenceID + ", " + list);
@@ -187,7 +187,7 @@
//Look for any invokable message that lies in one of those ranges
InvokerBean selector = new InvokerBean();
selector.setSequenceID(sequenceID);
- Iterator invokerBeansIterator =
+ Iterator<InvokerBean> invokerBeansIterator =
storageManager.getInvokerBeanMgr().find(selector).iterator();
while(invokerBeansIterator.hasNext()){
@@ -221,7 +221,7 @@
transaction = storageManager.getTransaction();
// Pick a sequence using a round-robin approach
- ArrayList allSequencesList = getSequences();
+ ArrayList<SequenceEntry> allSequencesList = getSequences();
int size = allSequencesList.size();
log.debug("Choosing one from " + size + " sequences");
if(nextIndex >= size) {
@@ -278,7 +278,7 @@
InvokerBean selector = new InvokerBean();
selector.setSequenceID(sequenceId);
selector.setMsgNo(nextMsgno);
- List invokerBeans = storageMapMgr.find(selector);
+ List<InvokerBean> invokerBeans = storageMapMgr.find(selector);
//add any msgs that belong to out of order windows
addOutOfOrderInvokerBeansToList(sequenceId,
@@ -294,7 +294,7 @@
return sleep;
}
- Iterator stMapIt = invokerBeans.iterator();
+ Iterator<InvokerBean> stMapIt = invokerBeans.iterator();
//TODO correct the locking mechanism to have one lock per sequence.
//TODO should this be a while, not an if?
Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/SandeshaThread.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/SandeshaThread.java?rev=714066&r1=714065&r2=714066&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/SandeshaThread.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/SandeshaThread.java Fri Nov 14 08:43:52 2008
@@ -49,7 +49,7 @@
private int sleepTime;
private WorkerLock lock = null;
- private ArrayList workingSequences = new ArrayList();
+ private ArrayList<SequenceEntry> workingSequences = new ArrayList<SequenceEntry>();
protected transient ThreadFactory threadPool;
protected ConfigurationContext context = null;
@@ -179,7 +179,7 @@
// Set the SandeshaThread to have the same context classloader as the application
try{
- AccessController.doPrivileged(new PrivilegedExceptionAction() {
+ AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
public Object run() throws Exception {
SandeshaThread.this.setContextClassLoader(Thread.currentThread().getContextClassLoader());
return null;
@@ -206,9 +206,9 @@
*
* @return a List of SequenceEntry instances
*/
- public synchronized ArrayList getSequences() {
+ public synchronized ArrayList<SequenceEntry> getSequences() {
// Need to copy the list for thread safety
- ArrayList result = new ArrayList();
+ ArrayList<SequenceEntry> result = new ArrayList<SequenceEntry>();
result.addAll(workingSequences);
return result;
}
Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/Sender.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/Sender.java?rev=714066&r1=714065&r2=714066&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/Sender.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/Sender.java Fri Nov 14 08:43:52 2008
@@ -75,9 +75,9 @@
private static int HOUSEKEEPING_INTERVAL = 20000;
- private ConcurrentHashMap ackMap = new ConcurrentHashMap();
+ private ConcurrentHashMap<String, AckHolder> ackMap = new ConcurrentHashMap<String, AckHolder>();
- private ConcurrentHashMap warnedAlreadyOrphans = new ConcurrentHashMap();
+ private ConcurrentHashMap<String, Long> warnedAlreadyOrphans = new ConcurrentHashMap<String, Long>();
private static class AckHolder {
public long tts = 0;
@@ -109,7 +109,7 @@
try {
// Pick a sequence using a round-robin approach
- ArrayList allSequencesList = getSequences();
+ ArrayList<SequenceEntry> allSequencesList = getSequences();
int size = allSequencesList.size();
if (log.isDebugEnabled())
@@ -343,7 +343,7 @@
if (deleteTime > 0) {
// Find terminated sequences.
- List rmsBeans = storageManager.getRMSBeanMgr().find(finderBean);
+ List<RMSBean> rmsBeans = storageManager.getRMSBeanMgr().find(finderBean);
deleteRMSBeans(rmsBeans, propertyBean, deleteTime);
@@ -359,9 +359,9 @@
RMDBean finderRMDBean = new RMDBean();
finderRMDBean.setTerminated(true);
- List rmdBeans = storageManager.getRMDBeanMgr().find(finderRMDBean);
+ List<RMDBean> rmdBeans = storageManager.getRMDBeanMgr().find(finderRMDBean);
- Iterator beans = rmdBeans.iterator();
+ Iterator<RMDBean> beans = rmdBeans.iterator();
while (beans.hasNext()) {
RMDBean rmdBean = (RMDBean) beans.next();
@@ -384,9 +384,9 @@
RMDBean finderRMDBean = new RMDBean();
finderRMDBean.setTerminated(false);
- List rmdBeans = storageManager.getRMDBeanMgr().find(finderRMDBean);
+ List<RMDBean> rmdBeans = storageManager.getRMDBeanMgr().find(finderRMDBean);
- Iterator beans = rmdBeans.iterator();
+ Iterator<RMDBean> beans = rmdBeans.iterator();
while (beans.hasNext()) {
RMDBean rmdBean = (RMDBean) beans.next();
@@ -425,13 +425,13 @@
log.debug("Exit: Sender::deleteTerminatedSequences");
}
- private void deleteRMSBeans(List rmsBeans, SandeshaPolicyBean propertyBean, long deleteTime)
+ private void deleteRMSBeans(List<RMSBean> rmsBeans, SandeshaPolicyBean propertyBean, long deleteTime)
throws SandeshaStorageException {
if (log.isDebugEnabled())
log.debug("Enter: Sender::deleteRMSBeans");
- Iterator beans = rmsBeans.iterator();
+ Iterator<RMSBean> beans = rmsBeans.iterator();
while (beans.hasNext()) {
RMSBean rmsBean = (RMSBean) beans.next();
@@ -470,8 +470,8 @@
finder.setTransportAvailable(true);
finder.setTimeToSend(System.currentTimeMillis() - Sandesha2Constants.TRANSPORT_WAIT_TIME);
- List beans = manager.getSenderBeanMgr().find(finder);
- Iterator beanIter = beans.iterator();
+ List<SenderBean> beans = manager.getSenderBeanMgr().find(finder);
+ Iterator<SenderBean> beanIter = beans.iterator();
while (beanIter.hasNext()) {
// The beans we have found are assigned to an internal sequence
// id, but the create
@@ -574,7 +574,7 @@
finder.setTransportAvailable(false);
finder.setTimeToSend(System.currentTimeMillis() - Sandesha2Constants.TRANSPORT_WAIT_TIME);
- List beans = manager.getSenderBeanMgr().find(finder);
+ List<SenderBean> beans = manager.getSenderBeanMgr().find(finder);
//Commit this transaction
tran.commit();
@@ -582,7 +582,7 @@
// Create a new transaction
tran = manager.getTransaction();
- Iterator beanIter = beans.iterator();
+ Iterator<SenderBean> beanIter = beans.iterator();
while (beanIter.hasNext()) {
SenderBean bean = (SenderBean) beanIter.next();
@@ -637,7 +637,7 @@
if( warnedAlreadyOrphans.size() > 1000 || currentTime > (lastRanCleanup + 600000)){
if(log.isDebugEnabled()) log.debug("Sender::checkForOrphanMessages. Cleaning up list of orphans");
long timeAnHourAgo = currentTime - 3600000;
- Iterator it = warnedAlreadyOrphans.keySet().iterator();
+ Iterator<String> it = warnedAlreadyOrphans.keySet().iterator();
while(it.hasNext()){
Object key = it.next();
long ageOfThisOrphan = ((Long)warnedAlreadyOrphans.get(key)).longValue();
Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java?rev=714066&r1=714065&r2=714066&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java Fri Nov 14 08:43:52 2008
@@ -67,6 +67,7 @@
import org.apache.sandesha2.wsrm.CloseSequence;
import org.apache.sandesha2.wsrm.Identifier;
import org.apache.sandesha2.wsrm.Sequence;
+import org.apache.sandesha2.wsrm.SequenceAcknowledgement;
import org.apache.sandesha2.wsrm.TerminateSequence;
public class SenderWorker extends SandeshaWorker implements Runnable {
@@ -161,7 +162,7 @@
}
// operation is the lowest level Sandesha2 should be attached
- ArrayList msgsNotToSend = SandeshaUtil.getPropertyBean(msgCtx.getAxisOperation()).getMsgTypesToDrop();
+ ArrayList<Integer> msgsNotToSend = SandeshaUtil.getPropertyBean(msgCtx.getAxisOperation()).getMsgTypesToDrop();
if (msgsNotToSend != null && msgsNotToSend.contains(new Integer(rmMsgCtx.getMessageType()))) {
if (log.isDebugEnabled())
@@ -468,7 +469,7 @@
// The only time that we can have a message of this type is when we are sending a
// stand-alone ack request, and in that case we only expect to find a single ack
// request header in the message.
- Iterator ackRequests = rmMsgContext.getAckRequests();
+ Iterator<AckRequested> ackRequests = rmMsgContext.getAckRequests();
AckRequested ackRequest = (AckRequested) ackRequests.next();
if (ackRequests.hasNext()) {
throw new SandeshaException (SandeshaMessageHelper.getMessage(SandeshaMessageKeys.ackRequestMultipleParts));
@@ -481,7 +482,7 @@
//if this is an sync WSRM 1.0 case we always have to add an ack
boolean ackPresent = false;
- Iterator it = rmMsgContext.getSequenceAcknowledgements();
+ Iterator<SequenceAcknowledgement> it = rmMsgContext.getSequenceAcknowledgements();
if (it.hasNext())
ackPresent = true;
@@ -687,8 +688,6 @@
responseMessageContext.setSoapAction("");
}
- InvocationResponse response = null;
-
if (resenvelope!=null) {
//Drive the response msg through the engine
//disable addressing validation - this is an inbound response msg so we do not want addressing to validate replyTo
@@ -697,7 +696,7 @@
log.debug("SenderWorker::disable addressing inbound checks, driving response through axis engine " + responseMessageContext);
responseMessageContext.setProperty(AddressingConstants.ADDR_VALIDATE_INVOCATION_PATTERN, Boolean.FALSE);
- response = AxisEngine.receive(responseMessageContext);
+ InvocationResponse response = AxisEngine.receive(responseMessageContext);
}
} catch (Exception e) {
Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/WorkerLock.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/WorkerLock.java?rev=714066&r1=714065&r2=714066&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/WorkerLock.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/WorkerLock.java Fri Nov 14 08:43:52 2008
@@ -29,7 +29,7 @@
public class WorkerLock {
static final Log log = LogFactory.getLog(WorkerLock.class);
- private ConcurrentHashMap locks = new ConcurrentHashMap();
+ private ConcurrentHashMap<String, Holder> locks = new ConcurrentHashMap<String, Holder>();
public WorkerLock () {
}
Modified: webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java?rev=714066&r1=714065&r2=714066&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java (original)
+++ webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java Fri Nov 14 08:43:52 2008
@@ -47,8 +47,8 @@
public class SequenceAcknowledgement implements RMHeaderPart {
private Identifier identifier;
- private ArrayList acknowledgementRangeList;
- private ArrayList nackList;
+ private ArrayList<Range> acknowledgementRangeList;
+ private ArrayList<Long> nackList;
private String namespaceValue = null;
private OMNamespace omNamespace = null;
private boolean ackNone = false;
@@ -63,8 +63,8 @@
}else{
omNamespace = Sandesha2Constants.SPEC_2007_02.OM_NS_URI;
}
- acknowledgementRangeList = new ArrayList();
- nackList = new ArrayList();
+ acknowledgementRangeList = new ArrayList<Range>();
+ nackList = new ArrayList<Long>();
}
public String getNamespaceValue() {
@@ -140,7 +140,7 @@
this.identifier = identifier;
}
- public void setAckRanges(ArrayList acknowledgementRagngesList) {
+ public void setAckRanges(ArrayList<Range> acknowledgementRagngesList) {
acknowledgementRangeList = acknowledgementRagngesList;
}
@@ -159,11 +159,11 @@
return identifier;
}
- public List getAcknowledgementRanges() {
+ public List<Range> getAcknowledgementRanges() {
return acknowledgementRangeList;
}
- public List getNackList() {
+ public List<Long> getNackList() {
return nackList;
}
@@ -201,7 +201,7 @@
sequenceAcknowledgementHeaderBlock.setMustUnderstand(true);
identifier.toOMElement(sequenceAcknowledgementHeaderBlock, omNamespace);
- Iterator ackRangeIt = acknowledgementRangeList.iterator();
+ Iterator<Range> ackRangeIt = acknowledgementRangeList.iterator();
while (ackRangeIt.hasNext()) {
Range ackRange = (Range) ackRangeIt.next();
@@ -225,7 +225,7 @@
sequenceAcknowledgementHeaderBlock.addChild(acknowledgementRangeElement);
}
- Iterator nackIt = nackList.iterator();
+ Iterator<Long> nackIt = nackList.iterator();
while (nackIt.hasNext()) {
Long nack = (Long) nackIt.next();
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.