Skip to content

Commit

Permalink
Merge pull request #9 from photowey/release
Browse files Browse the repository at this point in the history
[release] Release v1.3(3.7.0.1.3)
  • Loading branch information
photowey authored Apr 8, 2024
2 parents 72c1ed7 + f583e40 commit 5a067ac
Show file tree
Hide file tree
Showing 53 changed files with 208 additions and 120 deletions.
2 changes: 1 addition & 1 deletion kafka-plus-autoconfigure/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>io.github.photowey</groupId>
<artifactId>kafka-plus</artifactId>
<version>3.7.0.1.2</version>
<version>3.7.0.1.3</version>
</parent>

<artifactId>kafka-plus-autoconfigure</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
* {@code KafkaPlusConfigure}
*
* @author photowey
* @date 2024/04/06
* @since 1.0.0
* @since 2024/04/06
* @version 1.0.0
*/
@Import(value = {
KafkaEngineSpringAwareBeanPostProcessor.class,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
* {@code BeanFactoryGetter}
*
* @author photowey
* @date 2024/04/06
* @since 1.0.0
* @since 2024/04/06
* @version 1.0.0
*/
public interface BeanFactoryGetter {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@
* {@code KafkaPlusProperties}
*
* @author photowey
* @date 2024/04/06
* @since 1.0.0
* @version 1.0.0
* @since 2024/04/06
*/
public class KafkaPlusProperties implements Serializable {

public static final String SPRING_KAFKA_PLUS_PROPERTY_PREFIX = "spring.kafkaplus";

private static final long serialVersionUID = 8550578442514111961L;
private static final long serialVersionUID = 3337360099086676508L;

// ----------------------------------------------------------------

Expand All @@ -44,10 +44,25 @@ public static String getPrefix() {

// ----------------------------------------------------------------

/**
* The mode of the Kafka cluster.
*/
private Mode mode = new Mode();
/**
* The bootstrap properties.
*/
private Bootstrap bootstrap = new Bootstrap();
/**
* The admin properties.
*/
private Admin admin = new Admin();
/**
* The consumer properties.
*/
private Consumer consumer = new Consumer();
/**
* The producer properties.
*/
private Producer producer = new Producer();

// ----------------------------------------------------------------
Expand Down Expand Up @@ -81,6 +96,9 @@ public static class Bootstrap implements Serializable {

private static final long serialVersionUID = 1400298527365044251L;

/**
* The {@code bootstrap.servers}.
*/
private String servers = "localhost:9092";

// ----------------------------------------------------------------
Expand All @@ -104,16 +122,30 @@ public void setServers(String servers) {

public static class Admin implements Serializable {

private static final long serialVersionUID = -1451532170849716654L;
private static final long serialVersionUID = -1008246731350725859L;


private List<Topic> topics = new ArrayList<>();

public static class Topic implements Serializable {

private static final long serialVersionUID = -4411325091525328608L;

/**
* The topic name.
*/
private String topic;
/**
* The number of partitions.
*/
private int numPartitions = 1;
/**
* The replication factor.
*/
private int replicationFactor = 1;

/**
* The replicas assignments.
*/
private Map<Integer, List<Integer>> replicasAssignments;

// ----------------------------------------------------------------
Expand Down Expand Up @@ -194,14 +226,26 @@ public static class Consumer implements Serializable {

private static final long serialVersionUID = 6473628614295963537L;

/**
* The key deserializer.
*/
private String keyDeserializer = StringSerializer.class.getName();
/**
* The value deserializer.
*/
private String valueDeserializer = StringSerializer.class.getName();

/**
* The {@code auto.offset.reset}.
*/
private Kafka.Consumer.AutoOffsetReset autoOffsetReset;

/**
* The {@code group.id}.
*/
private String groupId;
/**
* The {@code enable.auto.commit}.
*/
private Boolean autoCommit;

/**
* Subscribes
* |- A,B,C,...,Z
Expand Down Expand Up @@ -291,23 +335,57 @@ public static class Producer implements Serializable {

private static final long serialVersionUID = 8700675817188492332L;

/**
* The key serializer.
*/
private String keySerializer = StringSerializer.class.getName();
/**
* The value serializer.
*/
private String valueSerializer = StringSerializer.class.getName();
/**
* The interceptor.
*/
private String interceptor;
/**
* The partitioner.
*/
private String partitioner;

/**
* The {@code acks}.
*/
private Kafka.Producer.Acks acks;

/**
* The {@code retries}.
*/
private Long retries;

/**
* The {@code batch.size}.
*/
private Long batchSize;
/**
* The {@code buffer.memory}.
*/
private Long bufferMemorySize;

/**
* The {@code linger.ms}.
*/
private Long lingerMs;
/**
* The {@code max.block.ms}.
*/
private Long maxBlockMs;
/**
* The {@code request.timeout.ms}.
*/
private Long requestTimeoutMs;
/**
* The {@code delivery.timeout.ms}.
*/
private Long deliveryTimeoutMs;

/**
* The {@code enable.idempotence}.
*/
private Boolean idempotence;

// ----------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
* {@code SpringKafkaEngineImpl}
*
* @author photowey
* @date 2024/04/06
* @since 1.0.0
* @since 2024/04/06
* @version 1.0.0
*/
public class SpringKafkaEngineImpl implements KafkaEngine, BeanFactoryAware, BeanFactoryGetter, SmartInitializingSingleton {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
* {@code AbstractEngineAwareBeanPostProcessor}
*
* @author photowey
* @date 2024/04/06
* @since 1.0.0
* @since 2024/04/06
* @version 1.0.0
*/
public abstract class AbstractEngineAwareBeanPostProcessor<E extends Engine, A extends Aware> implements EngineBeanPostProcessor {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
* {@code EngineBeanPostProcessor}
*
* @author photowey
* @date 2024/04/06
* @since 1.0.0
* @since 2024/04/06
* @version 1.0.0
*/
public interface EngineBeanPostProcessor extends BeanPostProcessor, BeanFactoryPostProcessor {}
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
* {@code KafkaEngineSpringAware}
*
* @author photowey
* @date 2024/04/06
* @since 1.0.0
* @since 2024/04/06
* @version 1.0.0
*/
public interface KafkaEngineSpringAware extends KafkaEngineAware, Aware {}
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
* {@code KafkaEngineSpringAwareBeanPostProcessor}
*
* @author photowey
* @date 2024/04/06
* @since 1.0.0
* @since 2024/04/06
* @version 1.0.0
*/
public class KafkaEngineSpringAwareBeanPostProcessor extends AbstractEngineAwareBeanPostProcessor<KafkaEngine, KafkaEngineSpringAware> {

Expand Down
2 changes: 1 addition & 1 deletion kafka-plus-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>io.github.photowey</groupId>
<artifactId>kafka-plus</artifactId>
<version>3.7.0.1.2</version>
<version>3.7.0.1.3</version>
</parent>

<artifactId>kafka-plus-core</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
* {@code AbstractService}
*
* @author photowey
* @date 2024/04/05
* @since 1.0.0
* @since 2024/04/05
* @version 1.0.0
*/
public abstract class AbstractBuilder {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
* {@code AdminBuilder}
*
* @author photowey
* @date 2024/04/05
* @since 1.0.0
* @since 2024/04/05
* @version 1.0.0
*/
public interface AdminBuilder {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@
* </pre>
*
* @author photowey
* @date 2024/04/05
* @since 1.0.0
* @since 2024/04/05
* @version 1.0.0
*/
public class AdminBuilderImpl extends AbstractBuilder implements AdminBuilder {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
* {@code NewTopicBuilder}
*
* @author photowey
* @date 2024/04/05
* @since 1.0.0
* @since 2024/04/05
* @version 1.0.0
*/
public interface NewTopicBuilder {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
* {@code NewTopicBuilderImpl}
*
* @author photowey
* @date 2024/04/05
* @since 1.0.0
* @since 2024/04/05
* @version 1.0.0
*/
public class NewTopicBuilderImpl implements NewTopicBuilder {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
* {@code ConsumerBuilder}
*
* @author photowey
* @date 2024/04/05
* @since 1.0.0
* @since 2024/04/05
* @version 1.0.0
*/
public interface ConsumerBuilder {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
* {@code ConsumerBuilderImpl}
*
* @author photowey
* @date 2024/04/05
* @since 1.0.0
* @since 2024/04/05
* @version 1.0.0
*/
public class ConsumerBuilderImpl extends AbstractBuilder implements ConsumerBuilder {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
* {@code ProducerBuilder}
*
* @author photowey
* @date 2024/04/05
* @since 1.0.0
* @since 2024/04/05
* @version 1.0.0
*/
public interface ProducerBuilder {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
* {@code ProducerBuilderImpl}
*
* @author photowey
* @date 2024/04/05
* @since 1.0.0
* @since 2024/04/05
* @version 1.0.0
*/
public class ProducerBuilderImpl extends AbstractBuilder implements ProducerBuilder {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
* {@code ProducerRecordBuilder}
*
* @author photowey
* @date 2024/04/06
* @since 1.0.0
* @since 2024/04/06
* @version 1.0.0
*/
public interface ProducerRecordBuilder {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
* {@code ProducerRecordBuilderImpl}
*
* @author photowey
* @date 2024/04/06
* @since 1.0.0
* @since 2024/04/06
* @version 1.0.0
*/
public class ProducerRecordBuilderImpl extends AbstractBuilder implements ProducerRecordBuilder {

Expand Down
Loading

0 comments on commit 5a067ac

Please sign in to comment.