From 1346a198d4b45e38666dc0443fb00e45095d63aa Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 22 May 2024 11:07:42 +0200 Subject: [PATCH] Creating service --- CHANGELOG.md | 8 + FUNDING.md | 26 ++ LICENSE.md | 311 ++++++++++++++++++ README.md | 48 ++- pom.xml | 27 +- .../ResourceInitializer.java | 6 +- ...nitializator.java => ResourceManager.java} | 26 +- .../resourcemanagement/rest/BaseREST.java | 14 +- .../rest/RequestFilter.java | 60 ---- .../rest/ResourceManagerExceptionMapper.java | 12 +- .../rest/administration/Configuration.java | 41 ++- .../rest/annotation/PATCH.java | 2 +- .../rest/annotation/PURGE.java | 2 +- 13 files changed, 439 insertions(+), 144 deletions(-) create mode 100644 CHANGELOG.md create mode 100644 FUNDING.md create mode 100644 LICENSE.md rename src/main/java/org/gcube/resourcemanagement/{ResourceManagerInitializator.java => ResourceManager.java} (73%) delete mode 100644 src/main/java/org/gcube/resourcemanagement/rest/RequestFilter.java diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..6544bf5 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,8 @@ +# Changelog for "HelloWorld" + +All notable changes to this project will be documented in this file. +This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [v1.0.0-SNAPSHOT] + +- First Release \ No newline at end of file diff --git a/FUNDING.md b/FUNDING.md new file mode 100644 index 0000000..6fa9eac --- /dev/null +++ b/FUNDING.md @@ -0,0 +1,26 @@ +# Acknowledgments + +The projects leading to this software have received funding from a series of European Union programmes including: + +- the Sixth Framework Programme for Research and Technological Development + - [DILIGENT](https://cordis.europa.eu/project/id/004260) (grant no. 004260). +- the Seventh Framework Programme for research, technological development and demonstration + - [D4Science](https://cordis.europa.eu/project/id/212488) (grant no. 212488); + - [D4Science-II](https://cordis.europa.eu/project/id/239019) (grant no.239019); + - [ENVRI](https://cordis.europa.eu/project/id/283465) (grant no. 283465); + - [iMarine](https://cordis.europa.eu/project/id/283644) (grant no. 283644); + - [EUBrazilOpenBio](https://cordis.europa.eu/project/id/288754) (grant no. 288754). +- the H2020 research and innovation programme + - [SoBigData](https://cordis.europa.eu/project/id/654024) (grant no. 654024); + - [PARTHENOS](https://cordis.europa.eu/project/id/654119) (grant no. 654119); + - [EGI-Engage](https://cordis.europa.eu/project/id/654142) (grant no. 654142); + - [ENVRI PLUS](https://cordis.europa.eu/project/id/654182) (grant no. 654182); + - [BlueBRIDGE](https://cordis.europa.eu/project/id/675680) (grant no. 675680); + - [PerformFISH](https://cordis.europa.eu/project/id/727610) (grant no. 727610); + - [AGINFRA PLUS](https://cordis.europa.eu/project/id/731001) (grant no. 731001); + - [DESIRA](https://cordis.europa.eu/project/id/818194) (grant no. 818194); + - [ARIADNEplus](https://cordis.europa.eu/project/id/823914) (grant no. 823914); + - [RISIS 2](https://cordis.europa.eu/project/id/824091) (grant no. 824091); + - [EOSC-Pillar](https://cordis.europa.eu/project/id/857650) (grant no. 857650); + - [Blue Cloud](https://cordis.europa.eu/project/id/862409) (grant no. 862409); + - [SoBigData-PlusPlus](https://cordis.europa.eu/project/id/871042) (grant no. 871042); \ No newline at end of file diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..9351ad1 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,311 @@ +#European Union Public Licence V.1.2 + +##*EUPL © the European Community 2007* + + +This **European Union Public Licence** (the **“EUPL”**) applies to the Work or Software +(as defined below) which is provided under the terms of this Licence. Any use of +the Work, other than as authorised under this Licence is prohibited (to the +extent such use is covered by a right of the copyright holder of the Work). + +The Original Work is provided under the terms of this Licence when the Licensor +(as defined below) has placed the following notice immediately following the +copyright notice for the Original Work: + +**Licensed under the EUPL V.1.2** + +or has expressed by any other mean his willingness to license under the EUPL. + + + +##1. Definitions + +In this Licence, the following terms have the following meaning: + +- The Licence: this Licence. + +- The Original Work or the Software: the software distributed and/or + communicated by the Licensor under this Licence, available as Source Code and + also as Executable Code as the case may be. + +- Derivative Works: the works or software that could be created by the Licensee, + based upon the Original Work or modifications thereof. This Licence does not + define the extent of modification or dependence on the Original Work required + in order to classify a work as a Derivative Work; this extent is determined by + copyright law applicable in the country mentioned in Article 15. + +- The Work: the Original Work and/or its Derivative Works. + +- The Source Code: the human-readable form of the Work which is the most + convenient for people to study and modify. + +- The Executable Code: any code which has generally been compiled and which is + meant to be interpreted by a computer as a program. + +- The Licensor: the natural or legal person that distributes and/or communicates + the Work under the Licence. + +- Contributor(s): any natural or legal person who modifies the Work under the + Licence, or otherwise contributes to the creation of a Derivative Work. + +- The Licensee or “You”: any natural or legal person who makes any usage of the + Software under the terms of the Licence. + +- Distribution and/or Communication: any act of selling, giving, lending, + renting, distributing, communicating, transmitting, or otherwise making + available, on-line or off-line, copies of the Work or providing access to its + essential functionalities at the disposal of any other natural or legal + person. + + + +##2. Scope of the rights granted by the Licence + +The Licensor hereby grants You a world-wide, royalty-free, non-exclusive, +sub-licensable licence to do the following, for the duration of copyright vested +in the Original Work: + +- use the Work in any circumstance and for all usage, reproduce the Work, modify +- the Original Work, and make Derivative Works based upon the Work, communicate +- to the public, including the right to make available or display the Work or +- copies thereof to the public and perform publicly, as the case may be, the +- Work, distribute the Work or copies thereof, lend and rent the Work or copies +- thereof, sub-license rights in the Work or copies thereof. + +Those rights can be exercised on any media, supports and formats, whether now +known or later invented, as far as the applicable law permits so. + +In the countries where moral rights apply, the Licensor waives his right to +exercise his moral right to the extent allowed by law in order to make effective +the licence of the economic rights here above listed. + +The Licensor grants to the Licensee royalty-free, non exclusive usage rights to +any patents held by the Licensor, to the extent necessary to make use of the +rights granted on the Work under this Licence. + + + +##3. Communication of the Source Code + +The Licensor may provide the Work either in its Source Code form, or as +Executable Code. If the Work is provided as Executable Code, the Licensor +provides in addition a machine-readable copy of the Source Code of the Work +along with each copy of the Work that the Licensor distributes or indicates, in +a notice following the copyright notice attached to the Work, a repository where +the Source Code is easily and freely accessible for as long as the Licensor +continues to distribute and/or communicate the Work. + + + +##4. Limitations on copyright + +Nothing in this Licence is intended to deprive the Licensee of the benefits from +any exception or limitation to the exclusive rights of the rights owners in the +Original Work or Software, of the exhaustion of those rights or of other +applicable limitations thereto. + + + +##5. Obligations of the Licensee + +The grant of the rights mentioned above is subject to some restrictions and +obligations imposed on the Licensee. Those obligations are the following: + +Attribution right: the Licensee shall keep intact all copyright, patent or +trademarks notices and all notices that refer to the Licence and to the +disclaimer of warranties. The Licensee must include a copy of such notices and a +copy of the Licence with every copy of the Work he/she distributes and/or +communicates. The Licensee must cause any Derivative Work to carry prominent +notices stating that the Work has been modified and the date of modification. + +Copyleft clause: If the Licensee distributes and/or communicates copies of the +Original Works or Derivative Works based upon the Original Work, this +Distribution and/or Communication will be done under the terms of this Licence +or of a later version of this Licence unless the Original Work is expressly +distributed only under this version of the Licence. The Licensee (becoming +Licensor) cannot offer or impose any additional terms or conditions on the Work +or Derivative Work that alter or restrict the terms of the Licence. + +Compatibility clause: If the Licensee Distributes and/or Communicates Derivative +Works or copies thereof based upon both the Original Work and another work +licensed under a Compatible Licence, this Distribution and/or Communication can +be done under the terms of this Compatible Licence. For the sake of this clause, +“Compatible Licence” refers to the licences listed in the appendix attached to +this Licence. Should the Licensee’s obligations under the Compatible Licence +conflict with his/her obligations under this Licence, the obligations of the +Compatible Licence shall prevail. + +Provision of Source Code: When distributing and/or communicating copies of the +Work, the Licensee will provide a machine-readable copy of the Source Code or +indicate a repository where this Source will be easily and freely available for +as long as the Licensee continues to distribute and/or communicate the Work. + +Legal Protection: This Licence does not grant permission to use the trade names, +trademarks, service marks, or names of the Licensor, except as required for +reasonable and customary use in describing the origin of the Work and +reproducing the content of the copyright notice. + + + +##6. Chain of Authorship + +The original Licensor warrants that the copyright in the Original Work granted +hereunder is owned by him/her or licensed to him/her and that he/she has the +power and authority to grant the Licence. + +Each Contributor warrants that the copyright in the modifications he/she brings +to the Work are owned by him/her or licensed to him/her and that he/she has the +power and authority to grant the Licence. + +Each time You accept the Licence, the original Licensor and subsequent +Contributors grant You a licence to their contributions to the Work, under the +terms of this Licence. + + + +##7. Disclaimer of Warranty + +The Work is a work in progress, which is continuously improved by numerous +contributors. It is not a finished work and may therefore contain defects or +“bugs” inherent to this type of software development. + +For the above reason, the Work is provided under the Licence on an “as is” basis +and without warranties of any kind concerning the Work, including without +limitation merchantability, fitness for a particular purpose, absence of defects +or errors, accuracy, non-infringement of intellectual property rights other than +copyright as stated in Article 6 of this Licence. + +This disclaimer of warranty is an essential part of the Licence and a condition +for the grant of any rights to the Work. + + + +##8. Disclaimer of Liability + +Except in the cases of wilful misconduct or damages directly caused to natural +persons, the Licensor will in no event be liable for any direct or indirect, +material or moral, damages of any kind, arising out of the Licence or of the use +of the Work, including without limitation, damages for loss of goodwill, work +stoppage, computer failure or malfunction, loss of data or any commercial +damage, even if the Licensor has been advised of the possibility of such +damage. However, the Licensor will be liable under statutory product liability +laws as far such laws apply to the Work. + + + +##9. Additional agreements + +While distributing the Original Work or Derivative Works, You may choose to +conclude an additional agreement to offer, and charge a fee for, acceptance of +support, warranty, indemnity, or other liability obligations and/or services +consistent with this Licence. However, in accepting such obligations, You may +act only on your own behalf and on your sole responsibility, not on behalf of +the original Licensor or any other Contributor, and only if You agree to +indemnify, defend, and hold each Contributor harmless for any liability incurred +by, or claims asserted against such Contributor by the fact You have accepted +any such warranty or additional liability. + + + +##10. Acceptance of the Licence + +The provisions of this Licence can be accepted by clicking on an icon “I agree” +placed under the bottom of a window displaying the text of this Licence or by +affirming consent in any other similar way, in accordance with the rules of +applicable law. Clicking on that icon indicates your clear and irrevocable +acceptance of this Licence and all of its terms and conditions. + +Similarly, you irrevocably accept this Licence and all of its terms and +conditions by exercising any rights granted to You by Article 2 of this Licence, +such as the use of the Work, the creation by You of a Derivative Work or the +Distribution and/or Communication by You of the Work or copies thereof. + + + +##11. Information to the public + +In case of any Distribution and/or Communication of the Work by means of +electronic communication by You (for example, by offering to download the Work +from a remote location) the distribution channel or media (for example, a +website) must at least provide to the public the information requested by the +applicable law regarding the Licensor, the Licence and the way it may be +accessible, concluded, stored and reproduced by the Licensee. + + + +##12. Termination of the Licence + +The Licence and the rights granted hereunder will terminate automatically upon +any breach by the Licensee of the terms of the Licence. + +Such a termination will not terminate the licences of any person who has +received the Work from the Licensee under the Licence, provided such persons +remain in full compliance with the Licence. + + + +##13. Miscellaneous + +Without prejudice of Article 9 above, the Licence represents the complete +agreement between the Parties as to the Work licensed hereunder. + +If any provision of the Licence is invalid or unenforceable under applicable +law, this will not affect the validity or enforceability of the Licence as a +whole. Such provision will be construed and/or reformed so as necessary to make +it valid and enforceable. + +The European Commission may publish other linguistic versions and/or new +versions of this Licence, so far this is required and reasonable, without +reducing the scope of the rights granted by the Licence. New versions of the +Licence will be published with a unique version number. + +All linguistic versions of this Licence, approved by the European Commission, +have identical value. Parties can take advantage of the linguistic version of +their choice. + + + +##14. Jurisdiction + +Any litigation resulting from the interpretation of this License, arising +between the European Commission, as a Licensor, and any Licensee, will be +subject to the jurisdiction of the Court of Justice of the European Communities, +as laid down in article 238 of the Treaty establishing the European Community. + +Any litigation arising between Parties, other than the European Commission, and +resulting from the interpretation of this License, will be subject to the +exclusive jurisdiction of the competent court where the Licensor resides or +conducts its primary business. + + + +##15. Applicable Law + +This Licence shall be governed by the law of the European Union country where +the Licensor resides or has his registered office. + +This licence shall be governed by the Belgian law if: + +- a litigation arises between the European Commission, as a Licensor, and any +- Licensee; the Licensor, other than the European Commission, has no residence +- or registered office inside a European Union country. + + +--- + + +##Appendix + + +**“Compatible Licences”** according to article 5 EUPL are: + + +- GNU General Public License (GNU GPL) v. 2 + +- Open Software License (OSL) v. 2.1, v. 3.0 + +- Common Public License v. 1.0 + +- Eclipse Public License v. 1.0 + +- Cecill v. 2.0 diff --git a/README.md b/README.md index 7bd4a7f..691d382 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,48 @@ -# resource-manager +# Resource Manager +Resource Manager .... + +## Built With + +* [OpenJDK](https://openjdk.java.net/) - The JDK used +* [Maven](https://maven.apache.org/) - Dependency Management + +## Documentation + + + +## Change log + +See [Releases](https://code-repo.d4science.org/gCubeSystem/resource-manager/releases). + +## Authors + +* **Luca Frosini** ([ORCID](https://orcid.org/0000-0003-3183-2291)) - [ISTI-CNR Infrascience Group](http://nemis.isti.cnr.it/groups/infrascience) + +## How to Cite this Software + +Tell people how to cite this software. +* Cite an associated paper? +* Use a specific BibTeX entry for the software? + + @software{, + title = {gCube Resource Manager}, + author = {{Frosini, Luca}}, + organization = {ISTI - CNR}, + address = {Pisa, Italy}, + year = 2024, + url = {http://www.gcube-system.org/} + } + +## License + +This project is licensed under the EUPL V.1.1 License - see the [LICENSE.md](LICENSE.md) file for details. + + +## About the gCube Framework +This software is part of the [gCubeFramework](https://www.gcube-system.org/ "gCubeFramework"): an +open-source software toolkit used for building and operating Hybrid Data +Infrastructures enabling the dynamic deployment of Virtual Research Environments +by favouring the realisation of reuse oriented policies. + +The projects leading to this software have received funding from a series of European Union programmes see [FUNDING.md](FUNDING.md) diff --git a/pom.xml b/pom.xml index dc67b05..80fb41f 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,10 @@ Resource Manager + 11 UTF-8 + ${java.version} + ${java.version} ${project.basedir}${file.separator}src${file.separator}main${file.separator}webapp${file.separator}WEB-INF 2.14.0 @@ -28,7 +31,7 @@ org.gcube.distribution gcube-smartgears-bom - 2.5.1-SNAPSHOT + 3.0.1-SNAPSHOT pom import @@ -52,11 +55,6 @@ org.gcube.core common-smartgears-app - - org.gcube.common - authorization-utils - [2.2.0, 3.0.0-SNAPSHOT) - org.gcube.information-system information-system-model @@ -81,23 +79,6 @@ org.glassfish.jersey.containers jersey-container-servlet - - javax.ws.rs - javax.ws.rs-api - - - - - javax.xml.ws - jaxws-api - provided - - - org.projectlombok - lombok - provided - - org.gcube.common diff --git a/src/main/java/org/gcube/resourcemanagement/ResourceInitializer.java b/src/main/java/org/gcube/resourcemanagement/ResourceInitializer.java index dc17c1b..c000d47 100644 --- a/src/main/java/org/gcube/resourcemanagement/ResourceInitializer.java +++ b/src/main/java/org/gcube/resourcemanagement/ResourceInitializer.java @@ -1,17 +1,17 @@ package org.gcube.resourcemanagement; -import javax.ws.rs.ApplicationPath; - import org.gcube.resourcemanagement.rest.BaseREST; import org.gcube.resourcemanagement.rest.administration.Configuration; import org.gcube.smartgears.annotations.ManagedBy; import org.glassfish.jersey.server.ResourceConfig; +import jakarta.ws.rs.ApplicationPath; + /** * @author Luca Frosini (ISTI - CNR) */ @ApplicationPath("/") -@ManagedBy(ResourceManagerInitializator.class) +@ManagedBy(ResourceManager.class) public class ResourceInitializer extends ResourceConfig { public ResourceInitializer() { diff --git a/src/main/java/org/gcube/resourcemanagement/ResourceManagerInitializator.java b/src/main/java/org/gcube/resourcemanagement/ResourceManager.java similarity index 73% rename from src/main/java/org/gcube/resourcemanagement/ResourceManagerInitializator.java rename to src/main/java/org/gcube/resourcemanagement/ResourceManager.java index 5a5d311..1eff703 100644 --- a/src/main/java/org/gcube/resourcemanagement/ResourceManagerInitializator.java +++ b/src/main/java/org/gcube/resourcemanagement/ResourceManager.java @@ -1,9 +1,6 @@ package org.gcube.resourcemanagement; -import java.io.IOException; - -import org.gcube.common.authorization.utils.manager.SecretManagerProvider; -import org.gcube.resourcemanagement.rest.RequestFilter; +import org.gcube.common.security.providers.SecretManagerProvider; import org.gcube.smartgears.ApplicationManager; import org.gcube.smartgears.ContextProvider; import org.gcube.smartgears.context.application.ApplicationContext; @@ -13,12 +10,12 @@ import org.slf4j.LoggerFactory; /** * @author Luca Frosini (ISTI - CNR) */ -public class ResourceManagerInitializator implements ApplicationManager { +public class ResourceManager implements ApplicationManager { /** * Logger */ - private static Logger logger = LoggerFactory.getLogger(ResourceManagerInitializator.class); + private static Logger logger = LoggerFactory.getLogger(ResourceManager.class); public static boolean initialised; @@ -31,14 +28,8 @@ public class ResourceManagerInitializator implements ApplicationManager { */ @Override public synchronized void onInit() { - RequestFilter requestFilter = new RequestFilter(); - try { - requestFilter.filter(null); - } catch (IOException e) { - throw new RuntimeException(e); - } - String context = SecretManagerProvider.instance.get().getContext(); + String context = SecretManagerProvider.get().getContext(); logger.trace( "\n-------------------------------------------------------\n" @@ -66,14 +57,7 @@ public class ResourceManagerInitializator implements ApplicationManager { */ @Override public synchronized void onShutdown(){ - RequestFilter requestFilter = new RequestFilter(); - try { - requestFilter.filter(null); - } catch (IOException e) { - throw new RuntimeException(e); - } - - String context = SecretManagerProvider.instance.get().getContext(); + String context = SecretManagerProvider.get().getContext(); logger.trace( "\n-------------------------------------------------------\n" diff --git a/src/main/java/org/gcube/resourcemanagement/rest/BaseREST.java b/src/main/java/org/gcube/resourcemanagement/rest/BaseREST.java index 20b8956..7a2d1d2 100644 --- a/src/main/java/org/gcube/resourcemanagement/rest/BaseREST.java +++ b/src/main/java/org/gcube/resourcemanagement/rest/BaseREST.java @@ -1,17 +1,17 @@ package org.gcube.resourcemanagement.rest; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response.ResponseBuilder; -import javax.ws.rs.core.UriInfo; - -import org.gcube.common.authorization.library.provider.CalledMethodProvider; +import org.gcube.smartgears.utils.InnerMethodName; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.webcohesion.enunciate.metadata.rs.RequestHeader; import com.webcohesion.enunciate.metadata.rs.RequestHeaders; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response.ResponseBuilder; +import jakarta.ws.rs.core.UriInfo; + /** * @author Luca Frosini (ISTI - CNR) */ @@ -36,7 +36,7 @@ public class BaseREST { protected static final String LOCATION_HEADER = "Location"; protected void setCalledMethod(String method) { - CalledMethodProvider.instance.set(method); + InnerMethodName.set(method); logger.info("{}", uriInfo.getAbsolutePath()); } diff --git a/src/main/java/org/gcube/resourcemanagement/rest/RequestFilter.java b/src/main/java/org/gcube/resourcemanagement/rest/RequestFilter.java deleted file mode 100644 index f39e716..0000000 --- a/src/main/java/org/gcube/resourcemanagement/rest/RequestFilter.java +++ /dev/null @@ -1,60 +0,0 @@ -package org.gcube.resourcemanagement.rest; - -import java.io.IOException; - -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.ext.Provider; - -import org.gcube.common.authorization.library.provider.AccessTokenProvider; -import org.gcube.common.authorization.library.provider.SecurityTokenProvider; -import org.gcube.common.authorization.utils.manager.SecretManager; -import org.gcube.common.authorization.utils.manager.SecretManagerProvider; -import org.gcube.common.authorization.utils.secret.GCubeSecret; -import org.gcube.common.authorization.utils.secret.JWTSecret; -import org.gcube.common.authorization.utils.secret.Secret; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * @author Luca Frosini (ISTI - CNR) - */ -@Provider -@PreMatching -public class RequestFilter implements ContainerRequestFilter, ContainerResponseFilter { - - private final static Logger logger = LoggerFactory.getLogger(RequestFilter.class); - - @Override - public void filter(ContainerRequestContext requestContext) throws IOException { - logger.trace("PreMatching RequestFilter"); - - SecretManagerProvider.instance.remove(); - SecretManager secretManager = new SecretManager(); - - String token = AccessTokenProvider.instance.get(); - if(token!=null) { - Secret secret = new JWTSecret(token); - secretManager.addSecret(secret); - } - - token = SecurityTokenProvider.instance.get(); - if(token!=null) { - Secret secret = new GCubeSecret(token); - secretManager.addSecret(secret); - } - - SecretManagerProvider.instance.set(secretManager); - } - - @Override - public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext) - throws IOException { - logger.trace("ResponseFilter"); - SecretManagerProvider.instance.remove(); - } - -} diff --git a/src/main/java/org/gcube/resourcemanagement/rest/ResourceManagerExceptionMapper.java b/src/main/java/org/gcube/resourcemanagement/rest/ResourceManagerExceptionMapper.java index 5845d04..5ae3d8a 100644 --- a/src/main/java/org/gcube/resourcemanagement/rest/ResourceManagerExceptionMapper.java +++ b/src/main/java/org/gcube/resourcemanagement/rest/ResourceManagerExceptionMapper.java @@ -1,11 +1,11 @@ package org.gcube.resourcemanagement.rest; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/resourcemanagement/rest/administration/Configuration.java b/src/main/java/org/gcube/resourcemanagement/rest/administration/Configuration.java index 4d418a0..9817236 100644 --- a/src/main/java/org/gcube/resourcemanagement/rest/administration/Configuration.java +++ b/src/main/java/org/gcube/resourcemanagement/rest/administration/Configuration.java @@ -1,25 +1,6 @@ package org.gcube.resourcemanagement.rest.administration; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.InternalServerErrorException; -//import javax.ws.rs.NotAuthorizedException; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; -import javax.ws.rs.core.Response.Status; -import javax.xml.ws.WebServiceException; - -import org.gcube.common.authorization.utils.manager.SecretManagerProvider; +import org.gcube.common.security.providers.SecretManagerProvider; import org.gcube.resourcemanagement.rest.BaseREST; import org.gcube.resourcemanagement.rest.annotation.PATCH; import org.gcube.resourcemanagement.rest.annotation.PURGE; @@ -32,6 +13,24 @@ import com.webcohesion.enunciate.metadata.rs.ResponseCode; import com.webcohesion.enunciate.metadata.rs.StatusCodes; import com.webcohesion.enunciate.metadata.swagger.OperationId; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.InternalServerErrorException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; +import jakarta.ws.rs.core.Response.Status; +import jakarta.xml.ws.WebServiceException; + /** * The catalogue configuration for the context of the request * (i.e. the context where the token has been generated). @@ -56,7 +55,7 @@ public class Configuration extends BaseREST { throw new BadRequestException("Please provide a valid context as path parameter"); } - String c = SecretManagerProvider.instance.get().getContext(); + String c = SecretManagerProvider.get().getContext(); if(context.compareTo(Configuration.CURRENT_CONTEXT_PATH_PARAMETER)==0) { return c; } diff --git a/src/main/java/org/gcube/resourcemanagement/rest/annotation/PATCH.java b/src/main/java/org/gcube/resourcemanagement/rest/annotation/PATCH.java index 0d05b65..236a84a 100644 --- a/src/main/java/org/gcube/resourcemanagement/rest/annotation/PATCH.java +++ b/src/main/java/org/gcube/resourcemanagement/rest/annotation/PATCH.java @@ -5,7 +5,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.ws.rs.HttpMethod; +import jakarta.ws.rs.HttpMethod; /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/resourcemanagement/rest/annotation/PURGE.java b/src/main/java/org/gcube/resourcemanagement/rest/annotation/PURGE.java index f4dd7de..15a8757 100644 --- a/src/main/java/org/gcube/resourcemanagement/rest/annotation/PURGE.java +++ b/src/main/java/org/gcube/resourcemanagement/rest/annotation/PURGE.java @@ -5,7 +5,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.ws.rs.HttpMethod; +import jakarta.ws.rs.HttpMethod; /** * @author Luca Frosini (ISTI - CNR)