upfluence-thrift 2.4.4 → 2.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2a5d582754f7ba1078d44e62f4230d522de92b033172de5546f4b224d4f59f9
-  data.tar.gz: d2c0359abdd5dd5885930a854bb58a0280c28d4a8cfcd04885d6058d069b672f
+  metadata.gz: 910b976b447406af13cf97d33ef26b0aa3d28cbbc90b6b8df8e5dfbdb7529026
+  data.tar.gz: a38f2536a472b778aef2083161e93bc973767c2a76ecbe139ecf63eda3d60565
 SHA512:
-  metadata.gz: 802f5da057755d933d88fce3e065f5af8dd172b775ba53f3f512736333ff5c9ca2db2547c269c0156c42c901576119290a43e94fa66db6aa8935fd968571619b
-  data.tar.gz: cb47abbb20ed8078060d11e572358913a2807a4b5c0723a53f526446425505672d179a8ea9c1e0c832e631ce49e972794b2a4c9cd61bfaf46b9a42ff0cd6f47b
+  metadata.gz: f70ad188a73e4113379a1f862ff7495b22bd1dd3a970e69326cc21d7cfb069834f7f63ce2b689d9bdf71a4b7033be54de90c8f78bf61eac3ed72519e9f675275
+  data.tar.gz: 5c41d9170f392877200e283da4a61b332db3c2669617f8ba3dd09fad50a914e4b0175be8271c5998047abc154f4f49d9035aa5f6d618b1768875c0e77733acf1

data/benchmark/gen-rb/benchmark_constants.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
 #

data/benchmark/gen-rb/benchmark_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
 #
@@ -12,48 +12,11 @@ module ThriftBenchmark
     SERVICE = 'BenchmarkService'.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 fibonacci(n)
-        result = @client.call_binary(
-          'fibonacci',
-          Fibonacci_args.new(n: n),
-          Fibonacci_result
-        )
-
-        return result.success unless result.success.nil?
-        raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'fibonacci failed: unknown result')
-        result
-      end
-
-    end
+    LEGACY_ANNOTATIONS = {
+    }.freeze
 
-    class Processor
-      include ::Thrift::Processor
-
-      def self.from_provider(handler, provider)
-        provider.build(NAMESPACE, SERVICE, Processor, handler)
-      end
-
-      def process_fibonacci(seqid, iprot, oprot)
-        args = read_args(iprot, Fibonacci_args)
-        result = @middleware.handle_binary('fibonacci', args) do |args|
-          result = Fibonacci_result.new()
-          result.success = @handler.fibonacci(args.n)
-          result
-        end
-
-        write_result(result, oprot, 'fibonacci', seqid)
-      end
-
-    end
+    STRUCTURED_ANNOTATIONS = [
+    ].freeze
 
     # HELPER FUNCTIONS AND STRUCTURES
 
@@ -63,10 +26,22 @@ module ThriftBenchmark
       NAME = 'fibonacci_args'.freeze
       NAMESPACE = ''.freeze
 
+      LEGACY_ANNOTATIONS = {
+      }.freeze
+
+      STRUCTURED_ANNOTATIONS = [
+      ].freeze
+
       THRIFT_FIELD_INDEX_N = 1
 
+      THRIFT_FIELD_N_LEGACY_ANNOTATIONS = {
+      }.freeze
+
+      THRIFT_FIELD_N_STRUCTURED_ANNOTATIONS = [
+      ].freeze
+
       FIELDS = {
-        THRIFT_FIELD_INDEX_N => {type: ::Thrift::Types::BYTE, name: 'n'}
+        THRIFT_FIELD_INDEX_N => {type: ::Thrift::Types::BYTE, name: 'n', legacy_annotations: THRIFT_FIELD_N_LEGACY_ANNOTATIONS, structured_annotations: THRIFT_FIELD_N_STRUCTURED_ANNOTATIONS}
       }
 
       def struct_fields; FIELDS; end
@@ -84,10 +59,22 @@ module ThriftBenchmark
       NAME = 'fibonacci_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 ThriftBenchmark
       ::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 fibonacci(n)
+        result = @client.call_binary(
+          'fibonacci',
+          Fibonacci_args.new(n: n),
+          Fibonacci_result
+        )
+
+        return result.success unless result.success.nil?
+        raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'fibonacci failed: unknown result')
+        result
+      end
+
+    end
+
+    class Processor
+      include ::Thrift::Processor
+
+      def self.from_provider(handler, provider)
+        provider.build(NAMESPACE, SERVICE, Processor, handler)
+      end
+
+      THRIFT_METHOD_FIBONACCI_LEGACY_ANNOTATIONS = {
+      }.freeze
+
+      THRIFT_METHOD_FIBONACCI_STRUCTURED_ANNOTATIONS = [
+      ].freeze
+
+      METHODS = {
+        'fibonacci' => { args_klass: Fibonacci_args, oneway: false, legacy_annotations: THRIFT_METHOD_FIBONACCI_STRUCTURED_ANNOTATIONS, structured_annotations: THRIFT_METHOD_FIBONACCI_STRUCTURED_ANNOTATIONS},
+      }.freeze
+
+      def execute_fibonacci(args)
+        result = Fibonacci_result.new()
+
+        result.success = @handler.fibonacci(args.n)
+        
+        result
+      end
+
+      def process_fibonacci(seqid, iprot, oprot)
+        args = read_args(iprot, Fibonacci_args)
+        result = @middleware.handle_binary('fibonacci', args) do |args|
+          execute_fibonacci(args)
+        end
+
+        write_result(result, oprot, 'fibonacci', seqid)
+      end
+
+    end
+
     ::Thrift.register_service_type(self)
 
   end

data/benchmark/gen-rb/benchmark_types.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
 #

data/lib/thrift/definition.rb

@@ -1,4 +1,12 @@
 module Thrift
+  class DefaultCanonicalNameExtractor
+    class << self
+      def extract(definition)
+        [definition.struct_type]
+      end
+    end
+  end
+
   class StructDefinition
     attr_reader :klass
 
@@ -6,6 +14,18 @@ module Thrift
       @klass = klass
     end
 
+    def structured_annotations
+      return [] unless @klass.const_defined? :STRUCTURED_ANNOTATIONS
+
+      @klass::STRUCTURED_ANNOTATIONS
+    end
+
+    def legacy_annotations
+      return {} unless @klass.const_defined? :LEGACY_ANNOTATIONS
+
+      @klass::LEGACY_ANNOTATIONS
+    end
+
     def namespace
       @klass::NAMESPACE
     end
@@ -17,15 +37,15 @@ module Thrift
     def struct_type
       "#{namespace}.#{name}"
     end
-  end
-
-  class ServiceDefinition < StructDefinition
-    attr_reader :klass
 
-    def initialize(klass)
-      @klass = klass
+    def canonical_names
+      CANONICAL_NAME_EXTRACTORS.reduce([]) do |acc, cur|
+        acc + cur.extract(self)
+      end
     end
+  end
 
+  class ServiceDefinition < StructDefinition
     def client_class
       @klass::Client
     end
@@ -34,8 +54,8 @@ module Thrift
       @klass::Processor
     end
 
-    def namespace
-      @klass::NAMESPACE
+    def name
+      service
     end
 
     def service
@@ -49,6 +69,7 @@ module Thrift
 
   STRUCT_DEFINITIONS = {}
   SERVICE_DEFINITIONS = {}
+  CANONICAL_NAME_EXTRACTORS = [DefaultCanonicalNameExtractor]
 
   class << self
     def register_struct_type(klass)
@@ -60,5 +81,9 @@ module Thrift
       definition = ServiceDefinition.new(klass)
       SERVICE_DEFINITIONS[definition.service_type] = definition
     end
+
+    def register_canonical_name_extractor(klass)
+      CANONICAL_NAME_EXTRACTORS << klass
+    end
   end
 end

data/lib/thrift/processor.rb

@@ -19,13 +19,109 @@
 
 module Thrift
   module Processor
+    class BaseProcessorFunction
+      def initialize(fname, middleware, args_klass, method)
+        @fname = fname
+        @middleware = middleware
+        @args_klass = args_klass
+        @method = method
+      end
+
+      protected
+
+      def read_args(iprot)
+        args = @args_klass.new
+
+        args.read(iprot)
+        iprot.read_message_end
+
+        args
+      end
+    end
+
+    class BinaryProcessorFunction < BaseProcessorFunction
+      def process(seqid, iprot, oprot)
+        execute(seqid, iprot, oprot)
+
+        true
+      end
+
+      private
+
+      def execute(seqid, iprot, oprot)
+        args = read_args(iprot)
+
+        result = @middleware.handle_binary(@fname, args) do |args|
+          @method.call(args)
+        end
+
+        write_result(result, oprot, seqid)
+      rescue => e
+        write_exception(e, oprot, seqid)
+      end
+
+      def write_exception(exception, oprot, seqid)
+        oprot.write_message_begin(@fname, MessageTypes::EXCEPTION, seqid)
+
+        unless exception.is_a? ApplicationException
+          exception = ApplicationException.new(
+            ApplicationException::INTERNAL_ERROR,
+            "Internal error processing #{@fname}: #{exception.class}: #{exception}"
+          )
+        end
+
+        exception.write(oprot)
+        oprot.write_message_end
+        oprot.trans.flush
+      end
+
+      def write_result(result, oprot, seqid)
+        oprot.write_message_begin(@fname, MessageTypes::REPLY, seqid)
+        result.write(oprot)
+        oprot.write_message_end
+        oprot.trans.flush
+      end
+    end
+
+    class UnaryProcessorFunction < BaseProcessorFunction
+      def process(_seqid, iprot, _oprot)
+        args = read_args(iprot)
+
+        @middleware.handle_unary(@fname, args) do |args|
+          @method.call(args)
+        end
+
+        true
+      end
+    end
+
     def initialize(handler, middlewares = [])
       @handler = handler
       @middleware = Middleware.wrap(middlewares)
+
+      @functions = if self.class.const_defined?(:METHODS)
+        self.class::METHODS.reduce({}) do |acc, (key, args)|
+          klass = args[:oneway] ? UnaryProcessorFunction : BinaryProcessorFunction
+
+          acc.merge key => klass.new(
+            key,
+            @middleware,
+            args[:args_klass],
+            method("execute_#{key}")
+          )
+        end
+      end || {}
     end
 
     def process(iprot, oprot)
       name, _type, seqid = iprot.read_message_begin
+
+      func = @functions[name]
+
+      return func.process(seqid, iprot, oprot) if func
+
+      # TODO: once all the stubs will be generated w thrift >=2.5 the next lines
+      # can be deleted
       if respond_to?("process_#{name}")
         begin
           send("process_#{name}", seqid, iprot, oprot)

data/lib/thrift/types/annotation/deprecation/deprecation_constants.rb

@@ -0,0 +1,17 @@
+#
+# Autogenerated by Thrift Compiler (2.5.4-upfluence)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+require 'thrift'
+require 'thrift/types/annotation/deprecation/deprecation_types'
+
+module Thrift
+  module Types
+    module Annotation
+      module Deprecation
+      end
+    end
+  end
+end

data/lib/thrift/types/annotation/deprecation/deprecation_types.rb

@@ -0,0 +1,44 @@
+#
+# Autogenerated by Thrift Compiler (2.5.4-upfluence)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+require 'thrift'
+
+module Thrift
+  module Types
+    module Annotation
+      module Deprecation
+        class Deprecated; end
+
+        class Deprecated
+          include ::Thrift::Struct, ::Thrift::Struct_Union
+
+          NAME = 'Deprecated'.freeze
+          NAMESPACE = 'types.annotation.deprecation'.freeze
+
+          LEGACY_ANNOTATIONS = {
+          }.freeze
+
+          STRUCTURED_ANNOTATIONS = [
+          ].freeze
+
+
+          FIELDS = {
+
+          }
+
+          def struct_fields; FIELDS; end
+
+          def validate
+          end
+
+          ::Thrift::Struct.generate_accessors self
+          ::Thrift.register_struct_type self
+        end
+
+      end
+    end
+  end
+end

data/lib/thrift/types/annotation/naming/naming.rb

@@ -0,0 +1,23 @@
+require 'thrift/types/annotation/naming/naming_types'
+
+module Thrift
+  module Types
+    module Annotation
+      module Naming
+        class CanonicalNameExtractor
+          class << self
+            def extract(definition)
+              definition.structured_annotations.select do |sa|
+                sa.is_a? PreviouslyKnownAs
+              end.map do |pka|
+                "#{pka.namespace_ || definition.namespace}.#{pka.name || definition.name}"
+              end
+            end
+          end
+
+          ::Thrift.register_canonical_name_extractor self
+        end
+      end
+    end
+  end
+end

data/lib/thrift/types/annotation/naming/naming_constants.rb

@@ -0,0 +1,17 @@
+#
+# Autogenerated by Thrift Compiler (2.5.4-upfluence)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+require 'thrift'
+require 'thrift/types/annotation/naming/naming_types'
+
+module Thrift
+  module Types
+    module Annotation
+      module Naming
+      end
+    end
+  end
+end

data/lib/thrift/types/annotation/naming/naming_types.rb

@@ -0,0 +1,59 @@
+#
+# Autogenerated by Thrift Compiler (2.5.4-upfluence)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+require 'thrift'
+
+module Thrift
+  module Types
+    module Annotation
+      module Naming
+        class PreviouslyKnownAs; end
+
+        class PreviouslyKnownAs
+          include ::Thrift::Struct, ::Thrift::Struct_Union
+
+          NAME = 'PreviouslyKnownAs'.freeze
+          NAMESPACE = 'types.annotation.naming'.freeze
+
+          LEGACY_ANNOTATIONS = {
+          }.freeze
+
+          STRUCTURED_ANNOTATIONS = [
+          ].freeze
+
+          THRIFT_FIELD_INDEX_NAMESPACE_ = 1
+          THRIFT_FIELD_INDEX_NAME = 2
+
+          THRIFT_FIELD_NAMESPACE__LEGACY_ANNOTATIONS = {
+          }.freeze
+
+          THRIFT_FIELD_NAMESPACE__STRUCTURED_ANNOTATIONS = [
+          ].freeze
+
+          THRIFT_FIELD_NAME_LEGACY_ANNOTATIONS = {
+          }.freeze
+
+          THRIFT_FIELD_NAME_STRUCTURED_ANNOTATIONS = [
+          ].freeze
+
+          FIELDS = {
+            THRIFT_FIELD_INDEX_NAMESPACE_ => {type: ::Thrift::Types::STRING, name: 'namespace_', optional: true, legacy_annotations: THRIFT_FIELD_NAMESPACE__LEGACY_ANNOTATIONS, structured_annotations: THRIFT_FIELD_NAMESPACE__STRUCTURED_ANNOTATIONS},
+            THRIFT_FIELD_INDEX_NAME => {type: ::Thrift::Types::STRING, name: 'name', optional: true, legacy_annotations: THRIFT_FIELD_NAME_LEGACY_ANNOTATIONS, structured_annotations: THRIFT_FIELD_NAME_STRUCTURED_ANNOTATIONS}
+          }
+
+          def struct_fields; FIELDS; end
+
+          def validate
+          end
+
+          ::Thrift::Struct.generate_accessors self
+          ::Thrift.register_struct_type self
+        end
+
+      end
+    end
+  end
+end

data/lib/thrift/types/known/{any.rb → any/any.rb}

@@ -1,4 +1,4 @@
-require 'thrift/types/known/any_types'
+require 'thrift/types/known/any/any_types'
 require 'json'
 require 'yaml'
 

data/lib/thrift/types/known/{any_constants.rb → any/any_constants.rb}

@@ -1,11 +1,11 @@
 #
-# Autogenerated by Thrift Compiler (2.3.0-upfluence)
+# Autogenerated by Thrift Compiler (2.5.4-upfluence)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
 
 require 'thrift'
-require 'any_types'
+require 'thrift/types/known/any/any_types'
 
 module Thrift
   module Types

data/lib/thrift/types/known/{any_types.rb → any/any_types.rb}

@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (2.3.0-upfluence)
+# Autogenerated by Thrift Compiler (2.5.4-upfluence)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -18,12 +18,30 @@ module Thrift
           NAME = 'Any'.freeze
           NAMESPACE = 'types.known.any'.freeze
 
+          LEGACY_ANNOTATIONS = {
+          }.freeze
+
+          STRUCTURED_ANNOTATIONS = [
+          ].freeze
+
           THRIFT_FIELD_INDEX_TYPE = 1
           THRIFT_FIELD_INDEX_VALUE = 2
 
+          THRIFT_FIELD_TYPE_LEGACY_ANNOTATIONS = {
+          }.freeze
+
+          THRIFT_FIELD_TYPE_STRUCTURED_ANNOTATIONS = [
+          ].freeze
+
+          THRIFT_FIELD_VALUE_LEGACY_ANNOTATIONS = {
+          }.freeze
+
+          THRIFT_FIELD_VALUE_STRUCTURED_ANNOTATIONS = [
+          ].freeze
+
           FIELDS = {
-            THRIFT_FIELD_INDEX_TYPE => {type: ::Thrift::Types::STRING, name: 'type'},
-            THRIFT_FIELD_INDEX_VALUE => {type: ::Thrift::Types::STRING, name: 'value', binary: true}
+            THRIFT_FIELD_INDEX_TYPE => {type: ::Thrift::Types::STRING, name: 'type', legacy_annotations: THRIFT_FIELD_TYPE_LEGACY_ANNOTATIONS, structured_annotations: THRIFT_FIELD_TYPE_STRUCTURED_ANNOTATIONS},
+            THRIFT_FIELD_INDEX_VALUE => {type: ::Thrift::Types::STRING, name: 'value', binary: true, legacy_annotations: THRIFT_FIELD_VALUE_LEGACY_ANNOTATIONS, structured_annotations: THRIFT_FIELD_VALUE_STRUCTURED_ANNOTATIONS}
           }
 
           def struct_fields; FIELDS; end

data/lib/thrift/types/known/{duration.rb → duration/duration.rb}

@@ -1,4 +1,4 @@
-require 'thrift/types/known/duration_types'
+require 'thrift/types/known/duration/duration_types'
 
 module Thrift
   module Types

data/lib/thrift/types/known/{duration_constants.rb → duration/duration_constants.rb}

@@ -1,11 +1,11 @@
 #
-# Autogenerated by Thrift Compiler (2.3.0-upfluence)
+# Autogenerated by Thrift Compiler (2.5.4-upfluence)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
 
 require 'thrift'
-require 'duration_types'
+require 'thrift/types/known/duration/duration_types'
 
 module Thrift
   module Types

data/lib/thrift/types/known/{duration_types.rb → duration/duration_types.rb}

@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (2.3.0-upfluence)
+# Autogenerated by Thrift Compiler (2.5.4-upfluence)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -18,12 +18,30 @@ module Thrift
           NAME = 'Duration'.freeze
           NAMESPACE = 'types.known.duration'.freeze
 
+          LEGACY_ANNOTATIONS = {
+          }.freeze
+
+          STRUCTURED_ANNOTATIONS = [
+          ].freeze
+
           THRIFT_FIELD_INDEX_SECONDS = 1
           THRIFT_FIELD_INDEX_NANOS = 2
 
+          THRIFT_FIELD_SECONDS_LEGACY_ANNOTATIONS = {
+          }.freeze
+
+          THRIFT_FIELD_SECONDS_STRUCTURED_ANNOTATIONS = [
+          ].freeze
+
+          THRIFT_FIELD_NANOS_LEGACY_ANNOTATIONS = {
+          }.freeze
+
+          THRIFT_FIELD_NANOS_STRUCTURED_ANNOTATIONS = [
+          ].freeze
+
           FIELDS = {
-            THRIFT_FIELD_INDEX_SECONDS => {type: ::Thrift::Types::I64, name: 'seconds'},
-            THRIFT_FIELD_INDEX_NANOS => {type: ::Thrift::Types::I32, name: 'nanos'}
+            THRIFT_FIELD_INDEX_SECONDS => {type: ::Thrift::Types::I64, name: 'seconds', legacy_annotations: THRIFT_FIELD_SECONDS_LEGACY_ANNOTATIONS, structured_annotations: THRIFT_FIELD_SECONDS_STRUCTURED_ANNOTATIONS},
+            THRIFT_FIELD_INDEX_NANOS => {type: ::Thrift::Types::I32, name: 'nanos', legacy_annotations: THRIFT_FIELD_NANOS_LEGACY_ANNOTATIONS, structured_annotations: THRIFT_FIELD_NANOS_STRUCTURED_ANNOTATIONS}
           }
 
           def struct_fields; FIELDS; end

data/lib/thrift/types/known/{timestamp.rb → timestamp/timestamp.rb}

@@ -1,4 +1,4 @@
-require 'thrift/types/known/timestamp_types'
+require 'thrift/types/known/timestamp/timestamp_types'
 
 module Thrift
   module Types