Skip to content

Commit a14c8ec

Browse files
committed
[style] format code
1 parent a331ed3 commit a14c8ec

File tree

2 files changed

+28
-25
lines changed

2 files changed

+28
-25
lines changed

handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/ServiceCombLoadBalancerStats.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,8 @@ public ServiceCombServerStats load(ServiceCombServer server) {
162162

163163
timer = new Timer("LoadBalancerStatsTimer", true);
164164
timer.schedule(new TimerTask() {
165-
private final MicroserviceInstancePing ping = SPIServiceUtils.getPriorityHighestService(MicroserviceInstancePing.class);
165+
private final MicroserviceInstancePing ping = SPIServiceUtils
166+
.getPriorityHighestService(MicroserviceInstancePing.class);
166167

167168
@Override
168169
public void run() {
@@ -171,14 +172,14 @@ public void run() {
171172
allServers.forEach((server, stats) -> {
172173
//get all microservice instances
173174
MicroserviceVersions microserviceVersions = DiscoveryManager.INSTANCE.getOrCreateMicroserviceVersions(
174-
RegistrationManager.INSTANCE.getAppId() , server.getMicroserviceName());
175+
RegistrationManager.INSTANCE.getAppId(), server.getMicroserviceName());
175176
List<MicroserviceInstance> microserviceInstanceList = microserviceVersions.getInstances();
176-
for (MicroserviceInstance instance:microserviceInstanceList){
177+
for (MicroserviceInstance instance : microserviceInstanceList) {
177178
//check if the instance still up
178-
if (server.getInstance().getInstanceId().equals(instance.getInstanceId())){
179+
if (server.getInstance().getInstanceId().equals(instance.getInstanceId())) {
179180
//check test interval
180181
if ((System.currentTimeMillis() - stats.getLastVisitTime() > timerIntervalInMillis)
181-
&& !ping.ping(server.getInstance())){
182+
&& !ping.ping(server.getInstance())) {
182183
LOGGER.info("ping mark server {} failure.", server.getInstance().getInstanceId());
183184
stats.markFailure();
184185
}

handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestServiceCombLoadBalancerStats.java

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import mockit.Mock;
3030
import mockit.MockUp;
3131
import mockit.Mocked;
32+
3233
import org.apache.servicecomb.core.Transport;
3334
import org.apache.servicecomb.foundation.common.utils.SPIServiceUtils;
3435
import org.apache.servicecomb.registry.DiscoveryManager;
@@ -47,7 +48,7 @@
4748

4849
public class TestServiceCombLoadBalancerStats {
4950

50-
List<MicroserviceInstance> instanceList=new ArrayList<>();
51+
List<MicroserviceInstance> instanceList = new ArrayList<>();
5152

5253
@Before
5354
public void before() {
@@ -63,24 +64,24 @@ public void before() {
6364
MicroserviceInstance instance2 = new MicroserviceInstance();
6465
instance2.setInstanceId("instance2");
6566
instanceList.add(instance2);
66-
MockUp mockUpRegistrationManager=new MockUp<RegistrationManager>() {
67+
MockUp mockUpRegistrationManager = new MockUp<RegistrationManager>() {
6768
@Mock
6869
public String getAppId() {
6970
return "test_app";
7071
}
7172
};
72-
MockUp mockUpMicroserviceVersions=new MockUp<MicroserviceVersions>() {
73+
MockUp mockUpMicroserviceVersions = new MockUp<MicroserviceVersions>() {
7374
@Mock
74-
public List<MicroserviceInstance> getInstances(){
75+
public List<MicroserviceInstance> getInstances() {
7576
return instanceList;
7677
}
7778
};
78-
AppManager appManager=new AppManager();
79-
MicroserviceVersions microserviceVersions=new MicroserviceVersions(appManager,"test_app","test_microservice");
80-
MockUp mockUpDiscoveryManager=new MockUp<DiscoveryManager>() {
79+
AppManager appManager = new AppManager();
80+
MicroserviceVersions microserviceVersions = new MicroserviceVersions(appManager, "test_app", "test_microservice");
81+
MockUp mockUpDiscoveryManager = new MockUp<DiscoveryManager>() {
8182

8283
@Mock
83-
public MicroserviceVersions getOrCreateMicroserviceVersions(String appId, String microserviceName){
84+
public MicroserviceVersions getOrCreateMicroserviceVersions(String appId, String microserviceName) {
8485
return microserviceVersions;
8586
}
8687
};
@@ -218,7 +219,7 @@ public void testMultiThread2(@Injectable Transport transport) throws Exception {
218219
//clear instances to mock instance2 down in cse
219220
instanceList.clear();
220221
ServiceCombServer serviceCombServer = new ServiceCombServer("test_microservice", transport,
221-
new CacheEndpoint("rest://localhost:8080", instance));
222+
new CacheEndpoint("rest://localhost:8080", instance));
222223

223224
CountDownLatch latch = new CountDownLatch(10);
224225
for (int i = 0; i < 10; i++) {
@@ -232,30 +233,31 @@ public void testMultiThread2(@Injectable Transport transport) throws Exception {
232233
}
233234
latch.await(30, TimeUnit.SECONDS);
234235
Assertions.assertEquals(
235-
ServiceCombLoadBalancerStats.INSTANCE.getServiceCombServerStats(serviceCombServer).getTotalRequests(),
236-
4 * 10);
236+
ServiceCombLoadBalancerStats.INSTANCE.getServiceCombServerStats(serviceCombServer).getTotalRequests(),
237+
4 * 10);
237238
Assertions.assertEquals(
238-
ServiceCombLoadBalancerStats.INSTANCE.getServiceCombServerStats(serviceCombServer).getFailedRate(), 50);
239+
ServiceCombLoadBalancerStats.INSTANCE.getServiceCombServerStats(serviceCombServer).getFailedRate(), 50);
239240
Assertions.assertEquals(
240-
ServiceCombLoadBalancerStats.INSTANCE.getServiceCombServerStats(serviceCombServer).getSuccessRate(), 50);
241+
ServiceCombLoadBalancerStats.INSTANCE.getServiceCombServerStats(serviceCombServer).getSuccessRate(), 50);
241242
Assertions.assertEquals(
242-
ServiceCombLoadBalancerStats.INSTANCE.getServiceCombServerStats(serviceCombServer).getSuccessRequests(), 20);
243+
ServiceCombLoadBalancerStats.INSTANCE.getServiceCombServerStats(serviceCombServer).getSuccessRequests(), 20);
243244
Assertions.assertTrue(
244-
ServiceCombLoadBalancerStats.INSTANCE.getServiceCombServerStats(serviceCombServer).getLastVisitTime() <= System
245-
.currentTimeMillis()
246-
&& ServiceCombLoadBalancerStats.INSTANCE.getServiceCombServerStats(serviceCombServer).getLastVisitTime()
247-
>= time);
245+
ServiceCombLoadBalancerStats.INSTANCE.getServiceCombServerStats(serviceCombServer).getLastVisitTime() <= System
246+
.currentTimeMillis()
247+
&& ServiceCombLoadBalancerStats.INSTANCE.getServiceCombServerStats(serviceCombServer).getLastVisitTime()
248+
>= time);
248249

249250
// time consuming test for timers, taking about 20 seconds. ping timer will not update instance status because instance2 is out of up instances
250251
Assertions.assertTrue(
251-
ServiceCombLoadBalancerStats.INSTANCE.getServiceCombServerStats(serviceCombServer).getFailedRate() <= 50);
252+
ServiceCombLoadBalancerStats.INSTANCE.getServiceCombServerStats(serviceCombServer).getFailedRate() <= 50);
252253
long beginTime = System.currentTimeMillis();
253254
long rate = ServiceCombLoadBalancerStats.INSTANCE.getServiceCombServerStats(serviceCombServer).getFailedRequests();
254255
while (System.currentTimeMillis() - beginTime <= 22000) {
255256
Thread.sleep(2000);
256257
System.out.println("failedRequests: " + rate);
257258
}
258259

259-
Assertions.assertEquals(20, ServiceCombLoadBalancerStats.INSTANCE.getServiceCombServerStats(serviceCombServer).getFailedRequests());
260+
Assertions.assertEquals(20,
261+
ServiceCombLoadBalancerStats.INSTANCE.getServiceCombServerStats(serviceCombServer).getFailedRequests());
260262
}
261263
}

0 commit comments

Comments
 (0)