Merge pull request #63 from guidomedina/gm-static-pattern-unsync-time-and-slf4j-update

QFJ-879: Small Changes: Static compiled pattern, un-sync time and slf4j update

Author: chrjohn

pom.xml

@@ -69,7 +69,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<jdkLevel>1.7</jdkLevel>
-		<slf4j.version>1.7.16</slf4j.version>
+		<slf4j.version>1.7.18</slf4j.version>
 		<mainClass/>
 
         <maven-resources-plugin-version>2.7</maven-resources-plugin-version>

quickfixj-core/src/main/java/quickfix/SessionID.java

@@ -38,7 +38,7 @@
  * but using different FIX versions (and/or session qualifiers).
  */
 public class SessionID implements Serializable {
-    private static final Pattern pattern = Pattern.compile("(.*?):(.*?)(?:/(.*?)|)(?:/(.*?)|)->(.*?)(?:/(.*?)|)(?:/(.*?)|)(?::(.*)|)");
+    private static final Pattern PATTERN = Pattern.compile("(.*?):(.*?)(?:/(.*?)|)(?:/(.*?)|)->(.*?)(?:/(.*?)|)(?:/(.*?)|)(?::(.*)|)");
     public static final String NOT_SET = "";
 
     private final String id;
@@ -106,7 +106,7 @@ public SessionID() {
     }
 
     public SessionID(String id) {
-        Matcher matcher = pattern.matcher(id);
+        Matcher matcher = PATTERN.matcher(id);
         if (!matcher.matches()) {
             throw new IllegalArgumentException("Invalid session ID string: " + id);
         }

quickfixj-core/src/main/java/quickfix/SessionSettings.java

@@ -529,14 +529,14 @@ private void skipWhitespace(Reader reader) throws IOException {
         }
     }
 
-    private final Pattern variablePattern = Pattern.compile("\\$\\{(.+?)}");
+    private static final Pattern VARIABLE_PATTERN = Pattern.compile("\\$\\{(.+?)}");
 
     private String interpolate(String value) {
         if (value == null || value.indexOf('$') == -1) {
             return value;
         }
         final StringBuffer buffer = new StringBuffer();
-        final Matcher m = variablePattern.matcher(value);
+        final Matcher m = VARIABLE_PATTERN.matcher(value);
         while (m.find()) {
             if (m.start() > 0 && value.charAt(m.start() - 1) == '\\') {
                 continue;

quickfixj-core/src/main/java/quickfix/SystemTime.java

@@ -35,17 +35,17 @@ public long getTime() {
         }
     };
 
-    private static SystemTimeSource systemTimeSource = DEFAULT_TIME_SOURCE;
+    private static volatile SystemTimeSource systemTimeSource = DEFAULT_TIME_SOURCE;
 
-    public static synchronized long currentTimeMillis() {
+    public static long currentTimeMillis() {
         return systemTimeSource.getTime();
     }
 
     public static Date getDate() {
         return new Date(currentTimeMillis());
     }
 
-    public static synchronized void setTimeSource(SystemTimeSource systemTimeSource) {
+    public static void setTimeSource(SystemTimeSource systemTimeSource) {
         SystemTime.systemTimeSource = systemTimeSource != null ? systemTimeSource
                 : DEFAULT_TIME_SOURCE;
     }

quickfixj-core/src/main/java/quickfix/field/converter/DoubleConverter.java

@@ -32,8 +32,8 @@
  * Converts between a double and a String.
  */
 public class DoubleConverter {
-    private static final Pattern decimalPattern = Pattern.compile("-?\\d*(\\.\\d*)?");
-    private static final ThreadLocal<DecimalFormat[]> threadDecimalFormats = new ThreadLocal<DecimalFormat[]>();
+    private static final Pattern DECIMAL_PATTERN = Pattern.compile("-?\\d*(\\.\\d*)?");
+    private static final ThreadLocal<DecimalFormat[]> THREAD_DECIMAL_FORMATS = new ThreadLocal<DecimalFormat[]>();
 
     /**
      * Converts a double to a string with no padding.
@@ -51,10 +51,10 @@ static DecimalFormat getDecimalFormat(int padding) {
             // FieldConvertError not supported in setDouble methods on Message
             throw new RuntimeError("maximum padding of 14 zeroes is supported: " + padding);
         }
-        DecimalFormat[] decimalFormats = threadDecimalFormats.get();
+        DecimalFormat[] decimalFormats = THREAD_DECIMAL_FORMATS.get();
         if (decimalFormats == null) {
             decimalFormats = new DecimalFormat[14];
-            threadDecimalFormats.set(decimalFormats);
+            THREAD_DECIMAL_FORMATS.set(decimalFormats);
         }
         DecimalFormat f = decimalFormats[padding];
         if (f == null) {
@@ -92,7 +92,7 @@ public static String convert(double d, int padding) {
      */
     public static double convert(String value) throws FieldConvertError {
         try {
-            Matcher matcher = decimalPattern.matcher(value);
+            Matcher matcher = DECIMAL_PATTERN.matcher(value);
             if (!matcher.matches()) {
                 throw new NumberFormatException();
             }

quickfixj-core/src/test/java/quickfix/test/acceptance/ExpectMessageStep.java

@@ -44,8 +44,8 @@ public class ExpectMessageStep implements TestStep {
     private final Logger log = LoggerFactory.getLogger(getClass());
     private final String data;
     private final Map<String, String> expectedFields;
-    private static final Pattern headerPattern = Pattern.compile("^E(\\d+),.*");
-    private static final Pattern fieldPattern = Pattern.compile("(\\d+)=([^\\001]+)\\001");
+    private static final Pattern HEADER_PATTERN = Pattern.compile("^E(\\d+),.*");
+    private static final Pattern FIELD_PATTERN = Pattern.compile("(\\d+)=([^\\001]+)\\001");
     private int clientId = 0;
     private static final int heartBeatOverride;
 
@@ -56,7 +56,7 @@ public class ExpectMessageStep implements TestStep {
 
     public ExpectMessageStep(String data) {
         this.data = data;
-        Matcher headerMatcher = headerPattern.matcher(data);
+        Matcher headerMatcher = HEADER_PATTERN.matcher(data);
         if (headerMatcher.matches()) {
             clientId = Integer.parseInt(headerMatcher.group(1));
         } else {
@@ -67,7 +67,7 @@ public ExpectMessageStep(String data) {
 
     private Map<String, String> simpleParse(String data) {
         HashMap<String, String> fields = new HashMap<String, String>();
-        Matcher fieldMatcher = fieldPattern.matcher(data);
+        Matcher fieldMatcher = FIELD_PATTERN.matcher(data);
         while (fieldMatcher.find()) {
             fields.put(fieldMatcher.group(1), fieldMatcher.group(2));
         }