fix test and commit spotless

challenge-service/src/main/java/com/cas/challengeservice/config/BadgeListener.java

@@ -1,3 +1,4 @@
+/* (C)2023 */
 package com.cas.challengeservice.config;
 
 import static com.cas.challengeservice.constant.Constants.MQ_REQUEST_ADD_BADGE;

challenge-service/src/main/java/com/cas/challengeservice/config/RabbitMQConfig.java

@@ -1,3 +1,4 @@
+/* (C)2023 */
 package com.cas.challengeservice.config;
 
 import org.springframework.amqp.core.Binding;

challenge-service/src/main/java/com/cas/challengeservice/constant/Constants.java

@@ -1,3 +1,4 @@
+/* (C)2023 */
 package com.cas.challengeservice.constant;
 
 public class Constants {

challenge-service/src/main/java/com/cas/challengeservice/controller/BadgeController.java

@@ -1,3 +1,4 @@
+/* (C)2023 */
 package com.cas.challengeservice.controller;
 
 import com.cas.challengeservice.dto.*;

challenge-service/src/main/java/com/cas/challengeservice/controller/ChallengeController.java

@@ -1,3 +1,4 @@
+/* (C)2023 */
 package com.cas.challengeservice.controller;
 
 import com.cas.challengeservice.dto.*;

challenge-service/src/main/java/com/cas/challengeservice/dto/BadgeAddRequest.java

@@ -1,3 +1,4 @@
+/* (C)2023 */
 package com.cas.challengeservice.dto;
 
 import lombok.*;

challenge-service/src/main/java/com/cas/challengeservice/dto/BadgeDeleteRequest.java

@@ -1,3 +1,4 @@
+/* (C)2023 */
 package com.cas.challengeservice.dto;
 
 import lombok.*;

challenge-service/src/main/java/com/cas/challengeservice/dto/BadgeDto.java

@@ -1,3 +1,4 @@
+/* (C)2023 */
 package com.cas.challengeservice.dto;
 
 import lombok.*;

challenge-service/src/main/java/com/cas/challengeservice/dto/BadgeGetRequest.java

@@ -1,3 +1,4 @@
+/* (C)2023 */
 package com.cas.challengeservice.dto;
 
 import lombok.*;

challenge-service/src/main/java/com/cas/challengeservice/dto/ChallengeAddRequest.java

@@ -1,3 +1,4 @@
+/* (C)2023 */
 package com.cas.challengeservice.dto;
 
 import lombok.*;

challenge-service/src/main/java/com/cas/challengeservice/dto/ChallengeDeleteRequest.java

@@ -1,3 +1,4 @@
+/* (C)2023 */
 package com.cas.challengeservice.dto;
 
 import lombok.*;

challenge-service/src/main/java/com/cas/challengeservice/dto/ChallengeGetRequest.java

@@ -1,3 +1,4 @@
+/* (C)2023 */
 package com.cas.challengeservice.dto;
 
 import lombok.*;

challenge-service/src/main/java/com/cas/challengeservice/dto/ChallengeTypeDto.java

@@ -1,3 +1,4 @@
+/* (C)2023 */
 package com.cas.challengeservice.dto;
 
 import lombok.*;

challenge-service/src/main/java/com/cas/challengeservice/dto/GenericMessage.java

@@ -1,3 +1,4 @@
+/* (C)2023 */
 package com.cas.challengeservice.dto;
 
 import jakarta.annotation.Nullable;

challenge-service/src/main/java/com/cas/challengeservice/dto/MessageDto.java

@@ -1,3 +1,4 @@
+/* (C)2023 */
 package com.cas.challengeservice.dto;
 
 import jakarta.annotation.Nullable;

challenge-service/src/main/java/com/cas/challengeservice/entity/Badge.java

@@ -1,3 +1,4 @@
+/* (C)2023 */
 package com.cas.challengeservice.entity;
 
 import com.cas.challengeservice.dto.BadgeDto;

challenge-service/src/main/java/com/cas/challengeservice/entity/ChallengeType.java

@@ -1,8 +1,8 @@
+/* (C)2023 */
 package com.cas.challengeservice.entity;
 
 import com.cas.challengeservice.dto.ChallengeTypeDto;
 import jakarta.persistence.*;
-import jdk.jshell.Snippet;
 import lombok.*;
 
 @Data

challenge-service/src/main/java/com/cas/challengeservice/repository/BadgeRepository.java

@@ -1,3 +1,4 @@
+/* (C)2023 */
 package com.cas.challengeservice.repository;
 
 import com.cas.challengeservice.entity.Badge;

challenge-service/src/main/java/com/cas/challengeservice/repository/ChallengeTypeRepository.java

@@ -1,3 +1,4 @@
+/* (C)2023 */
 package com.cas.challengeservice.repository;
 
 import com.cas.challengeservice.entity.ChallengeType;

challenge-service/src/main/java/com/cas/challengeservice/service/BadgeService.java

@@ -1,3 +1,4 @@
+/* (C)2023 */
 package com.cas.challengeservice.service;
 
 import com.cas.challengeservice.dto.*;

challenge-service/src/main/java/com/cas/challengeservice/service/ChallengeService.java

@@ -1,3 +1,4 @@
+/* (C)2023 */
 package com.cas.challengeservice.service;
 
 import com.cas.challengeservice.dto.*;

challenge-service/src/main/java/com/cas/challengeservice/service/Impl/BadgeServiceImpl.java

@@ -1,3 +1,4 @@
+/* (C)2023 */
 package com.cas.challengeservice.service.Impl;
 
 import com.cas.challengeservice.dto.*;

challenge-service/src/main/java/com/cas/challengeservice/service/Impl/ChallengeServiceImpl.java

@@ -1,3 +1,4 @@
+/* (C)2023 */
 package com.cas.challengeservice.service.Impl;
 
 import com.cas.challengeservice.dto.*;
@@ -14,6 +15,7 @@
 @Log4j2
 public class ChallengeServiceImpl implements ChallengeService {
  private final ChallengeTypeRepository challengeTypeRepository;
+
  @Autowired
  public ChallengeServiceImpl(ChallengeTypeRepository challengeTypeRepository) {
  this.challengeTypeRepository = challengeTypeRepository;
@@ -43,7 +45,9 @@ public GenericMessage<ChallengeTypeDto> getChallenge(ChallengeGetRequest request
  } else {
  return GenericMessage.<ChallengeTypeDto>builder()
  .status(HttpStatus.UNAUTHORIZED)
- .message("GetChallenge failed, user heart rate not in range for this challenge type")
+ .message(
+ "GetChallenge failed, user heart rate not in range for this"
+ + " challenge type")
  .build();
  }
  } else {

challenge-service/src/main/java/com/cas/challengeservice/service/Impl/MessageServiceImpl.java

@@ -1,3 +1,4 @@
+/* (C)2023 */
 package com.cas.challengeservice.service.Impl;
 
 import com.cas.challengeservice.service.MessageService;

challenge-service/src/main/java/com/cas/challengeservice/service/MessageService.java

@@ -1,3 +1,4 @@
+/* (C)2023 */
 package com.cas.challengeservice.service;
 
 public interface MessageService {

challenge-service/src/test/java/com/cas/challengeservice/ChallengeControllerTests.java

@@ -1,4 +1,6 @@
+/* (C)2023 */
 package com.cas.challengeservice;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
@@ -13,6 +15,7 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+
 @SpringBootTest
 public class ChallengeControllerTests {
  @Mock private ChallengeService challengeService;
@@ -32,11 +35,21 @@ public void setUp() {
  type = "Balance";
  exerciseCount = 30L;
 
- challengeGetRequest = ChallengeGetRequest.builder().userHeartRate(userHeartRate).type(type).build();
- challengeAddRequest = ChallengeAddRequest.builder().userHeartRate(userHeartRate).exerciseCount(exerciseCount).type(type).build();
+ challengeGetRequest =
+ ChallengeGetRequest.builder().userHeartRate(userHeartRate).type(type).build();
+ challengeAddRequest =
+ ChallengeAddRequest.builder()
+ .userHeartRate(userHeartRate)
+ .exerciseCount(exerciseCount)
+ .type(type)
+ .build();
  challengeDeleteRequest = ChallengeDeleteRequest.builder().type(type).build();
 
- message = GenericMessage.<ChallengeTypeDto>builder().status(HttpStatus.OK).message("Challenge Response").build();
+ message =
+ GenericMessage.<ChallengeTypeDto>builder()
+ .status(HttpStatus.OK)
+ .message("Challenge Response")
+ .build();
  }
 
  @Test

challenge-service/src/test/java/com/cas/challengeservice/ChallengeServiceTests.java

@@ -1,33 +1,32 @@
+/* (C)2023 */
 package com.cas.challengeservice;
 
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
 import com.cas.challengeservice.dto.*;
 import com.cas.challengeservice.entity.ChallengeType;
 import com.cas.challengeservice.repository.ChallengeTypeRepository;
 import com.cas.challengeservice.service.*;
-
 import com.cas.challengeservice.service.Impl.ChallengeServiceImpl;
+import java.util.Optional;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.HttpStatus;
 
-import java.util.Optional;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
 @SpringBootTest
 public class ChallengeServiceTests {
  @Mock private ChallengeTypeRepository challengeTypeRepository;
- @InjectMocks  private ChallengeServiceImpl challengeServiceImpl;
+ @InjectMocks private ChallengeServiceImpl challengeServiceImpl;
  private ChallengeAddRequest challengeAddRequest;
  private ChallengeDeleteRequest challengeDeleteRequest;
  private ChallengeGetRequest challengeGetRequest;
 
  @BeforeEach
- public void setUp() {
- }
+ public void setUp() {}
 
  @Test
  public void testGetChallengeWhenChallengeTypeNotExist() {
@@ -37,29 +36,36 @@ public void testGetChallengeWhenChallengeTypeNotExist() {
  GenericMessage<ChallengeTypeDto> result = challengeServiceImpl.getChallenge(request);
 
  assertEquals(HttpStatus.NOT_FOUND, result.getStatus());
- assertEquals("GetChallenge failed, no challenge type found with this type", result.getMessage());
+ assertEquals(
+ "GetChallenge failed, no challenge type found with this type", result.getMessage());
  }
 
  @Test
  public void testGetChallengeWhenUserHeartRateNotInRange() {
  ChallengeGetRequest request = new ChallengeGetRequest(300L, "Muscle");
 
- ChallengeType challengeType = ChallengeType.builder().description("Muscle").userHeartRate(200L).build();
+ ChallengeType challengeType =
+ ChallengeType.builder().description("Muscle").userHeartRate(200L).build();
 
- when(challengeTypeRepository.findByDescription(any())).thenReturn(Optional.ofNullable(challengeType));
+ when(challengeTypeRepository.findByDescription(any()))
+ .thenReturn(Optional.ofNullable(challengeType));
 
  GenericMessage<ChallengeTypeDto> result = challengeServiceImpl.getChallenge(request);
 
  assertEquals(HttpStatus.UNAUTHORIZED, result.getStatus());
- assertEquals("GetChallenge failed, user heart rate not in range for this challenge type", result.getMessage());
+ assertEquals(
+ "GetChallenge failed, user heart rate not in range for this challenge type",
+ result.getMessage());
  }
 
  @Test
  public void testGetChallengeSuccess() {
- ChallengeType challengeType = ChallengeType.builder().description("Cardio").userHeartRate(120L).build();
+ ChallengeType challengeType =
+ ChallengeType.builder().description("Cardio").userHeartRate(120L).build();
  ChallengeGetRequest request = new ChallengeGetRequest(120L, "Cardio");
 
- when(challengeTypeRepository.findByDescription(any())).thenReturn(Optional.ofNullable(challengeType));
+ when(challengeTypeRepository.findByDescription(any()))
+ .thenReturn(Optional.ofNullable(challengeType));
 
  GenericMessage<ChallengeTypeDto> result = challengeServiceImpl.getChallenge(request);
 
@@ -69,10 +75,12 @@ public void testGetChallengeSuccess() {
 
  @Test
  public void testAddChallengeTypeWhenChallengeTypeExist() {
- ChallengeType challengeType = ChallengeType.builder().description("Cardio").userHeartRate(120L).build();
+ ChallengeType challengeType =
+ ChallengeType.builder().description("Cardio").userHeartRate(120L).build();
  ChallengeAddRequest request = new ChallengeAddRequest(120L, 30L, "Cardio");
 
- when(challengeTypeRepository.findByDescription(any())).thenReturn(Optional.ofNullable(challengeType));
+ when(challengeTypeRepository.findByDescription(any()))
+ .thenReturn(Optional.ofNullable(challengeType));
 
  GenericMessage<ChallengeTypeDto> result = challengeServiceImpl.addChallenge(request);
 
@@ -99,14 +107,17 @@ public void testDeleteChallengeTypeWhenChallengeTypeNotFound() {
  GenericMessage<ChallengeTypeDto> result = challengeServiceImpl.deleteChallenge(request);
 
  assertEquals(HttpStatus.NOT_FOUND, result.getStatus());
- assertEquals("DeleteChallenge failed, no challenge type found with this type", result.getMessage());
+ assertEquals(
+ "DeleteChallenge failed, no challenge type found with this type",
+ result.getMessage());
  }
 
  @Test
  public void testDeleteChallengeTypeSuccess() {
  ChallengeType challengeType = ChallengeType.builder().description("Flexibility").build();
  ChallengeDeleteRequest request = new ChallengeDeleteRequest("Flexibility");
- when(challengeTypeRepository.findByDescription(any())).thenReturn(Optional.ofNullable(challengeType));
+ when(challengeTypeRepository.findByDescription(any()))
+ .thenReturn(Optional.ofNullable(challengeType));
 
  GenericMessage<ChallengeTypeDto> result = challengeServiceImpl.deleteChallenge(request);
 

geo-service/src/main/java/com/cas/geoservice/GeoServiceApplication.java

@@ -1,3 +1,4 @@
+/* (C)2023 */
 package com.cas.geoservice;
 
 import org.springframework.boot.SpringApplication;
@@ -9,5 +10,4 @@ public class GeoServiceApplication {
  public static void main(String[] args) {
  SpringApplication.run(GeoServiceApplication.class, args);
  }
-
 }

geo-service/src/main/java/com/cas/geoservice/config/RabbitMQConfig.java

@@ -1,3 +1,4 @@
+/* (C)2023 */
 package com.cas.geoservice.config;
 
 import org.springframework.amqp.core.Binding;
@@ -34,8 +35,7 @@ public class RabbitMQConfig {
  @Value("${spring.rabbitmq.queue}")
  private String queueName;
 
- @Autowired
- private ZoneListener zoneListener;
+ @Autowired private ZoneListener zoneListener;
 
  @Bean
  public ConnectionFactory connectionFactory() {

geo-service/src/main/java/com/cas/geoservice/config/ZoneListener.java

@@ -1,20 +1,20 @@
+/* (C)2023 */
 package com.cas.geoservice.config;
 
+import static com.cas.geoservice.constant.Constants.MQ_REQUEST_SET_ZONE;
+
 import com.cas.geoservice.dto.MessageDto;
 import com.cas.geoservice.dto.PlayerSetZoneRequest;
 import com.cas.geoservice.entity.PlayerZone;
 import com.cas.geoservice.repository.PlayerZoneRepository;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.Objects;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.MessageListener;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.Objects;
-
-import static com.cas.geoservice.constant.Constants.MQ_REQUEST_SET_ZONE;
-
 @Component
 @Log4j2
 public class ZoneListener implements MessageListener {
@@ -40,14 +40,24 @@ public void onMessage(Message message) {
  case MQ_REQUEST_SET_ZONE:
  log.info("MQ - Set zone: {}", messageDto.getPlayerSetZoneRequest());
  PlayerSetZoneRequest request = messageDto.getPlayerSetZoneRequest();
- PlayerZone playerZone = PlayerZone.builder().username(request.getUsername()).name(request.getZone()).build();
+ PlayerZone playerZone =
+ PlayerZone.builder()
+ .username(request.getUsername())
+ .name(request.getZone())
+ .build();
 
  PlayerZone zone = playerZoneRepository.findByUsername(request.getUsername());
- if(Objects.isNull(zone)) {
- log.info("Save player {} zone to : {}", playerZone.getUsername(), playerZone.getName());
+ if (Objects.isNull(zone)) {
+ log.info(
+ "Save player {} zone to : {}",
+ playerZone.getUsername(),
+ playerZone.getName());
  playerZoneRepository.save(playerZone);
  } else {
- log.info("Update player {} zone to : {}", zone.getUsername(), zone.getName());
+ log.info(
+ "Update player {} zone to : {}",
+ zone.getUsername(),
+ zone.getName());
  zone.setName(request.getZone());
  playerZoneRepository.save(zone);
  }

geo-service/src/main/java/com/cas/geoservice/constant/Constants.java

@@ -1,3 +1,4 @@
+/* (C)2023 */
 package com.cas.geoservice.constant;
 
 public class Constants {