upfluence-thrift 2.3.1 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65c3e787432bc70631ee206f1118e8da08d4c274d06c26fcc531ec2ebb03c26f
-  data.tar.gz: b906595d1faa44c761062d44baec1e4b4eb96cd5dfb0174ac4bbb68d5ff3d6f8
+  metadata.gz: 4fb37f79c1ff995e30d8891a0efe29ffe64d638a3dd5968c27a8e31363c14af6
+  data.tar.gz: 698761793f4c21b60d6cf99524230b039bab1bedf5c247fe10970487278f290f
 SHA512:
-  metadata.gz: 6888cd0e99251cb5c67eb314620f00f449270e544b7593088c50fbedfcff06893595c167e13031502ed8134608c03fd6510eaa21c10945a5cb404c1e22fe72bc
-  data.tar.gz: 9df5b7919319e943cd76e8ed28a8c24111d859cbb895033357aacb5fc24930cad9bfcf1ab8fa540c405fd15eb7fe40023f4b0aca8d96dfb796f68f3fc780022b
+  metadata.gz: c02b5806633a061e286f0f6b4bd93fe8c0d4a82308d7f8c0b5939b9823aeca9c0c4a38200fe241fac608900499e813dced8eec9f2d9a490d7ec42d0735fd7554
+  data.tar.gz: 80322343ae8247133b175e267206a9eeaf26868918ac52b71d06702ba98b946e06b69a0d2f09842fb8ff285bcaad25e566da7747cf007f69217432b8fedff170

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,14 @@ module Thrift
       @klass = klass
     end
 
+    def structured_annotations
+      @klass::STRUCTURED_ANNOTATIONS
+    end
+
+    def legacy_annotations
+      @klass::LEGACY_ANNOTATIONS
+    end
+
     def namespace
       @klass::NAMESPACE
     end
@@ -17,15 +33,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 +50,8 @@ module Thrift
       @klass::Processor
     end
 
-    def namespace
-      @klass::NAMESPACE
+    def name
+      service
     end
 
     def service
@@ -49,6 +65,7 @@ module Thrift
 
   STRUCT_DEFINITIONS = {}
   SERVICE_DEFINITIONS = {}
+  CANONICAL_NAME_EXTRACTORS = [DefaultCanonicalNameExtractor]
 
   class << self
     def register_struct_type(klass)
@@ -60,5 +77,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/protocol/json_protocol.rb

@@ -761,9 +761,73 @@ module Thrift
     end
   end
 
+  class SimpleJsonProtocol < JsonProtocol
+    READ_EXCEPTION = ProtocolException.new(
+      ProtocolException::NOT_IMPLEMENTED,
+      'op not implemented'
+    )
+
+    def write_message_begin(name, _type, _seqid)
+      write_json_object_start
+      write_json_string(name)
+    end
+
+    def read_message_begin
+      raise READ_EXCEPTION
+    end
+
+    def write_message_end
+      write_json_object_end
+    end
+
+    def write_field_begin(name, _type, _id)
+      write_json_string(name)
+    end
+
+    def read_field_begin
+      raise READ_EXCEPTION
+    end
+
+    def write_field_end; end
+
+    def write_map_begin(_ktype, _vtype, _size)
+      write_json_object_start
+    end
+
+    def read_map_begin
+      raise READ_EXCEPTION
+    end
+
+    def write_map_end
+      write_json_object_end
+    end
+
+    def write_list_begin(_etype, _size)
+      write_json_array_start
+    end
+
+    def read_list_begin
+      raise READ_EXCEPTION
+    end
+
+    def write_set_begin(_etype, _size)
+      write_json_array_start
+    end
+
+    def read_set_begin
+      raise READ_EXCEPTION
+    end
+  end
+
+  class SimpleJsonProtocolFactory < BaseProtocolFactory
+    def get_protocol(trans)
+      Thrift::SimpleJsonProtocol.new(trans)
+    end
+  end
+
   class JsonProtocolFactory < BaseProtocolFactory
     def get_protocol(trans)
-      return Thrift::JsonProtocol.new(trans)
+      Thrift::JsonProtocol.new(trans)
     end
   end
 end

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

data/lib/thrift/types/known/{timestamp_constants.rb → timestamp/timestamp_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 'timestamp_types'
+require 'thrift/types/known/timestamp/timestamp_types'
 
 module Thrift
   module Types

data/lib/thrift/types/known/{timestamp_types.rb → timestamp/timestamp_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 = 'Timestamp'.freeze
           NAMESPACE = 'types.known.timestamp'.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/{value.rb → value/value.rb}

@@ -1,4 +1,4 @@
-require 'thrift/types/value_types'
+require 'thrift/types/value/value_types'
 
 module Thrift
   module Types

data/lib/thrift/types/{value_constants.rb → value/value_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 'value_types'
+require 'thrift/types/value/value_types'
 
 module Thrift
   module Types

data/lib/thrift/types/{value_types.rb → value/value_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
 #
@@ -27,6 +27,12 @@ module Thrift
         NAME = 'NullValue'.freeze
         NAMESPACE = 'types.value'.freeze
 
+        LEGACY_ANNOTATIONS = {
+        }.freeze
+
+        STRUCTURED_ANNOTATIONS = [
+        ].freeze
+
 
         FIELDS = {
 
@@ -47,10 +53,22 @@ module Thrift
         NAME = 'ListValue'.freeze
         NAMESPACE = 'types.value'.freeze
 
+        LEGACY_ANNOTATIONS = {
+        }.freeze
+
+        STRUCTURED_ANNOTATIONS = [
+        ].freeze
+
         THRIFT_FIELD_INDEX_VALUES = 1
 
+        THRIFT_FIELD_VALUES_LEGACY_ANNOTATIONS = {
+        }.freeze
+
+        THRIFT_FIELD_VALUES_STRUCTURED_ANNOTATIONS = [
+        ].freeze
+
         FIELDS = {
-          THRIFT_FIELD_INDEX_VALUES => {type: ::Thrift::Types::LIST, name: 'values', element: {type: ::Thrift::Types::STRUCT, class: ::Thrift::Types::Value::Value}}
+          THRIFT_FIELD_INDEX_VALUES => {type: ::Thrift::Types::LIST, name: 'values', element: {type: ::Thrift::Types::STRUCT, class: ::Thrift::Types::Value::Value}, legacy_annotations: THRIFT_FIELD_VALUES_LEGACY_ANNOTATIONS, structured_annotations: THRIFT_FIELD_VALUES_STRUCTURED_ANNOTATIONS}
         }
 
         def struct_fields; FIELDS; end
@@ -69,12 +87,30 @@ module Thrift
         NAME = 'MapEntry'.freeze
         NAMESPACE = 'types.value'.freeze
 
+        LEGACY_ANNOTATIONS = {
+        }.freeze
+
+        STRUCTURED_ANNOTATIONS = [
+        ].freeze
+
         THRIFT_FIELD_INDEX_KEY = 1
         THRIFT_FIELD_INDEX_VALUE = 2
 
+        THRIFT_FIELD_KEY_LEGACY_ANNOTATIONS = {
+        }.freeze
+
+        THRIFT_FIELD_KEY_STRUCTURED_ANNOTATIONS = [
+        ].freeze
+
+        THRIFT_FIELD_VALUE_LEGACY_ANNOTATIONS = {
+        }.freeze
+
+        THRIFT_FIELD_VALUE_STRUCTURED_ANNOTATIONS = [
+        ].freeze
+
         FIELDS = {
-          THRIFT_FIELD_INDEX_KEY => {type: ::Thrift::Types::STRUCT, name: 'key', class: ::Thrift::Types::Value::Value},
-          THRIFT_FIELD_INDEX_VALUE => {type: ::Thrift::Types::STRUCT, name: 'value', class: ::Thrift::Types::Value::Value}
+          THRIFT_FIELD_INDEX_KEY => {type: ::Thrift::Types::STRUCT, name: 'key', class: ::Thrift::Types::Value::Value, legacy_annotations: THRIFT_FIELD_KEY_LEGACY_ANNOTATIONS, structured_annotations: THRIFT_FIELD_KEY_STRUCTURED_ANNOTATIONS},
+          THRIFT_FIELD_INDEX_VALUE => {type: ::Thrift::Types::STRUCT, name: 'value', class: ::Thrift::Types::Value::Value, legacy_annotations: THRIFT_FIELD_VALUE_LEGACY_ANNOTATIONS, structured_annotations: THRIFT_FIELD_VALUE_STRUCTURED_ANNOTATIONS}
         }
 
         def struct_fields; FIELDS; end
@@ -94,10 +130,22 @@ module Thrift
         NAME = 'MapValue'.freeze
         NAMESPACE = 'types.value'.freeze
 
+        LEGACY_ANNOTATIONS = {
+        }.freeze
+
+        STRUCTURED_ANNOTATIONS = [
+        ].freeze
+
         THRIFT_FIELD_INDEX_ENTRIES = 1
 
+        THRIFT_FIELD_ENTRIES_LEGACY_ANNOTATIONS = {
+        }.freeze
+
+        THRIFT_FIELD_ENTRIES_STRUCTURED_ANNOTATIONS = [
+        ].freeze
+
         FIELDS = {
-          THRIFT_FIELD_INDEX_ENTRIES => {type: ::Thrift::Types::LIST, name: 'entries', element: {type: ::Thrift::Types::STRUCT, class: ::Thrift::Types::Value::MapEntry}}
+          THRIFT_FIELD_INDEX_ENTRIES => {type: ::Thrift::Types::LIST, name: 'entries', element: {type: ::Thrift::Types::STRUCT, class: ::Thrift::Types::Value::MapEntry}, legacy_annotations: THRIFT_FIELD_ENTRIES_LEGACY_ANNOTATIONS, structured_annotations: THRIFT_FIELD_ENTRIES_STRUCTURED_ANNOTATIONS}
         }
 
         def struct_fields; FIELDS; end
@@ -116,10 +164,22 @@ module Thrift
         NAME = 'StructValue'.freeze
         NAMESPACE = 'types.value'.freeze
 
+        LEGACY_ANNOTATIONS = {
+        }.freeze
+
+        STRUCTURED_ANNOTATIONS = [
+        ].freeze
+
         THRIFT_FIELD_INDEX_FIELDS = 1
 
+        THRIFT_FIELD_FIELDS_LEGACY_ANNOTATIONS = {
+        }.freeze
+
+        THRIFT_FIELD_FIELDS_STRUCTURED_ANNOTATIONS = [
+        ].freeze
+
         FIELDS = {
-          THRIFT_FIELD_INDEX_FIELDS => {type: ::Thrift::Types::MAP, name: 'fields', key: {type: ::Thrift::Types::STRING}, value: {type: ::Thrift::Types::STRUCT, class: ::Thrift::Types::Value::Value}}
+          THRIFT_FIELD_INDEX_FIELDS => {type: ::Thrift::Types::MAP, name: 'fields', key: {type: ::Thrift::Types::STRING}, value: {type: ::Thrift::Types::STRUCT, class: ::Thrift::Types::Value::Value}, legacy_annotations: THRIFT_FIELD_FIELDS_LEGACY_ANNOTATIONS, structured_annotations: THRIFT_FIELD_FIELDS_STRUCTURED_ANNOTATIONS}
         }
 
         def struct_fields; FIELDS; end
@@ -138,6 +198,12 @@ module Thrift
         NAME = 'Value'.freeze
         NAMESPACE = 'types.value'.freeze
 
+        LEGACY_ANNOTATIONS = {
+        }.freeze
+
+        STRUCTURED_ANNOTATIONS = [
+        ].freeze
+
         class << self
           def null_value(val)
             Value.new(:null_value, val)
@@ -186,16 +252,70 @@ module Thrift
         THRIFT_FIELD_INDEX_MAP_VALUE = 8
         THRIFT_FIELD_INDEX_STRUCT_VALUE = 9
 
+        THRIFT_FIELD_NULL_VALUE_LEGACY_ANNOTATIONS = {
+        }.freeze
+
+        THRIFT_FIELD_NULL_VALUE_STRUCTURED_ANNOTATIONS = [
+        ].freeze
+
+        THRIFT_FIELD_STRING_VALUE_LEGACY_ANNOTATIONS = {
+        }.freeze
+
+        THRIFT_FIELD_STRING_VALUE_STRUCTURED_ANNOTATIONS = [
+        ].freeze
+
+        THRIFT_FIELD_BINARY_VALUE_LEGACY_ANNOTATIONS = {
+        }.freeze
+
+        THRIFT_FIELD_BINARY_VALUE_STRUCTURED_ANNOTATIONS = [
+        ].freeze
+
+        THRIFT_FIELD_INTEGER_VALUE_LEGACY_ANNOTATIONS = {
+        }.freeze
+
+        THRIFT_FIELD_INTEGER_VALUE_STRUCTURED_ANNOTATIONS = [
+        ].freeze
+
+        THRIFT_FIELD_DOUBLE_VALUE_LEGACY_ANNOTATIONS = {
+        }.freeze
+
+        THRIFT_FIELD_DOUBLE_VALUE_STRUCTURED_ANNOTATIONS = [
+        ].freeze
+
+        THRIFT_FIELD_BOOL_VALUE_LEGACY_ANNOTATIONS = {
+        }.freeze
+
+        THRIFT_FIELD_BOOL_VALUE_STRUCTURED_ANNOTATIONS = [
+        ].freeze
+
+        THRIFT_FIELD_LIST_VALUE_LEGACY_ANNOTATIONS = {
+        }.freeze
+
+        THRIFT_FIELD_LIST_VALUE_STRUCTURED_ANNOTATIONS = [
+        ].freeze
+
+        THRIFT_FIELD_MAP_VALUE_LEGACY_ANNOTATIONS = {
+        }.freeze
+
+        THRIFT_FIELD_MAP_VALUE_STRUCTURED_ANNOTATIONS = [
+        ].freeze
+
+        THRIFT_FIELD_STRUCT_VALUE_LEGACY_ANNOTATIONS = {
+        }.freeze
+
+        THRIFT_FIELD_STRUCT_VALUE_STRUCTURED_ANNOTATIONS = [
+        ].freeze
+
         FIELDS = {
-          THRIFT_FIELD_INDEX_NULL_VALUE => {type: ::Thrift::Types::STRUCT, name: 'null_value', class: ::Thrift::Types::Value::NullValue},
-          THRIFT_FIELD_INDEX_STRING_VALUE => {type: ::Thrift::Types::STRING, name: 'string_value'},
-          THRIFT_FIELD_INDEX_BINARY_VALUE => {type: ::Thrift::Types::STRING, name: 'binary_value', binary: true},
-          THRIFT_FIELD_INDEX_INTEGER_VALUE => {type: ::Thrift::Types::I64, name: 'integer_value'},
-          THRIFT_FIELD_INDEX_DOUBLE_VALUE => {type: ::Thrift::Types::DOUBLE, name: 'double_value'},
-          THRIFT_FIELD_INDEX_BOOL_VALUE => {type: ::Thrift::Types::BOOL, name: 'bool_value'},
-          THRIFT_FIELD_INDEX_LIST_VALUE => {type: ::Thrift::Types::STRUCT, name: 'list_value', class: ::Thrift::Types::Value::ListValue},
-          THRIFT_FIELD_INDEX_MAP_VALUE => {type: ::Thrift::Types::STRUCT, name: 'map_value', class: ::Thrift::Types::Value::MapValue},
-          THRIFT_FIELD_INDEX_STRUCT_VALUE => {type: ::Thrift::Types::STRUCT, name: 'struct_value', class: ::Thrift::Types::Value::StructValue}
+          THRIFT_FIELD_INDEX_NULL_VALUE => {type: ::Thrift::Types::STRUCT, name: 'null_value', class: ::Thrift::Types::Value::NullValue, legacy_annotations: THRIFT_FIELD_NULL_VALUE_LEGACY_ANNOTATIONS, structured_annotations: THRIFT_FIELD_NULL_VALUE_STRUCTURED_ANNOTATIONS},
+          THRIFT_FIELD_INDEX_STRING_VALUE => {type: ::Thrift::Types::STRING, name: 'string_value', legacy_annotations: THRIFT_FIELD_STRING_VALUE_LEGACY_ANNOTATIONS, structured_annotations: THRIFT_FIELD_STRING_VALUE_STRUCTURED_ANNOTATIONS},
+          THRIFT_FIELD_INDEX_BINARY_VALUE => {type: ::Thrift::Types::STRING, name: 'binary_value', binary: true, legacy_annotations: THRIFT_FIELD_BINARY_VALUE_LEGACY_ANNOTATIONS, structured_annotations: THRIFT_FIELD_BINARY_VALUE_STRUCTURED_ANNOTATIONS},
+          THRIFT_FIELD_INDEX_INTEGER_VALUE => {type: ::Thrift::Types::I64, name: 'integer_value', legacy_annotations: THRIFT_FIELD_INTEGER_VALUE_LEGACY_ANNOTATIONS, structured_annotations: THRIFT_FIELD_INTEGER_VALUE_STRUCTURED_ANNOTATIONS},
+          THRIFT_FIELD_INDEX_DOUBLE_VALUE => {type: ::Thrift::Types::DOUBLE, name: 'double_value', legacy_annotations: THRIFT_FIELD_DOUBLE_VALUE_LEGACY_ANNOTATIONS, structured_annotations: THRIFT_FIELD_DOUBLE_VALUE_STRUCTURED_ANNOTATIONS},
+          THRIFT_FIELD_INDEX_BOOL_VALUE => {type: ::Thrift::Types::BOOL, name: 'bool_value', legacy_annotations: THRIFT_FIELD_BOOL_VALUE_LEGACY_ANNOTATIONS, structured_annotations: THRIFT_FIELD_BOOL_VALUE_STRUCTURED_ANNOTATIONS},
+          THRIFT_FIELD_INDEX_LIST_VALUE => {type: ::Thrift::Types::STRUCT, name: 'list_value', class: ::Thrift::Types::Value::ListValue, legacy_annotations: THRIFT_FIELD_LIST_VALUE_LEGACY_ANNOTATIONS, structured_annotations: THRIFT_FIELD_LIST_VALUE_STRUCTURED_ANNOTATIONS},
+          THRIFT_FIELD_INDEX_MAP_VALUE => {type: ::Thrift::Types::STRUCT, name: 'map_value', class: ::Thrift::Types::Value::MapValue, legacy_annotations: THRIFT_FIELD_MAP_VALUE_LEGACY_ANNOTATIONS, structured_annotations: THRIFT_FIELD_MAP_VALUE_STRUCTURED_ANNOTATIONS},
+          THRIFT_FIELD_INDEX_STRUCT_VALUE => {type: ::Thrift::Types::STRUCT, name: 'struct_value', class: ::Thrift::Types::Value::StructValue, legacy_annotations: THRIFT_FIELD_STRUCT_VALUE_LEGACY_ANNOTATIONS, structured_annotations: THRIFT_FIELD_STRUCT_VALUE_STRUCTURED_ANNOTATIONS}
         }
 
         def struct_fields; FIELDS; end

data/lib/thrift.rb

@@ -68,3 +68,8 @@ require 'thrift/server/threaded_server'
 require 'thrift/server/thread_pool_server'
 
 require 'thrift/thrift_native'
+
+require 'thrift/types/known/any/any'
+require 'thrift/types/known/timestamp/timestamp'
+require 'thrift/types/known/duration/duration'
+require 'thrift/types/annotation/naming/naming'

data/spec/json_protocol_spec.rb

@@ -21,6 +21,23 @@
 require 'spec_helper'
 
 describe 'JsonProtocol' do
+  describe Thrift::SimpleJsonProtocol do
+    before(:each) do
+      @trans = Thrift::MemoryBufferTransport.new
+      @prot = Thrift::SimpleJsonProtocol.new(@trans)
+    end
+
+    it 'should pretty print object' do
+      SpecNamespace::Hello.new.write(@prot)
+
+      @trans.read(@trans.available).should == '{"greeting":"hello world"}'
+    end
+
+    it 'shound not be able to read message' do
+      @trans.write('{"greeting":"hello world"}')
+      expect {@prot.read_message_begin}.to raise_error(Thrift::ProtocolException)
+    end
+  end
 
   describe Thrift::JsonProtocol do
     before(:each) do

data/spec/spec_helper.rb

@@ -44,21 +44,21 @@ RSpec.configure do |configuration|
     Thrift.type_checking = true
   end
 end
-
-$:.unshift File.join(File.dirname(__FILE__), *%w[.. test debug_proto gen-rb])
-require 'srv'
-require 'debug_proto_test_constants'
-
-$:.unshift File.join(File.dirname(__FILE__), *%w[gen-rb])
-require 'thrift_spec_types'
-require 'nonblocking_service'
-
-module Fixtures
-  COMPACT_PROTOCOL_TEST_STRUCT = COMPACT_TEST.dup
-  COMPACT_PROTOCOL_TEST_STRUCT.a_binary = [0,1,2,3,4,5,6,7,8].pack('c*')
-  COMPACT_PROTOCOL_TEST_STRUCT.set_byte_map = nil
-  COMPACT_PROTOCOL_TEST_STRUCT.map_byte_map = nil
-end
-
-$:.unshift File.join(File.dirname(__FILE__), *%w[gen-rb/flat])
+#
+# $:.unshift File.join(File.dirname(__FILE__), *%w[.. test debug_proto gen-rb])
+# require 'srv'
+# require 'debug_proto_test_constants'
+#
+# $:.unshift File.join(File.dirname(__FILE__), *%w[gen-rb])
+# require 'thrift_spec_types'
+# require 'nonblocking_service'
+#
+# module Fixtures
+#   COMPACT_PROTOCOL_TEST_STRUCT = COMPACT_TEST.dup
+#   COMPACT_PROTOCOL_TEST_STRUCT.a_binary = [0,1,2,3,4,5,6,7,8].pack('c*')
+#   COMPACT_PROTOCOL_TEST_STRUCT.set_byte_map = nil
+#   COMPACT_PROTOCOL_TEST_STRUCT.map_byte_map = nil
+# end
+#
+# $:.unshift File.join(File.dirname(__FILE__), *%w[gen-rb/flat])
 

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: upfluence-thrift
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.6.1
 platform: ruby
 authors:
 - Thrift Developers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-11 00:00:00.000000000 Z
+date: 2024-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +56,16 @@ dependencies:
   name: thin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -161,18 +161,23 @@ extra_rdoc_files:
 - lib/thrift/transport/socket.rb
 - lib/thrift/transport/unix_server_socket.rb
 - lib/thrift/transport/unix_socket.rb
-- lib/thrift/types/known/any.rb
-- lib/thrift/types/known/any_constants.rb
-- lib/thrift/types/known/any_types.rb
-- lib/thrift/types/known/duration.rb
-- lib/thrift/types/known/duration_constants.rb
-- lib/thrift/types/known/duration_types.rb
-- lib/thrift/types/known/timestamp.rb
-- lib/thrift/types/known/timestamp_constants.rb
-- lib/thrift/types/known/timestamp_types.rb
-- lib/thrift/types/value.rb
-- lib/thrift/types/value_constants.rb
-- lib/thrift/types/value_types.rb
+- lib/thrift/types/annotation/deprecation/deprecation_constants.rb
+- lib/thrift/types/annotation/deprecation/deprecation_types.rb
+- lib/thrift/types/annotation/naming/naming.rb
+- lib/thrift/types/annotation/naming/naming_constants.rb
+- lib/thrift/types/annotation/naming/naming_types.rb
+- lib/thrift/types/known/any/any.rb
+- lib/thrift/types/known/any/any_constants.rb
+- lib/thrift/types/known/any/any_types.rb
+- lib/thrift/types/known/duration/duration.rb
+- lib/thrift/types/known/duration/duration_constants.rb
+- lib/thrift/types/known/duration/duration_types.rb
+- lib/thrift/types/known/timestamp/timestamp.rb
+- lib/thrift/types/known/timestamp/timestamp_constants.rb
+- lib/thrift/types/known/timestamp/timestamp_types.rb
+- lib/thrift/types/value/value.rb
+- lib/thrift/types/value/value_constants.rb
+- lib/thrift/types/value/value_types.rb
 - lib/thrift/types.rb
 - lib/thrift/union.rb
 - lib/thrift.rb
@@ -244,18 +249,23 @@ files:
 - lib/thrift/transport/unix_server_socket.rb
 - lib/thrift/transport/unix_socket.rb
 - lib/thrift/types.rb
-- lib/thrift/types/known/any.rb
-- lib/thrift/types/known/any_constants.rb
-- lib/thrift/types/known/any_types.rb
-- lib/thrift/types/known/duration.rb
-- lib/thrift/types/known/duration_constants.rb
-- lib/thrift/types/known/duration_types.rb
-- lib/thrift/types/known/timestamp.rb
-- lib/thrift/types/known/timestamp_constants.rb
-- lib/thrift/types/known/timestamp_types.rb
-- lib/thrift/types/value.rb
-- lib/thrift/types/value_constants.rb
-- lib/thrift/types/value_types.rb
+- lib/thrift/types/annotation/deprecation/deprecation_constants.rb
+- lib/thrift/types/annotation/deprecation/deprecation_types.rb
+- lib/thrift/types/annotation/naming/naming.rb
+- lib/thrift/types/annotation/naming/naming_constants.rb
+- lib/thrift/types/annotation/naming/naming_types.rb
+- lib/thrift/types/known/any/any.rb
+- lib/thrift/types/known/any/any_constants.rb
+- lib/thrift/types/known/any/any_types.rb
+- lib/thrift/types/known/duration/duration.rb
+- lib/thrift/types/known/duration/duration_constants.rb
+- lib/thrift/types/known/duration/duration_types.rb
+- lib/thrift/types/known/timestamp/timestamp.rb
+- lib/thrift/types/known/timestamp/timestamp_constants.rb
+- lib/thrift/types/known/timestamp/timestamp_types.rb
+- lib/thrift/types/value/value.rb
+- lib/thrift/types/value/value_constants.rb
+- lib/thrift/types/value/value_types.rb
 - lib/thrift/union.rb
 - spec/BaseService.thrift
 - spec/ExtendedService.thrift
@@ -320,7 +330,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Ruby bindings for Apache Thrift