[Andromdaplugins-cvs] CVS update: cartridges/andromda-ejb3/src/main/resources/templates/ejb3 EntityEmbeddable.vsl

[Vance K. <va...@us...>]

  User: vancek  
  Date: 06/01/24 18:50:48

  Modified:    andromda-ejb3/src/main/resources/templates/ejb3
                        EntityEmbeddable.vsl
  Log:
  added enumeration type to attribute, finder method's setParameter adds ordinal() or name() if parameter is an enumeration type with the corresponding base.  fixed comments.
  
  Revision  Changes    Path
  1.6       +20 -11    cartridges/andromda-ejb3/src/main/resources/templates/ejb3/EntityEmbeddable.vsl
  
  Index: EntityEmbeddable.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/EntityEmbeddable.vsl,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -w -r1.5 -r1.6
  --- EntityEmbeddable.vsl	23 Jan 2006 05:45:31 -0000	1.5
  +++ EntityEmbeddable.vsl	25 Jan 2006 02:50:46 -0000	1.6
  @@ -93,7 +93,7 @@
   #*    *##set ($doAttribute = true)
   #*  *##end
   #*  *##if ($doAttribute)
  -    private $attribute.type.fullyQualifiedName $attribute.name;
  +    private ${attribute.type.fullyQualifiedName} $attribute.name;
   #*  *##end
   #**##end
   #end
  @@ -127,7 +127,7 @@
   #set ($instanceAttributes = $transform.filterByVisibility($entity.instanceAttributes, "public"))
   #if ($entity.syntheticCreateMethodAllowed)
       /**
  -     * Implementation for the main constructor with all POJO attributes.
  +     * Implementation for the constructor with all POJO attributes.
        * This method sets all POJO fields defined in this class to the
        * values provided by the parameters.
        *
  @@ -293,17 +293,20 @@
   #*    *##if ($attribute.lazy)
       @javax.persistence.Basic(fetch = javax.persistence.FetchType.LAZY)
   #*    *##end
  -    public $attribute.type.fullyQualifiedName ${attribute.getterName}()
  +    public ${attribute.type.fullyQualifiedName} ${attribute.getterName}()
       {
           return $attribute.name;
       }
   
  -## Allow only if not a version attribute since they are set by the container - No setter method is made available
  +##
  +## Allow only if attribute is not a version attribute since they are 
  +## set by the container - No setter method is made available.
  +##
       /**
        * Set the $attribute.name property.
        * @param value the new value
        */
  -   #if (!$attribute.version) public#else protected#end void ${attribute.setterName}($attribute.type.fullyQualifiedName value)
  +   #if (!$attribute.version) public#else protected#end void ${attribute.setterName}(${attribute.type.fullyQualifiedName} value)
       {
           this.${attribute.name} = value;
       }
  @@ -467,6 +470,7 @@
       {
           return em.createQuery("FROM ${entity.tableName} AS $stringUtils.uncapitalize(${entity.name})").getResultList();
       }
  +    
   #**##end
   ## Only include the findByPrimaryKey method if not an inheriting class.
   ## Classes that inherit from a base class use the primary key identifier
  @@ -511,9 +515,9 @@
   #*    *##set ($parameters = "javax.persistence.EntityManager em, ${parameterList}")
   #*  *##end
       /**
  +     * Finder method for ${entity.name} entity using a query.
   $finder.getDocumentation("     * ")
        *
  -     * Finder method for ${entity.name} entity using a query.
        * @param em javax.persistence.EntityManager
   #*  *##foreach ($parameter in $finder.arguments)
        * @param $parameter.type.fullyQualifiedName ${parameter.name}
  @@ -530,10 +534,15 @@
   #*    *##elseif ($parameter.maxResults)
           query.setMaxResults(${parameter.name});
   #*    *##else
  +##
  +## Find the attribute matching the parameter name
  +## If the parameter type is an enum:
  +##    If 
  +##
   #*      *##if ($finder.useNamedParameters)
  -        query.setParameter("${parameter.name}",#if ($parameter.type.primitive) new ${parameter.type.wrapperName}(${parameter.name})#else ${parameter.name}#end#if ($parameter.temporalType), javax.persistence.TemporalType.${parameter.temporalType}#end);
  +        query.setParameter("${parameter.name}",#if ($parameter.type.primitive) new ${parameter.type.wrapperName}(${parameter.name})#else ${parameter.name}#if ($parameter.enumerationTypeOrdinal).ordinal()#elseif ($parameter.enumerationTypeString).name()#end#end#if ($parameter.temporalType), javax.persistence.TemporalType.${parameter.temporalType}#end);
   #*      *##else
  -        query.setParameter(${index},#if ($parameter.type.primitive) new ${parameter.type.wrapperName}(${parameter.name})#else ${parameter.name}#end#if ($parameter.temporalType), javax.persistence.TemporalType.${parameter.temporalType}#end);
  +        query.setParameter(${index},#if ($parameter.type.primitive) new ${parameter.type.wrapperName}(${parameter.name})#else ${parameter.name}#if ($parameter.enumerationTypeOrdinal).ordinal()#elseif ($parameter.enumerationTypeString).name()#end#end#if ($parameter.temporalType), javax.persistence.TemporalType.${parameter.temporalType}#end);
   #*      *##end
   #*    *##end
   #*  *##end