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

Timestamp:

07/14/13 23:20:04 (11 years ago)

Author:

psniegowski

Message:

HIGHLIGHTS:

• improve tree side notes
• improve GUI layout
• add foldable list of occured events to EventControl?
• improve automatic type conversion in proxy listeners
• implement several Access functionalities as algorithms independent of Access type
• introduce draft base classes for distributed experiments
• automatically register dependant Java classes to FramsClass? registry
• add testing prime experiment and configuration
• simplify and improve task dispatching

CHANGELOG:
Improve task dispatching in RemoteTree?.

GUI no longer hangs on connection problems.

Make all dispatchers joinables.

Refactorize Thread dispatcher.

Remove Task and PeriodicTask?.

Use Java utilities in those situations.

Reworking tasks dispatching.

Fix bug in EventControl? listener dispatching.

Minor improvements.

Add testing configuration for ExternalProcess? in GUI.

More improvement to prime.

Support for USERREADONLY in GUI.

Add that flag to various params in Java classes.

Remove redundant register clauses from several FramsClassAnnotations?.

Automatically gather and register dependant classes.

Add configuration for prime.

Improve Simulator class.

Add prime.xml configuration.

Introduce draft Experiment and Simulator classes.

Add prime experiment tests.

Enclose typical map with listeners into SimpleUniqueList?.

Needfile works in GUI.

Improve needfile handling in Browser.

More improvement with NeedFile?.

Implementing needfile.

Update test.

Rename ChangeEvent? to TestChangeEvent?.

Automatic argument type search in RemoteTree? listeners.

MultiParamLoader? uses AccessProvider?. By default old implementation
enclosed in AccessStash? or Registry.

Minor changes.

Rename SourceInterface? to Source.

Also improve toString of File and ListSource?.

Remove unused SimpleSource? class.

Add clearing in HistoryControl?.

Show entries in table at EventControl?.

Improve EventControl?.

Add listeners registration to EventControl?.

Add foldable table to HistoryControl?.

Add control row to Procedure and Event controls.

Improve layout of controls.

Another minor change to gui layout.

Minor improvement in the SliderControl?.

Minor changes.

Move ReflectionAccess?.Backend to separate file.

It was to cluttered.

Cleanup in ReflectionAccess?.

Move setMin, setMax, setDef to AccessOperations?.

Extract loading operation into AccessOperations?.

Append Framsticks to name of UnsupportedOperationException?.

The java.lang.UnsupportedOperationException? was shadowing this class.

Rename params.Util to params.ParamsUtil?.

Several improvements.

• Merge ValueControlListener? into ControlOwner?.
• Remove several deprecated utility classes.
• Add EventListeners? utility container.

Minor changes.

Implement revert functionality.

Improve local changes management.

Minor improvement.

Remove methods rendered superfluous after SideNoteKey? improvement.

Improve SideNoteKey?.

It is now generic type, so explicit type specification at
call site is no more needed.

Introduce SideNoteKey? interface.

Only Objects implementing that key may be used as side note keys.

Minor improvements.

Use strings instead of ValueControls? in several gui mappings.

File:

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

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

@@ -3 +3 @@
 import com.framsticks.communication.queries.ApplicationRequest;
 import com.framsticks.communication.queries.CallRequest;
+import com.framsticks.communication.queries.NeedFile;
+import com.framsticks.communication.queries.NeedFileAcceptor;
 import com.framsticks.communication.queries.ProtocolRequest;
 import com.framsticks.communication.queries.RegisterRequest;
@@ -43 +45 @@
         private boolean isHandshakeDone = false;
 
+        protected NeedFileAcceptor needFileAcceptor;
+
+        /**
+         * @return the needFileAcceptor
+         */
+        public NeedFileAcceptor getNeedFileAcceptor() {
+                return needFileAcceptor;
+        }
+
+        /**
+         * @param needFileAcceptor the needFileAcceptor to set
+         */
+        public void setNeedFileAcceptor(NeedFileAcceptor needFileAcceptor) {
+                this.needFileAcceptor = needFileAcceptor;
+        }
 
         /**
@@ -64 +81 @@
                 protocolVersion = -1;
         }
-
-
 
         protected List<String> readFileContent() {
@@ -116 +131 @@
         }
 
-        private Map<Integer, SentQuery<?>> queryMap = new HashMap<>();
-
-        private SentQuery<?> currentlySentQuery;
-
         public void send(ProtocolRequest request, ClientSideResponseFuture callback) {
                 //TODO RunAt
@@ -154 +165 @@
                 sentQuery.dispatcher = dispatcher;
 
+
                 senderThread.dispatch(new RunAt<Connection>(callback) {
                         @Override
                         protected void runAt() {
-                                Integer id;
-                                synchronized (ClientSideManagedConnection.this) {
-
-                                        while (!(requestIdEnabled || currentlySentQuery == null)) {
-                                                try {
-                                                        ClientSideManagedConnection.this.wait();
-                                                } catch (InterruptedException ignored) {
-                                                        break;
-                                                }
-                                        }
-                                        if (requestIdEnabled) {
-                                                queryMap.put(nextQueryId, sentQuery);
-                                                id = nextQueryId++;
-                                        } else {
-                                                currentlySentQuery = sentQuery;
-                                                id = null;
-                                        }
-                                }
+                                Integer id = sentQueries.put(null, sentQuery);
+
                                 String command = sentQuery.request.getCommand();
                                 StringBuilder message = new StringBuilder();
@@ -188 +184 @@
                                 flushOut();
                                 log.debug("sending query: {}", out);
-
                         }
                 });
-                /*
-                synchronized (this) {
-                        log.debug("queueing query: {}", query);
-                        queryQueue.offer(sentQuery);
-                        notifyAll();
-                }
-                 */
         }
 
@@ -204 +192 @@
                 return "client connection " + address;
         }
-
 
         private void sendQueryVersion(final int version, final Future<Void> future) {
@@ -229 +216 @@
         }
 
-        private synchronized @Nonnull SentQuery<?> fetchQuery(@Nullable Integer id, boolean remove) {
-                try {
-                        if (id == null) {
-                                if (requestIdEnabled) {
-                                        throw new FramsticksException().msg("request_id is enabled and id is missing");
-                                }
-                                SentQuery<?> result = currentlySentQuery;
-                                if (remove) {
-                                        currentlySentQuery = null;
-                                        notifyAll();
-                                }
-                                return result;
-                        }
-
-                        if (!queryMap.containsKey(id)) {
-                                throw new FramsticksException().msg("id is unknown").arg("id", id);
-                        }
-
-                        SentQuery<?> result = queryMap.get(id);
-                        if (remove) {
-                                queryMap.remove(id);
-                        }
-                        return result;
-
-                } catch (FramsticksException e) {
-                        throw new FramsticksException().msg("failed to match response to sent query").cause(e);
-                }
-        }
+        protected class IdCollection<T> {
+
+
+                protected final Map<Integer, T> map = new HashMap<>();
+                protected T current;
+
+                public Integer put(Integer idProposition, T value) {
+                        synchronized (ClientSideManagedConnection.this) {
+                                while (!(requestIdEnabled || current == null)) {
+                                        try {
+                                                ClientSideManagedConnection.this.wait();
+                                        } catch (InterruptedException ignored) {
+                                                break;
+                                        }
+                                }
+                                if (!requestIdEnabled) {
+                                        current = value;
+                                        return null;
+                                }
+                                if (idProposition == null) {
+                                        idProposition = nextQueryId++;
+                                }
+                                map.put(idProposition, value);
+                                return idProposition;
+                        }
+                }
+
+                public void clear(Integer id) {
+                        if (requestIdEnabled) {
+                                current = null;
+                        } else {
+                                map.remove(id);
+                        }
+                }
+
+                public @Nonnull T fetch(@Nullable Integer id, boolean remove) {
+                        synchronized (ClientSideManagedConnection.this) {
+                                try {
+                                        if (id == null) {
+                                                if (requestIdEnabled) {
+                                                        throw new FramsticksException().msg("request_id is enabled and id is missing");
+                                                }
+                                                T result = current;
+                                                current = null;
+                                                ClientSideManagedConnection.this.notifyAll();
+                                                return result;
+                                        }
+                                        if (!map.containsKey(id)) {
+                                                throw new FramsticksException().msg("id is unknown").arg("id", id);
+                                        }
+
+                                        T result = map.get(id);
+                                        if (remove) {
+                                                map.remove(id);
+                                        }
+                                        return result;
+
+                                } catch (FramsticksException e) {
+                                        throw new FramsticksException().msg("failed to match response to sent query").cause(e);
+                                }
+                        }
+                }
+        }
+
+        protected IdCollection<SentQuery<?>> sentQueries = new IdCollection<>();
+        protected IdCollection<NeedFile> needFiles = new IdCollection<>();
 
         private int nextQueryId = 0;
@@ -269 +294 @@
                         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();
+                String eventObjectPath = Strings.takeGroup(rest, matcher, 1).toString();
+                String eventCalleePath = Strings.takeGroup(rest, matcher, 2).toString();
                 final File file = new File("", new ListSource(readFileContent()));
                 log.debug("firing event {}", eventObjectPath);
@@ -277 +302 @@
                         listener = registeredListeners.get(eventObjectPath);
                 }
-                if (listener  == null) {
+                if (listener == null) {
                         throw new FramsticksException().msg("failed to find registered event").arg("event path", eventObjectPath).arg("object", eventCalleePath);
                 }
@@ -283 +308 @@
         }
 
+        protected void processNeedFile(Pair<Integer, CharSequence> rest) {
+                final Integer id = rest.first;
+                String suggestedName = null;
+                String description = null;
+                Pair<CharSequence, CharSequence> s = Request.takeString(rest.second);
+                if (s != null) {
+                        suggestedName = s.first.toString();
+                        Pair<CharSequence, CharSequence> d = Request.takeString(s.second);
+                        if (d != null) {
+                                description = d.first.toString();
+                        }
+                }
+
+                final Future<File> future = new Future<File>() {
+
+                        protected void send(final File result) {
+                                log.info("sending file: " + result);
+                                needFiles.clear(id);
+                                sendFile(null, result, id, ClientSideManagedConnection.this);
+
+                        }
+
+                        @Override
+                        protected void result(File result) {
+                                send(result);
+                        }
+
+                        @Override
+                        public void handle(FramsticksException exception) {
+                                send(new File("", ListSource.createFrom("# invalid", "# " + exception.getMessage())));
+                        }
+                };
+
+                NeedFile needFile = new NeedFile(suggestedName, description, future);
+
+                if (needFileAcceptor.acceptNeed(needFile)) {
+                        return;
+                }
+
+                future.handle(new FramsticksException().msg("acceptor did not accepted need"));
+        }
+
         protected void processFile(Pair<Integer, CharSequence> rest) {
-                final SentQuery<?> sentQuery = fetchQuery(rest.first, false);
+                final SentQuery<?> sentQuery = sentQueries.fetch(rest.first, false);
 
                 String currentFilePath = rest.second.toString();
@@ -292 +359 @@
 
                 sentQuery.files.add(new File(currentFilePath, new ListSource(readFileContent())));
-
         }
 
@@ -318 +384 @@
                         if (keyword.equals("ok") || keyword.equals("error")) {
 
-                                final SentQuery<?> sentQuery = fetchQuery(rest.first, true);
+                                final SentQuery<?> sentQuery = sentQueries.fetch(rest.first, true);
 
                                 log.debug("parsing response for request {}", sentQuery);
 
                                 sentQuery.dispatchResponseProcess(new Response(command.first.equals("ok"), rest.second.toString(), sentQuery.getFiles()));
+                                return;
+                        }
+                        if (keyword.equals("needfile")) {
+                                processNeedFile(rest);
                                 return;
                         }
@@ -336 +406 @@
                 @Override
                 public void handle(FramsticksException exception) {
-                        interrupt();
+                        interruptJoinable();
                         // finish();
                 }