From 1f0191b9e46d5d49a05f27b8a9d1fcaa428cad16 Mon Sep 17 00:00:00 2001 From: rob Date: Tue, 14 Feb 2023 19:41:45 +1300 Subject: [PATCH] Tidy ebean-test internals, final classes and whitespace --- .../java/io/ebean/test/config/provider/FixedEncryptKey.java | 3 +-- .../io/ebean/test/config/provider/FixedEncryptKeyManager.java | 2 +- .../java/io/ebean/test/config/provider/ProviderAutoConfig.java | 1 - .../java/io/ebean/test/config/provider/WhoTenantProvider.java | 2 +- .../java/io/ebean/test/config/provider/WhoUserProvider.java | 2 +- 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ebean-test/src/main/java/io/ebean/test/config/provider/FixedEncryptKey.java b/ebean-test/src/main/java/io/ebean/test/config/provider/FixedEncryptKey.java index 04c8cafb3..9b36e7a17 100644 --- a/ebean-test/src/main/java/io/ebean/test/config/provider/FixedEncryptKey.java +++ b/ebean-test/src/main/java/io/ebean/test/config/provider/FixedEncryptKey.java @@ -2,7 +2,7 @@ package io.ebean.test.config.provider; import io.ebean.config.EncryptKey; -class FixedEncryptKey implements EncryptKey { +final class FixedEncryptKey implements EncryptKey { private final String key; @@ -15,5 +15,4 @@ class FixedEncryptKey implements EncryptKey { return key; } - } diff --git a/ebean-test/src/main/java/io/ebean/test/config/provider/FixedEncryptKeyManager.java b/ebean-test/src/main/java/io/ebean/test/config/provider/FixedEncryptKeyManager.java index b386daeae..7c0bef0c6 100644 --- a/ebean-test/src/main/java/io/ebean/test/config/provider/FixedEncryptKeyManager.java +++ b/ebean-test/src/main/java/io/ebean/test/config/provider/FixedEncryptKeyManager.java @@ -3,7 +3,7 @@ package io.ebean.test.config.provider; import io.ebean.config.EncryptKey; import io.ebean.config.EncryptKeyManager; -class FixedEncryptKeyManager implements EncryptKeyManager { +final class FixedEncryptKeyManager implements EncryptKeyManager { private final FixedEncryptKey key; diff --git a/ebean-test/src/main/java/io/ebean/test/config/provider/ProviderAutoConfig.java b/ebean-test/src/main/java/io/ebean/test/config/provider/ProviderAutoConfig.java index 51be172b3..a1b80b9da 100644 --- a/ebean-test/src/main/java/io/ebean/test/config/provider/ProviderAutoConfig.java +++ b/ebean-test/src/main/java/io/ebean/test/config/provider/ProviderAutoConfig.java @@ -27,7 +27,6 @@ public class ProviderAutoConfig { } public void run() { - int providerSetFlag = 0; CurrentUserProvider provider = config.getCurrentUserProvider(); diff --git a/ebean-test/src/main/java/io/ebean/test/config/provider/WhoTenantProvider.java b/ebean-test/src/main/java/io/ebean/test/config/provider/WhoTenantProvider.java index 80946618d..de5d2b081 100644 --- a/ebean-test/src/main/java/io/ebean/test/config/provider/WhoTenantProvider.java +++ b/ebean-test/src/main/java/io/ebean/test/config/provider/WhoTenantProvider.java @@ -3,7 +3,7 @@ package io.ebean.test.config.provider; import io.ebean.config.CurrentTenantProvider; import io.ebean.test.UserContext; -class WhoTenantProvider implements CurrentTenantProvider{ +final class WhoTenantProvider implements CurrentTenantProvider { @Override public Object currentId() { diff --git a/ebean-test/src/main/java/io/ebean/test/config/provider/WhoUserProvider.java b/ebean-test/src/main/java/io/ebean/test/config/provider/WhoUserProvider.java index def0ccd9b..05110bddf 100644 --- a/ebean-test/src/main/java/io/ebean/test/config/provider/WhoUserProvider.java +++ b/ebean-test/src/main/java/io/ebean/test/config/provider/WhoUserProvider.java @@ -3,7 +3,7 @@ package io.ebean.test.config.provider; import io.ebean.config.CurrentUserProvider; import io.ebean.test.UserContext; -class WhoUserProvider implements CurrentUserProvider { +final class WhoUserProvider implements CurrentUserProvider { @Override public Object currentUser() {