From 9161e1747632b2efe9da69b76e15be7fc10504b0 Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 17 Aug 2021 21:39:57 +1200
Subject: [PATCH] #2318 - Refactor internals - final classes in querybean
 package

---
 ebean-querybean/src/main/java/io/ebean/typequery/PArray.java    | 2 +-
 .../src/main/java/io/ebean/typequery/PBigDecimal.java           | 2 +-
 .../src/main/java/io/ebean/typequery/PBigInteger.java           | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PBoolean.java  | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PCalendar.java | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PCidr.java     | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PClass.java    | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PCurrency.java | 2 +-
 .../src/main/java/io/ebean/typequery/PDayOfWeek.java            | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PDouble.java   | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PDuration.java | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PEnum.java     | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PFile.java     | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PFloat.java    | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PInet.java     | 2 +-
 .../src/main/java/io/ebean/typequery/PInetAddress.java          | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PInstant.java  | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PInteger.java  | 2 +-
 .../src/main/java/io/ebean/typequery/PJodaDateMidnight.java     | 2 +-
 .../src/main/java/io/ebean/typequery/PJodaDateTime.java         | 2 +-
 .../src/main/java/io/ebean/typequery/PJodaLocalDate.java        | 2 +-
 .../src/main/java/io/ebean/typequery/PJodaLocalDateTime.java    | 2 +-
 .../src/main/java/io/ebean/typequery/PJodaLocalTime.java        | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PJson.java     | 2 +-
 .../src/main/java/io/ebean/typequery/PLocalDate.java            | 2 +-
 .../src/main/java/io/ebean/typequery/PLocalDateTime.java        | 2 +-
 .../src/main/java/io/ebean/typequery/PLocalTime.java            | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PLocale.java   | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PLong.java     | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PMonth.java    | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PMonthDay.java | 2 +-
 .../src/main/java/io/ebean/typequery/POffsetDateTime.java       | 2 +-
 .../src/main/java/io/ebean/typequery/POffsetTime.java           | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PScalar.java   | 2 +-
 .../src/main/java/io/ebean/typequery/PScalarComparable.java     | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PShort.java    | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PSqlDate.java  | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PString.java   | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PTime.java     | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PTimeZone.java | 2 +-
 .../src/main/java/io/ebean/typequery/PTimestamp.java            | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PUri.java      | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PUrl.java      | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PUtilDate.java | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PUuid.java     | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PYear.java     | 2 +-
 .../src/main/java/io/ebean/typequery/PYearMonth.java            | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/PZoneId.java   | 2 +-
 .../src/main/java/io/ebean/typequery/PZoneOffset.java           | 2 +-
 .../src/main/java/io/ebean/typequery/PZonedDateTime.java        | 2 +-
 ebean-querybean/src/main/java/io/ebean/typequery/TQPath.java    | 2 +-
 51 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PArray.java b/ebean-querybean/src/main/java/io/ebean/typequery/PArray.java
index 61d077636..504a4b5d6 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PArray.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PArray.java
@@ -6,7 +6,7 @@ package io.ebean.typequery;
  * @param <R> the root query bean type
  * @param <E> the element type of the DbArray
  */
-public class PArray<R, E> extends TQPropertyBase<R> {
+public final class PArray<R, E> extends TQPropertyBase<R> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PBigDecimal.java b/ebean-querybean/src/main/java/io/ebean/typequery/PBigDecimal.java
index c2ab97572..9e68375bd 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PBigDecimal.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PBigDecimal.java
@@ -6,7 +6,7 @@ import java.math.BigDecimal;
  * BigDecimal property.
  * @param <R> the root query bean type
  */
-public class PBigDecimal<R> extends PBaseNumber<R,BigDecimal> {
+public final class PBigDecimal<R> extends PBaseNumber<R,BigDecimal> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PBigInteger.java b/ebean-querybean/src/main/java/io/ebean/typequery/PBigInteger.java
index fd96a13dd..b4e20ce94 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PBigInteger.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PBigInteger.java
@@ -7,7 +7,7 @@ import java.math.BigInteger;
  *
  * @param <R> the root query bean type
  */
-public class PBigInteger<R> extends PBaseNumber<R, BigInteger> {
+public final class PBigInteger<R> extends PBaseNumber<R, BigInteger> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PBoolean.java b/ebean-querybean/src/main/java/io/ebean/typequery/PBoolean.java
index bd0f1608a..55707300e 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PBoolean.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PBoolean.java
@@ -5,7 +5,7 @@ package io.ebean.typequery;
  *
  * @param <R> the root query bean type
  */
-public class PBoolean<R> extends PBaseValueEqual<R, Boolean> {
+public final class PBoolean<R> extends PBaseValueEqual<R, Boolean> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PCalendar.java b/ebean-querybean/src/main/java/io/ebean/typequery/PCalendar.java
index d23acb089..b64ae4f2c 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PCalendar.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PCalendar.java
@@ -7,7 +7,7 @@ import java.util.Calendar;
  *
  * @param <R> the root query bean type
  */
-public class PCalendar<R> extends PBaseDate<R,Calendar> {
+public final class PCalendar<R> extends PBaseDate<R,Calendar> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PCidr.java b/ebean-querybean/src/main/java/io/ebean/typequery/PCidr.java
index 78d64fa40..645b5d37b 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PCidr.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PCidr.java
@@ -7,7 +7,7 @@ import io.ebean.types.Cidr;
  *
  * @param <R> the root query bean type
  */
-public class PCidr<R> extends PBaseValueEqual<R, Cidr> {
+public final class PCidr<R> extends PBaseValueEqual<R, Cidr> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PClass.java b/ebean-querybean/src/main/java/io/ebean/typequery/PClass.java
index a372e4004..53aa03469 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PClass.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PClass.java
@@ -5,7 +5,7 @@ package io.ebean.typequery;
  *
  * @param <R> the root query bean type
  */
-public class PClass<R> extends PBaseString<R,Class> {
+public final class PClass<R> extends PBaseString<R,Class> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PCurrency.java b/ebean-querybean/src/main/java/io/ebean/typequery/PCurrency.java
index 4eec7eacb..5f2ecb65c 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PCurrency.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PCurrency.java
@@ -7,7 +7,7 @@ import java.util.Currency;
  *
  * @param <R> the root query bean type
  */
-public class PCurrency<R> extends PBaseValueEqual<R,Currency> {
+public final class PCurrency<R> extends PBaseValueEqual<R,Currency> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PDayOfWeek.java b/ebean-querybean/src/main/java/io/ebean/typequery/PDayOfWeek.java
index 2c9589831..199e89709 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PDayOfWeek.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PDayOfWeek.java
@@ -8,7 +8,7 @@ import java.time.DayOfWeek;
  *
  * @param <R> the root query bean type
  */
-public class PDayOfWeek<R> extends PBaseNumber<R,DayOfWeek> {
+public final class PDayOfWeek<R> extends PBaseNumber<R,DayOfWeek> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PDouble.java b/ebean-querybean/src/main/java/io/ebean/typequery/PDouble.java
index 0b51dc44b..e7cbd8d0f 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PDouble.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PDouble.java
@@ -5,7 +5,7 @@ package io.ebean.typequery;
  *
  * @param <R> the root query bean type
  */
-public class PDouble<R> extends PBaseNumber<R,Double> {
+public final class PDouble<R> extends PBaseNumber<R,Double> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PDuration.java b/ebean-querybean/src/main/java/io/ebean/typequery/PDuration.java
index 2eedd97a8..954fe41ef 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PDuration.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PDuration.java
@@ -8,7 +8,7 @@ import java.time.Duration;
  *
  * @param <R> the root query bean type
  */
-public class PDuration<R> extends PBaseNumber<R,Duration> {
+public final class PDuration<R> extends PBaseNumber<R,Duration> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PEnum.java b/ebean-querybean/src/main/java/io/ebean/typequery/PEnum.java
index 9c5d53fdd..ccd9ff7aa 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PEnum.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PEnum.java
@@ -6,7 +6,7 @@ package io.ebean.typequery;
  * @param <E> the enum specific type
  * @param <R> the root query bean type
  */
-public class PEnum<R,E> extends PBaseValueEqual<R,E> {
+public final class PEnum<R,E> extends PBaseValueEqual<R,E> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PFile.java b/ebean-querybean/src/main/java/io/ebean/typequery/PFile.java
index 5c78fbac7..c1ea4c2d5 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PFile.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PFile.java
@@ -9,7 +9,7 @@ package io.ebean.typequery;
  *
  * @param <R> the root query bean type
  */
-public class PFile<R> extends TQPropertyBase<R> {
+public final class PFile<R> extends TQPropertyBase<R> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PFloat.java b/ebean-querybean/src/main/java/io/ebean/typequery/PFloat.java
index 29f41a32e..e9bb712c5 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PFloat.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PFloat.java
@@ -5,7 +5,7 @@ package io.ebean.typequery;
  *
  * @param <R> the root query bean type
  */
-public class PFloat<R> extends PBaseNumber<R,Float> {
+public final class PFloat<R> extends PBaseNumber<R,Float> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PInet.java b/ebean-querybean/src/main/java/io/ebean/typequery/PInet.java
index d9be07066..d0fd0d8ab 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PInet.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PInet.java
@@ -7,7 +7,7 @@ import io.ebean.types.Inet;
  *
  * @param <R> the root query bean type
  */
-public class PInet<R> extends PBaseValueEqual<R, Inet> {
+public final class PInet<R> extends PBaseValueEqual<R, Inet> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PInetAddress.java b/ebean-querybean/src/main/java/io/ebean/typequery/PInetAddress.java
index 9a7d958b4..f4a30ca6a 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PInetAddress.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PInetAddress.java
@@ -8,7 +8,7 @@ import java.net.InetAddress;
  * @param <R> the root query bean type
  */
 
-public class PInetAddress<R> extends PBaseValueEqual<R,InetAddress> {
+public final class PInetAddress<R> extends PBaseValueEqual<R,InetAddress> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PInstant.java b/ebean-querybean/src/main/java/io/ebean/typequery/PInstant.java
index 371f1bd0a..3387668e0 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PInstant.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PInstant.java
@@ -8,7 +8,7 @@ import java.time.Instant;
  *
  * @param <R> the root query bean type
  */
-public class PInstant<R> extends PBaseDate<R,Instant> {
+public final class PInstant<R> extends PBaseDate<R,Instant> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PInteger.java b/ebean-querybean/src/main/java/io/ebean/typequery/PInteger.java
index 8657461be..ea87dbf3f 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PInteger.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PInteger.java
@@ -5,7 +5,7 @@ package io.ebean.typequery;
  *
  * @param <R> the root query bean type
  */
-public class PInteger<R> extends PBaseNumber<R,Integer> {
+public final class PInteger<R> extends PBaseNumber<R,Integer> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PJodaDateMidnight.java b/ebean-querybean/src/main/java/io/ebean/typequery/PJodaDateMidnight.java
index a2dc96e52..c6f7051e0 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PJodaDateMidnight.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PJodaDateMidnight.java
@@ -7,7 +7,7 @@ import org.joda.time.DateMidnight;
  *
  * @param <R> the root query bean type
  */
-public class PJodaDateMidnight<R> extends PBaseDate<R,DateMidnight> {
+public final class PJodaDateMidnight<R> extends PBaseDate<R,DateMidnight> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PJodaDateTime.java b/ebean-querybean/src/main/java/io/ebean/typequery/PJodaDateTime.java
index acda95c92..81132e2a2 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PJodaDateTime.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PJodaDateTime.java
@@ -7,7 +7,7 @@ import org.joda.time.DateTime;
  *
  * @param <R> the root query bean type
  */
-public class PJodaDateTime<R> extends PBaseDate<R,DateTime> {
+public final class PJodaDateTime<R> extends PBaseDate<R,DateTime> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PJodaLocalDate.java b/ebean-querybean/src/main/java/io/ebean/typequery/PJodaLocalDate.java
index 784832c0f..e6a5f4d52 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PJodaLocalDate.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PJodaLocalDate.java
@@ -7,7 +7,7 @@ import org.joda.time.LocalDate;
  *
  * @param <R> the root query bean type
  */
-public class PJodaLocalDate<R> extends PBaseDate<R,LocalDate> {
+public final class PJodaLocalDate<R> extends PBaseDate<R,LocalDate> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PJodaLocalDateTime.java b/ebean-querybean/src/main/java/io/ebean/typequery/PJodaLocalDateTime.java
index bfac78c04..bad5359e3 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PJodaLocalDateTime.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PJodaLocalDateTime.java
@@ -7,7 +7,7 @@ import org.joda.time.LocalDateTime;
  *
  * @param <R> the root query bean type
  */
-public class PJodaLocalDateTime<R> extends PBaseDate<R,LocalDateTime> {
+public final class PJodaLocalDateTime<R> extends PBaseDate<R,LocalDateTime> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PJodaLocalTime.java b/ebean-querybean/src/main/java/io/ebean/typequery/PJodaLocalTime.java
index 5c14ffea9..d92165d33 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PJodaLocalTime.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PJodaLocalTime.java
@@ -8,7 +8,7 @@ import org.joda.time.LocalTime;
  *
  * @param <R> the root query bean type
  */
-public class PJodaLocalTime<R> extends PBaseNumber<R,LocalTime> {
+public final class PJodaLocalTime<R> extends PBaseNumber<R,LocalTime> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PJson.java b/ebean-querybean/src/main/java/io/ebean/typequery/PJson.java
index 3601811fb..5eddd0196 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PJson.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PJson.java
@@ -17,7 +17,7 @@ package io.ebean.typequery;
  *
  * @param <R> the root query bean type
  */
-public class PJson<R> extends TQPropertyBase<R> {
+public final class PJson<R> extends TQPropertyBase<R> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PLocalDate.java b/ebean-querybean/src/main/java/io/ebean/typequery/PLocalDate.java
index 6ffd1285a..189b76eba 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PLocalDate.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PLocalDate.java
@@ -7,7 +7,7 @@ import java.time.LocalDate;
  *
  * @param <R> the root query bean type
  */
-public class PLocalDate<R> extends PBaseDate<R,LocalDate> {
+public final class PLocalDate<R> extends PBaseDate<R,LocalDate> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PLocalDateTime.java b/ebean-querybean/src/main/java/io/ebean/typequery/PLocalDateTime.java
index eea2346dc..feb74e659 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PLocalDateTime.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PLocalDateTime.java
@@ -7,7 +7,7 @@ import java.time.LocalDateTime;
  *
  * @param <R> the root query bean type
  */
-public class PLocalDateTime<R> extends PBaseDate<R,LocalDateTime> {
+public final class PLocalDateTime<R> extends PBaseDate<R,LocalDateTime> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PLocalTime.java b/ebean-querybean/src/main/java/io/ebean/typequery/PLocalTime.java
index 8470518f2..463365e8e 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PLocalTime.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PLocalTime.java
@@ -8,7 +8,7 @@ import java.time.LocalTime;
  *
  * @param <R> the root query bean type
  */
-public class PLocalTime<R> extends PBaseNumber<R,LocalTime> {
+public final class PLocalTime<R> extends PBaseNumber<R,LocalTime> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PLocale.java b/ebean-querybean/src/main/java/io/ebean/typequery/PLocale.java
index f6a17e024..c360682fc 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PLocale.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PLocale.java
@@ -7,7 +7,7 @@ import java.util.Locale;
  *
  * @param <R> the root query bean type
  */
-public class PLocale<R> extends PBaseString<R, Locale> {
+public final class PLocale<R> extends PBaseString<R, Locale> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PLong.java b/ebean-querybean/src/main/java/io/ebean/typequery/PLong.java
index d8e4cf58b..10aa4d80c 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PLong.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PLong.java
@@ -5,7 +5,7 @@ package io.ebean.typequery;
  *
  * @param <R> the root query bean type
  */
-public class PLong<R> extends PBaseNumber<R, Long> {
+public final class PLong<R> extends PBaseNumber<R, Long> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PMonth.java b/ebean-querybean/src/main/java/io/ebean/typequery/PMonth.java
index be11e6a2c..0d127d7e7 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PMonth.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PMonth.java
@@ -7,7 +7,7 @@ import java.time.Month;
  *
  * @param <R> the root query bean type
  */
-public class PMonth<R> extends PBaseDate<R,Month> {
+public final class PMonth<R> extends PBaseDate<R,Month> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PMonthDay.java b/ebean-querybean/src/main/java/io/ebean/typequery/PMonthDay.java
index 5c614edca..27b133f47 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PMonthDay.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PMonthDay.java
@@ -7,7 +7,7 @@ import java.time.MonthDay;
  *
  * @param <R> the root query bean type
  */
-public class PMonthDay<R> extends PBaseDate<R,MonthDay> {
+public final class PMonthDay<R> extends PBaseDate<R,MonthDay> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/POffsetDateTime.java b/ebean-querybean/src/main/java/io/ebean/typequery/POffsetDateTime.java
index 5a32f07e9..809248b86 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/POffsetDateTime.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/POffsetDateTime.java
@@ -7,7 +7,7 @@ import java.time.OffsetDateTime;
  *
  * @param <R> the root query bean type
  */
-public class POffsetDateTime<R> extends PBaseNumber<R,OffsetDateTime> {
+public final class POffsetDateTime<R> extends PBaseNumber<R,OffsetDateTime> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/POffsetTime.java b/ebean-querybean/src/main/java/io/ebean/typequery/POffsetTime.java
index 675b9895a..e6d226971 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/POffsetTime.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/POffsetTime.java
@@ -7,7 +7,7 @@ import java.time.OffsetTime;
  *
  * @param <R> the root query bean type
  */
-public class POffsetTime<R> extends PBaseNumber<R,OffsetTime> {
+public final class POffsetTime<R> extends PBaseNumber<R,OffsetTime> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PScalar.java b/ebean-querybean/src/main/java/io/ebean/typequery/PScalar.java
index 4e479bc61..7d109a6fd 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PScalar.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PScalar.java
@@ -7,7 +7,7 @@ package io.ebean.typequery;
  * @param <R> the root query bean type
  * @param <D> the scalar type
  */
-public class PScalar<R, D> extends PBaseValueEqual<R, D> {
+public final class PScalar<R, D> extends PBaseValueEqual<R, D> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PScalarComparable.java b/ebean-querybean/src/main/java/io/ebean/typequery/PScalarComparable.java
index 9364f9a8f..6da31acb2 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PScalarComparable.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PScalarComparable.java
@@ -8,7 +8,7 @@ package io.ebean.typequery;
  * @param <R> the root query bean type
  * @param <D> the scalar type
  */
-public class PScalarComparable<R, D extends Comparable<D>> extends PBaseCompareable<R, D> {
+public final class PScalarComparable<R, D extends Comparable<D>> extends PBaseCompareable<R, D> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PShort.java b/ebean-querybean/src/main/java/io/ebean/typequery/PShort.java
index f8ee7bf8a..3d86b63a2 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PShort.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PShort.java
@@ -5,7 +5,7 @@ package io.ebean.typequery;
  *
  * @param <R> the root query bean type
  */
-public class PShort<R> extends PBaseNumber<R, Short> {
+public final class PShort<R> extends PBaseNumber<R, Short> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PSqlDate.java b/ebean-querybean/src/main/java/io/ebean/typequery/PSqlDate.java
index 5e12b2c66..b239dbc34 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PSqlDate.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PSqlDate.java
@@ -8,7 +8,7 @@ import java.sql.Date;
  * @param <R> the root query bean type
  */
 
-public class PSqlDate<R> extends PBaseDate<R,Date> {
+public final class PSqlDate<R> extends PBaseDate<R,Date> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PString.java b/ebean-querybean/src/main/java/io/ebean/typequery/PString.java
index 5efdd346b..c37e6e8b2 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PString.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PString.java
@@ -5,7 +5,7 @@ package io.ebean.typequery;
  *
  * @param <R> the root query bean type
  */
-public class PString<R> extends PBaseCompareable<R, String> {
+public final class PString<R> extends PBaseCompareable<R, String> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PTime.java b/ebean-querybean/src/main/java/io/ebean/typequery/PTime.java
index 56f07eaf3..62556f480 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PTime.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PTime.java
@@ -8,7 +8,7 @@ import java.sql.Time;
  *
  * @param <R> the root query bean type
  */
-public class PTime<R> extends PBaseNumber<R,Time> {
+public final class PTime<R> extends PBaseNumber<R,Time> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PTimeZone.java b/ebean-querybean/src/main/java/io/ebean/typequery/PTimeZone.java
index 9257b7555..8a8352fef 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PTimeZone.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PTimeZone.java
@@ -7,7 +7,7 @@ import java.util.TimeZone;
  *
  * @param <R> the root query bean type
  */
-public class PTimeZone<R> extends PBaseValueEqual<R,TimeZone> {
+public final class PTimeZone<R> extends PBaseValueEqual<R,TimeZone> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PTimestamp.java b/ebean-querybean/src/main/java/io/ebean/typequery/PTimestamp.java
index 31ecbca8a..ace329987 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PTimestamp.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PTimestamp.java
@@ -7,7 +7,7 @@ import java.sql.Timestamp;
  *
  * @param <R> the root query bean type
  */
-public class PTimestamp<R> extends PBaseDate<R,Timestamp> {
+public final class PTimestamp<R> extends PBaseDate<R,Timestamp> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PUri.java b/ebean-querybean/src/main/java/io/ebean/typequery/PUri.java
index 37f369515..564a626b0 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PUri.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PUri.java
@@ -7,7 +7,7 @@ import java.net.URI;
  *
  * @param <R> the root query bean type
  */
-public class PUri<R> extends PBaseString<R,URI> {
+public final class PUri<R> extends PBaseString<R,URI> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PUrl.java b/ebean-querybean/src/main/java/io/ebean/typequery/PUrl.java
index f2a1c8c24..bf981e95f 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PUrl.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PUrl.java
@@ -7,7 +7,7 @@ import java.net.URL;
  *
  * @param <R> the root query bean type
  */
-public class PUrl<R> extends PBaseString<R,URL> {
+public final class PUrl<R> extends PBaseString<R,URL> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PUtilDate.java b/ebean-querybean/src/main/java/io/ebean/typequery/PUtilDate.java
index a63e1311b..49c410465 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PUtilDate.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PUtilDate.java
@@ -7,7 +7,7 @@ import java.util.Date;
  *
  * @param <R> the root query bean type
  */
-public class PUtilDate<R> extends PBaseDate<R,Date> {
+public final class PUtilDate<R> extends PBaseDate<R,Date> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PUuid.java b/ebean-querybean/src/main/java/io/ebean/typequery/PUuid.java
index e6a4e134f..8f08053eb 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PUuid.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PUuid.java
@@ -7,7 +7,7 @@ import java.util.UUID;
  *
  * @param <R> the root query bean type
  */
-public class PUuid<R> extends PBaseValueEqual<R,UUID> {
+public final class PUuid<R> extends PBaseValueEqual<R,UUID> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PYear.java b/ebean-querybean/src/main/java/io/ebean/typequery/PYear.java
index 760e26e5f..a52e13931 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PYear.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PYear.java
@@ -7,7 +7,7 @@ import java.time.Year;
  *
  * @param <R> the root query bean type
  */
-public class PYear<R> extends PBaseNumber<R,Year> {
+public final class PYear<R> extends PBaseNumber<R,Year> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PYearMonth.java b/ebean-querybean/src/main/java/io/ebean/typequery/PYearMonth.java
index e4b5634bc..77a34d70b 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PYearMonth.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PYearMonth.java
@@ -7,7 +7,7 @@ import java.time.YearMonth;
  *
  * @param <R> the root query bean type
  */
-public class PYearMonth<R> extends PBaseDate<R,YearMonth> {
+public final class PYearMonth<R> extends PBaseDate<R,YearMonth> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PZoneId.java b/ebean-querybean/src/main/java/io/ebean/typequery/PZoneId.java
index b10fb0fe6..b057840d9 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PZoneId.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PZoneId.java
@@ -7,7 +7,7 @@ import java.time.ZoneId;
  *
  * @param <R> the root query bean type
  */
-public class PZoneId<R> extends PBaseValueEqual<R,ZoneId> {
+public final class PZoneId<R> extends PBaseValueEqual<R,ZoneId> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PZoneOffset.java b/ebean-querybean/src/main/java/io/ebean/typequery/PZoneOffset.java
index 063e32d81..c94a99cc2 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PZoneOffset.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PZoneOffset.java
@@ -7,7 +7,7 @@ import java.time.ZoneOffset;
  *
  * @param <R> the root query bean type
  */
-public class PZoneOffset<R> extends PBaseValueEqual<R,ZoneOffset> {
+public final class PZoneOffset<R> extends PBaseValueEqual<R,ZoneOffset> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/PZonedDateTime.java b/ebean-querybean/src/main/java/io/ebean/typequery/PZonedDateTime.java
index e233449ef..3aca1d178 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/PZonedDateTime.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/PZonedDateTime.java
@@ -7,7 +7,7 @@ import java.time.ZonedDateTime;
  *
  * @param <R> the root query bean type
  */
-public class PZonedDateTime<R> extends PBaseCompareable<R, ZonedDateTime> {
+public final class PZonedDateTime<R> extends PBaseCompareable<R, ZonedDateTime> {
 
   /**
    * Construct with a property name and root instance.
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/TQPath.java b/ebean-querybean/src/main/java/io/ebean/typequery/TQPath.java
index 6dde7e1c4..409a1ceea 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/TQPath.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/TQPath.java
@@ -3,7 +3,7 @@ package io.ebean.typequery;
 /**
  * Helper for adding a path prefix to a property.
  */
-public class TQPath {
+public final class TQPath {
 
   /**
    * Return the full path by adding the prefix to the property name (null safe).