Skip to content
Snippets Groups Projects
Commit 8b21ff09 authored by Baptiste Toulemonde's avatar Baptiste Toulemonde
Browse files

fix

parent adad7557
Branches feature/jsonPath
No related tags found
1 merge request!17Feature/json path
package com.smartharvester.config;
import java.util.concurrent.Callable;
import java.util.concurrent.Executor;
import java.util.concurrent.Future;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.task.AsyncTaskExecutor;
import org.springframework.scheduling.annotation.AsyncConfigurer;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
......
......@@ -74,6 +74,7 @@ public class SmartHarvesterMappingController {
HttpStatus statusCode = responseEntity.getStatusCode();
if (!distributionPaths.isEmpty()) {
List<String> distributions = this.mappingService.buildDistribution(url, paths, isJsonpath, datasetId, fdpUrl);
for (String distribution: distributions) {
try {
ResponseEntity<String> distributionResponse = this.mappingService.asyncPostToFdp("/distribution", fdpUrl, distribution, fdpToken).get();
......
......@@ -75,33 +75,36 @@ public class MappingService {
List<Map<String, List<String>>> distributionList = dcatPropertiesMap.get("distribution");
List<String> distributionStrings = new ArrayList<>();
if (!distributionList.get(0).entrySet().stream().map(v -> v.getValue()).allMatch(v -> v.get(0).equals("undefined"))) {
for (Map<String, List<String>> distributionMap : distributionList) {
distributionMap.putIfAbsent("dct:hasVersion", List.of("undefined"));
if (!distributionList.isEmpty()) {
if (!distributionList.get(0).entrySet().stream().map(v -> v.getValue()).allMatch(v -> v.get(0).equals("undefined")) ) {
for (Map<String, List<String>> distributionMap : distributionList) {
distributionMap.putIfAbsent("dct:hasVersion", List.of("undefined"));
distributionMap.putIfAbsent("dct:publisher", List.of("undefined"));
distributionMap.putIfAbsent("dct:publisher", List.of("undefined"));
StringBuilder datasetString = this.getDistributionString(datasetId, fdpUrl);
for (Map.Entry<String, List<String>> entry : distributionMap.entrySet()) {
if (isReplicable(entry.getKey(), paths)) {
for (String value : entry.getValue()) {
datasetString.append(this.write(entry.getKey(), value));
StringBuilder datasetString = this.getDistributionString(datasetId, fdpUrl);
for (Map.Entry<String, List<String>> entry : distributionMap.entrySet()) {
if (isReplicable(entry.getKey(), paths)) {
for (String value : entry.getValue()) {
datasetString.append(this.write(entry.getKey(), value));
}
} else {
datasetString.append(this.write(entry.getKey(), entry.getValue().get(0)));
}
} else {
datasetString.append(this.write(entry.getKey(), entry.getValue().get(0)));
}
}
datasetString.append(".");
distributionStrings.add(datasetString.toString());
}
for (String distribString : distributionStrings) {
LOGGER.info(distribString);
}
datasetString.append(".");
distributionStrings.add(datasetString.toString());
}
for (String distribString : distributionStrings) {
LOGGER.info(distribString);
}
}
return distributionStrings;
}
......
......@@ -6,13 +6,8 @@ spring.jackson.serialization.indent-output=true
server.port=8080
# 3. MongoDB configuration.
#spring.data.mongodb.uri=mongodb://admin:adminadmin@mongo2.f2ds.svc.cluster.local:27017/fdp?authSource=admin
spring.data.mongodb.host=146.59.2.87
spring.data.mongodb.port=27017
spring.data.mongodb.database=fdp
spring.data.mongodb.authentication-database=admin
spring.data.mongodb.username=admin
spring.data.mongodb.password=adminadmin
spring.data.mongodb.uri=mongodb://admin:adminadmin@90.147.167.103:27017/fdp?authSource=admin
# 4. Logging configuration.
logging.level.com.assignment.springboot.mongo=DEBUG
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment