From bfe54697b7fc2caa82baa0a8de0fd9deadbba608 Mon Sep 17 00:00:00 2001 From: Guido Medina Date: Mon, 24 Jul 2017 11:39:35 +0100 Subject: [PATCH] IntelliJ inspections corrected and some dependencies updated. --- pom.xml | 4 +-- quickfixj-codegenerator/pom.xml | 2 +- .../src/main/java/quickfix/FieldMap.java | 4 +-- .../src/main/java/quickfix/JdbcUtil.java | 2 +- .../src/main/java/quickfix/Session.java | 6 ++-- .../main/java/quickfix/UtcTimeOnlyField.java | 4 +-- .../main/java/quickfix/UtcTimeStampField.java | 4 +-- .../field/converter/UtcDateOnlyConverter.java | 2 +- .../field/converter/UtcTimeOnlyConverter.java | 2 +- .../converter/UtcTimestampConverter.java | 2 +- .../mina/ssl/X509TrustManagerWrapper.java | 2 +- .../src/test/java/quickfix/SessionTest.java | 1 - .../java/quickfix/SocketInitiatorTest.java | 36 +++++++++---------- ...ngleThreadedEventHandlingStrategyTest.java | 4 +-- .../mina/message/FIXMessageDecoderTest.java | 5 +-- quickfixj-dictgenerator/pom.xml | 2 +- .../quickfixj/dictgenerator/Repository.java | 5 ++- .../examples/banzai/ui/OrderEntryPanel.java | 1 + 18 files changed, 43 insertions(+), 45 deletions(-) diff --git a/pom.xml b/pom.xml index 32e925e90..d2685f533 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ - 3.3.9 + 3.5.0 @@ -77,7 +77,7 @@ 3.6.1 3.0.2 2.20 - 3.7 + 3.8 3.0.1 2.10.4 3.0.0 diff --git a/quickfixj-codegenerator/pom.xml b/quickfixj-codegenerator/pom.xml index eca44bf2f..d3e18bf57 100644 --- a/quickfixj-codegenerator/pom.xml +++ b/quickfixj-codegenerator/pom.xml @@ -35,7 +35,7 @@ net.sf.saxon Saxon-HE - 9.8.0-2 + 9.8.0-3 diff --git a/quickfixj-core/src/main/java/quickfix/FieldMap.java b/quickfixj-core/src/main/java/quickfix/FieldMap.java index 24371a546..f7edfe408 100644 --- a/quickfixj-core/src/main/java/quickfix/FieldMap.java +++ b/quickfixj-core/src/main/java/quickfix/FieldMap.java @@ -189,7 +189,7 @@ public void setUtcTimeStamp(int field, LocalDateTime value) { } public void setUtcTimeStamp(int field, LocalDateTime value, boolean includeMilliseconds) { - setField(new StringField(field, UtcTimestampConverter.convert(value, (includeMilliseconds == true) ? UtcTimestampPrecision.MILLIS : UtcTimestampPrecision.SECONDS))); + setField(new StringField(field, UtcTimestampConverter.convert(value, includeMilliseconds ? UtcTimestampPrecision.MILLIS : UtcTimestampPrecision.SECONDS))); } public void setUtcTimeStamp(int field, LocalDateTime value, UtcTimestampPrecision precision) { @@ -201,7 +201,7 @@ public void setUtcTimeOnly(int field, LocalTime value) { } public void setUtcTimeOnly(int field, LocalTime value, boolean includeMilliseconds) { - setField(new StringField(field, UtcTimeOnlyConverter.convert(value, (includeMilliseconds == true) ? UtcTimestampPrecision.MILLIS : UtcTimestampPrecision.SECONDS))); + setField(new StringField(field, UtcTimeOnlyConverter.convert(value, includeMilliseconds ? UtcTimestampPrecision.MILLIS : UtcTimestampPrecision.SECONDS))); } public void setUtcTimeOnly(int field, LocalTime value, UtcTimestampPrecision precision) { diff --git a/quickfixj-core/src/main/java/quickfix/JdbcUtil.java b/quickfixj-core/src/main/java/quickfix/JdbcUtil.java index d97d524e0..14ffc259e 100644 --- a/quickfixj-core/src/main/java/quickfix/JdbcUtil.java +++ b/quickfixj-core/src/main/java/quickfix/JdbcUtil.java @@ -39,7 +39,7 @@ class JdbcUtil { static final String CONNECTION_POOL_ALIAS = "quickfixj"; private static final Map dataSources = new ConcurrentHashMap<>(); - private static AtomicInteger dataSourceCounter = new AtomicInteger(); + private static final AtomicInteger dataSourceCounter = new AtomicInteger(); static DataSource getDataSource(SessionSettings settings, SessionID sessionID) throws ConfigError, FieldConvertError { diff --git a/quickfixj-core/src/main/java/quickfix/Session.java b/quickfixj-core/src/main/java/quickfix/Session.java index b8d71efb9..21ebf2cd9 100644 --- a/quickfixj-core/src/main/java/quickfix/Session.java +++ b/quickfixj-core/src/main/java/quickfix/Session.java @@ -2801,18 +2801,18 @@ public void setTargetDefaultApplicationVersionID(ApplVerID applVerID) { } private static String extractNumber(String txt, int from) { - String ret = ""; + final StringBuilder ret = new StringBuilder(); for (int i = from; i != txt.length(); ++i) { final char c = txt.charAt(i); if (c >= '0' && c <= '9') { - ret += c; + ret.append(c); } else { if (ret.length() != 0) { break; } } } - return ret.trim(); + return ret.toString(); } protected static Integer extractExpectedSequenceNumber(String txt) { diff --git a/quickfixj-core/src/main/java/quickfix/UtcTimeOnlyField.java b/quickfixj-core/src/main/java/quickfix/UtcTimeOnlyField.java index be311a9d0..f7ea1d73c 100644 --- a/quickfixj-core/src/main/java/quickfix/UtcTimeOnlyField.java +++ b/quickfixj-core/src/main/java/quickfix/UtcTimeOnlyField.java @@ -43,12 +43,12 @@ protected UtcTimeOnlyField(int field, LocalTime data, UtcTimestampPrecision prec public UtcTimeOnlyField(int field, boolean includeMilliseconds) { super(field, LocalTime.now()); - this.precision = (includeMilliseconds == true) ? UtcTimestampPrecision.MILLIS : UtcTimestampPrecision.SECONDS; + this.precision = includeMilliseconds ? UtcTimestampPrecision.MILLIS : UtcTimestampPrecision.SECONDS; } protected UtcTimeOnlyField(int field, LocalTime data, boolean includeMilliseconds) { super(field, data); - this.precision = (includeMilliseconds == true) ? UtcTimestampPrecision.MILLIS : UtcTimestampPrecision.SECONDS; + this.precision = includeMilliseconds ? UtcTimestampPrecision.MILLIS : UtcTimestampPrecision.SECONDS; } public UtcTimestampPrecision getPrecision() { diff --git a/quickfixj-core/src/main/java/quickfix/UtcTimeStampField.java b/quickfixj-core/src/main/java/quickfix/UtcTimeStampField.java index 085dd6e63..92c391630 100644 --- a/quickfixj-core/src/main/java/quickfix/UtcTimeStampField.java +++ b/quickfixj-core/src/main/java/quickfix/UtcTimeStampField.java @@ -43,7 +43,7 @@ protected UtcTimeStampField(int field, LocalDateTime data, UtcTimestampPrecision public UtcTimeStampField(int field, boolean includeMilliseconds) { super(field, LocalDateTime.now()); - this.precision = (includeMilliseconds == true) ? UtcTimestampPrecision.MILLIS : UtcTimestampPrecision.SECONDS; + this.precision = includeMilliseconds ? UtcTimestampPrecision.MILLIS : UtcTimestampPrecision.SECONDS; } public UtcTimeStampField(int field, UtcTimestampPrecision precision) { @@ -53,7 +53,7 @@ public UtcTimeStampField(int field, UtcTimestampPrecision precision) { protected UtcTimeStampField(int field, LocalDateTime data, boolean includeMilliseconds) { super(field, data); - this.precision = (includeMilliseconds == true) ? UtcTimestampPrecision.MILLIS : UtcTimestampPrecision.SECONDS; + this.precision = includeMilliseconds ? UtcTimestampPrecision.MILLIS : UtcTimestampPrecision.SECONDS; } public UtcTimestampPrecision getPrecision() { diff --git a/quickfixj-core/src/main/java/quickfix/field/converter/UtcDateOnlyConverter.java b/quickfixj-core/src/main/java/quickfix/field/converter/UtcDateOnlyConverter.java index bf47b0335..cdaa67786 100644 --- a/quickfixj-core/src/main/java/quickfix/field/converter/UtcDateOnlyConverter.java +++ b/quickfixj-core/src/main/java/quickfix/field/converter/UtcDateOnlyConverter.java @@ -34,7 +34,7 @@ */ public class UtcDateOnlyConverter extends AbstractDateTimeConverter { - static String TYPE = "date"; + static final String TYPE = "date"; static final int DATE_LENGTH = 8; // SimpleDateFormats are not thread safe. A thread local is being // used to maintain high concurrency among multiple session threads diff --git a/quickfixj-core/src/main/java/quickfix/field/converter/UtcTimeOnlyConverter.java b/quickfixj-core/src/main/java/quickfix/field/converter/UtcTimeOnlyConverter.java index 97a03b942..fbc2d609f 100644 --- a/quickfixj-core/src/main/java/quickfix/field/converter/UtcTimeOnlyConverter.java +++ b/quickfixj-core/src/main/java/quickfix/field/converter/UtcTimeOnlyConverter.java @@ -36,7 +36,7 @@ */ public class UtcTimeOnlyConverter extends AbstractDateTimeConverter { - static String TYPE = "time"; + static final String TYPE = "time"; static final int LENGTH_INCL_SECONDS = 8; static final int LENGTH_INCL_MILLIS = 12; static final int LENGTH_INCL_MICROS = 15; diff --git a/quickfixj-core/src/main/java/quickfix/field/converter/UtcTimestampConverter.java b/quickfixj-core/src/main/java/quickfix/field/converter/UtcTimestampConverter.java index 17601fa6a..d792ad2e0 100644 --- a/quickfixj-core/src/main/java/quickfix/field/converter/UtcTimestampConverter.java +++ b/quickfixj-core/src/main/java/quickfix/field/converter/UtcTimestampConverter.java @@ -38,7 +38,7 @@ */ public class UtcTimestampConverter extends AbstractDateTimeConverter { - static String TYPE = "timestamp"; + static final String TYPE = "timestamp"; static final int LENGTH_INCL_SECONDS = 17; static final int LENGTH_INCL_MILLIS = 21; static final int LENGTH_INCL_MICROS = 24; diff --git a/quickfixj-core/src/main/java/quickfix/mina/ssl/X509TrustManagerWrapper.java b/quickfixj-core/src/main/java/quickfix/mina/ssl/X509TrustManagerWrapper.java index 8c273a2ab..6a52c914b 100644 --- a/quickfixj-core/src/main/java/quickfix/mina/ssl/X509TrustManagerWrapper.java +++ b/quickfixj-core/src/main/java/quickfix/mina/ssl/X509TrustManagerWrapper.java @@ -48,7 +48,7 @@ public static TrustManager[] wrap(TrustManager[] trustManagers) { return wrappers; } - private X509TrustManager trustManager; + private final X509TrustManager trustManager; public X509TrustManagerWrapper(final X509TrustManager trustManager) { this.trustManager = trustManager; diff --git a/quickfixj-core/src/test/java/quickfix/SessionTest.java b/quickfixj-core/src/test/java/quickfix/SessionTest.java index 9e7947900..0e185d857 100644 --- a/quickfixj-core/src/test/java/quickfix/SessionTest.java +++ b/quickfixj-core/src/test/java/quickfix/SessionTest.java @@ -51,7 +51,6 @@ import java.util.TimeZone; import static org.junit.Assert.*; -import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.*; import static quickfix.SessionFactoryTestSupport.createSession; diff --git a/quickfixj-core/src/test/java/quickfix/SocketInitiatorTest.java b/quickfixj-core/src/test/java/quickfix/SocketInitiatorTest.java index b3f39fe00..8590886be 100644 --- a/quickfixj-core/src/test/java/quickfix/SocketInitiatorTest.java +++ b/quickfixj-core/src/test/java/quickfix/SocketInitiatorTest.java @@ -268,29 +268,27 @@ public void testConnectedSocketsAreClosedAfterInitiatorClosed() throws Exception final int port = serverSocket.getLocalPort(); final AtomicBoolean socketConnected = new AtomicBoolean(false); - Thread socketThread = new Thread() { - public void run() { - Socket socket = null; + Thread socketThread = new Thread(() -> { + Socket socket = null; + try { + socket = serverSocket.accept(); + socketConnected.set(true); + final InputStream is = socket.getInputStream(); + while (is.read() != -1) { + } + } catch (Exception e) { + } finally { try { - socket = serverSocket.accept(); - socketConnected.set(true); - final InputStream is = socket.getInputStream(); - while (is.read() != -1) { - } + serverSocket.close(); } catch (Exception e) { - } finally { - try { - serverSocket.close(); - } catch (Exception e) { - } - try { - socket.close(); - } catch (Exception e) { - } - socketConnected.set(false); } + try { + socket.close(); + } catch (Exception e) { + } + socketConnected.set(false); } - }; + }); socketThread.setDaemon(true); socketThread.start(); diff --git a/quickfixj-core/src/test/java/quickfix/mina/SingleThreadedEventHandlingStrategyTest.java b/quickfixj-core/src/test/java/quickfix/mina/SingleThreadedEventHandlingStrategyTest.java index 63c5e74ff..0f351f4c0 100644 --- a/quickfixj-core/src/test/java/quickfix/mina/SingleThreadedEventHandlingStrategyTest.java +++ b/quickfixj-core/src/test/java/quickfix/mina/SingleThreadedEventHandlingStrategyTest.java @@ -221,7 +221,7 @@ public void shouldCleanUpAcceptorQFJMessageProcessorThreadAfterStop() throws Exc @Override public void run() { try { - acceptor.block(); + acceptor.start(); } catch (Exception e) { e.printStackTrace(); } finally { @@ -251,7 +251,7 @@ public void shouldCleanUpInitiatorQFJMessageProcessorThreadAfterStop() throws Ex @Override public void run() { try { - initiator.block(); + initiator.start(); } catch (Exception e) { e.printStackTrace(); } finally { diff --git a/quickfixj-core/src/test/java/quickfix/mina/message/FIXMessageDecoderTest.java b/quickfixj-core/src/test/java/quickfix/mina/message/FIXMessageDecoderTest.java index 811e7fa5a..cd7ef7f11 100644 --- a/quickfixj-core/src/test/java/quickfix/mina/message/FIXMessageDecoderTest.java +++ b/quickfixj-core/src/test/java/quickfix/mina/message/FIXMessageDecoderTest.java @@ -369,10 +369,11 @@ private void doTestMinaDemux(String message) throws Exception { final IoSessionStub mockSession = new IoSessionStub(); int count = 5; - String data = ""; + final StringBuilder builder = new StringBuilder(message.length() * 5); for (int i = 0; i < count; i++) { - data += message; + builder.append(message); } + final String data = builder.toString(); for (int i = 1; i < data.length(); i++) { String chunk1 = data.substring(0, i); diff --git a/quickfixj-dictgenerator/pom.xml b/quickfixj-dictgenerator/pom.xml index 5014a8984..d8b1c52fb 100644 --- a/quickfixj-dictgenerator/pom.xml +++ b/quickfixj-dictgenerator/pom.xml @@ -26,7 +26,7 @@ org.dom4j dom4j - 2.0.0 + 2.0.1 true diff --git a/quickfixj-dictgenerator/src/main/java/org/quickfixj/dictgenerator/Repository.java b/quickfixj-dictgenerator/src/main/java/org/quickfixj/dictgenerator/Repository.java index 7589047c3..ff1cbb24c 100644 --- a/quickfixj-dictgenerator/src/main/java/org/quickfixj/dictgenerator/Repository.java +++ b/quickfixj-dictgenerator/src/main/java/org/quickfixj/dictgenerator/Repository.java @@ -24,7 +24,6 @@ import org.dom4j.io.SAXReader; import java.io.File; -import java.util.Collections; import java.util.Comparator; import java.util.HashSet; import java.util.List; @@ -159,7 +158,7 @@ private void initFields() { allFields.put(field.getTag(), field); // Find enums List enumNodes = enums.selectNodes("//dataroot/Enums[Tag=" + tag + "]"); - Collections.sort(enumNodes, new EnumNodeComparator()); + enumNodes.sort(new EnumNodeComparator()); if (!enumNodes.isEmpty()) { for (Object enumO : enumNodes) { Node enumNode = (Node) enumO; @@ -223,7 +222,7 @@ private void addComponentMsgContent(Component component, String prefix) { private List getMsgContents(String msgID) { List nodes = msgContents.selectNodes("//dataroot/MsgContents[MsgID=" + msgID + "]"); - Collections.sort(nodes, new MsgContentNodeComparator()); + nodes.sort(new MsgContentNodeComparator()); return nodes; } diff --git a/quickfixj-examples/banzai/src/main/java/quickfix/examples/banzai/ui/OrderEntryPanel.java b/quickfixj-examples/banzai/src/main/java/quickfix/examples/banzai/ui/OrderEntryPanel.java index ecf1541e1..704c46f11 100644 --- a/quickfixj-examples/banzai/src/main/java/quickfix/examples/banzai/ui/OrderEntryPanel.java +++ b/quickfixj-examples/banzai/src/main/java/quickfix/examples/banzai/ui/OrderEntryPanel.java @@ -52,6 +52,7 @@ import quickfix.examples.banzai.OrderTableModel; import quickfix.examples.banzai.OrderType; +@SuppressWarnings("unchecked") public class OrderEntryPanel extends JPanel implements Observer { private boolean symbolEntered = false; private boolean quantityEntered = false;