THRIFT-314. Purge reflection.limited
This was a feature designed to allow a Thrift server to report
information about its interface. However, the feature has
significant design problems, and is presence is currently causing
confusion without doing any good. Therefore, it is being removed.
It will always be in source control if and when we are ready to
come back to it.
git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@741824 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/test/DebugProtoTest.thrift b/test/DebugProtoTest.thrift
index e8eb9a3..2d2e120 100644
--- a/test/DebugProtoTest.thrift
+++ b/test/DebugProtoTest.thrift
@@ -82,16 +82,6 @@
i32 Janky(i32 arg)
}
-service PartiallyReflectable {
- map<i32,map<i32,i32>> returnNotReflectable(1: i32 hello),
- void argNotReflectable(1: list<set<i32>> arg),
- void arg2NotReflectable(1: i32 arg1, 2: list<set<i32>> argNotReflectable),
- void withMap(1: map<i32, string> amap),
-
- OneOfEach refl1(1: list<Bonk> arg1),
- OneOfEach refl2(2: list<string> arg1, 1: Bonk arg2);
-}
-
// The only purpose of this thing is to increase the size of the generated code
// so that ZlibTest has more highly compressible data to play with.
struct BlowUp {
diff --git a/test/DenseLinkingTest.thrift b/test/DenseLinkingTest.thrift
index 787c501..90f0bd6 100644
--- a/test/DenseLinkingTest.thrift
+++ b/test/DenseLinkingTest.thrift
@@ -71,13 +71,3 @@
service Srv {
i32 Janky(i32 arg)
}
-
-service PartiallyReflectable {
- map<i32,map<i32,i32>> returnNotReflectable(1: i32 hello),
- void argNotReflectable(1: list<set<i32>> arg),
- void arg2NotReflectable(1: i32 arg1, 2: list<set<i32>> argNotReflectable),
- void withMap(1: map<i32, string> amap),
-
- OneOfEachZZ refl1(1: list<BonkZZ> arg1),
- OneOfEachZZ refl2(2: list<string> arg1, 1: BonkZZ arg2);
-}
diff --git a/test/Makefile.am b/test/Makefile.am
index 0c201c1..5f2ce8d 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -13,7 +13,6 @@
gen-cpp/DebugProtoTest_types.cpp \
gen-cpp/OptionalRequiredTest_types.cpp \
gen-cpp/DebugProtoTest_types.cpp \
- gen-cpp/PartiallyReflectable.cpp \
gen-cpp/Service.cpp \
gen-cpp/StressTest_types.cpp \
gen-cpp/SecondService.cpp \
@@ -37,7 +36,6 @@
DebugProtoTest \
JSONProtoTest \
OptionalRequiredTest \
- ReflectionTest \
UnitTests
TESTS = \
@@ -96,29 +94,21 @@
#
-# ReflectionTest
-#
-ReflectionTest_SOURCES = \
- ReflectionTest.cpp
-
-ReflectionTest_LDADD = libtestgencpp.la
-
-#
# Common thrift code generation rules
#
THRIFT = $(top_builddir)/compiler/cpp/thrift
-gen-cpp/DebugProtoTest_types.cpp gen-cpp/PartiallyReflectable.cpp: DebugProtoTest.thrift
- $(THRIFT) --gen cpp:dense,reflection_limited $<
+gen-cpp/DebugProtoTest_types.cpp: DebugProtoTest.thrift
+ $(THRIFT) --gen cpp:dense $<
gen-cpp/OptionalRequiredTest_types.cpp: OptionalRequiredTest.thrift
$(THRIFT) --gen cpp:dense $<
gen-cpp/Service.cpp gen-cpp/StressTest_types.cpp: StressTest.thrift
- $(THRIFT) --gen cpp:dense,reflection_limited $<
+ $(THRIFT) --gen cpp:dense $<
gen-cpp/SecondService.cpp gen-cpp/ThriftTest_constants.cpp gen-cpp/ThriftTest.cpp gen-cpp/ThriftTest_types.cpp: ThriftTest.thrift
- $(THRIFT) --gen cpp:dense,reflection_limited $<
+ $(THRIFT) --gen cpp:dense $<
INCLUDES = \
-I$(top_srcdir)/lib/cpp/src
diff --git a/test/ReflectionTest.cpp b/test/ReflectionTest.cpp
deleted file mode 100644
index c670c82..0000000
--- a/test/ReflectionTest.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#include <iostream>
-#include "gen-cpp/PartiallyReflectable.h"
-#include "gen-cpp/Service.h"
-#include "../lib/cpp/src/protocol/TDebugProtocol.h"
-
-int main() {
- using std::cout;
- using std::endl;
-
- apache::thrift::reflection::limited::Service srv1;
- thrift::test::debug::PartiallyReflectableIf::getStaticLimitedReflection(srv1);
- cout << apache::thrift::ThriftDebugString(srv1) << endl << endl;
-
- apache::thrift::reflection::limited::Service srv2;
- test::stress::ServiceIf::getStaticLimitedReflection(srv2);
- cout << apache::thrift::ThriftDebugString(srv2) << endl << endl;
-
- return 0;
-}