Resolve all conflicts for these commits #56

sumlin · 2018-04-19T05:35:41Z

No description provided.

Add some tests for DiagnosticsStatusNotification and FirmwareStatusNotification.

coveralls · 2018-04-19T05:39:45Z

Coverage decreased (-1.3%) to 54.353% when pulling 4ec5d13 on sumlin:master into 68fcba1 on ChargeTimeEU:master.

codecov-io · 2018-04-19T07:45:57Z

Codecov Report

Merging #56 into master will decrease coverage by 0.75%.
The diff coverage is 41.58%.

@@             Coverage Diff              @@
##             master      #56      +/-   ##
============================================
- Coverage     52.71%   51.96%   -0.76%     
- Complexity      710      760      +50     
============================================
  Files           164      179      +15     
  Lines          2796     2998     +202     
  Branches        201      221      +20     
============================================
+ Hits           1474     1558      +84     
- Misses         1241     1355     +114     
- Partials         81       85       +4

TVolden

Code looks good. Now I just need to check with spec.

TVolden · 2018-04-19T08:16:49Z

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/feature/profile/ServerLocalAuthListProfile.java

+
+    MIT License
+
+    Copyright (C) 2016-2018 Thomas Volden <tv@chargetime.eu>


Should be your name and e-mail (yes I found one :P)

I just check you ;)

TVolden · 2018-04-19T08:19:56Z

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/firmware/UpdateFirmwareConfirmation.java

+
+    @Override
+    public int hashCode() {
+        return 7;


Why 7? What argument is behind this decision?

The same as in previous situation. Just unique in compare with other classes. If you don't agree with me - I'd be happy if you suggest a better way.

No no, just curious and mostly based on lack of knowledge of the hash function. You only use prime numbers right?

Nope, only uniqueness matters. I just love prime numbers, who don't love them? If you want you may look at this http://www.baeldung.com/java-hashcode

@sumlin funnily the authors of the protocol haven't thought about nonces ot timestamps which makes it vulnerable to replay attacks. To the topic - I would propose to use something like UpdateFirmwareConfirmation.class.hashCode(); or UpdateFirmwareConfirmation.class.getCanonicalName().hashCode(); in such classes without fields which might be easier to maintain than sequential numbers. Equals might be simplified to return this == obj || obj instanceof UpdateFirmwareConfirmation;

@eupakhomov

They've got MessageIDs in SOAP part for request-response mapping and permanent connection for JSON part. I think it's enough for preventing of reply attacks.

Yeah, awesome decision, I'll rewrite it. But instanceof can't be used, look at a documentation https://docs.oracle.com/javase/specs/#instanceof . instanceof looks at parents too.

@sumlin sorry for the off-topic - I am not sure where it's better to handle such topic. What would you advise to make JSON part secure via permanent connection? Even if we prohibit sessions' replacement, Charge Points with Wi-Fi or mobile connection still are vulnerable due to easiness of breaking connection.

@eupakhomov I'm glad to give you some advises there https://gitter.im/ChargeTimeEU/Java-OCA-OCPP :) We're talking in this chat about all OCPP stuff, you are able to log in by Github account.

TVolden · 2018-04-20T07:44:39Z

ocpp-v1_6/src/test/java/eu/chargetime/ocpp/model/firmware/test/UpdateFirmwareRequestTest.java

+    }
+
+    @Test
+    public void validate_locationIsNotSet_returnsFalse() {


The test doesn't seem to math the name.
I would suggest validate_returnFalse

Should there be tests for when location is set, but retrieveDate isn't and vise versa?

Should there be tests for when location is set, but retrieveDate isn't and vise versa?

@TVolden I've looked at another tests, they have no these tests. If you want I'll do that tests.

It's no biggie. Just to test validation via state.

TVolden

Some data types that can cause some trouble. One rule which I couldn't find in the spec. Small stuff.

TVolden · 2018-04-21T09:12:01Z

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/firmware/UpdateFirmwareRequest.java

+    private String location;
+    private Integer retries;
+    private Calendar retrieveDate;
+    private int retryInterval;


Should change this to the nullable Integer

That's an optional value, right. FIxed.

TVolden · 2018-04-21T09:16:28Z

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/firmware/UpdateFirmwareRequest.java

+     * 
+     */
+    @XmlElement
+    public void setRetryInterval(int retryInterval) throws PropertyConstraintException {


Should change to the nullable Integer to avoid trouble with the communicator.

That's an optional value, right. FIxed.

TVolden · 2018-04-21T09:17:06Z

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/firmware/UpdateFirmwareRequest.java

+     *
+     * @return int, retry interval.
+     */
+    public int getRetryInterval() {


Should change to the nullable Integer to avoid trouble with the communicator.

That's an optional value, right. FIxed.

TVolden · 2018-04-21T09:19:07Z

..._6/src/main/java/eu/chargetime/ocpp/model/localauthlist/GetLocalListVersionConfirmation.java

-		if (listVersion < -1) throw new PropertyConstraintException("listVersion", listVersion, "Exceeded limit");
-		this.listVersion = listVersion;
-	}
+	private int listVersion = -2;


Should be changed to the nullable Integer, so it defaults to null instead.

That's a required field, it must has a value and must not be nullable.

TVolden · 2018-04-21T09:20:01Z

..._6/src/main/java/eu/chargetime/ocpp/model/localauthlist/GetLocalListVersionConfirmation.java


+	public GetLocalListVersionConfirmation() { }
+
+    public GetLocalListVersionConfirmation(int listVersion) {


Should be changed to the nullable Integer, to avoid trouble with the communicator.

That's a required field, it must has a value and must not be nullable.

TVolden · 2018-04-21T10:37:42Z

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/reservation/CancelReservationRequest.java

+     * @param reservationId Integer, id of the reservation.
+     */
+    @XmlElement
+    public void setReservationId(Integer reservationId) {


Should have a null guard.

TVolden · 2018-04-21T10:41:37Z

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/reservation/ReserveNowConfirmation.java

+     * @param status ReservationStatus, status of the reservation.
+     */
+    @XmlElement
+    public void setStatus(ReservationStatus status) {


Should have a null guard.

TVolden · 2018-04-21T10:52:51Z

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/reservation/ReserveNowRequest.java

+     */
+    @XmlElement
+    public void setConnectorId(Integer connectorId) throws PropertyConstraintException {
+        if (connectorId < 0)


Maybe add a null check also.

TVolden · 2018-04-21T10:53:14Z

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/reservation/ReserveNowRequest.java

+     */
+    @XmlElement
+    public void setExpiryDate(Calendar expiryDate) {
+        this.expiryDate = expiryDate;


Should have a null gate.

TVolden · 2018-04-21T11:01:02Z

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/reservation/ReserveNowRequest.java

+     */
+    @XmlElement
+    public void setReservationId(Integer reservationId) {
+        this.reservationId = reservationId;


Should have a null guard.

Small changes for PR #56.

sumlin added 10 commits April 16, 2018 19:39

Add FirmwareStatusNotification support.

2d87ffd

Add UpdateFirmware support.

c1f3fbc

Add some tests for DiagnosticsStatusNotification and FirmwareStatusNotification.

Add ReserveNow support.

c7f2e8f

Add CancelReservation.

19bdcb0

Add tests for LocalAuthList and fixed issues.

331f747

Add UpdateFirmware support.

1c62457

Add some tests for DiagnosticsStatusNotification and FirmwareStatusNotification.

Add ReserveNow support.

7ad3d75

Add CancelReservation.

1433d8e

Add tests for LocalAuthList and fixed issues.

1d58fdb

Merge branch 'master' of https://github.com/sumlin/Java-OCA-OCPP

3e7e923

Add tests for SmartCharging.

4ec5d13

TVolden reviewed Apr 20, 2018

View reviewed changes

TVolden requested changes Apr 21, 2018

View reviewed changes

TVolden merged commit 905759c into ChargeTimeEU:master Apr 22, 2018

sumlin added a commit to sumlin/Java-OCA-OCPP that referenced this pull request Apr 22, 2018

Small changes for PR ChargeTimeEU#56.

1cf5db1

This was referenced Apr 22, 2018

why no ReserveNowRequestFeature? #7

Closed

Add update firmware #50

Closed

Add reserve now #51

Closed

Add cancel reservation #52

Closed

Tests for local auth list #53

Closed

Tests for smart charging #54

Closed

TVolden added a commit that referenced this pull request Apr 22, 2018

Merge pull request #58 from sumlin/master

7ce74a2

Small changes for PR #56.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Resolve all conflicts for these commits #56

Resolve all conflicts for these commits #56

sumlin commented Apr 19, 2018

coveralls commented Apr 19, 2018 •

edited

Loading

codecov-io commented Apr 19, 2018

TVolden left a comment

TVolden Apr 19, 2018

sumlin Apr 20, 2018

TVolden Apr 19, 2018

sumlin Apr 20, 2018

TVolden Apr 20, 2018

sumlin Apr 20, 2018

eupakhomov Apr 21, 2018

sumlin Apr 22, 2018 •

edited

Loading

eupakhomov Apr 22, 2018

sumlin Apr 22, 2018

TVolden Apr 20, 2018

sumlin Apr 20, 2018

sumlin Apr 20, 2018 •

edited

Loading

TVolden Apr 20, 2018

sumlin Apr 20, 2018

TVolden left a comment

TVolden Apr 21, 2018

sumlin Apr 22, 2018

TVolden Apr 21, 2018

sumlin Apr 22, 2018

TVolden Apr 21, 2018

sumlin Apr 22, 2018

TVolden Apr 21, 2018

sumlin Apr 22, 2018

TVolden Apr 21, 2018

sumlin Apr 22, 2018

TVolden Apr 21, 2018

TVolden Apr 21, 2018

TVolden Apr 21, 2018

TVolden Apr 21, 2018

TVolden Apr 21, 2018


		MIT License

		Copyright (C) 2016-2018 Thomas Volden <tv@chargetime.eu>


		public GetLocalListVersionConfirmation() { }

		public GetLocalListVersionConfirmation(int listVersion) {

Resolve all conflicts for these commits #56

Resolve all conflicts for these commits #56

Conversation

sumlin commented Apr 19, 2018

coveralls commented Apr 19, 2018 • edited Loading

codecov-io commented Apr 19, 2018

Codecov Report

TVolden left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sumlin Apr 22, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sumlin Apr 20, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TVolden left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

coveralls commented Apr 19, 2018 •

edited

Loading

sumlin Apr 22, 2018 •

edited

Loading

sumlin Apr 20, 2018 •

edited

Loading