Skip to content

Commit 9218a31

Browse files
committed
Update to new types format
1 parent 7c1d7e1 commit 9218a31

File tree

9 files changed

+18
-18
lines changed

9 files changed

+18
-18
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ How to implement and relocate Settings library in your project.
164164

165165
```groovy
166166
plugins {
167-
id 'com.gradleup.shadow' version '8.3.5'
167+
id 'com.gradleup.shadow' version '8.3.9'
168168
}
169169
170170
repositories {
@@ -198,7 +198,7 @@ shadowJar {
198198

199199
```kotlin
200200
plugins {
201-
id("com.gradleup.shadow") version "8.3.5"
201+
id("com.gradleup.shadow") version "8.3.9"
202202
}
203203

204204
repositories {

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ subprojects {
6262
}
6363

6464
dependencies {
65-
api 'com.saicone:types:1.3.0'
65+
api 'com.saicone:types:1.4.0'
6666

6767
compileOnly 'com.ezylang:EvalEx:3.5.0'
6868
compileOnly 'com.github.ben-manes.caffeine:caffeine:3.2.2'

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
group=com.saicone.settings
2-
version=1.0.2
2+
version=1.0.3-SNAPSHOT

settings-toml/src/main/java/com/saicone/settings/source/TomlSettingsSource.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import com.saicone.settings.node.ListNode;
99
import com.saicone.settings.node.MapNode;
1010
import com.saicone.settings.node.NodeKey;
11-
import com.saicone.types.ValueType;
11+
import com.saicone.types.AnyObject;
1212
import org.jetbrains.annotations.Contract;
1313
import org.jetbrains.annotations.NotNull;
1414
import org.jetbrains.annotations.Nullable;
@@ -153,7 +153,7 @@ public Object writeValue(@Nullable Object object) {
153153
}
154154
return list;
155155
} else {
156-
return object instanceof ValueType ? ((ValueType<?>) object).getValue() : object;
156+
return object instanceof AnyObject ? ((AnyObject<?>) object).getValue() : object;
157157
}
158158
}
159159

src/main/java/com/saicone/settings/SettingsNode.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import com.saicone.settings.node.NodeKey;
66
import com.saicone.settings.node.ObjectNode;
77
import com.saicone.settings.util.Strings;
8-
import com.saicone.types.ValueType;
8+
import com.saicone.types.AnyObject;
99
import org.jetbrains.annotations.NotNull;
1010
import org.jetbrains.annotations.Nullable;
1111

@@ -22,7 +22,7 @@
2222
*
2323
* @author Rubenicos
2424
*/
25-
public interface SettingsNode extends ValueType<Object> {
25+
public interface SettingsNode extends AnyObject<Object> {
2626

2727
/**
2828
* Check if the current node is not a map or list.

src/main/java/com/saicone/settings/node/MapNode.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import com.saicone.settings.SettingsNode;
44
import com.saicone.settings.util.Strings;
5-
import com.saicone.types.IterableType;
6-
import com.saicone.types.ValueType;
5+
import com.saicone.types.AnyIterable;
6+
import com.saicone.types.AnyObject;
77
import org.intellij.lang.annotations.Language;
88
import org.jetbrains.annotations.NotNull;
99
import org.jetbrains.annotations.Nullable;
@@ -606,11 +606,11 @@ protected String asJson(@Nullable Object object) {
606606
return "null";
607607
}
608608

609-
if (object instanceof ValueType) {
610-
return asJson(((ValueType<?>) object).getValue());
609+
if (object instanceof AnyObject) {
610+
return asJson(((AnyObject<?>) object).getValue());
611611
} else if (object instanceof Iterable || object.getClass().isArray()) {
612612
final StringJoiner joiner = new StringJoiner(", ", "[", "]");
613-
for (Object o : object instanceof Iterable ? (Iterable<?>) object : IterableType.of(object)) {
613+
for (Object o : object instanceof Iterable ? (Iterable<?>) object : AnyIterable.of(object)) {
614614
joiner.add(asJson(o));
615615
}
616616
return joiner.toString();

src/main/java/com/saicone/settings/node/NodeValue.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ public SettingsNode setSideComment(@Nullable List<String> sideComment) {
172172
if (parser.equals(this.typeParser) && collection.getClass().isInstance(this.parsedValue)) {
173173
return (C) this.parsedValue;
174174
}
175-
final C parsedValue = parser.collection(collection, getValue());
175+
final C parsedValue = parser.collection(collection.getClass(), capacity -> collection).parse(getValue());
176176
this.typeParser = parser;
177177
this.parsedValue = parsedValue;
178178
return parsedValue;

src/main/java/com/saicone/settings/node/ObjectNode.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.saicone.settings.node;
22

33
import com.saicone.settings.SettingsNode;
4-
import com.saicone.types.IterableType;
4+
import com.saicone.types.AnyIterable;
55
import org.jetbrains.annotations.NotNull;
66
import org.jetbrains.annotations.Nullable;
77

@@ -13,7 +13,7 @@
1313
*
1414
* @author Rubenicos
1515
*/
16-
public class ObjectNode extends NodeKey<Object> implements IterableType<Object> {
16+
public class ObjectNode extends NodeKey<Object> implements AnyIterable<Object> {
1717

1818
/**
1919
* Constructs an empty object value.

src/main/java/com/saicone/settings/type/ListValueType.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.saicone.types.TypeParser;
44
import com.saicone.types.Types;
5-
import com.saicone.types.ValueType;
5+
import com.saicone.types.AnyObject;
66
import org.jetbrains.annotations.NotNull;
77

88
import java.util.Collection;
@@ -17,7 +17,7 @@
1717
* @param <T> the value type itself.
1818
*/
1919
@FunctionalInterface
20-
public interface ListValueType<T> extends ValueType<T> {
20+
public interface ListValueType<T> extends AnyObject<T> {
2121

2222
/**
2323
* Create a wrapped value type from given object type.

0 commit comments

Comments
 (0)