Changeset 99 for java/main/src/main/java/com/framsticks/communication/ClientSideManagedConnection.java

Timestamp:

07/10/13 22:41:02 (11 years ago)

Author:

psniegowski

Message:

HIGHLIGTS:

• complete events implementation
  • visible as EventListener?<Argument> from Java code
  • support in both RemoteTree? and LocalTree?
  • support at Java server side
  • automated argument printing and parsing
  • EventParams? are recognized when building FramsClass? from annotation for Java classes
• add CLI in Java Framsticks server
• add automatic registration for events in GUI
• improve objects fetching (object are never overwritten with new instances)
• properly react for ListChange? events
• add ListPanel? with table view
  • columns to be shown may be statically specified in configuration
  • currently modyfying data through tables is not available
• improve maven configuration
  • configuration file may be specified without touching pom.xml

CHANGELOG:
Extract constants from Flags into ParamFlags? and SetStateFlags?.

Extract flags I/O to FlagsUtils? class.

Configured maven to exec given resource configuration.

For example:
mvn exec:exec -Dframsticks.config=/configs/managed-console.xml

Cleanup pom.xml

Rename ObjectTree? to LocalTree? (also make LocalTree? and RemoteTree? final).

Minor change.

Add maximum number of columns in ListPanelProvider?.

Improve ColumnsConfig? interpretation.

Automatically fill FramsClass?.name if trying to construct empty.

Improve identitifer case mangling in XmlLoader?.

Introduce configurable ColumnsConfig?.

Draft working version of ListPanel?.

Table is being shown (although empty).

More improvements to table building.

Move some functionality from Frame to TreeModel?.

Move tree classes in gui to separate package.

Remove old table related classes.

Add draft implementation of TableModel?.

Redirect ParamBuilder?.forAccess to AccessInterface?.

Optimize ParamBuilder?.forAccess()

Do not clear list when loading.

Do not load fetched values directly.

Implement different AccessInterface? copying policy.

Optimize fetching values routine.

Remove Mode enum (work out get semantics).

Some improvements to ListChange? handling.

Improve UniqueListAccess?.

Add reaction for ListChanges? in the TreeNode?.

EventListeners? are being added in the TreeNode?.

Listeners for ListParams? are now very naive (they download
whole list).

Automatially register on events in GUI.

Events are working in RemoteTree? and Server.

Move listeners to the ClientSideManagedConnection?.

Remove old classes responsible for event subscriptions.

Improve event reading.

Improve events handling at server side.

Add register attribute in FramsClassAnnotation?
to automatically also register other classes.

Registering events works.

Setup for remote listeners registration.

More improvements.

Minor changes.

Add rootTree to the ClientAtServer?.

Moving CLI to the ClientAtServer?.

Fix bug: use Void.TYPE instead of Void.class

More development around CLI.

• Improve Path resolving.

Add synthetic root to ObjectTree?.

It is needed to allow sybling for the original root
that would containg CLI.

Some work with registering events in RemoteTree?.

Draft implementation of listener registering in RemoteTree?.

Support events registration in the ObjectTree?.

Add events support to ReflectionAccess?.

EventParam? is recognized by ParamCandidate?.

Prepare interface for Events across project.

Add EventListener? and API for listeners in Tree.

File:

• java/main/src/main/java/com/framsticks/communication/ClientSideManagedConnection.java (modified) (7 diffs)

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

@@ -2 +2 @@
 
 import com.framsticks.communication.queries.ApplicationRequest;
+import com.framsticks.communication.queries.CallRequest;
 import com.framsticks.communication.queries.ProtocolRequest;
-import com.framsticks.communication.queries.RegistrationRequest;
+import com.framsticks.communication.queries.RegisterRequest;
 import com.framsticks.communication.queries.UseRequest;
 import com.framsticks.communication.queries.VersionRequest;
-import com.framsticks.communication.util.LoggingStateCallback;
+import com.framsticks.core.Path;
 import com.framsticks.params.ListSource;
 import com.framsticks.util.*;
@@ -18 +19 @@
 import com.framsticks.util.lang.Pair;
 import com.framsticks.util.lang.Strings;
+import com.framsticks.params.EventListener;
 
 import org.apache.log4j.Logger;
@@ -32 +34 @@
         private final static Logger log = Logger.getLogger(ClientSideManagedConnection.class);
 
-        protected final Map<String, Subscription<?>> subscriptions = new HashMap<>();
-
         private final List<Runnable> applicationRequestsBuffer = new LinkedList<>();
         private boolean isHandshakeDone = false;
+
 
         /**
@@ -93 +94 @@
         }
 
-        private static class EventFire extends InboundMessage {
-                public final Subscription<?> subscription;
-
-                private EventFire(Subscription<?> subscription) {
-                        this.subscription = subscription;
-                }
-
-                public void startFile(String path) {
-                        assert path == null;
-                        initCurrentFile(null);
-                }
-
-                @Override
-                public void eof() {
-                        finishCurrentFile();
-
-                        subscription.dispatchCall(getFiles());
-                }
+        protected List<String> readFileContent() {
+                List<String> content = new LinkedList<String>();
+                String line;
+                while (!(line = getLine()).startsWith("eof")) {
+                        content.add(line);
+                }
+                return content;
         }
 
@@ -239 +229 @@
         }
 
-        public <C> void subscribe(final String path, final Dispatcher<C> dispatcher, final SubscriptionCallback<? extends C> callback) {
-                send(new RegistrationRequest().path(path), AtOnceDispatcher.getInstance(), new ClientSideResponseFuture(callback) {
-                        @Override
-                        protected void processOk(Response response) {
-                                assert response.getFiles().isEmpty();
-                                Subscription<C> subscription = new Subscription<C>(ClientSideManagedConnection.this, path, response.getComment(), dispatcher);
-                                log.debug("registered on event: " + subscription);
-                                synchronized (subscriptions) {
-                                        subscriptions.put(subscription.getRegisteredPath(), subscription);
-                                }
-                                subscription.setEventCallback(callback.subscribed(subscription));
-                                if (subscription.getEventCallback() == null) {
-                                        log.info("subscription for " + path + " aborted");
-                                        subscription.unsubscribe(new LoggingStateCallback(log, "abort subscription"));
-                                }
-                        }
-                });
-        }
 
         private void sendQueryVersion(final int version, final Future<Void> future) {
@@ -322 +294 @@
                 Matcher matcher = Request.EVENT_PATTERN.matcher(rest);
                 if (!matcher.matches()) {
-                        log.error("invalid event line: " + rest);
-                        return;
-                }
-                Subscription<?> subscription = subscriptions.get(matcher.group(1));
-                if (subscription == null) {
-                        log.error("non subscribed event: " + matcher.group(1));
-                        return;
-                }
-                EventFire event = new EventFire(subscription);
-                event.startFile(null);
-                processMessage(event);
+                        throw new FramsticksException().msg("invalid event line").arg("rest", rest);
+                }
+                String fileLine = getLine();
+                if (!fileLine.equals("file")) {
+                        throw new FramsticksException().msg("expected file line").arg("got", fileLine);
+                }
+                String eventObjectPath = Request.takeGroup(rest, matcher, 1).toString();
+                String eventCalleePath = Request.takeGroup(rest, matcher, 2).toString();
+                final File file = new File("", new ListSource(readFileContent()));
+                log.debug("firing event " + eventObjectPath);
+                EventListener<File> listener;
+                synchronized (registeredListeners) {
+                        listener = registeredListeners.get(eventObjectPath);
+                }
+                if (listener  == null) {
+                        throw new FramsticksException().msg("failed to find registered event").arg("event path", eventObjectPath).arg("object", eventCalleePath);
+                }
+                listener.action(file);
         }
 
@@ -397 +376 @@
         }
 
+        protected final Map<String, EventListener<File>> registeredListeners = new HashMap<>();
+
+        public <C> void addListener(String path, final EventListener<File> listener, final Dispatcher<C> dispatcher, final Future<Void> future) {
+                send(new RegisterRequest().path(path), dispatcher, new ClientSideResponseFuture(future) {
+                        @Override
+                        protected void processOk(Response response) {
+                                synchronized (registeredListeners) {
+                                        registeredListeners.put(Path.validateString(response.getComment()), listener);
+                                }
+                                future.pass(null);
+                        }
+                });
+        }
+
+        public <C> void removeListener(EventListener<File> listener, final Dispatcher<C> dispatcher, final Future<Void> future) {
+                String eventPath = null;
+                synchronized (registeredListeners) {
+                        for (Map.Entry<String, EventListener<File>> e : registeredListeners.entrySet()) {
+                                if (e.getValue() == listener) {
+                                        eventPath = e.getKey();
+                                        break;
+                                }
+                        }
+                }
+                if (eventPath == null) {
+                        future.handle(new FramsticksException().msg("listener is not registered").arg("listener", listener));
+                        return;
+                }
+
+                final String finalEventPath = eventPath;
+                                //TODO add arguments to the exception
+                send(new CallRequest().procedure("remove").path(eventPath), dispatcher, new ClientSideResponseFuture(future) {
+
+                        @Override
+                        protected void processOk(Response response) {
+                                synchronized (registeredListeners) {
+                                        registeredListeners.remove(finalEventPath);
+                                }
+                                future.pass(null);
+                        }
+                });
+        }
 }