From 2d475eed745bab61d72c4456f1f4c2dbc845fa40 Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Sat, 25 Jul 2020 10:38:40 -0700
Subject: [PATCH] Add Context::request() builder

---
 src/pvxs/client.h  | 29 +++++++++++++++++++++++++++++
 test/testpvreq.cpp | 24 ++++++++++--------------
 2 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/src/pvxs/client.h b/src/pvxs/client.h
index 803d0b7..846bf28 100644
--- a/src/pvxs/client.h
+++ b/src/pvxs/client.h
@@ -184,6 +184,7 @@ class GetBuilder;
 class PutBuilder;
 class RPCBuilder;
 class MonitorBuilder;
+class RequestBuilder;
 
 /** An independent PVA protocol client instance
  *
@@ -352,6 +353,23 @@ public:
     inline
     MonitorBuilder monitor(const std::string& pvname);
 
+    /** Compose a pvRequest independently of a network operation.
+     *
+     * This is not a network operation.
+     *
+     * Use of request() is optional.  pvRequests can be composed
+     * with individual network operation Builders.
+     *
+     * @code
+     * Value pvReq = Context::request()
+     *                      .pvRequest("field(value)field(blah)")
+     *                      .record("pipeline", true)
+     *                      .build();
+     * @endcode
+     */
+    static inline
+    RequestBuilder request();
+
     /** Request prompt search of any disconnected channels.
      *
      * Optional.  Equivalent to detection of a new server.
@@ -612,6 +630,17 @@ public:
 };
 MonitorBuilder Context::monitor(const std::string& name) { return MonitorBuilder{pvt, name}; }
 
+class RequestBuilder : public detail::CommonBuilder<RequestBuilder, detail::CommonBase>
+{
+public:
+    RequestBuilder() :CommonBuilder{nullptr,std::string()} {}
+    //! Return composed pvRequest
+    Value build() const {
+        return _buildReq();
+    }
+};
+RequestBuilder Context::request() { return RequestBuilder{}; }
+
 struct PVXS_API Config {
     //! List of unicast and broadcast addresses
     std::vector<std::string> addressList;
diff --git a/test/testpvreq.cpp b/test/testpvreq.cpp
index 9d663da..94e3081 100644
--- a/test/testpvreq.cpp
+++ b/test/testpvreq.cpp
@@ -28,10 +28,6 @@ struct TestBuilder : client::detail::CommonBuilder<TestBuilder, client::detail::
         :client::detail::CommonBuilder<TestBuilder, client::detail::PRBase>(nullptr, "")
     {}
 
-    Value makeReq() const {
-        return _buildReq();
-    }
-
     template<typename T>
     TestBuilder& set(const std::string& name, const T& val, bool required=true) {
         const typename impl::StoreAs<T>::store_t& norm(impl::StoreTransform<T>::in(val));
@@ -52,7 +48,7 @@ void testEmpty()
 {
     testShow()<<__func__;
 
-    auto req = TestBuilder().makeReq();
+    auto req = client::Context::request().build();
 
     testShow()<<req;
     testStrEq(std::string(SB()<<req),
@@ -67,12 +63,12 @@ void testAssemble()
 {
     testShow()<<__func__;
 
-    auto req = TestBuilder()
+    auto req = client::Context::request()
             .field("foo")
             .field("bar.baz")
             .record("abc", "xyz")
             .record("pipeline", true)
-            .makeReq();
+            .build();
 
     testShow()<<req;
     testStrEq(std::string(SB()<<req),
@@ -99,9 +95,9 @@ void testParse1()
 {
     testShow()<<__func__;
 
-    auto req = TestBuilder()
+    auto req = client::Context::request()
             .pvRequest("field(foo)field(bar.baz)record[abc=xyz]record[pipeline=true]")
-            .makeReq();
+            .build();
 
     testShow()<<req;
     testStrEq(std::string(SB()<<req),
@@ -128,9 +124,9 @@ void testParse2()
 {
     testShow()<<__func__;
 
-    auto req = TestBuilder()
+    auto req = client::Context::request()
             .pvRequest("field(foo,bar.baz)record[abc=xyz,pipeline=true]")
-            .makeReq();
+            .build();
 
     testShow()<<req;
     testStrEq(std::string(SB()<<req),
@@ -170,7 +166,7 @@ void testValid()
 
     for(auto& pvr : valid) {
         try {
-            testCase(true)<<pvr<<"\n"<<TestBuilder().pvRequest(pvr).makeReq();
+            testCase(true)<<pvr<<"\n"<<client::Context::request().pvRequest(pvr).build();
         }catch(std::exception& e){
             testCase(false)<<pvr<<" : "<<typeid(e).name()<<" : "<<e.what();
         }
@@ -198,9 +194,9 @@ void testError()
     for(auto& pvr : errors) {
 
         testThrows<std::runtime_error>([&pvr](){
-            auto req = TestBuilder()
+            auto req = client::Context::request()
                     .pvRequest(pvr)
-                    .makeReq();
+                    .build();
             testShow()<<req;
         })<<pvr;
     }