diff --git a/tweed5-annotation-inheritance/src/main/java/de/siphalor/tweed5/annotationinheritance/api/AnnotationInheritanceAwareAnnotatedElement.java b/tweed5-annotation-inheritance/src/main/java/de/siphalor/tweed5/annotationinheritance/api/AnnotationInheritanceAwareAnnotatedElement.java index a015b97..86ff447 100644 --- a/tweed5-annotation-inheritance/src/main/java/de/siphalor/tweed5/annotationinheritance/api/AnnotationInheritanceAwareAnnotatedElement.java +++ b/tweed5-annotation-inheritance/src/main/java/de/siphalor/tweed5/annotationinheritance/api/AnnotationInheritanceAwareAnnotatedElement.java @@ -4,7 +4,6 @@ import de.siphalor.tweed5.annotationinheritance.impl.AnnotationInheritanceResolv import de.siphalor.tweed5.typeutils.api.annotations.AnnotationRepeatType; import de.siphalor.tweed5.utils.api.collection.ClassToInstanceMap; import lombok.RequiredArgsConstructor; -import lombok.var; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jspecify.annotations.NonNull; @@ -62,7 +61,8 @@ public class AnnotationInheritanceAwareAnnotatedElement implements AnnotatedElem AnnotationRepeatType repeatType = AnnotationRepeatType.getType(annotationClass); if (repeatType instanceof AnnotationRepeatType.Repeatable) { - var containerRepeatType = ((AnnotationRepeatType.Repeatable) repeatType).containerRepeatType(); + AnnotationRepeatType.RepeatableContainer containerRepeatType = + ((AnnotationRepeatType.Repeatable) repeatType).containerRepeatType(); Annotation containerAnnotation = getOrResolveAnnotations().get(containerRepeatType.annotationClass()); if (containerAnnotation != null) { return containerRepeatType.elements(containerAnnotation); diff --git a/tweed5-attributes-extension/src/main/java/de/siphalor/tweed5/attributesextension/impl/AttributesExtensionImpl.java b/tweed5-attributes-extension/src/main/java/de/siphalor/tweed5/attributesextension/impl/AttributesExtensionImpl.java index 497a8d7..823e331 100644 --- a/tweed5-attributes-extension/src/main/java/de/siphalor/tweed5/attributesextension/impl/AttributesExtensionImpl.java +++ b/tweed5-attributes-extension/src/main/java/de/siphalor/tweed5/attributesextension/impl/AttributesExtensionImpl.java @@ -3,7 +3,6 @@ package de.siphalor.tweed5.attributesextension.impl; import de.siphalor.tweed5.attributesextension.api.AttributesExtension; import de.siphalor.tweed5.attributesextension.api.AttributesRelatedExtension; import de.siphalor.tweed5.core.api.container.ConfigContainer; -import de.siphalor.tweed5.core.api.container.ConfigContainerSetupPhase; import de.siphalor.tweed5.core.api.entry.ConfigEntry; import de.siphalor.tweed5.core.api.entry.ConfigEntryVisitor; import de.siphalor.tweed5.core.api.extension.TweedExtension; @@ -11,7 +10,6 @@ import de.siphalor.tweed5.core.api.extension.TweedExtensionSetupContext; import de.siphalor.tweed5.patchwork.api.PatchworkPartAccess; import de.siphalor.tweed5.utils.api.collection.ImmutableArrayBackedMap; import lombok.Data; -import lombok.var; import org.jspecify.annotations.Nullable; import java.util.*; @@ -30,7 +28,7 @@ public class AttributesExtensionImpl implements AttributesExtension { public void setAttribute(ConfigEntry entry, String key, List values) { requireEditable(); - var attributes = getOrCreateEditableAttributes(entry); + Map> attributes = getOrCreateEditableAttributes(entry); attributes.compute(key, (k, existingValues) -> { if (existingValues == null) { @@ -46,7 +44,7 @@ public class AttributesExtensionImpl implements AttributesExtension { public void setAttributeDefault(ConfigEntry entry, String key, List values) { requireEditable(); - var attributeDefaults = getOrCreateEditableAttributeDefaults(entry); + Map> attributeDefaults = getOrCreateEditableAttributeDefaults(entry); attributeDefaults.compute(key, (k, existingValues) -> { if (existingValues == null) { @@ -66,7 +64,7 @@ public class AttributesExtensionImpl implements AttributesExtension { private Map> getOrCreateEditableAttributes(ConfigEntry entry) { CustomEntryData data = getOrCreateCustomEntryData(entry); - var attributes = data.attributes(); + Map> attributes = data.attributes(); if (attributes == null) { attributes = new HashMap<>(); data.attributes(attributes); @@ -76,7 +74,7 @@ public class AttributesExtensionImpl implements AttributesExtension { private Map> getOrCreateEditableAttributeDefaults(ConfigEntry entry) { CustomEntryData data = getOrCreateCustomEntryData(entry); - var attributeDefaults = data.attributeDefaults(); + Map> attributeDefaults = data.attributeDefaults(); if (attributeDefaults == null) { attributeDefaults = new HashMap<>(); data.attributeDefaults(attributeDefaults); @@ -113,13 +111,13 @@ public class AttributesExtensionImpl implements AttributesExtension { } private void enterEntry(ConfigEntry entry) { - var data = entry.extensionsData().get(dataAccess); - var currentDefaults = defaults.getFirst(); + CustomEntryData data = entry.extensionsData().get(dataAccess); + Map> currentDefaults = defaults.getFirst(); if (data == null) { defaults.push(currentDefaults); return; } - var entryDefaults = data.attributeDefaults(); + Map> entryDefaults = data.attributeDefaults(); data.attributeDefaults(null); if (entryDefaults == null || entryDefaults.isEmpty()) { defaults.push(currentDefaults); @@ -143,8 +141,8 @@ public class AttributesExtensionImpl implements AttributesExtension { @Override public void visitEntry(ConfigEntry entry) { - var data = getOrCreateCustomEntryData(entry); - var currentDefaults = defaults.getFirst(); + CustomEntryData data = getOrCreateCustomEntryData(entry); + Map> currentDefaults = defaults.getFirst(); if (data.attributes() == null || data.attributes().isEmpty()) { data.attributes(currentDefaults); } else { diff --git a/tweed5-attributes-extension/src/main/java/de/siphalor/tweed5/attributesextension/impl/serde/filter/AttributesReadWriteFilterExtensionImpl.java b/tweed5-attributes-extension/src/main/java/de/siphalor/tweed5/attributesextension/impl/serde/filter/AttributesReadWriteFilterExtensionImpl.java index 2309d48..7a48ebf 100644 --- a/tweed5-attributes-extension/src/main/java/de/siphalor/tweed5/attributesextension/impl/serde/filter/AttributesReadWriteFilterExtensionImpl.java +++ b/tweed5-attributes-extension/src/main/java/de/siphalor/tweed5/attributesextension/impl/serde/filter/AttributesReadWriteFilterExtensionImpl.java @@ -27,7 +27,6 @@ import de.siphalor.tweed5.utils.api.UniqueSymbol; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; -import lombok.var; import org.jspecify.annotations.NonNull; import org.jspecify.annotations.Nullable; @@ -133,7 +132,7 @@ public class AttributesReadWriteFilterExtensionImpl public void addFilter(Patchwork contextExtensionsData, String key, String value) { requireInitialized(); - var contextCustomData = getOrCreateReadWriteContextCustomData(contextExtensionsData); + ReadWriteContextCustomData contextCustomData = getOrCreateReadWriteContextCustomData(contextExtensionsData); addFilterToRWContextData(key, value, contextCustomData); } diff --git a/tweed5-default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/pather/impl/PatherExtensionImpl.java b/tweed5-default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/pather/impl/PatherExtensionImpl.java index e8d3a15..e64f379 100644 --- a/tweed5-default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/pather/impl/PatherExtensionImpl.java +++ b/tweed5-default-extensions/src/main/java/de/siphalor/tweed5/defaultextensions/pather/impl/PatherExtensionImpl.java @@ -14,7 +14,6 @@ import de.siphalor.tweed5.defaultextensions.pather.api.PathTrackingDataVisitor; import de.siphalor.tweed5.defaultextensions.pather.api.PatherExtension; import de.siphalor.tweed5.patchwork.api.PatchworkPartAccess; import lombok.val; -import lombok.var; import org.jspecify.annotations.NonNull; import org.jspecify.annotations.Nullable; @@ -76,7 +75,7 @@ public class PatherExtensionImpl implements PatherExtension, ReadWriteRelatedExt try { return castedInner.read(new PathTrackingDataReader(reader, pathTracking), entry, context); } catch (TweedEntryReadException e) { - var exceptionPathTracking = e.context().extensionsData().get(rwContextPathTrackingAccess); + val exceptionPathTracking = e.context().extensionsData().get(rwContextPathTrackingAccess); if (exceptionPathTracking != null) { throw new TweedEntryReadException( "Exception while reading entry at " @@ -119,7 +118,7 @@ public class PatherExtensionImpl implements PatherExtension, ReadWriteRelatedExt try { castedInner.write(new PathTrackingDataVisitor(writer, pathTracking), value, entry, context); } catch (TweedEntryWriteException e) { - var exceptionPathTracking = e.context().extensionsData().get(rwContextPathTrackingAccess); + val exceptionPathTracking = e.context().extensionsData().get(rwContextPathTrackingAccess); if (exceptionPathTracking != null) { throw new TweedEntryWriteException( "Exception while writing entry at " diff --git a/tweed5-serde-extension/src/main/java/de/siphalor/tweed5/data/extension/impl/TweedEntryReaderWriterImpls.java b/tweed5-serde-extension/src/main/java/de/siphalor/tweed5/data/extension/impl/TweedEntryReaderWriterImpls.java index 5505d3b..3ef5177 100644 --- a/tweed5-serde-extension/src/main/java/de/siphalor/tweed5/data/extension/impl/TweedEntryReaderWriterImpls.java +++ b/tweed5-serde-extension/src/main/java/de/siphalor/tweed5/data/extension/impl/TweedEntryReaderWriterImpls.java @@ -9,7 +9,7 @@ import de.siphalor.tweed5.dataapi.api.*; import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.RequiredArgsConstructor; -import lombok.var; +import lombok.val; import org.jetbrains.annotations.Contract; import org.jspecify.annotations.Nullable; @@ -181,7 +181,7 @@ public class TweedEntryReaderWriterImpls { NOOP_READER_WRITER.read(reader, null, context); continue; } - var subEntryReaderChain = context.readWriteExtension().getReaderChain(subEntry); + val subEntryReaderChain = context.readWriteExtension().getReaderChain(subEntry); Object subEntryValue = subEntryReaderChain.read(reader, subEntry, context); entry.set(compoundValue, key, subEntryValue); } else { diff --git a/tweed5-weaver-pojo-attributes-extension/src/main/java/de/siphalor/tweed5/weaver/pojoext/attributes/api/AttributesPojoWeavingProcessor.java b/tweed5-weaver-pojo-attributes-extension/src/main/java/de/siphalor/tweed5/weaver/pojoext/attributes/api/AttributesPojoWeavingProcessor.java index ae36025..ae1e4e5 100644 --- a/tweed5-weaver-pojo-attributes-extension/src/main/java/de/siphalor/tweed5/weaver/pojoext/attributes/api/AttributesPojoWeavingProcessor.java +++ b/tweed5-weaver-pojo-attributes-extension/src/main/java/de/siphalor/tweed5/weaver/pojoext/attributes/api/AttributesPojoWeavingProcessor.java @@ -6,7 +6,7 @@ import de.siphalor.tweed5.core.api.entry.ConfigEntry; import de.siphalor.tweed5.typeutils.api.type.ActualType; import de.siphalor.tweed5.weaver.pojo.api.weaving.TweedPojoWeavingExtension; import de.siphalor.tweed5.weaver.pojo.api.weaving.WeavingContext; -import lombok.var; +import lombok.val; import org.jetbrains.annotations.ApiStatus; import java.util.*; @@ -31,12 +31,12 @@ public class AttributesPojoWeavingProcessor implements TweedPojoWeavingExtension @Override public void afterWeaveEntry(ActualType valueType, ConfigEntry configEntry, WeavingContext context) { - var attributeAnnotations = context.annotations().getAnnotationsByType(Attribute.class); - var attributes = collectAttributesFromAnnotations(attributeAnnotations, Attribute::key, Attribute::values); + val attributeAnnotations = context.annotations().getAnnotationsByType(Attribute.class); + val attributes = collectAttributesFromAnnotations(attributeAnnotations, Attribute::key, Attribute::values); attributes.forEach((key, values) -> attributesExtension.setAttribute(configEntry, key, values)); - var attributeDefaultAnnotations = context.annotations().getAnnotationsByType(AttributeDefault.class); - var attributeDefaults = collectAttributesFromAnnotations( + val attributeDefaultAnnotations = context.annotations().getAnnotationsByType(AttributeDefault.class); + val attributeDefaults = collectAttributesFromAnnotations( attributeDefaultAnnotations, AttributeDefault::key, AttributeDefault::defaultValue diff --git a/tweed5-weaver-pojo-serde-extension/src/main/java/de/siphalor/tweed5/weaver/pojoext/serde/api/nullable/AutoNullableReadWritePojoWeavingProcessor.java b/tweed5-weaver-pojo-serde-extension/src/main/java/de/siphalor/tweed5/weaver/pojoext/serde/api/nullable/AutoNullableReadWritePojoWeavingProcessor.java index 08419f5..1676485 100644 --- a/tweed5-weaver-pojo-serde-extension/src/main/java/de/siphalor/tweed5/weaver/pojoext/serde/api/nullable/AutoNullableReadWritePojoWeavingProcessor.java +++ b/tweed5-weaver-pojo-serde-extension/src/main/java/de/siphalor/tweed5/weaver/pojoext/serde/api/nullable/AutoNullableReadWritePojoWeavingProcessor.java @@ -11,7 +11,7 @@ import de.siphalor.tweed5.weaver.pojo.api.weaving.ProtoWeavingContext; import de.siphalor.tweed5.weaver.pojo.api.weaving.TweedPojoWeavingExtension; import de.siphalor.tweed5.weaver.pojo.api.weaving.WeavingContext; import lombok.Value; -import lombok.var; +import lombok.val; import org.jetbrains.annotations.ApiStatus; import org.jspecify.annotations.Nullable; @@ -41,7 +41,7 @@ public class AutoNullableReadWritePojoWeavingProcessor implements TweedPojoWeavi AutoReadWriteNullability innerNullability = null; - var behavior = context.annotations().getAnnotation(AutoNullableReadWriteBehavior.class); + val behavior = context.annotations().getAnnotation(AutoNullableReadWriteBehavior.class); if (behavior != null) { innerNullability = behavior.defaultNullability(); } @@ -67,14 +67,14 @@ public class AutoNullableReadWritePojoWeavingProcessor implements TweedPojoWeavi @Override public void afterWeaveEntry(ActualType valueType, ConfigEntry configEntry, WeavingContext context) { if (getNullability(valueType, context) == AutoReadWriteNullability.NULLABLE) { - var definedEntryReader = readWriteExtension.getDefinedEntryReader(configEntry); + val definedEntryReader = readWriteExtension.getDefinedEntryReader(configEntry); if (definedEntryReader != null) { readWriteExtension.setEntryReader( configEntry, new TweedEntryReaderWriterImpls.NullableReader<>(definedEntryReader) ); } - var definedEntryWriter = readWriteExtension.getDefinedEntryWriter(configEntry); + val definedEntryWriter = readWriteExtension.getDefinedEntryWriter(configEntry); if (definedEntryWriter != null) { readWriteExtension.setEntryWriter( configEntry, diff --git a/tweed5-weaver-pojo-validation-extension/src/main/java/de/siphalor/tweed5/weaver/pojoext/validation/api/validators/WeavableNumberRangeValidator.java b/tweed5-weaver-pojo-validation-extension/src/main/java/de/siphalor/tweed5/weaver/pojoext/validation/api/validators/WeavableNumberRangeValidator.java index 9bcd34e..f0e9002 100644 --- a/tweed5-weaver-pojo-validation-extension/src/main/java/de/siphalor/tweed5/weaver/pojoext/validation/api/validators/WeavableNumberRangeValidator.java +++ b/tweed5-weaver-pojo-validation-extension/src/main/java/de/siphalor/tweed5/weaver/pojoext/validation/api/validators/WeavableNumberRangeValidator.java @@ -8,7 +8,7 @@ import de.siphalor.tweed5.defaultextensions.validation.api.validators.NumberRang import lombok.AccessLevel; import lombok.RequiredArgsConstructor; import lombok.Value; -import lombok.var; +import lombok.val; import org.jetbrains.annotations.ApiStatus; import java.util.regex.Matcher; @@ -43,7 +43,7 @@ public class WeavableNumberRangeValidator implements WeavableConfigEntryValidato //noinspection unchecked Class numberClass = boxClass((Class) configEntry.valueClass()); //noinspection unchecked - var builder = NumberRangeValidator.builder((Class) numberClass); + val builder = NumberRangeValidator.builder((Class) numberClass); String minGroup = matcher.group(1); if (minGroup != null) {