Fix #1758: Use long for Feature.timeOut

zaza · zaza · commit fcbcdea99dc8 · 2023-04-04T12:51:38.000+02:00
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
@@ -255,7 +255,7 @@ 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);
@@ -319,7 +319,7 @@ 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);
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public P withUnsupportedStatements(boolean allowUnsupportedStatements) {`
`33`	`33`	`return withFeature(Feature.allowUnsupportedStatements, allowUnsupportedStatements);`
`34`	`34`	`}`
`35`	`35`
`36`		`- public P withTimeOut(int timeOutMillSeconds) {`
	`36`	`+ public P withTimeOut(long timeOutMillSeconds) {`
`37`	`37`	`return withFeature(Feature.timeOut, timeOutMillSeconds);`
`38`	`38`	`}`
`39`	`39`
`@@ -46,7 +46,7 @@ public P withFeature(Feature f, boolean enabled) {`
`46`	`46`	`return me();`
`47`	`47`	`}`
`48`	`48`
`49`		`- public P withFeature(Feature f, int value) {`
	`49`	`+ public P withFeature(Feature f, long value) {`
`50`	`50`	`getConfiguration().setValue(f, value);`
`51`	`51`	`return me();`
`52`	`52`	`}`
`@@ -59,8 +59,8 @@ public boolean getAsBoolean(Feature f) {`
`59`	`59`	`return getConfiguration().getAsBoolean(f);`
`60`	`60`	`}`
`61`	`61`
`62`		`- public Integer getAsInteger(Feature f) {`
`63`		`- return getConfiguration().getAsInteger(f);`
	`62`	`+ public Long getAsLong(Feature f) {`
	`63`	`+ return getConfiguration().getAsLong(f);`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`public void setErrorRecovery(boolean errorRecovery) {`
Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,8 @@ public boolean getAsBoolean(Feature f) {`
`61`	`61`	`return Boolean.parseBoolean(String.valueOf(getValue(f)));`
`62`	`62`	`}`
`63`	`63`
`64`		`- public Integer getAsInteger(Feature f) {`
`65`		`- return Integer.valueOf(String.valueOf(getValue(f)));`
	`64`	`+ public Long getAsLong(Feature f) {`
	`65`	`+ return Long.valueOf(String.valueOf(getValue(f)));`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`public String getAsString(Feature f) {`