CHG: changed message proto and fixed all causing issues after that

This commit is contained in:
Henry Winkel
2023-02-15 15:28:07 +01:00
parent 01e61cd482
commit 42f749be45
10 changed files with 160 additions and 92 deletions

View File

@@ -188,23 +188,23 @@ class Message final :
kSourceIDFieldNumber = 4,
kParentIDFieldNumber = 5,
};
// repeated .google.protobuf.Any payload = 6;
int payload_size() const;
// .google.protobuf.Any payload = 6;
bool has_payload() const;
private:
int _internal_payload_size() const;
bool _internal_has_payload() const;
public:
void clear_payload();
::PROTOBUF_NAMESPACE_ID::Any* mutable_payload(int index);
::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Any >*
mutable_payload();
const ::PROTOBUF_NAMESPACE_ID::Any& payload() const;
PROTOBUF_NODISCARD ::PROTOBUF_NAMESPACE_ID::Any* release_payload();
::PROTOBUF_NAMESPACE_ID::Any* mutable_payload();
void set_allocated_payload(::PROTOBUF_NAMESPACE_ID::Any* payload);
private:
const ::PROTOBUF_NAMESPACE_ID::Any& _internal_payload(int index) const;
::PROTOBUF_NAMESPACE_ID::Any* _internal_add_payload();
const ::PROTOBUF_NAMESPACE_ID::Any& _internal_payload() const;
::PROTOBUF_NAMESPACE_ID::Any* _internal_mutable_payload();
public:
const ::PROTOBUF_NAMESPACE_ID::Any& payload(int index) const;
::PROTOBUF_NAMESPACE_ID::Any* add_payload();
const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Any >&
payload() const;
void unsafe_arena_set_allocated_payload(
::PROTOBUF_NAMESPACE_ID::Any* payload);
::PROTOBUF_NAMESPACE_ID::Any* unsafe_arena_release_payload();
// uint32 topic = 1;
void clear_topic();
@@ -259,7 +259,7 @@ class Message final :
typedef void InternalArenaConstructable_;
typedef void DestructorSkippable_;
struct Impl_ {
::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Any > payload_;
::PROTOBUF_NAMESPACE_ID::Any* payload_;
uint32_t topic_;
uint32_t msgtype_;
uint32_t sourcetype_;
@@ -381,42 +381,90 @@ inline void Message::set_parentid(uint32_t value) {
// @@protoc_insertion_point(field_set:messages.header.Message.parentID)
}
// repeated .google.protobuf.Any payload = 6;
inline int Message::_internal_payload_size() const {
return _impl_.payload_.size();
// .google.protobuf.Any payload = 6;
inline bool Message::_internal_has_payload() const {
return this != internal_default_instance() && _impl_.payload_ != nullptr;
}
inline int Message::payload_size() const {
return _internal_payload_size();
inline bool Message::has_payload() const {
return _internal_has_payload();
}
inline ::PROTOBUF_NAMESPACE_ID::Any* Message::mutable_payload(int index) {
// @@protoc_insertion_point(field_mutable:messages.header.Message.payload)
return _impl_.payload_.Mutable(index);
inline const ::PROTOBUF_NAMESPACE_ID::Any& Message::_internal_payload() const {
const ::PROTOBUF_NAMESPACE_ID::Any* p = _impl_.payload_;
return p != nullptr ? *p : reinterpret_cast<const ::PROTOBUF_NAMESPACE_ID::Any&>(
::PROTOBUF_NAMESPACE_ID::_Any_default_instance_);
}
inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Any >*
Message::mutable_payload() {
// @@protoc_insertion_point(field_mutable_list:messages.header.Message.payload)
return &_impl_.payload_;
}
inline const ::PROTOBUF_NAMESPACE_ID::Any& Message::_internal_payload(int index) const {
return _impl_.payload_.Get(index);
}
inline const ::PROTOBUF_NAMESPACE_ID::Any& Message::payload(int index) const {
inline const ::PROTOBUF_NAMESPACE_ID::Any& Message::payload() const {
// @@protoc_insertion_point(field_get:messages.header.Message.payload)
return _internal_payload(index);
return _internal_payload();
}
inline ::PROTOBUF_NAMESPACE_ID::Any* Message::_internal_add_payload() {
return _impl_.payload_.Add();
inline void Message::unsafe_arena_set_allocated_payload(
::PROTOBUF_NAMESPACE_ID::Any* payload) {
if (GetArenaForAllocation() == nullptr) {
delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.payload_);
}
_impl_.payload_ = payload;
if (payload) {
} else {
}
// @@protoc_insertion_point(field_unsafe_arena_set_allocated:messages.header.Message.payload)
}
inline ::PROTOBUF_NAMESPACE_ID::Any* Message::add_payload() {
::PROTOBUF_NAMESPACE_ID::Any* _add = _internal_add_payload();
// @@protoc_insertion_point(field_add:messages.header.Message.payload)
return _add;
inline ::PROTOBUF_NAMESPACE_ID::Any* Message::release_payload() {
::PROTOBUF_NAMESPACE_ID::Any* temp = _impl_.payload_;
_impl_.payload_ = nullptr;
#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
auto* old = reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
if (GetArenaForAllocation() == nullptr) { delete old; }
#else // PROTOBUF_FORCE_COPY_IN_RELEASE
if (GetArenaForAllocation() != nullptr) {
temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
}
#endif // !PROTOBUF_FORCE_COPY_IN_RELEASE
return temp;
}
inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Any >&
Message::payload() const {
// @@protoc_insertion_point(field_list:messages.header.Message.payload)
inline ::PROTOBUF_NAMESPACE_ID::Any* Message::unsafe_arena_release_payload() {
// @@protoc_insertion_point(field_release:messages.header.Message.payload)
::PROTOBUF_NAMESPACE_ID::Any* temp = _impl_.payload_;
_impl_.payload_ = nullptr;
return temp;
}
inline ::PROTOBUF_NAMESPACE_ID::Any* Message::_internal_mutable_payload() {
if (_impl_.payload_ == nullptr) {
auto* p = CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::Any>(GetArenaForAllocation());
_impl_.payload_ = p;
}
return _impl_.payload_;
}
inline ::PROTOBUF_NAMESPACE_ID::Any* Message::mutable_payload() {
::PROTOBUF_NAMESPACE_ID::Any* _msg = _internal_mutable_payload();
// @@protoc_insertion_point(field_mutable:messages.header.Message.payload)
return _msg;
}
inline void Message::set_allocated_payload(::PROTOBUF_NAMESPACE_ID::Any* payload) {
::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
if (message_arena == nullptr) {
delete reinterpret_cast< ::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.payload_);
}
if (payload) {
::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(
reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(payload));
if (message_arena != submessage_arena) {
payload = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
message_arena, payload, submessage_arena);
}
} else {
}
_impl_.payload_ = payload;
// @@protoc_insertion_point(field_set_allocated:messages.header.Message.payload)
}
#ifdef __GNUC__
#pragma GCC diagnostic pop