Release 1.11.1

Author: dzikoysk

.github/README.md

@@ -36,9 +36,9 @@ repositories {
 
 dependencies {
     // Default
-    implementation 'net.dzikoysk:cdn:1.11.0'
+    implementation 'net.dzikoysk:cdn:1.11.1'
     // Kotlin wrapper
-    implementation 'net.dzikoysk:cdn-kt:1.11.0'
+    implementation 'net.dzikoysk:cdn-kt:1.11.1'
 }
 ```
 

cdn-kt/pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <artifactId>cdn-parent</artifactId>
         <groupId>net.dzikoysk</groupId>
-        <version>1.11.0</version>
+        <version>1.11.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

cdn-kt/src/main/kotlin/net/dzikoysk/cdn/KCdn.kt

@@ -18,24 +18,29 @@ package net.dzikoysk.cdn
 
 import net.dzikoysk.cdn.model.KConfiguration
 import net.dzikoysk.cdn.model.KNamedElement
+import net.dzikoysk.cdn.source.Source
 import kotlin.reflect.KClass
 
-class KCdn(private val cdn: Cdn) {
+class KCdn(val cdn: Cdn) {
 
-    fun parse(source: String): KConfiguration = KConfiguration(cdn.load { source } )
+    companion object
 
-    fun <T : Any> parse(scheme: KClass<T>, source: String): T = cdn.load( { source } , scheme.java)
+    fun parse(source: Source): KConfiguration = KConfiguration(cdn.load(source))
 
-    inline fun <reified T : Any> parseAs(source: String): T = this.parse(T::class, source)
+    fun <T : Any> parse(source: Source, template: KClass<T>): T = cdn.load(source, template.java)
+
+    fun <T : Any> parse(source: Source, instance: T): T = cdn.load(source, instance)
+
+    inline fun <reified T : Any> parseAs(source: Source): T = this.parse(source, T::class)
 
     fun render(element: KNamedElement<*>): String = cdn.render(element.namedElement)
 
     fun render(entity: Any): String = cdn.render(entity)
 
-    companion object {
-
-        fun configure(): CdnSettings = CdnSettings()
+}
 
-    }
+fun Cdn.toKotlinWrapper(): KCdn =
+    KCdn(this)
 
-}
+fun KCdn.Companion.configure(): CdnSettings =
+    CdnSettings()

cdn-kt/src/main/kotlin/net/dzikoysk/cdn/KCdnFactory.kt

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2021 dzikoysk
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dzikoysk.cdn
+
+object KCdnFactory {
+
+    fun createStandard(): KCdn =
+        Cdn.configure()
+            .registerKotlinModule()
+            .build()
+            .toKotlinWrapper()
+
+}

cdn-kt/src/main/kotlin/net/dzikoysk/cdn/KCdnSettingsExtension.kt

@@ -2,7 +2,5 @@ package net.dzikoysk.cdn
 
 import net.dzikoysk.cdn.annotation.KotlinMemberResolver
 
-fun CdnSettings.registerKotlinModule() : CdnSettings {
-    this.withAnnotationResolver(KotlinMemberResolver())
-    return this
-}
+fun CdnSettings.registerKotlinModule() : CdnSettings =
+    this.withAnnotationResolver(KotlinMemberResolver())

cdn/pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <artifactId>cdn-parent</artifactId>
         <groupId>net.dzikoysk</groupId>
-        <version>1.11.0</version>
+        <version>1.11.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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 net.dzikoysk.cdn.shared.source.Source;
+import net.dzikoysk.cdn.source.Source;
 import panda.utilities.FileUtils;
 import java.io.File;
 import java.io.IOException;
@@ -52,7 +52,7 @@ public static CdnSettings configure() {
      *
      * @param source the source to load
      * @return the parsed configuration
-     * @see net.dzikoysk.cdn.shared.source.Source
+     * @see net.dzikoysk.cdn.source.Source
      */
     public Configuration load(Source source) {
         return new CdnReader(settings).read(source);

cdn/src/main/java/net/dzikoysk/cdn/CdnReader.java

@@ -21,7 +21,7 @@
 import net.dzikoysk.cdn.model.Element;
 import net.dzikoysk.cdn.model.Section;
 import net.dzikoysk.cdn.model.Unit;
-import net.dzikoysk.cdn.shared.source.Source;
+import net.dzikoysk.cdn.source.Source;
 import panda.std.Option;
 import panda.utilities.StringUtils;
 import java.util.ArrayList;

cdn/src/main/java/net/dzikoysk/cdn/model/MutableReference.java

@@ -16,11 +16,15 @@
 
 package net.dzikoysk.cdn.model;
 
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
+
 public interface MutableReference<V> extends Reference<V> {
 
     MutableReference<V> update(V value);
 
-    static <T> MutableReference<T> mutable(T value) {
+    @Contract(value = "_ -> new", pure = true)
+    static <T> MutableReference<@NotNull T> mutableReference(@NotNull T value) {
         return new MutableReferenceImpl<>(value);
     }
 

cdn/src/main/java/net/dzikoysk/cdn/model/MutableReferenceImpl.java

@@ -16,6 +16,7 @@
 
 package net.dzikoysk.cdn.model;
 
+import org.jetbrains.annotations.NotNull;
 import panda.std.Subscriber;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -51,13 +52,13 @@ public Reference<V> subscribe(Subscriber<? super V> subscriber) {
     }
 
     @Override
-    public V get() {
+    public @NotNull V get() {
         return value;
     }
 
     @SuppressWarnings("unchecked")
     @Override
-    public Class<V> getType() {
+    public @NotNull Class<V> getType() {
         return (Class<V>) value.getClass();
     }