diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2.java
index f8b30a7a0..c9bc3a3f2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2.java
@@ -19,7 +19,7 @@ import static java.util.Collections.EMPTY_LIST;
  * H2 database support for DB ARRAY.
  */
 @SuppressWarnings("rawtypes")
-class ScalarTypeArrayListH2 extends ScalarTypeArrayList {
+final class ScalarTypeArrayListH2 extends ScalarTypeArrayList {
 
   static PlatformArrayTypeFactory factory() {
     return new ScalarTypeArrayListH2.Factory();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java
index cd7f7cf98..1d5c78553 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySetH2.java
@@ -19,7 +19,7 @@ import static java.util.Collections.EMPTY_SET;
  * H2 database support for DB ARRAY.
  */
 @SuppressWarnings("rawtypes")
-class ScalarTypeArraySetH2 extends ScalarTypeArraySet {
+final class ScalarTypeArraySetH2 extends ScalarTypeArraySet {
 
   static PlatformArrayTypeFactory factory() {
     return new ScalarTypeArraySetH2.Factory();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBoolean.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBoolean.java
index 93a688e94..56bc180a9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBoolean.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBoolean.java
@@ -21,9 +21,9 @@ import java.sql.Types;
  * This may or may not be a native jdbc type depending on the database and jdbc driver.
  * </p>
  */
-public class ScalarTypeBoolean {
+public final class ScalarTypeBoolean {
 
-  public static class Native extends BooleanBase {
+  public static final class Native extends BooleanBase {
 
     /**
      * Native Boolean database type.
@@ -75,7 +75,7 @@ public class ScalarTypeBoolean {
    * type.boolean.dbtype="bit" in the ebean configuration
    * </p>
    */
-  static class BitBoolean extends BooleanBase {
+  static final class BitBoolean extends BooleanBase {
 
     /**
      * Native Boolean database type.
@@ -124,7 +124,7 @@ public class ScalarTypeBoolean {
   /**
    * Converted to/from an Integer in the Database.
    */
-  static class IntBoolean extends BooleanBase {
+  static final class IntBoolean extends BooleanBase {
 
     private final Integer trueValue;
     private final Integer falseValue;
@@ -211,7 +211,7 @@ public class ScalarTypeBoolean {
   /**
    * Converted to/from an Integer in the Database.
    */
-  static class StringBoolean extends BooleanBase {
+  static final class StringBoolean extends BooleanBase {
 
     private final String trueValue;
     private final String falseValue;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeByte.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeByte.java
index 5d0660930..3a64f421f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeByte.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeByte.java
@@ -18,7 +18,7 @@ import java.sql.Types;
 /**
  * ScalarType for Byte.
  */
-public class ScalarTypeByte extends ScalarTypeBase<Byte> {
+public final class ScalarTypeByte extends ScalarTypeBase<Byte> {
 
   public ScalarTypeByte() {
     super(Byte.class, true, Types.TINYINT);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBinary.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBinary.java
index 8567c808f..18cdb096e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBinary.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBinary.java
@@ -8,7 +8,7 @@ import java.sql.Types;
 /**
  * ScalarType for Types.BINARY to byte[].
  */
-public class ScalarTypeBytesBinary extends ScalarTypeBytesBase {
+public final class ScalarTypeBytesBinary extends ScalarTypeBytesBase {
 
   public ScalarTypeBytesBinary() {
     super(true, Types.BINARY);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBlob.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBlob.java
index 5ad02618f..5cc3e2afc 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBlob.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesBlob.java
@@ -8,7 +8,7 @@ import java.sql.Types;
 /**
  * ScalarType for BLOB.
  */
-public class ScalarTypeBytesBlob extends ScalarTypeBytesBase {
+public final class ScalarTypeBytesBlob extends ScalarTypeBytesBase {
 
   public ScalarTypeBytesBlob() {
     super(true, Types.BLOB);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java
index 9b81acfde..df8b32ba9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesEncrypted.java
@@ -16,10 +16,9 @@ import java.sql.SQLException;
 /**
  * Encrypted ScalarType that wraps a byte[] types.
  */
-public class ScalarTypeBytesEncrypted implements ScalarType<byte[]> {
+public final class ScalarTypeBytesEncrypted implements ScalarType<byte[]> {
 
   private final ScalarTypeBytesBase baseType;
-
   private final DataEncryptSupport dataEncryptSupport;
 
   public ScalarTypeBytesEncrypted(ScalarTypeBytesBase baseType, DataEncryptSupport dataEncryptSupport) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesLongVarbinary.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesLongVarbinary.java
index 8d1b87cf9..fef593e12 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesLongVarbinary.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesLongVarbinary.java
@@ -8,7 +8,7 @@ import java.sql.Types;
 /**
  * ScalarType for Longvarbinary.
  */
-public class ScalarTypeBytesLongVarbinary extends ScalarTypeBytesBase {
+public final class ScalarTypeBytesLongVarbinary extends ScalarTypeBytesBase {
 
   public ScalarTypeBytesLongVarbinary() {
     super(true, Types.LONGVARBINARY);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesVarbinary.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesVarbinary.java
index 3e9b68790..dea5cc1a1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesVarbinary.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBytesVarbinary.java
@@ -8,7 +8,7 @@ import java.sql.Types;
 /**
  * ScalarType for Types.VARBINARY to byte[].
  */
-public class ScalarTypeBytesVarbinary extends ScalarTypeBytesBase {
+public final class ScalarTypeBytesVarbinary extends ScalarTypeBytesBase {
 
   public ScalarTypeBytesVarbinary() {
     super(true, Types.VARBINARY);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCalendar.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCalendar.java
index c0c67e7f8..bbefa5a83 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCalendar.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCalendar.java
@@ -16,7 +16,7 @@ import static io.ebeaninternal.server.type.IsoJsonDateTimeParser.formatIso;
 /**
  * ScalarType for java.util.Calendar.
  */
-public class ScalarTypeCalendar extends ScalarTypeBaseDateTime<Calendar> {
+public final class ScalarTypeCalendar extends ScalarTypeBaseDateTime<Calendar> {
 
   public ScalarTypeCalendar(JsonConfig.DateTime mode, int jdbcType) {
     super(mode, Calendar.class, false, jdbcType);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeChar.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeChar.java
index 509506298..f5fe00954 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeChar.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeChar.java
@@ -10,7 +10,7 @@ import java.sql.Types;
 /**
  * ScalarType for char.
  */
-public class ScalarTypeChar extends ScalarTypeBaseVarchar<Character> {
+public final class ScalarTypeChar extends ScalarTypeBaseVarchar<Character> {
 
   public ScalarTypeChar() {
     super(char.class, false, Types.VARCHAR);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCharArray.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCharArray.java
index dedb38838..ebfd69a6f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCharArray.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCharArray.java
@@ -13,7 +13,7 @@ import java.sql.Types;
 /**
  * ScalarType for char[].
  */
-public class ScalarTypeCharArray extends ScalarTypeBaseVarchar<char[]> {
+public final class ScalarTypeCharArray extends ScalarTypeBaseVarchar<char[]> {
 
   public ScalarTypeCharArray() {
     super(char[].class, false, Types.VARCHAR);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCidr.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCidr.java
index 1d303a157..390ac22c7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCidr.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCidr.java
@@ -42,7 +42,7 @@ public abstract class ScalarTypeCidr extends ScalarTypeBaseVarchar<Cidr> {
   /**
    * Cidr to Varchar.
    */
-  public static class Varchar extends ScalarTypeCidr {
+  public static final class Varchar extends ScalarTypeCidr {
 
     @Override
     public void bind(DataBinder binder, Cidr value) throws SQLException {
@@ -57,7 +57,7 @@ public abstract class ScalarTypeCidr extends ScalarTypeBaseVarchar<Cidr> {
   /**
    * Cidr to Postgres CIDR.
    */
-  public static class Postgres extends ScalarTypeCidr {
+  public static final class Postgres extends ScalarTypeCidr {
 
     @Override
     public void bind(DataBinder binder, Cidr value) throws SQLException {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeClass.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeClass.java
index 112e08459..78f4a19de 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeClass.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeClass.java
@@ -4,12 +4,9 @@ import javax.persistence.PersistenceException;
 
 /**
  * ScalarType for Class that persists it to VARCHAR column.
- *
- * @author emcgreal
- * @author rbygrave
  */
 @SuppressWarnings({"rawtypes"})
-public class ScalarTypeClass extends ScalarTypeBaseVarchar<Class> {
+public final class ScalarTypeClass extends ScalarTypeBaseVarchar<Class> {
 
   public ScalarTypeClass() {
     super(Class.class);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCurrency.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCurrency.java
index 6ed58b133..0eaeb8602 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCurrency.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeCurrency.java
@@ -5,7 +5,7 @@ import java.util.Currency;
 /**
  * ScalarType for java.util.Currency which converts to and from a VARCHAR database column.
  */
-public class ScalarTypeCurrency extends ScalarTypeBaseVarchar<Currency> {
+public final class ScalarTypeCurrency extends ScalarTypeBaseVarchar<Currency> {
 
   public ScalarTypeCurrency() {
     super(Currency.class);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDate.java
index b9d49586f..b69571c11 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDate.java
@@ -12,7 +12,7 @@ import java.sql.Types;
 /**
  * ScalarType for java.sql.Date.
  */
-public class ScalarTypeDate extends ScalarTypeBaseDate<java.sql.Date> {
+public final class ScalarTypeDate extends ScalarTypeBaseDate<java.sql.Date> {
 
   public ScalarTypeDate(JsonConfig.Date mode) {
     super(mode, Date.class, true, Types.DATE);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDayOfWeek.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDayOfWeek.java
index 39c8ada61..1cee17865 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDayOfWeek.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDayOfWeek.java
@@ -11,7 +11,7 @@ import java.time.DayOfWeek;
 /**
  * ScalarType mapping for Month enum.
  */
-public class ScalarTypeDayOfWeek extends ScalarTypeEnumWithMapping {
+public final class ScalarTypeDayOfWeek extends ScalarTypeEnumWithMapping {
 
   static final EnumToDbIntegerMap beanDbMap = new EnumToDbIntegerMap();
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java
index 14f825413..02adb9de8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java
@@ -16,7 +16,7 @@ import java.sql.Types;
 /**
  * ScalarType for Double and double.
  */
-public class ScalarTypeDouble extends ScalarTypeBase<Double> {
+public final class ScalarTypeDouble extends ScalarTypeBase<Double> {
 
   public ScalarTypeDouble() {
     super(Double.class, true, Types.DOUBLE);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanos.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanos.java
index faeca10a5..2f99708b3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanos.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanos.java
@@ -15,7 +15,7 @@ import java.time.Duration;
  * Stored in the DB as DECIMAL value.
  * </p>
  */
-public class ScalarTypeDurationWithNanos extends ScalarTypeDuration {
+public final class ScalarTypeDurationWithNanos extends ScalarTypeDuration {
 
   public ScalarTypeDurationWithNanos() {
     super(Types.DECIMAL);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java
index ba9a44b20..1a552d11a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEncryptedWrapper.java
@@ -12,12 +12,10 @@ import java.io.DataOutput;
 import java.io.IOException;
 import java.sql.SQLException;
 
-public class ScalarTypeEncryptedWrapper<T> implements ScalarType<T>, LocalEncryptedType {
+public final class ScalarTypeEncryptedWrapper<T> implements ScalarType<T>, LocalEncryptedType {
 
   private final ScalarType<T> wrapped;
-
   private final DataEncryptSupport dataEncryptSupport;
-
   private final ScalarTypeBytesBase byteArrayType;
 
   public ScalarTypeEncryptedWrapper(ScalarType<T> wrapped, ScalarTypeBytesBase byteArrayType, DataEncryptSupport dataEncryptSupport) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java
index 4c8a5e645..dcdc8d42a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java
@@ -28,10 +28,10 @@ import java.util.Set;
  * Ebean specific @EnumMapping.
  * </p>
  */
-public class ScalarTypeEnumStandard {
+public final class ScalarTypeEnumStandard {
 
   @SuppressWarnings({"rawtypes", "unchecked"})
-  public static class StringEnum extends EnumBase implements ScalarTypeEnum {
+  public static final class StringEnum extends EnumBase implements ScalarTypeEnum {
 
     private final int length;
 
@@ -63,15 +63,12 @@ public class ScalarTypeEnumStandard {
     }
 
     private int maxValueLength(Class<?> enumType) {
-
       int maxLen = 0;
-
       Object[] ea = enumType.getEnumConstants();
       for (Object anEa : ea) {
         Enum<?> e = (Enum<?>) anEa;
         maxLen = Math.max(maxLen, e.name().length());
       }
-
       return maxLen;
     }
 
@@ -120,7 +117,7 @@ public class ScalarTypeEnumStandard {
   }
 
   @SuppressWarnings({"rawtypes", "unchecked"})
-  public static class OrdinalEnum extends EnumBase implements ScalarTypeEnum {
+  public static final class OrdinalEnum extends EnumBase implements ScalarTypeEnum {
 
     private final Object[] enumArray;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java
index 598889f49..6960d4d09 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java
@@ -17,9 +17,7 @@ import java.util.Set;
 public class ScalarTypeEnumWithMapping extends ScalarTypeEnumStandard.EnumBase implements ScalarType, ScalarTypeEnum {
 
   private final EnumToDbValueMap beanDbMap;
-
   private final int length;
-
   private final boolean withConstraint;
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java
index 4dfa68a24..d6f694672 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java
@@ -25,16 +25,13 @@ import java.sql.Types;
 /**
  * ScalarType for streaming between a File and the database.
  */
-public class ScalarTypeFile extends ScalarTypeBase<File> {
+public final class ScalarTypeFile extends ScalarTypeBase<File> {
 
   private static final Logger logger = LoggerFactory.getLogger(ScalarTypeFile.class);
 
   private final String prefix;
-
   private final String suffix;
-
   private final File directory;
-
   private final int bufferSize;
 
   /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFloat.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFloat.java
index e9f8e1306..d468b74ef 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFloat.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFloat.java
@@ -16,7 +16,7 @@ import java.sql.Types;
 /**
  * ScalarType for Float and float.
  */
-public class ScalarTypeFloat extends ScalarTypeBase<Float> {
+public final class ScalarTypeFloat extends ScalarTypeBase<Float> {
 
   public ScalarTypeFloat() {
     super(Float.class, true, Types.REAL);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInet.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInet.java
index 9252afe6e..9a7b884f4 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInet.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInet.java
@@ -42,7 +42,7 @@ public abstract class ScalarTypeInet extends ScalarTypeBaseVarchar<Inet> {
   /**
    * Inet to Varchar.
    */
-  public static class Varchar extends ScalarTypeInet {
+  public static final class Varchar extends ScalarTypeInet {
 
     Varchar() {
       super(Types.VARCHAR);
@@ -61,7 +61,7 @@ public abstract class ScalarTypeInet extends ScalarTypeBaseVarchar<Inet> {
   /**
    * Inet to Postgres INET.
    */
-  public static class Postgres extends ScalarTypeInet {
+  public static final class Postgres extends ScalarTypeInet {
 
     Postgres() {
       super(ExtraDbTypes.INET);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddress.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddress.java
index 1de5e1db7..419f52cd3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddress.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddress.java
@@ -7,7 +7,7 @@ import java.net.InetAddress;
 /**
  * ScalarType for java.net.URI which converts to and from a VARCHAR database column.
  */
-public class ScalarTypeInetAddress extends ScalarTypeBaseVarchar<InetAddress> {
+public final class ScalarTypeInetAddress extends ScalarTypeBaseVarchar<InetAddress> {
 
   public ScalarTypeInetAddress() {
     super(InetAddress.class);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddressPostgres.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddressPostgres.java
index 086f4fd45..aba3aa4c9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddressPostgres.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInetAddressPostgres.java
@@ -11,7 +11,7 @@ import java.sql.Types;
 /**
  * ScalarType for InetAddress to Postgres INET.
  */
-public class ScalarTypeInetAddressPostgres extends ScalarTypeBaseVarchar<InetAddress> {
+public final class ScalarTypeInetAddressPostgres extends ScalarTypeBaseVarchar<InetAddress> {
 
   public ScalarTypeInetAddressPostgres() {
     super(InetAddress.class, false, ExtraDbTypes.INET);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInstant.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInstant.java
index dd78f4a65..0d84af6e1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInstant.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInstant.java
@@ -9,7 +9,7 @@ import java.time.Instant;
 /**
  * ScalarType for java.sql.Timestamp.
  */
-public class ScalarTypeInstant extends ScalarTypeBaseDateTime<Instant> {
+public final class ScalarTypeInstant extends ScalarTypeBaseDateTime<Instant> {
 
   public ScalarTypeInstant(JsonConfig.DateTime mode) {
     super(mode, Instant.class, false, Types.TIMESTAMP);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java
index 0d343d05b..cae0de91b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java
@@ -17,7 +17,7 @@ import java.sql.Types;
 /**
  * ScalarType for Integer and int.
  */
-public class ScalarTypeInteger extends ScalarTypeBase<Integer> {
+public final class ScalarTypeInteger extends ScalarTypeBase<Integer> {
 
   public static ScalarTypeInteger INSTANCE = new ScalarTypeInteger();
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateMidnight.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateMidnight.java
index bebd64de7..c108b99f1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateMidnight.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateMidnight.java
@@ -11,7 +11,7 @@ import java.sql.Types;
  * ScalarType for Joda DateMidnight. This maps to a JDBC Date.
  */
 @SuppressWarnings("deprecation")
-public class ScalarTypeJodaDateMidnight extends ScalarTypeBaseDate<org.joda.time.DateMidnight> {
+public final class ScalarTypeJodaDateMidnight extends ScalarTypeBaseDate<org.joda.time.DateMidnight> {
 
   /**
    * Instantiates a new scalar type joda date midnight.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateTime.java
index f8d9816ae..2ca296ed0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateTime.java
@@ -11,7 +11,7 @@ import java.time.Instant;
 /**
  * ScalarType for Joda DateTime. This maps to a JDBC Timestamp.
  */
-public class ScalarTypeJodaDateTime extends ScalarTypeBaseDateTime<DateTime> {
+public final class ScalarTypeJodaDateTime extends ScalarTypeBaseDateTime<DateTime> {
 
   public ScalarTypeJodaDateTime(JsonConfig.DateTime mode) {
     super(mode, DateTime.class, false, Types.TIMESTAMP);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java
index 4727f1d58..09acb797e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java
@@ -11,7 +11,7 @@ import java.sql.Types;
 /**
  * ScalarType for Joda LocalDate. This maps to a JDBC Date.
  */
-public class ScalarTypeJodaLocalDate extends ScalarTypeBaseDate<LocalDate> {
+public final class ScalarTypeJodaLocalDate extends ScalarTypeBaseDate<LocalDate> {
 
   public ScalarTypeJodaLocalDate(JsonConfig.Date mode) {
     super(mode, LocalDate.class, false, Types.DATE);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTime.java
index bb5db7e37..5d537dc9c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTime.java
@@ -11,7 +11,7 @@ import java.time.Instant;
 /**
  * ScalarType for Joda LocalDateTime. This maps to a JDBC Timestamp.
  */
-public class ScalarTypeJodaLocalDateTime extends ScalarTypeBaseDateTime<LocalDateTime> {
+public final class ScalarTypeJodaLocalDateTime extends ScalarTypeBaseDateTime<LocalDateTime> {
 
   public ScalarTypeJodaLocalDateTime(JsonConfig.DateTime mode) {
     super(mode, LocalDateTime.class, false, Types.TIMESTAMP);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeUTC.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeUTC.java
index 1cf2656a0..4de3c513a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeUTC.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalTimeUTC.java
@@ -13,7 +13,7 @@ import java.sql.Types;
 /**
  * ScalarType for Joda LocalTime. This maps to a JDBC Time.
  */
-public class ScalarTypeJodaLocalTimeUTC extends ScalarTypeJodaLocalTime {
+public final class ScalarTypeJodaLocalTimeUTC extends ScalarTypeJodaLocalTime {
 
   public ScalarTypeJodaLocalTimeUTC() {
     super();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriod.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriod.java
index 5d3e3ee4e..2dc09a233 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriod.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaPeriod.java
@@ -5,7 +5,7 @@ import org.joda.time.Period;
 /**
  * ScalarType for Joda Period stored as DB VARCHAR
  */
-public class ScalarTypeJodaPeriod extends ScalarTypeBaseVarchar<Period> {
+public final class ScalarTypeJodaPeriod extends ScalarTypeBaseVarchar<Period> {
 
   public ScalarTypeJodaPeriod() {
     super(Period.class);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java
index d3c700443..71179dba7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java
@@ -19,7 +19,7 @@ import java.util.List;
 /**
  * Types for mapping List in JSON format to DB types VARCHAR, JSON and JSONB.
  */
-class ScalarTypeJsonList {
+final class ScalarTypeJsonList {
 
   /**
    * Return the appropriate ScalarType based requested dbType and if Postgres.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNode.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNode.java
index 5ff3ef99a..9c3950b94 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNode.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNode.java
@@ -27,7 +27,7 @@ public abstract class ScalarTypeJsonNode extends ScalarTypeBase<JsonNode> {
   /**
    * Clob storage based implementation.
    */
-  public static class Clob extends ScalarTypeJsonNode {
+  public static final class Clob extends ScalarTypeJsonNode {
 
     public Clob(ObjectMapper objectMapper) {
       super(objectMapper, Types.CLOB);
@@ -46,7 +46,7 @@ public abstract class ScalarTypeJsonNode extends ScalarTypeBase<JsonNode> {
   /**
    * Varchar storage based implementation.
    */
-  public static class Varchar extends ScalarTypeJsonNode {
+  public static final class Varchar extends ScalarTypeJsonNode {
 
     public Varchar(ObjectMapper objectMapper) {
       super(objectMapper, Types.VARCHAR);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNodePostgres.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNodePostgres.java
index f24178aab..94d46a67d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNodePostgres.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNodePostgres.java
@@ -31,7 +31,7 @@ public abstract class ScalarTypeJsonNodePostgres extends ScalarTypeJsonNode {
   /**
    * ScalarType mapping JsonNode to Postgres JSON database type.
    */
-  public static class JSON extends ScalarTypeJsonNodePostgres {
+  public static final class JSON extends ScalarTypeJsonNodePostgres {
 
     public JSON(ObjectMapper objectMapper) {
       super(objectMapper, DbPlatformType.JSON, PostgresHelper.JSON_TYPE);
@@ -41,7 +41,7 @@ public abstract class ScalarTypeJsonNodePostgres extends ScalarTypeJsonNode {
   /**
    * ScalarType mapping JsonNode to Postgres JSONB database type.
    */
-  public static class JSONB extends ScalarTypeJsonNodePostgres {
+  public static final class JSONB extends ScalarTypeJsonNodePostgres {
 
     public JSONB(ObjectMapper objectMapper) {
       super(objectMapper, DbPlatformType.JSONB, PostgresHelper.JSONB_TYPE);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
index 65cb88cdc..5cda3f921 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonObjectMapper.java
@@ -25,7 +25,7 @@ import java.sql.Types;
 /**
  * Supports @DbJson properties using Jackson ObjectMapper.
  */
-class ScalarTypeJsonObjectMapper {
+final class ScalarTypeJsonObjectMapper {
 
   /**
    * Create and return the appropriate ScalarType.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java
index eca6102fa..4fd228459 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java
@@ -13,7 +13,7 @@ import java.time.ZonedDateTime;
 /**
  * ScalarType for java.time.LocalDate. This maps to a JDBC Date.
  */
-public class ScalarTypeLocalDate extends ScalarTypeBaseDate<LocalDate> {
+public final class ScalarTypeLocalDate extends ScalarTypeBaseDate<LocalDate> {
 
   public ScalarTypeLocalDate(JsonConfig.Date mode) {
     super(mode, LocalDate.class, false, Types.DATE);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTime.java
index 12b884e82..e03c67898 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTime.java
@@ -14,7 +14,7 @@ import java.time.ZoneId;
 /**
  * ScalarType for java.sql.Timestamp.
  */
-public class ScalarTypeLocalDateTime extends ScalarTypeBaseDateTime<LocalDateTime> {
+public final class ScalarTypeLocalDateTime extends ScalarTypeBaseDateTime<LocalDateTime> {
 
   public ScalarTypeLocalDateTime(JsonConfig.DateTime mode) {
     super(mode, LocalDateTime.class, false, Types.TIMESTAMP);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanos.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanos.java
index 0633fe19c..2a86abbfa 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanos.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalTimeWithNanos.java
@@ -11,7 +11,7 @@ import java.time.LocalTime;
 /**
  * ScalarType for java.time.LocalTime stored with Nanos as DB BIGINT type.
  */
-public class ScalarTypeLocalTimeWithNanos extends ScalarTypeLocalTime {
+public final class ScalarTypeLocalTimeWithNanos extends ScalarTypeLocalTime {
 
   public ScalarTypeLocalTimeWithNanos() {
     super(Types.BIGINT);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocale.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocale.java
index 438ddaf6a..cc1a4c166 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocale.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocale.java
@@ -5,7 +5,7 @@ import java.util.Locale;
 /**
  * ScalarType for java.util.Currency which converts to and from a VARCHAR database column.
  */
-public class ScalarTypeLocale extends ScalarTypeBaseVarchar<Locale> {
+public final class ScalarTypeLocale extends ScalarTypeBaseVarchar<Locale> {
 
   public ScalarTypeLocale() {
     super(Locale.class);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java
index 26c272f54..697e84376 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java
@@ -16,7 +16,7 @@ import java.sql.Types;
 /**
  * ScalarType for Long and long.
  */
-public class ScalarTypeLong extends ScalarTypeBase<Long> {
+public final class ScalarTypeLong extends ScalarTypeBase<Long> {
 
   public ScalarTypeLong() {
     super(Long.class, true, Types.BIGINT);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLongVarchar.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLongVarchar.java
index 9bde5947f..9dd621d36 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLongVarchar.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLongVarchar.java
@@ -5,7 +5,7 @@ import java.sql.Types;
 /**
  * ScalarType for String.
  */
-public class ScalarTypeLongVarchar extends ScalarTypeClob {
+public final class ScalarTypeLongVarchar extends ScalarTypeClob {
 
   public ScalarTypeLongVarchar() {
     super(true, Types.LONGVARCHAR);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMathBigInteger.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMathBigInteger.java
index bb101706f..3c5b99255 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMathBigInteger.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMathBigInteger.java
@@ -17,7 +17,7 @@ import java.sql.Types;
 /**
  * ScalarType for java.math.BigInteger.
  */
-public class ScalarTypeMathBigInteger extends ScalarTypeBase<BigInteger> {
+public final class ScalarTypeMathBigInteger extends ScalarTypeBase<BigInteger> {
 
   public ScalarTypeMathBigInteger() {
     super(BigInteger.class, false, Types.BIGINT);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonth.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonth.java
index 2707c88f1..a04925ebc 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonth.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonth.java
@@ -11,7 +11,7 @@ import java.time.Month;
 /**
  * ScalarType mapping for Month enum.
  */
-public class ScalarTypeMonth extends ScalarTypeEnumWithMapping {
+public final class ScalarTypeMonth extends ScalarTypeEnumWithMapping {
 
   static final EnumToDbIntegerMap beanDbMap = new EnumToDbIntegerMap();
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonthDay.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonthDay.java
index acebb04e9..eb26a84b9 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonthDay.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonthDay.java
@@ -21,24 +21,14 @@ import java.time.MonthDay;
  * Note that the year used should be a leap year.
  * </p>
  */
-public class ScalarTypeMonthDay extends ScalarTypeBase<MonthDay> {
-
-  protected final int year;
-
-  /**
-   * Construct with a year of 2000 (which is a leap year).
-   */
-  public ScalarTypeMonthDay() {
-    this(2000); // Year 2000 is a leap year
-  }
+final class ScalarTypeMonthDay extends ScalarTypeBase<MonthDay> {
 
   /**
    * Construct with a base year. The year should be a leap year to
    * allow the 29th Feb value.
    */
-  public ScalarTypeMonthDay(int year) {
+  ScalarTypeMonthDay() {
     super(MonthDay.class, false, Types.DATE);
-    this.year = year;
   }
 
   private MonthDay convertFromDate(Date ts) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTime.java
index b68f3eba9..f7e151238 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTime.java
@@ -13,11 +13,11 @@ import static io.ebeaninternal.server.type.IsoJsonDateTimeParser.formatIso;
 /**
  * ScalarType for java.sql.Timestamp.
  */
-public class ScalarTypeOffsetDateTime extends ScalarTypeBaseDateTime<OffsetDateTime> {
+final class ScalarTypeOffsetDateTime extends ScalarTypeBaseDateTime<OffsetDateTime> {
 
   private final ZoneId zoneId;
 
-  public ScalarTypeOffsetDateTime(JsonConfig.DateTime mode, ZoneId zoneId) {
+  ScalarTypeOffsetDateTime(JsonConfig.DateTime mode, ZoneId zoneId) {
     super(mode, OffsetDateTime.class, false, Types.TIMESTAMP);
     this.zoneId = zoneId;
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetTime.java
index 2cb3a6f35..e1f241b51 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetTime.java
@@ -5,9 +5,9 @@ import java.time.OffsetTime;
 /**
  * ScalarType for java.time.OffsetTime stored as DB VARCHAR
  */
-public class ScalarTypeOffsetTime extends ScalarTypeBaseVarchar<OffsetTime> {
+final class ScalarTypeOffsetTime extends ScalarTypeBaseVarchar<OffsetTime> {
 
-  public ScalarTypeOffsetTime() {
+  ScalarTypeOffsetTime() {
     super(OffsetTime.class);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePath.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePath.java
index c5ca8951d..a5e318881 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePath.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePath.java
@@ -8,9 +8,9 @@ import java.nio.file.Paths;
 /**
  * ScalarType for java.nio.file.Path which converts to and from a VARCHAR database column.
  */
-public class ScalarTypePath extends ScalarTypeBaseVarchar<Path> {
+final class ScalarTypePath extends ScalarTypeBaseVarchar<Path> {
 
-  public ScalarTypePath() {
+  ScalarTypePath() {
     super(Path.class);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePeriod.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePeriod.java
index 573ba6e5c..9b0175173 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePeriod.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePeriod.java
@@ -5,9 +5,9 @@ import java.time.Period;
 /**
  * ScalarType for Joda Period stored as DB VARCHAR
  */
-public class ScalarTypePeriod extends ScalarTypeBaseVarchar<Period> {
+final class ScalarTypePeriod extends ScalarTypeBaseVarchar<Period> {
 
-  public ScalarTypePeriod() {
+  ScalarTypePeriod() {
     super(Period.class);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePostgresHstore.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePostgresHstore.java
index 14d2c50d3..69b3d8a5b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePostgresHstore.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypePostgresHstore.java
@@ -20,9 +20,9 @@ import java.util.Map;
  * Postgres Hstore type which maps Map<String,String> to a single 'HStore column' in the DB.
  */
 @SuppressWarnings("rawtypes")
-public class ScalarTypePostgresHstore extends ScalarTypeBase<Map> {
+final class ScalarTypePostgresHstore extends ScalarTypeBase<Map> {
 
-  public ScalarTypePostgresHstore() {
+  ScalarTypePostgresHstore() {
     super(Map.class, false, DbPlatformType.HSTORE);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeShort.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeShort.java
index 43d7dac80..b3205b747 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeShort.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeShort.java
@@ -17,9 +17,9 @@ import java.sql.Types;
 /**
  * ScalarType for Short and short.
  */
-public class ScalarTypeShort extends ScalarTypeBase<Short> {
+final class ScalarTypeShort extends ScalarTypeBase<Short> {
 
-  public ScalarTypeShort() {
+  ScalarTypeShort() {
     super(Short.class, true, Types.SMALLINT);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeString.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeString.java
index 3ee87d9d9..d57bf253b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeString.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeString.java
@@ -5,7 +5,7 @@ import java.sql.Types;
 /**
  * ScalarType for String.
  */
-public class ScalarTypeString extends ScalarTypeStringBase {
+public final class ScalarTypeString extends ScalarTypeStringBase {
 
   public static final ScalarTypeString INSTANCE = new ScalarTypeString();
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeStringBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeStringBase.java
index 50b0d980d..d0ea5a278 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeStringBase.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeStringBase.java
@@ -16,7 +16,7 @@ import java.sql.Types;
 /**
  * Base ScalarType for String type using Varchar, Clob and LongVarchar.
  */
-public abstract class ScalarTypeStringBase extends ScalarTypeBase<String> {
+abstract class ScalarTypeStringBase extends ScalarTypeBase<String> {
 
   ScalarTypeStringBase(boolean jdbcNative, int jdbcType) {
     super(String.class, jdbcNative, jdbcType);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTime.java
index 4664d79ed..8328edfbe 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTime.java
@@ -17,9 +17,9 @@ import java.sql.Types;
 /**
  * ScalarType for java.sql.Time.
  */
-public class ScalarTypeTime extends ScalarTypeBase<Time> {
+final class ScalarTypeTime extends ScalarTypeBase<Time> {
 
-  public ScalarTypeTime() {
+  ScalarTypeTime() {
     super(Time.class, true, Types.TIME);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimeZone.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimeZone.java
index 17acc14c0..b059d2e31 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimeZone.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimeZone.java
@@ -5,9 +5,9 @@ import java.util.TimeZone;
 /**
  * ScalarType for java.util.TimeZone which converts to and from a VARCHAR database column.
  */
-public class ScalarTypeTimeZone extends ScalarTypeBaseVarchar<TimeZone> {
+final class ScalarTypeTimeZone extends ScalarTypeBaseVarchar<TimeZone> {
 
-  public ScalarTypeTimeZone() {
+  ScalarTypeTimeZone() {
     super(TimeZone.class);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimestamp.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimestamp.java
index 92db17b5d..a99b8cc56 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimestamp.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeTimestamp.java
@@ -15,9 +15,9 @@ import static io.ebeaninternal.server.type.IsoJsonDateTimeParser.formatIso;
 /**
  * ScalarType for java.sql.Timestamp.
  */
-public class ScalarTypeTimestamp extends ScalarTypeBaseDateTime<Timestamp> {
+final class ScalarTypeTimestamp extends ScalarTypeBaseDateTime<Timestamp> {
 
-  public ScalarTypeTimestamp(JsonConfig.DateTime mode) {
+  ScalarTypeTimestamp(JsonConfig.DateTime mode) {
     super(mode, Timestamp.class, true, Types.TIMESTAMP);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeURI.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeURI.java
index 3e3a67146..f7c9bcc81 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeURI.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeURI.java
@@ -8,9 +8,9 @@ import java.net.URISyntaxException;
 /**
  * ScalarType for java.net.URI which converts to and from a VARCHAR database column.
  */
-public class ScalarTypeURI extends ScalarTypeBaseVarchar<URI> {
+final class ScalarTypeURI extends ScalarTypeBaseVarchar<URI> {
 
-  public ScalarTypeURI() {
+  ScalarTypeURI() {
     super(URI.class);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeURL.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeURL.java
index 577c20b19..c93cd2a38 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeURL.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeURL.java
@@ -8,9 +8,9 @@ import java.net.URL;
 /**
  * ScalarType for java.net.URL which converts to and from a VARCHAR database column.
  */
-public class ScalarTypeURL extends ScalarTypeBaseVarchar<URL> {
+final class ScalarTypeURL extends ScalarTypeBaseVarchar<URL> {
 
-  public ScalarTypeURL() {
+  ScalarTypeURL() {
     super(URL.class);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBase.java
index 28ea7c879..abf91811b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBase.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBase.java
@@ -14,9 +14,9 @@ import java.util.UUID;
 /**
  * Base UUID type for string formatting, json handling etc.
  */
-public abstract class ScalarTypeUUIDBase extends ScalarTypeBase<UUID> implements ScalarTypeLogicalType {
+abstract class ScalarTypeUUIDBase extends ScalarTypeBase<UUID> implements ScalarTypeLogicalType {
 
-  public ScalarTypeUUIDBase(boolean jdbcNative, int jdbcType) {
+  ScalarTypeUUIDBase(boolean jdbcNative, int jdbcType) {
     super(UUID.class, jdbcNative, jdbcType);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBinary.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBinary.java
index c94b73d67..078d51a12 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBinary.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBinary.java
@@ -8,11 +8,11 @@ import java.sql.SQLException;
 import java.sql.Types;
 import java.util.UUID;
 
-public class ScalarTypeUUIDBinary extends ScalarTypeUUIDBase {
+public final class ScalarTypeUUIDBinary extends ScalarTypeUUIDBase {
 
   private final boolean optimized;
 
-  protected ScalarTypeUUIDBinary(boolean optimized) {
+  ScalarTypeUUIDBinary(boolean optimized) {
     super(false, Types.BINARY);
     this.optimized = optimized;
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDNative.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDNative.java
index cbbc63d27..73e375b3b 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDNative.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDNative.java
@@ -10,9 +10,9 @@ import java.util.UUID;
 /**
  * Postgres Hstore type which maps Map<String,String> to a single 'HStore column' in the DB.
  */
-public class ScalarTypeUUIDNative extends ScalarTypeUUIDBase {
+final class ScalarTypeUUIDNative extends ScalarTypeUUIDBase {
 
-  public ScalarTypeUUIDNative() {
+  ScalarTypeUUIDNative() {
     super(false, DbPlatformType.UUID);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDVarchar.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDVarchar.java
index aaba1c713..19a9e0829 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDVarchar.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDVarchar.java
@@ -10,9 +10,9 @@ import java.util.UUID;
 /**
  * ScalarType for java.util.UUID which converts to and from a VARCHAR database column.
  */
-public class ScalarTypeUUIDVarchar extends ScalarTypeUUIDBase {
+final class ScalarTypeUUIDVarchar extends ScalarTypeUUIDBase {
 
-  protected ScalarTypeUUIDVarchar() {
+  ScalarTypeUUIDVarchar() {
     super(false, Types.VARCHAR);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java
index 711992a08..3a816d498 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java
@@ -16,11 +16,11 @@ import static io.ebeaninternal.server.type.IsoJsonDateTimeParser.formatIso;
 /**
  * ScalarType for java.util.Date.
  */
-public class ScalarTypeUtilDate {
+final class ScalarTypeUtilDate {
 
-  public static class TimestampType extends ScalarTypeBaseDateTime<java.util.Date> {
+  static final class TimestampType extends ScalarTypeBaseDateTime<java.util.Date> {
 
-    public TimestampType(JsonConfig.DateTime mode) {
+    TimestampType(JsonConfig.DateTime mode) {
       super(mode, java.util.Date.class, false, Types.TIMESTAMP);
     }
 
@@ -89,9 +89,9 @@ public class ScalarTypeUtilDate {
     }
   }
 
-  public static class DateType extends ScalarTypeBaseDate<java.util.Date> {
+  static final class DateType extends ScalarTypeBaseDate<java.util.Date> {
 
-    public DateType(JsonConfig.Date mode) {
+    DateType(JsonConfig.Date mode) {
       super(mode, Date.class, false, Types.DATE);
     }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java
index 1ef378e03..1ce79bec0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeWrapper.java
@@ -26,11 +26,8 @@ import java.sql.SQLException;
 public class ScalarTypeWrapper<B, S> implements ScalarType<B> {
 
   private final ScalarType<S> scalarType;
-
   private final ScalarTypeConverter<B, S> converter;
-
   private final Class<B> wrapperType;
-
   private final B nullValue;
 
   public ScalarTypeWrapper(Class<B> wrapperType, ScalarType<S> scalarType, ScalarTypeConverter<B, S> converter) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYear.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYear.java
index d9b35fad5..c515de0e3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYear.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYear.java
@@ -18,9 +18,9 @@ import java.time.Year;
 /**
  * ScalarType for java.time.Year
  */
-public class ScalarTypeYear extends ScalarTypeBase<Year> {
+final class ScalarTypeYear extends ScalarTypeBase<Year> {
 
-  public ScalarTypeYear() {
+  ScalarTypeYear() {
     super(Year.class, false, Types.INTEGER);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDate.java
index 35b6683fd..e7ee97287 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDate.java
@@ -14,21 +14,22 @@ import java.time.ZonedDateTime;
 /**
  * ScalarType for java.time.LocalDate. This maps to a JDBC Date.
  */
-public class ScalarTypeYearMonthDate extends ScalarTypeBaseDate<YearMonth> {
+final class ScalarTypeYearMonthDate extends ScalarTypeBaseDate<YearMonth> {
 
-  public ScalarTypeYearMonthDate(JsonConfig.Date mode) {
+  ScalarTypeYearMonthDate(JsonConfig.Date mode) {
     super(mode, YearMonth.class, false, Types.DATE);
   }
 
+  @Override
   protected String toIsoFormat(YearMonth value) {
     return value.atDay(1).toString();
   }
 
-  protected LocalDate toLocalDate(YearMonth yearMonth) {
+  LocalDate toLocalDate(YearMonth yearMonth) {
     return yearMonth.atDay(1);
   }
 
-  protected YearMonth fromLocalDate(LocalDate localDate) {
+  YearMonth fromLocalDate(LocalDate localDate) {
     return YearMonth.of(localDate.getYear(), localDate.getMonth());
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZoneId.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZoneId.java
index 01a0c61d0..482752494 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZoneId.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZoneId.java
@@ -5,9 +5,9 @@ import java.time.ZoneId;
 /**
  * ScalarType for java.time.OffsetTime stored as DB VARCHAR
  */
-public class ScalarTypeZoneId extends ScalarTypeBaseVarchar<ZoneId> {
+final class ScalarTypeZoneId extends ScalarTypeBaseVarchar<ZoneId> {
 
-  public ScalarTypeZoneId() {
+  ScalarTypeZoneId() {
     super(ZoneId.class);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZoneOffset.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZoneOffset.java
index 420cf1ce6..613b25c2d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZoneOffset.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZoneOffset.java
@@ -5,9 +5,9 @@ import java.time.ZoneOffset;
 /**
  * ScalarType for java.time.OffsetTime stored as DB VARCHAR
  */
-public class ScalarTypeZoneOffset extends ScalarTypeBaseVarchar<ZoneOffset> {
+final class ScalarTypeZoneOffset extends ScalarTypeBaseVarchar<ZoneOffset> {
 
-  public ScalarTypeZoneOffset() {
+  ScalarTypeZoneOffset() {
     super(ZoneOffset.class);
   }
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTime.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTime.java
index 12e13cdfa..533489e6f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTime.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTime.java
@@ -11,11 +11,11 @@ import java.time.ZonedDateTime;
 /**
  * ScalarType for ZonedDateTime.
  */
-public class ScalarTypeZonedDateTime extends ScalarTypeBaseDateTime<ZonedDateTime> {
+final class ScalarTypeZonedDateTime extends ScalarTypeBaseDateTime<ZonedDateTime> {
 
   private final ZoneId zoneId;
 
-  public ScalarTypeZonedDateTime(JsonConfig.DateTime mode, ZoneId zoneId) {
+  ScalarTypeZonedDateTime(JsonConfig.DateTime mode, ZoneId zoneId) {
     super(mode, ZonedDateTime.class, false, Types.TIMESTAMP);
     this.zoneId = zoneId;
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/SimpleAesEncryptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/SimpleAesEncryptor.java
index 28d661591..0dfd3f999 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/SimpleAesEncryptor.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/SimpleAesEncryptor.java
@@ -11,7 +11,7 @@ import java.nio.charset.StandardCharsets;
 /**
  * Simple AES based encryption and decryption.
  */
-public class SimpleAesEncryptor implements Encryptor {
+public final class SimpleAesEncryptor implements Encryptor {
 
   private static final String AES_CIPHER = "AES/CBC/PKCS5Padding";
 
@@ -21,7 +21,6 @@ public class SimpleAesEncryptor implements Encryptor {
   }
 
   private String paddKey(EncryptKey encryptKey) {
-
     String key = encryptKey.getStringValue();
     int addChars = 16 - key.length();
     if (addChars < 0) {
@@ -38,25 +37,18 @@ public class SimpleAesEncryptor implements Encryptor {
 
   @Override
   public byte[] decrypt(byte[] data, EncryptKey encryptKey) {
-
     if (data == null) {
       return null;
     }
-
     String key = paddKey(encryptKey);
-
     try {
-
       byte[] keyBytes = key.getBytes(StandardCharsets.UTF_8);
       IvParameterSpec iv = getIvParameterSpec(key);
-
       SecretKeySpec sks = new SecretKeySpec(keyBytes, "AES");
       Cipher c = Cipher.getInstance(AES_CIPHER);
 
       c.init(Cipher.DECRYPT_MODE, sks, iv);
-
       return c.doFinal(data);
-
     } catch (Exception e) {
       throw new RuntimeException(e);
     }
@@ -64,24 +56,17 @@ public class SimpleAesEncryptor implements Encryptor {
 
   @Override
   public byte[] encrypt(byte[] data, EncryptKey encryptKey) {
-
     if (data == null) {
       return null;
     }
-
     String key = paddKey(encryptKey);
-
     try {
       byte[] keyBytes = key.getBytes(StandardCharsets.UTF_8);
       IvParameterSpec iv = getIvParameterSpec(key);
-
       SecretKeySpec sks = new SecretKeySpec(keyBytes, "AES");
       Cipher c = Cipher.getInstance(AES_CIPHER);
-
       c.init(Cipher.ENCRYPT_MODE, sks, iv);
-
       return c.doFinal(data);
-
     } catch (Exception e) {
       throw new RuntimeException(e);
     }
@@ -92,14 +77,12 @@ public class SimpleAesEncryptor implements Encryptor {
     if (data == null) {
       return null;
     }
-
     byte[] bytes = decrypt(data, key);
     return new String(bytes, StandardCharsets.UTF_8);
   }
 
   @Override
   public byte[] encryptString(String valueFormatValue, EncryptKey key) {
-
     if (valueFormatValue == null) {
       return null;
     }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeJsonManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeJsonManager.java
index 989ba2729..6660a9f39 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeJsonManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeJsonManager.java
@@ -5,7 +5,7 @@ import io.ebean.ModifyAwareType;
 import io.ebean.annotation.MutationDetection;
 import io.ebean.config.dbplatform.DbPlatformType;
 
-class TypeJsonManager {
+final class TypeJsonManager {
 
   private final boolean postgres;
   private final ObjectMapper objectMapper;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeReflectHelper.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeReflectHelper.java
index 663d18f00..25177d7df 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeReflectHelper.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeReflectHelper.java
@@ -4,7 +4,7 @@ import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.lang.reflect.WildcardType;
 
-public class TypeReflectHelper {
+public final class TypeReflectHelper {
 
   public static Class<?>[] getParams(Class<?> cls, Class<?> matchRawType) {
     return TypeResolver.resolveRawArgs(matchRawType, cls);
@@ -46,7 +46,6 @@ public class TypeReflectHelper {
   }
 
   private static Class<?> getClass(Type type) {
-
     while (true) {
       if (type instanceof ParameterizedType) {
         type = ((ParameterizedType) type).getRawType();
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeResolver.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeResolver.java
index 2fecd6a4b..873984ba0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeResolver.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeResolver.java
@@ -15,7 +15,7 @@ import java.util.Map;
  *
  * It is a cut down version removing the lambda support and related sun.misc.Unsafe use etc.
  */
-class TypeResolver {
+final class TypeResolver {
 
   /** An unknown type. */
   private static final class Unknown {
@@ -137,9 +137,7 @@ class TypeResolver {
   }
 
   private static Map<TypeVariable<?>, Type> getTypeVariableMap(final Class<?> targetType) {
-
     Map<TypeVariable<?>, Type> map = new HashMap<>();
-
     // Populate interfaces
     populateSuperTypeArgs(targetType.getGenericInterfaces(), map);
 
@@ -173,7 +171,6 @@ class TypeResolver {
    * Populates the {@code map} with with variable/argument pairs for the given {@code types}.
    */
   private static void populateSuperTypeArgs(final Type[] types, final Map<TypeVariable<?>, Type> map) {
-
     for (Type type : types) {
       if (type instanceof ParameterizedType) {
         ParameterizedType parameterizedType = (ParameterizedType) type;
@@ -195,7 +192,6 @@ class TypeResolver {
     if (type.getRawType() instanceof Class) {
       TypeVariable<?>[] typeVariables = ((Class<?>) type.getRawType()).getTypeParameters();
       Type[] typeArguments = type.getActualTypeArguments();
-
       if (type.getOwnerType() != null) {
         Type owner = type.getOwnerType();
         if (owner instanceof ParameterizedType) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/UtilDateParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/UtilDateParser.java
index a420f7ecc..4ad7722c8 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/UtilDateParser.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/UtilDateParser.java
@@ -4,7 +4,7 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-class UtilDateParser {
+final class UtilDateParser {
 
   private static final SimpleDateFormat dateTimeProto = new SimpleDateFormat("yyyy-MM-dd");