Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Simplify .NET namespaces and make required file name changes (option 1) #170

Closed
wants to merge 2 commits into from
Closed

Simplify .NET namespaces and make required file name changes (option 1) #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a0ec04
Simplify .NET namespaces and make required file name changes
macrogreg Mar 31, 2022
4d299d6
Change `-` in file names to `_`.
macrogreg Apr 13, 2022
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
12 changes: 6 additions & 6 deletions temporal/api/command/v1/message.proto → ...oral/api/command/v1/command_message.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@ option java_package = "io.temporal.api.command.v1";
option java_multiple_files = true;
option java_outer_classname = "MessageProto";
option ruby_package = "Temporal::Api::Command::V1";
option csharp_namespace = "Temporal.Api.Command.V1";
option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";

import "google/protobuf/duration.proto";

import "dependencies/gogoproto/gogo.proto";

import "temporal/api/enums/v1/workflow.proto";
import "temporal/api/enums/v1/command_type.proto";
import "temporal/api/common/v1/message.proto";
import "temporal/api/failure/v1/message.proto";
import "temporal/api/taskqueue/v1/message.proto";
import "temporal/api/enums/v1/enums_workflow.proto";
import "temporal/api/enums/v1/enums_command_type.proto";
import "temporal/api/common/v1/common_message.proto";
import "temporal/api/failure/v1/failure_message.proto";
import "temporal/api/taskqueue/v1/taskqueue_message.proto";

message ScheduleActivityTaskCommandAttributes {
string activity_id = 1;
Expand Down
4 changes: 2 additions & 2 deletions temporal/api/common/v1/message.proto → temporal/api/common/v1/common_message.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ option java_package = "io.temporal.api.common.v1";
option java_multiple_files = true;
option java_outer_classname = "MessageProto";
option ruby_package = "Temporal::Api::Common::V1";
option csharp_namespace = "Temporal.Api.Common.V1";
option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";

import "google/protobuf/duration.proto";

import "dependencies/gogoproto/gogo.proto";

import "temporal/api/enums/v1/common.proto";
import "temporal/api/enums/v1/enums_common.proto";

message DataBlob {
temporal.api.enums.v1.EncodingType encoding_type = 1;
Expand Down
2 changes: 1 addition & 1 deletion temporal/api/enums/v1/command_type.proto → ...ral/api/enums/v1/enums_command_type.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ option java_package = "io.temporal.api.enums.v1";
option java_multiple_files = true;
option java_outer_classname = "CommandTypeProto";
option ruby_package = "Temporal::Api::Enums::V1";
option csharp_namespace = "Temporal.Api.Enums.V1";
option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";

// Whenever this list of command types is changed do change the function shouldBufferEvent in mutableStateBuilder.go to make sure to do the correct event ordering.
enum CommandType {
Expand Down
2 changes: 1 addition & 1 deletion temporal/api/enums/v1/common.proto → temporal/api/enums/v1/enums_common.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ option java_package = "io.temporal.api.enums.v1";
option java_multiple_files = true;
option java_outer_classname = "CommonProto";
option ruby_package = "Temporal::Api::Enums::V1";
option csharp_namespace = "Temporal.Api.Enums.V1";
option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";

enum EncodingType {
ENCODING_TYPE_UNSPECIFIED = 0;
Expand Down
2 changes: 1 addition & 1 deletion temporal/api/enums/v1/event_type.proto → temporal/api/enums/v1/enums_event_type.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ option java_package = "io.temporal.api.enums.v1";
option java_multiple_files = true;
option java_outer_classname = "EventTypeProto";
option ruby_package = "Temporal::Api::Enums::V1";
option csharp_namespace = "Temporal.Api.Enums.V1";
option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";

// Whenever this list of events is changed do change the function shouldBufferEvent in mutableStateBuilder.go to make sure to do the correct event ordering
enum EventType {
Expand Down
2 changes: 1 addition & 1 deletion temporal/api/enums/v1/failed_cause.proto → ...ral/api/enums/v1/enums_failed_cause.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ option java_package = "io.temporal.api.enums.v1";
option java_multiple_files = true;
option java_outer_classname = "FailedCauseProto";
option ruby_package = "Temporal::Api::Enums::V1";
option csharp_namespace = "Temporal.Api.Enums.V1";
option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";

// Workflow tasks can fail for various reasons. Note that some of these reasons can only originate
// from the server, and some of them can only originate from the SDK/worker.
Expand Down
2 changes: 1 addition & 1 deletion temporal/api/enums/v1/namespace.proto → temporal/api/enums/v1/enums_namespace.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ option java_package = "io.temporal.api.enums.v1";
option java_multiple_files = true;
option java_outer_classname = "NamespaceProto";
option ruby_package = "Temporal::Api::Enums::V1";
option csharp_namespace = "Temporal.Api.Enums.V1";
option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";

enum NamespaceState {
NAMESPACE_STATE_UNSPECIFIED = 0;
Expand Down
2 changes: 1 addition & 1 deletion temporal/api/enums/v1/query.proto → temporal/api/enums/v1/enums_query.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ option java_package = "io.temporal.api.enums.v1";
option java_multiple_files = true;
option java_outer_classname = "QueryProto";
option ruby_package = "Temporal::Api::Enums::V1";
option csharp_namespace = "Temporal.Api.Enums.V1";
option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";

enum QueryResultType {
QUERY_RESULT_TYPE_UNSPECIFIED = 0;
Expand Down
2 changes: 1 addition & 1 deletion temporal/api/enums/v1/reset.proto → temporal/api/enums/v1/enums_reset.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ option java_package = "io.temporal.api.enums.v1";
option java_multiple_files = true;
option java_outer_classname = "ResetProto";
option ruby_package = "Temporal::Api::Enums::V1";
option csharp_namespace = "Temporal.Api.Enums.V1";
option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";

// TODO: What is this?
enum ResetReapplyType {
Expand Down
2 changes: 1 addition & 1 deletion temporal/api/enums/v1/task_queue.proto → temporal/api/enums/v1/enums_task_queue.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ option java_package = "io.temporal.api.enums.v1";
option java_multiple_files = true;
option java_outer_classname = "TaskQueueProto";
option ruby_package = "Temporal::Api::Enums::V1";
option csharp_namespace = "Temporal.Api.Enums.V1";
option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";

enum TaskQueueKind {
TASK_QUEUE_KIND_UNSPECIFIED = 0;
Expand Down
2 changes: 1 addition & 1 deletion temporal/api/enums/v1/workflow.proto → temporal/api/enums/v1/enums_workflow.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ option java_package = "io.temporal.api.enums.v1";
option java_multiple_files = true;
option java_outer_classname = "WorkflowProto";
option ruby_package = "Temporal::Api::Enums::V1";
option csharp_namespace = "Temporal.Api.Enums.V1";
option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";

// Defines how new runs of a workflow with a particular ID may or may not be allowed. Note that
// it is *never* valid to have two actively running instances of the same workflow id.
Expand Down
6 changes: 3 additions & 3 deletions temporal/api/errordetails/v1/message.proto → ...rrordetails/v1/errordetails_message.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ option java_package = "io.temporal.api.errordetails.v1";
option java_multiple_files = true;
option java_outer_classname = "MessageProto";
option ruby_package = "Temporal::Api::ErrorDetails::V1";
option csharp_namespace = "Temporal.Api.ErrorDetails.V1";
option csharp_namespace = "Temporal.ServiceApi.V1.DataModel.ErrorDetails";

import "temporal/api/common/v1/message.proto";
import "temporal/api/enums/v1/failed_cause.proto";
import "temporal/api/common/v1/common_message.proto";
import "temporal/api/enums/v1/enums_failed_cause.proto";

message NotFoundFailure {
string current_cluster = 1;
Expand Down
6 changes: 3 additions & 3 deletions temporal/api/failure/v1/message.proto → ...oral/api/failure/v1/failure_message.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ option java_package = "io.temporal.api.failure.v1";
option java_multiple_files = true;
option java_outer_classname = "MessageProto";
option ruby_package = "Temporal::Api::Failure::V1";
option csharp_namespace = "Temporal.Api.Failure.V1";
option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";

import "temporal/api/common/v1/message.proto";
import "temporal/api/enums/v1/workflow.proto";
import "temporal/api/common/v1/common_message.proto";
import "temporal/api/enums/v1/enums_workflow.proto";

message ApplicationFailureInfo {
string type = 1;
Expand Down
4 changes: 2 additions & 2 deletions temporal/api/filter/v1/message.proto → temporal/api/filter/v1/filter_message.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ option java_package = "io.temporal.api.filter.v1";
option java_multiple_files = true;
option java_outer_classname = "MessageProto";
option ruby_package = "Temporal::Api::Filter::V1";
option csharp_namespace = "Temporal.Api.Filter.V1";
option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";

import "google/protobuf/timestamp.proto";

import "dependencies/gogoproto/gogo.proto";

import "temporal/api/enums/v1/workflow.proto";
import "temporal/api/enums/v1/enums_workflow.proto";

message WorkflowExecutionFilter {
string workflow_id = 1;
Expand Down
16 changes: 8 additions & 8 deletions temporal/api/history/v1/message.proto → ...oral/api/history/v1/history_message.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,20 @@ option java_package = "io.temporal.api.history.v1";
option java_multiple_files = true;
option java_outer_classname = "MessageProto";
option ruby_package = "Temporal::Api::History::V1";
option csharp_namespace = "Temporal.Api.History.V1";
option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";

import "google/protobuf/duration.proto";
import "google/protobuf/timestamp.proto";

import "dependencies/gogoproto/gogo.proto";

import "temporal/api/enums/v1/event_type.proto";
import "temporal/api/enums/v1/failed_cause.proto";
import "temporal/api/enums/v1/workflow.proto";
import "temporal/api/common/v1/message.proto";
import "temporal/api/failure/v1/message.proto";
import "temporal/api/workflow/v1/message.proto";
import "temporal/api/taskqueue/v1/message.proto";
import "temporal/api/enums/v1/enums_event_type.proto";
import "temporal/api/enums/v1/enums_failed_cause.proto";
import "temporal/api/enums/v1/enums_workflow.proto";
import "temporal/api/common/v1/common_message.proto";
import "temporal/api/failure/v1/failure_message.proto";
import "temporal/api/workflow/v1/workflow_message.proto";
import "temporal/api/taskqueue/v1/taskqueue_message.proto";

// Always the first event in workflow history
message WorkflowExecutionStartedEventAttributes {
Expand Down
4 changes: 2 additions & 2 deletions temporal/api/namespace/v1/message.proto → .../api/namespace/v1/namespace_message.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ option java_package = "io.temporal.api.namespace.v1";
option java_multiple_files = true;
option java_outer_classname = "MessageProto";
option ruby_package = "Temporal::Api::Namespace::V1";
option csharp_namespace = "Temporal.Api.Namespace.V1";
option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";

import "google/protobuf/duration.proto";
import "google/protobuf/timestamp.proto";

import "dependencies/gogoproto/gogo.proto";

import "temporal/api/enums/v1/namespace.proto";
import "temporal/api/enums/v1/enums_namespace.proto";


message NamespaceInfo {
Expand Down
4 changes: 2 additions & 2 deletions ...operatorservice/v1/request_response.proto → ...v1/operatorservice_request_response.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ option java_package = "io.temporal.api.operatorservice.v1";
option java_multiple_files = true;
option java_outer_classname = "RequestResponseProto";
option ruby_package = "Temporal::Api::OperatorService::V1";
option csharp_namespace = "Temporal.Api.OperatorService.V1";
option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";

import "temporal/api/enums/v1/common.proto";
import "temporal/api/enums/v1/enums_common.proto";

// (-- Search Attribute --)

Expand Down
4 changes: 2 additions & 2 deletions ...oral/api/operatorservice/v1/service.proto → ...rservice/v1/operatorservice_service.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ option java_package = "io.temporal.api.operatorservice.v1";
option java_multiple_files = true;
option java_outer_classname = "ServiceProto";
option ruby_package = "Temporal::Api::OperatorService::V1";
option csharp_namespace = "Temporal.Api.OperatorService.V1";
option csharp_namespace = "Temporal.ServiceApi.V1.OperatorService";


import "temporal/api/operatorservice/v1/request_response.proto";
import "temporal/api/operatorservice/v1/operatorservice_request_response.proto";

// OperatorService API defines how Temporal SDKs and other clients interact with the Temporal server
// to perform administrative functions like registering a search attribute or a namespace.
Expand Down
8 changes: 4 additions & 4 deletions temporal/api/query/v1/message.proto → temporal/api/query/v1/query_message.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ option java_package = "io.temporal.api.query.v1";
option java_multiple_files = true;
option java_outer_classname = "MessageProto";
option ruby_package = "Temporal::Api::Query::V1";
option csharp_namespace = "Temporal.Api.Query.V1";
option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";

import "temporal/api/enums/v1/query.proto";
import "temporal/api/enums/v1/workflow.proto";
import "temporal/api/common/v1/message.proto";
import "temporal/api/enums/v1/enums_query.proto";
import "temporal/api/enums/v1/enums_workflow.proto";
import "temporal/api/common/v1/common_message.proto";

// See https://docs.temporal.io/docs/concepts/queries/
message WorkflowQuery {
Expand Down
4 changes: 2 additions & 2 deletions temporal/api/replication/v1/message.proto → .../replication/v1/replication_message.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ option java_package = "io.temporal.api.replication.v1";
option java_multiple_files = true;
option java_outer_classname = "MessageProto";
option ruby_package = "Temporal::Api::Replication::V1";
option csharp_namespace = "Temporal.Api.Replication.V1";
option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";

import "temporal/api/enums/v1/namespace.proto";
import "temporal/api/enums/v1/enums_namespace.proto";

message ClusterReplicationConfig {
string cluster_name = 1;
Expand Down
4 changes: 2 additions & 2 deletions temporal/api/taskqueue/v1/message.proto → .../api/taskqueue/v1/taskqueue_message.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ option java_package = "io.temporal.api.taskqueue.v1";
option java_multiple_files = true;
option java_outer_classname = "MessageProto";
option ruby_package = "Temporal::Api::TaskQueue::V1";
option csharp_namespace = "Temporal.Api.TaskQueue.V1";
option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";

import "google/protobuf/duration.proto";
import "google/protobuf/timestamp.proto";
import "google/protobuf/wrappers.proto";

import "dependencies/gogoproto/gogo.proto";

import "temporal/api/enums/v1/task_queue.proto";
import "temporal/api/enums/v1/enums_task_queue.proto";

// See https://docs.temporal.io/docs/concepts/task-queues/
message TaskQueue {
Expand Down
4 changes: 2 additions & 2 deletions temporal/api/version/v1/message.proto → ...oral/api/version/v1/version_message.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ option java_package = "io.temporal.api.version.v1";
option java_multiple_files = true;
option java_outer_classname = "MessageProto";
option ruby_package = "Temporal::Api::Version::V1";
option csharp_namespace = "Temporal.Api.Version.V1";
option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";

import "google/protobuf/timestamp.proto";
import "dependencies/gogoproto/gogo.proto";
import "temporal/api/enums/v1/common.proto";
import "temporal/api/enums/v1/enums_common.proto";

// ReleaseInfo contains information about specific version of temporal.
message ReleaseInfo {
Expand Down
10 changes: 5 additions & 5 deletions temporal/api/workflow/v1/message.proto → ...al/api/workflow/v1/workflow_message.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@ option java_package = "io.temporal.api.workflow.v1";
option java_multiple_files = true;
option java_outer_classname = "MessageProto";
option ruby_package = "Temporal::Api::Workflow::V1";
option csharp_namespace = "Temporal.Api.Workflow.V1";
option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";

import "google/protobuf/duration.proto";
import "google/protobuf/timestamp.proto";

import "dependencies/gogoproto/gogo.proto";

import "temporal/api/enums/v1/workflow.proto";
import "temporal/api/common/v1/message.proto";
import "temporal/api/failure/v1/message.proto";
import "temporal/api/taskqueue/v1/message.proto";
import "temporal/api/enums/v1/enums_workflow.proto";
import "temporal/api/common/v1/common_message.proto";
import "temporal/api/failure/v1/failure_message.proto";
import "temporal/api/taskqueue/v1/taskqueue_message.proto";

message WorkflowExecutionInfo {
temporal.api.common.v1.WorkflowExecution execution = 1;
Expand Down
40 changes: 20 additions & 20 deletions ...workflowservice/v1/request_response.proto → ...v1/workflowservice_request_response.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,26 +29,26 @@ option java_package = "io.temporal.api.workflowservice.v1";
option java_multiple_files = true;
option java_outer_classname = "RequestResponseProto";
option ruby_package = "Temporal::Api::WorkflowService::V1";
option csharp_namespace = "Temporal.Api.WorkflowService.V1";

import "temporal/api/enums/v1/workflow.proto";
import "temporal/api/enums/v1/namespace.proto";
import "temporal/api/enums/v1/failed_cause.proto";
import "temporal/api/enums/v1/common.proto";
import "temporal/api/enums/v1/query.proto";
import "temporal/api/enums/v1/reset.proto";
import "temporal/api/enums/v1/task_queue.proto";
import "temporal/api/common/v1/message.proto";
import "temporal/api/history/v1/message.proto";
import "temporal/api/workflow/v1/message.proto";
import "temporal/api/command/v1/message.proto";
import "temporal/api/failure/v1/message.proto";
import "temporal/api/filter/v1/message.proto";
import "temporal/api/namespace/v1/message.proto";
import "temporal/api/query/v1/message.proto";
import "temporal/api/replication/v1/message.proto";
import "temporal/api/taskqueue/v1/message.proto";
import "temporal/api/version/v1/message.proto";
option csharp_namespace = "Temporal.ServiceApi.V1.DataModel";

import "temporal/api/enums/v1/enums_workflow.proto";
import "temporal/api/enums/v1/enums_namespace.proto";
import "temporal/api/enums/v1/enums_failed_cause.proto";
import "temporal/api/enums/v1/enums_common.proto";
import "temporal/api/enums/v1/enums_query.proto";
import "temporal/api/enums/v1/enums_reset.proto";
import "temporal/api/enums/v1/enums_task_queue.proto";
import "temporal/api/common/v1/common_message.proto";
import "temporal/api/history/v1/history_message.proto";
import "temporal/api/workflow/v1/workflow_message.proto";
import "temporal/api/command/v1/command_message.proto";
import "temporal/api/failure/v1/failure_message.proto";
import "temporal/api/filter/v1/filter_message.proto";
import "temporal/api/namespace/v1/namespace_message.proto";
import "temporal/api/query/v1/query_message.proto";
import "temporal/api/replication/v1/replication_message.proto";
import "temporal/api/taskqueue/v1/taskqueue_message.proto";
import "temporal/api/version/v1/version_message.proto";

import "google/protobuf/duration.proto";
import "google/protobuf/timestamp.proto";
Expand Down
4 changes: 2 additions & 2 deletions ...oral/api/workflowservice/v1/service.proto → ...wservice/v1/workflowservice_service.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ option java_package = "io.temporal.api.workflowservice.v1";
option java_multiple_files = true;
option java_outer_classname = "ServiceProto";
option ruby_package = "Temporal::Api::WorkflowService::V1";
option csharp_namespace = "Temporal.Api.WorkflowService.V1";
option csharp_namespace = "Temporal.ServiceApi.V1.WorkflowService";


import "temporal/api/workflowservice/v1/request_response.proto";
import "temporal/api/workflowservice/v1/workflowservice_request_response.proto";

// WorkflowService API defines how Temporal SDKs and other clients interact with the Temporal server
// to create and interact with workflows and activities.
Expand Down