From 38e264bb5979bca65f1d5b47732c3879573b5560 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Thu, 19 Jan 2023 18:38:02 +0100 Subject: [PATCH] Renamed enum --- .../utils/documentation/DocGenerator.java | 8 ++++---- .../{ClassesMapping.java => ModelTypes.java} | 18 +++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) rename src/main/java/org/gcube/informationsystem/utils/documentation/{ClassesMapping.java => ModelTypes.java} (82%) diff --git a/src/main/java/org/gcube/informationsystem/utils/documentation/DocGenerator.java b/src/main/java/org/gcube/informationsystem/utils/documentation/DocGenerator.java index 1823a29..75c7f53 100644 --- a/src/main/java/org/gcube/informationsystem/utils/documentation/DocGenerator.java +++ b/src/main/java/org/gcube/informationsystem/utils/documentation/DocGenerator.java @@ -67,7 +67,7 @@ public class DocGenerator { generate(pkgs.toArray(new Package[pkgs.size()])); } - protected File getFile(ClassesMapping cm) throws IOException { + protected File getFile(ModelTypes cm) throws IOException { String fileName = cm.getFilename(); File file = new File(fileName); @@ -89,7 +89,7 @@ public class DocGenerator { return file; } - protected void generateAllOfType(ClassesMapping cm, Package[] packages) throws Exception { + protected void generateAllOfType(ModelTypes cm, Package[] packages) throws Exception { ElementSpecilizationDiscovery discovery = new ElementSpecilizationDiscovery<>(cm.getAccessType().getTypeClass()); if(Objects.nonNull(packages)) { Arrays.stream(packages).forEach(p -> discovery.addPackage(p)); @@ -105,7 +105,7 @@ public class DocGenerator { } } - protected void generateSingle(ClassesMapping cm) throws Exception { + protected void generateSingle(ModelTypes cm) throws Exception { File f = getFile(cm); DocumentationGenerator dgInstance = cm.getDocumentationGeneratorInstance(cm.getAccessType().getTypeClass()); StringBuffer sb = dgInstance.generateSection(); @@ -113,7 +113,7 @@ public class DocGenerator { } protected void generate(Package[] packages) throws Exception { - for(ClassesMapping cm : ClassesMapping.values()) { + for(ModelTypes cm : ModelTypes.values()) { if(cm.discover()) { generateAllOfType(cm, packages); }else { diff --git a/src/main/java/org/gcube/informationsystem/utils/documentation/ClassesMapping.java b/src/main/java/org/gcube/informationsystem/utils/documentation/ModelTypes.java similarity index 82% rename from src/main/java/org/gcube/informationsystem/utils/documentation/ClassesMapping.java rename to src/main/java/org/gcube/informationsystem/utils/documentation/ModelTypes.java index 9330d7c..4454fd8 100644 --- a/src/main/java/org/gcube/informationsystem/utils/documentation/ClassesMapping.java +++ b/src/main/java/org/gcube/informationsystem/utils/documentation/ModelTypes.java @@ -15,15 +15,15 @@ import org.gcube.informationsystem.utils.documentation.model.relations.RelationD /** * @author Luca Frosini (ISTI - CNR) */ -public enum ClassesMapping { +public enum ModelTypes { - PROPERTY(AccessType.PROPERTY, PropertyDocumentationGenerator.class, true, ClassesMapping.PROPERTIES_FILENAME, true), - ENTITY(AccessType.ENTITY, EntityDocumentationGenerator.class, false, ClassesMapping.ENTITIES_FILENAME, true), - RESOURCE(AccessType.RESOURCE, ResourceDocumentationGenerator.class, true, ClassesMapping.ENTITIES_FILENAME, false), - FACET(AccessType.FACET, FacetDocumentationGenerator.class, true, ClassesMapping.ENTITIES_FILENAME, false), - RELATION(AccessType.RELATION, RelationDocumentationGenerator.class, false, ClassesMapping.RELATIONS_FILENAME, true), - IS_RELATED_TO(AccessType.IS_RELATED_TO, IsRelatedToDocumentationGenerator.class, true, ClassesMapping.RELATIONS_FILENAME, false), - CONSISTS_OF(AccessType.CONSISTS_OF, ConsistsOfDocumentationGenerator.class, true, ClassesMapping.RELATIONS_FILENAME, false); + PROPERTY(AccessType.PROPERTY, PropertyDocumentationGenerator.class, true, ModelTypes.PROPERTIES_FILENAME, true), + ENTITY(AccessType.ENTITY, EntityDocumentationGenerator.class, false, ModelTypes.ENTITIES_FILENAME, true), + RESOURCE(AccessType.RESOURCE, ResourceDocumentationGenerator.class, true, ModelTypes.ENTITIES_FILENAME, false), + FACET(AccessType.FACET, FacetDocumentationGenerator.class, true, ModelTypes.ENTITIES_FILENAME, false), + RELATION(AccessType.RELATION, RelationDocumentationGenerator.class, false, ModelTypes.RELATIONS_FILENAME, true), + IS_RELATED_TO(AccessType.IS_RELATED_TO, IsRelatedToDocumentationGenerator.class, true, ModelTypes.RELATIONS_FILENAME, false), + CONSISTS_OF(AccessType.CONSISTS_OF, ConsistsOfDocumentationGenerator.class, true, ModelTypes.RELATIONS_FILENAME, false); public static final String PROPERTIES_FILENAME = "properties.rst"; public static final String ENTITIES_FILENAME = "entities.rst"; @@ -35,7 +35,7 @@ public enum ClassesMapping { private final String filename; private final boolean newFile; - ClassesMapping(AccessType accessType, Class dgClz, boolean discover, String filename, boolean newFile) { + ModelTypes(AccessType accessType, Class dgClz, boolean discover, String filename, boolean newFile) { this.accessType = accessType; this.dgClz = dgClz; this.discover = discover;