Skip to content

Commit 65bc730

Browse files
gavinkinggavinking
committed
use switch expressions in isWider() impls
Signed-off-by: Gavin King <[email protected]>
1 parent d6e85b0 commit 65bc730

16 files changed

+88
-153
lines changed

‎hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BigDecimalJavaType.java‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -99,20 +99,14 @@ public <X> BigDecimal wrap(X value, WrapperOptions options) {
9999

100100
@Override
101101
public boolean isWider(JavaType<?> javaType) {
102-
switch ( javaType.getTypeName() ) {
103-
case "byte":
104-
case "java.lang.Byte":
105-
case "short":
106-
case "java.lang.Short":
107-
case "int":
108-
case "java.lang.Integer":
109-
case "long":
110-
case "java.lang.Long":
111-
case "java.math.BigInteger":
112-
return true;
113-
default:
114-
return false;
115-
}
102+
return switch ( javaType.getTypeName() ) {
103+
case "byte", "java.lang.Byte",
104+
"short", "java.lang.Short",
105+
"int", "java.lang.Integer",
106+
"long", "java.lang.Long",
107+
"java.math.BigInteger" -> true;
108+
default -> false;
109+
};
116110
}
117111

118112
@Override

‎hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BigIntegerJavaType.java‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -97,19 +97,13 @@ public <X> BigInteger wrap(X value, WrapperOptions options) {
9797

9898
@Override
9999
public boolean isWider(JavaType<?> javaType) {
100-
switch ( javaType.getTypeName() ) {
101-
case "byte":
102-
case "java.lang.Byte":
103-
case "short":
104-
case "java.lang.Short":
105-
case "int":
106-
case "java.lang.Integer":
107-
case "long":
108-
case "java.lang.Long":
109-
return true;
110-
default:
111-
return false;
112-
}
100+
return switch ( javaType.getTypeName() ) {
101+
case "byte", "java.lang.Byte",
102+
"short", "java.lang.Short",
103+
"int", "java.lang.Integer",
104+
"long", "java.lang.Long" -> true;
105+
default -> false;
106+
};
113107
}
114108

115109
@Override

‎hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarDateJavaType.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,12 +130,10 @@ public <X> Calendar wrap(X value, WrapperOptions options) {
130130

131131
@Override
132132
public boolean isWider(JavaType<?> javaType) {
133-
switch ( javaType.getTypeName() ) {
134-
case "java.sql.Date":
135-
return true;
136-
default:
137-
return false;
138-
}
133+
return switch ( javaType.getTypeName() ) {
134+
case "java.sql.Date" -> true;
135+
default -> false;
136+
};
139137
}
140138

141139
@Override

‎hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarJavaType.java‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -147,14 +147,10 @@ public <X> Calendar wrap(X value, WrapperOptions options) {
147147

148148
@Override
149149
public boolean isWider(JavaType<?> javaType) {
150-
switch ( javaType.getTypeName() ) {
151-
case "java.util.Date":
152-
case "java.sql.Date":
153-
case "java.sql.Timestamp":
154-
return true;
155-
default:
156-
return false;
157-
}
150+
return switch ( javaType.getTypeName() ) {
151+
case "java.util.Date", "java.sql.Date", "java.sql.Timestamp" -> true;
152+
default -> false;
153+
};
158154
}
159155

160156
@Override

‎hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarTimeJavaType.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -132,12 +132,10 @@ public <X> Calendar wrap(X value, WrapperOptions options) {
132132

133133
@Override
134134
public boolean isWider(JavaType<?> javaType) {
135-
switch ( javaType.getTypeName() ) {
136-
case "java.sql.Time":
137-
return true;
138-
default:
139-
return false;
140-
}
135+
return switch ( javaType.getTypeName() ) {
136+
case "java.sql.Time" -> true;
137+
default -> false;
138+
};
141139
}
142140

143141
@Override

‎hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DateJavaType.java‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -168,14 +168,10 @@ public <X> Date wrap(X value, WrapperOptions options) {
168168

169169
@Override
170170
public boolean isWider(JavaType<?> javaType) {
171-
switch ( javaType.getTypeName() ) {
172-
case "java.sql.Date":
173-
case "java.sql.Timestamp":
174-
case "java.util.Calendar":
175-
return true;
176-
default:
177-
return false;
178-
}
171+
return switch ( javaType.getTypeName() ) {
172+
case "java.sql.Date", "java.sql.Timestamp", "java.util.Calendar" -> true;
173+
default -> false;
174+
};
179175
}
180176

181177
@Override

‎hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DoubleJavaType.java‎

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -103,23 +103,16 @@ else if ( value instanceof String ) {
103103

104104
@Override
105105
public boolean isWider(JavaType<?> javaType) {
106-
switch ( javaType.getTypeName() ) {
107-
case "byte":
108-
case "java.lang.Byte":
109-
case "short":
110-
case "java.lang.Short":
111-
case "int":
112-
case "java.lang.Integer":
113-
case "long":
114-
case "java.lang.Long":
115-
case "float":
116-
case "java.lang.Float":
117-
case "java.math.BigInteger":
118-
case "java.math.BigDecimal":
119-
return true;
120-
default:
121-
return false;
122-
}
106+
return switch ( javaType.getTypeName() ) {
107+
case "byte", "java.lang.Byte",
108+
"short", "java.lang.Short",
109+
"int", "java.lang.Integer",
110+
"long", "java.lang.Long",
111+
"float", "java.lang.Float",
112+
"java.math.BigInteger",
113+
"java.math.BigDecimal" -> true;
114+
default -> false;
115+
};
123116
}
124117

125118
@Override

‎hibernate-core/src/main/java/org/hibernate/type/descriptor/java/FloatJavaType.java‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -102,21 +102,15 @@ else if (value instanceof String) {
102102

103103
@Override
104104
public boolean isWider(JavaType<?> javaType) {
105-
switch ( javaType.getTypeName() ) {
106-
case "byte":
107-
case "java.lang.Byte":
108-
case "short":
109-
case "java.lang.Short":
110-
case "int":
111-
case "java.lang.Integer":
112-
case "long":
113-
case "java.lang.Long":
114-
case "java.math.BigInteger":
115-
case "java.math.BigDecimal":
116-
return true;
117-
default:
118-
return false;
119-
}
105+
return switch ( javaType.getTypeName() ) {
106+
case "byte", "java.lang.Byte",
107+
"short", "java.lang.Short",
108+
"int", "java.lang.Integer",
109+
"long", "java.lang.Long",
110+
"java.math.BigInteger",
111+
"java.math.BigDecimal" -> true;
112+
default -> false;
113+
};
120114
}
121115

122116
@Override

‎hibernate-core/src/main/java/org/hibernate/type/descriptor/java/IntegerJavaType.java‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -99,15 +99,11 @@ public <X> Integer wrap(X value, WrapperOptions options) {
9999

100100
@Override
101101
public boolean isWider(JavaType<?> javaType) {
102-
switch ( javaType.getTypeName() ) {
103-
case "byte":
104-
case "java.lang.Byte":
105-
case "short":
106-
case "java.lang.Short":
107-
return true;
108-
default:
109-
return false;
110-
}
102+
return switch ( javaType.getTypeName() ) {
103+
case "byte", "java.lang.Byte",
104+
"short", "java.lang.Short" -> true;
105+
default -> false;
106+
};
111107
}
112108

113109
@Override

‎hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcTimestampJavaType.java‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -192,15 +192,10 @@ public <X> Date wrap(X value, WrapperOptions options) {
192192

193193
@Override
194194
public boolean isWider(JavaType<?> javaType) {
195-
switch ( javaType.getTypeName() ) {
196-
case "java.sql.Date":
197-
case "java.sql.Timestamp":
198-
case "java.util.Date":
199-
case "java.util.Calendar":
200-
return true;
201-
default:
202-
return false;
203-
}
195+
return switch ( javaType.getTypeName() ) {
196+
case "java.sql.Date", "java.sql.Timestamp", "java.util.Date", "java.util.Calendar" -> true;
197+
default -> false;
198+
};
204199
}
205200

206201
@Override

0 commit comments

Comments
 (0)