Author: [log in to unmask]
Date: Thu Mar 26 14:01:09 2015
New Revision: 2576
Log:
Change to using static method for conditions manager access instead of direct instantiation.
Modified:
java/trunk/conditions/src/main/java/org/hps/conditions/beam/ImportBeamConditionsEngRun.java
java/trunk/conditions/src/main/java/org/hps/conditions/cli/CommandLineTool.java
java/trunk/conditions/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java
java/trunk/conditions/src/test/java/org/hps/conditions/ConditionsDriverTest.java
java/trunk/conditions/src/test/java/org/hps/conditions/EngRunConditionsTest.java
java/trunk/conditions/src/test/java/org/hps/conditions/RunNumberTest.java
java/trunk/conditions/src/test/java/org/hps/conditions/beam/BeamConditionsTest.java
java/trunk/conditions/src/test/java/org/hps/conditions/beam/BeamCurrentTest.java
java/trunk/conditions/src/test/java/org/hps/conditions/ecal/EcalHardwareConditionsTest.java
java/trunk/conditions/src/test/java/org/hps/conditions/svt/SvtBadChannelTest.java
java/trunk/conditions/src/test/java/org/hps/conditions/svt/SvtDaqMappingTest.java
java/trunk/ecal-recon/src/test/java/org/hps/recon/ecal/cluster/ClustererTest.java
java/trunk/evio/src/test/java/org/hps/evio/EpicsScalarDataTest.java
java/trunk/evio/src/test/java/org/hps/evio/LCSimEngRunEventBuilderTest.java
java/trunk/evio/src/test/java/org/hps/evio/LCSimTestRunEventBuilderTest.java
java/trunk/evio/src/test/java/org/hps/evio/ScalarsTest.java
java/trunk/evio/src/test/java/org/hps/evio/SvtEvioReaderTest.java
java/trunk/evio/src/test/java/org/hps/evio/TestRunSvtEvioReaderTest.java
java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/EventProcessing.java
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/beam/ImportBeamConditionsEngRun.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/beam/ImportBeamConditionsEngRun.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/beam/ImportBeamConditionsEngRun.java Thu Mar 26 14:01:09 2015
@@ -79,7 +79,7 @@
System.out.println(entry.getValue() + " ");
}
- DatabaseConditionsManager manager = new DatabaseConditionsManager();
+ DatabaseConditionsManager manager = DatabaseConditionsManager.getInstance();
manager.setLogLevel(Level.ALL);
for (Entry<Integer, BeamConditions> entry : beamMap.entrySet()) {
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/cli/CommandLineTool.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/cli/CommandLineTool.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/cli/CommandLineTool.java Thu Mar 26 14:01:09 2015
@@ -100,7 +100,7 @@
logger.info("setting up conditions manager");
// Create new manager.
- conditionsManager = new DatabaseConditionsManager();
+ conditionsManager = DatabaseConditionsManager.getInstance();
// Set log level.
conditionsManager.setLogLevel(logger.getLevel());
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 Thu Mar 26 14:01:09 2015
@@ -123,7 +123,7 @@
* Calling this will automatically register this
* manager as the global default.
*/
- public DatabaseConditionsManager() {
+ private DatabaseConditionsManager() {
registerConditionsConverter(new DetectorConditionsConverter());
setupConnectionFromSystemProperty();
ConditionsManager.setDefaultConditionsManager(this);
@@ -141,11 +141,11 @@
*/
public synchronized static DatabaseConditionsManager getInstance() {
- logger.finer("getting conditions manager instance");
+ logger.finest("getting conditions manager instance");
// Is there no manager installed yet?
if (!ConditionsManager.isSetup() || !(ConditionsManager.defaultInstance() instanceof DatabaseConditionsManager)) {
- logger.finer("creating new instance");
+ logger.finest("creating new DatabaseConditionsManager");
// Create a new instance if necessary, which will install it globally as the default.
new DatabaseConditionsManager();
}
@@ -157,9 +157,17 @@
throw new RuntimeException("Default conditions manager has the wrong type: " + ConditionsManager.defaultInstance().getClass().getName());
}
- logger.finer("returning conditions manager instance");
+ logger.finest("returning conditions manager instance");
return (DatabaseConditionsManager) manager;
+ }
+
+ /**
+ * Reset the global static instance of the conditions manager to a new object.
+ */
+ public synchronized static void resetInstance() {
+ logger.finest("DatabaseConditionsManager instance is being reset");
+ new DatabaseConditionsManager();
}
/**
Modified: java/trunk/conditions/src/test/java/org/hps/conditions/ConditionsDriverTest.java
=============================================================================
--- java/trunk/conditions/src/test/java/org/hps/conditions/ConditionsDriverTest.java (original)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/ConditionsDriverTest.java Thu Mar 26 14:01:09 2015
@@ -20,7 +20,7 @@
public void testConditionsDriverTestRun() throws Exception {
- new DatabaseConditionsManager();
+ DatabaseConditionsManager.getInstance();
FileCache cache = new FileCache();
File inputFile = cache.getCachedFile(new URL("http://www.lcsim.org/test/hps-java/ConditionsTest.slcio"));
Modified: java/trunk/conditions/src/test/java/org/hps/conditions/EngRunConditionsTest.java
=============================================================================
--- java/trunk/conditions/src/test/java/org/hps/conditions/EngRunConditionsTest.java (original)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/EngRunConditionsTest.java Thu Mar 26 14:01:09 2015
@@ -5,10 +5,10 @@
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
+import java.util.logging.Level;
import junit.framework.TestCase;
-import java.util.logging.Level;
import org.hps.conditions.api.AbstractConditionsObjectCollection;
import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.ecal.EcalCalibration.EcalCalibrationCollection;
@@ -17,8 +17,6 @@
import org.hps.conditions.ecal.EcalChannelConstants;
import org.hps.conditions.ecal.EcalConditions;
import org.hps.conditions.ecal.EcalGain.EcalGainCollection;
-import org.hps.conditions.ecal.EcalLed.EcalLedCollection;
-import org.hps.conditions.ecal.EcalTimeShift.EcalTimeShiftCollection;
import org.lcsim.detector.converter.compact.EcalCrystal;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
@@ -50,7 +48,7 @@
public void test() throws Exception {
- DatabaseConditionsManager manager = new DatabaseConditionsManager();
+ DatabaseConditionsManager manager = DatabaseConditionsManager.getInstance();
DatabaseConditionsManager.getLogger().setLevel(Level.ALL);
manager.setTag("pass0");
manager.setXmlConfig("/org/hps/conditions/config/conditions_database_engrun.xml");
Modified: java/trunk/conditions/src/test/java/org/hps/conditions/RunNumberTest.java
=============================================================================
--- java/trunk/conditions/src/test/java/org/hps/conditions/RunNumberTest.java (original)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/RunNumberTest.java Thu Mar 26 14:01:09 2015
@@ -42,8 +42,8 @@
File testFile = cache.getCachedFile(new URL(fileLocation));
// Create the record loop.
- new DatabaseConditionsManager();
- DatabaseConditionsManager.getInstance().setLogLevel(Level.WARNING);
+ DatabaseConditionsManager manager = DatabaseConditionsManager.getInstance();
+ manager.setLogLevel(Level.WARNING);
LCSimLoop loop = new LCSimLoop();
// Configure the loop.
Modified: java/trunk/conditions/src/test/java/org/hps/conditions/beam/BeamConditionsTest.java
=============================================================================
--- java/trunk/conditions/src/test/java/org/hps/conditions/beam/BeamConditionsTest.java (original)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/beam/BeamConditionsTest.java Thu Mar 26 14:01:09 2015
@@ -45,7 +45,7 @@
3463, 3216, 2926, 2935, 2934, 2937 };
public void testBeamConditions() {
- DatabaseConditionsManager manager = new DatabaseConditionsManager();
+ DatabaseConditionsManager manager = DatabaseConditionsManager.getInstance();
manager.setLogLevel(Level.SEVERE);
System.out.println("run id current position_x position_y energy");
Map<Integer, BeamConditions> beamConditions = new LinkedHashMap<Integer, BeamConditions>();
Modified: java/trunk/conditions/src/test/java/org/hps/conditions/beam/BeamCurrentTest.java
=============================================================================
--- java/trunk/conditions/src/test/java/org/hps/conditions/beam/BeamCurrentTest.java (original)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/beam/BeamCurrentTest.java Thu Mar 26 14:01:09 2015
@@ -45,7 +45,7 @@
*/
public void test() throws Exception {
- new DatabaseConditionsManager();
+ DatabaseConditionsManager.getInstance();
// Cache file locally from URL.
FileCache cache = new FileCache();
Modified: java/trunk/conditions/src/test/java/org/hps/conditions/ecal/EcalHardwareConditionsTest.java
=============================================================================
--- java/trunk/conditions/src/test/java/org/hps/conditions/ecal/EcalHardwareConditionsTest.java (original)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/ecal/EcalHardwareConditionsTest.java Thu Mar 26 14:01:09 2015
@@ -22,7 +22,7 @@
static int RECORD_COUNT = 442;
public void testEcalHardwareConditions() throws Exception {
- DatabaseConditionsManager manager = new DatabaseConditionsManager();
+ DatabaseConditionsManager manager = DatabaseConditionsManager.getInstance();
try {
manager.setDetector("HPS-ECalCommissioning-v2", 0);
} catch (ConditionsNotFoundException e) {
Modified: java/trunk/conditions/src/test/java/org/hps/conditions/svt/SvtBadChannelTest.java
=============================================================================
--- java/trunk/conditions/src/test/java/org/hps/conditions/svt/SvtBadChannelTest.java (original)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/svt/SvtBadChannelTest.java Thu Mar 26 14:01:09 2015
@@ -55,7 +55,7 @@
File testFile = cache.getCachedFile(new URL(TEST_FILE_URL));
// Create the record loop.
- new DatabaseConditionsManager();
+ DatabaseConditionsManager.getInstance();
LCSimLoop loop = new LCSimLoop();
// Configure the loop.
Modified: java/trunk/conditions/src/test/java/org/hps/conditions/svt/SvtDaqMappingTest.java
=============================================================================
--- java/trunk/conditions/src/test/java/org/hps/conditions/svt/SvtDaqMappingTest.java (original)
+++ java/trunk/conditions/src/test/java/org/hps/conditions/svt/SvtDaqMappingTest.java Thu Mar 26 14:01:09 2015
@@ -27,7 +27,7 @@
public void test() throws Exception {
- DatabaseConditionsManager conditionsManager = new DatabaseConditionsManager();
+ DatabaseConditionsManager conditionsManager = DatabaseConditionsManager.getInstance();
conditionsManager.setDetector("HPS-Proposal2014-v7-2pt2", 0);
SvtDaqMappingCollection daqMappingCollection = conditionsManager.getCachedConditions(SvtDaqMappingCollection.class, "svt_daq_map").getCachedData();
Modified: java/trunk/ecal-recon/src/test/java/org/hps/recon/ecal/cluster/ClustererTest.java
=============================================================================
--- java/trunk/ecal-recon/src/test/java/org/hps/recon/ecal/cluster/ClustererTest.java (original)
+++ java/trunk/ecal-recon/src/test/java/org/hps/recon/ecal/cluster/ClustererTest.java Thu Mar 26 14:01:09 2015
@@ -133,7 +133,7 @@
testOutputDir.mkdir();
// Initialize the conditions system.
- new DatabaseConditionsManager();
+ DatabaseConditionsManager.resetInstance();
DatabaseConditionsManager.getInstance().setLogLevel(Level.WARNING);
}
Modified: java/trunk/evio/src/test/java/org/hps/evio/EpicsScalarDataTest.java
=============================================================================
--- java/trunk/evio/src/test/java/org/hps/evio/EpicsScalarDataTest.java (original)
+++ java/trunk/evio/src/test/java/org/hps/evio/EpicsScalarDataTest.java Thu Mar 26 14:01:09 2015
@@ -38,7 +38,7 @@
File inputFile = cache.getCachedFile(new URL(TEST_FILE_URL));
// Setup conditions and event building.
- DatabaseConditionsManager manager = new DatabaseConditionsManager();
+ DatabaseConditionsManager manager = DatabaseConditionsManager.getInstance();
LCSimEventBuilder builder = new LCSimEngRunEventBuilder();
manager.addConditionsListener(builder);
Modified: java/trunk/evio/src/test/java/org/hps/evio/LCSimEngRunEventBuilderTest.java
=============================================================================
--- java/trunk/evio/src/test/java/org/hps/evio/LCSimEngRunEventBuilderTest.java (original)
+++ java/trunk/evio/src/test/java/org/hps/evio/LCSimEngRunEventBuilderTest.java Thu Mar 26 14:01:09 2015
@@ -27,7 +27,7 @@
public void testLCSimEngRunEventBuilder() throws Exception {
// Setup database conditions.
- DatabaseConditionsManager conditionsManager = new DatabaseConditionsManager();
+ DatabaseConditionsManager conditionsManager = DatabaseConditionsManager.getInstance();
conditionsManager.setXmlConfig("/org/hps/conditions/config/conditions_dev.xml");
conditionsManager.setDetector("HPS-Proposal2014-v8-6pt6", 2000);
Modified: java/trunk/evio/src/test/java/org/hps/evio/LCSimTestRunEventBuilderTest.java
=============================================================================
--- java/trunk/evio/src/test/java/org/hps/evio/LCSimTestRunEventBuilderTest.java (original)
+++ java/trunk/evio/src/test/java/org/hps/evio/LCSimTestRunEventBuilderTest.java Thu Mar 26 14:01:09 2015
@@ -31,7 +31,7 @@
public void testLCSimTestRunEventBuilder() throws Exception {
// Configure the conditions system to retrieve test run conditions fo run 1351.
- DatabaseConditionsManager conditionsManager = new DatabaseConditionsManager();
+ DatabaseConditionsManager conditionsManager = DatabaseConditionsManager.getInstance();
conditionsManager.setXmlConfig(DB_CONFIGURATION);
// Create the test run event builder
Modified: java/trunk/evio/src/test/java/org/hps/evio/ScalarsTest.java
=============================================================================
--- java/trunk/evio/src/test/java/org/hps/evio/ScalarsTest.java (original)
+++ java/trunk/evio/src/test/java/org/hps/evio/ScalarsTest.java Thu Mar 26 14:01:09 2015
@@ -41,7 +41,7 @@
File inputFile = cache.getCachedFile(new URL(TEST_FILE_URL));
// Setup conditions and event building.
- DatabaseConditionsManager manager = new DatabaseConditionsManager();
+ DatabaseConditionsManager manager = DatabaseConditionsManager.getInstance();
LCSimEventBuilder builder = new LCSimEngRunEventBuilder();
manager.addConditionsListener(builder);
Modified: java/trunk/evio/src/test/java/org/hps/evio/SvtEvioReaderTest.java
=============================================================================
--- java/trunk/evio/src/test/java/org/hps/evio/SvtEvioReaderTest.java (original)
+++ java/trunk/evio/src/test/java/org/hps/evio/SvtEvioReaderTest.java Thu Mar 26 14:01:09 2015
@@ -33,7 +33,7 @@
SvtEvioReader svtReader = new SvtEvioReader();
// Setup the database conditions
- DatabaseConditionsManager conditionsManager = new DatabaseConditionsManager();
+ DatabaseConditionsManager conditionsManager = DatabaseConditionsManager.getInstance();
conditionsManager.setDetector("HPS-Proposal2014-v8-2pt2", 0);
// Instantiate the event builder
Modified: java/trunk/evio/src/test/java/org/hps/evio/TestRunSvtEvioReaderTest.java
=============================================================================
--- java/trunk/evio/src/test/java/org/hps/evio/TestRunSvtEvioReaderTest.java (original)
+++ java/trunk/evio/src/test/java/org/hps/evio/TestRunSvtEvioReaderTest.java Thu Mar 26 14:01:09 2015
@@ -32,7 +32,7 @@
// TestRunSvtEvioReader svtReader = new TestRunSvtEvioReader();
// Configure conditions system
- DatabaseConditionsManager conditionsManager = new DatabaseConditionsManager();
+ DatabaseConditionsManager conditionsManager = DatabaseConditionsManager.getInstance();
conditionsManager.setXmlConfig("/org/hps/conditions/config/conditions_database_testrun_2012.xml");
// Instantiate the event builder
Modified: java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/EventProcessing.java
=============================================================================
--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/EventProcessing.java (original)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/EventProcessing.java Thu Mar 26 14:01:09 2015
@@ -135,12 +135,10 @@
MonitoringApplication.logger.config("set steering " + steering + " with type " + (steeringType == SteeringType.RESOURCE ? "RESOURCE" : "FILE"));
try {
- // Create and the job manager. The conditions manager is instantiated from this call but
- // not configured.
+ // Create the job manager. A new conditions manager is instantiated from this call but not configured.
sessionState.jobManager = new JobManager();
- // Add conditions listeners after new database conditions manager is initialized from
- // job manager.
+ // Add conditions listeners after new database conditions manager is initialized from the job manager.
DatabaseConditionsManager conditionsManager = DatabaseConditionsManager.getInstance();
for (ConditionsListener conditionsListener : sessionState.conditionsListeners) {
logger.config("adding conditions listener " + conditionsListener.getClass().getName());
|
