Skip to content

Commit 21756b5

Browse files
Gg-harnessGg-harness
committed
fix code format violations
1 parent 17bc5a0 commit 21756b5

File tree

3 files changed

+69
-69
lines changed

3 files changed

+69
-69
lines changed

‎grpc-circuitbreaker-utils/src/test/java/org/hypertrace/circuitbreaker/grpcutils/CircuitBreakerConfigParserTest.java

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,21 @@ class CircuitBreakerConfigParserTest {
1717
@Test
1818
void testParseConfig() {
1919
String configStr =
20-
"enabled = true\n" +
21-
"defaultThresholds {\n" +
22-
" failureRateThreshold = 50.0\n" +
23-
" slowCallRateThreshold = 30.0\n" +
24-
" slowCallDurationThreshold = 1s\n" +
25-
" slidingWindowSize = 100\n" +
26-
" slidingWindowType = COUNT_BASED\n" +
27-
"}\n" +
28-
"service1 {\n" +
29-
" failureRateThreshold = 60.0\n" +
30-
" slowCallRateThreshold = 40.0\n" +
31-
" slowCallDurationThreshold = 2s\n" +
32-
" slidingWindowSize = 200\n" +
33-
" slidingWindowType = TIME_BASED\n" +
34-
"}";
20+
"enabled = true\n"
21+
+ "defaultThresholds {\n"
22+
+ " failureRateThreshold = 50.0\n"
23+
+ " slowCallRateThreshold = 30.0\n"
24+
+ " slowCallDurationThreshold = 1s\n"
25+
+ " slidingWindowSize = 100\n"
26+
+ " slidingWindowType = COUNT_BASED\n"
27+
+ "}\n"
28+
+ "service1 {\n"
29+
+ " failureRateThreshold = 60.0\n"
30+
+ " slowCallRateThreshold = 40.0\n"
31+
+ " slowCallDurationThreshold = 2s\n"
32+
+ " slidingWindowSize = 200\n"
33+
+ " slidingWindowType = TIME_BASED\n"
34+
+ "}";
3535

3636
Config config = ConfigFactory.parseString(configStr);
3737
CircuitBreakerConfiguration.CircuitBreakerConfigurationBuilder<Object> builder =
@@ -51,7 +51,8 @@ void testParseConfig() {
5151
assertEquals(SlidingWindowType.COUNT_BASED, defaultThresholds.getSlidingWindowType());
5252

5353
// Test service specific thresholds
54-
Map<String, CircuitBreakerThresholds> thresholdsMap = configuration.getCircuitBreakerThresholdsMap();
54+
Map<String, CircuitBreakerThresholds> thresholdsMap =
55+
configuration.getCircuitBreakerThresholdsMap();
5556
assertNotNull(thresholdsMap);
5657
assertTrue(thresholdsMap.containsKey("service1"));
5758

‎grpc-circuitbreaker-utils/src/test/java/org/hypertrace/circuitbreaker/grpcutils/resilience/ResilienceCircuitBreakerConfigConverterTest.java

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,22 +58,13 @@ void shouldThrowExceptionWhenConfigurationIsNull() {
5858
void shouldGetDisabledKeys() {
5959
// Create a mix of enabled and disabled configurations
6060
CircuitBreakerThresholds enabledThresholds =
61-
CircuitBreakerThresholds.builder()
62-
.enabled(true)
63-
.failureRateThreshold(50.0f)
64-
.build();
61+
CircuitBreakerThresholds.builder().enabled(true).failureRateThreshold(50.0f).build();
6562

6663
CircuitBreakerThresholds disabledThresholds1 =
67-
CircuitBreakerThresholds.builder()
68-
.enabled(false)
69-
.failureRateThreshold(50.0f)
70-
.build();
64+
CircuitBreakerThresholds.builder().enabled(false).failureRateThreshold(50.0f).build();
7165

7266
CircuitBreakerThresholds disabledThresholds2 =
73-
CircuitBreakerThresholds.builder()
74-
.enabled(false)
75-
.failureRateThreshold(60.0f)
76-
.build();
67+
CircuitBreakerThresholds.builder().enabled(false).failureRateThreshold(60.0f).build();
7768

7869
Map<String, CircuitBreakerThresholds> configMap = new HashMap<>();
7970
configMap.put("enabledService", enabledThresholds);

‎grpc-circuitbreaker-utils/src/test/java/org/hypertrace/circuitbreaker/grpcutils/resilience/ResilienceCircuitBreakerProviderTest.java

Lines changed: 49 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -57,17 +57,16 @@ void setup() {
5757
lenient().when(eventPublisher.onCallNotPermitted(any())).thenReturn(eventPublisher);
5858
lenient().doNothing().when(eventPublisher).onEvent(any());
5959

60-
lenient().when(circuitBreakerRegistry.circuitBreaker(eq(ENABLED_SERVICE), eq(serviceConfig)))
60+
lenient()
61+
.when(circuitBreakerRegistry.circuitBreaker(eq(ENABLED_SERVICE), eq(serviceConfig)))
6162
.thenReturn(mockCircuitBreaker);
62-
lenient().when(circuitBreakerRegistry.circuitBreaker(eq(NON_CONFIGURED_SERVICE), eq(defaultConfig)))
63+
lenient()
64+
.when(circuitBreakerRegistry.circuitBreaker(eq(NON_CONFIGURED_SERVICE), eq(defaultConfig)))
6365
.thenReturn(mockCircuitBreaker);
6466

65-
provider = new ResilienceCircuitBreakerProvider(
66-
circuitBreakerRegistry,
67-
configMap,
68-
disabledKeys,
69-
true,
70-
CONFIG_KEY);
67+
provider =
68+
new ResilienceCircuitBreakerProvider(
69+
circuitBreakerRegistry, configMap, disabledKeys, true, CONFIG_KEY);
7170
}
7271

7372
@Test
@@ -82,8 +81,7 @@ void shouldReturnCircuitBreakerForEnabledKey() {
8281
assertEquals(mockCircuitBreaker, secondResult.get());
8382

8483
// Verify circuit breaker was created only once
85-
verify(circuitBreakerRegistry, times(1))
86-
.circuitBreaker(eq(ENABLED_SERVICE), eq(serviceConfig));
84+
verify(circuitBreakerRegistry, times(1)).circuitBreaker(eq(ENABLED_SERVICE), eq(serviceConfig));
8785
}
8886

8987
@Test
@@ -95,14 +93,16 @@ void shouldReturnEmptyForDisabledKey() {
9593
@Test
9694
void shouldReturnEmptyForNonConfiguredServiceWhenConfigKeyDisabled() {
9795
// Create provider with disabled config key
98-
ResilienceCircuitBreakerProvider providerWithDisabledConfig = new ResilienceCircuitBreakerProvider(
99-
circuitBreakerRegistry,
100-
configMap,
101-
Arrays.asList(DISABLED_SERVICE, CONFIG_KEY), // CONFIG_KEY is disabled
102-
true,
103-
CONFIG_KEY);
104-
105-
Optional<CircuitBreaker> result = providerWithDisabledConfig.getCircuitBreaker(NON_CONFIGURED_SERVICE);
96+
ResilienceCircuitBreakerProvider providerWithDisabledConfig =
97+
new ResilienceCircuitBreakerProvider(
98+
circuitBreakerRegistry,
99+
configMap,
100+
Arrays.asList(DISABLED_SERVICE, CONFIG_KEY), // CONFIG_KEY is disabled
101+
true,
102+
CONFIG_KEY);
103+
104+
Optional<CircuitBreaker> result =
105+
providerWithDisabledConfig.getCircuitBreaker(NON_CONFIGURED_SERVICE);
106106
assertFalse(result.isPresent());
107107
}
108108

@@ -125,8 +125,7 @@ void shouldCacheCircuitBreakerInstances() {
125125
provider.getCircuitBreaker(ENABLED_SERVICE);
126126

127127
// Verify circuit breaker was created only once despite multiple calls
128-
verify(circuitBreakerRegistry, times(1))
129-
.circuitBreaker(eq(ENABLED_SERVICE), eq(serviceConfig));
128+
verify(circuitBreakerRegistry, times(1)).circuitBreaker(eq(ENABLED_SERVICE), eq(serviceConfig));
130129
}
131130

132131
@Test
@@ -137,40 +136,49 @@ void shouldHandleAllBuildNewCircuitBreakerScenarios() {
137136
assertEquals(mockCircuitBreaker, serviceSpecificResult.get());
138137
verify(circuitBreakerRegistry).circuitBreaker(ENABLED_SERVICE, serviceConfig);
139138

140-
// Case 2: Service without specific config against circuit breaker key but with config present against config key
139+
// Case 2: Service without specific config against circuit breaker key but with config present
140+
// against config key
141141
String fallbackService = "fallbackService";
142-
lenient().when(circuitBreakerRegistry.circuitBreaker(eq(fallbackService), eq(defaultConfig)))
142+
lenient()
143+
.when(circuitBreakerRegistry.circuitBreaker(eq(fallbackService), eq(defaultConfig)))
143144
.thenReturn(mockCircuitBreaker);
144145
Optional<CircuitBreaker> fallbackResult = provider.getCircuitBreaker(fallbackService);
145146
assertTrue(fallbackResult.isPresent());
146147
assertEquals(mockCircuitBreaker, fallbackResult.get());
147148
verify(circuitBreakerRegistry).circuitBreaker(fallbackService, defaultConfig);
148149

149-
// Case 3: Service with no config present against circuit breaker key and no config key, but defaultEnabled=true
150+
// Case 3: Service with no config present against circuit breaker key and no config key, but
151+
// defaultEnabled=true
150152
String noConfigService = "noConfigService";
151-
ResilienceCircuitBreakerProvider defaultEnabledProvider = new ResilienceCircuitBreakerProvider(
152-
circuitBreakerRegistry,
153-
configMap,
154-
disabledKeys,
155-
true, // defaultEnabled = true
156-
null); // no config key
157-
158-
lenient().when(circuitBreakerRegistry.circuitBreaker(eq(noConfigService)))
153+
ResilienceCircuitBreakerProvider defaultEnabledProvider =
154+
new ResilienceCircuitBreakerProvider(
155+
circuitBreakerRegistry,
156+
configMap,
157+
disabledKeys,
158+
true, // defaultEnabled = true
159+
null); // no config key
160+
161+
lenient()
162+
.when(circuitBreakerRegistry.circuitBreaker(eq(noConfigService)))
159163
.thenReturn(mockCircuitBreaker);
160-
Optional<CircuitBreaker> noConfigResult = defaultEnabledProvider.getCircuitBreaker(noConfigService);
164+
Optional<CircuitBreaker> noConfigResult =
165+
defaultEnabledProvider.getCircuitBreaker(noConfigService);
161166
assertTrue(noConfigResult.isPresent());
162167
assertEquals(mockCircuitBreaker, noConfigResult.get());
163168
verify(circuitBreakerRegistry).circuitBreaker(noConfigService);
164169

165-
// Case 4: Service with no config present against circuit breaker key and no config key, and defaultEnabled=false
166-
ResilienceCircuitBreakerProvider disabledDefaultProvider = new ResilienceCircuitBreakerProvider(
167-
circuitBreakerRegistry,
168-
configMap,
169-
disabledKeys,
170-
false, // defaultEnabled = false
171-
null); // no config key
172-
173-
Optional<CircuitBreaker> disabledDefaultResult = disabledDefaultProvider.getCircuitBreaker(noConfigService);
170+
// Case 4: Service with no config present against circuit breaker key and no config key, and
171+
// defaultEnabled=false
172+
ResilienceCircuitBreakerProvider disabledDefaultProvider =
173+
new ResilienceCircuitBreakerProvider(
174+
circuitBreakerRegistry,
175+
configMap,
176+
disabledKeys,
177+
false, // defaultEnabled = false
178+
null); // no config key
179+
180+
Optional<CircuitBreaker> disabledDefaultResult =
181+
disabledDefaultProvider.getCircuitBreaker(noConfigService);
174182
assertFalse(disabledDefaultResult.isPresent());
175183
}
176184
}

0 commit comments

Comments
 (0)