From 838af0478e96258908545159c4181a306a0114b6 Mon Sep 17 00:00:00 2001 From: rob bygrave Date: Wed, 25 Nov 2020 22:32:59 +1300 Subject: [PATCH] #2113 - Refactor rename Query.LockType enum names --- ebean-api/src/main/java/io/ebean/Query.java | 16 ++++----- .../dbplatform/postgres/PostgresPlatform.java | 10 +++--- .../server/querydefn/DefaultOrmQuery.java | 6 ++-- .../dbplatform/PostgresPlatformTest.java | 36 +++++++++---------- .../basic/TestQueryForUpdatePostgresLock.java | 4 +-- 5 files changed, 36 insertions(+), 36 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/Query.java b/ebean-api/src/main/java/io/ebean/Query.java index 8b1d0fa03..200704cfd 100644 --- a/ebean-api/src/main/java/io/ebean/Query.java +++ b/ebean-api/src/main/java/io/ebean/Query.java @@ -184,29 +184,29 @@ public interface Query { */ enum LockType { /** - * The default lock type - See PlatformConfig.lockWithKey option. + * The default lock type - See PlatformConfig.forUpdateNoKey option. */ - Default, + DEFAULT, /** * FOR UPDATE. */ - Update, + UPDATE, /** * FOR NO KEY UPDATE. */ - NoKeyUpdate, + NO_KEY_UPDATE, /** - * FOR SHARE. + * FOR SHARE UPDATE. */ - Share, + SHARE, /** - * FOR KEY SHARE. + * FOR KEY SHARE UPDATE. */ - KeyShare + KEY_SHARE } /** diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java index c4305f901..19d8a9683 100644 --- a/ebean-api/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java +++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/postgres/PostgresPlatform.java @@ -141,11 +141,11 @@ public class PostgresPlatform extends DatabasePlatform { private String lock(Query.LockType lockType) { switch (lockType) { - case Update: return FOR_UPDATE; - case NoKeyUpdate: return FOR_NO_KEY_UPDATE; - case Share: return FOR_SHARE; - case KeyShare: return FOR_KEY_SHARE; - case Default: return forUpdateNoKey ? FOR_NO_KEY_UPDATE : FOR_UPDATE; + case UPDATE: return FOR_UPDATE; + case NO_KEY_UPDATE: return FOR_NO_KEY_UPDATE; + case SHARE: return FOR_SHARE; + case KEY_SHARE: return FOR_KEY_SHARE; + case DEFAULT: return forUpdateNoKey ? FOR_NO_KEY_UPDATE : FOR_UPDATE; } return FOR_UPDATE; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java index 8c790a121..a7cb9bd64 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java @@ -965,7 +965,7 @@ public class DefaultOrmQuery implements SpiQuery { @Override public DefaultOrmQuery forUpdate() { - return setForUpdateWithMode(LockWait.WAIT, LockType.Default); + return setForUpdateWithMode(LockWait.WAIT, LockType.DEFAULT); } @Override @@ -985,12 +985,12 @@ public class DefaultOrmQuery implements SpiQuery { @Override public DefaultOrmQuery forUpdateNoWait() { - return setForUpdateWithMode(LockWait.NOWAIT, LockType.Default); + return setForUpdateWithMode(LockWait.NOWAIT, LockType.DEFAULT); } @Override public DefaultOrmQuery forUpdateSkipLocked() { - return setForUpdateWithMode(LockWait.SKIPLOCKED, LockType.Default); + return setForUpdateWithMode(LockWait.SKIPLOCKED, LockType.DEFAULT); } private DefaultOrmQuery setForUpdateWithMode(LockWait mode, LockType lockType) { diff --git a/ebean-core/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java index e15b4550b..6ed8c3e88 100644 --- a/ebean-core/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java +++ b/ebean-core/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java @@ -30,24 +30,24 @@ public class PostgresPlatformTest { platform.configure(config); assertThat(config.isForUpdateNoKey()).isFalse(); - assertThat(platform.withForUpdate("X", Query.LockWait.SKIPLOCKED, Query.LockType.Default)).isEqualTo("X for update skip locked"); - assertThat(platform.withForUpdate("X", Query.LockWait.NOWAIT, Query.LockType.Default)).isEqualTo("X for update nowait"); - assertThat(platform.withForUpdate("X", Query.LockWait.WAIT, Query.LockType.Default)).isEqualTo("X for update"); + assertThat(platform.withForUpdate("X", Query.LockWait.SKIPLOCKED, Query.LockType.DEFAULT)).isEqualTo("X for update skip locked"); + assertThat(platform.withForUpdate("X", Query.LockWait.NOWAIT, Query.LockType.DEFAULT)).isEqualTo("X for update nowait"); + assertThat(platform.withForUpdate("X", Query.LockWait.WAIT, Query.LockType.DEFAULT)).isEqualTo("X for update"); - assertThat(platform.withForUpdate("X", Query.LockWait.SKIPLOCKED, Query.LockType.Update)).isEqualTo("X for update skip locked"); - assertThat(platform.withForUpdate("X", Query.LockWait.SKIPLOCKED, Query.LockType.NoKeyUpdate)).isEqualTo("X for no key update skip locked"); - assertThat(platform.withForUpdate("X", Query.LockWait.SKIPLOCKED, Query.LockType.Share)).isEqualTo("X for share skip locked"); - assertThat(platform.withForUpdate("X", Query.LockWait.SKIPLOCKED, Query.LockType.KeyShare)).isEqualTo("X for key share skip locked"); + assertThat(platform.withForUpdate("X", Query.LockWait.SKIPLOCKED, Query.LockType.UPDATE)).isEqualTo("X for update skip locked"); + assertThat(platform.withForUpdate("X", Query.LockWait.SKIPLOCKED, Query.LockType.NO_KEY_UPDATE)).isEqualTo("X for no key update skip locked"); + assertThat(platform.withForUpdate("X", Query.LockWait.SKIPLOCKED, Query.LockType.SHARE)).isEqualTo("X for share skip locked"); + assertThat(platform.withForUpdate("X", Query.LockWait.SKIPLOCKED, Query.LockType.KEY_SHARE)).isEqualTo("X for key share skip locked"); - assertThat(platform.withForUpdate("X", Query.LockWait.NOWAIT, Query.LockType.Update)).isEqualTo("X for update nowait"); - assertThat(platform.withForUpdate("X", Query.LockWait.NOWAIT, Query.LockType.NoKeyUpdate)).isEqualTo("X for no key update nowait"); - assertThat(platform.withForUpdate("X", Query.LockWait.NOWAIT, Query.LockType.Share)).isEqualTo("X for share nowait"); - assertThat(platform.withForUpdate("X", Query.LockWait.NOWAIT, Query.LockType.KeyShare)).isEqualTo("X for key share nowait"); + assertThat(platform.withForUpdate("X", Query.LockWait.NOWAIT, Query.LockType.UPDATE)).isEqualTo("X for update nowait"); + assertThat(platform.withForUpdate("X", Query.LockWait.NOWAIT, Query.LockType.NO_KEY_UPDATE)).isEqualTo("X for no key update nowait"); + assertThat(platform.withForUpdate("X", Query.LockWait.NOWAIT, Query.LockType.SHARE)).isEqualTo("X for share nowait"); + assertThat(platform.withForUpdate("X", Query.LockWait.NOWAIT, Query.LockType.KEY_SHARE)).isEqualTo("X for key share nowait"); - assertThat(platform.withForUpdate("X", Query.LockWait.WAIT, Query.LockType.Update)).isEqualTo("X for update"); - assertThat(platform.withForUpdate("X", Query.LockWait.WAIT, Query.LockType.NoKeyUpdate)).isEqualTo("X for no key update"); - assertThat(platform.withForUpdate("X", Query.LockWait.WAIT, Query.LockType.Share)).isEqualTo("X for share"); - assertThat(platform.withForUpdate("X", Query.LockWait.WAIT, Query.LockType.KeyShare)).isEqualTo("X for key share"); + assertThat(platform.withForUpdate("X", Query.LockWait.WAIT, Query.LockType.UPDATE)).isEqualTo("X for update"); + assertThat(platform.withForUpdate("X", Query.LockWait.WAIT, Query.LockType.NO_KEY_UPDATE)).isEqualTo("X for no key update"); + assertThat(platform.withForUpdate("X", Query.LockWait.WAIT, Query.LockType.SHARE)).isEqualTo("X for share"); + assertThat(platform.withForUpdate("X", Query.LockWait.WAIT, Query.LockType.KEY_SHARE)).isEqualTo("X for key share"); } @Test @@ -60,9 +60,9 @@ public class PostgresPlatformTest { platform.configure(config); assertThat(config.isForUpdateNoKey()).isTrue(); - assertThat(platform.withForUpdate("X", Query.LockWait.SKIPLOCKED, Query.LockType.Default)).isEqualTo("X for no key update skip locked"); - assertThat(platform.withForUpdate("X", Query.LockWait.NOWAIT, Query.LockType.Default)).isEqualTo("X for no key update nowait"); - assertThat(platform.withForUpdate("X", Query.LockWait.WAIT, Query.LockType.Default)).isEqualTo("X for no key update"); + assertThat(platform.withForUpdate("X", Query.LockWait.SKIPLOCKED, Query.LockType.DEFAULT)).isEqualTo("X for no key update skip locked"); + assertThat(platform.withForUpdate("X", Query.LockWait.NOWAIT, Query.LockType.DEFAULT)).isEqualTo("X for no key update nowait"); + assertThat(platform.withForUpdate("X", Query.LockWait.WAIT, Query.LockType.DEFAULT)).isEqualTo("X for no key update"); } } diff --git a/ebean-core/src/test/java/org/tests/basic/TestQueryForUpdatePostgresLock.java b/ebean-core/src/test/java/org/tests/basic/TestQueryForUpdatePostgresLock.java index d664f39c9..799850500 100644 --- a/ebean-core/src/test/java/org/tests/basic/TestQueryForUpdatePostgresLock.java +++ b/ebean-core/src/test/java/org/tests/basic/TestQueryForUpdatePostgresLock.java @@ -15,7 +15,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import static io.ebean.Query.LockType.NoKeyUpdate; +import static io.ebean.Query.LockType.NO_KEY_UPDATE; import static org.assertj.core.api.Assertions.assertThat; public class TestQueryForUpdatePostgresLock extends BaseTestCase { @@ -55,7 +55,7 @@ public class TestQueryForUpdatePostgresLock extends BaseTestCase { private void lockArticle(Integer id) { timePreLock = System.currentTimeMillis(); log.info("lock start"); - DB.find(Article.class).setId(id).forUpdate(NoKeyUpdate).findOne(); + DB.find(Article.class).setId(id).forUpdate(NO_KEY_UPDATE).findOne(); sleep(1000); timePostLock = System.currentTimeMillis(); log.info("lock done");