From 47dade7d46431933ab4adeb1b38ceae2e4911f15 Mon Sep 17 00:00:00 2001
From: Steven Murray <Steven.Murray@cern.ch>
Date: Fri, 3 Aug 2018 17:55:38 +0200
Subject: [PATCH] Removed the unused class common/archiveRoutes/ArchiveRoute
---
common/CMakeLists.txt | 1 -
common/archiveRoutes/ArchiveRoute.cpp | 46 ---------------
common/archiveRoutes/ArchiveRoute.hpp | 83 ---------------------------
scheduler/OStoreDB/OStoreDB.cpp | 1 -
scheduler/SchedulerDatabase.hpp | 6 --
scheduler/SchedulerDatabaseTest.cpp | 1 -
scheduler/SchedulerTest.cpp | 1 -
7 files changed, 139 deletions(-)
delete mode 100644 common/archiveRoutes/ArchiveRoute.cpp
delete mode 100644 common/archiveRoutes/ArchiveRoute.hpp
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index d49c2f7331..4e94819a07 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -68,7 +68,6 @@ set (COMMON_LIB_SRC_FILES
dataStructures/VerifyInfo.cpp
dataStructures/WriteTestResult.cpp
dataStructures/utils.cpp
- archiveRoutes/ArchiveRoute.cpp
checksum/Checksum.cpp
exception/AcceptConnectionInterrupted.cpp
exception/AcsQueryVolumeCmd.cpp
diff --git a/common/archiveRoutes/ArchiveRoute.cpp b/common/archiveRoutes/ArchiveRoute.cpp
deleted file mode 100644
index cfb3f57899..0000000000
--- a/common/archiveRoutes/ArchiveRoute.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * The CERN Tape Archive (CTA) project
- * Copyright (C) 2015 CERN
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "common/archiveRoutes/ArchiveRoute.hpp"
-
-//------------------------------------------------------------------------------
-// constructor
-//------------------------------------------------------------------------------
-cta::common::archiveRoute::ArchiveRoute::ArchiveRoute():
- copyNb(0) {
-}
-
-//------------------------------------------------------------------------------
-// destructor
-//------------------------------------------------------------------------------
-cta::common::archiveRoute::ArchiveRoute::~ArchiveRoute() throw() {
-}
-
-//------------------------------------------------------------------------------
-// constructor
-//------------------------------------------------------------------------------
-cta::common::archiveRoute::ArchiveRoute::ArchiveRoute(
- const std::string &storageClassName,
- const uint16_t copyNb,
- const std::string &tapePoolName,
- const CreationLog &creationLog):
- storageClassName(storageClassName),
- copyNb(copyNb),
- tapePoolName(tapePoolName),
- creationLog(creationLog) {
-}
diff --git a/common/archiveRoutes/ArchiveRoute.hpp b/common/archiveRoutes/ArchiveRoute.hpp
deleted file mode 100644
index 737c2a3791..0000000000
--- a/common/archiveRoutes/ArchiveRoute.hpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * The CERN Tape Archive (CTA) project
- * Copyright (C) 2015 CERN
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "common/UserIdentity.hpp"
-#include "common/CreationLog.hpp"
-
-#include <stdint.h>
-#include <string>
-#include <time.h>
-
-namespace cta { namespace common { namespace archiveRoute {
-
-/**
- * An archive route.
- */
-struct ArchiveRoute {
-
- /**
- * Constructor.
- */
- ArchiveRoute();
-
- /**
- * Destructor.
- */
- ~ArchiveRoute() throw();
-
- /**
- * Constructor.
- *
- * @param storageClassName The name of the storage class that identifies the
- * source disk files.
- * @param copyNb The tape copy number. Copy numbers start from 1.
- * @param tapePoolName The name of the destination tape pool.
- * @param creationLog The who, where, when an why of this modification.
- * time is used.
- */
- ArchiveRoute(
- const std::string &storageClassName,
- const uint16_t copyNb,
- const std::string &tapePoolName,
- const CreationLog &creationLog);
-
- /**
- * The name of the storage class that identifies the source disk files.
- */
- std::string storageClassName;
-
- /**
- * The tape copy number.
- */
- uint32_t copyNb;
-
- /**
- * The name of the destination tape pool.
- */
- std::string tapePoolName;
-
- /**
- * The record of the entry's creation
- */
- CreationLog creationLog;
-
-}; // class ArchiveRoute
-
-}}} // namespace cta::common::archiveRoute
\ No newline at end of file
diff --git a/scheduler/OStoreDB/OStoreDB.cpp b/scheduler/OStoreDB/OStoreDB.cpp
index 3c36de78ec..d825dae4ac 100644
--- a/scheduler/OStoreDB/OStoreDB.cpp
+++ b/scheduler/OStoreDB/OStoreDB.cpp
@@ -25,7 +25,6 @@
//#include "objectstore/RetrieveRequest.hpp"
#include "objectstore/Helpers.hpp"
#include "common/exception/Exception.hpp"
-#include "common/archiveRoutes/ArchiveRoute.hpp"
#include "common/utils/utils.hpp"
#include "scheduler/LogicalLibrary.hpp"
#include "common/dataStructures/MountPolicy.hpp"
diff --git a/scheduler/SchedulerDatabase.hpp b/scheduler/SchedulerDatabase.hpp
index 5b03fdc36f..5bbc23ee71 100644
--- a/scheduler/SchedulerDatabase.hpp
+++ b/scheduler/SchedulerDatabase.hpp
@@ -18,7 +18,6 @@
#pragma once
-#include "common/archiveRoutes/ArchiveRoute.hpp"
#include "common/dataStructures/RetrieveFileQueueCriteria.hpp"
#include "common/dataStructures/DriveState.hpp"
#include "common/MountControl.hpp"
@@ -49,11 +48,6 @@
namespace cta {
// Forward declarations for opaque references.
-namespace common {
-namespace archiveRoute {
- class ArchiveRoute;
-} // cta::common::archiveRoute
-} // cta::common
class ArchiveRequest;
class LogicalLibrary;
class RetrieveRequestDump;
diff --git a/scheduler/SchedulerDatabaseTest.cpp b/scheduler/SchedulerDatabaseTest.cpp
index 74908b9945..2f4671fba5 100644
--- a/scheduler/SchedulerDatabaseTest.cpp
+++ b/scheduler/SchedulerDatabaseTest.cpp
@@ -19,7 +19,6 @@
#include "objectstore/BackendRadosTestSwitch.hpp"
#include "tests/TestsCompileTimeSwitches.hpp"
#include "common/UserIdentity.hpp"
-#include "common/archiveRoutes/ArchiveRoute.hpp"
#include "scheduler/SchedulerDatabase.hpp"
#include "scheduler/SchedulerDatabaseFactory.hpp"
#include "common/dataStructures/SecurityIdentity.hpp"
diff --git a/scheduler/SchedulerTest.cpp b/scheduler/SchedulerTest.cpp
index a5b7a33974..978f6e098f 100644
--- a/scheduler/SchedulerTest.cpp
+++ b/scheduler/SchedulerTest.cpp
@@ -18,7 +18,6 @@
#include "catalogue/InMemoryCatalogue.hpp"
#include "catalogue/SchemaCreatingSqliteCatalogue.hpp"
-#include "common/archiveRoutes/ArchiveRoute.hpp"
#include "common/log/DummyLogger.hpp"
#include "common/make_unique.hpp"
#include "scheduler/ArchiveMount.hpp"
--
GitLab