This is an automated email from the ASF dual-hosted git repository.
jensg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/thrift.git
The following commit(s) were added to refs/heads/master by this push:
new fafcea7 THRIFT-5382 Netstd default list/set enums values are
generated incorrectly Client netstd Patch: Thomas Bruggink
fafcea7 is described below
commit fafcea7b5c83668424a90cd1d0ec5e985ad446f5
Author: Thomas <[email protected]>
AuthorDate: Sat Mar 27 16:07:13 2021 +0900
THRIFT-5382 Netstd default list/set enums values are generated incorrectly
Client netstd
Patch: Thomas Bruggink
This closes #2364
---
.../cpp/src/thrift/generate/t_netstd_generator.cc | 2 +-
.../Thrift.PublicInterfaces.Compile.Tests.csproj | 1 +
.../Thrift5382.objs.thrift | 24 +++++++++++++++
.../Thrift5382.thrift | 36 ++++++++++++++++++++++
4 files changed, 62 insertions(+), 1 deletion(-)
diff --git a/compiler/cpp/src/thrift/generate/t_netstd_generator.cc
b/compiler/cpp/src/thrift/generate/t_netstd_generator.cc
index 5fb3f55..ed766ee 100644
--- a/compiler/cpp/src/thrift/generate/t_netstd_generator.cc
+++ b/compiler/cpp/src/thrift/generate/t_netstd_generator.cc
@@ -667,7 +667,7 @@ string t_netstd_generator::render_const_value(ostream& out,
string name, t_type*
}
else if (type->is_enum())
{
- render << type->get_name() << "." << value->get_identifier_name();
+ render << type_name(type) << "." << value->get_identifier_name();
}
else
{
diff --git
a/lib/netstd/Tests/Thrift.PublicInterfaces.Compile.Tests/Thrift.PublicInterfaces.Compile.Tests.csproj
b/lib/netstd/Tests/Thrift.PublicInterfaces.Compile.Tests/Thrift.PublicInterfaces.Compile.Tests.csproj
index 103f315..d34c60a 100644
---
a/lib/netstd/Tests/Thrift.PublicInterfaces.Compile.Tests/Thrift.PublicInterfaces.Compile.Tests.csproj
+++
b/lib/netstd/Tests/Thrift.PublicInterfaces.Compile.Tests/Thrift.PublicInterfaces.Compile.Tests.csproj
@@ -78,6 +78,7 @@
<Exec Command="$(PathToThrift) -gen netstd:wcf,union,serial -r
./../../../../contrib/fb303/if/fb303.thrift" />
<Exec Command="$(PathToThrift) -gen netstd:wcf,union,serial -r
./Thrift5253.thrift" />
<Exec Command="$(PathToThrift) -gen netstd:wcf,union,serial -r
./Thrift5320.thrift" />
+ <Exec Command="$(PathToThrift) -gen netstd:wcf,union,serial -r
./Thrift5382.thrift" />
</Target>
</Project>
diff --git
a/lib/netstd/Tests/Thrift.PublicInterfaces.Compile.Tests/Thrift5382.objs.thrift
b/lib/netstd/Tests/Thrift.PublicInterfaces.Compile.Tests/Thrift5382.objs.thrift
new file mode 100644
index 0000000..095d7bd
--- /dev/null
+++
b/lib/netstd/Tests/Thrift.PublicInterfaces.Compile.Tests/Thrift5382.objs.thrift
@@ -0,0 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+// Testcase for THRIFT-5382 Netstd default list/set enums values are generated
incorrectly
+
+namespace * Thrift5382.objs
+
+enum FoobarEnum {
+ Val_1 = 0,
+ Val_2 = 1
+}
diff --git
a/lib/netstd/Tests/Thrift.PublicInterfaces.Compile.Tests/Thrift5382.thrift
b/lib/netstd/Tests/Thrift.PublicInterfaces.Compile.Tests/Thrift5382.thrift
new file mode 100644
index 0000000..db53dfa
--- /dev/null
+++ b/lib/netstd/Tests/Thrift.PublicInterfaces.Compile.Tests/Thrift5382.thrift
@@ -0,0 +1,36 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+// Testcase for THRIFT-5382 Netstd default list/set enums values are generated
incorrectly
+
+namespace * Thrift5382
+
+include "Thrift5382.objs.thrift"
+
+struct RequestModel {
+ // Breaks
+ 1: optional set<Thrift5382.objs.FoobarEnum> data_1 = [
FoobarEnum.Val_1, FoobarEnum.Val_2 ],
+ // Breaks
+ 2: optional list<Thrift5382.objs.FoobarEnum> data_2 = [
FoobarEnum.Val_1, FoobarEnum.Val_2 ],
+ // Works
+ 3: optional Thrift5382.objs.FoobarEnum data_3 = FoobarEnum.Val_1
+}
+
+service Test {
+ void CallMe(
+ 1 : RequestModel foo,
+ )
+}
