svn commit: r1364982 - in /ofbiz/trunk/framework/service/src/org/ofbiz/service: GenericDispatcher.java GenericDispatcherFactory.java

[adrianc]

Author: adrianc
Date: Tue Jul 24 11:30:12 2012
New Revision: 1364982

URL: http://svn.apache.org/viewvc?rev=1364982&view=rev
Log:
Now that client code no longer references the GenericDispatcher class, we can hide it in the factory.

Removed:
    ofbiz/trunk/framework/service/src/org/ofbiz/service/GenericDispatcher.java
Modified:
    ofbiz/trunk/framework/service/src/org/ofbiz/service/GenericDispatcherFactory.java

Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/GenericDispatcherFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/GenericDispatcherFactory.java?rev=1364982&r1=1364981&r2=1364982&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/GenericDispatcherFactory.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/GenericDispatcherFactory.java Tue Jul 24 11:30:12 2012
@@ -18,14 +18,24 @@
  *******************************************************************************/
 package org.ofbiz.service;
 
+import java.util.Map;
+
+import org.ofbiz.base.util.Debug;
+import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.entity.Delegator;
 
 /**
  * A default {@link LocalDispatcherFactory} implementation.
  */
 public class GenericDispatcherFactory implements LocalDispatcherFactory {
+
+    protected static boolean ecasDisabled = false;
+
     @Override
     public LocalDispatcher createLocalDispatcher(String name, Delegator delegator) {
+        if (UtilValidate.isEmpty(name)) {
+            throw new IllegalArgumentException("The name of a LocalDispatcher cannot be a null or empty String");
+        }
         // attempts to retrieve an already registered DispatchContext with the name "name"
         LocalDispatcher dispatcher = ServiceDispatcher.getLocalDispatcher(name, delegator);
         // if not found then create a new GenericDispatcher object; the constructor will also register a new DispatchContext in the ServiceDispatcher with name "dispatcherName"
@@ -34,4 +44,155 @@ public class GenericDispatcherFactory im
         }
         return dispatcher;
     }
+
+    private class GenericDispatcher extends GenericAbstractDispatcher {
+
+        private GenericDispatcher(String name, Delegator delegator) {
+            ClassLoader loader;
+            try {
+                loader = Thread.currentThread().getContextClassLoader();
+            } catch (SecurityException e) {
+                loader = this.getClass().getClassLoader();
+            }
+            this.name = name;
+            this.dispatcher = ServiceDispatcher.getInstance(delegator);
+            DispatchContext ctx = new DispatchContext(name, loader, this);
+            this.dispatcher.register(ctx);
+            this.ctx = ctx;
+            if (Debug.verboseOn()) Debug.logVerbose("[GenericDispatcher] : Created Dispatcher for: " + name, module);
+        }
+
+        @Override
+        public void disableEcas() {
+            ecasDisabled = true;
+        }
+
+        @Override
+        public void enableEcas() {
+            ecasDisabled = false;
+        }
+
+        @Override
+        public boolean isEcasDisabled() {
+            return ecasDisabled;
+        }
+
+        @Override
+        public Map<String, Object> runSync(String serviceName, Map<String, ? extends Object> context) throws ServiceValidationException, GenericServiceException {
+            ModelService service = ctx.getModelService(serviceName);
+            return dispatcher.runSync(this.name, service, context);
+        }
+
+        @Override
+        public Map<String, Object> runSync(String serviceName, Map<String, ? extends Object> context, int transactionTimeout, boolean requireNewTransaction) throws ServiceAuthException, ServiceValidationException, GenericServiceException {
+            ModelService service = ctx.getModelService(serviceName);
+            // clone the model service for updates
+            ModelService cloned = new ModelService(service);
+            cloned.requireNewTransaction = requireNewTransaction;
+            if (transactionTimeout != -1) {
+                cloned.transactionTimeout = transactionTimeout;
+            }
+            return dispatcher.runSync(this.name, cloned, context);
+        }
+
+        @Override
+        public Map<String, Object> runSync(String serviceName, int transactionTimeout, boolean requireNewTransaction, Object... context) throws ServiceAuthException, ServiceValidationException, GenericServiceException {
+            return runSync(serviceName, ServiceUtil.makeContext(context), transactionTimeout, requireNewTransaction);
+        }
+
+        @Override
+        public void runSyncIgnore(String serviceName, Map<String, ? extends Object> context) throws GenericServiceException {
+            ModelService service = ctx.getModelService(serviceName);
+            dispatcher.runSyncIgnore(this.name, service, context);
+        }
+
+        @Override
+        public void runSyncIgnore(String serviceName, Map<String, ? extends Object> context, int transactionTimeout, boolean requireNewTransaction) throws ServiceAuthException, ServiceValidationException, GenericServiceException {
+            ModelService service = ctx.getModelService(serviceName);
+            // clone the model service for updates
+            ModelService cloned = new ModelService(service);
+            cloned.requireNewTransaction = requireNewTransaction;
+            if (transactionTimeout != -1) {
+                cloned.transactionTimeout = transactionTimeout;
+            }
+            dispatcher.runSyncIgnore(this.name, cloned, context);
+        }
+
+        @Override
+        public void runSyncIgnore(String serviceName, int transactionTimeout, boolean requireNewTransaction, Object... context) throws ServiceAuthException, ServiceValidationException, GenericServiceException {
+            runSyncIgnore(serviceName, ServiceUtil.makeContext(context), transactionTimeout, requireNewTransaction);
+        }
+
+        @Override
+        public void runAsync(String serviceName, Map<String, ? extends Object> context, GenericRequester requester, boolean persist, int transactionTimeout, boolean requireNewTransaction) throws ServiceAuthException, ServiceValidationException, GenericServiceException {
+            ModelService service = ctx.getModelService(serviceName);
+            // clone the model service for updates
+            ModelService cloned = new ModelService(service);
+            cloned.requireNewTransaction = requireNewTransaction;
+            if (transactionTimeout != -1) {
+                cloned.transactionTimeout = transactionTimeout;
+            }
+            dispatcher.runAsync(this.name, cloned, context, requester, persist);
+        }
+
+        @Override
+        public void runAsync(String serviceName, GenericRequester requester, boolean persist, int transactionTimeout, boolean requireNewTransaction, Object... context) throws ServiceAuthException, ServiceValidationException, GenericServiceException {
+            runAsync(serviceName, ServiceUtil.makeContext(context), requester, persist, transactionTimeout, requireNewTransaction);
+        }
+
+        @Override
+        public void runAsync(String serviceName, Map<String, ? extends Object> context, GenericRequester requester, boolean persist) throws ServiceAuthException, ServiceValidationException, GenericServiceException {
+            ModelService service = ctx.getModelService(serviceName);
+            dispatcher.runAsync(this.name, service, context, requester, persist);
+        }
+
+        @Override
+        public void runAsync(String serviceName, GenericRequester requester, boolean persist, Object... context) throws ServiceAuthException, ServiceValidationException, GenericServiceException {
+            runAsync(serviceName, ServiceUtil.makeContext(context), requester, persist);
+        }
+
+        @Override
+        public void runAsync(String serviceName, Map<String, ? extends Object> context, GenericRequester requester) throws ServiceAuthException, ServiceValidationException, GenericServiceException {
+            runAsync(serviceName, context, requester, true);
+        }
+
+        @Override
+        public void runAsync(String serviceName, GenericRequester requester, Object... context) throws ServiceAuthException, ServiceValidationException, GenericServiceException {
+            runAsync(serviceName, ServiceUtil.makeContext(context), requester);
+        }
+
+        @Override
+        public void runAsync(String serviceName, Map<String, ? extends Object> context, boolean persist) throws ServiceAuthException, ServiceValidationException, GenericServiceException {
+            ModelService service = ctx.getModelService(serviceName);
+            dispatcher.runAsync(this.name, service, context, persist);
+        }
+
+        @Override
+        public void runAsync(String serviceName, boolean persist, Object... context) throws ServiceAuthException, ServiceValidationException, GenericServiceException {
+            runAsync(serviceName, ServiceUtil.makeContext(context), persist);
+        }
+
+        @Override
+        public void runAsync(String serviceName, Map<String, ? extends Object> context) throws ServiceAuthException, ServiceValidationException, GenericServiceException {
+            runAsync(serviceName, context, true);
+        }
+
+        @Override
+        public GenericResultWaiter runAsyncWait(String serviceName, Map<String, ? extends Object> context, boolean persist) throws ServiceAuthException, ServiceValidationException, GenericServiceException {
+            GenericResultWaiter waiter = new GenericResultWaiter();
+            this.runAsync(serviceName, context, waiter, persist);
+            return waiter;
+        }
+
+        @Override
+        public GenericResultWaiter runAsyncWait(String serviceName, boolean persist, Object... context) throws ServiceAuthException, ServiceValidationException, GenericServiceException {
+            return runAsyncWait(serviceName, ServiceUtil.makeContext(context), persist);
+        }
+
+        @Override
+        public GenericResultWaiter runAsyncWait(String serviceName, Map<String, ? extends Object> context) throws ServiceAuthException, ServiceValidationException, GenericServiceException {
+            return runAsyncWait(serviceName, context, true);
+        }
+    }
+
 }