From a315c7c11e9a938ddda8143230da71edf554398d Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Thu, 23 Feb 2017 20:42:27 +0100 Subject: [PATCH] More small fixes (#977) * no effecitve code change: add @FunctionalInterface to designated interfaces * no effective code change: removed obsolete imports * no effective code change: removed obsolete @SuppressWarnings * no effective code change: add @SuppressWarnings to UUID_PLACEHOLDER --- src/main/java/io/ebean/config/CurrentTenantProvider.java | 1 + src/main/java/io/ebean/config/CurrentUserProvider.java | 1 + src/main/java/io/ebean/config/EncryptDeployManager.java | 1 + src/main/java/io/ebean/config/EncryptKey.java | 1 + src/main/java/io/ebean/config/EncryptKeyManager.java | 3 ++- src/main/java/io/ebean/config/TenantDataSourceProvider.java | 3 ++- src/main/java/io/ebean/config/TenantSchemaProvider.java | 1 + .../java/io/ebean/config/dbplatform/DbPlatformTypeMapping.java | 1 + .../java/io/ebeaninternal/server/deploy/BeanDescriptor.java | 2 -- .../io/ebeaninternal/server/loadcontext/DLoadBeanContext.java | 1 - src/main/java/io/ebeaninternal/server/query/CQuery.java | 2 -- .../java/io/ebeaninternal/server/type/DefaultTypeManager.java | 1 - .../java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java | 1 - .../java/io/ebeaninternal/server/type/ScalarTypeWrapper.java | 2 -- .../java/io/ebeaninternal/server/type/ModifyAwareMapTest.java | 1 - src/test/java/org/tests/lib/TestMessage.java | 1 - 16 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/main/java/io/ebean/config/CurrentTenantProvider.java b/src/main/java/io/ebean/config/CurrentTenantProvider.java index 682f4401d..c1be77eeb 100644 --- a/src/main/java/io/ebean/config/CurrentTenantProvider.java +++ b/src/main/java/io/ebean/config/CurrentTenantProvider.java @@ -3,6 +3,7 @@ package io.ebean.config; /** * Provides the Tenant Id for the current request based on the current user. */ +@FunctionalInterface public interface CurrentTenantProvider { /** diff --git a/src/main/java/io/ebean/config/CurrentUserProvider.java b/src/main/java/io/ebean/config/CurrentUserProvider.java index 87387c3d1..45f7b9d1a 100644 --- a/src/main/java/io/ebean/config/CurrentUserProvider.java +++ b/src/main/java/io/ebean/config/CurrentUserProvider.java @@ -3,6 +3,7 @@ package io.ebean.config; /** * Provides the current user in order to support 'Who created', 'Who modified' and other audit features. */ +@FunctionalInterface public interface CurrentUserProvider { /** diff --git a/src/main/java/io/ebean/config/EncryptDeployManager.java b/src/main/java/io/ebean/config/EncryptDeployManager.java index 78823bed7..7abf971e5 100644 --- a/src/main/java/io/ebean/config/EncryptDeployManager.java +++ b/src/main/java/io/ebean/config/EncryptDeployManager.java @@ -3,6 +3,7 @@ package io.ebean.config; /** * Programmatically define which database columns are encrypted. */ +@FunctionalInterface public interface EncryptDeployManager { /** diff --git a/src/main/java/io/ebean/config/EncryptKey.java b/src/main/java/io/ebean/config/EncryptKey.java index b5d72c662..f49357ce5 100644 --- a/src/main/java/io/ebean/config/EncryptKey.java +++ b/src/main/java/io/ebean/config/EncryptKey.java @@ -6,6 +6,7 @@ package io.ebean.config; * For simple cases this often represent a simple String key but depending on * the encryption method this could contain other details. */ +@FunctionalInterface public interface EncryptKey { /** diff --git a/src/main/java/io/ebean/config/EncryptKeyManager.java b/src/main/java/io/ebean/config/EncryptKeyManager.java index dac0cfd21..0917ed052 100644 --- a/src/main/java/io/ebean/config/EncryptKeyManager.java +++ b/src/main/java/io/ebean/config/EncryptKeyManager.java @@ -3,6 +3,7 @@ package io.ebean.config; /** * Determine keys used for encryption and decryption. */ +@FunctionalInterface public interface EncryptKeyManager { /** @@ -11,7 +12,7 @@ public interface EncryptKeyManager { * This gives the EncryptKeyManager the opportunity to get keys etc. *

*/ - void initialise(); + default void initialise() {}; /** * Return the key used to encrypt and decrypt a property mapping to the given diff --git a/src/main/java/io/ebean/config/TenantDataSourceProvider.java b/src/main/java/io/ebean/config/TenantDataSourceProvider.java index fdb895caf..cd4a7e27e 100644 --- a/src/main/java/io/ebean/config/TenantDataSourceProvider.java +++ b/src/main/java/io/ebean/config/TenantDataSourceProvider.java @@ -5,6 +5,7 @@ import javax.sql.DataSource; /** * For multi-tenancy via DB supply the DataSource given the tenantId. */ +@FunctionalInterface public interface TenantDataSourceProvider { /** @@ -15,5 +16,5 @@ public interface TenantDataSourceProvider { /** * Shutdown all the DataSources. */ - void shutdown(boolean deregisterDriver); + default void shutdown(boolean deregisterDriver) {}; } diff --git a/src/main/java/io/ebean/config/TenantSchemaProvider.java b/src/main/java/io/ebean/config/TenantSchemaProvider.java index 7e1fc58b5..063b43631 100644 --- a/src/main/java/io/ebean/config/TenantSchemaProvider.java +++ b/src/main/java/io/ebean/config/TenantSchemaProvider.java @@ -3,6 +3,7 @@ package io.ebean.config; /** * For multi-tenancy via DB SCHEMA supply the schema given the tenantId. */ +@FunctionalInterface public interface TenantSchemaProvider { /** diff --git a/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeMapping.java b/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeMapping.java index c85fef105..6ad6f9e95 100644 --- a/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeMapping.java +++ b/src/main/java/io/ebean/config/dbplatform/DbPlatformTypeMapping.java @@ -13,6 +13,7 @@ public class DbPlatformTypeMapping { private static DbPlatformTypeLookup lookup = new DbPlatformTypeLookup(); private static final DbPlatformType UUID_NATIVE = new DbPlatformType("uuid", false); + @SuppressWarnings("unused") private static final DbPlatformType UUID_PLACEHOLDER = new DbPlatformType("uuidPlaceholder"); private static final DbPlatformType JSON_CLOB_PLACEHOLDER = new DbPlatformType("jsonClobPlaceholder"); private static final DbPlatformType JSON_BLOB_PLACEHOLDER = new DbPlatformType("jsonBlobPlaceholder"); diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java index a29ffcfa7..f37d870be 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java @@ -1642,7 +1642,6 @@ public class BeanDescriptor implements MetaBeanInfo, BeanType { * a reference (then {@link BeanPostLoad#postLoad(Object)} will be invoked * on first access (lazy load) or immediately (eager load) */ - @SuppressWarnings("unchecked") public EntityBean createEntityBean(boolean isNew) { try { EntityBean bean = (EntityBean) prototypeEntityBean._ebean_newInstance(); @@ -2392,7 +2391,6 @@ public class BeanDescriptor implements MetaBeanInfo, BeanType { /** * Register the new BeanPersistController. */ - @SuppressWarnings("unchecked") public void register(BeanPersistListener newPersistListener) { if (newPersistListener.isRegisterFor(beanType)) { diff --git a/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java index 8f98c38ba..574e6f72a 100644 --- a/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java +++ b/src/main/java/io/ebeaninternal/server/loadcontext/DLoadBeanContext.java @@ -12,7 +12,6 @@ import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.querydefn.OrmQueryProperties; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; /** diff --git a/src/main/java/io/ebeaninternal/server/query/CQuery.java b/src/main/java/io/ebeaninternal/server/query/CQuery.java index fe8bd8cc7..d7010dfe4 100644 --- a/src/main/java/io/ebeaninternal/server/query/CQuery.java +++ b/src/main/java/io/ebeaninternal/server/query/CQuery.java @@ -195,7 +195,6 @@ public class CQuery implements DbReadContext, CancelableQuery { /** * Create the Sql select based on the request. */ - @SuppressWarnings("unchecked") public CQuery(OrmQueryRequest request, CQueryPredicates predicates, CQueryPlan queryPlan) { this.request = request; this.queryPlan = queryPlan; @@ -537,7 +536,6 @@ public class CQuery implements DbReadContext, CancelableQuery { /** * Read version beans and their effective dates. */ - @SuppressWarnings("unchecked") List> readVersions() throws SQLException { List> versionList = new ArrayList<>(); diff --git a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java index 6acbfb064..f84688266 100644 --- a/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java +++ b/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java @@ -424,7 +424,6 @@ public final class DefaultTypeManager implements TypeManager { *

*/ @Override - @SuppressWarnings("unchecked") public ScalarType getScalarType(Class type, int jdbcType) { // File is a special Lob so check for that first diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java index c28637cb6..3806064b4 100644 --- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java @@ -113,7 +113,6 @@ public abstract class ScalarTypeBaseDate extends ScalarTypeBase { } @Override - @SuppressWarnings("unchecked") public void writeData(DataOutput dataOutput, T value) throws IOException { if (value == null) { diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java index 5114cf9ac..9117cbb1a 100644 --- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java @@ -64,14 +64,12 @@ public class ScalarTypeWrapper implements ScalarType { } @Override - @SuppressWarnings("unchecked") public B readData(DataInput dataInput) throws IOException { S unwrapValue = scalarType.readData(dataInput); return converter.wrapValue(unwrapValue); } @Override - @SuppressWarnings("unchecked") public void writeData(DataOutput dataOutput, B value) throws IOException { S unwrapValue = converter.unwrapValue(value); scalarType.writeData(dataOutput, unwrapValue); diff --git a/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java b/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java index e8fca2ed4..94cbf6ce7 100644 --- a/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ModifyAwareMapTest.java @@ -7,7 +7,6 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.LinkedHashMap; diff --git a/src/test/java/org/tests/lib/TestMessage.java b/src/test/java/org/tests/lib/TestMessage.java index ed20879ff..fcdede66f 100644 --- a/src/test/java/org/tests/lib/TestMessage.java +++ b/src/test/java/org/tests/lib/TestMessage.java @@ -1,7 +1,6 @@ package org.tests.lib; import io.ebeaninternal.server.core.Message; -import org.junit.Assert; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat;