Skip to content

Commit 6106339

Browse files
mageddomageddo
committed
refactoring packages
1 parent b6230f8 commit 6106339

14 files changed

+29
-23
lines changed

‎src/main/java/com/mageddo/dnsproxyserver/solver/SolverRemote.java

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

33
import com.mageddo.commons.circuitbreaker.CircuitCheckException;
44
import com.mageddo.dns.utils.Messages;
5-
import com.mageddo.dnsproxyserver.solver.remote.CircuitBreakerService;
5+
import com.mageddo.dnsproxyserver.solver.remote.application.CircuitBreakerService;
66
import com.mageddo.dnsproxyserver.solver.remote.Request;
77
import com.mageddo.dnsproxyserver.solver.remote.Result;
88
import com.mageddo.net.NetExecutorWatchdog;

‎src/main/java/com/mageddo/dnsproxyserver/solver/remote/CircuitStatus.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package com.mageddo.dnsproxyserver.solver.remote;
2+
3+
public enum CircuitStatus {
4+
OPEN,
5+
CLOSED,
6+
HALF_OPEN
7+
}

‎src/main/java/com/mageddo/dnsproxyserver/solver/remote/application/CircuitBreakerNonResilientService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.mageddo.dnsproxyserver.solver.remote.application;
22

3-
import com.mageddo.dnsproxyserver.solver.remote.CircuitBreakerService;
3+
import com.mageddo.dnsproxyserver.solver.remote.CircuitStatus;
44
import com.mageddo.dnsproxyserver.solver.remote.Result;
55

66
import java.net.InetSocketAddress;

‎src/main/java/com/mageddo/dnsproxyserver/solver/remote/CircuitBreakerService.java renamed to ‎src/main/java/com/mageddo/dnsproxyserver/solver/remote/application/CircuitBreakerService.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
package com.mageddo.dnsproxyserver.solver.remote;
1+
package com.mageddo.dnsproxyserver.solver.remote.application;
22

3-
import com.mageddo.dnsproxyserver.solver.remote.application.CircuitStatus;
3+
import com.mageddo.dnsproxyserver.solver.remote.CircuitStatus;
4+
import com.mageddo.dnsproxyserver.solver.remote.Result;
45

56
import java.net.InetSocketAddress;
67
import java.util.function.Supplier;

‎src/main/java/com/mageddo/dnsproxyserver/solver/remote/application/CircuitStatus.java

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎src/main/java/com/mageddo/dnsproxyserver/solver/remote/application/CircuitBreakerFactory.java renamed to ‎src/main/java/com/mageddo/dnsproxyserver/solver/remote/application/failsafe/CircuitBreakerFactory.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
package com.mageddo.dnsproxyserver.solver.remote.application;
1+
package com.mageddo.dnsproxyserver.solver.remote.application.failsafe;
22

33
import com.mageddo.commons.circuitbreaker.CircuitCheckException;
44
import com.mageddo.commons.lang.tuple.Pair;
55
import com.mageddo.dnsproxyserver.config.application.ConfigService;
6+
import com.mageddo.dnsproxyserver.solver.remote.CircuitStatus;
67
import com.mageddo.dnsproxyserver.solver.remote.Result;
78
import com.mageddo.dnsproxyserver.solver.remote.dataprovider.SolverConsistencyGuaranteeDAO;
89
import com.mageddo.dnsproxyserver.solver.remote.mapper.CircuitBreakerStateMapper;
@@ -30,7 +31,7 @@ public class CircuitBreakerFactory {
3031

3132
private final Map<InetSocketAddress, CircuitBreaker<Result>> circuitBreakerMap = new ConcurrentHashMap<>();
3233
private final ConfigService configService;
33-
private final FailSafeCircuitBreakerPingCheckerService circuitBreakerCheckerService;
34+
private final CircuitBreakerPingCheckerService circuitBreakerCheckerService;
3435
private final SolverConsistencyGuaranteeDAO solverConsistencyGuaranteeDAO;
3536

3637
public Result check(InetSocketAddress remoteAddress, Supplier<Result> sup) {

‎src/main/java/com/mageddo/dnsproxyserver/solver/remote/application/CircuitBreakerFailSafeService.java renamed to ‎src/main/java/com/mageddo/dnsproxyserver/solver/remote/application/failsafe/CircuitBreakerFailSafeService.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
package com.mageddo.dnsproxyserver.solver.remote.application;
1+
package com.mageddo.dnsproxyserver.solver.remote.application.failsafe;
22

33
import com.mageddo.commons.circuitbreaker.CircuitCheckException;
4-
import com.mageddo.dnsproxyserver.solver.remote.CircuitBreakerService;
4+
import com.mageddo.dnsproxyserver.solver.remote.CircuitStatus;
55
import com.mageddo.dnsproxyserver.solver.remote.Result;
6+
import com.mageddo.dnsproxyserver.solver.remote.application.CircuitBreakerService;
67
import dev.failsafe.CircuitBreakerOpenException;
78
import lombok.RequiredArgsConstructor;
89
import lombok.extern.slf4j.Slf4j;

‎src/main/java/com/mageddo/dnsproxyserver/solver/remote/application/FailSafeCircuitBreakerPingCheckerService.java renamed to ‎src/main/java/com/mageddo/dnsproxyserver/solver/remote/application/failsafe/CircuitBreakerPingCheckerService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.mageddo.dnsproxyserver.solver.remote.application;
1+
package com.mageddo.dnsproxyserver.solver.remote.application.failsafe;
22

33
import com.mageddo.commons.circuitbreaker.CircuitCheckException;
44
import com.mageddo.dnsproxyserver.solver.SolverRemote;
@@ -18,7 +18,7 @@
1818
@Slf4j
1919
@Singleton
2020
@RequiredArgsConstructor(onConstructor = @__({@Inject}))
21-
public class FailSafeCircuitBreakerPingCheckerService {
21+
public class CircuitBreakerPingCheckerService {
2222

2323
public boolean safeCheck(InetSocketAddress server, CircuitBreaker<Result> circuitBreaker) {
2424
try {

‎src/main/java/com/mageddo/dnsproxyserver/solver/remote/configurator/CircuitBreakerWatchDogScheduler.java

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

33
import com.mageddo.commons.concurrent.ThreadPool;
44
import com.mageddo.dnsproxyserver.di.StartupEvent;
5-
import com.mageddo.dnsproxyserver.solver.remote.application.CircuitBreakerFactory;
5+
import com.mageddo.dnsproxyserver.solver.remote.application.failsafe.CircuitBreakerFactory;
66
import lombok.RequiredArgsConstructor;
77
import lombok.extern.slf4j.Slf4j;
88

‎src/main/java/com/mageddo/dnsproxyserver/solver/remote/configurator/SolverRemoteModule.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.mageddo.dnsproxyserver.solver.remote.configurator;
22

3-
import com.mageddo.dnsproxyserver.solver.remote.CircuitBreakerService;
4-
import com.mageddo.dnsproxyserver.solver.remote.application.CircuitBreakerFailSafeService;
3+
import com.mageddo.dnsproxyserver.solver.remote.application.CircuitBreakerService;
4+
import com.mageddo.dnsproxyserver.solver.remote.application.failsafe.CircuitBreakerFailSafeService;
55
import com.mageddo.dnsproxyserver.solver.remote.dataprovider.SolverConsistencyGuaranteeDAO;
66
import com.mageddo.dnsproxyserver.solver.remote.dataprovider.SolverConsistencyGuaranteeDAOImpl;
77
import dagger.Binds;

‎src/main/java/com/mageddo/dnsproxyserver/solver/remote/mapper/CircuitBreakerStateMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.mageddo.dnsproxyserver.solver.remote.mapper;
22

33
import com.mageddo.dnsproxyserver.solver.remote.Result;
4-
import com.mageddo.dnsproxyserver.solver.remote.application.CircuitStatus;
4+
import com.mageddo.dnsproxyserver.solver.remote.CircuitStatus;
55
import dev.failsafe.CircuitBreaker;
66
import dev.failsafe.event.CircuitBreakerStateChangedEvent;
77

‎src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/CircuitBreakerFactoryTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.mageddo.commons.circuitbreaker.CircuitCheckException;
44
import com.mageddo.commons.concurrent.Threads;
55
import com.mageddo.dnsproxyserver.solver.remote.Result;
6+
import com.mageddo.dnsproxyserver.solver.remote.application.failsafe.CircuitBreakerFactory;
67
import org.junit.jupiter.api.Test;
78
import org.junit.jupiter.api.extension.ExtendWith;
89
import org.mockito.InjectMocks;

‎src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/CircuitBreakerFailSafeServiceCompTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.mageddo.commons.circuitbreaker.CircuitCheckException;
44
import com.mageddo.dnsproxyserver.solver.remote.Request;
55
import com.mageddo.dnsproxyserver.solver.remote.Result;
6+
import com.mageddo.dnsproxyserver.solver.remote.application.failsafe.CircuitBreakerFailSafeService;
67
import com.mageddo.dnsproxyserver.solver.remote.dataprovider.SolverConsistencyGuaranteeDAO;
78
import dagger.sheath.InjectMock;
89
import dagger.sheath.junit.DaggerTest;

‎src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/FailSafeCircuitBreakerPingCheckerServiceTest.java renamed to ‎src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/CircuitBreakerPingCheckerServiceTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.mageddo.dnsproxyserver.solver.remote.application;
22

33
import com.mageddo.dnsproxyserver.solver.remote.Result;
4+
import com.mageddo.dnsproxyserver.solver.remote.application.failsafe.CircuitBreakerPingCheckerService;
45
import com.mageddo.net.SocketUtils;
56
import dev.failsafe.CircuitBreaker;
67
import org.junit.jupiter.api.Test;
@@ -20,11 +21,11 @@
2021
import static org.mockito.Mockito.doThrow;
2122

2223
@ExtendWith(MockitoExtension.class)
23-
class FailSafeCircuitBreakerPingCheckerServiceTest {
24+
class CircuitBreakerPingCheckerServiceTest {
2425

2526
@Spy
2627
@InjectMocks
27-
FailSafeCircuitBreakerPingCheckerService service;
28+
CircuitBreakerPingCheckerService service;
2829

2930
@Test
3031
void mustReturnTrueWhenPingGetSuccess() {

0 commit comments

Comments
 (0)