Changeset 7978 for mauRepo/xmi2sqlalchemy

Timestamp:

14/11/11 11:40:08 (9 years ago)

Author:

mnagni

Message:

Now include a custom defined list of UMLClass to be included in the tables generation.
Removed the class_type as table column because the class inheritance can work even without it

Location:

mauRepo/xmi2sqlalchemy/trunk/src

Files:

• main/java/ndg/services/newmoon/UMLElementsArchive.java (modified) (1 diff)
• main/java/ndg/services/newmoon/velocity/python/GenerateTables.java (modified) (3 diffs)
• main/resources/velocity/python/mapping.vm (modified) (1 diff)
• main/resources/velocity/python/sqlAlchemyTables.vm (modified) (1 diff)
• test/java/ngn/services/newmoon/DOMParser.java (modified) (4 diffs)
• test/resources/CEDA_Model/AdditionalClasses.txt (added)
• test/resources/CEDA_ModelXMI.xml (deleted)

mauRepo/xmi2sqlalchemy/trunk/src/main/java/ndg/services/newmoon/UMLElementsArchive.java

@@ -479 +479 @@
         }
 
+        public UMLClass getUMLClassByName(String className) {
+                return getElementByName(className, UMLClass.class);
+        } 
+        
         private <T extends UML_ID> T getElementByName(String className, Class<T> elementType) {
 

mauRepo/xmi2sqlalchemy/trunk/src/main/java/ndg/services/newmoon/velocity/python/GenerateTables.java

@@ -51 +51 @@
 import ndg.services.newmoon.velocity.python.support.TableModel;
 import ndg.services.newmoon.xmiModel.UMLClass;
-import ndg.services.newmoon.xmiModel.UMLModel;
 import ndg.services.newmoon.xmiModel.UMLValueTagged;
 import ndg.services.newmoon.xmiModel.UML_ID;
@@ -71 +70 @@
 
         private final List<UMLClass> umlClasses = new ArrayList<UMLClass>();
-
-        private final UMLModel umlModel;
 
         private final Logger logger = LoggerFactory.getLogger(GenerateTables.class);
@@ -96 +93 @@
         
         /**
-         * @param packageBase
-         * @deprecated
+         * @param umlClasses the classes for which have to be generated a table instance
          */
         public GenerateTables(List<UMLClass> umlClasses, GenerateModuleHelper helper) {
                 super(helper);
                 this.umlClasses.addAll(umlClasses);
-                this.umlModel = null;
-        }
-
-        /**
-         * @param packageBase
-         */
-        public GenerateTables(UMLModel model, GenerateModuleHelper helper) {
-                super(helper);
-                this.umlModel = model;
-                umlClasses.addAll(UMLElementsArchive.getInstance().getUMLClassesByUMLModel(umlModel));
         }
 

mauRepo/xmi2sqlalchemy/trunk/src/main/resources/velocity/python/mapping.vm

@@ -6 +6 @@
 ${tab}if (target.${tm}_id is None):
 ${tab}${tab}target.${tm}_id = next_id(connection, '${tm}_id_seq')
-#if($tableModel.hasChildren)
-${tab}target.${tm}_type = '${tm}'
-#end
+##if($tableModel.hasChildren)
+##${tab}target.${tm}_type = '${tm}'
+##end
 #foreach( $parent in $tableModel.inherited)
 #set ($tp = $parent.associatedClass.name.toLowerCase())
-${tab}target.${tp}_type = '${tp}'
+##${tab}target.${tp}_type = '${tp}'
 ${tab}target.${tp}_id = next_id(connection, '${tp}_id_seq')
 ${tab}target.${tm}_${tp}_id = target.${tp}_id

mauRepo/xmi2sqlalchemy/trunk/src/main/resources/velocity/python/sqlAlchemyTables.vm

@@ -41 +41 @@
 ${tab}#column($simpleAttribute)
 #end
-#if($tableModel.hasChildren)
-${tab}Column('${tableModel.associatedClass.name.toLowerCase()}_type', String(30), nullable=False),
-#end
+##if($tableModel.hasChildren)
+##${tab}Column('${tableModel.associatedClass.name.toLowerCase()}_type', String(30), nullable=False),
+##end
 #inheritanceColumn($tableModel)
 ${tab}extend_existing=False,)

mauRepo/xmi2sqlalchemy/trunk/src/test/java/ngn/services/newmoon/DOMParser.java

@@ -4 +4 @@
 
 import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Scanner;
 import java.util.concurrent.Future;
 
@@ -10 +13 @@
 import ndg.services.newmoon.velocity.python.GenerateModule;
 import ndg.services.newmoon.velocity.python.GenerateTables;
+import ndg.services.newmoon.xmiModel.UMLClass;
 import ndg.services.newmoon.xmiModel.UMLModel;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.junit.Assert;
 import org.junit.Test;
 
 public class DOMParser {
+
+        
+        public final void testParseinputAddClassFile() {
+                InputStream inputAddClass = NmParser.class.getClassLoader().getResourceAsStream("CEDA_Model/AdditionalClasses.txt");
+                if (inputAddClass != null) {
+                        Scanner sc = new Scanner(inputAddClass);
+                        while (sc.hasNext()) {                                  
+                                System.out.println(sc.next());
+                        }
+                }
+        }
+                
         
         @Test
         public final void testParseXmlFile() {
-                //InputStream inputXML = NmParser.class.getClassLoader().getResourceAsStream("CEDA_Model/MOLES3_4.xml");
-                InputStream inputXML = NmParser.class.getClassLoader().getResourceAsStream("CEDA_ModelXMI.xml");
+                InputStream inputXML = NmParser.class.getClassLoader().getResourceAsStream("CEDA_Model/CEDA_ModelXMI.xml");
+                InputStream inputAddClass = NmParser.class.getClassLoader().getResourceAsStream("CEDA_Model/AdditionalClasses.txt");
                 try {
                         NmParser xmiParser = new NmParser(inputXML, null);
@@ -26 +43 @@
                          
                         UMLElementsArchive.getInstance().waitParserToComplete();
-                        
-                        
-                        
-                        // Evaluates which Stubs has multeplicity more than one.
-                        // It helps to generate pne of the one-to-one, one-to-many, many-to-many db strategies
-                        //UMLElementsArchive.getInstance().evaluateMulteplicity();
-
-                        /*
-                        //verify if is possible to fork as thread
-                        List<UMLModel> models = UMLElementsArchive.getInstance().getUMLElementByType(UMLModel.class);
-                        for (UMLModel model : models) {
-                                GenerateModule module = new GenerateModule(model);
-                                UMLElementsArchive.getInstance().startNewParser(module);                                
-                        }
-                        */
                         
                         /*  I try to generate just what I need */
@@ -48 +50 @@
                         UMLElementsArchive.getInstance().waitParserToComplete();
                         
+                        
+                        
                         // Is better to generate the table on a separate process in order to minimize the generated tables
-                        GenerateTables tables = new GenerateTables(umlModel, module.getHelper());
+                        List<UMLClass> umlClasses = new ArrayList<UMLClass>();
+                        umlClasses.addAll(UMLElementsArchive.getInstance().getUMLClassesByUMLModel(umlModel));
+                        if (inputAddClass != null) {
+                                Scanner sc = new Scanner(inputAddClass);
+                                if (sc.hasNext()) {                                     
+                                        CollectionUtils.addIgnoreNull(umlClasses, 
+                                                        UMLElementsArchive.getInstance().getUMLClassByName(sc.next()));
+                                }
+                        }
+                        
+                        GenerateTables tables = new GenerateTables(umlClasses, module.getHelper());
                         tables.execute();
-
 
                 } catch (Exception e) {