Adjusted NOWAIT and WAIT-Setter

Author: ANeumann82

src/main/java/net/sf/jsqlparser/statement/lock/LockStatement.java

@@ -7,7 +7,7 @@
 /**
  * Statement to Lock a specific table.<br>
  * Example:<br>
- * LOCK TABLE &lt;TABLE&gt; IN EXCLUSIVE MODE;<br>
+ * LOCK TABLE t IN EXCLUSIVE MODE<br>
  * <br>
  */
 public class LockStatement implements Statement {
@@ -59,37 +59,42 @@ public void setLockMode(LockMode lockMode) {
         this.lockMode = lockMode;
     }
 
+    /**
+     * @return True if the statement has a NOWAIT clause
+     */
     public boolean isNoWait() {
         return noWait;
     }
 
     /**
-     * Sets the NOWAIT-Flag. Clears a WAIT-Timeout if one was set before.
+     * Sets the NOWAIT-Flag.
      *
-     * @param noWait The new value of the NOWAIT-Flag
+     * @param noWait True if the statement should have the NOWAIT clause
      */
     public void setNoWait(boolean noWait) {
-        this.waitSeconds = null;
         this.noWait = noWait;
         checkValidState();
     }
 
-    public boolean isWait() {
-        return waitSeconds != null;
-    }
-
     /**
      * Sets the WAIT-Timeout. If this value is set, the Statement is rendered with WAIT
-     * &lt;timeoutSeconds&gt;
+     * &lt;timeoutSeconds&gt;<br>
+     * If the value is set to NULL, the WAIT-clause is skipped
      *
-     * @param waitSeconds The number of seconds for the WAIT timeout
+     * @param waitSeconds The number of seconds for the WAIT timeout or NULL to skip the WAIT clause
      */
-    public void setWaitSeconds(long waitSeconds) {
-        this.noWait = false;
+    public void setWaitSeconds(Long waitSeconds) {
         this.waitSeconds = waitSeconds;
         checkValidState();
     }
 
+    /**
+     * @return The number of seconds in the WAIT clause, or NULL if the statement has no WAIT clause
+     */
+    public Long getWaitSeconds() {
+        return waitSeconds;
+    }
+
     @Override
     public String toString() {
         return "LOCK TABLE "
@@ -106,7 +111,4 @@ public <T, S> T accept(StatementVisitor<T> statementVisitor, S context) {
         return statementVisitor.visit(this, context);
     }
 
-    public long getWaitTimeout() {
-        return waitSeconds;
-    }
 }

src/test/java/net/sf/jsqlparser/statement/lock/LockTest.java

@@ -63,8 +63,8 @@ void testWaitTimeout() throws JSQLParserException {
 
         LockStatement ls = (LockStatement) statement;
         assertEquals(LockMode.Share, ls.getLockMode());
-        assertTrue(ls.isWait());
-        assertEquals(300, ls.getWaitTimeout());
+        assertNotNull(ls.getWaitSeconds());
+        assertEquals(300, ls.getWaitSeconds());
     }
 
     @Test
@@ -80,15 +80,38 @@ void testCreateLockStatement() {
         ls.setNoWait(true);
         assertEquals("LOCK TABLE a IN SHARE MODE NOWAIT", ls.toString());
 
-        ls.setWaitSeconds(60);
+        ls.setNoWait(false);
+        ls.setWaitSeconds(60L);
         assertEquals("LOCK TABLE a IN SHARE MODE WAIT 60", ls.toString());
 
-        ls.setNoWait(false);
+        ls.setWaitSeconds(null);
         assertEquals("LOCK TABLE a IN SHARE MODE", ls.toString());
 
         ls.setTable(new Table("b"));
         assertEquals("LOCK TABLE b IN SHARE MODE", ls.toString());
     }
 
+    @Test
+    void testIllegalStateWaitSeconds() {
+        Table t = new Table("a");
+        LockStatement ls = new LockStatement(t, LockMode.Exclusive);
+
+        assertThrows(IllegalStateException.class, () -> {
+            ls.setNoWait(true);
+            ls.setWaitSeconds(60L);
+        });
+    }
+
+    @Test
+    void testIllegalStateNoWait() {
+        Table t = new Table("a");
+        LockStatement ls = new LockStatement(t, LockMode.Exclusive);
+
+        assertThrows(IllegalStateException.class, () -> {
+            ls.setWaitSeconds(60L);
+            ls.setNoWait(true);
+        });
+    }
+
 
 }