refactor: reverse dependency between jooq and core module

steve-api/src/main/java/de/rwth/idsg/steve/web/api/ChargePointsRestController.java

@@ -105,8 +105,7 @@ private static ApiChargePoint toDto(ChargePoint.Overview overview) {
     }
 
     private static ApiChargePoint toDto(ChargePoint.Details details) {
-        return new ApiChargePoint(
-                details.getChargeBox().getChargeBoxPk(), details.getChargeBox().getChargeBoxId());
+        return new ApiChargePoint(details.getChargeBoxPk(), details.getChargeBoxId());
     }
 
     @Data

steve-api/src/main/java/de/rwth/idsg/steve/web/api/UsersRestController.java

@@ -63,7 +63,7 @@ public ResponseEntity<User.Details> addUser(@Valid @RequestBody UserForm form) {
         var body = usersService.add(form);
         var location = ServletUriComponentsBuilder.fromCurrentRequest()
                 .path("/{id}")
-                .buildAndExpand(body.getUserRecord().getUserPk())
+                .buildAndExpand(body.getUserPk())
                 .toUri();
         return ResponseEntity.created(location).body(body);
     }

steve-api/src/test/java/de/rwth/idsg/steve/web/api/ChargePointsRestControllerTest.java

@@ -22,7 +22,6 @@
 import de.rwth.idsg.steve.repository.dto.ChargePoint;
 import de.rwth.idsg.steve.service.ChargePointsService;
 import de.rwth.idsg.steve.web.dto.ChargePointForm;
-import jooq.steve.db.tables.records.ChargeBoxRecord;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -108,10 +107,10 @@ public void testGetOne_found() {
     }
 
     private static ChargePoint.Details createDetails(Integer pk, String chargeBoxId) {
-        ChargeBoxRecord cbr = new ChargeBoxRecord();
-        cbr.setChargeBoxPk(pk);
-        cbr.setChargeBoxId(chargeBoxId);
-        return new ChargePoint.Details(cbr, null);
+        return ChargePoint.Details.builder()
+                .chargeBoxPk(pk)
+                .chargeBoxId(chargeBoxId)
+                .build();
     }
 
     @Test
@@ -161,9 +160,7 @@ public void testPut() throws Exception {
     @Test
     @DisplayName("DELETE: Entity deleted, expected 200")
     public void testDelete() {
-        var rec = new ChargeBoxRecord();
-        rec.setChargeBoxPk(1);
-        var result = new ChargePoint.Details(rec, null);
+        var result = createDetails(1, "test-cb");
         when(chargePointsService.getDetails(1)).thenReturn(result);
 
         assertThat(mockMvc.perform(delete("/api/v1/chargeboxes/1"))).hasStatusOk();

steve-core/pom.xml

@@ -10,10 +10,6 @@
   <artifactId>steve-core</artifactId>
 
   <dependencies>
-    <dependency>
-      <groupId>de.rwth.idsg</groupId>
-      <artifactId>steve-jooq</artifactId>
-    </dependency>
     <dependency>
       <groupId>de.rwth.idsg</groupId>
       <artifactId>steve-ocpp-1-x</artifactId>

steve-core/src/main/java/de/rwth/idsg/steve/ocpp/task/SetChargingProfileTaskFromDB.java

@@ -22,7 +22,6 @@
 import de.rwth.idsg.steve.repository.ChargingProfileRepository;
 import de.rwth.idsg.steve.repository.dto.ChargingProfile;
 import de.rwth.idsg.steve.web.dto.ocpp.SetChargingProfileParams;
-import jooq.steve.db.tables.records.ChargingProfileRecord;
 import ocpp.cp._2015._10.ChargingProfileKindType;
 import ocpp.cp._2015._10.ChargingProfilePurposeType;
 import ocpp.cp._2015._10.ChargingRateUnitType;
@@ -64,7 +63,7 @@ public void success(String chargeBoxId, String statusValue) {
                 addNewResponse(chargeBoxId, statusValue);
 
                 if ("Accepted".equalsIgnoreCase(statusValue)) {
-                    int chargingProfilePk = details.getProfile().getChargingProfilePk();
+                    int chargingProfilePk = details.getChargingProfilePk();
                     chargingProfileRepository.setProfile(chargingProfilePk, chargeBoxId, connectorId);
                 }
             }
@@ -73,8 +72,6 @@ public void success(String chargeBoxId, String statusValue) {
 
     @Override
     public SetChargingProfileRequest getOcpp16Request() {
-        ChargingProfileRecord profile = details.getProfile();
-
         List<ChargingSchedulePeriod> schedulePeriods = details.getPeriods().stream()
                 .map(k -> {
                     ChargingSchedulePeriod p = new ChargingSchedulePeriod();
@@ -86,23 +83,23 @@ public SetChargingProfileRequest getOcpp16Request() {
                 .collect(Collectors.toList());
 
         ChargingSchedule schedule = new ChargingSchedule()
-                .withDuration(profile.getDurationInSeconds())
-                .withStartSchedule(toOffsetDateTime(profile.getStartSchedule()))
-                .withChargingRateUnit(ChargingRateUnitType.fromValue(profile.getChargingRateUnit()))
-                .withMinChargingRate(profile.getMinChargingRate())
+                .withDuration(details.getDurationInSeconds())
+                .withStartSchedule(toOffsetDateTime(details.getStartSchedule()))
+                .withChargingRateUnit(ChargingRateUnitType.fromValue(details.getChargingRateUnit()))
+                .withMinChargingRate(details.getMinChargingRate())
                 .withChargingSchedulePeriod(schedulePeriods);
 
         ocpp.cp._2015._10.ChargingProfile ocppProfile = new ocpp.cp._2015._10.ChargingProfile()
-                .withChargingProfileId(profile.getChargingProfilePk())
-                .withStackLevel(profile.getStackLevel())
-                .withChargingProfilePurpose(ChargingProfilePurposeType.fromValue(profile.getChargingProfilePurpose()))
-                .withChargingProfileKind(ChargingProfileKindType.fromValue(profile.getChargingProfileKind()))
+                .withChargingProfileId(details.getChargingProfilePk())
+                .withStackLevel(details.getStackLevel())
+                .withChargingProfilePurpose(ChargingProfilePurposeType.fromValue(details.getChargingProfilePurpose()))
+                .withChargingProfileKind(ChargingProfileKindType.fromValue(details.getChargingProfileKind()))
                 .withRecurrencyKind(
-                        profile.getRecurrencyKind() == null
+                        details.getRecurrencyKind() == null
                                 ? null
-                                : RecurrencyKindType.fromValue(profile.getRecurrencyKind()))
-                .withValidFrom(toOffsetDateTime(profile.getValidFrom()))
-                .withValidTo(toOffsetDateTime(profile.getValidTo()))
+                                : RecurrencyKindType.fromValue(details.getRecurrencyKind()))
+                .withValidFrom(toOffsetDateTime(details.getValidFrom()))
+                .withValidTo(toOffsetDateTime(details.getValidTo()))
                 .withChargingSchedule(schedule);
 
         var request =

steve-core/src/main/java/de/rwth/idsg/steve/repository/AddressRepository.java

@@ -19,20 +19,18 @@
 package de.rwth.idsg.steve.repository;
 
 import de.rwth.idsg.steve.web.dto.Address;
-import jooq.steve.db.tables.records.AddressRecord;
-import org.jooq.DSLContext;
-import org.jooq.Record1;
-import org.jooq.SelectConditionStep;
 import org.jspecify.annotations.Nullable;
 
+import java.util.Optional;
+
 /**
  * @author Sevket Goekay <sevketgokay@gmail.com>
  * @since 24.11.2015
  */
 public interface AddressRepository {
-    @Nullable AddressRecord get(DSLContext ctx, Integer addressPk);
+    Optional<Address> get(Integer addressPk);
 
-    @Nullable Integer updateOrInsert(DSLContext ctx, Address address);
+    @Nullable Integer updateOrInsert(Address address);
 
-    void delete(DSLContext ctx, SelectConditionStep<Record1<Integer>> addressPkSelect);
+    void delete(Integer addressPk);
 }

steve-core/src/main/java/de/rwth/idsg/steve/repository/OcppTagRepository.java

@@ -19,12 +19,12 @@
 package de.rwth.idsg.steve.repository;
 
 import de.rwth.idsg.steve.repository.dto.OcppTag;
+import de.rwth.idsg.steve.repository.dto.OcppTagActivity;
 import de.rwth.idsg.steve.web.dto.OcppTagForm;
 import de.rwth.idsg.steve.web.dto.OcppTagQueryForm;
-import jooq.steve.db.tables.records.OcppTagActivityRecord;
-import org.jooq.Result;
 
 import java.util.List;
+import java.util.Optional;
 
 /**
  * @author Sevket Goekay <sevketgokay@gmail.com>
@@ -33,13 +33,13 @@
 public interface OcppTagRepository {
     List<OcppTag.OcppTagOverview> getOverview(OcppTagQueryForm form);
 
-    Result<OcppTagActivityRecord> getRecords();
+    List<OcppTagActivity> getRecords();
 
-    Result<OcppTagActivityRecord> getRecords(List<String> idTagList);
+    List<OcppTagActivity> getRecords(List<String> idTagList);
 
-    OcppTagActivityRecord getRecord(String idTag);
+    Optional<OcppTagActivity> getRecord(String idTag);
 
-    OcppTagActivityRecord getRecord(int ocppTagPk);
+    Optional<OcppTagActivity> getRecord(int ocppTagPk);
 
     List<String> getIdTags();
 

steve-core/src/main/java/de/rwth/idsg/steve/repository/ReservationRepository.java

@@ -21,8 +21,6 @@
 import de.rwth.idsg.steve.repository.dto.InsertReservationParams;
 import de.rwth.idsg.steve.repository.dto.Reservation;
 import de.rwth.idsg.steve.web.dto.ReservationQueryForm;
-import org.jooq.Record1;
-import org.jooq.Select;
 
 import java.util.List;
 import java.util.Optional;
@@ -54,5 +52,5 @@ public interface ReservationRepository {
 
     void cancelled(int reservationId);
 
-    void used(Select<Record1<Integer>> connectorPkSelect, String ocppIdTag, int reservationId, int transactionId);
+    void used(int connectorPk, String ocppIdTag, int reservationId, int transactionId);
 }

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

@@ -41,5 +41,5 @@ public interface TransactionRepository {
 
     Optional<Integer> getActiveTransactionId(String chargeBoxId, int connectorId);
 
-    TransactionDetails getDetails(int transactionPk);
+    Optional<TransactionDetails> getDetails(int transactionPk);
 }

steve-core/src/main/java/de/rwth/idsg/steve/repository/WebUserRepository.java

@@ -18,19 +18,20 @@
  */
 package de.rwth.idsg.steve.repository;
 
+import de.rwth.idsg.steve.repository.dto.WebUser;
+import de.rwth.idsg.steve.service.dto.WebUserOverview;
 import de.rwth.idsg.steve.web.dto.WebUserQueryForm;
-import jooq.steve.db.tables.records.WebUserRecord;
-import org.jooq.JSON;
-import org.jooq.Record4;
-import org.jooq.Result;
+
+import java.util.List;
+import java.util.Optional;
 
 public interface WebUserRepository {
 
-    void createUser(WebUserRecord user);
+    void createUser(WebUser user);
 
-    void updateUser(WebUserRecord user);
+    void updateUser(WebUser user);
 
-    void updateUserByPk(WebUserRecord user);
+    void updateUserByPk(WebUser user);
 
     void deleteUser(String username);
 
@@ -48,9 +49,9 @@ public interface WebUserRepository {
 
     boolean userExists(String username);
 
-    WebUserRecord loadUserByUserPk(Integer webUserPk);
+    Optional<WebUser> loadUserByUserPk(Integer webUserPk);
 
-    WebUserRecord loadUserByUsername(String username);
+    Optional<WebUser> loadUserByUsername(String username);
 
-    Result<Record4<Integer, String, Boolean, JSON>> getOverview(WebUserQueryForm form);
+    List<WebUserOverview> getOverview(WebUserQueryForm form);
 }

steve-core/src/main/java/de/rwth/idsg/steve/repository/dto/ChargePoint.java

@@ -18,12 +18,12 @@
  */
 package de.rwth.idsg.steve.repository.dto;
 
-import jooq.steve.db.tables.records.AddressRecord;
-import jooq.steve.db.tables.records.ChargeBoxRecord;
+import com.neovisionaries.i18n.CountryCode;
+import de.rwth.idsg.steve.web.dto.Address;
 import lombok.Builder;
 import lombok.Getter;
-import lombok.RequiredArgsConstructor;
 
+import java.math.BigDecimal;
 import java.time.Instant;
 
 /**
@@ -40,9 +40,32 @@ public static final class Overview {
     }
 
     @Getter
-    @RequiredArgsConstructor
+    @Builder
     public static final class Details {
-        private final ChargeBoxRecord chargeBox;
-        private final AddressRecord address;
+        private final Integer chargeBoxPk;
+        private final String chargeBoxId;
+        private final String ocppProtocol;
+        private final String description;
+        private final BigDecimal locationLatitude;
+        private final BigDecimal locationLongitude;
+        private final String note;
+        private final String adminAddress;
+        private final boolean insertConnectorStatusAfterTransactionMsg;
+        private final String registrationStatus;
+        private final String street;
+        private final String houseNumber;
+        private final String zipCode;
+        private final String city;
+        private final CountryCode country;
+
+        public Address getAddress() {
+            var address = new Address();
+            address.setStreet(street);
+            address.setHouseNumber(houseNumber);
+            address.setZipCode(zipCode);
+            address.setCity(city);
+            address.setCountry(country);
+            return address;
+        }
     }
 }

steve-core/src/main/java/de/rwth/idsg/steve/repository/dto/ChargingProfile.java

@@ -18,12 +18,11 @@
  */
 package de.rwth.idsg.steve.repository.dto;
 
-import jooq.steve.db.tables.records.ChargingProfileRecord;
-import jooq.steve.db.tables.records.ChargingSchedulePeriodRecord;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
+import java.math.BigDecimal;
 import java.time.Instant;
 import java.util.List;
 
@@ -58,9 +57,29 @@ public static final class Overview {
     }
 
     @Getter
-    @RequiredArgsConstructor
+    @Builder
     public static final class Details {
-        private final ChargingProfileRecord profile;
-        private final List<ChargingSchedulePeriodRecord> periods;
+        // from ChargingProfileRecord
+        private final int chargingProfilePk;
+        private final int stackLevel;
+        private final String chargingProfilePurpose;
+        private final String chargingProfileKind;
+        private final String recurrencyKind;
+        private final Instant validFrom;
+        private final Instant validTo;
+        private final Integer durationInSeconds;
+        private final Instant startSchedule;
+        private final String chargingRateUnit;
+        private final BigDecimal minChargingRate;
+        // from ChargingSchedulePeriodRecord
+        private final List<ChargingSchedulePeriod> periods;
+    }
+
+    @Getter
+    @RequiredArgsConstructor
+    public static final class ChargingSchedulePeriod {
+        private final int startPeriodInSeconds;
+        private final BigDecimal powerLimit;
+        private final Integer numberPhases;
     }
 }