From 0e58e3ec088772ac321a55c229d0deb06b1187a5 Mon Sep 17 00:00:00 2001 From: Philip Hell Date: Sat, 12 Oct 2024 07:53:41 +0200 Subject: [PATCH] introduced CSDecide annotation, which becomes useful with generic type-erasure --- .../bbconfigmapper/ConfigMapper.java | 2 +- .../bbconfigmapper/sections/CSDecide.java | 34 +++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 src/main/java/me/blvckbytes/bbconfigmapper/sections/CSDecide.java diff --git a/src/main/java/me/blvckbytes/bbconfigmapper/ConfigMapper.java b/src/main/java/me/blvckbytes/bbconfigmapper/ConfigMapper.java index 21aba3e..12c42d6 100644 --- a/src/main/java/me/blvckbytes/bbconfigmapper/ConfigMapper.java +++ b/src/main/java/me/blvckbytes/bbconfigmapper/ConfigMapper.java @@ -105,7 +105,7 @@ private T mapSectionSub(@Nullable String root, @Nulla logger.log(Level.FINEST, () -> DebugLogSource.MAPPER + "Processing field=" + fName + " of type=" + finalFieldType); // Object fields trigger a call to runtime decide their type based on previous fields - if (fieldType == Object.class) { + if (fieldType == Object.class || f.isAnnotationPresent(CSDecide.class)) { Class decidedType = instance.runtimeDecide(fName); if (decidedType == null) diff --git a/src/main/java/me/blvckbytes/bbconfigmapper/sections/CSDecide.java b/src/main/java/me/blvckbytes/bbconfigmapper/sections/CSDecide.java new file mode 100644 index 0000000..f817e82 --- /dev/null +++ b/src/main/java/me/blvckbytes/bbconfigmapper/sections/CSDecide.java @@ -0,0 +1,34 @@ +/* + * MIT License + * + * Copyright (c) 2024 BlvckBytes + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package me.blvckbytes.bbconfigmapper.sections; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target({ ElementType.FIELD }) +@Retention(RetentionPolicy.RUNTIME) +public @interface CSDecide {}