Author: [log in to unmask]
Date: Sat Jan 3 17:44:58 2015
New Revision: 1842
Log:
Minor changes to sync with my working copy.
Modified:
java/trunk/conditions/src/main/java/org/hps/conditions/api/FieldValueMap.java
java/trunk/conditions/src/main/java/org/hps/conditions/cli/LoadCommand.java
java/trunk/conditions/src/main/java/org/hps/conditions/database/ConnectionParameters.java
java/trunk/conditions/src/main/java/org/hps/conditions/database/ConverterRegistry.java
java/trunk/conditions/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java
java/trunk/conditions/src/main/java/org/hps/conditions/database/QueryBuilder.java
java/trunk/conditions/src/main/java/org/hps/conditions/database/TableMetaData.java
java/trunk/conditions/src/main/java/org/hps/conditions/ecal/TestRunEcalConditionsConverter.java
java/trunk/conditions/src/main/java/org/hps/conditions/package-info.java
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/api/FieldValueMap.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/api/FieldValueMap.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/api/FieldValueMap.java Sat Jan 3 17:44:58 2015
@@ -7,12 +7,4 @@
* to values.
*/
public final class FieldValueMap extends LinkedHashMap<String, Object> {
-
- Object[] valuesToArray() {
- return values().toArray();
- }
-
- String[] fieldsToArray() {
- return keySet().toArray(new String[] {});
- }
}
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/cli/LoadCommand.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/cli/LoadCommand.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/cli/LoadCommand.java Sat Jan 3 17:44:58 2015
@@ -75,6 +75,7 @@
String insertSql = QueryBuilder.buildInsert(tableName, collectionID, columnNames, rows);
if (verbose)
System.out.println(insertSql);
+ // FIXME: This call should go through an object API like ConditionsObjectCollection.insert rather than the manager directly.
List<Integer> IDs = conditionsManager.updateQuery(insertSql);
System.out.println("Inserted " + IDs.size() + " new rows into table " + tableName + " with collection_id " + collectionID);
}
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/database/ConnectionParameters.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/database/ConnectionParameters.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/database/ConnectionParameters.java Sat Jan 3 17:44:58 2015
@@ -15,8 +15,6 @@
* including hostname, port, user and password. It can also create and return a
* Connection object based on these parameters.
* @author Jeremy McCormick <[log in to unmask]>
- * @version $Id: ConnectionParameters.java,v 1.8 2013/10/04 01:54:16 jeremy Exp
- * $
*/
public class ConnectionParameters {
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/database/ConverterRegistry.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/database/ConverterRegistry.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/database/ConverterRegistry.java Sat Jan 3 17:44:58 2015
@@ -31,7 +31,7 @@
* @return The registry of converters.
*/
@SuppressWarnings({ "unchecked", "rawtypes" })
- public static ConverterRegistry create() {
+ static ConverterRegistry create() {
ConverterRegistry registry = new ConverterRegistry();
Reflections reflections = new Reflections("org.hps.conditions");
Set<Class<? extends ConditionsObject>> objectTypes = reflections.getSubTypesOf(ConditionsObject.class);
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java Sat Jan 3 17:44:58 2015
@@ -579,6 +579,7 @@
* Get a list of all the ConditionsRecord objects.
* @return The list of all the ConditionsRecord objects.
*/
+ // FIXME: This should use a cache created in initialize rather than do a find every time.
public ConditionsRecordCollection getConditionsRecords() {
ConditionsRecordCollection conditionsRecords = new ConditionsRecordCollection();
for (TableMetaData tableMetaData : tableRegistry.values()) {
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/database/QueryBuilder.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/database/QueryBuilder.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/database/QueryBuilder.java Sat Jan 3 17:44:58 2015
@@ -40,6 +40,7 @@
return buff.toString();
}
+ /*
static String buildUpdate(String tableName, int rowId, String[] fields, Object[] values) {
if (fields.length != values.length)
throw new IllegalArgumentException("The field and value arrays are different lengths.");
@@ -68,6 +69,7 @@
buff.append(") ");
return buff.toString();
}
+ */
static String buildPreparedInsert(String tableName, ConditionsObject object) {
if (object.getFieldValues().size() == 0) {
@@ -133,12 +135,14 @@
return buff.toString();
}
+ /*
static String buildDelete(String tableName, int rowId) {
if (rowId <= 0)
throw new IllegalArgumentException("Invalid row ID: " + rowId);
String query = "DELETE FROM " + tableName + " WHERE id = " + rowId;
return query;
}
+ */
static String formatDate(Date date) {
return dateFormat.format(date);
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/database/TableMetaData.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/database/TableMetaData.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/database/TableMetaData.java Sat Jan 3 17:44:58 2015
@@ -14,8 +14,8 @@
* conditions data fields. The list of fields does not include the collection ID
* or row ID, which are implicitly assumed to exist.
* <p>
- * It also has references to the implementation classes which are used to map
- * the data onto {@link ConditionsObject} and {@link AbstractConditionsObjectCollection}.
+ * It also has references to the implementation classes which are used for the ORM
+ * onto {@link ConditionsObject} and {@link ConditionsObjectCollection}.
*
* @see org.hps.conditions.api.ConditionsObject
* @see org.hps.conditions.api.AbstractConditionsObjectCollection
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/ecal/TestRunEcalConditionsConverter.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/ecal/TestRunEcalConditionsConverter.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/ecal/TestRunEcalConditionsConverter.java Sat Jan 3 17:44:58 2015
@@ -9,9 +9,8 @@
import org.hps.conditions.ecal.EcalTimeShift.EcalTimeShiftCollection;
/**
- * This class loads all ECal conditions into an {@link EcalConditions} object
- * from the database, based on the current run number known by the conditions
- * manager.
+ * This class loads all Test Run ECAL conditions into an {@link EcalConditions} object
+ * from the database.
*
* @author Jeremy McCormick <[log in to unmask]>
* @author Omar Moreno <[log in to unmask]>
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/package-info.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/package-info.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/package-info.java Sat Jan 3 17:44:58 2015
@@ -1,29 +1,8 @@
/**
- * <p>
- * The HPS conditions package provides facilities for accessing time dependent conditions
- * for a detector at runtime using a framework built on the LCSim Conditions System package.
+ * The HPS conditions module provides facilities for accessing time dependent conditions
+ * for a detector at runtime using a framework built on the LCSim conditions system.
* The {@link DatabaseConditionsReader} has a set of converters for reading data from
* tables using SQL queries and creating appropriate, typed objects for them.
- * </p>
- * <p>
- * There is a chain of readers that is called by the manager which looks like:
- * </p>
- * <p>
- * DetectorConditionsReader => DatabaseConditionsReader => ConditionsReader
- * </p>
- * <p>
- * The {@link DetectorConditionsReader} extends the {@link DatabaseConditionsReader} and
- * handles compact.xml files or other files embedded as jar resources in the detector directories
- * (e.g. from detector-data). It is the first class which attempts to resolve conditions by
- * name and type. When it does not find a set of condition data, it will call its
- * super class's method, which will then attempt to find the data.
- * </p>
- * <p>
- * The {@link DatabaseConditionsReader} in fact mostly relies on built-in behavior of the
- * {@link org.lcsim.conditions.ConditionsReader} class, which has a set of converters
- * registered on it. These converters perform the translation from database table rows
- * to Java objects.
- * </p>
*
* @author Jeremy McCormick <[log in to unmask]>
*/
