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

      * Datasource
      */
     @Entity
     @Table(name = "dsm_datasources")
     @Table(
     	name = "dsm_datasources",
     	indexes = {
     		@Index(name = "dsm_datasources_contactemail_idx", columnList = "contactemail"),
     		@Index(name = "dsm_datasources_englishname_idx", columnList = "englishname"),
     		@Index(name = "dsm_datasources_officialname_idx", columnList = "officialname"),
     		@Index(name = "dsm_datasources_registeredby_idx", columnList = "registeredby")
     	})
     @ApiModel(value = "Datasource model", description = "provides datasource details")
     public class Datasource {

     	@Async
     	ListenableFuture<Slice<Datasource>> findDistinctByOrganizationsCountryIgnoreCase(String country, Pageable pageable);
     	@Async
     	ListenableFuture<Slice<Datasource>> findDistinctByRegisteredbyIgnoreCase(String registeredby, Pageable pageable);
     	@Modifying
     	@Transactional
     	@Query("update Datasource d set d.managed = ?2 where d.id = ?1")
-...
     	@Query("update Datasource d set d.typology = ?2 where d.id = ?1")
     	void setTypology(String id, String typology);
     	@Modifying
     	@Transactional
     	@Query("update Datasource d set d.registeredby = ?2 where d.id = ?1")
     	void setRegisteringUser(String id, String registeredby);
+    }

     		return new Response().setDatasourceResponse(datasourceResponse).setHeader(new Header().setErrors(errors));
+    	}
     	public Response searchByRegisteringUser(final String registeredBy, final Pageable pageable) {
     		final List<DatasourceResponse> datasourceResponse = Lists.newArrayList();
     		final CountDownLatch outerLatch = new CountDownLatch(3);
     		final Queue<Throwable> errors = new ConcurrentLinkedQueue<>();
     		log.debug(String.format("search ds by registeredBy '%s'", registeredBy));
     		dsRepository.findDistinctByRegisteredbyIgnoreCase(registeredBy, pageable).addCallback(getSearchCallback(outerLatch, errors, datasourceResponse));
     		waitLatch(outerLatch, errors, config.getRequestTimeout());
     		return new Response().setDatasourceResponse(datasourceResponse).setHeader(new Header().setErrors(errors));
+    	}
     	public Response searchByContactemail(final String email, final Pageable pageable) {
     		final List<DatasourceResponse> datasourceResponse = Lists.newArrayList();
-...
     		log.info(String.format("updated datasource '%s' with timezone '%s'", dsId, typology));
+    	}
     	public void updateDatasourceRegisteringUser(final String dsId, final String registeredBy) {
     		dsRepository.setRegisteringUser(dsId, registeredBy);
     		log.info(String.format("updated datasource '%s' with registeredby '%s'", dsId, registeredBy));
+    	}
     	public void dropCaches() {
     		mongoLoggerClient.dropCache();
     		isLookupClient.dropCache();

                 @ApiResponse(code = 500, message = "unexpected error", response = Response.class) })
         List<DatasourceResponse> searchByCountry(String country, int page, int size);
         @ApiOperation(value = "search datasources by registering user", notes = "Returns list of Datasource details.", response = DatasourceResponse[].class)
         @ApiResponses(value = {
                 @ApiResponse(code = 200, message = "OK", response = DatasourceResponse[].class),
                 @ApiResponse(code = 500, message = "unexpected error", response = Response.class) })
         List<DatasourceResponse> searchByRegisteringUser(String registeredBy, int page, int size);
         @ApiOperation(value = "search among datasource APIs", notes = "Returns Datasource Api details.", response = SearchInterfacesEntry[].class)
         @ApiResponses(value = {
                 @ApiResponse(code = 200, message = "OK", response = SearchInterfacesEntry[].class),
-...
                 @ApiResponse(code = 400, message = "unexpected typology code")})
         void updateTypology(String dsId, String typology) throws ApiException;
         @ApiOperation(value = "updates a datasource registering user", notes = "updates a datasource registering user", httpMethod = "POST")
         @ApiResponses(value = {
                 @ApiResponse(code = 200, message = "OK"),
                 @ApiResponse(code = 500, message = "unexpected error"),
                 @ApiResponse(code = 400, message = "unexpected typology code")})
         void updateRegisteringUser(String dsId, String registeredBy) throws ApiException;
+    }

+    	}
     	@Override
     	@RequestMapping(value = "/ds/search/registeredby/{page}/{size}", produces = { "application/json" }, method = RequestMethod.GET)
     	public List<DatasourceResponse> searchByRegisteringUser(final String registeredBy, final int page, final int size) {
     		final StopWatch stop = StopWatch.createStarted();
     		final Response rsp = dsDao.searchByRegisteringUser(registeredBy, new PageRequest(page, size));
     		rsp.getHeader().setTime(stop.getTime());
     		if (log.isDebugEnabled()) {
     			log.debug("searchByRegisteringUser: " + rsp.getHeader().toJson());
+    		}
     		return rsp.getDatasourceResponse();
+    	}
     	@Override
     	@RequestMapping(value = "/api/search/{field}", produces = { "application/json" }, method = RequestMethod.GET)
     	public List<SearchInterfacesEntry> searchInterface(@PathVariable final String field, @RequestParam final String value) {
     		return dsDao.searchInterface(field, value);
-...
+    	}
     	@Override
     	@RequestMapping(value = "/ds/update/officialname", method = RequestMethod.POST)
     	@RequestMapping(value = "/ds/officialname", method = RequestMethod.POST)
     	public void updateOfficialname(@RequestParam final String dsId, @RequestParam final String officialname) throws ApiException {
     		dsDao.updateOfficialName(dsId, officialname);
+    	}
     	@Override
     	@RequestMapping(value = "/ds/update/englishname", method = RequestMethod.POST)
     	@RequestMapping(value = "/ds/englishname", method = RequestMethod.POST)
     	public void updateEnglishname(@RequestParam final String dsId, @RequestParam final String englishname) throws ApiException {
     		dsDao.updateEnglishName(dsId, englishname);
+    	}
     	@Override
     	@RequestMapping(value = "/ds/update/latitude", method = RequestMethod.POST)
     	@RequestMapping(value = "/ds/latitude", method = RequestMethod.POST)
     	public void updateLatitude(final String dsId, final Double latitude) throws ApiException {
     		dsDao.updateLatitude(dsId, latitude);
+    	}
     	@Override
     	@RequestMapping(value = "/ds/update/longitude", method = RequestMethod.POST)
     	@RequestMapping(value = "/ds/longitude", method = RequestMethod.POST)
     	public void updateLongitude(final String dsId, final Double longitude) throws ApiException {
     		dsDao.updateLongitude(dsId, longitude);
+    	}
     	@Override
     	@RequestMapping(value = "/ds/update/logourl", method = RequestMethod.POST)
     	@RequestMapping(value = "/ds/logourl", method = RequestMethod.POST)
     	public void updateLogourl(final String dsId, final String logourl) throws ApiException {
     		dsDao.updateLogourl(dsId, logourl);
+    	}
     	@Override
     	@RequestMapping(value = "/ds/update/timezone", method = RequestMethod.POST)
     	@RequestMapping(value = "/ds/timezone", method = RequestMethod.POST)
     	public void updateTimezone(final String dsId, final String timezone) throws ApiException {
     		dsDao.updateTimezone(dsId, timezone);
+    	}
     	@Override
     	@RequestMapping(value = "/ds/update/typology", method = RequestMethod.POST)
     	@RequestMapping(value = "/ds/typology", method = RequestMethod.POST)
     	public void updateTypology(final String dsId, final String typology) throws ApiException {
     		dsDao.updateDatasourceTypology(dsId, typology);
+    	}
     	@Override
     	@RequestMapping(value = "/ds/registeredby", method = RequestMethod.POST)
     	public void updateRegisteringUser(final String dsId, final String registeredBy) throws ApiException {
     		dsDao.updateDatasourceRegisteringUser(dsId, registeredBy);
+    	}
     	@ApiOperation(value = "drop the datasource manager caches", notes = "drop the datasource manager caches", httpMethod = "GET")
     	@ApiResponses(value = {
     			@ApiResponse(code = 200, message = "OK"),

modules/dnet-openaire-exporter/trunk/src/main/resources/dnet_dsm.sql
164	164	CREATE INDEX dsm_datasources_contactemail_idx ON dsm_datasources (contactemail);
165	165	CREATE INDEX dsm_datasources_englishname_idx ON dsm_datasources (englishname);
166	166	CREATE INDEX dsm_datasources_officialname_idx ON dsm_datasources (officialname);
	167	CREATE INDEX dsm_datasources_registeredby_idx ON dsm_datasources (registeredby);
167	168
168	169	ALTER TABLE dsm_datasources OWNER TO dnetapi;
169	170

Project

General

Profile

D-Net

Revision 49965

Added by Claudio Atzori over 6 years ago