Cleanup in preparation of new release

FourteenBrush · Jun 26, 2023 · a14f1d8 · a14f1d8
1 parent 7e2792e
commit a14f1d8
Show file tree

Hide file tree

Showing 13 changed files with 297 additions and 256 deletions.
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
@@ -18,12 +18,12 @@
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-core</artifactId>
-            <version>1.35</version>
+            <version>1.36</version>
         </dependency>
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-generator-annprocess</artifactId>
-            <version>1.35</version>
+            <version>1.36</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/core/pom.xml b/core/pom.xml
@@ -13,8 +13,17 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>5.9.0</version>
+            <version>5.9.3</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.1.2</version>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/core/src/main/java/me/fourteendoggo/mathexpressionparser/ExpressionParser.java b/core/src/main/java/me/fourteendoggo/mathexpressionparser/ExpressionParser.java
@@ -1,11 +1,11 @@
 package me.fourteendoggo.mathexpressionparser;
 
-import me.fourteendoggo.mathexpressionparser.container.TokenList;
 import me.fourteendoggo.mathexpressionparser.exceptions.SyntaxException;
 import me.fourteendoggo.mathexpressionparser.function.FunctionCallSite;
 import me.fourteendoggo.mathexpressionparser.function.FunctionContext;
 import me.fourteendoggo.mathexpressionparser.utils.Assert;
 
+import java.util.Objects;
 import java.util.function.DoubleBinaryOperator;
 import java.util.function.DoubleUnaryOperator;
 import java.util.function.ToDoubleFunction;
@@ -22,11 +22,11 @@ private ExpressionParser() {}
      * @throws SyntaxException if the given expression is invalid or empty
      */
     public static double parse(String input) {
-        Assert.notNull(input, "input was null");
+        Objects.requireNonNull(input, "input was null");
         Assert.isFalse(input.isEmpty(), "input was empty");
 
-        TokenList tokens = new Tokenizer(input.toCharArray()).readTokens();
-        return tokens.solve();
+        Tokenizer tokenizer = new Tokenizer(input.toCharArray());
+        return tokenizer.readTokens().solve();
     }
 
     /**