[Studio] Apply renaming of Dt to Data

vertigo-io · Feb 19, 2024 · edef502 · edef502
1 parent 2a3767a
commit edef502
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 37 deletions.
diff --git a/src/main/java/io/vertigo/studio/plugins/generator/vertigo/VertigoConstants.java b/src/main/java/io/vertigo/studio/plugins/generator/vertigo/VertigoConstants.java
@@ -25,18 +25,18 @@ public class VertigoConstants {
 
 	public enum VertigoClassNames {
 
-		DtList("io.vertigo.datamodel.structure.model.DtList"),
-		Entity("io.vertigo.datamodel.structure.model.Entity"),
-		DtObject("io.vertigo.datamodel.structure.model.DtObject"),
-		DtMasterData("io.vertigo.datamodel.structure.model.DtMasterData"),
-		DtStaticMasterData("io.vertigo.datamodel.structure.model.DtStaticMasterData"),
-		KeyConcept("io.vertigo.datamodel.structure.model.KeyConcept"),
-		Fragment("io.vertigo.datamodel.structure.model.Fragment"),
-		FragmentAnnotation("io.vertigo.datamodel.structure.stereotype.Fragment"),
-		AnnotationDataSpace("io.vertigo.datamodel.structure.stereotype.DataSpace"),
-		AnnotationForeignKey("io.vertigo.datamodel.structure.stereotype.ForeignKey"),
-		AnnotationAssociation("io.vertigo.datamodel.structure.stereotype.Association"),
-		AnnotationAssociationNN("io.vertigo.datamodel.structure.stereotype.AssociationNN");
+		DtList("io.vertigo.datamodel.data.model.DtList"), //
+		Entity("io.vertigo.datamodel.data.model.Entity"), //
+		DtObject("io.vertigo.datamodel.data.model.DataObject"), //
+		DtMasterData("io.vertigo.datamodel.data.model.DtMasterData"), //
+		DtStaticMasterData("io.vertigo.datamodel.data.model.DtStaticMasterData"), //
+		KeyConcept("io.vertigo.datamodel.data.model.KeyConcept"), //
+		Fragment("io.vertigo.datamodel.data.model.Fragment"), //
+		FragmentAnnotation("io.vertigo.datamodel.data.stereotype.Fragment"), //
+		AnnotationDataSpace("io.vertigo.datamodel.data.stereotype.DataSpace"), //
+		AnnotationForeignKey("io.vertigo.datamodel.data.stereotype.ForeignKey"), //
+		AnnotationAssociation("io.vertigo.datamodel.data.stereotype.Association"), //
+		AnnotationAssociationNN("io.vertigo.datamodel.data.stereotype.AssociationNN");
 
 		private final String packageName;
 		private final String simpleName;
@@ -68,9 +68,9 @@ public String getSimpleName() {
 
 	public enum VertigoDefinitionPrefix {
 
-		DtDefinition("Dt"),
-		FacetedQueryDefiniton("Qry"),
-		SearchIndexDefinition("Idx"),
+		DtDefinition("Dt"), //
+		FacetedQueryDefiniton("Qry"), //
+		SearchIndexDefinition("Idx"), //
 		Authorization("Atz");
 
 		private final String prefix;

diff --git a/...n/java/io/vertigo/studio/plugins/generator/vertigo/domain/java/template/dtdefinitions.ftl b/...n/java/io/vertigo/studio/plugins/generator/vertigo/domain/java/template/dtdefinitions.ftl
@@ -4,7 +4,7 @@ import java.util.Arrays;
 import java.util.Iterator;
 
 import io.vertigo.core.lang.Generated;
-import io.vertigo.datamodel.structure.definitions.DtFieldName;
+import io.vertigo.datamodel.data.definitions.DataFieldName;
 
 /**
  * This class is automatically generated.
@@ -42,7 +42,7 @@ public final class ${classSimpleName} implements Iterable<Class<?>> {
 	/**
 	 * Enumération des champs de ${dtDefinition.classSimpleName}.
 	 */
-	public enum ${dtDefinition.classSimpleName}Fields implements DtFieldName<${dtDefinition.classCanonicalName}> {
+	public enum ${dtDefinition.classSimpleName}Fields implements DataFieldName<${dtDefinition.classCanonicalName}> {
 		<#list dtDefinition.allFields as dtField>
 		/** Propriété '${dtField.label}'. */
 		${dtField.name}<#sep>,<#sep>

diff --git a/src/main/java/io/vertigo/studio/plugins/generator/vertigo/domain/java/template/dto.ftl b/src/main/java/io/vertigo/studio/plugins/generator/vertigo/domain/java/template/dto.ftl
@@ -9,13 +9,13 @@ import io.vertigo.datastore.impl.entitystore.EnumStoreVAccessor;
 import io.vertigo.datastore.impl.entitystore.StoreListVAccessor;
 </#if>
 <#if dtDefinition.entity || dtDefinition.fragment>
-import io.vertigo.datamodel.structure.model.UID;
+import io.vertigo.datamodel.data.model.UID;
 </#if>
 <#if dtDefinition.containsAccessor()>
 import io.vertigo.datastore.impl.entitystore.StoreVAccessor;
 </#if>	
-import io.vertigo.datamodel.structure.stereotype.Field;
-import io.vertigo.datamodel.structure.util.DtObjectUtil;
+import io.vertigo.datamodel.data.stereotype.Field;
+import io.vertigo.datamodel.data.util.DataModelUtil;
 
 /**
  * This class is automatically generated.
@@ -40,7 +40,7 @@ public final class ${dtDefinition.classSimpleName} implements ${dtDefinition.ste
 	private final StoreVAccessor<${dtField.association.returnType}> ${dtField.name?uncap_first}Accessor = new StoreVAccessor<>(${dtField.association.returnType}.class, "${dtField.association.role}");
 			</#if>
 		<#else>
-	private ${dtField.javaType} ${dtField.name}<#if dtField.multiple> = <#if dtField.dataObject > new io.vertigo.datamodel.structure.model.DtList<>(${dtField.dataObjectClassName}.class)<#else>new java.util.ArrayList<>()</#if></#if>;
+	private ${dtField.javaType} ${dtField.name}<#if dtField.multiple> = <#if dtField.dataObject > new io.vertigo.datamodel.data.model.DtList<>(${dtField.dataObjectClassName}.class)<#else>new java.util.ArrayList<>()</#if></#if>;
 		</#if>
 	</#list>
 	<#list dtDefinition.associations as association>
@@ -73,7 +73,7 @@ public final class ${dtDefinition.classSimpleName} implements ${dtDefinition.ste
 		</#list>
 	@Override
 	public UID<${dtDefinition.entityClassSimpleName}> getEntityUID() {
-		return DtObjectUtil.createEntityUID(this); 
+		return DataModelUtil.createEntityUID(this); 
 	}
 	</#if>
 	<#list dtDefinition.fields as dtField>
@@ -110,13 +110,13 @@ public final class ${dtDefinition.classSimpleName} implements ${dtDefinition.ste
 	${annotation}
 	</#list>
 	<#if dtField.isSortField()>
-	@io.vertigo.datamodel.structure.stereotype.SortField
+	@io.vertigo.datamodel.data.stereotype.SortField
 	</#if>
 	<#if dtField.isDisplayField()>
-	@io.vertigo.datamodel.structure.stereotype.DisplayField
+	@io.vertigo.datamodel.data.stereotype.DisplayField
 	</#if>
 	<#if dtField.isKeyField()>
-	@io.vertigo.datamodel.structure.stereotype.KeyField
+	@io.vertigo.datamodel.data.stereotype.KeyField
 	</#if>
 	public ${dtField.javaType} get${dtField.name?cap_first}() {
 		return ${dtField.name};
@@ -147,13 +147,13 @@ public final class ${dtDefinition.classSimpleName} implements ${dtDefinition.ste
 	${annotation}
 		</#list>
 	<#if dtField.isSortField()>
-	@io.vertigo.datamodel.structure.stereotype.SortField
+	@io.vertigo.datamodel.data.stereotype.SortField
 	</#if>
 	<#if dtField.isDisplayField()>
-	@io.vertigo.datamodel.structure.stereotype.DisplayField
+	@io.vertigo.datamodel.data.stereotype.DisplayField
 	</#if>
 	<#if dtField.isKeyField()>
-	@io.vertigo.datamodel.structure.stereotype.KeyField
+	@io.vertigo.datamodel.data.stereotype.KeyField
 	</#if>
 	public ${dtField.javaType} get${dtField.name?cap_first}() {
 		${dtField.javaCode}
@@ -190,6 +190,6 @@ public final class ${dtDefinition.classSimpleName} implements ${dtDefinition.ste
 	/** {@inheritDoc} */
 	@Override
 	public String toString() {
-		return DtObjectUtil.toString(this);
+		return DataModelUtil.toString(this);
 	}
 }
diff --git a/...java/io/vertigo/studio/plugins/generator/vertigo/domain/java/template/masterdata_enum.ftl b/...java/io/vertigo/studio/plugins/generator/vertigo/domain/java/template/masterdata_enum.ftl
@@ -2,8 +2,8 @@ package ${entity.packageName};
 
 import java.io.Serializable;
 
-import io.vertigo.datamodel.structure.model.MasterDataEnum;
-import io.vertigo.datamodel.structure.model.UID;
+import io.vertigo.datamodel.data.model.MasterDataEnum;
+import io.vertigo.datamodel.data.model.UID;
 
 public enum ${entity.classSimpleName}Enum implements MasterDataEnum<${entity.className}> {
 

diff --git a/src/main/java/io/vertigo/studio/plugins/generator/vertigo/domain/ksp/template/ksp.ftl b/src/main/java/io/vertigo/studio/plugins/generator/vertigo/domain/ksp/template/ksp.ftl
@@ -1,7 +1,7 @@
 package ${packageName}
 
 <#list dtSketchs as dtSketch>
-create DtDefinition ${dtSketch.name} {
+create DataDefinition ${dtSketch.name} {
 	<#list dtSketch.idFields as idField>
 	id ${idField.name} { label : "${idField.label}" domain: ${idField.domainName} }
 	</#list>

diff --git a/src/main/java/io/vertigo/studio/plugins/generator/vertigo/search/template/search_client.ftl b/src/main/java/io/vertigo/studio/plugins/generator/vertigo/search/template/search_client.ftl
@@ -28,8 +28,8 @@ import io.vertigo.datafactory.search.definitions.SearchIndexDefinition;
 import io.vertigo.datafactory.search.definitions.SearchIndexDefinitionSupplier;
 import io.vertigo.datafactory.search.model.SearchQuery;
 import io.vertigo.datafactory.search.model.SearchQueryBuilder;
-import io.vertigo.datamodel.structure.model.DtListState;
-import io.vertigo.datamodel.structure.model.UID;
+import io.vertigo.datamodel.data.model.DtListState;
+import io.vertigo.datamodel.data.model.UID;
 <#if indexDtDefinition.classCanonicalName != dtDefinition.classCanonicalName && indexDtDefinition.packageName != packageName>
 import ${indexDtDefinition.classCanonicalName};
 </#if>

diff --git a/src/main/java/io/vertigo/studio/plugins/generator/vertigo/task/template/dao.ftl b/src/main/java/io/vertigo/studio/plugins/generator/vertigo/task/template/dao.ftl
@@ -14,7 +14,7 @@ import io.vertigo.datamodel.task.model.Task;
 import io.vertigo.datamodel.task.model.TaskBuilder;
 </#if>
 <#if dao.keyConcept>
-import io.vertigo.datamodel.structure.model.UID;
+import io.vertigo.datamodel.data.model.UID;
 </#if>
 import io.vertigo.datastore.entitystore.EntityStoreManager;
 import io.vertigo.datastore.impl.dao.DAO;
@@ -61,7 +61,7 @@ public final class ${dao.classSimpleName} extends DAO<${dao.dtClassSimpleName},
 	 * @return KeyConcept à modifier
 	 */
 	public ${dao.dtClassSimpleName} readOneForUpdate(final ${dao.idFieldType} id) {
-		return readOneForUpdate(createDtObjectUID(id));
+		return readOneForUpdate(createUID(id));
 	}
 	</#if>
 	<#if !dao.taskDefinitions.empty>

diff --git a/src/main/java/io/vertigo/studio/plugins/generator/vertigo/util/DomainUtil.java b/src/main/java/io/vertigo/studio/plugins/generator/vertigo/util/DomainUtil.java
@@ -93,7 +93,7 @@ public static String buildJavaTypeLabel(final TaskSketchAttribute taskAttribute,
 	public static String getManyTargetJavaClass(final DomainSketch domainSketch) {
 		switch (domainSketch.getScope()) {
 			case DATA_OBJECT:
-				return "io.vertigo.datamodel.structure.model.DtList";
+				return "io.vertigo.datamodel.data.model.DtList";
 			case PRIMITIVE:
 			case VALUE_OBJECT:
 				return List.class.getName();