Skip to content

MCR-3699 Change MCRSentinel from nested into top-level annotation #2936

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
toKrause wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

MCR-3699 Change MCRSentinel from nested into top-level annotation #2936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2b6841
MCR-3650 refactor MCRConfigurableInstanceHelper into multiple classes
toKrause Mar 16, 2026
5e1d7d1
MCR-3668 remove MCRConfigurableInstanceHelper, move value-class deter…
toKrause Apr 7, 2026
a0c1da6
MCR-3699 change MCRSentinel from nested into top-level annotation
toKrause May 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mycore-base/src/main/java/org/mycore/backend/jpa/MCRJPAConfigurationCheck.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
import org.hibernate.jpa.boot.spi.PersistenceUnitDescriptor;
import org.hibernate.jpa.boot.spi.PersistenceXmlParser;
import org.mycore.common.config.MCRConfiguration2;
import org.mycore.common.config.MCRInstanceName;
import org.mycore.common.config.instantiator.MCRInstanceName;
import org.mycore.common.events.MCRStartupHandler.AutoExecutable;
import org.mycore.resource.MCRResourceResolver;
import org.mycore.resource.provider.MCRResourceProvider;
Expand Down
4 changes: 2 additions & 2 deletions mycore-base/src/main/java/org/mycore/common/MCRBasicObjectExpander.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,8 @@ private void expandClassifications(MCRObject mcrObject) {

public static final class Factory implements Supplier<MCRBasicObjectExpander> {

@MCRInstance(name = CLASSIFICATION_MAPPER_KEY, valueClass = MCRClassificationMapper.class, required = false,
sentinel = @MCRSentinel)
@MCRSentinel
@MCRInstance(name = CLASSIFICATION_MAPPER_KEY, valueClass = MCRClassificationMapper.class, required = false)
public MCRClassificationMapper classificationMapper;

@Override
Expand Down
12 changes: 5 additions & 7 deletions mycore-base/src/main/java/org/mycore/common/MCRClassTools.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,20 +51,18 @@ public static Object loadClassFromURL(File file, String className)

/**
* Loads a class via default ClassLoader or <code>Thread.currentThread().getContextClassLoader()</code>.
* @param classname Name of class
* @param className Name of class
* @param <T> Type of Class
* @return the initialized class
* @throws ClassNotFoundException if both ClassLoader cannot load the Class
*/
public static <T> Class<? extends T> forName(String classname) throws ClassNotFoundException {
@SuppressWarnings("unchecked")
Class<? extends T> forName;
@SuppressWarnings("unchecked")
public static <T> Class<? extends T> forName(String className) throws ClassNotFoundException {
try {
forName = (Class<? extends T>) Class.forName(classname);
return (Class<? extends T>) Class.forName(className);
} catch (ClassNotFoundException cnfe) {
forName = (Class<? extends T>) Class.forName(classname, true, extendedClassLoader);
return (Class<? extends T>) Class.forName(className, true, extendedClassLoader);
}
return forName;
}

/**
Expand Down
4 changes: 2 additions & 2 deletions mycore-base/src/main/java/org/mycore/common/MCRJSONManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ public GsonBuilder createGsonBuilder() {

public static class Factory implements Supplier<MCRJSONManager> {

@MCRInstanceMap(name = TYPE_ADAPTERS_KEY, valueClass = MCRJSONTypeAdapter.class, required = false,
sentinel = @MCRSentinel)
@MCRSentinel
@MCRInstanceMap(name = TYPE_ADAPTERS_KEY, valueClass = MCRJSONTypeAdapter.class, required = false)
public Map<String, MCRJSONTypeAdapter<?>> typeAdapters;

@Override
Expand Down
3 changes: 2 additions & 1 deletion mycore-base/src/main/java/org/mycore/common/MCRUserInformationResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,8 @@ public static String getSpecification(String schema, String userId) {

public static class Factory implements Supplier<MCRUserInformationResolver> {

@MCRInstanceMap(name = PROVIDERS_KEY, valueClass = MCRUserInformationProvider.class, sentinel = @MCRSentinel)
@MCRSentinel
@MCRInstanceMap(name = PROVIDERS_KEY, valueClass = MCRUserInformationProvider.class)
public Map<String, MCRUserInformationProvider> providers;

@Override
Expand Down
Loading
Loading