GH-77 Update to panda-utilities 0.5.0-alpha (Resolve #77)

dzikoysk · Jul 17, 2021 · 425f9f3 · 425f9f3
1 parent 0588b12
commit 425f9f3
Show file tree

Hide file tree

Showing 18 changed files with 31 additions and 32 deletions.
diff --git a/README.md b/README.md
@@ -36,9 +36,9 @@ repositories {
 
 dependencies {
     // Default
-    implementation 'net.dzikoysk:cdn:1.8.1'
+    implementation 'net.dzikoysk:cdn:1.9.0'
     // Kotlin wrapper
-    implementation 'net.dzikoysk:cdn-kt:1.8.1'
+    implementation 'net.dzikoysk:cdn-kt:1.9.0'
 }
 ```
 

diff --git a/cdn-kt/pom.xml b/cdn-kt/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>cdn-parent</artifactId>
         <groupId>net.dzikoysk</groupId>
-        <version>1.8.1</version>
+        <version>1.9.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>net.dzikoysk</groupId>
             <artifactId>cdn</artifactId>
-            <version>1.8.1</version>
+            <version>1.9.0</version>
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>

diff --git a/cdn/pom.xml b/cdn/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>cdn-parent</artifactId>
         <groupId>net.dzikoysk</groupId>
-        <version>1.8.1</version>
+        <version>1.9.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>org.panda-lang</groupId>
             <artifactId>panda-utilities</artifactId>
-            <version>0.4.0-alpha</version>
+            <version>0.5.0-alpha</version>
         </dependency>
 
         <!-- Benchmarks -->

diff --git a/cdn/src/main/java/net/dzikoysk/cdn/Cdn.java b/cdn/src/main/java/net/dzikoysk/cdn/Cdn.java
@@ -18,7 +18,7 @@
 
 import net.dzikoysk.cdn.model.Configuration;
 import net.dzikoysk.cdn.model.Element;
-import org.panda_lang.utilities.commons.FileUtils;
+import panda.utilities.FileUtils;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/cdn/src/main/java/net/dzikoysk/cdn/CdnDeserializer.java b/cdn/src/main/java/net/dzikoysk/cdn/CdnDeserializer.java
@@ -21,8 +21,8 @@
 import net.dzikoysk.cdn.model.Element;
 import net.dzikoysk.cdn.model.Section;
 import net.dzikoysk.cdn.serialization.Deserializer;
-import org.panda_lang.utilities.commons.ObjectUtils;
-import org.panda_lang.utilities.commons.function.Option;
+import panda.std.Option;
+import panda.utilities.ObjectUtils;
 
 import java.lang.reflect.Field;
 

diff --git a/cdn/src/main/java/net/dzikoysk/cdn/CdnReader.java b/cdn/src/main/java/net/dzikoysk/cdn/CdnReader.java
@@ -21,8 +21,8 @@
 import net.dzikoysk.cdn.model.Element;
 import net.dzikoysk.cdn.model.Section;
 import net.dzikoysk.cdn.model.Unit;
-import org.panda_lang.utilities.commons.StringUtils;
-import org.panda_lang.utilities.commons.function.Option;
+import panda.std.Option;
+import panda.utilities.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;

diff --git a/cdn/src/main/java/net/dzikoysk/cdn/CdnSettings.java b/cdn/src/main/java/net/dzikoysk/cdn/CdnSettings.java
@@ -25,8 +25,8 @@
 import net.dzikoysk.cdn.serialization.SimpleComposer;
 import net.dzikoysk.cdn.serialization.SimpleDeserializer;
 import net.dzikoysk.cdn.serialization.SimpleSerializer;
-import org.panda_lang.utilities.commons.ClassUtils;
-import org.panda_lang.utilities.commons.ObjectUtils;
+import panda.utilities.ClassUtils;
+import panda.utilities.ObjectUtils;
 
 import java.util.ArrayList;
 import java.util.Collection;

diff --git a/cdn/src/main/java/net/dzikoysk/cdn/CdnUtils.java b/cdn/src/main/java/net/dzikoysk/cdn/CdnUtils.java
@@ -22,7 +22,7 @@
 import net.dzikoysk.cdn.entity.Exclude;
 import net.dzikoysk.cdn.serialization.Composer;
 import org.jetbrains.annotations.Nullable;
-import org.panda_lang.utilities.commons.ObjectUtils;
+import panda.utilities.ObjectUtils;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/cdn/src/main/java/net/dzikoysk/cdn/CdnWriter.java b/cdn/src/main/java/net/dzikoysk/cdn/CdnWriter.java
@@ -21,7 +21,7 @@
 import net.dzikoysk.cdn.model.Entry;
 import net.dzikoysk.cdn.model.Section;
 import net.dzikoysk.cdn.model.Unit;
-import org.panda_lang.utilities.commons.StringUtils;
+import panda.utilities.StringUtils;
 
 import java.util.Map;
 

diff --git a/cdn/src/main/java/net/dzikoysk/cdn/composers/MapComposer.java b/cdn/src/main/java/net/dzikoysk/cdn/composers/MapComposer.java
@@ -27,7 +27,7 @@
 import net.dzikoysk.cdn.serialization.Composer;
 import net.dzikoysk.cdn.serialization.Deserializer;
 import net.dzikoysk.cdn.serialization.Serializer;
-import org.panda_lang.utilities.commons.ObjectUtils;
+import panda.utilities.ObjectUtils;
 
 import java.lang.reflect.AnnotatedParameterizedType;
 import java.lang.reflect.AnnotatedType;

diff --git a/cdn/src/main/java/net/dzikoysk/cdn/features/JsonFeature.java b/cdn/src/main/java/net/dzikoysk/cdn/features/JsonFeature.java
@@ -17,8 +17,8 @@
 package net.dzikoysk.cdn.features;
 
 import net.dzikoysk.cdn.CdnConstants;
-import org.panda_lang.utilities.commons.CharacterUtils;
-import org.panda_lang.utilities.commons.StringUtils;
+import panda.utilities.CharacterUtils;
+import panda.utilities.StringUtils;
 
 import java.util.Stack;
 

diff --git a/cdn/src/main/java/net/dzikoysk/cdn/features/YamlLikeConverter.java b/cdn/src/main/java/net/dzikoysk/cdn/features/YamlLikeConverter.java
@@ -16,9 +16,10 @@
 
 package net.dzikoysk.cdn.features;
 
-import org.panda_lang.utilities.commons.StringUtils;
+import panda.utilities.StringUtils;
 
-import static net.dzikoysk.cdn.CdnConstants.*;
+import static net.dzikoysk.cdn.CdnConstants.LINE_SEPARATOR;
+import static net.dzikoysk.cdn.CdnConstants.OPERATOR;
 
 final class YamlLikeConverter {
 

diff --git a/cdn/src/main/java/net/dzikoysk/cdn/model/Configuration.java b/cdn/src/main/java/net/dzikoysk/cdn/model/Configuration.java
@@ -17,7 +17,7 @@
 package net.dzikoysk.cdn.model;
 
 import net.dzikoysk.cdn.CdnConstants;
-import org.panda_lang.utilities.commons.StringUtils;
+import panda.utilities.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Collections;

diff --git a/cdn/src/main/java/net/dzikoysk/cdn/model/Section.java b/cdn/src/main/java/net/dzikoysk/cdn/model/Section.java
@@ -19,9 +19,9 @@
 import net.dzikoysk.cdn.CdnConstants;
 import net.dzikoysk.cdn.CdnUtils;
 import org.jetbrains.annotations.Contract;
-import org.panda_lang.utilities.commons.ObjectUtils;
-import org.panda_lang.utilities.commons.StringUtils;
-import org.panda_lang.utilities.commons.function.Option;
+import panda.std.Option;
+import panda.utilities.ObjectUtils;
+import panda.utilities.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Collections;

diff --git a/cdn/src/main/java/net/dzikoysk/cdn/model/Unit.java b/cdn/src/main/java/net/dzikoysk/cdn/model/Unit.java
@@ -17,8 +17,7 @@
 package net.dzikoysk.cdn.model;
 
 import net.dzikoysk.cdn.CdnConstants;
-import org.panda_lang.utilities.commons.StringUtils;
-
+import panda.utilities.StringUtils;
 import java.util.Collections;
 import java.util.List;
 

diff --git a/cdn/src/main/java/net/dzikoysk/cdn/serialization/SimpleSerializer.java b/cdn/src/main/java/net/dzikoysk/cdn/serialization/SimpleSerializer.java
@@ -20,8 +20,7 @@
 import net.dzikoysk.cdn.model.Element;
 import net.dzikoysk.cdn.model.Entry;
 import net.dzikoysk.cdn.model.Unit;
-import org.panda_lang.utilities.commons.StringUtils;
-
+import panda.utilities.StringUtils;
 import java.lang.reflect.AnnotatedType;
 import java.util.List;
 
@@ -39,7 +38,7 @@ public interface SimpleSerializer<T> extends Serializer<T> {
     default Element<?> serialize(CdnSettings settings, List<String> description, String key, AnnotatedType type, T entity) {
         String result = serialize(entity);
 
-        return StringUtils.isEmpty(key) 
+        return StringUtils.isEmpty(key)
                 ? new Unit(serialize(entity)) 
                 : new Entry(description, key, result);
     }

diff --git a/cdn/src/test/groovy/net/dzikoysk/cdn/model/ConfigurationTest.groovy b/cdn/src/test/groovy/net/dzikoysk/cdn/model/ConfigurationTest.groovy
@@ -19,9 +19,9 @@ package net.dzikoysk.cdn.model
 import groovy.transform.CompileStatic
 import net.dzikoysk.cdn.CdnSpec
 import org.junit.jupiter.api.Test
-import org.panda_lang.utilities.commons.StringUtils
 
 import static org.junit.jupiter.api.Assertions.assertEquals
+import static panda.utilities.StringUtils.EMPTY
 
 @CompileStatic
 final class ConfigurationTest extends CdnSpec {
@@ -34,7 +34,7 @@ final class ConfigurationTest extends CdnSpec {
 
     @Test
     void 'should contain empty name' () {
-        assertEquals StringUtils.EMPTY, ROOT.getName()
+        assertEquals EMPTY, ROOT.getName()
     }
 
 }
diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
     <groupId>net.dzikoysk</groupId>
     <artifactId>cdn-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.8.1</version>
+    <version>1.9.0</version>
 
     <scm>
         <connection>scm:git:https://github.com/dzikoysk/cdn.git</connection>