Bladeren bron

add Docker image

Fabien CHERET 5 jaren geleden
bovenliggende
commit
ade64bbe06

+ 0 - 4
pom.xml

@@ -27,10 +27,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-jpa</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>

+ 0 - 4
src/main/java/eu/fcheret/parkingtoll/model/ParkingLot.java

@@ -5,8 +5,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import org.springframework.validation.annotation.Validated;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
@@ -19,10 +17,8 @@ import java.util.stream.Collectors;
  */
 @Validated
 @Data
-@Entity
 public class ParkingLot   {
   @JsonProperty("id")
-  @Id
   private Long id = null;
 
   @JsonProperty("name")

+ 8 - 8
src/main/java/eu/fcheret/parkingtoll/service/ParkingLotService.java

@@ -61,27 +61,27 @@ public class ParkingLotService {
         return carSlot;
     }
 
-    public CarSlot parkAtParkingLot(Long parkingLotId, CarSlot carSlotItem) {
+    public CarSlot parkAtParkingLot(Long parkingLotId, CarSlot slot) {
         //check if the asked parking exists
         ParkingLot parkingLot = findParkingLotByIdOrThrow(parkingLotId);
 
         //check if there is available slots
-        Layout layout = getLayoutByNameOrThrow(carSlotItem.getType(), parkingLot);
+        Layout layout = getLayoutByNameOrThrow(slot.getType(), parkingLot);
         isAvailableOrThrow(layout);
         //found & available spot
         synchronized (this){
             //double check locking
             parkingLot = findParkingLotByIdOrThrow(parkingLotId);
-            layout = getLayoutByNameOrThrow(carSlotItem.getType(), parkingLot);
+            layout = getLayoutByNameOrThrow(slot.getType(), parkingLot);
             isAvailableOrThrow(layout);
             Long slotId = layout.decrementAndGetID();
-            carSlotItem.setSlot(slotId);
-            carSlotItem.setParkingLotId(parkingLotId);
-            carSlotItem.setArrivalTime(Instant.now());
-            layout.getCarSlots().put(slotId, carSlotItem);
+            slot.setSlot(slotId);
+            slot.setParkingLotId(parkingLotId);
+            slot.setArrivalTime(Instant.now());
+            layout.getCarSlots().put(slotId, slot);
             persistenceManager.save(parkingLot);
         }
-        return carSlotItem;
+        return slot;
     }
 
     private void isAvailableOrThrow(Layout layout){