Changeset 85 for java/main/src/main/java/com/framsticks/communication/Connection.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/Connection.java (modified) (8 diffs)

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

@@ -1 +1 @@
 package com.framsticks.communication;
 
+import com.framsticks.util.io.Encoding;
 import com.framsticks.util.lang.Pair;
 import org.apache.log4j.Logger;
@@ -6 +7 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.lang.Thread;
 import java.net.Socket;
 import java.net.SocketTimeoutException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
+import com.framsticks.util.dispatching.RunAt;
+import com.framsticks.util.dispatching.Thread;
 
 public abstract class Connection {
@@ -28 +32 @@
         protected int protocolVersion = -1;
 
-        protected final com.framsticks.util.dispatching.Thread senderThread = new com.framsticks.util.dispatching.Thread();
-        protected Thread receiverThread;
+        protected final Thread<Connection> senderThread = new Thread<>();
+        protected final Thread<Connection> receiverThread = new Thread<>();
 
         public boolean isConnected() {
@@ -42 +46 @@
                         senderThread.interrupt();
                         senderThread.join();
-                        if (receiverThread != null) {
-                                receiverThread.interrupt();
-                                receiverThread.join();
-                                receiverThread = null;
-                        }
+
+                        receiverThread.interrupt();
+                        receiverThread.join();
 
                         if (output != null) {
@@ -72 +74 @@
 
         protected static final String ARGUMENT_PATTERN_FRAGMENT = "((?:\\S+)|(?:\"[^\"]*\"))";
-        protected static Pattern requestIdEnabledPattern = Pattern.compile("^\\s*([0-9]+)(?:\\s+" + ARGUMENT_PATTERN_FRAGMENT + ")?\\n$");
-        protected static Pattern requestIDisabledPattern = Pattern.compile("^\\s*" + ARGUMENT_PATTERN_FRAGMENT + "?\\n$");
-        protected static Pattern eventPattern = Pattern.compile("^\\s*(\\S+)\\s*(\\S+)\\n");
+        protected static final Pattern requestIdEnabledPattern = Pattern.compile("^\\s*([0-9]+)(?:\\s+" + ARGUMENT_PATTERN_FRAGMENT + ")?\\n$");
+        protected static final Pattern requestIDisabledPattern = Pattern.compile("^\\s*" + ARGUMENT_PATTERN_FRAGMENT + "?\\n$");
+        protected static final Pattern eventPattern = Pattern.compile("^\\s*(\\S+)\\s*(\\S+)\\n");
 
 
@@ -126 +128 @@
         protected void runThreads() {
                 try {
-                        output = new PrintWriter(socket.getOutputStream(), true);
-                        input = new BufferedReader(new InputStreamReader(socket.getInputStream()));
+                        output = new PrintWriter(new OutputStreamWriter(socket.getOutputStream(), Encoding.getFramsticksCharset()), true);
+                        input = new BufferedReader(new InputStreamReader(socket.getInputStream(), Encoding.getFramsticksCharset()));
                 } catch (IOException e) {
                         log.error("buffer creation failure");
@@ -135 +137 @@
 
                 senderThread.setName(this + "-sender");
-                receiverThread = new Thread(new Runnable() {
+                receiverThread.setName(this + "-receiver");
+
+                senderThread.start();
+                receiverThread.start();
+
+                receiverThread.invokeLater(new RunAt<Connection>() {
                         @Override
                         public void run() {
@@ -148 +155 @@
                         }
                 });
-                receiverThread.setName(this + "-receiver");
 
-                senderThread.start();
-                receiverThread.start();
         }