Skip to content

Commit 5df7a6a

Browse files
Polish pattern matching usage
1 parent 627fafc commit 5df7a6a

File tree

5 files changed

+11
-14
lines changed

5 files changed

+11
-14
lines changed

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/IterableOfEntryToMapConverter.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ class IterableOfEntryToMapConverter implements ConditionalConverter, Converter<I
4141

4242
source.forEach(element -> {
4343

44-
if (!(element instanceof Entry)) {
45-
throw new IllegalArgumentException(String.format("Cannot convert %s to Map.Entry", element.getClass()));
44+
if (element instanceof Entry entry) {
45+
result.put(entry.getKey(), entry.getValue());
46+
return;
4647
}
4748

48-
Entry entry = (Entry) element;
49-
result.put(entry.getKey(), entry.getValue());
49+
throw new IllegalArgumentException(String.format("Cannot convert %s to Map.Entry", element.getClass()));
5050
});
5151

5252
return result;

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/QueryMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ private Condition mapCondition(CriteriaDefinition criteria, MapSqlParameterSourc
296296
&& metadataBackedField.property != null //
297297
&& (criteria.getValue() == null || !criteria.getValue().getClass().isArray())) {
298298

299-
RelationalPersistentProperty property = ((MetadataBackedField) propertyField).property;
299+
RelationalPersistentProperty property = metadataBackedField.property;
300300
JdbcValue jdbcValue = convertToJdbcValue(property, criteria.getValue());
301301
mappedValue = jdbcValue.getValue();
302302
sqlType = jdbcValue.getJdbcType() != null ? jdbcValue.getJdbcType() : propertyField.getSqlType();

spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/core/DefaultStatementMapper.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,7 @@ private PreparedOperation<Insert> getMappedObject(InsertSpec insertSpec,
172172

173173
for (Assignment assignment : boundAssignments.getAssignments()) {
174174

175-
if (assignment instanceof AssignValue) {
176-
AssignValue assignValue = (AssignValue) assignment;
175+
if (assignment instanceof AssignValue assignValue) {
177176

178177
insertBuilder.column(assignValue.getColumn());
179178
withBuild = insertBuilder.value(assignValue.getValue());

spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/core/NamedParameterUtils.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -384,11 +384,11 @@ int getEndIndex() {
384384
public boolean equals(@Nullable Object o) {
385385
if (this == o)
386386
return true;
387-
if (!(o instanceof ParameterHolder))
388-
return false;
389-
ParameterHolder that = (ParameterHolder) o;
390-
return this.startIndex == that.startIndex && this.endIndex == that.endIndex
387+
if (o instanceof ParameterHolder that) {
388+
return this.startIndex == that.startIndex && this.endIndex == that.endIndex
391389
&& Objects.equals(this.parameterName, that.parameterName);
390+
}
391+
return false;
392392
}
393393

394394
@Override

spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/render/SelectStatementVisitor.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,7 @@ public Delegation doEnter(Visitable segment) {
101101
@Override
102102
public Delegation doLeave(Visitable segment) {
103103

104-
if (segment instanceof Select) {
105-
106-
Select select = (Select) segment;
104+
if (segment instanceof Select select) {
107105

108106
builder.append("SELECT ");
109107

0 commit comments

Comments
 (0)