将ProducerConfig,ConsumerConfig基础类型字段改为装箱类型

jd-opensource · Oct 13, 2020 · 5636223 · 5636223
1 parent 85b960e
commit 5636223
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 22 deletions.
diff --git a/...ueue-data/joyqueue-data-model/src/main/java/org/joyqueue/model/domain/ConsumerConfig.java b/...ueue-data/joyqueue-data-model/src/main/java/org/joyqueue/model/domain/ConsumerConfig.java
@@ -131,7 +131,7 @@ public Boolean isNearBy() {
         return nearBy;
     }
 
-    public void setNearBy(boolean nearBy) {
+    public void setNearBy(Boolean nearBy) {
         this.nearBy = nearBy;
     }
 
@@ -147,103 +147,103 @@ public Boolean isPaused() {
         return paused;
     }
 
-    public void setPaused(boolean paused) {
+    public void setPaused(Boolean paused) {
         this.paused = paused;
     }
 
     public Boolean isArchive() {
         return archive;
     }
 
-    public void setArchive(boolean archive) {
+    public void setArchive(Boolean archive) {
         this.archive = archive;
     }
 
     public Boolean isRetry() {
         return retry;
     }
 
-    public void setRetry(boolean retry) {
+    public void setRetry(Boolean retry) {
         this.retry = retry;
     }
 
     public Integer getDelay() {
         return delay;
     }
 
-    public void setDelay(int delay) {
+    public void setDelay(Integer delay) {
         this.delay = delay;
     }
 
     public Integer getAckTimeout() {
         return ackTimeout;
     }
 
-    public void setAckTimeout(int ackTimeout) {
+    public void setAckTimeout(Integer ackTimeout) {
         this.ackTimeout = ackTimeout;
     }
 
     public Integer getBatchSize() {
         return batchSize;
     }
 
-    public void setBatchSize(int batchSize) {
+    public void setBatchSize(Integer batchSize) {
         this.batchSize = batchSize;
     }
 
     public Integer getMaxRetrys() {
         return maxRetrys;
     }
 
-    public void setMaxRetrys(int maxRetrys) {
+    public void setMaxRetrys(Integer maxRetrys) {
         this.maxRetrys = maxRetrys;
     }
 
     public Integer getMaxRetryDelay() {
         return maxRetryDelay;
     }
 
-    public void setMaxRetryDelay(int maxRetryDelay) {
+    public void setMaxRetryDelay(Integer maxRetryDelay) {
         this.maxRetryDelay = maxRetryDelay;
     }
 
     public Integer getRetryDelay() {
         return retryDelay;
     }
 
-    public void setRetryDelay(int retryDelay) {
+    public void setRetryDelay(Integer retryDelay) {
         this.retryDelay = retryDelay;
     }
 
     public Boolean isUseExponentialBackOff() {
         return useExponentialBackOff;
     }
 
-    public void setUseExponentialBackOff(boolean useExponentialBackOff) {
+    public void setUseExponentialBackOff(Boolean useExponentialBackOff) {
         this.useExponentialBackOff = useExponentialBackOff;
     }
 
     public Double getBackOffMultiplier() {
         return backOffMultiplier;
     }
 
-    public void setBackOffMultiplier(double backOffMultiplier) {
+    public void setBackOffMultiplier(Double backOffMultiplier) {
         this.backOffMultiplier = backOffMultiplier;
     }
 
     public Integer getExpireTime() {
         return expireTime;
     }
 
-    public void setExpireTime(int expireTime) {
+    public void setExpireTime(Integer expireTime) {
         this.expireTime = expireTime;
     }
 
     public Integer getConcurrent() {
         return concurrent;
     }
 
-    public void setConcurrent(int concurrent) {
+    public void setConcurrent(Integer concurrent) {
         this.concurrent = concurrent;
     }
 
@@ -263,15 +263,15 @@ public void setFilters(String filters) {
         this.filters = filters;
     }
 
-    public void setLimitTps(int limitTps) {
+    public void setLimitTps(Integer limitTps) {
         this.limitTps = limitTps;
     }
 
     public Integer getLimitTps() {
         return limitTps;
     }
 
-    public void setLimitTraffic(int limitTraffic) {
+    public void setLimitTraffic(Integer limitTraffic) {
         this.limitTraffic = limitTraffic;
     }
 

diff --git a/...ueue-data/joyqueue-data-model/src/main/java/org/joyqueue/model/domain/ProducerConfig.java b/...ueue-data/joyqueue-data-model/src/main/java/org/joyqueue/model/domain/ProducerConfig.java
@@ -70,7 +70,7 @@ public Boolean isNearBy() {
         return nearBy;
     }
 
-    public void setNearBy(boolean nearBy) {
+    public void setNearBy(Boolean nearBy) {
         this.nearBy = nearBy;
     }
 
@@ -86,15 +86,15 @@ public Boolean isSingle() {
         return single;
     }
 
-    public void setSingle(boolean single) {
+    public void setSingle(Boolean single) {
         this.single = single;
     }
 
     public Boolean isArchive() {
         return archive;
     }
 
-    public void setArchive(boolean archive) {
+    public void setArchive(Boolean archive) {
         this.archive = archive;
     }
 
@@ -106,15 +106,15 @@ public void setBlackList(String blackList) {
         this.blackList = blackList;
     }
 
-    public void setLimitTps(int limitTps) {
+    public void setLimitTps(Integer limitTps) {
         this.limitTps = limitTps;
     }
 
     public Integer getLimitTps() {
         return limitTps;
     }
 
-    public void setLimitTraffic(int limitTraffic) {
+    public void setLimitTraffic(Integer limitTraffic) {
         this.limitTraffic = limitTraffic;
     }
 

diff --git a/...e-data/joyqueue-data-service/src/main/java/org/joyqueue/convert/NsrConsumerConverter.java b/...e-data/joyqueue-data-service/src/main/java/org/joyqueue/convert/NsrConsumerConverter.java
@@ -99,7 +99,9 @@ protected Consumer backward(org.joyqueue.domain.Consumer nsrConsumer) {
             consumerConfig.setBlackList(StringUtils.join(consumerPolicy.getBlackList(), ","));
             consumerConfig.setAckTimeout(consumerPolicy.getAckTimeout());
             consumerConfig.setArchive(consumerPolicy.getArchive());
-            consumerConfig.setBatchSize(consumerPolicy.getBatchSize());
+            if (consumerPolicy.getBatchSize() != null) {
+                consumerConfig.setBatchSize(Integer.parseInt(consumerPolicy.getBatchSize().toString()));
+            }
             consumerConfig.setConcurrent(consumerPolicy.getConcurrent());
             consumerConfig.setDelay(consumerPolicy.getDelay());
             consumerConfig.setPaused(consumerPolicy.getPaused());