Traits v2_1: rebase main

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rust-ocpp"
-description = "ocpp 1.6 and 2.0.1 libraries"
+description = "ocpp 1.6, 2.0.1 and 2.1 libraries"
 readme = "README.md"
 license = "MIT OR Apache-2.0"
 version = "3.0.1"
@@ -23,31 +23,35 @@ exclude = ["docs/", "src/tests"]
 all-features = true
 
 [features]
-default = ["v2_0_1"]
+# No default feature, so each version must be explicitly enabled
 v1_6 = []
 v2_0_1 = []
+v2_1 = []
 
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 serde = { version = "1", default-features = false, features = ["derive"] }
 chrono = { version = "0.4.39", default-features = false, features = [
+    "now",
     "serde",
     "alloc",
 ] }
 uuid = { version = "1", default-features = false, features = ["v4"] }
-validator = { version = "0.19.0", default-features = false, features = [
+validator = { version = "0.20.0", default-features = false, features = [
     "derive",
 ] }
 regex = "1.11.1"
 rust_decimal = { version = "1.36.0", features = [
     "serde-with-arbitrary-precision",
 ] }
+rust_decimal_macros = "1.36.0"
+serde_json = "1"
+lazy_static = "1.4"
+jsonschema = "0.30.0"
 
 [dev-dependencies]
 chrono = { version = "0.4.39", default-features = false, features = ["clock"] }
-serde_json = "1"
 mockall = "0.13.1"
-jsonschema = "0.28"
-rust_decimal_macros = "1.36.0"
+jsonschema = "0.30.0"

README.md

@@ -7,37 +7,39 @@
 The `rust-ocpp` libs implements the Open Charge Point Protocol
 used in charging stations. You can read more on the official [Open Charge Alliance](https://www.openchargealliance.org/) website.
 
-Both OCPP v1.6 and v2.0.1 are implemented and validated using the official json schemas from Open Charge Alliance.
+OCPP versions v1.6, v2.0.1, and v2.1 are implemented and validated using the official json schemas from Open Charge Alliance.
 
-You can find the tests in `schema_validation.rs` for both `v.1.6` and `v2.0.1`
+You can find the tests in `schema_validation.rs` for all supported versions.
 
 ## repo structure
 
-`src/` : library files for v1.6 and v2.0.1
+`src/` : library files for v1.6, v2.0.1, and v2.1
 
 `docs/` : official ocpp specification
 
 ## How to Use
 
-Add `rust-ocpp` as a dependency in your `Cargo.toml`. It will default to version `2.0.1` of OCPP.
+Add `rust-ocpp` as a dependency in your `Cargo.toml`. Note that there is no default version - you must explicitly specify which OCPP version(s) you want to use via feature flags.
 
 ```toml
 [dependencies]
 rust-ocpp = "3.0"
 ```
 
-To use `1.6` you need to specify a protocol version with a feature flag:
+To use a specific version, specify it with a feature flag:
 
 ```toml
 [dependencies]
-rust-ocpp = { version = "1.0", features = ["v1_6"] }
+rust-ocpp = { version = "2.0", features = ["v1_6"] }  # For OCPP 1.6
+rust-ocpp = { version = "2.0", features = ["v2_0_1"] }  # For OCPP 2.0.1
+rust-ocpp = { version = "2.0", features = ["v2_1"] }  # For OCPP 2.1
 ```
 
-or use both versions
+You can also use multiple versions:
 
 ```toml
 [dependencies]
-rust-ocpp = { version = "1.0", features = ["v2_0_1", "v1_6"] }
+rust-ocpp = { version = "2.0", features = ["v2_0_1", "v2_1"] }
 ```
 
 ## How to Build
@@ -59,7 +61,7 @@ Once you have Rust and Cargo installed, you can build the library using the foll
    cd rust-ocpp
    ```
 
-3. Build the library using Cargo for both `1.6` and `2.0.1`:
+3. Build the library using Cargo for all versions:
 
    ```bash
    cargo build --all-features
@@ -68,14 +70,14 @@ Once you have Rust and Cargo installed, you can build the library using the foll
    This command will compile the library and its dependencies. If the build is successful, you will find the compiled
    artifacts in the `target/debug` directory.
 
-4. Run the tests on both versions:
+4. Run the tests on all versions:
 
    ```bash
    cargo test --all-features
 
    ```
 
-   This command will execute the tests for both OCPP versions. If all tests pass, it means that the library is
+   This command will execute the tests for all OCPP versions. If all tests pass, it means that the library is
    functioning correctly.
 
 5. Build a specific version:
@@ -93,6 +95,12 @@ Once you have Rust and Cargo installed, you can build the library using the foll
    cargo build --features v2_0_1
    ```
 
+   To build `v2_1`:
+
+   ```bash
+   cargo build --features v2_1
+   ```
+
 6. (Optional) Build for release:
 
    If you want to build the library for release, with optimizations enabled, you can use the following command:
@@ -119,35 +127,23 @@ please check the project's issue tracker on GitHub or open a new issue for assis
 
 ## Testing
 
-`rust-ocpp` provides testing against json schemas for both OCPP v1.6 and v2.0.1 versions. To run the tests, you can use
+`rust-ocpp` provides testing against json schemas for all supported OCPP versions. To run the tests, you can use
 Cargo's built-in test runner.
 
 ### Running Tests
 
-To run the tests for a specific version, use the appropriate feature flag when running the tests.
-
-For OCPP v1.6 tests:
-
-```bash
-cargo test --features v1_6
-```
-
-For OCPP v2.0.1 tests:
+To run the tests for a specific version, use the appropriate feature flag:
 
 ```bash
-cargo test --features v2_0_1
+cargo test --features v1_6      # For OCPP 1.6 tests
+cargo test --features v2_0_1    # For OCPP 2.0.1 tests
+cargo test --features v2_1      # For OCPP 2.1 tests
 ```
 
-To run all tests:
+To run all tests for all versions:
 
 ```bash
-cargo test
-```
-
-or for a specific version
-
-```bash
-cargo test --features v1_6
+cargo test --all-features
 ```
 
 ### Test Coverage
@@ -172,6 +168,7 @@ Use `rustfmt` before you PR.
 pre-commit config is available. You can read more about it at [pre-commits](https://pre-commit.com) website and checkout their repo on [github](https://github.com/pre-commit/pre-commit)
 
 ## Releasing a new version
+
 1. Update the version of the library and push the changes to the main branch.
 2. Create a [new release](https://github.com/codelabsab/rust-ocpp/releases/new) on GitHub with the new version number and some release notes (optional).
 

src/lib.rs

@@ -19,3 +19,5 @@ pub mod tests;
 pub mod v1_6;
 #[cfg(feature = "v2_0_1")]
 pub mod v2_0_1;
+#[cfg(feature = "v2_1")]
+pub mod v2_1;

src/tests/schema_validation/mod.rs

@@ -2,3 +2,5 @@
 mod v1_6;
 #[cfg(all(test, feature = "v2_0_1"))]
 mod v2_0_1;
+#[cfg(all(test, feature = "v2_1"))]
+mod v2_1;

src/tests/schema_validation/schemas/v2.1/AFRRSignalRequest.json

@@ -0,0 +1,41 @@
+{
+    "$schema": "http://json-schema.org/draft-06/schema#",
+    "$id": "urn:OCPP:Cp:2:2025:1:AFRRSignalRequest",
+    "comment": "OCPP 2.1 Edition 1 (c) OCA, Creative Commons Attribution-NoDerivatives 4.0 International Public License",
+    "definitions": {
+        "CustomDataType": {
+            "description": "This class does not get 'AdditionalProperties = false' in the schema generation, so it can be extended with arbitrary JSON properties to allow adding custom data.",
+            "javaType": "CustomData",
+            "type": "object",
+            "properties": {
+                "vendorId": {
+                    "type": "string",
+                    "maxLength": 255
+                }
+            },
+            "required": [
+                "vendorId"
+            ]
+        }
+    },
+    "type": "object",
+    "additionalProperties": false,
+    "properties": {
+        "timestamp": {
+            "description": "Time when signal becomes active.\r\n",
+            "type": "string",
+            "format": "date-time"
+        },
+        "signal": {
+            "description": "Value of signal in _v2xSignalWattCurve_. \r\n",
+            "type": "integer"
+        },
+        "customData": {
+            "$ref": "#/definitions/CustomDataType"
+        }
+    },
+    "required": [
+        "timestamp",
+        "signal"
+    ]
+}

src/tests/schema_validation/schemas/v2.1/AFRRSignalResponse.json

@@ -0,0 +1,70 @@
+{
+    "$schema": "http://json-schema.org/draft-06/schema#",
+    "$id": "urn:OCPP:Cp:2:2025:1:AFRRSignalResponse",
+    "comment": "OCPP 2.1 Edition 1 (c) OCA, Creative Commons Attribution-NoDerivatives 4.0 International Public License",
+    "definitions": {
+        "GenericStatusEnumType": {
+            "javaType": "GenericStatusEnum",
+            "type": "string",
+            "additionalProperties": false,
+            "enum": [
+                "Accepted",
+                "Rejected"
+            ]
+        },
+        "StatusInfoType": {
+            "description": "Element providing more information about the status.\r\n",
+            "javaType": "StatusInfo",
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "reasonCode": {
+                    "description": "A predefined code for the reason why the status is returned in this response. The string is case-insensitive.\r\n",
+                    "type": "string",
+                    "maxLength": 20
+                },
+                "additionalInfo": {
+                    "description": "Additional text to provide detailed information.\r\n",
+                    "type": "string",
+                    "maxLength": 1024
+                },
+                "customData": {
+                    "$ref": "#/definitions/CustomDataType"
+                }
+            },
+            "required": [
+                "reasonCode"
+            ]
+        },
+        "CustomDataType": {
+            "description": "This class does not get 'AdditionalProperties = false' in the schema generation, so it can be extended with arbitrary JSON properties to allow adding custom data.",
+            "javaType": "CustomData",
+            "type": "object",
+            "properties": {
+                "vendorId": {
+                    "type": "string",
+                    "maxLength": 255
+                }
+            },
+            "required": [
+                "vendorId"
+            ]
+        }
+    },
+    "type": "object",
+    "additionalProperties": false,
+    "properties": {
+        "status": {
+            "$ref": "#/definitions/GenericStatusEnumType"
+        },
+        "statusInfo": {
+            "$ref": "#/definitions/StatusInfoType"
+        },
+        "customData": {
+            "$ref": "#/definitions/CustomDataType"
+        }
+    },
+    "required": [
+        "status"
+    ]
+}

src/tests/schema_validation/schemas/v2.1/AdjustPeriodicEventStreamRequest.json

@@ -0,0 +1,59 @@
+{
+    "$schema": "http://json-schema.org/draft-06/schema#",
+    "$id": "urn:OCPP:Cp:2:2025:1:AdjustPeriodicEventStreamRequest",
+    "comment": "OCPP 2.1 Edition 1 (c) OCA, Creative Commons Attribution-NoDerivatives 4.0 International Public License",
+    "definitions": {
+        "PeriodicEventStreamParamsType": {
+            "javaType": "PeriodicEventStreamParams",
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "interval": {
+                    "description": "Time in seconds after which stream data is sent.\r\n",
+                    "type": "integer",
+                    "minimum": 0.0
+                },
+                "values": {
+                    "description": "Number of items to be sent together in stream.\r\n",
+                    "type": "integer",
+                    "minimum": 0.0
+                },
+                "customData": {
+                    "$ref": "#/definitions/CustomDataType"
+                }
+            }
+        },
+        "CustomDataType": {
+            "description": "This class does not get 'AdditionalProperties = false' in the schema generation, so it can be extended with arbitrary JSON properties to allow adding custom data.",
+            "javaType": "CustomData",
+            "type": "object",
+            "properties": {
+                "vendorId": {
+                    "type": "string",
+                    "maxLength": 255
+                }
+            },
+            "required": [
+                "vendorId"
+            ]
+        }
+    },
+    "type": "object",
+    "additionalProperties": false,
+    "properties": {
+        "id": {
+            "type": "integer",
+            "minimum": 0.0
+        },
+        "params": {
+            "$ref": "#/definitions/PeriodicEventStreamParamsType"
+        },
+        "customData": {
+            "$ref": "#/definitions/CustomDataType"
+        }
+    },
+    "required": [
+        "id",
+        "params"
+    ]
+}