Consuming proto files for 0.6.0 dapr runtime and updating DaprClient …

…for it. (#274)
dapr · Mar 31, 2020 · d8157b9 · d8157b9
1 parent 20fabb2
commit d8157b9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 53 deletions.
diff --git a/src/Dapr.Client/DaprClientGrpc.cs b/src/Dapr.Client/DaprClientGrpc.cs
@@ -364,7 +364,7 @@ internal async ValueTask MakeSaveStateCallAsync<TValue>(
 
             if (stateOptions != null)
             {
-                stateRequest.Options = ToAutoGeneratedStateRequestOptions(stateOptions);
+                stateRequest.Options = ToAutoGeneratedStateOptions(stateOptions);
             }
 
             if (value != null)
@@ -506,44 +506,6 @@ private async Task<TResponse> MakeGrpcCallHandleError<TResponse>(Func<CallOption
             return await callFunc.Invoke(callOptions);
         }
 
-        private StateRequestOptions ToAutoGeneratedStateRequestOptions(StateOptions stateOptions)
-        {
-            var stateRequestOptions = new Autogenerated.StateRequestOptions();
-
-            if (stateOptions.Consistency != null)
-            {
-                stateRequestOptions.Consistency = GetStringForConsistencyMode(stateOptions.Consistency.Value);
-            }
-
-            if (stateOptions.Concurrency != null)
-            {
-                stateRequestOptions.Concurrency = GetStringForConcurrencyMode(stateOptions.Concurrency.Value);
-            }
-
-            if (stateOptions.RetryOptions != null)
-            {
-                var retryPolicy = new Autogenerated.StateRetryPolicy();
-                if (stateOptions.RetryOptions.RetryMode != null)
-                {
-                    retryPolicy.Pattern = GetStringForRetryMode(stateOptions.RetryOptions.RetryMode.Value);
-                }
-
-                if (stateOptions.RetryOptions.RetryInterval != null)
-                {
-                    retryPolicy.Interval = Duration.FromTimeSpan(stateOptions.RetryOptions.RetryInterval.Value);
-                }
-
-                if (stateOptions.RetryOptions.RetryThreshold != null)
-                {
-                    retryPolicy.Threshold = stateOptions.RetryOptions.RetryThreshold.Value;
-                }
-
-                stateRequestOptions.RetryPolicy = retryPolicy;
-            }
-
-            return stateRequestOptions;
-        }
-
         private Autogenerated.StateOptions ToAutoGeneratedStateOptions(StateOptions stateOptions)
         {
             var stateRequestOptions = new Autogenerated.StateOptions();

diff --git a/src/Dapr.Client/Protos/dapr.proto b/src/Dapr.Client/Protos/dapr.proto
@@ -104,17 +104,5 @@ message StateRequest {
   google.protobuf.Any value = 2;
   string etag = 3;
   map<string,string> metadata = 4;
-  StateRequestOptions options = 5;
-}
-
-message StateRequestOptions {
-  string concurrency = 1;
-  string consistency = 2;
-  StateRetryPolicy retryPolicy = 3;
-}
-
-message StateRetryPolicy {
-  int32 threshold = 1;
-  string pattern = 2;
-  google.protobuf.Duration interval = 3;
+  StateOptions options = 5;
 }
diff --git a/src/Dapr.Client/Protos/daprclient.proto b/src/Dapr.Client/Protos/daprclient.proto
@@ -73,4 +73,4 @@ message RetryPolicy {
   int32 threshold = 1;
   string pattern = 2;
   google.protobuf.Duration interval = 3;
-}
+}