Skip to content

Commit 9c0edce

Browse files
dhanaspbdpiprava
authored andcommitted
Fixed typo in the Server Ping request (#130)
1 parent aa1431d commit 9c0edce

File tree

2 files changed

+60
-5
lines changed

2 files changed

+60
-5
lines changed

src/main/java/cd/go/contrib/elasticagents/docker/requests/ServerPingRequest.java

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,24 @@
2727
import java.util.ArrayList;
2828
import java.util.List;
2929
import java.util.Map;
30+
import java.util.Objects;
3031
import java.util.stream.Collectors;
3132

3233
public class ServerPingRequest {
3334
private static final Gson GSON = new GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create();
34-
private List<ClusterProfileProperties> allClusterProfilePropertiesProperties = new ArrayList<>();
35+
private List<ClusterProfileProperties> allClusterProfileProperties = new ArrayList<>();
3536

3637
public ServerPingRequest() {
3738
}
3839

3940
public ServerPingRequest(List<Map<String, String>> allClusterProfileProperties) {
40-
this.allClusterProfilePropertiesProperties = allClusterProfileProperties.stream()
41-
.map(clusterProfile -> ClusterProfileProperties.fromConfiguration(clusterProfile))
41+
this.allClusterProfileProperties = allClusterProfileProperties.stream()
42+
.map(ClusterProfileProperties::fromConfiguration)
4243
.collect(Collectors.toList());
4344
}
4445

4546
public List<ClusterProfileProperties> allClusterProfileProperties() {
46-
return allClusterProfilePropertiesProperties;
47+
return allClusterProfileProperties;
4748
}
4849

4950
public static ServerPingRequest fromJSON(String json) {
@@ -53,10 +54,23 @@ public static ServerPingRequest fromJSON(String json) {
5354
@Override
5455
public String toString() {
5556
return "ServerPingRequest{" +
56-
"allClusterProfilePropertiesProperties=" + allClusterProfilePropertiesProperties +
57+
"allClusterProfileProperties=" + allClusterProfileProperties +
5758
'}';
5859
}
5960

61+
@Override
62+
public boolean equals(Object o) {
63+
if (this == o) return true;
64+
if (o == null || getClass() != o.getClass()) return false;
65+
ServerPingRequest that = (ServerPingRequest) o;
66+
return Objects.equals(allClusterProfileProperties, that.allClusterProfileProperties);
67+
}
68+
69+
@Override
70+
public int hashCode() {
71+
return Objects.hash(allClusterProfileProperties);
72+
}
73+
6074
public ServerPingRequestExecutor executor(Map<String, DockerContainers> clusterSpecificAgentInstances, PluginRequest pluginRequest) {
6175
return new ServerPingRequestExecutor(this, clusterSpecificAgentInstances, pluginRequest);
6276
}
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
package cd.go.contrib.elasticagents.docker.requests;
2+
3+
4+
import org.junit.Test;
5+
6+
import java.util.Arrays;
7+
import java.util.HashMap;
8+
9+
import static org.hamcrest.Matchers.is;
10+
import static org.junit.Assert.assertThat;
11+
12+
public class ServerPingRequestTest {
13+
@Test
14+
public void shouldDeserializeJSONBody() {
15+
String requestBody = "{\n " +
16+
" \"all_cluster_profile_properties\": [\n " +
17+
"{\n " +
18+
" \"go_server_url\": \"foo\",\n" +
19+
" \"max_docker_containers\": \"100\",\n" +
20+
" \"docker_uri\": \"dockerURI\",\n" +
21+
" \"auto_register_timeout\": \"1\",\n" +
22+
" \"private_registry_password\": \"foobar\",\n" +
23+
" \"enable_private_registry_authentication\": \"false\",\n" +
24+
" \"private_registry_custom_credentials\": \"true\",\n" +
25+
" \"pull_on_container_create\": \"false\"\n" +
26+
" }\n" +
27+
" ]" +
28+
"\n}";
29+
30+
HashMap<String, String> configurations = new HashMap<>();
31+
configurations.put("go_server_url", "foo");
32+
configurations.put("max_docker_containers", "100");
33+
configurations.put("docker_uri", "dockerURI");
34+
configurations.put("auto_register_timeout", "1");
35+
configurations.put("private_registry_password", "foobar");
36+
configurations.put("enable_private_registry_authentication", "false");
37+
configurations.put("private_registry_custom_credentials", "true");
38+
configurations.put("pull_on_container_create", "false");
39+
assertThat(ServerPingRequest.fromJSON(requestBody), is(new ServerPingRequest(Arrays.asList(configurations))));
40+
}
41+
}

0 commit comments

Comments
 (0)