Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Remove deprecated OpaqueVal serialization methods

Browse source
This commit is contained in:
Tim Wojtulewicz 2024-08-04 21:50:04 -07:00
parent cbe612400c
commit dd982ee6c4
2 changed files with 2 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/OpaqueVal.cc
View file

@ -70,12 +70,6 @@ OpaqueValPtr OpaqueMgr::Instantiate(const std::string& id) const {
return x != _types.end() ? (*x->second)() : nullptr;
}
broker::expected<broker::data> OpaqueVal::Serialize() const {
if ( auto res = SerializeData() )
return zeek::detail::BrokerDataAccess::Unbox(*res);
return {broker::make_error(broker::ec::serialization_failed)};
}
std::optional<BrokerData> OpaqueVal::SerializeData() const {
auto type = OpaqueMgr::mgr()->TypeID(this);
@ -89,8 +83,6 @@ std::optional<BrokerData> OpaqueVal::SerializeData() const {
return std::move(builder).Build();
}
OpaqueValPtr OpaqueVal::Unserialize(const broker::data& data) { return UnserializeData(BrokerDataView(&data)); }
OpaqueValPtr OpaqueVal::UnserializeData(BrokerDataView data) {
if ( ! data.IsList() )
return nullptr;
@ -114,22 +106,9 @@ OpaqueValPtr OpaqueVal::UnserializeData(BrokerListView v) {
return val;
}
broker::expected<broker::data> OpaqueVal::DoSerialize() const {
return {broker::make_error(broker::ec::serialization_failed)};
}
std::optional<BrokerData> OpaqueVal::DoSerializeData() const { return std::nullopt; }
std::optional<BrokerData> OpaqueVal::DoSerializeData() const {
if ( auto res = DoSerialize() ) {
return BrokerData{std::move(*res)};
}
return std::nullopt;
}
bool OpaqueVal::DoUnserialize(const broker::data&) { return false; }
bool OpaqueVal::DoUnserializeData(BrokerDataView data) {
return DoUnserialize(zeek::detail::BrokerDataAccess::Unbox(data));
}
bool OpaqueVal::DoUnserializeData(BrokerDataView data) { return false; }
std::optional<BrokerData> OpaqueVal::SerializeType(const TypePtr& t) {
if ( t->InternalType() == TYPE_INTERNAL_ERROR )

27
src/OpaqueVal.h
View file

@ -119,28 +119,11 @@ public:
explicit OpaqueVal(OpaqueTypePtr t);
~OpaqueVal() override = default;
/**
* Serializes the value into a Broker representation.
*
* @return the broker representation, or an error if serialization
* isn't supported or failed.
*/
[[deprecated("Remove in v7.1: use SerializeData instead")]] broker::expected<broker::data> Serialize() const;
/**
* @copydoc Serialize
*/
std::optional<BrokerData> SerializeData() const;
/**
* Reinstantiates a value from its serialized Broker representation.
*
* @param data Broker representation as returned by *Serialize()*.
* @return unserialized instances with reference count at +1
*/
[[deprecated("Remove in v7.1: use UnserializeData instead")]] static OpaqueValPtr Unserialize(
const broker::data& data);
/**
* @copydoc Unserialize
*/
@ -155,11 +138,6 @@ protected:
friend class Val;
friend class OpaqueMgr;
/**
* @deprecated Override DoSerializeData instead. Remove in v7.1.
*/
virtual broker::expected<broker::data> DoSerialize() const;
/**
* Must be overridden to provide a serialized version of the derived
* class' state.
@ -169,11 +147,6 @@ protected:
*/
virtual std::optional<BrokerData> DoSerializeData() const;
/**
* @deprecated Override DoUnserializeData instead. Remove in v7.1.
*/
virtual bool DoUnserialize(const broker::data& data);
/**
* Must be overridden to recreate the derived class' state from a
* serialization.