Author: [log in to unmask]
Date: Wed Apr 29 12:05:42 2015
New Revision: 2857

Log:
Remove obsolete query methods.

Removed:
    java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/database/QueryBuilder.java
Modified:
    java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/beam/ImportBeamConditionsEngRun.java
    java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java

Modified: java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/beam/ImportBeamConditionsEngRun.java
 =============================================================================
--- java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/beam/ImportBeamConditionsEngRun.java	(original)
+++ java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/beam/ImportBeamConditionsEngRun.java	Wed Apr 29 12:05:42 2015
@@ -102,7 +102,7 @@
                     "imported from HPS_Runs.pdf", "eng_run");
             System.out.println(record);
             collection.add(beam);
-            manager.insertCollection(collection);
+            collection.insert();
             record.insert();
         }
         manager.closeConnection();

Modified: java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java
 =============================================================================
--- java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java	(original)
+++ java/branches/HPSJAVA-488/conditions/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java	Wed Apr 29 12:05:42 2015
@@ -709,84 +709,6 @@
     }
 
     /**
-     * Insert a collection of ConditionsObjects into the database.
-     *
-     * @param collection the collection to insert
-     * @param <ObjectType> the type of the conditions object
-     * @throws SQLException if there is a database or SQL error
-     * @throws ConditionsObjectException if there is a problem inserting the object
-     */
-    public <ObjectType extends ConditionsObject> void insertCollection(
-            final ConditionsObjectCollection<ObjectType> collection) throws SQLException, ConditionsObjectException {
-
-        if (collection == null) {
-            throw new IllegalArgumentException("The collection is null.");
-        }
-        if (collection.size() == 0) {
-            throw new IllegalArgumentException("The collection is empty.");
-        }
-
-        TableMetaData tableMetaData = collection.getTableMetaData();
-        if (tableMetaData == null) {
-            final List<TableMetaData> metaDataList = this.tableRegistry.findByCollectionType(collection.getClass());
-            if (metaDataList == null) {
-                // This is a fatal error because no meta data is available for the type.
-                throw new ConditionsObjectException("Failed to find meta data for type: " + collection.getClass());
-            }
-            tableMetaData = metaDataList.get(0);
-        }
-        if (collection.getCollectionId() == -1) {
-            collection.setCollectionId(this.getCollectionId(collection, null));
-        }
-
-        logger.info("inserting collection with ID " + collection.getCollectionId() + " and key "
-                + tableMetaData.getKey() + " into table " + tableMetaData.getTableName());
-
-        final boolean openedConnection = this.openConnection();
-
-        PreparedStatement preparedStatement = null;
-
-        try {
-            this.connection.setAutoCommit(false);
-            logger.fine("starting insert transaction");
-            final String sql = QueryBuilder.buildPreparedInsert(tableMetaData.getTableName(), collection.iterator()
-                    .next());
-            preparedStatement = this.connection.prepareStatement(sql);
-            logger.fine("using prepared statement: " + sql);
-            final int collectionId = collection.getCollectionId();
-            for (final ConditionsObject object : collection) {
-                preparedStatement.setObject(1, collectionId);
-                int parameterIndex = 2;
-                if (object instanceof ConditionsRecord) {
-                    parameterIndex = 1;
-                }
-                for (final Object value : object.getFieldValues().getValues()) {
-                    preparedStatement.setObject(parameterIndex, value);
-                    ++parameterIndex;
-                }
-                preparedStatement.executeUpdate();
-            }
-            this.connection.commit();
-            logger.fine("committed transaction");
-        } catch (final Exception e) {
-            e.printStackTrace();
-            logger.warning(e.getMessage());
-            logger.warning("rolling back transaction");
-            this.connection.rollback();
-            logger.warning("transaction was rolled back");
-        } finally {
-            this.connection.setAutoCommit(true);
-        }
-
-        try {
-            preparedStatement.close();
-        } catch (final Exception e) {
-        }
-
-        this.closeConnection(openedConnection);
-    }
-
-    /**
      * Check if connected to the database.
      *
      * @return <code>true</code> if connected