Skip to content

Commit

Permalink
Re-create app with Couchbase fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Matt Raible committed Feb 4, 2021
1 parent dea4974 commit 45280f1
Show file tree
Hide file tree
Showing 20 changed files with 171 additions and 50,499 deletions.
50,479 changes: 0 additions & 50,479 deletions package-lock.json

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,14 @@
*/
@SuppressWarnings("unused")
@Repository
public interface DivisionRepository extends ReactiveSortingRepository<Division, String> {}
public interface DivisionRepository extends ReactiveSortingRepository<Division, String> {
// Add ScanConsistency to fix issue with Spring Data Couchbase
// https://github.com/spring-projects/spring-data-couchbase/issues/897
@Override
@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
Flux<Division> findAll();

@Override
@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
Flux<Division> findAll(Sort sort);
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,14 @@
*/
@SuppressWarnings("unused")
@Repository
public interface DocumentBankAccountRepository extends ReactiveSortingRepository<DocumentBankAccount, String> {}
public interface DocumentBankAccountRepository extends ReactiveSortingRepository<DocumentBankAccount, String> {
// Add ScanConsistency to fix issue with Spring Data Couchbase
// https://github.com/spring-projects/spring-data-couchbase/issues/897
@Override
@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
Flux<DocumentBankAccount> findAll();

@Override
@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
Flux<DocumentBankAccount> findAll(Sort sort);
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,14 @@
*/
@SuppressWarnings("unused")
@Repository
public interface EntityWithDTORepository extends ReactiveSortingRepository<EntityWithDTO, String> {}
public interface EntityWithDTORepository extends ReactiveSortingRepository<EntityWithDTO, String> {
// Add ScanConsistency to fix issue with Spring Data Couchbase
// https://github.com/spring-projects/spring-data-couchbase/issues/897
@Override
@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
Flux<EntityWithDTO> findAll();

@Override
@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
Flux<EntityWithDTO> findAll(Sort sort);
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,14 @@
@Repository
public interface EntityWithPaginationAndDTORepository extends ReactiveSortingRepository<EntityWithPaginationAndDTO, String> {
Flux<EntityWithPaginationAndDTO> findAllBy(Pageable pageable);

// Add ScanConsistency to fix issue with Spring Data Couchbase
// https://github.com/spring-projects/spring-data-couchbase/issues/897
@Override
@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
Flux<EntityWithPaginationAndDTO> findAll();

@Override
@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
Flux<EntityWithPaginationAndDTO> findAll(Sort sort);
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,14 @@
public interface EntityWithServiceClassAndPaginationRepository
extends ReactiveSortingRepository<EntityWithServiceClassAndPagination, String> {
Flux<EntityWithServiceClassAndPagination> findAllBy(Pageable pageable);

// Add ScanConsistency to fix issue with Spring Data Couchbase
// https://github.com/spring-projects/spring-data-couchbase/issues/897
@Override
@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
Flux<EntityWithServiceClassAndPagination> findAll();

@Override
@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
Flux<EntityWithServiceClassAndPagination> findAll(Sort sort);
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,14 @@
public interface EntityWithServiceClassPaginationAndDTORepository
extends ReactiveSortingRepository<EntityWithServiceClassPaginationAndDTO, String> {
Flux<EntityWithServiceClassPaginationAndDTO> findAllBy(Pageable pageable);

// Add ScanConsistency to fix issue with Spring Data Couchbase
// https://github.com/spring-projects/spring-data-couchbase/issues/897
@Override
@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
Flux<EntityWithServiceClassPaginationAndDTO> findAll();

@Override
@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
Flux<EntityWithServiceClassPaginationAndDTO> findAll(Sort sort);
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,14 @@
*/
@SuppressWarnings("unused")
@Repository
public interface EntityWithServiceImplAndDTORepository extends ReactiveSortingRepository<EntityWithServiceImplAndDTO, String> {}
public interface EntityWithServiceImplAndDTORepository extends ReactiveSortingRepository<EntityWithServiceImplAndDTO, String> {
// Add ScanConsistency to fix issue with Spring Data Couchbase
// https://github.com/spring-projects/spring-data-couchbase/issues/897
@Override
@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
Flux<EntityWithServiceImplAndDTO> findAll();

@Override
@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
Flux<EntityWithServiceImplAndDTO> findAll(Sort sort);
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,14 @@
public interface EntityWithServiceImplAndPaginationRepository
extends ReactiveSortingRepository<EntityWithServiceImplAndPagination, String> {
Flux<EntityWithServiceImplAndPagination> findAllBy(Pageable pageable);

// Add ScanConsistency to fix issue with Spring Data Couchbase
// https://github.com/spring-projects/spring-data-couchbase/issues/897
@Override
@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
Flux<EntityWithServiceImplAndPagination> findAll();

@Override
@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
Flux<EntityWithServiceImplAndPagination> findAll(Sort sort);
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,14 @@
public interface EntityWithServiceImplPaginationAndDTORepository
extends ReactiveSortingRepository<EntityWithServiceImplPaginationAndDTO, String> {
Flux<EntityWithServiceImplPaginationAndDTO> findAllBy(Pageable pageable);

// Add ScanConsistency to fix issue with Spring Data Couchbase
// https://github.com/spring-projects/spring-data-couchbase/issues/897
@Override
@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
Flux<EntityWithServiceImplPaginationAndDTO> findAll();

@Override
@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
Flux<EntityWithServiceImplPaginationAndDTO> findAll(Sort sort);
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,14 @@
*/
@SuppressWarnings("unused")
@Repository
public interface FieldTestEntityRepository extends ReactiveSortingRepository<FieldTestEntity, String> {}
public interface FieldTestEntityRepository extends ReactiveSortingRepository<FieldTestEntity, String> {
// Add ScanConsistency to fix issue with Spring Data Couchbase
// https://github.com/spring-projects/spring-data-couchbase/issues/897
@Override
@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
Flux<FieldTestEntity> findAll();

@Override
@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
Flux<FieldTestEntity> findAll(Sort sort);
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,14 @@
@Repository
public interface FieldTestInfiniteScrollEntityRepository extends ReactiveSortingRepository<FieldTestInfiniteScrollEntity, String> {
Flux<FieldTestInfiniteScrollEntity> findAllBy(Pageable pageable);

// Add ScanConsistency to fix issue with Spring Data Couchbase
// https://github.com/spring-projects/spring-data-couchbase/issues/897
@Override
@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
Flux<FieldTestInfiniteScrollEntity> findAll();

@Override
@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
Flux<FieldTestInfiniteScrollEntity> findAll(Sort sort);
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,14 @@
@SuppressWarnings("unused")
@Repository
public interface FieldTestMapstructAndServiceClassEntityRepository
extends ReactiveSortingRepository<FieldTestMapstructAndServiceClassEntity, String> {}
extends ReactiveSortingRepository<FieldTestMapstructAndServiceClassEntity, String> {
// Add ScanConsistency to fix issue with Spring Data Couchbase
// https://github.com/spring-projects/spring-data-couchbase/issues/897
@Override
@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
Flux<FieldTestMapstructAndServiceClassEntity> findAll();

@Override
@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
Flux<FieldTestMapstructAndServiceClassEntity> findAll(Sort sort);
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,14 @@
@Repository
public interface FieldTestPaginationEntityRepository extends ReactiveSortingRepository<FieldTestPaginationEntity, String> {
Flux<FieldTestPaginationEntity> findAllBy(Pageable pageable);

// Add ScanConsistency to fix issue with Spring Data Couchbase
// https://github.com/spring-projects/spring-data-couchbase/issues/897
@Override
@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
Flux<FieldTestPaginationEntity> findAll();

@Override
@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
Flux<FieldTestPaginationEntity> findAll(Sort sort);
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,14 @@
@SuppressWarnings("unused")
@Repository
public interface FieldTestServiceClassAndJpaFilteringEntityRepository
extends ReactiveSortingRepository<FieldTestServiceClassAndJpaFilteringEntity, String> {}
extends ReactiveSortingRepository<FieldTestServiceClassAndJpaFilteringEntity, String> {
// Add ScanConsistency to fix issue with Spring Data Couchbase
// https://github.com/spring-projects/spring-data-couchbase/issues/897
@Override
@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
Flux<FieldTestServiceClassAndJpaFilteringEntity> findAll();

@Override
@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
Flux<FieldTestServiceClassAndJpaFilteringEntity> findAll(Sort sort);
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,14 @@
*/
@SuppressWarnings("unused")
@Repository
public interface FieldTestServiceImplEntityRepository extends ReactiveSortingRepository<FieldTestServiceImplEntity, String> {}
public interface FieldTestServiceImplEntityRepository extends ReactiveSortingRepository<FieldTestServiceImplEntity, String> {
// Add ScanConsistency to fix issue with Spring Data Couchbase
// https://github.com/spring-projects/spring-data-couchbase/issues/897
@Override
@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
Flux<FieldTestServiceImplEntity> findAll();

@Override
@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
Flux<FieldTestServiceImplEntity> findAll(Sort sort);
}
10 changes: 10 additions & 0 deletions src/main/java/tech/jhipster/sample/repository/PlaceRepository.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,14 @@ public interface PlaceRepository extends ReactiveSortingRepository<Place, String
@Query("#{#n1ql.selectEntity} USE KEYS $1 WHERE #{#n1ql.filter}")
@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
Mono<Place> findOneWithEagerRelationships(String id);

// Add ScanConsistency to fix issue with Spring Data Couchbase
// https://github.com/spring-projects/spring-data-couchbase/issues/897
@Override
@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
Flux<Place> findAll();

@Override
@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
Flux<Place> findAll(Sort sort);
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import org.springframework.data.couchbase.repository.Query;
import org.springframework.data.couchbase.repository.ReactiveCouchbaseRepository;
import org.springframework.data.couchbase.repository.ScanConsistency;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Repository;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
Expand Down Expand Up @@ -46,7 +46,7 @@ default Mono<User> findOneByLogin(String login) {

@Override
@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
Page<User> findAll(Pageable pageable);
Flux<User> findAll(Sort sort);

@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
Flux<User> findAllByIdNotNull(Pageable pageable);
Expand Down
11 changes: 1 addition & 10 deletions src/main/java/tech/jhipster/sample/service/UserService.java
Original file line number Diff line number Diff line change
Expand Up @@ -289,16 +289,7 @@ public Flux<AdminUserDTO> getAllManagedUsers(Pageable pageable) {
}

public Flux<UserDTO> getAllPublicUsers(Pageable pageable) {
// FIXME: 2/1/21 Current version of Spring Data doesnt seem to support Pagination parameters. Changed the
// method to return a list and added a count query to construct the page.
// return userRepository.findAllByIdNotNullAndActivatedIsTrue(pageable).map(UserDTO::new);

final Long count = userRepository.countAllByIdNotNullAndActivatedIsTrue();
if (count == 0) {
return Page.empty();
}
final List<User> users = userRepository.findAllByIdNotNullAndActivatedIsTrue();
return new PageImpl<>(users.stream().map(UserDTO::new).collect(Collectors.toList()), pageable, count);
return userRepository.findAllByIdNotNullAndActivatedIsTrue(pageable).map(UserDTO::new);
}

public Mono<Long> countManagedUsers() {
Expand Down
Binary file modified src/main/resources/config/tls/keystore.p12
Binary file not shown.

0 comments on commit 45280f1

Please sign in to comment.