Merge pull request #57 from michal-luczak/fix

Fix

Author: michal-luczak

application/src/main/java/pl/luczak/michal/joboffersapp/offer/scheduler/OfferSchedulerConfig.java

@@ -3,7 +3,6 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.EnableScheduling;
 import pl.luczak.michal.joboffersapp.ports.input.offer.OfferSchedulerPort;
 import pl.luczak.michal.joboffersapp.ports.output.OfferService;
 

application/src/test/java/pl/luczak/michal/joboffersapp/offer/scheduler/OfferSchedulerTest.java

@@ -4,6 +4,7 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import pl.luczak.michal.joboffersapp.ports.input.offer.OfferSchedulerPort;
 
 import java.time.Duration;
@@ -20,7 +21,7 @@
 @SpringBootTest(properties = "job-offers.offer.scheduler.fixed-rate=PT1S")
 class OfferSchedulerTest {
 
-    @SpyBean
+    @MockitoSpyBean
     private OfferSchedulerPort offerScheduler;
 
     @Test

domain/src/main/java/pl/luczak/michal/joboffersapp/ports/input/offer/OfferControllerPort.java

@@ -3,15 +3,15 @@
 import java.util.UUID;
 
 /**
- * @param <RP> Response
- * @param <RQ> Request
+ * @param <Response> Response
+ * @param <Request> Request
 **/
 
-public interface OfferControllerPort<RP, RQ> {
+public interface OfferControllerPort<Response, Request> {
 
-    RP saveOffer(RQ rq);
+    Response saveOffer(Request rq);
 
-    RP findAllOffers();
+    Response findAllOffers();
 
-    RP findOfferById(UUID uniqueID);
+    Response findOfferById(UUID uniqueID);
 }

domain/src/main/java/pl/luczak/michal/joboffersapp/ports/input/user/UserControllerPort.java

@@ -1,10 +1,10 @@
 package pl.luczak.michal.joboffersapp.ports.input.user;
 
 /**
- * @param <RQ> request
- * @param <RP> response
+ * @param <Request> request
+ * @param <Response> response
 **/
-public interface UserControllerPort<RP, RQ> {
+public interface UserControllerPort<Response, Request> {
 
-    RP register(RQ rq);
+    Response register(Request request);
 }

domain/src/test/java/pl/luczak/michal/joboffersapp/offer/OfferFacadeTest.java

@@ -71,10 +71,10 @@ void should_successfully_find_offer_by_id() {
 
     @Test
     void should_unsuccessfully_find_offer_by_id_and_throw_OfferNotFoundException() {
-        //then
+        var uuid = UUID.randomUUID();
         assertThrows(
                 OfferNotFoundException.class,
-                () -> offerFacade.findOfferById(UUID.randomUUID())
+                () -> offerFacade.findOfferById(uuid)
         );
     }
 

infrastructure/adapters/offer-rest-controller/src/main/java/pl/luczak/michal/joboffersapp/OfferSaveRequest.java

@@ -5,14 +5,13 @@
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Pattern;
 import lombok.Builder;
-import org.springframework.context.annotation.PropertySource;
 
 @Builder
 public record OfferSaveRequest(
         @NotNull(message = "{not.null}")
         @NotBlank(message = "{not.blank}")
         @Pattern(
-                regexp = "https:\\/\\/(www\\.)?[-a-zA-Z0-9@:%._\\+~#=]{1,256}\\.[a-zA-Z0-9()]{1,6}\\b([-a-zA-Z0-9()@:%_\\+.~#?&//=]*)",
+                regexp = "https://(www\\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\\.[a-zA-Z0-9()]{1,6}\\b([-a-zA-Z0-9()@:%_+.~#?&//=]*)",
                 message = "{wrong.link.pattern}"
         )
         @JsonProperty("offerUrl")

infrastructure/adapters/offer-rest-controller/src/main/java/pl/luczak/michal/joboffersapp/OfferSaveRequestToOfferDTOMapper.java

@@ -4,8 +4,6 @@
 import pl.luczak.michal.joboffersapp.offer.IOfferDTOMapper;
 import pl.luczak.michal.joboffersapp.offer.dto.OfferDTO;
 
-import java.util.UUID;
-
 @Service
 class OfferSaveRequestToOfferDTOMapper implements IOfferDTOMapper<OfferSaveRequest> {
 

infrastructure/adapters/offer-rest-controller/src/test/java/pl/luczak/michal/joboffersapp/error/TestController.java

@@ -2,7 +2,6 @@
 
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
-import pl.luczak.michal.joboffersapp.OfferSaveRequest;
 import pl.luczak.michal.joboffersapp.offer.OfferAlreadyExistsException;
 import pl.luczak.michal.joboffersapp.offer.OfferNotFoundException;
 

infrastructure/adapters/offer-rest-fetcher/src/main/java/pl/luczak/michal/joboffersapp/OfferFetcher.java

@@ -24,7 +24,7 @@ class OfferFetcher implements OfferFetcherPort<OfferRequestDTO> {
     @Override
     public List<OfferRequestDTO> fetchOffers() {
         log.warn("Fetching offers from external server...");
-        String url = UriComponentsBuilder.fromHttpUrl(getUrlService("/offers"))
+        String url = UriComponentsBuilder.fromUriString(getUrlService("/offers"))
                 .toUriString();
         ResponseEntity<List<OfferRequestDTO>> response = restTemplate.exchange(
                 url,

infrastructure/adapters/offer-rest-fetcher/src/main/java/pl/luczak/michal/joboffersapp/resttemplate/RestTemplateConfig.java

@@ -22,10 +22,10 @@ RestTemplate restTemplate(
     ) {
         return new RestTemplateBuilder()
                 .errorHandler(restTemplateResponseErrorHandler)
-                .setConnectTimeout(
+                .connectTimeout(
                         Duration.ofMillis(restTemplateConfigProperties.connectionTimeOut())
                 )
-                .setReadTimeout(
+                .readTimeout(
                         Duration.ofMillis(restTemplateConfigProperties.readTimeOut())
                 )
                 .build();