fixed types

Author: raydac

jbbp/src/main/java/com/igormaznitsa/jbbp/compiler/JBBPCompiler.java

@@ -181,13 +181,6 @@ private static void assertTokenHasExtraData(final String fieldType, final JBBPTo
     }
   }
 
-  private static void assertTokenDoesntHaveExtraData(final String fieldType,
-                                                     final JBBPToken token) {
-    if (token.getFieldTypeParameters().getExtraData() != null) {
-      throw new JBBPCompilationException('\'' + fieldType + "\' has extra value", token);
-    }
-  }
-
   /**
    * Compile a text script into its byte code representation/
    *
@@ -397,7 +390,7 @@ public static JBBPCompiledBlock compile(final String script,
         case CODE_RESET_COUNTER: {
           assertTokenNotArray("Reset counter", token);
           assertTokenNotNamed("Reset counter", token);
-          assertTokenDoesntHaveExtraData("Reset counter", token);
+          assertTokenHasNotExtraData("Reset counter", token);
         }
         break;
         case CODE_STRUCT_START: {
@@ -515,6 +508,13 @@ public static JBBPCompiledBlock compile(final String script,
         .build();
   }
 
+  private static void assertTokenHasNotExtraData(final String fieldType,
+                                                 final JBBPToken token) {
+    if (token.getFieldTypeParameters().getExtraData() != null) {
+      throw new JBBPCompilationException('\'' + fieldType + "\' has extra value", token);
+    }
+  }
+
   /**
    * The Method checks a value for negative.
    *
@@ -715,7 +715,7 @@ private static final class StructStackItem {
     private final int namedFieldCounter;
 
     /**
-     * Flag shows that the structure is array which shoukd be read till end of stream
+     * Flag shows that the structure is array which should be read till end of stream
      */
     private final boolean arrayToReadTillEndOfStream;
 

jbbp/src/main/java/com/igormaznitsa/jbbp/compiler/JBBPCompilerUtils.java

@@ -18,7 +18,6 @@
 
 import static com.igormaznitsa.jbbp.compiler.JBBPCompiler.FLAG_ARRAY;
 
-
 import com.igormaznitsa.jbbp.exceptions.JBBPCompilationException;
 import com.igormaznitsa.jbbp.utils.JBBPUtils;
 import java.util.List;
@@ -91,14 +90,14 @@ public static void assertFieldIsNotArrayOrInArray(final JBBPNamedFieldInfo field
     }
     if (fieldToCheck.getFieldPath().indexOf('.') >= 0) {
       // the field in structure, check that the structure is not an array or not in an array
-      final String[] splittedFieldPath = JBBPUtils.splitString(fieldToCheck.getFieldPath(), '.');
+      final String[] splitFieldPath = JBBPUtils.splitString(fieldToCheck.getFieldPath(), '.');
       final StringBuilder fieldPath = new StringBuilder();
       // process till the field name because we have already checked the field
-      for (int i = 0; i < splittedFieldPath.length - 1; i++) {
+      for (int i = 0; i < splitFieldPath.length - 1; i++) {
         if (fieldPath.length() != 0) {
           fieldPath.append('.');
         }
-        fieldPath.append(splittedFieldPath[i]);
+        fieldPath.append(splitFieldPath[i]);
         final JBBPNamedFieldInfo structureEnd =
             JBBPCompilerUtils.findForFieldPath(fieldPath.toString(), namedFieldList);
         if ((compiledScript[structureEnd.getFieldOffsetInCompiledBlock()] & FLAG_ARRAY) != 0) {

jbbp/src/main/java/com/igormaznitsa/jbbp/compiler/tokenizer/JBBPTokenizer.java

@@ -308,7 +308,6 @@ private JBBPTokenizerException checkFieldName(final String name, final int posit
     return null;
   }
 
-  @SuppressWarnings("NullableProblems")
   @Override
   public Iterator<JBBPToken> iterator() {
     return this;

jbbp/src/main/java/com/igormaznitsa/jbbp/compiler/varlen/JBBPExpressionEvaluator.java

@@ -18,7 +18,6 @@
 
 import static com.igormaznitsa.jbbp.utils.JBBPUtils.ARRAY_STRING_EMPTY;
 
-
 import com.igormaznitsa.jbbp.JBBPNamedNumericFieldMap;
 import com.igormaznitsa.jbbp.compiler.JBBPCompiledBlock;
 import com.igormaznitsa.jbbp.compiler.JBBPCompilerUtils;
@@ -193,10 +192,10 @@ public JBBPExpressionEvaluator(final String expression,
     while (matcher.find()) {
       if (lastFound >= 0) {
         // check for skipped substring
-        final String substr = expression.substring(lastFound, matcher.start());
-        if (substr.trim().length() != 0) {
+        final String subString = expression.substring(lastFound, matcher.start());
+        if (subString.trim().length() != 0) {
           throw new JBBPCompilationException(
-              "Can't recognize part of expression '" + substr + "' [" + expression + ']');
+              "Can't recognize part of expression '" + subString + "' [" + expression + ']');
         }
       }
 

jbbp/src/main/java/com/igormaznitsa/jbbp/io/AbstractMappedClassFieldObserver.java

@@ -99,7 +99,7 @@ protected void processObject(
    * @param obj                  an object which is an instance of a mapped class, must not be null
    * @param field                a field where the object has been found, it can be null for first call
    * @param binAnnotationWrapper wrapper to replace Bin annotation values for processing fields, can be null to be ignored
-   * @param binFieldFilter       filter for mapped fields, alows to exclude some of them, can be null
+   * @param binFieldFilter       filter for mapped fields, allows to exclude some of them, can be null
    * @param customFieldProcessor a processor for custom fields, it can be null
    * @see Bin
    * @since 2.0.4