svn commit: r1858295 [4/5] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/src/ma
Locked
svn commit: r1858295 [4/5] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/src/ma
 
|
Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/GenericResultWaiter.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/GenericResultWaiter.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/GenericResultWaiter.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/GenericResultWaiter.java Sat Apr 27 19:34:25 2019 @@ -42,9 +42,7 @@ public class GenericResultWaiter impleme private Map<String, Object> result = null; private Throwable t = null; - /** - * @see org.apache.ofbiz.service.GenericRequester#receiveResult(java.util.Map) - */ + @Override public synchronized void receiveResult(Map<String, Object> result) { this.result = result; completed = true; @@ -53,9 +51,7 @@ public class GenericResultWaiter impleme if (Debug.verboseOn()) Debug.logVerbose("Received Result (" + completed + ") -- " + result, module); } - /** - * @see org.apache.ofbiz.service.GenericRequester#receiveThrowable(java.lang.Throwable) - */ + @Override public synchronized void receiveThrowable(Throwable t) { this.t = t; completed = true; Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelService.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelService.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelService.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelService.java Sat Apr 27 19:34:25 2019 @@ -281,10 +281,12 @@ public class ModelService extends Abstra this.field = field; } + @Override public String getKey() { return field.getName(); } + @Override public Object getValue() { try { return field.get(ModelService.this); @@ -293,6 +295,7 @@ public class ModelService extends Abstra } } + @Override public Object setValue(Object value) { throw new UnsupportedOperationException(); } @@ -329,10 +332,12 @@ public class ModelService extends Abstra return new Iterator<Map.Entry<String, Object>>() { private int i = 0; + @Override public boolean hasNext() { return i < MODEL_SERVICE_FIELDS.length; } + @Override public Map.Entry<String, Object> next() { if (!hasNext()) { throw new NoSuchElementException(); @@ -340,6 +345,7 @@ public class ModelService extends Abstra return new ModelServiceMapEntry(MODEL_SERVICE_FIELDS[i++]); } + @Override public void remove() { throw new UnsupportedOperationException(); } Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/RunningService.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/RunningService.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/RunningService.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/RunningService.java Sat Apr 27 19:34:25 2019 @@ -78,6 +78,7 @@ public class RunningService { return false; } + @Override public int hashCode() { return System.identityHashCode(this); } Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpression.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpression.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpression.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/calendar/TemporalExpression.java Sat Apr 27 19:34:25 2019 @@ -44,6 +44,7 @@ public abstract class TemporalExpression */ public abstract void accept(TemporalExpressionVisitor visitor); + @Override public int compareTo(TemporalExpression obj) { if (this.equals(obj)) { return 0; Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/GenericAsyncEngine.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/GenericAsyncEngine.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/GenericAsyncEngine.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/GenericAsyncEngine.java Sat Apr 27 19:34:25 2019 @@ -54,26 +54,18 @@ public abstract class GenericAsyncEngine super(dispatcher); } - /** - * @see org.apache.ofbiz.service.engine.GenericEngine#runSync(java.lang.String, org.apache.ofbiz.service.ModelService, java.util.Map) - */ + @Override public abstract Map<String, Object> runSync(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException; - /** - * @see org.apache.ofbiz.service.engine.GenericEngine#runSyncIgnore(java.lang.String, org.apache.ofbiz.service.ModelService, java.util.Map) - */ + @Override public abstract void runSyncIgnore(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException; - /** - * @see org.apache.ofbiz.service.engine.GenericEngine#runAsync(java.lang.String, org.apache.ofbiz.service.ModelService, java.util.Map, boolean) - */ + @Override public void runAsync(String localName, ModelService modelService, Map<String, Object> context, boolean persist) throws GenericServiceException { runAsync(localName, modelService, context, null, persist); } - /** - * @see org.apache.ofbiz.service.engine.GenericEngine#runAsync(java.lang.String, org.apache.ofbiz.service.ModelService, java.util.Map, org.apache.ofbiz.service.GenericRequester, boolean) - */ + @Override public void runAsync(String localName, ModelService modelService, Map<String, Object> context, GenericRequester requester, boolean persist) throws GenericServiceException { DispatchContext dctx = dispatcher.getLocalContext(localName); Job job = null; Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/InterfaceEngine.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/InterfaceEngine.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/InterfaceEngine.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/engine/InterfaceEngine.java Sat Apr 27 19:34:25 2019 @@ -32,40 +32,35 @@ public class InterfaceEngine implements public InterfaceEngine(ServiceDispatcher dispatcher) { } - /** - * @see org.apache.ofbiz.service.engine.GenericEngine#runSync(java.lang.String, org.apache.ofbiz.service.ModelService, java.util.Map) - */ + @Override public Map<String, Object> runSync(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException { throw new GenericServiceException("Interface services cannot be invoked; try invoking an implementing service."); } - /** - * @see org.apache.ofbiz.service.engine.GenericEngine#runSyncIgnore(java.lang.String, org.apache.ofbiz.service.ModelService, java.util.Map) - */ + @Override public void runSyncIgnore(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException { throw new GenericServiceException("Interface services cannot be invoked; try invoking an implementing service."); } - /** - * @see org.apache.ofbiz.service.engine.GenericEngine#runAsync(java.lang.String, org.apache.ofbiz.service.ModelService, java.util.Map, org.apache.ofbiz.service.GenericRequester, boolean) - */ + @Override public void runAsync(String localName, ModelService modelService, Map<String, Object> context, GenericRequester requester, boolean persist) throws GenericServiceException { throw new GenericServiceException("Interface services cannot be invoked; try invoking an implementing service."); } - /** - * @see org.apache.ofbiz.service.engine.GenericEngine#runAsync(java.lang.String, org.apache.ofbiz.service.ModelService, java.util.Map, boolean) - */ + @Override public void runAsync(String localName, ModelService modelService, Map<String, Object> context, boolean persist) throws GenericServiceException { throw new GenericServiceException("Interface services cannot be invoked; try invoking an implementing service."); } + @Override public void sendCallbacks(ModelService modelService, Map<String, Object> context, int mode) throws GenericServiceException { } + @Override public void sendCallbacks(ModelService modelService, Map<String, Object> context, Map<String, Object> result, int mode) throws GenericServiceException { } + @Override public void sendCallbacks(ModelService modelService, Map<String, Object> context, Throwable t, int mode) throws GenericServiceException { } } Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/AbstractJmsListener.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/AbstractJmsListener.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/AbstractJmsListener.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/AbstractJmsListener.java Sat Apr 27 19:34:25 2019 @@ -109,6 +109,7 @@ public abstract class AbstractJmsListene * Receives the MapMessage and processes the service. * @see javax.jms.MessageListener#onMessage(Message) */ + @Override public void onMessage(Message message) { MapMessage mapMessage = null; @@ -127,6 +128,7 @@ public abstract class AbstractJmsListene * On exception try to re-establish connection to the JMS server. * @see javax.jms.ExceptionListener#onException(JMSException) */ + @Override public void onException(JMSException je) { this.setConnected(false); Debug.logError(je, "JMS connection exception", module); @@ -142,19 +144,13 @@ public abstract class AbstractJmsListene } } - /** - * - * @see org.apache.ofbiz.service.jms.GenericMessageListener#refresh() - */ + @Override public void refresh() throws GenericServiceException { this.close(); this.load(); } - /** - * - * @see org.apache.ofbiz.service.jms.GenericMessageListener#isConnected() - */ + @Override public boolean isConnected() { return this.isConnected; } Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsListenerFactory.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsListenerFactory.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsListenerFactory.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsListenerFactory.java Sat Apr 27 19:34:25 2019 @@ -76,6 +76,7 @@ public class JmsListenerFactory implemen thread.start(); } + @Override public void run() { Debug.logInfo("Starting JMS Listener Factory Thread", module); while (firstPass || connected < loadable) { Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsQueueListener.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsQueueListener.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsQueueListener.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsQueueListener.java Sat Apr 27 19:34:25 2019 @@ -59,6 +59,7 @@ public class JmsQueueListener extends Ab this.password = password; } + @Override public void close() throws GenericServiceException { try { session.close(); @@ -68,6 +69,7 @@ public class JmsQueueListener extends Ab } } + @Override public synchronized void load() throws GenericServiceException { try { InitialContext jndi = JNDIContextFactory.getInitialContext(jndiServer); Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsServiceEngine.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsServiceEngine.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsServiceEngine.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsServiceEngine.java Sat Apr 27 19:34:25 2019 @@ -324,32 +324,24 @@ public class JmsServiceEngine extends Ab return result; } - /** - * @see org.apache.ofbiz.service.engine.GenericEngine#runSync(java.lang.String, org.apache.ofbiz.service.ModelService, java.util.Map) - */ + @Override public Map<String, Object> runSync(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException { return run(modelService, context); } - /** - * @see org.apache.ofbiz.service.engine.GenericEngine#runSyncIgnore(java.lang.String, org.apache.ofbiz.service.ModelService, java.util.Map) - */ + @Override public void runSyncIgnore(String localName, ModelService modelService, Map<String, Object> context) throws GenericServiceException { run(modelService, context); } - /** - * @see org.apache.ofbiz.service.engine.GenericEngine#runAsync(java.lang.String, org.apache.ofbiz.service.ModelService, java.util.Map, org.apache.ofbiz.service.GenericRequester, boolean) - */ + @Override public void runAsync(String localName, ModelService modelService, Map<String, Object> context, GenericRequester requester, boolean persist) throws GenericServiceException { Map<String, Object> result = run(modelService, context); requester.receiveResult(result); } - /** - * @see org.apache.ofbiz.service.engine.GenericEngine#runAsync(java.lang.String, org.apache.ofbiz.service.ModelService, java.util.Map, boolean) - */ + @Override public void runAsync(String localName, ModelService modelService, Map<String, Object> context, boolean persist) throws GenericServiceException { run(modelService, context); } Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsTopicListener.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsTopicListener.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsTopicListener.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/jms/JmsTopicListener.java Sat Apr 27 19:34:25 2019 @@ -59,6 +59,7 @@ public class JmsTopicListener extends Ab this.password = password; } + @Override public void close() throws GenericServiceException { try { if (session != null) @@ -70,6 +71,7 @@ public class JmsTopicListener extends Ab } } + @Override public synchronized void load() throws GenericServiceException { try { InitialContext jndi = JNDIContextFactory.getInitialContext(jndiServer); Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/job/JobPoller.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/job/JobPoller.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/job/JobPoller.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/job/JobPoller.java Sat Apr 27 19:34:25 2019 @@ -253,6 +253,7 @@ public final class JobPoller implements // Do not check for interrupts in this method. The design requires the // thread to complete the job manager poll uninterrupted. + @Override public void run() { Debug.logInfo("JobPoller thread started.", module); try { Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/mail/MimeMessageWrapper.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/mail/MimeMessageWrapper.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/mail/MimeMessageWrapper.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/mail/MimeMessageWrapper.java Sat Apr 27 19:34:25 2019 @@ -533,6 +533,7 @@ public class MimeMessageWrapper implemen super(MimeMessageWrapper.class, String.class); } + @Override public String convert(MimeMessageWrapper obj) throws ConversionException { return obj.toString(); } Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RemoteDispatcherImpl.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RemoteDispatcherImpl.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RemoteDispatcherImpl.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RemoteDispatcherImpl.java Sat Apr 27 19:34:25 2019 @@ -52,76 +52,91 @@ public class RemoteDispatcherImpl extend // RemoteDispatcher methods + @Override public Map<String, Object> runSync(String serviceName, Map<String, ? extends Object> context) throws GenericServiceException, RemoteException { this.checkExportFlag(serviceName); return dispatcher.runSync(serviceName, context); } + @Override public Map<String, Object> runSync(String serviceName, Map<String, ? extends Object> context, int transactionTimeout, boolean requireNewTransaction) throws GenericServiceException, RemoteException { this.checkExportFlag(serviceName); return dispatcher.runSync(serviceName, context, transactionTimeout, requireNewTransaction); } + @Override public void runSyncIgnore(String serviceName, Map<String, ? extends Object> context) throws GenericServiceException, RemoteException { this.checkExportFlag(serviceName); dispatcher.runSyncIgnore(serviceName, context); } + @Override public void runSyncIgnore(String serviceName, Map<String, ? extends Object> context, int transactionTimeout, boolean requireNewTransaction) throws GenericServiceException, RemoteException { this.checkExportFlag(serviceName); dispatcher.runSyncIgnore(serviceName, context, transactionTimeout, requireNewTransaction); } + @Override public void runAsync(String serviceName, Map<String, ? extends Object> context, GenericRequester requester, boolean persist, int transactionTimeout, boolean requireNewTransaction) throws GenericServiceException, RemoteException { this.checkExportFlag(serviceName); dispatcher.runAsync(serviceName, context, requester, persist, transactionTimeout, requireNewTransaction); } + @Override public void runAsync(String serviceName, Map<String, ? extends Object> context, GenericRequester requester, boolean persist) throws GenericServiceException, RemoteException { this.checkExportFlag(serviceName); dispatcher.runAsync(serviceName, context, requester, persist); } + @Override public void runAsync(String serviceName, Map<String, ? extends Object> context, GenericRequester requester) throws GenericServiceException, RemoteException { this.checkExportFlag(serviceName); dispatcher.runAsync(serviceName, context, requester); } + @Override public void runAsync(String serviceName, Map<String, ? extends Object> context, boolean persist) throws GenericServiceException, RemoteException { this.checkExportFlag(serviceName); dispatcher.runAsync(serviceName, context, persist); } + @Override public void runAsync(String serviceName, Map<String, ? extends Object> context) throws GenericServiceException, RemoteException { this.checkExportFlag(serviceName); dispatcher.runAsync(serviceName, context); } + @Override public GenericResultWaiter runAsyncWait(String serviceName, Map<String, ? extends Object> context, boolean persist) throws GenericServiceException, RemoteException { this.checkExportFlag(serviceName); return dispatcher.runAsyncWait(serviceName, context, persist); } + @Override public GenericResultWaiter runAsyncWait(String serviceName, Map<String, ? extends Object> context) throws GenericServiceException, RemoteException { this.checkExportFlag(serviceName); return dispatcher.runAsyncWait(serviceName, context); } + @Override public void schedule(String serviceName, Map<String, ? extends Object> context, long startTime, int frequency, int interval, int count, long endTime) throws GenericServiceException, RemoteException { this.checkExportFlag(serviceName); dispatcher.schedule(serviceName, context, startTime, frequency, interval, count, endTime); } + @Override public void schedule(String serviceName, Map<String, ? extends Object> context, long startTime, int frequency, int interval, int count) throws GenericServiceException, RemoteException { this.checkExportFlag(serviceName); dispatcher.schedule(serviceName, context, startTime, frequency, interval, count); } + @Override public void schedule(String serviceName, Map<String, ? extends Object> context, long startTime, int frequency, int interval, long endTime) throws GenericServiceException, RemoteException { this.checkExportFlag(serviceName); dispatcher.schedule(serviceName, context, startTime, frequency, interval, endTime); } + @Override public void schedule(String serviceName, Map<String, ? extends Object> context, long startTime) throws GenericServiceException, RemoteException { this.checkExportFlag(serviceName); dispatcher.schedule(serviceName, context, startTime); Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RmiServiceContainer.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RmiServiceContainer.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RmiServiceContainer.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/RmiServiceContainer.java Sat Apr 27 19:34:25 2019 @@ -57,6 +57,7 @@ public class RmiServiceContainer impleme this.configFile = configFile; } + @Override public boolean start() throws ContainerException { // get the container config ContainerConfig.Configuration cfg = ContainerConfig.getConfiguration(containerName, configFile); @@ -179,6 +180,7 @@ public class RmiServiceContainer impleme remote.deregister(); } + @Override public String getName() { return containerName; } Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLClientSocketFactory.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLClientSocketFactory.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLClientSocketFactory.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLClientSocketFactory.java Sat Apr 27 19:34:25 2019 @@ -39,6 +39,7 @@ public class SSLClientSocketFactory impl public static final String module = SSLClientSocketFactory.class.getName(); + @Override public Socket createSocket(String host, int port) throws IOException { try { SSLSocketFactory factory = SSLUtil.getSSLSocketFactory(); Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLServerSocketFactory.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLServerSocketFactory.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLServerSocketFactory.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/rmi/socket/ssl/SSLServerSocketFactory.java Sat Apr 27 19:34:25 2019 @@ -63,6 +63,7 @@ public class SSLServerSocketFactory impl this.alias = alias; } + @Override public ServerSocket createServerSocket(int port) throws IOException { char[] passphrase = null; if (ksPass != null) { Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/xmlrpc/AliasSupportedTransportFactory.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/xmlrpc/AliasSupportedTransportFactory.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/xmlrpc/AliasSupportedTransportFactory.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/xmlrpc/AliasSupportedTransportFactory.java Sat Apr 27 19:34:25 2019 @@ -54,6 +54,7 @@ public class AliasSupportedTransportFact transport = new AliasSupportedTransport(client, ks, password, alias); } + @Override public XmlRpcTransport getTransport() { return transport; } Modified: ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/TestRunContainer.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/TestRunContainer.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/TestRunContainer.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/testtools/src/main/java/org/apache/ofbiz/testtools/TestRunContainer.java Sat Apr 27 19:34:25 2019 @@ -72,6 +72,7 @@ public class TestRunContainer implements this.jsWrapper = prepareJunitSuiteWrapper(testProps); } + @Override public boolean start() throws ContainerException { boolean failedRun = false; for (ModelTestSuite modelSuite: jsWrapper.getModelTestSuites()) { @@ -102,9 +103,11 @@ public class TestRunContainer implements return true; } + @Override public void stop() { } + @Override public String getName() { return name; } @@ -192,18 +195,22 @@ public class TestRunContainer implements class JunitListener implements TestListener { + @Override public void addError(Test test, Throwable throwable) { Debug.logWarning(throwable, "[JUNIT (error)] - " + getTestName(test) + " : " + throwable.toString(), module); } + @Override public void addFailure(Test test, AssertionFailedError assertionFailedError) { Debug.logWarning("[JUNIT (failure)] - " + getTestName(test) + " : " + assertionFailedError.getMessage(), module); } + @Override public void endTest(Test test) { Debug.logInfo("[JUNIT] : " + getTestName(test) + " finished.", module); } + @Override public void startTest(Test test) { Debug.logInfo("[JUNIT] : " + getTestName(test) + " starting...", module); } Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ContextFilter.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ContextFilter.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ContextFilter.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ContextFilter.java Sat Apr 27 19:34:25 2019 @@ -58,9 +58,7 @@ public class ContextFilter implements Fi private String defaultCharacterEncoding; private boolean isMultitenant; - /** - * @see javax.servlet.Filter#init(javax.servlet.FilterConfig) - */ + @Override public void init(FilterConfig config) throws ServletException { this.config = config; @@ -87,9 +85,7 @@ public class ContextFilter implements Fi new java.security.SecureRandom().nextLong(); } - /** - * @see javax.servlet.Filter#doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet.FilterChain) - */ + @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { HttpServletRequest httpRequest = (HttpServletRequest) request; HttpServletResponse httpResponse = (HttpServletResponse) response; @@ -191,9 +187,7 @@ public class ContextFilter implements Fi chain.doFilter(request, httpResponse); } - /** - * @see javax.servlet.Filter#destroy() - */ + @Override public void destroy() { WebAppUtil.getDispatcher(config.getServletContext()).deregister(); config = null; Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlActivationEventListener.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlActivationEventListener.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlActivationEventListener.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlActivationEventListener.java Sat Apr 27 19:34:25 2019 @@ -34,11 +34,13 @@ public class ControlActivationEventListe public ControlActivationEventListener() {} + @Override public void sessionWillPassivate(HttpSessionEvent event) { ControlEventListener.countPassivateSession(); Debug.logInfo("Passivating session: " + showSessionId(event.getSession()), module); } + @Override public void sessionDidActivate(HttpSessionEvent event) { ControlEventListener.countActivateSession(); Debug.logInfo("Activating session: " + showSessionId(event.getSession()), module); Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java Sat Apr 27 19:34:25 2019 @@ -50,6 +50,7 @@ public class ControlEventListener implem public ControlEventListener() {} + @Override public void sessionCreated(HttpSessionEvent event) { HttpSession session = event.getSession(); @@ -66,6 +67,7 @@ public class ControlEventListener implem Debug.logInfo("Creating session: " + ControlActivationEventListener.showSessionId(session), module); } + @Override public void sessionDestroyed(HttpSessionEvent event) { HttpSession session = event.getSession(); Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginEventListener.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginEventListener.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginEventListener.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginEventListener.java Sat Apr 27 19:34:25 2019 @@ -32,11 +32,13 @@ public class LoginEventListener implemen public LoginEventListener() {} + @Override public void sessionCreated(HttpSessionEvent event) { //for this one do nothing when the session is created... //HttpSession session = event.getSession(); } + @Override public void sessionDestroyed(HttpSessionEvent event) { HttpSession session = event.getSession(); ExternalLoginKeysManager.cleanupExternalLoginKey(session); Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/FileUploadProgressListener.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/FileUploadProgressListener.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/FileUploadProgressListener.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/FileUploadProgressListener.java Sat Apr 27 19:34:25 2019 @@ -35,6 +35,7 @@ public class FileUploadProgressListener protected int items = -1; protected boolean hasStarted = false; + @Override public void update(long bytesRead, long contentLength, int items) { this.contentLength = contentLength; this.bytesRead = bytesRead; Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/GroovyEventHandler.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/GroovyEventHandler.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/GroovyEventHandler.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/GroovyEventHandler.java Sat Apr 27 19:34:25 2019 @@ -69,9 +69,11 @@ public class GroovyEventHandler implemen return Collections.unmodifiableSet(newSet); } + @Override public void init(ServletContext context) throws EventHandlerException { } + @Override public String invoke(Event event, RequestMap requestMap, HttpServletRequest request, HttpServletResponse response) throws EventHandlerException { boolean beganTransaction = false; try { Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/JSONRequestBodyMapHandler.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/JSONRequestBodyMapHandler.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/JSONRequestBodyMapHandler.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/JSONRequestBodyMapHandler.java Sat Apr 27 19:34:25 2019 @@ -29,6 +29,7 @@ import org.apache.ofbiz.base.util.UtilGe /** An implementation of <code>RequestBodyMapHandler</code> that can extract a <code>Map<String, Object></code> from the JSON data in the request body */ public class JSONRequestBodyMapHandler implements RequestBodyMapHandler { + @Override public Map<String, Object> extractMapFromRequestBody(ServletRequest request) throws IOException { return UtilGenerics.<Map<String, Object>>cast(JSON.from(request.getInputStream()).toObject(Map.class)); } Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/JavaEventHandler.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/JavaEventHandler.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/JavaEventHandler.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/JavaEventHandler.java Sat Apr 27 19:34:25 2019 @@ -28,7 +28,6 @@ import javax.servlet.http.HttpServletRes import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.entity.transaction.GenericTransactionException; import org.apache.ofbiz.entity.transaction.TransactionUtil; -import org.apache.ofbiz.webapp.control.ConfigXMLReader; import org.apache.ofbiz.webapp.control.ConfigXMLReader.Event; import org.apache.ofbiz.webapp.control.ConfigXMLReader.RequestMap; @@ -54,15 +53,11 @@ public class JavaEventHandler implements } } - /** - * @see org.apache.ofbiz.webapp.event.EventHandler#init(javax.servlet.ServletContext) - */ + @Override public void init(ServletContext context) throws EventHandlerException { } - /** - * @see org.apache.ofbiz.webapp.event.EventHandler#invoke(ConfigXMLReader.Event, ConfigXMLReader.RequestMap, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) - */ + @Override public String invoke(Event event, RequestMap requestMap, HttpServletRequest request, HttpServletResponse response) throws EventHandlerException { Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RomeEventHandler.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RomeEventHandler.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RomeEventHandler.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/RomeEventHandler.java Sat Apr 27 19:34:25 2019 @@ -25,7 +25,6 @@ import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.ofbiz.webapp.control.ConfigXMLReader; import org.apache.ofbiz.webapp.control.ConfigXMLReader.Event; import org.apache.ofbiz.webapp.control.ConfigXMLReader.RequestMap; import org.apache.ofbiz.webapp.control.RequestHandler; @@ -46,6 +45,7 @@ public class RomeEventHandler implements protected EventHandler service; protected WireFeedOutput out; + @Override public void init(ServletContext context) throws EventHandlerException { // get the service event handler this.service = new ServiceEventHandler(); @@ -53,9 +53,7 @@ public class RomeEventHandler implements this.out = new WireFeedOutput(); } - /** - * @see org.apache.ofbiz.webapp.event.EventHandler#invoke(ConfigXMLReader.Event, ConfigXMLReader.RequestMap, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) - */ + @Override public String invoke(Event event, RequestMap requestMap, HttpServletRequest request, HttpServletResponse response) throws EventHandlerException { RequestHandler handler = (RequestHandler) request.getSession().getServletContext().getAttribute("_REQUEST_HANDLER_"); if (handler == null) { Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/SOAPEventHandler.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/SOAPEventHandler.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/SOAPEventHandler.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/SOAPEventHandler.java Sat Apr 27 19:34:25 2019 @@ -55,7 +55,6 @@ import org.apache.ofbiz.service.LocalDis import org.apache.ofbiz.service.ModelService; import org.apache.ofbiz.service.ServiceUtil; import org.apache.ofbiz.service.engine.SoapSerializer; -import org.apache.ofbiz.webapp.control.ConfigXMLReader; import org.apache.ofbiz.webapp.control.ConfigXMLReader.Event; import org.apache.ofbiz.webapp.control.ConfigXMLReader.RequestMap; import org.apache.ofbiz.webapp.control.RequestHandler; @@ -68,15 +67,11 @@ public class SOAPEventHandler implements public static final String module = SOAPEventHandler.class.getName(); - /** - * @see org.apache.ofbiz.webapp.event.EventHandler#init(javax.servlet.ServletContext) - */ + @Override public void init(ServletContext context) throws EventHandlerException { } - /** - * @see org.apache.ofbiz.webapp.event.EventHandler#invoke(ConfigXMLReader.Event, ConfigXMLReader.RequestMap, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) - */ + @Override public String invoke(Event event, RequestMap requestMap, HttpServletRequest request, HttpServletResponse response) throws EventHandlerException { LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher"); Delegator delegator = (Delegator) request.getAttribute("delegator"); Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceEventHandler.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceEventHandler.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceEventHandler.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceEventHandler.java Sat Apr 27 19:34:25 2019 @@ -44,7 +44,6 @@ import org.apache.ofbiz.service.ModelPar import org.apache.ofbiz.service.ModelService; import org.apache.ofbiz.service.ServiceAuthException; import org.apache.ofbiz.service.ServiceValidationException; -import org.apache.ofbiz.webapp.control.ConfigXMLReader; import org.apache.ofbiz.webapp.control.ConfigXMLReader.Event; import org.apache.ofbiz.webapp.control.ConfigXMLReader.RequestMap; import org.apache.ofbiz.webapp.control.ControlActivationEventListener; @@ -60,15 +59,11 @@ public class ServiceEventHandler impleme public static final String SYNC = "sync"; public static final String ASYNC = "async"; - /** - * @see org.apache.ofbiz.webapp.event.EventHandler#init(javax.servlet.ServletContext) - */ + @Override public void init(ServletContext context) throws EventHandlerException { } - /** - * @see org.apache.ofbiz.webapp.event.EventHandler#invoke(ConfigXMLReader.Event, ConfigXMLReader.RequestMap, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) - */ + @Override public String invoke(Event event, RequestMap requestMap, HttpServletRequest request, HttpServletResponse response) throws EventHandlerException { // make sure we have a valid reference to the Service Engine LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher"); Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceMultiEventHandler.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceMultiEventHandler.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceMultiEventHandler.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceMultiEventHandler.java Sat Apr 27 19:34:25 2019 @@ -66,16 +66,12 @@ public class ServiceMultiEventHandler im protected ServletContext servletContext; - /** - * @see org.apache.ofbiz.webapp.event.EventHandler#init(javax.servlet.ServletContext) - */ + @Override public void init(ServletContext servletContext) throws EventHandlerException { this.servletContext = servletContext; } - /** - * @see org.apache.ofbiz.webapp.event.EventHandler#invoke(ConfigXMLReader.Event, ConfigXMLReader.RequestMap, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) - */ + @Override public String invoke(Event event, RequestMap requestMap, HttpServletRequest request, HttpServletResponse response) throws EventHandlerException { // TODO: consider changing this to use the new UtilHttp.parseMultiFormData method Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/SimpleEventHandler.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/SimpleEventHandler.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/SimpleEventHandler.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/SimpleEventHandler.java Sat Apr 27 19:34:25 2019 @@ -31,7 +31,6 @@ import org.apache.ofbiz.entity.transacti import org.apache.ofbiz.entity.transaction.TransactionUtil; import org.apache.ofbiz.minilang.MiniLangException; import org.apache.ofbiz.minilang.SimpleMethod; -import org.apache.ofbiz.webapp.control.ConfigXMLReader; import org.apache.ofbiz.webapp.control.ConfigXMLReader.Event; import org.apache.ofbiz.webapp.control.ConfigXMLReader.RequestMap; @@ -44,15 +43,11 @@ public class SimpleEventHandler implemen /** Contains the property file name for translation of error messages. */ public static final String err_resource = "WebappUiLabels"; - /** - * @see org.apache.ofbiz.webapp.event.EventHandler#init(javax.servlet.ServletContext) - */ + @Override public void init(ServletContext context) throws EventHandlerException { } - /** - * @see org.apache.ofbiz.webapp.event.EventHandler#invoke(ConfigXMLReader.Event, ConfigXMLReader.RequestMap, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) - */ + @Override public String invoke(Event event, RequestMap requestMap, HttpServletRequest request, HttpServletResponse response) throws EventHandlerException { boolean beganTransaction = false; Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/XmlRpcEventHandler.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/XmlRpcEventHandler.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/XmlRpcEventHandler.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/XmlRpcEventHandler.java Sat Apr 27 19:34:25 2019 @@ -47,7 +47,6 @@ import org.apache.ofbiz.service.LocalDis import org.apache.ofbiz.service.ModelService; import org.apache.ofbiz.service.ServiceContainer; import org.apache.ofbiz.service.ServiceUtil; -import org.apache.ofbiz.webapp.control.ConfigXMLReader; import org.apache.ofbiz.webapp.control.ConfigXMLReader.Event; import org.apache.ofbiz.webapp.control.ConfigXMLReader.RequestMap; import org.apache.xmlrpc.XmlRpcException; @@ -81,6 +80,7 @@ public class XmlRpcEventHandler extends private Boolean enabledForExtensions = null; private Boolean enabledForExceptions = null; + @Override public void init(ServletContext context) throws EventHandlerException { String delegatorName = context.getInitParameter("entityDelegatorName"); this.delegator = DelegatorFactory.getDelegator(delegatorName); @@ -97,9 +97,7 @@ public class XmlRpcEventHandler extends } } - /** - * @see org.apache.ofbiz.webapp.event.EventHandler#invoke(ConfigXMLReader.Event, ConfigXMLReader.RequestMap, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) - */ + @Override public String invoke(Event event, RequestMap requestMap, HttpServletRequest request, HttpServletResponse response) throws EventHandlerException { String report = request.getParameter("echo"); if (report != null) { @@ -183,6 +181,7 @@ public class XmlRpcEventHandler extends class OfbizRpcAuthHandler implements AbstractReflectiveHandlerMapping.AuthenticationHandler { + @Override public boolean isAuthorized(XmlRpcRequest xmlRpcReq) throws XmlRpcException { XmlRpcHttpRequestConfig config = (XmlRpcHttpRequestConfig) xmlRpcReq.getConfig(); @@ -272,6 +271,7 @@ public class XmlRpcEventHandler extends } } + @Override protected XmlRpcRequest getRequest(final XmlRpcStreamRequestConfig pConfig, InputStream pStream) throws XmlRpcException { final XmlRpcRequestParser parser = new XmlRpcRequestParser(pConfig, getTypeFactory()); @@ -288,15 +288,19 @@ public class XmlRpcEventHandler extends } final List<?> params = parser.getParams(); return new XmlRpcRequest() { + @Override public XmlRpcRequestConfig getConfig() { return pConfig; } + @Override public String getMethodName() { return parser.getMethodName(); } + @Override public int getParameterCount() { return params == null ? 0 : params.size(); } + @Override public Object getParameter(int pIndex) { return params.get(pIndex); } @@ -323,6 +327,7 @@ public class XmlRpcEventHandler extends return this; } + @Override public Object execute(XmlRpcRequest xmlRpcReq) throws XmlRpcException { DispatchContext dctx = dispatcher.getDispatchContext(); String serviceName = xmlRpcReq.getMethodName(); @@ -438,15 +443,18 @@ public class XmlRpcEventHandler extends return response; } + @Override public InputStream newInputStream() throws IOException { return request.getInputStream(); } + @Override public OutputStream newOutputStream() throws IOException { response.setContentType("text/xml"); return response.getOutputStream(); } + @Override public void close() throws IOException { response.getOutputStream().close(); } Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/FreeMarkerViewHandler.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/FreeMarkerViewHandler.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/FreeMarkerViewHandler.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/FreeMarkerViewHandler.java Sat Apr 27 19:34:25 2019 @@ -47,11 +47,13 @@ public class FreeMarkerViewHandler exten public static final String module = FreeMarkerViewHandler.class.getName(); protected Configuration config = (Configuration) FreeMarkerWorker.getDefaultOfbizConfig().clone(); + @Override public void init(ServletContext context) throws ViewHandlerException { config.setCacheStorage(new OfbizCacheStorage("unknown")); config.setServletContextForTemplateLoading(context, "/"); } + @Override public void render(String name, String page, String info, String contentType, String encoding, HttpServletRequest request, HttpServletResponse response) throws ViewHandlerException { if (UtilValidate.isEmpty(page)) Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/LoopWriter.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/LoopWriter.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/LoopWriter.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/LoopWriter.java Sat Apr 27 19:34:25 2019 @@ -29,14 +29,17 @@ public class LoopWriter extends Writer i public LoopWriter(Writer out) { } + @Override public int onStart() throws TemplateModelException, IOException { return TransformControl.EVALUATE_BODY; } + @Override public int afterBody() throws TemplateModelException, IOException { return TransformControl.END_EVALUATION; } + @Override public void onError(Throwable t) throws Throwable { throw t; } Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizCacheStorage.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizCacheStorage.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizCacheStorage.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizCacheStorage.java Sat Apr 27 19:34:25 2019 @@ -33,18 +33,22 @@ public class OfbizCacheStorage implement this.localCache = UtilCache.createUtilCache("webapp.FreeMarkerCache." + id, 0, 0, false); } + @Override public Object get(Object key) { return localCache.get(key); } + @Override public void put(Object key, Object value) { localCache.put(key, value); } + @Override public void remove(Object key) { localCache.remove(key); } + @Override public void clear() { localCache.clear(); } Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/AbstractViewHandler.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/AbstractViewHandler.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/AbstractViewHandler.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/AbstractViewHandler.java Sat Apr 27 19:34:25 2019 @@ -24,10 +24,12 @@ package org.apache.ofbiz.webapp.view; public abstract class AbstractViewHandler implements ViewHandler { protected String name = null; + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/ApacheFopWorker.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/ApacheFopWorker.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/ApacheFopWorker.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/ApacheFopWorker.java Sat Apr 27 19:34:25 2019 @@ -253,6 +253,7 @@ public final class ApacheFopWorker { this.defaultResolver = defaultResolver; } + @Override public Source resolve(String href, String base) throws TransformerException { URL locationUrl = null; try { Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/HttpViewHandler.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/HttpViewHandler.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/HttpViewHandler.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/HttpViewHandler.java Sat Apr 27 19:34:25 2019 @@ -36,9 +36,11 @@ public class HttpViewHandler extends Abs public static final String module = HttpViewHandler.class.getName(); + @Override public void init(ServletContext context) throws ViewHandlerException { } + @Override public void render(String name, String page, String info, String contentType, String encoding, HttpServletRequest request, HttpServletResponse response) throws ViewHandlerException { // some containers call filters on EVERY request, even forwarded ones, // so let it know that it came from the control servlet Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/JspViewHandler.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/JspViewHandler.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/JspViewHandler.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/view/JspViewHandler.java Sat Apr 27 19:34:25 2019 @@ -40,10 +40,12 @@ public class JspViewHandler extends Abst protected ServletContext context; + @Override public void init(ServletContext context) throws ViewHandlerException { this.context = context; } + @Override public void render(String name, String page, String contentType, String encoding, String info, HttpServletRequest request, HttpServletResponse response) throws ViewHandlerException { // some containers call filters on EVERY request, even forwarded ones, // so let it know that it came from the control servlet Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ArtifactInfoBase.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ArtifactInfoBase.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ArtifactInfoBase.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/artifactinfo/ArtifactInfoBase.java Sat Apr 27 19:34:25 2019 @@ -33,6 +33,7 @@ public abstract class ArtifactInfoBase i this.aif = aif; } + @Override public int compareTo(ArtifactInfoBase that) { if (that == null) { return -1; Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/AbstractModelCondition.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/AbstractModelCondition.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/AbstractModelCondition.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/AbstractModelCondition.java Sat Apr 27 19:34:25 2019 @@ -170,6 +170,7 @@ public abstract class AbstractModelCondi } }; + @Override public ModelCondition newInstance(ModelWidget modelWidget, Element conditionElement) { return newInstance(this, modelWidget, conditionElement); } Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelGrid.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelGrid.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelGrid.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelGrid.java Sat Apr 27 19:34:25 2019 @@ -60,6 +60,7 @@ public class ModelGrid extends ModelForm visitor.visit(this); } + @Override protected ModelForm getParentModel(Element gridElement, ModelReader entityModelReader, DispatchContext dispatchContext) { ModelForm parentModel = null; String parentResource = gridElement.getAttribute("extends-resource"); Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreenWidget.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreenWidget.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreenWidget.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreenWidget.java Sat Apr 27 19:34:25 2019 @@ -1642,6 +1642,7 @@ public abstract class ModelScreenWidget } } + @Override public String getName() { return link.getName(); } @@ -1775,6 +1776,7 @@ public abstract class ModelScreenWidget public static final String TAG_NAME = "image"; private final Image image; + @Override public String getName() { return image.getName(); } Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelSingleForm.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelSingleForm.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelSingleForm.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelSingleForm.java Sat Apr 27 19:34:25 2019 @@ -61,6 +61,7 @@ public class ModelSingleForm extends Mod visitor.visit(this); } + @Override protected ModelForm getParentModel(Element formElement, ModelReader entityModelReader, DispatchContext dispatchContext) { ModelForm parent = null; String parentResource = formElement.getAttribute("extends-resource"); Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelWidgetCondition.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelWidgetCondition.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelWidgetCondition.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelWidgetCondition.java Sat Apr 27 19:34:25 2019 @@ -160,6 +160,7 @@ public abstract class ModelWidgetConditi } }; + @Override public Condition newInstance(ModelWidget modelWidget, Element conditionElement) { if (conditionElement == null) { return TRUE; Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/MenuWrapTransform.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/MenuWrapTransform.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/MenuWrapTransform.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/MenuWrapTransform.java Sat Apr 27 19:34:25 2019 @@ -73,6 +73,7 @@ public class MenuWrapTransform implement public static final String [] saveKeyNames = {"contentId", "subContentId", "subDataResourceTypeId", "mimeTypeId", "whenMap", "locale", "wrapTemplateId", "encloseWrapText", "nullThruDatesOnly", "renderOnStart", "renderOnClose", "menuDefFile", "menuName", "associatedContentId", "wrapperClassName"}; + @Override @SuppressWarnings("rawtypes") public Writer getWriter(final Writer out, Map args) { final Environment env = Environment.getCurrentEnvironment(); Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/VisualTheme.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/VisualTheme.java?rev=1858295&r1=1858294&r2=1858295&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/VisualTheme.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/VisualTheme.java Sat Apr 27 19:34:25 2019 @@ -79,6 +79,7 @@ public final class VisualTheme implement return modelTheme; } + @Override public String toString() { StringBuilder toString = new StringBuilder("visual-theme-id:").append(visualThemeId) .append(", display-name: ").append(this.displayName) |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |