Merge pull request #92 from sokomishalov/feature/1.2.0

1.2.0
sokomishalov · Oct 22, 2020 · fc3ca47 · fc3ca47
2 parents d8106f4 + 4b5027e
commit fc3ca47
Show file tree

Hide file tree

Showing 44 changed files with 153 additions and 852 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,4 +19,6 @@ out/
 /build/
 
 ### Visual Studio Code related ###
-.vscode/
+.vscode/
+
+.flattened-pom.xml
diff --git a/README.md b/README.md
@@ -21,14 +21,13 @@ Add the dependency:
 <dependency>
     <groupId>com.github.sokomishalov.commons</groupId>
     <artifactId>commons-[module]</artifactId>
-    <version>1.1.19</version>
+    <version>1.2.0</version>
 </dependency>
 ```
 
 Available modules now are:
 - core
 - logging
 - serialization
-- reactor
 - coroutines
 - spring
diff --git a/commons-core/pom.xml b/commons-core/pom.xml
@@ -14,44 +14,11 @@
     <version>${revision}</version>
 
     <dependencies>
-
-        <!--  COMPILE DEPS  -->
-
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-stdlib-jdk8</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
-
-        <!--  TEST DEPS  -->
-
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>${logback.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-            <version>${logback.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.projectreactor</groupId>
-            <artifactId>reactor-test</artifactId>
-            <version>${reactor.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-test-junit</artifactId>
-            <version>${kotlin.version}</version>
-            <scope>test</scope>
-        </dependency>
-
     </dependencies>
 
     <build>
@@ -65,7 +32,7 @@
                 <configuration>
                     <jvmTarget>${java.version}</jvmTarget>
                     <args>
-                        <arg>-Xuse-experimental=kotlin.Experimental</arg>
+                        <arg>-Xopt-in=kotlin.contracts.ExperimentalContracts</arg>
                     </args>
                 </configuration>
                 <executions>
@@ -76,49 +43,7 @@
                             <goal>compile</goal>
                         </goals>
                     </execution>
-                    <execution>
-                        <id>test-compile</id>
-                        <phase>test-compile</phase>
-                        <goals>
-                            <goal>test-compile</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>kapt</id>
-                        <goals>
-                            <goal>kapt</goal>
-                        </goals>
-                        <configuration>
-                            <sourceDirs>
-                                <sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
-                            </sourceDirs>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>compile</id>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>testCompile</id>
-                        <phase>test-compile</phase>
-                        <goals>
-                            <goal>testCompile</goal>
-                        </goals>
-                    </execution>
                 </executions>
-                <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
-                </configuration>
             </plugin>
         </plugins>
     </build>

diff --git a/commons-core/src/main/kotlin/ru/sokomishalov/commons/core/collections/ArrayExtensions.kt b/commons-core/src/main/kotlin/ru/sokomishalov/commons/core/collections/ArrayExtensions.kt
@@ -17,6 +17,4 @@
 
 package ru.sokomishalov.commons.core.collections
 
-inline fun <T, K, V> Array<out T>.toMap(transform: (T) -> Pair<K, V>): Map<K, V> {
-    return map(transform).toMap()
-}
+inline fun <T, K, V> Array<out T>.toMap(transform: (T) -> Pair<K, V>): Map<K, V> = map(transform).toMap()
diff --git a/...rialization/ProtobufObjectMapperHelper.kt → .../core/collections/CollectionExtensions.kt b/...rialization/ProtobufObjectMapperHelper.kt → .../core/collections/CollectionExtensions.kt
@@ -13,16 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@file:Suppress("unused")
+@file:Suppress("NOTHING_TO_INLINE")
 
-package ru.sokomishalov.commons.core.serialization
+package ru.sokomishalov.commons.core.collections
 
-import com.fasterxml.jackson.databind.ObjectMapper
-import com.fasterxml.jackson.dataformat.protobuf.ProtobufFactory
+import kotlin.contracts.contract
 
 /**
  * @author sokomishalov
  */
 
+inline fun <T> Collection<T>?.isNotNullOrEmpty(): Boolean {
+    contract {
+        returns(true) implies (this@isNotNullOrEmpty != null)
+    }
 
-val PROTOBUF_OBJECT_MAPPER: ObjectMapper = buildComplexObjectMapper(factory = ProtobufFactory())
+    return (this == null || this.isEmpty()).not()
+}
diff --git a/commons-core/src/main/kotlin/ru/sokomishalov/commons/core/collections/IterableExtensions.kt b/commons-core/src/main/kotlin/ru/sokomishalov/commons/core/collections/IterableExtensions.kt
@@ -13,18 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@file:Suppress("unused")
+@file:Suppress("unused", "NOTHING_TO_INLINE")
 
 package ru.sokomishalov.commons.core.collections
 
 /**
  * @author sokomishalov
  */
 
-inline fun <reified K, V> Iterable<Map<K, V>>.toMap(): Map<K, V> {
-    return fold(mutableMapOf(), { acc, map -> acc.putAll(map).let { acc } })
-}
+inline fun <K, V> Iterable<Map<K, V>>.toMap(): Map<K, V> = fold(mutableMapOf(), { acc, map -> acc.putAll(map).let { acc } })
 
-inline fun <T, K, V> Iterable<T>.toMap(transform: (T) -> Pair<K, V>): Map<K, V> {
-    return map(transform).toMap()
-}
+inline fun <T, K, V> Iterable<T>.toMap(transform: (T) -> Pair<K, V>): Map<K, V> = map(transform).toMap()
diff --git a/commons-core/src/main/kotlin/ru/sokomishalov/commons/core/collections/MapExtensions.kt b/commons-core/src/main/kotlin/ru/sokomishalov/commons/core/collections/MapExtensions.kt
@@ -13,15 +13,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@file:Suppress("unused")
+@file:Suppress("unused", "NOTHING_TO_INLINE")
 
 package ru.sokomishalov.commons.core.collections
 
+import kotlin.contracts.contract
+
 
 /**
  * @author sokomishalov
  */
 
-infix fun <K, V> Map<K, V>.containsEntryFrom(other: Map<K, V>): Boolean {
-    return entries.intersect(other.entries).isNullOrEmpty().not()
-}
+infix fun <K, V> Map<K, V>.containsEntryFrom(other: Map<K, V>): Boolean = entries.intersect(other.entries).isNullOrEmpty().not()
+
+inline fun <K, V> Map<K, V>?.isNotNullOrEmpty(): Boolean {
+    contract {
+        returns(true) implies (this@isNotNullOrEmpty != null)
+    }
+
+    return (this == null || this.isEmpty()).not()
+}
diff --git a/commons-core/src/main/kotlin/ru/sokomishalov/commons/core/consts/GlobalConstants.kt b/commons-core/src/main/kotlin/ru/sokomishalov/commons/core/consts/GlobalConstants.kt
@@ -20,5 +20,4 @@ package ru.sokomishalov.commons.core.consts
 /**
  * @author sokomishalov
  */
-const val EMPTY = ""
-const val LOCALHOST = "localhost"
+const val EMPTY = ""
diff --git a/commons-core/src/main/kotlin/ru/sokomishalov/commons/core/numbers/NumberExtensions.kt b/commons-core/src/main/kotlin/ru/sokomishalov/commons/core/numbers/NumberExtensions.kt
diff --git a/commons-core/src/main/kotlin/ru/sokomishalov/commons/core/reflection/ReflectionUtils.kt b/commons-core/src/main/kotlin/ru/sokomishalov/commons/core/reflection/ReflectionUtils.kt
@@ -22,9 +22,7 @@ package ru.sokomishalov.commons.core.reflection
  */
 
 
-inline fun <T : Any> Class<T>.unwrapCompanionClass(): Class<*> {
-    return when {
-        name.endsWith("\$Companion") -> enclosingClass ?: this
-        else -> this
-    }
+inline fun <T : Any> Class<T>.unwrapCompanionClass(): Class<*> = when {
+    name.endsWith("\$Companion") -> enclosingClass ?: this
+    else -> this
 }
diff --git a/commons-core/src/main/kotlin/ru/sokomishalov/commons/core/string/StringExtensions.kt b/commons-core/src/main/kotlin/ru/sokomishalov/commons/core/string/StringExtensions.kt
@@ -17,17 +17,22 @@
 
 package ru.sokomishalov.commons.core.string
 
-import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.contract
 
 /**
  * @author sokomishalov
  */
 
-@OptIn(ExperimentalContracts::class)
 inline fun CharSequence?.isNotNullOrBlank(): Boolean {
     contract {
         returns(true) implies (this@isNotNullOrBlank != null)
     }
-    return (this == null || this.isBlank()).not()
+    return (this == null || isBlank()).not()
+}
+
+inline fun CharSequence?.isNotNullOrEmpty(): Boolean {
+    contract {
+        returns(true) implies (this@isNotNullOrEmpty != null)
+    }
+    return (this == null || length == 0).not()
 }