[jboss-svn-commits] JBL Code SVN: r33554 - in labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid: drools-grid-local/src/main/java/org/drools/grid/local and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jun 18 16:21:59 EDT 2010
Author: diegoll
Date: 2010-06-18 16:21:58 -0400 (Fri, 18 Jun 2010)
New Revision: 33554
Modified:
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/GenericNodeConnector.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-local/src/main/java/org/drools/grid/local/DirectoryNodeLocalImpl.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-local/src/main/java/org/drools/grid/local/LocalConnection.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-local/src/main/java/org/drools/grid/local/LocalDirectoryConnector.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-local/src/main/java/org/drools/grid/local/LocalNodeConnector.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-api/src/main/java/org/drools/grid/remote/RemoteConnection.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-mina/src/main/java/org/drools/grid/remote/mina/MinaRemoteNodeConnector.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/TaskServerInstance.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-task/src/main/java/org/drools/grid/task/CommandBasedServicesWSHumanTaskHandler.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-task/src/main/java/org/drools/grid/task/HumanTaskService.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-task/src/main/java/org/drools/grid/task/HumanTaskServiceImpl.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-task/src/test/java/org/drools/grid/task/CommandBasedServicesWSHumanTaskHandlerTest.java
Log:
changed return type of connect to void and throw exception instead
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/GenericNodeConnector.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/GenericNodeConnector.java 2010-06-18 20:03:42 UTC (rev 33553)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-api/src/main/java/org/drools/grid/GenericNodeConnector.java 2010-06-18 20:21:58 UTC (rev 33554)
@@ -5,7 +5,7 @@
public interface GenericNodeConnector extends GenericIoWriter {
- boolean connect() throws ConnectorException;
+ void connect() throws ConnectorException;
void disconnect() throws ConnectorException;
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-local/src/main/java/org/drools/grid/local/DirectoryNodeLocalImpl.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-local/src/main/java/org/drools/grid/local/DirectoryNodeLocalImpl.java 2010-06-18 20:03:42 UTC (rev 33553)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-local/src/main/java/org/drools/grid/local/DirectoryNodeLocalImpl.java 2010-06-18 20:21:58 UTC (rev 33554)
@@ -98,8 +98,8 @@
throw new UnsupportedOperationException("Not supported yet.");
}
- public boolean connect() throws ConnectorException {
- return true;
+ public void connect() throws ConnectorException {
+ //do nothing
}
public void disconnect() throws ConnectorException {
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-local/src/main/java/org/drools/grid/local/LocalConnection.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-local/src/main/java/org/drools/grid/local/LocalConnection.java 2010-06-18 20:03:42 UTC (rev 33553)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-local/src/main/java/org/drools/grid/local/LocalConnection.java 2010-06-18 20:21:58 UTC (rev 33554)
@@ -83,9 +83,8 @@
}
GenericDirectoryConnector connector = directoryNodeConnectors.get(0);
DirectoryNodeService directoryNode = null;
- if (connector.connect()) {
- directoryNode = connector.getDirectoryNodeService();
- }
+ connector.connect();
+ directoryNode = connector.getDirectoryNodeService();
return directoryNode;
}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-local/src/main/java/org/drools/grid/local/LocalDirectoryConnector.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-local/src/main/java/org/drools/grid/local/LocalDirectoryConnector.java 2010-06-18 20:03:42 UTC (rev 33553)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-local/src/main/java/org/drools/grid/local/LocalDirectoryConnector.java 2010-06-18 20:21:58 UTC (rev 33554)
@@ -37,8 +37,8 @@
}
- public boolean connect() throws ConnectorException {
- return true;
+ public void connect() throws ConnectorException {
+ //do nothing
}
public void disconnect() throws ConnectorException {
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-local/src/main/java/org/drools/grid/local/LocalNodeConnector.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-local/src/main/java/org/drools/grid/local/LocalNodeConnector.java 2010-06-18 20:03:42 UTC (rev 33553)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-local/src/main/java/org/drools/grid/local/LocalNodeConnector.java 2010-06-18 20:21:58 UTC (rev 33554)
@@ -37,8 +37,8 @@
this.connection = new LocalConnection();
}
- public boolean connect() throws ConnectorException {
- return true;
+ public void connect() throws ConnectorException {
+ //do nothing
}
public void disconnect() throws ConnectorException {
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-api/src/main/java/org/drools/grid/remote/RemoteConnection.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-api/src/main/java/org/drools/grid/remote/RemoteConnection.java 2010-06-18 20:03:42 UTC (rev 33553)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-api/src/main/java/org/drools/grid/remote/RemoteConnection.java 2010-06-18 20:21:58 UTC (rev 33554)
@@ -18,8 +18,6 @@
import java.util.ArrayList;
import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.drools.KnowledgeBaseFactoryService;
import org.drools.builder.DirectoryLookupFactoryService;
@@ -93,16 +91,11 @@
strategy.setConnection(this);
connector = getBestNode(strategy);
}
- if (connector.connect()) {
- node = new ExecutionNode();
- node.set(KnowledgeBuilderFactoryService.class, new KnowledgeBuilderProviderRemoteClient(connector));
- node.set(KnowledgeBaseFactoryService.class, new KnowledgeBaseProviderRemoteClient(connector));
- node.set(DirectoryLookupFactoryService.class, new DirectoryLookupProviderRemoteClient(connector, this));
-
- }else{
- Logger.getLogger(RemoteConnection.class.getName()).log(Level.SEVERE, null, "The Node Connection Failed!");
- throw new IllegalStateException("Unable to connect to node");
- }
+ connector.connect();
+ node = new ExecutionNode();
+ node.set(KnowledgeBuilderFactoryService.class, new KnowledgeBuilderProviderRemoteClient(connector));
+ node.set(KnowledgeBaseFactoryService.class, new KnowledgeBaseProviderRemoteClient(connector));
+ node.set(DirectoryLookupFactoryService.class, new DirectoryLookupProviderRemoteClient(connector, this));
return node;
}
@@ -132,9 +125,7 @@
}
GenericDirectoryConnector connector = directoryNodeConnectors.get(0);
DirectoryNodeService directoryNode = null;
- if (connector.connect()) {
- directoryNode = connector.getDirectoryNodeService();
- }
+ directoryNode = connector.getDirectoryNodeService();
return directoryNode;
}
@@ -158,12 +149,11 @@
List<ExecutionNode> executionNodes = new ArrayList<ExecutionNode>();
for(GenericNodeConnector connector : executionNodeConnectors){
ExecutionNode node = null;
- if (connector.connect()) {
- node = new ExecutionNode();
- node.set(KnowledgeBuilderFactoryService.class, new KnowledgeBuilderProviderRemoteClient(connector));
- node.set(KnowledgeBaseFactoryService.class, new KnowledgeBaseProviderRemoteClient(connector));
- node.set(DirectoryLookupFactoryService.class, new DirectoryLookupProviderRemoteClient(connector, this));
- }
+ connector.connect();
+ node = new ExecutionNode();
+ node.set(KnowledgeBuilderFactoryService.class, new KnowledgeBuilderProviderRemoteClient(connector));
+ node.set(KnowledgeBaseFactoryService.class, new KnowledgeBaseProviderRemoteClient(connector));
+ node.set(DirectoryLookupFactoryService.class, new DirectoryLookupProviderRemoteClient(connector, this));
if (node != null) {
executionNodes.add(node);
}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-mina/src/main/java/org/drools/grid/remote/mina/MinaRemoteNodeConnector.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-mina/src/main/java/org/drools/grid/remote/mina/MinaRemoteNodeConnector.java 2010-06-18 20:03:42 UTC (rev 33553)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-remote-mina/src/main/java/org/drools/grid/remote/mina/MinaRemoteNodeConnector.java 2010-06-18 20:21:58 UTC (rev 33554)
@@ -3,6 +3,8 @@
import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.util.concurrent.atomic.AtomicInteger;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import org.apache.mina.core.future.ConnectFuture;
import org.apache.mina.core.session.IoSession;
@@ -67,7 +69,7 @@
- public boolean connect() throws ConnectorException {
+ public void connect() throws ConnectorException {
if (session != null && session.isConnected()) {
throw new IllegalStateException("Already connected. Disconnect first.");
}
@@ -80,14 +82,14 @@
future1.await(2000);
if (!future1.isConnected()) {
eventListener.info("unable to connect : " + address + " : " + future1.getException());
- return false;
+ Logger.getLogger(MinaRemoteNodeConnector.class.getName()).log(Level.SEVERE, null, "The Node Connection Failed!");
+ throw new ConnectorException("unable to connect : " + address + " : " + future1.getException());
}
eventListener.info("connected : " + address);
this.session = future1.getSession();
- return true;
} catch (Exception e) {
e.printStackTrace();
- return false;
+ throw new ConnectorException(e);
}
}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/TaskServerInstance.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/TaskServerInstance.java 2010-06-18 20:03:42 UTC (rev 33553)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/TaskServerInstance.java 2010-06-18 20:21:58 UTC (rev 33554)
@@ -23,20 +23,15 @@
public HumanTaskService getTaskClient() throws ConnectorException {
GenericConnection connection = getConnector().getConnection();
HumanTaskService htService = (HumanTaskService) connection.getTaskService(new ReturnFirstHumanTaskServiceSelectionStrategy(1, getConnector()));
-
- if(htService.connect()){
- return htService;
- }
- return null;
+ htService.connect();
+ return htService;
}
public HumanTaskService getTaskClient(HumanTaskServiceSelectionStrategy strategy) throws ConnectorException {
GenericConnection connection = getConnector().getConnection();
HumanTaskService htService = (HumanTaskService) connection.getTaskService(strategy);
- if(htService.connect()){
- return htService;
- }
- return null;
+ htService.connect();
+ return htService;
}
public List<HumanTaskService> getTaskClients() {
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-task/src/main/java/org/drools/grid/task/CommandBasedServicesWSHumanTaskHandler.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-task/src/main/java/org/drools/grid/task/CommandBasedServicesWSHumanTaskHandler.java 2010-06-18 20:03:42 UTC (rev 33553)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-task/src/main/java/org/drools/grid/task/CommandBasedServicesWSHumanTaskHandler.java 2010-06-18 20:21:58 UTC (rev 33554)
@@ -85,10 +85,7 @@
htclientConnector,
this.address,
SystemEventListenerFactory.getSystemEventListener());
- boolean connected = connector.connect();
- if (!connected) {
- throw new IllegalArgumentException("Could not connect task client");
- }
+ connector.connect();
int id = ((StatefulKnowledgeSession) session).getId();
client = new HumanTaskServiceImpl(connector, id);
}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-task/src/main/java/org/drools/grid/task/HumanTaskService.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-task/src/main/java/org/drools/grid/task/HumanTaskService.java 2010-06-18 20:03:42 UTC (rev 33553)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-task/src/main/java/org/drools/grid/task/HumanTaskService.java 2010-06-18 20:21:58 UTC (rev 33554)
@@ -56,6 +56,6 @@
public void getTasksAssignedAsTaskInitiator(String userId, String language, TaskSummaryMessageResponseHandler responseHandler);
public void getTasksAssignedAsTaskStakeholder(String userId, String language, TaskSummaryMessageResponseHandler responseHandler);
public void registerForEvent(EventKey key, boolean remove, EventMessageResponseHandler responseHandler);
- public boolean connect() throws ConnectorException;
+ public void connect() throws ConnectorException;
public void disconnect() throws ConnectorException;
}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-task/src/main/java/org/drools/grid/task/HumanTaskServiceImpl.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-task/src/main/java/org/drools/grid/task/HumanTaskServiceImpl.java 2010-06-18 20:03:42 UTC (rev 33553)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-task/src/main/java/org/drools/grid/task/HumanTaskServiceImpl.java 2010-06-18 20:21:58 UTC (rev 33554)
@@ -51,8 +51,8 @@
}
//@Override
- public boolean connect() throws ConnectorException {
- return this.client.connect();
+ public void connect() throws ConnectorException {
+ this.client.connect();
}
public void disconnect() throws ConnectorException {
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-task/src/test/java/org/drools/grid/task/CommandBasedServicesWSHumanTaskHandlerTest.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-task/src/test/java/org/drools/grid/task/CommandBasedServicesWSHumanTaskHandlerTest.java 2010-06-18 20:03:42 UTC (rev 33553)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-task/src/test/java/org/drools/grid/task/CommandBasedServicesWSHumanTaskHandlerTest.java 2010-06-18 20:21:58 UTC (rev 33554)
@@ -132,10 +132,7 @@
htAddress,
SystemEventListenerFactory.getSystemEventListener());
- boolean connected = htMinaClient.connect();
- if (!connected) {
- throw new IllegalArgumentException("Could not connect task client");
- }
+ htMinaClient.connect();
// setup RemoteService client
NioSocketConnector clientConnector = new NioSocketConnector();
More information about the jboss-svn-commits
mailing list