Skip to content

feat: refactor KafkaMaaSClient configuration to use Env for API URL #181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Smet2133 wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −11
Open

feat: refactor KafkaMaaSClient configuration to use Env for API URL #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 8 additions & 6 deletions ...om/netcracker/maas/declarative/kafka/quarkus/client/config/MaasKafkaProdClientConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.netcracker.cloud.maas.client.api.kafka.KafkaMaaSClient;
import com.netcracker.cloud.maas.client.impl.ApiUrlProvider;
import com.netcracker.cloud.maas.client.impl.Env;
import com.netcracker.cloud.maas.client.impl.apiversion.ServerApiVersion;
import com.netcracker.cloud.maas.client.impl.http.HttpClient;
import com.netcracker.cloud.maas.client.impl.kafka.KafkaMaaSClientImpl;
Expand All @@ -14,20 +15,21 @@
import io.quarkus.arc.DefaultBean;
import jakarta.enterprise.inject.Produces;
import jakarta.inject.Singleton;
import org.eclipse.microprofile.config.inject.ConfigProperty;


@Singleton
public class MaasKafkaProdClientConfig {

@Singleton
@Produces
KafkaMaaSClient kafkaMaaSClient(MaasKafkaProps props, M2MManager m2mManager) {
HttpClient httpClient = HttpClient.getM2mClient(() -> m2mManager.getToken().getTokenValue());
KafkaMaaSClient kafkaMaaSClient(M2MManager m2mManager) {
String maasApiUrl = Env.apiUrl();
HttpClient maasHttpClient = HttpClient.getMaasClient(() -> m2mManager.getToken().getTokenValue());
HttpClient m2mHttpClient = HttpClient.getM2mClient(() -> m2mManager.getToken().getTokenValue());
return new KafkaMaaSClientImpl(
httpClient,
() -> new TenantManagerConnectorImpl(httpClient),
new ApiUrlProvider(new ServerApiVersion(httpClient, props.maasAgentUrl), props.maasAgentUrl)
maasHttpClient,
() -> new TenantManagerConnectorImpl(m2mHttpClient),
new ApiUrlProvider(new ServerApiVersion(maasHttpClient, maasApiUrl), maasApiUrl)
);
}

Expand Down
8 changes: 3 additions & 5 deletions ...com/netcracker/maas/declarative/kafka/spring/client/config/MaasKafkaProdClientConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.netcracker.cloud.maas.client.api.kafka.KafkaMaaSClient;
import com.netcracker.cloud.maas.client.impl.ApiUrlProvider;
import com.netcracker.cloud.maas.client.impl.Env;
import com.netcracker.cloud.maas.client.impl.apiversion.ServerApiVersion;
import com.netcracker.cloud.maas.client.impl.http.HttpClient;
import com.netcracker.cloud.maas.client.impl.kafka.KafkaMaaSClientImpl;
Expand All @@ -13,7 +14,6 @@
import com.netcracker.maas.declarative.kafka.client.impl.topic.provider.api.MaasKafkaTopicServiceProvider;
import com.netcracker.maas.declarative.kafka.client.impl.topic.provider.impl.MaasKafkaTopicServiceProviderImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
Expand All @@ -25,9 +25,6 @@
@ConditionalOnProperty(value = KAFKA_LOCAL_DEV_ENABLED, havingValue = "false", matchIfMissing = true)
public class MaasKafkaProdClientConfig {

@Autowired
MaasKafkaProps props;

@Bean
HttpClient maasHttpClient(@Autowired M2MManager m2MManager) {
return HttpClient.getMaasClient(() -> m2MManager.getToken().getTokenValue());
Expand All @@ -40,10 +37,11 @@ TenantManagerConnector tenantManagerConnector(@Autowired M2MManager m2MManager)

@Bean
KafkaMaaSClient kafkaMaaSClient(HttpClient client, TenantManagerConnector tenantManagerConnector) {
String maasApiUrl = Env.apiUrl();
return new KafkaMaaSClientImpl(
client,
() -> tenantManagerConnector,
new ApiUrlProvider(new ServerApiVersion(client, props.maasAgentUrl), props.maasAgentUrl)
new ApiUrlProvider(new ServerApiVersion(client, maasApiUrl), maasApiUrl)
);
}

Expand Down
Loading