Skip to content

Commit cc7140b

Browse files
DemetrisChrDemetrisChr
authored
RCBC-461: Call extract_expiry_time in to_backend of options instead of constructor (#124)
1 parent a002884 commit cc7140b

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

‎lib/couchbase/options.rb‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ def initialize(expiry: nil,
585585
client_context: nil,
586586
parent_span: nil)
587587
super(timeout: timeout, retry_strategy: retry_strategy, client_context: client_context, parent_span: parent_span)
588-
@expiry = Utils::Time.extract_expiry_time(expiry)
588+
@expiry = expiry
589589
@transcoder = transcoder
590590
if durability_level != :none && (replicate_to != :none || persist_to != :none)
591591
raise ArgumentError, "durability_level conflicts with replicate_to and persist_to options"
@@ -601,7 +601,7 @@ def initialize(expiry: nil,
601601
def to_backend
602602
{
603603
timeout: Utils::Time.extract_duration(@timeout),
604-
expiry: @expiry,
604+
expiry: Utils::Time.extract_expiry_time(@expiry),
605605
durability_level: @durability_level,
606606
persist_to: @persist_to,
607607
replicate_to: @replicate_to,
@@ -668,7 +668,7 @@ def initialize(expiry: nil,
668668
client_context: nil,
669669
parent_span: nil)
670670
super(timeout: timeout, retry_strategy: retry_strategy, client_context: client_context, parent_span: parent_span)
671-
@expiry = Utils::Time.extract_expiry_time(expiry)
671+
@expiry = expiry
672672
@preserve_expiry = preserve_expiry
673673
@transcoder = transcoder
674674
if durability_level != :none && (replicate_to != :none || persist_to != :none)
@@ -684,7 +684,7 @@ def initialize(expiry: nil,
684684
def to_backend
685685
{
686686
timeout: Utils::Time.extract_duration(@timeout),
687-
expiry: @expiry,
687+
expiry: Utils::Time.extract_expiry_time(@expiry),
688688
preserve_expiry: @preserve_expiry,
689689
durability_level: @durability_level,
690690
persist_to: @persist_to,
@@ -752,7 +752,7 @@ def initialize(expiry: nil,
752752
client_context: nil,
753753
parent_span: nil)
754754
super(timeout: timeout, retry_strategy: retry_strategy, client_context: client_context, parent_span: parent_span)
755-
@expiry = Utils::Time.extract_expiry_time(expiry)
755+
@expiry = expiry
756756
@preserve_expiry = preserve_expiry
757757
@transcoder = transcoder
758758
if durability_level != :none && (replicate_to != :none || persist_to != :none)
@@ -768,7 +768,7 @@ def initialize(expiry: nil,
768768
def to_backend
769769
{
770770
timeout: Utils::Time.extract_duration(@timeout),
771-
expiry: @expiry,
771+
expiry: Utils::Time.extract_expiry_time(@expiry),
772772
preserve_expiry: @preserve_expiry,
773773
durability_level: @durability_level,
774774
persist_to: @persist_to,
@@ -839,7 +839,7 @@ def initialize(expiry: nil,
839839
client_context: nil,
840840
parent_span: nil)
841841
super(timeout: timeout, retry_strategy: retry_strategy, client_context: client_context, parent_span: parent_span)
842-
@expiry = Utils::Time.extract_expiry_time(expiry)
842+
@expiry = expiry
843843
@preserve_expiry = preserve_expiry
844844
@transcoder = transcoder
845845
@cas = cas
@@ -856,7 +856,7 @@ def initialize(expiry: nil,
856856
def to_backend
857857
{
858858
timeout: Utils::Time.extract_duration(@timeout),
859-
expiry: @expiry,
859+
expiry: Utils::Time.extract_expiry_time(@expiry),
860860
preserve_expiry: @preserve_expiry,
861861
durability_level: @durability_level,
862862
persist_to: @persist_to,
@@ -938,7 +938,7 @@ def initialize(expiry: nil,
938938
client_context: nil,
939939
parent_span: nil)
940940
super(timeout: timeout, retry_strategy: retry_strategy, client_context: client_context, parent_span: parent_span)
941-
@expiry = Utils::Time.extract_expiry_time(expiry)
941+
@expiry = expiry
942942
@preserve_expiry = preserve_expiry
943943
@store_semantics = store_semantics
944944
@cas = cas
@@ -959,7 +959,7 @@ def initialize(expiry: nil,
959959
def to_backend
960960
{
961961
timeout: Utils::Time.extract_duration(@timeout),
962-
expiry: @expiry,
962+
expiry: Utils::Time.extract_expiry_time(@expiry),
963963
preserve_expiry: @preserve_expiry,
964964
durability_level: @durability_level,
965965
persist_to: @persist_to,
@@ -1386,7 +1386,7 @@ def initialize(delta: 1,
13861386
super(timeout: timeout, retry_strategy: retry_strategy, client_context: client_context, parent_span: parent_span)
13871387
@delta = delta
13881388
@initial = initial
1389-
@expiry = Utils::Time.extract_expiry_time(expiry)
1389+
@expiry = expiry
13901390
if durability_level != :none && (replicate_to != :none || persist_to != :none)
13911391
raise ArgumentError, "durability_level conflicts with replicate_to and persist_to options"
13921392
end
@@ -1410,7 +1410,7 @@ def to_backend
14101410
timeout: Utils::Time.extract_duration(@timeout),
14111411
delta: @delta,
14121412
initial_value: @initial,
1413-
expiry: @expiry,
1413+
expiry: Utils::Time.extract_expiry_time(@expiry),
14141414
durability_level: @durability_level,
14151415
persist_to: @persist_to,
14161416
replicate_to: @replicate_to,
@@ -1480,7 +1480,7 @@ def initialize(delta: 1,
14801480
super(timeout: timeout, retry_strategy: retry_strategy, client_context: client_context, parent_span: parent_span)
14811481
@delta = delta
14821482
@initial = initial
1483-
@expiry = Utils::Time.extract_expiry_time(expiry)
1483+
@expiry = expiry
14841484
if durability_level != :none && (replicate_to != :none || persist_to != :none)
14851485
raise ArgumentError, "durability_level conflicts with replicate_to and persist_to options"
14861486
end
@@ -1504,7 +1504,7 @@ def to_backend
15041504
timeout: Utils::Time.extract_duration(@timeout),
15051505
delta: @delta,
15061506
initial_value: @initial,
1507-
expiry: @expiry,
1507+
expiry: Utils::Time.extract_expiry_time(@expiry),
15081508
durability_level: @durability_level,
15091509
persist_to: @persist_to,
15101510
replicate_to: @replicate_to,

0 commit comments

Comments
 (0)