some bug fixing and renaming

RealYusufIsmail · Sep 12, 2022 · 3b04866 · 3b04866
1 parent 740d41b
commit 3b04866
Show file tree

Hide file tree

Showing 8 changed files with 65 additions and 63 deletions.
diff --git a/Package.md b/Package.md
@@ -37,7 +37,7 @@ And thats it for getting the token.
 <dependency>
     <groupId>io.github.realyusufismail</groupId>
     <artifactId>jconfig</artifactId>
-    <version>1.0.5</version>
+    <version>1.0.6</version>
 </dependency>
 ```
 
@@ -46,11 +46,11 @@ And thats it for getting the token.
 ```groovy
 //kotlin
 dependencies {
-    implementation("io.github.realyusufismail:jconfig:${project.version}")
+    implementation("io.github.realyusufismail:jconfig:1.0.6")
 }
 
 //groovy
 dependencies {
-    implementation "io.github.realyusufismail:jconfig:${project.version}"
+    implementation "io.github.realyusufismail:jconfig:1.0.6"
 }
 ```
diff --git a/README.md b/README.md
@@ -39,7 +39,7 @@ And thats it for getting the token.
 <dependency>
     <groupId>io.github.realyusufismail</groupId>
     <artifactId>jconfig</artifactId>
-    <version>1.0.5</version>
+    <version>1.0.6</version>
 </dependency>
 ```
 
@@ -48,12 +48,12 @@ And thats it for getting the token.
 ```groovy
 //kotlin
 dependencies {
-   implementation("io.github.realyusufismail:jconfig:${project.version}")
+   implementation("io.github.realyusufismail:jconfig:1.0.6")
 }
 
 //groovy
 dependencies {
-   implementation "io.github.realyusufismail:jconfig:${project.version}"
+   implementation "io.github.realyusufismail:jconfig:1.0.6"
 }
 ```
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -24,7 +24,7 @@ extra.apply {
     set("name", "JConfig")
     set("description", "Json Configurations used to store tokens and other sensitive data")
     set("group", "io.github.realyusufismail")
-    set("version", "1.0.5")
+    set("version", "1.0.6")
     set("dev_id", "yusuf")
     set("dev_name", "Yusuf Ismail")
     set("dev_email", "yusufgamer222@gmail.com")
@@ -37,7 +37,7 @@ extra.apply {
 }
 
 group = "io.github.realyusufismail"
-version = "1.0.5"
+version = "1.0.6"
 
 repositories {
     mavenCentral()

diff --git a/src/main/kotlin/io/github/realyusufismail/jconfig/JConfigObject.kt b/src/main/kotlin/io/github/realyusufismail/jconfig/JConfigObject.kt
@@ -24,50 +24,50 @@ import java.math.BigInteger
 /** Used to get a value as a certain type. */
 interface JConfigObject {
     /** Get the value as a [String]. */
-    val string: String
+    val asString: String
 
     /** Get the value as an [Int]. */
-    val int: Int
+    val asInt: Int
 
     /** Get the value as a [BigInteger]. */
-    val bigInt: BigInteger
+    val asBigInt: BigInteger
 
     /** Get the value as a [Double]. */
-    val double: Double
+    val asDouble: Double
 
     /** Get the value as a [Boolean]. */
-    val boolean: Boolean
+    val asBoolean: Boolean
 
     /** Get the value as a [Byte]. */
-    val byte: Byte
+    val asByte: Byte
 
     /** Get the value as a [Short]. */
-    val short: Short
+    val asShort: Short
 
     /** Get the value as a [Long]. */
-    val long: Long
+    val asLong: Long
 
     /** Get the value as a [Float]. */
-    val float: Float
+    val asFloat: Float
 
     /** Get the value as a [Char]. */
-    val char: Char
+    val asChar: Char
 
     /** Get the value as a [Number]. */
-    val number: Number
+    val asNumber: Number
 
     /** Get the value as a [BigDecimal]. */
-    val decimal: BigDecimal
+    val asDecimal: BigDecimal
 
     /** Get the value as an [Array]. */
-    val array: Array<JConfigObject>
+    val asArray: Array<JConfigObject>
 
     /** Get the value as a [List]. */
-    val list: List<JConfigObject>
+    val asList: List<JConfigObject>
 
     /** Get the value as a [Map]. */
-    val map: Map<String, JConfigObject>
+    val asMap: Map<String, JConfigObject>
 
     /** Get the value as an [Any]. */
-    val any: Any
+    val asAny: Any
 }
diff --git a/src/main/kotlin/io/github/realyusufismail/jconfig/classes/JConfigImpl.kt b/src/main/kotlin/io/github/realyusufismail/jconfig/classes/JConfigImpl.kt
@@ -57,17 +57,19 @@ class JConfigImpl(entries: List<JsonEntry>) : JConfig {
                 value.isObject ->
                     JConfigObjectImpl(
                         value.fields().asSequence().map { it.key to it.value.asText() }.toMap())
-                else -> throw IllegalArgumentException("Unknown type: ${value.javaClass}")
+                value.isNull -> throw JConfigException("The value of the key $key is null")
+                else ->
+                    throw JConfigException("The key $key is not a valid type or is not supported")
             }
         } else {
-            throw IllegalArgumentException("Unknown type: ${value.javaClass}")
+            throw JConfigException("Unknown type: ${value.javaClass}")
         }
     }
 
     override fun get(key: String, defaultValue: Any): JConfigObject {
-        return try {
+        return if (mapEntries.containsKey(key)) {
             get(key)
-        } catch (e: NoSuchElementException) {
+        } else {
             JConfigObjectImpl(defaultValue)
         }
     }

diff --git a/src/main/kotlin/io/github/realyusufismail/jconfig/classes/JConfigObjectImpl.kt b/src/main/kotlin/io/github/realyusufismail/jconfig/classes/JConfigObjectImpl.kt
@@ -24,7 +24,7 @@ import java.math.BigInteger
 
 class JConfigObjectImpl(private val value: Any) : JConfigObject {
 
-    override val string: String
+    override val asString: String
         get() {
             if (value is String) {
                 return value
@@ -33,7 +33,7 @@ class JConfigObjectImpl(private val value: Any) : JConfigObject {
             }
         }
 
-    override val int: Int
+    override val asInt: Int
         get() {
             if (value is Int) {
                 return value
@@ -42,7 +42,7 @@ class JConfigObjectImpl(private val value: Any) : JConfigObject {
             }
         }
 
-    override val bigInt: BigInteger
+    override val asBigInt: BigInteger
         get() {
             if (value is BigInteger) {
                 return value
@@ -51,7 +51,7 @@ class JConfigObjectImpl(private val value: Any) : JConfigObject {
             }
         }
 
-    override val double: Double
+    override val asDouble: Double
         get() {
             if (value is Double) {
                 return value
@@ -60,7 +60,7 @@ class JConfigObjectImpl(private val value: Any) : JConfigObject {
             }
         }
 
-    override val boolean: Boolean
+    override val asBoolean: Boolean
         get() {
             if (value is Boolean) {
                 return value
@@ -69,7 +69,7 @@ class JConfigObjectImpl(private val value: Any) : JConfigObject {
             }
         }
 
-    override val byte: Byte
+    override val asByte: Byte
         get() {
             if (value is Byte) {
                 return value
@@ -78,7 +78,7 @@ class JConfigObjectImpl(private val value: Any) : JConfigObject {
             }
         }
 
-    override val short: Short
+    override val asShort: Short
         get() {
             if (value is Short) {
                 return value
@@ -87,7 +87,7 @@ class JConfigObjectImpl(private val value: Any) : JConfigObject {
             }
         }
 
-    override val long: Long
+    override val asLong: Long
         get() {
             if (value is Long) {
                 return value
@@ -96,7 +96,7 @@ class JConfigObjectImpl(private val value: Any) : JConfigObject {
             }
         }
 
-    override val float: Float
+    override val asFloat: Float
         get() {
             if (value is Float) {
                 return value
@@ -105,7 +105,7 @@ class JConfigObjectImpl(private val value: Any) : JConfigObject {
             }
         }
 
-    override val char: Char
+    override val asChar: Char
         get() {
             if (value is Char) {
                 return value
@@ -114,7 +114,7 @@ class JConfigObjectImpl(private val value: Any) : JConfigObject {
             }
         }
 
-    override val number: Number
+    override val asNumber: Number
         get() {
             if (value is Number) {
                 return value
@@ -123,7 +123,7 @@ class JConfigObjectImpl(private val value: Any) : JConfigObject {
             }
         }
 
-    override val decimal: BigDecimal
+    override val asDecimal: BigDecimal
         get() {
             if (value is BigDecimal) {
                 return value
@@ -132,7 +132,7 @@ class JConfigObjectImpl(private val value: Any) : JConfigObject {
             }
         }
 
-    override val array: Array<JConfigObject>
+    override val asArray: Array<JConfigObject>
         get() {
             if (value is Array<*>) {
                 return value
@@ -143,7 +143,7 @@ class JConfigObjectImpl(private val value: Any) : JConfigObject {
             }
         }
 
-    override val list: List<JConfigObject>
+    override val asList: List<JConfigObject>
         get() {
             if (value is List<*>) {
                 return value.map {
@@ -154,7 +154,7 @@ class JConfigObjectImpl(private val value: Any) : JConfigObject {
             }
         }
 
-    override val map: Map<String, JConfigObject>
+    override val asMap: Map<String, JConfigObject>
         get() {
             if (value is Map<*, *>) {
                 return value
@@ -169,7 +169,7 @@ class JConfigObjectImpl(private val value: Any) : JConfigObject {
             }
         }
 
-    override val any: Any
+    override val asAny: Any
         get() {
             return value
         }

diff --git a/src/main/kotlin/io/github/realyusufismail/jconfig/classes/JsonEntry.kt b/src/main/kotlin/io/github/realyusufismail/jconfig/classes/JsonEntry.kt
@@ -49,7 +49,7 @@ class JsonEntry
 ) {
 
     override fun toString(): String {
-        return "JsonEntry{key='$key', value=$value}"
+        return "{key: $key, value: $value}"
     }
 
     override fun equals(other: Any?): Boolean {