Project

General

Profile

« Previous | Next » 

Revision 61375

Added by Konstantinos Spyrou almost 3 years ago

minor refactoring

View differences:

RepositoryController.java
5 5 
import eu.dnetlib.repo.manager.domain.*;
6 6 
import eu.dnetlib.repo.manager.domain.dto.User;
7 7 
import eu.dnetlib.repo.manager.exception.ResourceNotFoundException;
8 
import eu.dnetlib.repo.manager.service.RepositoryServiceImpl;
8 
import eu.dnetlib.repo.manager.service.RepositoryService;
9 9 
import eu.dnetlib.repo.manager.service.security.AuthorizationService;
10 10 
import eu.dnetlib.repo.manager.utils.JsonUtils;
11 11 
import io.swagger.annotations.Api;
......
28 28 
import java.util.Map;
29 29 

  		




  30
  30
  
    
@RestController


  		




  31
  
  
    
@RequestMapping(value = "/repository")


  		




  32
  
  
    
@Api(description = "Repository API", tags = {"repository"})


  		




  
  31
  
    
@RequestMapping(value = "/repositories")


  		




  
  32
  
    
@Api(description = "Repository API", tags = {"repositories"})


  		




  33
  33
  
    
public class RepositoryController {


  		




  34
  34
  
    

  		




  35
  35
  
    
    private static final Logger logger = Logger.getLogger(RepositoryController.class);


  		




  36
  36
  
    

  		




  37
  
  
    
    private final RepositoryServiceImpl repositoryService; //TODO: why not RepositoryService??


  		




  
  37
  
    
    private final RepositoryService repositoryService;


  		




  38
  38
  
    
    private final AuthorizationService authorizationService;


  		




  39
  39
  
    

  		




  40
  40
  
    
    @Autowired


  		




  41
  
  
    
    RepositoryController(RepositoryServiceImpl repositoryService,


  		




  
  41
  
    
    RepositoryController(RepositoryService repositoryService,


  		




  42
  42
  
    
                         AuthorizationService authorizationService) {


  		




  43
  43
  
    
        this.repositoryService = repositoryService;


  		




  44
  44
  
    
        this.authorizationService = authorizationService;


  		




  45
  45
  
    
    }


  		




  46
  46
  
    

  		




  47
  47
  
    

  		




  48
  
  
    
    @RequestMapping(value = "/getCountries", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)


  		




  
  48
  
    
    @RequestMapping(value = "/countries", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)


  		




  49
  49
  
    
    @ResponseBody


  		




  50
  50
  
    
    public Country[] getCountries() {


  		




  51
  51
  
    
        return repositoryService.getCountries();


  		




  ......




  60
  60
  
    
        return repositoryService.getRepositoriesByCountry(country, mode, managed);


  		




  61
  61
  
    
    }


  		




  62
  62
  
    

  		




  63
  
  
    
    @RequestMapping(value = "/getRepositoriesOfUser/{page}/{size}", method = RequestMethod.GET,


  		




  
  63
  
    
    @RequestMapping(value = "/snippets/user", method = RequestMethod.GET,


  		




  64
  64
  
    
            produces = MediaType.APPLICATION_JSON_VALUE)


  		




  65
  65
  
    
    @ResponseBody


  		




  66
  66
  
    
    @PreAuthorize("hasAuthority('REGISTERED_USER')")


  		




  67
  
  
    
    public List<RepositorySnippet> getRepositoriesSnippetOfUser(


  		




  68
  
  
    
            @PathVariable("page") String page,


  		




  69
  
  
    
            @PathVariable("size") String size) throws Exception {


  		




  70
  
  
    
        return repositoryService.getRepositoriesSnippetOfUser(page, size);


  		




  
  67
  
    
    public List<RepositorySnippet> getRepositoriesSnippetsOfUser() throws Exception {


  		




  
  68
  
    
        return repositoryService.getRepositoriesSnippetOfUser("0", "100");


  		




  71
  69
  
    
    }


  		




  72
  70
  
    

  		




  73
  
  
    
    @RequestMapping(value = "/user/repositories/{page}/{size}", method = RequestMethod.GET,


  		




  74
  
  
    
            produces = MediaType.APPLICATION_JSON_VALUE)


  		




  75
  
  
    
    @ResponseBody


  		




  76
  
  
    
    @PreAuthorize("hasAuthority('REGISTERED_USER')")


  		




  77
  
  
    
    public List<Repository> getRepositoriesOfUser(


  		




  78
  
  
    
            @PathVariable("page") String page,


  		




  79
  
  
    
            @PathVariable("size") String size) throws JSONException, IOException {


  		




  80
  
  
    
        return repositoryService.getRepositoriesOfUser(page, size);


  		




  81
  
  
    
    }


  		




  82
  
  
    

  		




  83
  71
  
    
    @RequestMapping(value = "/searchRegisteredRepositories/{page}/{size}", method = RequestMethod.GET,


  		




  84
  72
  
    
            produces = MediaType.APPLICATION_JSON_VALUE)


  		




  85
  73
  
    
    @ResponseBody


  		












Also available in:  Unified diff