Skip to content

Commit ad6ae48

Browse files
committed
Polishing.
Use simple class name for named stored procedure derivation. See #4032
1 parent 5af0c40 commit ad6ae48

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/StoredProcedureAttributeSource.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
import java.util.Collections;
2727
import java.util.List;
2828

29-
import org.springframework.core.annotation.AnnotatedElementUtils;
30-
3129
import org.jspecify.annotations.Nullable;
30+
31+
import org.springframework.core.annotation.AnnotatedElementUtils;
3232
import org.springframework.util.Assert;
3333
import org.springframework.util.ObjectUtils;
3434
import org.springframework.util.StringUtils;
@@ -213,7 +213,7 @@ private String derivedNamedProcedureNameFrom(Method method, JpaEntityMetadata<?>
213213

214214
return StringUtils.hasText(procedure.name()) //
215215
? procedure.name() //
216-
: entityMetadata.getEntityName() + "." + method.getName();
216+
: entityMetadata.getJavaType().getSimpleName() + "." + method.getName();
217217
}
218218

219219
/**

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/StoredProcedureAttributeSourceUnitTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@
1515
*/
1616
package org.springframework.data.jpa.repository.query;
1717

18-
import static org.assertj.core.api.Assertions.assertThat;
19-
import static org.mockito.Mockito.doReturn;
20-
import static org.mockito.Mockito.when;
18+
import static org.assertj.core.api.Assertions.*;
19+
import static org.mockito.Mockito.*;
2120

2221
import jakarta.persistence.EntityManager;
2322
import jakarta.persistence.Id;
@@ -42,6 +41,7 @@
4241
import org.mockito.junit.jupiter.MockitoExtension;
4342
import org.mockito.junit.jupiter.MockitoSettings;
4443
import org.mockito.quality.Strictness;
44+
4545
import org.springframework.core.annotation.AliasFor;
4646
import org.springframework.data.jpa.domain.sample.Dummy;
4747
import org.springframework.data.jpa.domain.sample.User;
@@ -74,7 +74,7 @@ void setup() {
7474
creator = StoredProcedureAttributeSource.INSTANCE;
7575

7676
doReturn(User.class).when(entityMetadata).getJavaType();
77-
when(entityMetadata.getEntityName()).thenReturn("User");
77+
when(entityMetadata.getEntityName()).thenReturn("Some$User");
7878
}
7979

8080
@Test // DATAJPA-455

0 commit comments

Comments
 (0)