moved filter to ext

7 years ago · 961353ab6d
parent f73e76d596
commit 961353ab6d
17 changed files with 30 additions and 33 deletions
--- a/6
+++ b/6
@ -676,7 +676,6 @@ grpc_cc_library(
        "src/core/lib/channel/channel_args.cc",
        "src/core/lib/channel/channel_stack.cc",
        "src/core/lib/channel/channel_stack_builder.cc",
-        "src/core/lib/channel/client_authority_filter.cc",
        "src/core/lib/channel/connected_channel.cc",
        "src/core/lib/channel/handshaker.cc",
        "src/core/lib/channel/handshaker_factory.cc",
@ -812,7 +811,6 @@ grpc_cc_library(
        "src/core/lib/channel/channel_args.h",
        "src/core/lib/channel/channel_stack.h",
        "src/core/lib/channel/channel_stack_builder.h",
-        "src/core/lib/channel/client_authority_filter.h",
        "src/core/lib/channel/connected_channel.h",
        "src/core/lib/channel/context.h",
        "src/core/lib/channel/handshaker.h",
@ -1077,10 +1075,10 @@ grpc_cc_library(
 grpc_cc_library(
    name = "grpc_client_authority_filter",
    srcs = [
-        "src/core/lib/channel/client_authority_filter.cc",
+        "src/core/ext/filters/http/client_authority_filter.cc",
    ],
    hdrs = [
-        "src/core/lib/channel/client_authority_filter.h",
+        "src/core/ext/filters/http/client_authority_filter.h",
    ],
    language = "c++",
    deps = [
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1132,7 +1132,7 @@ add_library(grpc
  src/core/ext/census/grpc_context.cc
  src/core/ext/filters/max_age/max_age_filter.cc
  src/core/ext/filters/message_size/message_size_filter.cc
-  src/core/lib/channel/client_authority_filter.cc
+  src/core/ext/filters/http/client_authority_filter.cc
  src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc
  src/core/ext/filters/workarounds/workaround_utils.cc
  src/core/plugin_registry/grpc_plugin_registry.cc
@ -2367,7 +2367,7 @@ add_library(grpc_unsecure
  src/core/ext/census/grpc_context.cc
  src/core/ext/filters/max_age/max_age_filter.cc
  src/core/ext/filters/message_size/message_size_filter.cc
-  src/core/lib/channel/client_authority_filter.cc
+  src/core/ext/filters/http/client_authority_filter.cc
  src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc
  src/core/ext/filters/workarounds/workaround_utils.cc
  src/core/plugin_registry/grpc_unsecure_plugin_registry.cc
--- a/4
+++ b/4
@ -3437,7 +3437,7 @@ LIBGRPC_SRC = \
    src/core/ext/census/grpc_context.cc \
    src/core/ext/filters/max_age/max_age_filter.cc \
    src/core/ext/filters/message_size/message_size_filter.cc \
-    src/core/lib/channel/client_authority_filter.cc \
+    src/core/ext/filters/http/client_authority_filter.cc \
    src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc \
    src/core/ext/filters/workarounds/workaround_utils.cc \
    src/core/plugin_registry/grpc_plugin_registry.cc \
@ -4648,7 +4648,7 @@ LIBGRPC_UNSECURE_SRC = \
    src/core/ext/census/grpc_context.cc \
    src/core/ext/filters/max_age/max_age_filter.cc \
    src/core/ext/filters/message_size/message_size_filter.cc \
-    src/core/lib/channel/client_authority_filter.cc \
+    src/core/ext/filters/http/client_authority_filter.cc \
    src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc \
    src/core/ext/filters/workarounds/workaround_utils.cc \
    src/core/plugin_registry/grpc_unsecure_plugin_registry.cc \
--- a/build.yaml
+++ b/build.yaml
@ -517,9 +517,9 @@ filegroups:
  - grpc_trace_headers
 - name: grpc_client_authority_filter
  headers:
-  - src/core/lib/channel/client_authority_filter.h
+  - src/core/ext/filters/http/client_authority_filter.h
  src:
-  - src/core/lib/channel/client_authority_filter.cc
+  - src/core/ext/filters/http/client_authority_filter.cc
  plugin: grpc_client_authority_filter
  uses:
  - grpc_base
--- a/config.m4
+++ b/config.m4
@ -361,7 +361,7 @@ if test "$PHP_GRPC" != "no"; then
    src/core/ext/census/grpc_context.cc \
    src/core/ext/filters/max_age/max_age_filter.cc \
    src/core/ext/filters/message_size/message_size_filter.cc \
-    src/core/lib/channel/client_authority_filter.cc \
+    src/core/ext/filters/http/client_authority_filter.cc \
    src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc \
    src/core/ext/filters/workarounds/workaround_utils.cc \
    src/core/plugin_registry/grpc_plugin_registry.cc \
--- a/config.w32
+++ b/config.w32
@ -338,7 +338,7 @@ if (PHP_GRPC != "no") {
    "src\\core\\ext\\census\\grpc_context.cc " +
    "src\\core\\ext\\filters\\max_age\\max_age_filter.cc " +
    "src\\core\\ext\\filters\\message_size\\message_size_filter.cc " +
-    "src\\core\\lib\\channel\\client_authority_filter.cc " +
+    "src\\core\\ext\\filters\\http\\client_authority_filter.cc " +
    "src\\core\\ext\\filters\\workarounds\\workaround_cronet_compression_filter.cc " +
    "src\\core\\ext\\filters\\workarounds\\workaround_utils.cc " +
    "src\\core\\plugin_registry\\grpc_plugin_registry.cc " +
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@ -479,7 +479,7 @@ Pod::Spec.new do |s|
                      'src/core/ext/filters/load_reporting/server_load_reporting_plugin.h',
                      'src/core/ext/filters/max_age/max_age_filter.h',
                      'src/core/ext/filters/message_size/message_size_filter.h',
-                      'src/core/lib/channel/client_authority_filter.h',
+                      'src/core/ext/filters/http/client_authority_filter.h',
                      'src/core/ext/filters/workarounds/workaround_cronet_compression_filter.h',
                      'src/core/ext/filters/workarounds/workaround_utils.h'

--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@ -490,7 +490,7 @@ Pod::Spec.new do |s|
                      'src/core/ext/filters/load_reporting/server_load_reporting_plugin.h',
                      'src/core/ext/filters/max_age/max_age_filter.h',
                      'src/core/ext/filters/message_size/message_size_filter.h',
-                      'src/core/lib/channel/client_authority_filter.h',
+                      'src/core/ext/filters/http/client_authority_filter.h',
                      'src/core/ext/filters/workarounds/workaround_cronet_compression_filter.h',
                      'src/core/ext/filters/workarounds/workaround_utils.h',
                      'src/core/lib/surface/init.cc',
@ -773,7 +773,7 @@ Pod::Spec.new do |s|
                      'src/core/ext/census/grpc_context.cc',
                      'src/core/ext/filters/max_age/max_age_filter.cc',
                      'src/core/ext/filters/message_size/message_size_filter.cc',
-                      'src/core/lib/channel/client_authority_filter.cc',
+                      'src/core/ext/filters/http/client_authority_filter.cc',
                      'src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc',
                      'src/core/ext/filters/workarounds/workaround_utils.cc',
                      'src/core/plugin_registry/grpc_plugin_registry.cc'
@ -1046,7 +1046,7 @@ Pod::Spec.new do |s|
                              'src/core/ext/filters/load_reporting/server_load_reporting_plugin.h',
                              'src/core/ext/filters/max_age/max_age_filter.h',
                              'src/core/ext/filters/message_size/message_size_filter.h',
-                              'src/core/lib/channel/client_authority_filter.h',
+                              'src/core/ext/filters/http/client_authority_filter.h',
                              'src/core/ext/filters/workarounds/workaround_cronet_compression_filter.h',
                              'src/core/ext/filters/workarounds/workaround_utils.h'
  end
--- a/grpc.gemspec
+++ b/grpc.gemspec
@ -420,7 +420,7 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/ext/filters/load_reporting/server_load_reporting_plugin.h )
  s.files += %w( src/core/ext/filters/max_age/max_age_filter.h )
  s.files += %w( src/core/ext/filters/message_size/message_size_filter.h )
-  s.files += %w( src/core/lib/channel/client_authority_filter.h )
+  s.files += %w( src/core/ext/filters/http/client_authority_filter.h )
  s.files += %w( src/core/ext/filters/workarounds/workaround_cronet_compression_filter.h )
  s.files += %w( src/core/ext/filters/workarounds/workaround_utils.h )
  s.files += %w( src/core/lib/surface/init.cc )
@ -706,7 +706,7 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/ext/census/grpc_context.cc )
  s.files += %w( src/core/ext/filters/max_age/max_age_filter.cc )
  s.files += %w( src/core/ext/filters/message_size/message_size_filter.cc )
-  s.files += %w( src/core/lib/channel/client_authority_filter.cc )
+  s.files += %w( src/core/ext/filters/http/client_authority_filter.cc )
  s.files += %w( src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc )
  s.files += %w( src/core/ext/filters/workarounds/workaround_utils.cc )
  s.files += %w( src/core/plugin_registry/grpc_plugin_registry.cc )
--- a/grpc.gyp
+++ b/grpc.gyp
@ -513,7 +513,7 @@
        'src/core/ext/census/grpc_context.cc',
        'src/core/ext/filters/max_age/max_age_filter.cc',
        'src/core/ext/filters/message_size/message_size_filter.cc',
-        'src/core/lib/channel/client_authority_filter.cc',
+        'src/core/ext/filters/http/client_authority_filter.cc',
        'src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc',
        'src/core/ext/filters/workarounds/workaround_utils.cc',
        'src/core/plugin_registry/grpc_plugin_registry.cc',
@ -1194,7 +1194,7 @@
        'src/core/ext/census/grpc_context.cc',
        'src/core/ext/filters/max_age/max_age_filter.cc',
        'src/core/ext/filters/message_size/message_size_filter.cc',
-        'src/core/lib/channel/client_authority_filter.cc',
+        'src/core/ext/filters/http/client_authority_filter.cc',
        'src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc',
        'src/core/ext/filters/workarounds/workaround_utils.cc',
        'src/core/plugin_registry/grpc_unsecure_plugin_registry.cc',
--- a/package.xml
+++ b/package.xml
@ -427,7 +427,7 @@
    <file baseinstalldir="/" name="src/core/ext/filters/load_reporting/server_load_reporting_plugin.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/max_age/max_age_filter.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/message_size/message_size_filter.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/channel/client_authority_filter.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/filters/http/client_authority_filter.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/workarounds/workaround_cronet_compression_filter.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/workarounds/workaround_utils.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/surface/init.cc" role="src" />
@ -713,7 +713,7 @@
    <file baseinstalldir="/" name="src/core/ext/census/grpc_context.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/max_age/max_age_filter.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/message_size/message_size_filter.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/channel/client_authority_filter.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/filters/http/client_authority_filter.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/workarounds/workaround_utils.cc" role="src" />
    <file baseinstalldir="/" name="src/core/plugin_registry/grpc_plugin_registry.cc" role="src" />
--- a/src/core/ext/filters/http/client_authority_filter.cc
+++ b/src/core/ext/filters/http/client_authority_filter.cc
@ -26,8 +26,8 @@
 #include <grpc/support/log.h>
 #include <grpc/support/string_util.h>

+#include "src/core/ext/filters/http/client_authority_filter.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/channel/client_authority_filter.h"
 #include "src/core/lib/gpr/string.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/lib/slice/slice_string_helpers.h"
--- a/src/core/ext/filters/http/client_authority_filter.h
+++ b/src/core/ext/filters/http/client_authority_filter.h
@ -16,8 +16,8 @@
 *
 */

-#ifndef GRPC_CORE_LIB_CHANNEL_CLIENT_AUTHORITY_FILTER_H
-#define GRPC_CORE_LIB_CHANNEL_CLIENT_AUTHORITY_FILTER_H
+#ifndef GRPC_CORE_EXT_FILTERS_HTTP_CLIENT_AUTHORITY_FILTER_H
+#define GRPC_CORE_EXT_FILTERS_HTTP_CLIENT_AUTHORITY_FILTER_H

 #include <grpc/support/port_platform.h>

@ -31,4 +31,4 @@

 extern const grpc_channel_filter grpc_client_authority_filter;

-#endif /* GRPC_CORE_LIB_CHANNEL_CLIENT_AUTHORITY_FILTER_H */
+#endif /* GRPC_CORE_EXT_FILTERS_HTTP_CLIENT_AUTHORITY_FILTER_H */
--- a/src/core/lib/surface/init.cc
+++ b/src/core/lib/surface/init.cc
@ -27,7 +27,6 @@
 #include <grpc/support/log.h>
 #include <grpc/support/time.h>
 #include "src/core/lib/channel/channel_stack.h"
-#include "src/core/lib/channel/client_authority_filter.h"
 #include "src/core/lib/channel/connected_channel.h"
 #include "src/core/lib/channel/handshaker_registry.h"
 #include "src/core/lib/debug/stats.h"
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@ -337,7 +337,7 @@ CORE_SOURCE_FILES = [
    'src/core/ext/census/grpc_context.cc',
    'src/core/ext/filters/max_age/max_age_filter.cc',
    'src/core/ext/filters/message_size/message_size_filter.cc',
-    'src/core/lib/channel/client_authority_filter.cc',
+    'src/core/ext/filters/http/client_authority_filter.cc',
    'src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc',
    'src/core/ext/filters/workarounds/workaround_utils.cc',
    'src/core/plugin_registry/grpc_plugin_registry.cc',
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@ -941,6 +941,8 @@ src/core/ext/filters/deadline/deadline_filter.cc \
 src/core/ext/filters/deadline/deadline_filter.h \
 src/core/ext/filters/http/client/http_client_filter.cc \
 src/core/ext/filters/http/client/http_client_filter.h \
+src/core/ext/filters/http/client_authority_filter.cc \
+src/core/ext/filters/http/client_authority_filter.h \
 src/core/ext/filters/http/http_filters_plugin.cc \
 src/core/ext/filters/http/message_compress/message_compress_filter.cc \
 src/core/ext/filters/http/message_compress/message_compress_filter.h \
@ -1034,8 +1036,6 @@ src/core/lib/channel/channel_stack.cc \
 src/core/lib/channel/channel_stack.h \
 src/core/lib/channel/channel_stack_builder.cc \
 src/core/lib/channel/channel_stack_builder.h \
-src/core/lib/channel/client_authority_filter.cc \
-src/core/lib/channel/client_authority_filter.h \
 src/core/lib/channel/connected_channel.cc \
 src/core/lib/channel/connected_channel.h \
 src/core/lib/channel/context.h \
--- a/tools/run_tests/generated/sources_and_headers.json
+++ b/tools/run_tests/generated/sources_and_headers.json
@ -9423,14 +9423,14 @@
      "grpc_base"
    ], 
    "headers": [
-      "src/core/lib/channel/client_authority_filter.h"
+      "src/core/ext/filters/http/client_authority_filter.h"
    ], 
    "is_filegroup": true, 
    "language": "c", 
    "name": "grpc_client_authority_filter", 
    "src": [
-      "src/core/lib/channel/client_authority_filter.cc", 
-      "src/core/lib/channel/client_authority_filter.h"
+      "src/core/ext/filters/http/client_authority_filter.cc", 
+      "src/core/ext/filters/http/client_authority_filter.h"
    ], 
    "third_party": false, 
    "type": "filegroup"