Merge remote-tracking branch 'origin/200828_remove_lombok'

liuyueyi · Sep 15, 2020 · 9a6bd10 · 9a6bd10
2 parents d2c87f7 + 0aaf792
commit 9a6bd10
Show file tree

Hide file tree

Showing 54 changed files with 3,041 additions and 354 deletions.
diff --git a/console/pom.xml b/console/pom.xml
@@ -18,13 +18,13 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
-        <qrcode-plugin.version>2.4</qrcode-plugin.version>
-        <image-plugin.version>2.4</image-plugin.version>
-        <svg-plugin.version>2.4</svg-plugin.version>
-        <markdonw-plugin.version>2.4</markdonw-plugin.version>
-        <audio-plugin.version>2.4</audio-plugin.version>
-        <date-plugin.version>2.4</date-plugin.version>
-        <phantom-plugin.version>2.4</phantom-plugin.version>
+        <qrcode-plugin.version>2.5</qrcode-plugin.version>
+        <image-plugin.version>2.5</image-plugin.version>
+        <svg-plugin.version>2.5</svg-plugin.version>
+        <markdonw-plugin.version>2.5</markdonw-plugin.version>
+        <audio-plugin.version>2.5</audio-plugin.version>
+        <date-plugin.version>2.5</date-plugin.version>
+        <phantom-plugin.version>2.5</phantom-plugin.version>
     </properties>
 
     <repositories>
@@ -41,13 +41,6 @@
             </snapshots>
         </repository>
     </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>spring-releases</id>
-            <url>https://repo.spring.io/libs-release-local</url>
-        </pluginRepository>
-    </pluginRepositories>
-
     <dependencies>
 
         <dependency>

diff --git a/plugins/audio-plugin/pom.xml b/plugins/audio-plugin/pom.xml
@@ -5,18 +5,18 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>com.github.hui.media</groupId>
-        <version>2.4</version>
+        <version>2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>audio-plugin</artifactId>
-    <version>2.4</version>
+    <version>2.5</version>
 
     <dependencies>
         <dependency>
             <groupId>com.github.hui.media</groupId>
             <artifactId>base-plugin</artifactId>
-            <version>2.4</version>
+            <version>2.5</version>
         </dependency>
     </dependencies>
 

diff --git a/plugins/audio-plugin/src/main/java/com/github/hui/quick/plugin/audio/AudioOptions.java b/plugins/audio-plugin/src/main/java/com/github/hui/quick/plugin/audio/AudioOptions.java
@@ -6,7 +6,8 @@
 /**
  * Created by yihui on 2017/7/13.
  */
-public class AudioOptions {
+public class
+AudioOptions {
 
     private String cmd = "ffmpeg -i ";
 

diff --git a/plugins/audio-plugin/src/main/java/com/github/hui/quick/plugin/audio/AudioWrapper.java b/plugins/audio-plugin/src/main/java/com/github/hui/quick/plugin/audio/AudioWrapper.java
@@ -3,10 +3,9 @@
 import com.github.hui.quick.plugin.base.FileReadUtil;
 import com.github.hui.quick.plugin.base.FileWriteUtil;
 import com.github.hui.quick.plugin.base.ProcessUtil;
-import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.InputStream;
 import java.net.URI;
 import java.util.HashMap;
@@ -17,9 +16,10 @@
  * <p>
  * Created by yihui on 2017/7/13.
  */
-@Slf4j
 public class AudioWrapper {
 
+    private static final Logger log = LoggerFactory.getLogger(AudioWrapper.class);
+
     public static Builder<String> of(String str) {
         return new Builder<String>().setSource(str);
     }

diff --git a/plugins/audio-plugin/src/test/java/com/github/hui/quick/plugin/test/AudioWrapperTest.java b/plugins/audio-plugin/src/test/java/com/github/hui/quick/plugin/test/AudioWrapperTest.java
@@ -1,15 +1,17 @@
 package com.github.hui.quick.plugin.test;
 
 import com.github.hui.quick.plugin.audio.AudioWrapper;
-import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Created by yihui on 2017/7/13.
  */
-@Slf4j
 public class AudioWrapperTest {
 
+    private static final Logger log = LoggerFactory.getLogger(AudioWrapperTest.class);
+
 
     @Test
     public void testAudioParse() {

diff --git a/plugins/base-plugin/pom.xml b/plugins/base-plugin/pom.xml
@@ -5,30 +5,25 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>com.github.hui.media</groupId>
-        <version>2.4</version>
+        <version>2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>base-plugin</artifactId>
-    <version>2.4</version>
+    <version>2.5</version>
 
 
     <dependencies>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
 
-
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>

diff --git a/plugins/base-plugin/src/main/java/com/github/hui/quick/plugin/base/FileWriteUtil.java b/plugins/base-plugin/src/main/java/com/github/hui/quick/plugin/base/FileWriteUtil.java
@@ -1,22 +1,21 @@
 package com.github.hui.quick.plugin.base;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.*;
 import java.net.URI;
 import java.util.Date;
+import java.util.Objects;
 import java.util.Random;
 
 /**
  * Created by yihui on 2017/7/13.
  */
-@Slf4j
 public class FileWriteUtil {
+    private static final Logger log = LoggerFactory.getLogger(FileWriteUtil.class);
 
     public static String TEMP_PATH = "/tmp/quickmedia/";
 
@@ -279,9 +278,6 @@ private static void extraFileName(String fileName, FileInfo fileInfo) {
         }
     }
 
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
     public static class FileInfo {
         /**
          * 文件所在的目录
@@ -300,10 +296,67 @@ public static class FileInfo {
          */
         private String fileType;
 
+        public FileInfo() {
+        }
+
+        public FileInfo(String path, String filename, String fileType) {
+            this.path = path;
+            this.filename = filename;
+            this.fileType = fileType;
+        }
 
         public String getAbsFile() {
             return path + "/" + filename + "." + fileType;
         }
+
+        public String getPath() {
+            return path;
+        }
+
+        public void setPath(String path) {
+            this.path = path;
+        }
+
+        public String getFilename() {
+            return filename;
+        }
+
+        public void setFilename(String filename) {
+            this.filename = filename;
+        }
+
+        public String getFileType() {
+            return fileType;
+        }
+
+        public void setFileType(String fileType) {
+            this.fileType = fileType;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+            FileInfo fileInfo = (FileInfo) o;
+            return Objects.equals(path, fileInfo.path) && Objects.equals(filename, fileInfo.filename) &&
+                    Objects.equals(fileType, fileInfo.fileType);
+        }
+
+        @Override
+        public int hashCode() {
+
+            return Objects.hash(path, filename, fileType);
+        }
+
+        @Override
+        public String toString() {
+            return "FileInfo{" + "path='" + path + '\'' + ", filename='" + filename + '\'' + ", fileType='" + fileType +
+                    '\'' + '}';
+        }
     }
 
 

diff --git a/plugins/base-plugin/src/main/java/com/github/hui/quick/plugin/base/HttpUtil.java b/plugins/base-plugin/src/main/java/com/github/hui/quick/plugin/base/HttpUtil.java
@@ -1,11 +1,12 @@
 package com.github.hui.quick.plugin.base;
 
-import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.fluent.Request;
 import org.apache.http.client.utils.URIUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -15,9 +16,8 @@
 /**
  * Created by yihui on 2017/7/13.
  */
-@Slf4j
 public class HttpUtil {
-
+    private static Logger log = LoggerFactory.getLogger(HttpUtil.class);
 
     public static InputStream downFile(String src) throws IOException {
         return downFile(URI.create(src));

diff --git a/plugins/base-plugin/src/main/java/com/github/hui/quick/plugin/base/ProcessUtil.java b/plugins/base-plugin/src/main/java/com/github/hui/quick/plugin/base/ProcessUtil.java
@@ -1,6 +1,7 @@
 package com.github.hui.quick.plugin.base;
 
-import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -12,8 +13,8 @@
 /**
  * Created by yihui on 2017/7/13.
  */
-@Slf4j
 public class ProcessUtil {
+    private static Logger log = LoggerFactory.getLogger(ProcessUtil.class);
 
     /**
      * Buffer size of process input-stream (used for reading the

diff --git a/plugins/date-plugin/pom.xml b/plugins/date-plugin/pom.xml
@@ -5,24 +5,19 @@
     <parent>
         <artifactId>plugins</artifactId>
         <groupId>com.github.hui.media</groupId>
-        <version>2.4</version>
+        <version>2.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>date-plugin</artifactId>
-    <version>2.4</version>
+    <version>2.5</version>
 
 
     <dependencies>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>