From 74775ffce55b9417df4bdc6514e66840612e7407 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Tue, 8 Dec 2020 21:19:16 +0100 Subject: [PATCH] [jOOQ/jOOQ#11061] [jOOQ/jOOQ#11070] [jOOQ/jOOQ#11091] Avoid rawtypes --- jOOQ/src/main/java/org/jooq/impl/Abs.java | 2 +- .../main/java/org/jooq/impl/AlterDomainImpl.java | 8 ++++---- .../main/java/org/jooq/impl/CreateDomainImpl.java | 10 +++++----- .../java/org/jooq/impl/CreateSequenceImpl.java | 14 +++++++------- jOOQ/src/main/java/org/jooq/impl/DSL.java | 4 ++-- .../main/java/org/jooq/impl/DefaultDSLContext.java | 12 ++++++------ .../main/java/org/jooq/impl/DropDomainImpl.java | 4 ++-- .../main/java/org/jooq/impl/DropSequenceImpl.java | 2 +- jOOQ/src/main/java/org/jooq/impl/GrantImpl.java | 6 +++--- jOOQ/src/main/java/org/jooq/impl/LTrim.java | 6 +++--- jOOQ/src/main/java/org/jooq/impl/Left.java | 4 ++-- jOOQ/src/main/java/org/jooq/impl/Lower.java | 2 +- jOOQ/src/main/java/org/jooq/impl/Lpad.java | 10 +++++----- jOOQ/src/main/java/org/jooq/impl/Position.java | 10 +++++----- jOOQ/src/main/java/org/jooq/impl/RTrim.java | 6 +++--- jOOQ/src/main/java/org/jooq/impl/Repeat.java | 4 ++-- jOOQ/src/main/java/org/jooq/impl/Replace.java | 10 +++++----- jOOQ/src/main/java/org/jooq/impl/Reverse.java | 2 +- jOOQ/src/main/java/org/jooq/impl/RevokeImpl.java | 6 +++--- jOOQ/src/main/java/org/jooq/impl/Right.java | 4 ++-- jOOQ/src/main/java/org/jooq/impl/Rpad.java | 10 +++++----- jOOQ/src/main/java/org/jooq/impl/Sign.java | 2 +- jOOQ/src/main/java/org/jooq/impl/Substring.java | 10 +++++----- jOOQ/src/main/java/org/jooq/impl/Trim.java | 6 +++--- jOOQ/src/main/java/org/jooq/impl/Upper.java | 2 +- 25 files changed, 78 insertions(+), 78 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/Abs.java b/jOOQ/src/main/java/org/jooq/impl/Abs.java index e8f3276369..270639195e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Abs.java +++ b/jOOQ/src/main/java/org/jooq/impl/Abs.java @@ -65,7 +65,7 @@ extends private final Field number; Abs( - Field number + Field 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 index 962bbaf84a..143ae63c99 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java @@ -84,7 +84,7 @@ implements AlterDomainImpl( Configuration configuration, - Domain domain, + Domain domain, boolean alterDomainIfExists ) { this( @@ -108,15 +108,15 @@ implements AlterDomainImpl( Configuration configuration, - Domain domain, + Domain domain, boolean alterDomainIfExists, Constraint addConstraint, Constraint dropConstraint, boolean dropConstraintIfExists, - Domain renameTo, + Domain renameTo, Constraint renameConstraint, boolean renameConstraintIfExists, - Field setDefault, + Field 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 index 5eb1fd44da..5f5128dc79 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java @@ -75,7 +75,7 @@ implements CreateDomainImpl( Configuration configuration, - Domain domain, + Domain domain, boolean createDomainIfNotExists ) { this( @@ -90,11 +90,11 @@ implements CreateDomainImpl( Configuration configuration, - Domain domain, + Domain domain, boolean createDomainIfNotExists, - DataType dataType, - Field default_, - Collection constraints + DataType dataType, + Field default_, + Collection 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 index 4228c796ce..46bb0cdcb3 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java @@ -80,7 +80,7 @@ implements CreateSequenceImpl( Configuration configuration, - Sequence sequence, + Sequence sequence, boolean createSequenceIfNotExists ) { this( @@ -102,17 +102,17 @@ implements CreateSequenceImpl( Configuration configuration, - Sequence sequence, + Sequence sequence, boolean createSequenceIfNotExists, - Field startWith, - Field incrementBy, - Field minvalue, + Field startWith, + Field incrementBy, + Field minvalue, boolean noMinvalue, - Field maxvalue, + Field maxvalue, boolean noMaxvalue, boolean cycle, boolean noCycle, - Field cache, + Field 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 index 1b6fc72297..0cfb8def86 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DSL.java +++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java @@ -14887,7 +14887,7 @@ public class DSL { @NotNull @Support public static Field abs(T number) { - return new Abs<>(Tools.field(number)); + return new Abs(Tools.field(number)); } /** @@ -14896,7 +14896,7 @@ public class DSL { @NotNull @Support public static Field abs(Field 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 index 68308e22b4..6304e9be18 100644 --- 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 class DefaultDSLContext extends AbstractScope implements DSLContext, Seri @Override public org.jooq.AlterDomainStep 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 org.jooq.AlterDomainStep alterDomain(Name domain) { - return new AlterDomainImpl<>(configuration(), DSL.domain(domain), false); + return new AlterDomainImpl(configuration(), DSL.domain(domain), false); } @Override public org.jooq.AlterDomainStep alterDomain(Domain domain) { - return new AlterDomainImpl<>(configuration(), domain, false); + return new AlterDomainImpl(configuration(), domain, false); } @Override public org.jooq.AlterDomainStep 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 org.jooq.AlterDomainStep alterDomainIfExists(Name domain) { - return new AlterDomainImpl<>(configuration(), DSL.domain(domain), true); + return new AlterDomainImpl(configuration(), DSL.domain(domain), true); } @Override public org.jooq.AlterDomainStep alterDomainIfExists(Domain 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 index d250d14527..a0ac679c8b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java @@ -71,7 +71,7 @@ implements DropDomainImpl( Configuration configuration, - Domain domain, + Domain domain, boolean dropDomainIfExists ) { this( @@ -84,7 +84,7 @@ implements 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 index 32d2a09f69..362339d2d8 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java @@ -69,7 +69,7 @@ implements 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 index bb2509d480..53f3f60d41 100644 --- a/jOOQ/src/main/java/org/jooq/impl/GrantImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/GrantImpl.java @@ -75,7 +75,7 @@ implements GrantImpl( Configuration configuration, - Collection privileges + Collection privileges ) { this( configuration, @@ -89,8 +89,8 @@ implements GrantImpl( Configuration configuration, - Collection privileges, - Table on, + Collection 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 index 19b2ba5f74..c9658f2db4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/LTrim.java +++ b/jOOQ/src/main/java/org/jooq/impl/LTrim.java @@ -66,7 +66,7 @@ extends private final Field characters; Ltrim( - Field string + Field string ) { super(N_LTRIM, allNotNull(VARCHAR, string)); @@ -75,8 +75,8 @@ extends } Ltrim( - Field string, - Field characters + Field string, + Field 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 index ce84768252..8ae2b3c617 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Left.java +++ b/jOOQ/src/main/java/org/jooq/impl/Left.java @@ -66,8 +66,8 @@ extends private final Field length; Left( - Field string, - Field length + Field string, + Field 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 index 8fcf719e86..3543de173f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Lower.java +++ b/jOOQ/src/main/java/org/jooq/impl/Lower.java @@ -65,7 +65,7 @@ extends private final Field string; Lower( - Field string + Field 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 index 091a09644c..fe1179ed2a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Lpad.java +++ b/jOOQ/src/main/java/org/jooq/impl/Lpad.java @@ -67,8 +67,8 @@ extends private final Field character; Lpad( - Field string, - Field length + Field string, + Field length ) { super(N_LPAD, allNotNull(VARCHAR, string, length)); @@ -78,9 +78,9 @@ extends } Lpad( - Field string, - Field length, - Field character + Field string, + Field length, + Field 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 index 316997f0d0..faba28b721 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Position.java +++ b/jOOQ/src/main/java/org/jooq/impl/Position.java @@ -67,8 +67,8 @@ extends private final Field startIndex; Position( - Field in, - Field search + Field in, + Field search ) { super(N_POSITION, allNotNull(INTEGER, in, search)); @@ -78,9 +78,9 @@ extends } Position( - Field in, - Field search, - Field startIndex + Field in, + Field search, + Field 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 index d31f9ed970..becb35b1d3 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RTrim.java +++ b/jOOQ/src/main/java/org/jooq/impl/RTrim.java @@ -66,7 +66,7 @@ extends private final Field characters; Rtrim( - Field string + Field string ) { super(N_RTRIM, allNotNull(VARCHAR, string)); @@ -75,8 +75,8 @@ extends } Rtrim( - Field string, - Field characters + Field string, + Field 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 index a46ba91b34..1327661996 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Repeat.java +++ b/jOOQ/src/main/java/org/jooq/impl/Repeat.java @@ -66,8 +66,8 @@ extends private final Field count; Repeat( - Field string, - Field count + Field string, + Field 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 index 2929f5a145..f68664f41b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Replace.java +++ b/jOOQ/src/main/java/org/jooq/impl/Replace.java @@ -67,8 +67,8 @@ extends private final Field replace; Replace( - Field string, - Field search + Field string, + Field search ) { super(N_REPLACE, allNotNull(VARCHAR, string, search)); @@ -78,9 +78,9 @@ extends } Replace( - Field string, - Field search, - Field replace + Field string, + Field search, + Field 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 index 60343fe3bb..cd5e24c101 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Reverse.java +++ b/jOOQ/src/main/java/org/jooq/impl/Reverse.java @@ -65,7 +65,7 @@ extends private final Field string; Reverse( - Field string + Field 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 index e82e291bd0..acdfa181f5 100644 --- a/jOOQ/src/main/java/org/jooq/impl/RevokeImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/RevokeImpl.java @@ -74,7 +74,7 @@ implements RevokeImpl( Configuration configuration, - Collection privileges, + Collection privileges, boolean revokeGrantOptionFor ) { this( @@ -89,9 +89,9 @@ implements RevokeImpl( Configuration configuration, - Collection privileges, + Collection 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 index 8ad4fcce40..d90f11747e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Right.java +++ b/jOOQ/src/main/java/org/jooq/impl/Right.java @@ -66,8 +66,8 @@ extends private final Field length; Right( - Field string, - Field length + Field string, + Field length ) { super(N_RIGHT, allNotNull(VARCHAR, string, length)); diff --git a/jOOQ/src/main/java/org/jooq/impl/Rpad.java b/jOOQ/src/main/java/org/jooq/impl/Rpad.java index 91bd548638..59b08f0c13 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Rpad.java +++ b/jOOQ/src/main/java/org/jooq/impl/Rpad.java @@ -67,8 +67,8 @@ extends private final Field character; Rpad( - Field string, - Field length + Field string, + Field length ) { super(N_RPAD, allNotNull(VARCHAR, string, length)); @@ -78,9 +78,9 @@ extends } Rpad( - Field string, - Field length, - Field character + Field string, + Field length, + Field character ) { super(N_RPAD, allNotNull(VARCHAR, string, length, character)); diff --git a/jOOQ/src/main/java/org/jooq/impl/Sign.java b/jOOQ/src/main/java/org/jooq/impl/Sign.java index e77ad400c0..b2327a0848 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Sign.java +++ b/jOOQ/src/main/java/org/jooq/impl/Sign.java @@ -65,7 +65,7 @@ extends private final Field number; Sign( - Field number + Field number ) { super(N_SIGN, allNotNull(INTEGER, number)); diff --git a/jOOQ/src/main/java/org/jooq/impl/Substring.java b/jOOQ/src/main/java/org/jooq/impl/Substring.java index 694bc0c897..cc7e57f242 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Substring.java +++ b/jOOQ/src/main/java/org/jooq/impl/Substring.java @@ -67,8 +67,8 @@ extends private final Field length; Substring( - Field string, - Field startingPosition + Field string, + Field startingPosition ) { super(N_SUBSTRING, allNotNull(VARCHAR, string, startingPosition)); @@ -78,9 +78,9 @@ extends } Substring( - Field string, - Field startingPosition, - Field length + Field string, + Field startingPosition, + Field length ) { super(N_SUBSTRING, allNotNull(VARCHAR, string, startingPosition, length)); diff --git a/jOOQ/src/main/java/org/jooq/impl/Trim.java b/jOOQ/src/main/java/org/jooq/impl/Trim.java index 3abd56a49d..0914e9b0a2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Trim.java +++ b/jOOQ/src/main/java/org/jooq/impl/Trim.java @@ -66,7 +66,7 @@ extends private final Field characters; Trim( - Field string + Field string ) { super(N_TRIM, allNotNull(VARCHAR, string)); @@ -75,8 +75,8 @@ extends } Trim( - Field string, - Field characters + Field string, + Field characters ) { super(N_TRIM, allNotNull(VARCHAR, string, characters)); diff --git a/jOOQ/src/main/java/org/jooq/impl/Upper.java b/jOOQ/src/main/java/org/jooq/impl/Upper.java index 18b5872283..d7e401a16e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Upper.java +++ b/jOOQ/src/main/java/org/jooq/impl/Upper.java @@ -65,7 +65,7 @@ extends private final Field string; Upper( - Field string + Field string ) { super(N_UPPER, allNotNull(VARCHAR, string));