Skip to content
This repository was archived by the owner on Jan 10, 2019. It is now read-only.

Use full namespace for Future #127

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion aws-flow/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ gemspec

group :test do
gem "rspec", "2.14"
gem "rake"
gem "rake", '< 11.0' # RSpec 2.X is incompatible with newer Rake versions
gem "factory_girl"
end
4 changes: 2 additions & 2 deletions aws-flow/lib/aws/decider/async_retrying_executor.rb
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ def schedule_with_retry(command, failure, attempts, first_attempt_time, time_of_
# @api private
def invoke(command, attempts, first_attempt_time)
failure_to_retry = nil
should_retry = Future.new
return_value = Future.new
should_retry = AWS::Flow::Core::Future.new
return_value = AWS::Flow::Core::Future.new
output = Utilities::AddressableFuture.new
error_handler do |t|
t.begin { return_value.set(command.call) }
Expand Down
2 changes: 1 addition & 1 deletion aws-flow/lib/aws/decider/utilities.rb
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ class AddressableFuture
attr_accessor :return_value, :_metadata
def initialize(initial_metadata = nil)
@_metadata = initial_metadata
@return_value = Future.new
@return_value = AWS::Flow::Core::Future.new
end

# Determines whether the object is a flow future. The contract is that
Expand Down
4 changes: 2 additions & 2 deletions aws-flow/lib/aws/decider/workflow_client.rb
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ class WorkflowFuture
#
def initialize(workflow_execution)
@_workflow_execution = workflow_execution.dup
@return_value = Future.new
@return_value = AWS::Flow::Core::Future.new
end

# Determines whether the object is a flow future. The contract is that flow futures must have a `get` method.
Expand Down Expand Up @@ -272,7 +272,7 @@ def start_internal_workflow(method_name, input = NoInput.new, &block)
client_options = Utilities::client_options_from_method_name(method_name, @options)
options = Utilities::merge_all_options(client_options, options)

workflow_id_future, run_id_future = Future.new, Future.new
workflow_id_future, run_id_future = AWS::Flow::Core::Future.new, AWS::Flow::Core::Future.new
minimal_domain = MinimalDomain.new(@domain.name.to_s)
output = WorkflowFuture.new(AWS::Flow::MinimalWorkflowExecution.new(minimal_domain, workflow_id_future, run_id_future))
new_options = StartWorkflowOptions.new(options)
Expand Down
2 changes: 1 addition & 1 deletion aws-flow/lib/aws/decider/workflow_clock.rb
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def create_timer(delay_seconds, block)
attributes[:timer_id] = timer_id
attributes[:start_to_fire_timeout] = delay_seconds.to_s
open_request = OpenRequestInfo.new
open_request.blocking_promise = Future.new
open_request.blocking_promise = AWS::Flow::Core::Future.new
if block
open_request.result = task do
open_request.blocking_promise.get
Expand Down
4 changes: 2 additions & 2 deletions aws-flow/lib/aws/decider/workflow_definition.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ def initialize(instance, workflow_method, signals, get_state_method, converter)

def execute(input = nil)
#TODO Set up all the converter stuff
result = Future.new
method_output = Future.new
result = AWS::Flow::Core::Future.new
method_output = AWS::Flow::Core::Future.new
error_handler do |t|
t.begin do
if input.nil?
Expand Down