Skip to content

Commit 05d5d9d

Browse files
merikbestmerikbest
committed
Changed commons lib imports. Added batch job configs and scripts
1 parent 48fa79f commit 05d5d9d

File tree

398 files changed

+1410
-990
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

398 files changed

+1410
-990
lines changed

‎api-gateway/src/main/java/com/gmail/merikbest2015/filter/AuthFilter.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
package com.gmail.merikbest2015.filter;
22

3-
import com.gmail.merikbest2015.dto.response.user.UserPrincipalResponse;
4-
import com.gmail.merikbest2015.security.JwtAuthenticationException;
5-
import com.gmail.merikbest2015.security.JwtProvider;
3+
import com.gmail.merikbest2015.commons.dto.response.user.UserPrincipalResponse;
4+
import com.gmail.merikbest2015.commons.security.JwtAuthenticationException;
5+
import com.gmail.merikbest2015.commons.security.JwtProvider;
66
import org.springframework.cloud.gateway.filter.GatewayFilter;
77
import org.springframework.cloud.gateway.filter.factory.AbstractGatewayFilterFactory;
88
import org.springframework.stereotype.Component;
99
import org.springframework.web.client.RestTemplate;
1010

11-
import static com.gmail.merikbest2015.constants.ErrorMessage.JWT_TOKEN_EXPIRED;
12-
import static com.gmail.merikbest2015.constants.FeignConstants.USER_SERVICE;
13-
import static com.gmail.merikbest2015.constants.PathConstants.*;
11+
import static com.gmail.merikbest2015.commons.constants.ErrorMessage.JWT_TOKEN_EXPIRED;
12+
import static com.gmail.merikbest2015.commons.constants.FeignConstants.USER_SERVICE;
13+
import static com.gmail.merikbest2015.commons.constants.PathConstants.*;
1414

1515
@Component
1616
public class AuthFilter extends AbstractGatewayFilterFactory<AuthFilter.Config> {

‎chat-service/src/main/java/com/gmail/merikbest2015/batch/ImportUserJobConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.gmail.merikbest2015.batch;
22

33
import com.gmail.merikbest2015.client.UserClient;
4-
import com.gmail.merikbest2015.event.UpdateUserEvent;
4+
import com.gmail.merikbest2015.commons.event.UpdateUserEvent;
55
import com.gmail.merikbest2015.model.User;
66
import com.gmail.merikbest2015.service.UserHandlerService;
77
import jakarta.persistence.EntityManagerFactory;

‎chat-service/src/main/java/com/gmail/merikbest2015/batch/UserItemReader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.gmail.merikbest2015.batch;
22

3-
import com.gmail.merikbest2015.event.UpdateUserEvent;
3+
import com.gmail.merikbest2015.commons.event.UpdateUserEvent;
44
import org.springframework.batch.item.data.AbstractPaginatedDataItemReader;
55
import org.springframework.data.domain.Page;
66
import org.springframework.data.domain.PageRequest;

‎chat-service/src/main/java/com/gmail/merikbest2015/broker/consumer/UserConsumer.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
package com.gmail.merikbest2015.broker.consumer;
22

3-
import com.gmail.merikbest2015.event.BlockUserEvent;
4-
import com.gmail.merikbest2015.event.FollowRequestUserEvent;
5-
import com.gmail.merikbest2015.event.FollowUserEvent;
6-
import com.gmail.merikbest2015.event.UpdateUserEvent;
3+
import com.gmail.merikbest2015.commons.event.BlockUserEvent;
4+
import com.gmail.merikbest2015.commons.event.FollowRequestUserEvent;
5+
import com.gmail.merikbest2015.commons.event.FollowUserEvent;
6+
import com.gmail.merikbest2015.commons.event.UpdateUserEvent;
77
import com.gmail.merikbest2015.service.UserHandlerService;
88
import lombok.RequiredArgsConstructor;
99
import org.springframework.kafka.annotation.KafkaListener;
1010
import org.springframework.messaging.handler.annotation.Header;
1111
import org.springframework.stereotype.Component;
1212

13-
import static com.gmail.merikbest2015.constants.KafkaTopicConstants.*;
14-
import static com.gmail.merikbest2015.constants.PathConstants.AUTH_USER_ID_HEADER;
13+
import static com.gmail.merikbest2015.commons.constants.KafkaTopicConstants.*;
14+
import static com.gmail.merikbest2015.commons.constants.PathConstants.AUTH_USER_ID_HEADER;
1515

1616
@Component
1717
@RequiredArgsConstructor

‎chat-service/src/main/java/com/gmail/merikbest2015/client/TweetClient.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package com.gmail.merikbest2015.client;
22

3-
import com.gmail.merikbest2015.configuration.FeignConfiguration;
4-
import com.gmail.merikbest2015.dto.response.chat.ChatTweetResponse;
3+
import com.gmail.merikbest2015.commons.configuration.FeignConfiguration;
4+
import com.gmail.merikbest2015.commons.dto.response.chat.ChatTweetResponse;
55
import io.github.resilience4j.circuitbreaker.annotation.CircuitBreaker;
66
import org.springframework.cloud.openfeign.FeignClient;
77
import org.springframework.web.bind.annotation.GetMapping;
88
import org.springframework.web.bind.annotation.PathVariable;
99

10-
import static com.gmail.merikbest2015.constants.FeignConstants.TWEET_SERVICE;
11-
import static com.gmail.merikbest2015.constants.PathConstants.*;
10+
import static com.gmail.merikbest2015.commons.constants.FeignConstants.TWEET_SERVICE;
11+
import static com.gmail.merikbest2015.commons.constants.PathConstants.*;
1212

1313
@CircuitBreaker(name = TWEET_SERVICE)
1414
@FeignClient(name = TWEET_SERVICE, path = API_V1_TWEETS, configuration = FeignConfiguration.class)

‎chat-service/src/main/java/com/gmail/merikbest2015/client/UserClient.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
package com.gmail.merikbest2015.client;
22

3-
import com.gmail.merikbest2015.configuration.FeignConfiguration;
4-
import com.gmail.merikbest2015.event.UpdateUserEvent;
3+
import com.gmail.merikbest2015.commons.configuration.FeignConfiguration;
4+
import com.gmail.merikbest2015.commons.event.UpdateUserEvent;
55
import io.github.resilience4j.circuitbreaker.annotation.CircuitBreaker;
66
import org.springframework.cloud.openfeign.FeignClient;
77
import org.springframework.web.bind.annotation.GetMapping;
88
import org.springframework.web.bind.annotation.RequestParam;
99

1010
import java.util.List;
1111

12-
import static com.gmail.merikbest2015.constants.FeignConstants.USER_SERVICE;
13-
import static com.gmail.merikbest2015.constants.PathConstants.API_V1_USER;
14-
import static com.gmail.merikbest2015.constants.PathConstants.BATCH_USERS;
12+
import static com.gmail.merikbest2015.commons.constants.FeignConstants.USER_SERVICE;
13+
import static com.gmail.merikbest2015.commons.constants.PathConstants.API_V1_USER;
14+
import static com.gmail.merikbest2015.commons.constants.PathConstants.BATCH_USERS;
1515

1616
@CircuitBreaker(name = USER_SERVICE)
1717
@FeignClient(value = USER_SERVICE, path = API_V1_USER, configuration = FeignConfiguration.class)

‎chat-service/src/main/java/com/gmail/merikbest2015/client/WebSocketClient.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package com.gmail.merikbest2015.client;
22

3-
import com.gmail.merikbest2015.configuration.FeignConfiguration;
3+
import com.gmail.merikbest2015.commons.configuration.FeignConfiguration;
44
import io.github.resilience4j.circuitbreaker.annotation.CircuitBreaker;
55
import org.springframework.cloud.openfeign.FeignClient;
66
import org.springframework.web.bind.annotation.PostMapping;
77
import org.springframework.web.bind.annotation.RequestBody;
88
import org.springframework.web.bind.annotation.RequestParam;
99

10-
import static com.gmail.merikbest2015.constants.FeignConstants.WEBSOCKET_SERVICE;
11-
import static com.gmail.merikbest2015.constants.PathConstants.API_V1_WEBSOCKET;
10+
import static com.gmail.merikbest2015.commons.constants.FeignConstants.WEBSOCKET_SERVICE;
11+
import static com.gmail.merikbest2015.commons.constants.PathConstants.API_V1_WEBSOCKET;
1212

1313
@CircuitBreaker(name = WEBSOCKET_SERVICE)
1414
@FeignClient(name = WEBSOCKET_SERVICE, configuration = FeignConfiguration.class)

‎chat-service/src/main/java/com/gmail/merikbest2015/configuration/KafkaConsumerConfiguration.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.gmail.merikbest2015.configuration;
22

3-
import com.gmail.merikbest2015.event.BlockUserEvent;
4-
import com.gmail.merikbest2015.event.FollowRequestUserEvent;
5-
import com.gmail.merikbest2015.event.FollowUserEvent;
6-
import com.gmail.merikbest2015.event.UpdateUserEvent;
3+
import com.gmail.merikbest2015.commons.event.BlockUserEvent;
4+
import com.gmail.merikbest2015.commons.event.FollowRequestUserEvent;
5+
import com.gmail.merikbest2015.commons.event.FollowUserEvent;
6+
import com.gmail.merikbest2015.commons.event.UpdateUserEvent;
77
import org.apache.kafka.clients.consumer.ConsumerConfig;
88
import org.apache.kafka.common.serialization.StringDeserializer;
99
import org.springframework.beans.factory.annotation.Value;

‎chat-service/src/main/java/com/gmail/merikbest2015/controller/ChatController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
import java.util.List;
1313

14-
import static com.gmail.merikbest2015.constants.PathConstants.*;
14+
import static com.gmail.merikbest2015.commons.constants.PathConstants.*;
1515

1616
@RestController
1717
@RequiredArgsConstructor

‎chat-service/src/main/java/com/gmail/merikbest2015/controller/ChatMessageController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
import java.util.List;
1313

14-
import static com.gmail.merikbest2015.constants.PathConstants.*;
15-
import static com.gmail.merikbest2015.constants.WebsocketConstants.TOPIC_CHAT;
14+
import static com.gmail.merikbest2015.commons.constants.PathConstants.*;
15+
import static com.gmail.merikbest2015.commons.constants.WebsocketConstants.TOPIC_CHAT;
1616

1717
@RestController
1818
@RequiredArgsConstructor

‎chat-service/src/main/java/com/gmail/merikbest2015/controller/ChatParticipantController.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.gmail.merikbest2015.controller;
22

3-
import com.gmail.merikbest2015.dto.HeaderResponse;
3+
import com.gmail.merikbest2015.commons.dto.HeaderResponse;
44
import com.gmail.merikbest2015.dto.response.UserChatResponse;
5-
import com.gmail.merikbest2015.dto.response.user.UserResponse;
5+
import com.gmail.merikbest2015.commons.dto.response.user.UserResponse;
66
import com.gmail.merikbest2015.mapper.ChatParticipantMapper;
77
import lombok.RequiredArgsConstructor;
88
import org.springframework.data.domain.Pageable;
@@ -15,8 +15,8 @@
1515

1616
import java.util.List;
1717

18-
import static com.gmail.merikbest2015.constants.PathConstants.*;
19-
import static com.gmail.merikbest2015.constants.PathConstants.SEARCH_USERNAME;
18+
import static com.gmail.merikbest2015.commons.constants.PathConstants.*;
19+
import static com.gmail.merikbest2015.commons.constants.PathConstants.SEARCH_USERNAME;
2020

2121
@RestController
2222
@RequiredArgsConstructor

‎chat-service/src/main/java/com/gmail/merikbest2015/dto/response/ChatMessageResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.gmail.merikbest2015.dto.response;
22

3-
import com.gmail.merikbest2015.dto.response.chat.ChatTweetResponse;
3+
import com.gmail.merikbest2015.commons.dto.response.chat.ChatTweetResponse;
44
import lombok.Data;
55

66
import java.time.LocalDateTime;

‎chat-service/src/main/java/com/gmail/merikbest2015/dto/response/ChatResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.gmail.merikbest2015.dto.response;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
4-
import com.gmail.merikbest2015.dto.response.chat.ChatUserParticipantResponse;
4+
import com.gmail.merikbest2015.commons.dto.response.chat.ChatUserParticipantResponse;
55
import lombok.Data;
66

77
import java.time.LocalDateTime;

‎chat-service/src/main/java/com/gmail/merikbest2015/dto/response/UserChatResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.gmail.merikbest2015.dto.response;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
4-
import com.gmail.merikbest2015.dto.response.user.UserResponse;
4+
import com.gmail.merikbest2015.commons.dto.response.user.UserResponse;
55
import lombok.Getter;
66
import lombok.Setter;
77

‎chat-service/src/main/java/com/gmail/merikbest2015/mapper/ChatMapper.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.gmail.merikbest2015.mapper;
22

3+
import com.gmail.merikbest2015.commons.mapper.BasicMapper;
34
import com.gmail.merikbest2015.dto.response.ChatResponse;
45
import com.gmail.merikbest2015.repository.projection.ChatProjection;
56
import com.gmail.merikbest2015.service.ChatService;

‎chat-service/src/main/java/com/gmail/merikbest2015/mapper/ChatMessageMapper.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.gmail.merikbest2015.mapper;
22

3+
import com.gmail.merikbest2015.commons.mapper.BasicMapper;
34
import com.gmail.merikbest2015.dto.request.ChatMessageRequest;
45
import com.gmail.merikbest2015.dto.request.MessageWithTweetRequest;
56
import com.gmail.merikbest2015.dto.response.ChatMessageResponse;

‎chat-service/src/main/java/com/gmail/merikbest2015/mapper/ChatParticipantMapper.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package com.gmail.merikbest2015.mapper;
22

3-
import com.gmail.merikbest2015.dto.HeaderResponse;
3+
import com.gmail.merikbest2015.commons.dto.HeaderResponse;
4+
import com.gmail.merikbest2015.commons.mapper.BasicMapper;
45
import com.gmail.merikbest2015.dto.response.UserChatResponse;
5-
import com.gmail.merikbest2015.dto.response.user.UserResponse;
6+
import com.gmail.merikbest2015.commons.dto.response.user.UserResponse;
67
import com.gmail.merikbest2015.repository.projection.UserChatProjection;
78
import com.gmail.merikbest2015.repository.projection.UserProjection;
89
import com.gmail.merikbest2015.service.ChatParticipantService;

‎chat-service/src/main/java/com/gmail/merikbest2015/repository/projection/ChatMessageProjection.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.gmail.merikbest2015.repository.projection;
22

3-
import com.gmail.merikbest2015.dto.response.chat.ChatTweetResponse;
3+
import com.gmail.merikbest2015.commons.dto.response.chat.ChatTweetResponse;
44
import org.springframework.beans.factory.annotation.Value;
55

66
import java.time.LocalDateTime;

‎chat-service/src/main/java/com/gmail/merikbest2015/service/UserHandlerService.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.gmail.merikbest2015.service;
22

3-
import com.gmail.merikbest2015.event.BlockUserEvent;
4-
import com.gmail.merikbest2015.event.FollowRequestUserEvent;
5-
import com.gmail.merikbest2015.event.FollowUserEvent;
6-
import com.gmail.merikbest2015.event.UpdateUserEvent;
3+
import com.gmail.merikbest2015.commons.event.BlockUserEvent;
4+
import com.gmail.merikbest2015.commons.event.FollowRequestUserEvent;
5+
import com.gmail.merikbest2015.commons.event.FollowUserEvent;
6+
import com.gmail.merikbest2015.commons.event.UpdateUserEvent;
77
import com.gmail.merikbest2015.model.User;
88

99
public interface UserHandlerService {

‎chat-service/src/main/java/com/gmail/merikbest2015/service/impl/ChatMessageServiceImpl.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.gmail.merikbest2015.service.impl;
22

3-
import com.gmail.merikbest2015.exception.ApiRequestException;
3+
import com.gmail.merikbest2015.commons.exception.ApiRequestException;
44
import com.gmail.merikbest2015.model.Chat;
55
import com.gmail.merikbest2015.model.ChatMessage;
66
import com.gmail.merikbest2015.model.ChatParticipant;
@@ -13,7 +13,7 @@
1313
import com.gmail.merikbest2015.service.ChatMessageService;
1414
import com.gmail.merikbest2015.service.UserService;
1515
import com.gmail.merikbest2015.service.util.ChatServiceHelper;
16-
import com.gmail.merikbest2015.util.AuthUtil;
16+
import com.gmail.merikbest2015.commons.util.AuthUtil;
1717
import lombok.RequiredArgsConstructor;
1818
import org.springframework.http.HttpStatus;
1919
import org.springframework.stereotype.Service;
@@ -24,8 +24,8 @@
2424
import java.util.Map;
2525
import java.util.stream.Collectors;
2626

27-
import static com.gmail.merikbest2015.constants.ErrorMessage.CHAT_NOT_FOUND;
28-
import static com.gmail.merikbest2015.constants.ErrorMessage.CHAT_PARTICIPANT_NOT_FOUND;
27+
import static com.gmail.merikbest2015.commons.constants.ErrorMessage.CHAT_NOT_FOUND;
28+
import static com.gmail.merikbest2015.commons.constants.ErrorMessage.CHAT_PARTICIPANT_NOT_FOUND;
2929

3030
@Service
3131
@RequiredArgsConstructor

‎chat-service/src/main/java/com/gmail/merikbest2015/service/impl/ChatParticipantServiceImpl.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.gmail.merikbest2015.service.impl;
22

3-
import com.gmail.merikbest2015.exception.ApiRequestException;
3+
import com.gmail.merikbest2015.commons.exception.ApiRequestException;
44
import com.gmail.merikbest2015.model.Chat;
55
import com.gmail.merikbest2015.model.ChatParticipant;
66
import com.gmail.merikbest2015.model.User;
@@ -10,16 +10,16 @@
1010
import com.gmail.merikbest2015.repository.projection.UserProjection;
1111
import com.gmail.merikbest2015.service.ChatParticipantService;
1212
import com.gmail.merikbest2015.service.UserService;
13-
import com.gmail.merikbest2015.util.AuthUtil;
13+
import com.gmail.merikbest2015.commons.util.AuthUtil;
1414
import lombok.RequiredArgsConstructor;
1515
import org.springframework.data.domain.Page;
1616
import org.springframework.data.domain.Pageable;
1717
import org.springframework.http.HttpStatus;
1818
import org.springframework.stereotype.Service;
1919
import org.springframework.transaction.annotation.Transactional;
2020

21-
import static com.gmail.merikbest2015.constants.ErrorMessage.CHAT_NOT_FOUND;
22-
import static com.gmail.merikbest2015.constants.ErrorMessage.CHAT_PARTICIPANT_NOT_FOUND;
21+
import static com.gmail.merikbest2015.commons.constants.ErrorMessage.CHAT_NOT_FOUND;
22+
import static com.gmail.merikbest2015.commons.constants.ErrorMessage.CHAT_PARTICIPANT_NOT_FOUND;
2323

2424
@Service
2525
@RequiredArgsConstructor

‎chat-service/src/main/java/com/gmail/merikbest2015/service/impl/ChatServiceImpl.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
package com.gmail.merikbest2015.service.impl;
22

3-
import com.gmail.merikbest2015.exception.ApiRequestException;
3+
import com.gmail.merikbest2015.commons.exception.ApiRequestException;
44
import com.gmail.merikbest2015.model.Chat;
55
import com.gmail.merikbest2015.model.ChatParticipant;
66
import com.gmail.merikbest2015.model.User;
77
import com.gmail.merikbest2015.repository.ChatRepository;
88
import com.gmail.merikbest2015.repository.projection.ChatProjection;
99
import com.gmail.merikbest2015.service.ChatService;
1010
import com.gmail.merikbest2015.service.UserService;
11-
import com.gmail.merikbest2015.util.AuthUtil;
11+
import com.gmail.merikbest2015.commons.util.AuthUtil;
1212
import lombok.RequiredArgsConstructor;
1313
import org.springframework.http.HttpStatus;
1414
import org.springframework.stereotype.Service;
1515
import org.springframework.transaction.annotation.Transactional;
1616

1717
import java.util.List;
1818

19-
import static com.gmail.merikbest2015.constants.ErrorMessage.CHAT_NOT_FOUND;
19+
import static com.gmail.merikbest2015.commons.constants.ErrorMessage.CHAT_NOT_FOUND;
2020

2121
@Service
2222
@RequiredArgsConstructor

‎chat-service/src/main/java/com/gmail/merikbest2015/service/impl/UserHandlerServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.gmail.merikbest2015.service.impl;
22

3-
import com.gmail.merikbest2015.event.*;
3+
import com.gmail.merikbest2015.commons.event.*;
44
import com.gmail.merikbest2015.model.User;
55
import com.gmail.merikbest2015.repository.UserRepository;
66
import com.gmail.merikbest2015.service.UserHandlerService;

‎chat-service/src/main/java/com/gmail/merikbest2015/service/impl/UserServiceImpl.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package com.gmail.merikbest2015.service.impl;
22

3-
import com.gmail.merikbest2015.exception.ApiRequestException;
3+
import com.gmail.merikbest2015.commons.exception.ApiRequestException;
44
import com.gmail.merikbest2015.model.User;
55
import com.gmail.merikbest2015.repository.UserRepository;
66
import com.gmail.merikbest2015.repository.projection.UserChatProjection;
77
import com.gmail.merikbest2015.repository.projection.UserProjection;
88
import com.gmail.merikbest2015.service.UserService;
9-
import com.gmail.merikbest2015.util.AuthUtil;
9+
import com.gmail.merikbest2015.commons.util.AuthUtil;
1010
import lombok.RequiredArgsConstructor;
1111
import org.springframework.data.domain.Page;
1212
import org.springframework.data.domain.Pageable;
@@ -15,8 +15,8 @@
1515

1616
import java.util.List;
1717

18-
import static com.gmail.merikbest2015.constants.ErrorMessage.CHAT_PARTICIPANT_BLOCKED;
19-
import static com.gmail.merikbest2015.constants.ErrorMessage.USER_NOT_FOUND;
18+
import static com.gmail.merikbest2015.commons.constants.ErrorMessage.CHAT_PARTICIPANT_BLOCKED;
19+
import static com.gmail.merikbest2015.commons.constants.ErrorMessage.USER_NOT_FOUND;
2020

2121
@Service
2222
@RequiredArgsConstructor

‎chat-service/src/main/java/com/gmail/merikbest2015/service/util/ChatServiceHelper.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package com.gmail.merikbest2015.service.util;
22

3-
import com.gmail.merikbest2015.dto.response.chat.ChatTweetResponse;
4-
import com.gmail.merikbest2015.exception.ApiRequestException;
3+
import com.gmail.merikbest2015.commons.dto.response.chat.ChatTweetResponse;
4+
import com.gmail.merikbest2015.commons.exception.ApiRequestException;
55
import com.gmail.merikbest2015.client.TweetClient;
66
import lombok.RequiredArgsConstructor;
77
import org.springframework.http.HttpStatus;
88
import org.springframework.stereotype.Component;
99

10-
import static com.gmail.merikbest2015.constants.ErrorMessage.INCORRECT_CHAT_MESSAGE_LENGTH;
11-
import static com.gmail.merikbest2015.constants.ErrorMessage.TWEET_NOT_FOUND;
10+
import static com.gmail.merikbest2015.commons.constants.ErrorMessage.INCORRECT_CHAT_MESSAGE_LENGTH;
11+
import static com.gmail.merikbest2015.commons.constants.ErrorMessage.TWEET_NOT_FOUND;
1212

1313
@Component
1414
@RequiredArgsConstructor

0 commit comments

Comments
 (0)