diff --git a/include/envoy/stream_info/stream_info.h b/include/envoy/stream_info/stream_info.h index 714cac7b42a9..49b46080257e 100644 --- a/include/envoy/stream_info/stream_info.h +++ b/include/envoy/stream_info/stream_info.h @@ -360,7 +360,7 @@ class StreamInfo { /** * @return response flags encoded as an integer. */ - virtual uint64_t getResponseFlags() const PURE; + virtual uint64_t responseFlags() const PURE; /** * @return upstream host description. diff --git a/source/common/stream_info/stream_info_impl.h b/source/common/stream_info/stream_info_impl.h index 72b9be3d728c..99cc23e980bd 100644 --- a/source/common/stream_info/stream_info_impl.h +++ b/source/common/stream_info/stream_info_impl.h @@ -123,7 +123,7 @@ struct StreamInfoImpl : public StreamInfo { bool hasAnyResponseFlag() const override { return response_flags_ != 0; } - uint64_t getResponseFlags() const override { return response_flags_; } + uint64_t responseFlags() const override { return response_flags_; } void onUpstreamHostSelected(Upstream::HostDescriptionConstSharedPtr host) override { upstream_host_ = host; diff --git a/source/extensions/filters/common/expr/context.cc b/source/extensions/filters/common/expr/context.cc index 9505d004047c..a6eaf8a459ca 100644 --- a/source/extensions/filters/common/expr/context.cc +++ b/source/extensions/filters/common/expr/context.cc @@ -130,7 +130,7 @@ absl::optional ResponseWrapper::operator[](CelValue key) const { } else if (value == Trailers) { return CelValue::CreateMap(&trailers_); } else if (value == Flags) { - return CelValue::CreateInt64(info_.getResponseFlags()); + return CelValue::CreateInt64(info_.responseFlags()); } return {}; } diff --git a/test/common/stream_info/stream_info_impl_test.cc b/test/common/stream_info/stream_info_impl_test.cc index 5be26e32af5b..a57d4eaae3e4 100644 --- a/test/common/stream_info/stream_info_impl_test.cc +++ b/test/common/stream_info/stream_info_impl_test.cc @@ -121,7 +121,7 @@ TEST_F(StreamInfoImplTest, ResponseFlagTest) { << fmt::format("Flag: {} was expected to be set", flag); } EXPECT_TRUE(stream_info.hasAnyResponseFlag()); - EXPECT_EQ(0xFFF, stream_info.getResponseFlags()); + EXPECT_EQ(0xFFF, stream_info.responseFlags()); StreamInfoImpl stream_info2(Http::Protocol::Http2, test_time_.timeSystem()); stream_info2.setResponseFlag(FailedLocalHealthCheck); diff --git a/test/common/stream_info/test_util.h b/test/common/stream_info/test_util.h index a1e425cbef77..670d981db84e 100644 --- a/test/common/stream_info/test_util.h +++ b/test/common/stream_info/test_util.h @@ -49,7 +49,7 @@ class TestStreamInfo : public StreamInfo::StreamInfo { void setResponseFlag(Envoy::StreamInfo::ResponseFlag response_flag) override { response_flags_ |= response_flag; } - uint64_t getResponseFlags() const override { return response_flags_; } + uint64_t responseFlags() const override { return response_flags_; } void onUpstreamHostSelected(Upstream::HostDescriptionConstSharedPtr host) override { upstream_host_ = host; } diff --git a/test/extensions/filters/common/expr/context_test.cc b/test/extensions/filters/common/expr/context_test.cc index 09e9f8e454a7..ce4217cc58fb 100644 --- a/test/extensions/filters/common/expr/context_test.cc +++ b/test/extensions/filters/common/expr/context_test.cc @@ -195,7 +195,7 @@ TEST(Context, ResponseAttributes) { EXPECT_CALL(info, responseCode()).WillRepeatedly(Return(404)); EXPECT_CALL(info, bytesSent()).WillRepeatedly(Return(123)); - EXPECT_CALL(info, getResponseFlags()).WillRepeatedly(Return(0x1)); + EXPECT_CALL(info, responseFlags()).WillRepeatedly(Return(0x1)); { auto value = response[CelValue::CreateString(Undefined)]; diff --git a/test/mocks/stream_info/mocks.h b/test/mocks/stream_info/mocks.h index a985c0a800d0..ba3a7af0c536 100644 --- a/test/mocks/stream_info/mocks.h +++ b/test/mocks/stream_info/mocks.h @@ -52,7 +52,7 @@ class MockStreamInfo : public StreamInfo { MOCK_CONST_METHOD0(bytesSent, uint64_t()); MOCK_CONST_METHOD1(hasResponseFlag, bool(ResponseFlag)); MOCK_CONST_METHOD0(hasAnyResponseFlag, bool()); - MOCK_CONST_METHOD0(getResponseFlags, uint64_t()); + MOCK_CONST_METHOD0(responseFlags, uint64_t()); MOCK_CONST_METHOD0(upstreamHost, Upstream::HostDescriptionConstSharedPtr()); MOCK_METHOD1(setUpstreamLocalAddress, void(const Network::Address::InstanceConstSharedPtr&)); MOCK_CONST_METHOD0(upstreamLocalAddress, const Network::Address::InstanceConstSharedPtr&());