Skip to content

Commit

Permalink
feat: Remove unused classes
Browse files Browse the repository at this point in the history
  • Loading branch information
vincenzo-ingenito committed Sep 3, 2024
1 parent b6dcd41 commit 472a362
Show file tree
Hide file tree
Showing 2 changed files with 104 additions and 118 deletions.
Original file line number Diff line number Diff line change
@@ -1,93 +1,98 @@
package it.finanze.sanita.fse2.ms.iniclient.config.kafka;
// package it.finanze.sanita.fse2.ms.iniclient.config.kafka;

import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.HashMap;
import java.util.Map;
// import java.net.InetAddress;
// import java.net.UnknownHostException;
// import java.util.HashMap;
// import java.util.Map;

import org.apache.commons.lang3.StringUtils;
import org.apache.kafka.clients.producer.ProducerConfig;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;
import org.springframework.kafka.core.DefaultKafkaProducerFactory;
import org.springframework.kafka.core.KafkaTemplate;
import org.springframework.kafka.core.ProducerFactory;

import lombok.extern.slf4j.Slf4j;
// import org.apache.commons.lang3.StringUtils;
// import org.apache.kafka.clients.producer.ProducerConfig;
// import org.springframework.beans.factory.annotation.Autowired;
// import org.springframework.beans.factory.annotation.Qualifier;
// import org.springframework.context.annotation.Bean;
// import org.springframework.context.annotation.Configuration;
// import org.springframework.core.env.Environment;
// import org.springframework.kafka.core.DefaultKafkaProducerFactory;
// import org.springframework.kafka.core.KafkaTemplate;
// import org.springframework.kafka.core.ProducerFactory;

/**
* Kafka producer configuration.
*/
@Configuration
@Slf4j
public class KafkaProducerCFG {

/**
* Kafka properties.
*/
@Autowired
private KafkaPropertiesCFG kafkaPropCFG;
// import lombok.extern.slf4j.Slf4j;

/**
* Kafka producer properties.
*/
@Autowired
private KafkaProducerPropertiesCFG kafkaProducerPropCFG;
// /**
// * Kafka producer configuration.
// */
// @Configuration
// @Slf4j
// public class KafkaProducerCFG {


/**
* Non transactional producer config.
*/
@Bean
public Map<String, Object> producerWithoutTransactionConfigs() {
Map<String, Object> props = new HashMap<>();
// /**
// * Kafka properties.
// */
// @Autowired
// private KafkaPropertiesCFG kafkaPropCFG;

props.put(ProducerConfig.CLIENT_ID_CONFIG, kafkaProducerPropCFG.getClientId()+ "-noTx");
props.put(ProducerConfig.RETRIES_CONFIG, kafkaProducerPropCFG.getRetries());
props.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, kafkaPropCFG.getProducerBootstrapServers());
props.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, kafkaProducerPropCFG.getKeySerializer());
props.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, kafkaProducerPropCFG.getValueSerializer());
// /**
// * Kafka producer properties.
// */
// @Autowired
// private KafkaProducerPropertiesCFG kafkaProducerPropCFG;

if (!StringUtils.isBlank(kafkaPropCFG.getProtocol())) {
props.put("security.protocol", kafkaPropCFG.getProtocol());
}
if (!StringUtils.isBlank(kafkaPropCFG.getMechanism())) {
props.put("sasl.mechanism", kafkaPropCFG.getMechanism());
}
if (!StringUtils.isBlank(kafkaPropCFG.getConfigJaas())) {
props.put("sasl.jaas.config", kafkaPropCFG.getConfigJaas());
}
if (!StringUtils.isBlank(kafkaPropCFG.getTrustoreLocation())) {
props.put("ssl.truststore.location", kafkaPropCFG.getTrustoreLocation());
}
if (kafkaPropCFG.getTrustorePassword() != null && kafkaPropCFG.getTrustorePassword().length > 0) {
props.put("ssl.truststore.password", String.valueOf(kafkaPropCFG.getTrustorePassword()));
}
// /**
// * Non transactional producer config.
// */
// @Bean
// public Map<String, Object> producerWithoutTransactionConfigs() {
// Map<String, Object> props = new HashMap<>();

return props;
}
// props.put(ProducerConfig.CLIENT_ID_CONFIG,
// kafkaProducerPropCFG.getClientId()+ "-noTx");
// props.put(ProducerConfig.RETRIES_CONFIG, kafkaProducerPropCFG.getRetries());
// props.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG,
// kafkaPropCFG.getProducerBootstrapServers());
// props.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG,
// kafkaProducerPropCFG.getKeySerializer());
// props.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG,
// kafkaProducerPropCFG.getValueSerializer());

/**
* Non transactional producer.
*/
@Bean
@Qualifier("notxkafkatemplateFactory")
public ProducerFactory<String, String> producerFactoryWithoutTransaction() {
log.info("Initialization of non transactional Factory");
return new DefaultKafkaProducerFactory<>(producerWithoutTransactionConfigs());
}
// if (!StringUtils.isBlank(kafkaPropCFG.getProtocol())) {
// props.put("security.protocol", kafkaPropCFG.getProtocol());
// }
// if (!StringUtils.isBlank(kafkaPropCFG.getMechanism())) {
// props.put("sasl.mechanism", kafkaPropCFG.getMechanism());
// }
// if (!StringUtils.isBlank(kafkaPropCFG.getConfigJaas())) {
// props.put("sasl.jaas.config", kafkaPropCFG.getConfigJaas());
// }
// if (!StringUtils.isBlank(kafkaPropCFG.getTrustoreLocation())) {
// props.put("ssl.truststore.location", kafkaPropCFG.getTrustoreLocation());
// }
// if (kafkaPropCFG.getTrustorePassword() != null &&
// kafkaPropCFG.getTrustorePassword().length > 0) {
// props.put("ssl.truststore.password",
// String.valueOf(kafkaPropCFG.getTrustorePassword()));
// }

/**
* Non transactional kafka template.
*/
@Bean
@Qualifier("notxkafkatemplate")
public KafkaTemplate<String, String> notxKafkaTemplate() {
return new KafkaTemplate<>(producerFactoryWithoutTransaction());
}
// return props;
// }

// /**
// * Non transactional producer.
// */
// @Bean
// @Qualifier("notxkafkatemplateFactory")
// public ProducerFactory<String, String> producerFactoryWithoutTransaction() {
// log.info("Initialization of non transactional Factory");
// return new
// DefaultKafkaProducerFactory<>(producerWithoutTransactionConfigs());
// }

}
// /**
// * Non transactional kafka template.
// */
// @Bean
// @Qualifier("notxkafkatemplate")
// public KafkaTemplate<String, String> notxKafkaTemplate() {
// return new KafkaTemplate<>(producerFactoryWithoutTransaction());
// }

// }
Original file line number Diff line number Diff line change
@@ -1,40 +1,21 @@
package it.finanze.sanita.fse2.ms.iniclient.config.kafka;
// package it.finanze.sanita.fse2.ms.iniclient.config.kafka;

import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
// import org.springframework.beans.factory.annotation.Value;
// import org.springframework.stereotype.Component;

import lombok.Data;
// import lombok.Data;

/**
* Kafka producer properties configuration.
*/
@Data
@Component
public class KafkaProducerPropertiesCFG {

/**
* Client id.
*/
@Value("${kafka.producer.client-id}")
private String clientId;

/**
* Retries.
*/
@Value("${kafka.producer.retries}")
private Integer retries;

/**
* Key serializer.
*/
@Value("${kafka.producer.key-serializer}")
private String keySerializer;

/**
* Value serializer.
*/
@Value("${kafka.producer.value-serializer}")
private String valueSerializer;


}
// /**
// * Kafka producer properties configuration.
// */
// @Data
// @Component
// public class KafkaProducerPropertiesCFG {

// /**
// * Client id.
// */
// @Value("${kafka.producer.client-id}")
// private String clientId;

// }

0 comments on commit 472a362

Please sign in to comment.