diff --git a/Kitodo-API/src/main/java/org/kitodo/constants/StringConstants.java b/Kitodo-API/src/main/java/org/kitodo/constants/StringConstants.java index 71c4d3392c5..e53b699ee36 100644 --- a/Kitodo-API/src/main/java/org/kitodo/constants/StringConstants.java +++ b/Kitodo-API/src/main/java/org/kitodo/constants/StringConstants.java @@ -13,6 +13,8 @@ public class StringConstants { + public static final String KITODO = "kitodo"; + public static final String COMMA_DELIMITER = ", "; public static final String SEMICOLON_DELIMITER = "; "; public static final String EDIT_FORM_SAVE = "editForm:save"; diff --git a/Kitodo-DataEditor/src/main/java/org/kitodo/dataeditor/MetsKitodoNamespacePrefixMapper.java b/Kitodo-DataEditor/src/main/java/org/kitodo/dataeditor/MetsKitodoNamespacePrefixMapper.java index 3eeb9cd117b..51ae7bb1877 100644 --- a/Kitodo-DataEditor/src/main/java/org/kitodo/dataeditor/MetsKitodoNamespacePrefixMapper.java +++ b/Kitodo-DataEditor/src/main/java/org/kitodo/dataeditor/MetsKitodoNamespacePrefixMapper.java @@ -11,6 +11,8 @@ package org.kitodo.dataeditor; +import static org.kitodo.constants.StringConstants.KITODO; + import com.sun.xml.bind.marshaller.NamespacePrefixMapper; /** @@ -26,7 +28,6 @@ public class MetsKitodoNamespacePrefixMapper extends NamespacePrefixMapper { private static final String XLINK_PREFIX = "xlink"; private static final String XLINK_URI = "http://www.w3.org/1999/xlink"; - private static final String KITODO_PREFIX = "kitodo"; private static final String KITODO_URI = "http://meta.kitodo.org/v1/"; @Override @@ -36,7 +37,7 @@ public String getPreferredPrefix(String namespaceUri, String suggestion, boolean } else if (XLINK_URI.equals(namespaceUri)) { return XLINK_PREFIX; } else if (KITODO_URI.equals(namespaceUri)) { - return KITODO_PREFIX; + return KITODO; } return suggestion; } diff --git a/Kitodo-DataEditor/src/test/java/org/kitodo/dataeditor/MetsKitodoNamespacePrefixMapperTest.java b/Kitodo-DataEditor/src/test/java/org/kitodo/dataeditor/MetsKitodoNamespacePrefixMapperTest.java index fea0a2c32f0..d2e719efe31 100644 --- a/Kitodo-DataEditor/src/test/java/org/kitodo/dataeditor/MetsKitodoNamespacePrefixMapperTest.java +++ b/Kitodo-DataEditor/src/test/java/org/kitodo/dataeditor/MetsKitodoNamespacePrefixMapperTest.java @@ -11,6 +11,8 @@ package org.kitodo.dataeditor; +import static org.kitodo.constants.StringConstants.KITODO; + import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; @@ -24,7 +26,7 @@ public void shouldReturnPrefix() { String preferredMetsPrefix = mapper.getPreferredPrefix("http://www.loc.gov/METS/", null, true); String preferredXlinkPrefix = mapper.getPreferredPrefix("http://www.w3.org/1999/xlink", null, true); String notExistingPrefix = mapper.getPreferredPrefix("http://not.existing", "return this", true); - assertEquals("kitodo", preferredKitodoPrefix, "Prefix mapper return the wrong prefix for kitodo uri"); + assertEquals(KITODO, preferredKitodoPrefix, "Prefix mapper return the wrong prefix for kitodo uri"); assertEquals("mets", preferredMetsPrefix, "Prefix mapper return the wrong prefix for mets uri"); assertEquals("xlink", preferredXlinkPrefix, "Prefix mapper return the wrong prefix for xlink uri"); assertEquals("return this", notExistingPrefix, "Prefix mapper return the wrong prefix for not existing uri"); diff --git a/Kitodo-DataEditor/src/test/java/org/kitodo/dataeditor/ruleset/RulesetManagementIT.java b/Kitodo-DataEditor/src/test/java/org/kitodo/dataeditor/ruleset/RulesetManagementIT.java index fefdfc340b8..9d66c8473e7 100644 --- a/Kitodo-DataEditor/src/test/java/org/kitodo/dataeditor/ruleset/RulesetManagementIT.java +++ b/Kitodo-DataEditor/src/test/java/org/kitodo/dataeditor/ruleset/RulesetManagementIT.java @@ -11,6 +11,9 @@ package org.kitodo.dataeditor.ruleset; +import static org.kitodo.constants.StringConstants.CREATE; +import static org.kitodo.constants.StringConstants.EDIT; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.anyOf; import static org.hamcrest.Matchers.contains; @@ -1101,7 +1104,7 @@ public void testReimportOfMetadataModesCreate() throws Exception { imported.add(newMetadataEntry("metadataToKeepExceptInEditing", "value not to replace")); // 0 imported.add(newMetadataEntry("metadataThatIsNew", "new value")); // 1 - int numAdded = underTest.updateMetadata("division", metadata, "create", imported); + int numAdded = underTest.updateMetadata("division", metadata, CREATE, imported); assertEquals(5, numAdded); List defaultReplace = metadata.stream() @@ -1163,7 +1166,7 @@ public void testReimportOfMetadataModesEdit() throws Exception { imported.add(newMetadataEntry("metadataToAddDuringCreationAndKeepLater", "value not to replace")); // 0 imported.add(newMetadataEntry("metadataToKeepExceptInEditing", "replaced value")); // -1 - int numAdded = underTest.updateMetadata("division", metadata, "edit", imported); + int numAdded = underTest.updateMetadata("division", metadata, EDIT, imported); assertEquals(-1, numAdded); List keepLater = metadata.stream() diff --git a/Kitodo-DataFormat/src/main/java/org/kitodo/dataformat/access/DivXmlElementAccess.java b/Kitodo-DataFormat/src/main/java/org/kitodo/dataformat/access/DivXmlElementAccess.java index df63a7350e7..a95d6b87d31 100644 --- a/Kitodo-DataFormat/src/main/java/org/kitodo/dataformat/access/DivXmlElementAccess.java +++ b/Kitodo-DataFormat/src/main/java/org/kitodo/dataformat/access/DivXmlElementAccess.java @@ -11,6 +11,8 @@ package org.kitodo.dataformat.access; +import static org.kitodo.constants.StringConstants.KITODO; + import java.math.BigInteger; import java.net.URI; import java.nio.charset.StandardCharsets; @@ -58,7 +60,7 @@ public class DivXmlElementAccess extends LogicalDivision { * The qualified name of the Kitodo metadata format, needed to assemble the * metadata entries in METS using JAXB. */ - private static final QName KITODO_QNAME = new QName("http://meta.kitodo.org/v1/", "kitodo"); + private static final QName KITODO_QNAME = new QName("http://meta.kitodo.org/v1/", KITODO); /** * Some magic numbers that are used in the METS XML file representation of diff --git a/Kitodo-DataManagement/src/main/java/org/kitodo/data/elasticsearch/Index.java b/Kitodo-DataManagement/src/main/java/org/kitodo/data/elasticsearch/Index.java index 8c35d4ab548..abf86cc83fc 100644 --- a/Kitodo-DataManagement/src/main/java/org/kitodo/data/elasticsearch/Index.java +++ b/Kitodo-DataManagement/src/main/java/org/kitodo/data/elasticsearch/Index.java @@ -11,6 +11,8 @@ package org.kitodo.data.elasticsearch; +import static org.kitodo.constants.StringConstants.KITODO; + import javax.persistence.Table; import org.kitodo.config.ConfigMain; @@ -31,7 +33,7 @@ public abstract class Index { */ public Index(Class beanClass) { Table table = beanClass.getAnnotation(Table.class); - this.index = ConfigMain.getParameter("elasticsearch.index", "kitodo"); + this.index = ConfigMain.getParameter("elasticsearch.index", KITODO); this.setType(table.name()); } @@ -42,7 +44,7 @@ public Index(Class beanClass) { * as String */ public Index(String type) { - this.index = ConfigMain.getParameter("elasticsearch.index", "kitodo"); + this.index = ConfigMain.getParameter("elasticsearch.index", KITODO); this.setType(type); } diff --git a/Kitodo/src/main/java/org/kitodo/config/ConfigProject.java b/Kitodo/src/main/java/org/kitodo/config/ConfigProject.java index edf95abc99a..56f247bc8b3 100644 --- a/Kitodo/src/main/java/org/kitodo/config/ConfigProject.java +++ b/Kitodo/src/main/java/org/kitodo/config/ConfigProject.java @@ -11,6 +11,8 @@ package org.kitodo.config; +import static org.kitodo.constants.StringConstants.KITODO; + import de.unigoettingen.sub.search.opac.ConfigOpac; import java.io.IOException; @@ -142,7 +144,7 @@ public String getOpacCatalog() { * @return tif definition as String */ public String getTifDefinition() throws DoctypeMissingException { - return getParamString("tifheader." + getDocType(), "kitodo"); + return getParamString("tifheader." + getDocType(), KITODO); } /** diff --git a/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/CreateProcessForm.java b/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/CreateProcessForm.java index 8940db6b080..61a9858c4da 100644 --- a/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/CreateProcessForm.java +++ b/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/CreateProcessForm.java @@ -11,6 +11,8 @@ package org.kitodo.production.forms.createprocess; +import static org.kitodo.constants.StringConstants.CREATE; + import java.io.IOException; import java.net.URI; import java.text.MessageFormat; @@ -92,7 +94,6 @@ public class CreateProcessForm extends BaseForm implements MetadataTreeTableInte private RulesetManagementInterface rulesetManagement; private final List priorityList; - private final String acquisitionStage = "create"; private Project project; private Template template; private LinkedList processes = new LinkedList<>(); @@ -174,7 +175,7 @@ private List getAllRulesetDivisions() { */ @Override public String getAcquisitionStage() { - return acquisitionStage; + return CREATE; } /** @@ -419,7 +420,7 @@ private String parentTypeIfForbidden() throws IOException { } else { String parentType = logicalDivision.getType(); StructuralElementViewInterface divisionView = rulesetManagement.getStructuralElementView(parentType, - acquisitionStage, priorityList); + CREATE, priorityList); if (divisionView.getAllowedSubstructuralElements().containsKey(processDataTab.getDocType())) { return null; } else { @@ -595,8 +596,8 @@ private void saveChildProcessLinks() throws IOException, DataException { private void processChildren() { // set parent relations between main process and its imported child processes! try { - ImportService.processProcessChildren(getMainProcess(), childProcesses, rulesetManagement, - acquisitionStage, priorityList); + ImportService.processProcessChildren(getMainProcess(), childProcesses, rulesetManagement, CREATE, + priorityList); } catch (DataException | InvalidMetadataValueException | NoSuchMetadataFieldException | ProcessGenerationException | IOException e) { Helper.setErrorMessage("Unable to attach child documents to process: " + e.getMessage()); @@ -620,7 +621,7 @@ private void processAncestors() throws ProcessGenerationException { private void processTempProcess(TempProcess tempProcess) throws ProcessGenerationException { try { tempProcess.getProcessMetadata().preserve(); - ImportService.processTempProcess(tempProcess, rulesetManagement, acquisitionStage, priorityList, null); + ImportService.processTempProcess(tempProcess, rulesetManagement, CREATE, priorityList, null); } catch (InvalidMetadataValueException | NoSuchMetadataFieldException e) { throw new ProcessGenerationException("Error creating process hierarchy: invalid metadata found!"); } catch (RulesetNotFoundException e) { @@ -637,11 +638,11 @@ private void saveProcessHierarchyMetadata() { if (this.processes.indexOf(tempProcess) == 0) { tempProcess.getProcessMetadata().preserve(); } - ProcessHelper.saveTempProcessMetadata(tempProcess, rulesetManagement, acquisitionStage, priorityList); + ProcessHelper.saveTempProcessMetadata(tempProcess, rulesetManagement, CREATE, priorityList); } // save child processes meta.xml files for (TempProcess tempProcess : this.childProcesses) { - ProcessHelper.saveTempProcessMetadata(tempProcess, rulesetManagement, acquisitionStage, priorityList); + ProcessHelper.saveTempProcessMetadata(tempProcess, rulesetManagement, CREATE, priorityList); } } diff --git a/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/MetadataImportDialog.java b/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/MetadataImportDialog.java index a57b650056f..01f51d09e2b 100644 --- a/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/MetadataImportDialog.java +++ b/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/MetadataImportDialog.java @@ -11,6 +11,8 @@ package org.kitodo.production.forms.createprocess; +import static org.kitodo.constants.StringConstants.CREATE; + import java.io.IOException; import java.util.Collection; import java.util.Collections; @@ -32,7 +34,6 @@ import org.kitodo.production.helper.ProcessHelper; import org.kitodo.production.helper.TempProcess; import org.kitodo.production.services.ServiceManager; -import org.kitodo.production.services.data.ImportService; import org.omnifaces.util.Ajax; import org.primefaces.PrimeFaces; @@ -85,11 +86,10 @@ void attachToExistingParentAndGenerateAtstslIfNotExist(TempProcess tempProcess) if (StringUtils.isBlank(tempProcess.getAtstsl())) { if (Objects.nonNull(parentTempProcess)) { - ProcessHelper.generateAtstslFields(tempProcess, Collections.singletonList(parentTempProcess), - ImportService.ACQUISITION_STAGE_CREATE, true); + ProcessHelper.generateAtstslFields(tempProcess, Collections.singletonList(parentTempProcess), CREATE, + true); } else { - ProcessHelper.generateAtstslFields(tempProcess, null, - ImportService.ACQUISITION_STAGE_CREATE, true); + ProcessHelper.generateAtstslFields(tempProcess, null, CREATE, true); } } } diff --git a/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessFieldedMetadata.java b/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessFieldedMetadata.java index 497cafc5037..4a1132ad829 100644 --- a/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessFieldedMetadata.java +++ b/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessFieldedMetadata.java @@ -11,6 +11,8 @@ package org.kitodo.production.forms.createprocess; +import static org.kitodo.constants.StringConstants.CREATE; + import java.io.Serializable; import java.net.URI; import java.util.ArrayList; @@ -146,7 +148,7 @@ public int addMetadataIfNotExists(Collection potentialMetadataItems) throws InvalidMetadataValueException, NoSuchMetadataFieldException { preserve(); - int count = rulesetService.updateMetadata(division.getType(), metadata, "create", potentialMetadataItems); + int count = rulesetService.updateMetadata(division.getType(), metadata, CREATE, potentialMetadataItems); buildTreeNodeAndCreateMetadataTable(); return count; } diff --git a/Kitodo/src/main/java/org/kitodo/production/forms/dataeditor/DataEditorForm.java b/Kitodo/src/main/java/org/kitodo/production/forms/dataeditor/DataEditorForm.java index eace28839f5..255029f16c9 100644 --- a/Kitodo/src/main/java/org/kitodo/production/forms/dataeditor/DataEditorForm.java +++ b/Kitodo/src/main/java/org/kitodo/production/forms/dataeditor/DataEditorForm.java @@ -11,6 +11,8 @@ package org.kitodo.production.forms.dataeditor; +import static org.kitodo.constants.StringConstants.EDIT; + import java.io.FileNotFoundException; import java.io.IOException; import java.io.OutputStream; @@ -84,12 +86,6 @@ public class DataEditorForm implements MetadataTreeTableInterface, RulesetSetupI private static final Logger logger = LogManager.getLogger(DataEditorForm.class); - /** - * A filter on the rule set depending on the workflow step. So far this is - * not configurable anywhere and is therefore on “edit”. - */ - private final String acquisitionStage; - /** * Backing bean for the add doc struc type dialog. */ @@ -248,7 +244,6 @@ public DataEditorForm() { this.changeDocStrucTypeDialog = new ChangeDocStrucTypeDialog(this); this.editPagesDialog = new EditPagesDialog(this); this.uploadFileDialog = new UploadFileDialog(this); - acquisitionStage = "edit"; } /** @@ -644,7 +639,7 @@ public void deletePhysicalDivision() { @Override public String getAcquisitionStage() { - return acquisitionStage; + return EDIT; } /** diff --git a/Kitodo/src/main/java/org/kitodo/production/forms/massimport/AddMetadataDialog.java b/Kitodo/src/main/java/org/kitodo/production/forms/massimport/AddMetadataDialog.java index 01e911d2afe..6ce3e9fddc1 100644 --- a/Kitodo/src/main/java/org/kitodo/production/forms/massimport/AddMetadataDialog.java +++ b/Kitodo/src/main/java/org/kitodo/production/forms/massimport/AddMetadataDialog.java @@ -11,6 +11,8 @@ package org.kitodo.production.forms.massimport; +import static org.kitodo.constants.StringConstants.CREATE; + import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -34,7 +36,6 @@ public class AddMetadataDialog { private RulesetManagementInterface rulesetManagement; private final List priorityList = ServiceManager.getUserService() .getCurrentMetadataLanguage(); - private final String acquisitionStage = "create"; private List allRulesetDivisions = new ArrayList<>(); AddMetadataDialog(MassImportForm massImportForm) { @@ -71,7 +72,7 @@ public void setRulesetManagement(RulesetManagementInterface rulesetManagement) { /** * Returns the list of selectable metadata types. * - * @return the map of metadata types + * @return the list of metadata types */ public List getAllMetadataTypes() { if (Objects.isNull(metadataTypes)) { @@ -96,7 +97,7 @@ public void prepareMetadataTypes() { private List getDivisions() { return rulesetManagement.getStructuralElements(priorityList).keySet().stream() - .map(key -> rulesetManagement.getStructuralElementView(key, acquisitionStage, priorityList)) + .map(key -> rulesetManagement.getStructuralElementView(key, CREATE, priorityList)) .collect(Collectors.toList()); } diff --git a/Kitodo/src/main/java/org/kitodo/production/helper/metadata/legacytypeimplementations/LegacyLogicalDocStructHelper.java b/Kitodo/src/main/java/org/kitodo/production/helper/metadata/legacytypeimplementations/LegacyLogicalDocStructHelper.java index 045d146b331..26830268749 100644 --- a/Kitodo/src/main/java/org/kitodo/production/helper/metadata/legacytypeimplementations/LegacyLogicalDocStructHelper.java +++ b/Kitodo/src/main/java/org/kitodo/production/helper/metadata/legacytypeimplementations/LegacyLogicalDocStructHelper.java @@ -11,6 +11,8 @@ package org.kitodo.production.helper.metadata.legacytypeimplementations; +import static org.kitodo.constants.StringConstants.EDIT; + import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.Collection; @@ -77,7 +79,7 @@ public class LegacyLogicalDocStructHelper implements LegacyDocStructHelperInterf this.priorityList = priorityList; this.parent = parent; String type = logicalDivision.getType(); - this.divisionView = ruleset.getStructuralElementView(Objects.nonNull(type) ? type : "", "edit", priorityList); + this.divisionView = ruleset.getStructuralElementView(Objects.nonNull(type) ? type : "", EDIT, priorityList); } @Override diff --git a/Kitodo/src/main/java/org/kitodo/production/helper/metadata/legacytypeimplementations/LegacyPrefsHelper.java b/Kitodo/src/main/java/org/kitodo/production/helper/metadata/legacytypeimplementations/LegacyPrefsHelper.java index 14cf27a06f2..f44e2f49607 100644 --- a/Kitodo/src/main/java/org/kitodo/production/helper/metadata/legacytypeimplementations/LegacyPrefsHelper.java +++ b/Kitodo/src/main/java/org/kitodo/production/helper/metadata/legacytypeimplementations/LegacyPrefsHelper.java @@ -11,6 +11,8 @@ package org.kitodo.production.helper.metadata.legacytypeimplementations; +import static org.kitodo.constants.StringConstants.EDIT; + import java.io.File; import java.io.IOException; import java.util.Arrays; @@ -95,7 +97,7 @@ public LegacyMetadataTypeHelper getMetadataTypeByName(String identifier) { logger.catching(Level.TRACE, e); priorityList = LanguageRange.parse("en"); } - StructuralElementViewInterface divisionView = ruleset.getStructuralElementView("", "edit", + StructuralElementViewInterface divisionView = ruleset.getStructuralElementView("", EDIT, priorityList); List entryViews = divisionView .getSortedVisibleMetadata(Collections.emptyList(), Arrays.asList(identifier)); diff --git a/Kitodo/src/main/java/org/kitodo/production/interfaces/activemq/CreateNewProcessesProcessor.java b/Kitodo/src/main/java/org/kitodo/production/interfaces/activemq/CreateNewProcessesProcessor.java index 87a7d2b10cf..a8242cb9f37 100644 --- a/Kitodo/src/main/java/org/kitodo/production/interfaces/activemq/CreateNewProcessesProcessor.java +++ b/Kitodo/src/main/java/org/kitodo/production/interfaces/activemq/CreateNewProcessesProcessor.java @@ -11,6 +11,8 @@ package org.kitodo.production.interfaces.activemq; +import static org.kitodo.constants.StringConstants.CREATE; + import java.io.IOException; import java.net.URISyntaxException; import java.util.Collections; @@ -67,7 +69,6 @@ public class CreateNewProcessesProcessor extends ActiveMQProcessor { private static final Logger logger = LogManager.getLogger(CreateNewProcessesProcessor.class); - private static final String ACQUISITION_STAGE_PROCESS_CREATION = "create"; private static final int IMPORT_WITHOUT_ANY_HIERARCHY = 1; private static final String LAST_CHILD = Integer.toString(-1); private static final List METADATA_LANGUAGE = Locale.LanguageRange.parse("en"); @@ -135,8 +136,7 @@ private TempProcess obtainTempProcess(CreateNewProcessOrder order) throws DAOExc TempProcess repeatedImport = importProcess(order, which); Set metadata = repeatedImport.getWorkpiece().getLogicalStructure().getMetadata(); rulesetManagement.updateMetadata(tempProcess.getWorkpiece().getLogicalStructure().getType(), - tempProcess.getWorkpiece().getLogicalStructure().getMetadata(), - ACQUISITION_STAGE_PROCESS_CREATION, metadata); + tempProcess.getWorkpiece().getLogicalStructure().getMetadata(), CREATE, metadata); } return tempProcess; } @@ -174,11 +174,11 @@ private Process formProcessTitle(CreateNewProcessOrder order, TempProcess tempPr throws DAOException, ProcessGenerationException, ProcessorException { ProcessFieldedMetadata processDetails = ProcessHelper.initializeProcessDetails(tempProcess.getWorkpiece() - .getLogicalStructure(), rulesetManagement, ACQUISITION_STAGE_PROCESS_CREATION, METADATA_LANGUAGE); + .getLogicalStructure(), rulesetManagement, CREATE, METADATA_LANGUAGE); Process parentProcess = order.getParent(); ProcessHelper.generateAtstslFields(tempProcess, processDetails.getRows(), Collections.emptyList(), tempProcess - .getWorkpiece().getLogicalStructure().getType(), rulesetManagement, ACQUISITION_STAGE_PROCESS_CREATION, - METADATA_LANGUAGE, parentProcess, true); + .getWorkpiece().getLogicalStructure().getType(), rulesetManagement, CREATE, METADATA_LANGUAGE, + parentProcess, true); if (order.getTitle().isPresent()) { process.setTitle(order.getTitle().get()); } diff --git a/Kitodo/src/main/java/org/kitodo/production/model/LazyDTOModel.java b/Kitodo/src/main/java/org/kitodo/production/model/LazyDTOModel.java index 915ca3ddc32..fba73372620 100644 --- a/Kitodo/src/main/java/org/kitodo/production/model/LazyDTOModel.java +++ b/Kitodo/src/main/java/org/kitodo/production/model/LazyDTOModel.java @@ -11,6 +11,8 @@ package org.kitodo.production.model; +import static org.kitodo.constants.StringConstants.KITODO; + import static java.lang.Math.toIntExact; import java.io.IOException; @@ -59,7 +61,7 @@ public class LazyDTOModel extends LazyDataModel { * source */ public LazyDTOModel(SearchDatabaseService searchService) { - indexRestClient.setIndexBase(ConfigMain.getParameter("elasticsearch.index", "kitodo")); + indexRestClient.setIndexBase(ConfigMain.getParameter("elasticsearch.index", KITODO)); this.searchService = searchService; try { diff --git a/Kitodo/src/main/java/org/kitodo/production/services/calendar/CalendarService.java b/Kitodo/src/main/java/org/kitodo/production/services/calendar/CalendarService.java index 5a7d9d63dc3..2174cf0f4af 100644 --- a/Kitodo/src/main/java/org/kitodo/production/services/calendar/CalendarService.java +++ b/Kitodo/src/main/java/org/kitodo/production/services/calendar/CalendarService.java @@ -11,6 +11,8 @@ package org.kitodo.production.services.calendar; +import static org.kitodo.constants.StringConstants.CREATE; + import java.io.File; import java.io.IOException; import java.nio.file.Paths; @@ -76,7 +78,6 @@ public static List getIndividualIssues(Block block) { * @throws IOException when ruleset file could not be read */ public static List getAddableMetadata(Process completeEdition) throws IOException, DataException { - final String acquisitionStage = "create"; // get an instance of the ruleset module RulesetManagementInterface ruleset = ServiceManager.getRulesetManagementService().getRulesetManagement(); @@ -94,19 +95,19 @@ public static List getAddableMetadata(Process completeEdi String newspaperType = ServiceManager.getProcessService().getBaseType(completeEdition.getId()); // descend to the issue - StructuralElementViewInterface newspaperView = ruleset.getStructuralElementView(newspaperType, acquisitionStage, priorityList); + StructuralElementViewInterface newspaperView = ruleset.getStructuralElementView(newspaperType, CREATE, priorityList); String yearType = newspaperView.getAllowedSubstructuralElements().entrySet().iterator().next().getKey(); - StructuralElementViewInterface yearView = ruleset.getStructuralElementView(yearType, acquisitionStage, priorityList); + StructuralElementViewInterface yearView = ruleset.getStructuralElementView(yearType, CREATE, priorityList); String monthType = yearView.getAllowedSubstructuralElements().entrySet().iterator().next().getKey(); - StructuralElementViewInterface monthView = ruleset.getStructuralElementView(monthType, acquisitionStage, priorityList); + StructuralElementViewInterface monthView = ruleset.getStructuralElementView(monthType, CREATE, priorityList); String dayType = monthView.getAllowedSubstructuralElements().entrySet().iterator().next().getKey(); - StructuralElementViewInterface dayView = ruleset.getStructuralElementView(dayType, acquisitionStage, priorityList); + StructuralElementViewInterface dayView = ruleset.getStructuralElementView(dayType, CREATE, priorityList); String issueType = dayView.getAllowedSubstructuralElements().entrySet().iterator().next().getKey(); - StructuralElementViewInterface issueView = ruleset.getStructuralElementView(issueType, acquisitionStage, priorityList); + StructuralElementViewInterface issueView = ruleset.getStructuralElementView(issueType, CREATE, priorityList); // From view to output, get all addable metadata return new ArrayList<>(issueView.getAllowedMetadata()) diff --git a/Kitodo/src/main/java/org/kitodo/production/services/command/ImportingProcess.java b/Kitodo/src/main/java/org/kitodo/production/services/command/ImportingProcess.java index 12164defda5..b5411d88933 100644 --- a/Kitodo/src/main/java/org/kitodo/production/services/command/ImportingProcess.java +++ b/Kitodo/src/main/java/org/kitodo/production/services/command/ImportingProcess.java @@ -11,6 +11,8 @@ package org.kitodo.production.services.command; +import static org.kitodo.constants.StringConstants.CREATE; + // static functions used import static java.lang.System.lineSeparator; import static java.util.function.Predicate.not; @@ -296,7 +298,7 @@ private Map searchLinkedProcesses(LogicalDivision divis */ private String formProcessTitle(RulesetManagementInterface ruleset, Workpiece workpiece) { Optional processTitleAttribute = ruleset - .getStructuralElementView(baseType, "create", NewspaperProcessesGenerator.ENGLISH).getProcessTitle(); + .getStructuralElementView(baseType, CREATE, NewspaperProcessesGenerator.ENGLISH).getProcessTitle(); if (processTitleAttribute.isEmpty()) { errors.add(Helper.getTranslation("kitodoScript.importProcesses.noProcessTitleRule", baseType)); return null; diff --git a/Kitodo/src/main/java/org/kitodo/production/services/data/ImportService.java b/Kitodo/src/main/java/org/kitodo/production/services/data/ImportService.java index 7c83cc1d995..f751863733a 100644 --- a/Kitodo/src/main/java/org/kitodo/production/services/data/ImportService.java +++ b/Kitodo/src/main/java/org/kitodo/production/services/data/ImportService.java @@ -11,6 +11,9 @@ package org.kitodo.production.services.data; +import static org.kitodo.constants.StringConstants.CREATE; +import static org.kitodo.constants.StringConstants.KITODO; + import java.io.File; import java.io.IOException; import java.io.OutputStream; @@ -120,12 +123,10 @@ public class ImportService { private static final Logger logger = LogManager.getLogger(ImportService.class); - public static final String ACQUISITION_STAGE_CREATE = "create"; private static volatile ImportService instance = null; private static ExternalDataImportInterface importModule; private static final String KITODO_NAMESPACE = "http://meta.kitodo.org/v1/"; - private static final String KITODO_STRING = "kitodo"; private ProcessGenerator processGenerator; private static final String REPLACE_ME = "REPLACE_ME"; @@ -363,7 +364,7 @@ private SchemaConverterInterface getSchemaConverter(DataRecord record) throws Un private String getRecordDocType(Document record, Ruleset ruleset) throws IOException { Collection doctypes = getDocTypeMetadata(ruleset); Element root = record.getDocumentElement(); - NodeList kitodoNodes = root.getElementsByTagNameNS(KITODO_NAMESPACE, KITODO_STRING); + NodeList kitodoNodes = root.getElementsByTagNameNS(KITODO_NAMESPACE, KITODO); if (kitodoNodes.getLength() > 0 && !doctypes.isEmpty() && kitodoNodes.item(0) instanceof Element) { Element kitodoElement = (Element) kitodoNodes.item(0); NodeList importedMetadata = kitodoElement.getElementsByTagNameNS(KITODO_NAMESPACE, "metadata"); @@ -566,7 +567,7 @@ public LinkedList importProcessHierarchy(String recordId, ImportCon if (fromIndex < processes.size()) { parents = processes.subList(fromIndex, processes.size()); } - ProcessHelper.generateAtstslFields(processesIterator.next(), parents, ACQUISITION_STAGE_CREATE, false); + ProcessHelper.generateAtstslFields(processesIterator.next(), parents, CREATE, false); } return processes; @@ -724,7 +725,7 @@ public LinkedList getChildProcesses(ImportConfiguration importConfi TempProcess tempProcess = createTempProcessFromDocument(importConfiguration, childDocument, templateId, projectId); tempProcess.getProcess().setImportConfiguration(importConfiguration); - ProcessHelper.generateAtstslFields(tempProcess, parentProcesses, ACQUISITION_STAGE_CREATE, false); + ProcessHelper.generateAtstslFields(tempProcess, parentProcesses, CREATE, false); childProcesses.add(tempProcess); } @@ -799,7 +800,7 @@ public LinkedList parseImportedEADCollection(DataRecord importedEAD for (Element fileElement : childElements) { TempProcess currentFileProcess = createTempProcessFromElement(fileElement, importConfiguration, projectId, templateId, false); - ProcessHelper.generateAtstslFields(currentFileProcess, parentProcesses, ACQUISITION_STAGE_CREATE, false); + ProcessHelper.generateAtstslFields(currentFileProcess, parentProcesses, CREATE, false); eadCollectionProcesses.add(currentFileProcess); } @@ -915,7 +916,7 @@ public Document convertDataRecordToInternal(DataRecord dataRecord, ImportConfigu } private NodeList extractMetadataNodeList(Document document) throws ProcessGenerationException { - NodeList kitodoNodes = document.getElementsByTagNameNS(KITODO_NAMESPACE, KITODO_STRING); + NodeList kitodoNodes = document.getElementsByTagNameNS(KITODO_NAMESPACE, KITODO); if (kitodoNodes.getLength() != 1) { throw new ProcessGenerationException("Number of 'kitodo' nodes unequal to '1' => unable to generate process!"); } @@ -1380,7 +1381,7 @@ public Process importProcess(String ppn, int projectId, int templateId, ImportCo String metadataLanguage = ServiceManager.getUserService().getCurrentUser().getMetadataLanguage(); tempProcess.getWorkpiece().getLogicalStructure().getMetadata().addAll(createMetadata(presetMetadata)); processTempProcess(tempProcess, ServiceManager.getRulesetService().openRuleset(template.getRuleset()), - "create", Locale.LanguageRange.parse(metadataLanguage.isEmpty() ? "en" : metadataLanguage), + CREATE, Locale.LanguageRange.parse(metadataLanguage.isEmpty() ? "en" : metadataLanguage), parentTempProcess); setLabelAndOrderLabelOfImportedProcess(tempProcess, presetMetadata); String title = tempProcess.getProcess().getTitle(); @@ -1585,7 +1586,7 @@ public boolean isRecordIdentifierMetadataConfigured(RulesetManagementInterface r boolean isConfigured = true; for (Map.Entry division : structuralElements.entrySet()) { StructuralElementViewInterface divisionView = rulesetManagement - .getStructuralElementView(division.getKey(), ACQUISITION_STAGE_CREATE, languages); + .getStructuralElementView(division.getKey(), CREATE, languages); List allowedMetadataKeys = divisionView.getAllowedMetadata().stream() .map(MetadataViewInterface::getId).collect(Collectors.toList()); allowedMetadataKeys.retainAll(recordIdentifierMetadata); diff --git a/Kitodo/src/main/java/org/kitodo/production/services/index/IndexingService.java b/Kitodo/src/main/java/org/kitodo/production/services/index/IndexingService.java index 515edee9f78..41b24d747b9 100644 --- a/Kitodo/src/main/java/org/kitodo/production/services/index/IndexingService.java +++ b/Kitodo/src/main/java/org/kitodo/production/services/index/IndexingService.java @@ -12,6 +12,7 @@ package org.kitodo.production.services.index; import static java.lang.Math.toIntExact; +import static org.kitodo.constants.StringConstants.KITODO; import java.io.IOException; import java.io.InputStream; @@ -113,7 +114,7 @@ private IndexingService() { searchServices.put(objectType, getService(objectType)); objectIndexingStates.put(objectType, IndexStates.NO_STATE); } - indexRestClient.setIndexBase(ConfigMain.getParameter("elasticsearch.index", "kitodo")); + indexRestClient.setIndexBase(ConfigMain.getParameter("elasticsearch.index", KITODO)); try { countDatabaseObjects(); } catch (DAOException e) { diff --git a/Kitodo/src/main/java/org/kitodo/production/workflow/KitodoNamespaceContext.java b/Kitodo/src/main/java/org/kitodo/production/workflow/KitodoNamespaceContext.java index 6f33eee02dd..aa94973f6ae 100644 --- a/Kitodo/src/main/java/org/kitodo/production/workflow/KitodoNamespaceContext.java +++ b/Kitodo/src/main/java/org/kitodo/production/workflow/KitodoNamespaceContext.java @@ -11,6 +11,8 @@ package org.kitodo.production.workflow; +import static org.kitodo.constants.StringConstants.KITODO; + import java.util.HashMap; import java.util.Iterator; import java.util.Map; @@ -26,7 +28,7 @@ public class KitodoNamespaceContext implements NamespaceContext { */ public KitodoNamespaceContext() { namespaces = new HashMap<>(); - namespaces.put("kitodo", "http://meta.kitodo.org/v1/"); + namespaces.put(KITODO, "http://meta.kitodo.org/v1/"); namespaces.put("mets", "http://www.loc.gov/METS/"); namespaces.put("mods", "http://www.loc.gov/mods/v3"); namespaces.put("marc", "http://www.loc.gov/MARC21/slim"); diff --git a/Kitodo/src/test/java/org/kitodo/config/ConfigProjectTest.java b/Kitodo/src/test/java/org/kitodo/config/ConfigProjectTest.java index ffd6b753706..b68242dd54e 100644 --- a/Kitodo/src/test/java/org/kitodo/config/ConfigProjectTest.java +++ b/Kitodo/src/test/java/org/kitodo/config/ConfigProjectTest.java @@ -12,6 +12,7 @@ package org.kitodo.config; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.kitodo.constants.StringConstants.KITODO; import java.io.IOException; import java.util.List; @@ -62,7 +63,7 @@ public void shouldGetDocType() throws DoctypeMissingException { @Test public void shouldGetTifDefinition() throws DoctypeMissingException { - assertEquals("kitodo", configProject.getTifDefinition(), "Tif definition is incorrect!"); + assertEquals(KITODO, configProject.getTifDefinition(), "Tif definition is incorrect!"); } @Test diff --git a/Kitodo/src/test/java/org/kitodo/production/forms/createprocess/ProcessDetailIT.java b/Kitodo/src/test/java/org/kitodo/production/forms/createprocess/ProcessDetailIT.java index 8e5d4a57af5..33452645e99 100644 --- a/Kitodo/src/test/java/org/kitodo/production/forms/createprocess/ProcessDetailIT.java +++ b/Kitodo/src/test/java/org/kitodo/production/forms/createprocess/ProcessDetailIT.java @@ -12,6 +12,7 @@ package org.kitodo.production.forms.createprocess; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.kitodo.constants.StringConstants.EDIT; import java.io.File; import java.util.Locale; @@ -32,7 +33,7 @@ public class ProcessDetailIT { public void shouldCopyProcessDetail() throws Exception { RulesetManagementInterface ruleset = ServiceManager.getRulesetManagementService().getRulesetManagement(); ruleset.load(new File(TestConstants.TEST_RULESET)); - StructuralElementViewInterface divisionView = ruleset.getStructuralElementView("Monograph", "edit", + StructuralElementViewInterface divisionView = ruleset.getStructuralElementView("Monograph", EDIT, Locale.LanguageRange.parse("en")); LogicalDivision division = new LogicalDivision(); division.setType("Monograph"); diff --git a/Kitodo/src/test/java/org/kitodo/production/helper/ProcessHelperIT.java b/Kitodo/src/test/java/org/kitodo/production/helper/ProcessHelperIT.java index e3677375b25..ccd0783e495 100644 --- a/Kitodo/src/test/java/org/kitodo/production/helper/ProcessHelperIT.java +++ b/Kitodo/src/test/java/org/kitodo/production/helper/ProcessHelperIT.java @@ -13,6 +13,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; +import static org.kitodo.constants.StringConstants.CREATE; import java.io.IOException; import java.util.Collections; @@ -41,7 +42,6 @@ public class ProcessHelperIT { public static final String DOCTYPE = "Monograph"; - private static final String ACQUISITION_STAGE_CREATE = "create"; private static final String TEST_PROCESS_TITLE = "Second process"; private static List priorityList; private static int processHelperTestProcessId = -1; @@ -112,7 +112,7 @@ public void generateAtstslFields() throws DAOException, ProcessGenerationExcepti private void testForceRegenerationByParentProcess(TempProcess tempProcess, RulesetManagementInterface rulesetManagement) throws ProcessGenerationException, DAOException { ProcessHelper.generateAtstslFields(tempProcess, tempProcess.getProcessMetadata().getProcessDetailsElements(), - null, DOCTYPE, rulesetManagement, ACQUISITION_STAGE_CREATE, priorityList, + null, DOCTYPE, rulesetManagement, CREATE, priorityList, ServiceManager.getProcessService().getById(processHelperTestProcessId), true); assertEquals("Secopr", tempProcess.getAtstsl()); } @@ -128,18 +128,18 @@ private void testForceRegenerationByTempProcessParents(TempProcess tempProcess, } }); ProcessHelper.generateAtstslFields(tempProcess, tempProcess.getProcessMetadata().getProcessDetailsElements(), - Collections.singletonList(tempProcessParent), DOCTYPE, rulesetManagement, - ACQUISITION_STAGE_CREATE, priorityList, null, true); + Collections.singletonList(tempProcessParent), DOCTYPE, rulesetManagement, CREATE, priorityList, null, + true); assertEquals("Secopr", tempProcess.getAtstsl()); } private void testForceRegenerationOfAtstsl(TempProcess tempProcess, RulesetManagementInterface rulesetManagement) throws ProcessGenerationException { ProcessHelper.generateAtstslFields(tempProcess, tempProcess.getProcessMetadata().getProcessDetailsElements(), - null, DOCTYPE, rulesetManagement, ACQUISITION_STAGE_CREATE, priorityList, null, false); + null, DOCTYPE, rulesetManagement, CREATE, priorityList, null, false); assertEquals("test", tempProcess.getAtstsl()); ProcessHelper.generateAtstslFields(tempProcess, tempProcess.getProcessMetadata().getProcessDetailsElements(), - null, DOCTYPE, rulesetManagement, ACQUISITION_STAGE_CREATE, priorityList, null, true); + null, DOCTYPE, rulesetManagement, CREATE, priorityList, null, true); assertEquals("test2", tempProcess.getAtstsl()); } @@ -153,7 +153,7 @@ private void testGenerationOfAtstslByCurrentTempProcess(TempProcess tempProcess, }); assertNull(tempProcess.getAtstsl()); ProcessHelper.generateAtstslFields(tempProcess, tempProcess.getProcessMetadata().getProcessDetailsElements(), - null, DOCTYPE, rulesetManagement, ACQUISITION_STAGE_CREATE, priorityList, null, false); + null, DOCTYPE, rulesetManagement, CREATE, priorityList, null, false); assertEquals("test", tempProcess.getAtstsl()); tempProcess.getProcessMetadata().setProcessDetails(new ProcessFieldedMetadata() { { diff --git a/Kitodo/src/test/java/org/kitodo/production/metadata/MetadataEditorIT.java b/Kitodo/src/test/java/org/kitodo/production/metadata/MetadataEditorIT.java index b5033cccaec..0ec4abf6fd2 100644 --- a/Kitodo/src/test/java/org/kitodo/production/metadata/MetadataEditorIT.java +++ b/Kitodo/src/test/java/org/kitodo/production/metadata/MetadataEditorIT.java @@ -14,6 +14,7 @@ import static org.awaitility.Awaitility.await; import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.kitodo.constants.StringConstants.EDIT; import static org.kitodo.test.utils.ProcessTestUtils.METADATA_BASE_DIR; import static org.kitodo.test.utils.ProcessTestUtils.META_XML; @@ -122,7 +123,7 @@ public void shouldAddMultipleStructuresWithMetadataGroup() throws Exception { RulesetManagementInterface ruleset = ServiceManager.getRulesetManagementService().getRulesetManagement(); ruleset.load(new File(TestConstants.TEST_RULESET)); - StructuralElementViewInterface divisionView = ruleset.getStructuralElementView("Monograph", "edit", + StructuralElementViewInterface divisionView = ruleset.getStructuralElementView("Monograph", EDIT, Locale.LanguageRange.parse("en")); String metadataKey = "TitleDocMain"; @@ -157,7 +158,7 @@ public void shouldAddMultipleStructuresWithMetadataGroup() throws Exception { public void shouldAddMultipleStructuresWithMetadataEntry() throws Exception { RulesetManagementInterface ruleset = ServiceManager.getRulesetManagementService().getRulesetManagement(); ruleset.load(new File(TestConstants.TEST_RULESET)); - StructuralElementViewInterface divisionView = ruleset.getStructuralElementView("Monograph", "edit", + StructuralElementViewInterface divisionView = ruleset.getStructuralElementView("Monograph", EDIT, Locale.LanguageRange.parse("en")); String metadataKey = "Person"; diff --git a/Kitodo/src/test/java/org/kitodo/production/services/data/DataEditorServiceIT.java b/Kitodo/src/test/java/org/kitodo/production/services/data/DataEditorServiceIT.java index 04690de8b06..445430bdbcc 100644 --- a/Kitodo/src/test/java/org/kitodo/production/services/data/DataEditorServiceIT.java +++ b/Kitodo/src/test/java/org/kitodo/production/services/data/DataEditorServiceIT.java @@ -18,6 +18,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.kitodo.constants.StringConstants.EDIT; import static org.kitodo.test.utils.TestConstants.TITLE_DOC_MAIN; import java.io.File; @@ -58,7 +59,6 @@ public class DataEditorServiceIT { private static final String TEST_METADATA_FILE = "testmeta.xml"; private static final String TEST_RULESET = "src/test/resources/rulesets/ruleset_test.xml"; private static final String ENGLISH = "en"; - private static final String EDIT = "edit"; private static final String CONTRIBUTOR_PERSON = "ContributorPerson"; private static final String EXPECTED_EXCEPTION_MESSAGE = "Unable to update metadata of process %d; " + "(either import configuration or record identifier are missing)"; diff --git a/Kitodo/src/test/java/org/kitodo/production/services/data/ImportServiceIT.java b/Kitodo/src/test/java/org/kitodo/production/services/data/ImportServiceIT.java index 7c7fc7651a9..134233fe21e 100644 --- a/Kitodo/src/test/java/org/kitodo/production/services/data/ImportServiceIT.java +++ b/Kitodo/src/test/java/org/kitodo/production/services/data/ImportServiceIT.java @@ -11,6 +11,9 @@ package org.kitodo.production.services.data; +import static org.kitodo.constants.StringConstants.CREATE; +import static org.kitodo.constants.StringConstants.KITODO; + import static org.awaitility.Awaitility.await; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -131,7 +134,6 @@ public class ImportServiceIT { private static final String PICA_PARENT_ID = "pica.parentId"; private static final String firstProcess = "First process"; private static final String TEST_PROCESS_TITLE = "Testtitel"; - private static final String KITODO = "kitodo"; private static final String METADATA = "metadata"; private static final String EXPECTED_AUTHOR = "HansMeier"; private static final String KITODO_NAMESPACE = "http://meta.kitodo.org/v1/"; @@ -434,9 +436,8 @@ public void shouldProcessTempProcess() throws DAOException, IOException, Process Document xmlDocument = XMLUtils.parseXMLString(fileContent); TempProcess tempProcess = ServiceManager.getImportService().createTempProcessFromDocument( importConfiguration, xmlDocument, TEMPLATE_ID, PROJECT_ID); - ImportService.processTempProcess(tempProcess, managementInterface, - ImportService.ACQUISITION_STAGE_CREATE, ServiceManager.getUserService() - .getCurrentMetadataLanguage(), null); + ImportService.processTempProcess(tempProcess, managementInterface, CREATE, + ServiceManager.getUserService().getCurrentMetadataLanguage(), null); assertFalse(tempProcess.getProcess().getProperties().isEmpty(), "Process should have some properties"); assertTrue(StringUtils.isNotBlank(tempProcess.getProcess().getTitle()), "Process title should not be empty"); } @@ -628,9 +629,8 @@ private static List loadProcessDetailsFromTestProcess(String file Document xmlDocument = XMLUtils.parseXMLString(fileContent); TempProcess tempProcess = ServiceManager.getImportService().createTempProcessFromDocument( importConfiguration, xmlDocument, TEMPLATE_ID, PROJECT_ID); - return ProcessHelper.transformToProcessDetails(tempProcess, managementInterface, - ImportService.ACQUISITION_STAGE_CREATE, ServiceManager.getUserService() - .getCurrentMetadataLanguage()); + return ProcessHelper.transformToProcessDetails(tempProcess, managementInterface, CREATE, + ServiceManager.getUserService().getCurrentMetadataLanguage()); } } diff --git a/Kitodo/src/test/java/org/kitodo/production/services/data/MassImportServiceIT.java b/Kitodo/src/test/java/org/kitodo/production/services/data/MassImportServiceIT.java index 7e6fc8b69da..1daf81751bb 100644 --- a/Kitodo/src/test/java/org/kitodo/production/services/data/MassImportServiceIT.java +++ b/Kitodo/src/test/java/org/kitodo/production/services/data/MassImportServiceIT.java @@ -13,6 +13,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.kitodo.constants.StringConstants.CREATE; import java.io.IOException; import java.util.Collection; @@ -79,7 +80,7 @@ private List retrieveDivisions() throws DAOExcep RulesetManagementInterface rulesetInterface = ServiceManager.getRulesetService().openRuleset(ruleset); List priorityList = Locale.LanguageRange.parse("en"); return rulesetInterface.getStructuralElements(priorityList).keySet().stream() - .map(key -> rulesetInterface.getStructuralElementView(key, "create", priorityList)) + .map(key -> rulesetInterface.getStructuralElementView(key, CREATE, priorityList)) .collect(Collectors.toList()); }