map, String description) {
-
- SortedMap keyMap = new TreeMap<>();
- for (String key : map.keySet()) {
- try {
- Integer integerValue = Integer.parseInt(key);
- String alreadyMappedKey = keyMap.put(integerValue, key);
- if (alreadyMappedKey != null && !alreadyMappedKey.equals(key)) {
- throw inconsistentKeysException(property, target, key, alreadyMappedKey, description);
- }
- } catch (NumberFormatException e) {
- throw nonIntegerKeyException(property, target, key, description, e);
- }
- }
-
- return new ArrayList<>(keyMap.values());
-
- }
-
- public static void clearCache() {
- CONFIG_CACHE.clear();
- INFOS.clear();
- }
-
- /**
- * A {@link ClassInfo} is a helper class that gathers and holds some information about a target class.
- *
- * This class gathers the following information about the target class:
- *
- *
- * A {@link Supplier} as a factory for creating instances of the target class.
- * That factory is
- *
- *
- * preferably the target classes parameterless public constructor or
- *
- *
- * a parameterless public static factory method whose name case-insensitively contains
- * the word "instance".
- *
- *
- * An exception is thrown if neither kind of factory exists or if no suitable constructor but
- * multiple suitable factory methods exists.
- *
- *
- * A list of {@link Injector} that are executed after an instance of the target class has been created.
- * Each injector binds together a {@link Source} and a {@link Target}.
- *
- * {@link MCRProperty}
- * {@link MCRRawProperties}
- * {@link MCRInstance}
- * {@link MCRInstanceMap}
- * {@link MCRInstanceList}
- * {@link MCRPostConstruction}
- *
- * Targets are:
- *
- * public fields,
- * public methods with no parameter or
- * public methods with one parameter.
- *
- * The list of injectors is created by
- *
- *
- * examining all possible fields and methods, generalized as {@link Injectable},
- * (done in {@link ClassInfo#findInjectors(Class)}),
- *
- *
- * checking, if such an injectable is annotated with a supported annotation
- * (done in {@link AnnotationMapper#injectableToSource(Injectable)}),
- *
- *
- * creating a corresponding source for that annotation
- * (using {@link AnnotationMapper#annotationToSource(Annotation)}) and
- *
- *
- * creating a corresponding target for that injectable
- * (using {@link Injectable#toTarget()}).
- *
- *
- * An exception is thrown if multiple sources are detected for the same target (for example, because a method is
- * annotated with {@link MCRProperty} and {@link MCRPostConstruction}), if the target is not allowed for the
- * detected source (for example, {@link MCRPostConstruction} is only allowed on methods) or if the values
- * produced by the source are assignment-incompatible with the target (for example, values produced by a
- * {@link InstanceSource} are not assignment-compatible with {@link String}) (as far as type erasure allows it
- * to determine this preemptively).
- *
- *
- *
- * It is intended that instances of this class are cached, such that the information about the target class
- * only needs to be gathered once.
- */
- private static final class ClassInfo {
-
- private final Class targetClass;
-
- private final Supplier factory;
-
- private final List> injectors;
-
- private ClassInfo(Class targetClass) {
- this.targetClass = targetClass;
- this.factory = getFactory(targetClass);
- this.injectors = findInjectors(targetClass);
- }
-
- private Supplier getFactory(Class targetClass) {
-
- List declaredFactoryMethods = findFactoryMethods(targetClass, targetClass.getDeclaredMethods());
- Optional> factory = Stream.>>>of(
- () -> findSingletonFactoryMethod(declaredFactoryMethods),
- () -> findAnnotatedFactoryMethod(declaredFactoryMethods),
- () -> findDefaultConstructor(targetClass))
- .map(Supplier::get)
- .filter(Optional::isPresent)
- .map(Optional::get)
- .findFirst();
-
- return factory.orElseThrow(() -> new MCRConfigurationException("Class " + targetClass.getName() + " has "
- + " has no singleton factory method (public, static, matching return type, parameterless, name"
- + " equals 'getInstance'), no annotated factory method (public, static, matching return type,"
- + " parameterless, annotated with @MCRFactory) and no public parameterless constructor"));
-
- }
-
- private static List findFactoryMethods(Class targetClass, Method[] declaredMethods) {
- return Stream.of(declaredMethods)
- .filter(method -> Modifier.isPublic(method.getModifiers()))
- .filter(method -> Modifier.isStatic(method.getModifiers()))
- .filter(method -> method.getReturnType().isAssignableFrom(targetClass))
- .filter(method -> method.getParameterTypes().length == 0)
- .filter(method -> !method.isVarArgs())
- .toList();
- }
-
- private Optional> findSingletonFactoryMethod(List factoryMethods) {
-
- List singletonFactoryMethods = factoryMethods.stream()
- .filter(method -> method.getName().equals("getInstance"))
- .toList();
-
- if (singletonFactoryMethods.size() > 1) {
- throw new MCRConfigurationException("Class " + targetClass.getName()
- + " has multiple singleton factory methods (public, static, matching return type, parameterless,"
- + " name equals 'getInstance'): " + methodNames(singletonFactoryMethods));
- }
-
- return singletonFactoryMethods.stream().findFirst().map(this::createFactoryMethodFactory);
-
- }
-
- private Optional> findAnnotatedFactoryMethod(List factoryMethods) {
-
- List annotatedFactoryMethods = factoryMethods.stream()
- .filter(method -> method.getDeclaredAnnotation(MCRFactory.class) != null)
- .toList();
-
- if (annotatedFactoryMethods.size() > 1) {
- throw new MCRConfigurationException("Class " + targetClass.getName()
- + " has multiple annotated factory methods (public, static, matching return type, parameterless,"
- + " annotated with @MCRFactory): " + methodNames(annotatedFactoryMethods));
- }
-
- return annotatedFactoryMethods.stream().findFirst().map(this::createFactoryMethodFactory);
-
- }
-
- private Optional> findDefaultConstructor(Class targetClass) {
- try {
- return Optional.of(createConstructorFactory(targetClass.getConstructor()));
- } catch (NoSuchMethodException e) {
- return Optional.empty();
- }
- }
-
- @SuppressWarnings("unchecked")
- private Supplier createFactoryMethodFactory(Method method) {
- return () -> {
- try {
- return (T) method.invoke(method.getDeclaringClass(), (Object[]) null);
- } catch (Exception e) {
- throw new MCRConfigurationException("Unable to create an instance of "
- + method.getDeclaringClass().getName() + " using public, parameterless constructor", e);
- }
- };
- }
-
- private Supplier createConstructorFactory(Constructor constructor) {
- return () -> {
- try {
- return constructor.newInstance();
- } catch (Exception e) {
- throw new MCRConfigurationException("Unable to create an instance of "
- + constructor.getDeclaringClass().getName() + " using parameterless public constructor", e);
- }
- };
- }
-
- private List> findInjectors(Class targetClass) {
- List> injectors = new LinkedList<>();
- for (Field field : targetClass.getFields()) {
- findInjector(new FieldInjectable(field)).ifPresent(injectors::add);
- }
- for (Method method : targetClass.getMethods()) {
- findInjector(new MethodInjectable(method)).ifPresent(injectors::add);
- }
- Collections.sort(injectors);
- return injectors;
- }
-
- private Optional> findInjector(Injectable injectable) {
-
- List> sources = new LinkedList<>();
- for (SourceType sourceType : SourceType.values()) {
- sourceType.mapper.injectableToSource(injectable).ifPresent(sources::add);
- }
-
- if (sources.isEmpty()) {
- return Optional.empty();
- }
-
- Target target = injectable.toTarget();
- if (sources.size() != 1) {
- throw new MCRConfigurationException("Target " + targetTypeName(target) + " '"
- + target.name() + "' has multiple annotations (" + annotationClassNames(sources)
- + ") in configured class " + targetClass.getName());
- }
-
- Source source = sources.getFirst();
-
- if (!source.allowedTargetTypes().contains(target.type())) {
- throw new MCRConfigurationException("Target " + targetTypeName(target) + " '"
- + target.name() + "' is not allowed for annotation (" + annotationClassName(source)
- + ") in configured class " + targetClass.getName());
- }
-
- if (!target.isAssignableFrom(source.valueClass())) {
- throw new MCRConfigurationException("Target " + targetTypeName(target) + " '"
- + target.name() + "' has incompatible type for annotation (" + annotationClassName(source)
- + ") in configured class " + targetClass.getName());
- }
-
- return Optional.of(new Injector<>(target, source));
-
- }
-
- public T createInstance(MCRInstanceConfiguration configuration) {
- T instance = factory.get();
- for (Injector injector : injectors) {
- injector.inject(instance, configuration);
- }
- return instance;
- }
-
- }
-
- private static abstract class Injectable {
-
- public abstract Optional annotation(Class annotationClass);
-
- public abstract Target toTarget();
-
- }
-
- private static final class FieldInjectable extends Injectable {
-
- private final Field field;
-
- private FieldInjectable(Field field) {
- this.field = field;
- }
-
- @Override
- public Optional annotation(Class annotationClass) {
- return Optional.ofNullable(field.getDeclaredAnnotation(annotationClass));
- }
-
- @Override
- public Target toTarget() {
- return new FieldTarget<>(field);
- }
-
- }
-
- private static final class MethodInjectable extends Injectable {
-
- private final Method method;
-
- private MethodInjectable(Method method) {
- this.method = method;
- }
-
- @Override
- public Optional annotation(Class annotationClass) {
- return Optional.ofNullable(method.getDeclaredAnnotation(annotationClass));
- }
-
- @Override
- public Target toTarget() {
- int numberOfParameters = method.getParameterTypes().length;
- return switch (numberOfParameters) {
- case 0 -> new NoParameterMethodTarget<>(method);
- case 1 -> new SingleParameterMethodTarget<>(method);
- default -> throw new MCRConfigurationException("Target method '" + method.getName() +
- "' has an unexpected number of parameters (" + numberOfParameters +
- ") in configured class " + method.getDeclaringClass().getName());
- };
- }
-
- }
-
- private enum TargetType {
-
- FIELD(0),
-
- METHOD(1);
-
- public final int order;
-
- TargetType(int order) {
- this.order = order;
- }
-
- }
-
- private static abstract class Target {
-
- public abstract TargetType type();
-
- public abstract Class declaringClass();
-
- public abstract String name();
-
- public abstract boolean isAssignableFrom(Class valueClass);
-
- public abstract void set(T instance, Object value);
-
- }
-
- private static final class FieldTarget extends Target {
-
- private final Field field;
-
- private FieldTarget(Field field) {
- this.field = field;
- }
-
- @Override
- public TargetType type() {
- return TargetType.FIELD;
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public Class declaringClass() {
- return (Class) field.getDeclaringClass();
- }
-
- @Override
- public String name() {
- return field.getName();
- }
-
- @Override
- public boolean isAssignableFrom(Class valueClass) {
- return valueClass.isAssignableFrom(field.getType());
- }
-
- @Override
- public void set(T instance, Object value) {
- try {
- field.set(instance, value);
- } catch (Exception e) {
- throw new MCRConfigurationException("Failed to set target field '" + name() + "' to '" + value
- + "' in configurable class " + field.getDeclaringClass().getName(), e);
- }
- }
-
- }
-
- private static abstract class MethodTarget extends Target {
-
- private final Method method;
-
- private MethodTarget(Method method) {
- this.method = method;
- }
-
- @Override
- public final TargetType type() {
- return TargetType.METHOD;
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public Class declaringClass() {
- return (Class) method.getDeclaringClass();
- }
-
- @Override
- public final String name() {
- return method.getName();
- }
-
- }
-
- private static final class NoParameterMethodTarget extends MethodTarget {
-
- private final Method method;
-
- private NoParameterMethodTarget(Method method) {
- super(method);
- this.method = method;
- }
-
- @Override
- public boolean isAssignableFrom(Class valueClass) {
- return true;
- }
-
- @Override
- public void set(T instance, Object value) {
- try {
- method.invoke(instance);
- } catch (Exception e) {
- throw new MCRConfigurationException("Failed to call target method '" + name()
- + "' in configurable class " + method.getDeclaringClass().getName(), e);
- }
- }
-
- }
-
- private static final class SingleParameterMethodTarget extends MethodTarget {
-
- private final Method method;
-
- private SingleParameterMethodTarget(Method method) {
- super(method);
- this.method = method;
- }
-
- @Override
- public boolean isAssignableFrom(Class valueClass) {
- return method.getParameterTypes()[0].isAssignableFrom(valueClass);
- }
-
- @Override
- public void set(T instance, Object value) {
- try {
- method.invoke(instance, value);
- } catch (Exception e) {
- throw new MCRConfigurationException("Failed to call target method '" + name() + "' with '"
- + value + "' in configurable class " + method.getDeclaringClass().getName(), e);
- }
- }
-
- }
-
- private enum SourceGroup {
-
- VALUE_INJECTION,
-
- POST_CONSTRUCTION;
-
- }
-
- private enum SourceType {
-
- PROPERTY(SourceGroup.VALUE_INJECTION, new AnnotationMapper() {
-
- @Override
- public Class annotationClass() {
- return MCRProperty.class;
- }
-
- @Override
- public Source annotationToSource(MCRProperty annotation) {
- return new PropertySource(annotation);
- }
-
- }),
-
- PROPERTY_MAP(SourceGroup.VALUE_INJECTION, new AnnotationMapper() {
-
- @Override
- public Class annotationClass() {
- return MCRPropertyMap.class;
- }
-
- @Override
- public Source annotationToSource(MCRPropertyMap annotation) {
- return new PropertyMapSource(annotation);
- }
-
- }),
-
- PROPERTY_LIST(SourceGroup.VALUE_INJECTION, new AnnotationMapper() {
-
- @Override
- public Class annotationClass() {
- return MCRPropertyList.class;
- }
-
- @Override
- public Source annotationToSource(MCRPropertyList annotation) {
- return new PropertyListSource(annotation);
- }
-
- }),
-
- RAW_PROPERTIES(SourceGroup.VALUE_INJECTION, new AnnotationMapper() {
-
- @Override
- public Class annotationClass() {
- return MCRRawProperties.class;
- }
-
- @Override
- public Source annotationToSource(MCRRawProperties annotation) {
- return new RawPropertiesSource(annotation);
- }
-
- }),
-
- INSTANCE(SourceGroup.VALUE_INJECTION, new AnnotationMapper() {
-
- @Override
- public Class annotationClass() {
- return MCRInstance.class;
- }
-
- @Override
- public Source annotationToSource(MCRInstance annotation) {
- return new InstanceSource(annotation);
- }
-
- }),
-
- INSTANCE_MAP(SourceGroup.VALUE_INJECTION, new AnnotationMapper() {
-
- @Override
- public Class annotationClass() {
- return MCRInstanceMap.class;
- }
-
- @Override
- public Source annotationToSource(MCRInstanceMap annotation) {
- return new InstanceMapSource(annotation);
- }
-
- }),
-
- INSTANCE_LIST(SourceGroup.VALUE_INJECTION, new AnnotationMapper() {
-
- @Override
- public Class annotationClass() {
- return MCRInstanceList.class;
- }
-
- @Override
- public Source annotationToSource(MCRInstanceList annotation) {
- return new InstanceListSource(annotation);
- }
-
- }),
-
- POST_CONSTRUCTION(SourceGroup.POST_CONSTRUCTION, new AnnotationMapper() {
-
- @Override
- public Class annotationClass() {
- return MCRPostConstruction.class;
- }
-
- @Override
- public Source annotationToSource(MCRPostConstruction annotation) {
- return new PostConstructionSource(annotation);
- }
-
- });
-
- public final int order;
-
- public final AnnotationMapper mapper;
-
- SourceType(SourceGroup group, AnnotationMapper mapper) {
- this.order = group.ordinal();
- this.mapper = mapper;
- }
-
- }
-
- private abstract static class AnnotationMapper {
-
- public abstract Class annotationClass();
-
- public abstract Source annotationToSource(A annotation);
-
- public Optional> injectableToSource(Injectable injectable) {
- return injectable.annotation(annotationClass()).map(this::annotationToSource);
- }
-
- }
-
- private static abstract class Source {
-
- public abstract SourceType type();
-
- public abstract Class annotationClass();
-
- public abstract A annotation();
-
- public abstract int order();
-
- public abstract Set allowedTargetTypes();
-
- public abstract Class valueClass();
-
- public abstract V get(MCRInstanceConfiguration configuration, Target target);
-
- public final Set createOptions(Class valueClass) {
- return Modifier.isFinal(valueClass.getModifiers())
- ? ADD_IMPLICIT_CLASS_PROPERTIES : NO_OPTIONS;
- }
-
- }
-
- private static final class PropertySource extends Source {
-
- private final MCRProperty annotation;
-
- private PropertySource(MCRProperty annotation) {
- this.annotation = annotation;
- }
-
- @Override
- public SourceType type() {
- return SourceType.PROPERTY;
- }
-
- @Override
- public Class annotationClass() {
- return MCRProperty.class;
- }
-
- @Override
- public MCRProperty annotation() {
- return annotation;
- }
-
- @Override
- public int order() {
- return annotation.order();
- }
-
- @Override
- public Set allowedTargetTypes() {
- return EnumSet.allOf(TargetType.class);
- }
-
- @Override
- public Class valueClass() {
- return String.class;
- }
-
- @Override
- public String get(MCRInstanceConfiguration configuration, Target target) {
-
- String name = annotation.name();
- if (name.isEmpty()) {
- throw new MCRConfigurationException(
- "The name for target " + targetTypeName(target) + " '" + target.name() + "' in configured class "
- + target.declaringClass().getName() + " must not be empty");
- }
-
- String property;
- String description;
- String propertyValue;
- if (annotation.absolute()) {
- property = annotation.name();
- description = "absolute property";
- propertyValue = getPropertyValue(property, annotation.name(),
- configuration.fullProperties(), description);
- } else {
- property = configuration.name().canonical() + "." + annotation.name();
- description = "property";
- propertyValue = getPropertyValue(property, annotation.name(),
- configuration.properties(), description);
- }
-
- String defaultName = annotation.defaultName();
- if (propertyValue == null && !defaultName.isEmpty()) {
-
- property = defaultName;
- description = "default property";
- propertyValue = getPropertyValue(defaultName, defaultName,
- configuration.fullProperties(), description);
-
- if (propertyValue == null) {
- throw missingException(property, target, description);
- }
-
- }
-
- if (propertyValue == null && annotation.required()) {
- throw missingException(property, target, description);
- }
-
- return propertyValue;
-
- }
-
- private String getPropertyValue(String property, String prefix,
- Map properties, String description) {
-
- MCRSentinel sentinel = annotation.sentinel();
-
- if (sentinel.enabled()) {
- boolean sentinelValue = sentinel.defaultValue();
- String configurationValue = properties.get(prefix + "." + sentinel.name());
- if (configurationValue != null) {
- sentinelValue = Boolean.parseBoolean(configurationValue);
- }
- if (sentinelValue == sentinel.rejectionValue()) {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("[SENTINEL] Ignoring {} {} and all sub-properties",
- description, property);
- }
- return null;
- }
-
- }
-
- return properties.get(prefix);
-
- }
-
- }
-
- private static final class PropertyMapSource extends Source> {
-
- private final MCRPropertyMap annotation;
-
- private PropertyMapSource(MCRPropertyMap annotation) {
- this.annotation = annotation;
- }
-
- @Override
- public SourceType type() {
- return SourceType.PROPERTY_MAP;
- }
-
- @Override
- public Class annotationClass() {
- return MCRPropertyMap.class;
- }
-
- @Override
- public MCRPropertyMap annotation() {
- return annotation;
- }
-
- @Override
- public int order() {
- return annotation.order();
- }
-
- @Override
- public Set allowedTargetTypes() {
- return EnumSet.allOf(TargetType.class);
- }
-
- @Override
- public Class valueClass() {
- return Map.class;
- }
-
- @Override
- public Map get(MCRInstanceConfiguration configuration, Target target) {
-
- String property;
- String description;
- Map propertyMap;
- if (annotation.absolute()) {
- property = annotation.name();
- description = "absolute property map";
- Map properties = configuration.fullProperties();
- propertyMap = getPropertyMap(property, annotation.name(), ".", properties, description);
- } else {
- Map properties = configuration.properties();
- if (annotation.name().isEmpty()) {
- property = configuration.name().canonical();
- description = "property map";
- // when non-empty class suffix is used, the property with empty name may contain the short-form-map
- if (configuration.name().suffix() != MCRInstanceName.Suffix.NONE) {
- properties.put("", configuration.fullProperties().get(property));
- }
- propertyMap = getPropertyMap(property, "", "", properties, description);
- } else {
- property = configuration.name().canonical() + "." + annotation.name();
- description = "property map";
- propertyMap = getPropertyMap(property, annotation.name(), ".", properties, description);
- }
- }
-
- String defaultName = annotation.defaultName();
- if (propertyMap == null && !defaultName.isEmpty()) {
-
- property = defaultName;
- description = "default property map";
- propertyMap = getPropertyMap(defaultName, defaultName, ".",
- configuration.fullProperties(), description);
-
- if (propertyMap == null || (propertyMap.isEmpty() && annotation.required())) {
- throw emptyException(property, target, description);
- }
-
- }
-
- if ((propertyMap == null || propertyMap.isEmpty()) && annotation.required()) {
- throw emptyException(property, target, description);
- }
-
- return propertyMap == null ? new HashMap<>() : propertyMap;
-
- }
-
- private Map getPropertyMap(String property, String prefix, String delimiter,
- Map properties, String description) {
-
- AtomicBoolean hasRelevantProperty = new AtomicBoolean(false);
- MCRSentinel sentinel = annotation.sentinel();
-
- Map shortFormMap = Map.of();
- String shortFormPropertyValue = properties.get(prefix);
- if (shortFormPropertyValue != null) {
- hasRelevantProperty.set(true);
- shortFormMap = parseShortFormMap(property, shortFormPropertyValue);
- }
-
- Map rawPropertyMap = new HashMap<>(shortFormMap);
- String keyPrefix = prefix + delimiter;
- int keyPrefixLength = keyPrefix.length();
- properties.forEach((key, value) -> {
- if (key.startsWith(keyPrefix) && !key.isEmpty()) {
- int index = key.indexOf('.', keyPrefixLength);
- if (index == -1) {
- if (!value.isEmpty()) {
- hasRelevantProperty.set(true);
- rawPropertyMap.put(key.substring(keyPrefixLength), value);
- }
- }
- }
- });
-
- Map propertyMap = new HashMap<>();
-
- for (String key : rawPropertyMap.keySet()) {
- String value = rawPropertyMap.get(key);
- if (sentinel.enabled()) {
- boolean sentinelValue = sentinel.defaultValue();
- String configurationValue = properties.get(keyPrefix + key + "." + sentinel.name());
- if (configurationValue != null) {
- sentinelValue = Boolean.parseBoolean(configurationValue);
- }
- if (sentinelValue == sentinel.rejectionValue()) {
- LOGGER.info("[SENTINEL] Ignoring {} entry {}.{} and all sub-properties",
- description, property, key);
- continue;
- }
- }
-
- propertyMap.put(key, value);
-
- }
-
- return hasRelevantProperty.get() ? propertyMap : null;
-
- }
-
- private Map parseShortFormMap(String property, String value) {
- Map shortFormMap = new HashMap<>();
- MCRConfiguration2.splitValue(value).forEach(string -> {
- String[] parts = string.split(":", 2);
- if (parts.length != 2 || parts[0].isBlank() || parts[1].isBlank()) {
- if (LOGGER.isWarnEnabled()) {
- LOGGER.warn("Ignoring incomplete short-form-map entry {} while processing {}",
- value, property);
- }
- } else {
- shortFormMap.put(parts[0], parts[1]);
- }
- });
- return shortFormMap;
- }
-
- }
-
- private static final class PropertyListSource extends Source> {
-
- private final MCRPropertyList annotation;
-
- private PropertyListSource(MCRPropertyList annotation) {
- this.annotation = annotation;
- }
-
- @Override
- public SourceType type() {
- return SourceType.PROPERTY_LIST;
- }
-
- @Override
- public Class annotationClass() {
- return MCRPropertyList.class;
- }
-
- @Override
- public MCRPropertyList annotation() {
- return annotation;
- }
-
- @Override
- public int order() {
- return annotation.order();
- }
-
- @Override
- public Set allowedTargetTypes() {
- return EnumSet.allOf(TargetType.class);
- }
-
- @Override
- public Class valueClass() {
- return List.class;
- }
-
- @Override
- public List get(MCRInstanceConfiguration configuration, Target target) {
-
- String property;
- String description;
- List propertyList;
- if (annotation.absolute()) {
- property = annotation.name();
- description = "absolute property list";
- Map properties = configuration.fullProperties();
- propertyList = getPropertyList(property, annotation.name(), ".", target, properties, description);
- } else {
- Map properties = configuration.properties();
- if (annotation.name().isEmpty()) {
- property = configuration.name().canonical();
- description = "property list";
- // when non-empty class suffix is used, the property with empty name may contain the short-form-list
- if (configuration.name().suffix() != MCRInstanceName.Suffix.NONE) {
- properties.put("", configuration.fullProperties().get(property));
- }
- propertyList = getPropertyList(property, "", "", target, properties, description);
- } else {
- property = configuration.name().canonical() + "." + annotation.name();
- description = "property list";
- propertyList = getPropertyList(property, annotation.name(), ".", target, properties, description);
- }
- }
-
- String defaultName = annotation.defaultName();
- if (propertyList == null && !defaultName.isEmpty()) {
-
- property = defaultName;
- description = "default property list";
- propertyList = getPropertyList(defaultName, defaultName, ".",
- target, configuration.fullProperties(), description);
-
- if (propertyList == null || (propertyList.isEmpty() && annotation.required())) {
- throw emptyException(property, target, description);
- }
- }
-
- if ((propertyList == null || propertyList.isEmpty()) && annotation.required()) {
- throw emptyException(property, target, description);
- }
-
- return propertyList == null ? new ArrayList<>() : propertyList;
-
- }
-
- private List getPropertyList(String property, String prefix, String delimiter,
- Target target, Map properties, String description) {
-
- AtomicBoolean hasRelevantProperty = new AtomicBoolean(false);
- MCRSentinel sentinel = annotation.sentinel();
-
- Map rawPropertyMap = new HashMap<>();
- String keyPrefix = prefix + delimiter;
- int keyPrefixLength = keyPrefix.length();
- properties.forEach((key, value) -> {
- if (key.startsWith(keyPrefix) && !key.isEmpty()) {
- int index = key.indexOf('.', keyPrefixLength);
- if (index == -1) {
- if (!value.isEmpty()) {
- hasRelevantProperty.set(true);
- rawPropertyMap.put(key.substring(keyPrefixLength), value);
- }
- }
- }
- });
-
- List headPropertyList = new ArrayList<>(0);
- List tailPropertyList = new ArrayList<>(rawPropertyMap.size());
-
- List keyList = orderedKeys(property, target, rawPropertyMap, description);
- for (String key : keyList) {
- String value = rawPropertyMap.get(key);
- if (sentinel.enabled()) {
- boolean sentinelValue = sentinel.defaultValue();
- String configurationValue = properties.get(keyPrefix + key + "." + sentinel.name());
- if (configurationValue != null) {
- sentinelValue = Boolean.parseBoolean(configurationValue);
- }
- if (sentinelValue == sentinel.rejectionValue()) {
- LOGGER.info("[SENTINEL] Ignoring {} element {}.{} and all sup-properties",
- description, property, key);
- continue;
- }
- }
-
- if (key.charAt(0) == '-') {
- headPropertyList.add(value);
- } else {
- tailPropertyList.add(value);
- }
-
- }
-
- List shortFormList = List.of();
- String shortFormPropertyValue = properties.get(prefix);
- if (shortFormPropertyValue != null) {
- hasRelevantProperty.set(true);
- shortFormList = parseShortFormList(shortFormPropertyValue);
- }
-
- int totalSize = headPropertyList.size() + shortFormList.size() + tailPropertyList.size();
- List fullPropertyList = new ArrayList<>(totalSize);
- fullPropertyList.addAll(headPropertyList);
- fullPropertyList.addAll(shortFormList);
- fullPropertyList.addAll(tailPropertyList);
-
- return hasRelevantProperty.get() ? fullPropertyList : null;
-
- }
-
- private List parseShortFormList(String value) {
- return MCRConfiguration2.splitValue(value).toList();
- }
-
- }
-
- private static final class RawPropertiesSource extends Source> {
-
- private final MCRRawProperties annotation;
-
- private final String prefix;
-
- private RawPropertiesSource(MCRRawProperties annotation) {
- this.annotation = annotation;
- String namePattern = annotation.namePattern();
- if (namePattern.equals("*")) {
- this.prefix = "";
- } else if (namePattern.endsWith(".*")) {
- this.prefix = namePattern.substring(0, namePattern.length() - 1);
- } else {
- throw new MCRConfigurationException("Unsupported name pattern:" + annotation.namePattern());
- }
- }
-
- @Override
- public SourceType type() {
- return SourceType.RAW_PROPERTIES;
- }
-
- @Override
- public Class annotationClass() {
- return MCRRawProperties.class;
- }
-
- @Override
- public MCRRawProperties annotation() {
- return annotation;
- }
-
- @Override
- public int order() {
- return annotation.order();
- }
-
- @Override
- public Set allowedTargetTypes() {
- return EnumSet.allOf(TargetType.class);
- }
-
- @Override
- public Class valueClass() {
- return Map.class;
- }
-
- @Override
- public Map get(MCRInstanceConfiguration configuration, Target target) {
-
- Map properties =
- annotation.absolute() ? configuration.fullProperties() : configuration.properties();
-
- Map filteredProperties = new HashMap<>();
- properties.forEach((key, value) -> {
- if (key.startsWith(prefix)) {
- filteredProperties.put(key.substring(prefix.length()), value);
- }
- });
-
- if (filteredProperties.isEmpty() && annotation.required()) {
- String property;
- String description;
- if (annotation.absolute()) {
- property = annotation.namePattern();
- description = "absolute raw property map";
- } else {
- property = configuration.name().canonical() + "." + annotation.namePattern();
- description = "raw property map";
- }
- throw emptyRawException(property, target, description);
- }
-
- return filteredProperties;
-
- }
-
- }
-
- @SuppressWarnings("PMD.SingletonClassReturningNewInstance")
- private static abstract class InstanceSourceBase extends Source {
-
- protected Object getInstance(String property, Target target, Class valueClass,
- MCRInstanceConfiguration nestedConfiguration, MCRSentinel sentinel) {
-
- Set options = createOptions(valueClass);
- boolean implicitValueClass = Modifier.isFinal(valueClass.getModifiers());
-
- if (sentinel.enabled()) {
- boolean sentinelValue = sentinel.defaultValue();
- String configuredSentinelValue = nestedConfiguration.properties().remove(sentinel.name());
- if (configuredSentinelValue != null) {
- sentinelValue = Boolean.parseBoolean(configuredSentinelValue);
- }
- if (sentinelValue == sentinel.rejectionValue()) {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("[SENTINEL] Ignoring {} {} and all sup-properties",
- description(), property);
- }
- return null;
- }
- }
-
- String className = nestedConfiguration.className();
- if (className == null && !implicitValueClass) {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("[CLEAN-UP] Ignoring {} {} and all sup-properties (no class name)",
- description(), property);
- }
- return null;
- } else if (className != null && className.isBlank()) {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("[CLEAN-UP] Ignoring {} {} and all sup-properties (empty class name)",
- description(), property);
- }
- return null;
- }
-
- Object instance = MCRConfigurableInstanceHelper.getInstance(valueClass, nestedConfiguration, options);
- if (!valueClass.isAssignableFrom(instance.getClass())) {
- throw incompatibilityException(property, target, valueClass, instance);
- }
-
- return instance;
-
- }
-
- protected abstract String description();
-
- }
-
- private static final class InstanceSource extends InstanceSourceBase {
-
- private final MCRInstance annotation;
-
- private InstanceSource(MCRInstance annotation) {
- this.annotation = annotation;
- }
-
- @Override
- public SourceType type() {
- return SourceType.INSTANCE;
- }
-
- @Override
- public Class annotationClass() {
- return MCRInstance.class;
- }
-
- @Override
- public MCRInstance annotation() {
- return annotation;
- }
-
- @Override
- public int order() {
- return annotation.order();
- }
-
- @Override
- public Set allowedTargetTypes() {
- return EnumSet.allOf(TargetType.class);
- }
-
- @Override
- public Class valueClass() {
- return annotation.valueClass();
- }
-
- @Override
- public Object get(MCRInstanceConfiguration configuration, Target target) {
-
- String name = annotation.name();
- if (name.isEmpty()) {
- throw new MCRConfigurationException(
- "The name for target " + targetTypeName(target) + " '" + target.name() + "' in configured class "
- + target.declaringClass().getName() + " must not be empty");
- }
-
- Object instance = getInstance(configuration, target, name);
-
- if (instance == null && annotation.required()) {
- throw missingException(property(configuration, annotation.name()), target, "instance");
- }
-
- return instance;
-
- }
-
- private Object getInstance(MCRInstanceConfiguration configuration, Target target, String name) {
-
- MCRInstanceConfiguration nestedConfiguration = configuration.nestedConfiguration(name);
- String property = nestedConfiguration.name().canonical();
-
- Class valueClass = annotation.valueClass();
- MCRSentinel sentinel = annotation.sentinel();
-
- return getInstance(property, target, valueClass, nestedConfiguration, sentinel);
-
- }
-
- @Override
- protected String description() {
- return "instance";
- }
-
- }
-
- private static final class InstanceMapSource extends InstanceSourceBase> {
-
- private final MCRInstanceMap annotation;
-
- private InstanceMapSource(MCRInstanceMap annotation) {
- this.annotation = annotation;
- }
-
- @Override
- public SourceType type() {
- return SourceType.INSTANCE_MAP;
- }
-
- @Override
- public Class annotationClass() {
- return MCRInstanceMap.class;
- }
-
- @Override
- public MCRInstanceMap annotation() {
- return annotation;
- }
-
- @Override
- public int order() {
- return annotation.order();
- }
-
- @Override
- public Set allowedTargetTypes() {
- return EnumSet.allOf(TargetType.class);
- }
-
- @Override
- public Class valueClass() {
- return Map.class;
- }
-
- @Override
- public Map get(MCRInstanceConfiguration configuration, Target target) {
-
- Map instanceMap = getInstanceMap(target, configuration);
-
- if (instanceMap.isEmpty() && annotation.required()) {
- throw emptyException(property(configuration, annotation.name()), target, "instance map");
- }
-
- return instanceMap;
-
- }
-
- private Map getInstanceMap(Target target, MCRInstanceConfiguration configuration) {
-
- Map nestedConfigurationMap = nestedConfigurationMap(configuration);
-
- Class valueClass = annotation.valueClass();
- MCRSentinel sentinel = annotation.sentinel();
-
- Map instanceMap = new HashMap<>();
- for (String key : nestedConfigurationMap.keySet()) {
-
- MCRInstanceConfiguration nestedConfiguration = nestedConfigurationMap.get(key);
- String property = nestedConfiguration.name().canonical();
-
- Object instance = getInstance(property, target, valueClass, nestedConfiguration, sentinel);
- if (instance != null) {
- instanceMap.put(key, instance);
- }
-
- }
-
- return instanceMap;
-
- }
-
- private Map nestedConfigurationMap(MCRInstanceConfiguration configuration) {
- if (Objects.equals("", annotation.name())) {
- return configuration.nestedConfigurationMap();
- } else {
- return configuration.nestedConfigurationMap(annotation().name());
- }
- }
-
- @Override
- protected String description() {
- return "instance map entry";
- }
-
- }
-
- private static final class InstanceListSource extends InstanceSourceBase> {
-
- private final MCRInstanceList annotation;
-
- private InstanceListSource(MCRInstanceList annotation) {
- this.annotation = annotation;
- }
-
- @Override
- public SourceType type() {
- return SourceType.INSTANCE_LIST;
- }
-
- @Override
- public Class annotationClass() {
- return MCRInstanceList.class;
- }
-
- @Override
- public MCRInstanceList annotation() {
- return annotation;
- }
-
- @Override
- public int order() {
- return annotation.order();
- }
-
- @Override
- public Set allowedTargetTypes() {
- return EnumSet.allOf(TargetType.class);
- }
-
- @Override
- public Class valueClass() {
- return List.class;
- }
-
- @Override
- public List get(MCRInstanceConfiguration configuration, Target target) {
-
- List instanceMap = getInstanceList(target, configuration);
-
- if (instanceMap.isEmpty() && annotation.required()) {
- throw emptyException(property(configuration, annotation.name()), target, "instance list");
- }
-
- return instanceMap;
-
- }
-
- private List getInstanceList(Target target, MCRInstanceConfiguration configuration) {
-
- Map nestedConfigurationMap = nestedConfigurationMap(configuration);
- List keyList = orderedKeys(property(configuration, annotation.name()), target,
- nestedConfigurationMap, "instance list");
-
- Class valueClass = annotation.valueClass();
- MCRSentinel sentinel = annotation.sentinel();
-
- List instanceList = new ArrayList<>(nestedConfigurationMap.size());
- for (String key : keyList) {
-
- MCRInstanceConfiguration nestedConfiguration = nestedConfigurationMap.get(key);
- String property = nestedConfiguration.name().canonical();
-
- Object instance = getInstance(property, target, valueClass, nestedConfiguration, sentinel);
- if (instance != null) {
- instanceList.add(instance);
- }
-
- }
-
- return instanceList;
-
- }
-
- private Map nestedConfigurationMap(MCRInstanceConfiguration configuration) {
- if (Objects.equals("", annotation.name())) {
- return configuration.nestedConfigurationMap();
- } else {
- return configuration.nestedConfigurationMap(annotation().name());
- }
- }
-
- @Override
- protected String description() {
- return "instance list element";
- }
- }
-
- private static final class PostConstructionSource extends Source {
-
- private final MCRPostConstruction annotation;
-
- private PostConstructionSource(MCRPostConstruction annotation) {
- this.annotation = annotation;
- }
-
- @Override
- public SourceType type() {
- return SourceType.POST_CONSTRUCTION;
- }
-
- @Override
- public Class annotationClass() {
- return MCRPostConstruction.class;
- }
-
- @Override
- public MCRPostConstruction annotation() {
- return annotation;
- }
-
- @Override
- public int order() {
- return annotation.order();
- }
-
- @Override
- public Set allowedTargetTypes() {
- return EnumSet.allOf(TargetType.class);
- }
-
- @Override
- public Class valueClass() {
- return String.class;
- }
-
- @Override
- public String get(MCRInstanceConfiguration configuration, Target target) {
- return switch (annotation.value()) {
- case ACTUAL -> configuration.name().actual();
- case CANONICAL -> configuration.name().canonical();
- };
- }
-
- }
-
- private record Injector(Target target, Source source)
- implements Comparable> {
-
- private static final Comparator> COMPARATOR = Comparator
- .comparingInt((ToIntFunction>) injector -> injector.target.type().order)
- .thenComparingInt(injector -> injector.source.type().order)
- .thenComparingInt(injector -> injector.source.order());
-
- public void inject(T instance, MCRInstanceConfiguration configuration) {
- Object value = source.get(configuration, target);
- if (value != null) {
- target.set(instance, value);
- }
- }
-
- @Override
- public int compareTo(Injector other) {
- return COMPARATOR.compare(this, other);
- }
-
- }
-
- public enum Option {
-
- /**
- * If a class is required to be in the configuration properties (for example, because of usage of
- * {@link MCRConfiguration2#getInstanceOfOrThrow(Class, String)} or because of an annotation with required=true)
- * and the expected super class is a final class (i.e. if the class name that has to be present in the
- * properties could ever be only exactly the class name of that final class), add corresponding entries to the
- * properties during instantiation, if not present anyway.
- */
- ADD_IMPLICIT_CLASS_PROPERTIES;
-
- }
-
-}
diff --git a/mycore-base/src/main/java/org/mycore/common/config/MCRConfiguration2.java b/mycore-base/src/main/java/org/mycore/common/config/MCRConfiguration2.java
index e7ee5aa3f8..2edf019055 100644
--- a/mycore-base/src/main/java/org/mycore/common/config/MCRConfiguration2.java
+++ b/mycore-base/src/main/java/org/mycore/common/config/MCRConfiguration2.java
@@ -18,7 +18,10 @@
package org.mycore.common.config;
+import static org.mycore.common.config.instantiator.MCRInstanceConfiguration.ofName;
+
import java.util.Collections;
+import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
@@ -32,8 +35,15 @@
import java.util.stream.Stream;
import org.mycore.common.MCRClassTools;
+import org.mycore.common.config.instantiator.MCRInstanceConfiguration;
+import org.mycore.common.config.instantiator.MCRInstanceConfiguration.Option;
+import org.mycore.common.config.instantiator.MCRInstanceConfiguration.Options;
+import org.mycore.common.config.instantiator.MCRInstanceName;
+import org.mycore.common.config.instantiator.MCRInstanceName.Suffix;
import org.mycore.common.function.MCRTriConsumer;
+import jakarta.inject.Singleton;
+
/**
* Provides methods to manage and read all configuration properties from the MyCoRe configuration files.
* The Properties used by this class are used from {@link MCRConfigurationBase}.
@@ -81,7 +91,7 @@
* @since 2018.05
*/
// because of intrusive test case org.mycore.common.config.MCRConfigurationTest.testSingletonMapGet
-@SuppressWarnings("PMD.MutableStaticState")
+@SuppressWarnings("PMD.MutableStaticState")
public class MCRConfiguration2 {
private static final Map LISTENERS = new ConcurrentHashMap<>();
@@ -131,16 +141,7 @@ public static Map getSubPropertiesMap(String propertyPrefix) {
* @throws MCRConfigurationException if the class can not be loaded or instantiated
*/
public static Optional getInstanceOf(Class superClass, String name) throws MCRConfigurationException {
- return getInstanceOf(superClass, name, MCRConfigurableInstanceHelper.NO_OPTIONS);
- }
-
- private static Optional getInstanceOf(Class superClass, String name,
- Set options) {
- if (MCRConfigurableInstanceHelper.isSingleton(superClass)) {
- return getSingleInstanceOf(superClass, name, options);
- } else {
- return MCRConfigurableInstanceHelper.getInstance(superClass, name, options);
- }
+ return getInstanceOf(superClass, name, Options.NONE);
}
/**
@@ -153,7 +154,7 @@ private static Optional getInstanceOf(Class superClass, String name,
* or the configuration property is not set
*/
public static S getInstanceOfOrThrow(Class superClass, String name) throws MCRConfigurationException {
- return getInstanceOf(superClass, name, MCRConfigurableInstanceHelper.ADD_IMPLICIT_CLASS_PROPERTIES)
+ return getInstanceOf(superClass, name, Options.IMPLICIT)
.orElseThrow(() -> createConfigurationException(name));
}
@@ -167,15 +168,7 @@ public static S getInstanceOfOrThrow(Class superClass, String name) throw
* @throws MCRConfigurationException if the class can not be loaded or instantiated
*/
public static Optional getSingleInstanceOf(Class superClass, String name) {
- return getSingleInstanceOf(superClass, name, MCRConfigurableInstanceHelper.NO_OPTIONS);
- }
-
- private static Optional getSingleInstanceOf(Class superClass, String name,
- Set options) {
- return getString(name)
- .map(className -> new ConfigSingletonKey(name, className))
- .map(key -> (S) instanceHolder.computeIfAbsent(key,
- k -> MCRConfigurableInstanceHelper.getInstance(superClass, name, options).orElse(null)));
+ return getSingleInstanceOf(superClass, name, Options.NONE);
}
/**
@@ -189,17 +182,51 @@ private static Optional getSingleInstanceOf(Class superClass, String n
* or the configuration property is not set
*/
public static S getSingleInstanceOfOrThrow(Class superClass, String name) {
- return getSingleInstanceOf(superClass, name, MCRConfigurableInstanceHelper.ADD_IMPLICIT_CLASS_PROPERTIES)
+ return getSingleInstanceOf(superClass, name, Options.IMPLICIT)
.orElseThrow(() -> createConfigurationException(name));
}
+ private static Optional getInstanceOf(Class superClass, String name, Set options) {
+ if (isSingleton(superClass)) {
+ return getSingleInstanceOf(superClass, name, options);
+ }
+ return getInstantiableConfiguration(superClass, name, options).map(MCRInstanceConfiguration::instantiate);
+
+ }
+
+ @SuppressWarnings("unchecked")
+ private static Optional getSingleInstanceOf(Class superClass, String name, Set options) {
+ return getInstantiableConfiguration(superClass, name, options).map(
+ configuration -> {
+ SingletonKey key = new ConfigSingletonKey(name, configuration.valueClass().getName());
+ return (S) instanceHolder.computeIfAbsent(key, _ -> configuration.instantiate());
+ });
+ }
+
+ private static Optional> getInstantiableConfiguration(Class superClass,
+ String name, Set options) {
+ MCRInstanceConfiguration configuration = ofName(superClass, name, getPropertiesMap(), options);
+ return configuration.instantiatable() ? Optional.of(configuration) : Optional.empty();
+
+ }
+
+ /**
+ * Checks if a class is annotated with {@link Singleton}.
+ *
+ * @param targetClass the class
+ * @return true if the class in the property is annotated with {@link Singleton}
+ */
+ public static boolean isSingleton(Class targetClass) {
+ return targetClass.getDeclaredAnnotation(Singleton.class) != null;
+ }
+
/**
* Loads a Java Class defined in property name.
* @param name Name of the property
* @param Supertype of class defined in name
- * @return Optional of Class asignable to <T>
+ * @return Optional of Class assignable to <T>
* @throws MCRConfigurationException
- * if the the class can not be loaded or instantiated
+ * if the class can not be loaded or instantiated
*/
public static Optional> getClass(String name) throws MCRConfigurationException {
return getString(name).map(MCRConfiguration2::getClassObject);
@@ -425,7 +452,8 @@ public static boolean removePropertyChangeEventListener(UUID uuid) {
}
public static S instantiateClass(Class superClass, String className) {
- return MCRConfigurableInstanceHelper.getInstance(superClass, MCRInstanceConfiguration.ofClass(className));
+ return MCRInstanceConfiguration.ofClassName(superClass, className, "MCR.AnonymousInstance." + className,
+ Suffix.UPPER_CASE, new HashMap<>(), getPropertiesMap()).instantiate();
}
public static Stream instantiateClasses(Class superClass, String propertyName) {
@@ -445,11 +473,11 @@ private static Class getClassObject(String classname) {
private static class EventListener {
- private Predicate keyPredicate;
+ private final Predicate keyPredicate;
- private MCRTriConsumer, Optional> listener;
+ private final MCRTriConsumer, Optional> listener;
- private UUID uuid;
+ private final UUID uuid;
EventListener(Predicate keyPredicate,
MCRTriConsumer, Optional> listener) {
diff --git a/mycore-base/src/main/java/org/mycore/common/config/MCRConfigurationBase.java b/mycore-base/src/main/java/org/mycore/common/config/MCRConfigurationBase.java
index f8cab370ab..22cd9971c2 100644
--- a/mycore-base/src/main/java/org/mycore/common/config/MCRConfigurationBase.java
+++ b/mycore-base/src/main/java/org/mycore/common/config/MCRConfigurationBase.java
@@ -258,11 +258,6 @@ public static synchronized void initialize(Map deprecated, MapMCR.Foo.Bar.
*/
String defaultName() default "";
-
+
/**
* @return The {@link MCRSentinel} for the configured properties.
*/
diff --git a/mycore-base/src/main/java/org/mycore/common/config/annotation/MCRRawProperties.java b/mycore-base/src/main/java/org/mycore/common/config/annotation/MCRRawProperties.java
index d2de781cc2..7495bec9a1 100644
--- a/mycore-base/src/main/java/org/mycore/common/config/annotation/MCRRawProperties.java
+++ b/mycore-base/src/main/java/org/mycore/common/config/annotation/MCRRawProperties.java
@@ -18,14 +18,14 @@
package org.mycore.common.config.annotation;
-import org.mycore.common.config.MCRConfigurationException;
-
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import org.mycore.common.config.MCRConfigurationException;
+
/**
* This annotation is used to mark fields or methods that should be set to or called with
* a map of string values from the configuration properties.
diff --git a/mycore-base/src/main/java/org/mycore/common/config/MCRInstanceConfiguration.java b/mycore-base/src/main/java/org/mycore/common/config/instantiator/MCRInstanceConfiguration.java
similarity index 56%
rename from mycore-base/src/main/java/org/mycore/common/config/MCRInstanceConfiguration.java
rename to mycore-base/src/main/java/org/mycore/common/config/instantiator/MCRInstanceConfiguration.java
index f10d9c66ac..469e03656c 100644
--- a/mycore-base/src/main/java/org/mycore/common/config/MCRInstanceConfiguration.java
+++ b/mycore-base/src/main/java/org/mycore/common/config/instantiator/MCRInstanceConfiguration.java
@@ -16,19 +16,28 @@
* along with MyCoRe. If not, see