LibSWOC++ upgrades for YAML

include/tscore/ConsistentHash.h

@@ -21,10 +21,11 @@
 
 #pragma once
 
-#include "Hash.h"
+#include "tscpp/util/Hash.h"
 #include <cstdint>
 #include <iostream>
 #include <map>
+#include <memory>
 
 /*
   Helper class to be extended to make ring nodes.
@@ -46,17 +47,17 @@ typedef std::map<uint64_t, ATSConsistentHashNode *>::iterator ATSConsistentHashI
  */
 
 struct ATSConsistentHash {
-  ATSConsistentHash(int r = 1024, ATSHash64 *h = nullptr);
-  void insert(ATSConsistentHashNode *node, float weight = 1.0, ATSHash64 *h = nullptr);
+  ATSConsistentHash(int r = 1024, ts::Hash64Functor *h = nullptr);
+  void insert(ATSConsistentHashNode *node, float weight = 1.0, ts::Hash64Functor *h = nullptr);
   ATSConsistentHashNode *lookup(const char *url = nullptr, ATSConsistentHashIter *i = nullptr, bool *w = nullptr,
-                                ATSHash64 *h = nullptr);
+                                ts::Hash64Functor *h = nullptr);
   ATSConsistentHashNode *lookup_available(const char *url = nullptr, ATSConsistentHashIter *i = nullptr, bool *w = nullptr,
-                                          ATSHash64 *h = nullptr);
+                                          ts::Hash64Functor *h = nullptr);
   ATSConsistentHashNode *lookup_by_hashval(uint64_t hashval, ATSConsistentHashIter *i = nullptr, bool *w = nullptr);
   ~ATSConsistentHash();
 
 private:
   int replicas;
-  ATSHash64 *hash;
+  std::unique_ptr<ts::Hash64Functor> hash;
   std::map<uint64_t, ATSConsistentHashNode *> NodeMap;
 };

include/tscore/CryptoHash.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "tscore/BufferWriter.h"
+#include "tscpp/util/BufferWriter.h"
 #include <string_view>
 
 /// Apache Traffic Server commons.
@@ -180,7 +180,7 @@ CryptoContext::finalize(CryptoHash &hash)
   return reinterpret_cast<CryptoContextBase *>(_obj)->finalize(hash);
 }
 
-ts::BufferWriter &bwformat(ts::BufferWriter &w, ts::BWFSpec const &spec, ats::CryptoHash const &hash);
+ts::BufferWriter &bwformat(ts::BufferWriter &w, ts::bwf::Spec const &spec, ats::CryptoHash const &hash);
 
 } // namespace ats
 

include/tscore/EnumDescriptor.h

@@ -22,15 +22,13 @@
 #include <string_view>
 #include <unordered_map>
 
-#include "tscore/HashFNV.h"
+#include "tscpp/util/HashFNV.h"
 
 /// Hash functor for @c string_view
 inline size_t
 TsLuaConfigSVHash(std::string_view const &sv)
 {
-  ATSHash64FNV1a h;
-  h.update(sv.data(), sv.size());
-  return h.get();
+  return ts::Hash64FNV1a().hash_immediate(sv);
 }
 
 class TsEnumDescriptor