refactoring

Author: raydac

jbbp-plugins/jbbp-gradle/build.gradle

@@ -17,8 +17,8 @@ apply plugin: 'groovy'
 apply plugin: 'maven-publish'
 apply plugin: "com.gradle.plugin-publish"
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = 11
+targetCompatibility = 11
 
 dependencies {
     implementation gradleApi()

jbbp-plugins/jbbp-gradle/pom.xml

@@ -22,8 +22,6 @@
     </dependencies>
 
     <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
         <gradle.executable>gradle8</gradle.executable>
         <gradleGoal>publishToMavenLocal</gradleGoal>
     </properties>

jbbp-plugins/jbbp-maven/jbbp-maven-plugin/pom.xml

@@ -14,11 +14,6 @@
     <name>JBBP Maven plugin</name>
     <description>Generator of sources from JBBP scripts</description>
 
-    <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-    </properties>
-
     <profiles>
         <profile>
             <id>publish</id>
@@ -185,31 +180,10 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>animal-sniffer-maven-plugin</artifactId>
-                <version>1.19</version>
-                <configuration>
-                    <signature>
-                        <groupId>org.codehaus.mojo.signature</groupId>
-                        <artifactId>java16-sun</artifactId>
-                        <version>1.10</version>
-                    </signature>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>animal-sniffer</id>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-plugin-plugin</artifactId>
-                <version>3.5</version>
+                <version>3.8.1</version>
                 <configuration>
                     <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
                     <goalPrefix>jbbp</goalPrefix>

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

@@ -135,24 +135,6 @@ public static boolean isGlobalReservedName(final String name) {
     return GLOBAL_RESERVED_TYPE_NAMES.contains(name);
   }
 
-  private static JBBPByteOrder getJbbpByteOrder(String groupTypeByteOrder, String fieldType) {
-    JBBPByteOrder byteOrder;
-    if (groupTypeByteOrder != null) {
-      if (">".equals(groupTypeByteOrder)) {
-        byteOrder = JBBPByteOrder.BIG_ENDIAN;
-      } else if ("<".equals(groupTypeByteOrder)) {
-        byteOrder = JBBPByteOrder.LITTLE_ENDIAN;
-      } else {
-        throw new Error(
-            "Illegal byte order char, unexpected error, contact developer please ["
-                + fieldType + ']');
-      }
-    } else {
-      byteOrder = JBBPByteOrder.BIG_ENDIAN;
-    }
-    return byteOrder;
-  }
-
   /**
    * Inside method to read the next token from the string and place it into
    * inside storage.
@@ -240,7 +222,20 @@ private void readNextItem() {
 
             wrongFormat = false;
 
-            JBBPByteOrder byteOrder = getJbbpByteOrder(groupTypeByteOrder, fieldType);
+            JBBPByteOrder byteOrder;
+            if (groupTypeByteOrder != null) {
+              if (">".equals(groupTypeByteOrder)) {
+                byteOrder = JBBPByteOrder.BIG_ENDIAN;
+              } else if ("<".equals(groupTypeByteOrder)) {
+                byteOrder = JBBPByteOrder.LITTLE_ENDIAN;
+              } else {
+                throw new Error(
+                    "Illegal byte order char, unexpected error, contact developer please ["
+                        + fieldType + ']');
+              }
+            } else {
+              byteOrder = JBBPByteOrder.BIG_ENDIAN;
+            }
 
             parsedType =
                 new JBBPFieldTypeParameterContainer(byteOrder, groupTypeName, groupTypeExtraField);

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

@@ -362,7 +362,29 @@ public JBBPExpressionEvaluator(final String expression,
 
         prevoperator = false;
         try {
-          int parsed = getParsed(number, unaryOperatorCode);
+          int parsed = Integer.parseInt(number);
+
+          if (unaryOperatorCode >= 0) {
+            switch (unaryOperatorCode) {
+              case CODE_UNARYPLUS:
+              case CODE_ADD: {
+                // do nothing
+              }
+              break;
+              case CODE_UNARYMINUS:
+              case CODE_MINUS: {
+                parsed = -parsed;
+              }
+              break;
+              case CODE_NOT: {
+                parsed = ~parsed;
+              }
+              break;
+              default: {
+                throw new Error("Unsupported unary operator [" + SYMBOLS[unaryOperatorCode] + ']');
+              }
+            }
+          }
 
           unaryOperatorCode = -1;
           compiledScript.write(CODE_CONST);
@@ -415,33 +437,6 @@ public JBBPExpressionEvaluator(final String expression,
     this.maxStackDepth = calculateMaxStackDepth();
   }
 
-  private static int getParsed(String number, int unaryOperatorCode) {
-    int parsed = Integer.parseInt(number);
-
-    if (unaryOperatorCode >= 0) {
-      switch (unaryOperatorCode) {
-        case CODE_UNARYPLUS:
-        case CODE_ADD: {
-          // do nothing
-        }
-        break;
-        case CODE_UNARYMINUS:
-        case CODE_MINUS: {
-          parsed = -parsed;
-        }
-        break;
-        case CODE_NOT: {
-          parsed = ~parsed;
-        }
-        break;
-        default: {
-          throw new Error("Unsupported unary operator [" + SYMBOLS[unaryOperatorCode] + ']');
-        }
-      }
-    }
-    return parsed;
-  }
-
   /**
    * Encode code of an operator to code of similar unary operator.
    *

jbbp/src/main/java/com/igormaznitsa/jbbp/utils/JBBPUtils.java

@@ -1136,7 +1136,7 @@ public static void traceData(final InputStream inStream,
    * @param script                   script to be processed, must not be null
    * @param customFieldTypeProcessor custom field type processor if needed, can be null if no custom types in use
    * @return detected biggest static array size with embedded structure awareness
-   * @since 2.1.1
+   * @since 3.0.0
    */
   public static int findMaxStaticArraySize(final String script,
                                            final JBBPCustomFieldTypeProcessor customFieldTypeProcessor) {