From b20e1fede9e265529dcad5a31a56cc1efe58ec10 Mon Sep 17 00:00:00 2001
From: DBotThePony <dbotthepony@yandex.ru>
Date: Sat, 3 Feb 2024 19:15:36 +0700
Subject: [PATCH] Fix wrong package

---
 gradle.properties                             |  2 +-
 .../kommons/gson/AABBTypeAdapter.kt           |  2 +-
 .../kommons/gson/AABBiTypeAdapter.kt          |  2 +-
 .../kommons/gson/JsonArrayCollector.kt        | 31 +++++++++++++++++++
 .../ru/dbotthepony/kommons/util/AABB.kt       |  3 +-
 .../ru/dbotthepony/kommons/util/AABBi.kt      |  3 +-
 6 files changed, 36 insertions(+), 7 deletions(-)
 create mode 100644 gson/src/main/kotlin/ru/dbotthepony/kommons/gson/JsonArrayCollector.kt

diff --git a/gradle.properties b/gradle.properties
index a494137..ac4b02a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ kotlin.code.style=official
 specifyKotlinAsDependency=false
 
 projectGroup=ru.dbotthepony.kommons
-projectVersion=1.4.0
+projectVersion=1.5.0
 
 guavaDepVersion=33.0.0
 gsonDepVersion=2.8.9
diff --git a/gson-linear-algebra/src/main/kotlin/ru/dbotthepony/kommons/gson/AABBTypeAdapter.kt b/gson-linear-algebra/src/main/kotlin/ru/dbotthepony/kommons/gson/AABBTypeAdapter.kt
index 0e0be80..2df8dcf 100644
--- a/gson-linear-algebra/src/main/kotlin/ru/dbotthepony/kommons/gson/AABBTypeAdapter.kt
+++ b/gson-linear-algebra/src/main/kotlin/ru/dbotthepony/kommons/gson/AABBTypeAdapter.kt
@@ -4,7 +4,7 @@ import com.google.gson.TypeAdapter
 import com.google.gson.stream.JsonReader
 import com.google.gson.stream.JsonWriter
 import ru.dbotthepony.kommons.vector.Vector2d
-import ru.dbotthepony.kvector.util2d.AABB
+import ru.dbotthepony.kommons.util.AABB
 
 object AABBTypeAdapter : TypeAdapter<AABB>() {
 	override fun write(out: JsonWriter, value: AABB) {
diff --git a/gson-linear-algebra/src/main/kotlin/ru/dbotthepony/kommons/gson/AABBiTypeAdapter.kt b/gson-linear-algebra/src/main/kotlin/ru/dbotthepony/kommons/gson/AABBiTypeAdapter.kt
index 5bd931a..2ba3fe9 100644
--- a/gson-linear-algebra/src/main/kotlin/ru/dbotthepony/kommons/gson/AABBiTypeAdapter.kt
+++ b/gson-linear-algebra/src/main/kotlin/ru/dbotthepony/kommons/gson/AABBiTypeAdapter.kt
@@ -4,7 +4,7 @@ import com.google.gson.TypeAdapter
 import com.google.gson.stream.JsonReader
 import com.google.gson.stream.JsonWriter
 import ru.dbotthepony.kommons.vector.Vector2i
-import ru.dbotthepony.kvector.util2d.AABBi
+import ru.dbotthepony.kommons.util.AABBi
 
 object AABBiTypeAdapter : TypeAdapter<AABBi>() {
 	override fun write(out: JsonWriter, value: AABBi) {
diff --git a/gson/src/main/kotlin/ru/dbotthepony/kommons/gson/JsonArrayCollector.kt b/gson/src/main/kotlin/ru/dbotthepony/kommons/gson/JsonArrayCollector.kt
new file mode 100644
index 0000000..41663a4
--- /dev/null
+++ b/gson/src/main/kotlin/ru/dbotthepony/kommons/gson/JsonArrayCollector.kt
@@ -0,0 +1,31 @@
+package ru.dbotthepony.kommons.gson
+
+import com.google.gson.JsonArray
+import com.google.gson.JsonElement
+import java.util.function.BiConsumer
+import java.util.function.BinaryOperator
+import java.util.function.Function
+import java.util.function.Supplier
+import java.util.stream.Collector
+
+object JsonArrayCollector : Collector<JsonElement, JsonArray, JsonArray> {
+	override fun supplier(): Supplier<JsonArray> {
+		return Supplier { JsonArray() }
+	}
+
+	override fun accumulator(): BiConsumer<JsonArray, JsonElement> {
+		return BiConsumer { t, u -> t.add(u) }
+	}
+
+	override fun combiner(): BinaryOperator<JsonArray> {
+		return BinaryOperator { t, u -> t.addAll(u); t }
+	}
+
+	override fun finisher(): Function<JsonArray, JsonArray> {
+		return Function.identity()
+	}
+
+	override fun characteristics(): Set<Collector.Characteristics> {
+		return setOf(Collector.Characteristics.IDENTITY_FINISH)
+	}
+}
diff --git a/linear-algebra/src/main/kotlin/ru/dbotthepony/kommons/util/AABB.kt b/linear-algebra/src/main/kotlin/ru/dbotthepony/kommons/util/AABB.kt
index fd171ac..f5fb92d 100644
--- a/linear-algebra/src/main/kotlin/ru/dbotthepony/kommons/util/AABB.kt
+++ b/linear-algebra/src/main/kotlin/ru/dbotthepony/kommons/util/AABB.kt
@@ -1,10 +1,9 @@
 
 @file:Suppress("unused", "LiftReturnOrAssignment", "MemberVisibilityCanBePrivate")
 
-package ru.dbotthepony.kvector.util2d
+package ru.dbotthepony.kommons.util
 
 import ru.dbotthepony.kommons.core.IStruct2d
-import ru.dbotthepony.kommons.core.IStruct2i
 import ru.dbotthepony.kommons.math.intersectRectangles
 import ru.dbotthepony.kommons.math.rectangleContainsRectangle
 import ru.dbotthepony.kommons.vector.Vector2d
diff --git a/linear-algebra/src/main/kotlin/ru/dbotthepony/kommons/util/AABBi.kt b/linear-algebra/src/main/kotlin/ru/dbotthepony/kommons/util/AABBi.kt
index 19da290..5987ff4 100644
--- a/linear-algebra/src/main/kotlin/ru/dbotthepony/kommons/util/AABBi.kt
+++ b/linear-algebra/src/main/kotlin/ru/dbotthepony/kommons/util/AABBi.kt
@@ -1,9 +1,8 @@
-package ru.dbotthepony.kvector.util2d
+package ru.dbotthepony.kommons.util
 
 import ru.dbotthepony.kommons.core.IStruct2i
 import ru.dbotthepony.kommons.math.intersectRectangles
 import ru.dbotthepony.kommons.math.rectangleContainsRectangle
-import ru.dbotthepony.kommons.vector.Vector2d
 import ru.dbotthepony.kommons.vector.Vector2i
 
 data class AABBi(val mins: Vector2i, val maxs: Vector2i) {