From b316467608969df3c6afbb9c2b6e0378bc5c1164 Mon Sep 17 00:00:00 2001 From: enricoottonello Date: Wed, 3 Apr 2019 10:53:54 +0200 Subject: [PATCH] added common module --- .../dhp-mdstore-manager-app/pom.xml | 9 +++- .../manager/controller/MDStoreController.java | 10 ++-- .../MDStoreCurrentVersionRepository.java | 2 +- .../manager/repository/MDStoreRepository.java | 2 +- .../repository/MDStoreVersionRepository.java | 2 +- .../repository/MDStoreWithInfoRepository.java | 2 +- .../resources/static/js/mdstoremanager.js | 2 +- dhp-common/pom.xml | 52 +++++++++---------- .../manager/common}/model/MDStore.java | 2 +- .../common}/model/MDStoreCurrentVersion.java | 2 +- .../manager/common}/model/MDStoreVersion.java | 2 +- .../common}/model/MDStoreWithInfo.java | 2 +- .../target/maven-archiver/pom.properties | 2 +- 13 files changed, 49 insertions(+), 42 deletions(-) rename {dhp-applications/dhp-mdstore-manager-app/src/main/java/eu/dnetlib/data/mdstore/manager => dhp-common/src/main/java/eu/dnetlib/data/mdstore/manager/common}/model/MDStore.java (97%) rename {dhp-applications/dhp-mdstore-manager-app/src/main/java/eu/dnetlib/data/mdstore/manager => dhp-common/src/main/java/eu/dnetlib/data/mdstore/manager/common}/model/MDStoreCurrentVersion.java (95%) rename {dhp-applications/dhp-mdstore-manager-app/src/main/java/eu/dnetlib/data/mdstore/manager => dhp-common/src/main/java/eu/dnetlib/data/mdstore/manager/common}/model/MDStoreVersion.java (97%) rename {dhp-applications/dhp-mdstore-manager-app/src/main/java/eu/dnetlib/data/mdstore/manager => dhp-common/src/main/java/eu/dnetlib/data/mdstore/manager/common}/model/MDStoreWithInfo.java (98%) diff --git a/dhp-applications/dhp-mdstore-manager-app/pom.xml b/dhp-applications/dhp-mdstore-manager-app/pom.xml index 066b33981..292a3ca34 100644 --- a/dhp-applications/dhp-mdstore-manager-app/pom.xml +++ b/dhp-applications/dhp-mdstore-manager-app/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - eu.dnetlib + eu.dnetlib.dhp dhp-mdstore-manager-app 1.1.0-SNAPSHOT @@ -55,6 +55,13 @@ commons-io 2.6 + + + + eu.dnetlib.dhp + dhp-common + 1.0.0-SNAPSHOT + diff --git a/dhp-applications/dhp-mdstore-manager-app/src/main/java/eu/dnetlib/data/mdstore/manager/controller/MDStoreController.java b/dhp-applications/dhp-mdstore-manager-app/src/main/java/eu/dnetlib/data/mdstore/manager/controller/MDStoreController.java index 06c2c3036..4cad53fc3 100644 --- a/dhp-applications/dhp-mdstore-manager-app/src/main/java/eu/dnetlib/data/mdstore/manager/controller/MDStoreController.java +++ b/dhp-applications/dhp-mdstore-manager-app/src/main/java/eu/dnetlib/data/mdstore/manager/controller/MDStoreController.java @@ -17,12 +17,12 @@ import org.springframework.web.bind.annotation.RestController; import com.google.common.collect.Lists; +import eu.dnetlib.data.mdstore.manager.common.model.MDStore; +import eu.dnetlib.data.mdstore.manager.common.model.MDStoreCurrentVersion; +import eu.dnetlib.data.mdstore.manager.common.model.MDStoreVersion; +import eu.dnetlib.data.mdstore.manager.common.model.MDStoreWithInfo; import eu.dnetlib.data.mdstore.manager.exceptions.MDStoreManagerException; import eu.dnetlib.data.mdstore.manager.exceptions.NoContentException; -import eu.dnetlib.data.mdstore.manager.model.MDStore; -import eu.dnetlib.data.mdstore.manager.model.MDStoreCurrentVersion; -import eu.dnetlib.data.mdstore.manager.model.MDStoreVersion; -import eu.dnetlib.data.mdstore.manager.model.MDStoreWithInfo; import eu.dnetlib.data.mdstore.manager.repository.MDStoreCurrentVersionRepository; import eu.dnetlib.data.mdstore.manager.repository.MDStoreRepository; import eu.dnetlib.data.mdstore.manager.repository.MDStoreVersionRepository; @@ -72,7 +72,7 @@ public class MDStoreController { } @ApiOperation(value = "Create a new mdstore") - @RequestMapping(value = "/new/{format}/{layout}/{interpretation}", method = RequestMethod.PUT) + @RequestMapping(value = "/new/{format}/{layout}/{interpretation}", method = RequestMethod.GET) public MDStoreWithInfo createMDStore( @ApiParam("mdstore format") @PathVariable final String format, @ApiParam("mdstore layout") @PathVariable final String layout, diff --git a/dhp-applications/dhp-mdstore-manager-app/src/main/java/eu/dnetlib/data/mdstore/manager/repository/MDStoreCurrentVersionRepository.java b/dhp-applications/dhp-mdstore-manager-app/src/main/java/eu/dnetlib/data/mdstore/manager/repository/MDStoreCurrentVersionRepository.java index aabdac875..e78a4dc16 100644 --- a/dhp-applications/dhp-mdstore-manager-app/src/main/java/eu/dnetlib/data/mdstore/manager/repository/MDStoreCurrentVersionRepository.java +++ b/dhp-applications/dhp-mdstore-manager-app/src/main/java/eu/dnetlib/data/mdstore/manager/repository/MDStoreCurrentVersionRepository.java @@ -3,7 +3,7 @@ package eu.dnetlib.data.mdstore.manager.repository; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import eu.dnetlib.data.mdstore.manager.model.MDStoreCurrentVersion; +import eu.dnetlib.data.mdstore.manager.common.model.MDStoreCurrentVersion; @Repository public interface MDStoreCurrentVersionRepository extends JpaRepository { diff --git a/dhp-applications/dhp-mdstore-manager-app/src/main/java/eu/dnetlib/data/mdstore/manager/repository/MDStoreRepository.java b/dhp-applications/dhp-mdstore-manager-app/src/main/java/eu/dnetlib/data/mdstore/manager/repository/MDStoreRepository.java index ab499a3a1..14c50020d 100644 --- a/dhp-applications/dhp-mdstore-manager-app/src/main/java/eu/dnetlib/data/mdstore/manager/repository/MDStoreRepository.java +++ b/dhp-applications/dhp-mdstore-manager-app/src/main/java/eu/dnetlib/data/mdstore/manager/repository/MDStoreRepository.java @@ -3,7 +3,7 @@ package eu.dnetlib.data.mdstore.manager.repository; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import eu.dnetlib.data.mdstore.manager.model.MDStore; +import eu.dnetlib.data.mdstore.manager.common.model.MDStore; @Repository public interface MDStoreRepository extends JpaRepository { diff --git a/dhp-applications/dhp-mdstore-manager-app/src/main/java/eu/dnetlib/data/mdstore/manager/repository/MDStoreVersionRepository.java b/dhp-applications/dhp-mdstore-manager-app/src/main/java/eu/dnetlib/data/mdstore/manager/repository/MDStoreVersionRepository.java index f0f0a1ae8..e5a10e12f 100644 --- a/dhp-applications/dhp-mdstore-manager-app/src/main/java/eu/dnetlib/data/mdstore/manager/repository/MDStoreVersionRepository.java +++ b/dhp-applications/dhp-mdstore-manager-app/src/main/java/eu/dnetlib/data/mdstore/manager/repository/MDStoreVersionRepository.java @@ -3,7 +3,7 @@ package eu.dnetlib.data.mdstore.manager.repository; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import eu.dnetlib.data.mdstore.manager.model.MDStoreVersion; +import eu.dnetlib.data.mdstore.manager.common.model.MDStoreVersion; @Repository public interface MDStoreVersionRepository extends JpaRepository { diff --git a/dhp-applications/dhp-mdstore-manager-app/src/main/java/eu/dnetlib/data/mdstore/manager/repository/MDStoreWithInfoRepository.java b/dhp-applications/dhp-mdstore-manager-app/src/main/java/eu/dnetlib/data/mdstore/manager/repository/MDStoreWithInfoRepository.java index 3a8608ba2..a13e0fd18 100644 --- a/dhp-applications/dhp-mdstore-manager-app/src/main/java/eu/dnetlib/data/mdstore/manager/repository/MDStoreWithInfoRepository.java +++ b/dhp-applications/dhp-mdstore-manager-app/src/main/java/eu/dnetlib/data/mdstore/manager/repository/MDStoreWithInfoRepository.java @@ -2,7 +2,7 @@ package eu.dnetlib.data.mdstore.manager.repository; import org.springframework.stereotype.Repository; -import eu.dnetlib.data.mdstore.manager.model.MDStoreWithInfo; +import eu.dnetlib.data.mdstore.manager.common.model.MDStoreWithInfo; @Repository public interface MDStoreWithInfoRepository extends ReadOnlyRepository { diff --git a/dhp-applications/dhp-mdstore-manager-app/src/main/resources/static/js/mdstoremanager.js b/dhp-applications/dhp-mdstore-manager-app/src/main/resources/static/js/mdstoremanager.js index 5d9f61717..b92c78766 100644 --- a/dhp-applications/dhp-mdstore-manager-app/src/main/resources/static/js/mdstoremanager.js +++ b/dhp-applications/dhp-mdstore-manager-app/src/main/resources/static/js/mdstoremanager.js @@ -21,7 +21,7 @@ app.controller('mdstoreManagerController', function($scope, $http) { if (dsName || dsId || apiId) { url += '?dsName=' + encodeURIComponent(dsName) + '&dsId=' + encodeURIComponent(dsId) + '&apiId=' + encodeURIComponent(apiId); } - $http.put(url).success(function(data) { + $http.get(url).success(function(data) { $scope.reload(); }).error(function() { alert("error"); diff --git a/dhp-common/pom.xml b/dhp-common/pom.xml index 8b66ddae2..3b7b6aca3 100644 --- a/dhp-common/pom.xml +++ b/dhp-common/pom.xml @@ -1,33 +1,33 @@ - 4.0.0 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - eu.dnetlib.dhp - dhp - 1.0.0-SNAPSHOT - + + eu.dnetlib.dhp + dhp + 1.0.0-SNAPSHOT + - dhp-common - jar + dhp-common + jar - - - org.apache.commons - commons-lang3 - - - commons-codec - commons-codec - + + + org.apache.commons + commons-lang3 + + + commons-codec + commons-codec + + + javax.persistence + javax.persistence-api + 2.2 + provided + + - - - - - - - diff --git a/dhp-applications/dhp-mdstore-manager-app/src/main/java/eu/dnetlib/data/mdstore/manager/model/MDStore.java b/dhp-common/src/main/java/eu/dnetlib/data/mdstore/manager/common/model/MDStore.java similarity index 97% rename from dhp-applications/dhp-mdstore-manager-app/src/main/java/eu/dnetlib/data/mdstore/manager/model/MDStore.java rename to dhp-common/src/main/java/eu/dnetlib/data/mdstore/manager/common/model/MDStore.java index 5a4ce8a5e..478bda440 100644 --- a/dhp-applications/dhp-mdstore-manager-app/src/main/java/eu/dnetlib/data/mdstore/manager/model/MDStore.java +++ b/dhp-common/src/main/java/eu/dnetlib/data/mdstore/manager/common/model/MDStore.java @@ -1,4 +1,4 @@ -package eu.dnetlib.data.mdstore.manager.model; +package eu.dnetlib.data.mdstore.manager.common.model; import java.io.Serializable; import java.util.UUID; diff --git a/dhp-applications/dhp-mdstore-manager-app/src/main/java/eu/dnetlib/data/mdstore/manager/model/MDStoreCurrentVersion.java b/dhp-common/src/main/java/eu/dnetlib/data/mdstore/manager/common/model/MDStoreCurrentVersion.java similarity index 95% rename from dhp-applications/dhp-mdstore-manager-app/src/main/java/eu/dnetlib/data/mdstore/manager/model/MDStoreCurrentVersion.java rename to dhp-common/src/main/java/eu/dnetlib/data/mdstore/manager/common/model/MDStoreCurrentVersion.java index 1c504468f..2a52d0d1d 100644 --- a/dhp-applications/dhp-mdstore-manager-app/src/main/java/eu/dnetlib/data/mdstore/manager/model/MDStoreCurrentVersion.java +++ b/dhp-common/src/main/java/eu/dnetlib/data/mdstore/manager/common/model/MDStoreCurrentVersion.java @@ -1,4 +1,4 @@ -package eu.dnetlib.data.mdstore.manager.model; +package eu.dnetlib.data.mdstore.manager.common.model; import java.io.Serializable; diff --git a/dhp-applications/dhp-mdstore-manager-app/src/main/java/eu/dnetlib/data/mdstore/manager/model/MDStoreVersion.java b/dhp-common/src/main/java/eu/dnetlib/data/mdstore/manager/common/model/MDStoreVersion.java similarity index 97% rename from dhp-applications/dhp-mdstore-manager-app/src/main/java/eu/dnetlib/data/mdstore/manager/model/MDStoreVersion.java rename to dhp-common/src/main/java/eu/dnetlib/data/mdstore/manager/common/model/MDStoreVersion.java index 9a9f3b871..4ad6f137c 100644 --- a/dhp-applications/dhp-mdstore-manager-app/src/main/java/eu/dnetlib/data/mdstore/manager/model/MDStoreVersion.java +++ b/dhp-common/src/main/java/eu/dnetlib/data/mdstore/manager/common/model/MDStoreVersion.java @@ -1,4 +1,4 @@ -package eu.dnetlib.data.mdstore.manager.model; +package eu.dnetlib.data.mdstore.manager.common.model; import java.io.Serializable; import java.util.Date; diff --git a/dhp-applications/dhp-mdstore-manager-app/src/main/java/eu/dnetlib/data/mdstore/manager/model/MDStoreWithInfo.java b/dhp-common/src/main/java/eu/dnetlib/data/mdstore/manager/common/model/MDStoreWithInfo.java similarity index 98% rename from dhp-applications/dhp-mdstore-manager-app/src/main/java/eu/dnetlib/data/mdstore/manager/model/MDStoreWithInfo.java rename to dhp-common/src/main/java/eu/dnetlib/data/mdstore/manager/common/model/MDStoreWithInfo.java index 066b6c6b2..dfe188f54 100644 --- a/dhp-applications/dhp-mdstore-manager-app/src/main/java/eu/dnetlib/data/mdstore/manager/model/MDStoreWithInfo.java +++ b/dhp-common/src/main/java/eu/dnetlib/data/mdstore/manager/common/model/MDStoreWithInfo.java @@ -1,4 +1,4 @@ -package eu.dnetlib.data.mdstore.manager.model; +package eu.dnetlib.data.mdstore.manager.common.model; import java.io.Serializable; import java.util.Date; diff --git a/dhp-workflows/dhp-collector-worker/target/maven-archiver/pom.properties b/dhp-workflows/dhp-collector-worker/target/maven-archiver/pom.properties index 6b3be9ca3..ef502424b 100644 --- a/dhp-workflows/dhp-collector-worker/target/maven-archiver/pom.properties +++ b/dhp-workflows/dhp-collector-worker/target/maven-archiver/pom.properties @@ -1,4 +1,4 @@ -#Created by Apache Maven 3.5.2 +#Created by Apache Maven 3.6.0 version=1.0.0 groupId=eu.dnetlib artifactId=dhp-collector-worker