[openejb-scm] openejb/modules/openejb-builder/src/java/org/openejb/deployment CMPEntityBuilder.java

[ammulder]

ammulder    2005/07/25 00:15:59

  Modified:    modules/openejb-builder/src/java/org/openejb/deployment
                        CMPEntityBuilder.java
  Log:

  Test and fix for GERONIMO-808, plus a bit more trimming besides.
  
  Revision  Changes    Path
  1.37      +8 -8      
openejb/modules/openejb-builder/src/java/org/openejb/deployment/CMPEntityBuilder.java
  
  Index: CMPEntityBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/CMPEntityBuilder.java,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- CMPEntityBuilder.java     8 Jul 2005 23:14:14 -0000       1.36
  +++ CMPEntityBuilder.java     25 Jul 2005 04:15:59 -0000      1.37
  @@ -279,7 +279,7 @@
               CmpFieldMapping mappings[] = 
openEjbEntity.getCmpFieldMappingArray();
               for (int j = 0; j < mappings.length; j++) {
                   CmpFieldMapping mapping = mappings[j];
  -                cmpFieldToMapping.put(mapping.getCmpFieldName(), mapping);
  +                cmpFieldToMapping.put(mapping.getCmpFieldName().trim(), 
mapping);
               }
   
               // Handle "Unknown Primary Key Type" -- try to identify the PK 
class
  @@ -332,7 +332,7 @@
               Set pkFieldNames;
               if ( unknownPK && openEjbEntity.isSetPrimkeyField() ) {
                   pkFieldNames = new HashSet(1);
  -                pkFieldNames.add(openEjbEntity.getPrimkeyField());
  +                pkFieldNames.add(openEjbEntity.getPrimkeyField().trim());
               } else if ( false == entityBean.isSetPrimkeyField() ) {
                   // no field name specified, must be a compound pk so get the 
field names from the public fields
                   Field[] fields = pkClass.getFields();
  @@ -359,14 +359,14 @@
                   boolean isPKField = pkFieldNames.contains(fieldName);
                   CMPField cmpField = new CMPField(fieldName, fieldName, 
fieldType, isPKField); 
                   ejb.addCMPField(cmpField);
  -                Column column = new Column(fieldName, 
mapping.getTableColumn(), fieldType, isPKField);
  +                Column column = new Column(fieldName, 
mapping.getTableColumn().trim(), fieldType, isPKField);
                   if (mapping.isSetSqlType()) {
  -                    
column.setSQLType(SQLTypeLoader.getSQLType(mapping.getSqlType()));
  +                    
column.setSQLType(SQLTypeLoader.getSQLType(mapping.getSqlType().trim()));
                   }
                   if (mapping.isSetTypeConverter()) {
                       TypeConverter typeConverter;
                       try {
  -                        Class typeConverterClass = 
cl.loadClass(mapping.getTypeConverter());
  +                        Class typeConverterClass = 
cl.loadClass(mapping.getTypeConverter().trim());
                           typeConverter = (TypeConverter) 
typeConverterClass.newInstance();
                       } catch (Exception e) {
                           throw new DeploymentException("Cannot create type 
converter " + mapping.getTypeConverter(), e);
  @@ -863,13 +863,13 @@
           if (value == null) {
               return null;
           }
  -        return value.getStringValue();
  +        return value.getStringValue().trim();
       }
   
       private String getString(EjbNameType value) {
           if (value == null) {
               return null;
           }
  -        return value.getStringValue();
  +        return value.getStringValue().trim();
       }
   }