Skip to content

Commit ca0b85a

Browse files
goekaygoekay
committed
refactor
1 parent f4d4883 commit ca0b85a

File tree

6 files changed

+76
-75
lines changed

6 files changed

+76
-75
lines changed

‎src/main/java/de/rwth/idsg/steve/repository/ChargePointRepositoryImpl.java

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -82,24 +82,24 @@ public ChargePoint getChargePointDetails(String chargeBoxId) {
8282

8383
// TODO: Sweet baby jesus. Is there a better way?
8484
return ChargePoint.builder()
85-
.chargeBoxId(r.getChargeboxid())
86-
.endpointAddress(r.getEndpointAddress())
87-
.ocppProtocol(r.getOcppprotocol())
88-
.chargePointVendor(r.getChargepointvendor())
89-
.chargePointModel(r.getChargepointmodel())
90-
.chargePointSerialNumber(r.getChargepointserialnumber())
91-
.chargeBoxSerialNumber(r.getChargeboxserialnumber())
92-
.firewireVersion(r.getFwversion())
93-
.firewireUpdateStatus(r.getFwupdatestatus())
94-
.firewireUpdateTimestamp(DateTimeUtils.humanize(r.getFwupdatetimestamp()))
95-
.iccid(r.getIccid())
96-
.imsi(r.getImsi())
97-
.meterType(r.getMetertype())
98-
.meterSerialNumber(r.getMeterserialnumber())
99-
.diagnosticsStatus(r.getDiagnosticsstatus())
100-
.diagnosticsTimestamp(DateTimeUtils.humanize(r.getDiagnosticstimestamp()))
101-
.lastHeartbeatTimestamp(DateTimeUtils.humanize(r.getLastheartbeattimestamp()))
102-
.build();
85+
.chargeBoxId(r.getChargeboxid())
86+
.endpointAddress(r.getEndpointAddress())
87+
.ocppProtocol(r.getOcppprotocol())
88+
.chargePointVendor(r.getChargepointvendor())
89+
.chargePointModel(r.getChargepointmodel())
90+
.chargePointSerialNumber(r.getChargepointserialnumber())
91+
.chargeBoxSerialNumber(r.getChargeboxserialnumber())
92+
.firewireVersion(r.getFwversion())
93+
.firewireUpdateStatus(r.getFwupdatestatus())
94+
.firewireUpdateTimestamp(DateTimeUtils.humanize(r.getFwupdatetimestamp()))
95+
.iccid(r.getIccid())
96+
.imsi(r.getImsi())
97+
.meterType(r.getMetertype())
98+
.meterSerialNumber(r.getMeterserialnumber())
99+
.diagnosticsStatus(r.getDiagnosticsstatus())
100+
.diagnosticsTimestamp(DateTimeUtils.humanize(r.getDiagnosticstimestamp()))
101+
.lastHeartbeatTimestamp(DateTimeUtils.humanize(r.getLastheartbeattimestamp()))
102+
.build();
103103
}
104104

105105
@Override
@@ -193,9 +193,9 @@ private class HeartbeatMapper implements RecordMapper<Record2<String, Timestamp>
193193
@Override
194194
public Heartbeat map(Record2<String, Timestamp> r) {
195195
return Heartbeat.builder()
196-
.chargeBoxId(r.value1())
197-
.lastTimestamp(DateTimeUtils.humanize(r.value2()))
198-
.build();
196+
.chargeBoxId(r.value1())
197+
.lastTimestamp(DateTimeUtils.humanize(r.value2()))
198+
.build();
199199
}
200200
}
201201

@@ -204,12 +204,12 @@ private class ConnectorStatusMapper implements
204204
@Override
205205
public ConnectorStatus map(Record5<String, Integer, Timestamp, String, String> r) {
206206
return ConnectorStatus.builder()
207-
.chargeBoxId(r.value1())
208-
.connectorId(r.value2())
209-
.timeStamp(DateTimeUtils.humanize(r.value3()))
210-
.status(r.value4())
211-
.errorCode(r.value5())
212-
.build();
207+
.chargeBoxId(r.value1())
208+
.connectorId(r.value2())
209+
.timeStamp(DateTimeUtils.humanize(r.value3()))
210+
.status(r.value4())
211+
.errorCode(r.value5())
212+
.build();
213213
}
214214
}
215215
}

‎src/main/java/de/rwth/idsg/steve/repository/GenericRepositoryImpl.java

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -38,33 +38,33 @@ public Statistics getStats() {
3838
gs.execute(config);
3939

4040
return Statistics.builder()
41-
.numChargeBoxes(gs.getNumchargeboxes())
42-
.numUsers(gs.getNumusers())
43-
.numReservations(gs.getNumreservs())
44-
.numTransactions(gs.getNumtranses())
45-
.heartbeatToday(gs.getHeartbeattoday())
46-
.heartbeatYesterday(gs.getHeartbeatyester())
47-
.heartbeatEarlier(gs.getHeartbeatearl())
48-
.connAvailable(gs.getConnavail())
49-
.connOccupied(gs.getConnocc())
50-
.connFaulted(gs.getConnfault())
51-
.connUnavailable(gs.getConnunavail())
52-
.build();
41+
.numChargeBoxes(gs.getNumchargeboxes())
42+
.numUsers(gs.getNumusers())
43+
.numReservations(gs.getNumreservs())
44+
.numTransactions(gs.getNumtranses())
45+
.heartbeatToday(gs.getHeartbeattoday())
46+
.heartbeatYesterday(gs.getHeartbeatyester())
47+
.heartbeatEarlier(gs.getHeartbeatearl())
48+
.connAvailable(gs.getConnavail())
49+
.connOccupied(gs.getConnocc())
50+
.connFaulted(gs.getConnfault())
51+
.connUnavailable(gs.getConnunavail())
52+
.build();
5353
}
5454

5555
@Override
5656
public DbVersion getDBVersion() {
5757
Record2<String, Timestamp> record = DSL.using(config)
58-
.select(SCHEMA_VERSION.VERSION, SCHEMA_VERSION.INSTALLED_ON)
59-
.from(SCHEMA_VERSION)
60-
.where(SCHEMA_VERSION.VERSION_RANK.eq(
61-
select(max(SCHEMA_VERSION.VERSION_RANK)).from(SCHEMA_VERSION)))
62-
.fetchOne();
58+
.select(SCHEMA_VERSION.VERSION, SCHEMA_VERSION.INSTALLED_ON)
59+
.from(SCHEMA_VERSION)
60+
.where(SCHEMA_VERSION.VERSION_RANK.eq(
61+
select(max(SCHEMA_VERSION.VERSION_RANK)).from(SCHEMA_VERSION)))
62+
.fetchOne();
6363

6464
String ts = DateTimeUtils.humanize(record.value2());
6565
return DbVersion.builder()
66-
.version(record.value1())
67-
.updateTimestamp(ts)
68-
.build();
66+
.version(record.value1())
67+
.updateTimestamp(ts)
68+
.build();
6969
}
7070
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,8 @@ public void run(Configuration configuration) throws Exception {
193193
}
194194

195195
@Override
196-
public void insertMeterValuesOfTransaction(String chargeBoxIdentity, final int transactionId, final List<MeterValue> list) {
196+
public void insertMeterValuesOfTransaction(String chargeBoxIdentity, final int transactionId,
197+
final List<MeterValue> list) {
197198

198199
DSL.using(config).transaction(new TransactionalRunnable() {
199200
@Override

‎src/main/java/de/rwth/idsg/steve/repository/RequestTaskStoreImpl.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ public List<TaskOverview> getOverview() {
3131
RequestTask r = entry.getValue();
3232
list.add(
3333
TaskOverview.builder()
34-
.taskId(entry.getKey())
35-
.start(r.getStartTimestamp())
36-
.end(r.getEndTimestamp())
37-
.responseCount(r.getResponseCount().get())
38-
.requestCount(r.getResultMap().size())
39-
.build()
34+
.taskId(entry.getKey())
35+
.start(r.getStartTimestamp())
36+
.end(r.getEndTimestamp())
37+
.responseCount(r.getResponseCount().get())
38+
.requestCount(r.getResultMap().size())
39+
.build()
4040
);
4141
}
4242
Collections.sort(list);

‎src/main/java/de/rwth/idsg/steve/repository/ReservationRepositoryImpl.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -131,18 +131,6 @@ public void used(int reservationId, int transactionId) {
131131
.execute();
132132
}
133133

134-
private void internalUpdateReservation(int reservationId, ReservationStatus status) {
135-
try {
136-
DSL.using(config)
137-
.update(RESERVATION)
138-
.set(RESERVATION.STATUS, status.name())
139-
.where(RESERVATION.RESERVATION_PK.equal(reservationId))
140-
.execute();
141-
} catch (DataAccessException e) {
142-
log.error("Updating of reservationId '{}' to status '{}' FAILED.", reservationId, status, e);
143-
}
144-
}
145-
146134
// -------------------------------------------------------------------------
147135
// Private helpers
148136
// -------------------------------------------------------------------------
@@ -163,6 +151,18 @@ public Reservation map(Record7<Integer, Integer, String, String, Timestamp, Time
163151
}
164152
}
165153

154+
private void internalUpdateReservation(int reservationId, ReservationStatus status) {
155+
try {
156+
DSL.using(config)
157+
.update(RESERVATION)
158+
.set(RESERVATION.STATUS, status.name())
159+
.where(RESERVATION.RESERVATION_PK.equal(reservationId))
160+
.execute();
161+
} catch (DataAccessException e) {
162+
log.error("Updating of reservationId '{}' to status '{}' FAILED.", reservationId, status, e);
163+
}
164+
}
165+
166166
private void processType(SelectQuery selectQuery, ReservationQueryForm form) {
167167
switch (form.getPeriodType()) {
168168
case ACTIVE:

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -102,15 +102,15 @@ private class TransactionMapper implements
102102
@Override
103103
public Transaction map(Record8<Integer, String, Integer, String, Timestamp, String, Timestamp, String> r) {
104104
return Transaction.builder()
105-
.id(r.value1())
106-
.chargeBoxId(r.value2())
107-
.connectorId(r.value3())
108-
.idTag(r.value4())
109-
.startTimestamp(DateTimeUtils.humanize(r.value5()))
110-
.startValue(r.value6())
111-
.stopTimestamp(DateTimeUtils.humanize(r.value7()))
112-
.stopValue(r.value8())
113-
.build();
105+
.id(r.value1())
106+
.chargeBoxId(r.value2())
107+
.connectorId(r.value3())
108+
.idTag(r.value4())
109+
.startTimestamp(DateTimeUtils.humanize(r.value5()))
110+
.startValue(r.value6())
111+
.stopTimestamp(DateTimeUtils.humanize(r.value7()))
112+
.stopValue(r.value8())
113+
.build();
114114
}
115115
}
116116

0 commit comments

Comments
 (0)