Polishing.

Moved Kotlin files to kotlin source directory. Minor formatting. See #1961 Original pull request #1962
spring-projects · Dec 18, 2024 · bce51f4 · bce51f4
1 parent 8d1e0e1
commit bce51f4
Show file tree

Hide file tree

Showing 4 changed files with 225 additions and 183 deletions.
diff --git a/spring-data-jdbc/pom.xml b/spring-data-jdbc/pom.xml
@@ -74,6 +74,18 @@
 			<artifactId>spring-core</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.jetbrains.kotlin</groupId>
+			<artifactId>kotlin-stdlib</artifactId>
+			<optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>org.jetbrains.kotlin</groupId>
+			<artifactId>kotlin-reflect</artifactId>
+			<optional>true</optional>
+		</dependency>
+
 		<dependency>
 			<groupId>org.mybatis</groupId>
 			<artifactId>mybatis-spring</artifactId>
@@ -246,19 +258,6 @@
 			<version>${hikari.version}</version>
 			<scope>test</scope>
 		</dependency>
-
-		<!-- Kotlin extension -->
-		<dependency>
-			<groupId>org.jetbrains.kotlin</groupId>
-			<artifactId>kotlin-stdlib</artifactId>
-			<optional>true</optional>
-		</dependency>
-
-		<dependency>
-			<groupId>org.jetbrains.kotlin</groupId>
-			<artifactId>kotlin-reflect</artifactId>
-			<optional>true</optional>
-		</dependency>
 	</dependencies>
 
 	<build>

diff --git a/...core/JdbcAggregateOperationsExtensions.kt → ...core/JdbcAggregateOperationsExtensions.kt b/...core/JdbcAggregateOperationsExtensions.kt → ...core/JdbcAggregateOperationsExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 the original author or authors.
+ * Copyright 2024 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.
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.data.jdbc.core
 
 import org.springframework.data.domain.Page
 import org.springframework.data.domain.Pageable
 import org.springframework.data.domain.Sort
 import org.springframework.data.relational.core.query.Query
-
 import java.util.Optional
 
 /**
- * Extensions for [JdbcAggregateOperations].
+ * Kotlin extensions for [JdbcAggregateOperations].
  *
  * @author Felix Desyatirikov
  * @since 3.5

diff --git a/...rc/test/java/org/springframework/data/jdbc/core/JdbcAggregateOperationsExtensionsTests.kt b/...rc/test/java/org/springframework/data/jdbc/core/JdbcAggregateOperationsExtensionsTests.kt