From c6c57fd3f5418e39dfa60be49f44b2b0ea8dbc06 Mon Sep 17 00:00:00 2001 From: Arved Solth Date: Wed, 29 Jan 2025 09:48:03 +0100 Subject: [PATCH] Remove unnecessary string conversion --- .../serviceloader/KitodoServiceLoader.java | 2 +- .../access/DivXmlElementAccess.java | 2 +- .../index/type/enums/TypeInterface.java | 24 +++++++++---------- .../kitodo/production/forms/LanguageForm.java | 2 +- .../helper/CustomListColumnInitializer.java | 4 ++-- .../production/helper/VariableReplacer.java | 4 ++-- .../model/bibliography/course/Block.java | 4 ++-- .../model/bibliography/course/Issue.java | 4 ++-- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Kitodo-API/src/main/java/org/kitodo/serviceloader/KitodoServiceLoader.java b/Kitodo-API/src/main/java/org/kitodo/serviceloader/KitodoServiceLoader.java index 6f18b1826c6..6613c87443b 100644 --- a/Kitodo-API/src/main/java/org/kitodo/serviceloader/KitodoServiceLoader.java +++ b/Kitodo-API/src/main/java/org/kitodo/serviceloader/KitodoServiceLoader.java @@ -148,7 +148,7 @@ private void loadBeans() { try (JarFile jarFile = new JarFile(f.toString())) { if (hasFrontendFiles(jarFile)) { Enumeration entries = jarFile.entries(); - URL[] urls = {new URL("jar:file:" + f.toString() + "!/") }; + URL[] urls = {new URL("jar:file:" + f + "!/") }; try (URLClassLoader cl = URLClassLoader.newInstance(urls)) { while (entries.hasMoreElements()) { JarEntry je = entries.nextElement(); 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..67cc9e37ad1 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 @@ -262,7 +262,7 @@ DivType toDiv(Map physicalDivisionIDs, LinkedList optionalDmdSec = createMdSec(super.getMetadata(), MdSec.DMD_SEC); if (optionalDmdSec.isPresent()) { MdSecType dmdSec = optionalDmdSec.get(); - String name = metsReferrerId + ':' + MdSec.DMD_SEC.toString(); + String name = metsReferrerId + ':' + MdSec.DMD_SEC; dmdSec.setID(KitodoUUID.nameUUIDFromBytes(name.getBytes(StandardCharsets.UTF_8))); mets.getDmdSec().add(dmdSec); div.getDMDID().add(dmdSec); diff --git a/Kitodo-DataManagement/src/main/java/org/kitodo/data/elasticsearch/index/type/enums/TypeInterface.java b/Kitodo-DataManagement/src/main/java/org/kitodo/data/elasticsearch/index/type/enums/TypeInterface.java index 0dcb67f2c88..f38fc0511cc 100644 --- a/Kitodo-DataManagement/src/main/java/org/kitodo/data/elasticsearch/index/type/enums/TypeInterface.java +++ b/Kitodo-DataManagement/src/main/java/org/kitodo/data/elasticsearch/index/type/enums/TypeInterface.java @@ -39,8 +39,8 @@ default boolean getBooleanValue(Map jsonObject) throws DataExcep try { return (Boolean) jsonObject.get(this.toString()); } catch (ClassCastException | NullPointerException e) { - throw new DataException("Not possible to retrieve boolean value for key " + this.toString() - + ". Exception: " + e.getMessage()); + throw new DataException("Not possible to retrieve boolean value for key " + this + ". Exception: " + + e.getMessage()); } } @@ -55,8 +55,8 @@ default int getIntValue(Map jsonObject) throws DataException { try { return (Integer) jsonObject.get(this.toString()); } catch (ClassCastException | NullPointerException e) { - throw new DataException("Not possible to retrieve int value for key " + this.toString() - + ". Exception: " + e.getMessage()); + throw new DataException("Not possible to retrieve int value for key " + this + ". Exception: " + + e.getMessage()); } } @@ -71,8 +71,8 @@ default double getDoubleValue(Map jsonObject) throws DataExcepti try { return (double) jsonObject.get(this.toString()); } catch (ClassCastException | NullPointerException e) { - throw new DataException("Not possible to retrieve double value for key " + this.toString() - + ". Exception: " + e.getMessage()); + throw new DataException("Not possible to retrieve double value for key " + this + ". Exception: " + + e.getMessage()); } } @@ -87,8 +87,8 @@ default String getStringValue(Map jsonObject) throws DataExcepti try { return (String) jsonObject.get(this.toString()); } catch (ClassCastException | NullPointerException e) { - throw new DataException("Not possible to retrieve String value for key " + this.toString() - + ". Exception: " + e.getMessage()); + throw new DataException("Not possible to retrieve String value for key " + this + ". Exception: " + + e.getMessage()); } } @@ -104,8 +104,8 @@ default List> getJsonArray(Map jsonObject) t try { return (List>) jsonObject.get(this.toString()); } catch (ClassCastException | NullPointerException e) { - throw new DataException("Not possible to retrieve JsonArray value for key " + this.toString() - + ". Exception: " + e.getMessage()); + throw new DataException("Not possible to retrieve JsonArray value for key " + this + ". Exception: " + + e.getMessage()); } } @@ -121,8 +121,8 @@ default int getSizeOfProperty(Map object) throws DataException { try { return ((List) object.get(this.toString())).size(); } catch (ClassCastException | NullPointerException e) { - throw new DataException("Not possible to retrieve size of array for key " + this.toString() - + ". Exception: " + e.getMessage()); + throw new DataException("Not possible to retrieve size of array for key " + this + ". Exception: " + + e.getMessage()); } } return 0; diff --git a/Kitodo/src/main/java/org/kitodo/production/forms/LanguageForm.java b/Kitodo/src/main/java/org/kitodo/production/forms/LanguageForm.java index 8ed4547dbe6..9880927fbc7 100644 --- a/Kitodo/src/main/java/org/kitodo/production/forms/LanguageForm.java +++ b/Kitodo/src/main/java/org/kitodo/production/forms/LanguageForm.java @@ -120,7 +120,7 @@ public List> getSupportedLocales() { translation.put("displayLanguageTranslated", supportedLocale.getDisplayLanguage(currentDisplayLanguage)); translation.put("selected", supportedLocale.equals(currentDisplayLanguage)); - translation.put("flag", "javax.faces.resource/images/" + supportedLocale.toString() + ".svg.jsf"); + translation.put("flag", "javax.faces.resource/images/" + supportedLocale + ".svg.jsf"); supportedLocales.add(translation); } } diff --git a/Kitodo/src/main/java/org/kitodo/production/helper/CustomListColumnInitializer.java b/Kitodo/src/main/java/org/kitodo/production/helper/CustomListColumnInitializer.java index 83f23a93fb8..040dbc8692f 100644 --- a/Kitodo/src/main/java/org/kitodo/production/helper/CustomListColumnInitializer.java +++ b/Kitodo/src/main/java/org/kitodo/production/helper/CustomListColumnInitializer.java @@ -60,8 +60,8 @@ public void init(@Observes @Initialized(ApplicationScoped.class) ServletContext logger.error("Unable to update custom list columns in database!"); } catch (NoSuchElementException e) { logger.info("Configuration key '" - + ParameterCore.PROCESS_PROPERTIES.toString() - + "' or '" + ParameterCore.TASK_CUSTOM_COLUMNS.toString() + + ParameterCore.PROCESS_PROPERTIES + + "' or '" + ParameterCore.TASK_CUSTOM_COLUMNS + "' not found in configuration => unable to load corresponding custom columns!"); } } diff --git a/Kitodo/src/main/java/org/kitodo/production/helper/VariableReplacer.java b/Kitodo/src/main/java/org/kitodo/production/helper/VariableReplacer.java index 486b1d2b2d9..9d3ed7e8f88 100644 --- a/Kitodo/src/main/java/org/kitodo/production/helper/VariableReplacer.java +++ b/Kitodo/src/main/java/org/kitodo/production/helper/VariableReplacer.java @@ -322,7 +322,7 @@ private String determineReplacementForProjectid(Matcher variableFinder) { logger.warn("Cannot replace \"(projectid)\": process has no project assigned"); return variableFinder.group(1); } - return variableFinder.group(1) + String.valueOf(process.getProject().getId()); + return variableFinder.group(1) + process.getProject().getId(); } private String determineReplacementForStepid(Matcher variableFinder) { @@ -330,7 +330,7 @@ private String determineReplacementForStepid(Matcher variableFinder) { logger.warn("Cannot replace \"(stepid)\": no task given"); return variableFinder.group(1); } - return variableFinder.group(1) + String.valueOf(task.getId()); + return variableFinder.group(1) + task.getId(); } private String determineReplacementForStepname(Matcher variableFinder) { diff --git a/Kitodo/src/main/java/org/kitodo/production/model/bibliography/course/Block.java b/Kitodo/src/main/java/org/kitodo/production/model/bibliography/course/Block.java index f462ce3500b..13ab941a355 100644 --- a/Kitodo/src/main/java/org/kitodo/production/model/bibliography/course/Block.java +++ b/Kitodo/src/main/java/org/kitodo/production/model/bibliography/course/Block.java @@ -633,11 +633,11 @@ private void prohibitOverlaps(LocalDate from, LocalDate until) { public String toString() { StringBuilder result = new StringBuilder(); if (Objects.nonNull(firstAppearance)) { - result.append(firstAppearance.toString()); + result.append(firstAppearance); } result.append(" - "); if (Objects.nonNull(lastAppearance)) { - result.append(lastAppearance.toString()); + result.append(lastAppearance); } result.append(" ["); boolean first = true; diff --git a/Kitodo/src/main/java/org/kitodo/production/model/bibliography/course/Issue.java b/Kitodo/src/main/java/org/kitodo/production/model/bibliography/course/Issue.java index 4d3305c4901..324ba887469 100644 --- a/Kitodo/src/main/java/org/kitodo/production/model/bibliography/course/Issue.java +++ b/Kitodo/src/main/java/org/kitodo/production/model/bibliography/course/Issue.java @@ -532,7 +532,7 @@ public String toString() { result.append(daysOfWeek.contains(DayOfWeek.SUNDAY.getValue()) ? 'S' : '-'); result.append(") +"); if (additions.size() <= 5) { - result.append(additions.toString()); + result.append(additions); } else { result.append("[…("); result.append(additions.size()); @@ -540,7 +540,7 @@ public String toString() { } result.append(" -"); if (exclusions.size() <= 5) { - result.append(exclusions.toString()); + result.append(exclusions); } else { result.append("[…("); result.append(exclusions.size());