Compare commits
10 Commits
master
...
rest-colle
Author | SHA1 | Date |
---|---|---|
Lucio Lelii | bc84828fc5 | |
Lucio Lelii | ee9e001fcc | |
lucio | 1626dddc97 | |
lucio | 14b618bf41 | |
lucio | 61a5cf8700 | |
lucio | a00b163f3f | |
lucio | 1d01f50e29 | |
lucio | eb40fd0eeb | |
lucio | 858c935b6c | |
lucio | e97ec6fbd1 |
|
@ -0,0 +1,36 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="src" output="target/classes" path="src/main/java">
|
||||
<attributes>
|
||||
<attribute name="optional" value="true"/>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
|
||||
<attributes>
|
||||
<attribute name="test" value="true"/>
|
||||
<attribute name="optional" value="true"/>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
|
||||
<attributes>
|
||||
<attribute name="test" value="true"/>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
|
||||
<attributes>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
|
||||
<attributes>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/ic-client"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/common-scope-maps"/>
|
||||
<classpathentry kind="output" path="target/classes"/>
|
||||
</classpath>
|
|
@ -0,0 +1 @@
|
|||
/target/
|
|
@ -0,0 +1,8 @@
|
|||
eclipse.preferences.version=1
|
||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
|
||||
org.eclipse.jdt.core.compiler.compliance=1.8
|
||||
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
|
||||
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
|
||||
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
|
||||
org.eclipse.jdt.core.compiler.release=disabled
|
||||
org.eclipse.jdt.core.compiler.source=1.8
|
22
CHANGELOG.md
22
CHANGELOG.md
|
@ -1,22 +0,0 @@
|
|||
# Changelog for "registry-publisher"
|
||||
|
||||
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||
|
||||
|
||||
## [v1.3.2] 2020-07-26
|
||||
### Fixes
|
||||
- fix updateVo method. if a generic resource was updated by monitor at root-vo level, the change wasn't propagated properly to the others VOs (#19690)
|
||||
|
||||
|
||||
|
||||
## [v1.3.1] 2020-12-10
|
||||
|
||||
### Fixes
|
||||
- fix getInternalVOScopes method. Now it returns only the VO and root-vo as well
|
||||
|
||||
## [v1.3.0] 2019-09-04
|
||||
### New Features
|
||||
Added create and remove operation at vo level
|
||||
Resource synchronization with the more recent one searched at VO level
|
||||
create, remove operation fail only if there is a problem in the current VO
|
||||
|
26
FUNDING.md
26
FUNDING.md
|
@ -1,26 +0,0 @@
|
|||
# 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);
|
311
LICENSE.md
311
LICENSE.md
|
@ -1,311 +0,0 @@
|
|||
# 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
|
62
README.md
62
README.md
|
@ -1,62 +0,0 @@
|
|||
# registry-publisher
|
||||
|
||||
In conjunction with the IC-Client, the Registry-Publisher represents the mediation layer gCube Services, based on FWS, will rely on to interact with the Information Service as a whole.
|
||||
|
||||
|
||||
## Built With
|
||||
|
||||
* [OpenJDK](https://openjdk.java.net/) - The JDK used
|
||||
* [Maven](https://maven.apache.org/) - Dependency Management
|
||||
|
||||
|
||||
## Documentation
|
||||
|
||||
See registry-publisher on [Wiki](https://gcube.wiki.gcube-system.org/gcube/Registry-Publisher).
|
||||
|
||||
## Change log
|
||||
|
||||
See [CHANGELOG.md](CHANGELOG.md).
|
||||
|
||||
## Authors
|
||||
|
||||
* **John Doe** ([ORCID](https://orcid.org/...-...)) - *Initial work* @ [ISTI-CNR Infrascience Group](http://nemis.isti.cnr.it/groups/infrascience)
|
||||
* **Fabio Simeoni** (fabio.simeoni-AT-fao.org), FAO of the UN, Italy
|
||||
* **Lucio Lelii** (lucio.lelii-AT-isti.cnr.it), CNR, Italy
|
||||
* **Roberto Cirillo** (roberto.cirillo-AT-isti.cnr.it), ISTI-CNR.
|
||||
|
||||
## How to Cite this Software
|
||||
|
||||
Tell people how to cite this software.
|
||||
* Cite an associated paper?
|
||||
* Use a specific BibTeX entry for the software?
|
||||
|
||||
|
||||
@Manual{,
|
||||
title = {.. registry-publisher ..},
|
||||
author = {{Infrascience Group}},
|
||||
organization = {ISTI - CNR},
|
||||
address = {Pisa, Italy},
|
||||
year = 2019,
|
||||
note = {...},
|
||||
url = {http://www.http://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)
|
||||
|
||||
## Acknowledgments
|
||||
|
||||
* Hat tip to anyone whose code was used
|
||||
* Inspiration
|
||||
* etc
|
||||
|
3
pom.xml
3
pom.xml
|
@ -21,7 +21,8 @@
|
|||
|
||||
<groupId>org.gcube.resources</groupId>
|
||||
<artifactId>registry-publisher</artifactId>
|
||||
<version>1.3.2</version>
|
||||
<version>1.4.0-SNAPSHOT</version>
|
||||
|
||||
|
||||
<dependencies>
|
||||
|
||||
|
|
|
@ -19,8 +19,9 @@ public class ResourceMediator {
|
|||
public static void setScope(Resource resource, String scope){
|
||||
resource.scopes().add(scope);
|
||||
}
|
||||
public static void removeScope(Resource resource, String scope){
|
||||
resource.scopes().remove(scope);
|
||||
public static void removeScope(Resource resource, String ... scopes){
|
||||
for (String scope : scopes)
|
||||
resource.scopes().remove(scope);
|
||||
}
|
||||
|
||||
public static Resource cleanAllScopes(Resource resource){
|
||||
|
|
|
@ -48,6 +48,11 @@ public class AdvancedPublisher extends AdvancedPublisherCommonUtils implements R
|
|||
@Override
|
||||
public <T extends Resource> T vosUpdate(T resource) {
|
||||
return publisher.vosUpdate(resource);
|
||||
}
|
||||
|
||||
@Override
|
||||
public <T extends Resource> T vosRemove(T resource, List<String> scopes) {
|
||||
return publisher.vosRemove(resource, scopes);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -48,5 +48,16 @@ public interface RegistryPublisher {
|
|||
* @return the resource without the current scope if the remove operation has been successfully completed
|
||||
*/
|
||||
<T extends Resource> T remove(T resource);
|
||||
|
||||
/**
|
||||
* The resource will be removed from the list of scopes.
|
||||
* if the scope is the last scope in the resource, the profile will be deleted from IS else:
|
||||
* if it is a VRE scope then the profile will be updated without the VRE scope;
|
||||
* if it is a VO scope but there is another VRE scope, belong to the VO, defined in the resource then throw IllegalArgumentException;
|
||||
* if it is a INFRA scope but there is another VRE or VO scope , belong to the INFRA, defined in the resource then throw IllegalArgumentException.
|
||||
* @throws IllegalArgumentException if the current scope is not defined in the resource or if there is another VRE scope defined in the resource
|
||||
* @return the resource without the current scope if the remove operation has been successfully completed
|
||||
*/
|
||||
<T extends Resource> T vosRemove(T resource, List<String> scopes);
|
||||
|
||||
}
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
package org.gcube.informationsystem.publisher;
|
||||
|
||||
import java.io.StringWriter;
|
||||
import java.util.Date;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashSet;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
|
||||
import javax.xml.ws.soap.SOAPFaultException;
|
||||
|
@ -24,6 +24,7 @@ import org.gcube.informationsystem.publisher.scope.ValidatorProvider;
|
|||
import org.gcube.informationsystem.publisher.stubs.registry.RegistryStub;
|
||||
import org.gcube.informationsystem.publisher.stubs.registry.faults.CreateException;
|
||||
import org.gcube.informationsystem.publisher.stubs.registry.faults.InvalidResourceException;
|
||||
import org.gcube.informationsystem.publisher.stubs.registry.faults.ResourceDoesNotExistException;
|
||||
import org.gcube.informationsystem.publisher.stubs.registry.faults.ResourceNotAcceptedException;
|
||||
import org.gcube.informationsystem.publisher.stubs.registry.faults.UpdateException;
|
||||
import org.gcube.informationsystem.publisher.utils.RegistryStubs;
|
||||
|
@ -107,13 +108,13 @@ public class RegistryPublisherImpl implements RegistryPublisher {
|
|||
String currentVO = Utils.getCurrentVO(currentScope);
|
||||
if (currentVO != null){
|
||||
RegistryStub stub = getRegistryStub();
|
||||
createResource(resource, currentVO, stub);
|
||||
vosScopes.remove(currentVO);
|
||||
//in this case it is a root-vo scope so we need to create the resource only at root-vo level
|
||||
createResource(resource, currentVO, stub);
|
||||
vosScopes.remove(currentVO);
|
||||
//in this case it is a root-vo scope so we need to create the resource only at root-vo level
|
||||
}else{
|
||||
RegistryStub stub = getRegistryStub();
|
||||
createResource(resource, currentScope, stub);
|
||||
vosScopes.remove(currentScope);
|
||||
createResource(resource, currentVO, stub);
|
||||
return resource;
|
||||
}
|
||||
}
|
||||
// update the resource for each VO
|
||||
|
@ -232,18 +233,16 @@ public class RegistryPublisherImpl implements RegistryPublisher {
|
|||
HashSet<String> vosScopes = Utils.getInternalVOScopes(resource);
|
||||
try{
|
||||
if(currentScope != null){
|
||||
// checking the current scope: if the operation fail in the current VO it will give an exception, if it fails in another VO no exception will be given
|
||||
// checking the current scope: if the operation fail in the current VO it will raise an exception, if it fails in another VO no exception will be raised
|
||||
String currentVO = Utils.getCurrentVO(currentScope);
|
||||
if (currentVO != null){
|
||||
ScopeProvider.instance.set(currentVO);
|
||||
registryUpdate(resource, 0);
|
||||
log.debug("currentVO "+currentVO+" updated");
|
||||
vosScopes.remove(currentVO);
|
||||
// in this case it is a root-vo scope so we need to update the resource only at root-vo level
|
||||
// in this case it is a root-vo scope
|
||||
}else{
|
||||
ScopeProvider.instance.set(currentScope);
|
||||
registryUpdate(resource, 0);
|
||||
log.debug("currentVO "+currentScope+" is the root-vo");
|
||||
vosScopes.remove(currentScope);
|
||||
}
|
||||
}
|
||||
|
@ -276,6 +275,66 @@ public class RegistryPublisherImpl implements RegistryPublisher {
|
|||
return resource;
|
||||
}
|
||||
|
||||
/**
|
||||
* The resource will be removed from all the scopes
|
||||
* if the scope is the last scope in the resource, the profile will be deleted from IS else
|
||||
* if it is a VRE scope then the profile will be updated without the VRE scope,
|
||||
* if it is a VO scope but there is another VRE scope, belong to the VO, defined in the resource then throw IllegalArgumentException
|
||||
*
|
||||
* @throws IllegalArgumentException if no service endpoints can be discovered or if there is another VRE scope defined in the resource
|
||||
*/
|
||||
public <T extends Resource> T vosRemove(T resource, List<String> scopes){
|
||||
String currentScope=ScopeProvider.instance.get();
|
||||
log.info(" remove resource with id : {} from scope: {}",resource.id(),currentScope);
|
||||
ValidationUtils.valid("resource", resource);// helper that throws an IllegalArgumentException if resource are null
|
||||
ValidationUtils.valid("scopes", currentScope);// helper that throws an IllegalArgumentException if scopes are null
|
||||
validateScope(resource);
|
||||
// the returned voScopes list is not used yet. it should be used if the update/remove operation will be done at VO level
|
||||
// HashSet<String> vosScopes = updateResourceScopes(resource);
|
||||
updateResourceScopes(resource);
|
||||
try {
|
||||
Resources.validate(resource);
|
||||
} catch (Exception e) {
|
||||
log.error("the resource is not valid", e);
|
||||
throw new IllegalArgumentException("the resource is not valid", e);
|
||||
}
|
||||
log.info(" remove {} scope from resource {}",scopes,resource.id());
|
||||
|
||||
Set<String> voScopesBeforeRemove =Utils.getInternalVOScopes(resource);
|
||||
|
||||
ResourceMediator.removeScope(resource, scopes.toArray(new String[scopes.size()]));
|
||||
|
||||
Set<String> voScopesAfterRemove =Utils.getInternalVOScopes(resource);
|
||||
|
||||
voScopesBeforeRemove.removeAll(voScopesAfterRemove);
|
||||
for (String scope: voScopesBeforeRemove)
|
||||
try {
|
||||
ScopeProvider.instance.set(scope);
|
||||
log.info("remove from IS scope {}",currentScope);
|
||||
registry.getStubs().remove(resource.id(), resource.type().toString());
|
||||
} catch (ResourceDoesNotExistException e) {
|
||||
log.warn("resource not found in the current scope, continue");
|
||||
} catch (Exception e) {
|
||||
log.error("the resource can't be removed ", e);
|
||||
throw new IllegalArgumentException("the resource can't be removed from scope "+currentScope, e);
|
||||
} finally {
|
||||
ScopeProvider.instance.set(currentScope);
|
||||
}
|
||||
|
||||
|
||||
// retrieves the scopes on resource and update it
|
||||
// updateResource(resource, currentScope);
|
||||
if (!voScopesAfterRemove.isEmpty())
|
||||
try{
|
||||
vosUpdate(resource);
|
||||
}catch(Exception e){
|
||||
log.error("exception message: "+e.getMessage());
|
||||
throw new RuntimeException(e.getMessage());
|
||||
}
|
||||
return resource;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* The resource will be removed from current scope
|
||||
* if the scope is the last scope in the resource, the profile will be deleted from IS else
|
||||
|
@ -286,12 +345,12 @@ public class RegistryPublisherImpl implements RegistryPublisher {
|
|||
*/
|
||||
public <T extends Resource> T remove(T resource){
|
||||
String currentScope=ScopeProvider.instance.get();
|
||||
log.info(" remove resource with id : "+resource.id()+" from scope: "+currentScope);
|
||||
log.info(" remove resource with id : {} from scope: {}",resource.id(),currentScope);
|
||||
ValidationUtils.valid("resource", resource);// helper that throws an IllegalArgumentException if resource are null
|
||||
ValidationUtils.valid("scopes", currentScope);// helper that throws an IllegalArgumentException if scopes are null
|
||||
validateScope(resource);
|
||||
// the returned voScopes list is not used yet. it should be used if the update/remove operation will be done at VO level
|
||||
// HashSet<String> vosScopes = updateResourceScopes(resource);
|
||||
// the returned voScopes list is not used yet. it should be used if the update/remove operation will be done at VO level
|
||||
// HashSet<String> vosScopes = updateResourceScopes(resource);
|
||||
updateResourceScopes(resource);
|
||||
try {
|
||||
Resources.validate(resource);
|
||||
|
@ -299,7 +358,7 @@ public class RegistryPublisherImpl implements RegistryPublisher {
|
|||
log.error("the resource is not valid", e);
|
||||
throw new IllegalArgumentException("the resource is not valid", e);
|
||||
}
|
||||
log.info(" remove "+currentScope+" scope from resource "+resource.id());
|
||||
log.info(" remove {} scope from resource {}",currentScope,resource.id());
|
||||
ResourceMediator.removeScope(resource, currentScope);
|
||||
// retrieves the scopes on resource and update it
|
||||
// updateResource(resource, currentScope);
|
||||
|
@ -314,6 +373,7 @@ public class RegistryPublisherImpl implements RegistryPublisher {
|
|||
}
|
||||
|
||||
|
||||
|
||||
private void registryUpdate(Resource resource, int tries){
|
||||
log.trace("try to update resource with id: "+resource.id()+" times "+(tries+1)+" on scope: "+ScopeProvider.instance.get());
|
||||
try{
|
||||
|
@ -360,14 +420,14 @@ public class RegistryPublisherImpl implements RegistryPublisher {
|
|||
*/
|
||||
private <T extends Resource> void updateResourceRemoveOperation(T resource, String currentScope) {
|
||||
if(!isRemoveNeeded(resource, currentScope)){
|
||||
// updateResource(resource, currentScope);
|
||||
// v 1.3 (20190902) try to update the resource just at vo level
|
||||
// updateResource(resource, currentScope);
|
||||
// v 1.3 (20190902) try to update the resource just at vo level
|
||||
vosUpdate(resource);
|
||||
}else{ // remove the profile from IC
|
||||
log.info("the resource have only the "+currentScope+" scope defined. Remove the resource "+resource.id()+" from IC");
|
||||
log.info("the resource have only the {} scope defined. Remove the resource {} from IC", currentScope,resource.id());
|
||||
// if the resource hasn't any scope, the resource will be removed
|
||||
try {
|
||||
log.debug("remove from IS scope "+currentScope);
|
||||
log.info("remove from IS scope {}",currentScope);
|
||||
registry.getStubs().remove(resource.id(), resource.type().toString());
|
||||
} catch (Exception e) {
|
||||
log.error("the resource can't be removed ", e);
|
||||
|
@ -431,8 +491,7 @@ public class RegistryPublisherImpl implements RegistryPublisher {
|
|||
ScopeProvider.instance.set(currentScope);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
private <T extends Resource> void updateResourceVOLevel(T resource, List <String> voScopes, String currentScope) {
|
||||
int tries=0;
|
||||
try{
|
||||
|
@ -445,17 +504,17 @@ public class RegistryPublisherImpl implements RegistryPublisher {
|
|||
ScopeProvider.instance.set(currentScope);
|
||||
}
|
||||
}
|
||||
|
||||
*/
|
||||
private <T extends Resource> HashSet<String> updateResourceScopes(T resource) {
|
||||
HashSet<String> vosScopes = Utils.getInternalVOScopes(resource);
|
||||
// if the resource type is a RunningInstance or a HostingNode the check on the most recent resource is bypassed
|
||||
// if the resource type is a RunningInstance or a HostingNode the check on the most recent resource is bypassed
|
||||
if((resource.type().toString().equalsIgnoreCase("RunningInstance")) || (resource.type().toString().equalsIgnoreCase("GHN")) || (resource.type().toString().equalsIgnoreCase("GCoreEndpoint")) || (resource.type().toString().equalsIgnoreCase("HostingNode")))
|
||||
return vosScopes;
|
||||
//extract the scopes from the more recent resource found at vo level
|
||||
List <String> latestScopesFound= Utils.setLatestInternalScopes(resource, vosScopes);
|
||||
log.debug("latest scope found are "+latestScopesFound);
|
||||
if((latestScopesFound == null) || (latestScopesFound.isEmpty())){
|
||||
// if it is a new resource the latestScopesFound should be null, in this case the more recent scopes are the new scopes
|
||||
// if it is a new resource the latestScopesFound should be null, in this case the more recent scopes are the new scopes
|
||||
latestScopesFound= new ArrayList<String>(vosScopes.size());
|
||||
for (String scope: vosScopes){
|
||||
latestScopesFound.add(scope);
|
||||
|
@ -468,7 +527,7 @@ public class RegistryPublisherImpl implements RegistryPublisher {
|
|||
log.debug("[VOCREATE] scope added {}",scope);
|
||||
ResourceMediator.setScope(resource, scope);
|
||||
ScopeBean scopeBean = new ScopeBean(scope);
|
||||
// check if the scope was already present inside the resource, if not, it will be added to the voScopes
|
||||
// check if the scope was already present inside the resource, if not, it will be added to the voScopes
|
||||
if((!scopeBean.is(Type.VRE)) && (!vosScopes.contains(scope))){
|
||||
vosScopes.add(scope);
|
||||
}
|
||||
|
|
|
@ -47,13 +47,7 @@ public class ScopedPublisherImpl implements ScopedPublisher{
|
|||
|
||||
@Override
|
||||
public <T extends Resource> T remove(T resource, List<String> scopes) throws RegistryNotFoundException{
|
||||
String currentScope=ScopeProvider.instance.get();
|
||||
for(String scope : scopes){
|
||||
ScopeProvider.instance.set(scope);
|
||||
registryPublisher.remove(resource);
|
||||
}
|
||||
ScopeProvider.instance.set(currentScope);
|
||||
return resource;
|
||||
return registryPublisher.vosRemove(resource, scopes);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -3,36 +3,18 @@ package org.gcube.informationsystem.publisher.scope;
|
|||
import java.util.List;
|
||||
|
||||
import org.gcube.common.resources.gcore.Resource;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
public class DefaultScopeValidator<R> implements Validator<Resource>{
|
||||
|
||||
private static Logger log = LoggerFactory.getLogger(DefaultScopeValidator.class);
|
||||
public class DefaultScopeValidator implements Validator{
|
||||
|
||||
@Override
|
||||
public <R extends Resource> void validate(R resource) {
|
||||
// log.info("validate method of "+this.getClass());
|
||||
// String currentScope=ScopeProvider.instance.get();
|
||||
// ScopeGroup<String> scopes=resource.scopes();
|
||||
// boolean founded= false;
|
||||
// for(Iterator<String> it=scopes.iterator(); it.hasNext();){
|
||||
// String scope=it.next();
|
||||
// if(scope.equals(currentScope))
|
||||
// founded=true;
|
||||
// }
|
||||
// if(!founded)
|
||||
// throw new IllegalStateException(" scope "+currentScope+" not present in resource");
|
||||
|
||||
public void validate(Resource resource) {
|
||||
if (resource.scopes().isEmpty())
|
||||
throw new IllegalArgumentException("scopes in the resource are empty");
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public Class type() {
|
||||
return Resource.class;
|
||||
}
|
||||
|
||||
@Override
|
||||
public <R extends Resource> void checkScopeCompatibility(R resource,
|
||||
public void checkScopeCompatibility(Resource resource,
|
||||
List<String> scopesList) {
|
||||
// for(String scope: scopesList){
|
||||
// ScopeGroup<String> scopes=resource.scopes();
|
||||
|
|
|
@ -4,11 +4,9 @@ import java.util.List;
|
|||
|
||||
import org.gcube.common.resources.gcore.Resource;
|
||||
|
||||
public interface Validator <R extends Resource>{
|
||||
public interface Validator {
|
||||
|
||||
<R extends Resource> void validate(R resource);
|
||||
<R extends Resource> void checkScopeCompatibility(R resource, List<String> scopes);
|
||||
|
||||
public Class<R> type();
|
||||
|
||||
void validate(Resource resource);
|
||||
void checkScopeCompatibility(Resource resource, List<String> scopes);
|
||||
|
||||
}
|
||||
|
|
|
@ -1,29 +1,12 @@
|
|||
package org.gcube.informationsystem.publisher.scope;
|
||||
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.gcube.common.resources.gcore.Resource;
|
||||
|
||||
public class ValidatorProvider {
|
||||
|
||||
private static Map<Class, Validator> validatorsMap= new LinkedHashMap<Class, Validator>();
|
||||
|
||||
|
||||
public static Validator getValidator(Resource resource){
|
||||
Validator validator=null;
|
||||
if(validatorsMap.isEmpty()){
|
||||
IValidatorContext context= ScopeValidatorScanner.provider();
|
||||
List<Validator> validators=context.getValidators();
|
||||
for(Validator v :validators){
|
||||
validatorsMap.put(v.type(), v);
|
||||
}
|
||||
}
|
||||
validator=validatorsMap.get(resource.getClass());
|
||||
if (validator==null)
|
||||
validator=new DefaultScopeValidator();
|
||||
return validator;
|
||||
return new DefaultScopeValidator();
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -0,0 +1,121 @@
|
|||
package org.gcube.informationsystem.publisher.stubs.registry;
|
||||
|
||||
import java.io.BufferedOutputStream;
|
||||
import java.io.OutputStream;
|
||||
import java.net.HttpURLConnection;
|
||||
import java.net.URL;
|
||||
|
||||
import javax.net.ssl.HttpsURLConnection;
|
||||
|
||||
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
|
||||
import org.gcube.common.scope.api.ScopeProvider;
|
||||
import org.gcube.informationsystem.publisher.stubs.registry.faults.CreateException;
|
||||
import org.gcube.informationsystem.publisher.stubs.registry.faults.InvalidResourceException;
|
||||
import org.gcube.informationsystem.publisher.stubs.registry.faults.RemoveException;
|
||||
import org.gcube.informationsystem.publisher.stubs.registry.faults.ResourceDoesNotExistException;
|
||||
import org.gcube.informationsystem.publisher.stubs.registry.faults.ResourceNotAcceptedException;
|
||||
import org.gcube.informationsystem.publisher.stubs.registry.faults.UpdateException;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
public class CollectorStubs implements RegistryStub {
|
||||
|
||||
private static Logger log = LoggerFactory.getLogger(CollectorStubs.class);
|
||||
|
||||
public static final String TOKEN_HEADER_ENTRY = "gcube-token";
|
||||
public static final String SCOPE_HEADER_ENTRY = "gcube-scope";
|
||||
|
||||
private String endopoint;
|
||||
|
||||
public CollectorStubs(String endopoint) {
|
||||
super();
|
||||
this.endopoint = endopoint;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public void create(String profile, String type)
|
||||
throws InvalidResourceException, ResourceNotAcceptedException, CreateException {
|
||||
StringBuilder callUrl = new StringBuilder(endopoint).append("/").append(type);
|
||||
try {
|
||||
URL url = new URL(callUrl.toString());
|
||||
HttpURLConnection connection = makeRequest(url, "POST");
|
||||
connection.setDoOutput(true);
|
||||
connection.setRequestProperty("Content-type", "text/xml");
|
||||
|
||||
try(OutputStream os = new BufferedOutputStream(connection.getOutputStream())){
|
||||
os.write(profile.getBytes());
|
||||
}
|
||||
|
||||
if (connection.getResponseCode()!=200) throw new CreateException("error creating resource "+connection.getResponseCode());
|
||||
}catch (Exception e) {
|
||||
log.error("error on create",e);
|
||||
throw new CreateException(e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public void update(String id, String type, String profile)
|
||||
throws InvalidResourceException, ResourceNotAcceptedException, UpdateException {
|
||||
StringBuilder callUrl = new StringBuilder(endopoint).append("/").append(type).append("/").append(id);
|
||||
try {
|
||||
URL url = new URL(callUrl.toString());
|
||||
HttpURLConnection connection = makeRequest(url, "PUT");
|
||||
connection.setDoOutput(true);
|
||||
connection.setRequestProperty("Content-type", "text/xml");
|
||||
|
||||
try(OutputStream os = new BufferedOutputStream(connection.getOutputStream())){
|
||||
os.write(profile.getBytes());
|
||||
}
|
||||
|
||||
if (connection.getResponseCode()!=200) throw new UpdateException("error updating resource "+connection.getResponseCode());
|
||||
}catch (Exception e) {
|
||||
log.error("error on update",e);
|
||||
throw new UpdateException(e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public void remove(String id, String type) throws ResourceDoesNotExistException, RemoveException {
|
||||
StringBuilder callUrl = new StringBuilder(endopoint).append("/").append(type).append("/").append(id);
|
||||
try {
|
||||
URL url = new URL(callUrl.toString());
|
||||
HttpURLConnection connection = makeRequest(url, "DELETE");
|
||||
connection.setDoInput(true);
|
||||
if (connection.getResponseCode()!=200){
|
||||
log.info("response code is not 200");
|
||||
if (connection.getResponseCode()==404)
|
||||
throw new ResourceDoesNotExistException("resource with id "+id+" not found");
|
||||
else throw new RemoveException("generic error removing resource "+id);
|
||||
}
|
||||
}catch (ResourceDoesNotExistException | RemoveException e) {
|
||||
throw e;
|
||||
}catch (Exception e1) {
|
||||
throw new RemoveException("connection error removing resource");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
private HttpURLConnection makeRequest(URL url, String method) throws Exception{
|
||||
HttpURLConnection connection;
|
||||
if (url.toString().startsWith("https://"))
|
||||
connection = (HttpsURLConnection)url.openConnection();
|
||||
else connection = (HttpURLConnection)url.openConnection();
|
||||
|
||||
if (ScopeProvider.instance.get()!=null)
|
||||
connection.setRequestProperty(SCOPE_HEADER_ENTRY,ScopeProvider.instance.get());
|
||||
else if (SecurityTokenProvider.instance.get()!=null)
|
||||
connection.setRequestProperty(TOKEN_HEADER_ENTRY,SecurityTokenProvider.instance.get());
|
||||
else throw new RuntimeException("Collector requires authorization (via token or scope)");
|
||||
|
||||
connection.setRequestMethod(method);
|
||||
return connection;
|
||||
}
|
||||
|
||||
}
|
|
@ -2,11 +2,15 @@ package org.gcube.informationsystem.publisher.stubs.registry;
|
|||
|
||||
import static org.gcube.informationsystem.publisher.stubs.registry.RegistryConstants.*;
|
||||
|
||||
import java.io.StringWriter;
|
||||
|
||||
import javax.jws.WebMethod;
|
||||
import javax.jws.WebParam;
|
||||
import javax.jws.WebResult;
|
||||
import javax.jws.WebService;
|
||||
|
||||
import org.gcube.common.resources.gcore.Resource;
|
||||
import org.gcube.common.resources.gcore.Resources;
|
||||
import org.gcube.informationsystem.publisher.stubs.registry.faults.CreateException;
|
||||
import org.gcube.informationsystem.publisher.stubs.registry.faults.InvalidResourceException;
|
||||
import org.gcube.informationsystem.publisher.stubs.registry.faults.RemoveException;
|
||||
|
@ -35,6 +39,7 @@ public interface RegistryStub {
|
|||
@WebResult()
|
||||
void create(@WebParam(name="profile") String profile, @WebParam(name="type") String type ) throws InvalidResourceException,
|
||||
ResourceNotAcceptedException, CreateException;
|
||||
|
||||
/**
|
||||
*
|
||||
* @param id the id of the resource to update
|
||||
|
@ -48,7 +53,8 @@ public interface RegistryStub {
|
|||
@WebMethod(operationName="update")
|
||||
@WebResult()
|
||||
void update(@WebParam(name="uniqueID") String id, @WebParam(name="type") String type, @WebParam(name="xmlProfile") String profile ) throws InvalidResourceException,
|
||||
ResourceNotAcceptedException, UpdateException;
|
||||
ResourceNotAcceptedException, UpdateException;
|
||||
|
||||
/**
|
||||
*
|
||||
* @param id the id of the resource to remove
|
||||
|
@ -60,7 +66,6 @@ public interface RegistryStub {
|
|||
@WebMethod(operationName="remove")
|
||||
@WebResult()
|
||||
void remove(@WebParam(name="uniqueID") String id, @WebParam(name="type") String type) throws ResourceDoesNotExistException,
|
||||
RemoveException;
|
||||
|
||||
|
||||
RemoveException;
|
||||
|
||||
}
|
||||
|
|
|
@ -8,8 +8,10 @@ import java.util.List;
|
|||
|
||||
import org.gcube.common.resources.gcore.GCoreEndpoint;
|
||||
import org.gcube.common.scope.api.ScopeProvider;
|
||||
import org.gcube.common.scope.api.ServiceMap;
|
||||
import org.gcube.informationsystem.publisher.cache.RegistryCache;
|
||||
import org.gcube.informationsystem.publisher.exception.RegistryNotFoundException;
|
||||
import org.gcube.informationsystem.publisher.stubs.registry.CollectorStubs;
|
||||
import org.gcube.informationsystem.publisher.stubs.registry.RegistryConstants;
|
||||
import org.gcube.informationsystem.publisher.stubs.registry.RegistryStub;
|
||||
import org.gcube.resources.discovery.client.api.DiscoveryClient;
|
||||
|
@ -21,16 +23,17 @@ import org.slf4j.Logger;
|
|||
import org.slf4j.LoggerFactory;
|
||||
|
||||
public class RegistryStubs {
|
||||
|
||||
|
||||
private RegistryCache cache = new RegistryCache(10);
|
||||
private List<URI> endpoints;
|
||||
private static final Logger log = LoggerFactory.getLogger(RegistryStubs.class);
|
||||
|
||||
|
||||
|
||||
|
||||
private static final String XMLSTOREACCESS_SERVICE ="XMLStoreService";
|
||||
|
||||
|
||||
public List<URI> getEndPoints(){
|
||||
String scope=ScopeProvider.instance.get();
|
||||
// able/disable cache
|
||||
// able/disable cache
|
||||
endpoints=(List<URI>)cache.get(scope);
|
||||
if(endpoints==null){
|
||||
SimpleQuery query = queryFor(GCoreEndpoint.class);
|
||||
|
@ -40,32 +43,47 @@ public class RegistryStubs {
|
|||
public URI parse(String result) throws Exception {
|
||||
return new URI(result.replaceAll("\n", ""));
|
||||
}
|
||||
|
||||
|
||||
};
|
||||
DiscoveryClient<URI> client = new DelegateClient<URI>(uriParser, new ICClient());
|
||||
query.addCondition("$resource/Profile/ServiceClass/text() eq '"+RegistryConstants.service_class+"'")
|
||||
.addCondition("$resource/Profile/ServiceName/text() eq '"+RegistryConstants.service_name+"'")
|
||||
.setResult("$resource/Profile/AccessPoint/RunningInstanceInterfaces/Endpoint[string(@EntryName) eq '"+RegistryConstants.service_entrypoint+"']/string()");
|
||||
.addCondition("$resource/Profile/ServiceName/text() eq '"+RegistryConstants.service_name+"'")
|
||||
.setResult("$resource/Profile/AccessPoint/RunningInstanceInterfaces/Endpoint[string(@EntryName) eq '"+RegistryConstants.service_entrypoint+"']/string()");
|
||||
endpoints = client.submit(query);
|
||||
if (endpoints.size()==0){
|
||||
throw new IllegalArgumentException("No registry endpoint founded");
|
||||
throw new IllegalArgumentException("No registry endpoint found");
|
||||
}
|
||||
// able/disable cache
|
||||
// able/disable cache
|
||||
cache.put(scope, endpoints);
|
||||
}
|
||||
return endpoints;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public RegistryStub getStubs() throws RegistryNotFoundException{
|
||||
URI endpoint=null;
|
||||
//use another method to cache epr
|
||||
endpoint = getEndPoints().get(0);
|
||||
log.debug("get stubs from endpoint: "+ endpoint);
|
||||
return stubFor(RegistryConstants.registry).at(endpoint);
|
||||
ServiceMap serviceMap = ServiceMap.instance;
|
||||
if (serviceMap!=null && serviceMap.version().equals("2.0.0")) {
|
||||
try {
|
||||
@SuppressWarnings("unchecked")
|
||||
Class<? extends RegistryStub> localClientclass =(Class<? extends RegistryStub>) Class.forName("org.gcube.informationsystem.collector.client.LocalPublisherClient", true, Thread.currentThread().getContextClassLoader());
|
||||
log.info("using LocalPublisherClient, information collector specific publisher");
|
||||
return localClientclass.newInstance();
|
||||
}catch (Exception e) {
|
||||
String endpoint = serviceMap.endpoint(XMLSTOREACCESS_SERVICE);
|
||||
log.info("using REST COLLECTOR");
|
||||
return new CollectorStubs(endpoint);
|
||||
}
|
||||
|
||||
} else {
|
||||
//use another method to cache epr
|
||||
URI endpoint = getEndPoints().get(0);
|
||||
log.info("getting REGISTRY STUBS stubs from endpoint: {}",endpoint);
|
||||
return stubFor(RegistryConstants.registry).at(endpoint);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public RegistryStub getStubs(URI endpoint) throws RegistryNotFoundException{
|
||||
log.debug("get stubs from endpoint: "+ endpoint);
|
||||
log.debug("get stubs from endpoint: {}", endpoint);
|
||||
return stubFor(RegistryConstants.registry).at(endpoint);
|
||||
}
|
||||
|
||||
|
|
|
@ -42,13 +42,11 @@ public class Utils {
|
|||
*/
|
||||
public static String getCurrentVO(String currentScope) {
|
||||
ScopeBean scopeBean = new ScopeBean(currentScope);
|
||||
String currentVO=null;
|
||||
if(scopeBean.is(Type.VRE))
|
||||
currentVO=scopeBean.enclosingScope().toString();
|
||||
return scopeBean.enclosingScope().toString();
|
||||
else if (scopeBean.is(Type.VO))
|
||||
currentVO= currentScope;
|
||||
return currentScope;
|
||||
else return null;
|
||||
return currentVO;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -63,15 +61,11 @@ public class Utils {
|
|||
for(String scope: resource.scopes()){
|
||||
log.debug("processing scope: "+scope);
|
||||
ScopeBean scopeBean = new ScopeBean(scope);
|
||||
if(scopeBean.is(Type.VRE)) {
|
||||
String enclosedVO=scopeBean.enclosingScope().toString();
|
||||
vosScopes.add(enclosedVO);
|
||||
log.debug(enclosedVO+" VO scope added");
|
||||
}else {
|
||||
if(scopeBean.is(Type.VRE))
|
||||
vosScopes.add(scopeBean.enclosingScope().toString());
|
||||
else
|
||||
// if the scope is a root-vo scope, it will be added to the vosScope array
|
||||
vosScopes.add(scope);
|
||||
log.debug(scope+" VO scope added");
|
||||
}
|
||||
}
|
||||
return vosScopes;
|
||||
}
|
||||
|
|
|
@ -74,7 +74,7 @@ public class ValidationUtils {
|
|||
}
|
||||
|
||||
public static <T extends Resource> boolean isCompatibleScopeForRemove(T resource, String scope){
|
||||
log.info("scope: "+scope+" check if update is needed inr resource: "+resource.id());
|
||||
log.info("scope: {} check if update is needed inr resource: {}", scope,resource.id());
|
||||
if(resource.scopes().size() == 0)
|
||||
return true;
|
||||
if(new ScopeBean(scope).is(Type.VRE)){
|
||||
|
|
|
@ -1,68 +0,0 @@
|
|||
package org.gcube.informationsystem.publisher;
|
||||
|
||||
import static org.junit.Assert.*;
|
||||
import java.net.URL;
|
||||
import java.net.URLClassLoader;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.ServiceLoader;
|
||||
import org.gcube.informationsystem.publisher.scope.IValidatorContext;
|
||||
import org.gcube.informationsystem.publisher.scope.Validator;
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
public class ConfigurationTest {
|
||||
|
||||
private ClassLoader loader;
|
||||
// static final String relativePath="src/test/java/META-INF/services/org.gcube.informationsystem.publisher.scope.IValidatorContext";
|
||||
|
||||
|
||||
@Before
|
||||
public void init() {
|
||||
loader = Thread.currentThread().getContextClassLoader();
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
public void alternativeProvidersCanBeConfigured() {
|
||||
addJarsToClasspath("customValidator.jar");
|
||||
List<IValidatorContext> impls=load();
|
||||
assertEquals(impls.size(), 1);
|
||||
}
|
||||
|
||||
private List<IValidatorContext> load(){
|
||||
ServiceLoader<IValidatorContext> loader = ServiceLoader.load(IValidatorContext.class);
|
||||
Iterator<IValidatorContext> iterator = loader.iterator();
|
||||
List<IValidatorContext> impls = new ArrayList<IValidatorContext>();
|
||||
while(iterator.hasNext())
|
||||
impls.add(iterator.next());
|
||||
System.out.println("size: "+impls.size());
|
||||
if(impls.size()==1){
|
||||
IValidatorContext context = impls.get(0);
|
||||
for( Validator validator : context.getValidators()){
|
||||
System.out.println("implementation found: "+ validator.type());
|
||||
}
|
||||
}
|
||||
return impls;
|
||||
}
|
||||
|
||||
private void addJarsToClasspath(String ... jars) {
|
||||
|
||||
List<URL> jarUrls = new ArrayList<URL>();
|
||||
for (String jar : jars)
|
||||
jarUrls.add(loader.getResource(jar));
|
||||
|
||||
URLClassLoader urlClassLoader
|
||||
= new URLClassLoader(jarUrls.toArray(new URL[0]),loader);
|
||||
|
||||
|
||||
Thread.currentThread().setContextClassLoader(urlClassLoader);
|
||||
}
|
||||
|
||||
@After
|
||||
public void teardown() {
|
||||
Thread.currentThread().setContextClassLoader(loader);
|
||||
}
|
||||
}
|
|
@ -1,22 +0,0 @@
|
|||
package org.gcube.informationsystem.publisher;
|
||||
|
||||
import java.util.List;
|
||||
import static org.junit.Assert.*;
|
||||
import org.gcube.informationsystem.publisher.scope.IValidatorContext;
|
||||
import org.gcube.informationsystem.publisher.scope.ScopeValidatorScanner;
|
||||
import org.gcube.informationsystem.publisher.scope.Validator;
|
||||
import org.junit.Test;
|
||||
|
||||
public class DefaultConfigurationTest {
|
||||
|
||||
@Test
|
||||
public void testDefaultValidator(){
|
||||
IValidatorContext context=ScopeValidatorScanner.provider();
|
||||
List<Validator> list= context.getValidators();
|
||||
assertNotNull(list);
|
||||
Validator validator =list.get(0);
|
||||
System.out.println("found validator: "+validator.type());
|
||||
assertEquals(validator.type().toString().trim(),"class org.gcube.common.resources.gcore.Resource");
|
||||
}
|
||||
|
||||
}
|
|
@ -1,46 +0,0 @@
|
|||
package org.gcube.informationsystem.publisher;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.InputStream;
|
||||
import java.net.URL;
|
||||
import java.util.List;
|
||||
|
||||
import org.apache.log4j.helpers.Loader;
|
||||
import org.gcube.informationsystem.publisher.scope.IValidatorContext;
|
||||
import org.gcube.informationsystem.publisher.scope.ScopeValidatorScanner;
|
||||
import org.gcube.informationsystem.publisher.scope.Validator;
|
||||
import org.junit.BeforeClass;
|
||||
import org.junit.Test;
|
||||
|
||||
public class DefaultScopeValidatorTest {
|
||||
|
||||
static final String relativePath="/src/test/java/META-INF/services/org.gcube.informationsystem.publisher.scope.IValidatorContext";
|
||||
|
||||
// @BeforeClass
|
||||
public static void deleteServiceInfo(){
|
||||
URL url=Thread.currentThread().getClass().getResource("/");
|
||||
if(url != null){
|
||||
File f =new File(url.getPath());
|
||||
String rootPath=f.getParentFile().getParentFile().getAbsolutePath();
|
||||
System.out.println(" "+f.exists()+" path "+rootPath);
|
||||
File service=new File(rootPath+relativePath);
|
||||
|
||||
if(service.exists()){
|
||||
boolean del=service.delete();
|
||||
System.out.println("deleted? "+del);
|
||||
}
|
||||
}
|
||||
System.out.println("url founded "+url);
|
||||
|
||||
}
|
||||
|
||||
// @Test
|
||||
public void testDefaultValidator(){
|
||||
IValidatorContext context=ScopeValidatorScanner.provider();
|
||||
List<Validator> list= context.getValidators();
|
||||
for(Validator validator : list){
|
||||
System.out.println("validator founded: "+validator.type());
|
||||
}
|
||||
}
|
||||
|
||||
}
|
|
@ -2,6 +2,8 @@ package org.gcube.informationsystem.publisher;
|
|||
|
||||
import static org.gcube.common.resources.gcore.Resources.print;
|
||||
import static org.junit.Assert.*;
|
||||
|
||||
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
|
||||
import org.gcube.common.resources.gcore.GCoreEndpoint;
|
||||
import org.gcube.common.resources.gcore.Resource;
|
||||
import org.gcube.common.resources.gcore.Resource.Type;
|
||||
|
@ -14,38 +16,39 @@ import org.slf4j.Logger;
|
|||
import org.slf4j.LoggerFactory;
|
||||
|
||||
public class GCoreEndpointPublisherTests {
|
||||
|
||||
|
||||
private static final Logger log = LoggerFactory.getLogger(RegistryPublisherTests.class);
|
||||
static GCoreEndpoint running;
|
||||
static RegistryPublisher rp;
|
||||
static Resource r;
|
||||
|
||||
|
||||
@BeforeClass
|
||||
public static void init(){
|
||||
// ScopeProvider.instance.set("/d4science.research-infrastructures.eu/EUBrazilOpenBio");
|
||||
ScopeProvider.instance.set("/gcube/devsec");
|
||||
running = Resources.unmarshal(GCoreEndpoint.class, PublisherTest.class.getClassLoader().getResourceAsStream("gCoreEndpoint.xml"));
|
||||
// ScopeProvider.instance.set("/d4science.research-infrastructures.eu/EUBrazilOpenBio");
|
||||
ScopeProvider.instance.set("/gcube/devNext");
|
||||
SecurityTokenProvider.instance.set("52b59669-ccde-46d2-a4da-108b9e941f7c-98187548");
|
||||
rp=RegistryPublisherFactory.create();
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void printTest(){
|
||||
print(running);
|
||||
//resource-specific tests
|
||||
//print(running);
|
||||
//resource-specific tests
|
||||
assertEquals(Type.GCOREENDPOINT,running.type());
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void registerCreate(){
|
||||
r=rp.create(running);
|
||||
System.out.println("new resource created: ");
|
||||
if(r!=null)
|
||||
print(r);
|
||||
assertEquals(running,r);
|
||||
|
||||
for (int i = 0; i<10; i++) {
|
||||
running = Resources.unmarshal(GCoreEndpoint.class, PublisherTest.class.getClassLoader().getResourceAsStream("gCoreEndpoint.xml"));
|
||||
r=rp.create(running);
|
||||
System.out.println("new resource created: "+r.id());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@AfterClass
|
||||
|
||||
|
||||
/*@AfterClass
|
||||
public static void forceDeleteResource(){
|
||||
try {
|
||||
Thread.sleep(3000);
|
||||
|
@ -59,8 +62,8 @@ public class GCoreEndpointPublisherTests {
|
|||
advancedPublisher.forceRemove(r);
|
||||
ScopeProvider.instance.set(currentScope);
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
}*/
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -1,64 +0,0 @@
|
|||
package org.gcube.informationsystem.publisher;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.PrintStream;
|
||||
import java.net.MalformedURLException;
|
||||
import java.net.URL;
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
import org.gcube.informationsystem.publisher.scope.IValidatorContext;
|
||||
import org.gcube.informationsystem.publisher.scope.ScopeValidatorScanner;
|
||||
import org.gcube.informationsystem.publisher.scope.Validator;
|
||||
import org.junit.AfterClass;
|
||||
import org.junit.BeforeClass;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.rules.TemporaryFolder;
|
||||
|
||||
public class ScopeValidatorTest {
|
||||
|
||||
// static IValidatorContext context;
|
||||
static final String IMPL_CLASS="org.gcube.informationsystem.scope.validator.ValidatorContextImpl";
|
||||
static final String relativePath="src/test/java/META-INF/services/org.gcube.informationsystem.publisher.scope.IValidatorContext";
|
||||
|
||||
// @Rule
|
||||
// public static TemporaryFolder testFolder = new TemporaryFolder();
|
||||
|
||||
public static File service;
|
||||
|
||||
// @BeforeClass
|
||||
public static void writeServiceInfo() throws IOException{
|
||||
service=new File(relativePath);
|
||||
FileOutputStream file = new FileOutputStream(service);
|
||||
PrintStream output = new PrintStream(file);
|
||||
output.print(IMPL_CLASS);
|
||||
output.flush();
|
||||
output.close();
|
||||
System.out.println("file writed ");
|
||||
}
|
||||
|
||||
|
||||
// @Test
|
||||
public void test(){
|
||||
IValidatorContext context=ScopeValidatorScanner.provider();
|
||||
List<Validator> list= context.getValidators();
|
||||
for(Validator validator : list){
|
||||
System.out.println("validator founded: "+validator.type());
|
||||
}
|
||||
}
|
||||
|
||||
// @AfterClass
|
||||
// public static void deleteServiceInfo() throws IOException{
|
||||
// if(service.exists()){
|
||||
// boolean del=service.delete();
|
||||
// System.out.println("deleted? "+del);
|
||||
//
|
||||
// }
|
||||
//
|
||||
// }
|
||||
|
||||
}
|
|
@ -1,33 +0,0 @@
|
|||
package org.gcube.informationsystem.scope.validator;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.gcube.common.resources.gcore.GenericResource;
|
||||
import org.gcube.common.resources.gcore.Resource;
|
||||
import org.gcube.informationsystem.publisher.scope.Validator;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
public class MyGenericResourceValidator<R> implements Validator<GenericResource> {
|
||||
|
||||
private static Logger log = LoggerFactory.getLogger(MyGenericResourceValidator.class);
|
||||
|
||||
@Override
|
||||
public <R extends Resource> void validate(R resource) {
|
||||
log.info("validate method of "+this.getClass());
|
||||
}
|
||||
|
||||
@Override
|
||||
public Class type() {
|
||||
return GenericResource.class;
|
||||
}
|
||||
|
||||
@Override
|
||||
public <R extends Resource> void checkScopeCompatibility(R resource,
|
||||
List<String> scopes) {
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
|
@ -1,35 +0,0 @@
|
|||
package org.gcube.informationsystem.scope.validator;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.gcube.common.resources.gcore.Resource;
|
||||
import org.gcube.common.resources.gcore.ServiceEndpoint;
|
||||
import org.gcube.informationsystem.publisher.scope.Validator;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
public class MyServiceEndpointValidator<R> implements Validator<ServiceEndpoint>{
|
||||
|
||||
private static Logger log = LoggerFactory.getLogger(MyServiceEndpointValidator.class);
|
||||
|
||||
@Override
|
||||
public <R extends Resource> void validate(R resource) {
|
||||
log.info("validate method of "+this.getClass());
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public Class type() {
|
||||
return ServiceEndpoint.class;
|
||||
}
|
||||
|
||||
@Override
|
||||
public <R extends Resource> void checkScopeCompatibility(R resource,
|
||||
List<String> scopes) {
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
|
@ -1,18 +0,0 @@
|
|||
package org.gcube.informationsystem.scope.validator;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
import org.gcube.informationsystem.publisher.scope.IValidatorContext;
|
||||
import org.gcube.informationsystem.publisher.scope.Validator;
|
||||
|
||||
public class ValidatorContextImpl implements IValidatorContext{
|
||||
|
||||
final static List<Validator> validators = Arrays.asList(new MyGenericResourceValidator(), new MyServiceEndpointValidator());
|
||||
|
||||
@Override
|
||||
public List<Validator> getValidators() {
|
||||
return validators;
|
||||
}
|
||||
|
||||
}
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
<Resource version="0.4.x">
|
||||
<ID>5d244ab0-9d79-11e3-af18-dd5904b11dd6</ID>
|
||||
<ID></ID>
|
||||
<Type>RunningInstance</Type>
|
||||
<Scopes>
|
||||
</Scopes>
|
||||
|
|
Loading…
Reference in New Issue