From 409af8409d5151075a4555c5fcd0704b328b1626 Mon Sep 17 00:00:00 2001 From: zhaojun <873019219@qq.com> Date: Fri, 5 Aug 2022 15:22:36 +0800 Subject: [PATCH] =?UTF-8?q?:hammer:=20=E9=87=8D=E6=9E=84=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=8C=85=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/{annoation => annotation}/RefererCheck.java | 2 +- .../{annoation => annotation}/StorageParamItem.java | 2 +- .../{annoation => annotation}/StorageParamSelect.java | 4 ++-- .../StorageParamSelectOption.java | 2 +- .../model/StorageSourceParamDef.java | 4 ++-- .../select/impl/EncodingStorageParamSelect.java | 8 ++++---- .../controller/stroage/StorageMetaDataController.java | 2 +- .../im/zhaojun/zfile/admin/model/param/FtpParam.java | 4 ++-- .../im/zhaojun/zfile/admin/model/param/LocalParam.java | 2 +- .../zfile/admin/model/param/MicrosoftDriveParam.java | 2 +- .../im/zhaojun/zfile/admin/model/param/MinIOParam.java | 2 +- .../zfile/admin/model/param/OneDriveChinaParam.java | 2 +- .../zfile/admin/model/param/ProxyTransferParam.java | 2 +- .../zhaojun/zfile/admin/model/param/S3BaseParam.java | 2 +- .../im/zhaojun/zfile/admin/model/param/S3Param.java | 4 ++-- .../zfile/admin/model/param/SharePointChinaParam.java | 2 +- .../zfile/admin/model/param/SharePointParam.java | 2 +- .../zhaojun/zfile/admin/model/param/TencentParam.java | 2 +- .../im/zhaojun/zfile/admin/model/param/UpYunParam.java | 2 +- .../zhaojun/zfile/admin/model/param/WebdavParam.java | 2 +- .../zfile/admin/service/StorageSourceService.java | 2 +- .../zfile/common/context/StorageSourceContext.java | 4 ++-- .../zhaojun/zfile/home/aspect/RefererCheckAspect.java | 2 +- .../home/service/base/AbstractBaseFileService.java | 10 +++++----- 24 files changed, 36 insertions(+), 36 deletions(-) rename src/main/java/im/zhaojun/zfile/admin/{annoation => annotation}/RefererCheck.java (90%) rename src/main/java/im/zhaojun/zfile/admin/{annoation => annotation}/StorageParamItem.java (97%) rename src/main/java/im/zhaojun/zfile/admin/{annoation => annotation}/StorageParamSelect.java (82%) rename src/main/java/im/zhaojun/zfile/admin/{annoation => annotation}/StorageParamSelectOption.java (91%) rename src/main/java/im/zhaojun/zfile/admin/{annoation => annotation}/model/StorageSourceParamDef.java (92%) rename src/main/java/im/zhaojun/zfile/admin/{annoation => annotation}/select/impl/EncodingStorageParamSelect.java (73%) diff --git a/src/main/java/im/zhaojun/zfile/admin/annoation/RefererCheck.java b/src/main/java/im/zhaojun/zfile/admin/annotation/RefererCheck.java similarity index 90% rename from src/main/java/im/zhaojun/zfile/admin/annoation/RefererCheck.java rename to src/main/java/im/zhaojun/zfile/admin/annotation/RefererCheck.java index c78b6b6..e90d64c 100644 --- a/src/main/java/im/zhaojun/zfile/admin/annoation/RefererCheck.java +++ b/src/main/java/im/zhaojun/zfile/admin/annotation/RefererCheck.java @@ -1,4 +1,4 @@ -package im.zhaojun.zfile.admin.annoation; +package im.zhaojun.zfile.admin.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/im/zhaojun/zfile/admin/annoation/StorageParamItem.java b/src/main/java/im/zhaojun/zfile/admin/annotation/StorageParamItem.java similarity index 97% rename from src/main/java/im/zhaojun/zfile/admin/annoation/StorageParamItem.java rename to src/main/java/im/zhaojun/zfile/admin/annotation/StorageParamItem.java index 84fdf59..d102bbf 100644 --- a/src/main/java/im/zhaojun/zfile/admin/annoation/StorageParamItem.java +++ b/src/main/java/im/zhaojun/zfile/admin/annotation/StorageParamItem.java @@ -1,4 +1,4 @@ -package im.zhaojun.zfile.admin.annoation; +package im.zhaojun.zfile.admin.annotation; import im.zhaojun.zfile.admin.model.enums.StorageParamTypeEnum; diff --git a/src/main/java/im/zhaojun/zfile/admin/annoation/StorageParamSelect.java b/src/main/java/im/zhaojun/zfile/admin/annotation/StorageParamSelect.java similarity index 82% rename from src/main/java/im/zhaojun/zfile/admin/annoation/StorageParamSelect.java rename to src/main/java/im/zhaojun/zfile/admin/annotation/StorageParamSelect.java index 5b37977..5cf923c 100644 --- a/src/main/java/im/zhaojun/zfile/admin/annoation/StorageParamSelect.java +++ b/src/main/java/im/zhaojun/zfile/admin/annotation/StorageParamSelect.java @@ -1,7 +1,7 @@ -package im.zhaojun.zfile.admin.annoation; +package im.zhaojun.zfile.admin.annotation; import im.zhaojun.zfile.admin.model.param.IStorageParam; -import im.zhaojun.zfile.admin.annoation.model.StorageSourceParamDef; +import im.zhaojun.zfile.admin.annotation.model.StorageSourceParamDef; import java.util.List; diff --git a/src/main/java/im/zhaojun/zfile/admin/annoation/StorageParamSelectOption.java b/src/main/java/im/zhaojun/zfile/admin/annotation/StorageParamSelectOption.java similarity index 91% rename from src/main/java/im/zhaojun/zfile/admin/annoation/StorageParamSelectOption.java rename to src/main/java/im/zhaojun/zfile/admin/annotation/StorageParamSelectOption.java index b9e5828..c52ec4f 100644 --- a/src/main/java/im/zhaojun/zfile/admin/annoation/StorageParamSelectOption.java +++ b/src/main/java/im/zhaojun/zfile/admin/annotation/StorageParamSelectOption.java @@ -1,4 +1,4 @@ -package im.zhaojun.zfile.admin.annoation; +package im.zhaojun.zfile.admin.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/im/zhaojun/zfile/admin/annoation/model/StorageSourceParamDef.java b/src/main/java/im/zhaojun/zfile/admin/annotation/model/StorageSourceParamDef.java similarity index 92% rename from src/main/java/im/zhaojun/zfile/admin/annoation/model/StorageSourceParamDef.java rename to src/main/java/im/zhaojun/zfile/admin/annotation/model/StorageSourceParamDef.java index 73f0d43..cd9278c 100644 --- a/src/main/java/im/zhaojun/zfile/admin/annoation/model/StorageSourceParamDef.java +++ b/src/main/java/im/zhaojun/zfile/admin/annotation/model/StorageSourceParamDef.java @@ -1,6 +1,6 @@ -package im.zhaojun.zfile.admin.annoation.model; +package im.zhaojun.zfile.admin.annotation.model; -import im.zhaojun.zfile.admin.annoation.StorageParamSelectOption; +import im.zhaojun.zfile.admin.annotation.StorageParamSelectOption; import im.zhaojun.zfile.admin.model.enums.StorageParamTypeEnum; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/im/zhaojun/zfile/admin/annoation/select/impl/EncodingStorageParamSelect.java b/src/main/java/im/zhaojun/zfile/admin/annotation/select/impl/EncodingStorageParamSelect.java similarity index 73% rename from src/main/java/im/zhaojun/zfile/admin/annoation/select/impl/EncodingStorageParamSelect.java rename to src/main/java/im/zhaojun/zfile/admin/annotation/select/impl/EncodingStorageParamSelect.java index 4cef030..debd005 100644 --- a/src/main/java/im/zhaojun/zfile/admin/annoation/select/impl/EncodingStorageParamSelect.java +++ b/src/main/java/im/zhaojun/zfile/admin/annotation/select/impl/EncodingStorageParamSelect.java @@ -1,9 +1,9 @@ -package im.zhaojun.zfile.admin.annoation.select.impl; +package im.zhaojun.zfile.admin.annotation.select.impl; -import im.zhaojun.zfile.admin.annoation.StorageParamItem; -import im.zhaojun.zfile.admin.annoation.StorageParamSelect; +import im.zhaojun.zfile.admin.annotation.StorageParamItem; +import im.zhaojun.zfile.admin.annotation.StorageParamSelect; import im.zhaojun.zfile.admin.model.param.IStorageParam; -import im.zhaojun.zfile.admin.annoation.model.StorageSourceParamDef; +import im.zhaojun.zfile.admin.annotation.model.StorageSourceParamDef; import java.nio.charset.Charset; import java.util.ArrayList; diff --git a/src/main/java/im/zhaojun/zfile/admin/controller/stroage/StorageMetaDataController.java b/src/main/java/im/zhaojun/zfile/admin/controller/stroage/StorageMetaDataController.java index 65e41a1..f3e2bb2 100644 --- a/src/main/java/im/zhaojun/zfile/admin/controller/stroage/StorageMetaDataController.java +++ b/src/main/java/im/zhaojun/zfile/admin/controller/stroage/StorageMetaDataController.java @@ -4,7 +4,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.xiaoymin.knife4j.annotations.ApiSort; import im.zhaojun.zfile.common.context.StorageSourceContext; import im.zhaojun.zfile.home.model.enums.StorageTypeEnum; -import im.zhaojun.zfile.admin.annoation.model.StorageSourceParamDef; +import im.zhaojun.zfile.admin.annotation.model.StorageSourceParamDef; import im.zhaojun.zfile.common.util.AjaxJson; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/im/zhaojun/zfile/admin/model/param/FtpParam.java b/src/main/java/im/zhaojun/zfile/admin/model/param/FtpParam.java index 741dc1d..79622fd 100644 --- a/src/main/java/im/zhaojun/zfile/admin/model/param/FtpParam.java +++ b/src/main/java/im/zhaojun/zfile/admin/model/param/FtpParam.java @@ -1,7 +1,7 @@ package im.zhaojun.zfile.admin.model.param; -import im.zhaojun.zfile.admin.annoation.StorageParamItem; -import im.zhaojun.zfile.admin.annoation.select.impl.EncodingStorageParamSelect; +import im.zhaojun.zfile.admin.annotation.StorageParamItem; +import im.zhaojun.zfile.admin.annotation.select.impl.EncodingStorageParamSelect; import im.zhaojun.zfile.admin.model.enums.StorageParamTypeEnum; import lombok.Getter; diff --git a/src/main/java/im/zhaojun/zfile/admin/model/param/LocalParam.java b/src/main/java/im/zhaojun/zfile/admin/model/param/LocalParam.java index 7239c3f..c2a8850 100644 --- a/src/main/java/im/zhaojun/zfile/admin/model/param/LocalParam.java +++ b/src/main/java/im/zhaojun/zfile/admin/model/param/LocalParam.java @@ -1,6 +1,6 @@ package im.zhaojun.zfile.admin.model.param; -import im.zhaojun.zfile.admin.annoation.StorageParamItem; +import im.zhaojun.zfile.admin.annotation.StorageParamItem; import lombok.Getter; /** diff --git a/src/main/java/im/zhaojun/zfile/admin/model/param/MicrosoftDriveParam.java b/src/main/java/im/zhaojun/zfile/admin/model/param/MicrosoftDriveParam.java index 573711c..e3b4a6b 100644 --- a/src/main/java/im/zhaojun/zfile/admin/model/param/MicrosoftDriveParam.java +++ b/src/main/java/im/zhaojun/zfile/admin/model/param/MicrosoftDriveParam.java @@ -1,6 +1,6 @@ package im.zhaojun.zfile.admin.model.param; -import im.zhaojun.zfile.admin.annoation.StorageParamItem; +import im.zhaojun.zfile.admin.annotation.StorageParamItem; import lombok.Getter; /** diff --git a/src/main/java/im/zhaojun/zfile/admin/model/param/MinIOParam.java b/src/main/java/im/zhaojun/zfile/admin/model/param/MinIOParam.java index 527da6a..51877fc 100644 --- a/src/main/java/im/zhaojun/zfile/admin/model/param/MinIOParam.java +++ b/src/main/java/im/zhaojun/zfile/admin/model/param/MinIOParam.java @@ -1,6 +1,6 @@ package im.zhaojun.zfile.admin.model.param; -import im.zhaojun.zfile.admin.annoation.StorageParamItem; +import im.zhaojun.zfile.admin.annotation.StorageParamItem; import lombok.Getter; /** diff --git a/src/main/java/im/zhaojun/zfile/admin/model/param/OneDriveChinaParam.java b/src/main/java/im/zhaojun/zfile/admin/model/param/OneDriveChinaParam.java index 95a1943..c28f460 100644 --- a/src/main/java/im/zhaojun/zfile/admin/model/param/OneDriveChinaParam.java +++ b/src/main/java/im/zhaojun/zfile/admin/model/param/OneDriveChinaParam.java @@ -1,6 +1,6 @@ package im.zhaojun.zfile.admin.model.param; -import im.zhaojun.zfile.admin.annoation.StorageParamItem; +import im.zhaojun.zfile.admin.annotation.StorageParamItem; import lombok.Getter; /** diff --git a/src/main/java/im/zhaojun/zfile/admin/model/param/ProxyTransferParam.java b/src/main/java/im/zhaojun/zfile/admin/model/param/ProxyTransferParam.java index 9d32e44..d4889b0 100644 --- a/src/main/java/im/zhaojun/zfile/admin/model/param/ProxyTransferParam.java +++ b/src/main/java/im/zhaojun/zfile/admin/model/param/ProxyTransferParam.java @@ -1,6 +1,6 @@ package im.zhaojun.zfile.admin.model.param; -import im.zhaojun.zfile.admin.annoation.StorageParamItem; +import im.zhaojun.zfile.admin.annotation.StorageParamItem; import im.zhaojun.zfile.admin.model.enums.StorageParamTypeEnum; import lombok.Getter; diff --git a/src/main/java/im/zhaojun/zfile/admin/model/param/S3BaseParam.java b/src/main/java/im/zhaojun/zfile/admin/model/param/S3BaseParam.java index d274d64..e547767 100644 --- a/src/main/java/im/zhaojun/zfile/admin/model/param/S3BaseParam.java +++ b/src/main/java/im/zhaojun/zfile/admin/model/param/S3BaseParam.java @@ -1,6 +1,6 @@ package im.zhaojun.zfile.admin.model.param; -import im.zhaojun.zfile.admin.annoation.StorageParamItem; +import im.zhaojun.zfile.admin.annotation.StorageParamItem; import im.zhaojun.zfile.admin.model.enums.StorageParamTypeEnum; import lombok.Getter; diff --git a/src/main/java/im/zhaojun/zfile/admin/model/param/S3Param.java b/src/main/java/im/zhaojun/zfile/admin/model/param/S3Param.java index 3c0493f..dcc8482 100644 --- a/src/main/java/im/zhaojun/zfile/admin/model/param/S3Param.java +++ b/src/main/java/im/zhaojun/zfile/admin/model/param/S3Param.java @@ -1,7 +1,7 @@ package im.zhaojun.zfile.admin.model.param; -import im.zhaojun.zfile.admin.annoation.StorageParamItem; -import im.zhaojun.zfile.admin.annoation.StorageParamSelectOption; +import im.zhaojun.zfile.admin.annotation.StorageParamItem; +import im.zhaojun.zfile.admin.annotation.StorageParamSelectOption; import im.zhaojun.zfile.admin.model.enums.StorageParamTypeEnum; import lombok.Getter; diff --git a/src/main/java/im/zhaojun/zfile/admin/model/param/SharePointChinaParam.java b/src/main/java/im/zhaojun/zfile/admin/model/param/SharePointChinaParam.java index 14bc2c2..bdec156 100644 --- a/src/main/java/im/zhaojun/zfile/admin/model/param/SharePointChinaParam.java +++ b/src/main/java/im/zhaojun/zfile/admin/model/param/SharePointChinaParam.java @@ -1,6 +1,6 @@ package im.zhaojun.zfile.admin.model.param; -import im.zhaojun.zfile.admin.annoation.StorageParamItem; +import im.zhaojun.zfile.admin.annotation.StorageParamItem; /** * SharePoint 世纪互联初始化参数 diff --git a/src/main/java/im/zhaojun/zfile/admin/model/param/SharePointParam.java b/src/main/java/im/zhaojun/zfile/admin/model/param/SharePointParam.java index 33af559..9955c79 100644 --- a/src/main/java/im/zhaojun/zfile/admin/model/param/SharePointParam.java +++ b/src/main/java/im/zhaojun/zfile/admin/model/param/SharePointParam.java @@ -1,6 +1,6 @@ package im.zhaojun.zfile.admin.model.param; -import im.zhaojun.zfile.admin.annoation.StorageParamItem; +import im.zhaojun.zfile.admin.annotation.StorageParamItem; import lombok.Getter; /** diff --git a/src/main/java/im/zhaojun/zfile/admin/model/param/TencentParam.java b/src/main/java/im/zhaojun/zfile/admin/model/param/TencentParam.java index f0f25a1..0f7eb9a 100644 --- a/src/main/java/im/zhaojun/zfile/admin/model/param/TencentParam.java +++ b/src/main/java/im/zhaojun/zfile/admin/model/param/TencentParam.java @@ -1,6 +1,6 @@ package im.zhaojun.zfile.admin.model.param; -import im.zhaojun.zfile.admin.annoation.StorageParamItem; +import im.zhaojun.zfile.admin.annotation.StorageParamItem; import lombok.Getter; /** diff --git a/src/main/java/im/zhaojun/zfile/admin/model/param/UpYunParam.java b/src/main/java/im/zhaojun/zfile/admin/model/param/UpYunParam.java index 25a713c..225dc38 100644 --- a/src/main/java/im/zhaojun/zfile/admin/model/param/UpYunParam.java +++ b/src/main/java/im/zhaojun/zfile/admin/model/param/UpYunParam.java @@ -1,6 +1,6 @@ package im.zhaojun.zfile.admin.model.param; -import im.zhaojun.zfile.admin.annoation.StorageParamItem; +import im.zhaojun.zfile.admin.annotation.StorageParamItem; import lombok.Getter; /** diff --git a/src/main/java/im/zhaojun/zfile/admin/model/param/WebdavParam.java b/src/main/java/im/zhaojun/zfile/admin/model/param/WebdavParam.java index 75ff39f..c493760 100644 --- a/src/main/java/im/zhaojun/zfile/admin/model/param/WebdavParam.java +++ b/src/main/java/im/zhaojun/zfile/admin/model/param/WebdavParam.java @@ -1,6 +1,6 @@ package im.zhaojun.zfile.admin.model.param; -import im.zhaojun.zfile.admin.annoation.StorageParamItem; +import im.zhaojun.zfile.admin.annotation.StorageParamItem; import lombok.Getter; /** diff --git a/src/main/java/im/zhaojun/zfile/admin/service/StorageSourceService.java b/src/main/java/im/zhaojun/zfile/admin/service/StorageSourceService.java index bf0efdb..3ba33b6 100644 --- a/src/main/java/im/zhaojun/zfile/admin/service/StorageSourceService.java +++ b/src/main/java/im/zhaojun/zfile/admin/service/StorageSourceService.java @@ -6,7 +6,7 @@ import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import im.zhaojun.zfile.admin.annoation.model.StorageSourceParamDef; +import im.zhaojun.zfile.admin.annotation.model.StorageSourceParamDef; import im.zhaojun.zfile.admin.mapper.StorageSourceMapper; import im.zhaojun.zfile.admin.model.entity.StorageSource; import im.zhaojun.zfile.admin.model.entity.StorageSourceConfig; diff --git a/src/main/java/im/zhaojun/zfile/common/context/StorageSourceContext.java b/src/main/java/im/zhaojun/zfile/common/context/StorageSourceContext.java index 01fbd43..136c0df 100644 --- a/src/main/java/im/zhaojun/zfile/common/context/StorageSourceContext.java +++ b/src/main/java/im/zhaojun/zfile/common/context/StorageSourceContext.java @@ -4,8 +4,8 @@ import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.spring.SpringUtil; import com.alibaba.fastjson.JSON; -import im.zhaojun.zfile.admin.annoation.StorageParamItem; -import im.zhaojun.zfile.admin.annoation.model.StorageSourceParamDef; +import im.zhaojun.zfile.admin.annotation.StorageParamItem; +import im.zhaojun.zfile.admin.annotation.model.StorageSourceParamDef; import im.zhaojun.zfile.admin.model.entity.StorageSource; import im.zhaojun.zfile.admin.model.entity.StorageSourceConfig; import im.zhaojun.zfile.admin.model.param.IStorageParam; diff --git a/src/main/java/im/zhaojun/zfile/home/aspect/RefererCheckAspect.java b/src/main/java/im/zhaojun/zfile/home/aspect/RefererCheckAspect.java index e2f7421..3361757 100644 --- a/src/main/java/im/zhaojun/zfile/home/aspect/RefererCheckAspect.java +++ b/src/main/java/im/zhaojun/zfile/home/aspect/RefererCheckAspect.java @@ -2,7 +2,7 @@ package im.zhaojun.zfile.home.aspect; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import im.zhaojun.zfile.admin.annoation.RefererCheck; +import im.zhaojun.zfile.admin.annotation.RefererCheck; import im.zhaojun.zfile.admin.model.enums.RefererTypeEnum; import im.zhaojun.zfile.admin.service.SystemConfigService; import im.zhaojun.zfile.home.model.dto.SystemConfigDTO; diff --git a/src/main/java/im/zhaojun/zfile/home/service/base/AbstractBaseFileService.java b/src/main/java/im/zhaojun/zfile/home/service/base/AbstractBaseFileService.java index db6829b..174d211 100644 --- a/src/main/java/im/zhaojun/zfile/home/service/base/AbstractBaseFileService.java +++ b/src/main/java/im/zhaojun/zfile/home/service/base/AbstractBaseFileService.java @@ -4,10 +4,10 @@ import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; -import im.zhaojun.zfile.admin.annoation.StorageParamItem; -import im.zhaojun.zfile.admin.annoation.StorageParamSelect; -import im.zhaojun.zfile.admin.annoation.StorageParamSelectOption; -import im.zhaojun.zfile.admin.annoation.model.StorageSourceParamDef; +import im.zhaojun.zfile.admin.annotation.StorageParamItem; +import im.zhaojun.zfile.admin.annotation.StorageParamSelect; +import im.zhaojun.zfile.admin.annotation.StorageParamSelectOption; +import im.zhaojun.zfile.admin.annotation.model.StorageSourceParamDef; import im.zhaojun.zfile.admin.model.enums.StorageParamTypeEnum; import im.zhaojun.zfile.admin.model.param.IStorageParam; import im.zhaojun.zfile.admin.service.SystemConfigService; @@ -163,7 +163,7 @@ public abstract class AbstractBaseFileService

implement // 从实现类中通过反射获取 options Class storageParamSelectClass = annotation.optionsClass(); if (ObjectUtil.isNotEmpty(storageParamSelectClass) - && ObjectUtil.notEqual(storageParamSelectClass.getName(), "im.zhaojun.zfile.admin.annoation.StorageParamSelect")) { + && ObjectUtil.notEqual(storageParamSelectClass.getName(), "im.zhaojun.zfile.admin.annotation.StorageParamSelect")) { StorageParamSelect storageParamSelect = ReflectUtil.newInstance(storageParamSelectClass); List storageParamSelectOptions = storageParamSelect.getOptions(annotation, param); optionsList.addAll(storageParamSelectOptions);