From 7326df1ff8c8778671ab5a3ef0ac8ceb1c898b8f Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Thu, 19 Nov 2020 11:25:45 +0100 Subject: [PATCH] Concessione --- .gitignore | 3 + .settings/.gitignore | 3 + CHANGELOG.md | 7 + FUNDING.md | 26 ++ LICENSE.md | 312 ++++++++++++++++++ README.md | 50 ++- pom.xml | 112 +++++++ .../geoportal/client/GeoPortalClient.java | 8 + .../client/GeoportalAbstractPlugin.java | 50 +++ .../client/legacy/ConcessioniManager.java | 89 +++++ .../client/legacy/ConcessioniPlugin.java | 46 +++ .../client/legacy/DefaultConcessioni.java | 64 ++++ .../client/model/CommunicationException.java | 36 ++ .../common/model/ConcessioniTests.java | 22 ++ .../geoportal/common/model/TokenSetter.java | 35 ++ src/test/resources/Concessione.json | 200 +++++++++++ 16 files changed, 1062 insertions(+), 1 deletion(-) create mode 100644 .gitignore create mode 100644 .settings/.gitignore create mode 100644 CHANGELOG.md create mode 100644 FUNDING.md create mode 100644 LICENSE.md create mode 100644 pom.xml create mode 100644 src/main/java/org/gcube/application/geoportal/client/GeoPortalClient.java create mode 100644 src/main/java/org/gcube/application/geoportal/client/GeoportalAbstractPlugin.java create mode 100644 src/main/java/org/gcube/application/geoportal/client/legacy/ConcessioniManager.java create mode 100644 src/main/java/org/gcube/application/geoportal/client/legacy/ConcessioniPlugin.java create mode 100644 src/main/java/org/gcube/application/geoportal/client/legacy/DefaultConcessioni.java create mode 100644 src/main/java/org/gcube/application/geoportal/client/model/CommunicationException.java create mode 100644 src/test/java/org/gcube/application/geoportal/common/model/ConcessioniTests.java create mode 100644 src/test/java/org/gcube/application/geoportal/common/model/TokenSetter.java create mode 100644 src/test/resources/Concessione.json diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..525681c --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +/target/ +/.classpath +/.project diff --git a/.settings/.gitignore b/.settings/.gitignore new file mode 100644 index 0000000..1de83a6 --- /dev/null +++ b/.settings/.gitignore @@ -0,0 +1,3 @@ +/org.eclipse.core.resources.prefs +/org.eclipse.jdt.core.prefs +/org.eclipse.m2e.core.prefs diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..3252c2d --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,7 @@ +This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +# Changelog for org.gcube.application.geoportal-client + +## [v1.0.0-SNAPSHOT] - 2020-11-11 + +First release \ No newline at end of file diff --git a/FUNDING.md b/FUNDING.md new file mode 100644 index 0000000..9e48b94 --- /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); diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..3af0507 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,312 @@ +# European Union Public Licence V. 1.1 + + +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.1 + +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 85ecc67..b80f923 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,50 @@ -# geoportal-client +GeoPortal - Client +-------------------------------------------------- + +GeoPortal - Client is the java library wrapping Geoportal REST Service + +## Built with +* [Maven](https://maven.apache.org/) - Dependency Management + +## Documentation + +Documentation can be found [here](https://gcube.wiki.gcube-system.org/gcube/GeoPortal). + +## Change log + +See [CHANGELOG.md](CHANGELOG.md). + +## 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 including: + +- the Sixth Framework Programme for Research and Technological Development + - DILIGENT (grant no. 004260). +- the Seventh Framework Programme for research, technological development and demonstration + - D4Science (grant no. 212488); + - D4Science-II (grant no.239019); + - ENVRI (grant no. 283465); + - iMarine(grant no. 283644); + - EUBrazilOpenBio (grant no. 288754). +- the H2020 research and innovation programme + - SoBigData (grant no. 654024); + - PARTHENOS (grant no. 654119); + - EGIEngage (grant no. 654142); + - ENVRIplus (grant no. 654182); + - BlueBRIDGE (grant no. 675680); + - PerformFish (grant no. 727610); + - AGINFRAplus (grant no. 731001); + - DESIRA (grant no. 818194); + - ARIADNEplus (grant no. 823914); + - RISIS2 (grant no. 824091); + + diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..034b847 --- /dev/null +++ b/pom.xml @@ -0,0 +1,112 @@ + + 4.0.0 + org.gcube.application + geoportal-client + 1.0.0-SNAPSHOT + Geoportal Client + + + + maven-parent + org.gcube.tools + 1.1.0 + + + + + https://code-repo.d4science.org/gCubeSystem + 1.0 + + + + + + + scm:git:${gitBaseUrl}/${project.artifactId}.git + scm:git:${gitBaseUrl}/${project.artifactId}.git + ${gitBaseUrl}/${project.artifactId}.git + + + + + + + + org.gcube.distribution + gcube-bom + 2.0.0 + pom + import + + + + + + + + org.projectlombok + lombok + 1.14.8 + + + + org.gcube.application + geoportal-common + [1.0.0-SNAPSHOT,2.0.0) + + + + + org.gcube.core + common-fw-clients + + + + org.gcube.core + common-generic-clients + + + + org.gcube.core + common-gcube-calls + + + + org.gcube.common + common-jaxrs-client + [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT) + + + + + junit + junit + test + 4.11 + + + + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + 2.8.8 + + + + org.glassfish.jersey.media + jersey-media-json-jackson + + + + ch.qos.logback + logback-classic + test + + + + + + \ No newline at end of file diff --git a/src/main/java/org/gcube/application/geoportal/client/GeoPortalClient.java b/src/main/java/org/gcube/application/geoportal/client/GeoPortalClient.java new file mode 100644 index 0000000..f3a0a83 --- /dev/null +++ b/src/main/java/org/gcube/application/geoportal/client/GeoPortalClient.java @@ -0,0 +1,8 @@ +package org.gcube.application.geoportal.client; + +public class GeoPortalClient { + + + + +} diff --git a/src/main/java/org/gcube/application/geoportal/client/GeoportalAbstractPlugin.java b/src/main/java/org/gcube/application/geoportal/client/GeoportalAbstractPlugin.java new file mode 100644 index 0000000..fef5a4a --- /dev/null +++ b/src/main/java/org/gcube/application/geoportal/client/GeoportalAbstractPlugin.java @@ -0,0 +1,50 @@ +package org.gcube.application.geoportal.client; + +import javax.ws.rs.client.WebTarget; + +import org.gcube.application.geoportal.client.legacy.ConcessioniPlugin; +import org.gcube.application.geoportal.common.rest.ConcessioniI; +import org.gcube.application.geoportal.common.rest.InterfaceConstants; +import org.gcube.common.clients.Plugin; +import org.gcube.common.clients.ProxyBuilder; +import org.gcube.common.clients.ProxyBuilderImpl; + +import lombok.AllArgsConstructor; + +@AllArgsConstructor +public abstract class GeoportalAbstractPlugin implements Plugin{ + + + private static ConcessioniPlugin concessioni_plugin=new ConcessioniPlugin(); + + public static ProxyBuilder concessioni() { + return new ProxyBuilderImpl(concessioni_plugin); + } + + private String name; + + + + @Override + public String name() { + return this.name; + } + + @Override + public String namespace() { + return InterfaceConstants.NAMESPACE; + } + + @Override + public String serviceClass() { + return InterfaceConstants.SERVICE_CLASS; + } + + @Override + public String serviceName() { + return InterfaceConstants.SERVICE_NAME; + } + + + +} diff --git a/src/main/java/org/gcube/application/geoportal/client/legacy/ConcessioniManager.java b/src/main/java/org/gcube/application/geoportal/client/legacy/ConcessioniManager.java new file mode 100644 index 0000000..a63b37e --- /dev/null +++ b/src/main/java/org/gcube/application/geoportal/client/legacy/ConcessioniManager.java @@ -0,0 +1,89 @@ +package org.gcube.application.geoportal.client.legacy; + +import static org.gcube.application.geoportal.client.GeoportalAbstractPlugin.concessioni; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Collection; + +import javax.json.Json; +import javax.json.JsonArray; + +import org.gcube.application.geoportal.common.model.legacy.Concessione; +import org.gcube.application.geoportal.common.rest.ConcessioniI; + +import com.fasterxml.jackson.annotation.JsonInclude.Include; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectReader; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; + +import lombok.extern.slf4j.Slf4j; + +@Slf4j +public class ConcessioniManager { + + private static ObjectMapper mapper = new ObjectMapper(); + + private static ObjectReader concessioniReader=mapper.readerFor(Concessione.class); + private static ObjectReader collectionReader=mapper.readerFor(Collection.class); + + static { + mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES,false); + mapper.configure(SerializationFeature.WRITE_EMPTY_JSON_ARRAYS, false); + mapper.setSerializationInclusion(Include.NON_NULL); + // mapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false); + mapper.registerModule(new JavaTimeModule()); + mapper.configure(SerializationFeature.INDENT_OUTPUT, true); + } + + private ConcessioniI service; + + public ConcessioniManager() { + service=concessioni().build(); + } + + public Concessione getById(String id) throws Exception { + log.info("Reading by ID "+id); + try { + String result=service.readById(id); + log.debug("Reading json object : "+result); + return concessioniReader.readValue(result); + } catch (IOException e) { + e.printStackTrace(); + throw e; + } catch (Exception e) { + e.printStackTrace(); + throw e; + } + } + + public static String toJson(Object obj) throws JsonProcessingException { + return mapper.writeValueAsString(obj); + } + + + public ArrayList getList() throws Exception{ + log.info("Getting list"); + try { + String result=service.getAll(); + log.debug("Reading json object : "+result); + JsonArray array=Json.createReader(new ByteArrayInputStream(result.getBytes(StandardCharsets.UTF_8))).readArray(); + ArrayList toReturn=new ArrayList(); + for(int i=0;i{ + + public ConcessioniPlugin() { + super(InterfaceConstants.APPLICATION_BASE_PATH+InterfaceConstants.APPLICATION_PATH); + } + + @Override + public Exception convert(Exception fault, ProxyConfig config) { + return fault; + } + + @Override + public ConcessioniI newProxy(ProxyDelegate delegate) { + return new DefaultConcessioni(delegate); + } + + + @Override + public WebTarget resolve(EndpointReference address, ProxyConfig config) throws Exception { + DOMResult result = new DOMResult(); + address.writeTo(result); + Node node =result.getNode(); + Node child=node.getFirstChild(); + String addressString = child.getTextContent(); + GcubeService service = GcubeService.service(). + withName(new QName(InterfaceConstants.NAMESPACE,InterfaceConstants.Methods.CONCESSIONI)). + andPath(InterfaceConstants.Methods.CONCESSIONI); + return TargetFactory.stubFor(service).at(addressString); + } +} diff --git a/src/main/java/org/gcube/application/geoportal/client/legacy/DefaultConcessioni.java b/src/main/java/org/gcube/application/geoportal/client/legacy/DefaultConcessioni.java new file mode 100644 index 0000000..68c6c0d --- /dev/null +++ b/src/main/java/org/gcube/application/geoportal/client/legacy/DefaultConcessioni.java @@ -0,0 +1,64 @@ +package org.gcube.application.geoportal.client.legacy; + +import javax.ws.rs.client.Entity; +import javax.ws.rs.client.WebTarget; +import javax.ws.rs.core.MediaType; + +import org.gcube.application.geoportal.common.rest.ConcessioniI; +import org.gcube.common.clients.Call; +import org.gcube.common.clients.delegates.ProxyDelegate; + +import lombok.NonNull; +import lombok.RequiredArgsConstructor; + +@RequiredArgsConstructor +public class DefaultConcessioni implements ConcessioniI{ + + @NonNull + private final ProxyDelegate delegate; + + @Override + public String create(final String toCreate) throws Exception { + Call call= new Call(){ + @Override + public String call(WebTarget endpoint) throws Exception { + return endpoint.request(MediaType.APPLICATION_JSON).put(Entity.entity(toCreate, MediaType.APPLICATION_JSON)).readEntity(String.class); + } + }; + return delegate.make(call); + } + + + @Override + public String readById(final String readById) throws Exception { + Call call= new Call(){ + @Override + public String call(WebTarget endpoint) throws Exception { + return endpoint.path(readById).request(MediaType.APPLICATION_JSON).get().readEntity(String.class); + } + }; + return delegate.make(call); + } + + @Override + public String getAll() throws Exception { + Call call= new Call(){ + @Override + public String call(WebTarget endpoint) throws Exception { + return endpoint.request(MediaType.APPLICATION_JSON).get().readEntity(String.class); + } + }; + return delegate.make(call); + } + + @Override + public String update(final String id, final String updated) throws Exception { + Call call= new Call(){ + @Override + public String call(WebTarget endpoint) throws Exception { + return endpoint.path(id).request(MediaType.APPLICATION_JSON).put(Entity.entity(updated, MediaType.APPLICATION_JSON)).readEntity(String.class); + } + }; + return delegate.make(call); + } +} diff --git a/src/main/java/org/gcube/application/geoportal/client/model/CommunicationException.java b/src/main/java/org/gcube/application/geoportal/client/model/CommunicationException.java new file mode 100644 index 0000000..fd34809 --- /dev/null +++ b/src/main/java/org/gcube/application/geoportal/client/model/CommunicationException.java @@ -0,0 +1,36 @@ +package org.gcube.application.geoportal.client.model; + +import lombok.Data; + +@Data +public class CommunicationException extends Exception { + + private String remoteMessage; + private Integer responseHTTPCode; + + public CommunicationException() { + // TODO Auto-generated constructor stub + } + + public CommunicationException(String message) { + super(message); + // TODO Auto-generated constructor stub + } + + public CommunicationException(Throwable cause) { + super(cause); + // TODO Auto-generated constructor stub + } + + public CommunicationException(String message, Throwable cause) { + super(message, cause); + // TODO Auto-generated constructor stub + } + + public CommunicationException(String message, Throwable cause, boolean enableSuppression, + boolean writableStackTrace) { + super(message, cause, enableSuppression, writableStackTrace); + // TODO Auto-generated constructor stub + } + +} diff --git a/src/test/java/org/gcube/application/geoportal/common/model/ConcessioniTests.java b/src/test/java/org/gcube/application/geoportal/common/model/ConcessioniTests.java new file mode 100644 index 0000000..51bd224 --- /dev/null +++ b/src/test/java/org/gcube/application/geoportal/common/model/ConcessioniTests.java @@ -0,0 +1,22 @@ +package org.gcube.application.geoportal.common.model; + +import java.util.ArrayList; + +import org.gcube.application.geoportal.client.legacy.ConcessioniManager; +import org.gcube.application.geoportal.common.model.legacy.Concessione; +import org.junit.Before; +import org.junit.Test; + +public class ConcessioniTests { + + @Before + public void setScope(){ + TokenSetter.set("/gcube/devNext/NextNext"); + } + + @Test + public void readAll() throws Exception { + ConcessioniManager manager=new ConcessioniManager(); + ArrayList found=manager.getList(); + } +} diff --git a/src/test/java/org/gcube/application/geoportal/common/model/TokenSetter.java b/src/test/java/org/gcube/application/geoportal/common/model/TokenSetter.java new file mode 100644 index 0000000..7052726 --- /dev/null +++ b/src/test/java/org/gcube/application/geoportal/common/model/TokenSetter.java @@ -0,0 +1,35 @@ +package org.gcube.application.geoportal.common.model; + +import java.util.Properties; + +import org.gcube.common.authorization.library.provider.SecurityTokenProvider; +import org.gcube.common.scope.api.ScopeProvider; + +public class TokenSetter { + + + + private static Properties props=new Properties(); + + static{ + try { + props.load(TokenSetter.class.getResourceAsStream("/tokens.properties")); + } catch (Exception e) { + throw new RuntimeException("YOU NEED TO SET TOKEN FILE IN CONFIGURATION"); + } + } + + + public static void set(String scope){ + try{ + if(!props.containsKey(scope)) throw new RuntimeException("No token found for scope : "+scope); + SecurityTokenProvider.instance.set(props.getProperty(scope)); + }catch(Exception e){ + e.printStackTrace(System.err); + throw e; + } + ScopeProvider.instance.set(scope); + } + + +} diff --git a/src/test/resources/Concessione.json b/src/test/resources/Concessione.json new file mode 100644 index 0000000..595f22e --- /dev/null +++ b/src/test/resources/Concessione.json @@ -0,0 +1,200 @@ +{ + "id": 1, + "recordType": "CONCESSIONE", + "version": "1.0.0", + "licenzaID": "CC-BY", + "policy": "OPEN", + "nome": "Italia, forse", + "folderId": "2f1bcd4b-fc3d-48c5-aa3b-064c68ba94c9", + "lastUpdateTime": [ + 2020, + 11, + 17, + 12, + 19, + 58, + 418000000 + ], + "lastUpdateUser": "NO NAME", + "creationTime": [ + 2020, + 11, + 17, + 12, + 19, + 58, + 418000000 + ], + "creationUser": "NO NAME", + "introduzione": "This is my project", + "descrizioneContenuto": "It contains this and that", + "authors": [ + "Some one", + "Some, oneelse" + ], + "contributore": "Contrib 1", + "titolari": [ + "Some one", + "Some, oneelse" + ], + "responsabile": "Someone", + "editore": "Editore", + "fontiFinanziamento": [ + "Big pharma", + "Pentagon" + ], + "soggetto": [ + "Research Excavation", + "Archeology" + ], + "risorseCorrelate": [], + "dataInizioProgetto": [ + 2020, + 11, + 17, + 12, + 19, + 40, + 741000000 + ], + "dataFineProgetto": [ + 2020, + 11, + 17, + 12, + 19, + 40, + 752000000 + ], + "titolareLicenza": "Qualcun altro", + "titolareCopyright": "Chiedilo in giro", + "paroleChiaveLibere": [ + "Robba", + "Stuff" + ], + "paroleChiaveICCD": [ + "vattelapesca", + "somthing something" + ], + "centroidLat": 43.0, + "centroidLong": 9.0, + "relazioneScavo": { + "id": 11, + "policy": "OPEN", + "licenseID": "CC-BY", + "titolo": "Italia, forse relazione di scavo", + "creationTime": [ + 2020, + 11, + 17, + 12, + 19, + 58, + 418000000 + ], + "record": null, + "actualContent": [ + { + "id": 16, + "associated": null, + "mimetype": "application/pdf", + "storageID": "78ec815e-cc0e-4a61-8248-8eebe8c7c6be", + "link": "https://data.dev.d4science.org/shub/E_K0lSY05ja0s2N2hkVkxzWTVRSGN0MWZ4UFFOQnFTZHgraytOK05lcHZ2d002aGQ1Z2grZkE5d1ZmTUc5V3diLw==" + } + ], + "abstractSection": "simple abstract section", + "responsabili": [ + "Some one", + "Some, oneelse" + ], + "soggetto": [ + "Research Excavation", + "Archeology" + ] + }, + "immaginiRappresentative": [], + "posizionamentoScavo": { + "id": 10, + "policy": "OPEN", + "licenseID": "CC-BY", + "titolo": "Italia, forse posizionamento scavo", + "creationTime": [ + 2020, + 11, + 17, + 12, + 19, + 58, + 418000000 + ], + "record": null, + "actualContent": [ + { + "id": 11, + "associated": null, + "mimetype": "application/x-dbf", + "storageID": "6c6ab4c4-5691-4652-9010-485ec8f1fc3d", + "link": "https://data.dev.d4science.org/shub/E_OThaZC9lRkk5cVprcjBwZlBFS1NyZEtvcjNTekFJYjVoZUdXalQweGI2emJzZ3cxNTFoUUJNbUs1YXRKLzA0bg==" + }, + { + "id": 12, + "associated": null, + "mimetype": "text/plain", + "storageID": "10b8fbce-89a1-4a76-9e91-17c08c45c8ca", + "link": "https://data.dev.d4science.org/shub/E_eEo2NEV5WHl6RDhVSUMvWm1NTndwOW5FTjZaSkdPVjR0MFBiclNWWTBCbUJXUjA1ZmNVbU00N3FXeU5JQVdnLw==" + }, + { + "id": 13, + "associated": null, + "mimetype": "text/plain", + "storageID": "435380a5-812d-4bef-b0f1-f0e89cd93730", + "link": "https://data.dev.d4science.org/shub/E_YTMyTDU5cVBxSWRkZEFuYi9hTVQ2ZUxtbnNyYU9KcUNydFl6dk5jbkhYWHk2ODAwUDZuemE5M2xVT2RPZDA5MA==" + }, + { + "id": 14, + "associated": null, + "mimetype": "application/x-shapefile", + "storageID": "04a284fe-c6f2-4dd6-8c9c-06cc1ebbefb8", + "link": "https://data.dev.d4science.org/shub/E_UXRlN0F0OUdWazdCNElORExJUlppL0JEMjdkcHIvNWNDNGdtejNBQkxQTFlySERlWnQySUVDSkVTWHJHblRtdg==" + }, + { + "id": 15, + "associated": null, + "mimetype": "application/x-shapefile", + "storageID": "285882cd-7922-4755-b7f2-95fe72960425", + "link": "https://data.dev.d4science.org/shub/E_aFlKbkhhREE3VlQ3TzZRMzlNK2YrODYxamFsclRmOWZKL1FYS1BzbjIvYWNBMjNnK2pyQzZTZUVKODUrRjBlTQ==" + } + ], + "layerUUID": null, + "layerID": null, + "layerName": null, + "wmsLink": null, + "abstractSection": "Posizionamento topografico georeferenziato dell’area interessata dalle indagini", + "topicCategory": "Society", + "subTopic": "Archeology", + "bbox": { + "maxLat": 90.0, + "maxLong": 180.0, + "minLat": -90.0, + "minLong": -180.0 + }, + "paroleChiaveLibere": [ + "Robba", + "Stuff" + ], + "paroleChiaveICCD": [ + "vattelapesca", + "somthing something" + ], + "valutazioneQualita": "Secondo me si", + "metodoRaccoltaDati": "Fattobbene", + "scalaAcquisizione": "1:10000", + "authors": [ + "Some one", + "Some, oneelse" + ], + "responsabile": "Someone" + }, + "pianteFineScavo": [], + "genericContent": [] +} \ No newline at end of file