From 165c0e437db1ddc6b033cc8039b37c12979044c0 Mon Sep 17 00:00:00 2001 From: Galyna Klymenko <139880944+klymenko-galyna-ew@users.noreply.github.com> Date: Tue, 29 Aug 2023 18:43:11 +0300 Subject: [PATCH 1/2] Updated github job * Updated github job --- .github/workflows/release-publish.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml index d66d650..6287390 100644 --- a/.github/workflows/release-publish.yml +++ b/.github/workflows/release-publish.yml @@ -1,6 +1,9 @@ name: Publish package to the Maven Central Repository on: + push: + tags: + - v* pull_request: branches: [ main ] From 8505d11644791dcff480d9b5e0d8d4130a4a5d9b Mon Sep 17 00:00:00 2001 From: Galyna Klymenko <139880944+klymenko-galyna-ew@users.noreply.github.com> Date: Thu, 7 Sep 2023 10:27:26 +0300 Subject: [PATCH 2/2] Updated Readme, changed. models contraints (#6) Updated readme, changed model constraints --- README.md | 35 +++++++++++-------- pom.xml | 2 +- .../controller/CPOCredentialsController.java | 8 ++--- .../ocpi/controller/CPOVersionController.java | 6 ++-- .../ocpi/model/dto/CredentialsDTO.java | 3 +- .../extrawest/ocpi/model/dto/TariffDTO.java | 8 ++--- .../com/extrawest/ocpi/util/Constants.java | 4 ++- 7 files changed, 37 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 8a24e41..3298e55 100644 --- a/README.md +++ b/README.md @@ -116,25 +116,32 @@ for OCPI 2.1.1 to OCPI 2.2 -> OCPI 2.2.1 Functional Modules: - Module | v2023.8.24 | Description + + + Module | v2023.8.24 | Description | -------------------|----|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| - [Locations](https://github.com/ocpi/ocpi/blob/2.2.1/mod_locations.asciidoc) | + | The Location objects live in the CPO back-end system. They describe the charging locations of an operator | - [Sessions](https://github.com/ocpi/ocpi/blob/2.2.1/mod_sessions.asciidoc) | + | The Session object describes one charging session. The Session object is owned by the CPO back-end system, and can be GET from the CPO system, or pushed by the CPO to another system | - [CDRs](https://github.com/ocpi/ocpi/blob/2.2.1/mod_cdrs.asciidoc) | + | A Charge Detail Record is the description of a concluded charging session. The CDR is the only billing-relevant object. CDRs are sent from the CPO to the eMSP after the charging session has ended | - [Tariffs](https://github.com/ocpi/ocpi/blob/2.2.1/mod_tariffs.asciidoc) | + | The Tariffs module gives eMSPs information about the tariffs used by the CPO | - [Tokens](https://github.com/ocpi/ocpi/blob/2.2.1/mod_tokens.asciidoc) | + | The tokens module gives CPOs knowledge of the token information of an eMSP. eMSPs can push Token information to CPOs, CPOs can build a cache of known Tokens. When a request to authorize comes from a Charge Point, the CPO can check against this cache. With this cached information they know to which eMSP they can later send a CDR | - [Commands](https://github.com/ocpi/ocpi/blob/2.2.1/mod_commands.asciidoc) | + | The Commands module enables remote commands to be sent to a Location/EVSE. The following commands are supported: CANCEL_RESERVATION, RESERVE_NOW, START_SESSION , STOP_SESSION, UNLOCK_CONNECTOR | - [Charging Profiles](https://github.com/ocpi/ocpi/blob/2.2.1/mod_charging_profiles.asciidoc)| + | With the ChargingProfiles module, parties (SCSP but also MSPs) can send (Smart) Charging Profiles to a Location/EVSE. It is also possible to request the 'ActiveChargingProfile' from a Location/EVSE | - [Hub Client Info](https://github.com/ocpi/ocpi/blob/2.2.1/mod_hub_client_info.asciidoc) | + | Provides parties connected to a hub with the connection status of other parties that are connected to a hub that they can communicate with. So, CPOs know which eMSP and other parties are online and vice versa | + [Locations](https://github.com/ocpi/ocpi/blob/2.2.1/mod_locations.asciidoc) |
+
| The Location objects live in the CPO back-end system. They describe the charging locations of an operator | + [Sessions](https://github.com/ocpi/ocpi/blob/2.2.1/mod_sessions.asciidoc) |+
| The Session object describes one charging session. The Session object is owned by the CPO back-end system, and can be GET from the CPO system, or pushed by the CPO to another system | + [CDRs](https://github.com/ocpi/ocpi/blob/2.2.1/mod_cdrs.asciidoc) |+
| A Charge Detail Record is the description of a concluded charging session. The CDR is the only billing-relevant object. CDRs are sent from the CPO to the eMSP after the charging session has ended | + [Tariffs](https://github.com/ocpi/ocpi/blob/2.2.1/mod_tariffs.asciidoc) |+
| The Tariffs module gives eMSPs information about the tariffs used by the CPO | + [Tokens](https://github.com/ocpi/ocpi/blob/2.2.1/mod_tokens.asciidoc) |+
| The tokens module gives CPOs knowledge of the token information of an eMSP. eMSPs can push Token information to CPOs, CPOs can build a cache of known Tokens. When a request to authorize comes from a Charge Point, the CPO can check against this cache. With this cached information they know to which eMSP they can later send a CDR | + [Commands](https://github.com/ocpi/ocpi/blob/2.2.1/mod_commands.asciidoc) |+
| The Commands module enables remote commands to be sent to a Location/EVSE. The following commands are supported: CANCEL_RESERVATION, RESERVE_NOW, START_SESSION , STOP_SESSION, UNLOCK_CONNECTOR | + [Charging Profiles](https://github.com/ocpi/ocpi/blob/2.2.1/mod_charging_profiles.asciidoc)|+
| With the ChargingProfiles module, parties (SCSP but also MSPs) can send (Smart) Charging Profiles to a Location/EVSE. It is also possible to request the 'ActiveChargingProfile' from a Location/EVSE | + [Hub Client Info](https://github.com/ocpi/ocpi/blob/2.2.1/mod_hub_client_info.asciidoc) |+
| Provides parties connected to a hub with the connection status of other parties that are connected to a hub that they can communicate with. So, CPOs know which eMSP and other parties are online and vice versa | Configuration Modules: -Module | v2023.8.24 | Description ------------- |-----------|-------------------------------------------------------------------------------------------------------------------------------------- -[Credentials](https://github.com/ocpi/ocpi/blob/2.2.1/credentials.asciidoc)| + | The credentials module is used to exchange the credentials token that has to be used by parties for authorization of requests | -[Versions](https://github.com/ocpi/ocpi/blob/2.2.1/version_information_endpoint.asciidoc) | + | Via this module, clients can learn which versions of OCPI a server supports, and which modules it supports for each of the versions | +Module | v2023.8.24 | Description | +------------ |-----------|--------------------------------------------------------------------------------------------------------------------------------------| +[Credentials](https://github.com/ocpi/ocpi/blob/2.2.1/credentials.asciidoc)|+
| The credentials module is used to exchange the credentials token that has to be used by parties for authorization of requests | +[Versions](https://github.com/ocpi/ocpi/blob/2.2.1/version_information_endpoint.asciidoc) |+
| Via this module, clients can learn which versions of OCPI a server supports, and which modules it supports for each of the versions | + +Roadmap: -Plans for next releases is to enrich Credentials with OCPI Registration process +Functionality | Q7 2023 | +------------ |------------------------------| +[Authentification](https://github.com/ocpi/ocpi/blob/2.2.1/credentials.asciidoc)| +[Authorization](https://github.com/ocpi/ocpi/blob/master/transport_and_format.asciidoc#transport_and_format_authorization_header) | License ======= diff --git a/pom.xml b/pom.xml index 96b4c75..842e553 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@