Spring/spring-data-relational
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAJDBC-218 - Polishing.

Browse Source 
Added line breaks for better readability.
Added braces to if/else statements.
Used StringUtils instead of .equals("").

Original pull request: #83.
This commit is contained in:
Jens Schauder
2018-09-18 14:22:19 +02:00
parent 0a86f3a43b
commit 335a7cbe65
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/org/springframework/data/relational/core/mapping/BasicRelationalPersistentProperty.java
View File

@@ -32,6 +32,7 @@ import org.springframework.data.util.Lazy;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
import org.springframework.util.StringUtils;
/**
* Meta data about a property to be used by repository implementations.
@@ -46,6 +47,7 @@ class BasicRelationalPersistentProperty extends AnnotationBasedPersistentPropert
private static final Map<Class<?>, Class<?>> javaToDbType = new LinkedHashMap<>();
static {
javaToDbType.put(Enum.class, String.class);
javaToDbType.put(ZonedDateTime.class, String.class);
javaToDbType.put(Temporal.class, Date.class);
@@ -72,8 +74,11 @@ class BasicRelationalPersistentProperty extends AnnotationBasedPersistentPropert
this.context = context;
this.columnName = Lazy.of(() -> Optional.ofNullable(findAnnotation(Column.class)).map(Column::value));
this.keyColumnName = Lazy.of(() -> Optional.ofNullable(
findAnnotation(Column.class)).map(Column::keyColumn).filter(keyColumn -> !keyColumn.equals("")));
this.keyColumnName = Lazy.of(() -> Optional.ofNullable( //
findAnnotation(Column.class)) //
.map(Column::keyColumn) //
.filter(StringUtils::hasText) //
);
}
/*
@@ -120,10 +125,12 @@ class BasicRelationalPersistentProperty extends AnnotationBasedPersistentPropert
@Override
public String getKeyColumn() {
if (isQualified())
if (isQualified()) {
return keyColumnName.get().orElseGet(() -> context.getNamingStrategy().getKeyColumn(this));
else
} else {
return null;
}
}
@Override

13
src/test/java/org/springframework/data/relational/core/mapping/BasicRelationalPersistentPropertyUnitTests.java
View File

@@ -89,12 +89,12 @@ public class BasicRelationalPersistentPropertyUnitTests {
@Test // DATAJDBC-218
public void detectsAnnotatedColumnAndKeyName() {
RelationalPersistentEntity<?> entity = context.getRequiredPersistentEntity(DummyEntity.class);
RelationalPersistentProperty listProperty = context //
.getRequiredPersistentEntity(DummyEntity.class) //
.getRequiredPersistentProperty("someList");
assertThat(entity.getRequiredPersistentProperty("someList").getColumnName())
.isEqualTo("dummy_column_name");
assertThat(entity.getRequiredPersistentProperty("someList").getKeyColumn())
.isEqualTo("dummy_key_column_name");
assertThat(listProperty.getColumnName()).isEqualTo("dummy_column_name");
assertThat(listProperty.getKeyColumn()).isEqualTo("dummy_key_column_name");
}
private void checkTargetType(SoftAssertions softly, RelationalPersistentEntity<?> persistentEntity,
@@ -113,8 +113,7 @@ public class BasicRelationalPersistentPropertyUnitTests {
private final ZonedDateTime zonedDateTime;
private final UUID uuid;
@Column(value="dummy_column_name", keyColumn="dummy_key_column_name")
private List<Integer> someList;
@Column(value = "dummy_column_name", keyColumn = "dummy_key_column_name") private List<Integer> someList;
// DATACMNS-106
private @Column("dummy_name") String name;