diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/RelationalPersistentEntityImpl.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/RelationalPersistentEntityImpl.java index 05ce1fa518..3c241b8822 100644 --- a/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/RelationalPersistentEntityImpl.java +++ b/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/RelationalPersistentEntityImpl.java @@ -21,12 +21,14 @@ import org.springframework.data.mapping.model.PersistentPropertyAccessorFactory; import org.springframework.data.util.Lazy; import org.springframework.data.util.TypeInformation; +import org.springframework.util.StringUtils; /** * Meta data a repository might need for implementing persistence operations for instances of type {@code T} * * @author Jens Schauder * @author Greg Turnquist + * @author Bastian Wilhelm */ class RelationalPersistentEntityImpl extends BasicPersistentEntity implements RelationalPersistentEntity { @@ -44,7 +46,11 @@ class RelationalPersistentEntityImpl extends BasicPersistentEntity Optional.ofNullable(findAnnotation(Table.class)).map(Table::value)); + this.tableName = Lazy.of(() -> Optional.ofNullable( // + findAnnotation(Table.class)) // + .map(Table::value) // + .filter(StringUtils::hasText) // + ); } /* diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/Table.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/Table.java index b07cd6faaf..5ae88c93fc 100644 --- a/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/Table.java +++ b/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/Table.java @@ -26,6 +26,7 @@ * The annotation to configure the mapping from a class to a database table. * * @author Kazuki Shimizu + * @author Bastian Wilhelm */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) @@ -36,5 +37,5 @@ /** * The mapping table name. */ - String value(); + String value() default ""; } diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/mapping/RelationalPersistentEntityWithoutNamesImplUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/mapping/RelationalPersistentEntityWithoutNamesImplUnitTests.java new file mode 100644 index 0000000000..e77ca478dd --- /dev/null +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/mapping/RelationalPersistentEntityWithoutNamesImplUnitTests.java @@ -0,0 +1,52 @@ +/* + * Copyright 2018-2019 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.data.relational.core.mapping; + +import org.junit.Test; +import org.springframework.data.annotation.Id; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Unit tests for {@link RelationalPersistentEntityImpl} without names in {@link Column} and {@link Table}. + * + * @author Bastian Wilhelm + */ +public class RelationalPersistentEntityWithoutNamesImplUnitTests { + + RelationalMappingContext mappingContext = new RelationalMappingContext(); + + @Test // DATAJDBC-296 + public void discoversAnnotatedTableName() { + + RelationalPersistentEntity entity = mappingContext.getPersistentEntity(DummySubEntity.class); + + assertThat(entity.getTableName()).isEqualTo("dummy_sub_entity"); + } + + @Test // DATAJDBC-296 + public void considerIdColumnName() { + + RelationalPersistentEntity entity = mappingContext.getPersistentEntity(DummySubEntity.class); + + assertThat(entity.getIdColumn()).isEqualTo("id"); + } + + @Table() + static class DummySubEntity { + @Id @Column() Long id; + } +}