Fix #1758: Use long for Feature.timeOut (#1759)

Co-authored-by: Tobias <t.warneke@gmx.net>
JSQLParser · Apr 27, 2023 · 3314edf · 3314edf
1 parent 1bbb144
commit 3314edf
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 10 deletions.
diff --git a/src/main/java/net/sf/jsqlparser/parser/AbstractJSqlParser.java b/src/main/java/net/sf/jsqlparser/parser/AbstractJSqlParser.java
@@ -33,7 +33,7 @@ public P withUnsupportedStatements(boolean allowUnsupportedStatements) {
         return withFeature(Feature.allowUnsupportedStatements, allowUnsupportedStatements);
     }
 
-    public P withTimeOut(int timeOutMillSeconds) {
+    public P withTimeOut(long timeOutMillSeconds) {
         return withFeature(Feature.timeOut, timeOutMillSeconds);
     }
 
@@ -46,7 +46,7 @@ public P withFeature(Feature f, boolean enabled) {
         return me();
     }
 
-    public P withFeature(Feature f, int value) {
+    public P withFeature(Feature f, long value) {
         getConfiguration().setValue(f, value);
         return me();
     }
@@ -59,8 +59,8 @@ public boolean getAsBoolean(Feature f) {
         return getConfiguration().getAsBoolean(f);
     }
 
-    public Integer getAsInteger(Feature f) {
-        return getConfiguration().getAsInteger(f);
+    public Long getAsLong(Feature f) {
+        return getConfiguration().getAsLong(f);
     }
 
     public void setErrorRecovery(boolean errorRecovery) {

diff --git a/src/main/java/net/sf/jsqlparser/parser/CCJSqlParserUtil.java b/src/main/java/net/sf/jsqlparser/parser/CCJSqlParserUtil.java
@@ -268,8 +268,8 @@ public Statement call() throws Exception {
             });
             executorService.shutdown();
 
-            statement = future.get(parser.getConfiguration().getAsInteger(Feature.timeOut),
-                    TimeUnit.MILLISECONDS);
+            statement = future.get( parser.getConfiguration().getAsLong(Feature.timeOut), TimeUnit.MILLISECONDS);
+
         } catch (TimeoutException ex) {
             parser.interrupted = true;
             throw new JSQLParserException("Time out occurred.", ex);
@@ -335,8 +335,8 @@ public Statements call() throws Exception {
             });
             executorService.shutdown();
 
-            statements = future.get(parser.getConfiguration().getAsInteger(Feature.timeOut),
-                    TimeUnit.MILLISECONDS);
+            statements = future.get( parser.getConfiguration().getAsLong(Feature.timeOut) , TimeUnit.MILLISECONDS);
+
         } catch (TimeoutException ex) {
             parser.interrupted = true;
             throw new JSQLParserException("Time out occurred.", ex);

diff --git a/src/main/java/net/sf/jsqlparser/parser/feature/FeatureConfiguration.java b/src/main/java/net/sf/jsqlparser/parser/feature/FeatureConfiguration.java
@@ -61,8 +61,8 @@ public boolean getAsBoolean(Feature f) {
         return Boolean.parseBoolean(String.valueOf(getValue(f)));
     }
 
-    public Integer getAsInteger(Feature f) {
-        return Integer.valueOf(String.valueOf(getValue(f)));
+    public Long getAsLong(Feature f) {
+        return Long.valueOf(String.valueOf(getValue(f)));
     }
 
     public String getAsString(Feature f) {

diff --git a/src/test/java/net/sf/jsqlparser/parser/CCJSqlParserTest.java b/src/test/java/net/sf/jsqlparser/parser/CCJSqlParserTest.java
@@ -0,0 +1,18 @@
+package net.sf.jsqlparser.parser;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+import net.sf.jsqlparser.parser.feature.Feature;
+
+public class CCJSqlParserTest {
+    @Test
+    public void parserWithTimeout() throws Exception {
+        CCJSqlParser parser = CCJSqlParserUtil.newParser("foo").withTimeOut(123L);
+
+        Long timeOut = parser.getAsLong(Feature.timeOut);
+
+        assertThat(timeOut).isEqualTo(123L);
+    }
+}
diff --git a/src/test/java/net/sf/jsqlparser/parser/feature/FeatureConfigurationTest.java b/src/test/java/net/sf/jsqlparser/parser/feature/FeatureConfigurationTest.java
@@ -0,0 +1,17 @@
+package net.sf.jsqlparser.parser.feature;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+public class FeatureConfigurationTest {
+    @Test
+    public void getAsLong() {
+        FeatureConfiguration featureConfiguration = new FeatureConfiguration();
+        featureConfiguration.setValue(Feature.timeOut, 123L);
+
+        Long timeOut = featureConfiguration.getAsLong(Feature.timeOut);
+
+        assertThat(timeOut).isEqualTo(123L);
+    }
+}