Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ public class MqttKafkaOptionsConfig extends OptionsConfig
{
public final MqttKafkaTopicsConfig topics;
public final String serverRef;
public final String store;
public final List<String> clients;
public final MqttKafkaPublishConfig publish;

Expand All @@ -40,11 +41,13 @@ public static <T> MqttKafkaOptionsConfigBuilder<T> builder(
MqttKafkaOptionsConfig(
MqttKafkaTopicsConfig topics,
String serverRef,
String store,
List<String> clients,
MqttKafkaPublishConfig publish)
{
this.topics = topics;
this.serverRef = serverRef;
this.store = store;
this.clients = clients;
this.publish = publish;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ public class MqttKafkaOptionsConfigBuilder<T> extends ConfigBuilder<T, MqttKafka

private MqttKafkaTopicsConfig topics;
private String serverRef;
private String store;
private List<String> clients;
private MqttKafkaPublishConfig publish;

Expand Down Expand Up @@ -62,6 +63,13 @@ public MqttKafkaOptionsConfigBuilder<T> serverRef(
return this;
}

public MqttKafkaOptionsConfigBuilder<T> store(
String store)
{
this.store = store;
return this;
}

public MqttKafkaOptionsConfigBuilder<T> clients(
List<String> clients)
{
Expand All @@ -85,6 +93,6 @@ public MqttKafkaPublishConfigBuilder<MqttKafkaOptionsConfigBuilder<T>> publish()
@Override
public T build()
{
return mapper.apply(new MqttKafkaOptionsConfig(topics, serverRef, clients, publish));
return mapper.apply(new MqttKafkaOptionsConfig(topics, serverRef, store, clients, publish));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ public class MqttKafkaOptionsConfigAdapter implements OptionsConfigAdapterSpi, J
{
private static final String TOPICS_NAME = "topics";
private static final String SERVER_NAME = "server";
private static final String STORE_NAME = "store";
private static final String CLIENTS_NAME = "clients";
private static final String SESSIONS_NAME = "sessions";
private static final String MESSAGES_NAME = "messages";
Expand Down Expand Up @@ -66,13 +67,18 @@ public JsonObject adaptToJson(
JsonObjectBuilder object = Json.createObjectBuilder();

String serverRef = mqttKafkaOptions.serverRef;
String store = mqttKafkaOptions.store;
MqttKafkaTopicsConfig topics = mqttKafkaOptions.topics;
List<String> clients = mqttKafkaOptions.clients;

if (serverRef != null)
{
object.add(SERVER_NAME, serverRef);
}
if (store != null)
{
object.add(STORE_NAME, store);
}
if (topics != null)
{
JsonObjectBuilder newTopics = Json.createObjectBuilder();
Expand Down Expand Up @@ -113,6 +119,7 @@ public OptionsConfig adaptFromJson(
MqttKafkaOptionsConfigBuilder<MqttKafkaOptionsConfig> options = MqttKafkaOptionsConfig.builder();
JsonObject topics = object.getJsonObject(TOPICS_NAME);
options.serverRef(object.getString(SERVER_NAME, null));
options.store(object.getString(STORE_NAME, null));
JsonArray clientsJson = object.getJsonArray(CLIENTS_NAME);
JsonObject publish = object.getJsonObject(PUBLISH_NAME);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,11 @@ public void onAttached(
this.groupIdPrefix =
String.format(groupIdPrefixFormat, supplyNamespace.apply(bindingId), supplyLocalName.apply(bindingId));

if (binding.options.store == null && coreIndex == 0)
{
warnSessionOwnershipDeprecated(supplyLocalName.apply(bindingId));
}

if (willAvailable && coreIndex == 0)
{
Optional<MqttKafkaRouteConfig> route = binding.routes.stream().findFirst();
Expand All @@ -389,6 +394,25 @@ public void onAttached(
sessionIds.put(bindingId, supplySessionId.get());
}

private void warnSessionOwnershipDeprecated(
String bindingName)
{
System.out.printf(
"WARN [%s] Session ownership coordination via Kafka consumer group is deprecated. " +
"The 'store' option will be required in an upcoming release. " +
"To prepare, configure a store reference on this binding:%n" +
"%n" +
" stores:%n" +
" memory0:%n" +
" type: memory%n" +
"%n" +
" bindings:%n" +
" %s:%n" +
" options:%n" +
" store: memory0%n",
bindingName, bindingName);
}

@Override
public void onDetached(
long bindingId)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,53 @@ public void shouldWriteOptions()
"}"));
}

@Test
public void shouldReadOptionsWithStore()
{
String text =
"{" +
"\"store\":\"memory0\"," +
"\"topics\":" +
"{" +
"\"sessions\":\"sessions\"," +
"\"messages\":\"messages\"," +
"\"retained\":\"retained\"" +
"}" +
"}";

MqttKafkaOptionsConfig options = jsonb.fromJson(text, MqttKafkaOptionsConfig.class);

assertThat(options, not(nullValue()));
assertThat(options.store, equalTo("memory0"));
}

@Test
public void shouldWriteOptionsWithStore()
{
MqttKafkaOptionsConfig options = MqttKafkaOptionsConfig.builder()
.topics(MqttKafkaTopicsConfig.builder()
.sessions("sessions")
.messages("messages")
.retained("retained")
.build())
.store("memory0")
.build();

String text = jsonb.toJson(options);

assertThat(text, not(nullValue()));
assertThat(text, equalTo(
"{" +
"\"store\":\"memory0\"," +
"\"topics\":" +
"{" +
"\"sessions\":\"sessions\"," +
"\"messages\":\"messages\"," +
"\"retained\":\"retained\"" +
"}" +
"}"));
}

@Test
public void shouldReadOptionsWithoutClients()
{
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#
# Copyright 2021-2024 Aklivity Inc
#
# Licensed under the Aklivity Community License (the "License"); you may not use
# this file except in compliance with the License. You may obtain a copy of the
# License at
#
# https://www.aklivity.io/aklivity-community-license/
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OF ANY KIND, either express or implied. See the License for the
# specific language governing permissions and limitations under the License.
#

---
name: test
bindings:
mqtt0:
type: mqtt-kafka
kind: proxy
options:
store: memory0
topics:
sessions: sessions
messages: messages
retained: retained
exit: kafka0
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@
"title": "Server Reference",
"type": "string"
},
"store":
{
"title": "Store Reference",
"type": "string"
},
"topics":
{
"title": "Topics",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,14 @@ public void shouldValidateProxyWithOptions()
assertThat(config, not(nullValue()));
}

@Test
public void shouldValidateProxyWithStore()
{
JsonObject config = schema.validate("proxy.store.yaml");

assertThat(config, not(nullValue()));
}

@Test
public void shouldValidateProxyWithPublishQosMax()
{
Expand Down
Loading