@restorecommerce/protos 0.4.6 → 0.4.11

package/CHANGELOG.md

@@ -3,6 +3,63 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.4.11](https://github.com/restorecommerce/libs/compare/@restorecommerce/protos@0.4.10...@restorecommerce/protos@0.4.11) (2021-12-09)
+
+
+### Bug Fixes
+
+* **protos:** updated access_control proto to include `obligation` in isAllowed and whatIsAllowed response. ([c2af601](https://github.com/restorecommerce/libs/commit/c2af60104bf8cbcde9296ee99a374b6bdddb132a))
+
+
+
+
+
+## [0.4.10](https://github.com/restorecommerce/libs/compare/@restorecommerce/protos@0.4.9...@restorecommerce/protos@0.4.10) (2021-12-06)
+
+
+### Bug Fixes
+
+* **protos:** fixed import and reference errors ([6efb6b1](https://github.com/restorecommerce/libs/commit/6efb6b1954bf6449f8c58e267f959b22c45e8066))
+* **protos:** updated graph proto to include operation status ([dcf0a39](https://github.com/restorecommerce/libs/commit/dcf0a3920bcfd098efdd42d6186864359025b1fd))
+
+
+
+
+
+## [0.4.9](https://github.com/restorecommerce/libs/compare/@restorecommerce/protos@0.4.8...@restorecommerce/protos@0.4.9) (2021-11-08)
+
+
+### Bug Fixes
+
+* **protos:** rename sourcePath to sourceObject for Move api ([11c5049](https://github.com/restorecommerce/libs/commit/11c504939fc22005c22dc28b3b6886684a1224c3))
+
+
+
+
+
+## [0.4.8](https://github.com/restorecommerce/libs/compare/@restorecommerce/protos@0.4.7...@restorecommerce/protos@0.4.8) (2021-11-05)
+
+
+### Bug Fixes
+
+* **protos:** fix move response ([c6c16c1](https://github.com/restorecommerce/libs/commit/c6c16c1b0f86656fc29a240876fde9207debd335))
+* **protos:** updated ostorage protos listRequest adding max_keys and prefix, added move api ([9854365](https://github.com/restorecommerce/libs/commit/9854365e7ba486edce922704af7539a5ba9a1095))
+
+
+
+
+
+## [0.4.7](https://github.com/restorecommerce/libs/compare/@restorecommerce/protos@0.4.6...@restorecommerce/protos@0.4.7) (2021-10-25)
+
+
+### Bug Fixes
+
+* **protos:** restructured payment proto ([b5a8703](https://github.com/restorecommerce/libs/commit/b5a8703a7818cc233e579fa9bb0e5f0bba8b0492))
+
+
+
+
+
 ## [0.4.6](https://github.com/restorecommerce/libs/compare/@restorecommerce/protos@0.4.5...@restorecommerce/protos@0.4.6) (2021-10-19)
 
 

package/io/restorecommerce/access_control.proto

@@ -6,6 +6,7 @@ import "google/protobuf/any.proto";
 import "io/restorecommerce/rule.proto";
 import "io/restorecommerce/policy_set.proto";
 import "io/restorecommerce/status.proto";
+import "io/restorecommerce/attribute.proto";
 
 /**
 * Access control service interface.
@@ -32,14 +33,15 @@ message Response {
     INDETERMINATE = 3;
   }
   Decision decision = 1;
-  string obligation = 2;
+  repeated io.restorecommerce.attribute.Attribute obligation = 2;
   bool evaluation_cacheable = 3;
   io.restorecommerce.status.OperationStatus operation_status = 4;
 }
 
 message ReverseQuery {
   repeated io.restorecommerce.policy_set.PolicySetRQ policy_sets = 1;
-  io.restorecommerce.status.OperationStatus operation_status = 2;
+  repeated io.restorecommerce.attribute.Attribute obligation = 2;
+  io.restorecommerce.status.OperationStatus operation_status = 3;
 }
 
 service Service {

package/io/restorecommerce/fulfillment.proto

@@ -6,6 +6,9 @@ import "google/protobuf/any.proto";
 import "io/restorecommerce/resource_base.proto";
 import "io/restorecommerce/auth.proto";
 import "io/restorecommerce/status.proto";
+import "io/restorecommerce/address.proto";
+import "io/restorecommerce/country.proto";
+import "io/restorecommerce/meta.proto";
 
 /**
 Microservice definition.
@@ -52,20 +55,6 @@ service Service {
   rpc Delete (io.restorecommerce.resourcebase.DeleteRequest) returns (io.restorecommerce.resourcebase.DeleteResponse);
 }
 
-enum AddressType {
-  Standard = 0;
-  DHL_Packstation = 1;
-  DHL_Postfiliale = 2;
-  //UPS_Whatever
-}
-
-enum LabelType {
-  Default = 0;
-  URL = 1;
-  PDF = 2;
-  Image = 3;
-}
-
 enum State {
   Incomplete = 0;
   Ordered = 1;
@@ -86,36 +75,52 @@ message Contact {
   string phone = 3;
 }
 
+message Branch {
+  string branch_number = 1;
+  string post_number = 2;
+}
+
+message Packstation {
+  string station_number = 1;
+  string post_number = 2;
+}
+
 message Address {
-  AddressType address_type = 1;
+  string title = 1;
   repeated string name = 2;
-  string street = 3;
-  string number = 4;
-  string addition = 5;
-  string zip = 6;
-  string city = 7;
-  Origin origin = 8;
-  Contact contact = 9;
+  oneof type {
+    io.restorecommerce.address.Address address = 3;
+    Packstation packstation = 4;
+    Branch branch = 5;
+  };
+  io.restorecommerce.country.Country country = 6;
+  Contact contact = 7;
 }
 
 message Parcel {
-  float weight = 1;
-  float width = 2;
-  float length = 3;
-  float height = 4;
+  int32 quantity = 1;
+  float weight = 2;
+  float height = 3;
+  float width = 4;
+  float length = 5;
 }
 
 message Order {
-  string uks_id = 1; //id from external services for reference
-  repeated Parcel parcels = 4;
-  Address sender = 6;
-  Address receiver = 7;
-  string notify = 8;
+  repeated Parcel parcels = 1;
+  Address sender = 2;
+  Address receiver = 3;
+  string notify = 5;
 }
 
 message Label {
-  LabelType type = 1;
-  string data = 2; //Could be an URL, base64 or bytes of i.e. a PDF or PNG...
+  oneof type {
+    string url = 1;
+    string pdf = 2;
+    string png = 3;
+  }
+  string shipment_id = 4; //filled on Order
+  State state = 5; //update by Track
+  io.restorecommerce.status.Status status = 6; //API status
 }
 
 message Event {
@@ -148,10 +153,7 @@ message Fulfillment {
   string product_id = 3;
   Order order = 4;
   io.restorecommerce.meta.Meta meta = 5;
-  string shipment_id = 6; //filled on Order
-  Label label = 7; //filled on Order
-  State state = 8; //update by Track
-  io.restorecommerce.status.Status status = 9; //API status
+  Label label = 6; //filled on Order
 }
 
 message FulfillmentResponse {
@@ -195,4 +197,8 @@ message CancelRequestList {
 message CancelResultList {
   repeated io.restorecommerce.status.Status items = 1;
   io.restorecommerce.status.OperationStatus operation_status = 2;
+}
+
+message Deleted {
+  string id = 1;
 }

package/io/restorecommerce/fulfillment_courier.proto

@@ -6,7 +6,7 @@ import "io/restorecommerce/resource_base.proto";
 import "io/restorecommerce/meta.proto";
 import "io/restorecommerce/auth.proto";
 import "io/restorecommerce/status.proto";
-import "io/restorecommerce/fulfillment_courier_dhl.proto";
+import "google/protobuf/any.proto";
 
 /**
 Microservice defination   
@@ -22,15 +22,12 @@ service Service {
 
 message Courier {
   string id = 1;
-  string uks_id = 2;
   string name = 4;
   string description = 5;
   string logo = 6;
   string website = 7;
-  //google.protobuf.Any data = 8;
-  oneof type {
-    io.restorecommerce.fulfillment_courier_dhl.Setting DHL = 8;
-  }
+  string stub_type = 8;
+  google.protobuf.Any configuration = 9;
   io.restorecommerce.meta.Meta meta = 10;
 }
 
@@ -50,3 +47,7 @@ message CourierResponseList  {
   uint32 total_count = 2;
   io.restorecommerce.status.OperationStatus operation_status = 3;
 }
+
+message Deleted {
+  string id = 1;
+}

package/io/restorecommerce/fulfillment_product.proto

@@ -6,7 +6,9 @@ import "io/restorecommerce/resource_base.proto";
 import "io/restorecommerce/meta.proto";
 import "io/restorecommerce/auth.proto";
 import "io/restorecommerce/status.proto";
-import "io/restorecommerce/fulfillment_courier_dhl.proto";
+import "io/restorecommerce/fulfillment.proto";
+import "io/restorecommerce/country.proto";
+import "io/restorecommerce/attribute.proto";
 
 /**
 Microservice defination
@@ -14,22 +16,67 @@ Microservice defination
 
 service Service {
   rpc Read (io.restorecommerce.resourcebase.ReadRequest) returns (ProductResponseList);
+  rpc Find (QueryList) returns (ProductResponseList);
+/*      - start_address
+      - destination_address
+      - good[]:
+        - quantity
+        - weight
+        - height
+        - width
+        - depth*/
+
   rpc Create (ProductList) returns (ProductResponseList);
   rpc Update (ProductList) returns (ProductResponseList);
   rpc Upsert (ProductList) returns (ProductResponseList);
   rpc Delete (io.restorecommerce.resourcebase.DeleteRequest) returns (io.restorecommerce.resourcebase.DeleteResponse);
 }
 
+message Good {
+  double quantity = 1;
+  double weight = 2;
+  double height = 3;
+  double width = 4;
+  double length = 5;
+}
+
+message Query {
+  io.restorecommerce.fulfillment.Address sender = 1;
+  io.restorecommerce.fulfillment.Address receiver  = 2;
+  repeated Good good = 3;
+}
+
+message QueryList {
+  repeated Query items = 1;
+  uint32 total_count = 2;
+  io.restorecommerce.auth.Subject subject = 3;
+}
+
 message Product {
   string id = 1;
-  string uks_id = 2;
-  string courier_id = 3;
-  string name = 4;
-  string description = 5;
-  io.restorecommerce.meta.Meta meta = 6;
-  oneof type {
-    io.restorecommerce.fulfillment_courier_dhl.Product DHL = 7;
-  }
+  string name = 2;
+  string description = 3;
+  string courier_id = 4;
+  repeated io.restorecommerce.country.Country start_country = 5;
+  repeated string start_zone = 6;
+  repeated io.restorecommerce.country.Country destination_country = 7;
+  repeated string destination_zone = 8;
+  repeated string tax_id = 9;
+  repeated io.restorecommerce.attribute.Attribute attributes = 10;
+  repeated Variant variants = 11;
+  io.restorecommerce.meta.Meta meta = 12;
+}
+
+message Variant {
+  string id = 1;
+  string name = 2;
+  string description = 3;
+  double price = 4;
+  double max_weight = 5;
+  double max_width = 6;
+  double max_height = 7;
+  double max_length = 8;
+  double max_volume = 9;
 }
 
 message ProductList {
@@ -47,4 +94,8 @@ message ProductResponseList {
   repeated ProductResponse items = 1;
   uint32 total_count = 2;
   io.restorecommerce.status.OperationStatus operation_status = 3;
+}
+
+message Deleted {
+  string id = 1;
 }

package/io/restorecommerce/graph.proto

@@ -2,6 +2,7 @@ syntax = "proto3";
 package io.restorecommerce.graph;
 import "google/protobuf/any.proto";
 import "io/restorecommerce/auth.proto";
+import "io/restorecommerce/status.proto";
 
 // Service provides the CRUD operations
 service Service {
@@ -33,6 +34,7 @@ message TraversalResponse {
   repeated VertexFields vertex_fields = 1;
   google.protobuf.Any paths = 2;
   google.protobuf.Any data = 3;
+  io.restorecommerce.status.OperationStatus operation_status = 4;
 }
 
 message VertexFields {

package/io/restorecommerce/order.proto

@@ -40,13 +40,14 @@ message Order {
   string name = 3;
   string description = 4;
   string status = 5;
-  repeated Items items = 6;
+  string customer_reference = 6;
+  repeated Items items = 7;
   // sum of all the quantity_price will be total_price
-  double total_price = 7;
+  double total_price = 8;
   // shipping address
-  string shipping_contact_point_id = 8;
-  string billing_contact_point_id = 9;
-  double total_weight_in_kg = 10;
+  string shipping_contact_point_id = 9;
+  string billing_contact_point_id = 10;
+  double total_weight_in_kg = 11;
 }
 
 message Items {

package/io/restorecommerce/ostorage.proto

@@ -15,15 +15,16 @@ service Service {
   rpc Put (stream Object) returns (PutResponse);
   rpc Delete (DeleteRequest) returns (io.restorecommerce.resourcebase.DeleteResponse);
   rpc List (ListRequest) returns (ListResponse);
-  rpc Copy (CopyRequest) returns (CopyResponse);
+  rpc Copy (CopyRequestList) returns (CopyResponseList);
+  rpc Move (MoveRequestList) returns (MoveResponseList);
 }
 
-message CopyRequest {
+message CopyRequestList {
   repeated CopyRequestItem items = 1;
   io.restorecommerce.auth.Subject subject = 2;
 }
 
-message CopyResponse {
+message CopyResponseList {
   repeated copyResponsePayloadWithStatus response = 1;
   io.restorecommerce.status.OperationStatus operation_status = 2;
 }
@@ -142,6 +143,8 @@ message ListRequest {
   string bucket = 1;
   io.restorecommerce.filter.FilterOp filters = 2; /// Filter based on fieldName|operation, value|list
   io.restorecommerce.auth.Subject subject = 3;
+  int32 max_keys = 4;
+  string prefix = 5;
 }
 
 // OstorageMessage is used for emitting
@@ -152,3 +155,34 @@ message OstorageMessage {
   google.protobuf.Any metadata = 3;
   io.restorecommerce.auth.Subject subject = 4;
 }
+
+message MoveRequestList {
+  repeated MoveRequestItem items = 1;
+  io.restorecommerce.auth.Subject subject = 2;
+}
+
+message MoveRequestItem {
+  string bucket = 1; // destination bucket name
+  string sourceObject = 2; // source object with bucket name
+  string key = 3; // destination key name
+  io.restorecommerce.meta.Meta meta = 4;
+  Options options = 5;
+}
+
+message MoveResponseList {
+  repeated MoveResponsePayloadWithStatus response = 1;
+  io.restorecommerce.status.OperationStatus operation_status = 2;
+}
+
+message MoveResponsePayloadWithStatus {
+  MoveResponseItem payload = 1;
+  io.restorecommerce.status.Status status = 2;
+}
+
+message MoveResponseItem {
+  string bucket = 1;
+  string sourceObject = 2;
+  string key = 3;
+  io.restorecommerce.meta.Meta meta = 4;
+  Options options = 5;
+}

package/io/restorecommerce/payment.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 package io.restorecommerce.payment;
-import "google/protobuf/wrappers.proto";
 import "io/restorecommerce/auth.proto";
+import "io/restorecommerce/status.proto";
  
 service Service {
   // Wrapper for setup_authorization in ActiveMerchant
@@ -36,12 +36,21 @@ message SetupRequest {
   io.restorecommerce.auth.Subject subject = 12;
 }
 
+message SetupPayload {
+  string token = 1;
+  string confirm_initiation_url = 2;
+  string initiated_on = 3;
+}
+
+message SetupPayloadStatus {
+  SetupPayload payload = 1;
+  io.restorecommerce.status.Status status = 2;
+}
+
 // Response object for setup calls.
 message SetupResponse {
-  repeated PaymentError payment_errors = 1;
-  string token = 2;
-  string confirm_initiation_url = 3;
-  string initiated_on = 4;
+  SetupPayloadStatus item = 1;
+  io.restorecommerce.status.OperationStatus operation_status = 2;
 }
 
 // Request object for authorization or purchase call for cardless payment.
@@ -64,12 +73,21 @@ message CaptureRequest {
   io.restorecommerce.auth.Subject subject = 5;
 }
 
+message PaymentPayload {
+  string payment_id = 1;
+  string executed_on = 2;
+}
+
+message PaymentPayloadStatus {
+  PaymentPayload payload = 1;
+  io.restorecommerce.status.Status status = 2;
+}
+
 // Unified response object for authorization, purchase and capture calls
 // for both standard and cardless payments.
 message PaymentResponse {
-  repeated PaymentError payment_errors = 1;
-  string payment_id = 2;
-  string executed_on = 3;
+  PaymentPayloadStatus item = 1;
+  io.restorecommerce.status.OperationStatus operation_status = 2;
 }
 
 // Used for building ActiveMerchant::Billing::CreditCard instance.
@@ -90,21 +108,155 @@ message Item {
   int32 amount = 4;
 }
 
-// Error details.
-message PaymentError {
-  bool killed = 1;
-  int32 code = 2;
-  google.protobuf.StringValue signal = 3;
-  string cmd = 4;
-  string stdout = 5;
-  string stderr = 6;
-}
-
 // Possible service providers. Provider names must be exactly as in config.yml.
 enum Provider {
   NO_PROVIDER = 0;
-  PaypalExpressGateway = 1;
-  AuthorizeNetGateway = 2;
+  Adyen = 1;
+  AuthorizeNetCIM = 2;
+  AuthorizeNet = 3;
+  AxcessMS = 4;
+  Balanced = 5;
+  BamboraAsiaPacific = 6;
+  BankFrick = 7;
+  Banwire = 8;
+  BarclaysePDQExtraPlus = 9;
+  Be2Bill = 10;
+  Beanstreamcom = 11;
+  BluePay = 12;
+  Borgun = 13;
+  Braintree = 14;
+  BridgePay = 15;
+  Cardknox = 16;
+  CardSave = 17;
+  CardStream = 18;
+  Cashnet = 19;
+  Cecabank = 20;
+  Cenpos = 21;
+  CAMSCentralAccountManagementSystem = 22;
+  Checkoutcom = 23;
+  Clearhaus = 24;
+  Commercegate = 25;
+  Conekta = 26;
+  CyberSource = 27;
+  DIBS = 28;
+  DataCash = 29;
+  Efsnet = 30;
+  ElavonMyVirtualMerchant = 31;
+  ePay = 32;
+  EVOCanada = 33;
+  eWAY = 34;
+  eWAYRapid = 35;
+  Exact = 36;
+  Ezic = 37;
+  FatZebra = 38;
+  FederatedCanada = 39;
+  FinansbankWebPOS = 40;
+  Flo2Cash = 41;
+  stPayGatewayNet = 42;
+  FirstDataGlobalGatewaye4 = 43;
+  FirstGiving = 44;
+  GarantiSanalPOS = 45;
+  GlobalTransport = 46;
+  HDFC = 47;
+  HeartlandPaymentSystems = 48;
+  iATSPayments = 49;
+  InspireCommerce = 50;
+  InstaPay = 51;
+  IPP = 52;
+  Iridium = 53;
+  iTransact = 54;
+  JetPay = 55;
+  Komoju = 56;
+  LinkPoint = 57;
+  LitleCo = 58;
+  maxiPago = 59;
+  MerchanteSolutions = 60;
+  MerchantOneGateway = 61;
+  MerchantWARE = 62;
+  MerchantWarrior = 63;
+  Mercury = 64;
+  MetricsGlobal = 65;
+  MasterCardInternetGatewayServiceMiGS = 66;
+  ModernPayments = 67;
+  MONEI = 68;
+  Moneris = 69;
+  MoneyMovers = 70;
+  NABTransact = 71;
+  NELiXTransaX = 72;
+  NetRegistry = 73;
+  BBSNetaxept = 74;
+  NETbilling = 75;
+  NETPAYGateway = 76;
+  NMI = 77;
+  Ogone = 78;
+  Omise = 79;
+  Openpay = 80;
+  OptimalPayments = 81;
+  OrbitalPaymentech = 82;
+  Pagarme = 83;
+  PagoFacil = 84;
+  PayConex = 85;
+  PayGatePayXML = 86;
+  PayHub = 87;
+  PayJunction = 89;
+  PaySecure = 90;
+  PayboxDirect = 91;
+  Payeezy = 92;
+  Payex = 93;
+  PaymentExpress = 94;
+  PAYMILL = 95;
+  PayPalExpressCheckout = 96;
+  PayPalExpressCheckoutUK = 97;
+  PayPalPayflowPro = 98;
+  PayPalPaymentsProUS = 99;
+  PayPalPaymentsProUK = 100;
+  PayPalWebsitePaymentsProCA = 101;
+  PayPalExpressCheckoutforDigitalGoods = 102;
+  Payscout = 103;
+  Paystation = 104;
+  PayWay = 105;
+  PayUIndia = 106;
+  PinPayments = 107;
+  PlugnPay = 108;
+  Psigate = 109;
+  PSLPaymentSolutions = 110;
+  QuickBooksMerchantServices = 111;
+  QuickBooksPayments = 112;
+  QuantumGateway = 113;
+  QuickPay = 114;
+  Qvalent = 115;
+  Raven = 116;
+  Realex = 117;
+  Redsys = 118;
+  S5 = 119;
+  SagePay = 120;
+  SagePaymentSolutions = 121;
+  SallieMae = 122;
+  SecureNet = 123;
+  SecurePay = 124;
+  SecurePayTech = 125;
+  SecurionPay = 126;
+  SkipJack = 127;
+  SoEasyPay = 128;
+  Spreedly = 129;
+  Stripe = 130;
+  Swipe = 131;
+  TNS = 132;
+  TransactPro = 133;
+  TransFirst = 134;
+  Transnational = 135;
+  Trexle = 136;
+  TrustCommerce = 137;
+  USAePay = 138;
+  VancoPaymentSolutions = 139;
+  Verifi = 140;
+  ViaKLIX = 141;
+  WebPay = 142;
+  WePay = 143;
+  Wirecard = 144;
+  WorldpayGlobal = 145;
+  WorldpayOnline = 146;
+  WorldpayUS = 147;
 }
 
 // Possible payment identifiers.

package/io/restorecommerce/product.proto

@@ -7,6 +7,7 @@ import "io/restorecommerce/meta.proto";
 import "io/restorecommerce/image.proto";
 import "io/restorecommerce/auth.proto";
 import "io/restorecommerce/status.proto";
+import "io/restorecommerce/attribute.proto";
 
 service Service {
   rpc Read (io.restorecommerce.resourcebase.ReadRequest) returns (ProductListResponse);
@@ -37,7 +38,7 @@ message Product {
     Identifier prototype = 6;
     Identifier category = 7;
   }
-  repeated string tax_type_id = 8;
+  repeated string tax_id = 8;
   repeated Variant variants = 9;
   string gtin = 10;
 }
@@ -73,12 +74,8 @@ message Variant {
   double sale_price = 7;
   repeated io.restorecommerce.image.Image image = 8;
   string stock_keeping_unit = 9;
-  repeated VariantAttribute attributes = 10;
-}
-
-message VariantAttribute {
-  string key = 1;
-  repeated string values = 2;
+  string template_variant = 10;
+  repeated io.restorecommerce.attribute.Attribute attributes = 11;
 }
 
 message Bundle {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@restorecommerce/protos",
-  "version": "0.4.6",
+  "version": "0.4.11",
   "description": "Protobuf descriptors for Restorecommerce services",
   "author": "n-fuse GmbH",
   "repository": {
@@ -15,5 +15,5 @@
     "protobufs"
   ],
   "scripts": {},
-  "gitHead": "56d4bf46c83c5cc8993629fc1ec5adad15761cab"
+  "gitHead": "162ea83a0b06d629c84f760e69bb07ca412800fe"
 }

package/io/restorecommerce/fulfillment_courier_dhl.proto

@@ -1,37 +0,0 @@
-syntax = "proto3";
-
-package io.restorecommerce.fulfillment_courier_dhl;
-
-message Auth {
-  string user = 1;
-  string signature = 2;
-}
-
-message WSDLHeader {
-  Auth Authentification = 1;
-}
-
-message Ordering {
-  string wsdl = 1;
-  string endpoint = 2;
-  string username = 3;
-  string password = 4;
-  WSDLHeader wsdl_header = 5;
-}
-
-message Tracking {
-  string endpoint = 1;
-  string appname = 2;
-  string username = 3;
-  string token = 4;
-  string password = 5;
-}
-
-message Setting {
-  Ordering ordering = 0;
-  Tracking tracking = 1;
-}
-
-message Product {
-  string account_number = 1;
-}