diff --git a/CHANGELOG.md b/CHANGELOG.md index 036873c..04c7f76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for gCube Model -## [v4.0.1-SNAPSHOT] +## [v4.1.0-SNAPSHOT] -- Adding documentation generation +- Added model name to registration provider ## [v4.0.0] diff --git a/pom.xml b/pom.xml index fc9efc8..7766eb9 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.gcube.resource-management gcube-model - 4.0.1-SNAPSHOT + 4.1.0-SNAPSHOT gCube Resources gCube Model is a resource model built on top of IS Model which captures the different aspects of the resources and their relations playing significant roles in a research infrastructure empowered by gCube jar diff --git a/src/main/java/org/gcube/resourcemanagement/model/impl/GCubeModelRegistrationProvider.java b/src/main/java/org/gcube/resourcemanagement/model/impl/GCubeModelRegistrationProvider.java index 38e8738..889ffbd 100644 --- a/src/main/java/org/gcube/resourcemanagement/model/impl/GCubeModelRegistrationProvider.java +++ b/src/main/java/org/gcube/resourcemanagement/model/impl/GCubeModelRegistrationProvider.java @@ -15,6 +15,8 @@ import org.gcube.resourcemanagement.model.reference.relations.isrelatedto.Activa */ public class GCubeModelRegistrationProvider implements RegistrationProvider { + public static final String GCUBE_MODEL_NAME = "gCube Model"; + @Override public List getPackagesToRegister() { List packages = new ArrayList<>(); @@ -25,5 +27,10 @@ public class GCubeModelRegistrationProvider implements RegistrationProvider { packages.add(HasContact.class.getPackage()); return packages; } + + @Override + public String getModelName() { + return GCUBE_MODEL_NAME; + } } diff --git a/src/test/java/org/gcube/resourcemanagement/documentation/ISMDiscoveryForDocumentation.java b/src/test/java/org/gcube/resourcemanagement/documentation/ISMDiscoveryForDocumentation.java deleted file mode 100644 index d6bf487..0000000 --- a/src/test/java/org/gcube/resourcemanagement/documentation/ISMDiscoveryForDocumentation.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.gcube.resourcemanagement.documentation; - -import java.io.File; -import java.util.List; - -import org.gcube.informationsystem.utils.documentation.DocumentationGenerator; -import org.gcube.resourcemanagement.model.impl.GCubeModelRegistrationProvider; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * @author Luca Frosini (ISTI - CNR) - */ -public class ISMDiscoveryForDocumentation { - - private static final Logger logger = LoggerFactory.getLogger(ISMDiscoveryForDocumentation.class); - - @Test - public void generateDocumentation() throws Exception { - File documentationDirectory = new File("docs"); - DocumentationGenerator documentationGenerator = new DocumentationGenerator(documentationDirectory); - -// Type type = TypeMapper.createTypeDefinition(ValueSchema.class); -// documentationGenerator.generatePropertySection(type); - List pkgs = (new GCubeModelRegistrationProvider()).getPackagesToRegister(); - documentationGenerator.generate(pkgs); - } -}