diff --git a/spring-remoting/pom.xml b/spring-remoting/pom.xml index cfb4af9d85..2e3b7e76f8 100644 --- a/spring-remoting/pom.xml +++ b/spring-remoting/pom.xml @@ -13,8 +13,8 @@ 3.0.0 3.1.0 - 1.1.7 - 4.2.4.RELEASE + 1.1.8 + 4.3.5.RELEASE diff --git a/spring-remoting/remoting-http/api/src/main/java/com/baeldung/api/Booking.java b/spring-remoting/remoting-http/api/src/main/java/com/baeldung/api/Booking.java index 0f52a7bfbd..7bec4e162d 100644 --- a/spring-remoting/remoting-http/api/src/main/java/com/baeldung/api/Booking.java +++ b/spring-remoting/remoting-http/api/src/main/java/com/baeldung/api/Booking.java @@ -1,18 +1,18 @@ package com.baeldung.api; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; public class Booking implements Serializable { private int costInCent; private int etaInSeconds; private String bookingCode; - private Date pickUptime; + private LocalDateTime pickUptime; private Address pickUpAddress; private Address dropOffAddress; - public Booking(Address pickUpAddress, Date pickUptime, Address dropOffAddress, int costInCent, int etaInSeconds, String bookingCode) { + public Booking(Address pickUpAddress, LocalDateTime pickUptime, Address dropOffAddress, int costInCent, int etaInSeconds, String bookingCode) { this.costInCent = costInCent; this.etaInSeconds = etaInSeconds; this.bookingCode = bookingCode; @@ -33,7 +33,7 @@ public class Booking implements Serializable { return bookingCode; } - public Date getPickUptime() { + public LocalDateTime getPickUptime() { return pickUptime; } @@ -42,12 +42,11 @@ public class Booking implements Serializable { } @Override public String toString() { - return String.format("Booking: pick up @ %tr in %s, drop down in %s after %d minutes, %.2f $.", pickUptime, pickUpAddress, dropOffAddress, etaInSeconds/60, costInCent/100.0); + return String.format("Booking: pick up @ %tr in %s, drop down in %s after %d minutes, %.2f $.", pickUptime, pickUpAddress, dropOffAddress, etaInSeconds / 60, costInCent / 100.0); } public static void main(String[] args) throws InterruptedException { - System.out.println( - new Booking(new Address("a", "b"), new Date(), new Address("c", "d"), 123_00, 600, "abc") - ); + System.out.println(new Booking(new Address("a", "b"), + LocalDateTime.now(), new Address("c", "d"), 123_00, 600, "abc")); } } diff --git a/spring-remoting/remoting-http/client/src/main/java/com/baeldug/client/CabBookingClient.java b/spring-remoting/remoting-http/client/src/main/java/com/baeldug/client/CabBookingClient.java index 7cc8e5183c..9669970403 100644 --- a/spring-remoting/remoting-http/client/src/main/java/com/baeldug/client/CabBookingClient.java +++ b/spring-remoting/remoting-http/client/src/main/java/com/baeldug/client/CabBookingClient.java @@ -10,15 +10,11 @@ public class CabBookingClient { this.cabService = cabService; } - public void run() { + public void run() throws BookingException { Address pickUp = new Address("13 Seagate Blvd, Key Largo, FL 33037", "US"); Address dropDown = new Address("91831 Overseas Hwy, Tavernier, FL 33070", "US"); - try { - System.out.println( cabService.bookPickUp(pickUp, dropDown, 3) ); - } catch (BookingException e) { - e.printStackTrace(); - } + System.out.println( cabService.bookPickUp(pickUp, dropDown, 3) ); } diff --git a/spring-remoting/remoting-http/client/src/main/java/com/baeldug/client/Main.java b/spring-remoting/remoting-http/client/src/main/java/com/baeldug/client/Main.java index 0ddb37c508..a5e3ccd912 100644 --- a/spring-remoting/remoting-http/client/src/main/java/com/baeldug/client/Main.java +++ b/spring-remoting/remoting-http/client/src/main/java/com/baeldug/client/Main.java @@ -22,7 +22,7 @@ public class Main { return new CabBookingClient(service); } - public static void main(String[] args) throws InterruptedException { + public static void main(String[] args) throws Exception { AnnotationConfigApplicationContext rootContext = new AnnotationConfigApplicationContext(); rootContext.scan(Main.class.getPackage().getName()); diff --git a/spring-remoting/remoting-http/server/src/main/java/com/baeldung/server/CabBookingServiceImpl.java b/spring-remoting/remoting-http/server/src/main/java/com/baeldung/server/CabBookingServiceImpl.java index 5f43c7e707..8f3c099fe0 100644 --- a/spring-remoting/remoting-http/server/src/main/java/com/baeldung/server/CabBookingServiceImpl.java +++ b/spring-remoting/remoting-http/server/src/main/java/com/baeldung/server/CabBookingServiceImpl.java @@ -5,22 +5,23 @@ import com.baeldung.api.Booking; import com.baeldung.api.BookingException; import com.baeldung.api.CabBookingService; -import java.util.Date; +import java.time.LocalDateTime; import static java.lang.Math.random; -import static java.lang.System.currentTimeMillis; +import static java.time.LocalDateTime.now; +import static java.time.temporal.ChronoUnit.MINUTES; import static java.util.UUID.randomUUID; public class CabBookingServiceImpl implements CabBookingService { @Override public Booking bookPickUp(Address pickUpLocation, Address dropOffLocation, int pax) throws BookingException { - if(random()<0.3){ + if (random() < 0.3) { throw new BookingException("Cab unavailable"); } int tripTimeInMinutes = (int) (5 + random() * 15); int costInCent = 15_00 + tripTimeInMinutes * 5 * pax; - Date pickUpDate = new Date((long) (currentTimeMillis() + (1000 * 60 * random() * 15))); - return new Booking(pickUpLocation, pickUpDate, dropOffLocation, costInCent, tripTimeInMinutes * 60, - randomUUID().toString()); + LocalDateTime pickUpDate = now().plus(15L * (long) (random() * 10), MINUTES); + + return new Booking(pickUpLocation, pickUpDate, dropOffLocation, costInCent, tripTimeInMinutes * 60, randomUUID().toString()); } } diff --git a/spring-remoting/remoting-http/server/src/main/resources/logback.xml b/spring-remoting/remoting-http/server/src/main/resources/logback.xml index 7a03574f40..566c44b448 100644 --- a/spring-remoting/remoting-http/server/src/main/resources/logback.xml +++ b/spring-remoting/remoting-http/server/src/main/resources/logback.xml @@ -5,23 +5,12 @@ value="%-30(%d{MMM dd YYYY HH:mm:ss.SSS} [%thread]) %-5level %logger{5} [%file:%line] - %msg%n"/> - ${logPattern} - - - C:\Users\danidemi\tmp\baledung\app.log - false - - ${logPattern} - - - \ No newline at end of file