Merge pull request #175 from tubaobao3/bugfix-caseId-asiainfo

bugfix to caseId-handle on 2.1.6
FederatedAI · Aug 11, 2023 · 8892c98 · 8892c98
2 parents fdc6b08 + 683e4fb
commit 8892c98
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 15 deletions.
diff --git a/...ing-core/src/main/java/com/webank/ai/fate/serving/core/bean/BatchHostFederatedParams.java b/...ing-core/src/main/java/com/webank/ai/fate/serving/core/bean/BatchHostFederatedParams.java
@@ -56,11 +56,6 @@ public void setHostPartyId(String hostPartyId) {
         this.hostPartyId = hostPartyId;
     }
 
-    @Override
-    public String getCaseId() {
-        return caseId;
-    }
-
     @Override
     public void setCaseId(String caseId) {
         this.caseId = caseId;

diff --git a/...erving-core/src/main/java/com/webank/ai/fate/serving/core/bean/BatchInferenceRequest.java b/...erving-core/src/main/java/com/webank/ai/fate/serving/core/bean/BatchInferenceRequest.java
@@ -35,10 +35,6 @@ public void setBatchDataList(List<SingleInferenceData> batchDataList) {
         this.batchDataList = batchDataList;
     }
 
-    public String getCaseId() {
-        return caseId;
-    }
-
     @Override
     public void setCaseId(String caseId) {
         this.caseId = caseId;

diff --git a/fate-serving-core/src/main/java/com/webank/ai/fate/serving/core/bean/InferenceRequest.java b/fate-serving-core/src/main/java/com/webank/ai/fate/serving/core/bean/InferenceRequest.java
@@ -91,7 +91,7 @@ public void setAppid(String appid) {
     }
 
     @Override
-    public String getCaseid() {
+    public String getCaseId() {
         return caseId;
     }
 

diff --git a/fate-serving-core/src/main/java/com/webank/ai/fate/serving/core/bean/Request.java b/fate-serving-core/src/main/java/com/webank/ai/fate/serving/core/bean/Request.java
@@ -24,7 +24,7 @@ public interface Request {
 
     public String getAppid();
 
-    public String getCaseid();
+    public String getCaseId();
 
     public String getPartyId();
 

diff --git a/...c/main/java/com/webank/ai/fate/serving/guest/interceptors/GuestBatchParamInterceptor.java b/...c/main/java/com/webank/ai/fate/serving/guest/interceptors/GuestBatchParamInterceptor.java
@@ -45,10 +45,10 @@ public void doPreProcess(Context context, InboundPackage inboundPackage, Outboun
             inboundPackage.setBody(batchInferenceRequest);
             Preconditions.checkArgument(batchInferenceRequest != null, "request message parse error");
             Preconditions.checkArgument(StringUtils.isNotBlank(batchInferenceRequest.getServiceId()), "no service id");
-            if (batchInferenceRequest.getCaseid() == null || batchInferenceRequest.getCaseid().length() == 0) {
+            if (batchInferenceRequest.getCaseId() == null || batchInferenceRequest.getCaseId().length() == 0) {
                 batchInferenceRequest.setCaseId(InferenceUtils.generateCaseid());
             }
-            context.setCaseId(batchInferenceRequest.getCaseid());
+            context.setCaseId(batchInferenceRequest.getCaseId());
             context.setServiceId(batchInferenceRequest.getServiceId());
             if (batchInferenceRequest.getApplyId() != null) {
                 context.setApplyId(batchInferenceRequest.getApplyId());

diff --git a/.../main/java/com/webank/ai/fate/serving/guest/interceptors/GuestSingleParamInterceptor.java b/.../main/java/com/webank/ai/fate/serving/guest/interceptors/GuestSingleParamInterceptor.java
@@ -43,10 +43,10 @@ public void doPreProcess(Context context, InboundPackage inboundPackage, Outboun
             Preconditions.checkArgument(inferenceRequest.getFeatureData() != null, "no feature data");
             Preconditions.checkArgument(inferenceRequest.getSendToRemoteFeatureData() != null, "no send to remote feature data");
             Preconditions.checkArgument(StringUtils.isNotBlank(inferenceRequest.getServiceId()), "no service id");
-            if (inferenceRequest.getCaseid() == null || inferenceRequest.getCaseid().length() == 0) {
+            if (inferenceRequest.getCaseId() == null || inferenceRequest.getCaseId().length() == 0) {
                 inferenceRequest.setCaseId(InferenceUtils.generateCaseid());
             }
-            context.setCaseId(inferenceRequest.getCaseid());
+            context.setCaseId(inferenceRequest.getCaseId());
             context.setServiceId(inferenceRequest.getServiceId());
             if (inferenceRequest.getApplyId() != null) {
                 context.setApplyId(inferenceRequest.getApplyId());