merge master

HZ-Cyq · Apr 13, 2021 · 5a41cba · 5a41cba
2 parents 7f126bc + d6bac7e
commit 5a41cba
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 377 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,3 @@
 target/
 .idea/
-
+chenyuuqun.iml
diff --git a/chenyuuqun.iml b/chenyuuqun.iml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:19.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.41" level="project" />
+    <orderEntry type="library" name="Maven: io.vavr:vavr:0.9.0" level="project" />
+    <orderEntry type="library" name="Maven: io.vavr:vavr-match:0.9.0" level="project" />
+    <orderEntry type="library" name="Maven: org.powermock:powermock-api-mockito2:2.0.7" level="project" />
+    <orderEntry type="library" name="Maven: org.powermock:powermock-api-support:2.0.7" level="project" />
+    <orderEntry type="library" name="Maven: org.mockito:mockito-core:2.28.2" level="project" />
+    <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" />
+    <orderEntry type="library" name="Maven: org.powermock:powermock-core:2.0.7" level="project" />
+    <orderEntry type="library" name="Maven: org.powermock:powermock-reflect:2.0.7" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.27.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.10" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.10" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-all:2.0.2-beta" level="project" />
+    <orderEntry type="library" name="Maven: org.powermock:powermock-module-junit4:2.0.7" level="project" />
+    <orderEntry type="library" name="Maven: org.powermock:powermock-module-junit4-common:2.0.7" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains:annotations:18.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.openjdk.jmh:jmh-core:1.23" level="project" />
+    <orderEntry type="library" name="Maven: net.sf.jopt-simple:jopt-simple:4.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.openjdk.jmh:jmh-generator-annprocess:1.23" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.10.Final" level="project" />
+  </component>
+</module>
diff --git a/src/main/java/Utils/StringUtils.java b/src/main/java/Utils/StringUtils.java
@@ -0,0 +1,7 @@
+package Utils;
+
+public class StringUtils {
+    public static boolean isEmpty(String str) {
+        return str == null || str.isEmpty();
+    }
+}
diff --git a/src/main/java/design_pattern/creational/builder/ResourcePoolConfig.java b/src/main/java/design_pattern/creational/builder/ResourcePoolConfig.java
@@ -1,6 +1,6 @@
 package design_pattern.creational.builder;
 
-import com.taobao.api.internal.util.StringUtils;
+import Utils.StringUtils;
 
 /**
  * @author chenyuqun

diff --git a/src/main/java/design_pattern/structural/composite/FileSystemNode.java b/src/main/java/design_pattern/structural/composite/FileSystemNode.java
@@ -1,6 +1,4 @@
 package design_pattern.structural.composite;
-
-import com.dingtalk.api.request.OapiChatSendRequest;
 import com.google.common.collect.Lists;
 
 import java.io.File;

diff --git a/src/main/java/design_pattern/structural/flyweight/chess/flyweight/ChessBoard.java b/src/main/java/design_pattern/structural/flyweight/chess/flyweight/ChessBoard.java
@@ -2,7 +2,6 @@
 
 import com.google.common.collect.Maps;
 
-import javax.jnlp.SingleInstanceListener;
 import java.util.Map;
 
 /**
@@ -14,10 +13,12 @@ public class ChessBoard {
     public ChessBoard() {
         init();
     }
+
     private void init() {
-        chessPieces.put(1,new ChessPiece(ChessPieceUnitFactory.getChessPiece(1),0,0));
-        chessPieces.put(2,new ChessPiece(ChessPieceUnitFactory.getChessPiece(2),1,0));
+        chessPieces.put(1, new ChessPiece(ChessPieceUnitFactory.getChessPiece(1), 0, 0));
+        chessPieces.put(2, new ChessPiece(ChessPieceUnitFactory.getChessPiece(2), 1, 0));
     }
+
     private void move(int chessPieceId, int toPositionX, int toPositionY) {
         // ...省略...
     }

diff --git a/src/main/java/java_language_basic/input_and_output/yearCelebrate.java b/src/main/java/java_language_basic/input_and_output/yearCelebrate.java