Project

General

Profile

« Previous | Next » 

Revision 56661

- Fixing some code-smells
- Implemented search of piwik repos
- Added site_id info on repository

View differences:

PiWikController.java
1 1
package eu.dnetlib.repo.manager.controllers;
2 2

  
3 3
import eu.dnetlib.domain.data.PiwikInfo;
4
import eu.dnetlib.repo.manager.domain.OrderByField;
5
import eu.dnetlib.repo.manager.domain.OrderByType;
4 6
import eu.dnetlib.repo.manager.service.PiWikServiceImpl;
5 7
import eu.dnetlib.repo.manager.shared.RepositoryServiceException;
6 8
import io.swagger.annotations.Api;
......
18 20
public class PiWikController {
19 21

  
20 22
    @Autowired
21
    PiWikServiceImpl piWikService;
23
    private PiWikServiceImpl piWikService;
22 24

  
23 25

  
24 26
    @RequestMapping(value = "/getPiwikSiteForRepo/{repositoryId}" , method = RequestMethod.GET,produces = MediaType.APPLICATION_JSON_VALUE)
......
35 37
    }
36 38

  
37 39
    @RequestMapping(value = "/getPiwikSitesForRepos" , method = RequestMethod.GET,produces = MediaType.APPLICATION_JSON_VALUE)
38
    List<PiwikInfo> getPiwikSitesForRepos(){
39
        return piWikService.getPiwikSitesForRepos();
40
    public List<PiwikInfo> getPiwikSitesForRepos(
41
            @RequestParam(value = "from",required=false,defaultValue = "0") int from,
42
            @RequestParam(value = "quantity",required=false,defaultValue = "100") int quantity,
43
            @RequestParam(value = "order",required=false,defaultValue = "ASC") OrderByType orderType,
44
            @RequestParam(value = "orderField", required = false, defaultValue = "REPOSITORY_NAME") OrderByField orderField,
45
            @RequestParam(value = "searchField", required = false, defaultValue = "") String searchField
46

  
47
    ){
48
        return piWikService.getPiwikSitesForRepos(orderField,orderType,from,quantity,searchField);
40 49
    }
41 50

  
42 51
    @RequestMapping(value = "/approvePiwikSite/{repositoryId}" , method = RequestMethod.GET)
......
48 57

  
49 58
    @RequestMapping(value = "/getOpenaireId/{repositoryId}" , method = RequestMethod.GET,produces = MediaType.APPLICATION_JSON_VALUE)
50 59
    @ResponseBody
51
    String getOpenaireId(String repositoryid){
60
    public String getOpenaireId(String repositoryid){
52 61
        return piWikService.getOpenaireId(repositoryid);
53 62
    }
54 63

  

Also available in: Unified diff