Skip to content

Commit 759af48

Browse files
olim7temerkle826
authored andcommitted
Add new listTables operation with more detailed response (fixes #361) (#352)
1 parent 62b9ea6 commit 759af48

File tree

31 files changed

+553
-21
lines changed

31 files changed

+553
-21
lines changed

management-api-agent-3.x/pom.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,19 @@
6060
<version>${junit.version}</version>
6161
<scope>test</scope>
6262
</dependency>
63+
<dependency>
64+
<groupId>org.assertj</groupId>
65+
<artifactId>assertj-core</artifactId>
66+
<version>${assertj.version}</version>
67+
<scope>test</scope>
68+
</dependency>
69+
<dependency>
70+
<groupId>io.k8ssandra</groupId>
71+
<artifactId>datastax-mgmtapi-agent-common</artifactId>
72+
<version>${project.version}</version>
73+
<classifier>tests</classifier>
74+
<scope>test</scope>
75+
</dependency>
6376
</dependencies>
6477
</profile>
6578
</profiles>

management-api-agent-3.x/src/main/java/com/datastax/mgmtapi/rpc/ObjectSerializer3x.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public ObjectSerializer3x(Class<T> clazz, Type genericType) {
7373
field -> field.getName(),
7474
field ->
7575
new FieldSerializer(
76-
GenericSerializer3x.getType(field.getType()), field))));
76+
GenericSerializer3x.getType(field.getGenericType()), field))));
7777
// currently not recursive; multiple ways to do it
7878
}
7979

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/*
2+
* Copyright DataStax, Inc.
3+
*
4+
* Please see the included license file for details.
5+
*/
6+
package com.datastax.mgmtapi.rpc;
7+
8+
import static org.assertj.core.api.Assertions.assertThat;
9+
10+
public class ObjectSerializer3xTest extends ObjectSerializerTestBase<ObjectSerializer3x<Example>> {
11+
12+
@Override
13+
protected ObjectSerializer3x<Example> createExampleSerializer() {
14+
return new ObjectSerializer3x<>(Example.class);
15+
}
16+
17+
@Override
18+
protected String getCqlType(ObjectSerializer3x<Example> serializer, String fieldName) {
19+
assertThat(serializer.serializers).containsKey(fieldName);
20+
return serializer.serializers.get(fieldName).type.toString();
21+
}
22+
}

management-api-agent-4.1.x/pom.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,19 @@
4545
<version>${junit.version}</version>
4646
<scope>test</scope>
4747
</dependency>
48+
<dependency>
49+
<groupId>org.assertj</groupId>
50+
<artifactId>assertj-core</artifactId>
51+
<version>${assertj.version}</version>
52+
<scope>test</scope>
53+
</dependency>
54+
<dependency>
55+
<groupId>io.k8ssandra</groupId>
56+
<artifactId>datastax-mgmtapi-agent-common</artifactId>
57+
<version>${project.version}</version>
58+
<classifier>tests</classifier>
59+
<scope>test</scope>
60+
</dependency>
4861
</dependencies>
4962
<profiles>
5063
<profile>

management-api-agent-4.1.x/src/main/java/com/datastax/mgmtapi/rpc/ObjectSerializer41x.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public ObjectSerializer41x(Class<T> clazz, Type genericType) {
7373
field -> field.getName(),
7474
field ->
7575
new FieldSerializer(
76-
GenericSerializer41x.getType(field.getType()), field))));
76+
GenericSerializer41x.getType(field.getGenericType()), field))));
7777
// currently not recursive; multiple ways to do it
7878
}
7979

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
/*
2+
* Copyright DataStax, Inc.
3+
*
4+
* Please see the included license file for details.
5+
*/
6+
package com.datastax.mgmtapi.rpc;
7+
8+
import static org.assertj.core.api.Assertions.assertThat;
9+
10+
public class ObjectSerializer41xTest
11+
extends ObjectSerializerTestBase<ObjectSerializer41x<Example>> {
12+
13+
@Override
14+
protected ObjectSerializer41x<Example> createExampleSerializer() {
15+
return new ObjectSerializer41x<>(Example.class);
16+
}
17+
18+
@Override
19+
protected String getCqlType(ObjectSerializer41x<Example> serializer, String fieldName) {
20+
assertThat(serializer.serializers).containsKey(fieldName);
21+
return serializer.serializers.get(fieldName).type.toString();
22+
}
23+
}

management-api-agent-4.x/pom.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,19 @@
4242
<version>${junit.version}</version>
4343
<scope>test</scope>
4444
</dependency>
45+
<dependency>
46+
<groupId>org.assertj</groupId>
47+
<artifactId>assertj-core</artifactId>
48+
<version>${assertj.version}</version>
49+
<scope>test</scope>
50+
</dependency>
51+
<dependency>
52+
<groupId>io.k8ssandra</groupId>
53+
<artifactId>datastax-mgmtapi-agent-common</artifactId>
54+
<version>${project.version}</version>
55+
<classifier>tests</classifier>
56+
<scope>test</scope>
57+
</dependency>
4558
</dependencies>
4659
<profiles>
4760
<profile>

management-api-agent-4.x/src/main/java/com/datastax/mgmtapi/rpc/ObjectSerializer4x.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public ObjectSerializer4x(Class<T> clazz, Type genericType) {
7373
field -> field.getName(),
7474
field ->
7575
new FieldSerializer(
76-
GenericSerializer4x.getType(field.getType()), field))));
76+
GenericSerializer4x.getType(field.getGenericType()), field))));
7777
// currently not recursive; multiple ways to do it
7878
}
7979

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/*
2+
* Copyright DataStax, Inc.
3+
*
4+
* Please see the included license file for details.
5+
*/
6+
package com.datastax.mgmtapi.rpc;
7+
8+
import static org.assertj.core.api.Assertions.assertThat;
9+
10+
public class ObjectSerializer4xTest extends ObjectSerializerTestBase<ObjectSerializer4x<Example>> {
11+
12+
@Override
13+
protected ObjectSerializer4x<Example> createExampleSerializer() {
14+
return new ObjectSerializer4x<>(Example.class);
15+
}
16+
17+
@Override
18+
protected String getCqlType(ObjectSerializer4x<Example> serializer, String fieldName) {
19+
assertThat(serializer.serializers).containsKey(fieldName);
20+
return serializer.serializers.get(fieldName).type.toString();
21+
}
22+
}

management-api-agent-5.0.x/pom.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,19 @@
4545
<version>${junit.version}</version>
4646
<scope>test</scope>
4747
</dependency>
48+
<dependency>
49+
<groupId>org.assertj</groupId>
50+
<artifactId>assertj-core</artifactId>
51+
<version>${assertj.version}</version>
52+
<scope>test</scope>
53+
</dependency>
54+
<dependency>
55+
<groupId>io.k8ssandra</groupId>
56+
<artifactId>datastax-mgmtapi-agent-common</artifactId>
57+
<version>${project.version}</version>
58+
<classifier>tests</classifier>
59+
<scope>test</scope>
60+
</dependency>
4861
</dependencies>
4962
<profiles>
5063
<profile>

0 commit comments

Comments
 (0)