Merge pull request ChargeTimeEU#150 from codibly/bugfix/rename-changing-to-charging-in-charging-rate-unit-type

Rename enum ChangingRateUnitType to ChargingRateUnitType (Typo)

Author: TVolden

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/smartcharging/ChangingRateUnitType.java renamed to ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/smartcharging/ChargingRateUnitType.java

@@ -25,7 +25,7 @@ of this software and associated documentation files (the "Software"), to deal
    SOFTWARE.
 */
 
-public enum ChangingRateUnitType {
+public enum ChargingRateUnitType {
   W,
   A
 }

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/smartcharging/GetCompositeScheduleRequest.java

@@ -38,7 +38,7 @@ public class GetCompositeScheduleRequest implements Request {
 
   private Integer connectorId;
   private Integer duration;
-  private ChangingRateUnitType changingRateUnitType;
+  private ChargingRateUnitType chargingRateUnit;
 
   /**
    * @deprecated use {@link #GetCompositeScheduleRequest(Integer, Integer)} to be sure to set
@@ -107,18 +107,18 @@ public void setDuration(Integer duration) {
    *
    * @return current profile
    */
-  public ChangingRateUnitType getChangingRateUnitType() {
-    return changingRateUnitType;
+  public ChargingRateUnitType getChargingRateUnit() {
+    return chargingRateUnit;
   }
 
   /**
    * Optional. Can be used to force a power or current profile
    *
-   * @param changingRateUnitType the {@link ChangingRateUnitType}
+   * @param chargingRateUnit the {@link ChargingRateUnitType}
    */
   @XmlElement
-  public void setChangingRateUnitType(ChangingRateUnitType changingRateUnitType) {
-    this.changingRateUnitType = changingRateUnitType;
+  public void setChargingRateUnit(ChargingRateUnitType chargingRateUnit) {
+    this.chargingRateUnit = chargingRateUnit;
   }
 
   @Override
@@ -136,15 +136,15 @@ public boolean transactionRelated() {
 
   @Override
   public int hashCode() {
-    return Objects.hash(connectorId, duration, changingRateUnitType);
+    return Objects.hash(connectorId, duration, chargingRateUnit);
   }
 
   @Override
   public String toString() {
     return MoreObjects.toStringHelper(this)
         .add("connectorId", connectorId)
         .add("duration", duration)
-        .add("changingRateUnitType", changingRateUnitType)
+        .add("chargingRateUnit", chargingRateUnit)
         .add("isValid", validate())
         .toString();
   }

ocpp-v1_6/src/test/java/eu/chargetime/ocpp/model/test/GetCompositeScheduleRequestTest.java

@@ -4,7 +4,7 @@
 import static org.junit.Assert.assertThat;
 
 import eu.chargetime.ocpp.PropertyConstraintException;
-import eu.chargetime.ocpp.model.smartcharging.ChangingRateUnitType;
+import eu.chargetime.ocpp.model.smartcharging.ChargingRateUnitType;
 import eu.chargetime.ocpp.model.smartcharging.GetCompositeScheduleRequest;
 import org.junit.Before;
 import org.junit.Rule;
@@ -87,15 +87,15 @@ public void setDuration_zeroInteger_durationIsSet() {
   }
 
   @Test
-  public void setChangingRateUnitType_A_changingRateUnitTypeIsSet() {
+  public void setChargingRateUnitType_A_chargingRateUnitTypeIsSet() {
     // Given
-    ChangingRateUnitType chargingRateUnitType = ChangingRateUnitType.A;
+    ChargingRateUnitType chargingRateUnit = ChargingRateUnitType.A;
 
     // When
-    request.setChangingRateUnitType(chargingRateUnitType);
+    request.setChargingRateUnit(chargingRateUnit);
 
     // Then
-    assertThat(request.getChangingRateUnitType(), equalTo(chargingRateUnitType));
+    assertThat(request.getChargingRateUnit(), equalTo(chargingRateUnit));
   }
 
   @Test
@@ -112,7 +112,7 @@ public void validate_connectorIdAndMeterValueIsValid_returnTrue() {
     // Given
     request.setConnectorId(42);
     request.setDuration(0);
-    request.setChangingRateUnitType(ChangingRateUnitType.A);
+    request.setChargingRateUnit(ChargingRateUnitType.A);
 
     // When
     boolean isValid = request.validate();