diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/AbstractDsmController.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/AbstractDsmController.java similarity index 97% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/AbstractDsmController.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/AbstractDsmController.java index 5b8f048a..4457ddab 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/AbstractDsmController.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/AbstractDsmController.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm; +package eu.dnetlib.dsm; import java.util.List; import java.util.stream.Collectors; @@ -17,10 +17,10 @@ import org.springframework.web.bind.annotation.ResponseStatus; import com.fasterxml.jackson.annotation.JsonAutoDetect; import eu.dnetlib.common.controller.AbstractDnetController; +import eu.dnetlib.dsm.domain.Response; import eu.dnetlib.is.errors.DsmException; import eu.dnetlib.is.errors.DsmForbiddenException; import eu.dnetlib.is.errors.DsmNotFoundException; -import eu.dnetlib.openaire.dsm.domain.Response; /** * Created by claudio on 18/07/2017. diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/DatasourceManagerCommon.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/DatasourceManagerCommon.java similarity index 96% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/DatasourceManagerCommon.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/DatasourceManagerCommon.java index 2a704614..c7651c74 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/DatasourceManagerCommon.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/DatasourceManagerCommon.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm; +package eu.dnetlib.dsm; import java.util.List; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/DsmAjaxController.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/DsmAjaxController.java similarity index 97% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/DsmAjaxController.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/DsmAjaxController.java index 9e9cdcef..c10ec4b1 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/DsmAjaxController.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/DsmAjaxController.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm; +package eu.dnetlib.dsm; import java.util.Arrays; import java.util.LinkedHashMap; @@ -21,9 +21,9 @@ import eu.dnetlib.data.is.vocabulary.repository.VocabularyTermRepository; import eu.dnetlib.data.openaire.dsm.model.Api; import eu.dnetlib.data.openaire.dsm.model.BrowseTerm; import eu.dnetlib.data.openaire.dsm.model.view.SimpleDsWithApis; +import eu.dnetlib.dsm.utils.DsmBrowsableFields; import eu.dnetlib.is.errors.DsmException; import eu.dnetlib.is.info.KeyValue; -import eu.dnetlib.openaire.dsm.utils.DsmBrowsableFields; @RestController @RequestMapping("/ajax/dsm") diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/DsmApiControllerV1.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/DsmApiControllerV1.java similarity index 88% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/DsmApiControllerV1.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/DsmApiControllerV1.java index 0af302cd..fb4a5af3 100755 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/DsmApiControllerV1.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/DsmApiControllerV1.java @@ -1,8 +1,8 @@ -package eu.dnetlib.openaire.dsm; +package eu.dnetlib.dsm; -import static eu.dnetlib.openaire.dsm.utils.DsmMappingUtils.asDbEntry; -import static eu.dnetlib.openaire.dsm.utils.DsmMappingUtils.copyNonNullProperties; -import static eu.dnetlib.openaire.dsm.utils.DsmMappingUtils.createId; +import static eu.dnetlib.dsm.utils.DsmMappingUtils.asDbEntry; +import static eu.dnetlib.dsm.utils.DsmMappingUtils.copyNonNullProperties; +import static eu.dnetlib.dsm.utils.DsmMappingUtils.createId; import java.util.Collection; import java.util.HashSet; @@ -33,27 +33,27 @@ import org.springframework.web.bind.annotation.RestController; import eu.dnetlib.data.openaire.dsm.model.Api; import eu.dnetlib.data.openaire.dsm.model.Datasource; import eu.dnetlib.data.openaire.dsm.model.Identity; +import eu.dnetlib.dsm.domain.AggregationHistoryResponse; +import eu.dnetlib.dsm.domain.AggregationInfo; +import eu.dnetlib.dsm.domain.ApiDetails; +import eu.dnetlib.dsm.domain.ApiDetailsResponse; +import eu.dnetlib.dsm.domain.Country; +import eu.dnetlib.dsm.domain.DatasourceDetailResponse; +import eu.dnetlib.dsm.domain.DatasourceDetails; +import eu.dnetlib.dsm.domain.DatasourceDetailsUpdate; +import eu.dnetlib.dsm.domain.DatasourceDetailsWithApis; +import eu.dnetlib.dsm.domain.DatasourceSnippetResponse; +import eu.dnetlib.dsm.domain.RegisteredDatasourceInfo; +import eu.dnetlib.dsm.domain.RequestFilter; +import eu.dnetlib.dsm.domain.RequestSort; +import eu.dnetlib.dsm.domain.RequestSortOrder; +import eu.dnetlib.dsm.domain.SimpleResponse; +import eu.dnetlib.dsm.utils.DsmMappingUtils; +import eu.dnetlib.dsm.utils.ResponseUtils; +import eu.dnetlib.dsm.utils.WfLoggerClient; import eu.dnetlib.is.errors.DsmException; import eu.dnetlib.is.errors.DsmForbiddenException; import eu.dnetlib.is.errors.DsmNotFoundException; -import eu.dnetlib.openaire.dsm.domain.AggregationHistoryResponse; -import eu.dnetlib.openaire.dsm.domain.AggregationInfo; -import eu.dnetlib.openaire.dsm.domain.ApiDetails; -import eu.dnetlib.openaire.dsm.domain.ApiDetailsResponse; -import eu.dnetlib.openaire.dsm.domain.Country; -import eu.dnetlib.openaire.dsm.domain.DatasourceDetailResponse; -import eu.dnetlib.openaire.dsm.domain.DatasourceDetails; -import eu.dnetlib.openaire.dsm.domain.DatasourceDetailsUpdate; -import eu.dnetlib.openaire.dsm.domain.DatasourceDetailsWithApis; -import eu.dnetlib.openaire.dsm.domain.DatasourceSnippetResponse; -import eu.dnetlib.openaire.dsm.domain.RegisteredDatasourceInfo; -import eu.dnetlib.openaire.dsm.domain.RequestFilter; -import eu.dnetlib.openaire.dsm.domain.RequestSort; -import eu.dnetlib.openaire.dsm.domain.RequestSortOrder; -import eu.dnetlib.openaire.dsm.domain.SimpleResponse; -import eu.dnetlib.openaire.dsm.utils.DsmMappingUtils; -import eu.dnetlib.openaire.dsm.utils.ResponseUtils; -import eu.dnetlib.openaire.dsm.utils.WfLoggerClient; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/DsmApiControllerV2.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/DsmApiControllerV2.java similarity index 91% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/DsmApiControllerV2.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/DsmApiControllerV2.java index 56922f0e..f514fd46 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/DsmApiControllerV2.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/DsmApiControllerV2.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm; +package eu.dnetlib.dsm; import java.util.List; @@ -11,9 +11,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import eu.dnetlib.openaire.dsm.domain.SimpleDatasourceInfo; -import eu.dnetlib.openaire.dsm.domain.SimpleResponse; -import eu.dnetlib.openaire.dsm.utils.ResponseUtils; +import eu.dnetlib.dsm.domain.SimpleDatasourceInfo; +import eu.dnetlib.dsm.domain.SimpleResponse; +import eu.dnetlib.dsm.utils.ResponseUtils; import io.swagger.v3.oas.annotations.tags.Tag; @RestController diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/DsmService.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/DsmService.java similarity index 94% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/DsmService.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/DsmService.java index a01c0c4c..7e279bfb 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/DsmService.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/DsmService.java @@ -1,10 +1,10 @@ -package eu.dnetlib.openaire.dsm; +package eu.dnetlib.dsm; -import static eu.dnetlib.openaire.dsm.utils.DatasourceSpecs.apiSpec; -import static eu.dnetlib.openaire.dsm.utils.DatasourceSpecs.dsRegisteredbyNotNullSpec; -import static eu.dnetlib.openaire.dsm.utils.DatasourceSpecs.dsSpec; -import static eu.dnetlib.openaire.dsm.utils.DsmMappingUtils.asDbEntry; -import static eu.dnetlib.openaire.dsm.utils.DsmMappingUtils.createId; +import static eu.dnetlib.dsm.utils.DatasourceSpecs.apiSpec; +import static eu.dnetlib.dsm.utils.DatasourceSpecs.dsRegisteredbyNotNullSpec; +import static eu.dnetlib.dsm.utils.DatasourceSpecs.dsSpec; +import static eu.dnetlib.dsm.utils.DsmMappingUtils.asDbEntry; +import static eu.dnetlib.dsm.utils.DsmMappingUtils.createId; import java.io.IOException; import java.nio.charset.Charset; @@ -48,23 +48,23 @@ import eu.dnetlib.data.openaire.dsm.repository.ApiRepository; import eu.dnetlib.data.openaire.dsm.repository.ApiWithAdditionalInfoRepository; import eu.dnetlib.data.openaire.dsm.repository.DatasourceRepository; import eu.dnetlib.data.openaire.dsm.repository.SimpleDsWithApisRepository; +import eu.dnetlib.dsm.domain.ApiDetails; +import eu.dnetlib.dsm.domain.Country; +import eu.dnetlib.dsm.domain.DatasourceDetailResponse; +import eu.dnetlib.dsm.domain.DatasourceSnippetResponse; +import eu.dnetlib.dsm.domain.RegisteredDatasourceInfo; +import eu.dnetlib.dsm.domain.RequestFilter; +import eu.dnetlib.dsm.domain.RequestSort; +import eu.dnetlib.dsm.domain.RequestSortOrder; +import eu.dnetlib.dsm.domain.SimpleDatasourceInfo; +import eu.dnetlib.dsm.domain.SimpleResponse; +import eu.dnetlib.dsm.utils.DsmBrowsableFields; +import eu.dnetlib.dsm.utils.DsmMappingUtils; +import eu.dnetlib.dsm.utils.ResponseUtils; +import eu.dnetlib.dsm.utils.VocabularyClient; import eu.dnetlib.is.errors.DsmException; import eu.dnetlib.is.errors.DsmForbiddenException; import eu.dnetlib.is.errors.DsmNotFoundException; -import eu.dnetlib.openaire.dsm.domain.ApiDetails; -import eu.dnetlib.openaire.dsm.domain.Country; -import eu.dnetlib.openaire.dsm.domain.DatasourceDetailResponse; -import eu.dnetlib.openaire.dsm.domain.DatasourceSnippetResponse; -import eu.dnetlib.openaire.dsm.domain.RegisteredDatasourceInfo; -import eu.dnetlib.openaire.dsm.domain.RequestFilter; -import eu.dnetlib.openaire.dsm.domain.RequestSort; -import eu.dnetlib.openaire.dsm.domain.RequestSortOrder; -import eu.dnetlib.openaire.dsm.domain.SimpleDatasourceInfo; -import eu.dnetlib.openaire.dsm.domain.SimpleResponse; -import eu.dnetlib.openaire.dsm.utils.DsmBrowsableFields; -import eu.dnetlib.openaire.dsm.utils.DsmMappingUtils; -import eu.dnetlib.openaire.dsm.utils.ResponseUtils; -import eu.dnetlib.openaire.dsm.utils.VocabularyClient; @Service @ConditionalOnProperty(value = "openaire.api.enable.dsm", havingValue = "true") diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/AggregationHistoryResponse.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/AggregationHistoryResponse.java similarity index 93% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/AggregationHistoryResponse.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/AggregationHistoryResponse.java index 7ccb86d5..d6e2097e 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/AggregationHistoryResponse.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/AggregationHistoryResponse.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.dsm.domain; import java.util.List; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/AggregationInfo.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/AggregationInfo.java similarity index 96% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/AggregationInfo.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/AggregationInfo.java index 372ed0cd..c465146a 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/AggregationInfo.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/AggregationInfo.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.dsm.domain; public abstract class AggregationInfo { diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/AggregationStage.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/AggregationStage.java similarity index 92% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/AggregationStage.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/AggregationStage.java index a9dc0cd3..eda465aa 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/AggregationStage.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/AggregationStage.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.dsm.domain; public enum AggregationStage { diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/ApiDetails.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/ApiDetails.java similarity index 99% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/ApiDetails.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/ApiDetails.java index 4768d9a0..6bf9c977 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/ApiDetails.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/ApiDetails.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.dsm.domain; import java.sql.Date; import java.util.Set; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/ApiDetailsResponse.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/ApiDetailsResponse.java similarity index 90% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/ApiDetailsResponse.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/ApiDetailsResponse.java index cecb20c1..a8cd9c37 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/ApiDetailsResponse.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/ApiDetailsResponse.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.dsm.domain; import java.util.List; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/ApiIgnoredProperties.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/ApiIgnoredProperties.java similarity index 97% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/ApiIgnoredProperties.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/ApiIgnoredProperties.java index d674f260..4d8a40c8 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/ApiIgnoredProperties.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/ApiIgnoredProperties.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.dsm.domain; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/ApiParamDetails.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/ApiParamDetails.java similarity index 88% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/ApiParamDetails.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/ApiParamDetails.java index 158bd72a..57df6a55 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/ApiParamDetails.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/ApiParamDetails.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.dsm.domain; public class ApiParamDetails { diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/CollectionInfo.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/CollectionInfo.java similarity index 91% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/CollectionInfo.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/CollectionInfo.java index 3fbd44f6..037177f1 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/CollectionInfo.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/CollectionInfo.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.dsm.domain; import com.fasterxml.jackson.annotation.JsonAutoDetect; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/CollectionMode.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/CollectionMode.java similarity index 81% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/CollectionMode.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/CollectionMode.java index 5d8702d7..c90b88d5 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/CollectionMode.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/CollectionMode.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.dsm.domain; import com.fasterxml.jackson.annotation.JsonAutoDetect; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/Country.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/Country.java similarity index 91% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/Country.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/Country.java index c6e0451f..26c1fc1a 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/Country.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/Country.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.dsm.domain; public class Country { diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetailResponse.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/DatasourceDetailResponse.java similarity index 93% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetailResponse.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/DatasourceDetailResponse.java index e59cb037..284576c1 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetailResponse.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/DatasourceDetailResponse.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.dsm.domain; import java.util.List; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetails.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/DatasourceDetails.java similarity index 99% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetails.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/DatasourceDetails.java index 0d27e3bc..096a76dd 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetails.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/DatasourceDetails.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.dsm.domain; import java.sql.Date; import java.util.Set; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetailsUpdate.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/DatasourceDetailsUpdate.java similarity index 99% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetailsUpdate.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/DatasourceDetailsUpdate.java index 750813bb..e9fe39f8 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetailsUpdate.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/DatasourceDetailsUpdate.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.dsm.domain; import java.sql.Date; import java.util.Set; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetailsWithApis.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/DatasourceDetailsWithApis.java similarity index 95% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetailsWithApis.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/DatasourceDetailsWithApis.java index 8e0c3d09..506ccab1 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceDetailsWithApis.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/DatasourceDetailsWithApis.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.dsm.domain; import java.util.ArrayList; import java.util.List; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceIgnoredProperties.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/DatasourceIgnoredProperties.java similarity index 99% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceIgnoredProperties.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/DatasourceIgnoredProperties.java index f00a734c..4a1a3e10 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceIgnoredProperties.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/DatasourceIgnoredProperties.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.dsm.domain; import java.sql.Date; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceInfo.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/DatasourceInfo.java similarity index 98% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceInfo.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/DatasourceInfo.java index 28ca21a9..7f59b474 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceInfo.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/DatasourceInfo.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.dsm.domain; import java.util.List; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceResponse.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/DatasourceResponse.java similarity index 93% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceResponse.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/DatasourceResponse.java index 9aba8b8a..049e6864 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceResponse.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/DatasourceResponse.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.dsm.domain; import java.util.List; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceSearchResponse.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/DatasourceSearchResponse.java similarity index 93% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceSearchResponse.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/DatasourceSearchResponse.java index 2be76532..caa6e3dc 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceSearchResponse.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/DatasourceSearchResponse.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.dsm.domain; import java.util.List; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceSnippet.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/DatasourceSnippet.java similarity index 95% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceSnippet.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/DatasourceSnippet.java index 9ce47b8d..e3d559fa 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceSnippet.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/DatasourceSnippet.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.dsm.domain; import javax.validation.constraints.NotBlank; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceSnippetExtended.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/DatasourceSnippetExtended.java similarity index 98% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceSnippetExtended.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/DatasourceSnippetExtended.java index 819fe307..b44f19d8 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceSnippetExtended.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/DatasourceSnippetExtended.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.dsm.domain; import java.util.Date; import java.util.Set; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceSnippetResponse.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/DatasourceSnippetResponse.java similarity index 93% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceSnippetResponse.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/DatasourceSnippetResponse.java index 522d5653..8d2fd0df 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/DatasourceSnippetResponse.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/DatasourceSnippetResponse.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.dsm.domain; import java.util.List; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/FilterName.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/FilterName.java similarity index 96% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/FilterName.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/FilterName.java index 2dbd67eb..7854abb2 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/FilterName.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/FilterName.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.dsm.domain; import com.fasterxml.jackson.annotation.JsonAutoDetect; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/FilterType.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/FilterType.java similarity index 63% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/FilterType.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/FilterType.java index a028e350..b1f3fa11 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/FilterType.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/FilterType.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.dsm.domain; public enum FilterType { exact, diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/Header.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/Header.java similarity index 98% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/Header.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/Header.java index e5121ff5..960c68ab 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/Header.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/Header.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.dsm.domain; import java.util.List; import java.util.Queue; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/IdentitiesDetails.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/IdentitiesDetails.java similarity index 92% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/IdentitiesDetails.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/IdentitiesDetails.java index 48cba1e9..7e9cf937 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/IdentitiesDetails.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/IdentitiesDetails.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.dsm.domain; import com.fasterxml.jackson.annotation.JsonAutoDetect; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/OrganizationDetails.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/OrganizationDetails.java similarity index 97% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/OrganizationDetails.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/OrganizationDetails.java index 1abc52d4..2ec2b286 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/OrganizationDetails.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/OrganizationDetails.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.dsm.domain; import javax.validation.constraints.NotBlank; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/OrganizationIgnoredProperties.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/OrganizationIgnoredProperties.java similarity index 96% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/OrganizationIgnoredProperties.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/OrganizationIgnoredProperties.java index 3212fb66..2a87622f 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/OrganizationIgnoredProperties.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/OrganizationIgnoredProperties.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.dsm.domain; import java.util.Date; import java.util.Set; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/RegisteredDatasourceInfo.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/RegisteredDatasourceInfo.java similarity index 98% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/RegisteredDatasourceInfo.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/RegisteredDatasourceInfo.java index 5bd17cc2..620194d7 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/RegisteredDatasourceInfo.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/RegisteredDatasourceInfo.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.dsm.domain; public class RegisteredDatasourceInfo { diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/RequestFilter.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/RequestFilter.java similarity index 91% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/RequestFilter.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/RequestFilter.java index fe160844..6763fb3c 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/RequestFilter.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/RequestFilter.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.dsm.domain; import java.util.HashMap; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/RequestSort.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/RequestSort.java similarity index 79% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/RequestSort.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/RequestSort.java index bf0c0cbd..15ae1744 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/RequestSort.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/RequestSort.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.dsm.domain; import com.fasterxml.jackson.annotation.JsonAutoDetect; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/RequestSortOrder.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/RequestSortOrder.java similarity index 76% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/RequestSortOrder.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/RequestSortOrder.java index 2423a991..34e92397 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/RequestSortOrder.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/RequestSortOrder.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.dsm.domain; import com.fasterxml.jackson.annotation.JsonAutoDetect; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/Response.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/Response.java similarity index 92% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/Response.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/Response.java index abba2c54..0b5e9f4b 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/Response.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/Response.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.dsm.domain; import com.fasterxml.jackson.annotation.JsonAutoDetect; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/SimpleDatasourceInfo.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/SimpleDatasourceInfo.java similarity index 98% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/SimpleDatasourceInfo.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/SimpleDatasourceInfo.java index 997f3894..833e6fb3 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/SimpleDatasourceInfo.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/SimpleDatasourceInfo.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.dsm.domain; import java.util.LinkedHashMap; import java.util.Map; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/SimpleResponse.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/SimpleResponse.java similarity index 89% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/SimpleResponse.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/SimpleResponse.java index 73381faf..589b8b63 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/SimpleResponse.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/SimpleResponse.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.dsm.domain; import java.util.List; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/TransformationInfo.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/TransformationInfo.java similarity index 81% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/TransformationInfo.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/TransformationInfo.java index 5e5c425a..f3522d37 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/domain/TransformationInfo.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/domain/TransformationInfo.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.domain; +package eu.dnetlib.dsm.domain; import com.fasterxml.jackson.annotation.JsonAutoDetect; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/utils/DatasourceSpecs.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/utils/DatasourceSpecs.java similarity index 95% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/utils/DatasourceSpecs.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/utils/DatasourceSpecs.java index 7a6b4f2d..27d33d2f 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/utils/DatasourceSpecs.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/utils/DatasourceSpecs.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.utils; +package eu.dnetlib.dsm.utils; import java.util.Arrays; import java.util.List; @@ -18,10 +18,10 @@ import org.springframework.data.jpa.domain.Specification; import eu.dnetlib.data.openaire.dsm.model.Datasource; import eu.dnetlib.data.openaire.dsm.model.view.ApiWithAdditionalInfo; -import eu.dnetlib.openaire.dsm.domain.FilterName; -import eu.dnetlib.openaire.dsm.domain.RequestFilter; -import eu.dnetlib.openaire.dsm.domain.RequestSort; -import eu.dnetlib.openaire.dsm.domain.RequestSortOrder; +import eu.dnetlib.dsm.domain.FilterName; +import eu.dnetlib.dsm.domain.RequestFilter; +import eu.dnetlib.dsm.domain.RequestSort; +import eu.dnetlib.dsm.domain.RequestSortOrder; public class DatasourceSpecs { diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/utils/DsmBrowsableFields.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/utils/DsmBrowsableFields.java similarity index 91% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/utils/DsmBrowsableFields.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/utils/DsmBrowsableFields.java index e150d4f2..e8c16d9b 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/utils/DsmBrowsableFields.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/utils/DsmBrowsableFields.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.utils; +package eu.dnetlib.dsm.utils; public enum DsmBrowsableFields { diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/utils/DsmMappingUtils.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/utils/DsmMappingUtils.java similarity index 95% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/utils/DsmMappingUtils.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/utils/DsmMappingUtils.java index 9fdadf4a..b23edc63 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/utils/DsmMappingUtils.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/utils/DsmMappingUtils.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.utils; +package eu.dnetlib.dsm.utils; import java.sql.Date; import java.util.HashSet; @@ -17,11 +17,11 @@ import com.fasterxml.jackson.databind.ObjectMapper; import eu.dnetlib.data.openaire.dsm.model.Api; import eu.dnetlib.data.openaire.dsm.model.Datasource; import eu.dnetlib.data.openaire.dsm.model.Organization; -import eu.dnetlib.openaire.dsm.domain.ApiDetails; -import eu.dnetlib.openaire.dsm.domain.DatasourceDetails; -import eu.dnetlib.openaire.dsm.domain.DatasourceDetailsUpdate; -import eu.dnetlib.openaire.dsm.domain.DatasourceSnippetExtended; -import eu.dnetlib.openaire.dsm.domain.OrganizationDetails; +import eu.dnetlib.dsm.domain.ApiDetails; +import eu.dnetlib.dsm.domain.DatasourceDetails; +import eu.dnetlib.dsm.domain.DatasourceDetailsUpdate; +import eu.dnetlib.dsm.domain.DatasourceSnippetExtended; +import eu.dnetlib.dsm.domain.OrganizationDetails; public class DsmMappingUtils { diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/utils/ResponseUtils.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/utils/ResponseUtils.java similarity index 71% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/utils/ResponseUtils.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/utils/ResponseUtils.java index 67af7922..daee11b6 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/utils/ResponseUtils.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/utils/ResponseUtils.java @@ -1,20 +1,20 @@ -package eu.dnetlib.openaire.dsm.utils; +package eu.dnetlib.dsm.utils; import java.util.List; import java.util.Queue; import com.google.common.collect.Lists; -import eu.dnetlib.openaire.dsm.domain.ApiDetails; -import eu.dnetlib.openaire.dsm.domain.ApiDetailsResponse; -import eu.dnetlib.openaire.dsm.domain.DatasourceDetailResponse; -import eu.dnetlib.openaire.dsm.domain.DatasourceDetails; -import eu.dnetlib.openaire.dsm.domain.DatasourceInfo; -import eu.dnetlib.openaire.dsm.domain.DatasourceSearchResponse; -import eu.dnetlib.openaire.dsm.domain.DatasourceSnippetExtended; -import eu.dnetlib.openaire.dsm.domain.DatasourceSnippetResponse; -import eu.dnetlib.openaire.dsm.domain.Header; -import eu.dnetlib.openaire.dsm.domain.SimpleResponse; +import eu.dnetlib.dsm.domain.ApiDetails; +import eu.dnetlib.dsm.domain.ApiDetailsResponse; +import eu.dnetlib.dsm.domain.DatasourceDetailResponse; +import eu.dnetlib.dsm.domain.DatasourceDetails; +import eu.dnetlib.dsm.domain.DatasourceInfo; +import eu.dnetlib.dsm.domain.DatasourceSearchResponse; +import eu.dnetlib.dsm.domain.DatasourceSnippetExtended; +import eu.dnetlib.dsm.domain.DatasourceSnippetResponse; +import eu.dnetlib.dsm.domain.Header; +import eu.dnetlib.dsm.domain.SimpleResponse; public class ResponseUtils { diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/utils/VocabularyClient.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/utils/VocabularyClient.java similarity index 93% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/utils/VocabularyClient.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/utils/VocabularyClient.java index 2c892149..933580a8 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/utils/VocabularyClient.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/utils/VocabularyClient.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.utils; +package eu.dnetlib.dsm.utils; import org.springframework.stereotype.Component; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/utils/WfLoggerClient.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/utils/WfLoggerClient.java similarity index 89% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/utils/WfLoggerClient.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/utils/WfLoggerClient.java index 22e70180..54fdb296 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/openaire/dsm/utils/WfLoggerClient.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/utils/WfLoggerClient.java @@ -1,4 +1,4 @@ -package eu.dnetlib.openaire.dsm.utils; +package eu.dnetlib.dsm.utils; import java.util.List; @@ -7,8 +7,8 @@ import org.apache.commons.logging.LogFactory; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; +import eu.dnetlib.dsm.domain.AggregationInfo; import eu.dnetlib.is.errors.DsmException; -import eu.dnetlib.openaire.dsm.domain.AggregationInfo; /** * Created by claudio on 20/10/2016. diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/MainAjaxController.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/is/common/MainAjaxController.java similarity index 96% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/is/MainAjaxController.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/is/common/MainAjaxController.java index aea360e2..2f7a0efb 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/MainAjaxController.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/is/common/MainAjaxController.java @@ -1,4 +1,4 @@ -package eu.dnetlib.is; +package eu.dnetlib.is.common; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/SwaggerController.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/is/common/SwaggerController.java similarity index 91% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/is/SwaggerController.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/is/common/SwaggerController.java index c71ebffe..d1b22a4b 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/SwaggerController.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/is/common/SwaggerController.java @@ -1,4 +1,4 @@ -package eu.dnetlib.is; +package eu.dnetlib.is.common; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/apps/dnet-is-application/src/main/resources/static/index.html b/apps/dnet-is-application/src/main/resources/static/index.html index 9f0462fa..052e4089 100644 --- a/apps/dnet-is-application/src/main/resources/static/index.html +++ b/apps/dnet-is-application/src/main/resources/static/index.html @@ -105,7 +105,18 @@ + - + + + + + + + + + + + \ No newline at end of file diff --git a/apps/dnet-is-application/src/main/resources/static/js/ctx_ctrls.js b/apps/dnet-is-application/src/main/resources/static/js/ctx_ctrls.js new file mode 100644 index 00000000..d9312c1f --- /dev/null +++ b/apps/dnet-is-application/src/main/resources/static/js/ctx_ctrls.js @@ -0,0 +1,99 @@ +app.controller('ctxListController', function($scope, $http) { + $scope.contexts = []; + $scope.tmpCtx = {}; + $scope.mode = ''; + + call_http_get($http, './ajax/contexts/?' + $.now(), function(res) { + $scope.contexts = res.data; + }); + + $scope.prepareNewCtx = function() { + $scope.mode = 'new'; + $scope.tmpCtx = { + 'id' : '', + 'label' : '', + 'type' : '', + 'parameters' : [] + }; + } + + $scope.prepareEditCtx = function(ctx) { + $scope.mode = 'edit'; + $scope.tmpCtx = angular.copy(ctx); + } + + $scope.saveContext = function(ctx) { + if ($scope.mode == 'new') { + var found = false; + + angular.forEach($scope.contexts, function(v) { + if (ctx.id == ctx.id) { found = true; }; + }); + + if (found) { + alert("Insertion failed: context already exists !"); + return; + } + } + + json_http_post($http,'./ajax/contexts/?' + $.now(), ctx, function(res) { + $scope.contexts = res.data; + alert("Context saved"); + }); + }; + + $scope.deleteContext = function(id) { + if (confirm("Are you sure ?")) { + call_http_delete($http, './ajax/contexts/' + encodeURIComponent(id) + '?' + $.now(), function(res) { + $scope.contexts = res.data; + alert("Context deleted"); + }); + } + }; + +}); + +// ---------------------------------------------------- + +app.controller('ctxViewerController', function($scope, $http, $routeParams) { + $scope.ctxId = $routeParams.id; + $scope.ctxInfo = {}; + $scope.categories = []; + $scope.parameters = []; + + var url = './ajax/contexts/' + encodeURIComponent($scope.ctxId); + + call_http_get($http, url + '?' + $.now(), function(res) { + $scope.ctxInfo = res.data; + + call_http_get($http, url + '/categories?' + $.now(), function(res) { + $scope.categories = res.data; + }); + }); + + $scope.loadContextParameters = function() { + $scope.parameters = []; + call_http_get($http, './ajax/contexts/' + encodeURIComponent($scope.ctxId) + '?' + $.now(), function(res) { + $scope.parameters = res.data.parameters; + }); + } + + $scope.populateNode = function(level, node) { + $scope.url = './ajax/contexts/' + + encodeURIComponent(level) + + '/' + + encodeURIComponent(node.id) + + '/concepts'; + + node.populated = true; + + call_http_get($http, $scope.url + '?' + $.now(), function(res) { + node.concepts = res.data; + }); + } + + $scope.initShowParameters = function(params) { + $scope.parameters = params; + } + +}); diff --git a/apps/dnet-is-application/src/main/resources/static/js/dsm_ctrls.js b/apps/dnet-is-application/src/main/resources/static/js/dsm_ctrls.js new file mode 100644 index 00000000..6dcce434 --- /dev/null +++ b/apps/dnet-is-application/src/main/resources/static/js/dsm_ctrls.js @@ -0,0 +1,107 @@ +app.controller('dsmSearchController', function($scope, $http, $location, $timeout) { + $scope.browseFieldId = ""; + $scope.browseFieldName = ""; + $scope.browseData = []; + + $scope.browsableFields = []; + + call_http_get($http, './ajax/dsm/browsableFields' , function(res) { + $scope.browsableFields = res.data; + }); + + $scope.browseField = function(id, label) { + $scope.browseFieldId = id; + $scope.browseFieldName = name; + $scope.browseData = []; + + call_http_get($http, './ajax/dsm/browse/' + encodeURIComponent(id) + '?' + $.now(), function(res) { + $scope.browseData = res.data; + }); + } + + $scope.search = function(field, value) { + var path = "/dsm/results"; + if (field) { path += '/' + encodeURIComponent(field); } + path += '/0/100'; + + $timeout(function() { + $location.path(path).search('value', value); + }, 1000); + } +}); + +// ---------------------------------------------------- + +app.controller('dsmResultsController', function($scope, $http, $location, $routeParams) { + $scope.field = $routeParams.field; + $scope.value = $routeParams.value; + $scope.pageSize = $routeParams.size; + $scope.currPage = $routeParams.page; + + $scope.nResults = 0; + $scope.results = []; + $scope.nPages = 0; + + var url = './ajax/dsm/'; + if ($scope.field) { url += 'searchByField/' + encodeURIComponent($scope.field); } + else { url += 'search' } + url += '/' + $scope.currPage + '/' + $scope.pageSize; + url += '?value=' + encodeURIComponent($scope.value) + '&' + $.now(); + + call_http_get($http, url, function(res) { + $scope.results = res.data.content; + $scope.nResults = res.data.totalElements; + $scope.currPage = res.data.number; + $scope.nPages = res.data.totalPages; + }); + + $scope.gotoPage = function(page) { + $scope.results = []; + var path = "/dsm/results"; + if ($scope.field) { path += '/' + encodeURIComponent($scope.field); } + path += '/' + page + '/' + $scope.pageSize; + $location.path(path).search('value', $scope.value); + } + +}); + +// ---------------------------------------------------- + +app.controller('dsmApiController', function($scope, $http, $routeParams) { + $scope.apiId = $routeParams.id; + $scope.api = {}; + + call_http_get($http, './ajax/dsm/api?id=' + encodeURIComponent($scope.apiId) , function(res) { + $scope.api = res.data; + }); + +}); + +// ---------------------------------------------------- + +app.controller('dsmAddApiController', function($scope, $http, $routeParams) { + $scope.dsName = $routeParams.dsName; + $scope.prefix = 'api_________::' + $routeParams.dsId + '::'; + $scope.api = {} + + $scope.protocols = []; + $scope.compatibilityLevels = []; + $scope.contentDescTypes = []; + + call_http_get($http, './ajax/dsm/browsableFields' , function(res) { + $scope.protocols = res.data.protocols; + $scope.compatibilityLevels = res.data.compatibilityLevels; + $scope.contentDescTypes = res.data.contentDescTypes; + }); + + $scope.save = function() { + var record = angular.copy($scope.api); + record.id = $scope.prefix + record.id; + record.datasource = $routeParams.dsId; + + json_http_post($http, './ajax/dsm/api', record, function(res) { + $scope.api = res.data; + }); + } + +}); diff --git a/apps/dnet-is-application/src/main/resources/static/js/is_main.js b/apps/dnet-is-application/src/main/resources/static/js/is_main.js index 18289c65..5cee5777 100644 --- a/apps/dnet-is-application/src/main/resources/static/js/is_main.js +++ b/apps/dnet-is-application/src/main/resources/static/js/is_main.js @@ -19,564 +19,3 @@ app.config(['$routeProvider', function($routeProvider) { } ]); -app.controller('isMenuController', function($scope, $http) { - $scope.resTypes = []; - - call_http_get($http, './ajax/resourceTypes' , function(res) { - $scope.resTypes = res.data; - }); -}); - - -// ---------------------------------------------------- - -app.controller('infoController', function($scope, $http) { - $scope.info = []; - - call_http_get($http, './ajax/info/?' + $.now(), function(res) { - angular.forEach(res.data, function(section) { - if (section.name != 'Modules') { - angular.forEach(section.data, function(r) { - if (r.k.toLowerCase().endsWith('path') || r.k.toLowerCase().endsWith('.dirs')) { - r.v = r.v.replaceAll(':', ':\n'); - } - }); - } - }); - $scope.info = res.data; - }); -}); - -// ---------------------------------------------------- - -app.controller('wfHistoryController', function($scope, $http, $routeParams) { - $scope.fromDate = $routeParams.from; - $scope.toDate = $routeParams.to; - $scope.maxNumberOfRecentWfs = $routeParams.total; - - $scope.workflows = []; - $scope.currentWf = {}; - $scope.currDetailsKey = ''; - $scope.currDetailsValue = ''; - $scope.sortField = 'processId'; - $scope.sortReverse = false; - - $scope.reload = function() { - var url = './ajax/wfs/?' + $.now(); - - url += "&total=" + $scope.maxNumberOfRecentWfs; - - if ($scope.fromDate > 0) { url += "&from=" + $scope.fromDate; } - if ($scope.toDate > 0) { url += "&to=" + $scope.toDate; } - - call_http_get($http, url, function(res) { - $scope.workflows = res.data; - }); - }; - - $scope.setCurrentWf = function(wf) { - $scope.currentWf = angular.copy(wf); - $scope.currDetailsKey = ''; - $scope.currDetailsValue = ''; - $scope.currentWf.arrayDetails = []; - $scope.currentWf.duration = $scope.calculateDateDiff(parseInt(wf.details['system:startDate']), parseInt(wf.details['system:endDate'])); - - angular.forEach(wf.details, function(v,k) { - $scope.currentWf.arrayDetails.push({'k':k, 'v':v}); - }); - } - - $scope.setCurrentDetailParam = function(k, v) { - $scope.currDetailsKey = k; - $scope.currDetailsValue = v; - } - - - $scope.calculateDateDiff = function(start, end) { - if (start <= 0 || end <= 0) { - return '-'; - } - var seconds = 0; - var minutes = 0; - var hours = 0; - var days = 0; - - if (end > start) { - seconds = Math.round((end - start) / 1000); - if (seconds > 60) { - minutes = Math.floor(seconds / 60); - seconds = seconds % 60; - if (minutes > 60) { - hours = Math.floor(minutes / 60); - minutes = minutes % 60; - if (hours > 24) { - days = Math.floor(hours / 24); - hours = hours % 24; - } - } - } - } - var res = ''; - if (days > 0) { - if (res) { res += ', '; } - res += days + " day(s)" - } - if (hours > 0) { - if (res) { res += ', '; } - res += hours + " hour(s)" - } - if (minutes > 0) { - if (res) { res += ', '; } - res += minutes + " minute(s)" - } - if (seconds > 0) { - if (res) { res += ', '; } - res += seconds + " second(s)" - } - if (!res) { - res = '0 seconds'; - } - - return res; - } - - $scope.reload(); -}); - -// ---------------------------------------------------- - -app.controller('resourcesController', function($scope, $http, $routeParams, $location) { - $scope.resources = []; - $scope.tmpRes = {}; - $scope.tmpContent = "loading..."; - $scope.type = $routeParams.type; - $scope.typeDesc = {}; - - $scope.reload = function() { - call_http_get($http, './ajax/resourceTypes/' + encodeURIComponent($scope.type) + '?' + $.now(), function(res) { - $scope.typeDesc = res.data; - }); - - call_http_get($http, './ajax/resources/' + encodeURIComponent($scope.type) + '?' + $.now(), function(res) { - $scope.resources = res.data; - }); - }; - - $scope.prepareNewResource = function() { - $scope.tmpRes = { - 'name' : '', - 'description' : '', - 'content' : '' - }; - } - - $scope.prepareEditMetadata = function(r) { - $scope.tmpRes = angular.copy(r); - } - - $scope.prepareEditContent = function(r) { - $scope.tmpRes = angular.copy(r); - $scope.tmpContent = "loading..."; - call_http_get($http, './ajax/resources/' + encodeURIComponent(r.id) + '/content?' + $.now(), function(res) { - if (res.data instanceof Object) { - $scope.tmpContent = JSON.stringify(res.data, null, "\t"); - } else { - $scope.tmpContent = res.data; - } - }); - } - - $scope.createNewResource = function(r) { - params_http_post($http, './ajax/resources/?' + $.now(), $.param({ - 'name' : r.name, - 'type' : $scope.type, - 'description' : r.description, - 'content' : r.content - }), function(res) { - alert("Resource saved"); - $('#newResourceModal').modal('hide'); - $scope.reload(); - }); - } - - $scope.saveMetadata = function(id, md) { - json_http_post($http, './ajax/resources/' + encodeURIComponent(id) + '/metadata?' + $.now(), md, function(res) { - alert("Resource saved"); - $scope.reload(); - }); - }; - - $scope.saveContent = function(id, content) { - params_http_post($http, './ajax/resources/' + encodeURIComponent(id) + '/content?' + $.now(), $.param({ - 'content' : content - }), function(res) { - alert("Resource saved"); - $('#editContentModal').modal('hide'); - }); - }; - - $scope.deleteResource = function(r) { - if (confirm("Are you sure ?")) { - call_http_delete($http, './ajax/resources/' + encodeURIComponent(r.id) + '?' + $.now(), function(res) { - alert("Resource deleted"); - $scope.reload(); - }); - } - }; - - if ($scope.type == 'context') { $location.url("/contexts"); } - else if ($scope.type == 'vocabulary') { $location.url("/vocs"); } - else if ($scope.type == 'protocol') { $location.url("/protocols"); } - else { $scope.reload(); } -}); - -// ---------------------------------------------------- - -app.controller('protocolsController', function($scope, $http) { - $scope.protocols = []; - - call_http_get($http, './ajax/protocols/?' + $.now(), function(res) { - $scope.protocols = res.data; - }); -}); - -// ---------------------------------------------------- - -app.controller('ctxListController', function($scope, $http) { - $scope.contexts = []; - $scope.tmpCtx = {}; - $scope.mode = ''; - - call_http_get($http, './ajax/contexts/?' + $.now(), function(res) { - $scope.contexts = res.data; - }); - - $scope.prepareNewCtx = function() { - $scope.mode = 'new'; - $scope.tmpCtx = { - 'id' : '', - 'label' : '', - 'type' : '', - 'parameters' : [] - }; - } - - $scope.prepareEditCtx = function(ctx) { - $scope.mode = 'edit'; - $scope.tmpCtx = angular.copy(ctx); - } - - $scope.saveContext = function(ctx) { - if ($scope.mode == 'new') { - var found = false; - - angular.forEach($scope.contexts, function(v) { - if (ctx.id == ctx.id) { found = true; }; - }); - - if (found) { - alert("Insertion failed: context already exists !"); - return; - } - } - - json_http_post($http,'./ajax/contexts/?' + $.now(), ctx, function(res) { - $scope.contexts = res.data; - alert("Context saved"); - }); - }; - - $scope.deleteContext = function(id) { - if (confirm("Are you sure ?")) { - call_http_delete($http, './ajax/contexts/' + encodeURIComponent(id) + '?' + $.now(), function(res) { - $scope.contexts = res.data; - alert("Context deleted"); - }); - } - }; - -}); - -// ---------------------------------------------------- - -app.controller('ctxViewerController', function($scope, $http, $routeParams) { - $scope.ctxId = $routeParams.id; - $scope.ctxInfo = {}; - $scope.categories = []; - $scope.parameters = []; - - var url = './ajax/contexts/' + encodeURIComponent($scope.ctxId); - - call_http_get($http, url + '?' + $.now(), function(res) { - $scope.ctxInfo = res.data; - - call_http_get($http, url + '/categories?' + $.now(), function(res) { - $scope.categories = res.data; - }); - }); - - $scope.loadContextParameters = function() { - $scope.parameters = []; - call_http_get($http, './ajax/contexts/' + encodeURIComponent($scope.ctxId) + '?' + $.now(), function(res) { - $scope.parameters = res.data.parameters; - }); - } - - $scope.populateNode = function(level, node) { - $scope.url = './ajax/contexts/' - + encodeURIComponent(level) - + '/' - + encodeURIComponent(node.id) - + '/concepts'; - - node.populated = true; - - call_http_get($http, $scope.url + '?' + $.now(), function(res) { - node.concepts = res.data; - }); - } - - $scope.initShowParameters = function(params) { - $scope.parameters = params; - } - -}); - -// ---------------------------------------------------- - -app.controller('vocListController', function($scope, $http) { - $scope.vocabularies = []; - $scope.tmpVoc = {}; - $scope.mode = ''; - - call_http_get($http, './ajax/vocs/?' + $.now(), function(res) { - $scope.vocabularies = res.data; - }); - - $scope.prepareNewVoc = function() { - $scope.mode = 'new'; - $scope.tmpVoc = { - 'id' : '', - 'name' : '', - 'description' : '' - }; - } - - $scope.prepareEditVoc = function(voc) { - $scope.mode = 'edit'; - $scope.tmpVoc = angular.copy(voc); - } - - $scope.saveVocabulary = function(voc) { - if ($scope.mode == 'new') { - var found = false; - - angular.forEach($scope.vocabularies, function(v) { - if (voc.id == v.id) { found = true; }; - }); - - if (found) { - alert("Insertion failed: vocabulary already exists !"); - return; - } - } - - json_http_post($http, './ajax/vocs/?' + $.now(), voc, function(res) { - $scope.vocabularies = res.data; - alert("Vocabulary saved"); - }); - }; - - $scope.deleteVocabulary = function(id) { - if (confirm("Are you sure ?")) { - call_http_delete($http, './ajax/vocs/' + encodeURIComponent(id) + '?' + $.now(), function(res) { - $scope.vocabularies = res.data; - alert("Vocabulary deleted"); - }); - } - }; -}); - -// ---------------------------------------------------- - -app.controller('vocEditorController', function($scope, $http, $routeParams) { - $scope.terms = []; - $scope.vocId = $routeParams.id; - $scope.vocInfo = {}; - $scope.editTermCode = ''; - $scope.tmpTerm = {}; - $scope.mode = ''; - $scope.currTerm = []; - - $scope.baseUrl = './ajax/vocs/' + encodeURIComponent($scope.vocId); - - call_http_get($http, $scope.baseUrl + '?' + $.now(), function(res) { - $scope.vocInfo = res.data; - - call_http_get($http, $scope.baseUrl + '/terms?' + $.now(), function(res) { - $scope.terms = res.data; - }); - }); - - $scope.setCurrTerm = function(term) { - $scope.currTerm = angular.copy(term); - } - - $scope.prepareNewTerm = function() { - $scope.mode = 'new'; - $scope.editTermCode = ''; - $scope.tmpTerm = { - 'code' : '', - 'name' : '', - 'encoding' : 'OPENAIRE', - 'synonyms' : [] - }; - } - - $scope.prepareEditTerm = function(term) { - $scope.mode = 'edit'; - $scope.editTermCode = term.code; - $scope.tmpTerm = angular.copy(term); - } - - - $scope.saveTerm = function(term) { - var url = $scope.baseUrl + '/terms?' + $.now(); - - json_http_post($http, url, term, function(res) { - if ($scope.editTermCode != '' && $scope.editTermCode != $scope.tmpTerm.code) { - var deleteUrl = $scope.baseUrl + '/terms/' + encodeURIComponent($scope.editTermCode) + '?' + $.now(); - call_http_delete($http, deleteUrl, function(res) { - $scope.terms = res.data; - alert("Term replaced"); - }); - } else { - $scope.terms = res.data; - alert("Term saved"); - } - }); - }; - - $scope.deleteTerm = function(code) { - if (confirm("Are you sure ?")) { - var url = $scope.baseUrl + '/terms/' + encodeURIComponent(code) + '?' + $.now(); - - call_http_delete($http, url, function(res) { - $scope.terms = res.data; - alert("Term deleted"); - }); - } - }; - -}); - -// ---------------------------------------------------- - -app.controller('dsmSearchController', function($scope, $http, $location, $timeout) { - $scope.browseFieldId = ""; - $scope.browseFieldName = ""; - $scope.browseData = []; - - $scope.browsableFields = []; - - call_http_get($http, './ajax/dsm/browsableFields' , function(res) { - $scope.browsableFields = res.data; - }); - - $scope.browseField = function(id, label) { - $scope.browseFieldId = id; - $scope.browseFieldName = name; - $scope.browseData = []; - - call_http_get($http, './ajax/dsm/browse/' + encodeURIComponent(id) + '?' + $.now(), function(res) { - $scope.browseData = res.data; - }); - } - - $scope.search = function(field, value) { - var path = "/dsm/results"; - if (field) { path += '/' + encodeURIComponent(field); } - path += '/0/100'; - - $timeout(function() { - $location.path(path).search('value', value); - }, 1000); - } -}); - -// ---------------------------------------------------- - -app.controller('dsmResultsController', function($scope, $http, $location, $routeParams) { - $scope.field = $routeParams.field; - $scope.value = $routeParams.value; - $scope.pageSize = $routeParams.size; - $scope.currPage = $routeParams.page; - - $scope.nResults = 0; - $scope.results = []; - $scope.nPages = 0; - - var url = './ajax/dsm/'; - if ($scope.field) { url += 'searchByField/' + encodeURIComponent($scope.field); } - else { url += 'search' } - url += '/' + $scope.currPage + '/' + $scope.pageSize; - url += '?value=' + encodeURIComponent($scope.value) + '&' + $.now(); - - call_http_get($http, url, function(res) { - $scope.results = res.data.content; - $scope.nResults = res.data.totalElements; - $scope.currPage = res.data.number; - $scope.nPages = res.data.totalPages; - }); - - $scope.gotoPage = function(page) { - $scope.results = []; - var path = "/dsm/results"; - if ($scope.field) { path += '/' + encodeURIComponent($scope.field); } - path += '/' + page + '/' + $scope.pageSize; - $location.path(path).search('value', $scope.value); - } - -}); - -// ---------------------------------------------------- - -app.controller('dsmApiController', function($scope, $http, $routeParams) { - $scope.apiId = $routeParams.id; - $scope.api = {}; - - call_http_get($http, './ajax/dsm/api?id=' + encodeURIComponent($scope.apiId) , function(res) { - $scope.api = res.data; - }); - -}); - -// ---------------------------------------------------- - -app.controller('dsmAddApiController', function($scope, $http, $routeParams) { - $scope.dsName = $routeParams.dsName; - $scope.prefix = 'api_________::' + $routeParams.dsId + '::'; - $scope.api = {} - - $scope.protocols = []; - $scope.compatibilityLevels = []; - $scope.contentDescTypes = []; - - call_http_get($http, './ajax/dsm/browsableFields' , function(res) { - $scope.protocols = res.data.protocols; - $scope.compatibilityLevels = res.data.compatibilityLevels; - $scope.contentDescTypes = res.data.contentDescTypes; - }); - - $scope.save = function() { - var record = angular.copy($scope.api); - record.id = $scope.prefix + record.id; - record.datasource = $routeParams.dsId; - - json_http_post($http, './ajax/dsm/api', record, function(res) { - $scope.api = res.data; - }); - } - -}); - diff --git a/apps/dnet-is-application/src/main/resources/static/js/is_simple_ctrls.js b/apps/dnet-is-application/src/main/resources/static/js/is_simple_ctrls.js new file mode 100644 index 00000000..5bfd08e5 --- /dev/null +++ b/apps/dnet-is-application/src/main/resources/static/js/is_simple_ctrls.js @@ -0,0 +1,36 @@ +app.controller('isMenuController', function($scope, $http) { + $scope.resTypes = []; + + call_http_get($http, './ajax/resourceTypes' , function(res) { + $scope.resTypes = res.data; + }); +}); + +// ---------------------------------------------------- + +app.controller('infoController', function($scope, $http) { + $scope.info = []; + + call_http_get($http, './ajax/info/?' + $.now(), function(res) { + angular.forEach(res.data, function(section) { + if (section.name != 'Modules') { + angular.forEach(section.data, function(r) { + if (r.k.toLowerCase().endsWith('path') || r.k.toLowerCase().endsWith('.dirs')) { + r.v = r.v.replaceAll(':', ':\n'); + } + }); + } + }); + $scope.info = res.data; + }); +}); + +// ---------------------------------------------------- + +app.controller('protocolsController', function($scope, $http) { + $scope.protocols = []; + + call_http_get($http, './ajax/protocols/?' + $.now(), function(res) { + $scope.protocols = res.data; + }); +}); diff --git a/apps/dnet-is-application/src/main/resources/static/js/res_ctrls.js b/apps/dnet-is-application/src/main/resources/static/js/res_ctrls.js new file mode 100644 index 00000000..076e971f --- /dev/null +++ b/apps/dnet-is-application/src/main/resources/static/js/res_ctrls.js @@ -0,0 +1,84 @@ +app.controller('resourcesController', function($scope, $http, $routeParams, $location) { + $scope.resources = []; + $scope.tmpRes = {}; + $scope.tmpContent = "loading..."; + $scope.type = $routeParams.type; + $scope.typeDesc = {}; + + $scope.reload = function() { + call_http_get($http, './ajax/resourceTypes/' + encodeURIComponent($scope.type) + '?' + $.now(), function(res) { + $scope.typeDesc = res.data; + }); + + call_http_get($http, './ajax/resources/' + encodeURIComponent($scope.type) + '?' + $.now(), function(res) { + $scope.resources = res.data; + }); + }; + + $scope.prepareNewResource = function() { + $scope.tmpRes = { + 'name' : '', + 'description' : '', + 'content' : '' + }; + } + + $scope.prepareEditMetadata = function(r) { + $scope.tmpRes = angular.copy(r); + } + + $scope.prepareEditContent = function(r) { + $scope.tmpRes = angular.copy(r); + $scope.tmpContent = "loading..."; + call_http_get($http, './ajax/resources/' + encodeURIComponent(r.id) + '/content?' + $.now(), function(res) { + if (res.data instanceof Object) { + $scope.tmpContent = JSON.stringify(res.data, null, "\t"); + } else { + $scope.tmpContent = res.data; + } + }); + } + + $scope.createNewResource = function(r) { + params_http_post($http, './ajax/resources/?' + $.now(), $.param({ + 'name' : r.name, + 'type' : $scope.type, + 'description' : r.description, + 'content' : r.content + }), function(res) { + alert("Resource saved"); + $('#newResourceModal').modal('hide'); + $scope.reload(); + }); + } + + $scope.saveMetadata = function(id, md) { + json_http_post($http, './ajax/resources/' + encodeURIComponent(id) + '/metadata?' + $.now(), md, function(res) { + alert("Resource saved"); + $scope.reload(); + }); + }; + + $scope.saveContent = function(id, content) { + params_http_post($http, './ajax/resources/' + encodeURIComponent(id) + '/content?' + $.now(), $.param({ + 'content' : content + }), function(res) { + alert("Resource saved"); + $('#editContentModal').modal('hide'); + }); + }; + + $scope.deleteResource = function(r) { + if (confirm("Are you sure ?")) { + call_http_delete($http, './ajax/resources/' + encodeURIComponent(r.id) + '?' + $.now(), function(res) { + alert("Resource deleted"); + $scope.reload(); + }); + } + }; + + if ($scope.type == 'context') { $location.url("/contexts"); } + else if ($scope.type == 'vocabulary') { $location.url("/vocs"); } + else if ($scope.type == 'protocol') { $location.url("/protocols"); } + else { $scope.reload(); } +}); diff --git a/apps/dnet-is-application/src/main/resources/static/js/voc_ctrls.js b/apps/dnet-is-application/src/main/resources/static/js/voc_ctrls.js new file mode 100644 index 00000000..0ecb730b --- /dev/null +++ b/apps/dnet-is-application/src/main/resources/static/js/voc_ctrls.js @@ -0,0 +1,125 @@ +app.controller('vocListController', function($scope, $http) { + $scope.vocabularies = []; + $scope.tmpVoc = {}; + $scope.mode = ''; + + call_http_get($http, './ajax/vocs/?' + $.now(), function(res) { + $scope.vocabularies = res.data; + }); + + $scope.prepareNewVoc = function() { + $scope.mode = 'new'; + $scope.tmpVoc = { + 'id' : '', + 'name' : '', + 'description' : '' + }; + } + + $scope.prepareEditVoc = function(voc) { + $scope.mode = 'edit'; + $scope.tmpVoc = angular.copy(voc); + } + + $scope.saveVocabulary = function(voc) { + if ($scope.mode == 'new') { + var found = false; + + angular.forEach($scope.vocabularies, function(v) { + if (voc.id == v.id) { found = true; }; + }); + + if (found) { + alert("Insertion failed: vocabulary already exists !"); + return; + } + } + + json_http_post($http, './ajax/vocs/?' + $.now(), voc, function(res) { + $scope.vocabularies = res.data; + alert("Vocabulary saved"); + }); + }; + + $scope.deleteVocabulary = function(id) { + if (confirm("Are you sure ?")) { + call_http_delete($http, './ajax/vocs/' + encodeURIComponent(id) + '?' + $.now(), function(res) { + $scope.vocabularies = res.data; + alert("Vocabulary deleted"); + }); + } + }; +}); + +// ---------------------------------------------------- + +app.controller('vocEditorController', function($scope, $http, $routeParams) { + $scope.terms = []; + $scope.vocId = $routeParams.id; + $scope.vocInfo = {}; + $scope.editTermCode = ''; + $scope.tmpTerm = {}; + $scope.mode = ''; + $scope.currTerm = []; + + $scope.baseUrl = './ajax/vocs/' + encodeURIComponent($scope.vocId); + + call_http_get($http, $scope.baseUrl + '?' + $.now(), function(res) { + $scope.vocInfo = res.data; + + call_http_get($http, $scope.baseUrl + '/terms?' + $.now(), function(res) { + $scope.terms = res.data; + }); + }); + + $scope.setCurrTerm = function(term) { + $scope.currTerm = angular.copy(term); + } + + $scope.prepareNewTerm = function() { + $scope.mode = 'new'; + $scope.editTermCode = ''; + $scope.tmpTerm = { + 'code' : '', + 'name' : '', + 'encoding' : 'OPENAIRE', + 'synonyms' : [] + }; + } + + $scope.prepareEditTerm = function(term) { + $scope.mode = 'edit'; + $scope.editTermCode = term.code; + $scope.tmpTerm = angular.copy(term); + } + + + $scope.saveTerm = function(term) { + var url = $scope.baseUrl + '/terms?' + $.now(); + + json_http_post($http, url, term, function(res) { + if ($scope.editTermCode != '' && $scope.editTermCode != $scope.tmpTerm.code) { + var deleteUrl = $scope.baseUrl + '/terms/' + encodeURIComponent($scope.editTermCode) + '?' + $.now(); + call_http_delete($http, deleteUrl, function(res) { + $scope.terms = res.data; + alert("Term replaced"); + }); + } else { + $scope.terms = res.data; + alert("Term saved"); + } + }); + }; + + $scope.deleteTerm = function(code) { + if (confirm("Are you sure ?")) { + var url = $scope.baseUrl + '/terms/' + encodeURIComponent(code) + '?' + $.now(); + + call_http_delete($http, url, function(res) { + $scope.terms = res.data; + alert("Term deleted"); + }); + } + }; + +}); diff --git a/apps/dnet-is-application/src/main/resources/static/js/wf_ctrls.js b/apps/dnet-is-application/src/main/resources/static/js/wf_ctrls.js new file mode 100644 index 00000000..e1125fa6 --- /dev/null +++ b/apps/dnet-is-application/src/main/resources/static/js/wf_ctrls.js @@ -0,0 +1,93 @@ +app.controller('wfHistoryController', function($scope, $http, $routeParams) { + $scope.fromDate = $routeParams.from; + $scope.toDate = $routeParams.to; + $scope.maxNumberOfRecentWfs = $routeParams.total; + + $scope.workflows = []; + $scope.currentWf = {}; + $scope.currDetailsKey = ''; + $scope.currDetailsValue = ''; + $scope.sortField = 'processId'; + $scope.sortReverse = false; + + $scope.reload = function() { + var url = './ajax/wfs/?' + $.now(); + + url += "&total=" + $scope.maxNumberOfRecentWfs; + + if ($scope.fromDate > 0) { url += "&from=" + $scope.fromDate; } + if ($scope.toDate > 0) { url += "&to=" + $scope.toDate; } + + call_http_get($http, url, function(res) { + $scope.workflows = res.data; + }); + }; + + $scope.setCurrentWf = function(wf) { + $scope.currentWf = angular.copy(wf); + $scope.currDetailsKey = ''; + $scope.currDetailsValue = ''; + $scope.currentWf.arrayDetails = []; + $scope.currentWf.duration = $scope.calculateDateDiff(parseInt(wf.details['system:startDate']), parseInt(wf.details['system:endDate'])); + + angular.forEach(wf.details, function(v,k) { + $scope.currentWf.arrayDetails.push({'k':k, 'v':v}); + }); + } + + $scope.setCurrentDetailParam = function(k, v) { + $scope.currDetailsKey = k; + $scope.currDetailsValue = v; + } + + + $scope.calculateDateDiff = function(start, end) { + if (start <= 0 || end <= 0) { + return '-'; + } + var seconds = 0; + var minutes = 0; + var hours = 0; + var days = 0; + + if (end > start) { + seconds = Math.round((end - start) / 1000); + if (seconds > 60) { + minutes = Math.floor(seconds / 60); + seconds = seconds % 60; + if (minutes > 60) { + hours = Math.floor(minutes / 60); + minutes = minutes % 60; + if (hours > 24) { + days = Math.floor(hours / 24); + hours = hours % 24; + } + } + } + } + var res = ''; + if (days > 0) { + if (res) { res += ', '; } + res += days + " day(s)" + } + if (hours > 0) { + if (res) { res += ', '; } + res += hours + " hour(s)" + } + if (minutes > 0) { + if (res) { res += ', '; } + res += minutes + " minute(s)" + } + if (seconds > 0) { + if (res) { res += ', '; } + res += seconds + " second(s)" + } + if (!res) { + res = '0 seconds'; + } + + return res; + } + + $scope.reload(); +}); \ No newline at end of file