Skip to content

Commit

Permalink
apply spotless
Browse files Browse the repository at this point in the history
  • Loading branch information
@EddeCCC
EddeCCC committed Nov 6, 2024
1 parent fe778be commit 3ff3408
Show file tree
Hide file tree
Showing 2 changed files with 80 additions and 80 deletions.
2 changes: 1 addition & 1 deletion ...a/rocks/inspectit/gepard/agentmanager/connection/controller/ConnectionControllerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ void queryConnections_whenRegexInParameters_shouldReturnOk() throws Exception {
QueryConnectionRequest queryRequest =
new QueryConnectionRequest(
"^2023-04-[0-9]+T[0-9:]+Z$",
ConnectionStatus.CONNECTED.name(),
ConnectionStatus.CONNECTED.name(),
new QueryConnectionRequest.QueryAgentRequest(
"regex:^service-.*",
"12345L",
Expand Down
158 changes: 79 additions & 79 deletions ...st/java/rocks/inspectit/gepard/agentmanager/connection/service/ConnectionServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,22 +52,22 @@ void testGetConnectionsEmptyResult() {
void testGetConnectionNotFound() {
String id = "7e4686b";
Exception exception =
assertThrows(NoSuchElementException.class, () -> connectionService.getConnection(id));
assertThrows(NoSuchElementException.class, () -> connectionService.getConnection(id));
assertEquals("No connection with id " + id + " found in cache.", exception.getMessage());
}

@Test
void testGetConnections() {
CreateConnectionRequest createConnectionRequest =
new CreateConnectionRequest(
"customer-service-e",
"0.0.1",
"1.26.8",
"67887@localhost",
"7e4686b7998c88427b14700f1c2aa69304a1c2fdb899067efe8ba9542fc02029",
Instant.now().toEpochMilli(),
"22",
Map.of());
new CreateConnectionRequest(
"customer-service-e",
"0.0.1",
"1.26.8",
"67887@localhost",
"7e4686b7998c88427b14700f1c2aa69304a1c2fdb899067efe8ba9542fc02029",
Instant.now().toEpochMilli(),
"22",
Map.of());
connectionService.handleConnectRequest(createConnectionRequest);
connectionService.handleConnectRequest(createConnectionRequest);

Expand All @@ -79,22 +79,22 @@ void testGetConnections() {
@Test
void testGetConnection() {
CreateConnectionRequest createConnectionRequest =
new CreateConnectionRequest(
"customer-service-e",
"0.0.1",
"1.26.8",
"67887@localhost",
"7e4686b7998c88427b14700f1c2aa69304a1c2fdb899067efe8ba9542fc02029",
Instant.now().toEpochMilli(),
"22",
Map.of());
new CreateConnectionRequest(
"customer-service-e",
"0.0.1",
"1.26.8",
"67887@localhost",
"7e4686b7998c88427b14700f1c2aa69304a1c2fdb899067efe8ba9542fc02029",
Instant.now().toEpochMilli(),
"22",
Map.of());
Connection connection = connectionService.handleConnectRequest(createConnectionRequest);

ConnectionDto connectionDto =
connectionService.getConnection(connection.getAgent().getAgentId());
connectionService.getConnection(connection.getAgent().getAgentId());

assertEquals(
Instant.ofEpochMilli(createConnectionRequest.startTime()), connectionDto.startTime());
Instant.ofEpochMilli(createConnectionRequest.startTime()), connectionDto.startTime());
assertEquals(createConnectionRequest.javaVersion(), connectionDto.javaVersion());
assertEquals(createConnectionRequest.otelVersion(), connectionDto.otelVersion());
assertEquals(createConnectionRequest.gepardVersion(), connectionDto.gepardVersion());
Expand All @@ -110,20 +110,20 @@ class HandleConnectRequest {
@Test
void testHandleConnectRequest() {
CreateConnectionRequest createConnectionRequest =
new CreateConnectionRequest(
"customer-service-e",
"0.0.1",
"1.26.8",
"67887@localhost",
"7e4686b7998c88427b14700f1c2aa69304a1c2fdb899067efe8ba9542fc02029",
Instant.now().toEpochMilli(),
"22",
Map.of());
new CreateConnectionRequest(
"customer-service-e",
"0.0.1",
"1.26.8",
"67887@localhost",
"7e4686b7998c88427b14700f1c2aa69304a1c2fdb899067efe8ba9542fc02029",
Instant.now().toEpochMilli(),
"22",
Map.of());

Connection response = connectionService.handleConnectRequest(createConnectionRequest);

assertEquals(
createConnectionRequest.startTime(), response.getAgent().getStartTime().toEpochMilli());
createConnectionRequest.startTime(), response.getAgent().getStartTime().toEpochMilli());
assertEquals(createConnectionRequest.javaVersion(), response.getAgent().getJavaVersion());
assertEquals(createConnectionRequest.otelVersion(), response.getAgent().getOtelVersion());
assertEquals(createConnectionRequest.gepardVersion(), response.getAgent().getGepardVersion());
Expand Down Expand Up @@ -172,7 +172,8 @@ void testQueryShouldFindConnectionByRegistrationTime() {
Connection connection = createTestConnection(id, registrationTime);
connectionCache.put(id, connection);

QueryConnectionRequest query = new QueryConnectionRequest(registrationTime.toString(), null,null);
QueryConnectionRequest query =
new QueryConnectionRequest(registrationTime.toString(), null, null);

// when
List<ConnectionDto> result = connectionService.queryConnections(query);
Expand All @@ -190,11 +191,11 @@ void testQueryShouldFindConnectionByAgentServiceName() {
connectionCache.put(id, connection);

QueryConnectionRequest query =
new QueryConnectionRequest(
null,
null,
new QueryConnectionRequest.QueryAgentRequest(
"testService", null, null, null, null, null, null, null));
new QueryConnectionRequest(
null,
null,
new QueryConnectionRequest.QueryAgentRequest(
"testService", null, null, null, null, null, null, null));

// when
List<ConnectionDto> result = connectionService.queryConnections(query);
Expand All @@ -213,11 +214,11 @@ void testQueryShouldFindConnectionByAgentAttributes() {
connectionCache.put(id, connection);

QueryConnectionRequest query =
new QueryConnectionRequest(
null,
null,
new QueryConnectionRequest.QueryAgentRequest(
null, null, null, null, null, null, null, attributes));
new QueryConnectionRequest(
null,
null,
new QueryConnectionRequest.QueryAgentRequest(
null, null, null, null, null, null, null, attributes));

// when
List<ConnectionDto> result = connectionService.queryConnections(query);
Expand All @@ -235,11 +236,11 @@ void testQueryShouldNotFindConnectionWhenAttributesDontMatch() {
connectionCache.put(id, connection);

QueryConnectionRequest query =
new QueryConnectionRequest(
null,
null,
new QueryConnectionRequest.QueryAgentRequest(
null, null, null, null, null, null, null, Map.of("key2", "value2")));
new QueryConnectionRequest(
null,
null,
new QueryConnectionRequest.QueryAgentRequest(
null, null, null, null, null, null, null, Map.of("key2", "value2")));

// when
List<ConnectionDto> result = connectionService.queryConnections(query);
Expand All @@ -258,11 +259,11 @@ void testQueryShouldFindConnectionWithMultipleCriteria() {
connectionCache.put(id, connection);

QueryConnectionRequest query =
new QueryConnectionRequest(
registrationTime.toString(),
ConnectionStatus.CONNECTED.toString(),
new QueryConnectionRequest.QueryAgentRequest(
"testService", "1234@localhost", id, "1.0", "1.0", null, "17", attributes));
new QueryConnectionRequest(
registrationTime.toString(),
ConnectionStatus.CONNECTED.toString(),
new QueryConnectionRequest.QueryAgentRequest(
"testService", "1234@localhost", id, "1.0", "1.0", null, "17", attributes));

// when
List<ConnectionDto> result = connectionService.queryConnections(query);
Expand Down Expand Up @@ -307,11 +308,11 @@ void testQueryShouldFindConnectionsByRegexId() {
connectionCache.put(id2, connection2);

QueryConnectionRequest query =
new QueryConnectionRequest(
null,
null,
new QueryConnectionRequest.QueryAgentRequest(
null, null, "regex:^[0-9a-f]+$", null, null, null, null, null));
new QueryConnectionRequest(
null,
null,
new QueryConnectionRequest.QueryAgentRequest(
null, null, "regex:^[0-9a-f]+$", null, null, null, null, null));

// when
List<ConnectionDto> result = connectionService.queryConnections(query);
Expand All @@ -334,16 +335,16 @@ void testQueryShouldFindConnectionsByRegexRegistrationTime() {
connectionCache.put(connectionId2, connection2);

QueryConnectionRequest query =
new QueryConnectionRequest("regex:^2023-04-[0-9]+T[0-9:]+Z$", null, null);
new QueryConnectionRequest("regex:^2023-04-[0-9]+T[0-9:]+Z$", null, null);

// when
List<ConnectionDto> result = connectionService.queryConnections(query);

// then
assertThat(result).hasSize(2);
assertThat(result)
.extracting(ConnectionDto::registrationTime)
.containsExactlyInAnyOrder(registrationTime1, registrationTime2);
.extracting(ConnectionDto::registrationTime)
.containsExactlyInAnyOrder(registrationTime1, registrationTime2);
}

@Test
Expand All @@ -357,20 +358,20 @@ void testQueryShouldFindConnectionsByRegexAgentServiceName() {
connectionCache.put(id2, connection2);

QueryConnectionRequest query =
new QueryConnectionRequest(
null,
null,
new QueryConnectionRequest.QueryAgentRequest(
"regex:^service-.*", null, null, null, null, null, null, null));
new QueryConnectionRequest(
null,
null,
new QueryConnectionRequest.QueryAgentRequest(
"regex:^service-.*", null, null, null, null, null, null, null));

// when
List<ConnectionDto> result = connectionService.queryConnections(query);

// then
assertThat(result).hasSize(2);
assertThat(result)
.extracting(ConnectionDto::serviceName)
.containsExactlyInAnyOrder("service-a", "service-b");
.extracting(ConnectionDto::serviceName)
.containsExactlyInAnyOrder("service-a", "service-b");
}

@Test
Expand All @@ -388,11 +389,11 @@ void testQueryShouldFindConnectionByRegexAgentStartTime() {
String timeRegex = "regex:" + nearStartTime.toString().substring(0, 16) + ".*Z";

QueryConnectionRequest query =
new QueryConnectionRequest(
null,
null,
new QueryConnectionRequest.QueryAgentRequest(
null, null, null, null, null, timeRegex, null, null));
new QueryConnectionRequest(
null,
null,
new QueryConnectionRequest.QueryAgentRequest(
null, null, null, null, null, timeRegex, null, null));

// when
List<ConnectionDto> result = connectionService.queryConnections(query);
Expand All @@ -403,7 +404,7 @@ void testQueryShouldFindConnectionByRegexAgentStartTime() {
// Assert that start time of result is within 1 second of nearStartTime
Instant resultStartTime = result.get(0).startTime();
assertThat(resultStartTime)
.isBetween(nearStartTime.minusSeconds(1), nearStartTime.plusSeconds(1));
.isBetween(nearStartTime.minusSeconds(1), nearStartTime.plusSeconds(1));
}

@Test
Expand All @@ -419,11 +420,11 @@ void testQueryShouldFindConnectionsByRegexAgentAttributes() {
connectionCache.put(id2, connection2);

QueryConnectionRequest query =
new QueryConnectionRequest(
null,
null,
new QueryConnectionRequest.QueryAgentRequest(
null, null, null, null, null, null, null, Map.of("key1", "regex:^value-.*")));
new QueryConnectionRequest(
null,
null,
new QueryConnectionRequest.QueryAgentRequest(
null, null, null, null, null, null, null, Map.of("key1", "regex:^value-.*")));

// when
List<ConnectionDto> result = connectionService.queryConnections(query);
Expand All @@ -435,7 +436,6 @@ void testQueryShouldFindConnectionsByRegexAgentAttributes() {
}
}


private Connection createTestConnection(String id) {
return createTestConnection(id, Instant.now(), "testService");
}
Expand Down

0 comments on commit 3ff3408

Please sign in to comment.