Skip to content

MCR-3600 Turn MCRXMLMetadataManager into an interface #2796

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

Open
toKrause wants to merge 4 commits into
base: main
Choose a base branch
from
Open

MCR-3600 Turn MCRXMLMetadataManager into an interface #2796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
25bc361
MCR-3600 turn MCRXMLMetadataManager into an interface
toKrause Jan 29, 2026
08e422b
MCR-3600 rename getInstance to obtainInstance to satisfy PMD rules
toKrause Jan 29, 2026
da2b020
MCR-3600 allow legacy features annotated with @Deprecated
toKrause Jan 29, 2026
269cd9a
MCR-3600 fix checkstyle issues
toKrause Jan 29, 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/access/mcrimpl/MCRAccessStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public Collection<MCRAccessDefinition> getDefinition(String type) {
Collection<String> elements;

if (MCRConfiguration2.getOrThrow("MCR.Metadata.Type." + type, Boolean::parseBoolean)) {
elements = MCRXMLMetadataManager.getInstance().listIDsOfType(type);
elements = MCRXMLMetadataManager.obtainInstance().listIDsOfType(type);
} else {
return Collections.emptySet();
}
Expand Down
2 changes: 1 addition & 1 deletion mycore-base/src/main/java/org/mycore/access/strategies/MCRParentRuleStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public boolean checkPermission(String id, String permission) {
private static String getParentID(String objectID) {
Document parentDoc;
try {
parentDoc = MCRXMLMetadataManager.getInstance().retrieveXML(MCRObjectID.getInstance(objectID));
parentDoc = MCRXMLMetadataManager.obtainInstance().retrieveXML(MCRObjectID.getInstance(objectID));
} catch (IOException | JDOMException e) {
LOGGER.error("Could not read object: {}", objectID, e);
return null;
Expand Down
8 changes: 4 additions & 4 deletions mycore-base/src/main/java/org/mycore/common/xml/MCRURIResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ public Source resolve(String href, String base) throws TransformerException {

MCRObjectID mcrid = MCRObjectID.getInstance(id);
try {
MCRXMLMetadataManager xmlmm = MCRXMLMetadataManager.getInstance();
MCRXMLMetadataManager xmlmm = MCRXMLMetadataManager.obtainInstance();

MCRContent content;
if (params.containsKey("r")) {
Expand Down Expand Up @@ -795,7 +795,7 @@ private static boolean shouldSortCategories(String classId) {
}

private static long getSystemLastModified() {
long xmlLastModified = MCRXMLMetadataManager.getInstance().getLastModified();
long xmlLastModified = MCRXMLMetadataManager.obtainInstance().getLastModified();
long classLastModified = dao.getLastModified();
return Math.max(xmlLastModified, classLastModified);
}
Expand Down Expand Up @@ -1509,7 +1509,7 @@ public Source resolve(String href, String base) throws TransformerException {
String id = href.substring(href.indexOf(':') + 1);
LOGGER.debug("Reading version info of MCRObject with ID {}", id);
MCRObjectID mcrId = MCRObjectID.getInstance(id);
MCRXMLMetadataManager metadataManager = MCRXMLMetadataManager.getInstance();
MCRXMLMetadataManager metadataManager = MCRXMLMetadataManager.obtainInstance();
try {
List<? extends MCRAbstractMetadataVersion<?>> versions = metadataManager.listRevisions(mcrId);
if (versions != null && !versions.isEmpty()) {
Expand Down Expand Up @@ -1564,7 +1564,7 @@ public Source resolve(String href, String base) throws TransformerException {
MCRObjectID mcrId = MCRObjectID.getInstance(parts[parts.length - 1]);
LOGGER.info("Resolving deleted object {}", mcrId);
try {
MCRContent lastPresentVersion = MCRXMLMetadataManager.getInstance().retrieveContent(mcrId);
MCRContent lastPresentVersion = MCRXMLMetadataManager.obtainInstance().retrieveContent(mcrId);
if (lastPresentVersion == null) {
LOGGER.warn("Could not resolve deleted object {}", mcrId);
return new JDOMSource(MCRObjectFactory.getSampleObject(mcrId));
Expand Down
2 changes: 1 addition & 1 deletion mycore-base/src/main/java/org/mycore/datamodel/common/MCRCreatorCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public String load(final MCRObjectID objectId) {
return null;
}).orElseGet(() -> {
try {
return Optional.ofNullable(MCRXMLMetadataManager.getInstance().listRevisions(objectId))
return Optional.ofNullable(MCRXMLMetadataManager.obtainInstance().listRevisions(objectId))
.map(versions -> versions.stream()
.sorted(
Collections
Expand Down
4 changes: 2 additions & 2 deletions mycore-base/src/main/java/org/mycore/datamodel/common/MCRDefaultObjectIDGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public synchronized MCRObjectID getLastID(String baseId) {

@Override
public Collection<String> getBaseIDs() {
return MCRXMLMetadataManager.getInstance().getObjectBaseIds();
return MCRXMLMetadataManager.obtainInstance().getObjectBaseIds();
}

/**
Expand All @@ -111,7 +111,7 @@ public Collection<String> getBaseIDs() {
*/
private int getLastIDNumber(String baseId) {
int lastIDKnown = lastNumber.getOrDefault(baseId, 0);
int highestStoredID = MCRXMLMetadataManager.getInstance().getHighestStoredID(baseId);
int highestStoredID = MCRXMLMetadataManager.obtainInstance().getHighestStoredID(baseId);

return Math.max(lastIDKnown, highestStoredID);
}
Expand Down
Loading