Improvements on XML models inheritance

TASMAN-core/src/main/java/it/inaf/ia2/tsm/Column.java

@@ -71,7 +71,7 @@ public class Column extends ChildEntity<Table> {
         String type = null;
 
         if (tapSchema.getName().equals(parentSchema.getName())) {
-            TableModel tableModel = tapSchema.getTapSchemaModel().get(parentTable.getName());
+            TableModel tableModel = tapSchema.getTapSchemaModel().getTable(parentTable.getName());
             type = tableModel.get(getName()).getType();
         }
 

TASMAN-core/src/main/java/it/inaf/ia2/tsm/Table.java

@@ -59,11 +59,11 @@ public class Table extends ChildEntity<Schema> implements EntitiesContainer<Colu
 
     private TableModel getModel() {
         if (tapSchema.getName().equals(parentSchema.getName())) {
-            return tapSchema.getTapSchemaModel().get(simpleName);
+            return tapSchema.getTapSchemaModel().getTable(simpleName);
         }
         if (tapSchema.isHasObscore() && parentSchema.getName().equals("ivoa")
                 && simpleName.equals("obscore")) {
-            return tapSchema.getIvoaSchemaModel().get(simpleName);
+            return tapSchema.getIvoaSchemaModel().getTable(simpleName);
         }
         return null;
     }

TASMAN-core/src/main/java/it/inaf/ia2/tsm/TapSchema.java

@@ -660,7 +660,7 @@ public class TapSchema implements EntitiesContainer<Schema>, Serializable {
     }
 
     public final TableModel getTableModel(String tableName) {
-        return getTapSchemaModel().getTables().get(tableName);
+        return getTapSchemaModel().getTable(tableName);
     }
 
     public Map<String, Object> getSchemaMetadata(String schemaName) {
@@ -697,11 +697,11 @@ public class TapSchema implements EntitiesContainer<Schema>, Serializable {
     private void fillColumnProperties(SchemaModel schemaModel, String schemaName) {
 
         // check only on std, but valid also for principal (it depends on TS version)
-        boolean useIntegerAsBool = getTapSchemaModel().get(COLUMNS_TABLE).get(Column.STD_KEY).getJavaType() == Integer.class;
+        boolean useIntegerAsBool = getTapSchemaModel().getTable(COLUMNS_TABLE).get(Column.STD_KEY).getJavaType() == Integer.class;
 
         Schema schema = getChild(schemaName);
         schema.setValue(DESCRIPTION_KEY, schemaModel.getDescription());
-        for (TableModel tableModel : schemaModel.getTables().values()) {
+        for (TableModel tableModel : schemaModel.getTables()) {
             Table table = schema.getChild(tableModel.getName());
             table.setValue(DESCRIPTION_KEY, tableModel.getDescription());
             for (ColumnModel propertyModel : tableModel.getColumns()) {

TASMAN-core/src/main/java/it/inaf/ia2/tsm/datalayer/DBBrokerTemplate.java

@@ -142,7 +142,7 @@ public abstract class DBBrokerTemplate implements DBBroker {
 
             execute(getCreateDatabaseQuery(tapSchemaName), conn);
 
-            for (TableModel tableModel : tapSchemaModel.getTables().values()) {
+            for (TableModel tableModel : tapSchemaModel.getTables()) {
                 createTable(tapSchemaName, tableModel, conn);
             }
 
@@ -174,7 +174,7 @@ public abstract class DBBrokerTemplate implements DBBroker {
     public void createIvoaSchemaStructure(SchemaModel ivoaSchemaModel) throws SQLException {
         try (Connection conn = dataSource.getConnection()) {
             execute(getCreateDatabaseQuery(ivoaSchemaModel.getName()), conn);
-            for (TableModel tableModel : ivoaSchemaModel.getTables().values()) {
+            for (TableModel tableModel : ivoaSchemaModel.getTables()) {
                 createTable(ivoaSchemaModel.getName(), tableModel, conn);
             }
         }
@@ -681,11 +681,11 @@ public abstract class DBBrokerTemplate implements DBBroker {
         }
 
         for (SchemaModel tapSchemaModel : SchemaModels.getTapSchemaModels()) {
-            if (match(tapSchemaModel.get(TapSchema.SCHEMAS_TABLE), schemasColumns)
-                    && match(tapSchemaModel.get(TapSchema.TABLES_TABLE), tablesColumns)
-                    && match(tapSchemaModel.get(TapSchema.COLUMNS_TABLE), columnsColumns)
-                    && match(tapSchemaModel.get(TapSchema.KEYS_TABLE), keyColumns)
-                    && match(tapSchemaModel.get(TapSchema.KEY_COLUMNS_TABLE), keyColumnsColumns)) {
+            if (match(tapSchemaModel.getTable(TapSchema.SCHEMAS_TABLE), schemasColumns)
+                    && match(tapSchemaModel.getTable(TapSchema.TABLES_TABLE), tablesColumns)
+                    && match(tapSchemaModel.getTable(TapSchema.COLUMNS_TABLE), columnsColumns)
+                    && match(tapSchemaModel.getTable(TapSchema.KEYS_TABLE), keyColumns)
+                    && match(tapSchemaModel.getTable(TapSchema.KEY_COLUMNS_TABLE), keyColumnsColumns)) {
                 return tapSchemaModel.getVersion();
             }
         }

TASMAN-core/src/main/java/it/inaf/ia2/tsm/datalayer/mysql/MySQLDBBroker.java

@@ -156,6 +156,7 @@ public class MySQLDBBroker extends DBBrokerTemplate {
 
         boolean first = true;
         for (ColumnModel cm : tableModel.getColumns()) {
+            if (cm.isMandatory()) {
                 if (!first) {
                     querySb.append(",\n");
                 }
@@ -176,6 +177,7 @@ public class MySQLDBBroker extends DBBrokerTemplate {
                     querySb.append(" NOT NULL");
                 }
             }
+        }
 
         querySb.append(")");
 

TASMAN-core/src/main/java/it/inaf/ia2/tsm/datalayer/pgsql/PostgresDBBroker.java

@@ -70,6 +70,7 @@ public class PostgresDBBroker extends DBBrokerTemplate {
 
         boolean first = true;
         for (ColumnModel cm : tableModel.getColumns()) {
+            if (cm.isMandatory()) {
                 if (!first) {
                     querySb.append(",\n");
                 }
@@ -90,6 +91,7 @@ public class PostgresDBBroker extends DBBrokerTemplate {
                     querySb.append(" NOT NULL");
                 }
             }
+        }
 
         querySb.append(")");
 

TASMAN-core/src/main/java/it/inaf/ia2/tsm/model/ColumnModel.java

@@ -23,6 +23,7 @@
 package it.inaf.ia2.tsm.model;
 
 import java.io.Serializable;
+import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlTransient;
 
@@ -57,7 +58,7 @@ public class ColumnModel implements Serializable {
         mandatory = true;
     }
 
-    @XmlElement(name = "name")
+    @XmlAttribute(name = "name")
     public String getName() {
         return name;
     }

TASMAN-core/src/main/java/it/inaf/ia2/tsm/model/SchemaModel.java

@@ -23,8 +23,8 @@
 package it.inaf.ia2.tsm.model;
 
 import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.ArrayList;
+import java.util.List;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElements;
@@ -39,15 +39,16 @@ public class SchemaModel implements Serializable {
 
     private static final long serialVersionUID = 1087876778125446000L;
 
-    private final Map<String, TableModel> tables;
+    private final List<TableModel> tables;
 
     private String name;
     private String version;
     private String extendsFrom;
     private String description;
+    private String datatypeType;
 
     public SchemaModel() {
-        tables = new HashMap<>();
+        tables = new ArrayList<>();
     }
 
     @XmlAttribute(name = "name")
@@ -89,11 +90,25 @@ public class SchemaModel implements Serializable {
     @XmlElements({
         @XmlElement(name = "table")
     })
-    public Map<String, TableModel> getTables() {
+    public List<TableModel> getTables() {
         return tables;
     }
 
-    public TableModel get(String tableName) {
-        return tables.get(tableName);
+    public TableModel getTable(String tableName) {
+        for (TableModel table : tables) {
+            if (tableName.equals(table.getName())) {
+                return table;
+            }
+        }
+        return null;
+    }
+
+    @XmlAttribute(name = "datatype")
+    public String getDatatypeType() {
+        return datatypeType;
+    }
+
+    public void setDatatypeType(String datatypeType) {
+        this.datatypeType = datatypeType;
     }
 }

TASMAN-core/src/main/java/it/inaf/ia2/tsm/model/SchemaModels.java

@@ -89,7 +89,7 @@ public class SchemaModels {
     }
 
     public static TableModel getTapSchemaTableModel(String tableName, String version) {
-        return getTapSchemaModel(version).getTables().get(tableName);
+        return getTapSchemaModel(version).getTable(tableName);
     }
 
     private static List<String> getAvailableVersions(Map<String, SchemaModel> schemaModels) {

TASMAN-core/src/main/java/it/inaf/ia2/tsm/model/TableModel.java

@@ -28,7 +28,6 @@ import java.util.List;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlTransient;
 
 /**
  *

TASMAN-core/src/main/java/it/inaf/ia2/tsm/model/XMLMerger.java

@@ -99,8 +99,12 @@ public class XMLMerger {
 
     private Element checkElement(Element inheritedParent, Element child) {
 
+        Element inheritedElement = null;
+
         String name = child.getAttribute("name");
-        Element inheritedElement = findElementByNameAttribute(inheritedParent, name);
+        if (name != null && !name.isEmpty()) {
+            inheritedElement = findElementByNameAttribute(inheritedParent, name);
+        }
 
         if (child.getNodeName().equals("remove")) {
             if (inheritedElement != null) {

TASMAN-core/src/main/resources/schema_definition/tap_schema-1-IA2.xml

@@ -23,46 +23,40 @@ Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 -->
 <schema name="tap_schema" version="1.0-IA2" extends="1.0">
     <table name="schemas">
-        <column>
-            <name>schemaID</name>
+        <column name="schemaID">
             <type>BIGINT</type>
             <updatable>true</updatable>
             <standard>false</standard>
         </column>
     </table>
     <table name="tables">
-        <column>
-            <name>tableID</name>
+        <column name="tableID">
             <type>BIGINT</type>
             <updatable>true</updatable>
             <standard>false</standard>
         </column>
     </table>
     <table name="columns">
-        <column>
-            <name>columnID</name>
+        <column name="columnID">
             <type>BIGINT</type>
             <updatable>true</updatable>
             <standard>false</standard>
         </column>
-        <column>
-            <name>id</name>
+        <column name="id">
             <type>INTEGER</type>
             <updatable>true</updatable>
             <standard>false</standard>
         </column>
     </table>
     <table name="keys">
-        <column>
-            <name>keyID</name>
+        <column name="keyID">
             <type>BIGINT</type>
             <updatable>true</updatable>
             <standard>false</standard>
         </column>
     </table>
     <table name="key_columns">
-        <column>
-            <name>key_columnID</name>
+        <column name="key_columnID">
             <type>BIGINT</type>
             <updatable>true</updatable>
             <standard>false</standard>

TASMAN-core/src/main/resources/schema_definition/tap_schema-1.xml

@@ -21,10 +21,9 @@ You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc., 51
 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 -->
-<schema name="tap_schema" version="1.0" description="a special schema to describe a TAP tableset">
+<schema name="tap_schema" version="1.0" description="a special schema to describe a TAP tableset" datatype="ADQL">
     <table name="schemas" description="description of schemas in this tableset">
-        <column>
-            <name>schema_name</name>
+        <column name="schema_name">
             <type>VARCHAR</type>
             <size>64</size>
             <updatable>false</updatable>
@@ -33,16 +32,14 @@ Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
             <description>schema name for reference to TAP_SCHEMA.schemas</description>
             <standard>true</standard>
         </column>
-        <column>
-            <name>utype</name>
+        <column name="utype">
             <type>VARCHAR</type>
             <size>255</size>
             <updatable>true</updatable>
             <description>lists the utypes of schemas in the tableset</description>
             <standard>true</standard>
         </column>
-        <column>
-            <name>description</name>
+        <column name="description">
             <type>VARCHAR</type>
             <size>255</size>
             <updatable>true</updatable>
@@ -51,8 +48,7 @@ Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         </column>
     </table>
     <table name="tables" description="description of tables in this tableset">
-        <column>
-            <name>schema_name</name>
+        <column name="schema_name">
             <type>VARCHAR</type>
             <size>64</size>
             <updatable>false</updatable>
@@ -61,8 +57,7 @@ Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
             <description>the schema this table belongs to</description>
             <standard>true</standard>
         </column>
-        <column>
-            <name>table_name</name>
+        <column name="table_name">
             <type>VARCHAR</type>
             <size>128</size>
             <updatable>false</updatable>
@@ -71,8 +66,7 @@ Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
             <description>the fully qualified table name</description>
             <standard>true</standard>
         </column>
-        <column>
-            <name>table_type</name>
+        <column name="table_type">
             <size>8</size>
             <type>VARCHAR</type>
             <updatable>false</updatable>
@@ -80,16 +74,14 @@ Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
             <description>one of: table view</description>
             <standard>true</standard>
         </column>
-        <column>
-            <name>utype</name>
+        <column name="utype">
             <type>VARCHAR</type>
             <size>255</size>
             <updatable>true</updatable>
             <description>lists the utype of tables in the tableset</description>
             <standard>true</standard>
         </column>
-        <column>
-            <name>description</name>
+        <column name="description">
             <type>VARCHAR</type>
             <size>255</size>
             <updatable>true</updatable>
@@ -98,8 +90,7 @@ Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         </column>
     </table>
     <table name="columns" description="description of columns in this tableset">
-        <column>
-            <name>table_name</name>
+        <column name="table_name">
             <required>true</required>
             <type>VARCHAR</type>
             <size>128</size>
@@ -109,8 +100,7 @@ Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
             <description>the table this column belongs to</description>
             <standard>true</standard>
         </column>
-        <column>
-            <name>column_name</name>
+        <column name="column_name">
             <required>true</required>
             <type>VARCHAR</type>
             <size>64</size>
@@ -120,8 +110,7 @@ Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
             <description>the column name</description>
             <standard>true</standard>
         </column>
-        <column>
-            <name>datatype</name>
+        <column name="datatype">
             <type>VARCHAR</type>
             <size>64</size>
             <updatable>true</updatable>
@@ -129,48 +118,42 @@ Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
             <description>lists the ADQL datatype of columns in the tableset</description>
             <standard>true</standard>
         </column>
-        <column>
-            <name>size</name>
+        <column name="size">
             <type>INTEGER</type>
             <updatable>false</updatable>
             <key>size</key>
             <description>lists the size of variable-length columns in the tableset</description>
             <standard>true</standard>
         </column>
-        <column>
-            <name>description</name>
+        <column name="description">
             <type>VARCHAR</type>
             <size>255</size>
             <updatable>true</updatable> 
             <description>describes the columns in the tableset</description>
             <standard>true</standard>
         </column>
-        <column>
-            <name>utype</name>
+        <column name="utype">
             <type>VARCHAR</type>
             <size>255</size>
             <updatable>true</updatable>
             <description>lists the utypes of columns in the tableset</description>
             <standard>true</standard>
         </column>
-        <column>
-            <name>unit</name>
+        <column name="unit">
             <type>VARCHAR</type>
             <size>64</size>
             <updatable>true</updatable>
             <description>lists the unit used for column values in the tableset</description>
             <standard>true</standard>
         </column>
-        <column>
-            <name>ucd</name>
+        <column name="ucd">
             <type>VARCHAR</type>
             <size>64</size>
             <updatable>true</updatable>
             <description>lists the UCDs of columns in the tableset</description>
             <standard>true</standard>
         </column>
-        <column>
-            <name>indexed</name>
+        <column name="indexed">
             <type>INTEGER</type>
             <updatable>false</updatable>
             <nullable>false</nullable>
@@ -179,8 +162,7 @@ Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
             <description>an indexed column; 1 means true, 0 means false</description>
             <standard>true</standard>
         </column>
-        <column>
-            <name>principal</name>
+        <column name="principal">
             <type>INTEGER</type>
             <updatable>true</updatable>
             <nullable>false</nullable>
@@ -188,8 +170,7 @@ Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
             <description>a principal column; 1 means true, 0 means false</description>
             <standard>true</standard>
         </column>
-        <column>
-            <name>std</name>
+        <column name="std">
             <type>INTEGER</type>
             <updatable>true</updatable>
             <nullable>false</nullable>
@@ -199,16 +180,14 @@ Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         </column>
     </table>
     <table name="keys" description="description of foreign keys in this tableset">
-        <column>
-            <name>key_id</name>
+        <column name="key_id">
             <type>VARCHAR</type>
             <size>64</size>
             <updatable>true</updatable>
             <description>unique key to join to TAP_SCHEMA.key_columns</description>
             <standard>true</standard>
         </column>
-        <column>
-            <name>from_table</name>
+        <column name="from_table">
             <type>VARCHAR</type>
             <size>128</size>
             <updatable>false</updatable>
@@ -216,8 +195,7 @@ Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
             <description>the table with the foreign key</description>
             <standard>true</standard>
         </column>
-        <column>
-            <name>target_table</name>
+        <column name="target_table">
             <type>VARCHAR</type>
             <size>128</size>
             <updatable>false</updatable>
@@ -225,16 +203,14 @@ Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
             <description>the table with the primary key</description>
             <standard>true</standard>
         </column>
-        <column>
-            <name>description</name>
+        <column name="description">
             <type>VARCHAR</type>
             <size>255</size>
             <updatable>true</updatable>
             <description>describes keys in the tableset</description>
             <standard>true</standard>
         </column>
-        <column>
-            <name>utype</name>
+        <column name="utype">
             <type>VARCHAR</type>
             <size>255</size>
             <updatable>true</updatable>
@@ -243,16 +219,14 @@ Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         </column>
     </table>
     <table name="key_columns" description="description of foreign key columns in this tableset">
-        <column>
-            <name>key_id</name>
+        <column name="key_id">
             <type>VARCHAR</type>
             <size>64</size>
             <updatable>true</updatable>
             <description>key to join to TAP_SCHEMA.keys</description>
             <standard>true</standard>
         </column>
-        <column>
-            <name>from_column</name>
+        <column name="from_column">
             <type>VARCHAR</type>
             <size>64</size>
             <updatable>false</updatable>
@@ -260,8 +234,7 @@ Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
             <description>column in the from_table</description>
             <standard>true</standard>
         </column>
-        <column>
-            <name>target_column</name>
+        <column name="target_column">
             <type>VARCHAR</type>
             <size>64</size>
             <updatable>false</updatable>

TASMAN-core/src/main/resources/schema_definition/tap_schema-1_1.xml

@@ -21,39 +21,34 @@ You should have received a copy of the GNU General Public License along with
 this program; if not, write to the Free Software Foundation, Inc., 51
 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 -->
-<schema name="tap_schema" version="1.1" extends="1.0">
+<schema name="tap_schema" version="1.1" extends="1.0" datatype="VOTable">
     <table name="tables">
-        <column>
-            <name>table_index</name>
+        <column name="table_index">
             <type>INTEGER</type>
             <updatable>true</updatable>
             <standard>true</standard>
         </column>
     </table>
     <table name="columns">
-        <column>
-            <name>arraysize</name>
+        <column name="arraysize">
             <type>VARCHAR</type>
             <updatable>false</updatable> 
             <key>arraysize</key>
             <size>255</size>
             <standard>true</standard>
         </column>
-        <column>
-            <name>xtype</name>
+        <column name="xtype">
             <type>VARCHAR</type>
             <updatable>true</updatable>
             <size>255</size>
             <standard>true</standard>
         </column>
-        <column>
-            <name>column_index</name>
+        <column name="column_index">
             <type>INTEGER</type>
             <updatable>true</updatable>
             <standard>true</standard>
         </column>
-        <column>
-            <name>indexed</name>
+        <column name="indexed">
             <type>BOOLEAN</type>
             <updatable>false</updatable>
             <nullable>false</nullable>
@@ -62,8 +57,7 @@ Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
             <description>an indexed column</description>
             <standard>true</standard>
         </column>
-        <column>
-            <name>principal</name>
+        <column name="principal">
             <type>BOOLEAN</type>
             <updatable>true</updatable>
             <nullable>false</nullable>
@@ -71,8 +65,7 @@ Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
             <description>a principal column</description>
             <standard>true</standard>
         </column>
-        <column>
-            <name>std</name>
+        <column name="std">
             <type>BOOLEAN</type>
             <updatable>true</updatable>
             <nullable>false</nullable>