diff --git a/README.md b/README.md index 09d7cf3..6b58334 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -# client-management +# Developers API diff --git a/pom.xml b/pom.xml index d4f46e5..531d2e2 100644 --- a/pom.xml +++ b/pom.xml @@ -6,12 +6,12 @@ uoa-spring-boot-parent 1.0.0 - client-management + developers-api 1.0-SNAPSHOT war - client-management + developers-api - scm:git:gitea@code-repo.d4science.org:MaDgIK/client-management.git + scm:git:gitea@code-repo.d4science.org:MaDgIK/developers-api.git HEAD @@ -60,7 +60,7 @@ spring-boot-maven-plugin ${spring-boot-version} - eu.dnetlib.clientmanagement.ClientManagementApplication + eu.dnetlib.developers.ClientManagementApplication true diff --git a/scripts/updates/2023-06-21.sql b/scripts/updates/2023-06-21.sql index 2418a69..d99e700 100644 --- a/scripts/updates/2023-06-21.sql +++ b/scripts/updates/2023-06-21.sql @@ -11,5 +11,4 @@ CREATE TABLE IF NOT EXISTS personal_info ); ALTER TABLE ONLY personal_info DROP CONSTRAINT IF EXISTS personal_info_pkey; - ALTER TABLE ONLY personal_info ADD CONSTRAINT personal_info_pkey PRIMARY KEY (id); diff --git a/scripts/updates/2023-07-13.sql b/scripts/updates/2023-07-13.sql new file mode 100644 index 0000000..8941095 --- /dev/null +++ b/scripts/updates/2023-07-13.sql @@ -0,0 +1,4 @@ +ALTER TABLE ONLY personal_info ADD COLUMN affilation_type character varying(255); +ALTER TABLE ONLY registered_service ADD COLUMN description character varying(255); +ALTER TABLE ONLY registered_service ADD COLUMN frequency character varying(255); +ALTER TABLE ONLY registered_service ADD COLUMN target text[]; diff --git a/src/main/java/eu/dnetlib/clientmanagement/ClientManagementApplication.java b/src/main/java/eu/dnetlib/developers/ClientManagementApplication.java similarity index 79% rename from src/main/java/eu/dnetlib/clientmanagement/ClientManagementApplication.java rename to src/main/java/eu/dnetlib/developers/ClientManagementApplication.java index 6c8a649..34b5f71 100644 --- a/src/main/java/eu/dnetlib/clientmanagement/ClientManagementApplication.java +++ b/src/main/java/eu/dnetlib/developers/ClientManagementApplication.java @@ -1,7 +1,7 @@ -package eu.dnetlib.clientmanagement; +package eu.dnetlib.developers; import eu.dnetlib.authentication.configuration.AuthenticationConfiguration; -import eu.dnetlib.clientmanagement.configuration.Properties; +import eu.dnetlib.developers.configuration.Properties; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -9,10 +9,10 @@ import org.springframework.context.annotation.Import; import org.springframework.context.annotation.PropertySource; import org.springframework.context.annotation.PropertySources; -@SpringBootApplication(scanBasePackages = {"eu.dnetlib.clientmanagement"}) +@SpringBootApplication(scanBasePackages = {"eu.dnetlib.developers"}) @PropertySources({ @PropertySource("classpath:authentication.properties"), - @PropertySource("classpath:client-management.properties"), + @PropertySource("classpath:developers.properties"), @PropertySource(value = "classpath:dnet-override.properties", ignoreResourceNotFound = true) }) @Import({AuthenticationConfiguration.class}) diff --git a/src/main/java/eu/dnetlib/clientmanagement/ServletInitializer.java b/src/main/java/eu/dnetlib/developers/ServletInitializer.java similarity index 91% rename from src/main/java/eu/dnetlib/clientmanagement/ServletInitializer.java rename to src/main/java/eu/dnetlib/developers/ServletInitializer.java index af42aa1..408d637 100644 --- a/src/main/java/eu/dnetlib/clientmanagement/ServletInitializer.java +++ b/src/main/java/eu/dnetlib/developers/ServletInitializer.java @@ -1,4 +1,4 @@ -package eu.dnetlib.clientmanagement; +package eu.dnetlib.developers; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.support.SpringBootServletInitializer; diff --git a/src/main/java/eu/dnetlib/clientmanagement/configuration/DataSourceConfig.java b/src/main/java/eu/dnetlib/developers/configuration/DataSourceConfig.java similarity index 94% rename from src/main/java/eu/dnetlib/clientmanagement/configuration/DataSourceConfig.java rename to src/main/java/eu/dnetlib/developers/configuration/DataSourceConfig.java index 5e81e75..f2dd1ac 100644 --- a/src/main/java/eu/dnetlib/clientmanagement/configuration/DataSourceConfig.java +++ b/src/main/java/eu/dnetlib/developers/configuration/DataSourceConfig.java @@ -1,4 +1,4 @@ -package eu.dnetlib.clientmanagement.configuration; +package eu.dnetlib.developers.configuration; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/eu/dnetlib/clientmanagement/configuration/Datasource.java b/src/main/java/eu/dnetlib/developers/configuration/Datasource.java similarity index 93% rename from src/main/java/eu/dnetlib/clientmanagement/configuration/Datasource.java rename to src/main/java/eu/dnetlib/developers/configuration/Datasource.java index f9adf26..ce1e6ce 100644 --- a/src/main/java/eu/dnetlib/clientmanagement/configuration/Datasource.java +++ b/src/main/java/eu/dnetlib/developers/configuration/Datasource.java @@ -1,4 +1,4 @@ -package eu.dnetlib.clientmanagement.configuration; +package eu.dnetlib.developers.configuration; public class Datasource { private String driver; diff --git a/src/main/java/eu/dnetlib/clientmanagement/configuration/Properties.java b/src/main/java/eu/dnetlib/developers/configuration/Properties.java similarity index 83% rename from src/main/java/eu/dnetlib/clientmanagement/configuration/Properties.java rename to src/main/java/eu/dnetlib/developers/configuration/Properties.java index 0a57bc5..544f3fc 100644 --- a/src/main/java/eu/dnetlib/clientmanagement/configuration/Properties.java +++ b/src/main/java/eu/dnetlib/developers/configuration/Properties.java @@ -1,8 +1,8 @@ -package eu.dnetlib.clientmanagement.configuration; +package eu.dnetlib.developers.configuration; import org.springframework.boot.context.properties.ConfigurationProperties; -@ConfigurationProperties("client-management") +@ConfigurationProperties("developers") public class Properties { Datasource datasource; String issuer; diff --git a/src/main/java/eu/dnetlib/clientmanagement/configuration/SwaggerConfig.java b/src/main/java/eu/dnetlib/developers/configuration/SwaggerConfig.java similarity index 98% rename from src/main/java/eu/dnetlib/clientmanagement/configuration/SwaggerConfig.java rename to src/main/java/eu/dnetlib/developers/configuration/SwaggerConfig.java index e7052eb..176febf 100644 --- a/src/main/java/eu/dnetlib/clientmanagement/configuration/SwaggerConfig.java +++ b/src/main/java/eu/dnetlib/developers/configuration/SwaggerConfig.java @@ -1,4 +1,4 @@ -package eu.dnetlib.clientmanagement.configuration; +package eu.dnetlib.developers.configuration; import eu.dnetlib.authentication.configuration.APIProperties; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/eu/dnetlib/clientmanagement/controllers/APIController.java b/src/main/java/eu/dnetlib/developers/controllers/APIController.java similarity index 90% rename from src/main/java/eu/dnetlib/clientmanagement/controllers/APIController.java rename to src/main/java/eu/dnetlib/developers/controllers/APIController.java index f70af8b..8fdd952 100644 --- a/src/main/java/eu/dnetlib/clientmanagement/controllers/APIController.java +++ b/src/main/java/eu/dnetlib/developers/controllers/APIController.java @@ -1,9 +1,9 @@ -package eu.dnetlib.clientmanagement.controllers; +package eu.dnetlib.developers.controllers; -import eu.dnetlib.clientmanagement.dto.RegisteredAT; -import eu.dnetlib.clientmanagement.dto.API; -import eu.dnetlib.clientmanagement.dto.ServiceForm; -import eu.dnetlib.clientmanagement.services.APIService; +import eu.dnetlib.developers.dto.RegisteredAT; +import eu.dnetlib.developers.dto.API; +import eu.dnetlib.developers.dto.ServiceForm; +import eu.dnetlib.developers.services.APIService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; diff --git a/src/main/java/eu/dnetlib/clientmanagement/controllers/HealthController.java b/src/main/java/eu/dnetlib/developers/controllers/HealthController.java similarity index 88% rename from src/main/java/eu/dnetlib/clientmanagement/controllers/HealthController.java rename to src/main/java/eu/dnetlib/developers/controllers/HealthController.java index 6db9b6f..0bd9fdb 100644 --- a/src/main/java/eu/dnetlib/clientmanagement/controllers/HealthController.java +++ b/src/main/java/eu/dnetlib/developers/controllers/HealthController.java @@ -1,4 +1,4 @@ -package eu.dnetlib.clientmanagement.controllers; +package eu.dnetlib.developers.controllers; import eu.dnetlib.authentication.configuration.AuthenticationConfiguration; import org.apache.logging.log4j.LogManager; @@ -23,8 +23,8 @@ public class HealthController { @RequestMapping(value = {"", "/health_check"}, method = RequestMethod.GET) public String hello() { - log.debug("Hello from Client Management service!"); - return "Hello from Client Management service!"; + log.debug("Hello from Developers API service!"); + return "Hello from Developers API service!"; } @PreAuthorize("hasAnyAuthority('PORTAL_ADMINISTRATOR')") diff --git a/src/main/java/eu/dnetlib/clientmanagement/controllers/PersonalInfoController.java b/src/main/java/eu/dnetlib/developers/controllers/PersonalInfoController.java similarity index 88% rename from src/main/java/eu/dnetlib/clientmanagement/controllers/PersonalInfoController.java rename to src/main/java/eu/dnetlib/developers/controllers/PersonalInfoController.java index d3b71f6..0ba7a98 100644 --- a/src/main/java/eu/dnetlib/clientmanagement/controllers/PersonalInfoController.java +++ b/src/main/java/eu/dnetlib/developers/controllers/PersonalInfoController.java @@ -1,7 +1,7 @@ -package eu.dnetlib.clientmanagement.controllers; +package eu.dnetlib.developers.controllers; -import eu.dnetlib.clientmanagement.entities.PersonalInfo; -import eu.dnetlib.clientmanagement.services.PersonalInfoService; +import eu.dnetlib.developers.entities.PersonalInfo; +import eu.dnetlib.developers.services.PersonalInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; diff --git a/src/main/java/eu/dnetlib/clientmanagement/dto/API.java b/src/main/java/eu/dnetlib/developers/dto/API.java similarity index 81% rename from src/main/java/eu/dnetlib/clientmanagement/dto/API.java rename to src/main/java/eu/dnetlib/developers/dto/API.java index 56eb85b..76f6077 100644 --- a/src/main/java/eu/dnetlib/clientmanagement/dto/API.java +++ b/src/main/java/eu/dnetlib/developers/dto/API.java @@ -1,6 +1,6 @@ -package eu.dnetlib.clientmanagement.dto; +package eu.dnetlib.developers.dto; -import eu.dnetlib.clientmanagement.entities.RegisteredService; +import eu.dnetlib.developers.entities.RegisteredService; public class API { private RegisteredService service; diff --git a/src/main/java/eu/dnetlib/clientmanagement/dto/Jwks.java b/src/main/java/eu/dnetlib/developers/dto/Jwks.java similarity index 88% rename from src/main/java/eu/dnetlib/clientmanagement/dto/Jwks.java rename to src/main/java/eu/dnetlib/developers/dto/Jwks.java index 30f5ee1..606f6a7 100644 --- a/src/main/java/eu/dnetlib/clientmanagement/dto/Jwks.java +++ b/src/main/java/eu/dnetlib/developers/dto/Jwks.java @@ -1,4 +1,4 @@ -package eu.dnetlib.clientmanagement.dto; +package eu.dnetlib.developers.dto; import java.io.Serializable; diff --git a/src/main/java/eu/dnetlib/clientmanagement/dto/JwksDeserializer.java b/src/main/java/eu/dnetlib/developers/dto/JwksDeserializer.java similarity index 97% rename from src/main/java/eu/dnetlib/clientmanagement/dto/JwksDeserializer.java rename to src/main/java/eu/dnetlib/developers/dto/JwksDeserializer.java index f8e20e5..5fa4d1e 100644 --- a/src/main/java/eu/dnetlib/clientmanagement/dto/JwksDeserializer.java +++ b/src/main/java/eu/dnetlib/developers/dto/JwksDeserializer.java @@ -1,4 +1,4 @@ -package eu.dnetlib.clientmanagement.dto; +package eu.dnetlib.developers.dto; import com.google.gson.*; diff --git a/src/main/java/eu/dnetlib/clientmanagement/dto/Key.java b/src/main/java/eu/dnetlib/developers/dto/Key.java similarity index 94% rename from src/main/java/eu/dnetlib/clientmanagement/dto/Key.java rename to src/main/java/eu/dnetlib/developers/dto/Key.java index 2f362ad..1c92d0a 100644 --- a/src/main/java/eu/dnetlib/clientmanagement/dto/Key.java +++ b/src/main/java/eu/dnetlib/developers/dto/Key.java @@ -1,4 +1,4 @@ -package eu.dnetlib.clientmanagement.dto; +package eu.dnetlib.developers.dto; import java.io.Serializable; diff --git a/src/main/java/eu/dnetlib/clientmanagement/dto/RegisteredAT.java b/src/main/java/eu/dnetlib/developers/dto/RegisteredAT.java similarity index 94% rename from src/main/java/eu/dnetlib/clientmanagement/dto/RegisteredAT.java rename to src/main/java/eu/dnetlib/developers/dto/RegisteredAT.java index c9253f1..7e12e4c 100644 --- a/src/main/java/eu/dnetlib/clientmanagement/dto/RegisteredAT.java +++ b/src/main/java/eu/dnetlib/developers/dto/RegisteredAT.java @@ -1,4 +1,4 @@ -package eu.dnetlib.clientmanagement.dto; +package eu.dnetlib.developers.dto; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/eu/dnetlib/clientmanagement/dto/ServiceForm.java b/src/main/java/eu/dnetlib/developers/dto/ServiceForm.java similarity index 97% rename from src/main/java/eu/dnetlib/clientmanagement/dto/ServiceForm.java rename to src/main/java/eu/dnetlib/developers/dto/ServiceForm.java index ee9ebbe..b8e3682 100644 --- a/src/main/java/eu/dnetlib/clientmanagement/dto/ServiceForm.java +++ b/src/main/java/eu/dnetlib/developers/dto/ServiceForm.java @@ -1,4 +1,4 @@ -package eu.dnetlib.clientmanagement.dto; +package eu.dnetlib.developers.dto; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/eu/dnetlib/clientmanagement/dto/ServiceRequest.java b/src/main/java/eu/dnetlib/developers/dto/ServiceRequest.java similarity index 98% rename from src/main/java/eu/dnetlib/clientmanagement/dto/ServiceRequest.java rename to src/main/java/eu/dnetlib/developers/dto/ServiceRequest.java index 6920998..19c701b 100644 --- a/src/main/java/eu/dnetlib/clientmanagement/dto/ServiceRequest.java +++ b/src/main/java/eu/dnetlib/developers/dto/ServiceRequest.java @@ -1,4 +1,4 @@ -package eu.dnetlib.clientmanagement.dto; +package eu.dnetlib.developers.dto; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/src/main/java/eu/dnetlib/clientmanagement/dto/ServiceResponse.java b/src/main/java/eu/dnetlib/developers/dto/ServiceResponse.java similarity index 98% rename from src/main/java/eu/dnetlib/clientmanagement/dto/ServiceResponse.java rename to src/main/java/eu/dnetlib/developers/dto/ServiceResponse.java index 9faaf00..19cf1a6 100644 --- a/src/main/java/eu/dnetlib/clientmanagement/dto/ServiceResponse.java +++ b/src/main/java/eu/dnetlib/developers/dto/ServiceResponse.java @@ -1,4 +1,4 @@ -package eu.dnetlib.clientmanagement.dto; +package eu.dnetlib.developers.dto; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/src/main/java/eu/dnetlib/clientmanagement/entities/PersonalInfo.java b/src/main/java/eu/dnetlib/developers/entities/PersonalInfo.java similarity index 96% rename from src/main/java/eu/dnetlib/clientmanagement/entities/PersonalInfo.java rename to src/main/java/eu/dnetlib/developers/entities/PersonalInfo.java index fd98620..e6bf4fd 100644 --- a/src/main/java/eu/dnetlib/clientmanagement/entities/PersonalInfo.java +++ b/src/main/java/eu/dnetlib/developers/entities/PersonalInfo.java @@ -1,4 +1,4 @@ -package eu.dnetlib.clientmanagement.entities; +package eu.dnetlib.developers.entities; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/main/java/eu/dnetlib/clientmanagement/entities/RegisteredService.java b/src/main/java/eu/dnetlib/developers/entities/RegisteredService.java similarity index 97% rename from src/main/java/eu/dnetlib/clientmanagement/entities/RegisteredService.java rename to src/main/java/eu/dnetlib/developers/entities/RegisteredService.java index 5d5d932..fee051a 100644 --- a/src/main/java/eu/dnetlib/clientmanagement/entities/RegisteredService.java +++ b/src/main/java/eu/dnetlib/developers/entities/RegisteredService.java @@ -1,4 +1,4 @@ -package eu.dnetlib.clientmanagement.entities; +package eu.dnetlib.developers.entities; import javax.persistence.*; import java.util.Date; diff --git a/src/main/java/eu/dnetlib/clientmanagement/exceptions/EntityMissingException.java b/src/main/java/eu/dnetlib/developers/exceptions/EntityMissingException.java similarity index 86% rename from src/main/java/eu/dnetlib/clientmanagement/exceptions/EntityMissingException.java rename to src/main/java/eu/dnetlib/developers/exceptions/EntityMissingException.java index 54c0ec4..309de39 100644 --- a/src/main/java/eu/dnetlib/clientmanagement/exceptions/EntityMissingException.java +++ b/src/main/java/eu/dnetlib/developers/exceptions/EntityMissingException.java @@ -1,4 +1,4 @@ -package eu.dnetlib.clientmanagement.exceptions; +package eu.dnetlib.developers.exceptions; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ResponseStatus; diff --git a/src/main/java/eu/dnetlib/clientmanagement/exceptions/EntityNotFoundException.java b/src/main/java/eu/dnetlib/developers/exceptions/EntityNotFoundException.java similarity index 86% rename from src/main/java/eu/dnetlib/clientmanagement/exceptions/EntityNotFoundException.java rename to src/main/java/eu/dnetlib/developers/exceptions/EntityNotFoundException.java index a78ebf9..0a33305 100644 --- a/src/main/java/eu/dnetlib/clientmanagement/exceptions/EntityNotFoundException.java +++ b/src/main/java/eu/dnetlib/developers/exceptions/EntityNotFoundException.java @@ -1,4 +1,4 @@ -package eu.dnetlib.clientmanagement.exceptions; +package eu.dnetlib.developers.exceptions; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ResponseStatus; diff --git a/src/main/java/eu/dnetlib/clientmanagement/exceptions/ForbiddenException.java b/src/main/java/eu/dnetlib/developers/exceptions/ForbiddenException.java similarity index 85% rename from src/main/java/eu/dnetlib/clientmanagement/exceptions/ForbiddenException.java rename to src/main/java/eu/dnetlib/developers/exceptions/ForbiddenException.java index 14a3985..022d498 100644 --- a/src/main/java/eu/dnetlib/clientmanagement/exceptions/ForbiddenException.java +++ b/src/main/java/eu/dnetlib/developers/exceptions/ForbiddenException.java @@ -1,4 +1,4 @@ -package eu.dnetlib.clientmanagement.exceptions; +package eu.dnetlib.developers.exceptions; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ResponseStatus; diff --git a/src/main/java/eu/dnetlib/clientmanagement/repositories/PersonalInfoDAO.java b/src/main/java/eu/dnetlib/developers/repositories/PersonalInfoDAO.java similarity index 63% rename from src/main/java/eu/dnetlib/clientmanagement/repositories/PersonalInfoDAO.java rename to src/main/java/eu/dnetlib/developers/repositories/PersonalInfoDAO.java index fbda9b7..5b54efa 100644 --- a/src/main/java/eu/dnetlib/clientmanagement/repositories/PersonalInfoDAO.java +++ b/src/main/java/eu/dnetlib/developers/repositories/PersonalInfoDAO.java @@ -1,8 +1,6 @@ -package eu.dnetlib.clientmanagement.repositories; +package eu.dnetlib.developers.repositories; -import eu.dnetlib.clientmanagement.entities.PersonalInfo; -import eu.dnetlib.clientmanagement.entities.RegisteredService; -import org.springframework.data.jpa.repository.JpaRepository; +import eu.dnetlib.developers.entities.PersonalInfo; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/eu/dnetlib/clientmanagement/repositories/RegisteredServiceDAO.java b/src/main/java/eu/dnetlib/developers/repositories/RegisteredServiceDAO.java similarity index 81% rename from src/main/java/eu/dnetlib/clientmanagement/repositories/RegisteredServiceDAO.java rename to src/main/java/eu/dnetlib/developers/repositories/RegisteredServiceDAO.java index 3b5bf9c..d24a5b2 100644 --- a/src/main/java/eu/dnetlib/clientmanagement/repositories/RegisteredServiceDAO.java +++ b/src/main/java/eu/dnetlib/developers/repositories/RegisteredServiceDAO.java @@ -1,6 +1,6 @@ -package eu.dnetlib.clientmanagement.repositories; +package eu.dnetlib.developers.repositories; -import eu.dnetlib.clientmanagement.entities.RegisteredService; +import eu.dnetlib.developers.entities.RegisteredService; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/eu/dnetlib/clientmanagement/services/APIService.java b/src/main/java/eu/dnetlib/developers/services/APIService.java similarity index 94% rename from src/main/java/eu/dnetlib/clientmanagement/services/APIService.java rename to src/main/java/eu/dnetlib/developers/services/APIService.java index 08d9ba8..db41311 100644 --- a/src/main/java/eu/dnetlib/clientmanagement/services/APIService.java +++ b/src/main/java/eu/dnetlib/developers/services/APIService.java @@ -1,14 +1,14 @@ -package eu.dnetlib.clientmanagement.services; +package eu.dnetlib.developers.services; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import eu.dnetlib.clientmanagement.configuration.Properties; -import eu.dnetlib.clientmanagement.dto.*; -import eu.dnetlib.clientmanagement.entities.RegisteredService; -import eu.dnetlib.clientmanagement.exceptions.EntityMissingException; -import eu.dnetlib.clientmanagement.exceptions.EntityNotFoundException; -import eu.dnetlib.clientmanagement.exceptions.ForbiddenException; -import eu.dnetlib.clientmanagement.repositories.RegisteredServiceDAO; +import eu.dnetlib.developers.configuration.Properties; +import eu.dnetlib.developers.dto.*; +import eu.dnetlib.developers.entities.RegisteredService; +import eu.dnetlib.developers.exceptions.EntityMissingException; +import eu.dnetlib.developers.exceptions.EntityNotFoundException; +import eu.dnetlib.developers.exceptions.ForbiddenException; +import eu.dnetlib.developers.repositories.RegisteredServiceDAO; import org.mitre.openid.connect.model.OIDCAuthenticationToken; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.*; diff --git a/src/main/java/eu/dnetlib/clientmanagement/services/AuthorizationService.java b/src/main/java/eu/dnetlib/developers/services/AuthorizationService.java similarity index 84% rename from src/main/java/eu/dnetlib/clientmanagement/services/AuthorizationService.java rename to src/main/java/eu/dnetlib/developers/services/AuthorizationService.java index 198c8bf..91bb3ac 100644 --- a/src/main/java/eu/dnetlib/clientmanagement/services/AuthorizationService.java +++ b/src/main/java/eu/dnetlib/developers/services/AuthorizationService.java @@ -1,8 +1,8 @@ -package eu.dnetlib.clientmanagement.services; +package eu.dnetlib.developers.services; -import eu.dnetlib.clientmanagement.entities.RegisteredService; -import eu.dnetlib.clientmanagement.repositories.PersonalInfoDAO; -import eu.dnetlib.clientmanagement.repositories.RegisteredServiceDAO; +import eu.dnetlib.developers.entities.RegisteredService; +import eu.dnetlib.developers.repositories.PersonalInfoDAO; +import eu.dnetlib.developers.repositories.RegisteredServiceDAO; import org.mitre.openid.connect.model.OIDCAuthenticationToken; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/src/main/java/eu/dnetlib/clientmanagement/services/PersonalInfoService.java b/src/main/java/eu/dnetlib/developers/services/PersonalInfoService.java similarity index 78% rename from src/main/java/eu/dnetlib/clientmanagement/services/PersonalInfoService.java rename to src/main/java/eu/dnetlib/developers/services/PersonalInfoService.java index 08a20b0..2bcc6c5 100644 --- a/src/main/java/eu/dnetlib/clientmanagement/services/PersonalInfoService.java +++ b/src/main/java/eu/dnetlib/developers/services/PersonalInfoService.java @@ -1,10 +1,8 @@ -package eu.dnetlib.clientmanagement.services; +package eu.dnetlib.developers.services; -import eu.dnetlib.clientmanagement.entities.PersonalInfo; -import eu.dnetlib.clientmanagement.entities.RegisteredService; -import eu.dnetlib.clientmanagement.exceptions.EntityNotFoundException; -import eu.dnetlib.clientmanagement.repositories.PersonalInfoDAO; -import eu.dnetlib.clientmanagement.repositories.RegisteredServiceDAO; +import eu.dnetlib.developers.entities.PersonalInfo; +import eu.dnetlib.developers.exceptions.EntityNotFoundException; +import eu.dnetlib.developers.repositories.PersonalInfoDAO; import org.mitre.openid.connect.model.OIDCAuthenticationToken; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/src/main/resources/client-management.properties b/src/main/resources/client-management.properties deleted file mode 100644 index 731cb17..0000000 --- a/src/main/resources/client-management.properties +++ /dev/null @@ -1,12 +0,0 @@ -client-management.datasource.driver=org.postgresql.Driver -client-management.datasource.url=jdbc:postgresql://dl170.madgik.di.uoa.gr:5432/usersdb -client-management.datasource.username=username -client-management.datasource.password=pass -client-management.issuer=issuer - -spring.jpa.hibernate.ddl-auto=none - -## API Documentation Properties -api.title = Client Management -api.description = Client Management includes authentication methods and provides functionalities to manage OpenAIRE Dynamic AAI Clients. -api.version = ${project.version} diff --git a/src/main/resources/developers.properties b/src/main/resources/developers.properties new file mode 100644 index 0000000..12c5a2d --- /dev/null +++ b/src/main/resources/developers.properties @@ -0,0 +1,12 @@ +developers.datasource.driver=org.postgresql.Driver +developers.datasource.url=jdbc:postgresql://dl170.madgik.di.uoa.gr:5432/usersdb +developers.datasource.username=username +developers.datasource.password=pass +developers.issuer=issuer + +spring.jpa.hibernate.ddl-auto=none + +## API Documentation Properties +api.title = Developers API +api.description = Developers API includes authentication methods and provides functionalities to manage OpenAIRE Dynamic AAI APIs. +api.version = ${project.version} diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml index d353395..41267cd 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -7,8 +7,8 @@ - + ${LOG_PATTERN} @@ -17,8 +17,8 @@ - + ${LOG_PATTERN}