Skip to content

Commit 3b458ee

Browse files
committed
fix: remove public ctors from SwapManager singleton
1 parent cbec9ac commit 3b458ee

File tree

1 file changed

+7
-25
lines changed
  • common-tools/clas-detector/src/main/java/org/jlab/detector/swaps

1 file changed

+7
-25
lines changed

common-tools/clas-detector/src/main/java/org/jlab/detector/swaps/SwapManager.java

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -70,31 +70,13 @@ public List<String> getBanks(String detectorName) {
7070

7171
private SwapManager() {}
7272

73-
public static SwapManager getInstance() {
73+
public static synchronized SwapManager getInstance() {
7474
if (instance == null) {
7575
instance = new SwapManager();
7676
}
7777
return instance;
7878
}
7979

80-
/**
81-
* @param detectorNames
82-
* @param prevTimestamp in CCDB format: MM/DD/YYYY
83-
* @param currTimestamp in CCDB format: MM/DD/YYYY
84-
*/
85-
public SwapManager(List<String> detectorNames, String prevTimestamp,String currTimestamp) {
86-
this.initialize(detectorNames, prevTimestamp, currTimestamp);
87-
}
88-
89-
/**
90-
* @param detectorNames
91-
* @param previous timestamp/variation used for translation tables during decoding
92-
* @param current timestamp/variation with correct translation tables
93-
*/
94-
public SwapManager(List<String> detectorNames,ConstantsManager previous,ConstantsManager current) {
95-
this.initialize(detectorNames, previous, current);
96-
}
97-
9880
/**
9981
* @param detectorNames
10082
* @param prevTimestamp in CCDB format: MM/DD/YYYY
@@ -269,13 +251,13 @@ public static void main(String[] args) {
269251

270252
DefaultLogger.debug();
271253

272-
SwapManager man1 = new SwapManager(Arrays.asList("DC"),"08/10/2020","10/13/2024");
273-
System.err.println(man1.banksToTables.get("DC::tot"));
254+
SwapManager man = getInstance();
255+
System.out.println(Arrays.toString(man.get(11014, "/daq/tt/bmt",3,5,320,0)));
274256

275-
SwapManager noman = getInstance();
276-
System.out.println(Arrays.toString(noman.get(11014, "/daq/tt/bmt",3,5,320,0)));
277-
278-
SwapManager man = new SwapManager(Arrays.asList("BMT"),"08/10/2020","10/13/2020");
257+
man.initialize(Arrays.asList("DC"),"08/10/2020","10/13/2024");
258+
System.err.println(man.banksToTables.get("DC::tot"));
259+
260+
man.initialize(Arrays.asList("BMT"),"08/10/2020","10/13/2020");
279261
man.get(11014,man.getTable("BMT"),"sector",3,6,8,0);
280262
System.out.println("SwapManager:\n"+man);
281263
System.out.println(man.get(11014,man.getTable("BMT"),"sector",99,22,33,44));

0 commit comments

Comments
 (0)