Merge remote-tracking branch 'origin/main'

Author: burdoto

lombok.config

@@ -6,6 +6,8 @@ lombok.accessors.chain = true
 lombok.builder.classname = Builder
 lombok.fielddefaults.defaultprivate = true
 lombok.equalsandhashcode.callsuper = CALL
+lombok.toString.callSuper = CALL
 lombok.copyableannotations += com.fasterxml.jackson.annotation.JsonIgnore
 lombok.copyableannotations += org.intellij.lang.annotations.Language
-lombok.copyableannotations += org.comroid.annotations.Ignore
+lombok.copyableannotations += org.comroid.annotations.Ignore
+lombok.utilityClass.flagUsage = error

src/main/java/org/comroid/annotations/internal/Annotations.java

@@ -5,7 +5,6 @@
 import lombok.AllArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.Value;
-import lombok.experimental.UtilityClass;
 import lombok.extern.java.Log;
 import org.comroid.annotations.Alias;
 import org.comroid.annotations.Category;
@@ -54,10 +53,17 @@
 import static org.comroid.api.func.util.Streams.*;
 
 @Log
-@UtilityClass
 @ApiStatus.Internal
 @SuppressWarnings({ "DuplicatedCode", "BooleanMethodIsAlwaysInverted" })
 public class Annotations {
+    public static boolean readonly(AnnotatedElement element) {
+        return concat(of(Readonly.class),
+                SoftDepend.<Annotation>type("jakarta.persistence.Id").stream()).flatMap(type -> findAnnotations(type,
+                        element))
+                .findAny()
+                .isPresent();
+    }
+
     public static final Class<?>[] SystemFilters = new Class<?>[]{ Object.class, Class.class, Annotation.class };
 
     @ApiStatus.Experimental
@@ -66,10 +72,8 @@ public static Constraint.API expect(AnnotatedElement context) {
         return Constraint.fail();
     }
 
-    public static boolean readonly(AnnotatedElement element) {
-        return concat(of(Readonly.class), SoftDepend.<Annotation>type("javax.persistence.Id").stream()).flatMap(type -> findAnnotations(type, element))
-                .findAny()
-                .isPresent();
+    private Annotations() {
+        throw new UnsupportedOperationException();
     }
 
     public static Set<String> aliases(@NotNull AnnotatedElement of) {

src/main/java/org/comroid/api/Polyfill.java

@@ -1,6 +1,5 @@
 package org.comroid.api;
 
-import lombok.experimental.UtilityClass;
 import org.comroid.annotations.Doc;
 import org.comroid.api.data.RegExpUtil;
 import org.comroid.api.func.Provider;
@@ -47,8 +46,11 @@
 import static java.util.Objects.*;
 
 @Experimental
-@UtilityClass
 public final class Polyfill {
+    private Polyfill() {
+        throw new UnsupportedOperationException();
+    }
+
     private static final CompletableFuture<?>                                   infiniteFuture     = new CompletableFuture<>();
     private static final Pattern                                                DURATION_PATTERN   = Pattern.compile(
             "((?<amount>\\d+)(?<unit>[yMwdhms][oi]?n?))");

src/main/java/org/comroid/api/comp/Base64.java

@@ -1,8 +1,5 @@
 package org.comroid.api.comp;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 
 import static java.util.Base64.*;

src/main/java/org/comroid/api/func/BuilderDelegate.java

@@ -0,0 +1,7 @@
+package org.comroid.api.func;
+
+public interface BuilderDelegate<T, B> {
+    B builder();
+
+    T build(B builder);
+}

src/main/java/org/comroid/api/func/QueryOps.java

@@ -0,0 +1,45 @@
+package org.comroid.api.func;
+
+import org.comroid.api.func.util.GetOrCreate;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.stream.Stream;
+
+public interface QueryOps<Key, It, Builder> {
+    Stream<It> all();
+
+    default Optional<It> any() {
+        return all().findAny();
+    }
+
+    Optional<It> get(Key key);
+
+    GetOrCreate<It, Builder> getOrCreate(@Nullable Key key);
+
+    default GetOrCreate<It, Builder> create() {
+        return getOrCreate(null);
+    }
+
+    default <NewKey> QueryOps<NewKey, It, Builder> by(final Function<It, NewKey> keyFunction) {
+        final var parent = this;
+        return new QueryOps<>() {
+            @Override
+            public Stream<It> all() {
+                return parent.all();
+            }
+
+            @Override
+            public Optional<It> get(NewKey key) {
+                return all().filter(it -> Objects.equals(keyFunction.apply(it), key)).findFirst();
+            }
+
+            @Override
+            public GetOrCreate<It, Builder> getOrCreate(NewKey key) {
+                return parent.getOrCreate(null).setGet(() -> get(key).orElse(null));
+            }
+        };
+    }
+}

src/main/java/org/comroid/api/func/util/Bitmask.java

@@ -2,7 +2,6 @@
 
 import lombok.Value;
 import lombok.experimental.NonFinal;
-import lombok.experimental.UtilityClass;
 import org.comroid.annotations.Convert;
 import org.comroid.annotations.Default;
 import org.comroid.annotations.Instance;
@@ -30,8 +29,11 @@
 import java.util.stream.LongStream;
 import java.util.stream.Stream;
 
-@UtilityClass
 public final class Bitmask {
+    private Bitmask() {
+        throw new UnsupportedOperationException();
+    }
+
     private static final Map<Class<?>, AtomicLong> LAST_FLAG = new ConcurrentHashMap<>();
     public static final long EMPTY = 0x0;
 

src/main/java/org/comroid/api/func/util/Debug.java

@@ -1,6 +1,5 @@
 package org.comroid.api.func.util;
 
-import lombok.experimental.UtilityClass;
 import org.comroid.api.data.seri.DataNode;
 import org.comroid.api.func.comp.StringBasedComparator;
 import org.comroid.api.info.Log;
@@ -21,9 +20,12 @@
 import static java.util.stream.IntStream.*;
 import static org.comroid.api.java.StackTraceUtils.*;
 
-@UtilityClass
 @lombok.extern.java.Log
 public final class Debug {
+    private Debug() {
+        throw new UnsupportedOperationException();
+    }
+
     public static String[]          DEBUG_ENV_KEYS  = new String[]{ "DEBUG", "DEBUG_ENV", "IS_DEBUG", "TRACE", "TRACE_ENV", "IS_TRACE" };
     public static BooleanSupplier[] IS_DEBUG_CHECKS = new BooleanSupplier[]{ Debug::isDebugEnv };
     public static Logger            logger          = Log.get(Debug.class);

src/main/java/org/comroid/api/func/util/Optionals.java

@@ -1,15 +1,25 @@
 package org.comroid.api.func.util;
 
-import lombok.experimental.UtilityClass;
-
 import java.util.Optional;
+import java.util.function.BiFunction;
 import java.util.function.Function;
 
 import static java.util.Optional.*;
 
-@UtilityClass
+@SuppressWarnings("OptionalUsedAsFieldOrParameterType")
 public class Optionals {
     public static <I, O> Function<I, Optional<O>> cast(Class<? extends O> type) {
         return x -> type.isInstance(x) ? of(type.cast(x)) : empty();
     }
+
+    public static <T, A, R> Function<T, Optional<R>> combine(
+            Optional<A> other,
+            BiFunction<T, A, Optional<R>> combiner
+    ) {
+        return t -> other.flatMap(a -> combiner.apply(t, a));
+    }
+
+    private Optionals() {
+        throw new AbstractMethodError("no");
+    }
 }