Будущий переезд на протобуф 4 (пока параллельная с мастером ветка)

pom.xml

@@ -4,13 +4,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>ru.kontur.diadoc</groupId>
     <artifactId>diadocsdk</artifactId>
-    <version>3.25.2</version>
+    <version>4.0.0-rc.6</version>
 
     <packaging>jar</packaging>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <protobuf.version>2.6.1</protobuf.version>
+        <protobuf.version>4.28.1</protobuf.version>
         <httpClient.version>4.5.6</httpClient.version>
         <fluent-hc.version>4.5.10</fluent-hc.version>
         <commons-io.version>2.6</commons-io.version>
@@ -26,7 +26,7 @@
 
         <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
         <os-maven-plugin.version>1.5.0.Final</os-maven-plugin.version>
-        <protobuf-maven-plugin.version>0.5.0</protobuf-maven-plugin.version>
+        <protobuf-maven-plugin.version>0.6.1</protobuf-maven-plugin.version>
     </properties>
 
     <dependencies>

proto/Docflow/BilateralDocflow.proto

@@ -8,6 +8,7 @@ option java_outer_classname = "BilateralDocflowProtos";
 
 message BilateralDocflow
 {
+	option deprecated = true;
 	optional bool IsFinished = 1;
 
 	optional ReceiptDocflow ReceiptDocflow = 2;

proto/Docflow/Docflow.proto

@@ -16,6 +16,7 @@ option java_outer_classname = "DocflowProtos";
 
 message Docflow
 {
+	option deprecated = true;
 	optional bool IsFinished = 1;
 
 	optional SignedAttachment DocumentAttachment = 2;
@@ -47,12 +48,14 @@ message Docflow
 
 message DocflowStatus
 {
+	option deprecated = true;
 	optional DocflowStatusModel PrimaryStatus = 1;
 	optional DocflowStatusModel SecondaryStatus = 2;
 }
 
 message DocflowStatusModel
 {
+	option deprecated = true;
 	optional DocflowStatusSeverity Severity = 1 [default = UnknownDocflowStatusSeverity];
 	optional string StatusText = 2;
 	optional string StatusHint = 3;

proto/Docflow/DocflowApi.proto

@@ -26,6 +26,7 @@ message GetDocflowRequest
 
 message GetDocflowBatchResponse
 {
+	option deprecated = true;
 	repeated DocumentWithDocflow Documents = 1;
 }
 
@@ -49,6 +50,7 @@ message SearchDocflowsRequest
 
 message SearchDocflowsResponse
 {
+	option deprecated = true;
 	repeated DocumentWithDocflow Documents = 1;
 	optional bool HaveMoreDocuments = 2;
 }
@@ -63,12 +65,14 @@ message GetDocflowsByPacketIdRequest
 
 message FetchedDocument
 {
+	option deprecated = true;
 	required DocumentWithDocflow Document = 1;
 	required bytes IndexKey = 2;
 }
 
 message GetDocflowsByPacketIdResponse
 {
+	option deprecated = true;
 	repeated FetchedDocument Documents = 1;
 	optional bytes NextPageIndexKey = 2;
 }
@@ -90,13 +94,15 @@ message GetDocflowEventsRequest
 
 message GetDocflowEventsResponse
 {
+	option deprecated = true;
 	optional int32 TotalCount = 1;
 	repeated DocflowEvent Events = 2;
 	required TotalCountType TotalCountType = 3;
 }
 
 message DocflowEvent
 {
+	option deprecated = true;
 	optional string EventId = 1;
 	optional Timestamp Timestamp = 2;
 	optional DocumentId DocumentId = 3;

proto/Docflow/DocumentInfo.proto

@@ -8,6 +8,7 @@ option java_outer_classname = "DocumentInfoProtos";
 
 message DocumentInfo
 {
+	option deprecated = true;
 	optional DocumentType DocumentType = 1 [default = UnknownDocumentType];
 	optional DocumentDirection DocumentDirection = 2 [default = UnknownDocumentDirection];
 	optional bool IsTest = 3;
@@ -30,12 +31,14 @@ message DocumentInfo
 
 message DocumentDateAndNumber
 {
+	option deprecated = true;
 	optional string DocumentDate = 1;
 	optional string DocumentNumber = 2;
 }
 
 message BasicDocumentInfo
 {
+	option deprecated = true;
 	optional string Total = 1;
 	optional bool NoVat = 2;
 	optional string Vat = 3;
@@ -45,6 +48,7 @@ message BasicDocumentInfo
 
 message InvoiceDocumentInfo
 {
+	option deprecated = true;
 	optional string Total = 1;
 	optional string Vat = 2;
 	optional int32 CurrencyCode = 3;
@@ -53,6 +57,7 @@ message InvoiceDocumentInfo
 
 message InvoiceCorrectionDocumentInfo
 {
+	option deprecated = true;
 	optional string TotalInc = 1;
 	optional string TotalDec = 2;
 	optional string VatInc = 3;
@@ -65,18 +70,21 @@ message InvoiceCorrectionDocumentInfo
 
 message PriceListDocumentInfo
 {
+	option deprecated = true;
 	optional string PriceListEffectiveDate = 1;
 	optional DocumentDateAndNumber ContractDocumentDateAndNumber = 2;
 }
 
 message ContractDocumentInfo
 {
+	option deprecated = true;
 	optional string ContractPrice = 1;
 	optional string ContractType = 2;
 }
 
 message SupplementaryAgreementDocumentInfo
 {
+	option deprecated = true;
 	optional string ContractType = 1;
 	required DocumentDateAndNumber ContractDocumentDateAndNumber = 2;
 	required DocumentDateAndNumber DocumentDateAndNumber = 3;
@@ -85,6 +93,7 @@ message SupplementaryAgreementDocumentInfo
 
 message UniversalTransferDocumentInfo
 {
+	option deprecated = true;
 	optional string Total = 1;
 	optional string Vat = 2;
 	optional int32 CurrencyCode = 3;
@@ -95,6 +104,7 @@ message UniversalTransferDocumentInfo
 
 message UniversalCorrectionDocumentInfo
 {
+	option deprecated = true;
 	optional string TotalInc = 1;
 	optional string TotalDec = 2;
 	optional string VatInc = 3;

proto/Docflow/DocumentWithDocflow.proto

@@ -8,8 +8,11 @@ package Diadoc.Api.Proto.Docflow;
 
 option java_outer_classname = "DocumentWithDocflowProtos";
 
+option deprecated = true;
+
 message DocumentWithDocflow
 {
+	option deprecated = true;
 	optional DocumentId DocumentId = 1;
 	optional string LastEventId = 2;
 	optional Timestamp LastEventTimestamp = 3;

proto/Docflow/InvoiceDocflow.proto

@@ -8,6 +8,7 @@ option java_outer_classname = "InvoiceDocflowProtos";
 
 message InboundInvoiceDocflow
 {
+	option deprecated = true;
 	optional bool IsFinished = 1;
 
 	optional InboundInvoiceReceiptDocflow ReceiptDocflow = 2;
@@ -23,6 +24,7 @@ message InboundInvoiceDocflow
 
 message OutboundInvoiceDocflow
 {
+	option deprecated = true;
 	optional bool IsFinished = 1;
 
 	optional ReceiptDocflow ReceiptDocflow = 2;
@@ -40,6 +42,7 @@ message OutboundInvoiceDocflow
 
 message InvoiceConfirmationDocflow
 {
+	option deprecated = true;
 	optional bool IsFinished = 1;
 
 	optional SignedAttachment ConfirmationAttachment = 2;
@@ -49,6 +52,7 @@ message InvoiceConfirmationDocflow
 
 message InboundInvoiceReceiptDocflow
 {
+	option deprecated = true;
 	optional bool IsFinished = 1;
 
 	optional SignedAttachment ReceiptAttachment = 2;
@@ -58,6 +62,7 @@ message InboundInvoiceReceiptDocflow
 
 message InvoiceCorrectionRequestDocflow
 {
+	option deprecated = true;
 	optional bool IsFinished = 1;
 
 	optional SignedAttachment CorrectionRequestAttachment = 2;

proto/Docflow/ReceiptDocflow.proto

@@ -6,6 +6,8 @@ option java_outer_classname = "ReceiptDocflowProtos";
 
 message ReceiptDocflow
 {
+	option deprecated = true;
+
 	optional bool IsFinished = 1;
 
 	optional SignedAttachment ReceiptAttachment = 2;

proto/Docflow/RecipientSignatureDocflow.proto

@@ -7,6 +7,8 @@ option java_outer_classname = "RecipientSignatureDocflowProtos";
 
 message RecipientSignatureDocflow
 {
+	option deprecated = true;
+
 	optional bool IsFinished = 1;
 
 	optional Signature RecipientSignature = 2;

proto/Docflow/RecipientSignatureRejectionDocflow.proto

@@ -5,8 +5,12 @@ package Diadoc.Api.Proto.Docflow;
 
 option java_outer_classname = "RecipientSignatureRejectionDocflowProtos";
 
+option deprecated = true;
+
 message RecipientSignatureRejectionDocflow
 {
+	option deprecated = true;
+
 	optional bool IsFinished = 1;
 
 	optional SignedAttachment RecipientSignatureRejectionAttachment = 2;

proto/Docflow/RevocationDocflow.proto

@@ -6,8 +6,12 @@ package Diadoc.Api.Proto.Docflow;
 
 option java_outer_classname = "RevocationDocflowProtos";
 
+option deprecated = true;
+
 message RevocationDocflow
 {
+	option deprecated = true;
+
 	optional bool IsFinished = 1;
 
 	optional SignedAttachment RevocationRequestAttachment = 2;

proto/Docflow/UnilateralDocflow.proto

@@ -4,8 +4,12 @@ package Diadoc.Api.Proto.Docflow;
 
 option java_outer_classname = "UnilateralDocflowProtos";
 
+option deprecated = true;
+
 message UnilateralDocflow
 {
+	option deprecated = true;
+
 	optional bool IsFinished = 1;
 
 	optional ReceiptDocflow ReceiptDocflow = 2;

proto/Docflow/UniversalTransferDocumentDocflow.proto

@@ -9,8 +9,11 @@ package Diadoc.Api.Proto.Docflow;
 
 option java_outer_classname = "UniversalTransferDocumentDocflowProtos";
 
+option deprecated = true;
+
 message InboundUniversalTransferDocumentDocflow
 {
+  option deprecated = true;
   optional bool IsFinished = 1;
 
   optional InboundInvoiceReceiptDocflow ReceiptDocflow = 2;
@@ -37,6 +40,7 @@ message InboundUniversalTransferDocumentDocflow
 
 message OutboundUniversalTransferDocumentDocflow
 {
+  option deprecated = true;
   optional bool IsFinished = 1;
 
   optional ReceiptDocflow ReceiptDocflow = 2;

proto/Docflow/XmlBilateralDocflow.proto

@@ -7,8 +7,12 @@ package Diadoc.Api.Proto.Docflow;
 
 option java_outer_classname = "XmlBilateralDocflowProtos";
 
+option deprecated = true;
+
 message XmlBilateralDocflow
 {
+	option deprecated = true;
+
 	optional bool IsFinished = 1;
 
 	optional ReceiptDocflow ReceiptDocflow = 2;
@@ -26,6 +30,7 @@ message XmlBilateralDocflow
 
 message BuyerTitleDocflow
 {
+	option deprecated = true;
 	optional bool IsFinished = 1;
 
 	optional SignedAttachment BuyerTitleAttachment = 2;

proto/Documents/BilateralDocument.proto

@@ -43,6 +43,7 @@ message SupplementaryAgreementMetadata {
 }
 
 message BilateralDocumentMetadata {
+	option deprecated = true;
 	optional BilateralDocumentStatus DocumentStatus = 1 [default = UnknownBilateralDocumentStatus];
 	optional ReceiptStatus ReceiptStatus = 2 [default = UnknownReceiptStatus];
 }

proto/Documents/NonformalizedDocument.proto

@@ -5,6 +5,7 @@ package Diadoc.Api.Proto.Documents.NonformalizedDocument;
 option java_outer_classname = "NonformalizedDocumentProtos";
 
 message NonformalizedDocumentMetadata {
+	option deprecated = true;
 	optional NonformalizedDocumentStatus DocumentStatus = 1 [default = UnknownNonformalizedDocumentStatus];
 	optional ReceiptStatus ReceiptStatus = 2 [default = UnknownReceiptStatus];
 }