Do not allow both timeZone and serverTime

lukas-krecan · lukas-krecan · commit a9d9a5193fb9 · 2020-04-25T09:38:14.000+02:00
diff --git a/providers/jdbc/shedlock-provider-jdbc-template/src/main/java/net/javacrumbs/shedlock/provider/jdbctemplate/JdbcTemplateLockProvider.java b/providers/jdbc/shedlock-provider-jdbc-template/src/main/java/net/javacrumbs/shedlock/provider/jdbctemplate/JdbcTemplateLockProvider.java
@@ -111,6 +111,9 @@ public static final class Configuration {
             this.timeZone = timeZone;
             this.columnNames = requireNonNull(columnNames, "columnNames can not be null");
             this.lockedByValue = requireNonNull(lockedByValue, "lockedByValue can not be null");
+            if (useServerTime && timeZone != null) {
+                throw new IllegalArgumentException("Can not set both serverTime and timeZone");
+            }
             this.useServerTime = useServerTime;
         }
 
diff --git a/providers/jdbc/shedlock-provider-jdbc-template/src/main/java/net/javacrumbs/shedlock/provider/jdbctemplate/SqlStatementsSource.java b/providers/jdbc/shedlock-provider-jdbc-template/src/main/java/net/javacrumbs/shedlock/provider/jdbctemplate/SqlStatementsSource.java
@@ -46,8 +46,7 @@ static SqlStatementsSource create(Configuration configuration) {
                     logger.debug("Using MySqlServerTimeStatementsSource (for MariaDB)");
                     return new MySqlServerTimeStatementsSource(configuration);
                 default:
-                    logger.debug("Using SqlStatementsSource");
-                    return new SqlStatementsSource(configuration);
+                    throw new UnsupportedOperationException("Server time is not supported for " + databaseProductName);
             }
         } else {
             if ("PostgreSQL".equals(databaseProductName)) {
diff --git a/providers/jdbc/shedlock-provider-jdbc-template/src/test/java/net/javacrumbs/shedlock/provider/jdbctemplate/JdbcTemplateLockProviderTest.java b/providers/jdbc/shedlock-provider-jdbc-template/src/test/java/net/javacrumbs/shedlock/provider/jdbctemplate/JdbcTemplateLockProviderTest.java
@@ -0,0 +1,23 @@
+package net.javacrumbs.shedlock.provider.jdbctemplate;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.jdbc.core.JdbcTemplate;
+
+import java.util.TimeZone;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.Mockito.mock;
+
+
+class JdbcTemplateLockProviderTest {
+    @Test
+    void shouldNotEnableBothTimezoneAndServerTime() {
+        assertThatThrownBy(
+            () -> JdbcTemplateLockProvider.Configuration.builder()
+                .withTimeZone(TimeZone.getTimeZone("Europe/Prague"))
+                .withJdbcTemplate(mock(JdbcTemplate.class))
+                .usingServerTime()
+                .build()
+        ).isInstanceOf(IllegalArgumentException.class);
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,9 @@ public static final class Configuration {`
`111`	`111`	`this.timeZone = timeZone;`
`112`	`112`	`this.columnNames = requireNonNull(columnNames, "columnNames can not be null");`
`113`	`113`	`this.lockedByValue = requireNonNull(lockedByValue, "lockedByValue can not be null");`
	`114`	`+ if (useServerTime && timeZone != null) {`
	`115`	`+ throw new IllegalArgumentException("Can not set both serverTime and timeZone");`
	`116`	`+ }`
`114`	`117`	`this.useServerTime = useServerTime;`
`115`	`118`	`}`
`116`	`119`