Skip to content

Commit 6ea5e9b

Browse files
goekaygoekay
committed
refactor
1 parent 091319d commit 6ea5e9b

6 files changed

Lines changed: 19 additions & 19 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public final void handleMessage(SoapMessage message) {
100100
* redirect to the version-specific implementation according to the namespace
101101
* of the incoming message.
102102
*/
103-
public void initServerLookupMap(SoapMessage message) {
103+
private void initServerLookupMap(SoapMessage message) {
104104
Bus bus = message.getExchange().getBus();
105105

106106
ServerRegistry serverRegistry = bus.getExtension(ServerRegistry.class);

‎src/main/java/de/rwth/idsg/steve/repository/dto/User.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package de.rwth.idsg.steve.repository.dto;
22

3-
import com.google.common.base.Optional;
43
import jooq.steve.db.tables.records.AddressRecord;
54
import jooq.steve.db.tables.records.UserRecord;
65
import lombok.Builder;
76
import lombok.Getter;
87

8+
import java.util.Optional;
9+
910
/**
1011
* @author Sevket Goekay <goekay@dbis.rwth-aachen.de>
1112
* @since 25.11.2015

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package de.rwth.idsg.steve.repository.impl;
22

3-
import com.google.common.base.Optional;
43
import de.rwth.idsg.steve.SteveException;
54
import de.rwth.idsg.steve.repository.AddressRepository;
65
import de.rwth.idsg.steve.repository.UserRepository;
@@ -24,6 +23,7 @@
2423
import org.springframework.stereotype.Repository;
2524

2625
import java.util.List;
26+
import java.util.Optional;
2727

2828
import static de.rwth.idsg.steve.utils.CustomDSL.includes;
2929
import static jooq.steve.db.tables.OcppTag.OCPP_TAG;
@@ -43,15 +43,15 @@ public class UserRepositoryImpl implements UserRepository {
4343
@Override
4444
public List<User.Overview> getOverview(UserQueryForm form) {
4545
return getOverviewInternal(form)
46-
.map(r -> User.Overview.builder()
47-
.userPk(r.value1())
48-
.ocppTagPk(r.value2())
49-
.ocppIdTag(r.value3())
50-
.name(r.value4() + " " + r.value5())
51-
.phone(r.value6())
52-
.email(r.value7())
53-
.build()
54-
);
46+
.map(r -> User.Overview.builder()
47+
.userPk(r.value1())
48+
.ocppTagPk(r.value2())
49+
.ocppIdTag(r.value3())
50+
.name(r.value4() + " " + r.value5())
51+
.phone(r.value6())
52+
.email(r.value7())
53+
.build()
54+
);
5555
}
5656

5757
@Override
@@ -74,7 +74,7 @@ public User.Details getDetails(int userPk) {
7474
// -------------------------------------------------------------------------
7575

7676
AddressRecord ar = addressRepository.get(ctx, ur.getAddressPk());
77-
77+
7878
// -------------------------------------------------------------------------
7979
// 3. ocpp_tag table
8080
// -------------------------------------------------------------------------
@@ -94,7 +94,7 @@ public User.Details getDetails(int userPk) {
9494
return User.Details.builder()
9595
.userRecord(ur)
9696
.address(ar)
97-
.ocppIdTag(Optional.fromNullable(ocppIdTag))
97+
.ocppIdTag(Optional.ofNullable(ocppIdTag))
9898
.build();
9999
}
100100

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package de.rwth.idsg.steve.utils;
22

3-
import com.google.common.base.Optional;
43
import lombok.extern.slf4j.Slf4j;
54
import org.apache.logging.log4j.LogManager;
65
import org.apache.logging.log4j.core.Appender;
@@ -18,6 +17,7 @@
1817
import java.nio.file.Paths;
1918
import java.util.ArrayList;
2019
import java.util.List;
20+
import java.util.Optional;
2121
import java.util.Random;
2222

2323
/**
@@ -44,7 +44,7 @@ public Optional<Path> getPath() {
4444
} else {
4545
p = rollTheDice();
4646
}
47-
return Optional.fromNullable(p);
47+
return Optional.ofNullable(p);
4848
}
4949

5050
public String getLogFilePathOrErrorMessage() {

‎src/main/java/de/rwth/idsg/steve/web/controller/LogController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package de.rwth.idsg.steve.web.controller;
22

3-
import com.google.common.base.Optional;
43
import de.rwth.idsg.steve.utils.LogFileRetriever;
54
import lombok.extern.slf4j.Slf4j;
65
import org.springframework.stereotype.Controller;
@@ -13,6 +12,7 @@
1312
import java.nio.charset.StandardCharsets;
1413
import java.nio.file.Files;
1514
import java.nio.file.Path;
15+
import java.util.Optional;
1616

1717
/**
1818
* @author Sevket Goekay <goekay@dbis.rwth-aachen.de>

‎src/main/java/de/rwth/idsg/steve/web/controller/UsersController.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package de.rwth.idsg.steve.web.controller;
22

3-
4-
import com.google.common.base.Optional;
53
import de.rwth.idsg.steve.repository.OcppTagRepository;
64
import de.rwth.idsg.steve.repository.UserRepository;
75
import de.rwth.idsg.steve.repository.dto.User;
@@ -19,6 +17,7 @@
1917
import org.springframework.web.bind.annotation.RequestMethod;
2018

2119
import javax.validation.Valid;
20+
import java.util.Optional;
2221

2322
/**
2423
* @author Sevket Goekay <goekay@dbis.rwth-aachen.de>

0 commit comments

Comments
 (0)