|
21 | 21 | import com.fasterxml.jackson.databind.ObjectMapper;
|
22 | 22 | import com.fasterxml.jackson.databind.node.ArrayNode;
|
23 | 23 | import com.fasterxml.jackson.databind.node.JsonNodeFactory;
|
24 |
| -import com.fasterxml.jackson.databind.node.ObjectNode; |
25 |
| -import org.apache.kafka.common.cache.Cache; |
26 | 24 | import org.apache.kafka.common.utils.Utils;
|
27 | 25 | import org.apache.kafka.connect.data.Date;
|
28 | 26 | import org.apache.kafka.connect.data.Decimal;
|
|
35 | 33 | import org.apache.kafka.connect.errors.DataException;
|
36 | 34 | import org.junit.jupiter.api.BeforeEach;
|
37 | 35 | import org.junit.jupiter.api.Test;
|
38 |
| -import org.powermock.reflect.Whitebox; |
39 | 36 |
|
40 | 37 | import java.io.File;
|
41 | 38 | import java.io.IOException;
|
@@ -484,22 +481,21 @@ public void testJsonSchemaMetadataTranslation() {
|
484 | 481 |
|
485 | 482 | @Test
|
486 | 483 | public void testCacheSchemaToConnectConversion() {
|
487 |
| - Cache<JsonNode, Schema> cache = Whitebox.getInternalState(converter, "toConnectSchemaCache"); |
488 |
| - assertEquals(0, cache.size()); |
| 484 | + assertEquals(0, converter.sizeOfToConnectSchemaCache()); |
489 | 485 |
|
490 | 486 | converter.toConnectData(TOPIC, "{ \"schema\": { \"type\": \"boolean\" }, \"payload\": true }".getBytes());
|
491 |
| - assertEquals(1, cache.size()); |
| 487 | + assertEquals(1, converter.sizeOfToConnectSchemaCache()); |
492 | 488 |
|
493 | 489 | converter.toConnectData(TOPIC, "{ \"schema\": { \"type\": \"boolean\" }, \"payload\": true }".getBytes());
|
494 |
| - assertEquals(1, cache.size()); |
| 490 | + assertEquals(1, converter.sizeOfToConnectSchemaCache()); |
495 | 491 |
|
496 | 492 | // Different schema should also get cached
|
497 | 493 | converter.toConnectData(TOPIC, "{ \"schema\": { \"type\": \"boolean\", \"optional\": true }, \"payload\": true }".getBytes());
|
498 |
| - assertEquals(2, cache.size()); |
| 494 | + assertEquals(2, converter.sizeOfToConnectSchemaCache()); |
499 | 495 |
|
500 | 496 | // Even equivalent, but different JSON encoding of schema, should get different cache entry
|
501 | 497 | converter.toConnectData(TOPIC, "{ \"schema\": { \"type\": \"boolean\", \"optional\": false }, \"payload\": true }".getBytes());
|
502 |
| - assertEquals(3, cache.size()); |
| 498 | + assertEquals(3, converter.sizeOfToConnectSchemaCache()); |
503 | 499 | }
|
504 | 500 |
|
505 | 501 | // Schema types
|
@@ -848,20 +844,19 @@ public void noSchemaToJson() {
|
848 | 844 |
|
849 | 845 | @Test
|
850 | 846 | public void testCacheSchemaToJsonConversion() {
|
851 |
| - Cache<Schema, ObjectNode> cache = Whitebox.getInternalState(converter, "fromConnectSchemaCache"); |
852 |
| - assertEquals(0, cache.size()); |
| 847 | + assertEquals(0, converter.sizeOfFromConnectSchemaCache()); |
853 | 848 |
|
854 | 849 | // Repeated conversion of the same schema, even if the schema object is different should return the same Java
|
855 | 850 | // object
|
856 | 851 | converter.fromConnectData(TOPIC, SchemaBuilder.bool().build(), true);
|
857 |
| - assertEquals(1, cache.size()); |
| 852 | + assertEquals(1, converter.sizeOfFromConnectSchemaCache()); |
858 | 853 |
|
859 | 854 | converter.fromConnectData(TOPIC, SchemaBuilder.bool().build(), true);
|
860 |
| - assertEquals(1, cache.size()); |
| 855 | + assertEquals(1, converter.sizeOfFromConnectSchemaCache()); |
861 | 856 |
|
862 | 857 | // Validate that a similar, but different schema correctly returns a different schema.
|
863 | 858 | converter.fromConnectData(TOPIC, SchemaBuilder.bool().optional().build(), true);
|
864 |
| - assertEquals(2, cache.size()); |
| 859 | + assertEquals(2, converter.sizeOfFromConnectSchemaCache()); |
865 | 860 | }
|
866 | 861 |
|
867 | 862 | @Test
|
|
0 commit comments