[jboss-cvs] jboss-seam/src/main/org/jboss/seam/remoting ...

[Shane Bryzak]

  User: sbryzak2
  Date: 06/10/13 06:14:27

  Modified:    src/main/org/jboss/seam/remoting  InterfaceGenerator.java
  Log:
  Fixed interface type for Maps, added unit test
  
  Revision  Changes    Path
  1.23      +26 -12    jboss-seam/src/main/org/jboss/seam/remoting/InterfaceGenerator.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: InterfaceGenerator.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/remoting/InterfaceGenerator.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -b -r1.22 -r1.23
  --- InterfaceGenerator.java	12 Oct 2006 00:05:43 -0000	1.22
  +++ InterfaceGenerator.java	13 Oct 2006 10:14:27 -0000	1.23
  @@ -636,9 +636,10 @@
      * @param type Class
      * @return String
      */
  -  private String getFieldType(Type type)
  +  protected String getFieldType(Type type)
     {
  -    if (type.equals(String.class) || (type instanceof Class && ((Class) type).isEnum()) ||
  +    if (type.equals(String.class) ||
  +        (type instanceof Class && ( (Class) type).isEnum()) ||
           type.equals(BigInteger.class) || type.equals(BigDecimal.class))
         return "str";
       else if (type.equals(Boolean.class) || type.equals(Boolean.TYPE))
  @@ -650,15 +651,28 @@
                type.equals(Double.class) || type.equals(Double.TYPE) ||
                type.equals(Byte.class) || type.equals(Byte.TYPE))
         return "number";
  -    else if (type instanceof Class && Date.class.isAssignableFrom((Class) type))
  +    else if (type instanceof Class)
  +    {
  +      Class cls = (Class) type;
  +      if (Date.class.isAssignableFrom(cls))
         return "date";
  -    else if (type instanceof Class && Map.class.isAssignableFrom((Class) type))
  +      else if (cls.isArray())
  +        return "bag";
  +      else if (cls.isAssignableFrom(Map.class))
         return "map";
  -    else if (type instanceof ParameterizedType ||
  -             (type instanceof Class && ((Class) type).isArray() ||
  -              Collection.class.isAssignableFrom((Class) type)))
  +      else if (cls.isAssignableFrom(Collection.class))
         return "bag";
  -    else
  +    }
  +    else if (type instanceof ParameterizedType)
  +    {
  +      ParameterizedType pt = (ParameterizedType) type;
  +
  +      if (pt.getRawType() instanceof Class && Map.class.isAssignableFrom((Class) pt.getRawType()))
  +        return "map";
  +      else if (pt.getRawType() instanceof Class && Collection.class.isAssignableFrom((Class) pt.getRawType()))
  +        return "bag";
  +    }
  +
         return "bean";
     }
   }