Fix formatting issues

Signed-off-by: Raul Gutierrez Segales <[email protected]>
envoyproxy · Apr 30, 2018 · 1747131 · 1747131
1 parent bde0c9c
commit 1747131
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/source/common/router/router.h b/source/common/router/router.h
@@ -168,7 +168,8 @@ class Filter : Logger::Loggable<Logger::Id::router>,
       const auto& request_metadata = callbacks_->requestInfo().dynamicMetadata().filter_metadata();
       const auto filter_it = request_metadata.find(Envoy::Config::MetadataFilters::get().ENVOY_LB);
       if (filter_it != request_metadata.end()) {
-        metadata_match_ = route_entry_->metadataMatchCriteria()->mergeMatchCriteria(filter_it->second);
+        metadata_match_ =
+            route_entry_->metadataMatchCriteria()->mergeMatchCriteria(filter_it->second);
         return metadata_match_.get();
       }
       return route_entry_->metadataMatchCriteria();

diff --git a/test/common/upstream/subset_lb_test.cc b/test/common/upstream/subset_lb_test.cc
@@ -92,9 +92,7 @@ class TestLoadBalancerContext : public LoadBalancerContext {
   // Upstream::LoadBalancerContext
   absl::optional<uint64_t> computeHashKey() override { return {}; }
   const Network::Connection* downstreamConnection() const override { return nullptr; }
-  const Router::MetadataMatchCriteria* metadataMatchCriteria() override {
-    return matches_.get();
-  }
+  const Router::MetadataMatchCriteria* metadataMatchCriteria() override { return matches_.get(); }
 
 private:
   const std::shared_ptr<Router::MetadataMatchCriteria> matches_;

diff --git a/test/mocks/router/mocks.h b/test/mocks/router/mocks.h
@@ -189,7 +189,7 @@ class MockMetadataMatchCriteria : public MetadataMatchCriteria {
   // Router::MetadataMatchCriteria
   MOCK_CONST_METHOD0(metadataMatchCriteria,
                      const std::vector<MetadataMatchCriterionConstSharedPtr>&());
-  MOCK_CONST_METHOD1(mergeMatchCriteria, MetadataMatchCriteriaConstPtr(const google::protobuf::Struct&));
+  MOCK_CONST_METHOD1(mergeMatchCriteria, MetadataMatchCriteriaConstPtr(const ProtobufWkt::Struct&));
 };
 
 class MockPathMatchCriterion : public PathMatchCriterion {