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

     import org.springframework.security.core.context.SecurityContextHolder;
     import org.springframework.stereotype.Service;
     import java.net.URLEncoder;
     import java.util.ArrayList;
     import java.util.HashMap;
     import java.util.List;
-...
         public final RegistryUtils jsonUtils;
         @Autowired
         RegistryCalls(@Value("${registry.coid:2}") String coid,
         RegistryCalls(@Value("${aai.registry.coid:2}") String coid,
                       HttpUtils httpUtils, RegistryUtils registryUtils) {
             this.coid = coid;
             this.httpUtils = httpUtils;
-...
             Map<String, String> params = new HashMap<>();
             params.put("coid", coid);
             if (name != null) {
                 params.put("name", name.toLowerCase());
                 params.put("name", URLEncoder.encode(name).toLowerCase());
+            }
             JsonElement response = httpUtils.get("cous.json", params);
             return (response != null) ? response.getAsJsonObject().get("Cous").getAsJsonArray() : new JsonArray();
-...
         @Override
         public JsonArray getUserEmailByCouId(Integer couId, boolean admin) {
             Map<String, String> params = new HashMap<>();
             if (couId == null) {
                 throw new IllegalArgumentException("Provided 'couId' is null");
+            }
             params.put("couid", couId.toString());
             if (admin) {
                 params.put("admin", "true");

     import java.net.URLEncoder;
     import java.util.Collection;
     import java.util.Objects;
     import java.util.stream.Collectors;
     @Service("roleMappingService")
-...
         private static final Logger logger = Logger.getLogger(AaiRoleMappingService.class);
         @Value("${registry.production:true}")
         @Value("${aai.registry.production:true}")
         private boolean production;
-...
         @Override
         public String getRepoIdByRoleId(String roleId) {
             if (!roleActive(roleId)) {
                 return null;
+            }
             return roleId.replaceFirst(".*datasource\\.", "").replace("$", ":");
+        }
-...
         public Collection<String> getRepoIdsByRoleIds(Collection<String> roleIds) {
             return roleIds
                     .stream()
                     //.filter(this::roleActive) //  implicitly executed in the next statement
                     .map(this::getRepoIdByRoleId)
                     .filter(Objects::nonNull)
                     .collect(Collectors.toList());
+        }
-...
             return repoIds
                     .stream()
                     .map(this::getRoleIdByRepoId)
                     .filter(Objects::nonNull)
                     .collect(Collectors.toList());
+        }
         @Override
         public String convertAuthorityIdToRepoId(String authorityId) {
             String repo = "";
             if (authorityId != null) {
             if (authorityId != null && roleActive(authorityId)) {
                 repo = authorityId
                         .replaceFirst(".*datasource\\.", "")
                         .replace("$", ":")
-...
             String role = convertRepoIdToEncodedAuthorityId(repoId);
             return new SimpleGrantedAuthority(role);
+        }
         private boolean roleActive(String roleId) {
             return (production && !roleId.toLowerCase().startsWith("beta."))
                     || (!production && roleId.toLowerCase().startsWith("beta."));
+        }
+    }

         private static final Logger logger = Logger.getLogger(HttpUtils.class);
         //TODO: refactor
         // TODO: To be changed the values
     //    @Value("https://aai.openaire.eu/registry/")
         @Value("https://openaire-dev.aai-dev.grnet.gr/registry/")
         private String issuer;
         @Value("${aai.registry.url}")
         private String registryUrl;
         @Value("kostis30fylloy")
         @Value("${aai.registry.authentication.username}")
         private String user;
         @Value("fynhWc7F*2y4me4U")
         @Value("${aai.registry.authentication.password}")
         private String password;
         public JsonElement post(String path, JsonObject body) {
-...
             HttpHeaders headers = createHeaders(user, password);
             headers.setContentType(MediaType.APPLICATION_JSON);
             HttpEntity<String> request = new HttpEntity<>(body.toString(), headers);
             ResponseEntity<String> responseEntity = restTemplate.exchange(issuer + path, HttpMethod.POST, request, String.class);
             ResponseEntity<String> responseEntity = restTemplate.exchange(registryUrl + path, HttpMethod.POST, request, String.class);
             return getResponseEntityAsJsonElement(responseEntity);
+        }
-...
             HttpHeaders headers = createHeaders(user, password);
             headers.setContentType(MediaType.APPLICATION_JSON);
             HttpEntity<String> request = new HttpEntity<>(body.toString(), headers);
             ResponseEntity<String> responseEntity = restTemplate.exchange(issuer + path, HttpMethod.PUT, request, String.class);
             ResponseEntity<String> responseEntity = restTemplate.exchange(registryUrl + path, HttpMethod.PUT, request, String.class);
             return getResponseEntityAsJsonElement(responseEntity);
+        }
         public JsonElement get(String path, Map<String, String> params) {
             RestTemplate restTemplate = new RestTemplate();
             String url = issuer + path + ((params != null) ? createParams(params) : null);
             String url = registryUrl + path + ((params != null) ? createParams(params) : null);
             ResponseEntity<String> responseEntity = restTemplate.exchange
                     (url, HttpMethod.GET, new HttpEntity<>(createHeaders(user, password)), String.class);
             return getResponseEntityAsJsonElement(responseEntity);
-...
         public JsonElement delete(String path) {
             RestTemplate restTemplate = new RestTemplate();
             String url = issuer + path;
             String url = registryUrl + path;
             ResponseEntity<String> responseEntity = restTemplate.exchange
                     (url, HttpMethod.DELETE, new HttpEntity<>(createHeaders(user, password)), String.class);
             return getResponseEntityAsJsonElement(responseEntity);

Project

General

Profile

D-Net

Revision 61422

Added by Konstantinos Spyrou almost 3 years ago