Changeset 85 for java/main/src/main/java/com/framsticks/communication/Subscription.java

Timestamp:

06/24/13 13:38:40 (11 years ago)

Author:

psniegowski

Message:

HIGHLIGHTS:

• upgrade to Java 7
  • use try-multi-catch clauses
  • use try-with-resources were appropriate
• configure FindBugs? (use mvn site and then navigate in browser to the report)
  • remove most bugs found
• parametrize Dispatching environment (Dispatcher, RunAt?) to enforce more control on the place of closures actual call

CHANGELOG:
Rework FavouritesXMLFactory.

FindBugs?. Thread start.

FindBugs?. Minor change.

FindBugs?. Iterate over entrySet.

FindBugs?. Various.

FindBug?.

FindBug?. Encoding.

FindBug?. Final fields.

FindBug?.

Remove synchronization bug in ClientConnection?.

Experiments with findbugs.

Finish parametrization.

Make RunAt? an abstract class.

More changes in parametrization.

More changes in parametrizing dispatching.

Several changes to parametrize tasks.

Rename Runnable to RunAt?.

Add specific framsticks Runnable.

Add JSR305 (annotations).

Add findbugs reporting.

More improvements to ParamBuilder? wording.

Make FramsClass? accept also ParamBuilder?.

Change wording of ParamBuilder?.

Change wording of Request creation.

Use Java 7 exception catch syntax.

Add ScopeEnd? class.

Upgrade to Java 7.

File:

• java/main/src/main/java/com/framsticks/communication/Subscription.java (modified) (3 diffs)

java/main/src/main/java/com/framsticks/communication/Subscription.java

@@ -1 +1 @@
 package com.framsticks.communication;
 
+import java.util.List;
+
 import com.framsticks.communication.queries.RegistrationRequest;
-import com.framsticks.util.dispatching.AtOnceDispatcher;
 import com.framsticks.util.dispatching.Dispatcher;
+import com.framsticks.util.dispatching.Dispatching;
+import com.framsticks.util.dispatching.RunAt;
 import com.framsticks.util.StateFunctor;
 import org.apache.log4j.Logger;
@@ -11 +14 @@
  * @author Piotr Sniegowski
  */
-public class Subscription {
+public class Subscription<C> {
 
-    private final static Logger log = Logger.getLogger(Subscription.class);
+        private final static Logger log = Logger.getLogger(Subscription.class);
 
-    private final ClientConnection connection;
-    private final String path;
+        private final ClientConnection connection;
+        private final String path;
         private final String registeredPath;
-    private Dispatcher dispatcher = AtOnceDispatcher.instance;
+        private final Dispatcher<C> dispatcher;
 
         private EventCallback eventCallback;
 
-        public Subscription(ClientConnection connection, String path, String registeredPath) {
+        public Subscription(ClientConnection connection, String path, String registeredPath, Dispatcher<C> dispatcher) {
                 this.connection = connection;
-        this.path = path;
+                this.path = path;
                 this.registeredPath = registeredPath;
+                this.dispatcher = dispatcher;
         }
 
@@ -41 +45 @@
         }
 
-    public void setDispatcher(Dispatcher dispatcher) {
-        this.dispatcher = dispatcher;
-    }
+        public void unsubscribe(final StateFunctor stateFunctor) {
+                //@todo remove that /cli/ prefix, when registeredPath will be a fully qualified path
+                connection.send(new RegistrationRequest().register(false).path(registeredPath), new ResponseCallback<Connection>() {
+                        @Override
+                        public void process(Response response) {
+                                if (!response.getOk()) {
+                                        log.error("failed to unsunscribe " + this + ": " + response.getComment());
+                                        stateFunctor.call(new Exception(response.getComment()));
+                                        return;
+                                }
+                                assert response.hasFiles();
+                                log.debug("unsunscribed " + this);
+                                stateFunctor.call(null);
+                        }
+                });
+        }
 
-    public void unsubscribe(final StateFunctor stateFunctor) {
-        //@todo remove that /cli/ prefix, when registeredPath will be a fully qualified path
-        connection.send(new RegistrationRequest().register(false).setPath(registeredPath), new ResponseCallback() {
-            @Override
-            public void process(Response response) {
-                if (!response.getOk()) {
-                    log.error("failed to unsunscribe " + this + ": " + response.getComment());
-                    stateFunctor.call(new Exception(response.getComment()));
-                    return;
-                }
-                assert response.hasFiles();
-                log.debug("unsunscribed " + this);
-                stateFunctor.call(null);
-            }
-        });
-    }
+        public EventCallback getEventCallback() {
+                return eventCallback;
+        }
 
-    public EventCallback getEventCallback() {
-        return eventCallback;
-    }
+        public Dispatcher<C> getDispatcher() {
+                return dispatcher;
+        }
 
-    public Dispatcher getDispatcher() {
-        return dispatcher;
-    }
+        public void setEventCallback(EventCallback eventCallback) {
+                this.eventCallback = eventCallback;
+        }
 
-    public void setEventCallback(EventCallback eventCallback) {
-        this.eventCallback = eventCallback;
-    }
+        public void dispatchCall(final List<File> files) {
+                Dispatching.invokeLaterOrNow(dispatcher, new RunAt<C>() {
+                        @Override
+                        public void run() {
+                                eventCallback.call(files);
+                        }
+                });
+        }
 }