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

Timestamp:

07/12/13 23:41:06 (11 years ago)

Author:

psniegowski

Message:

HIGHLIGHTS:

• add <include/> to configuration
• add side notes to tree
  • used to store arbitrary information alongside the tree structure
• migrate to log4j2
  • supports lazy string evaluation of passed arguments
• improve GUI tree
  • it stays in synchronization with actual state (even in high load test scenario)
• improve panel management in GUI
• make loading objects in GUI more lazy
• offload parsing to connection receiver thread
  • info parsing
  • first step of objects parsing
• fix connection parsing bug (eof in long values)
• support zero-arguments procedure in table view

CHANGELOG:
Implement procedure calls from table view.

Refactorization around procedures in tables.

Add table editor for buttons.

Render buttons in the the list view.

Further improve Columns.

Add Column class for TableModel?.

Accept also non-arguments ProcedureParams? in tableView.

Increase maximal TextAreaControl? size.

Add tooltip to ProcedureControl?.

Fix bug of interpreting eofs in long values by connection reader.

Further rework connection parsing.

Simplify client connection processing.

Test ListChange? modification.

Test ListChange? events with java server.

Add TestChild?.

Fix bug with fast deregistering when connecting to running server.

Another minor refactorization in TreeOperations?.

Fix bug in SimpleAbstractAccess? loading routine.

Another minor improvement.

Minor change.

Make reading of List objects two-phase.

Another minor change.

Dispatch parsing into receiver thread.

Another step.

Enclose passing value in ObjectParam? case in closure.

Minor step.

Minor change on way to offload parsing.

Temporarily comment out single ValueParam? get.

It will be generalized to multi ValueParam?.

Process info in receiver thread.

Add DispatchingExceptionHandler?.

Make waits in browser test longer.

Use FETCHED_MARK.

It is honored in GUI, where it used to decide whether to get values

after user action.

It is set in standard algorithm for processing fetched values.

Add remove operation to side notes.

Make loading more lazy.

Improve loading policy.

On node choose load itself, on node expansion, load children.

Minor improvement.

Fix bug with panel interleaving.

Minor improvements.

Improve panel management.

More cleaning around panels.

Reorganize panels.

Further improve tree.

Fix bug in TreeModel?.

Remove children from TreeNode?.

Implement TreeNode? hashCode and equals.

Make TreeNode? delegate equals and hashcode to internal reference.

Move listeners from TreeNode? to side notes.

Store path.textual as a side note.

Side note params instead of accesses for objects.

More refactorizations.

In TreeNode? bindAccess based on side notes.

Minor step.

Hide createAccess.

Rename AccessInterface? to Access.

Minor changes.

Several improvements in high load scenarios.

Change semantics of ArrayListAccess?.set(index, null);

It now removes the element, making list shorter
(it was set to null before).

Add path remove handler.

Handle exceptions in Connection.

Update .gitignore

Configure logging to file.

Move registration to TreeModel?.

Further refactorization.

Minor refactorization.

Minor improvements.

Use specialized event also for Modify action of ListChange?.

Use remove events.

Use the insertion events for tree.

Further improve tree refreshing.

Further improve reacting on events in GUI.

Fix problem with not adding objects on addition list change.

Migrate to log4j lazy String construction interface.

Migrate imports to log4j2.

Drop dependency on adapter to version 1.2.

Switch log4j implementation to log4j2.

Add dirty mark to the NodeAtFrame?.

Make selecting in AccessInterfaces? type safe.

Ignore containers size settings in Model and Genotype.

Use tree side notes to remember local changes and panels.

Add sideNotes to tree.

They will be used to store various accompanying information
right in the tree.

Use ReferenceIdentityMap? from apache in TreeNode?.

It suits the need perfectly (weak semantics on both key and value).

Make ArrayListParam? do not react size changes.

Guard in TableModel? before not yet loaded objects.

Add <include/> clause and AutoInjector?.

Extract common columns configuration to separate xml,
that can be included by other configurations.

File:

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

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

@@ -17 +17 @@
 import com.framsticks.util.dispatching.FutureHandler;
 import com.framsticks.util.dispatching.JoinableState;
+import com.framsticks.util.lang.Casting;
 import com.framsticks.util.lang.Pair;
 import com.framsticks.util.lang.Strings;
 import com.framsticks.params.EventListener;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.util.*;
 import java.util.regex.Matcher;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import com.framsticks.util.dispatching.RunAt;
 
@@ -32 +38 @@
 public class ClientSideManagedConnection extends ManagedConnection {
 
-        private final static Logger log = Logger.getLogger(ClientSideManagedConnection.class);
+        private final static Logger log = LogManager.getLogger(ClientSideManagedConnection.class);
 
         private final List<Runnable> applicationRequestsBuffer = new LinkedList<>();
@@ -60 +66 @@
 
 
-        private static abstract class InboundMessage {
-                protected String currentFilePath;
-                protected List<String> currentFileContent;
-                protected final List<File> files = new ArrayList<File>();
-
-                public abstract void eof();
-
-                protected void initCurrentFile(String path) {
-                        currentFileContent = new LinkedList<String>();
-                        currentFilePath = path;
-                }
-
-                protected void finishCurrentFile() {
-                        if (currentFileContent == null) {
-                                return;
-                        }
-                        files.add(new File(currentFilePath, new ListSource(currentFileContent)));
-                        currentFilePath = null;
-                        currentFileContent = null;
-                }
-
-                public abstract void startFile(String path);
-
-                public final void addLine(String line) {
-                        assert line != null;
-                        assert currentFileContent != null;
-                        currentFileContent.add(line);
-                }
-
-                public List<File> getFiles() {
-                        return files;
-                }
-        }
 
         protected List<String> readFileContent() {
                 List<String> content = new LinkedList<String>();
                 String line;
-                while (!(line = getLine()).startsWith("eof")) {
+                boolean longValue = false;
+                while (true) {
+                        line = getLine();
+                        if (longValue) {
+                                if (line.endsWith("~") && !line.endsWith("\\~")) {
+                                        longValue = false;
+                                }
+                        } else {
+                                if (line.equals("eof")) {
+                                        break;
+                                }
+                                if (line.endsWith(":~")) {
+                                        longValue = true;
+                                }
+                        }
                         content.add(line);
                 }
@@ -103 +90 @@
         }
 
-        private static class SentQuery<C> extends InboundMessage {
+        private static class SentQuery<C> {
+
                 Request request;
                 ClientSideResponseFuture callback;
                 Dispatcher<C> dispatcher;
-
-                public void startFile(String path) {
-                        finishCurrentFile();
-                        if (!Strings.notEmpty(path)) {
-                                assert request instanceof ApplicationRequest;
-                                path = ((ApplicationRequest) request).getPath();
-                        }
-                        Strings.assureNotEmpty(path);
-                        initCurrentFile(path);
-                }
-
-                public void eof() {
-                        assert Strings.notEmpty(currentFilePath);
-                        finishCurrentFile();
-                        //no-operation
+                protected final List<File> files = new ArrayList<File>();
+
+                public List<File> getFiles() {
+                        return files;
                 }
 
@@ -169 +146 @@
 
                 if (getState().ordinal() > JoinableState.RUNNING.ordinal()) {
-                        log.fatal("not connected");
-                        return;
+                        throw new FramsticksException().msg("connection is not connected").arg("connection", this);
                 }
 
@@ -211 +187 @@
                                 putLine(out);
                                 flushOut();
-                                log.debug("sending query: " + out);
+                                log.debug("sending query: {}", out);
 
                         }
@@ -217 +193 @@
                 /*
                 synchronized (this) {
-                        log.debug("queueing query: " + query);
+                        log.debug("queueing query: {}", query);
                         queryQueue.offer(sentQuery);
                         notifyAll();
@@ -253 +229 @@
         }
 
-        private synchronized SentQuery<?> fetchQuery(Integer id, boolean remove) {
-                if (id == null) {
-                        if (requestIdEnabled) {
-                                return null;
-                        }
-                        SentQuery<?> result = currentlySentQuery;
-                        if (remove) {
-                                currentlySentQuery = null;
-                                notifyAll();
-                        }
-                        return result;
-                }
-                if (queryMap.containsKey(id)) {
+        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) {
@@ -271 +252 @@
                         }
                         return result;
-                }
-                return null;
+
+                } catch (FramsticksException e) {
+                        throw new FramsticksException().msg("failed to match response to sent query").cause(e);
+                }
         }
 
         private int nextQueryId = 0;
-
-        protected void processMessage(InboundMessage inboundMessage) {
-                if (inboundMessage == null) {
-                        log.error("failed to use any inbound message");
-                        return;
-                }
-
-                String line;
-                while (!(line = getLine()).startsWith("eof")) {
-                        // log.debug("line: " + line);
-                        inboundMessage.addLine(line);
-                }
-                inboundMessage.eof();
-        }
 
         protected void processEvent(String rest) {
@@ -303 +272 @@
                 String eventCalleePath = Request.takeGroup(rest, matcher, 2).toString();
                 final File file = new File("", new ListSource(readFileContent()));
-                log.debug("firing event " + eventObjectPath);
+                log.debug("firing event {}", eventObjectPath);
                 EventListener<File> listener;
                 synchronized (registeredListeners) {
@@ -314 +283 @@
         }
 
-        protected void processMessageStartingWith(String line) {
+        protected void processFile(Pair<Integer, CharSequence> rest) {
+                final SentQuery<?> sentQuery = fetchQuery(rest.first, false);
+
+                String currentFilePath = rest.second.toString();
+                if (!Strings.notEmpty(currentFilePath)) {
+                        currentFilePath = Casting.throwCast(ApplicationRequest.class, sentQuery.request).getPath();
+                }
+
+                sentQuery.files.add(new File(currentFilePath, new ListSource(readFileContent())));
+
+        }
+
+        protected void processMessageStartingWith(final String header) {
                 try {
-                        Pair<CharSequence, CharSequence> command = Request.takeIdentifier(line);
-                        if (command.first.equals("event")) {
+                        final Pair<CharSequence, CharSequence> command = Request.takeIdentifier(header);
+                        if (command == null) {
+                                throw new FramsticksException().msg("failed to parse command");
+                        }
+                        final CharSequence keyword = command.first;
+                        if (keyword.equals("event")) {
                                 processEvent(command.second.toString());
                                 return;
                         }
-                        Pair<Integer, CharSequence> rest = takeRequestId(command.second);
-
-                        if (command.first.equals("file")) {
-                                SentQuery<?> sentQuery = fetchQuery(rest.first, false);
-                                sentQuery.startFile(rest.second.toString());
-                                processMessage(sentQuery);
+
+                        final Pair<Integer, CharSequence> rest = takeRequestId(command.second);
+                        if (rest == null) {
+                                throw new FramsticksException().msg("failed to parse optional id and remainder");
+                        }
+
+                        if (keyword.equals("file")) {
+                                processFile(rest);
                                 return;
                         }
-
-                        SentQuery<?> sentQuery = fetchQuery(rest.first, true);
-                        if (sentQuery == null) {
+                        if (keyword.equals("ok") || keyword.equals("error")) {
+
+                                final SentQuery<?> sentQuery = fetchQuery(rest.first, true);
+
+                                log.debug("parsing response for request {}", sentQuery);
+
+                                sentQuery.dispatchResponseProcess(new Response(command.first.equals("ok"), rest.second.toString(), sentQuery.getFiles()));
                                 return;
                         }
-                        log.debug("parsing response for request " + sentQuery);
-
-                        sentQuery.dispatchResponseProcess(new Response(command.first.equals("ok"), rest.second.toString(), sentQuery.getFiles()));
+
+                        throw new FramsticksException().msg("unknown command keyword").arg("keyword", keyword);
                 } catch (FramsticksException e) {
-                        throw new FramsticksException().msg("failed to process message").arg("starting with line", line).cause(e);
+                        throw new FramsticksException().msg("failed to process message").arg("starting with line", header).cause(e);
                 }
         }