Project

General

Profile

« Previous | Next » 

Revision 50219

Added by Panagiotis Kanakakis over 6 years ago

1. Changes on piwik api
2. Changes on repository interface (new response entities)
3. Changes on converter class due to new json response.

View differences:

Converter.java
1 1 
package eu.dnetlib.repo.manager.service.utils;
2 2 

  		




  3
  
  
    
import com.fasterxml.jackson.core.JsonProcessingException;


  		




  4
  
  
    
import com.fasterxml.jackson.core.type.TypeReference;


  		




  5
  3
  
    
import com.fasterxml.jackson.databind.ObjectMapper;


  		




  6
  4
  
    
import eu.dnetlib.domain.data.Repository;


  		




  7
  5
  
    
import eu.dnetlib.domain.data.RepositoryInterface;


  		




  8
  
  
    
import eu.dnetlib.repo.manager.service.controllers.RepositoryApi;


  		




  9
  6
  
    
import eu.dnetlib.repo.manager.shared.*;


  		




  10
  7
  
    
import org.apache.log4j.Logger;


  		




  11
  8
  
    
import org.json.JSONArray;


  		




  12
  9
  
    
import org.json.JSONException;


  		




  13
  10
  
    
import org.json.JSONObject;


  		




  14
  
  
    
import org.springframework.beans.factory.annotation.Autowired;


  		




  15
  11
  
    

  		




  16
  12
  
    
import java.io.*;


  		




  17
  13
  
    
import java.text.ParseException;


  		




  ......




  26
  22
  
    

  		




  27
  23
  
    
        Repository repository = new Repository();


  		




  28
  24
  
    

  		




  29
  
  
    
        if( repositoryObject.get("datasource").equals(null))


  		




  30
  
  
    
            return null;


  		




  31
  25
  
    

  		




  32
  
  
    
        JSONObject datasource = (JSONObject) repositoryObject.get("datasource");


  		




  
  26
  
    
        LOGGER.debug("datasource response -> " + repositoryObject);


  		




  
  27
  
    
        JSONObject datasource = repositoryObject.getJSONObject("datasource");


  		




  33
  28
  
    

  		




  
  29
  
    
        if( datasource.equals(null))


  		




  
  30
  
    
            return null;


  		




  
  31
  
    
        


  		




  34
  32
  
    
        repository.setActivationId(datasource.get("activationId").toString());


  		




  35
  33
  
    
        repository.setAggregator(datasource.get("aggregator").toString());


  		




  36
  34
  
    
        repository.setCertificates(datasource.get("certificates").toString());


  		




  ......




  83
  81
  
    
        repository.setProvenanceActionClass( datasource.get("provenanceaction").toString());


  		




  84
  82
  
    
        repository.setQualityManagementKind(datasource.get("qualitymanagementkind").toString());


  		




  85
  83
  
    
        repository.setRegisteredBy(datasource.get("registeredby").toString());


  		




  
  84
  
    

  		




  
  85
  
    
        if(repository.getRegisteredBy() != null)


  		




  
  86
  
    
            repository.setRegistered(true);


  		




  
  87
  
    

  		




  86
  88
  
    
        repository.setReleaseEndDate(convertStringToDate(datasource.get("releaseenddate").toString()));


  		




  87
  89
  
    
        repository.setReleaseStartDate(convertStringToDate(datasource.get("releasestartdate").toString()));


  		




  88
  90
  
    
        repository.setServiceProvider(Boolean.valueOf(datasource.get("serviceprovider").toString()));


  		




  ......




  149
  151
  
    
            return Double.valueOf(number);


  		




  150
  152
  
    
    }


  		




  151
  153
  
    

  		




  152
  
  
    
    public static List<Repository> jsonToRepositoryList(JSONArray rs) throws JSONException {


  		




  
  154
  
    
    public static List<Repository> jsonToRepositoryList(JSONObject json) throws JSONException {


  		




  153
  155
  
    

  		




  154
  156
  
    
        List<Repository> resultSet = new ArrayList<>();


  		




  
  157
  
    
        JSONArray rs = json.getJSONArray("datasourceInfo");


  		




  155
  158
  
    
        for(int i=0;i<rs.length();i++)


  		




  156
  159
  
    
            resultSet.add(jsonToRepositoryObject( rs.getJSONObject(i)) );


  		




  157
  160
  
    
        return resultSet;


  		












Also available in:  Unified diff