Skip to content

Commit 8172780

Browse files
committed
fixing checkstyle
Signed-off-by: salaboy <[email protected]>
1 parent d2738c8 commit 8172780

File tree

4 files changed

+30
-27
lines changed

4 files changed

+30
-27
lines changed

testcontainers-dapr/src/main/java/io/dapr/testcontainers/AppHttpPipeline.java

+10-9
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,17 @@
44
import java.util.List;
55

66
public class AppHttpPipeline implements ConfigurationSettings {
7-
private List<ListEntry> handlers;
8-
9-
public AppHttpPipeline(){}
7+
private List<ListEntry> handlers;
108

11-
public AppHttpPipeline(List<ListEntry> handlers){
12-
this.handlers = Collections.unmodifiableList(handlers);
13-
}
9+
public AppHttpPipeline() {
10+
}
1411

15-
public List<ListEntry> getHandlers(){
16-
return handlers;
17-
}
12+
public AppHttpPipeline(List<ListEntry> handlers) {
13+
this.handlers = Collections.unmodifiableList(handlers);
14+
}
15+
16+
public List<ListEntry> getHandlers() {
17+
return handlers;
18+
}
1819

1920
}

testcontainers-dapr/src/main/java/io/dapr/testcontainers/Configuration.java

+9-6
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,17 @@ public class Configuration {
2121
private final TracingConfigurationSettings tracing;
2222
private final AppHttpPipeline appHttpPipeline;
2323

24-
//@TODO: add secrets
25-
//@TODO: add components
26-
//@TODO: add accessControl
24+
// @TODO: add secrets
25+
// @TODO: add components
26+
// @TODO: add accessControl
2727

2828
/**
2929
* Creates a new configuration.
30-
* @param name Configuration name.
31-
* @param tracing TracingConfigParameters tracing configuration parameters.
30+
*
31+
* @param name Configuration name.
32+
* @param tracing TracingConfigParameters tracing configuration
33+
* parameters.
34+
* @param appHttpPipeline AppHttpPipeline middleware configuration.
3235
*/
3336
public Configuration(String name, TracingConfigurationSettings tracing, AppHttpPipeline appHttpPipeline) {
3437
this.name = name;
@@ -44,7 +47,7 @@ public TracingConfigurationSettings getTracing() {
4447
return tracing;
4548
}
4649

47-
public AppHttpPipeline getAppHttpPipeline(){
50+
public AppHttpPipeline getAppHttpPipeline() {
4851
return appHttpPipeline;
4952
}
5053
}

testcontainers-dapr/src/main/java/io/dapr/testcontainers/converter/ConfigurationYamlConverter.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ public String convert(Configuration configuration) {
6565
}
6666

6767
AppHttpPipeline appHttpPipeline = configuration.getAppHttpPipeline();
68-
if( appHttpPipeline != null ){
68+
if (appHttpPipeline != null) {
69+
6970
Map<String, Object> appHttpPipelineMap = new LinkedHashMap<>();
7071
List<ListEntry> handlers = appHttpPipeline.getHandlers();
7172
appHttpPipelineMap.put("handlers", handlers);

testcontainers-dapr/src/test/java/io/dapr/testcontainers/converter/ComponentYamlConverterTest.java

+9-11
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ public void testComponentToYaml() {
3434
assertFalse(kvstore.getMetadata().isEmpty());
3535

3636
String componentYaml = converter.convert(kvstore);
37-
String expectedComponentYaml =
38-
"apiVersion: dapr.io/v1alpha1\n"
37+
String expectedComponentYaml = "apiVersion: dapr.io/v1alpha1\n"
3938
+ "kind: Component\n"
4039
+ "metadata:\n"
4140
+ " name: statestore\n"
@@ -58,11 +57,11 @@ public void testComponentWithInLineStringToYaml() {
5857
"alias",
5958
"middleware.http.routeralias",
6059
"v1",
61-
Map.of("routes", "{\n" +
62-
" \"/mall/activity/info\": \"/v1.0/invoke/srv.default/method/mall/activity/info\",\n" +
63-
" \"/hello/activity/{id}/info\": \"/v1.0/invoke/srv.default/method/hello/activity/info\",\n" + //
64-
" \"/hello/activity/{id}/user\": \"/v1.0/invoke/srv.default/method/hello/activity/user\"\n" + //
65-
"}")))
60+
Map.of("routes", "{\n" +
61+
" \"/mall/activity/info\": \"/v1.0/invoke/srv.default/method/mall/activity/info\",\n" +
62+
" \"/hello/activity/{id}/info\": \"/v1.0/invoke/srv.default/method/hello/activity/info\",\n" + //
63+
" \"/hello/activity/{id}/user\": \"/v1.0/invoke/srv.default/method/hello/activity/user\"\n" + //
64+
"}")))
6665
.withAppChannelAddress("host.testcontainers.internal");
6766

6867
Set<Component> components = dapr.getComponents();
@@ -72,8 +71,7 @@ public void testComponentWithInLineStringToYaml() {
7271
assertFalse(kvstore.getMetadata().isEmpty());
7372

7473
String componentYaml = converter.convert(kvstore);
75-
String expectedComponentYaml =
76-
"apiVersion: dapr.io/v1alpha1\n"
74+
String expectedComponentYaml = "apiVersion: dapr.io/v1alpha1\n"
7775
+ "kind: Component\n"
7876
+ "metadata:\n"
7977
+ " name: alias\n"
@@ -83,10 +81,10 @@ public void testComponentWithInLineStringToYaml() {
8381
+ " metadata:\n"
8482
+ " - name: routes\n"
8583
+ " value: |-\n"
86-
+ " {\n"
84+
+ " {\n"
8785
+ " \"/mall/activity/info\": \"/v1.0/invoke/srv.default/method/mall/activity/info\",\n"
8886
+ " \"/hello/activity/{id}/info\": \"/v1.0/invoke/srv.default/method/hello/activity/info\",\n"
89-
+ " \"/hello/activity/{id}/user\": \"/v1.0/invoke/srv.default/method/hello/activity/user\"\n"
87+
+ " \"/hello/activity/{id}/user\": \"/v1.0/invoke/srv.default/method/hello/activity/user\"\n"
9088
+ " }\n";
9189

9290
assertEquals(expectedComponentYaml, componentYaml);

0 commit comments

Comments
 (0)