Skip to content

Commit 3eb8ea2

Browse files
committed
refactor/improvements from juherr#120
applied some of the relevant suggestions by AI review
1 parent 0051369 commit 3eb8ea2

File tree

8 files changed

+22
-6
lines changed

8 files changed

+22
-6
lines changed

src/main/java/de/rwth/idsg/steve/SteveApplication.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@
2727
import org.springframework.boot.SpringApplication;
2828
import org.springframework.boot.autoconfigure.SpringBootApplication;
2929
import org.springframework.boot.autoconfigure.jooq.JooqAutoConfiguration;
30+
import org.springframework.boot.context.event.ApplicationStartedEvent;
3031
import org.springframework.context.ConfigurableApplicationContext;
32+
import org.springframework.context.event.EventListener;
3133

3234
import java.util.TimeZone;
3335

@@ -48,6 +50,10 @@ public class SteveApplication {
4850

4951
TimeZone.setDefault(TimeZone.getTimeZone(SteveProperties.TIME_ZONE_ID));
5052
DateTimeZone.setDefault(DateTimeZone.forID(SteveProperties.TIME_ZONE_ID));
53+
}
54+
55+
@EventListener(ApplicationStartedEvent.class)
56+
public void logStartup() {
5157
log.info("Date/time zone of the application is set to {}. Current date/time: {}", SteveProperties.TIME_ZONE_ID, DateTime.now());
5258
}
5359

src/main/java/de/rwth/idsg/steve/ocpp/soap/ClientProvider.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,10 @@ private static JaxWsProxyFactoryBean getBean(String endpointAddress) {
7575
}
7676

7777
private static TLSClientParameters create(Ssl ssl) throws Exception {
78+
if (ssl == null || !ssl.isEnabled()) {
79+
return null;
80+
}
81+
7882
String keyStorePath = ssl.getKeyStore();
7983
String keyStorePwd = ssl.getKeyStorePassword();
8084

src/main/java/de/rwth/idsg/steve/ocpp/soap/MediatorInInterceptor.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,9 @@ public final void handleMessage(SoapMessage message) {
8787
Server targetServer = actualServers.get(schemaNamespace);
8888

8989
// Redirect the request
90-
if (targetServer != null) {
90+
if (targetServer == null) {
91+
log.warn("No server mapped for namespace '{}'", schemaNamespace);
92+
} else {
9193
targetServer.getDestination().getMessageObserver().onMessage(message);
9294
}
9395

src/main/java/de/rwth/idsg/steve/ocpp/ws/OcppWebSocketHandshakeHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,9 @@ public boolean doHandshake(ServerHttpRequest request, ServerHttpResponse respons
117117
}
118118

119119
private AbstractWebSocketEndpoint selectEndpoint(List<String> requestedProtocols ) {
120-
for (String requestedProcotol : requestedProtocols) {
120+
for (String requestedProtocol : requestedProtocols) {
121121
for (AbstractWebSocketEndpoint item : endpoints) {
122-
if (item.getVersion().getValue().equals(requestedProcotol)) {
122+
if (item.getVersion().getValue().equals(requestedProtocol)) {
123123
return item;
124124
}
125125
}

src/main/java/de/rwth/idsg/steve/service/WebUserService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public void afterStart(ContextRefreshedEvent event) {
8787

8888
var headerVal = steveProperties.getAuth().getWebApiSecret();
8989

90-
var encodedApiPassword = StringUtils.isEmpty(headerVal)
90+
var encodedApiPassword = StringUtils.isBlank(headerVal)
9191
? null
9292
: passwordEncoder.encode(headerVal);
9393

src/main/java/de/rwth/idsg/steve/utils/LogFileRetriever.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ private List<Path> getActiveLogFilePaths() {
9393
Iterator<Appender<ILoggingEvent>> appenderIterator = logger.iteratorForAppenders();
9494

9595
List<Path> fileNameList = new ArrayList<>();
96-
if (appenderIterator.hasNext()) {
96+
while (appenderIterator.hasNext()) {
9797
var appender = appenderIterator.next();
9898
String fileName = extractFileName(appender);
9999
if (fileName != null) {

src/main/java/de/rwth/idsg/steve/web/validation/ChargeBoxIdListValidator.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
import lombok.RequiredArgsConstructor;
2222
import org.springframework.stereotype.Component;
23+
import org.springframework.util.CollectionUtils;
2324

2425
import jakarta.validation.ConstraintValidator;
2526
import jakarta.validation.ConstraintValidatorContext;
@@ -43,6 +44,9 @@ public void initialize(ChargeBoxId constraintAnnotation) {
4344

4445
@Override
4546
public boolean isValid(List<String> value, ConstraintValidatorContext context) {
47+
if (CollectionUtils.isEmpty(value)) {
48+
return true; // null or empty is valid, because it is another constraint's responsibility
49+
}
4650
for (String s : value) {
4751
if (!validator.isValid(s, context)) {
4852
return false;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ protected void attack() throws Exception {
8484
} finally {
8585
try {
8686
if (app != null) {
87-
app.stop();
87+
app.close();
8888
}
8989
} finally {
9090
if (databasePreparer != null) {

0 commit comments

Comments
 (0)