From d638790c78323608f9ffb55353fa2bfd2f2f7abb Mon Sep 17 00:00:00 2001 From: "michele.artini" Date: Fri, 11 Jun 2021 10:06:03 +0200 Subject: [PATCH] rename of the app, some properties added --- .../pom.xml | 2 +- .../directindex/DirectIndexApiException.java | 0 .../directindex/DirectIndexApplication.java | 12 +------ .../directindex/DirectIndexController.java | 13 ++++---- .../directindex/input/DatasourceEntry.java | 0 .../openaire/directindex/input/PidEntry.java | 0 .../directindex/input/ResultEntry.java | 0 .../directindex/input/ZenodoContextList.java | 0 .../directindex/is/ISLookupClient.java | 0 .../openaire/directindex/is/IndexDsInfo.java | 0 .../mapping/OpenAIRESubmitterUtils.java | 0 .../mapping/XmlRecordConverter.java | 0 .../openaire/directindex/repo/RecordInfo.java | 0 .../repo/RecordInfoRepository.java | 0 .../scheduled/ScheduledActions.java | 0 .../directindex/solr/SolrIndexClient.java | 0 .../solr/SolrIndexClientFactory.java | 0 .../solr/StreamingInputDocumentFactory.java | 0 .../solr/XmlToIndexRecordFactory.java | 0 .../src/main/resources/application.properties | 32 +++++++++++++++++++ .../resources/templates/indexRecord.xml.vm | 0 .../resources/xqueries/findIndexDsInfo.xquery | 0 .../xqueries/findSolrIndexUrl.xquery | 0 .../openaireLayoutToRecordStylesheet.xslt | 0 .../OpenAIRESubmitterUtilsTest.java | 0 .../mapping/XmlRecordConverterTest.java | 0 .../src/test/resources/log4j.properties | 0 .../test/resources/samples/test_record.json | 0 .../samples/test_record_ariadne.json | 0 .../samples/test_record_complete.json | 0 .../samples/test_record_openaireId.json | 0 .../resources/samples/test_record_orp.json | 0 .../samples/test_record_software.json | 0 .../samples/test_record_with_greek_chars.json | 0 .../samples/test_record_wrong_openaireId.json | 0 .../test/resources/samples/test_zenodo.json | 0 .../test_zenodoAmpersandEverywhere.json | 0 .../samples/test_zenodo_community.json | 0 .../samples/test_zenodo_community2.json | 0 .../samples/test_zenodo_problems.json | 0 .../src/main/resources/application.properties | 3 -- apps/pom.xml | 2 +- 42 files changed, 42 insertions(+), 22 deletions(-) rename apps/{dnet-directindex => dnet-directindex-api}/pom.xml (97%) rename apps/{dnet-directindex => dnet-directindex-api}/src/main/java/eu/dnetlib/openaire/directindex/DirectIndexApiException.java (100%) rename apps/{dnet-directindex => dnet-directindex-api}/src/main/java/eu/dnetlib/openaire/directindex/DirectIndexApplication.java (79%) rename apps/{dnet-directindex => dnet-directindex-api}/src/main/java/eu/dnetlib/openaire/directindex/DirectIndexController.java (90%) rename apps/{dnet-directindex => dnet-directindex-api}/src/main/java/eu/dnetlib/openaire/directindex/input/DatasourceEntry.java (100%) rename apps/{dnet-directindex => dnet-directindex-api}/src/main/java/eu/dnetlib/openaire/directindex/input/PidEntry.java (100%) rename apps/{dnet-directindex => dnet-directindex-api}/src/main/java/eu/dnetlib/openaire/directindex/input/ResultEntry.java (100%) rename apps/{dnet-directindex => dnet-directindex-api}/src/main/java/eu/dnetlib/openaire/directindex/input/ZenodoContextList.java (100%) rename apps/{dnet-directindex => dnet-directindex-api}/src/main/java/eu/dnetlib/openaire/directindex/is/ISLookupClient.java (100%) rename apps/{dnet-directindex => dnet-directindex-api}/src/main/java/eu/dnetlib/openaire/directindex/is/IndexDsInfo.java (100%) rename apps/{dnet-directindex => dnet-directindex-api}/src/main/java/eu/dnetlib/openaire/directindex/mapping/OpenAIRESubmitterUtils.java (100%) rename apps/{dnet-directindex => dnet-directindex-api}/src/main/java/eu/dnetlib/openaire/directindex/mapping/XmlRecordConverter.java (100%) rename apps/{dnet-directindex => dnet-directindex-api}/src/main/java/eu/dnetlib/openaire/directindex/repo/RecordInfo.java (100%) rename apps/{dnet-directindex => dnet-directindex-api}/src/main/java/eu/dnetlib/openaire/directindex/repo/RecordInfoRepository.java (100%) rename apps/{dnet-directindex => dnet-directindex-api}/src/main/java/eu/dnetlib/openaire/directindex/scheduled/ScheduledActions.java (100%) rename apps/{dnet-directindex => dnet-directindex-api}/src/main/java/eu/dnetlib/openaire/directindex/solr/SolrIndexClient.java (100%) rename apps/{dnet-directindex => dnet-directindex-api}/src/main/java/eu/dnetlib/openaire/directindex/solr/SolrIndexClientFactory.java (100%) rename apps/{dnet-directindex => dnet-directindex-api}/src/main/java/eu/dnetlib/openaire/directindex/solr/StreamingInputDocumentFactory.java (100%) rename apps/{dnet-directindex => dnet-directindex-api}/src/main/java/eu/dnetlib/openaire/directindex/solr/XmlToIndexRecordFactory.java (100%) create mode 100644 apps/dnet-directindex-api/src/main/resources/application.properties rename apps/{dnet-directindex => dnet-directindex-api}/src/main/resources/templates/indexRecord.xml.vm (100%) rename apps/{dnet-directindex => dnet-directindex-api}/src/main/resources/xqueries/findIndexDsInfo.xquery (100%) rename apps/{dnet-directindex => dnet-directindex-api}/src/main/resources/xqueries/findSolrIndexUrl.xquery (100%) rename apps/{dnet-directindex => dnet-directindex-api}/src/main/resources/xslt/openaireLayoutToRecordStylesheet.xslt (100%) rename apps/{dnet-directindex => dnet-directindex-api}/src/test/java/eu/dnetlib/openaire/directindex/OpenAIRESubmitterUtilsTest.java (100%) rename apps/{dnet-directindex => dnet-directindex-api}/src/test/java/eu/dnetlib/openaire/directindex/mapping/XmlRecordConverterTest.java (100%) rename apps/{dnet-directindex => dnet-directindex-api}/src/test/resources/log4j.properties (100%) rename apps/{dnet-directindex => dnet-directindex-api}/src/test/resources/samples/test_record.json (100%) rename apps/{dnet-directindex => dnet-directindex-api}/src/test/resources/samples/test_record_ariadne.json (100%) rename apps/{dnet-directindex => dnet-directindex-api}/src/test/resources/samples/test_record_complete.json (100%) rename apps/{dnet-directindex => dnet-directindex-api}/src/test/resources/samples/test_record_openaireId.json (100%) rename apps/{dnet-directindex => dnet-directindex-api}/src/test/resources/samples/test_record_orp.json (100%) rename apps/{dnet-directindex => dnet-directindex-api}/src/test/resources/samples/test_record_software.json (100%) rename apps/{dnet-directindex => dnet-directindex-api}/src/test/resources/samples/test_record_with_greek_chars.json (100%) rename apps/{dnet-directindex => dnet-directindex-api}/src/test/resources/samples/test_record_wrong_openaireId.json (100%) rename apps/{dnet-directindex => dnet-directindex-api}/src/test/resources/samples/test_zenodo.json (100%) rename apps/{dnet-directindex => dnet-directindex-api}/src/test/resources/samples/test_zenodoAmpersandEverywhere.json (100%) rename apps/{dnet-directindex => dnet-directindex-api}/src/test/resources/samples/test_zenodo_community.json (100%) rename apps/{dnet-directindex => dnet-directindex-api}/src/test/resources/samples/test_zenodo_community2.json (100%) rename apps/{dnet-directindex => dnet-directindex-api}/src/test/resources/samples/test_zenodo_problems.json (100%) delete mode 100644 apps/dnet-directindex/src/main/resources/application.properties diff --git a/apps/dnet-directindex/pom.xml b/apps/dnet-directindex-api/pom.xml similarity index 97% rename from apps/dnet-directindex/pom.xml rename to apps/dnet-directindex-api/pom.xml index 922075ba..d63b600d 100644 --- a/apps/dnet-directindex/pom.xml +++ b/apps/dnet-directindex-api/pom.xml @@ -11,7 +11,7 @@ 4.0.0 - dnet-directindex + dnet-directindex-api jar diff --git a/apps/dnet-directindex/src/main/java/eu/dnetlib/openaire/directindex/DirectIndexApiException.java b/apps/dnet-directindex-api/src/main/java/eu/dnetlib/openaire/directindex/DirectIndexApiException.java similarity index 100% rename from apps/dnet-directindex/src/main/java/eu/dnetlib/openaire/directindex/DirectIndexApiException.java rename to apps/dnet-directindex-api/src/main/java/eu/dnetlib/openaire/directindex/DirectIndexApiException.java diff --git a/apps/dnet-directindex/src/main/java/eu/dnetlib/openaire/directindex/DirectIndexApplication.java b/apps/dnet-directindex-api/src/main/java/eu/dnetlib/openaire/directindex/DirectIndexApplication.java similarity index 79% rename from apps/dnet-directindex/src/main/java/eu/dnetlib/openaire/directindex/DirectIndexApplication.java rename to apps/dnet-directindex-api/src/main/java/eu/dnetlib/openaire/directindex/DirectIndexApplication.java index e77cd89f..9a0188b7 100644 --- a/apps/dnet-directindex/src/main/java/eu/dnetlib/openaire/directindex/DirectIndexApplication.java +++ b/apps/dnet-directindex-api/src/main/java/eu/dnetlib/openaire/directindex/DirectIndexApplication.java @@ -1,6 +1,5 @@ package eu.dnetlib.openaire.directindex; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cache.annotation.EnableCaching; @@ -19,15 +18,6 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; @EnableScheduling public class DirectIndexApplication extends AbstractDnetApp { - @Value("${openaire.api.directindex.mongo.url}") - private String mongoUrl; - - @Value("${openaire.api.directindex.mongo.db}") - private String mongoDb; - - @Value("${openaire.api.directindex.mongo.collection}") - private String mongoColl; - public static void main(final String[] args) { SpringApplication.run(DirectIndexApplication.class, args); } @@ -39,7 +29,7 @@ public class DirectIndexApplication extends AbstractDnetApp { .paths(p -> p.startsWith("/api/")) .build() .apiInfo(new ApiInfoBuilder() - .title("OpenAIRE DirectIndex APIs") + .title("OpenAIRE DirectIndex API") .description("APIs documentation") .version("1.1") .contact(ApiInfo.DEFAULT_CONTACT) diff --git a/apps/dnet-directindex/src/main/java/eu/dnetlib/openaire/directindex/DirectIndexController.java b/apps/dnet-directindex-api/src/main/java/eu/dnetlib/openaire/directindex/DirectIndexController.java similarity index 90% rename from apps/dnet-directindex/src/main/java/eu/dnetlib/openaire/directindex/DirectIndexController.java rename to apps/dnet-directindex-api/src/main/java/eu/dnetlib/openaire/directindex/DirectIndexController.java index 1044c640..c0fe600b 100644 --- a/apps/dnet-directindex/src/main/java/eu/dnetlib/openaire/directindex/DirectIndexController.java +++ b/apps/dnet-directindex-api/src/main/java/eu/dnetlib/openaire/directindex/DirectIndexController.java @@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; @@ -24,6 +25,7 @@ import eu.dnetlib.openaire.directindex.repo.RecordInfo; import eu.dnetlib.openaire.directindex.repo.RecordInfoRepository; @RestController +@RequestMapping("/api") public class DirectIndexController extends AbstractDnetController { private static final Log log = LogFactory.getLog(DirectIndexController.class); @@ -37,7 +39,7 @@ public class DirectIndexController extends AbstractDnetController { @Autowired private ISLookupClient isLookupClient; - @PostMapping("/api/results/feedObject") + @PostMapping("/results/feedObject") public String feedResult(@RequestBody final ResultEntry pub) throws DirectIndexApiException { log.debug(pub); @@ -64,15 +66,14 @@ public class DirectIndexController extends AbstractDnetController { } - @DeleteMapping("/api/result/{openaireId}") + @DeleteMapping("/result/{openaireId}") public void deleteResultWithOpenaireId(@PathVariable final String openaireId) throws DirectIndexApiException { deleteResult(openaireId); } - @DeleteMapping("/api/results") + @DeleteMapping("/results") public void deleteResultWithOriginalId(@RequestParam final String originalId, @RequestParam final String collectedFromId) throws Exception { - final String openaireId = xmlRecordConverter.calculateOpenaireId(originalId, collectedFromId); - deleteResult(openaireId); + deleteResult(xmlRecordConverter.calculateOpenaireId(originalId, collectedFromId)); } private void deleteResult(final String openaireId) throws DirectIndexApiException { @@ -87,7 +88,7 @@ public class DirectIndexController extends AbstractDnetController { recordInfoRepository.save(info); } - @GetMapping("/api/admin/evictCache") + @GetMapping("/admin/evictCache") @ResponseStatus(HttpStatus.OK) public void evictCache() { isLookupClient.evictCache(); diff --git a/apps/dnet-directindex/src/main/java/eu/dnetlib/openaire/directindex/input/DatasourceEntry.java b/apps/dnet-directindex-api/src/main/java/eu/dnetlib/openaire/directindex/input/DatasourceEntry.java similarity index 100% rename from apps/dnet-directindex/src/main/java/eu/dnetlib/openaire/directindex/input/DatasourceEntry.java rename to apps/dnet-directindex-api/src/main/java/eu/dnetlib/openaire/directindex/input/DatasourceEntry.java diff --git a/apps/dnet-directindex/src/main/java/eu/dnetlib/openaire/directindex/input/PidEntry.java b/apps/dnet-directindex-api/src/main/java/eu/dnetlib/openaire/directindex/input/PidEntry.java similarity index 100% rename from apps/dnet-directindex/src/main/java/eu/dnetlib/openaire/directindex/input/PidEntry.java rename to apps/dnet-directindex-api/src/main/java/eu/dnetlib/openaire/directindex/input/PidEntry.java diff --git a/apps/dnet-directindex/src/main/java/eu/dnetlib/openaire/directindex/input/ResultEntry.java b/apps/dnet-directindex-api/src/main/java/eu/dnetlib/openaire/directindex/input/ResultEntry.java similarity index 100% rename from apps/dnet-directindex/src/main/java/eu/dnetlib/openaire/directindex/input/ResultEntry.java rename to apps/dnet-directindex-api/src/main/java/eu/dnetlib/openaire/directindex/input/ResultEntry.java diff --git a/apps/dnet-directindex/src/main/java/eu/dnetlib/openaire/directindex/input/ZenodoContextList.java b/apps/dnet-directindex-api/src/main/java/eu/dnetlib/openaire/directindex/input/ZenodoContextList.java similarity index 100% rename from apps/dnet-directindex/src/main/java/eu/dnetlib/openaire/directindex/input/ZenodoContextList.java rename to apps/dnet-directindex-api/src/main/java/eu/dnetlib/openaire/directindex/input/ZenodoContextList.java diff --git a/apps/dnet-directindex/src/main/java/eu/dnetlib/openaire/directindex/is/ISLookupClient.java b/apps/dnet-directindex-api/src/main/java/eu/dnetlib/openaire/directindex/is/ISLookupClient.java similarity index 100% rename from apps/dnet-directindex/src/main/java/eu/dnetlib/openaire/directindex/is/ISLookupClient.java rename to apps/dnet-directindex-api/src/main/java/eu/dnetlib/openaire/directindex/is/ISLookupClient.java diff --git a/apps/dnet-directindex/src/main/java/eu/dnetlib/openaire/directindex/is/IndexDsInfo.java b/apps/dnet-directindex-api/src/main/java/eu/dnetlib/openaire/directindex/is/IndexDsInfo.java similarity index 100% rename from apps/dnet-directindex/src/main/java/eu/dnetlib/openaire/directindex/is/IndexDsInfo.java rename to apps/dnet-directindex-api/src/main/java/eu/dnetlib/openaire/directindex/is/IndexDsInfo.java diff --git a/apps/dnet-directindex/src/main/java/eu/dnetlib/openaire/directindex/mapping/OpenAIRESubmitterUtils.java b/apps/dnet-directindex-api/src/main/java/eu/dnetlib/openaire/directindex/mapping/OpenAIRESubmitterUtils.java similarity index 100% rename from apps/dnet-directindex/src/main/java/eu/dnetlib/openaire/directindex/mapping/OpenAIRESubmitterUtils.java rename to apps/dnet-directindex-api/src/main/java/eu/dnetlib/openaire/directindex/mapping/OpenAIRESubmitterUtils.java diff --git a/apps/dnet-directindex/src/main/java/eu/dnetlib/openaire/directindex/mapping/XmlRecordConverter.java b/apps/dnet-directindex-api/src/main/java/eu/dnetlib/openaire/directindex/mapping/XmlRecordConverter.java similarity index 100% rename from apps/dnet-directindex/src/main/java/eu/dnetlib/openaire/directindex/mapping/XmlRecordConverter.java rename to apps/dnet-directindex-api/src/main/java/eu/dnetlib/openaire/directindex/mapping/XmlRecordConverter.java diff --git a/apps/dnet-directindex/src/main/java/eu/dnetlib/openaire/directindex/repo/RecordInfo.java b/apps/dnet-directindex-api/src/main/java/eu/dnetlib/openaire/directindex/repo/RecordInfo.java similarity index 100% rename from apps/dnet-directindex/src/main/java/eu/dnetlib/openaire/directindex/repo/RecordInfo.java rename to apps/dnet-directindex-api/src/main/java/eu/dnetlib/openaire/directindex/repo/RecordInfo.java diff --git a/apps/dnet-directindex/src/main/java/eu/dnetlib/openaire/directindex/repo/RecordInfoRepository.java b/apps/dnet-directindex-api/src/main/java/eu/dnetlib/openaire/directindex/repo/RecordInfoRepository.java similarity index 100% rename from apps/dnet-directindex/src/main/java/eu/dnetlib/openaire/directindex/repo/RecordInfoRepository.java rename to apps/dnet-directindex-api/src/main/java/eu/dnetlib/openaire/directindex/repo/RecordInfoRepository.java diff --git a/apps/dnet-directindex/src/main/java/eu/dnetlib/openaire/directindex/scheduled/ScheduledActions.java b/apps/dnet-directindex-api/src/main/java/eu/dnetlib/openaire/directindex/scheduled/ScheduledActions.java similarity index 100% rename from apps/dnet-directindex/src/main/java/eu/dnetlib/openaire/directindex/scheduled/ScheduledActions.java rename to apps/dnet-directindex-api/src/main/java/eu/dnetlib/openaire/directindex/scheduled/ScheduledActions.java diff --git a/apps/dnet-directindex/src/main/java/eu/dnetlib/openaire/directindex/solr/SolrIndexClient.java b/apps/dnet-directindex-api/src/main/java/eu/dnetlib/openaire/directindex/solr/SolrIndexClient.java similarity index 100% rename from apps/dnet-directindex/src/main/java/eu/dnetlib/openaire/directindex/solr/SolrIndexClient.java rename to apps/dnet-directindex-api/src/main/java/eu/dnetlib/openaire/directindex/solr/SolrIndexClient.java diff --git a/apps/dnet-directindex/src/main/java/eu/dnetlib/openaire/directindex/solr/SolrIndexClientFactory.java b/apps/dnet-directindex-api/src/main/java/eu/dnetlib/openaire/directindex/solr/SolrIndexClientFactory.java similarity index 100% rename from apps/dnet-directindex/src/main/java/eu/dnetlib/openaire/directindex/solr/SolrIndexClientFactory.java rename to apps/dnet-directindex-api/src/main/java/eu/dnetlib/openaire/directindex/solr/SolrIndexClientFactory.java diff --git a/apps/dnet-directindex/src/main/java/eu/dnetlib/openaire/directindex/solr/StreamingInputDocumentFactory.java b/apps/dnet-directindex-api/src/main/java/eu/dnetlib/openaire/directindex/solr/StreamingInputDocumentFactory.java similarity index 100% rename from apps/dnet-directindex/src/main/java/eu/dnetlib/openaire/directindex/solr/StreamingInputDocumentFactory.java rename to apps/dnet-directindex-api/src/main/java/eu/dnetlib/openaire/directindex/solr/StreamingInputDocumentFactory.java diff --git a/apps/dnet-directindex/src/main/java/eu/dnetlib/openaire/directindex/solr/XmlToIndexRecordFactory.java b/apps/dnet-directindex-api/src/main/java/eu/dnetlib/openaire/directindex/solr/XmlToIndexRecordFactory.java similarity index 100% rename from apps/dnet-directindex/src/main/java/eu/dnetlib/openaire/directindex/solr/XmlToIndexRecordFactory.java rename to apps/dnet-directindex-api/src/main/java/eu/dnetlib/openaire/directindex/solr/XmlToIndexRecordFactory.java diff --git a/apps/dnet-directindex-api/src/main/resources/application.properties b/apps/dnet-directindex-api/src/main/resources/application.properties new file mode 100644 index 00000000..0847f918 --- /dev/null +++ b/apps/dnet-directindex-api/src/main/resources/application.properties @@ -0,0 +1,32 @@ +server.port=8080 + +spring.profiles.active=dev + +maven.pom.path = /META-INF/maven/eu.dnetlib.dhp/dnet-directindex-application/effective-pom.xml + +spring.main.banner-mode = off + +logging.level.root = INFO +#logging.level.org.springframework = DEBUG + +management.endpoints.web.exposure.include = prometheus,health +management.endpoints.web.base-path = / +management.endpoints.web.path-mapping.prometheus = metrics +management.endpoints.web.path-mapping.health = health + +spring.datasource.url=jdbc:postgresql://localhost:5432/oa_directindex +spring.datasource.username=oa_directindex +spring.datasource.password= + +# Hibernate ddl auto (create, create-drop, validate, update) +spring.jpa.hibernate.ddl-auto = validate +spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.PostgreSQLDialect +spring.jpa.properties.hibernate.hbm2dll.extra_physical_table_types = MATERIALIZED VIEW +spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true +spring.jpa.open-in-view=true +spring.jpa.properties.hibernate.show_sql=false +spring.jpa.properties.hibernate.use_sql_comments=false +spring.jpa.properties.hibernate.format_sql=false + +openaire.api.community=http://${container.hostname}/openaire/community/ +oaf.schema.location=https://www.openaire.eu/schema/1.0/oaf-1.0.xsd \ No newline at end of file diff --git a/apps/dnet-directindex/src/main/resources/templates/indexRecord.xml.vm b/apps/dnet-directindex-api/src/main/resources/templates/indexRecord.xml.vm similarity index 100% rename from apps/dnet-directindex/src/main/resources/templates/indexRecord.xml.vm rename to apps/dnet-directindex-api/src/main/resources/templates/indexRecord.xml.vm diff --git a/apps/dnet-directindex/src/main/resources/xqueries/findIndexDsInfo.xquery b/apps/dnet-directindex-api/src/main/resources/xqueries/findIndexDsInfo.xquery similarity index 100% rename from apps/dnet-directindex/src/main/resources/xqueries/findIndexDsInfo.xquery rename to apps/dnet-directindex-api/src/main/resources/xqueries/findIndexDsInfo.xquery diff --git a/apps/dnet-directindex/src/main/resources/xqueries/findSolrIndexUrl.xquery b/apps/dnet-directindex-api/src/main/resources/xqueries/findSolrIndexUrl.xquery similarity index 100% rename from apps/dnet-directindex/src/main/resources/xqueries/findSolrIndexUrl.xquery rename to apps/dnet-directindex-api/src/main/resources/xqueries/findSolrIndexUrl.xquery diff --git a/apps/dnet-directindex/src/main/resources/xslt/openaireLayoutToRecordStylesheet.xslt b/apps/dnet-directindex-api/src/main/resources/xslt/openaireLayoutToRecordStylesheet.xslt similarity index 100% rename from apps/dnet-directindex/src/main/resources/xslt/openaireLayoutToRecordStylesheet.xslt rename to apps/dnet-directindex-api/src/main/resources/xslt/openaireLayoutToRecordStylesheet.xslt diff --git a/apps/dnet-directindex/src/test/java/eu/dnetlib/openaire/directindex/OpenAIRESubmitterUtilsTest.java b/apps/dnet-directindex-api/src/test/java/eu/dnetlib/openaire/directindex/OpenAIRESubmitterUtilsTest.java similarity index 100% rename from apps/dnet-directindex/src/test/java/eu/dnetlib/openaire/directindex/OpenAIRESubmitterUtilsTest.java rename to apps/dnet-directindex-api/src/test/java/eu/dnetlib/openaire/directindex/OpenAIRESubmitterUtilsTest.java diff --git a/apps/dnet-directindex/src/test/java/eu/dnetlib/openaire/directindex/mapping/XmlRecordConverterTest.java b/apps/dnet-directindex-api/src/test/java/eu/dnetlib/openaire/directindex/mapping/XmlRecordConverterTest.java similarity index 100% rename from apps/dnet-directindex/src/test/java/eu/dnetlib/openaire/directindex/mapping/XmlRecordConverterTest.java rename to apps/dnet-directindex-api/src/test/java/eu/dnetlib/openaire/directindex/mapping/XmlRecordConverterTest.java diff --git a/apps/dnet-directindex/src/test/resources/log4j.properties b/apps/dnet-directindex-api/src/test/resources/log4j.properties similarity index 100% rename from apps/dnet-directindex/src/test/resources/log4j.properties rename to apps/dnet-directindex-api/src/test/resources/log4j.properties diff --git a/apps/dnet-directindex/src/test/resources/samples/test_record.json b/apps/dnet-directindex-api/src/test/resources/samples/test_record.json similarity index 100% rename from apps/dnet-directindex/src/test/resources/samples/test_record.json rename to apps/dnet-directindex-api/src/test/resources/samples/test_record.json diff --git a/apps/dnet-directindex/src/test/resources/samples/test_record_ariadne.json b/apps/dnet-directindex-api/src/test/resources/samples/test_record_ariadne.json similarity index 100% rename from apps/dnet-directindex/src/test/resources/samples/test_record_ariadne.json rename to apps/dnet-directindex-api/src/test/resources/samples/test_record_ariadne.json diff --git a/apps/dnet-directindex/src/test/resources/samples/test_record_complete.json b/apps/dnet-directindex-api/src/test/resources/samples/test_record_complete.json similarity index 100% rename from apps/dnet-directindex/src/test/resources/samples/test_record_complete.json rename to apps/dnet-directindex-api/src/test/resources/samples/test_record_complete.json diff --git a/apps/dnet-directindex/src/test/resources/samples/test_record_openaireId.json b/apps/dnet-directindex-api/src/test/resources/samples/test_record_openaireId.json similarity index 100% rename from apps/dnet-directindex/src/test/resources/samples/test_record_openaireId.json rename to apps/dnet-directindex-api/src/test/resources/samples/test_record_openaireId.json diff --git a/apps/dnet-directindex/src/test/resources/samples/test_record_orp.json b/apps/dnet-directindex-api/src/test/resources/samples/test_record_orp.json similarity index 100% rename from apps/dnet-directindex/src/test/resources/samples/test_record_orp.json rename to apps/dnet-directindex-api/src/test/resources/samples/test_record_orp.json diff --git a/apps/dnet-directindex/src/test/resources/samples/test_record_software.json b/apps/dnet-directindex-api/src/test/resources/samples/test_record_software.json similarity index 100% rename from apps/dnet-directindex/src/test/resources/samples/test_record_software.json rename to apps/dnet-directindex-api/src/test/resources/samples/test_record_software.json diff --git a/apps/dnet-directindex/src/test/resources/samples/test_record_with_greek_chars.json b/apps/dnet-directindex-api/src/test/resources/samples/test_record_with_greek_chars.json similarity index 100% rename from apps/dnet-directindex/src/test/resources/samples/test_record_with_greek_chars.json rename to apps/dnet-directindex-api/src/test/resources/samples/test_record_with_greek_chars.json diff --git a/apps/dnet-directindex/src/test/resources/samples/test_record_wrong_openaireId.json b/apps/dnet-directindex-api/src/test/resources/samples/test_record_wrong_openaireId.json similarity index 100% rename from apps/dnet-directindex/src/test/resources/samples/test_record_wrong_openaireId.json rename to apps/dnet-directindex-api/src/test/resources/samples/test_record_wrong_openaireId.json diff --git a/apps/dnet-directindex/src/test/resources/samples/test_zenodo.json b/apps/dnet-directindex-api/src/test/resources/samples/test_zenodo.json similarity index 100% rename from apps/dnet-directindex/src/test/resources/samples/test_zenodo.json rename to apps/dnet-directindex-api/src/test/resources/samples/test_zenodo.json diff --git a/apps/dnet-directindex/src/test/resources/samples/test_zenodoAmpersandEverywhere.json b/apps/dnet-directindex-api/src/test/resources/samples/test_zenodoAmpersandEverywhere.json similarity index 100% rename from apps/dnet-directindex/src/test/resources/samples/test_zenodoAmpersandEverywhere.json rename to apps/dnet-directindex-api/src/test/resources/samples/test_zenodoAmpersandEverywhere.json diff --git a/apps/dnet-directindex/src/test/resources/samples/test_zenodo_community.json b/apps/dnet-directindex-api/src/test/resources/samples/test_zenodo_community.json similarity index 100% rename from apps/dnet-directindex/src/test/resources/samples/test_zenodo_community.json rename to apps/dnet-directindex-api/src/test/resources/samples/test_zenodo_community.json diff --git a/apps/dnet-directindex/src/test/resources/samples/test_zenodo_community2.json b/apps/dnet-directindex-api/src/test/resources/samples/test_zenodo_community2.json similarity index 100% rename from apps/dnet-directindex/src/test/resources/samples/test_zenodo_community2.json rename to apps/dnet-directindex-api/src/test/resources/samples/test_zenodo_community2.json diff --git a/apps/dnet-directindex/src/test/resources/samples/test_zenodo_problems.json b/apps/dnet-directindex-api/src/test/resources/samples/test_zenodo_problems.json similarity index 100% rename from apps/dnet-directindex/src/test/resources/samples/test_zenodo_problems.json rename to apps/dnet-directindex-api/src/test/resources/samples/test_zenodo_problems.json diff --git a/apps/dnet-directindex/src/main/resources/application.properties b/apps/dnet-directindex/src/main/resources/application.properties deleted file mode 100644 index 2c4f376e..00000000 --- a/apps/dnet-directindex/src/main/resources/application.properties +++ /dev/null @@ -1,3 +0,0 @@ -openaire.api.directindex.layoutToRecord.xslt=/xslt/openaireLayoutToRecordStylesheet.xsl - -openaire.api.community=http://${container.hostname}/openaire/community/ diff --git a/apps/pom.xml b/apps/pom.xml index ce12da0a..8366724f 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -18,7 +18,7 @@ dhp-broker-public-application dhp-mdstore-manager dnet-orgs-database-application - dnet-directindex + dnet-directindex-api