From ebc5cfb80d0176ea28acc1bccc1018c6207e8cee Mon Sep 17 00:00:00 2001 From: Noc <6710543+Noctunus@users.noreply.github.com> Date: Wed, 2 Oct 2024 15:59:25 +0200 Subject: [PATCH] Fixing ordering of processing in auto-generation of services to make sure that on every system we get the same result. (#54) Co-authored-by: Noctunus --- .../rpc/generated/register_client_services.go | 154 +++++++-------- .../rpc/generated/register_server_services.go | 44 ++--- internal/rpc/generated/unmarshal.go | 176 +++++++++--------- scripts/generate_grpc_service_handlers.sh | 2 +- 4 files changed, 188 insertions(+), 188 deletions(-) diff --git a/internal/rpc/generated/register_client_services.go b/internal/rpc/generated/register_client_services.go index dadc12a..76135a8 100644 --- a/internal/rpc/generated/register_client_services.go +++ b/internal/rpc/generated/register_client_services.go @@ -11,69 +11,69 @@ import ( func RegisterClientServices(rpcConn *grpc.ClientConn, serviceNames map[string]struct{}) map[types.MessageType]rpc.Service { services := make(map[types.MessageType]rpc.Service, len(serviceNames)) - if _, ok := serviceNames[MintServiceV1]; ok { - services[MintServiceV1Request] = rpc.NewService(NewMintServiceV1(rpcConn), MintServiceV1) - delete(serviceNames, MintServiceV1) - } - if _, ok := serviceNames[ValidationServiceV1]; ok { - services[ValidationServiceV1Request] = rpc.NewService(NewValidationServiceV1(rpcConn), ValidationServiceV1) - delete(serviceNames, ValidationServiceV1) - } - if _, ok := serviceNames[MintServiceV2]; ok { - services[MintServiceV2Request] = rpc.NewService(NewMintServiceV2(rpcConn), MintServiceV2) - delete(serviceNames, MintServiceV2) - } - if _, ok := serviceNames[ValidationServiceV2]; ok { - services[ValidationServiceV2Request] = rpc.NewService(NewValidationServiceV2(rpcConn), ValidationServiceV2) - delete(serviceNames, ValidationServiceV2) - } - if _, ok := serviceNames[TransportSearchServiceV1]; ok { - services[TransportSearchServiceV1Request] = rpc.NewService(NewTransportSearchServiceV1(rpcConn), TransportSearchServiceV1) - delete(serviceNames, TransportSearchServiceV1) + if _, ok := serviceNames[AccommodationProductInfoServiceV1]; ok { + services[AccommodationProductInfoServiceV1Request] = rpc.NewService(NewAccommodationProductInfoServiceV1(rpcConn), AccommodationProductInfoServiceV1) + delete(serviceNames, AccommodationProductInfoServiceV1) } - if _, ok := serviceNames[TransportSearchServiceV2]; ok { - services[TransportSearchServiceV2Request] = rpc.NewService(NewTransportSearchServiceV2(rpcConn), TransportSearchServiceV2) - delete(serviceNames, TransportSearchServiceV2) + if _, ok := serviceNames[AccommodationProductListServiceV1]; ok { + services[AccommodationProductListServiceV1Request] = rpc.NewService(NewAccommodationProductListServiceV1(rpcConn), AccommodationProductListServiceV1) + delete(serviceNames, AccommodationProductListServiceV1) } if _, ok := serviceNames[AccommodationSearchServiceV1]; ok { services[AccommodationSearchServiceV1Request] = rpc.NewService(NewAccommodationSearchServiceV1(rpcConn), AccommodationSearchServiceV1) delete(serviceNames, AccommodationSearchServiceV1) } - if _, ok := serviceNames[AccommodationProductListServiceV1]; ok { - services[AccommodationProductListServiceV1Request] = rpc.NewService(NewAccommodationProductListServiceV1(rpcConn), AccommodationProductListServiceV1) - delete(serviceNames, AccommodationProductListServiceV1) + if _, ok := serviceNames[AccommodationProductInfoServiceV2]; ok { + services[AccommodationProductInfoServiceV2Request] = rpc.NewService(NewAccommodationProductInfoServiceV2(rpcConn), AccommodationProductInfoServiceV2) + delete(serviceNames, AccommodationProductInfoServiceV2) } - if _, ok := serviceNames[AccommodationProductInfoServiceV1]; ok { - services[AccommodationProductInfoServiceV1Request] = rpc.NewService(NewAccommodationProductInfoServiceV1(rpcConn), AccommodationProductInfoServiceV1) - delete(serviceNames, AccommodationProductInfoServiceV1) + if _, ok := serviceNames[AccommodationProductListServiceV2]; ok { + services[AccommodationProductListServiceV2Request] = rpc.NewService(NewAccommodationProductListServiceV2(rpcConn), AccommodationProductListServiceV2) + delete(serviceNames, AccommodationProductListServiceV2) } if _, ok := serviceNames[AccommodationSearchServiceV2]; ok { services[AccommodationSearchServiceV2Request] = rpc.NewService(NewAccommodationSearchServiceV2(rpcConn), AccommodationSearchServiceV2) delete(serviceNames, AccommodationSearchServiceV2) } - if _, ok := serviceNames[AccommodationProductListServiceV2]; ok { - services[AccommodationProductListServiceV2Request] = rpc.NewService(NewAccommodationProductListServiceV2(rpcConn), AccommodationProductListServiceV2) - delete(serviceNames, AccommodationProductListServiceV2) + if _, ok := serviceNames[ActivityProductInfoServiceV1]; ok { + services[ActivityProductInfoServiceV1Request] = rpc.NewService(NewActivityProductInfoServiceV1(rpcConn), ActivityProductInfoServiceV1) + delete(serviceNames, ActivityProductInfoServiceV1) } - if _, ok := serviceNames[AccommodationProductInfoServiceV2]; ok { - services[AccommodationProductInfoServiceV2Request] = rpc.NewService(NewAccommodationProductInfoServiceV2(rpcConn), AccommodationProductInfoServiceV2) - delete(serviceNames, AccommodationProductInfoServiceV2) + if _, ok := serviceNames[ActivityProductListServiceV1]; ok { + services[ActivityProductListServiceV1Request] = rpc.NewService(NewActivityProductListServiceV1(rpcConn), ActivityProductListServiceV1) + delete(serviceNames, ActivityProductListServiceV1) } - if _, ok := serviceNames[SeatMapServiceV1]; ok { - services[SeatMapServiceV1Request] = rpc.NewService(NewSeatMapServiceV1(rpcConn), SeatMapServiceV1) - delete(serviceNames, SeatMapServiceV1) + if _, ok := serviceNames[ActivitySearchServiceV1]; ok { + services[ActivitySearchServiceV1Request] = rpc.NewService(NewActivitySearchServiceV1(rpcConn), ActivitySearchServiceV1) + delete(serviceNames, ActivitySearchServiceV1) } - if _, ok := serviceNames[SeatMapAvailabilityServiceV1]; ok { - services[SeatMapAvailabilityServiceV1Request] = rpc.NewService(NewSeatMapAvailabilityServiceV1(rpcConn), SeatMapAvailabilityServiceV1) - delete(serviceNames, SeatMapAvailabilityServiceV1) + if _, ok := serviceNames[ActivityProductInfoServiceV2]; ok { + services[ActivityProductInfoServiceV2Request] = rpc.NewService(NewActivityProductInfoServiceV2(rpcConn), ActivityProductInfoServiceV2) + delete(serviceNames, ActivityProductInfoServiceV2) } - if _, ok := serviceNames[SeatMapServiceV2]; ok { - services[SeatMapServiceV2Request] = rpc.NewService(NewSeatMapServiceV2(rpcConn), SeatMapServiceV2) - delete(serviceNames, SeatMapServiceV2) + if _, ok := serviceNames[ActivityProductListServiceV2]; ok { + services[ActivityProductListServiceV2Request] = rpc.NewService(NewActivityProductListServiceV2(rpcConn), ActivityProductListServiceV2) + delete(serviceNames, ActivityProductListServiceV2) } - if _, ok := serviceNames[SeatMapAvailabilityServiceV2]; ok { - services[SeatMapAvailabilityServiceV2Request] = rpc.NewService(NewSeatMapAvailabilityServiceV2(rpcConn), SeatMapAvailabilityServiceV2) - delete(serviceNames, SeatMapAvailabilityServiceV2) + if _, ok := serviceNames[ActivitySearchServiceV2]; ok { + services[ActivitySearchServiceV2Request] = rpc.NewService(NewActivitySearchServiceV2(rpcConn), ActivitySearchServiceV2) + delete(serviceNames, ActivitySearchServiceV2) + } + if _, ok := serviceNames[MintServiceV1]; ok { + services[MintServiceV1Request] = rpc.NewService(NewMintServiceV1(rpcConn), MintServiceV1) + delete(serviceNames, MintServiceV1) + } + if _, ok := serviceNames[ValidationServiceV1]; ok { + services[ValidationServiceV1Request] = rpc.NewService(NewValidationServiceV1(rpcConn), ValidationServiceV1) + delete(serviceNames, ValidationServiceV1) + } + if _, ok := serviceNames[MintServiceV2]; ok { + services[MintServiceV2Request] = rpc.NewService(NewMintServiceV2(rpcConn), MintServiceV2) + delete(serviceNames, MintServiceV2) + } + if _, ok := serviceNames[ValidationServiceV2]; ok { + services[ValidationServiceV2Request] = rpc.NewService(NewValidationServiceV2(rpcConn), ValidationServiceV2) + delete(serviceNames, ValidationServiceV2) } if _, ok := serviceNames[CountryEntryRequirementsServiceV1]; ok { services[CountryEntryRequirementsServiceV1Request] = rpc.NewService(NewCountryEntryRequirementsServiceV1(rpcConn), CountryEntryRequirementsServiceV1) @@ -83,21 +83,21 @@ func RegisterClientServices(rpcConn *grpc.ClientConn, serviceNames map[string]st services[CountryEntryRequirementsServiceV2Request] = rpc.NewService(NewCountryEntryRequirementsServiceV2(rpcConn), CountryEntryRequirementsServiceV2) delete(serviceNames, CountryEntryRequirementsServiceV2) } - if _, ok := serviceNames[PingServiceV1]; ok { - services[PingServiceV1Request] = rpc.NewService(NewPingServiceV1(rpcConn), PingServiceV1) - delete(serviceNames, PingServiceV1) - } - if _, ok := serviceNames[InsuranceSearchServiceV1]; ok { - services[InsuranceSearchServiceV1Request] = rpc.NewService(NewInsuranceSearchServiceV1(rpcConn), InsuranceSearchServiceV1) - delete(serviceNames, InsuranceSearchServiceV1) + if _, ok := serviceNames[InsuranceProductInfoServiceV1]; ok { + services[InsuranceProductInfoServiceV1Request] = rpc.NewService(NewInsuranceProductInfoServiceV1(rpcConn), InsuranceProductInfoServiceV1) + delete(serviceNames, InsuranceProductInfoServiceV1) } if _, ok := serviceNames[InsuranceProductListServiceV1]; ok { services[InsuranceProductListServiceV1Request] = rpc.NewService(NewInsuranceProductListServiceV1(rpcConn), InsuranceProductListServiceV1) delete(serviceNames, InsuranceProductListServiceV1) } - if _, ok := serviceNames[InsuranceProductInfoServiceV1]; ok { - services[InsuranceProductInfoServiceV1Request] = rpc.NewService(NewInsuranceProductInfoServiceV1(rpcConn), InsuranceProductInfoServiceV1) - delete(serviceNames, InsuranceProductInfoServiceV1) + if _, ok := serviceNames[InsuranceSearchServiceV1]; ok { + services[InsuranceSearchServiceV1Request] = rpc.NewService(NewInsuranceSearchServiceV1(rpcConn), InsuranceSearchServiceV1) + delete(serviceNames, InsuranceSearchServiceV1) + } + if _, ok := serviceNames[GetNetworkFeeServiceV1]; ok { + services[GetNetworkFeeServiceV1Request] = rpc.NewService(NewGetNetworkFeeServiceV1(rpcConn), GetNetworkFeeServiceV1) + delete(serviceNames, GetNetworkFeeServiceV1) } if _, ok := serviceNames[GetPartnerConfigurationServiceV1]; ok { services[GetPartnerConfigurationServiceV1Request] = rpc.NewService(NewGetPartnerConfigurationServiceV1(rpcConn), GetPartnerConfigurationServiceV1) @@ -107,33 +107,33 @@ func RegisterClientServices(rpcConn *grpc.ClientConn, serviceNames map[string]st services[GetPartnerConfigurationServiceV2Request] = rpc.NewService(NewGetPartnerConfigurationServiceV2(rpcConn), GetPartnerConfigurationServiceV2) delete(serviceNames, GetPartnerConfigurationServiceV2) } - if _, ok := serviceNames[ActivitySearchServiceV1]; ok { - services[ActivitySearchServiceV1Request] = rpc.NewService(NewActivitySearchServiceV1(rpcConn), ActivitySearchServiceV1) - delete(serviceNames, ActivitySearchServiceV1) + if _, ok := serviceNames[PingServiceV1]; ok { + services[PingServiceV1Request] = rpc.NewService(NewPingServiceV1(rpcConn), PingServiceV1) + delete(serviceNames, PingServiceV1) } - if _, ok := serviceNames[ActivityProductListServiceV1]; ok { - services[ActivityProductListServiceV1Request] = rpc.NewService(NewActivityProductListServiceV1(rpcConn), ActivityProductListServiceV1) - delete(serviceNames, ActivityProductListServiceV1) + if _, ok := serviceNames[SeatMapAvailabilityServiceV1]; ok { + services[SeatMapAvailabilityServiceV1Request] = rpc.NewService(NewSeatMapAvailabilityServiceV1(rpcConn), SeatMapAvailabilityServiceV1) + delete(serviceNames, SeatMapAvailabilityServiceV1) } - if _, ok := serviceNames[ActivityProductInfoServiceV1]; ok { - services[ActivityProductInfoServiceV1Request] = rpc.NewService(NewActivityProductInfoServiceV1(rpcConn), ActivityProductInfoServiceV1) - delete(serviceNames, ActivityProductInfoServiceV1) + if _, ok := serviceNames[SeatMapServiceV1]; ok { + services[SeatMapServiceV1Request] = rpc.NewService(NewSeatMapServiceV1(rpcConn), SeatMapServiceV1) + delete(serviceNames, SeatMapServiceV1) } - if _, ok := serviceNames[ActivitySearchServiceV2]; ok { - services[ActivitySearchServiceV2Request] = rpc.NewService(NewActivitySearchServiceV2(rpcConn), ActivitySearchServiceV2) - delete(serviceNames, ActivitySearchServiceV2) + if _, ok := serviceNames[SeatMapAvailabilityServiceV2]; ok { + services[SeatMapAvailabilityServiceV2Request] = rpc.NewService(NewSeatMapAvailabilityServiceV2(rpcConn), SeatMapAvailabilityServiceV2) + delete(serviceNames, SeatMapAvailabilityServiceV2) } - if _, ok := serviceNames[ActivityProductListServiceV2]; ok { - services[ActivityProductListServiceV2Request] = rpc.NewService(NewActivityProductListServiceV2(rpcConn), ActivityProductListServiceV2) - delete(serviceNames, ActivityProductListServiceV2) + if _, ok := serviceNames[SeatMapServiceV2]; ok { + services[SeatMapServiceV2Request] = rpc.NewService(NewSeatMapServiceV2(rpcConn), SeatMapServiceV2) + delete(serviceNames, SeatMapServiceV2) } - if _, ok := serviceNames[ActivityProductInfoServiceV2]; ok { - services[ActivityProductInfoServiceV2Request] = rpc.NewService(NewActivityProductInfoServiceV2(rpcConn), ActivityProductInfoServiceV2) - delete(serviceNames, ActivityProductInfoServiceV2) + if _, ok := serviceNames[TransportSearchServiceV1]; ok { + services[TransportSearchServiceV1Request] = rpc.NewService(NewTransportSearchServiceV1(rpcConn), TransportSearchServiceV1) + delete(serviceNames, TransportSearchServiceV1) } - if _, ok := serviceNames[GetNetworkFeeServiceV1]; ok { - services[GetNetworkFeeServiceV1Request] = rpc.NewService(NewGetNetworkFeeServiceV1(rpcConn), GetNetworkFeeServiceV1) - delete(serviceNames, GetNetworkFeeServiceV1) + if _, ok := serviceNames[TransportSearchServiceV2]; ok { + services[TransportSearchServiceV2Request] = rpc.NewService(NewTransportSearchServiceV2(rpcConn), TransportSearchServiceV2) + delete(serviceNames, TransportSearchServiceV2) } return services } diff --git a/internal/rpc/generated/register_server_services.go b/internal/rpc/generated/register_server_services.go index a08a31f..a83de0f 100644 --- a/internal/rpc/generated/register_server_services.go +++ b/internal/rpc/generated/register_server_services.go @@ -8,35 +8,35 @@ import ( ) func RegisterServerServices(grpcServer *grpc.Server, reqProcessor rpc.ExternalRequestProcessor) { + registerAccommodationProductInfoServiceV1Server(grpcServer, reqProcessor) + registerAccommodationProductListServiceV1Server(grpcServer, reqProcessor) + registerAccommodationSearchServiceV1Server(grpcServer, reqProcessor) + registerAccommodationProductInfoServiceV2Server(grpcServer, reqProcessor) + registerAccommodationProductListServiceV2Server(grpcServer, reqProcessor) + registerAccommodationSearchServiceV2Server(grpcServer, reqProcessor) + registerActivityProductInfoServiceV1Server(grpcServer, reqProcessor) + registerActivityProductListServiceV1Server(grpcServer, reqProcessor) + registerActivitySearchServiceV1Server(grpcServer, reqProcessor) + registerActivityProductInfoServiceV2Server(grpcServer, reqProcessor) + registerActivityProductListServiceV2Server(grpcServer, reqProcessor) + registerActivitySearchServiceV2Server(grpcServer, reqProcessor) registerMintServiceV1Server(grpcServer, reqProcessor) registerValidationServiceV1Server(grpcServer, reqProcessor) registerMintServiceV2Server(grpcServer, reqProcessor) registerValidationServiceV2Server(grpcServer, reqProcessor) - registerTransportSearchServiceV1Server(grpcServer, reqProcessor) - registerTransportSearchServiceV2Server(grpcServer, reqProcessor) - registerAccommodationSearchServiceV1Server(grpcServer, reqProcessor) - registerAccommodationProductListServiceV1Server(grpcServer, reqProcessor) - registerAccommodationProductInfoServiceV1Server(grpcServer, reqProcessor) - registerAccommodationSearchServiceV2Server(grpcServer, reqProcessor) - registerAccommodationProductListServiceV2Server(grpcServer, reqProcessor) - registerAccommodationProductInfoServiceV2Server(grpcServer, reqProcessor) - registerSeatMapServiceV1Server(grpcServer, reqProcessor) - registerSeatMapAvailabilityServiceV1Server(grpcServer, reqProcessor) - registerSeatMapServiceV2Server(grpcServer, reqProcessor) - registerSeatMapAvailabilityServiceV2Server(grpcServer, reqProcessor) registerCountryEntryRequirementsServiceV1Server(grpcServer, reqProcessor) registerCountryEntryRequirementsServiceV2Server(grpcServer, reqProcessor) - registerPingServiceV1Server(grpcServer, reqProcessor) - registerInsuranceSearchServiceV1Server(grpcServer, reqProcessor) - registerInsuranceProductListServiceV1Server(grpcServer, reqProcessor) registerInsuranceProductInfoServiceV1Server(grpcServer, reqProcessor) + registerInsuranceProductListServiceV1Server(grpcServer, reqProcessor) + registerInsuranceSearchServiceV1Server(grpcServer, reqProcessor) + registerGetNetworkFeeServiceV1Server(grpcServer, reqProcessor) registerGetPartnerConfigurationServiceV1Server(grpcServer, reqProcessor) registerGetPartnerConfigurationServiceV2Server(grpcServer, reqProcessor) - registerActivitySearchServiceV1Server(grpcServer, reqProcessor) - registerActivityProductListServiceV1Server(grpcServer, reqProcessor) - registerActivityProductInfoServiceV1Server(grpcServer, reqProcessor) - registerActivitySearchServiceV2Server(grpcServer, reqProcessor) - registerActivityProductListServiceV2Server(grpcServer, reqProcessor) - registerActivityProductInfoServiceV2Server(grpcServer, reqProcessor) - registerGetNetworkFeeServiceV1Server(grpcServer, reqProcessor) + registerPingServiceV1Server(grpcServer, reqProcessor) + registerSeatMapAvailabilityServiceV1Server(grpcServer, reqProcessor) + registerSeatMapServiceV1Server(grpcServer, reqProcessor) + registerSeatMapAvailabilityServiceV2Server(grpcServer, reqProcessor) + registerSeatMapServiceV2Server(grpcServer, reqProcessor) + registerTransportSearchServiceV1Server(grpcServer, reqProcessor) + registerTransportSearchServiceV2Server(grpcServer, reqProcessor) } diff --git a/internal/rpc/generated/unmarshal.go b/internal/rpc/generated/unmarshal.go index 11ff839..5dafcec 100644 --- a/internal/rpc/generated/unmarshal.go +++ b/internal/rpc/generated/unmarshal.go @@ -27,6 +27,54 @@ import ( func UnmarshalContent(src []byte, msgType types.MessageType, destination *protoreflect.ProtoMessage) error { switch msgType { + case AccommodationProductInfoServiceV1Request: + *destination = &accommodationv1.AccommodationProductInfoRequest{} + case AccommodationProductInfoServiceV1Response: + *destination = &accommodationv1.AccommodationProductInfoResponse{} + case AccommodationProductListServiceV1Request: + *destination = &accommodationv1.AccommodationProductListRequest{} + case AccommodationProductListServiceV1Response: + *destination = &accommodationv1.AccommodationProductListResponse{} + case AccommodationSearchServiceV1Request: + *destination = &accommodationv1.AccommodationSearchRequest{} + case AccommodationSearchServiceV1Response: + *destination = &accommodationv1.AccommodationSearchResponse{} + case AccommodationProductInfoServiceV2Request: + *destination = &accommodationv2.AccommodationProductInfoRequest{} + case AccommodationProductInfoServiceV2Response: + *destination = &accommodationv2.AccommodationProductInfoResponse{} + case AccommodationProductListServiceV2Request: + *destination = &accommodationv2.AccommodationProductListRequest{} + case AccommodationProductListServiceV2Response: + *destination = &accommodationv2.AccommodationProductListResponse{} + case AccommodationSearchServiceV2Request: + *destination = &accommodationv2.AccommodationSearchRequest{} + case AccommodationSearchServiceV2Response: + *destination = &accommodationv2.AccommodationSearchResponse{} + case ActivityProductInfoServiceV1Request: + *destination = &activityv1.ActivityProductInfoRequest{} + case ActivityProductInfoServiceV1Response: + *destination = &activityv1.ActivityProductInfoResponse{} + case ActivityProductListServiceV1Request: + *destination = &activityv1.ActivityProductListRequest{} + case ActivityProductListServiceV1Response: + *destination = &activityv1.ActivityProductListResponse{} + case ActivitySearchServiceV1Request: + *destination = &activityv1.ActivitySearchRequest{} + case ActivitySearchServiceV1Response: + *destination = &activityv1.ActivitySearchResponse{} + case ActivityProductInfoServiceV2Request: + *destination = &activityv2.ActivityProductInfoRequest{} + case ActivityProductInfoServiceV2Response: + *destination = &activityv2.ActivityProductInfoResponse{} + case ActivityProductListServiceV2Request: + *destination = &activityv2.ActivityProductListRequest{} + case ActivityProductListServiceV2Response: + *destination = &activityv2.ActivityProductListResponse{} + case ActivitySearchServiceV2Request: + *destination = &activityv2.ActivitySearchRequest{} + case ActivitySearchServiceV2Response: + *destination = &activityv2.ActivitySearchResponse{} case MintServiceV1Request: *destination = &bookv1.MintRequest{} case MintServiceV1Response: @@ -43,54 +91,6 @@ func UnmarshalContent(src []byte, msgType types.MessageType, destination *protor *destination = &bookv2.ValidationRequest{} case ValidationServiceV2Response: *destination = &bookv2.ValidationResponse{} - case TransportSearchServiceV1Request: - *destination = &transportv1.TransportSearchRequest{} - case TransportSearchServiceV1Response: - *destination = &transportv1.TransportSearchResponse{} - case TransportSearchServiceV2Request: - *destination = &transportv2.TransportSearchRequest{} - case TransportSearchServiceV2Response: - *destination = &transportv2.TransportSearchResponse{} - case AccommodationSearchServiceV1Request: - *destination = &accommodationv1.AccommodationSearchRequest{} - case AccommodationSearchServiceV1Response: - *destination = &accommodationv1.AccommodationSearchResponse{} - case AccommodationProductListServiceV1Request: - *destination = &accommodationv1.AccommodationProductListRequest{} - case AccommodationProductListServiceV1Response: - *destination = &accommodationv1.AccommodationProductListResponse{} - case AccommodationProductInfoServiceV1Request: - *destination = &accommodationv1.AccommodationProductInfoRequest{} - case AccommodationProductInfoServiceV1Response: - *destination = &accommodationv1.AccommodationProductInfoResponse{} - case AccommodationSearchServiceV2Request: - *destination = &accommodationv2.AccommodationSearchRequest{} - case AccommodationSearchServiceV2Response: - *destination = &accommodationv2.AccommodationSearchResponse{} - case AccommodationProductListServiceV2Request: - *destination = &accommodationv2.AccommodationProductListRequest{} - case AccommodationProductListServiceV2Response: - *destination = &accommodationv2.AccommodationProductListResponse{} - case AccommodationProductInfoServiceV2Request: - *destination = &accommodationv2.AccommodationProductInfoRequest{} - case AccommodationProductInfoServiceV2Response: - *destination = &accommodationv2.AccommodationProductInfoResponse{} - case SeatMapServiceV1Request: - *destination = &seat_mapv1.SeatMapRequest{} - case SeatMapServiceV1Response: - *destination = &seat_mapv1.SeatMapResponse{} - case SeatMapAvailabilityServiceV1Request: - *destination = &seat_mapv1.SeatMapAvailabilityRequest{} - case SeatMapAvailabilityServiceV1Response: - *destination = &seat_mapv1.SeatMapAvailabilityResponse{} - case SeatMapServiceV2Request: - *destination = &seat_mapv2.SeatMapRequest{} - case SeatMapServiceV2Response: - *destination = &seat_mapv2.SeatMapResponse{} - case SeatMapAvailabilityServiceV2Request: - *destination = &seat_mapv2.SeatMapAvailabilityRequest{} - case SeatMapAvailabilityServiceV2Response: - *destination = &seat_mapv2.SeatMapAvailabilityResponse{} case CountryEntryRequirementsServiceV1Request: *destination = &infov1.CountryEntryRequirementsRequest{} case CountryEntryRequirementsServiceV1Response: @@ -99,22 +99,22 @@ func UnmarshalContent(src []byte, msgType types.MessageType, destination *protor *destination = &infov2.CountryEntryRequirementsRequest{} case CountryEntryRequirementsServiceV2Response: *destination = &infov2.CountryEntryRequirementsResponse{} - case PingServiceV1Request: - *destination = &pingv1.PingRequest{} - case PingServiceV1Response: - *destination = &pingv1.PingResponse{} - case InsuranceSearchServiceV1Request: - *destination = &insurancev1.InsuranceSearchRequest{} - case InsuranceSearchServiceV1Response: - *destination = &insurancev1.InsuranceSearchResponse{} - case InsuranceProductListServiceV1Request: - *destination = &insurancev1.InsuranceProductListRequest{} - case InsuranceProductListServiceV1Response: - *destination = &insurancev1.InsuranceProductListResponse{} case InsuranceProductInfoServiceV1Request: *destination = &insurancev1.InsuranceProductInfoRequest{} case InsuranceProductInfoServiceV1Response: *destination = &insurancev1.InsuranceProductInfoResponse{} + case InsuranceProductListServiceV1Request: + *destination = &insurancev1.InsuranceProductListRequest{} + case InsuranceProductListServiceV1Response: + *destination = &insurancev1.InsuranceProductListResponse{} + case InsuranceSearchServiceV1Request: + *destination = &insurancev1.InsuranceSearchRequest{} + case InsuranceSearchServiceV1Response: + *destination = &insurancev1.InsuranceSearchResponse{} + case GetNetworkFeeServiceV1Request: + *destination = &networkv1.GetNetworkFeeRequest{} + case GetNetworkFeeServiceV1Response: + *destination = &networkv1.GetNetworkFeeResponse{} case GetPartnerConfigurationServiceV1Request: *destination = &partnerv1.GetPartnerConfigurationRequest{} case GetPartnerConfigurationServiceV1Response: @@ -123,34 +123,34 @@ func UnmarshalContent(src []byte, msgType types.MessageType, destination *protor *destination = &partnerv2.GetPartnerConfigurationRequest{} case GetPartnerConfigurationServiceV2Response: *destination = &partnerv2.GetPartnerConfigurationResponse{} - case ActivitySearchServiceV1Request: - *destination = &activityv1.ActivitySearchRequest{} - case ActivitySearchServiceV1Response: - *destination = &activityv1.ActivitySearchResponse{} - case ActivityProductListServiceV1Request: - *destination = &activityv1.ActivityProductListRequest{} - case ActivityProductListServiceV1Response: - *destination = &activityv1.ActivityProductListResponse{} - case ActivityProductInfoServiceV1Request: - *destination = &activityv1.ActivityProductInfoRequest{} - case ActivityProductInfoServiceV1Response: - *destination = &activityv1.ActivityProductInfoResponse{} - case ActivitySearchServiceV2Request: - *destination = &activityv2.ActivitySearchRequest{} - case ActivitySearchServiceV2Response: - *destination = &activityv2.ActivitySearchResponse{} - case ActivityProductListServiceV2Request: - *destination = &activityv2.ActivityProductListRequest{} - case ActivityProductListServiceV2Response: - *destination = &activityv2.ActivityProductListResponse{} - case ActivityProductInfoServiceV2Request: - *destination = &activityv2.ActivityProductInfoRequest{} - case ActivityProductInfoServiceV2Response: - *destination = &activityv2.ActivityProductInfoResponse{} - case GetNetworkFeeServiceV1Request: - *destination = &networkv1.GetNetworkFeeRequest{} - case GetNetworkFeeServiceV1Response: - *destination = &networkv1.GetNetworkFeeResponse{} + case PingServiceV1Request: + *destination = &pingv1.PingRequest{} + case PingServiceV1Response: + *destination = &pingv1.PingResponse{} + case SeatMapAvailabilityServiceV1Request: + *destination = &seat_mapv1.SeatMapAvailabilityRequest{} + case SeatMapAvailabilityServiceV1Response: + *destination = &seat_mapv1.SeatMapAvailabilityResponse{} + case SeatMapServiceV1Request: + *destination = &seat_mapv1.SeatMapRequest{} + case SeatMapServiceV1Response: + *destination = &seat_mapv1.SeatMapResponse{} + case SeatMapAvailabilityServiceV2Request: + *destination = &seat_mapv2.SeatMapAvailabilityRequest{} + case SeatMapAvailabilityServiceV2Response: + *destination = &seat_mapv2.SeatMapAvailabilityResponse{} + case SeatMapServiceV2Request: + *destination = &seat_mapv2.SeatMapRequest{} + case SeatMapServiceV2Response: + *destination = &seat_mapv2.SeatMapResponse{} + case TransportSearchServiceV1Request: + *destination = &transportv1.TransportSearchRequest{} + case TransportSearchServiceV1Response: + *destination = &transportv1.TransportSearchResponse{} + case TransportSearchServiceV2Request: + *destination = &transportv2.TransportSearchRequest{} + case TransportSearchServiceV2Response: + *destination = &transportv2.TransportSearchResponse{} default: return types.ErrUnknownMessageType } diff --git a/scripts/generate_grpc_service_handlers.sh b/scripts/generate_grpc_service_handlers.sh index 560ef12..a30782c 100755 --- a/scripts/generate_grpc_service_handlers.sh +++ b/scripts/generate_grpc_service_handlers.sh @@ -305,7 +305,7 @@ while read file ; do PROTO_INCLUDES_FOR_UNMARSHALLING+=("$PROTO_INCLUDE") echo -done < <(find "$SDK_PATH/cmp/services/" -name "*_grpc.pb.go") +done < <(find "$SDK_PATH/cmp/services/" -name "*_grpc.pb.go" | sort) generate_register_services_server "$REGISTER_SERVICES_SERVER_FILE" SERVICES_TO_REGISTER generate_register_services_client "$REGISTER_SERVICES_CLIENT_FILE" SERVICES_TO_REGISTER