Skip to content

Commit 6893e2a

Browse files
germanosingermanosin
committed
Fixed naming errors
1 parent f938513 commit 6893e2a

File tree

10 files changed

+52
-50
lines changed

10 files changed

+52
-50
lines changed

‎api/src/main/java/io/kafbat/ui/config/McpConfig.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,14 @@
1212
import java.util.ArrayList;
1313
import java.util.List;
1414
import lombok.RequiredArgsConstructor;
15+
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
1516
import org.springframework.context.annotation.Bean;
1617
import org.springframework.context.annotation.Configuration;
1718
import org.springframework.web.reactive.function.server.RouterFunction;
1819

1920
@Configuration
2021
@RequiredArgsConstructor
22+
@ConditionalOnProperty(value = "mcp.enabled", havingValue = "true")
2123
public class McpConfig {
2224

2325
private final List<McpTool> mcpTools;

‎api/src/main/java/io/kafbat/ui/emitter/MessageFilters.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public static Predicate<TopicMessageDTO> noop() {
5656

5757
public static Predicate<TopicMessageDTO> containsStringFilter(String string) {
5858
return msg -> StringUtils.contains(msg.getKey(), string)
59-
|| StringUtils.contains(msg.getContent(), string) || headersContains(msg, string);
59+
|| StringUtils.contains(msg.getValue(), string) || headersContains(msg, string);
6060
}
6161

6262
private static boolean headersContains(TopicMessageDTO msg, String searchString) {
@@ -126,9 +126,9 @@ private static Map<String, Map<String, Object>> recordToArgs(TopicMessageDTO top
126126
args.put("keyAsText", topicMessage.getKey());
127127
}
128128

129-
if (topicMessage.getContent() != null) {
130-
args.put("value", parseToJsonOrReturnAsIs(topicMessage.getContent()));
131-
args.put("valueAsText", topicMessage.getContent());
129+
if (topicMessage.getValue() != null) {
130+
args.put("value", parseToJsonOrReturnAsIs(topicMessage.getValue()));
131+
args.put("valueAsText", topicMessage.getValue());
132132
}
133133

134134
args.put("headers", Objects.requireNonNullElse(topicMessage.getHeaders(), emptyMap()));

‎api/src/main/java/io/kafbat/ui/serdes/ConsumerRecordDeserializer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,15 +99,15 @@ private void fillValue(TopicMessageDTO message, ConsumerRecord<Bytes, Bytes> rec
9999
try {
100100
var deserResult = valueDeserializer.deserialize(
101101
new RecordHeadersImpl(rec.headers()), rec.value().get());
102-
message.setContent(deserResult.getResult());
102+
message.setValue(deserResult.getResult());
103103
message.setValueSerde(valueSerdeName);
104104
message.setValueDeserializeProperties(deserResult.getAdditionalProperties());
105105
} catch (Exception e) {
106106
log.trace("Error deserializing key for value topic: {}, partition {}, offset {}, with serde {}",
107107
rec.topic(), rec.partition(), rec.offset(), valueSerdeName, e);
108108
var deserResult = fallbackValueDeserializer.deserialize(
109109
new RecordHeadersImpl(rec.headers()), rec.value().get());
110-
message.setContent(deserResult.getResult());
110+
message.setValue(deserResult.getResult());
111111
message.setValueSerde(fallbackSerdeName);
112112
}
113113
}

‎api/src/main/java/io/kafbat/ui/service/MessagesService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public static SmartFilterTestExecutionResultDTO execSmartFilterTest(SmartFilterT
110110
var result = predicate.test(
111111
new TopicMessageDTO()
112112
.key(execData.getKey())
113-
.content(execData.getValue())
113+
.value(execData.getValue())
114114
.headers(execData.getHeaders())
115115
.offset(execData.getOffset())
116116
.partition(execData.getPartition())

‎api/src/main/java/io/kafbat/ui/service/masking/DataMasking.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public UnaryOperator<TopicMessageDTO> getMaskerForTopic(String topic) {
6767
var valMasker = getMaskingFunction(topic, Serde.Target.VALUE);
6868
return msg -> msg
6969
.key(keyMasker.apply(msg.getKey()))
70-
.content(valMasker.apply(msg.getContent()));
70+
.value(valMasker.apply(msg.getValue()));
7171
}
7272

7373
@VisibleForTesting

‎api/src/test/java/io/kafbat/ui/emitter/MessageFiltersTest.java

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,42 +30,42 @@ class StringContainsFilter {
3030
@Test
3131
void returnsTrueWhenStringContainedInKeyOrContentOrHeadersOrInAllThree() {
3232
assertTrue(
33-
filter.test(msg().key("contains abCd").content("some str"))
33+
filter.test(msg().key("contains abCd").value("some str"))
3434
);
3535

3636
assertTrue(
37-
filter.test(msg().key("some str").content("contains abCd"))
37+
filter.test(msg().key("some str").value("contains abCd"))
3838
);
3939

4040
assertTrue(
41-
filter.test(msg().key("contains abCd").content("contains abCd"))
41+
filter.test(msg().key("contains abCd").value("contains abCd"))
4242
);
4343

4444
assertTrue(
45-
filter.test(msg().key("dfg").content("does-not-contain").headers(Map.of("abC", "value")))
45+
filter.test(msg().key("dfg").value("does-not-contain").headers(Map.of("abC", "value")))
4646
);
4747

4848
assertTrue(
49-
filter.test(msg().key("dfg").content("does-not-contain").headers(Map.of("x1", "some abC")))
49+
filter.test(msg().key("dfg").value("does-not-contain").headers(Map.of("x1", "some abC")))
5050
);
5151
}
5252

5353
@Test
5454
void returnsFalseOtherwise() {
5555
assertFalse(
56-
filter.test(msg().key("some str").content("some str"))
56+
filter.test(msg().key("some str").value("some str"))
5757
);
5858

5959
assertFalse(
60-
filter.test(msg().key(null).content(null))
60+
filter.test(msg().key(null).value(null))
6161
);
6262

6363
assertFalse(
64-
filter.test(msg().key("aBc").content("AbC"))
64+
filter.test(msg().key("aBc").value("AbC"))
6565
);
6666

6767
assertFalse(
68-
filter.test(msg().key("aBc").content("AbC").headers(Map.of("abc", "value")))
68+
filter.test(msg().key("aBc").value("AbC").headers(Map.of("abc", "value")))
6969
);
7070

7171
}
@@ -120,8 +120,8 @@ void canCheckTimestampMs() {
120120
@Test
121121
void canCheckValueAsText() {
122122
var f = celScriptFilter("record.valueAsText == 'some text'");
123-
assertTrue(f.test(msg().content("some text")));
124-
assertFalse(f.test(msg().content("some other text")));
123+
assertTrue(f.test(msg().value("some text")));
124+
assertFalse(f.test(msg().value("some other text")));
125125
}
126126

127127
@Test
@@ -157,24 +157,24 @@ void keyAndKeyAsTextSetToNullIfRecordsKeyIsNull() {
157157
@Test
158158
void canCheckValueAsJsonObjectIfItCanBeParsedToJson() {
159159
var f = celScriptFilter("has(record.value.name.first) && record.value.name.first == 'user1'");
160-
assertTrue(f.test(msg().content("{ \"name\" : { \"first\" : \"user1\" } }")));
161-
assertFalse(f.test(msg().content("{ \"name\" : { \"first\" : \"user2\" } }")));
162-
assertFalse(f.test(msg().content("{ \"name\" : { \"second\" : \"user2\" } }")));
160+
assertTrue(f.test(msg().value("{ \"name\" : { \"first\" : \"user1\" } }")));
161+
assertFalse(f.test(msg().value("{ \"name\" : { \"first\" : \"user2\" } }")));
162+
assertFalse(f.test(msg().value("{ \"name\" : { \"second\" : \"user2\" } }")));
163163
}
164164

165165
@Test
166166
void valueSetToContentStringIfCantBeParsedToJson() {
167167
var f = celScriptFilter("record.value == \"not json\"");
168-
assertTrue(f.test(msg().content("not json")));
168+
assertTrue(f.test(msg().value("not json")));
169169
}
170170

171171
@Test
172172
void valueAndValueAsTextSetToNullIfRecordsContentIsNull() {
173173
var f = celScriptFilter("!has(record.value)");
174-
assertTrue(f.test(msg().content(null)));
174+
assertTrue(f.test(msg().value(null)));
175175

176176
f = celScriptFilter("!has(record.valueAsText)");
177-
assertTrue(f.test(msg().content(null)));
177+
assertTrue(f.test(msg().value(null)));
178178
}
179179

180180
@Test
@@ -188,7 +188,7 @@ void filterSpeedIsAtLeast5kPerSec() {
188188
String jsonContent = String.format(
189189
"{ \"name\" : { \"randomStr\": \"%s\", \"first\" : \"%s\"} }",
190190
randString, name);
191-
toFilter.add(msg().content(jsonContent).key(randString));
191+
toFilter.add(msg().value(jsonContent).key(randString));
192192
}
193193
// first iteration for warmup
194194
// noinspection ResultOfMethodCallIgnored
@@ -207,10 +207,10 @@ void nullFiltering() {
207207
String msg = "{ \"field\": { \"inner\": null } }";
208208

209209
var f = celScriptFilter("record.value.field.inner == null");
210-
assertTrue(f.test(msg().content(msg)));
210+
assertTrue(f.test(msg().value(msg)));
211211

212212
f = celScriptFilter("record.value.field.inner != null");
213-
assertFalse(f.test(msg().content(msg)));
213+
assertFalse(f.test(msg().value(msg)));
214214
}
215215

216216
}
@@ -220,7 +220,7 @@ void testBase64DecodingWorks() {
220220
var uuid = UUID.randomUUID().toString();
221221
var msg = "test." + Base64.getEncoder().encodeToString(uuid.getBytes());
222222
var f = celScriptFilter("string(base64.decode(record.value.split('.')[1])).contains('" + uuid + "')");
223-
assertTrue(f.test(msg().content(msg)));
223+
assertTrue(f.test(msg().value(msg)));
224224
}
225225

226226
private TopicMessageDTO msg() {

‎api/src/test/java/io/kafbat/ui/emitter/TailingEmitterTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ void allNewMessagesShouldBeEmitted() throws Exception {
7171
.untilAsserted(() ->
7272
assertThat(fluxOutput)
7373
.filteredOn(msg -> msg.getType() == TopicMessageEventDTO.TypeEnum.MESSAGE)
74-
.extracting(msg -> msg.getMessage().getContent())
74+
.extracting(msg -> msg.getMessage().getValue())
7575
.hasSameElementsAs(expectedValues)
7676
);
7777
}
@@ -96,7 +96,7 @@ void allNewMessageThatFitFilterConditionShouldBeEmitted() throws Exception {
9696
.untilAsserted(() ->
9797
assertThat(fluxOutput)
9898
.filteredOn(msg -> msg.getType() == TopicMessageEventDTO.TypeEnum.MESSAGE)
99-
.extracting(msg -> msg.getMessage().getContent())
99+
.extracting(msg -> msg.getMessage().getValue())
100100
.hasSameElementsAs(expectedValues)
101101
);
102102
}

‎api/src/test/java/io/kafbat/ui/service/MessagesServiceTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ void maskingAppliedOnConfiguredClusters() throws Exception {
104104

105105
// both messages should be masked
106106
StepVerifier.create(msgsFlux)
107-
.expectNextMatches(msg -> msg.getContent().equals("***"))
108-
.expectNextMatches(msg -> msg.getContent().equals("***"))
107+
.expectNextMatches(msg -> msg.getValue().equals("***"))
108+
.expectNextMatches(msg -> msg.getValue().equals("***"))
109109
.verifyComplete();
110110
}
111111

@@ -136,7 +136,7 @@ void cursorIsRegisteredAfterPollingIsDoneAndCanBeUsedForNextPagePolling(PollingM
136136
}
137137
})
138138
.filter(evt -> evt.getType() == TopicMessageEventDTO.TypeEnum.MESSAGE)
139-
.map(evt -> evt.getMessage().getContent());
139+
.map(evt -> evt.getMessage().getValue());
140140

141141
StepVerifier.create(msgsFlux)
142142
.expectNextCount(pageSize)
@@ -151,7 +151,7 @@ void cursorIsRegisteredAfterPollingIsDoneAndCanBeUsedForNextPagePolling(PollingM
151151
}
152152
})
153153
.filter(evt -> evt.getType() == TopicMessageEventDTO.TypeEnum.MESSAGE)
154-
.map(evt -> evt.getMessage().getContent());
154+
.map(evt -> evt.getMessage().getValue());
155155

156156
StepVerifier.create(remainingMsgs)
157157
.expectNextCount(msgsToGenerate - pageSize)

‎api/src/test/java/io/kafbat/ui/service/RecordEmitterTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ private void expectEmitter(
345345
Flux.create(emitter)
346346
.filter(m -> m.getType().equals(TopicMessageEventDTO.TypeEnum.MESSAGE))
347347
.take(take)
348-
.map(m -> m.getMessage().getContent())
348+
.map(m -> m.getMessage().getValue())
349349
);
350350

351351
StepVerifier.Step<String> step = stepConsumer.apply(firstStep);

‎api/src/test/java/io/kafbat/ui/service/SendAndReadTests.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ void noSchemaStringKeyStringValue() {
148148
)
149149
.doAssert(polled -> {
150150
assertThat(polled.getKey()).isEqualTo("testKey");
151-
assertThat(polled.getContent()).isEqualTo("testValue");
151+
assertThat(polled.getValue()).isEqualTo("testValue");
152152
});
153153
}
154154

@@ -164,7 +164,7 @@ void keyIsIntValueIsLong() {
164164
)
165165
.doAssert(polled -> {
166166
assertThat(polled.getKey()).isEqualTo("123");
167-
assertThat(polled.getContent()).isEqualTo("21474836470");
167+
assertThat(polled.getValue()).isEqualTo("21474836470");
168168
});
169169
}
170170

@@ -180,7 +180,7 @@ void keyIsNull() {
180180
)
181181
.doAssert(polled -> {
182182
assertThat(polled.getKey()).isNull();
183-
assertThat(polled.getContent()).isEqualTo("testValue");
183+
assertThat(polled.getValue()).isEqualTo("testValue");
184184
});
185185
}
186186

@@ -196,7 +196,7 @@ void valueIsNull() {
196196
)
197197
.doAssert(polled -> {
198198
assertThat(polled.getKey()).isEqualTo("testKey");
199-
assertThat(polled.getContent()).isNull();
199+
assertThat(polled.getValue()).isNull();
200200
});
201201
}
202202

@@ -214,7 +214,7 @@ void primitiveAvroSchemas() {
214214
)
215215
.doAssert(polled -> {
216216
assertThat(polled.getKey()).isEqualTo("\"some string\"");
217-
assertThat(polled.getContent()).isEqualTo("123");
217+
assertThat(polled.getValue()).isEqualTo("123");
218218
});
219219
}
220220

@@ -232,7 +232,7 @@ void recordAvroSchema() {
232232
)
233233
.doAssert(polled -> {
234234
assertJsonEqual(polled.getKey(), AVRO_SCHEMA_1_JSON_RECORD);
235-
assertJsonEqual(polled.getContent(), AVRO_SCHEMA_2_JSON_RECORD);
235+
assertJsonEqual(polled.getValue(), AVRO_SCHEMA_2_JSON_RECORD);
236236
});
237237
}
238238

@@ -249,7 +249,7 @@ void keyWithNoSchemaValueWithProtoSchema() {
249249
)
250250
.doAssert(polled -> {
251251
assertThat(polled.getKey()).isEqualTo("testKey");
252-
assertJsonEqual(polled.getContent(), PROTOBUF_SCHEMA_JSON_RECORD);
252+
assertJsonEqual(polled.getValue(), PROTOBUF_SCHEMA_JSON_RECORD);
253253
});
254254
}
255255

@@ -268,7 +268,7 @@ void keyWithAvroSchemaValueWithAvroSchemaKeyIsNull() {
268268
)
269269
.doAssert(polled -> {
270270
assertThat(polled.getKey()).isNull();
271-
assertJsonEqual(polled.getContent(), AVRO_SCHEMA_2_JSON_RECORD);
271+
assertJsonEqual(polled.getValue(), AVRO_SCHEMA_2_JSON_RECORD);
272272
});
273273
}
274274

@@ -300,7 +300,7 @@ void keyWithAvroSchemaValueWithProtoSchema() {
300300
)
301301
.doAssert(polled -> {
302302
assertJsonEqual(polled.getKey(), AVRO_SCHEMA_1_JSON_RECORD);
303-
assertJsonEqual(polled.getContent(), PROTOBUF_SCHEMA_JSON_RECORD);
303+
assertJsonEqual(polled.getValue(), PROTOBUF_SCHEMA_JSON_RECORD);
304304
});
305305
}
306306

@@ -333,7 +333,7 @@ void keyWithProtoSchemaValueWithJsonSchema() {
333333
)
334334
.doAssert(polled -> {
335335
assertJsonEqual(polled.getKey(), PROTOBUF_SCHEMA_JSON_RECORD);
336-
assertJsonEqual(polled.getContent(), JSON_SCHEMA_RECORD);
336+
assertJsonEqual(polled.getValue(), JSON_SCHEMA_RECORD);
337337
});
338338
}
339339

@@ -366,7 +366,7 @@ void topicMessageMetadataAvro() {
366366
)
367367
.doAssert(polled -> {
368368
assertJsonEqual(polled.getKey(), AVRO_SCHEMA_1_JSON_RECORD);
369-
assertJsonEqual(polled.getContent(), AVRO_SCHEMA_2_JSON_RECORD);
369+
assertJsonEqual(polled.getValue(), AVRO_SCHEMA_2_JSON_RECORD);
370370
assertThat(polled.getKeySize()).isEqualTo(15L);
371371
assertThat(polled.getValueSize()).isEqualTo(15L);
372372
assertThat(polled.getKeyDeserializeProperties().get("schemaId")).isNotNull();
@@ -391,7 +391,7 @@ void topicMessageMetadataProtobuf() {
391391
)
392392
.doAssert(polled -> {
393393
assertJsonEqual(polled.getKey(), PROTOBUF_SCHEMA_JSON_RECORD);
394-
assertJsonEqual(polled.getContent(), PROTOBUF_SCHEMA_JSON_RECORD);
394+
assertJsonEqual(polled.getValue(), PROTOBUF_SCHEMA_JSON_RECORD);
395395
assertThat(polled.getKeySize()).isEqualTo(18L);
396396
assertThat(polled.getValueSize()).isEqualTo(18L);
397397
assertThat(polled.getValueDeserializeProperties().get("schemaId")).isNotNull();
@@ -416,7 +416,7 @@ void topicMessageMetadataJson() {
416416
)
417417
.doAssert(polled -> {
418418
assertJsonEqual(polled.getKey(), JSON_SCHEMA_RECORD);
419-
assertJsonEqual(polled.getContent(), JSON_SCHEMA_RECORD);
419+
assertJsonEqual(polled.getValue(), JSON_SCHEMA_RECORD);
420420
assertThat(polled.getKeySize()).isEqualTo(57L);
421421
assertThat(polled.getValueSize()).isEqualTo(57L);
422422
assertThat(polled.getHeadersSize()).isEqualTo(13L);
@@ -456,7 +456,7 @@ void noKeyAndNoContentPresentTest() {
456456
)
457457
.doAssert(polled -> {
458458
assertThat(polled.getKey()).isNull();
459-
assertThat(polled.getContent()).isNull();
459+
assertThat(polled.getValue()).isNull();
460460
});
461461
}
462462

0 commit comments

Comments
 (0)