Siphalor/tweed5
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects 1 Releases Wiki Activity

[*] Rework registration of TweedExtensions

Browse Source
This commit is contained in:
Siphalor
2025-04-25 15:33:55 +02:00
parent c97f711c0b
commit 59f882bd12
27 changed files with 639 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
tweed5-weaver-pojo/src/main/java/de/siphalor/tweed5/weaver/pojo/impl/weaving/TweedPojoWeaverBootstrapper.java
View File

@@ -3,7 +3,6 @@ package de.siphalor.tweed5.weaver.pojo.impl.weaving;
import de.siphalor.tweed5.core.api.container.ConfigContainer;
import de.siphalor.tweed5.core.api.entry.ConfigEntry;
import de.siphalor.tweed5.core.api.extension.RegisteredExtensionData;
import de.siphalor.tweed5.core.api.extension.TweedExtension;
import de.siphalor.tweed5.patchwork.api.PatchworkClassCreator;
import de.siphalor.tweed5.patchwork.impl.PatchworkClass;
import de.siphalor.tweed5.patchwork.impl.PatchworkClassGenerator;
@@ -15,7 +14,6 @@ import de.siphalor.tweed5.weaver.pojo.api.weaving.WeavingContext;
import de.siphalor.tweed5.weaver.pojo.api.weaving.postprocess.TweedPojoWeavingPostProcessor;
import lombok.*;
import lombok.extern.slf4j.Slf4j;
import org.jspecify.annotations.Nullable;
import java.lang.annotation.Annotation;
import java.lang.invoke.MethodHandle;
@@ -44,21 +42,12 @@ public class TweedPojoWeaverBootstrapper<T> {
Collection<TweedPojoWeaver> weavers = loadWeavers(Arrays.asList(rootWeavingConfig.weavers()));
Collection<TweedPojoWeavingPostProcessor> postProcessors = loadPostProcessors(Arrays.asList(rootWeavingConfig.postProcessors()));
Collection<TweedExtension> extensions = loadExtensions(Arrays.asList(rootWeavingConfig.extensions()));
configContainer.registerExtensions(extensions.toArray(new TweedExtension[0]));
configContainer.registerExtensions(rootWeavingConfig.extensions());
configContainer.finishExtensionSetup();
return new TweedPojoWeaverBootstrapper<>(pojoClass, configContainer, weavers, postProcessors);
}
private static Collection<TweedExtension> loadExtensions(Collection<Class<? extends TweedExtension>> extensionClasses) {
try {
return loadSingleServices(extensionClasses);
} catch (Exception e) {
throw new PojoWeavingException("Failed to load Tweed extensions", e);
}
}
private static Collection<TweedPojoWeaver> loadWeavers(Collection<Class<? extends TweedPojoWeaver>> weaverClasses) {
return weaverClasses.stream()
.map(weaverClass -> TweedPojoWeaver.FACTORY.construct(weaverClass).finish())
@@ -79,60 +68,6 @@ public class TweedPojoWeaverBootstrapper<T> {
}
}
private static <S> Collection<S> loadSingleServices(Collection<Class<? extends S>> serviceClasses) {
Collection<S> services = new ArrayList<>(serviceClasses.size());
for (Class<? extends S> serviceClass : serviceClasses) {
try {
services.add(loadSingleService(serviceClass));
} catch (Exception e) {
throw new PojoWeavingException("Failed to instantiate single service " + serviceClass.getName(), e);
}
}
return services;
}
private static <S> S loadSingleService(Class<S> serviceClass) {
try {
ServiceLoader<S> loader = ServiceLoader.load(serviceClass);
Iterator<S> iterator = loader.iterator();
if (!iterator.hasNext()) {
throw new PojoWeavingException("Could not find any service for class " + serviceClass.getName());
}
S service = iterator.next();
if (iterator.hasNext()) {
throw new PojoWeavingException(
"Found multiple services for class " + serviceClass.getName() + ": " +
createInstanceDebugStringFromIterator(loader.iterator())
);
}
return service;
} catch (ServiceConfigurationError e) {
throw new PojoWeavingException("Failed to load service " + serviceClass.getName(), e);
}
}
private static String createInstanceDebugStringFromIterator(Iterator<?> iterator) {
StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append("[ ");
while (iterator.hasNext()) {
stringBuilder.append(createInstanceDebugDescriptor(iterator.next()));
stringBuilder.append(", ");
}
stringBuilder.append(" ]");
return stringBuilder.toString();
}
private static String createInstanceDebugDescriptor(@Nullable Object object) {
if (object == null) {
return "null";
} else {
return object.getClass().getName() + "@" + System.identityHashCode(object);
}
}
private static <A extends Annotation> A expectAnnotation(Class<?> clazz, Class<A> annotationClass) {
A annotation = clazz.getAnnotation(annotationClass);
if (annotation == null) {

8
tweed5-weaver-pojo/src/test/java/de/siphalor/tweed5/weaver/pojo/api/weaving/CompoundPojoWeaverTest.java
View File

@@ -4,6 +4,7 @@ import de.siphalor.tweed5.core.api.container.ConfigContainer;
import de.siphalor.tweed5.core.api.entry.ConfigEntry;
import de.siphalor.tweed5.core.api.entry.SimpleConfigEntry;
import de.siphalor.tweed5.core.api.extension.RegisteredExtensionData;
import de.siphalor.tweed5.core.impl.entry.SimpleConfigEntryImpl;
import de.siphalor.tweed5.namingformat.api.NamingFormat;
import de.siphalor.tweed5.weaver.pojo.api.annotation.CompoundWeaving;
import de.siphalor.tweed5.weaver.pojo.api.entry.WeavableCompoundConfigEntry;
@@ -12,6 +13,7 @@ import de.siphalor.tweed5.weaver.pojo.impl.weaving.compound.CompoundWeavingConfi
import lombok.AllArgsConstructor;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jspecify.annotations.NullUnmarked;
import org.junit.jupiter.api.Test;
import static de.siphalor.tweed5.weaver.pojo.test.ConfigEntryAssertions.isCompoundEntryForClassWith;
@@ -20,6 +22,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.*;
@SuppressWarnings("unused")
@NullUnmarked
class CompoundPojoWeaverTest {
@Test
@@ -39,10 +42,7 @@ class CompoundPojoWeaverTest {
if (entry != null) {
return entry;
} else {
//noinspection unchecked
ConfigEntry<T> configEntry = mock((Class<SimpleConfigEntry<T>>) (Class<?>) SimpleConfigEntry.class);
when(configEntry.valueClass()).thenReturn(valueType.declaredType());
return configEntry;
return new SimpleConfigEntryImpl<>(valueType.declaredType());
}
}
}, mock(ConfigContainer.class))