replace deprecated API for 2024.06 #85

MyCoRe-Org · Oct 14, 2024 · 51175e5 · 51175e5
1 parent b1cdc3e
commit 51175e5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/...n-module/src/main/java/org/mycore/jspdocportal/common/MCRHibernateTransactionWrapper.java b/...n-module/src/main/java/org/mycore/jspdocportal/common/MCRHibernateTransactionWrapper.java
@@ -56,7 +56,11 @@ public void close() throws MCRException {
             EntityTransaction et = MCREntityManagerProvider.getCurrentEntityManager().getTransaction();
             et.commit();
             */
-            MCRTransactionHelper.commitTransaction();
+            if (MCRTransactionHelper.transactionRequiresRollback()) {
+                MCRTransactionHelper.rollbackTransaction();
+            } else {
+                MCRTransactionHelper.commitTransaction();
+            }
         }
     }
 }
diff --git a/...ycore/jspdocportal/common/bpmn/workflows/create_object_simple/MCRAbstractWorkflowMgr.java b/...ycore/jspdocportal/common/bpmn/workflows/create_object_simple/MCRAbstractWorkflowMgr.java
@@ -240,7 +240,7 @@ public boolean commitMCRObject(DelegateExecution execution) {
                 for (String flag : mcrWFObj.getService().getFlags("mcr-delete:doctype")) {
                     mcrObj.getService().addFlag("mcr-delete:doctype", flag);
                 }
-                if ("deleted".equals(mcrWFObj.getService().getState().getID())) {
+                if ("deleted".equals(mcrWFObj.getService().getState().getId())) {
                     mcrObj.getService().setState(new MCRCategoryID(
                         MCRConfiguration2.getString("MCR.Metadata.Service.State.Classification.ID").orElse("state"),
                         "deleted"));
@@ -335,7 +335,7 @@ private boolean resetMetadataAndCleanupWorkflowDir(MCRObjectID mcrObjID) {
                         LOGGER.error(mpe);
                     }
                     if (derObj != null && derObj.getService().getState() != null) {
-                        String state = derObj.getService().getState().getID();
+                        String state = derObj.getService().getState().getId();
                         if (state.equals("new")) {
                             MCRMetadataManager.delete(derObj);
                         } else {
@@ -354,7 +354,7 @@ private boolean resetMetadataAndCleanupWorkflowDir(MCRObjectID mcrObjID) {
 
                 mcrObj = MCRMetadataManager.retrieveMCRObject(mcrObjID);
                 if (mcrObj.getService().getState() != null &&
-                    "new".equals(mcrObj.getService().getState().getID())) {
+                    "new".equals(mcrObj.getService().getState().getId())) {
                     MCRMetadataManager.delete(mcrObj);
                 } else {
                     mcrObj.getService().removeFlags("editedby");
@@ -380,7 +380,7 @@ private void processDerivatesOnLoad(MCRObject mcrObj) {
             if (mcrDerID != null && MCRMetadataManager.exists(mcrDerID)) {
                 MCRDerivate mcrDer = MCRMetadataManager.retrieveMCRDerivate(mcrDerID);
                 if (mcrDer.getService().getState() == null
-                    || "new|published".contains(mcrDer.getService().getState().getID())) {
+                    || "new|published".contains(mcrDer.getService().getState().getId())) {
                     mcrDer.getService().removeFlags("editedby");
                     mcrDer.getService().addFlag("editedby", MCRUserManager.getCurrentUser().getUserID());
                 }
@@ -427,12 +427,12 @@ private void processDerivatesOnCommit(MCRObject mcrObj, MCRObject mcrWFObj) {
             MCRDerivate der = MCRBPMNUtils.loadMCRDerivateFromWorkflowDirectory(mcrObj.getId(),
                 MCRObjectID.getInstance(derID));
             der.setOrder(wfDerivateIDs.indexOf(derID) + 1);
-            if ("deleted".equals(mcrObj.getService().getState().getID())) {
+            if ("deleted".equals(mcrObj.getService().getState().getId())) {
                 der.getService().setState(new MCRCategoryID(
                     MCRConfiguration2.getString("MCR.Metadata.Service.State.Classification.ID").orElse("state"),
                     "deleted"));
             } else if (der.getService().getState() == null
-                || "new|review".contains(der.getService().getState().getID())) {
+                || "new|review".contains(der.getService().getState().getId())) {
                 der.getService().setState(new MCRCategoryID(
                     MCRConfiguration2.getString("MCR.Metadata.Service.State.Classification.ID").orElse("state"),
                     "published"));

diff --git a/...odule/src/main/java/org/mycore/jspdocportal/common/controller/MCRStartEditController.java b/...odule/src/main/java/org/mycore/jspdocportal/common/controller/MCRStartEditController.java
@@ -47,7 +47,7 @@ public Response defaultRes(@QueryParam("mcrid") String mcrid, @QueryParam("mode"
                 if (MCRAccessManager.checkPermission(mcrid, "writedb")) {
                     MCRObjectID mcrObjID = MCRObjectID.getInstance(mcrid);
                     MCRObject mcrObj = MCRMetadataManager.retrieveMCRObject(mcrObjID);
-                    if (Arrays.asList("published", "deleted", "reserved").contains(mcrObj.getService().getState().getID())) {
+                    if (Arrays.asList("published", "deleted", "reserved").contains(mcrObj.getService().getState().getId())) {
                     	//String mode = retrieveModeFromMetadata(mcrObj);
                     	//TODO validate mode
                         Map<String, Object> variables = new HashMap<String, Object>();

diff --git a/.../java/org/mycore/jspdocportal/common/controller/workspace/MCRShowWorkspaceController.java b/.../java/org/mycore/jspdocportal/common/controller/workspace/MCRShowWorkspaceController.java
@@ -1,7 +1,6 @@
 package org.mycore.jspdocportal.common.controller.workspace;
 
 import java.io.ByteArrayOutputStream;
-import java.io.StringWriter;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
@@ -10,13 +9,13 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.TreeSet;
 
 import javax.xml.transform.TransformerFactory;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.camunda.bpm.engine.RuntimeService;
@@ -67,8 +66,8 @@
 public class MCRShowWorkspaceController {
     private static Logger LOGGER = LogManager.getLogger(MCRShowWorkspaceController.class);
 
-    private MCRMODSCatalogService modsCatService = (MCRMODSCatalogService) MCRConfiguration2
-        .getInstanceOf("MCR.Workflow.MODSCatalogService.class").orElse(null);
+    private MCRMODSCatalogService modsCatService = MCRConfiguration2
+        .getInstanceOf(MCRMODSCatalogService.class, "MCR.Workflow.MODSCatalogService.class").orElse(null);
 
     @POST
     public Response submitForm(@Context HttpServletRequest request) {
@@ -396,7 +395,7 @@ private void updateWFObjectMetadata(Task t) {
             LOGGER.error(e);
             txt = e.getMessage();
         }
-        ts.setVariable(t.getId(), MCRBPMNMgr.WF_VAR_DISPLAY_RECORD_IDENTIFIER, StringUtils.defaultString(txt, ""));
+        ts.setVariable(t.getId(), MCRBPMNMgr.WF_VAR_DISPLAY_RECORD_IDENTIFIER, Objects.toString(txt, ""));
 
         //Persistent Identifier (URN für Pica)
         try {
@@ -408,7 +407,7 @@ private void updateWFObjectMetadata(Task t) {
             LOGGER.error(e);
             txt = e.getMessage();
         }
-        ts.setVariable(t.getId(), MCRBPMNMgr.WF_VAR_DISPLAY_PERSISTENT_IDENTIFIER, StringUtils.defaultString(txt, ""));
+        ts.setVariable(t.getId(), MCRBPMNMgr.WF_VAR_DISPLAY_PERSISTENT_IDENTIFIER, Objects.toString(txt, ""));
 
         // LicenceInfo ... TODO MOVE TO XSLT for Description
         ts.setVariable(t.getId(), MCRBPMNMgr.WF_VAR_DISPLAY_LICENCE_HTML, "");