Changeset 99 for java/main/src/main/java/com/framsticks/hosting/ClientAtServer.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/hosting/ClientAtServer.java (modified) (9 diffs)

java/main/src/main/java/com/framsticks/hosting/ClientAtServer.java

@@ -8 +8 @@
 import com.framsticks.communication.queries.GetRequest;
 import com.framsticks.communication.queries.InfoRequest;
+import com.framsticks.communication.queries.RegisterRequest;
 import com.framsticks.communication.queries.SetRequest;
+import com.framsticks.core.LocalTree;
 import com.framsticks.core.Tree;
 import com.framsticks.core.Path;
 import com.framsticks.params.*;
+import com.framsticks.params.types.EventParam;
 import com.framsticks.params.types.ProcedureParam;
 import com.framsticks.parsers.Savers;
 import com.framsticks.util.FramsticksException;
+import com.framsticks.util.Misc;
 import com.framsticks.util.dispatching.AbstractJoinable;
 import com.framsticks.util.dispatching.Dispatching;
@@ -22 +26 @@
 import com.framsticks.util.dispatching.JoinableParent;
 import com.framsticks.util.dispatching.JoinableState;
+import com.framsticks.util.lang.FlagsUtil;
+import com.framsticks.util.lang.Strings;
+
 import static com.framsticks.core.TreeOperations.*;
 
 import java.net.Socket;
-import java.util.LinkedList;
-import java.util.List;
 
 /**
@@ -34 +39 @@
 
         protected final Server server;
-        protected final Tree tree;
+        protected final Tree contentTree;
+        protected final Object treeRootObject;
         protected final ServerSideManagedConnection connection;
+
+        protected final Cli cliObject;
+        protected final LocalTree rootTree;
+
+
+        protected final FramsClass rootFramsClass;
+        protected final Object root;
+        protected final String contentPrefix;
 
         public ClientAtServer(Server server, Socket socket) {
                 this.server = server;
-                this.tree = server.hosted;
+                this.contentTree = server.hosted;
                 this.connection = new ServerSideManagedConnection(socket, this);
+
+                treeRootObject = contentTree.getAssignedRoot().getObject();
+                Misc.throwIfNull(treeRootObject);
+
+                cliObject = new Cli(this);
+                rootTree = new LocalTree();
+                // rootTree.setDispatcher(new AtOnceDispatcher<Tree>());
+                rootTree.setDispatcher(server.getHosted().getDispatcher());
+                assert rootTree.getDispatcher() != null;
+
+                final FramsClass framsClass = bindAccess(contentTree.getAssignedRoot()).getFramsClass();
+                final String id = Strings.uncapitalize(framsClass.getName());
+                contentPrefix = "/" + id;
+                final String rootFramsClassId = id + "Root";
+
+                rootFramsClass = FramsClass.build()
+                        .idAndName(rootFramsClassId)
+                        .param(Param.build().id(id).name(framsClass.getName()).type("o " + framsClass.getId()))
+                        .param(Param.build().id("cli").name("CLI").type("o Cli"))
+                        .finish();
+
+                // rootTree.putInfoIntoCache(rootFramsClass);
+                rootTree.getRegistry().putFramsClass(rootFramsClass);
+                rootTree.getRegistry().registerAndBuild(Cli.class);
+                rootTree.getRegistry().registerAndBuild(CliEvent.class);
+
+                AccessInterface access = new PropertiesAccess(rootFramsClass);
+
+                root = access.createAccessee();
+                access.select(root);
+                access.set(id, treeRootObject);
+                access.set("cli", cliObject);
+
+                rootTree.assignRootParam(access.buildParam(new ParamBuilder()).name(rootFramsClassId).finish(CompositeParam.class));
+                rootTree.assignRootObject(root);
+
         }
 
@@ -52 +102 @@
                 assureNotEmpty(request.getPath());
 
-                tryGet(tree, request.getPath(), new FutureHandler<Path>(responseCallback) {
+                if (request.getPath().startsWith(contentPrefix)) {
+                        String p = request.getPath().substring(contentPrefix.length());
+                        request.path(p.equals("") ? "/" : p);
+                        handleInTree(contentTree, request, responseCallback, contentPrefix);
+                        return;
+                }
+
+                handleInTree(rootTree, request, responseCallback, "");
+        }
+
+        public static File printToFile(String path, AccessInterface access) {
+                ListSink sink = new ListSink();
+                access.save(sink);
+                return new File(path, new ListSource(sink.getOut()));
+        }
+
+        protected void handleInTree(final Tree tree, final ApplicationRequest request, final ServerSideResponseFuture responseCallback, final String usedPrefix) {
+
+                tryGet(tree, request.getActualPath(), new FutureHandler<Path>(responseCallback) {
                         @Override
                         protected void result(final Path path) {
 
-                                if (!path.getTextual().equals(request.getPath())) {
-                                        throw new FramsticksException().msg("invalid path").arg("path", request.getPath());
+                                if (!path.getTextual().equals(request.getActualPath())) {
+                                        throw new FramsticksException().msg("invalid path").arg("path", request.getActualPath());
                                 }
 
                                 // final AccessInterface access = tree.prepareAccess(path);
                                 final AccessInterface access = bindAccess(path);
+
+                                if (request instanceof GetRequest) {
+                                        Object result = path.getTopObject();
+                                        if (result != access.getSelected()) {
+                                                throw new FramsticksException().msg("mismatch objects during fetch").arg("path", path);
+                                        }
+                                        responseCallback.pass(new Response(true, "", File.single(printToFile(path.getTextual(), access))));
+
+                                        return;
+                                }
 
                                 if (request instanceof SetRequest) {
@@ -69 +147 @@
                                                 @Override
                                                 protected void result(Integer flag) {
-                                                        responseCallback.pass(new Response(true, Flags.write(flag, null), null));
+                                                        responseCallback.pass(new Response(true, FlagsUtil.write(SetStateFlags.class, flag, null), null));
 
                                                 }
@@ -76 +154 @@
                                 }
 
-                                if (request instanceof GetRequest) {
-                                        Object result = path.getTopObject();
-                                        if (result != access.getSelected()) {
-                                                throw new FramsticksException().msg("mismatch objects during fetch").arg("path", path);
-                                        }
-                                        List<File> files = new LinkedList<File>();
-                                        ListSink sink = new ListSink();
-                                        access.save(sink);
-                                        files.add(new File(path.getTextual(), new ListSource(sink.getOut())));
-                                        responseCallback.pass(new Response(true, "", files));
-
-                                        return;
-                                }
                                 if (request instanceof CallRequest) {
                                         final CallRequest callRequest = (CallRequest) request;
@@ -107 +172 @@
                                         return;
                                 }
+
                                 if (request instanceof InfoRequest) {
                                         FramsClass framsClass = getInfo(path);
@@ -116 +182 @@
                                 }
 
+                                if (request instanceof RegisterRequest) {
+                                        RegisterRequest register = (RegisterRequest) request;
+
+                                        cliObject.addListener(path, access.getFramsClass().getParamEntry(register.getEventName(), EventParam.class), usedPrefix, responseCallback);
+                                        return;
+                                }
+
                                 throw new FramsticksException().msg("invalid request type: " + request.getCommand());
                         }
@@ -148 +221 @@
         @Override
         public void handle(FramsticksException exception) {
-                tree.handle(exception);
+                contentTree.handle(exception);
+        }
+
+        /**
+         * @return the tree
+         */
+        public Tree getTree() {
+                return contentTree;
         }