[#11061] [#11070] [#11091] Avoid rawtypes

jOOQ · Dec 8, 2020 · 74775ff · 74775ff
1 parent 574e754
commit 74775ff
Show file tree

Hide file tree

Showing 25 changed files with 78 additions and 78 deletions.
diff --git a/jOOQ/src/main/java/org/jooq/impl/Abs.java b/jOOQ/src/main/java/org/jooq/impl/Abs.java
@@ -65,7 +65,7 @@ final class Abs<T>
     private final Field<T> number;
 
     Abs(
-        Field number
+        Field<T> number
     ) {
         super(N_ABS, allNotNull((DataType) INTEGER, number));
 

diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java
@@ -84,7 +84,7 @@ final class AlterDomainImpl<T>
 
     AlterDomainImpl(
         Configuration configuration,
-        Domain domain,
+        Domain<T> domain,
         boolean alterDomainIfExists
     ) {
         this(
@@ -108,15 +108,15 @@ final class AlterDomainImpl<T>
 
     AlterDomainImpl(
         Configuration configuration,
-        Domain domain,
+        Domain<T> domain,
         boolean alterDomainIfExists,
         Constraint addConstraint,
         Constraint dropConstraint,
         boolean dropConstraintIfExists,
-        Domain renameTo,
+        Domain<?> renameTo,
         Constraint renameConstraint,
         boolean renameConstraintIfExists,
-        Field setDefault,
+        Field<T> setDefault,
         boolean dropDefault,
         boolean setNotNull,
         boolean dropNotNull,

diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java
@@ -75,7 +75,7 @@ final class CreateDomainImpl<T>
 
     CreateDomainImpl(
         Configuration configuration,
-        Domain domain,
+        Domain<?> domain,
         boolean createDomainIfNotExists
     ) {
         this(
@@ -90,11 +90,11 @@ final class CreateDomainImpl<T>
 
     CreateDomainImpl(
         Configuration configuration,
-        Domain domain,
+        Domain<?> domain,
         boolean createDomainIfNotExists,
-        DataType dataType,
-        Field default_,
-        Collection constraints
+        DataType<T> dataType,
+        Field<T> default_,
+        Collection<? extends Constraint> constraints
     ) {
         super(configuration);
 

diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java
@@ -80,7 +80,7 @@ final class CreateSequenceImpl
 
     CreateSequenceImpl(
         Configuration configuration,
-        Sequence sequence,
+        Sequence<?> sequence,
         boolean createSequenceIfNotExists
     ) {
         this(
@@ -102,17 +102,17 @@ final class CreateSequenceImpl
 
     CreateSequenceImpl(
         Configuration configuration,
-        Sequence sequence,
+        Sequence<?> sequence,
         boolean createSequenceIfNotExists,
-        Field startWith,
-        Field incrementBy,
-        Field minvalue,
+        Field<? extends Number> startWith,
+        Field<? extends Number> incrementBy,
+        Field<? extends Number> minvalue,
         boolean noMinvalue,
-        Field maxvalue,
+        Field<? extends Number> maxvalue,
         boolean noMaxvalue,
         boolean cycle,
         boolean noCycle,
-        Field cache,
+        Field<? extends Number> cache,
         boolean noCache
     ) {
         super(configuration);

diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java
@@ -14887,7 +14887,7 @@ static <T> Field<T> iif0(Name name, Condition condition, Field<T> ifTrue, Field<
     @NotNull
     @Support
     public static <T extends Number> Field<T> abs(T number) {
-        return new Abs<>(Tools.field(number));
+        return new Abs(Tools.field(number));
     }
 
     /**
@@ -14896,7 +14896,7 @@ public static <T extends Number> Field<T> abs(T number) {
     @NotNull
     @Support
     public static <T extends Number> Field<T> abs(Field<T> number) {
-        return new Abs<>(number);
+        return new Abs(number);
     }
 
     /**

diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
@@ -3114,32 +3114,32 @@ public org.jooq.AlterDatabaseStep alterDatabaseIfExists(Catalog database) {
 
     @Override
     public <T> org.jooq.AlterDomainStep<T> alterDomain(String domain) {
-        return new AlterDomainImpl<>(configuration(), DSL.domain(DSL.name(domain)), false);
+        return new AlterDomainImpl(configuration(), DSL.domain(DSL.name(domain)), false);
     }
 
     @Override
     public <T> org.jooq.AlterDomainStep<T> alterDomain(Name domain) {
-        return new AlterDomainImpl<>(configuration(), DSL.domain(domain), false);
+        return new AlterDomainImpl(configuration(), DSL.domain(domain), false);
     }
 
     @Override
     public <T> org.jooq.AlterDomainStep<T> alterDomain(Domain<T> domain) {
-        return new AlterDomainImpl<>(configuration(), domain, false);
+        return new AlterDomainImpl(configuration(), domain, false);
     }
 
     @Override
     public <T> org.jooq.AlterDomainStep<T> alterDomainIfExists(String domain) {
-        return new AlterDomainImpl<>(configuration(), DSL.domain(DSL.name(domain)), true);
+        return new AlterDomainImpl(configuration(), DSL.domain(DSL.name(domain)), true);
     }
 
     @Override
     public <T> org.jooq.AlterDomainStep<T> alterDomainIfExists(Name domain) {
-        return new AlterDomainImpl<>(configuration(), DSL.domain(domain), true);
+        return new AlterDomainImpl(configuration(), DSL.domain(domain), true);
     }
 
     @Override
     public <T> org.jooq.AlterDomainStep<T> alterDomainIfExists(Domain<T> domain) {
-        return new AlterDomainImpl<>(configuration(), domain, true);
+        return new AlterDomainImpl(configuration(), domain, true);
     }
 
     @Override

diff --git a/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java
@@ -71,7 +71,7 @@ final class DropDomainImpl
 
     DropDomainImpl(
         Configuration configuration,
-        Domain domain,
+        Domain<?> domain,
         boolean dropDomainIfExists
     ) {
         this(
@@ -84,7 +84,7 @@ final class DropDomainImpl
 
     DropDomainImpl(
         Configuration configuration,
-        Domain domain,
+        Domain<?> domain,
         boolean dropDomainIfExists,
         Boolean cascade
     ) {

diff --git a/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java
@@ -69,7 +69,7 @@ final class DropSequenceImpl
 
     DropSequenceImpl(
         Configuration configuration,
-        Sequence sequence,
+        Sequence<?> sequence,
         boolean dropSequenceIfExists
     ) {
         super(configuration);

diff --git a/jOOQ/src/main/java/org/jooq/impl/GrantImpl.java b/jOOQ/src/main/java/org/jooq/impl/GrantImpl.java
@@ -75,7 +75,7 @@ final class GrantImpl
 
     GrantImpl(
         Configuration configuration,
-        Collection privileges
+        Collection<? extends Privilege> privileges
     ) {
         this(
             configuration,
@@ -89,8 +89,8 @@ final class GrantImpl
 
     GrantImpl(
         Configuration configuration,
-        Collection privileges,
-        Table on,
+        Collection<? extends Privilege> privileges,
+        Table<?> on,
         Role to,
         Boolean toPublic,
         Boolean withGrantOption

diff --git a/jOOQ/src/main/java/org/jooq/impl/LTrim.java b/jOOQ/src/main/java/org/jooq/impl/LTrim.java
@@ -66,7 +66,7 @@ final class Ltrim
     private final Field<String> characters;
 
     Ltrim(
-        Field string
+        Field<String> string
     ) {
         super(N_LTRIM, allNotNull(VARCHAR, string));
 
@@ -75,8 +75,8 @@ final class Ltrim
     }
 
     Ltrim(
-        Field string,
-        Field characters
+        Field<String> string,
+        Field<String> characters
     ) {
         super(N_LTRIM, allNotNull(VARCHAR, string, characters));
 

diff --git a/jOOQ/src/main/java/org/jooq/impl/Left.java b/jOOQ/src/main/java/org/jooq/impl/Left.java
@@ -66,8 +66,8 @@ final class Left
     private final Field<? extends Number> length;
 
     Left(
-        Field string,
-        Field length
+        Field<String> string,
+        Field<? extends Number> length
     ) {
         super(N_LEFT, allNotNull(VARCHAR, string, length));
 

diff --git a/jOOQ/src/main/java/org/jooq/impl/Lower.java b/jOOQ/src/main/java/org/jooq/impl/Lower.java
@@ -65,7 +65,7 @@ final class Lower
     private final Field<String> string;
 
     Lower(
-        Field string
+        Field<String> string
     ) {
         super(N_LOWER, allNotNull(VARCHAR, string));
 

diff --git a/jOOQ/src/main/java/org/jooq/impl/Lpad.java b/jOOQ/src/main/java/org/jooq/impl/Lpad.java
@@ -67,8 +67,8 @@ final class Lpad
     private final Field<String>           character;
 
     Lpad(
-        Field string,
-        Field length
+        Field<String> string,
+        Field<? extends Number> length
     ) {
         super(N_LPAD, allNotNull(VARCHAR, string, length));
 
@@ -78,9 +78,9 @@ final class Lpad
     }
 
     Lpad(
-        Field string,
-        Field length,
-        Field character
+        Field<String> string,
+        Field<? extends Number> length,
+        Field<String> character
     ) {
         super(N_LPAD, allNotNull(VARCHAR, string, length, character));
 

diff --git a/jOOQ/src/main/java/org/jooq/impl/Position.java b/jOOQ/src/main/java/org/jooq/impl/Position.java
@@ -67,8 +67,8 @@ final class Position
     private final Field<? extends Number> startIndex;
 
     Position(
-        Field in,
-        Field search
+        Field<String> in,
+        Field<String> search
     ) {
         super(N_POSITION, allNotNull(INTEGER, in, search));
 
@@ -78,9 +78,9 @@ final class Position
     }
 
     Position(
-        Field in,
-        Field search,
-        Field startIndex
+        Field<String> in,
+        Field<String> search,
+        Field<? extends Number> startIndex
     ) {
         super(N_POSITION, allNotNull(INTEGER, in, search, startIndex));
 

diff --git a/jOOQ/src/main/java/org/jooq/impl/RTrim.java b/jOOQ/src/main/java/org/jooq/impl/RTrim.java
@@ -66,7 +66,7 @@ final class Rtrim
     private final Field<String> characters;
 
     Rtrim(
-        Field string
+        Field<String> string
     ) {
         super(N_RTRIM, allNotNull(VARCHAR, string));
 
@@ -75,8 +75,8 @@ final class Rtrim
     }
 
     Rtrim(
-        Field string,
-        Field characters
+        Field<String> string,
+        Field<String> characters
     ) {
         super(N_RTRIM, allNotNull(VARCHAR, string, characters));
 

diff --git a/jOOQ/src/main/java/org/jooq/impl/Repeat.java b/jOOQ/src/main/java/org/jooq/impl/Repeat.java
@@ -66,8 +66,8 @@ final class Repeat
     private final Field<? extends Number> count;
 
     Repeat(
-        Field string,
-        Field count
+        Field<String> string,
+        Field<? extends Number> count
     ) {
         super(N_REPEAT, allNotNull(VARCHAR, string, count));
 

diff --git a/jOOQ/src/main/java/org/jooq/impl/Replace.java b/jOOQ/src/main/java/org/jooq/impl/Replace.java
@@ -67,8 +67,8 @@ final class Replace
     private final Field<String> replace;
 
     Replace(
-        Field string,
-        Field search
+        Field<String> string,
+        Field<String> search
     ) {
         super(N_REPLACE, allNotNull(VARCHAR, string, search));
 
@@ -78,9 +78,9 @@ final class Replace
     }
 
     Replace(
-        Field string,
-        Field search,
-        Field replace
+        Field<String> string,
+        Field<String> search,
+        Field<String> replace
     ) {
         super(N_REPLACE, allNotNull(VARCHAR, string, search, replace));
 

diff --git a/jOOQ/src/main/java/org/jooq/impl/Reverse.java b/jOOQ/src/main/java/org/jooq/impl/Reverse.java
@@ -65,7 +65,7 @@ final class Reverse
     private final Field<String> string;
 
     Reverse(
-        Field string
+        Field<String> string
     ) {
         super(N_REVERSE, allNotNull(VARCHAR, string));
 

diff --git a/jOOQ/src/main/java/org/jooq/impl/RevokeImpl.java b/jOOQ/src/main/java/org/jooq/impl/RevokeImpl.java
@@ -74,7 +74,7 @@ final class RevokeImpl
 
     RevokeImpl(
         Configuration configuration,
-        Collection privileges,
+        Collection<? extends Privilege> privileges,
         boolean revokeGrantOptionFor
     ) {
         this(
@@ -89,9 +89,9 @@ final class RevokeImpl
 
     RevokeImpl(
         Configuration configuration,
-        Collection privileges,
+        Collection<? extends Privilege> privileges,
         boolean revokeGrantOptionFor,
-        Table on,
+        Table<?> on,
         Role from,
         Boolean fromPublic
     ) {

diff --git a/jOOQ/src/main/java/org/jooq/impl/Right.java b/jOOQ/src/main/java/org/jooq/impl/Right.java
@@ -66,8 +66,8 @@ final class Right
     private final Field<? extends Number> length;
 
     Right(
-        Field string,
-        Field length
+        Field<String> string,
+        Field<? extends Number> length
     ) {
         super(N_RIGHT, allNotNull(VARCHAR, string, length));