PentHertz
/
RISE-V2G
mirror of https://github.com/PentHertz/RISE-V2G.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactored controllers to use a default constructor 

This makes the instantiation much cleaner, and also makes the
responsibility of the controller more clear.

Now we pass the communication session to the controller right
after instantiation inside the ImplementationFactory
This commit is contained in:
Nagy Attila Gabor 2019-02-08 22:10:45 +01:00
parent 5ccf4ceaad
commit 6e1d7fbcb7
10 changed files with 50 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/evController/DummyEVController.java
View File

@ -57,8 +57,7 @@ public class DummyEVController implements IACEVController, IDCEVController {
private CPStates cpState;
private int chargingLoopCounter;
public DummyEVController(V2GCommunicationSessionEVCC commSessionContext) {
setCommSessionContext(commSessionContext);
public DummyEVController() {
setCPState(CPStates.STATE_B); // should be signaled before ISO/IEC 15118 stack initializes
setChargingLoopCounter((short) 0);
}
@ -187,6 +186,7 @@ public class DummyEVController implements IACEVController, IDCEVController {
return commSessionContext;
}
@Override
public void setCommSessionContext(V2GCommunicationSessionEVCC commSessionContext) {
this.commSessionContext = commSessionContext;
}

8
RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/evController/IEVController.java
View File

@ -23,6 +23,7 @@
*******************************************************************************/
package com.v2gclarity.risev2g.evcc.evController;
import com.v2gclarity.risev2g.evcc.session.V2GCommunicationSessionEVCC;
import com.v2gclarity.risev2g.shared.enumerations.CPStates;
import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargingProfileType;
import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.EnergyTransferModeType;
@ -31,6 +32,13 @@ import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.PaymentOptionType;
public interface IEVController {
/**
* Provides a reference to the current communication session for
* this controller instance.
* @param commSessionContext The active communication session
*/
public void setCommSessionContext(V2GCommunicationSessionEVCC commSessionContext);
/**
* Returns the user-chosen payment method, either external identification means (EIM) such as an
* RFID card or via Plug-and-Charge (PnC)

8
RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/misc/EVCCImplementationFactory.java
View File

@ -40,11 +40,11 @@ public class EVCCImplementationFactory extends V2GImplementationFactory {
* @return
*/
public static IEVController createEVController(V2GCommunicationSessionEVCC commSessionContext) {
IEVController instance = buildFromProperties("implementation.evcc.controller", IEVController.class, commSessionContext);
IEVController instance = buildFromProperties("implementation.evcc.controller", IEVController.class);
if (instance == null) {
return new DummyEVController(commSessionContext);
} else {
return instance;
instance = new DummyEVController();
}
instance.setCommSessionContext(commSessionContext);
return instance;
}
}

4
RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/backend/DummyBackendInterface.java
View File

@ -59,8 +59,7 @@ public class DummyBackendInterface implements IBackendInterface {
this.moSubCA2PrivateKey = moSubCA2PrivateKey;
}
public DummyBackendInterface(V2GCommunicationSessionSECC commSessionContext) {
setCommSessionContext(commSessionContext);
public DummyBackendInterface() {
/*
* In order to reduce timing problems with handling ChargeParameterDiscoveryReq, reading the private key of the MO Sub-CA2
@ -313,6 +312,7 @@ public class DummyBackendInterface implements IBackendInterface {
return commSessionContext;
}
@Override
public void setCommSessionContext(V2GCommunicationSessionSECC commSessionContext) {
this.commSessionContext = commSessionContext;
}

8
RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/backend/IBackendInterface.java
View File

@ -27,11 +27,19 @@ import java.security.cert.X509Certificate;
import java.security.interfaces.ECPrivateKey;
import java.util.HashMap;
import com.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC;
import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.CertificateChainType;
import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.SAScheduleListType;
public interface IBackendInterface {
/**
* Provides a reference to the current communication session for
* this backend interface.
* @param commSessionContext The active communication session
*/
public void setCommSessionContext(V2GCommunicationSessionSECC commSessionContext);
/**
* Provides a list of schedules coming from a secondary actor (SAScheduleList) with pMax values
* and optional tariff incentives which shall influence the charging behaviour of the EV.

4
RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/evseController/DummyACEVSEController.java
View File

@ -41,8 +41,7 @@ public class DummyACEVSEController implements IACEVSEController {
private V2GCommunicationSessionSECC commSessionContext;
public DummyACEVSEController(V2GCommunicationSessionSECC commSessionContext) {
setCommSessionContext(commSessionContext);
public DummyACEVSEController() {
}
@Override
@ -86,6 +85,7 @@ public class DummyACEVSEController implements IACEVSEController {
}
@Override
public void setCommSessionContext(V2GCommunicationSessionSECC commSessionContext) {
this.commSessionContext = commSessionContext;
}

4
RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/evseController/DummyDCEVSEController.java
View File

@ -48,8 +48,7 @@ public class DummyDCEVSEController implements IDCEVSEController {
private PhysicalValueType maximumEVPowerLimit;
private IsolationLevelType isolationLevel;
public DummyDCEVSEController(V2GCommunicationSessionSECC commSessionContext) {
setCommSessionContext(commSessionContext);
public DummyDCEVSEController() {
setIsolationLevel(IsolationLevelType.INVALID);
}
@ -82,6 +81,7 @@ public class DummyDCEVSEController implements IDCEVSEController {
return commSessionContext;
}
@Override
public void setCommSessionContext(V2GCommunicationSessionSECC commSessionContext) {
this.commSessionContext = commSessionContext;
}

8
RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/evseController/IEVSEController.java
View File

@ -23,11 +23,19 @@
*******************************************************************************/
package com.v2gclarity.risev2g.secc.evseController;
import com.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC;
import com.v2gclarity.risev2g.shared.v2gMessages.msgDef.MeterInfoType;
public interface IEVSEController {
/**
* Provides a reference to the current communication session for
* this controller instance.
* @param commSessionContext The active communication session
*/
public void setCommSessionContext(V2GCommunicationSessionSECC commSessionContext);
/**
* The EVSEID is formatted according to Annex H of ISO/IEC 15118 and consists of minimum 7, max 37
* characters.

24
RISE-V2G-SECC/src/main/java/com/v2gclarity/risev2g/secc/misc/SECCImplementationFactory.java
View File

@ -45,12 +45,12 @@ public class SECCImplementationFactory extends V2GImplementationFactory {
* @return
*/
public static IBackendInterface createBackendInterface(V2GCommunicationSessionSECC commSessionContext) {
IBackendInterface instance = buildFromProperties("implementation.secc.backend", IBackendInterface.class, commSessionContext);
IBackendInterface instance = buildFromProperties("implementation.secc.backend", IBackendInterface.class);
if (instance == null) {
return new DummyBackendInterface(commSessionContext);
} else {
return instance;
instance = new DummyBackendInterface();
}
instance.setCommSessionContext(commSessionContext);
return instance;
}
/**
@ -59,12 +59,12 @@ public class SECCImplementationFactory extends V2GImplementationFactory {
* @return
*/
public static IACEVSEController createACEVSEController(V2GCommunicationSessionSECC commSessionContext) {
IACEVSEController instance = buildFromProperties("implementation.secc.acevsecontroller", IACEVSEController.class, commSessionContext);
IACEVSEController instance = buildFromProperties("implementation.secc.acevsecontroller", IACEVSEController.class);
if (instance == null) {
return new DummyACEVSEController(commSessionContext);
} else {
return instance;
instance = new DummyACEVSEController();
}
instance.setCommSessionContext(commSessionContext);
return instance;
}
/**
@ -73,12 +73,12 @@ public class SECCImplementationFactory extends V2GImplementationFactory {
* @return
*/
public static IDCEVSEController createDCEVSEController(V2GCommunicationSessionSECC commSessionContext) {
IDCEVSEController instance = buildFromProperties("implementation.secc.dcevsecontroller", IDCEVSEController.class, commSessionContext);
IDCEVSEController instance = buildFromProperties("implementation.secc.dcevsecontroller", IDCEVSEController.class);
if (instance == null) {
return new DummyDCEVSEController(commSessionContext);
} else {
return instance;
instance = new DummyDCEVSEController();
}
instance.setCommSessionContext(commSessionContext);
return instance;
}
}

14
RISE-V2G-Shared/src/main/java/com/v2gclarity/risev2g/shared/misc/V2GImplementationFactory.java
View File

@ -23,9 +23,6 @@
*******************************************************************************/
package com.v2gclarity.risev2g.shared.misc;
import java.lang.reflect.Constructor;
import java.util.Arrays;
import com.v2gclarity.risev2g.shared.utils.MiscUtils;
/**
@ -42,24 +39,17 @@ abstract public class V2GImplementationFactory {
* will be built.
* @param propertyName Name of the property that contains the fully qualified class name
* @param cls Target class of the build instance
* @param params Optional arguments to the constructor
* @return
*/
protected static <T> T buildFromProperties(String propertyName, Class<T> cls, Object...params) {
protected static <T> T buildFromProperties(String propertyName, Class<T> cls) {
try {
String className = MiscUtils.getV2gEntityConfig().getProperty(propertyName);
if (className == null) {
return null;
}
Class<?> clazz = Class.forName(className);
Object instance = Class.forName(className).newInstance();
Class<?>[] paramClasses = Arrays.stream(params)
.map(param -> param.getClass())
.toArray(size -> new Class<?>[size]);
Constructor<?> constructor = clazz.getConstructor(paramClasses);
Object instance = constructor.newInstance(params);
if (!cls.isInstance(instance)) {
throw new Exception("Instantiated object does not match the expected type " + cls.getCanonicalName());
}