diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/common/MainAjaxController.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/MainAjaxController.java similarity index 96% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/is/common/MainAjaxController.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/MainAjaxController.java index 9dc985b9..e66cac27 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/common/MainAjaxController.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/MainAjaxController.java @@ -1,4 +1,4 @@ -package eu.dnetlib.is.common; +package eu.dnetlib; 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/MainApplication.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/MainApplication.java similarity index 97% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/is/MainApplication.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/MainApplication.java index 392264b5..034d8971 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/MainApplication.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/MainApplication.java @@ -1,4 +1,4 @@ -package eu.dnetlib.is; +package eu.dnetlib; import org.springdoc.core.GroupedOpenApi; import org.springframework.boot.SpringApplication; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/MainDBConfig.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/MainDBConfig.java similarity index 98% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/is/MainDBConfig.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/MainDBConfig.java index b1e87d5b..bbb78569 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/MainDBConfig.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/MainDBConfig.java @@ -1,4 +1,4 @@ -package eu.dnetlib.is; +package eu.dnetlib; import javax.persistence.EntityManagerFactory; import javax.sql.DataSource; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/OpenaireDBConfig.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/OpenaireDBConfig.java similarity index 98% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/is/OpenaireDBConfig.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/OpenaireDBConfig.java index 2dc6905d..f44d652e 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/OpenaireDBConfig.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/OpenaireDBConfig.java @@ -1,4 +1,4 @@ -package eu.dnetlib.is; +package eu.dnetlib; import javax.persistence.EntityManagerFactory; import javax.sql.DataSource; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/common/SwaggerController.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/SwaggerController.java similarity index 91% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/is/common/SwaggerController.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/SwaggerController.java index d1b22a4b..1adfc1f6 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/common/SwaggerController.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/SwaggerController.java @@ -1,4 +1,4 @@ -package eu.dnetlib.is.common; +package eu.dnetlib; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/MDInspectorController.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/MDInspectorController.java index d9c3b350..cd96effc 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/MDInspectorController.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/MDInspectorController.java @@ -4,26 +4,20 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.http.HttpStatus; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseStatus; -import org.springframework.web.servlet.ModelAndView; import eu.dnetlib.dhp.schema.mdstore.MDStoreVersion; import eu.dnetlib.dhp.schema.mdstore.MDStoreWithInfo; -import eu.dnetlib.data.mdstore.manager.exceptions.MDStoreManagerException; -import eu.dnetlib.data.mdstore.utils.ControllerUtils; -import eu.dnetlib.data.mdstore.utils.DatabaseUtils; +import eu.dnetlib.errors.MDStoreManagerException; @Controller public class MDInspectorController { @Autowired - private DatabaseUtils databaseUtils; + private MDStoreService databaseUtils; private static final Logger log = LoggerFactory.getLogger(MDInspectorController.class); @@ -74,12 +68,6 @@ public class MDInspectorController { return "inspector"; } - @ExceptionHandler(Exception.class) - @ResponseStatus(value = HttpStatus.INTERNAL_SERVER_ERROR) - public ModelAndView handleException(final Exception e) { - return ControllerUtils.errorPage("Metadata Inspector - ERROR", e); - } - private boolean isMdstoreId(final String id) { return id.length() < 40; } diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/MDStoreController.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/MDStoreController.java index f407f7a0..fc3141bd 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/MDStoreController.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/MDStoreController.java @@ -18,11 +18,10 @@ import org.springframework.web.bind.annotation.RestController; import com.google.common.collect.Sets; import eu.dnetlib.common.controller.AbstractDnetController; -import eu.dnetlib.data.mdstore.manager.exceptions.MDStoreManagerException; -import eu.dnetlib.data.mdstore.utils.DatabaseUtils; -import eu.dnetlib.data.mdstore.utils.HdfsClient; +import eu.dnetlib.data.mdstore.hadoop.HdfsClient; import eu.dnetlib.dhp.schema.mdstore.MDStoreVersion; import eu.dnetlib.dhp.schema.mdstore.MDStoreWithInfo; +import eu.dnetlib.errors.MDStoreManagerException; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -33,12 +32,12 @@ import io.swagger.v3.oas.annotations.tags.Tag; public class MDStoreController extends AbstractDnetController { @Autowired - private DatabaseUtils databaseUtils; + private MDStoreService databaseUtils; @Autowired private HdfsClient hdfsClient; - private static final Logger log = LoggerFactory.getLogger(DatabaseUtils.class); + private static final Logger log = LoggerFactory.getLogger(MDStoreService.class); @Operation(summary = "Return all the mdstores") @GetMapping("/") @@ -221,7 +220,7 @@ public class MDStoreController extends AbstractDnetController { return hdfsClient.readParquetFiles(path + "/store", limit); } - protected void setDatabaseUtils(final DatabaseUtils databaseUtils) { + protected void setDatabaseUtils(final MDStoreService databaseUtils) { this.databaseUtils = databaseUtils; } diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/utils/DatabaseUtils.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/MDStoreService.java similarity index 96% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/utils/DatabaseUtils.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/MDStoreService.java index fe177238..1233a3ee 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/utils/DatabaseUtils.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/MDStoreService.java @@ -1,4 +1,4 @@ -package eu.dnetlib.data.mdstore.utils; +package eu.dnetlib.data.mdstore; import java.util.Date; import java.util.HashSet; @@ -16,7 +16,6 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Service; -import eu.dnetlib.data.mdstore.manager.exceptions.MDStoreManagerException; import eu.dnetlib.data.mdstore.repository.MDStoreCurrentVersionRepository; import eu.dnetlib.data.mdstore.repository.MDStoreRepository; import eu.dnetlib.data.mdstore.repository.MDStoreVersionRepository; @@ -25,9 +24,10 @@ import eu.dnetlib.dhp.schema.mdstore.MDStore; import eu.dnetlib.dhp.schema.mdstore.MDStoreCurrentVersion; import eu.dnetlib.dhp.schema.mdstore.MDStoreVersion; import eu.dnetlib.dhp.schema.mdstore.MDStoreWithInfo; +import eu.dnetlib.errors.MDStoreManagerException; @Service -public class DatabaseUtils { +public class MDStoreService { @Autowired private MDStoreRepository mdstoreRepository; @@ -43,7 +43,7 @@ public class DatabaseUtils { @Value("${dhp.mdstore-manager.hdfs.base-path}") private String hdfsBasePath; - private static final Logger log = LoggerFactory.getLogger(DatabaseUtils.class); + private static final Logger log = LoggerFactory.getLogger(MDStoreService.class); public Iterable listMdStores() { return mdstoreWithInfoRepository.findAll(); diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/ZeppelinAjaxController.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/ZeppelinAjaxController.java index f2d6bb89..55a4590e 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/ZeppelinAjaxController.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/ZeppelinAjaxController.java @@ -8,8 +8,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import eu.dnetlib.common.controller.AbstractDnetController; -import eu.dnetlib.data.mdstore.manager.exceptions.MDStoreManagerException; -import eu.dnetlib.data.mdstore.utils.ZeppelinClient; +import eu.dnetlib.data.mdstore.hadoop.ZeppelinClient; +import eu.dnetlib.errors.MDStoreManagerException; @RestController @RequestMapping("/zeppelin") diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/ZeppelinController.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/ZeppelinController.java index e5b53f11..48e25143 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/ZeppelinController.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/ZeppelinController.java @@ -1,19 +1,13 @@ package eu.dnetlib.data.mdstore; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseStatus; -import org.springframework.web.servlet.ModelAndView; -import eu.dnetlib.data.mdstore.manager.exceptions.MDStoreManagerException; -import eu.dnetlib.data.mdstore.utils.ControllerUtils; -import eu.dnetlib.data.mdstore.utils.DatabaseUtils; -import eu.dnetlib.data.mdstore.utils.ZeppelinClient; +import eu.dnetlib.data.mdstore.hadoop.ZeppelinClient; import eu.dnetlib.dhp.schema.mdstore.MDStoreWithInfo; +import eu.dnetlib.errors.MDStoreManagerException; @Controller public class ZeppelinController { @@ -22,7 +16,7 @@ public class ZeppelinController { private ZeppelinClient zeppelinClient; @Autowired - private DatabaseUtils databaseUtils; + private MDStoreService databaseUtils; @RequestMapping("/zeppelin/{mdId}/{note}") public String goToZeppelin(@PathVariable final String mdId, final @PathVariable String note) throws MDStoreManagerException { @@ -32,10 +26,4 @@ public class ZeppelinController { return "redirect:" + zeppelinClient.zeppelinNote(note, mdstore, path); } - @ExceptionHandler(Exception.class) - @ResponseStatus(value = HttpStatus.INTERNAL_SERVER_ERROR) - public ModelAndView handleException(final Exception e) { - return ControllerUtils.errorPage("Metadata Store Manager - Zeppelin Client", e); - } - } diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/zeppelin/HasStatus.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/hadoop/HasStatus.java similarity index 56% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/zeppelin/HasStatus.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/hadoop/HasStatus.java index 92b1c71a..30d954bc 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/zeppelin/HasStatus.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/hadoop/HasStatus.java @@ -1,4 +1,4 @@ -package eu.dnetlib.data.mdstore.zeppelin; +package eu.dnetlib.data.mdstore.hadoop; public interface HasStatus { diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/utils/HdfsClient.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/hadoop/HdfsClient.java similarity index 98% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/utils/HdfsClient.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/hadoop/HdfsClient.java index a225dbc3..6df47735 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/utils/HdfsClient.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/hadoop/HdfsClient.java @@ -1,4 +1,4 @@ -package eu.dnetlib.data.mdstore.utils; +package eu.dnetlib.data.mdstore.hadoop; import java.io.FileNotFoundException; import java.io.IOException; @@ -20,7 +20,7 @@ import org.apache.hadoop.fs.Path; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import eu.dnetlib.data.mdstore.manager.exceptions.MDStoreManagerException; +import eu.dnetlib.errors.MDStoreManagerException; import parquet.avro.AvroParquetReader; import parquet.hadoop.ParquetReader; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/zeppelin/ListResponse.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/hadoop/ListResponse.java similarity index 94% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/zeppelin/ListResponse.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/hadoop/ListResponse.java index 82179b41..7d1085b6 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/zeppelin/ListResponse.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/hadoop/ListResponse.java @@ -1,4 +1,4 @@ -package eu.dnetlib.data.mdstore.zeppelin; +package eu.dnetlib.data.mdstore.hadoop; import java.util.List; import java.util.Map; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/zeppelin/MapResponse.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/hadoop/MapResponse.java similarity index 94% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/zeppelin/MapResponse.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/hadoop/MapResponse.java index 5729979a..a9464c1e 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/zeppelin/MapResponse.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/hadoop/MapResponse.java @@ -1,4 +1,4 @@ -package eu.dnetlib.data.mdstore.zeppelin; +package eu.dnetlib.data.mdstore.hadoop; import java.util.Map; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/zeppelin/Note.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/hadoop/Note.java similarity index 84% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/zeppelin/Note.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/hadoop/Note.java index f260cf70..75ef84e5 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/zeppelin/Note.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/hadoop/Note.java @@ -1,4 +1,4 @@ -package eu.dnetlib.data.mdstore.zeppelin; +package eu.dnetlib.data.mdstore.hadoop; public class Note { diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/zeppelin/Paragraph.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/hadoop/Paragraph.java similarity index 95% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/zeppelin/Paragraph.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/hadoop/Paragraph.java index 5d9fe2d9..79cf8335 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/zeppelin/Paragraph.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/hadoop/Paragraph.java @@ -1,4 +1,4 @@ -package eu.dnetlib.data.mdstore.zeppelin; +package eu.dnetlib.data.mdstore.hadoop; import java.util.LinkedHashMap; import java.util.Map; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/zeppelin/SimpleResponse.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/hadoop/SimpleResponse.java similarity index 84% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/zeppelin/SimpleResponse.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/hadoop/SimpleResponse.java index 4de0145c..94fe0132 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/zeppelin/SimpleResponse.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/hadoop/SimpleResponse.java @@ -1,4 +1,4 @@ -package eu.dnetlib.data.mdstore.zeppelin; +package eu.dnetlib.data.mdstore.hadoop; public class SimpleResponse implements HasStatus { diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/zeppelin/StringResponse.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/hadoop/StringResponse.java similarity index 93% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/zeppelin/StringResponse.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/hadoop/StringResponse.java index eb818162..a2c750f4 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/zeppelin/StringResponse.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/hadoop/StringResponse.java @@ -1,4 +1,4 @@ -package eu.dnetlib.data.mdstore.zeppelin; +package eu.dnetlib.data.mdstore.hadoop; public class StringResponse implements HasStatus { diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/utils/ZeppelinClient.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/hadoop/ZeppelinClient.java similarity index 96% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/utils/ZeppelinClient.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/hadoop/ZeppelinClient.java index ff0dfef2..6f3cf17c 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/utils/ZeppelinClient.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/hadoop/ZeppelinClient.java @@ -1,4 +1,4 @@ -package eu.dnetlib.data.mdstore.utils; +package eu.dnetlib.data.mdstore.hadoop; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -33,14 +33,8 @@ import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.web.client.RestTemplate; -import eu.dnetlib.data.mdstore.manager.exceptions.MDStoreManagerException; -import eu.dnetlib.data.mdstore.zeppelin.HasStatus; -import eu.dnetlib.data.mdstore.zeppelin.ListResponse; -import eu.dnetlib.data.mdstore.zeppelin.Note; -import eu.dnetlib.data.mdstore.zeppelin.Paragraph; -import eu.dnetlib.data.mdstore.zeppelin.SimpleResponse; -import eu.dnetlib.data.mdstore.zeppelin.StringResponse; import eu.dnetlib.dhp.schema.mdstore.MDStoreWithInfo; +import eu.dnetlib.errors.MDStoreManagerException; @Component public class ZeppelinClient { diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/repository/MDStoreWithInfoRepository.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/repository/MDStoreWithInfoRepository.java index b21adbf1..c7626a74 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/repository/MDStoreWithInfoRepository.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/repository/MDStoreWithInfoRepository.java @@ -3,7 +3,7 @@ package eu.dnetlib.data.mdstore.repository; import org.springframework.stereotype.Repository; import eu.dnetlib.dhp.schema.mdstore.MDStoreWithInfo; -import eu.dnetlib.is.util.ReadOnlyRepository; +import eu.dnetlib.utils.ReadOnlyRepository; @Repository public interface MDStoreWithInfoRepository extends ReadOnlyRepository { diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/utils/ControllerUtils.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/utils/ControllerUtils.java deleted file mode 100644 index 085bea8a..00000000 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/utils/ControllerUtils.java +++ /dev/null @@ -1,22 +0,0 @@ -package eu.dnetlib.data.mdstore.utils; - -import org.apache.commons.lang3.exception.ExceptionUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.web.servlet.ModelAndView; - -public class ControllerUtils { - - private static final Logger log = LoggerFactory.getLogger(ControllerUtils.class); - - public static ModelAndView errorPage(final String title, final Throwable e) { - log.debug(e.getMessage(), e); - final ModelAndView mv = new ModelAndView(); - mv.setViewName("error"); - mv.addObject("title", title); - mv.addObject("error", e.getMessage()); - mv.addObject("stacktrace", ExceptionUtils.getStackTrace(e)); - return mv; - - } -} diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/AbstractDsmController.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/AbstractDsmController.java index 4457ddab..23b701fb 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/AbstractDsmController.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/AbstractDsmController.java @@ -18,9 +18,9 @@ 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.errors.DsmException; +import eu.dnetlib.errors.DsmForbiddenException; +import eu.dnetlib.errors.DsmNotFoundException; /** * Created by claudio on 18/07/2017. diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/DatasourceManagerCommon.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/DatasourceManagerCommon.java index 32c43703..65e0e734 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/DatasourceManagerCommon.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/DatasourceManagerCommon.java @@ -4,9 +4,9 @@ import java.util.List; import eu.dnetlib.dsm.model.Api; import eu.dnetlib.dsm.model.Datasource; -import eu.dnetlib.is.errors.DsmException; -import eu.dnetlib.is.errors.DsmForbiddenException; -import eu.dnetlib.is.errors.DsmNotFoundException; +import eu.dnetlib.errors.DsmException; +import eu.dnetlib.errors.DsmForbiddenException; +import eu.dnetlib.errors.DsmNotFoundException; public interface DatasourceManagerCommon { diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/DsmAjaxController.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/DsmAjaxController.java index d11202e2..330d8e95 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/DsmAjaxController.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/DsmAjaxController.java @@ -21,7 +21,7 @@ import eu.dnetlib.dsm.model.Api; import eu.dnetlib.dsm.model.BrowseTerm; import eu.dnetlib.dsm.model.readonly.SimpleDsWithApis; import eu.dnetlib.dsm.utils.DsmBrowsableFields; -import eu.dnetlib.is.errors.DsmException; +import eu.dnetlib.errors.DsmException; import eu.dnetlib.is.info.KeyValue; import eu.dnetlib.is.protocol.ProtocolService; import eu.dnetlib.is.vocabulary.repository.VocabularyTermRepository; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/DsmApiControllerV1.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/DsmApiControllerV1.java index 78ba329c..972ee657 100755 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/DsmApiControllerV1.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/DsmApiControllerV1.java @@ -51,9 +51,9 @@ import eu.dnetlib.dsm.model.Identity; 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.errors.DsmException; +import eu.dnetlib.errors.DsmForbiddenException; +import eu.dnetlib.errors.DsmNotFoundException; 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/dsm/DsmService.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/DsmService.java index 305eec1d..5f292ce1 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/DsmService.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/DsmService.java @@ -61,9 +61,9 @@ 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.errors.DsmException; +import eu.dnetlib.errors.DsmForbiddenException; +import eu.dnetlib.errors.DsmNotFoundException; import eu.dnetlib.is.model.vocabulary.Vocabulary; @Service diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/repository/ApiWithAdditionalInfoRepository.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/repository/ApiWithAdditionalInfoRepository.java index ad52cec2..b33dbd8e 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/repository/ApiWithAdditionalInfoRepository.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/repository/ApiWithAdditionalInfoRepository.java @@ -5,7 +5,7 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.stereotype.Repository; import eu.dnetlib.dsm.model.readonly.ApiWithAdditionalInfo; -import eu.dnetlib.is.util.ReadOnlyRepository; +import eu.dnetlib.utils.ReadOnlyRepository; @Repository @ConditionalOnProperty(value = "openaire.api.enable.dsm", havingValue = "true") diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/repository/SimpleDsWithApisRepository.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/repository/SimpleDsWithApisRepository.java index 4b802706..d625d284 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/repository/SimpleDsWithApisRepository.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/repository/SimpleDsWithApisRepository.java @@ -12,7 +12,7 @@ import org.springframework.stereotype.Repository; import eu.dnetlib.dsm.model.BrowseTerm; import eu.dnetlib.dsm.model.readonly.SimpleDsWithApis; -import eu.dnetlib.is.util.ReadOnlyRepository; +import eu.dnetlib.utils.ReadOnlyRepository; @Repository @ConditionalOnProperty(value = "openaire.api.enable.dsm", havingValue = "true") diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/utils/WfLoggerClient.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/utils/WfLoggerClient.java index 54fdb296..930de9ec 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/utils/WfLoggerClient.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/dsm/utils/WfLoggerClient.java @@ -8,7 +8,7 @@ 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.errors.DsmException; /** * Created by claudio on 20/10/2016. diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/errors/DsmException.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/errors/DsmException.java similarity index 90% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/is/errors/DsmException.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/errors/DsmException.java index 6ad1dcd5..22a2dacd 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/errors/DsmException.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/errors/DsmException.java @@ -1,4 +1,4 @@ -package eu.dnetlib.is.errors; +package eu.dnetlib.errors; public class DsmException extends Exception { diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/errors/DsmForbiddenException.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/errors/DsmForbiddenException.java similarity index 91% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/is/errors/DsmForbiddenException.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/errors/DsmForbiddenException.java index c7aaf8c3..8fc4fcd0 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/errors/DsmForbiddenException.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/errors/DsmForbiddenException.java @@ -1,4 +1,4 @@ -package eu.dnetlib.is.errors; +package eu.dnetlib.errors; public class DsmForbiddenException extends DsmException { diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/errors/DsmNotFoundException.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/errors/DsmNotFoundException.java similarity index 91% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/is/errors/DsmNotFoundException.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/errors/DsmNotFoundException.java index f1d0e9de..facf9e6c 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/errors/DsmNotFoundException.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/errors/DsmNotFoundException.java @@ -1,4 +1,4 @@ -package eu.dnetlib.is.errors; +package eu.dnetlib.errors; public class DsmNotFoundException extends DsmException { diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/errors/InformationServiceException.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/errors/InformationServiceException.java similarity index 91% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/is/errors/InformationServiceException.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/errors/InformationServiceException.java index 2dbc43d6..587ea9ba 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/errors/InformationServiceException.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/errors/InformationServiceException.java @@ -1,4 +1,4 @@ -package eu.dnetlib.is.errors; +package eu.dnetlib.errors; public class InformationServiceException extends Exception { diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/manager/exceptions/MDStoreManagerException.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/errors/MDStoreManagerException.java similarity index 93% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/manager/exceptions/MDStoreManagerException.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/errors/MDStoreManagerException.java index c6dd2e96..4e58cb83 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/data/mdstore/manager/exceptions/MDStoreManagerException.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/errors/MDStoreManagerException.java @@ -1,4 +1,4 @@ -package eu.dnetlib.data.mdstore.manager.exceptions; +package eu.dnetlib.errors; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ResponseStatus; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/context/ContextAjaxController.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/is/context/ContextAjaxController.java index 080a2fd1..1d65f459 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/context/ContextAjaxController.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/is/context/ContextAjaxController.java @@ -5,7 +5,7 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import eu.dnetlib.is.errors.InformationServiceException; +import eu.dnetlib.errors.InformationServiceException; import eu.dnetlib.is.model.context.Category; import eu.dnetlib.is.model.context.Context; import eu.dnetlib.is.model.context.CtxChildInfo; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/context/ContextApiController.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/is/context/ContextApiController.java index eafa9b0d..5e97da16 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/context/ContextApiController.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/is/context/ContextApiController.java @@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.RestController; import com.fasterxml.jackson.databind.node.ObjectNode; -import eu.dnetlib.is.errors.InformationServiceException; +import eu.dnetlib.errors.InformationServiceException; @RestController @RequestMapping("/api/contexts") diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/context/ContextService.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/is/context/ContextService.java index aa785a21..3f9221a5 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/context/ContextService.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/is/context/ContextService.java @@ -12,12 +12,12 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; +import eu.dnetlib.errors.InformationServiceException; import eu.dnetlib.is.context.repository.CategoryRepository; import eu.dnetlib.is.context.repository.ConceptLevel0Repository; import eu.dnetlib.is.context.repository.ConceptLevel1Repository; import eu.dnetlib.is.context.repository.ConceptLevel2Repository; import eu.dnetlib.is.context.repository.ContextRepository; -import eu.dnetlib.is.errors.InformationServiceException; import eu.dnetlib.is.model.context.Category; import eu.dnetlib.is.model.context.Context; import eu.dnetlib.is.model.context.CtxChildInfo; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/importer/OldProfilesImporter.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/is/importer/OldProfilesImporter.java index eb237373..5ea769ff 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/importer/OldProfilesImporter.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/is/importer/OldProfilesImporter.java @@ -12,16 +12,16 @@ import org.dom4j.Node; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import eu.dnetlib.is.errors.InformationServiceException; +import eu.dnetlib.errors.InformationServiceException; import eu.dnetlib.is.model.resource.SimpleResource; import eu.dnetlib.is.model.vocabulary.Synonym; import eu.dnetlib.is.model.vocabulary.Vocabulary; import eu.dnetlib.is.model.vocabulary.VocabularyTerm; import eu.dnetlib.is.resource.repository.SimpleResourceRepository; -import eu.dnetlib.is.util.ResourceValidator; -import eu.dnetlib.is.util.XmlIndenter; import eu.dnetlib.is.vocabulary.repository.VocabularyRepository; import eu.dnetlib.is.vocabulary.repository.VocabularyTermRepository; +import eu.dnetlib.utils.ResourceValidator; +import eu.dnetlib.utils.XmlIndenter; @Service public class OldProfilesImporter { diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/resource/AbstractResourceController.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/is/resource/AbstractResourceController.java index 30438abf..4575dbba 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/resource/AbstractResourceController.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/is/resource/AbstractResourceController.java @@ -13,9 +13,9 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import eu.dnetlib.common.controller.AbstractDnetController; -import eu.dnetlib.is.errors.InformationServiceException; +import eu.dnetlib.errors.InformationServiceException; import eu.dnetlib.is.model.resource.SimpleResource; -import eu.dnetlib.is.util.XmlIndenter; +import eu.dnetlib.utils.XmlIndenter; public class AbstractResourceController extends AbstractDnetController { diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/resource/ResourceAjaxController.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/is/resource/ResourceAjaxController.java index fcdcffa8..e154e2f8 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/resource/ResourceAjaxController.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/is/resource/ResourceAjaxController.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import eu.dnetlib.is.errors.InformationServiceException; +import eu.dnetlib.errors.InformationServiceException; import eu.dnetlib.is.model.resource.SimpleResource; @RestController diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/resource/SimpleResourceService.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/is/resource/SimpleResourceService.java index c4215361..42f8bdea 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/resource/SimpleResourceService.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/is/resource/SimpleResourceService.java @@ -14,10 +14,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.PathVariable; -import eu.dnetlib.is.errors.InformationServiceException; +import eu.dnetlib.errors.InformationServiceException; import eu.dnetlib.is.model.resource.SimpleResource; import eu.dnetlib.is.resource.repository.SimpleResourceRepository; -import eu.dnetlib.is.util.ResourceValidator; +import eu.dnetlib.utils.ResourceValidator; @Service public class SimpleResourceService { diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/resource/repository/ResourceTypeRepository.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/is/resource/repository/ResourceTypeRepository.java index 21840688..3c3160b3 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/resource/repository/ResourceTypeRepository.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/is/resource/repository/ResourceTypeRepository.java @@ -1,7 +1,7 @@ package eu.dnetlib.is.resource.repository; import eu.dnetlib.is.model.resource.ResourceType; -import eu.dnetlib.is.util.ReadOnlyRepository; +import eu.dnetlib.utils.ReadOnlyRepository; public interface ResourceTypeRepository extends ReadOnlyRepository { diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/vocabulary/VocabularyAjaxController.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/is/vocabulary/VocabularyAjaxController.java index bb3e0cb2..6f8b4347 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/vocabulary/VocabularyAjaxController.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/is/vocabulary/VocabularyAjaxController.java @@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import eu.dnetlib.is.errors.InformationServiceException; +import eu.dnetlib.errors.InformationServiceException; import eu.dnetlib.is.model.vocabulary.Vocabulary; import eu.dnetlib.is.model.vocabulary.VocabularyTerm; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/vocabulary/VocabularyService.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/is/vocabulary/VocabularyService.java index 63e21c41..71bfe26e 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/vocabulary/VocabularyService.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/is/vocabulary/VocabularyService.java @@ -11,7 +11,7 @@ import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import eu.dnetlib.is.errors.InformationServiceException; +import eu.dnetlib.errors.InformationServiceException; import eu.dnetlib.is.model.vocabulary.Vocabulary; import eu.dnetlib.is.model.vocabulary.VocabularyTerm; import eu.dnetlib.is.model.vocabulary.VocabularyTermPK; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/util/DateUtils.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/utils/DateUtils.java similarity index 98% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/is/util/DateUtils.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/utils/DateUtils.java index 6b3aa183..63691bf7 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/util/DateUtils.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/utils/DateUtils.java @@ -1,4 +1,4 @@ -package eu.dnetlib.is.util; +package eu.dnetlib.utils; import java.io.StringWriter; import java.text.SimpleDateFormat; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/util/ReadOnlyRepository.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/utils/ReadOnlyRepository.java similarity index 94% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/is/util/ReadOnlyRepository.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/utils/ReadOnlyRepository.java index fd4bd911..21e24748 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/util/ReadOnlyRepository.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/utils/ReadOnlyRepository.java @@ -1,4 +1,4 @@ -package eu.dnetlib.is.util; +package eu.dnetlib.utils; import java.util.Optional; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/util/ResourceValidator.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/utils/ResourceValidator.java similarity index 97% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/is/util/ResourceValidator.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/utils/ResourceValidator.java index 5522ecad..60f57a87 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/util/ResourceValidator.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/utils/ResourceValidator.java @@ -1,4 +1,4 @@ -package eu.dnetlib.is.util; +package eu.dnetlib.utils; import java.io.IOException; import java.io.InputStream; @@ -23,7 +23,7 @@ import org.xml.sax.SAXException; import com.fasterxml.jackson.databind.ObjectMapper; -import eu.dnetlib.is.errors.InformationServiceException; +import eu.dnetlib.errors.InformationServiceException; import eu.dnetlib.is.model.resource.ResourceType; import eu.dnetlib.is.resource.repository.ResourceTypeRepository; diff --git a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/util/XmlIndenter.java b/apps/dnet-is-application/src/main/java/eu/dnetlib/utils/XmlIndenter.java similarity index 97% rename from apps/dnet-is-application/src/main/java/eu/dnetlib/is/util/XmlIndenter.java rename to apps/dnet-is-application/src/main/java/eu/dnetlib/utils/XmlIndenter.java index 1edae291..b546bb88 100644 --- a/apps/dnet-is-application/src/main/java/eu/dnetlib/is/util/XmlIndenter.java +++ b/apps/dnet-is-application/src/main/java/eu/dnetlib/utils/XmlIndenter.java @@ -1,4 +1,4 @@ -package eu.dnetlib.is.util; +package eu.dnetlib.utils; import java.io.StringWriter;