[Andromda-cvs] SF.net SVN: andromda:[15438] trunk/cartridges/andromda-spring/src

[<wal...@us...>]

Revision: 15438
          http://sourceforge.net/p/andromda/svn/15438
Author:   walterim
Date:     2015-03-13 14:48:06 +0000 (Fri, 13 Mar 2015)
Log Message:
-----------
Some treatment to uploaded files in cruds

Modified Paths:
--------------
    trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudDaoBase.vsl
    trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudServiceBase.vsl
    trunk/cartridges/andromda-spring/src/test/expected/cartridge-output.zip
    trunk/cartridges/andromda-spring/src/test/expected/cartridge-outputUML2.zip

Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudDaoBase.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudDaoBase.vsl	2014-12-12 23:31:12 UTC (rev 15437)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudDaoBase.vsl	2015-03-13 14:48:06 UTC (rev 15438)
@@ -318,7 +318,8 @@
         if(example != null)
         {
 #foreach ($member in $manageable.manageableAttributes)
-            if (example.${member.getterName}() != null)
+#if (!$member.inputFile && !$member.needsFileUpload)
+            if (#if($member.type.stringType) org.apache.commons.lang.StringUtils.isNotEmpty(example.${member.getterName}())#else example.${member.getterName}() != null#end)
 #if ($member.type.stringType)
             {
                 criteria.add(Restrictions.ilike("$member.name", example.${member.getterName}(), $matchMode));
@@ -353,6 +354,7 @@
             }
 #end
 #end
+#end
 #foreach ($member in $manageable.manageableAssociationEnds)
 #if ($member.many)
             if (example.${member.getterName}() != null && example.${member.getterName}().length > 0)

Modified: trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudServiceBase.vsl
===================================================================
--- trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudServiceBase.vsl	2014-12-12 23:31:12 UTC (rev 15437)
+++ trunk/cartridges/andromda-spring/src/main/resources/templates/spring/crud/SpringCrudServiceBase.vsl	2015-03-13 14:48:06 UTC (rev 15438)
@@ -54,8 +54,10 @@
 
         final $searchExampleClassName searchExample=new $searchExampleClassName();
 #foreach ($member in $manageable.manageableMembers)
+#if (!$member.inputFile && !$member.needsFileUpload)
         searchExample.${member.setterName}(${member.name});
 #end
+#end
 
         return searchExample;
     }

Modified: trunk/cartridges/andromda-spring/src/test/expected/cartridge-output.zip
===================================================================
(Binary files differ)

Modified: trunk/cartridges/andromda-spring/src/test/expected/cartridge-outputUML2.zip
===================================================================
(Binary files differ)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.