From 2677ce10a8034e90c4dd24eb664e81d3316c30aa Mon Sep 17 00:00:00 2001
From: Sara Golemon <sara.golemon@mongodb.com>
Date: Thu, 10 Jan 2019 16:12:05 +0000
Subject: SERVER-38930 Switch new custom SCPs to use cpp_class method

---
 src/mongo/db/ftdc/ftdc_mongos.cpp | 13 ++++++++-----
 src/mongo/db/ftdc/ftdc_mongos.h   |  6 ------
 src/mongo/db/ftdc/ftdc_mongos.idl |  6 +-----
 3 files changed, 9 insertions(+), 16 deletions(-)

(limited to 'src/mongo/db/ftdc')

diff --git a/src/mongo/db/ftdc/ftdc_mongos.cpp b/src/mongo/db/ftdc/ftdc_mongos.cpp
index a3c85936268..15a8f28f1d5 100644
--- a/src/mongo/db/ftdc/ftdc_mongos.cpp
+++ b/src/mongo/db/ftdc/ftdc_mongos.cpp
@@ -36,6 +36,7 @@
 #include <boost/filesystem.hpp>
 
 #include "mongo/db/ftdc/controller.h"
+#include "mongo/db/ftdc/ftdc_mongos_gen.h"
 #include "mongo/db/ftdc/ftdc_server.h"
 #include "mongo/db/server_parameters.h"
 #include "mongo/stdx/thread.h"
@@ -52,22 +53,24 @@ namespace {
 synchronized_value<boost::filesystem::path> ftdcDirectoryPathParameter;
 }  // namespace
 
-void ftdcDirectoryAppendBSON(OperationContext* opCtx, BSONObjBuilder* b, StringData name) {
-    b->append(name, ftdcDirectoryPathParameter->generic_string());
+void DiagnosticDataCollectionDirectoryPathServerParameter::append(OperationContext* opCtx,
+                                                                  BSONObjBuilder& b,
+                                                                  const std::string& name) {
+    b.append(name, ftdcDirectoryPathParameter->generic_string());
 }
 
-Status ftdcDirectoryFromString(StringData str) {
+Status DiagnosticDataCollectionDirectoryPathServerParameter::setFromString(const std::string& str) {
     if (hasGlobalServiceContext()) {
         FTDCController* controller = FTDCController::get(getGlobalServiceContext());
         if (controller) {
-            Status s = controller->setDirectory(str.toString());
+            Status s = controller->setDirectory(str);
             if (!s.isOK()) {
                 return s;
             }
         }
     }
 
-    ftdcDirectoryPathParameter = str.toString();
+    ftdcDirectoryPathParameter = str;
 
     return Status::OK();
 }
diff --git a/src/mongo/db/ftdc/ftdc_mongos.h b/src/mongo/db/ftdc/ftdc_mongos.h
index 5bc75c0f179..26f91c765e2 100644
--- a/src/mongo/db/ftdc/ftdc_mongos.h
+++ b/src/mongo/db/ftdc/ftdc_mongos.h
@@ -47,10 +47,4 @@ void startMongoSFTDC();
  */
 void stopMongoSFTDC();
 
-/**
- * Set Parameters utility methods
- */
-Status ftdcDirectoryFromString(StringData str);
-void ftdcDirectoryAppendBSON(OperationContext* opCtx, BSONObjBuilder* b, StringData name);
-
 }  // namespace mongo
diff --git a/src/mongo/db/ftdc/ftdc_mongos.idl b/src/mongo/db/ftdc/ftdc_mongos.idl
index 1a99ab66321..f8546f3e639 100644
--- a/src/mongo/db/ftdc/ftdc_mongos.idl
+++ b/src/mongo/db/ftdc/ftdc_mongos.idl
@@ -31,14 +31,10 @@ global:
   cpp_includes:
     - "mongo/db/ftdc/ftdc_mongos.h"
 
-imports:
-  - "mongo/idl/basic_types.idl"
-
 server_parameters:
 
   diagnosticDataCollectionDirectoryPath:
     description: "Specify the directory for the diagnostic directory for mongos"
     set_at: [startup, runtime]
-    append_bson: "ftdcDirectoryAppendBSON"
-    from_string: "ftdcDirectoryFromString"
+    cpp_class: DiagnosticDataCollectionDirectoryPathServerParameter
 
-- 
cgit v1.2.1