User: patriot1burke
  Date: 01/06/21 14:52:19

  Modified:    src/main/org/jboss/ejb/plugins/jaws/metadata
                        JawsEntityMetaData.java
  Log:
  read-head is now defaultable in standardjboss.xml and jaws.xml
  
  Revision  Changes    Path
  1.10      +221 -206  
jboss/src/main/org/jboss/ejb/plugins/jaws/metadata/JawsEntityMetaData.java
  
  Index: JawsEntityMetaData.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jaws/metadata/JawsEntityMetaData.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- JawsEntityMetaData.java   2001/06/06 01:07:40     1.9
  +++ JawsEntityMetaData.java   2001/06/21 21:52:19     1.10
  @@ -33,284 +33,299 @@
    *      
    *   @see <related>
    *   @author <a href="[EMAIL PROTECTED]">Sebastien Alborini</a>
  - *  @author <a href="mailto:[EMAIL PROTECTED]";>Dirk Zimmermann</a>
  - *   @version $Revision: 1.9 $
  + *      @author <a href="mailto:[EMAIL PROTECTED]";>Dirk Zimmermann</a>
  + *      @author <a href="mailto:[EMAIL PROTECTED]";>Bill Burke</a>
  + *   @version $Revision: 1.10 $
  + *
  + *      Revisions:
  + *      20010621 Bill Burke: made read-ahead defaultable in standardjboss.xml and 
jaws.xml
    */
   public class JawsEntityMetaData extends MetaData implements XmlLoadable {
  -     // Constants -----------------------------------------------------
  +   // Constants -----------------------------------------------------
       
  -     // Attributes ----------------------------------------------------
  +   // Attributes ----------------------------------------------------
       
  -     // parent metadata structures
  -     private JawsApplicationMetaData jawsApplication;
  -     private EntityMetaData entity;
  +   // parent metadata structures
  +   private JawsApplicationMetaData jawsApplication;
  +   private EntityMetaData entity;
        
  -     // the name of the bean (same as entity.getEjbName())
  -     private String ejbName = null;
  +   // the name of the bean (same as entity.getEjbName())
  +   private String ejbName = null;
        
  -     // the name of the table to use for this bean
  -     private String tableName = null;
  +   // the name of the table to use for this bean
  +   private String tableName = null;
        
  -     // do we have to try and create the table on deployment?
  -     private boolean createTable;
  +   // do we have to try and create the table on deployment?
  +   private boolean createTable;
        
  -     // do we have to drop the table on undeployment?
  -     private boolean removeTable;
  +   // do we have to drop the table on undeployment?
  +   private boolean removeTable;
        
  -     // do we use tuned updates?
  -     private boolean tunedUpdates;
  +   // do we use tuned updates?
  +   private boolean tunedUpdates;
   
      // do we use 'SELECT ... FOR UPDATE' syntax?
      private boolean selectForUpdate;
   
  -     // is the bean read-only?
  -     private boolean readOnly;
  -     private int timeOut;
  +   // is the bean read-only?
  +   private boolean readOnly;
   
  -     // should the table have a primary key constraint?
  -     private boolean pkConstraint;
  +   // make finders by default read-ahead?
  +   private boolean readAhead;
  +
  +   private int timeOut;
  +
  +   // should the table have a primary key constraint?
  +   private boolean pkConstraint;
        
  -     // is the bean's primary key a composite object
  -     private boolean compositeKey;
  +   // is the bean's primary key a composite object
  +   private boolean compositeKey;
        
  -     // the class of the primary key
  -     private Class primaryKeyClass;
  +   // the class of the primary key
  +   private Class primaryKeyClass;
        
  -     // the fields we must persist for this bean
  -     private Hashtable cmpFields = new Hashtable();
  +   // the fields we must persist for this bean
  +   private Hashtable cmpFields = new Hashtable();
        
  -     // the fields that belong to the primary key (if composite)
  -     private ArrayList pkFields = new ArrayList();
  +   // the fields that belong to the primary key (if composite)
  +   private ArrayList pkFields = new ArrayList();
        
  -     // finders for this bean
  -     private ArrayList finders = new ArrayList();
  +   // finders for this bean
  +   private ArrayList finders = new ArrayList();
        
  -     /**
  -      * Here we store the basename of all detailed fields in jaws.xml
  -      * (e.g., "data" for "data.categoryPK").
  -      */
  -     private HashMap detailedFieldDescriptions = new HashMap();
  +   /**
  +    * Here we store the basename of all detailed fields in jaws.xml
  +    * (e.g., "data" for "data.categoryPK").
  +    */
  +   private HashMap detailedFieldDescriptions = new HashMap();
        
  -     /**
  -      * This is the Boolean we store as value in detailedFieldDescriptions.
  -      */
  -     private static final Boolean detailedBoolean = new Boolean(true);
  +   /**
  +    * This is the Boolean we store as value in detailedFieldDescriptions.
  +    */
  +   private static final Boolean detailedBoolean = new Boolean(true);
   
   
  -     // Static --------------------------------------------------------
  +   // Static --------------------------------------------------------
      
  -     // Constructors --------------------------------------------------
  +   // Constructors --------------------------------------------------
       
  -     public JawsEntityMetaData(JawsApplicationMetaData app, EntityMetaData ent) 
throws DeploymentException {
  -             // initialisation of this object goes as follows:
  -             //  - constructor
  -             //  - importXml() for standardjaws.xml and jaws.xml
  -             
  -             jawsApplication = app;
  -             entity = ent;
  -             ejbName = entity.getEjbName();
  -             compositeKey = entity.getPrimKeyField() == null;
  -             
  -             try {
  -                     primaryKeyClass = 
jawsApplication.getClassLoader().loadClass(entity.getPrimaryKeyClass());
  -             } catch (ClassNotFoundException e) {
  -                     throw new DeploymentException("could not load primary key 
class: " + entity.getPrimaryKeyClass());
  -             }
  -             
  -             // we replace the . by _ because some dbs die on it...
  -             // the table name may be overridden in importXml(jaws.xml)
  -             tableName = ejbName.replace('.', '_');
  -             
  -             // build the metadata for the cmp fields now in case there is no 
jaws.xml
  -             Iterator cmpFieldNames = entity.getCMPFields();
  -
  -             while (cmpFieldNames.hasNext()) {
  -                     String cmpFieldName = (String)cmpFieldNames.next();
  -                     CMPFieldMetaData cmpField = new CMPFieldMetaData(cmpFieldName, 
this);
  +   public JawsEntityMetaData(JawsApplicationMetaData app, EntityMetaData ent) 
throws DeploymentException {
  +      // initialisation of this object goes as follows:
  +      //  - constructor
  +      //  - importXml() for standardjaws.xml and jaws.xml
  +             
  +      jawsApplication = app;
  +      entity = ent;
  +      ejbName = entity.getEjbName();
  +      compositeKey = entity.getPrimKeyField() == null;
  +             
  +      try {
  +         primaryKeyClass = 
jawsApplication.getClassLoader().loadClass(entity.getPrimaryKeyClass());
  +      } catch (ClassNotFoundException e) {
  +         throw new DeploymentException("could not load primary key class: " + 
entity.getPrimaryKeyClass());
  +      }
  +             
  +      // we replace the . by _ because some dbs die on it...
  +      // the table name may be overridden in importXml(jaws.xml)
  +      tableName = ejbName.replace('.', '_');
  +             
  +      // build the metadata for the cmp fields now in case there is no jaws.xml
  +      Iterator cmpFieldNames = entity.getCMPFields();
  +
  +      while (cmpFieldNames.hasNext()) {
  +         String cmpFieldName = (String)cmpFieldNames.next();
  +         CMPFieldMetaData cmpField = new CMPFieldMetaData(cmpFieldName, this);
                        
  -                     cmpFields.put(cmpFieldName, cmpField);              
  -             }
  +         cmpFields.put(cmpFieldName, cmpField);                  
  +      }
                
  -             // build the pkfields metadatas
  -             if (compositeKey) {
  -                     Field[] pkClassFields = primaryKeyClass.getFields();
  +      // build the pkfields metadatas
  +      if (compositeKey) {
  +         Field[] pkClassFields = primaryKeyClass.getFields();
                
  -                     for (int i = 0; i < pkClassFields.length; i++) {
  -                             Field pkField = pkClassFields[i];
  -                             CMPFieldMetaData cmpField = 
(CMPFieldMetaData)cmpFields.get(pkField.getName());
  +         for (int i = 0; i < pkClassFields.length; i++) {
  +            Field pkField = pkClassFields[i];
  +            CMPFieldMetaData cmpField = 
(CMPFieldMetaData)cmpFields.get(pkField.getName());
   
  -                             if (cmpField == null) throw new 
DeploymentException("Bean " + ejbName + " has PK of type " + primaryKeyClass.getName() 
+ ", so it should have a cmp-field named " + pkField.getName());
  +            if (cmpField == null) throw new DeploymentException("Bean " + ejbName + 
" has PK of type " + primaryKeyClass.getName() + ", so it should have a cmp-field 
named " + pkField.getName());
   
  -                             pkFields.add(new PkFieldMetaData(pkField, cmpField, 
this));
  -                     }
  +            pkFields.add(new PkFieldMetaData(pkField, cmpField, this));
  +         }
   
  -             } else {
  -                     String pkFieldName = entity.getPrimKeyField();
  -             CMPFieldMetaData cmpField = 
(CMPFieldMetaData)cmpFields.get(pkFieldName);
  +      } else {
  +         String pkFieldName = entity.getPrimKeyField();
  +         CMPFieldMetaData cmpField = (CMPFieldMetaData)cmpFields.get(pkFieldName);
   
  -                     pkFields.add(new PkFieldMetaData(cmpField, this));
  -             }               
  -     }
  +         pkFields.add(new PkFieldMetaData(cmpField, this));
  +      }              
  +   }
        
  -     // Public --------------------------------------------------------
  +   // Public --------------------------------------------------------
   
  -    public JawsApplicationMetaData getJawsApplication() { return jawsApplication; }
  +   public JawsApplicationMetaData getJawsApplication() { return jawsApplication; }
   
  -     public EntityMetaData getEntity() { return entity; }
  +   public EntityMetaData getEntity() { return entity; }
        
  -     public Iterator getCMPFields() { return cmpFields.values().iterator(); }
  +   public Iterator getCMPFields() { return cmpFields.values().iterator(); }
        
  -     public CMPFieldMetaData getCMPFieldByName(String name) {
  -             return (CMPFieldMetaData)cmpFields.get(name);
  -     }
  +   public CMPFieldMetaData getCMPFieldByName(String name) {
  +      return (CMPFieldMetaData)cmpFields.get(name);
  +   }
        
  -     public Iterator getPkFields() { return pkFields.iterator(); }
  +   public Iterator getPkFields() { return pkFields.iterator(); }
        
      public int getNumberOfPkFields() { return pkFields.size(); }
      
  -     public String getTableName() { return tableName; }
  +   public String getTableName() { return tableName; }
        
  -     public boolean getCreateTable() { return createTable; }
  +   public boolean getCreateTable() { return createTable; }
        
  -     public boolean getRemoveTable() { return removeTable; }
  +   public boolean getRemoveTable() { return removeTable; }
        
  -     public boolean hasTunedUpdates() { return tunedUpdates; }
  +   public boolean hasTunedUpdates() { return tunedUpdates; }
        
  -     public boolean hasPkConstraint() { return pkConstraint; }
  +   public boolean hasPkConstraint() { return pkConstraint; }
   
  -     public int getReadOnlyTimeOut() { return timeOut; }
  +   public int getReadOnlyTimeOut() { return timeOut; }
        
  -     public boolean hasCompositeKey() { return compositeKey; }
  +   public boolean hasCompositeKey() { return compositeKey; }
       
  -     public DataSource getDataSource() { return jawsApplication.getDataSource(); }
  +   public DataSource getDataSource() { return jawsApplication.getDataSource(); }
        
  -     public String getDbURL() { return jawsApplication.getDbURL(); }
  +   public String getDbURL() { return jawsApplication.getDbURL(); }
        
  -     public Iterator getFinders() { return finders.iterator(); }
  +   public Iterator getFinders() { return finders.iterator(); }
        
  -     public String getName() { return ejbName; }
  +   public String getName() { return ejbName; }
        
  -     public int getNumberOfCMPFields() { return cmpFields.size(); }
  +   public int getNumberOfCMPFields() { return cmpFields.size(); }
        
  -     public Class getPrimaryKeyClass() { return primaryKeyClass; }
  +   public Class getPrimaryKeyClass() { return primaryKeyClass; }
        
  -     public boolean isReadOnly() { return readOnly; }
  +   public boolean isReadOnly() { return readOnly; }
        
  -     public Iterator getEjbReferences() { return entity.getEjbReferences(); }
  +   public Iterator getEjbReferences() { return entity.getEjbReferences(); }
        
  -     public String getPrimKeyField() { return entity.getPrimKeyField(); }
  +   public String getPrimKeyField() { return entity.getPrimKeyField(); }
        
  -     public boolean hasSelectForUpdate() { return selectForUpdate; }
  +   public boolean hasSelectForUpdate() { return selectForUpdate; }
                
  -     // XmlLoadable implementation ------------------------------------
  +   public boolean hasReadAhead() { return readAhead; }
  +
  +   // XmlLoadable implementation ------------------------------------
        
  -     public void importXml(Element element) throws DeploymentException {            
 
  -             // This method will be called:
  -             //  - with element = <default-entity> from standardjaws.xml (always)
  -             //  - with element = <default-entity> from jaws.xml (if provided)
  -             //  - with element = <entity> from jaws.xml (if provided)
  +   public void importXml(Element element) throws DeploymentException {              
 
  +      // This method will be called:
  +      //  - with element = <default-entity> from standardjaws.xml (always)
  +      //  - with element = <default-entity> from jaws.xml (if provided)
  +      //  - with element = <entity> from jaws.xml (if provided)
                
  -             // All defaults are set during the first call. The following calls 
override them. 
  +      // All defaults are set during the first call. The following calls override 
them. 
                
                
  -             // get table name
  -             String tableStr = getElementContent(getOptionalChild(element, 
"table-name"));
  -             if (tableStr != null) tableName = tableStr;
  +      // get table name
  +      String tableStr = getElementContent(getOptionalChild(element, "table-name"));
  +      if (tableStr != null) tableName = tableStr;
                        
  -             // create table?  If not provided, keep default.
  -             String createStr = getElementContent(getOptionalChild(element, 
"create-table"));
  -             if (createStr != null) createTable = 
Boolean.valueOf(createStr).booleanValue();
  +      // create table?  If not provided, keep default.
  +      String createStr = getElementContent(getOptionalChild(element, 
"create-table"));
  +      if (createStr != null) createTable = 
Boolean.valueOf(createStr).booleanValue();
                        
  -     // remove table?  If not provided, keep default.
  -             String removeStr = getElementContent(getOptionalChild(element, 
"remove-table"));
  -             if (removeStr != null) removeTable = 
Boolean.valueOf(removeStr).booleanValue();
  +      // remove table?  If not provided, keep default.
  +      String removeStr = getElementContent(getOptionalChild(element, 
"remove-table"));
  +      if (removeStr != null) removeTable = 
Boolean.valueOf(removeStr).booleanValue();
        
  -             // tuned updates?  If not provided, keep default.
  -             String tunedStr = getElementContent(getOptionalChild(element, 
"tuned-updates"));
  -             if (tunedStr != null) tunedUpdates = 
Boolean.valueOf(tunedStr).booleanValue();
  -             
  -             // read only?  If not provided, keep default.
  -             String roStr = getElementContent(getOptionalChild(element, 
"read-only"));
  -         if (roStr != null) readOnly = Boolean.valueOf(roStr).booleanValue();
  -
  -             String sForUpStr = getElementContent(getOptionalChild(element, 
"select-for-update"));
  -             if (sForUpStr != null) selectForUpdate = 
(Boolean.valueOf(sForUpStr).booleanValue());
  -             selectForUpdate = selectForUpdate && !readOnly;
  -
  -             // read only timeout?  
  -             String toStr = getElementContent(getOptionalChild(element, 
"time-out"));
  -             if (toStr != null) timeOut = Integer.valueOf(toStr).intValue();
  +      // tuned updates?  If not provided, keep default.
  +      String tunedStr = getElementContent(getOptionalChild(element, 
"tuned-updates"));
  +      if (tunedStr != null) tunedUpdates = Boolean.valueOf(tunedStr).booleanValue();
  +             
  +      // read only?  If not provided, keep default.
  +      String roStr = getElementContent(getOptionalChild(element, "read-only"));
  +      if (roStr != null) readOnly = Boolean.valueOf(roStr).booleanValue();
  +
  +      // read ahead?  If not provided, keep default.
  +      String raheadStr = getElementContent(getOptionalChild(element, "read-ahead"));
  +      if (raheadStr != null) readAhead = Boolean.valueOf(raheadStr).booleanValue();
  +      
  +      String sForUpStr = getElementContent(getOptionalChild(element, 
"select-for-update"));
  +      if (sForUpStr != null) selectForUpdate = 
(Boolean.valueOf(sForUpStr).booleanValue());
  +      selectForUpdate = selectForUpdate && !readOnly;
  +
  +      // read only timeout?  
  +      String toStr = getElementContent(getOptionalChild(element, "time-out"));
  +      if (toStr != null) timeOut = Integer.valueOf(toStr).intValue();
                        
  -             // primary key constraint?  If not provided, keep default.
  -             String pkStr = getElementContent(getOptionalChild(element, 
"pk-constraint"));
  -         if (pkStr != null) pkConstraint = Boolean.valueOf(pkStr).booleanValue();
  -
  -             // cmp fields
  -             Iterator iterator = getChildrenByTagName(element, "cmp-field");
  -
  -             while (iterator.hasNext()) {
  -                     Element cmpField = (Element)iterator.next();
  -                     String fieldName = getElementContent(getUniqueChild(cmpField, 
"field-name"));
  +      // primary key constraint?  If not provided, keep default.
  +      String pkStr = getElementContent(getOptionalChild(element, "pk-constraint"));
  +      if (pkStr != null) pkConstraint = Boolean.valueOf(pkStr).booleanValue();
  +
  +      // cmp fields
  +      Iterator iterator = getChildrenByTagName(element, "cmp-field");
  +
  +      while (iterator.hasNext()) {
  +         Element cmpField = (Element)iterator.next();
  +         String fieldName = getElementContent(getUniqueChild(cmpField, 
"field-name"));
                        
  -                     CMPFieldMetaData cmpFieldMetaData = 
getCMPFieldByName(fieldName);
  -                     if (cmpFieldMetaData == null) {
  +         CMPFieldMetaData cmpFieldMetaData = getCMPFieldByName(fieldName);
  +         if (cmpFieldMetaData == null) {
                                // Before we throw an exception, we have to check for 
nested cmp-fields.
                                // We just add a new CMPFieldMetaData.
  -                             if (isDetailedFieldDescription(fieldName)) {
  -                                     // We obviously have a cmp-field like 
"data.categoryPK" in jaws.xml
  -                                     // and a cmp-field "data" in ejb-jar.xml.
  -                                     // In this case, we assume the 
"data.categoryPK" as a detailed description for "data".
  -                                     cmpFieldMetaData = new 
CMPFieldMetaData(fieldName, this);
  -                                     cmpFields.put(fieldName, cmpFieldMetaData);    
             
  -                             }
  -                             else {
  -                                     throw new DeploymentException("cmp-field 
'"+fieldName+"' found in jaws.xml but not in ejb-jar.xml");
  -                             }
  -                     }
  -                     cmpFieldMetaData.importXml(cmpField);
  -             }
  -             
  -             // finders
  -             iterator = getChildrenByTagName(element, "finder");
  -
  -             while (iterator.hasNext()) {
  -                     Element finder = (Element)iterator.next();
  -                     FinderMetaData finderMetaData = new FinderMetaData();
  -                     finderMetaData.importXml(finder);
  -
  -                     finders.add(finderMetaData);
  -             }
  -             
  -     }
  -
  -     /**
  -      * @return true For a fieldname declared in jaws.xml like "data.categoryPK" if
  -      * there was a fieldname declared in ejb-jar.xml like "data".
  -      */
  -     private boolean isDetailedFieldDescription(String fieldName) {
  -             String fieldBaseName = CMPFieldMetaData.getFirstComponent(fieldName);
  -
  -             if (detailedFieldDescriptions.containsKey(fieldBaseName)) {
  -                     return true;
  -             }
  -
  -             CMPFieldMetaData cmpFieldMetaData = getCMPFieldByName(fieldBaseName);
  -             if (cmpFieldMetaData == null) {
  -                     return false;
  -             }
  -             else {
  -                     detailedFieldDescriptions.put(fieldBaseName, detailedBoolean);
  -                     cmpFields.remove(fieldBaseName);
  -                     return true;
  -             }
  -     }
  +            if (isDetailedFieldDescription(fieldName)) {
  +               // We obviously have a cmp-field like "data.categoryPK" in jaws.xml
  +               // and a cmp-field "data" in ejb-jar.xml.
  +               // In this case, we assume the "data.categoryPK" as a detailed 
description for "data".
  +               cmpFieldMetaData = new CMPFieldMetaData(fieldName, this);
  +               cmpFields.put(fieldName, cmpFieldMetaData);               
  +            }
  +            else {
  +               throw new DeploymentException("cmp-field '"+fieldName+"' found in 
jaws.xml but not in ejb-jar.xml");
  +            }
  +         }
  +         cmpFieldMetaData.importXml(cmpField);
  +      }
  +             
  +      // finders
  +      iterator = getChildrenByTagName(element, "finder");
  +
  +      while (iterator.hasNext()) {
  +         Element finder = (Element)iterator.next();
  +         FinderMetaData finderMetaData = new FinderMetaData();
  +         finderMetaData.setReadAhead(readAhead);
  +         finderMetaData.importXml(finder);
  +
  +         finders.add(finderMetaData);
  +      }
  +             
  +   }
  +
  +   /**
  +    * @return true For a fieldname declared in jaws.xml like "data.categoryPK" if
  +    * there was a fieldname declared in ejb-jar.xml like "data".
  +    */
  +   private boolean isDetailedFieldDescription(String fieldName) {
  +      String fieldBaseName = CMPFieldMetaData.getFirstComponent(fieldName);
  +
  +      if (detailedFieldDescriptions.containsKey(fieldBaseName)) {
  +         return true;
  +      }
  +
  +      CMPFieldMetaData cmpFieldMetaData = getCMPFieldByName(fieldBaseName);
  +      if (cmpFieldMetaData == null) {
  +         return false;
  +      }
  +      else {
  +         detailedFieldDescriptions.put(fieldBaseName, detailedBoolean);
  +         cmpFields.remove(fieldBaseName);
  +         return true;
  +      }
  +   }
                
                
  -     // Package protected ---------------------------------------------
  +   // Package protected ---------------------------------------------
    
  -     // Protected -----------------------------------------------------
  +   // Protected -----------------------------------------------------
       
  -     // Private -------------------------------------------------------
  +   // Private -------------------------------------------------------
   
  -     // Inner classes -------------------------------------------------
  +   // Inner classes -------------------------------------------------
   }
  
  
  

_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development

Reply via email to