@cronapp/templates 2.9.1 → 2.9.2-SP.2

package/templates/low-code/data-layer/ENTITIES.ftl

@@ -18,14 +18,14 @@
     * @generated
     */
     public ${classClass.name} set${fieldName?cap_first}(${field.type} ${fieldName}) {
-        <#if field.isEncryption() && !clazz.hasStrongPassword()>
+        <#if field.isEncryption() && field.getPasswordPolicy() != "full">
         this.${fieldName} = ${fieldName}.startsWith(ENCRYPT) ? ${fieldName} : new BCryptPasswordEncoder().encode(${fieldName});
         <#else>
         this.${fieldName} = ${fieldName};
-        </#if>        
+        </#if>
         return this;
     }
-</#macro>    
+</#macro>
 
 package ${entityPackage}<#if subPackage??>.${subPackage}</#if>;
 
@@ -39,13 +39,16 @@ import cronapi.rest.security.CronappSecurity;
 <#if clazz.rest>
 import cronapi.swagger.CronappSwagger;
 </#if>
-<#if clazz.hasRowVersion() || clazz.hasXML()>
+<#if clazz.hasRowVersion() || clazz.hasXML() || clazz.hasUUID()>
 import org.eclipse.persistence.annotations.Convert;
 import org.eclipse.persistence.annotations.Converter;
 </#if>
 <#if clazz.hasRowVersion()>
 import cronapi.database.VersionConverter;
 </#if>
+<#if clazz.hasUUID()>
+import cronapi.database.UUIDConverter;
+</#if>
 <#if clazz.hasUseOuterJoin()?? && clazz.hasUseOuterJoin()>
 import org.eclipse.persistence.annotations.JoinFetch;
 import org.eclipse.persistence.annotations.JoinFetchType;
@@ -68,9 +71,8 @@ import cronapi.database.ByteConverter;
 import cronapp.framework.persistence.ValidPassword;
 import cronapp.framework.persistence.ValidPasswords;
 import cronapp.framework.persistence.PasswordEncoderListener;
-  <#else>
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;  
   </#if>
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 </#if>
 <#list clazz.imports as import>
     import ${import};
@@ -104,7 +106,7 @@ import org.eclipse.persistence.annotations.*;
     </#if>
     _0", columnNames={
     <#list clazz.fieldsUniqueKey as field>
-        "${field.dbFieldName}" 
+        "${field.dbFieldName}"
         <#if field?has_next>
             ,
         </#if>
@@ -125,7 +127,7 @@ import org.eclipse.persistence.annotations.*;
 @TenantDiscriminatorColumns({
     </#if>
     <#list clazz.multitententFields as field>
-@TenantDiscriminatorColumn(name = "${field.dbFieldName}", contextProperty = "${field.multitenantContext}")<#if field_has_next>,</#if>
+@TenantDiscriminatorColumn(name = "${field.dbFieldName?replace("\"", "\\\"")}", contextProperty = "${field.multitenantContext}")<#if field_has_next>,</#if>
     </#list>
     <#if (clazz.multitententFields?size > 1)>
 })
@@ -147,17 +149,23 @@ import org.eclipse.persistence.annotations.*;
   converterClass=ByteConverter.class
 )
 </#if>
+<#if clazz.hasUUID()>
+@Converter(
+  name="uuid",
+  converterClass=UUIDConverter.class
+)
+</#if>
 <#if clazz.hasStrongPassword() && clazz.hasEncryption()>
 @ValidPasswords({
     <#list clazz.fields as field>
-        <#if field.isEncryption()>
+        <#if field.isEncryption() && field.getPasswordPolicy() == "full">
     @ValidPassword(passwordProperty = "${field.name}", passwordHistoryProperty = "${field.name}History"),
         </#if>
     </#list>
-})    
+})
 </#if>
 public class ${clazz.name} implements Serializable {
-<#if clazz.hasEncryption() && !clazz.hasStrongPassword()>
+<#if clazz.hasEncryption()>
     /**
     * Variável privada para verificação da criptofrafia
     *
@@ -185,6 +193,9 @@ public class ${clazz.name} implements Serializable {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
             </#if>
         </#if>
+    <#if (field.isUUID())!false>
+    @Convert("uuid")
+    </#if>
         <#if field.isVersion()>
     @Version
         <#elseif field.isDate()>
@@ -197,7 +208,7 @@ public class ${clazz.name} implements Serializable {
         <#if (field.relationNames?size == 1)>
             <#list field.relationNames?keys as key>
                 <#if key??>
-    @JoinColumn(name="${key}", nullable = ${field.nullable?c}, referencedColumnName = "${field.relationNames[key]}", insertable=${field.insertable?c}, updatable=${field.updatable?c})
+    @JoinColumn(name="${(key)?replace("\"", "\\\"")}", nullable = ${field.nullable?c}, referencedColumnName = "${field.relationNames[key]?replace("\"", "\\\"")}", insertable=${field.insertable?c}, updatable=${field.updatable?c})
                 </#if>
             </#list>
         <#elseif (field.relationNames?size > 1)>
@@ -205,14 +216,17 @@ public class ${clazz.name} implements Serializable {
     @JoinColumns({
             <#list field.relationNames?keys as key>
                 <#if key??>
-    @JoinColumn(name="${key}", nullable = ${field.nullable?c}, referencedColumnName = "${field.relationNames[key]}", insertable=${field.insertable?c}, updatable=${field.updatable?c})
+    @JoinColumn(name="${(key)?replace("\"", "\\\"")}", nullable = ${field.nullable?c}, referencedColumnName = "${field.relationNames[key]?replace("\"", "\\\"")}", insertable=${field.insertable?c}, updatable=${field.updatable?c})
                     <#if (i>1)>,</#if>
                 </#if>
                 <#assign i = i-1>
             </#list>
     })
         <#else>
-    @Column(name = "${field.dbFieldName}", nullable = ${field.nullable?c}<#if !field.primaryKey>, unique = ${field.unique?c}</#if><#if field.length??>, length=${field.length?c}</#if><#if field.precision??>, precision=${field.precision?c}</#if><#if field.scale??>, scale=${field.scale?c}</#if>, insertable=${field.insertable?c}, updatable=${field.updatable?c}<#if field.columnDefinition??>, columnDefinition = "${field.columnDefinition}"</#if>)
+    <#if field.columnDefinition?? && field.columnDefinition == "TEXT" && persistenceProvider?upper_case == "ORACLE">
+    @Lob
+    </#if>
+    @Column(name = "${field.dbFieldName?replace("\"", "\\\"")}", nullable = ${field.nullable?c}<#if !field.primaryKey>, unique = ${field.unique?c}</#if><#if field.length??>, length=${field.length?c}</#if><#if field.precision??>, precision=${field.precision?c}</#if><#if field.scale??>, scale=${field.scale?c}</#if>, insertable=${field.insertable?c}, updatable=${field.updatable?c}<#if field.columnDefinition?? && (field.columnDefinition != "TEXT" || persistenceProvider?upper_case != "ORACLE")>, columnDefinition = "${field.columnDefinition}"</#if>)
         </#if>
         ${field.modifier} <#if field.arrayRelation>${field.type}<#else>${field.type}</#if> ${name}<#if field.defaultValue?has_content> = ${field.defaultValue}<#elseif field.primaryKey && field.generationType?? && field.generationType == "UUID"> = UUID.randomUUID().toString().toUpperCase()</#if>;
     </#if>
@@ -225,6 +239,9 @@ public class ${clazz.name} implements Serializable {
     */
         <#if (field.rowVersion)!false>
     @Convert("version")
+        </#if>
+        <#if (field.isUUID())!false>
+    @Convert("uuid")
         </#if>
         <#if (field.XML)!false>
     @Convert("bytes")
@@ -237,7 +254,7 @@ public class ${clazz.name} implements Serializable {
         <#if (field.relationNames?size == 1)>
             <#list field.relationNames?keys as key>
                 <#if key??>
-    @JoinColumn(name="${key}", nullable = ${field.nullable?c}, referencedColumnName = "${field.relationNames[key]}", insertable=${field.insertable?c}, updatable=${field.updatable?c}<#if field.cascade>, foreignKey = @ForeignKey(name = "<#if tableName??>${tableName}<#else>${clazz.name?upper_case}</#if>_${key?upper_case}_${field.dbTableRelationClazz}_${field.relationNames[key]?upper_case}", foreignKeyDefinition = "FOREIGN KEY (${key}) REFERENCES ${field.dbTableRelationClazz} (${field.relationNames[key]}) ON DELETE CASCADE")<#elseif field.fkName?has_content>, foreignKey = @ForeignKey(name = "${field.fkName}", foreignKeyDefinition = "FOREIGN KEY (${key}) REFERENCES ${field.dbTableRelationClazz} (${field.relationNames[key]})")</#if>)
+    @JoinColumn(name="${(key)?replace("\"", "\\\"")}", nullable = ${field.nullable?c}, referencedColumnName = "${field.relationNames[key]?replace("\"", "\\\"")}", insertable=${field.insertable?c}, updatable=${field.updatable?c}<#if field.cascade>, foreignKey = @ForeignKey(name = "<#if tableName??>${tableName?replace("\"", "\\\"")}<#else>${(clazz.name?upper_case)?replace("\"", "\\\"")}</#if>_${(key?upper_case)?replace("\"", "\\\"")}_${field.dbTableRelationClazz?replace("\"", "\\\"")}_${(field.relationNames[key]?upper_case)?replace("\"", "\\\"")}", foreignKeyDefinition = "FOREIGN KEY (${(key)?replace("\"", "\\\"")}) REFERENCES ${field.dbTableRelationClazz} (${field.relationNames[key]?replace("\"", "\\\"")}) ON DELETE CASCADE")<#elseif field.fkName?has_content>, foreignKey = @ForeignKey(name = "${field.fkName?replace("\"", "\\\"")}", foreignKeyDefinition = "FOREIGN KEY (${(key)?replace("\"", "\\\"")}) REFERENCES ${field.dbTableRelationClazz} (${field.relationNames[key]?replace("\"", "\\\"")})")</#if>)
                 </#if>
             </#list>
         <#elseif (field.relationNames?size > 1)>
@@ -245,14 +262,14 @@ public class ${clazz.name} implements Serializable {
     @JoinColumns({
             <#list field.relationNames?keys as key>
                 <#if key??>
-    @JoinColumn(name="${key}", nullable = ${field.nullable?c}, referencedColumnName = "${field.relationNames[key]}", insertable=${field.insertable?c}, updatable=${field.updatable?c}<#if field.fkName?has_content>, foreignKey = @ForeignKey(name = "${field.fkName}", foreignKeyDefinition = "FOREIGN KEY (${key}) REFERENCES ${field.dbTableRelationClazz} (${field.relationNames[key]})")</#if>)
+    @JoinColumn(name="${(key)?replace("\"", "\\\"")}", nullable = ${field.nullable?c}, referencedColumnName = "${field.relationNames[key]?replace("\"", "\\\"")}", insertable=${field.insertable?c}, updatable=${field.updatable?c}<#if field.fkName?has_content>, foreignKey = @ForeignKey(name = "${field.fkName?replace("\"", "\\\"")}", foreignKeyDefinition = "FOREIGN KEY (${(key)?replace("\"", "\\\"")}) REFERENCES ${field.dbTableRelationClazz} (${field.relationNames[key]?replace("\"", "\\\"")})")</#if>)
                     <#if (i>1)>,</#if>
                 </#if>
                 <#assign i = i-1>
             </#list>
     })
         <#elseif field.arrayRelation>
-    @OneToMany(fetch = FetchType.LAZY, mappedBy="${field.mappedBy}", insertable=${field.insertable?c}, updatable=${field.updatable?c})
+    @OneToMany(fetch = FetchType.LAZY, mappedBy="${field.mappedBy?replace("\"", "\\\"")}", insertable=${field.insertable?c}, updatable=${field.updatable?c})
         <#else>
             <#if field.transient>
     @Transient
@@ -266,7 +283,10 @@ public class ${clazz.name} implements Serializable {
                 <#elseif field.isTimestamp()>
     @Temporal(TemporalType.TIMESTAMP)
                 </#if>
-    @Column(name = "${field.dbFieldName}", nullable = ${field.nullable?c}<#if !field.primaryKey>, unique = ${field.unique?c}</#if><#if field.length??>, length=${field.length?c}</#if><#if field.precision??>, precision=${field.precision?c}</#if><#if field.scale??>, scale=${field.scale?c}</#if>, insertable=${field.insertable?c}, updatable=${field.updatable?c}<#if field.columnDefinition??>, columnDefinition = "${field.columnDefinition}"</#if>)
+    <#if field.columnDefinition?? && field.columnDefinition == "TEXT" && persistenceProvider?upper_case == "ORACLE">
+    @Lob
+    </#if>
+    @Column(name = "${field.dbFieldName?replace("\"", "\\\"")}", nullable = ${field.nullable?c}<#if !field.primaryKey>, unique = ${field.unique?c}</#if><#if field.length??>, length=${field.length?c}</#if><#if field.precision??>, precision=${field.precision?c}</#if><#if field.scale??>, scale=${field.scale?c}</#if>, insertable=${field.insertable?c}, updatable=${field.updatable?c}<#if field.columnDefinition?? && (field.columnDefinition != "TEXT" || persistenceProvider?upper_case != "ORACLE")>, columnDefinition = "${field.columnDefinition}"</#if>)
             </#if>
         </#if>
         <#if field.getUseOuterJoin()>
@@ -276,7 +296,7 @@ public class ${clazz.name} implements Serializable {
     @JsonIgnore
         </#if>
         <#if field.isCloudStorage()>
-    @CronapiCloud(type = "${field.getStorageType()}", value="${field.getStorageKey()}", id="${field.getStorageId()}", secret="${field.getStorageSecret()}")
+    @CronapiCloud(type = "${field.getStorageType()}", value="${field.getStorageKey()}", id="${field.getStorageId()}", secret="${field.getStorageSecret()}", regionAWS="${field.getRegionAWS()}")
         </#if>
         <#if field.isFileDataBase()>
     @CronapiByteHeaderSignature
@@ -288,11 +308,11 @@ public class ${clazz.name} implements Serializable {
         ${field.modifier} <#if field.arrayRelation>${field.type}<#else>${field.type}</#if> ${field.name}<#if field.defaultValue?has_content> = ${field.defaultValue}</#if>;
     </#if>
 
-    <#if field.isEncryption()>    
+    <#if field.isEncryption() && field.getPasswordPolicy() == "full">
     /**
     * @generated
     */
-    <@single_line>@Column(name = "${field.dbFieldName}_history"
+    <@single_line>@Column(name = "${field.dbFieldName?replace("\"", "\\\"")}_history"
         <#if !field.insertable>, insertable = ${field.insertable?c}</#if>
         <#if !field.updatable>, updatable = ${field.updatable?c}</#if>
     )</@single_line>
@@ -309,7 +329,7 @@ public class ${clazz.name} implements Serializable {
 
 <#list clazz.fields as field>
     <@getter_setter clazz field "${field.name}" />
-    <#if field.isEncryption()>
+    <#if field.isEncryption() && field.getPasswordPolicy() == "full">
     <@getter_setter clazz field "${field.name}History" />
     </#if>
 </#list>

package/templates/low-code/data-layer/ENTITIESPK.ftl

@@ -32,7 +32,7 @@ public class ${clazz.name + "PK"} implements Serializable {
   <#assign name = "${field.name}">
   <#if field.getProperty("FOREIGN")??>
     <#if name?contains('_')>
-      <#assign name = "${field.name?string[0..field.name?index_of('_') - 1]}">
+      <#assign name = "${field.name?string[0..field.name?last_index_of('_') - 1]}">
     </#if>
   </#if>
 
@@ -53,7 +53,7 @@ public class ${clazz.name + "PK"} implements Serializable {
   <#assign name = "${field.name}">
   <#if field.getProperty("FOREIGN")??>
     <#if name?contains('_')>
-      <#assign name = "${field.name?string[0..field.name?index_of('_') - 1]}">
+      <#assign name = "${field.name?string[0..field.name?last_index_of('_') - 1]}">
     </#if>
   </#if>
   /**
@@ -88,7 +88,7 @@ ${clazz.name + "PK"} object = (${clazz.name + "PK"})obj;
   <#assign name = "${field.name}">
   <#if field.getProperty("FOREIGN")??>
     <#if name?contains('_')>
-      <#assign name = "${field.name?string[0..field.name?index_of('_') - 1]}">
+      <#assign name = "${field.name?string[0..field.name?last_index_of('_') - 1]}">
     </#if>
   </#if>
     if (${name} != null ? !${name}.equals(object.${name}) : object.${name} != null) return false;
@@ -106,7 +106,7 @@ ${clazz.name + "PK"} object = (${clazz.name + "PK"})obj;
   <#assign name = "${field.name}">
   <#if field.getProperty("FOREIGN")??>
     <#if name?contains('_')>
-      <#assign name = "${field.name?string[0..field.name?index_of('_') - 1]}">
+      <#assign name = "${field.name?string[0..field.name?last_index_of('_') - 1]}">
     </#if>
   </#if>
   <#if !field.isTypePrimitive()>

package/file/view.html/EmptyCrudHtml/__FileName__.view.html.ftl

@@ -1,69 +0,0 @@
-<h2 class="component-holder text-left h3 title">Title</h2>
-
-<datasource data-component="crn-datasource" filter="" name="MainDatasource" entity="" keys="" rows-per-page="100" class="" schema="" lazy=""></datasource> 
-
-<div role="search" ng-hide="MainDatasource.inserting || MainDatasource.editing" data-component="crn-datasource-filter" id="crn-datasource-filter" class="">
-  <div class="form-group"> 
-    <label for="textinput-filter" class="">{{"template.crud.search" | translate}}</label> 
-    <input type="text" ng-model="vars.search" id="textinput-filter" class="form-control k-textbox" cronapp-filter="" cronapp-filter-operator="" cronapp-filter-caseinsensitive="false" cronapp-filter-autopost="true" crn-datasource="MainDatasource" value="" placeholder="{{'template.crud.search' | translate}}"> 
-  </div> 
-</div> 
-
-<section ng-hide="MainDatasource.editing || MainDatasource.inserting" class="component-holder ng-binding ng-scope" data-component="crn-cron-grid" id="cron-crn-grid-search">
-  <cron-grid options="{&quot;dataSourceScreen&quot;:{},&quot;allowPaging&quot;:true,&quot;allowSorting&quot;:true,&quot;allowGrouping&quot;:false,&quot;allowSelectionTotalPageToShow&quot;:true,&quot;allowRefreshGrid&quot;:true,&quot;allowSelectionRow&quot;:true,&quot;editable&quot;:&quot;datasource&quot;,&quot;columns&quot;:[],&quot;toolBarButtons&quot;:[{&quot;type&quot;:&quot;Native&quot;,&quot;title&quot;:&quot;create&quot;}],&quot;details&quot;:[]}" ng-model="vars.gridmain" class="" style=""> 
-  </cron-grid> 
-</section>
-<div data-component="crn-form" id="crn-form-form"> 
-  <section class="form" ng-show="MainDatasource.editing || MainDatasource.inserting">
-    <form crn-datasource="MainDatasource" class=""> 
-        <div class="tool-bar" ng-hide="datasource.editing || datasource.inserting">
-          <div class="component-holder ng-scope" data-component="crn-button" id="crn-button-startInserting">
-            <button class="btn k-button btn-block btn-default btn-fab" ng-click="datasource.startInserting()" aria-label="{{'StartInserting' | translate}}" xattr-fullsize="btn-block" xattr-theme="btn-default" xattr-disabled="">
-              <i class="glyphicon glyphicon-plus" icon-theme=""></i>
-            </button>
-          </div>
-          <div class="component-holder ng-scope" data-component="crn-button" id="crn-button-startEditing">
-            <button class="btn k-button btn-block btn-default btn-fab" ng-click="datasource.startEditing()" aria-label="{{'startEditing' | translate}}" xattr-fullsize="btn-block" xattr-theme="btn-default" xattr-disabled="">
-              <i class="glyphicon glyphicon-pencil" icon-theme=""></i>
-            </button>
-          </div>
-          <div class="component-holder ng-scope" data-component="crn-button" id="crn-button-previous">
-            <button class="btn k-button btn-block btn-default btn-fab" ng-click="datasource.previous()" ng-disabled="!datasource.hasPrevious()" aria-label="{{'Before' | translate}}" xattr-fullsize="btn-block" xattr-theme="btn-default" xattr-disabled="">
-              <i class="glyphicon glyphicon-chevron-left" icon-theme=""></i>
-            </button>
-          </div>
-          <div class="component-holder ng-scope" data-component="crn-button" id="crn-button-next">
-            <button class="btn k-button btn-block btn-default btn-fab" ng-click="datasource.next()" ng-disabled="!datasource.hasNext()" aria-label="{{'Next' | translate}}" xattr-fullsize="btn-block" xattr-theme="btn-default" xattr-disabled="">
-              <i class="glyphicon glyphicon-chevron-right" icon-theme=""></i>
-            </button>
-          </div>
-          <div class="component-holder ng-scope" data-component="crn-button" id="crn-button-remove">
-            <button class="btn k-button btn-block btn-danger btn-fab" ng-click="datasource.remove()" aria-label="{{'Remove' | translate}}" xattr-fullsize="btn-block" xattr-theme="btn-danger" xattr-disabled="">
-              <i class="glyphicon glyphicon-remove" icon-theme=""></i>
-            </button>
-          </div>
-        </div>
-        <div class="active-bar" ng-hide="!datasource.editing &amp;&amp; !datasource.inserting">
-          <div class="component-holder ng-scope" data-component="crn-button" id="btn_crud_post_${model.random}">
-            <button class="btn k-button btn-block btn-success btn-fab" ng-click="datasource.post()" aria-label="{{'SaveChanges' | translate}}" xattr-fullsize="btn-block" xattr-theme="btn-success" xattr-disabled="">
-              <i class="glyphicon glyphicon-ok" icon-theme=""></i>
-            </button>
-          </div>
-          <div class="component-holder ng-scope" data-component="crn-button" id="btn_crud_cancel_${model.random}">
-            <button class="btn k-button btn-block btn-danger btn-fab" ng-click="datasource.cancel()" aria-label="{{'CancelChanges' | translate}}" xattr-fullsize="btn-block" xattr-theme="btn-danger" xattr-disabled="">
-              <i class="glyphicon glyphicon-ban-circle" icon-theme=""></i>
-            </button>
-          </div>
-      </div>
-      <br> 
-      <fieldset ng-disabled="!datasource.editing &amp;&amp; !datasource.inserting"> 
-        <div class="component-holder ng-binding ng-scope" data-component="crn-textinput" id="crn-textinput-98075">
-          <div class="form-group">
-            <label for="input5045">Label</label>
-            <input type="text" mask="" mask-placeholder="" ng-required="false" ng-model="vars.input5045" class="form-control k-textbox" id="input5045" placeholder="Placeholder text">
-          </div>
-        </div> 
-      </fieldset> 
-    </form>
-  </section>
-</div>

package/file/view.html/EmptyCrudHtml/template.properties

@@ -1,7 +0,0 @@
-icon=view.html.png
-underFolders=webapp
-name=Crud From
-encoding=UTF-8
-parameter.string.FileName=File Name
-parameter.string.FileName.value=crud
-projectType=W

package/file/view.html/EmptyCrudHtml/template_pt_BR.properties

@@ -1,4 +0,0 @@
-icon=view.html.png
-name=Formulário Crud
-encoding=UTF-8
-parameter.string.FileName=Nome do Arquivo