Simplified DataDictionary

Author: amichair

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

@@ -272,8 +272,7 @@ public boolean isMsgField(String msgType, int field) {
      * @return true if field is a header field, false otherwise.
      */
     public boolean isHeaderField(int field) {
-        Set<Integer> fields = messageFields.get(HEADER_ID);
-        return fields != null && fields.contains(field);
+        return isMsgField(HEADER_ID, field);
     }
 
     /**
@@ -283,8 +282,7 @@ public boolean isHeaderField(int field) {
      * @return true if field is a trailer field, false otherwise.
      */
     public boolean isTrailerField(int field) {
-        Set<Integer> fields = messageFields.get(TRAILER_ID);
-        return fields != null && fields.contains(field);
+        return isMsgField(TRAILER_ID, field);
     }
 
     private void addFieldType(int field, FieldType fieldType) {
@@ -542,7 +540,7 @@ private void copyFrom(DataDictionary rhs) {
     }
 
     @SuppressWarnings("unchecked")
-    private <K, V> void copyMap(Map<K, V> lhs, Map<K, V> rhs) {
+    private static <K, V> void copyMap(Map<K, V> lhs, Map<K, V> rhs) {
         lhs.clear();
         for (Map.Entry<K, V> entry : rhs.entrySet()) {
             Object value = entry.getValue();
@@ -562,7 +560,7 @@ private <K, V> void copyMap(Map<K, V> lhs, Map<K, V> rhs) {
         }
     }
 
-    private <V> void copyCollection(Collection<V> lhs, Collection<V> rhs) {
+    private static <V> void copyCollection(Collection<V> lhs, Collection<V> rhs) {
         lhs.clear();
         lhs.addAll(rhs);
     }
@@ -752,13 +750,8 @@ private void checkValidFormat(StringField field) throws IncorrectDataFormat {
     }
 
     private void checkValue(StringField field) throws IncorrectTagValue {
-        final int tag = field.getField();
-        if (!hasFieldValue(tag)) {
-            return;
-        }
-
-        final String value = field.getValue();
-        if (!isFieldValue(tag, value)) {
+        int tag = field.getField();
+        if (hasFieldValue(tag) && !isFieldValue(tag, field.getValue())) {
             throw new IncorrectTagValue(tag);
         }
     }
@@ -1056,11 +1049,9 @@ private void load(Document document, String msgtype, Node node) throws ConfigErr
     public int[] getOrderedFields() {
         if (orderedFieldsArray == null) {
             orderedFieldsArray = new int[fields.size()];
-
-            final Iterator<Integer> fieldItr = fields.iterator();
             int i = 0;
-            while (fieldItr.hasNext()) {
-                orderedFieldsArray[i++] = fieldItr.next();
+            for (Integer field : fields) {
+                orderedFieldsArray[i++] = field;
             }
         }
 
@@ -1216,14 +1207,6 @@ public IntStringPair(int value, String value2) {
             stringValue = value2;
         }
 
-        //public int getIntValue() {
-        //    return intValue;
-        //}
-
-        //public String getStringValue() {
-        //    return stringValue;
-        //}
-
         @Override
         public boolean equals(Object other) {
             return this == other