refactor($Minio): move classes to minio package

[skip ci]
johnnymillergh · Aug 12, 2021 · 4da6876 · 4da6876
1 parent 4a93665
commit 4da6876
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/...src/main/java/com/jmsoftware/maf/osscenter/read/service/impl/ReadResourceServiceImpl.java b/...src/main/java/com/jmsoftware/maf/osscenter/read/service/impl/ReadResourceServiceImpl.java
@@ -3,7 +3,7 @@
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.io.IoUtil;
 import com.jmsoftware.maf.osscenter.read.service.ReadResourceService;
-import com.jmsoftware.maf.springcloudstarter.helper.MinioHelper;
+import com.jmsoftware.maf.springcloudstarter.minio.MinioHelper;
 import io.minio.StatObjectResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

diff --git a/...c/main/java/com/jmsoftware/maf/osscenter/write/service/impl/WriteResourceServiceImpl.java b/...c/main/java/com/jmsoftware/maf/osscenter/write/service/impl/WriteResourceServiceImpl.java
@@ -3,7 +3,7 @@
 import cn.hutool.core.util.StrUtil;
 import com.jmsoftware.maf.common.exception.BizException;
 import com.jmsoftware.maf.osscenter.write.service.WriteResourceService;
-import com.jmsoftware.maf.springcloudstarter.helper.MinioHelper;
+import com.jmsoftware.maf.springcloudstarter.minio.MinioHelper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;

diff --git a/...oud-starter/src/main/java/com/jmsoftware/maf/springcloudstarter/MafAutoConfiguration.java b/...oud-starter/src/main/java/com/jmsoftware/maf/springcloudstarter/MafAutoConfiguration.java
@@ -14,6 +14,7 @@
 import com.jmsoftware.maf.springcloudstarter.helper.HttpApiScanHelper;
 import com.jmsoftware.maf.springcloudstarter.helper.IpHelper;
 import com.jmsoftware.maf.springcloudstarter.helper.SpringBootStartupHelper;
+import com.jmsoftware.maf.springcloudstarter.minio.MinioConfiguration;
 import com.jmsoftware.maf.springcloudstarter.quartz.QuartzConfiguration;
 import com.jmsoftware.maf.springcloudstarter.redis.RedisConfiguration;
 import com.jmsoftware.maf.springcloudstarter.service.CommonService;

diff --git a/...ter/configuration/MinioConfiguration.java → ...loudstarter/minio/MinioConfiguration.java b/...ter/configuration/MinioConfiguration.java → ...loudstarter/minio/MinioConfiguration.java
@@ -1,8 +1,8 @@
-package com.jmsoftware.maf.springcloudstarter.configuration;
+package com.jmsoftware.maf.springcloudstarter.minio;
 
-import com.jmsoftware.maf.springcloudstarter.helper.MinioHelper;
 import io.minio.MinioClient;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -18,6 +18,7 @@
 @EnableConfigurationProperties({
         MinioProperties.class
 })
+@ConditionalOnClass({MinioClient.class})
 @ConditionalOnProperty({"minio.enabled"})
 public class MinioConfiguration {
     @Bean

diff --git a/...pringcloudstarter/helper/MinioHelper.java → ...springcloudstarter/minio/MinioHelper.java b/...pringcloudstarter/helper/MinioHelper.java → ...springcloudstarter/minio/MinioHelper.java
@@ -1,4 +1,4 @@
-package com.jmsoftware.maf.springcloudstarter.helper;
+package com.jmsoftware.maf.springcloudstarter.minio;
 
 import cn.hutool.core.util.ObjectUtil;
 import io.minio.*;

diff --git a/...tarter/configuration/MinioProperties.java → ...ngcloudstarter/minio/MinioProperties.java b/...tarter/configuration/MinioProperties.java → ...ngcloudstarter/minio/MinioProperties.java
@@ -1,4 +1,4 @@
-package com.jmsoftware.maf.springcloudstarter.configuration;
+package com.jmsoftware.maf.springcloudstarter.minio;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;