refactor

Author: goekay

src/main/java/de/rwth/idsg/steve/config/OcppConfiguration.java

@@ -47,12 +47,12 @@ public class OcppConfiguration {
     @Autowired private ocpp.cs._2015._10.CentralSystemService ocpp16Server;
 
     @Autowired
-    @Qualifier("FromAddressInterceptor")
-    private PhaseInterceptor<Message> fromAddressInterceptor;
+    @Qualifier("MessageHeaderInterceptor")
+    private PhaseInterceptor<Message> messageHeaderInterceptor;
 
     @PostConstruct
     public void init() {
-        List<Interceptor<? extends Message>> interceptors = asList(new MessageIdInterceptor(), fromAddressInterceptor);
+        List<Interceptor<? extends Message>> interceptors = asList(new MessageIdInterceptor(), messageHeaderInterceptor);
         List<Feature> logging = singletonList(LoggingFeatureProxy.INSTANCE.get());
 
         createOcppService(ocpp12Server, "/CentralSystemServiceOCPP12", interceptors, logging);

src/main/java/de/rwth/idsg/steve/ocpp/soap/FromAddressInterceptor.java renamed to src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageHeaderInterceptor.java

@@ -37,8 +37,8 @@
  * @since 15.06.2015
  */
 @Slf4j
-@Component("FromAddressInterceptor")
-public class FromAddressInterceptor extends AbstractPhaseInterceptor<Message> {
+@Component("MessageHeaderInterceptor")
+public class MessageHeaderInterceptor extends AbstractPhaseInterceptor<Message> {
 
     @Autowired private OcppServerRepository ocppServerRepository;
     @Autowired private ChargePointRepository chargePointRepository;
@@ -47,7 +47,7 @@ public class FromAddressInterceptor extends AbstractPhaseInterceptor<Message> {
     private static final String BOOT_OPERATION_NAME = "BootNotification";
     private static final String CHARGEBOX_ID_HEADER = "ChargeBoxIdentity";
 
-    public FromAddressInterceptor() {
+    public MessageHeaderInterceptor() {
         super(Phase.PRE_INVOKE);
     }
 

src/test/java/de/rwth/idsg/steve/OperationalTestSoapOCPP16.java

@@ -1,7 +1,7 @@
 package de.rwth.idsg.steve;
 
 import de.rwth.idsg.steve.ocpp.OcppProtocol;
-import de.rwth.idsg.steve.ocpp.soap.FromAddressInterceptor;
+import de.rwth.idsg.steve.ocpp.soap.MessageHeaderInterceptor;
 import de.rwth.idsg.steve.ocpp.ws.OcppWebSocketUpgrader;
 import de.rwth.idsg.steve.repository.ReservationStatus;
 import de.rwth.idsg.steve.repository.dto.ChargePoint;
@@ -104,7 +104,7 @@ public void testUnregisteredCP() {
 
     /**
      * Reason: We started to check registration status by intercepting every SOAP message other than BootNotification
-     * in {@link FromAddressInterceptor} and throw exception if station is not registered and auto-register is
+     * in {@link MessageHeaderInterceptor} and throw exception if station is not registered and auto-register is
      * disabled (and therefore early-exit the processing pipeline of the message).
      *
      * In case of BootNotification, the expected behaviour is to set RegistrationStatus.REJECTED in response, as done