/ - Diff - D-Net - D-Net project tracking tool

     public interface DatasourceApiRepository extends JpaRepository<DatasourceApi, String> {
     	@Query("select distinct da.baseurl from DatasourceApi da where lower(contactemail) = lower(?1) and managed = ?2")
     	Slice<String> findDistinctBaseurlByContactemailContainingAllIgnoreCase(String contactemail, boolean managed, Pageable pageable);
     	Slice<String> searchBaseUrlManaged(String contactemail, boolean managed, Pageable pageable);
     	@Query("select distinct da.baseurl from DatasourceApi da where lower(contactemail) = lower(?1)")
     	Slice<String> searchBaseUrl(String contactemail, Pageable pageable);
+    }

     		return null;
+    	}
     	public List<String> findBaseURLs(final String contactemail, final boolean managed, final Pageable pageable) throws ApiException {
     		final Slice<String> baseurl =
     				datasourceApiRepository.findDistinctBaseurlByContactemailContainingAllIgnoreCase(contactemail, managed, pageable);
     		return baseurl.getContent().stream()
     	public List<String> findBaseURLs(final String contactemail, final Boolean managed, final Pageable pageable) throws ApiException {
     		return _findBaseURLs(contactemail, managed, pageable).getContent().stream()
     				.filter(StringUtils::isNotBlank)
     				.collect(Collectors.toList());
+    	}
     	private Slice<String> _findBaseURLs(final String contactemail, final Boolean managed, final Pageable pageable) throws ApiException {
     		return managed != null ?
     				datasourceApiRepository.searchBaseUrlManaged(contactemail, managed, pageable) :
     				datasourceApiRepository.searchBaseUrl(contactemail, pageable);
+    	}
     	public List<CountryTerm> browseCountries() {
     		return countryTermRepository.findAll();
+    	}

         @ApiResponses(value = {
                 @ApiResponse(code = 200, message = "OK", response = String[].class),
                 @ApiResponse(code = 500, message = "unexpected error", response = Response.class) })
         List<String> searchBaseUrls(String userEmail, boolean managed, int page, int size) throws ApiException;
         List<String> searchBaseUrls(String userEmail, Boolean managed, int page, int size) throws ApiException;
         @ApiOperation(value = "terms and count for the given field", notes = "Returns the list of BrowseTerms.", response = BrowseTerm[].class)
         @ApiResponses(value = {

     	@Override
     	@RequestMapping(value = "/api/baseurl/{page}/{size}", produces = { "application/json" }, method = RequestMethod.GET)
     	public List<String> searchBaseUrls(@RequestParam final String userEmail, @RequestParam final boolean managed, @PathVariable final int page, @PathVariable final int size) throws ApiException {
     	public List<String> searchBaseUrls(@RequestParam final String userEmail, @RequestParam(required = false) final Boolean managed, @PathVariable final int page, @PathVariable final int size) throws ApiException {
     		return dsDao.findBaseURLs(userEmail, managed, new PageRequest(page, size));
+    	}

D-Net