From b1d9a43e6ebe80c721571946c8978606722da644 Mon Sep 17 00:00:00 2001
From: mmusich <marco.musich@cern.ch>
Date: Wed, 20 Apr 2022 14:01:33 +0200
Subject: [PATCH] get rid of more deprecation warnings in OnlineDB

---
 .../SiStripConfigDb/test/plugins/module.cc    |  5 --
 .../test/plugins/testSiStripConfigDb.cc       | 49 ++++++++++++++++---
 .../test/plugins/testSiStripConfigDb.h        | 44 -----------------
 3 files changed, 42 insertions(+), 56 deletions(-)
 delete mode 100644 OnlineDB/SiStripConfigDb/test/plugins/module.cc
 delete mode 100644 OnlineDB/SiStripConfigDb/test/plugins/testSiStripConfigDb.h

diff --git a/OnlineDB/SiStripConfigDb/test/plugins/module.cc b/OnlineDB/SiStripConfigDb/test/plugins/module.cc
deleted file mode 100644
index 11453070cf6ed..0000000000000
--- a/OnlineDB/SiStripConfigDb/test/plugins/module.cc
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#include "FWCore/Framework/interface/MakerMacros.h"
-
-#include "OnlineDB/SiStripConfigDb/test/plugins/testSiStripConfigDb.h"
-DEFINE_FWK_MODULE(testSiStripConfigDb);
diff --git a/OnlineDB/SiStripConfigDb/test/plugins/testSiStripConfigDb.cc b/OnlineDB/SiStripConfigDb/test/plugins/testSiStripConfigDb.cc
index 2c58a1e9fba92..34d4ef496c930 100644
--- a/OnlineDB/SiStripConfigDb/test/plugins/testSiStripConfigDb.cc
+++ b/OnlineDB/SiStripConfigDb/test/plugins/testSiStripConfigDb.cc
@@ -1,15 +1,47 @@
-
-#include "OnlineDB/SiStripConfigDb/test/plugins/testSiStripConfigDb.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "DataFormats/SiStripCommon/interface/SiStripConstants.h"
-#include "DataFormats/SiStripCommon/interface/SiStripEnumsAndStrings.h"
-#include "OnlineDB/SiStripConfigDb/interface/SiStripConfigDb.h"
+// system includes
 #include <iostream>
 #include <iomanip>
 #include <sstream>
 #include <string>
 
+// user includes
+#include "DataFormats/SiStripCommon/interface/SiStripConstants.h"
+#include "DataFormats/SiStripCommon/interface/SiStripEnumsAndStrings.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
+#include "OnlineDB/SiStripConfigDb/interface/SiStripConfigDb.h"
+
+class SiStripConfigDb;
+
+/**
+   @class testSiStripConfigDb
+   @author R.Bainbridge
+   @brief Simple class that tests SiStripConfigDb service
+*/
+class testSiStripConfigDb : public edm::one::EDAnalyzer<> {
+public:
+  testSiStripConfigDb(const edm::ParameterSet&);
+  ~testSiStripConfigDb();
+
+  void analyze(const edm::Event&, const edm::EventSetup&) { ; }
+  void beginJob();
+
+private:
+  SiStripConfigDb* db_;
+
+  const bool download_;
+  const bool upload_;
+  const bool conns_;
+  const bool devices_;
+  const bool feds_;
+  const bool dcus_;
+  const bool anals_;
+};
+
 using namespace std;
 using namespace sistrip;
 
@@ -604,3 +636,6 @@ void testSiStripConfigDb::beginJob() {
     }
   }
 }
+
+#include "FWCore/Framework/interface/MakerMacros.h"
+DEFINE_FWK_MODULE(testSiStripConfigDb);
diff --git a/OnlineDB/SiStripConfigDb/test/plugins/testSiStripConfigDb.h b/OnlineDB/SiStripConfigDb/test/plugins/testSiStripConfigDb.h
deleted file mode 100644
index f3b947433800a..0000000000000
--- a/OnlineDB/SiStripConfigDb/test/plugins/testSiStripConfigDb.h
+++ /dev/null
@@ -1,44 +0,0 @@
-
-#ifndef OnlineDB_SiStripConfigDb_testSiStripConfigDb_H
-#define OnlineDB_SiStripConfigDb_testSiStripConfigDb_H
-
-#include "FWCore/Framework/interface/EDAnalyzer.h"
-#include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-
-class SiStripConfigDb;
-
-/**
-   @class testSiStripConfigDb 
-   @author R.Bainbridge
-   @brief Simple class that tests SiStripConfigDb service
-*/
-class testSiStripConfigDb : public edm::EDAnalyzer {
-public:
-  testSiStripConfigDb(const edm::ParameterSet&);
-  ~testSiStripConfigDb();
-
-  void beginJob();
-  void analyze(const edm::Event&, const edm::EventSetup&) { ; }
-  void endJob() { ; }
-
-private:
-  SiStripConfigDb* db_;
-
-  bool download_;
-
-  bool upload_;
-
-  bool conns_;
-
-  bool devices_;
-
-  bool feds_;
-
-  bool dcus_;
-
-  bool anals_;
-};
-
-#endif  // OnlineDB_SiStripConfigDb_testSiStripConfigDb_H