You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by mc...@apache.org on 2008/04/16 22:35:19 UTC
svn commit: r648835 - in
/incubator/tuscany/java/sca/modules/binding-notification/src:
main/java/org/apache/tuscany/sca/binding/notification/
main/java/org/apache/tuscany/sca/binding/notification/encoding/
main/java/org/apache/tuscany/sca/binding/notif...
Author: mcombellack
Date: Wed Apr 16 13:35:15 2008
New Revision: 648835
URL: http://svn.apache.org/viewvc?rev=648835&view=rev
Log:
Made placement of { and } consistent throughout the source and with the rest of Tuscany
Modified:
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingInvoker.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManagerImpl.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBrokerEnDeCoder.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingUtils.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/IOUtils.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/NotificationServlet.java
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/URIUtil.java
incubator/tuscany/java/sca/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/AxiomTestCase.java
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingInvoker.java?rev=648835&r1=648834&r2=648835&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingInvoker.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingInvoker.java Wed Apr 16 13:35:15 2008
@@ -62,15 +62,12 @@
if (bodyArray.length == 3) {
writeable = getWriteableFromByteArray((byte[])bodyArray[1]);
incomingBrokerID = (String)bodyArray[2];
- }
- else if (bodyArray.length == 1) {
+ } else if (bodyArray.length == 1) {
writeable = getWriteableFromPayload(bodyArray[0]);
- }
- else {
+ } else {
throw new RuntimeException("Invalid body array size");
}
- }
- else {
+ } else {
writeable = getWriteableFromPayload(payload);
}
@@ -105,8 +102,7 @@
try {
element.serialize(os);
os.flush();
- }
- catch(Exception e) {
+ } catch(Exception e) {
throw new IOUtilsException(e);
}
}
@@ -120,8 +116,7 @@
try {
os.write(payload);
os.flush();
- }
- catch(Exception e) {
+ } catch(Exception e) {
throw new IOUtilsException(e);
}
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.java?rev=648835&r1=648834&r2=648835&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationReferenceBindingProvider.java Wed Apr 16 13:35:15 2008
@@ -97,8 +97,7 @@
if (ntmAddress != null && notificationType != null) {
remoteNtmUrl = new URL(ntmAddress + notificationTypePath);
}
- }
- catch(Exception e) {
+ } catch(Exception e) {
throw new RuntimeException(e);
}
this.started = false;
@@ -175,8 +174,7 @@
for (URL consumerUrl : consumerList) {
addSubscriberUrl(consumerUrl);
}
- }
- else if (Constants.BrokerConsumers.equals(sequenceType)) {
+ } else if (Constants.BrokerConsumers.equals(sequenceType)) {
// Pick a broker consumer, for now the first one
URL consumerUrl = consumerList.get(0);
addSubscriberUrl(consumerUrl);
@@ -211,12 +209,10 @@
if (eo instanceof Subscribe) {
Subscribe sub = (Subscribe)eo;
addSubscriber(sub.getConsumerReference().getReference());
- }
- else if (eo instanceof ConnectionOverride) {
+ } else if (eo instanceof ConnectionOverride) {
ConnectionOverride co = (ConnectionOverride)eo;
replaceSubscribers(co.getBrokerConsumerReference().getReference());
- }
- else if (eo instanceof ReplaceBrokerConnection) {
+ } else if (eo instanceof ReplaceBrokerConnection) {
ReplaceBrokerConnection rbc = (ReplaceBrokerConnection)eo;
URL removedBrokerConsumerEpr = rbc.getRemovedBroker().getReference().getEndpointAddress().getAddress();
if (rbc.getNeighbors() != null) {
@@ -226,12 +222,10 @@
chosenBroker.getBrokerConsumerReference().getReference());
brokerManager.replaceConsumersBrokerConnection(notificationType,
chosenBroker.getBrokerProducerReference().getReference());
- }
- else {
+ } else {
replaceBrokerSubscriber(removedBrokerConsumerEpr, null);
}
- }
- else {
+ } else {
throw new RuntimeException("Unknown encoding object");
}
} catch(Throwable e) {
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java?rev=648835&r1=648834&r2=648835&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationServiceBindingProvider.java Wed Apr 16 13:35:15 2008
@@ -105,8 +105,7 @@
if (ntmAddress != null && notificationType != null) {
remoteNtmUrl = new URL(ntmAddress + notificationTypePath);
}
- }
- catch(Exception e) {
+ } catch(Exception e) {
throw new RuntimeException(e);
}
this.started = false;
@@ -169,8 +168,7 @@
for (URL producerUrl : producerList) {
subscribeWithProducer(producerUrl, null, ws);
}
- }
- else if (Constants.BrokerProducers.equals(sequenceType)) {
+ } else if (Constants.BrokerProducers.equals(sequenceType)) {
// Pick a broker producer, for now the first one
URL producerUrl = producerList.get(0);
subscribeWithProducer(producerUrl, null, ws);
@@ -239,8 +237,7 @@
byte[] payload = null;
try {
payload = IOUtils.readFully(istream, contentLength);
- }
- catch(IOException e) {
+ } catch(IOException e) {
throw new RuntimeException(e);
}
Object[] args = getArgsFromByteArray(payload, incomingBrokerID);
@@ -255,8 +252,7 @@
StAXOMBuilder builder = new StAXOMBuilder(new ByteArrayInputStream(payload));
OMElement element = builder.getDocumentElement();
return new Object[] { element };
- }
- catch(Exception e) {
+ } catch(Exception e) {
throw new RuntimeException(e);
}
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManagerImpl.java?rev=648835&r1=648834&r2=648835&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManagerImpl.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationTypeManagerImpl.java Wed Apr 16 13:35:15 2008
@@ -122,8 +122,7 @@
e.printStackTrace();
throw new RuntimeException(e);
}
- }
- else {
+ } else {
NotificationTypeManagerHandler ntmHandler = ntmHandlers.get(notificationType);
if (ntmHandler != null) {
throw new RuntimeException("Trying to deploy local consumer with existing local producer, consumer or broker");
@@ -160,8 +159,7 @@
e.printStackTrace();
throw new RuntimeException(e);
}
- }
- else {
+ } else {
NotificationTypeManagerHandler ntmHandler = ntmHandlers.get(notificationType);
if (ntmHandler != null) {
throw new RuntimeException("Trying to deploy local producer with existing local producer, consumer or broker");
@@ -201,8 +199,7 @@
producerListResult.add(epr);
}
}
- }
- else {
+ } else {
for (Broker broker : nbr.getBrokers().getBrokerSequence()) {
consumerListResult.add(broker.getBrokerConsumerReference().getReference());
producerListResult.add(broker.getBrokerProducerReference().getReference());
@@ -213,8 +210,7 @@
e.printStackTrace();
throw new RuntimeException(e);
}
- }
- else {
+ } else {
NotificationTypeManagerHandler ntmHandler = ntmHandlers.get(notificationType);
if (ntmHandler != null) {
throw new RuntimeException("Trying to deploy local broker with existing local producer, consumer or broker");
@@ -280,11 +276,9 @@
this(notificationType);
if (consumerUrl != null) {
addConsumer(consumerUrl);
- }
- else if (producerUrl != null) {
+ } else if (producerUrl != null) {
addProducer(producerUrl);
- }
- else if (broker != null) {
+ } else if (broker != null) {
addBroker(broker);
}
}
@@ -315,24 +309,19 @@
EncodingObject eo = null;
try {
eo = EncodingUtils.decodeFromStream(encodingRegistry, istream);
- }
- catch(EncodingException e) {
+ } catch(EncodingException e) {
throw new RuntimeException(e);
}
if (Constants.NEW_CONSUMER_OP.equals(opHeader)) {
handleNewConsumer((NewConsumer)eo, ostream);
- }
- else if(Constants.NEW_PRODUCER_OP.equals(opHeader)) {
+ } else if(Constants.NEW_PRODUCER_OP.equals(opHeader)) {
handleNewProducer((NewProducer)eo, ostream);
- }
- else if(Constants.NEW_BROKER_OP.equals(opHeader)) {
+ } else if(Constants.NEW_BROKER_OP.equals(opHeader)) {
handleNewBroker((NewBroker)eo, ostream);
- }
- else if (Constants.NEW_BROKER_ACK_OP.equals(opHeader)) {
+ } else if (Constants.NEW_BROKER_ACK_OP.equals(opHeader)) {
handleNewBrokerAck();
- }
- else if (Constants.REMOVE_BROKER_OP.equals(opHeader)) {
+ } else if (Constants.REMOVE_BROKER_OP.equals(opHeader)) {
handleRemoveBroker((RemoveBroker)eo);
}
}
@@ -353,20 +342,17 @@
for (URL producerUrl : producerList) {
ncr.addReferenceToSequence(EncodingUtils.createEndpointReference(producerUrl, null));
}
- }
- else if(brokerList != null) {
+ } else if(brokerList != null) {
ncr.setSequenceType(Constants.BrokerProducers);
for (BrokerStruct broker : brokerList) {
ncr.addReferenceToSequence(EncodingUtils.createEndpointReference(broker.producerUrl, null));
}
- }
- else {
+ } else {
ncr.setSequenceType(Constants.NoProducers);
}
try {
EncodingUtils.encodeToStream(encodingRegistry, ncr, ostream);
- }
- catch(IOUtilsException e) {
+ } catch(IOUtilsException e) {
throw new RuntimeException(e);
}
}
@@ -388,20 +374,17 @@
for (URL consumerUrl : consumerList) {
npr.addReferenceToSequence(EncodingUtils.createEndpointReference(consumerUrl, null));
}
- }
- else if(brokerList != null) {
+ } else if(brokerList != null) {
npr.setSequenceType(Constants.BrokerConsumers);
for (BrokerStruct broker : brokerList) {
npr.addReferenceToSequence(EncodingUtils.createEndpointReference(broker.consumerUrl, null));
}
- }
- else {
+ } else {
npr.setSequenceType(Constants.NoConsumers);
}
try {
EncodingUtils.encodeToStream(encodingRegistry, npr, ostream);
- }
- catch(IOUtilsException e) {
+ } catch(IOUtilsException e) {
throw new RuntimeException(e);
}
}
@@ -421,8 +404,7 @@
for (URL consumerUrl : consumerList) {
endConsumers.addReferenceToSequence(EncodingUtils.createEndpointReference(consumerUrl, null));
}
- }
- else {
+ } else {
endConsumers.setSequenceType(Constants.NoConsumers);
}
nbr.setEndConsumers(endConsumers);
@@ -432,13 +414,11 @@
for (URL producerUrl : producerList) {
endProducers.addReferenceToSequence(EncodingUtils.createEndpointReference(producerUrl, null));
}
- }
- else {
+ } else {
endProducers.setSequenceType(Constants.NoProducers);
}
nbr.setEndProducers(endProducers);
- }
- else {
+ } else {
nbr.setFirstBroker(false);
Brokers brokers = new Brokers();
for (BrokerStruct brokerStruct : brokerList) {
@@ -471,15 +451,13 @@
BrokerStruct broker = new BrokerStruct(consumerUrl, producerUrl, consumerBrokerID.getID());
if (consumerList == null && producerList == null) {
addBroker(broker);
- }
- else {
+ } else {
pendingBroker = broker;
notificationTypeLock.isLocked = true;
}
try {
EncodingUtils.encodeToStream(encodingRegistry, nbr, ostream);
- }
- catch(IOUtilsException e) {
+ } catch(IOUtilsException e) {
throw new RuntimeException(e);
}
}
@@ -605,8 +583,7 @@
public Object read(InputStream istream) throws IOUtilsException {
try {
return EncodingUtils.decodeFromStream(encodingRegistry, istream);
- }
- catch(EncodingException e) {
+ } catch(EncodingException e) {
throw new IOUtilsException(e);
}
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBrokerEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBrokerEnDeCoder.java?rev=648835&r1=648834&r2=648835&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBrokerEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractBrokerEnDeCoder.java Wed Apr 16 13:35:15 2008
@@ -62,12 +62,10 @@
if (encodingObject instanceof BrokerConsumerReference && !haveBCR) {
brokerElement.setBrokerConsumerReference((BrokerConsumerReference)encodingObject);
haveBCR = true;
- }
- else if(encodingObject instanceof BrokerProducerReference && !haveBPR) {
+ } else if(encodingObject instanceof BrokerProducerReference && !haveBPR) {
brokerElement.setBrokerProducerReference((BrokerProducerReference)encodingObject);
haveBPR = true;
- }
- else {
+ } else {
throw new EncodingException("Invalid encoding object");
}
break;
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java?rev=648835&r1=648834&r2=648835&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java Wed Apr 16 13:35:15 2008
@@ -63,8 +63,7 @@
if (reader.hasText()) {
String id = reader.getText();
brokerIDElement.setID(id);
- }
- else {
+ } else {
throw new EncodingException("Broker ID missing value");
}
break;
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingUtils.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingUtils.java?rev=648835&r1=648834&r2=648835&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingUtils.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EncodingUtils.java Wed Apr 16 13:35:15 2008
@@ -46,8 +46,7 @@
encodingRegistry.encode(eo, writer);
writer.flush();
writer.close();
- }
- catch(Exception e) {
+ } catch(Exception e) {
throw new IOUtilsException(e);
}
}
@@ -60,8 +59,7 @@
reader.next();
eo = encodingRegistry.decode(reader);
reader.close();
- }
- catch(XMLStreamException e) {
+ } catch(XMLStreamException e) {
throw new EncodingException(e);
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java?rev=648835&r1=648834&r2=648835&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java Wed Apr 16 13:35:15 2008
@@ -63,8 +63,7 @@
if (reader.hasText()) {
String address = reader.getText();
endpointAddressElement.setAddress(address);
- }
- else {
+ } else {
throw new EncodingException("Endpoint address is missing address");
}
break;
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java?rev=648835&r1=648834&r2=648835&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java Wed Apr 16 13:35:15 2008
@@ -66,12 +66,10 @@
if (encodingObject instanceof EndpointAddress && !haveEPA) {
endpointReferenceElement.setEndpointAddress((EndpointAddress)encodingObject);
haveEPA = true;
- }
- else if(encodingObject instanceof ReferenceProperties && !haveRP) {
+ } else if(encodingObject instanceof ReferenceProperties && !haveRP) {
endpointReferenceElement.setReferenceProperties((ReferenceProperties)encodingObject);
haveRP = true;
- }
- else {
+ } else {
throw new EncodingException("Invalid encoding object");
}
break;
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java?rev=648835&r1=648834&r2=648835&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java Wed Apr 16 13:35:15 2008
@@ -48,8 +48,7 @@
if (encodingObject.isFirstBroker()) {
registry.encode(encodingObject.getEndConsumers(), writer);
registry.encode(encodingObject.getEndProducers(), writer);
- }
- else {
+ } else {
registry.encode(encodingObject.getBrokers(), writer);
}
writer.writeEndElement();
@@ -74,16 +73,13 @@
if (encodingObject instanceof EndProducers && !haveEP && firstBroker) {
newBrokerResponseElement.setEndProducers((EndProducers)encodingObject);
haveEP = true;
- }
- else if(encodingObject instanceof EndConsumers && !haveEC && firstBroker) {
+ } else if(encodingObject instanceof EndConsumers && !haveEC && firstBroker) {
newBrokerResponseElement.setEndConsumers((EndConsumers)encodingObject);
haveEC = true;
- }
- else if(encodingObject instanceof Brokers && !haveB && !firstBroker) {
+ } else if(encodingObject instanceof Brokers && !haveB && !firstBroker) {
newBrokerResponseElement.setBrokers((Brokers)encodingObject);
haveB = true;
- }
- else {
+ } else {
throw new EncodingException("Invalid encoding object");
}
break;
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java?rev=648835&r1=648834&r2=648835&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java Wed Apr 16 13:35:15 2008
@@ -66,12 +66,10 @@
if (encodingObject instanceof BrokerConsumerReference && !haveBCR) {
removeBrokerElement.setBrokerConsumerReference((BrokerConsumerReference)encodingObject);
haveBCR = true;
- }
- else if(encodingObject instanceof NeighborBrokerConsumers && !haveNBC) {
+ } else if(encodingObject instanceof NeighborBrokerConsumers && !haveNBC) {
removeBrokerElement.setNeighborBrokerConsumers((NeighborBrokerConsumers)encodingObject);
haveNBC = true;
- }
- else {
+ } else {
throw new EncodingException("Invalid encoding object");
}
break;
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.java?rev=648835&r1=648834&r2=648835&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReplaceBrokerConnectionEnDeCoder.java Wed Apr 16 13:35:15 2008
@@ -66,12 +66,10 @@
if (encodingObject instanceof RemovedBroker && !haveRB) {
replaceBrokerConnectionElement.setRemovedBroker((RemovedBroker)encodingObject);
haveRB = true;
- }
- else if(encodingObject instanceof Neighbors && !haveN) {
+ } else if(encodingObject instanceof Neighbors && !haveN) {
replaceBrokerConnectionElement.setNeighbors((Neighbors)encodingObject);
haveN = true;
- }
- else {
+ } else {
throw new EncodingException("Invalid encoding object");
}
break;
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/IOUtils.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/IOUtils.java?rev=648835&r1=648834&r2=648835&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/IOUtils.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/IOUtils.java Wed Apr 16 13:35:15 2008
@@ -84,8 +84,7 @@
if (wbody != null) {
OutputStream ost = con.getOutputStream();
wbody.write(ost);
- }
- else {
+ } else {
throw new IOUtilsException("Missing writeable body");
}
final int rc = con.getResponseCode();
@@ -101,9 +100,7 @@
default:
throw new RuntimeException("Unexpected response code: " + rc);
}
- }
- finally
- {
+ } finally {
con.disconnect();
}
return response;
@@ -164,8 +161,7 @@
final int cbRead = ist.read(block, 0, cbToRead);
if (cbRead == -1) {
done = true;
- }
- else {
+ } else {
ost.write(block, 0, cbRead);
cbCopied += cbRead;
done = cbCopied == length;
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/NotificationServlet.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/NotificationServlet.java?rev=648835&r1=648834&r2=648835&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/NotificationServlet.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/NotificationServlet.java Wed Apr 16 13:35:15 2008
@@ -70,12 +70,10 @@
response.getOutputStream().write(handlersResponse);
response.getOutputStream().flush();
}
- }
- else {
+ } else {
try {
servletStreamHandler.handle(headers, request.getInputStream(), request.getContentLength(), response.getOutputStream());
- }
- catch(RuntimeException e) {
+ } catch(RuntimeException e) {
e.printStackTrace();
}
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/URIUtil.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/URIUtil.java?rev=648835&r1=648834&r2=648835&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/URIUtil.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/util/URIUtil.java Wed Apr 16 13:35:15 2008
@@ -30,8 +30,7 @@
if (uri.isOpaque()) {
path = "/" + uri.getSchemeSpecificPart();
- }
- else if (uri.isAbsolute()) {
+ } else if (uri.isAbsolute()) {
path = uri.getPath();
} else {
path = "/" + uri.getPath();
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/AxiomTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/AxiomTestCase.java?rev=648835&r1=648834&r2=648835&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/AxiomTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/test/java/org/apache/tuscany/sca/binding/notification/encoding/AxiomTestCase.java Wed Apr 16 13:35:15 2008
@@ -49,8 +49,7 @@
element.serialize(sw);
sw.flush();
Assert.assertEquals(sw.toString(),testNewProducerResponse);
- }
- catch(Throwable e) {
+ } catch(Throwable e) {
e.printStackTrace();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org