upfluence-thrift 2.4.4 → 2.6.8

data/test/debug_proto/gen-rb/empty_service.rb

@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (2.4.0-upfluence)
+# Autogenerated by Thrift Compiler ()
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -11,6 +11,14 @@ module EmptyService
   SERVICE = 'EmptyService'.freeze
   NAMESPACE = ''.freeze
 
+  LEGACY_ANNOTATIONS = {
+  }.freeze
+
+  STRUCTURED_ANNOTATIONS = [
+  ].freeze
+
+  # HELPER FUNCTIONS AND STRUCTURES
+
   class Client
     def initialize(client)
       @client = ::Thrift.build_client(client)
@@ -29,9 +37,10 @@ module EmptyService
       provider.build(NAMESPACE, SERVICE, Processor, handler)
     end
 
-  end
+    METHODS = {
+    }.freeze
 
-  # HELPER FUNCTIONS AND STRUCTURES
+  end
 
   ::Thrift.register_service_type(self)
 

data/test/debug_proto/gen-rb/inherited.rb

@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (2.4.0-upfluence)
+# Autogenerated by Thrift Compiler ()
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -12,48 +12,11 @@ module Inherited
   SERVICE = 'Inherited'.freeze
   NAMESPACE = ''.freeze
 
-  class Client < ::Srv::Client 
-    def initialize(client)
-      @client = ::Thrift.build_client(client)
-    end
-
-    def self.from_provider(provider)
-      Client.new(provider.build(NAMESPACE, SERVICE))
-    end
-
-    def identity(arg)
-      result = @client.call_binary(
-        'identity',
-        Identity_args.new(arg: arg),
-        Identity_result
-      )
-
-      return result.success unless result.success.nil?
-      raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'identity failed: unknown result')
-      result
-    end
-
-  end
+  LEGACY_ANNOTATIONS = {
+  }.freeze
 
-  class Processor < ::Srv::Processor 
-    include ::Thrift::Processor
-
-    def self.from_provider(handler, provider)
-      provider.build(NAMESPACE, SERVICE, Processor, handler)
-    end
-
-    def process_identity(seqid, iprot, oprot)
-      args = read_args(iprot, Identity_args)
-      result = @middleware.handle_binary('identity', args) do |args|
-        result = Identity_result.new()
-        result.success = @handler.identity(args.arg)
-        result
-      end
-
-      write_result(result, oprot, 'identity', seqid)
-    end
-
-  end
+  STRUCTURED_ANNOTATIONS = [
+  ].freeze
 
   # HELPER FUNCTIONS AND STRUCTURES
 
@@ -63,10 +26,22 @@ module Inherited
     NAME = 'identity_args'.freeze
     NAMESPACE = ''.freeze
 
+    LEGACY_ANNOTATIONS = {
+    }.freeze
+
+    STRUCTURED_ANNOTATIONS = [
+    ].freeze
+
     THRIFT_FIELD_INDEX_ARG = 1
 
+    THRIFT_FIELD_ARG_LEGACY_ANNOTATIONS = {
+    }.freeze
+
+    THRIFT_FIELD_ARG_STRUCTURED_ANNOTATIONS = [
+    ].freeze
+
     FIELDS = {
-      THRIFT_FIELD_INDEX_ARG => {type: ::Thrift::Types::I32, name: 'arg'}
+      THRIFT_FIELD_INDEX_ARG => {type: ::Thrift::Types::I32, name: 'arg', legacy_annotations: THRIFT_FIELD_ARG_LEGACY_ANNOTATIONS, structured_annotations: THRIFT_FIELD_ARG_STRUCTURED_ANNOTATIONS}
     }
 
     def struct_fields; FIELDS; end
@@ -84,10 +59,22 @@ module Inherited
     NAME = 'identity_result'.freeze
     NAMESPACE = ''.freeze
 
+    LEGACY_ANNOTATIONS = {
+    }.freeze
+
+    STRUCTURED_ANNOTATIONS = [
+    ].freeze
+
     THRIFT_FIELD_INDEX_SUCCESS = 0
 
+    THRIFT_FIELD_SUCCESS_LEGACY_ANNOTATIONS = {
+    }.freeze
+
+    THRIFT_FIELD_SUCCESS_STRUCTURED_ANNOTATIONS = [
+    ].freeze
+
     FIELDS = {
-      THRIFT_FIELD_INDEX_SUCCESS => {type: ::Thrift::Types::I32, name: 'success'}
+      THRIFT_FIELD_INDEX_SUCCESS => {type: ::Thrift::Types::I32, name: 'success', legacy_annotations: THRIFT_FIELD_SUCCESS_LEGACY_ANNOTATIONS, structured_annotations: THRIFT_FIELD_SUCCESS_STRUCTURED_ANNOTATIONS}
     }
 
     def struct_fields; FIELDS; end
@@ -99,6 +86,65 @@ module Inherited
     ::Thrift.register_struct_type self
   end
 
+  class Client < ::Srv::Client 
+    def initialize(client)
+      @client = ::Thrift.build_client(client)
+    end
+
+    def self.from_provider(provider)
+      Client.new(provider.build(NAMESPACE, SERVICE))
+    end
+
+    def identity(arg)
+      result = @client.call_binary(
+        'identity',
+        Identity_args.new(arg: arg),
+        Identity_result
+      )
+
+      return result.success unless result.success.nil?
+      raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'identity failed: unknown result')
+      result
+    end
+
+  end
+
+  class Processor < ::Srv::Processor 
+    include ::Thrift::Processor
+
+    def self.from_provider(handler, provider)
+      provider.build(NAMESPACE, SERVICE, Processor, handler)
+    end
+
+    THRIFT_METHOD_IDENTITY_LEGACY_ANNOTATIONS = {
+    }.freeze
+
+    THRIFT_METHOD_IDENTITY_STRUCTURED_ANNOTATIONS = [
+    ].freeze
+
+    METHODS = {
+      'identity' => { args_klass: Identity_args, oneway: false, legacy_annotations: THRIFT_METHOD_IDENTITY_STRUCTURED_ANNOTATIONS, structured_annotations: THRIFT_METHOD_IDENTITY_STRUCTURED_ANNOTATIONS},
+    }.freeze
+
+    def execute_identity(args)
+      result = Identity_result.new()
+
+      result.success = @handler.identity(args.arg)
+      
+      result
+    end
+
+    def process_identity(seqid, iprot, oprot)
+      args = read_args(iprot, Identity_args)
+      result = @middleware.handle_binary('identity', args) do |args|
+        execute_identity(args)
+      end
+
+      write_result(result, oprot, 'identity', seqid)
+    end
+
+  end
+
   ::Thrift.register_service_type(self)
 
 end

data/test/debug_proto/gen-rb/reverse_order_service.rb

@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (2.4.0-upfluence)
+# Autogenerated by Thrift Compiler ()
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -11,46 +11,11 @@ module ReverseOrderService
   SERVICE = 'ReverseOrderService'.freeze
   NAMESPACE = ''.freeze
 
-  class Client
-    def initialize(client)
-      @client = ::Thrift.build_client(client)
-    end
-
-    def self.from_provider(provider)
-      Client.new(provider.build(NAMESPACE, SERVICE))
-    end
-
-    def myMethod(first, second, third, fourth)
-      result = @client.call_binary(
-        'myMethod',
-        MyMethod_args.new(first: first, second: second, third: third, fourth: fourth),
-        MyMethod_result
-      )
-
-      nil
-    end
-
-  end
-
-  class Processor
-    include ::Thrift::Processor
+  LEGACY_ANNOTATIONS = {
+  }.freeze
 
-    def self.from_provider(handler, provider)
-      provider.build(NAMESPACE, SERVICE, Processor, handler)
-    end
-
-    def process_myMethod(seqid, iprot, oprot)
-      args = read_args(iprot, MyMethod_args)
-      result = @middleware.handle_binary('myMethod', args) do |args|
-        result = MyMethod_result.new()
-        @handler.myMethod(args.first, args.second, args.third, args.fourth)
-        result
-      end
-
-      write_result(result, oprot, 'myMethod', seqid)
-    end
-
-  end
+  STRUCTURED_ANNOTATIONS = [
+  ].freeze
 
   # HELPER FUNCTIONS AND STRUCTURES
 
@@ -60,16 +25,46 @@ module ReverseOrderService
     NAME = 'myMethod_args'.freeze
     NAMESPACE = ''.freeze
 
+    LEGACY_ANNOTATIONS = {
+    }.freeze
+
+    STRUCTURED_ANNOTATIONS = [
+    ].freeze
+
     THRIFT_FIELD_INDEX_FIRST = 4
     THRIFT_FIELD_INDEX_SECOND = 3
     THRIFT_FIELD_INDEX_THIRD = 2
     THRIFT_FIELD_INDEX_FOURTH = 1
 
+    THRIFT_FIELD_FIRST_LEGACY_ANNOTATIONS = {
+    }.freeze
+
+    THRIFT_FIELD_FIRST_STRUCTURED_ANNOTATIONS = [
+    ].freeze
+
+    THRIFT_FIELD_SECOND_LEGACY_ANNOTATIONS = {
+    }.freeze
+
+    THRIFT_FIELD_SECOND_STRUCTURED_ANNOTATIONS = [
+    ].freeze
+
+    THRIFT_FIELD_THIRD_LEGACY_ANNOTATIONS = {
+    }.freeze
+
+    THRIFT_FIELD_THIRD_STRUCTURED_ANNOTATIONS = [
+    ].freeze
+
+    THRIFT_FIELD_FOURTH_LEGACY_ANNOTATIONS = {
+    }.freeze
+
+    THRIFT_FIELD_FOURTH_STRUCTURED_ANNOTATIONS = [
+    ].freeze
+
     FIELDS = {
-      THRIFT_FIELD_INDEX_FIRST => {type: ::Thrift::Types::STRING, name: 'first'},
-      THRIFT_FIELD_INDEX_SECOND => {type: ::Thrift::Types::I16, name: 'second'},
-      THRIFT_FIELD_INDEX_THIRD => {type: ::Thrift::Types::I32, name: 'third'},
-      THRIFT_FIELD_INDEX_FOURTH => {type: ::Thrift::Types::I64, name: 'fourth'}
+      THRIFT_FIELD_INDEX_FIRST => {type: ::Thrift::Types::STRING, name: 'first', legacy_annotations: THRIFT_FIELD_FIRST_LEGACY_ANNOTATIONS, structured_annotations: THRIFT_FIELD_FIRST_STRUCTURED_ANNOTATIONS},
+      THRIFT_FIELD_INDEX_SECOND => {type: ::Thrift::Types::I16, name: 'second', legacy_annotations: THRIFT_FIELD_SECOND_LEGACY_ANNOTATIONS, structured_annotations: THRIFT_FIELD_SECOND_STRUCTURED_ANNOTATIONS},
+      THRIFT_FIELD_INDEX_THIRD => {type: ::Thrift::Types::I32, name: 'third', legacy_annotations: THRIFT_FIELD_THIRD_LEGACY_ANNOTATIONS, structured_annotations: THRIFT_FIELD_THIRD_STRUCTURED_ANNOTATIONS},
+      THRIFT_FIELD_INDEX_FOURTH => {type: ::Thrift::Types::I64, name: 'fourth', legacy_annotations: THRIFT_FIELD_FOURTH_LEGACY_ANNOTATIONS, structured_annotations: THRIFT_FIELD_FOURTH_STRUCTURED_ANNOTATIONS}
     }
 
     def struct_fields; FIELDS; end
@@ -87,6 +82,12 @@ module ReverseOrderService
     NAME = 'myMethod_result'.freeze
     NAMESPACE = ''.freeze
 
+    LEGACY_ANNOTATIONS = {
+    }.freeze
+
+    STRUCTURED_ANNOTATIONS = [
+    ].freeze
+
 
     FIELDS = {
 
@@ -101,6 +102,63 @@ module ReverseOrderService
     ::Thrift.register_struct_type self
   end
 
+  class Client
+    def initialize(client)
+      @client = ::Thrift.build_client(client)
+    end
+
+    def self.from_provider(provider)
+      Client.new(provider.build(NAMESPACE, SERVICE))
+    end
+
+    def myMethod(first, second, third, fourth)
+      result = @client.call_binary(
+        'myMethod',
+        MyMethod_args.new(first: first, second: second, third: third, fourth: fourth),
+        MyMethod_result
+      )
+
+      nil
+    end
+
+  end
+
+  class Processor
+    include ::Thrift::Processor
+
+    def self.from_provider(handler, provider)
+      provider.build(NAMESPACE, SERVICE, Processor, handler)
+    end
+
+    THRIFT_METHOD_MYMETHOD_LEGACY_ANNOTATIONS = {
+    }.freeze
+
+    THRIFT_METHOD_MYMETHOD_STRUCTURED_ANNOTATIONS = [
+    ].freeze
+
+    METHODS = {
+      'myMethod' => { args_klass: MyMethod_args, oneway: false, legacy_annotations: THRIFT_METHOD_MYMETHOD_STRUCTURED_ANNOTATIONS, structured_annotations: THRIFT_METHOD_MYMETHOD_STRUCTURED_ANNOTATIONS},
+    }.freeze
+
+    def execute_myMethod(args)
+      result = MyMethod_result.new()
+
+      @handler.myMethod(args.first, args.second, args.third, args.fourth)
+      
+      result
+    end
+
+    def process_myMethod(seqid, iprot, oprot)
+      args = read_args(iprot, MyMethod_args)
+      result = @middleware.handle_binary('myMethod', args) do |args|
+        execute_myMethod(args)
+      end
+
+      write_result(result, oprot, 'myMethod', seqid)
+    end
+
+  end
+
   ::Thrift.register_service_type(self)
 
 end

data/test/debug_proto/gen-rb/service_for_exception_with_a_map.rb

@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (2.4.0-upfluence)
+# Autogenerated by Thrift Compiler ()
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -11,51 +11,11 @@ module ServiceForExceptionWithAMap
   SERVICE = 'ServiceForExceptionWithAMap'.freeze
   NAMESPACE = ''.freeze
 
-  class Client
-    def initialize(client)
-      @client = ::Thrift.build_client(client)
-    end
-
-    def self.from_provider(provider)
-      Client.new(provider.build(NAMESPACE, SERVICE))
-    end
+  LEGACY_ANNOTATIONS = {
+  }.freeze
 
-    def methodThatThrowsAnException()
-      result = @client.call_binary(
-        'methodThatThrowsAnException',
-        MethodThatThrowsAnException_args.new(),
-        MethodThatThrowsAnException_result
-      )
-
-      raise result.xwamap unless result.xwamap.nil?
-      nil
-    end
-
-  end
-
-  class Processor
-    include ::Thrift::Processor
-
-    def self.from_provider(handler, provider)
-      provider.build(NAMESPACE, SERVICE, Processor, handler)
-    end
-
-    def process_methodThatThrowsAnException(seqid, iprot, oprot)
-      args = read_args(iprot, MethodThatThrowsAnException_args)
-      result = @middleware.handle_binary('methodThatThrowsAnException', args) do |args|
-        result = MethodThatThrowsAnException_result.new()
-        begin
-          @handler.methodThatThrowsAnException()
-        rescue ::ExceptionWithAMap => xwamap
-          result.xwamap = xwamap
-        end
-        result
-      end
-
-      write_result(result, oprot, 'methodThatThrowsAnException', seqid)
-    end
-
-  end
+  STRUCTURED_ANNOTATIONS = [
+  ].freeze
 
   # HELPER FUNCTIONS AND STRUCTURES
 
@@ -65,6 +25,12 @@ module ServiceForExceptionWithAMap
     NAME = 'methodThatThrowsAnException_args'.freeze
     NAMESPACE = ''.freeze
 
+    LEGACY_ANNOTATIONS = {
+    }.freeze
+
+    STRUCTURED_ANNOTATIONS = [
+    ].freeze
+
 
     FIELDS = {
 
@@ -85,10 +51,22 @@ module ServiceForExceptionWithAMap
     NAME = 'methodThatThrowsAnException_result'.freeze
     NAMESPACE = ''.freeze
 
+    LEGACY_ANNOTATIONS = {
+    }.freeze
+
+    STRUCTURED_ANNOTATIONS = [
+    ].freeze
+
     THRIFT_FIELD_INDEX_XWAMAP = 1
 
+    THRIFT_FIELD_XWAMAP_LEGACY_ANNOTATIONS = {
+    }.freeze
+
+    THRIFT_FIELD_XWAMAP_STRUCTURED_ANNOTATIONS = [
+    ].freeze
+
     FIELDS = {
-      THRIFT_FIELD_INDEX_XWAMAP => {type: ::Thrift::Types::STRUCT, name: 'xwamap', class: ::ExceptionWithAMap}
+      THRIFT_FIELD_INDEX_XWAMAP => {type: ::Thrift::Types::STRUCT, name: 'xwamap', class: ::ExceptionWithAMap, legacy_annotations: THRIFT_FIELD_XWAMAP_LEGACY_ANNOTATIONS, structured_annotations: THRIFT_FIELD_XWAMAP_STRUCTURED_ANNOTATIONS}
     }
 
     def struct_fields; FIELDS; end
@@ -100,6 +78,68 @@ module ServiceForExceptionWithAMap
     ::Thrift.register_struct_type self
   end
 
+  class Client
+    def initialize(client)
+      @client = ::Thrift.build_client(client)
+    end
+
+    def self.from_provider(provider)
+      Client.new(provider.build(NAMESPACE, SERVICE))
+    end
+
+    def methodThatThrowsAnException()
+      result = @client.call_binary(
+        'methodThatThrowsAnException',
+        MethodThatThrowsAnException_args.new(),
+        MethodThatThrowsAnException_result
+      )
+
+      raise result.xwamap unless result.xwamap.nil?
+      nil
+    end
+
+  end
+
+  class Processor
+    include ::Thrift::Processor
+
+    def self.from_provider(handler, provider)
+      provider.build(NAMESPACE, SERVICE, Processor, handler)
+    end
+
+    THRIFT_METHOD_METHODTHATTHROWSANEXCEPTION_LEGACY_ANNOTATIONS = {
+    }.freeze
+
+    THRIFT_METHOD_METHODTHATTHROWSANEXCEPTION_STRUCTURED_ANNOTATIONS = [
+    ].freeze
+
+    METHODS = {
+      'methodThatThrowsAnException' => { args_klass: MethodThatThrowsAnException_args, oneway: false, legacy_annotations: THRIFT_METHOD_METHODTHATTHROWSANEXCEPTION_STRUCTURED_ANNOTATIONS, structured_annotations: THRIFT_METHOD_METHODTHATTHROWSANEXCEPTION_STRUCTURED_ANNOTATIONS},
+    }.freeze
+
+    def execute_methodThatThrowsAnException(args)
+      result = MethodThatThrowsAnException_result.new()
+
+      begin
+        @handler.methodThatThrowsAnException()
+      rescue ::ExceptionWithAMap => xwamap
+        result.xwamap = xwamap
+      end
+      
+      result
+    end
+
+    def process_methodThatThrowsAnException(seqid, iprot, oprot)
+      args = read_args(iprot, MethodThatThrowsAnException_args)
+      result = @middleware.handle_binary('methodThatThrowsAnException', args) do |args|
+        execute_methodThatThrowsAnException(args)
+      end
+
+      write_result(result, oprot, 'methodThatThrowsAnException', seqid)
+    end
+
+  end
+
   ::Thrift.register_service_type(self)
 
 end