Project

General

Profile

« Previous | Next » 

Revision 50614

1. New rest api
2. Cors filter on web.xml
3. Remove aai

View differences:

RepositoryApiImpl.java
1 1
package eu.dnetlib.repo.manager.service.controllers;
2 2

  
3
import com.fasterxml.jackson.core.JsonProcessingException;
3 4
import com.fasterxml.jackson.databind.DeserializationFeature;
4 5
import com.fasterxml.jackson.databind.ObjectMapper;
5 6
import eu.dnetlib.domain.data.Repository;
6 7
import eu.dnetlib.domain.data.RepositoryInterface;
7 8
import eu.dnetlib.domain.enabling.Vocabulary;
8 9
import eu.dnetlib.repo.manager.service.utils.Converter;
10
import eu.dnetlib.repo.manager.service.utils.RequestFilter;
9 11
import eu.dnetlib.repo.manager.shared.*;
10 12
import gr.uoa.di.driver.enabling.vocabulary.VocabularyLoader;
11 13
import org.apache.commons.codec.digest.DigestUtils;
......
16 18
import org.springframework.beans.factory.annotation.Autowired;
17 19
import org.springframework.beans.factory.annotation.Value;
18 20
import org.springframework.core.ParameterizedTypeReference;
19
import org.springframework.http.HttpEntity;
20
import org.springframework.http.HttpHeaders;
21
import org.springframework.http.HttpMethod;
22
import org.springframework.http.ResponseEntity;
21
import org.springframework.http.*;
23 22
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
24 23
import org.springframework.stereotype.Component;
25 24
import org.springframework.web.bind.annotation.PathVariable;
......
31 30
import org.springframework.web.util.UriComponentsBuilder;
32 31

  
33 32
import javax.annotation.PostConstruct;
34
import javax.ws.rs.QueryParam;
35 33
import java.sql.Timestamp;
36 34
import java.text.Normalizer;
37 35
import java.util.*;
......
222 220

  
223 221
        LOGGER.debug("Retreiving repositories of user : " + userEmail );
224 222
        UriComponents uriComponents = UriComponentsBuilder
225
                .fromHttpUrl(baseAddress + "/ds/search/registeredby/")
223
                .fromHttpUrl(baseAddress + "/ds/search/")
226 224
                .path("/{page}/{size}/")
227
                .queryParam("registeredBy", userEmail)
225
                .queryParam("requestSortBy","id")
226
                .queryParam("order","ASCENDING")
228 227
                .build().expand(page, size).encode();
229 228

  
230
        String rs = restTemplate.getForObject(uriComponents.toUri(), String.class);
229
        RequestFilter requestFilter = new RequestFilter();
230
        requestFilter.setRegisteredby(userEmail);
231

  
232
        String rs = restTemplate.postForObject(uriComponents.toUri(),requestFilter, String.class);
233

  
231 234
        List<Repository> repos = Converter.jsonToRepositoryList(new JSONObject(rs));
232 235
        for (Repository r : repos)
233 236
            this.getRepositoryInfo(r);
......
362 365

  
363 366
    private void updateRepository(Repository repository) {
364 367
        this.updateRegisteredByValue(repository.getId(),repository.getRegisteredBy());
365
        this.updateEnglishName(repository.getId(),repository.getEnglishName());
368
        this.updateEnglishName(repository.getId(),repository.getOfficialName(),repository.getEnglishName());
366 369
        this.updateLogoUrl(repository.getId(),repository.getLogoUrl());
367 370
        this.updateTimezone(repository.getId(), String.valueOf(repository.getTimezone()));
368 371
        //TODO update datasource type
......
575 578

  
576 579
    @Override
577 580
    public String updateEnglishName(@RequestParam(value = "id")   String id,
581
                                    @RequestParam(value = "officialName")   String officialName,
578 582
                                    @RequestParam(value = "englishname")  String englishName) {
579 583

  
580 584
        UriComponents uriComponents = UriComponentsBuilder
581
                .fromHttpUrl(baseAddress + "/ds/englishname/")
585
                .fromHttpUrl(baseAddress + "/ds/name/")
582 586
                .queryParam("dsId",id)
587
                .queryParam("officialname",officialName)
583 588
                .queryParam("englishname",englishName)
584 589
                .build().encode();
585 590
        return restTemplate.postForObject(uriComponents.toUri(), null,String.class);
......
667 672
    }
668 673

  
669 674
    @Override
670
    public List<String> getUrlsOfUserRepos(@PathVariable("user_email") String user_email,
675
    public List<String> getUrlsOfUserRepos(@PathVariable("user_email") String userEmail,
671 676
                                           @PathVariable("page") String page,
672 677
                                           @PathVariable("size") String size) throws JSONException {
673 678
        UriComponents uriComponents = UriComponentsBuilder
674 679
                .fromHttpUrl(baseAddress + "/api/baseurl/")
675 680
                .path("/{page}/{size}")
676
                .queryParam("userEmail",user_email)
677 681
                .build().expand(page,size).encode();
678
        return Arrays.asList(restTemplate.getForObject(uriComponents.toUri(), String[].class));
682

  
683

  
684
        RequestFilter requestFilter = new RequestFilter();
685
        requestFilter.setRegisteredby(userEmail);
686
        return Arrays.asList(restTemplate.postForObject(uriComponents.toUri(),requestFilter, String[].class));
679 687
    }
680 688

  
681 689
    @Override

Also available in: Unified diff