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

         <orderEntry type="library" name="Maven: org.apache.neethi:neethi:3.0.3" level="project" />
         <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
         <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-transports-http:3.1.5" level="project" />
         <orderEntry type="library" name="Maven: eu.dnetlib:cnr-service-common:2.1.7-SNAPSHOT" level="project" />
         <orderEntry type="module" module-name="cnr-service-common (1)" />
         <orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.2.2" level="project" />
         <orderEntry type="library" name="Maven: c3p0:c3p0:0.9.1.1" level="project" />
         <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.7.RELEASE" level="project" />

     			final QueryResponse rsp = indexClient.query(query);
     			final SolrDocument doc = Iterables.getFirst(rsp.getResults(), new SolrDocument());
     			if (log.isDebugEnabled()) {
     				log.debug(String.format("got document %s", doc.toString()));
     				log.debug(String.format("got document %s", doc.get("__indexrecordidentifier")));
+    			}
     			return new IndexRecordsInfo()

     		return new Response().setDatasourceResponse(datasourceResponse).setHeader(new Header().setErrors(errors));
+    	}
     	public Response searchByCountry(final String country, final Pageable pageable) {
     	public Response searchByCountry(final String country, final Boolean managed, final Pageable pageable) {
     		final List<DatasourceResponse> datasourceResponse = Lists.newArrayList();
-...
     		final Queue<Throwable> errors = new ConcurrentLinkedQueue<>();
     		log.debug(String.format("search ds by country '%s'", country));
     		dsRepository.findDistinctByOrganizationsCountryIgnoreCase(country, pageable).addCallback(getSearchCallback(outerLatch, errors, datasourceResponse));
     		final ListenableFuture<Slice<Datasource>> datasources;
     		if (managed == null) {
     			datasources = dsRepository.findDistinctByOrganizationsCountryIgnoreCase(country, pageable);
     		} else {
     			datasources = dsRepository.findDistinctByManagedEqualsAndOrganizationsCountryIgnoreCase(managed, country, pageable);
+    		}
     		datasources.addCallback(getSearchCallback(outerLatch, errors, datasourceResponse));
     		waitLatch(outerLatch, errors, config.getRequestTimeout());
     		return new Response().setDatasourceResponse(datasourceResponse).setHeader(new Header().setErrors(errors));
-...
     			@Override
     			public void onSuccess(final Slice<Datasource> datasources) {
     				datasources.forEach(d -> {
     					final DatasourceResponse response = new DatasourceResponse();
     					response.setDatasource(d);
     					getAggregationHistory(d.getId(), outerLatch, errors, response);
     					getIndexDsInfo(d.getId(), outerLatch, errors, response);
     					datasourceResponse.add(response);
     				});
     				outerLatch.countDown();
     				if (!datasources.hasContent()) {
     					while (outerLatch.getCount() > 0) {
     						log.debug(String.format("fast countdown for outer latch %s", outerLatch));
     						outerLatch.countDown();
+    					}
     				} else {
     					datasources.forEach(d -> {
     						final DatasourceResponse response = new DatasourceResponse();
     						response.setDatasource(d);
     						getAggregationHistory(d.getId(), outerLatch, errors, response);
     						getIndexDsInfo(d.getId(), outerLatch, errors, response);
     						datasourceResponse.add(response);
     					});
     					outerLatch.countDown();
+    				}
+    			}
     			@Override
-...
+    	}
     	private void waitLatch(final CountDownLatch latch, final Queue<Throwable> errors, final int waitSeconds) {
     		log.debug(String.format("thread %s awaits latch %s", Thread.currentThread().getId(), latch.toString()));
     		try {
     			if (!latch.await(waitSeconds, TimeUnit.SECONDS)) {
     			final boolean await = latch.await(waitSeconds, TimeUnit.SECONDS);
     			if (!await) {
     				errors.offer(new TimeoutException("Waiting for requests to complete has timed out."));
     			} else {
     				log.debug(String.format("thread %s successfully awaied latch %s", Thread.currentThread().getId(), latch.toString()));
+    			}
     		} catch (final InterruptedException e) {
     			errors.offer(e);

         @ApiResponses(value = {
                 @ApiResponse(code = 200, message = "OK", response = DatasourceResponse[].class),
                 @ApiResponse(code = 500, message = "unexpected error", response = Response.class) })
         List<DatasourceResponse> searchByCountry(String country, int page, int size);
         List<DatasourceResponse> searchByCountry(String country, Boolean managed, int page, int size);
         @ApiOperation(value = "search datasources by registering user", notes = "Returns list of Datasource details.", response = DatasourceResponse[].class)
         @ApiResponses(value = {

     	@Override
     	@RequestMapping(value = "/ds/search/country/{page}/{size}", produces = { "application/json" }, method = RequestMethod.GET)
     	public List<DatasourceResponse> searchByCountry(
     			@RequestParam final String country, @PathVariable final int page, @PathVariable final int size) {
     			@RequestParam final String country,
     			@RequestParam(required = false) final Boolean managed,
     			@PathVariable final int page,
     			@PathVariable final int size) {
     		final StopWatch stop = StopWatch.createStarted();
     		final Response rsp = dsDao.searchByCountry(country, new PageRequest(page, size));
     		final Response rsp = dsDao.searchByCountry(country, managed, new PageRequest(page, size));
     		rsp.getHeader().setTime(stop.getTime());
     		if (log.isDebugEnabled()) {
     			log.debug("searchByCountry: " + rsp.getHeader().toJson());

Project

General

Profile

D-Net

Revision 50092

Added by Claudio Atzori over 6 years ago