From d5989e4a840d0c5f157a8b0fdcec860000596590 Mon Sep 17 00:00:00 2001 From: ajaxfan <909938737@qq.com> Date: Tue, 2 Mar 2021 17:45:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=99=84=E4=BB=B6sdk?= =?UTF-8?q?=E7=9A=84=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../attachment/sdk/convertor/ModelConvertor.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/convertor/ModelConvertor.java b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/convertor/ModelConvertor.java index b7c2c2e..2ff9c1c 100644 --- a/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/convertor/ModelConvertor.java +++ b/mall-ebtp-cloud-attachment-sdk/src/main/java/com/chinaunicom/ebtp/mall/cloud/attachment/sdk/convertor/ModelConvertor.java @@ -1,7 +1,6 @@ package com.chinaunicom.ebtp.mall.cloud.attachment.sdk.convertor; import java.nio.charset.Charset; -import java.util.List; import java.util.Optional; import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.model.AttachmentEntity; @@ -11,7 +10,6 @@ import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.vo.SysStorageVO; import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.vo.down.DownStream; import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.vo.query.QueryResult; import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.vo.upload.UploadStream; -import com.chinaunicom.ebtp.mall.cloud.attachment.sdk.vo.upload.UploadStreamData; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.JsonMappingException; @@ -136,7 +134,8 @@ public class ModelConvertor { */ private SysStorageVO tpDownPO(String json) throws JsonMappingException, JsonProcessingException { log.debug("current convertor json is: {}", json); - return objectMapper.readValue(json, DownStream.class).getData().getSysStorageVO(); + return Optional.ofNullable(objectMapper.readValue(json, DownStream.class)) + .map(ds -> ds.getData().getSysStorageVO()).orElseGet(SysStorageVO::new); } /** @@ -147,9 +146,9 @@ public class ModelConvertor { */ private SysStorageVO toUploadPO(String json) throws JsonMappingException, JsonProcessingException { log.debug("current convertor json is: {}", json); - List list = objectMapper.readValue(json, UploadStream.class).getData(); - - return list.stream().findFirst().map(obj -> obj.getSysStorageVO()).orElseGet(SysStorageVO::new); + return Optional.ofNullable(objectMapper.readValue(json, UploadStream.class).getData()) + .map(ls -> ls.stream().findFirst().map(obj -> obj.getSysStorageVO()).orElseGet(() -> null)) + .orElseGet(SysStorageVO::new); } }