diff --git a/.classpath b/.classpath index afb1550..045159b 100644 --- a/.classpath +++ b/.classpath @@ -1,17 +1,12 @@ - + - - - - - - + @@ -24,7 +19,7 @@ - + diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..cdfe4f1 --- /dev/null +++ b/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding//src/test/java=UTF-8 +encoding//src/test/resources=UTF-8 +encoding/=UTF-8 diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index b9a1035..db24ee7 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,4 +12,4 @@ org.eclipse.jdt.core.compiler.problem.enumIdentifier=error 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.7 +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..c469294 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,10 @@ + +# Changelog + +All notable changes to this project will be documented in this file. +This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + + +## [v0.1.0] - 2020-08-27 + +First Release diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..1932b4c --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,311 @@ +#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 new file mode 100644 index 0000000..b29582c --- /dev/null +++ b/README.md @@ -0,0 +1,57 @@ +# Catalogue Util Library + +Utility library to interact with the D4Science's Catalogues. +Read informations like: get users information, get organizations informations, etc. are powered by jackan library. +Write informations like: create new datasets, create a new resources, etc, are powered by [gCat service](https://wiki.gcube-system.org/GCat_Background) + +## Built With + +* [OpenJDK](https://openjdk.java.net/) - The JDK used +* [Maven](https://maven.apache.org/) - Dependency Management + +## Documentation + +You can find the D4Science Catalogue documentation at [GCat Background Wiki Page](https://wiki.gcube-system.org/GCat_Background) + +## Change log + +See the [Releases](https://code-repo.d4science.org/gCubeSystem/catalogue-util-library/releases) + +## Authors + +* **Francesco Mangiacrapa** ([ORCID](https://orcid.org/0000-0002-6528-664X)) Computer Scientist at [ISTI-CNR Infrascience Group](http://nemis.isti.cnr.it/groups/infrascience) + +## 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); + - EUBrazilOpenBio (grant no. 288754); + - iMarine(grant no. 283644). +- the H2020 research and innovation programme + - BlueBRIDGE (grant no. 675680); + - EGIEngage (grant no. 654142); + - ENVRIplus (grant no. 654182); + - PARTHENOS (grant no. 654119); + - SoBigData (grant no. 654024); + - DESIRA (grant no. 818194); + - ARIADNEplus (grant no. 823914); + - RISIS2 (grant no. 824091); + - PerformFish (grant no. 727610); + - AGINFRAplus (grant no. 731001). + + diff --git a/descriptor.xml b/descriptor.xml new file mode 100644 index 0000000..eb2042f --- /dev/null +++ b/descriptor.xml @@ -0,0 +1,30 @@ + + servicearchive + + tar.gz + + / + + + / + true + + README.md + LICENSE.md + profile.xml + CHANGELOG.md + + 755 + true + + + + + target/${build.finalName}.${project.packaging} + /${artifactId} + + + \ No newline at end of file diff --git a/profile.xml b/profile.xml new file mode 100644 index 0000000..1a36d72 --- /dev/null +++ b/profile.xml @@ -0,0 +1,25 @@ + + + + Service + + ${project.description} + PortletWidget + ${project.artifactId} + 1.0.0 + + + ${project.artifactId} + ${project.description} + + ${project.groupId} + ${project.artifactId} + ${project.version} + + + ${project.build.finalName}.${project.packaging} + + + + + diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/ckan/ExtendCkanClient.java b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/ckan/ExtendCkanClient.java index 59fd7b4..5114024 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/ckan/ExtendCkanClient.java +++ b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/ckan/ExtendCkanClient.java @@ -110,7 +110,7 @@ public class ExtendCkanClient extends CkanClient implements PatchedCkan{ */ public synchronized CkanOrganization getOrganization(String idOrName) { checkNotNull(idOrName, "Need a valid id or name!"); - logger.info("Patched read organization for id/name: {}", idOrName); + logger.debug("Patched read organization for id/name: {}", idOrName); return getHttp(OrganizationResponse.class, "/api/3/action/organization_show", "id", idOrName, "include_datasets", "false", "include_users", "true").result; @@ -128,7 +128,7 @@ public class ExtendCkanClient extends CkanClient implements PatchedCkan{ */ public synchronized CkanGroup getGroup(String idOrName) { checkNotNull(idOrName, "Need a valid id or name!"); - logger.info("Patched read group for id/name: {}", idOrName); + logger.debug("Patched read group for id/name: {}", idOrName); return getHttp(GroupResponse.class, "/api/3/action/group_show", "id", idOrName, "include_datasets", "false", "include_users", "true").result; } diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/db/DBCaller.java b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/db/DBCaller.java index 29054af..5057918 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/db/DBCaller.java +++ b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/db/DBCaller.java @@ -77,7 +77,9 @@ public class DBCaller { dbBaseConnectionURL+="/" + CKAN_DB_NAME; - LOG.trace("DB CONNECTION URL: "+dbBaseConnectionURL); + LOG.debug("DB CONNECTION URL: "+dbBaseConnectionURL); + LOG.debug("CKAN_DB_USER: "+CKAN_DB_USER); + LOG.debug("CKAN_DB_PASSWORD: "+CKAN_DB_PASSWORD); Connection connection = DriverManager.getConnection(dbBaseConnectionURL, CKAN_DB_USER, CKAN_DB_PASSWORD); LOG.trace("Returnig db connection"); diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogue.java b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogue.java index 90b1a67..8207a39 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogue.java +++ b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogue.java @@ -149,7 +149,7 @@ public interface DataCatalogue { /** * Retrieve the organization with this name */ - CkanOrganization getOrganizationByName(String name); + CkanOrganization getOrganizationByIdOrName(String name); /** * Returns the list of organizations to whom the user belongs (with any role) @@ -174,7 +174,8 @@ public interface DataCatalogue { String getRoleOfUserInOrganization(String username, String orgName); - /**************************************************************************** + /** + * ************************************************************************** * * * @@ -190,7 +191,28 @@ public interface DataCatalogue { * * * - * ***************************************************************************/ + * **************************************************************************. + * + * @param username the username + * @param title the title + * @param name the name + * @param organizationNameOrId the organization name or id + * @param author the author + * @param authorMail the author mail + * @param maintainer the maintainer + * @param maintainerMail the maintainer mail + * @param version the version + * @param description the description + * @param licenseId the license id + * @param tags the tags + * @param customFieldsMultiple the custom fields multiple + * @param resources the resources + * @param setPublic the set public + * @param setSearchable the set searchable + * @param authorizationToken the authorization token + * @return the string + * @throws Exception the exception + */ /** diff --git a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogueImpl.java b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogueImpl.java index 6b28d5d..8891115 100644 --- a/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogueImpl.java +++ b/src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/DataCatalogueImpl.java @@ -13,6 +13,7 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import org.gcube.common.authorization.library.provider.SecurityTokenProvider; +import org.gcube.common.scope.api.ScopeProvider; import org.gcube.common.scope.impl.ScopeBean; import org.gcube.common.scope.impl.ScopeBean.Type; import org.gcube.datacatalogue.ckanutillibrary.ckan.DirectCkanCaller; @@ -145,6 +146,20 @@ public class DataCatalogueImpl implements DataCatalogue { extendRoleInOrganization = runningInstance.getExtendRoleInOrganization(); } + /** + * The ckan catalogue url and database will be discovered in this scope. + * + * @param scope the scope + * @param sysAuthentication if true perform the sys authentication + * @throws Exception if unable to find datacatalogue info + */ + public DataCatalogueImpl(String scope, boolean sysAuthentication) throws Exception{ + this(scope); + + if(sysAuthentication) + ckanCaller = new ExtendCkanClient(CKAN_CATALOGUE_URL, CKAN_TOKEN_SYS); + } + @Override public String getCatalogueUrl() { return CKAN_CATALOGUE_URL; @@ -623,17 +638,17 @@ public class DataCatalogueImpl implements DataCatalogue { } @Override - public CkanOrganization getOrganizationByName(String name) { + public CkanOrganization getOrganizationByIdOrName(String idOrName) { - checkNotNull(name); + checkNotNull(idOrName); - String ckanName = name.toLowerCase(); + String ckanName = idOrName.toLowerCase(); try{ return ckanCaller.getOrganization(ckanName); }catch(Exception e){ - LOG.warn("Failed to retrieve the organization with name " +name+ " on the ckan: "+ckanCaller.getCatalogUrl(), e); + LOG.warn("Failed to retrieve the organization with name " +idOrName+ " on the ckan: "+ckanCaller.getCatalogUrl(), e); } return null; } @@ -796,7 +811,9 @@ public class DataCatalogueImpl implements DataCatalogue { // try to create String jsonValueDataset = MarshUnmarshCkanObject.toJsonValueDataset(dataset); - LOG.debug("Serialized dataset is: " + jsonValueDataset); + LOG.info("Serialized dataset is: " + jsonValueDataset); + ScopeProvider.instance.set("/gcube/devsec/devVRE"); + SecurityTokenProvider.instance.set("8e74a17c-92f1-405a-b591-3a6090066248-98187548"); jsonValueDataset = gCatCaller.createDataset(jsonValueDataset,true); LOG.debug("Created dataset is: " + jsonValueDataset); diff --git a/src/test/java/org/gcube/datacatalogue/ckanutillibrary/test/TestDataCatalogueLib.java b/src/test/java/org/gcube/datacatalogue/ckanutillibrary/test/TestDataCatalogueLib.java index fb72f95..bf193ce 100644 --- a/src/test/java/org/gcube/datacatalogue/ckanutillibrary/test/TestDataCatalogueLib.java +++ b/src/test/java/org/gcube/datacatalogue/ckanutillibrary/test/TestDataCatalogueLib.java @@ -38,7 +38,7 @@ public class TestDataCatalogueLib { //private String scope = "/d4science.research-infrastructures.eu/gCubeApps/BiodiversityLab"; //private String testUser = "costantino_perciante"; private String testUser = "francesco.mangiacrapa"; - private String authorizationToken = ""; + private String authorizationToken = "8e74a17c-92f1-405a-b591-3a6090066248-98187548"; //devVRE String subjectId = "aa_father4"; String objectId = "bb_son4"; @@ -134,7 +134,7 @@ public class TestDataCatalogueLib { String orgName = "devvre"; DataCatalogueImpl utils = factory.getUtilsPerScope(scope); - CkanOrganization org = utils.getOrganizationByName(orgName); + CkanOrganization org = utils.getOrganizationByIdOrName(orgName); String role = utils.getRoleOfUserInOrganization(testUser, org.getName()); logger.debug("The user "+testUser+" in the org "+org.getName() + " has the role "+role); } @@ -143,10 +143,10 @@ public class TestDataCatalogueLib { public void getOrganizationForName() throws Exception{ String orgName = "devvre"; - + DataCatalogueImpl utils = factory.getUtilsPerScope(scope); - CkanOrganization org = utils.getOrganizationByName(orgName); + CkanOrganization org = utils.getOrganizationByIdOrName(orgName); logger.debug("The "+CkanOrganization.class.getSimpleName()+" is: "+org.getName()); logger.debug("LandingPages of "+CkanOrganization.class.getSimpleName()+" for name " + utils.getLandingPages()); @@ -166,10 +166,29 @@ public class TestDataCatalogueLib { } + //@Test + public void countDatasetForOganization() throws Exception{ + + DataCatalogueImpl utils = new DataCatalogueImpl(scope,true); + + List listOrgIds = utils.getOrganizationsIds(); + + System.out.println("'ORGANIZATION NAME': 'NUMBER OF PACKAGE'"); + + for (String orgID : listOrgIds) { + CkanOrganization org = utils.getOrganizationByIdOrName(orgID); + int packageCount = org.getPackageCount(); + //logger.info("ORG: "+org.getName() + " has "+packageCount+ " package/s"); + System.out.println(org.getName()+": "+packageCount); + } + + } + @Test public void createDataset() throws Exception{ try { + ScopeProvider.instance.set(scope); SecurityTokenProvider.instance.set(authorizationToken); DataCatalogueImpl instance = factory.getUtilsPerScope(scope); @@ -194,10 +213,13 @@ public class TestDataCatalogueLib { //System.out.println("Org name by VRE: "+orgName); logger.debug("Org name by VRE: "+orgName); + int random = new Random().nextInt(); + String datasetTitle = "a dataset created by catalogue-util-library "+random; + String datasetName = datasetTitle.replace(" ", ""); String createdDataset = instance.createCKanDatasetMultipleCustomFields( testUser, - "first dataset by catalogue-util-library", - "firstdatasetbycatalogue-util-library", + "a dataset created by catalogue-util-library "+random, + datasetName, orgName, testUser, null,