style correction

src/main/java/de/rwth/idsg/steve/repository/OcppServerRepository.java

@@ -42,7 +42,7 @@ public interface OcppServerRepository {
  void updateChargeboxHeartbeat(String chargeBoxIdentity, DateTime ts);
 
  void insertConnectorStatus(InsertConnectorStatusParams params);
- public Integer getConnectorPk(String chargeBoxId, int connectorId);
+ Integer getConnectorPk(String chargeBoxId, int connectorId);
 
  void insertMeterValues(String chargeBoxIdentity, List<MeterValue> list, int connectorId, Integer transactionId);
  void insertMeterValues(String chargeBoxIdentity, List<MeterValue> list, int transactionId);

src/main/java/de/rwth/idsg/steve/repository/TransactionRepository.java

@@ -30,7 +30,7 @@
  * @since 19.08.2014
  */
 public interface TransactionRepository {
- Transaction getTransaction(int transaction_pk);
+ Transaction getTransaction(int transactionPk);
 
  List<Transaction> getTransactions(TransactionQueryForm form);
 

src/main/java/de/rwth/idsg/steve/repository/impl/OcppServerRepositoryImpl.java

@@ -166,12 +166,12 @@ public void insertConnectorStatus(InsertConnectorStatusParams p) {
  }
 
  @Override
- public Integer getConnectorPk(String chargeBoxId, int connectorId){
+ public Integer getConnectorPk(String chargeBoxId, int connectorId) {
  return ctx.select(CONNECTOR.CONNECTOR_PK)
  .from(CONNECTOR)
  .where(CONNECTOR.CHARGE_BOX_ID.equal(chargeBoxId))
  .and(CONNECTOR.CONNECTOR_ID.equal(connectorId))
- .fetchOne().value1(); 
+ .fetchOne().value1();
  }
 
  @Override

src/main/java/de/rwth/idsg/steve/repository/impl/TransactionRepositoryImpl.java

@@ -66,9 +66,9 @@ public TransactionRepositoryImpl(DSLContext ctx) {
  }
 
  @Override
- public Transaction getTransaction(int transaction_pk) {
+ public Transaction getTransaction(int transactionPk) {
  TransactionQueryForm form = new TransactionQueryForm();
- form.setTransactionPk(transaction_pk);
+ form.setTransactionPk(transactionPk);
  form.setReturnCSV(false);
  form.setType(TransactionQueryForm.QueryType.ALL);
  return getInternal(form).fetch()

src/main/java/de/rwth/idsg/steve/repository/impl/UserRepositoryImpl.java

@@ -118,12 +118,11 @@ public User.Details getDetails(int userPk) {
 
  @Override
  public User.Details getDetails(String ocppIdTag) {
-
  Integer ocppPk = ctx.select(OCPP_TAG.OCPP_TAG_PK)
  .from(OCPP_TAG)
  .where(OCPP_TAG.ID_TAG.eq(ocppIdTag))
  .fetchOne(OCPP_TAG.OCPP_TAG_PK);
- 
+
  if (ocppPk == null) {
  throw new SteveException("There is no OCPP_Tag: '%s'", ocppIdTag);
  }

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

@@ -109,7 +109,7 @@
  return;
  }
 
- String subject = format("Connector '%s' of charging station '%s' is FAULTED", 
+ String subject = format("Connector '%s' of charging station '%s' is FAULTED",
  notification.getConnectorId(),
  notification.getChargeBoxId()
  );
@@ -135,63 +135,71 @@
 
  @EventListener
  @Async
- public void ocppStationStatusSuspendedEV(OcppStationStatusSuspendedEV notification){
- Integer connectorPk = ocppServerRepository.getConnectorPk(notification.getChargeBoxId(), notification.getConnectorId());
+ public void ocppStationStatusSuspendedEV(OcppStationStatusSuspendedEV notification) {
+ Integer connectorPk = ocppServerRepository.getConnectorPk(notification.getChargeBoxId(), 
+ notification.getConnectorId()
+ );
  String ocppTag = transactionRepository.getOcppTagOfActiveTransaction(connectorPk);
 
- String subject = format("EV stopped charging at charging station %s, Connector %d", 
- notification.getChargeBoxId(), 
- notification.getConnectorId());
+ String subject = format("EV stopped charging at charging station %s, Connector %d",
+ notification.getChargeBoxId(),
+ notification.getConnectorId()
+ );
  if (ocppTag != null){
 
  UserRecord userRecord = userRepository.getDetails(ocppTag).getUserRecord();
  String eMailAddy = userRecord.getEMail();
  // send email if user with eMail address found
- if (!Strings.isNullOrEmpty(eMailAddy)){
- String bodyUserMail = format("User: %s %s \n\n Connector %d of charging station %s notifies Suspended_EV",
- userRecord.getFirstName(),
- userRecord.getLastName(),
- notification.getConnectorId(),
- notification.getChargeBoxId()
- );
-
- mailService.sendAsync( subject, addTimestamp(bodyUserMail), eMailAddy);
+ if (!Strings.isNullOrEmpty(eMailAddy)) {
+ String bodyUserMail = 
+ format("User: %s %s \n\n Connector %d of charging station %s notifies Suspended_EV",
+ userRecord.getFirstName(),
+ userRecord.getLastName(),
+ notification.getConnectorId(),
+ notification.getChargeBoxId()
+ );
+
+ mailService.sendAsync(subject, addTimestamp(bodyUserMail), eMailAddy);
  }
  }
 
  /* mail defined in settings */ 
  if (isDisabled(OcppStationStatusSuspendedEV)) {
  return;
  }
- String body = format("Connector %d of charging station %s notifies Suspended_EV", 
+ String body = format("Connector %d of charging station %s notifies Suspended_EV",
  notification.getConnectorId(),
- notification.getChargeBoxId());
- mailService.sendAsync( subject, addTimestamp(body), "");
+ notification.getChargeBoxId()
+ );
+ mailService.sendAsync(subject, addTimestamp(body), "");
  }
 
  @EventListener
  @Async
  public void ocppTransactionEnded(OcppTransactionEnded notification) {
- Transaction TransActParams = transactionRepository.getTransaction(notification.getParams().getTransactionId());
+ Transaction transActParams = transactionRepository.getTransaction(notification.getParams().getTransactionId());
 
- TransActParams.getOcppTagPk();
- UserRecord userRecord = userRepository.getDetails(TransActParams.getOcppIdTag()).getUserRecord();
+ transActParams.getOcppTagPk();
+ UserRecord userRecord = userRepository.getDetails(transActParams.getOcppIdTag()).getUserRecord();
  String eMailAddress = userRecord.getEMail();
 
  // mail to user
  if (!Strings.isNullOrEmpty(eMailAddress)) {
- String subjectUserMail = format("Transaction '%s' has ended on charging station '%s'", 
- TransActParams.getId(),
- TransActParams.getChargeBoxId()
+ String subjectUserMail = format("Transaction '%s' has ended on charging station '%s'",
+ transActParams.getId(),
+ transActParams.getChargeBoxId()
  );
 
  // if the Transactionstop is received within the first Minute don't send an E-Mail
- if (TransActParams.getStopTimestamp().isAfter(TransActParams.getStartTimestamp().plusMinutes(1))){
- mailService.sendAsync(subjectUserMail, addTimestamp(createContent(TransActParams, userRecord)), eMailAddress);
+ if (transActParams.getStopTimestamp().isAfter(transActParams.getStartTimestamp().plusMinutes(1))) {
+ mailService.sendAsync(subjectUserMail,
+ addTimestamp(createContent(transActParams, userRecord)),
+ eMailAddress
+ );
  }
  }
 
  /* mail defined in settings */ 
  if (isDisabled(OcppTransactionEnded)) {
  return;
  }
@@ -233,23 +241,21 @@
  .toString();
  }
 
-private static String createContent(Transaction params, UserRecord userRecord) {
+ private static String createContent(Transaction params, UserRecord userRecord) {
  Double meterValueDiff;
  Integer meterValueStop;
  Integer meterValueStart;
- String str_meterValueDiff = "-";
- try
- {
+ String strMeterValueDiff = "-";
+ try {
  meterValueStop = Integer.valueOf(params.getStopValue());
  meterValueStart = Integer.valueOf(params.getStartValue());
- meterValueDiff = (meterValueStop - meterValueStart)/1000.0; // --> kWh
- str_meterValueDiff = meterValueDiff.toString() + " kWh";
+ meterValueDiff = (meterValueStop - meterValueStart) / 1000.0; // --> kWh
+ strMeterValueDiff = meterValueDiff.toString() + " kWh";
  }
- catch(NumberFormatException e)
- {
+ catch(NumberFormatException e) {
  log.error("Failed to calculate charged energy! ", e);
  }
 
  return new StringBuilder("User: ")
  .append(userRecord.getFirstName()).append(" ").append(userRecord.getLastName())
  .append(System.lineSeparator())
@@ -263,7 +269,7 @@
  .append("- stopTimestamp (UTC): ").append(params.getStopTimestamp()).append(System.lineSeparator())
  .append("- stopMeterValue: ").append(params.getStopValue()).append(System.lineSeparator())
  .append("- stopReason: ").append(params.getStopReason()).append(System.lineSeparator())
- .append("- charged energy: ").append(str_meterValueDiff).append(System.lineSeparator()) 
+ .append("- charged energy: ").append(strMeterValueDiff).append(System.lineSeparator())
  .toString();
  }
 

src/main/java/de/rwth/idsg/steve/service/notification/OcppStationStatusSuspendedEV.java

@@ -23,8 +23,8 @@
 /**
  * @author fnkbsi
  * @since 12.10.2022
- * 
  */
+
 @Data
 public class OcppStationStatusSuspendedEV {
 

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

@@ -99,9 +99,14 @@ public static String getLastBitFromUrl(final String input) {
 
  // https://www.baeldung.com/java-email-validation-regex
  public static boolean isValidAddress(String emailAddress) {
- String regexPattern = "^(?=.{1,64}@)[A-Za-z0-9_-]+(\\.[A-Za-z0-9_-]+)*@[^-][A-Za-z0-9-]+(\\.[A-Za-z0-9-]+)*(\\.[A-Za-z]{2,})$"; // Strict Regular Expression Validation
- //String regexPattern = "^(?=.{1,64}@)[\\p{L}0-9_-]+(\\.[\\p{L}0-9_-]+)*@[^-][\\p{L}0-9-]+(\\.[\\p{L}0-9-]+)*(\\.[\\p{L}]{2,})$"; //Regular Expression for Validation of Non-Latin or Unicode Characters Email
- //String regexPattern = "^[a-zA-Z0-9_!#$%&'*+/=?`{|}~^.-]+@[a-zA-Z0-9.-]+$" // Regular Expression by RFC 5322 for Email Validation
+ // Strict Regular Expression Validation
+ String regexPattern =
+ "^(?=.{1,64}@)[A-Za-z0-9_-]+(\\.[A-Za-z0-9_-]+)*@[^-][A-Za-z0-9-]+(\\.[A-Za-z0-9-]+)*(\\.[A-Za-z]{2,})$";
+ //Regular Expression for Validation of Non-Latin or Unicode Characters Email
+ //String regexPattern =
+ // "^(?=.{1,64}@)[\\p{L}0-9_-]+(\\.[\\p{L}0-9_-]+)*@[^-][\\p{L}0-9-]+(\\.[\\p{L}0-9-]+)*(\\.[\\p{L}]{2,})$";
+ // Regular Expression by RFC 5322 for Email Validation
+ //String regexPattern = "^[a-zA-Z0-9_!#$%&'*+/=?`{|}~^.-]+@[a-zA-Z0-9.-]+$"
  return Pattern.compile(regexPattern)
  .matcher(emailAddress)
  .matches();