From 9414b490232ccf6b45d24f8aad7500bc228760ed Mon Sep 17 00:00:00 2001 From: Oliver Drotbohm Date: Fri, 7 Dec 2018 15:47:11 +0100 Subject: [PATCH] DATACMNS-1346 - Polishing. License headers, Javadoc, @since tags. Original pull request: #299. --- .../repository/CrudRepositoryExtensions.kt | 16 ++++++++++++++++ .../CrudRepositoryExtensionsTests.kt | 19 ++++++++++++++++++- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/org/springframework/data/repository/CrudRepositoryExtensions.kt b/src/main/kotlin/org/springframework/data/repository/CrudRepositoryExtensions.kt index 7c3bfb2a8..446b37cb3 100644 --- a/src/main/kotlin/org/springframework/data/repository/CrudRepositoryExtensions.kt +++ b/src/main/kotlin/org/springframework/data/repository/CrudRepositoryExtensions.kt @@ -1,3 +1,18 @@ +/* + * Copyright 2018 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.repository /** @@ -6,5 +21,6 @@ package org.springframework.data.repository * @param id the entity id. * @return the entity with the given id or `null` if none found * @author Sebastien Deleuze + * @since 2.1.4 */ fun CrudRepository.findByIdOrNull(id: ID): T? = findById(id).orElse(null) diff --git a/src/test/kotlin/org/springframework/data/repository/CrudRepositoryExtensionsTests.kt b/src/test/kotlin/org/springframework/data/repository/CrudRepositoryExtensionsTests.kt index 6f4d262e1..7038e87b0 100644 --- a/src/test/kotlin/org/springframework/data/repository/CrudRepositoryExtensionsTests.kt +++ b/src/test/kotlin/org/springframework/data/repository/CrudRepositoryExtensionsTests.kt @@ -1,3 +1,18 @@ +/* + * Copyright 2008-2018 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.repository import com.nhaarman.mockito_kotlin.verify @@ -9,6 +24,8 @@ import org.mockito.junit.MockitoJUnitRunner import org.springframework.data.repository.sample.User /** + * Unit tests for CrudRepositoryExtensions. + * * @author Sebastien Deleuze */ @RunWith(MockitoJUnitRunner::class) @@ -17,7 +34,7 @@ class CrudRepositoryExtensionsTests { @Mock(answer = Answers.RETURNS_MOCKS) lateinit var repository: CrudRepository - @Test + @Test // DATACMNS-1346 fun `CrudRepository#findByIdOrNull() extension should call its Java counterpart`() { repository.findByIdOrNull("foo") verify(repository).findById("foo")