From 4e1c2191f469148638695aee975d1283c60a07c9 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Mon, 3 Jun 2024 17:58:12 +0200 Subject: [PATCH] [jOOQ/jOOQ#10113] Re-generate code --- .../main/java/org/jooq/impl/JSONArray.java | 71 ++++++------------- .../main/java/org/jooq/impl/JSONObject.java | 5 +- jOOQ/src/main/java/org/jooq/impl/Names.java | 2 +- 3 files changed, 26 insertions(+), 52 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONArray.java b/jOOQ/src/main/java/org/jooq/impl/JSONArray.java index 4243b144bd..2cabececd7 100644 --- a/jOOQ/src/main/java/org/jooq/impl/JSONArray.java +++ b/jOOQ/src/main/java/org/jooq/impl/JSONArray.java @@ -37,57 +37,32 @@ */ package org.jooq.impl; -// ... -import static org.jooq.SQLDialect.H2; -import static org.jooq.impl.DSL.array; -import static org.jooq.impl.DSL.function; -import static org.jooq.impl.DSL.inline; -import static org.jooq.impl.DSL.jsonArray; -import static org.jooq.impl.DSL.jsonArrayAgg; -import static org.jooq.impl.DSL.jsonTable; -import static org.jooq.impl.DSL.jsonbArrayAgg; -import static org.jooq.impl.DSL.rand; -import static org.jooq.impl.DSL.row; -import static org.jooq.impl.DSL.select; -import static org.jooq.impl.DSL.values; -import static org.jooq.impl.JSONEntryImpl.jsonCastMapper; -import static org.jooq.impl.Names.N_ARRAY_CONSTRUCT; -import static org.jooq.impl.Names.N_ARRAY_CONSTRUCT_COMPACT; -import static org.jooq.impl.Names.N_JSONB_BUILD_ARRAY; -import static org.jooq.impl.Names.N_JSON_ARRAY; -import static org.jooq.impl.Names.N_JSON_BUILD_ARRAY; -import static org.jooq.impl.Names.N_JSON_EXTRACT; -import static org.jooq.impl.Names.N_JSON_MODIFY; -import static org.jooq.impl.Names.N_JSON_QUERY; -import static org.jooq.impl.Names.N_JSON_TREE; -import static org.jooq.impl.Names.N_KEY; -import static org.jooq.impl.Names.N_T; -import static org.jooq.impl.Names.N_TUPLE; -import static org.jooq.impl.Names.N_VALUE; -import static org.jooq.impl.Names.N_toJSONString; -import static org.jooq.impl.SQLDataType.JSON; -import static org.jooq.impl.SQLDataType.JSONB; -import static org.jooq.impl.SQLDataType.OTHER; -import static org.jooq.impl.SQLDataType.VARCHAR; -import static org.jooq.impl.Tools.anyMatch; -import static org.jooq.impl.Tools.map; +import static org.jooq.impl.DSL.*; +import static org.jooq.impl.Internal.*; +import static org.jooq.impl.Keywords.*; +import static org.jooq.impl.Names.*; +import static org.jooq.impl.SQLDataType.*; +import static org.jooq.impl.Tools.*; +import static org.jooq.impl.Tools.BooleanDataKey.*; +import static org.jooq.impl.Tools.ExtendedDataKey.*; +import static org.jooq.impl.Tools.SimpleDataKey.*; +import static org.jooq.SQLDialect.*; -import java.util.Collection; - -import org.jooq.Context; -import org.jooq.DataType; -import org.jooq.Field; -import org.jooq.Function4; -import org.jooq.JSON; -import org.jooq.JSONArrayNullStep; -import org.jooq.JSONArrayReturningStep; -import org.jooq.Param; -// ... -import org.jooq.Row1; -import org.jooq.Table; +import org.jooq.*; +import org.jooq.Function1; +import org.jooq.Record; +import org.jooq.conf.ParamType; import org.jooq.impl.QOM.JSONOnNull; import org.jooq.tools.StringUtils; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; + /** @@ -172,7 +147,7 @@ implements @Override public void accept(Context ctx) { - QueryPartCollectionView> mapped = QueryPartCollectionView.wrap((Collection>) fields).map(jsonCastMapper(ctx)); + QueryPartCollectionView> mapped = QueryPartCollectionView.wrap((Collection>) fields).map(JSONEntryImpl.jsonCastMapper(ctx)); switch (ctx.family()) { diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONObject.java b/jOOQ/src/main/java/org/jooq/impl/JSONObject.java index e300b411a2..4f9b4dddc4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/JSONObject.java +++ b/jOOQ/src/main/java/org/jooq/impl/JSONObject.java @@ -39,7 +39,6 @@ package org.jooq.impl; import static org.jooq.impl.DSL.*; import static org.jooq.impl.Internal.*; -import static org.jooq.impl.JSONEntryImpl.jsonMerge; import static org.jooq.impl.Keywords.*; import static org.jooq.impl.Names.*; import static org.jooq.impl.SQLDataType.*; @@ -212,7 +211,7 @@ implements // Workaround for https://jira.mariadb.org/browse/MDEV-13701 if (entries.size() > 1) { - ctx.visit(jsonMerge(ctx, "{}", + ctx.visit(JSONEntryImpl.jsonMerge(ctx, "{}", map(entries, onNull == JSONOnNull.ABSENT_ON_NULL ? e -> DSL.nvl2(e.value(), jsonObject(e), jsonObject()) : e -> jsonObject(e) @@ -222,7 +221,7 @@ implements } else if (!entries.isEmpty() && isJSONArray((first = entries.iterator().next()).value())) { ctx.visit(jsonObject( - key(first.key()).value(jsonMerge(ctx, "[]", first.value())) + key(first.key()).value(JSONEntryImpl.jsonMerge(ctx, "[]", first.value())) )); } else diff --git a/jOOQ/src/main/java/org/jooq/impl/Names.java b/jOOQ/src/main/java/org/jooq/impl/Names.java index 54623bf817..dda0bc2dc2 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Names.java +++ b/jOOQ/src/main/java/org/jooq/impl/Names.java @@ -184,6 +184,7 @@ final class Names { static final Name N_JSON_UNQUOTE = systemName("json_unquote"); static final Name N_JSON_VALUE = systemName("json_value"); static final Name N_jsonMergePatch = systemName("jsonMergePatch"); + static final Name N_KEY = systemName("key"); static final Name N_LAG = systemName("lag"); static final Name N_lagInFrame = systemName("lagInFrame"); static final Name N_LAST_VALUE = systemName("last_value"); @@ -508,7 +509,6 @@ final class Names { static final Name N_JSON_SET = systemName("json_set"); static final Name N_JSON_TRANSFORM = systemName("json_transform"); static final Name N_JSON_VALID = systemName("json_valid"); - static final Name N_KEY = systemName("key"); static final Name N_LCASE = systemName("lcase"); static final Name N_LEFT = systemName("left"); static final Name N_LEN = systemName("len");