From 82ca13a4bb76493e3c4cd79e4823852e3d769436 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 17 May 2021 11:44:05 +0200 Subject: [PATCH] Polishing. See #972 --- .../data/jdbc/core/convert/Identifier.java | 2 +- .../core/conversion/BasicRelationalConverter.java | 10 +++++----- .../mapping/BasicRelationalPersistentProperty.java | 2 +- .../core/mapping/RelationalMappingContext.java | 2 +- .../core/mapping/RelationalPersistentEntityImpl.java | 5 ++--- .../core/mapping/event/RelationalAuditingCallback.java | 2 +- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/Identifier.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/Identifier.java index f99113098..d3c190e9c 100644 --- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/Identifier.java +++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/Identifier.java @@ -1,5 +1,5 @@ /* - * Copyright 2019-2021 the original author or authors. + * Copyright 2021 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. diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/conversion/BasicRelationalConverter.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/conversion/BasicRelationalConverter.java index 29f699854..d38ec8f7a 100644 --- a/spring-data-relational/src/main/java/org/springframework/data/relational/core/conversion/BasicRelationalConverter.java +++ b/spring-data-relational/src/main/java/org/springframework/data/relational/core/conversion/BasicRelationalConverter.java @@ -15,6 +15,10 @@ */ package org.springframework.data.relational.core.conversion; +import java.util.Collections; +import java.util.Optional; +import java.util.function.Function; + import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.support.ConfigurableConversionService; import org.springframework.core.convert.support.DefaultConversionService; @@ -37,10 +41,6 @@ import org.springframework.lang.Nullable; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; -import java.util.Collections; -import java.util.Optional; -import java.util.function.Function; - /** * {@link RelationalConverter} that uses a {@link MappingContext} to apply basic conversion of relational values to * property values. @@ -63,7 +63,7 @@ public class BasicRelationalConverter implements RelationalConverter { /** * Creates a new {@link BasicRelationalConverter} given {@link MappingContext}. * - * @param context must not be {@literal null}. org.springframework.data.jdbc.core.DefaultDataAccessStrategyUnitTests + * @param context must not be {@literal null}. */ public BasicRelationalConverter( MappingContext, ? extends RelationalPersistentProperty> context) { diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/BasicRelationalPersistentProperty.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/BasicRelationalPersistentProperty.java index 1cd392b85..4b5c30010 100644 --- a/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/BasicRelationalPersistentProperty.java +++ b/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/BasicRelationalPersistentProperty.java @@ -147,7 +147,7 @@ public class BasicRelationalPersistentProperty extends AnnotationBasedPersistent /* * (non-Javadoc) - * @see org.springframework.data.jdbc.core.mapping.model.JdbcPersistentProperty#getColumnName() + * @see org.springframework.data.relational.core.mapping.model.RelationalPersistentProperty#getColumnName() */ @Override public SqlIdentifier getColumnName() { diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/RelationalMappingContext.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/RelationalMappingContext.java index fa76d33b6..5056f143b 100644 --- a/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/RelationalMappingContext.java +++ b/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/RelationalMappingContext.java @@ -23,7 +23,7 @@ import org.springframework.data.util.TypeInformation; import org.springframework.util.Assert; /** - * {@link MappingContext} implementation for JDBC. + * {@link MappingContext} implementation. * * @author Jens Schauder * @author Greg Turnquist 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 57d027145..4f7c563c7 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 @@ -18,7 +18,6 @@ package org.springframework.data.relational.core.mapping; import java.util.Optional; import org.springframework.data.mapping.model.BasicPersistentEntity; -import org.springframework.data.mapping.model.PersistentPropertyAccessorFactory; import org.springframework.data.relational.core.sql.SqlIdentifier; import org.springframework.data.util.Lazy; import org.springframework.data.util.TypeInformation; @@ -74,7 +73,7 @@ class RelationalPersistentEntityImpl extends BasicPersistentEntity extends BasicPersistentEntity - * An instance of this class gets registered when you enable auditing for Spring Data JDBC. + * An instance of this class gets registered when you enable auditing for Spring Data Relational. * * @author Jens Schauder * @author Mark Paluch