Skip to content

Commit a297494

Browse files
authored
Misc fixes (#31624)
1 parent cc1d658 commit a297494

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

generators/spring-boot/templates/src/main/java/_package_/_entityPackage_/service/_entityClass_QueryService.java.ejs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public class <%= serviceClassName %> extends QueryService<<%= persistClass %>> {
127127
if (criteria != null) {
128128
// This has to be called first, because the distinct method returns null
129129
specification = Specification.allOf(
130-
Boolean.TRUE.equals(criteria.getDistinct()) ? distinct(criteria.getDistinct()) : null
130+
Boolean.TRUE.equals(criteria.getDistinct()) ? distinct(criteria.getDistinct()) : Specification.unrestricted()
131131
<%_ for (const field of fields.filter(field => !field.transient && field.filterableField)) { _%>
132132
,
133133
<%= field.fieldJavaBuildSpecification %>(criteria.get<%= field.fieldInJavaBeanMethod %>(), <%= persistClass %>_.<%= field.fieldName %>)

generators/spring-boot/templates/src/test/java/_package_/service/MailServiceIT.java.ejs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@ import <%= user.entityAbsoluteClass %>;
2424
import tech.jhipster.config.JHipsterProperties;
2525
import org.junit.jupiter.api.BeforeEach;
2626
import org.junit.jupiter.api.Test;
27+
import org.junit.jupiter.api.extension.ExtendWith;
2728
import org.mockito.ArgumentCaptor;
2829
import org.mockito.Captor;
30+
import org.mockito.junit.jupiter.MockitoExtension;
2931
import org.springframework.beans.factory.annotation.Autowired;
3032
import org.springframework.mail.MailSendException;
3133
import org.springframework.mail.javamail.JavaMailSender;
@@ -53,6 +55,7 @@ import static org.mockito.Mockito.*;
5355
/**
5456
* Integration tests for {@link MailService}.
5557
*/
58+
@ExtendWith(MockitoExtension.class)
5659
@IntegrationTest
5760
class MailServiceIT {
5861

0 commit comments

Comments
 (0)