chore(all): org.apache.commons -> com.gmoon.javacore used

google-spreadsheet/pom.xml

@@ -19,8 +19,6 @@
 		<google-api-services-sheets.version>v4-rev493-${google-api-client.version}</google-api-services-sheets.version>
 		<google-api-services-drive.version>v3-rev110-1.23.0</google-api-services-drive.version>
 		<junit-platform-engine.version>1.4.0</junit-platform-engine.version>
-		<commons-lang3.version>3.11</commons-lang3.version>
-		<commons-configuration.version>1.10</commons-configuration.version>
 	</properties>
 
 	<dependencies>
@@ -53,17 +51,17 @@
 			<optional>true</optional>
 		</dependency>
 
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang3.version}</version>
-        </dependency>
 		<dependency>
 			<groupId>commons-configuration</groupId>
 			<artifactId>commons-configuration</artifactId>
-			<version>${commons-configuration.version}</version>
-		</dependency>
+            <version>1.10</version>
+        </dependency>
 
+        <dependency>
+            <groupId>com.gmoon</groupId>
+            <artifactId>java-core</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+		</dependency>
 
 		<dependency>
 			<groupId>com.google.api-client</groupId>

google-spreadsheet/src/main/java/com/gmoon/spreadsheet/utils/GoogleSpreadSheetToResources.java

@@ -6,12 +6,12 @@
 import java.util.stream.Collectors;
 
 import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
 import com.google.api.services.sheets.v4.model.ValueRange;
 
+import com.gmoon.javacore.util.StringUtils;
 import com.gmoon.spreadsheet.config.GoogleSpreadSheetProperties;
 import com.gmoon.spreadsheet.vo.ResourceVO;
 

google-spreadsheet/src/main/java/com/gmoon/spreadsheet/utils/GoogleSpreadSheetToXmlDataSet.java

@@ -6,8 +6,6 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
@@ -19,6 +17,8 @@
 import com.google.api.services.sheets.v4.model.Sheet;
 import com.google.api.services.sheets.v4.model.Spreadsheet;
 
+import com.gmoon.javacore.util.StringUtils;
+
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -117,7 +117,7 @@ private static StringBuffer getValueElementStringBuffer(TableNode.RowNode rowNod
 			} else {
 				String columnName = valueNode.getDescription();
 				sb.append(String.format("\n         <value description=\"%s\">%s</value>", columnName,
-					 StringEscapeUtils.escapeXml(columnValue)));
+					 StringUtils.escapeXml11(columnValue)));
 			}
 		}
 		return sb;

java-core/pom.xml

@@ -16,8 +16,6 @@
     <description>java-core</description>
 
     <properties>
-        <commons-lang3.version>3.12.0</commons-lang3.version>
-        <commons-collections4.version>4.4</commons-collections4.version>
         <poi.version>4.1.1</poi.version>
         <zxing.version>3.5.1</zxing.version>
         <totp.version>1.7.1</totp.version>
@@ -52,19 +50,23 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang3.version}</version>
+            <version>3.14.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+            <version>1.3</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-collections4</artifactId>
-            <version>${commons-collections4.version}</version>
+            <version>4.4</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
             <version>2.11.0</version>
         </dependency>
-
         <!-- https://mvnrepository.com/artifact/org.reflections/reflections -->
         <dependency>
             <groupId>org.reflections</groupId>

java-core/src/main/java/com/gmoon/javacore/util/ArrayUtils.java

@@ -0,0 +1,12 @@
+package com.gmoon.javacore.util;
+
+public class ArrayUtils {
+
+	public static boolean isEmpty(Object[] array) {
+		return org.apache.commons.lang3.ArrayUtils.isEmpty(array);
+	}
+
+	public static boolean isEmpty(int[] array) {
+		return org.apache.commons.lang3.ArrayUtils.isEmpty(array);
+	}
+}

java-core/src/main/java/com/gmoon/javacore/util/BooleanUtils.java

@@ -0,0 +1,11 @@
+package com.gmoon.javacore.util;
+
+public class BooleanUtils {
+	public static boolean toBoolean(Boolean bool) {
+		return org.apache.commons.lang3.BooleanUtils.toBoolean(bool);
+	}
+
+	public static boolean toBoolean(Integer integer) {
+		return org.apache.commons.lang3.BooleanUtils.toBoolean(integer);
+	}
+}

java-core/src/main/java/com/gmoon/javacore/util/CollectionUtils.java

@@ -6,8 +6,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.apache.commons.lang3.ArrayUtils;
-
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 

java-core/src/main/java/com/gmoon/javacore/util/StringUtils.java

@@ -1,12 +1,14 @@
 package com.gmoon.javacore.util;
 
 import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.text.StringEscapeUtils;
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class StringUtils {
+	public static String EMPTY = "";
 
 	public static String randomAlphabetic(int length) {
 		return RandomStringUtils.randomAlphabetic(length);
@@ -136,4 +138,20 @@ public static byte[] getBytes(String str, String charset) {
 			throw new RuntimeException(e);
 		}
 	}
+
+	public static String trimToEmpty(String str) {
+		return org.apache.commons.lang3.StringUtils.trimToEmpty(str);
+	}
+
+	public static String removeStart(String str, String remove) {
+		return org.apache.commons.lang3.StringUtils.removeStart(str, remove);
+	}
+
+	public static String escapeXml11(String input) {
+		return StringEscapeUtils.escapeXml11(input);
+	}
+
+	public static String escapeXml10(String input) {
+		return StringEscapeUtils.escapeXml10(input);
+	}
 }

java-core/src/test/java/com/gmoon/javacore/util/ArrayUtilsTest.java

@@ -0,0 +1,15 @@
+package com.gmoon.javacore.util;
+
+import static org.assertj.core.api.Assertions.*;
+
+import org.junit.jupiter.api.Test;
+
+class ArrayUtilsTest {
+
+	@Test
+	void isEmpty() {
+		int[] array = new int[] {};
+
+		assertThat(ArrayUtils.isEmpty(array)).isTrue();
+	}
+}

spring-cache/jpa-second-level-cache/pom.xml

@@ -79,10 +79,6 @@
         </dependency>
         <!-- cache end -->
 
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
         <!-- persistence start -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -118,6 +114,11 @@
             <version>${quick-perf.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.gmoon</groupId>
+            <artifactId>java-core</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
     <build>

spring-cache/jpa-second-level-cache/src/main/java/com/gmoon/hibernatesecondlevelcache/config/RedissonConfig.java

@@ -1,6 +1,5 @@
 package com.gmoon.hibernatesecondlevelcache.config;
 
-import org.apache.commons.lang3.StringUtils;
 import org.redisson.Redisson;
 import org.redisson.api.RedissonClient;
 import org.redisson.config.Config;
@@ -9,6 +8,8 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import com.gmoon.javacore.util.StringUtils;
+
 import lombok.RequiredArgsConstructor;
 
 @Configuration

spring-cache/spring-data-redis/pom.xml

@@ -15,7 +15,6 @@
     <name>spring-data-redis</name>
     <description>spring-data-redis</description>
     <properties>
-        <commons-lang3.version>3.12.0</commons-lang3.version>
         <jackson-databind.version>2.13.1</jackson-databind.version>
     </properties>
     <dependencies>
@@ -63,13 +62,6 @@
             <scope>test</scope>
         </dependency>
 
-        <!-- utils -->
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang3.version}</version>
-        </dependency>
-
         <!-- JedisShardInfo removed -->
         <dependency>
             <groupId>redis.clients</groupId>

spring-cache/spring-data-redis/src/main/java/com/gmoon/springdataredis/config/RedisConfig.java

@@ -5,7 +5,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
 import org.springframework.cache.CacheManager;
@@ -26,6 +25,7 @@
 import org.springframework.data.redis.serializer.RedisSerializer;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 
+import com.gmoon.javacore.util.StringUtils;
 import com.gmoon.springdataredis.cache.CacheName;
 import com.gmoon.springdataredis.util.RedisUtils;
 
@@ -39,8 +39,9 @@
  * {@link org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration}
  * {@link org.springframework.boot.autoconfigure.data.redis.LettuceConnectionConfiguration}
  * {@link org.springframework.boot.autoconfigure.data.redis.JedisConnectionConfiguration}
+ *
  * @see RedisTemplate#afterPropertiesSet()
- * **/
+ **/
 @Slf4j
 @Configuration
 @EnableCaching
@@ -103,14 +104,14 @@ private void setReplicaNodes(RedisStaticMasterReplicaConfiguration config) {
 	 * ************************************************************************************************
 	 * MASTER / UPSTREAM						Read master node only
 	 * MASTER_PREFERRED / UPSTREAM_PREFERRED	Read the master node first.
-	 * 											If the master node is unavailable, read the slave node
+	 * If the master node is unavailable, read the slave node
 	 * REPLICA / @Deprecated SLAVE				Read from node only
 	 * REPLICA_PREFERRED / SLAVE_PREFERRED		Read the slave node first.
-	 * 											If the slave node is unavailable, read the master node
+	 * If the slave node is unavailable, read the master node
 	 * NEAREST									Read from nearest node
 	 * ANY										Read from any node
 	 * ANY_REPLICA								Read from any slave node
-	 * */
+	 */
 	private LettuceClientConfiguration getClientConfig() {
 		return LettuceClientConfiguration.builder()
 			 // master-replica(master-slave) replication strategy config.

spring-cache/spring-data-redis/src/main/java/com/gmoon/springdataredis/util/RedisTemplateUtils.java

@@ -7,10 +7,10 @@
 import java.util.Objects;
 import java.util.Set;
 
-import org.apache.commons.lang3.BooleanUtils;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 
+import com.gmoon.javacore.util.BooleanUtils;
 import com.gmoon.springdataredis.cache.Cache;
 import com.gmoon.springdataredis.exception.NotFoundDataException;
 

spring-event/spring-async/pom.xml

@@ -38,11 +38,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>3.12.0</version>
-        </dependency>
         <dependency>
             <groupId>com.gmoon</groupId>
             <artifactId>java-core</artifactId>

spring-event/spring-async/src/main/java/com/gmoon/springasync/mail/InviteMailVO.java

@@ -2,7 +2,7 @@
 
 import java.io.Serializable;
 
-import org.apache.commons.lang3.StringUtils;
+import com.gmoon.javacore.util.StringUtils;
 
 import lombok.Getter;
 

spring-event/spring-async/src/main/java/com/gmoon/springasync/mail/MailService.java

@@ -3,14 +3,14 @@
 import java.util.concurrent.Future;
 import java.util.function.Function;
 
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.mail.SimpleMailMessage;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.AsyncResult;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import com.gmoon.javacore.util.StringUtils;
 import com.gmoon.springasync.member.Member;
 import com.gmoon.springasync.member.MemberRepository;
 

spring-event/spring-async/src/main/java/com/gmoon/springasync/mail/MailTemplate.java

@@ -2,11 +2,11 @@
 
 import java.io.File;
 
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.mail.SimpleMailMessage;
 import org.springframework.stereotype.Component;
 
 import com.gmoon.javacore.util.FileUtils;
+import com.gmoon.javacore.util.StringUtils;
 
 import lombok.RequiredArgsConstructor;
 

spring-event/spring-quartz-cluster/pom.xml

@@ -17,7 +17,6 @@
 
     <properties>
         <querydsl-core.version>5.0.0</querydsl-core.version>
-        <commons-lang3.version>3.12.0</commons-lang3.version>
     </properties>
 
     <dependencies>
@@ -44,11 +43,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang3.version}</version>
-        </dependency>
 
         <!-- jpa persistence -->
         <dependency>
@@ -77,6 +71,11 @@
             <version>${h2.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.gmoon</groupId>
+            <artifactId>java-core</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
     <build>