Skip to content

Commit

Permalink
Bump up spring boot version to 3.2.1 (#115)
Browse files Browse the repository at this point in the history
- upgrade version 3.2.0 -> 3.2.1
- apply changing usage of getPersistentPropertyPath
- remove copy AnsiDialect
  • Loading branch information
chanhyeong authored Jan 17, 2024
1 parent 090493f commit 7a67b7d
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 156 deletions.
4 changes: 2 additions & 2 deletions NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spring-projects/spring-data-commons
https://github.com/spring-projects/spring-data-commons


Spring Data Commons 3.2.0
Spring Data Commons 3.2.1
Copyright (c) [2010-2019] Pivotal Software, Inc.

This product is licensed to you under the Apache License, Version 2.0 (the "License").
Expand Down Expand Up @@ -71,7 +71,7 @@ spring-projects/spring-data-jdbc
https://github.com/spring-projects/spring-data-jdbc


Spring Data Relational 3.2.0
Spring Data Relational 3.2.1
Copyright (c) [2017-2019] Pivotal Software, Inc.

This product is licensed to you under the Apache License, Version 2.0 (the "License").
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ may be an appropriate choice.
}
}
dependencies {
classpath("org.springframework.boot:spring-boot-gradle-plugin:3.2.0")
classpath("org.springframework.boot:spring-boot-gradle-plugin:3.2.1")
}
}
dependencies {
implementation("org.springframework.boot:spring-boot-starter-data-jdbc")
implementation("com.navercorp.spring:spring-boot-starter-data-jdbc-plus-sql:3.2.0")
implementation("com.navercorp.spring:spring-boot-starter-data-jdbc-plus-sql:3.2.1")
}
```
Expand All @@ -50,7 +50,7 @@ may be an appropriate choice.
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.2.0</version>
<version>3.2.1</version>
<relativePath/>
</parent>
Expand All @@ -62,7 +62,7 @@ may be an appropriate choice.
<dependency>
<groupId>com.navercorp.spring</groupId>
<artifactId>spring-boot-starter-data-jdbc-plus-sql</artifactId>
<version>3.2.0</version>
<version>3.2.1</version>
</dependency>
```
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
springDataVersion=3.2.0
springDataCommonsVersion=3.2.0
springBootVersion=3.2.0
springDataVersion=3.2.1
springDataCommonsVersion=3.2.1
springBootVersion=3.2.1
kotlinVersion=1.9.20
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ protected Object getTargetRepository(RepositoryInformation repositoryInformation
}

RelationalPersistentEntity<?> persistentEntity = context.getRequiredPersistentEntity(
repositoryInformation.getDomainType());
repositoryInformation.getDomainTypeInformation()
);

return getTargetRepositoryViaReflection(repositoryInformation, template, persistentEntity,
converter);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1107,7 +1107,7 @@ private SqlIdentifier getColumnNameToSortBy(Sort.Order order) {
}

PersistentPropertyPath<RelationalPersistentProperty> persistentPropertyPath = mappingContext
.getPersistentPropertyPath(order.getProperty(), entity.getType());
.getPersistentPropertyPath(order.getProperty(), entity.getTypeInformation());

propertyToSortBy = persistentPropertyPath.getBaseProperty();

Expand All @@ -1122,7 +1122,7 @@ private SqlIdentifier getColumnNameToSortBy(Sort.Order order) {
));

RelationalPersistentEntity<?> embeddedEntity = mappingContext
.getRequiredPersistentEntity(propertyToSortBy.getType());
.getRequiredPersistentEntity(propertyToSortBy.getTypeInformation());
return embeddedEntity.getRequiredPersistentProperty(extractFieldNameFromEmbeddedProperty(order))
.getColumnName(); // @checkstyle:ignoreLength
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ void addParameterSource(
if (property.isEmbedded()) {
Object value = propertyAccessor.getProperty(property);
RelationalPersistentEntity<?> embeddedEntity =
this.mappingContext.getRequiredPersistentEntity(property.getType());
this.mappingContext.getRequiredPersistentEntity(property.getTypeInformation());
this.addParameterSource(
parameterSource, value, embeddedEntity, prefix + property.getEmbeddedPrefix());
} else {
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import org.springframework.data.jdbc.core.convert.MappingJdbcConverter;
import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
import org.springframework.data.mapping.PersistentPropertyPath;
import org.springframework.data.relational.core.dialect.AnsiDialect;
import org.springframework.data.relational.core.mapping.NamingStrategy;
import org.springframework.data.relational.core.mapping.RelationalMappingContext;
import org.springframework.data.relational.core.mapping.RelationalPersistentEntity;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.springframework.data.jdbc.core.mapping.AggregateReference;
import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
import org.springframework.data.mapping.PersistentPropertyPath;
import org.springframework.data.relational.core.dialect.AnsiDialect;
import org.springframework.data.relational.core.dialect.Dialect;
import org.springframework.data.relational.core.dialect.PostgresDialect;
import org.springframework.data.relational.core.dialect.SqlServerDialect;
Expand Down

0 comments on commit 7a67b7d

Please sign in to comment.