Implement variable replacer for copy data #4112
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Kathrin-Huber
force-pushed
the
implement_variableReplacerForCopyData
branch
from
403fef5 to
ad864c7
Compare
Kathrin-Huber
force-pushed
the
implement_variableReplacerForCopyData
branch
from
aca0a1a to
b5051a9
Compare
Kathrin-Huber
force-pushed
the
implement_variableReplacerForCopyData
branch
from
5b02879 to
0fd979e
Compare
This was referenced Dec 9, 2020
Closed
Closed
solth
reviewed
Dec 9, 2020
| @@ -19,6 +19,7 @@ | |||
| import org.apache.commons.configuration.ConfigurationException; | |||
| import org.apache.logging.log4j.LogManager; | |||
| import org.apache.logging.log4j.Logger; | |||
| import org.kitodo.production.services.ServiceManager; | |||
There was a problem hiding this comment.
Suggested change
| import org.kitodo.production.services.ServiceManager; |
Comment on lines
33
to
34
| import org.kitodo.production.services.data.ImportService; | ||
| import org.primefaces.PrimeFaces; |
There was a problem hiding this comment.
Suggested change
| import org.kitodo.production.services.data.ImportService; | |
| import org.primefaces.PrimeFaces; |
| import org.kitodo.exceptions.MetadataException; | ||
| import org.kitodo.production.helper.Helper; |
There was a problem hiding this comment.
Suggested change
| import org.kitodo.production.helper.Helper; |
| ServiceManager.getMetsService().save(workpiece, out); | ||
| ServiceManager.getProcessService().saveToIndex(data.getProcess(), false); | ||
| } catch (IOException | CustomResponseException | DataException e) { | ||
| System.out.println("log me"); |
There was a problem hiding this comment.
Use Helper or logger instead of System.out.println
| */ | ||
| protected abstract int getMinObjects(); | ||
| for (IncludedStructuralElement child : allIncludedStructuralElements) { | ||
| Collection<Metadata> metadata = child.getMetadata(); |
There was a problem hiding this comment.
Suggested change
| Collection<Metadata> metadata = child.getMetadata(); |
metadata is never used
Comment on lines
28
to
29
| import org.kitodo.data.elasticsearch.exceptions.CustomResponseException; | ||
| import org.kitodo.data.exceptions.DataException; |
There was a problem hiding this comment.
Suggested change
| import org.kitodo.data.elasticsearch.exceptions.CustomResponseException; | |
| import org.kitodo.data.exceptions.DataException; |
| import org.kitodo.data.elasticsearch.exceptions.CustomResponseException; | ||
| import org.kitodo.data.exceptions.DataException; | ||
| import org.kitodo.production.helper.metadata.legacytypeimplementations.LegacyMetsModsDigitalDocumentHelper; | ||
| import org.kitodo.production.services.ServiceManager; |
There was a problem hiding this comment.
Suggested change
| import org.kitodo.production.services.ServiceManager; |
Comment on lines
44
to
45
| List<Metadata> metadataCollectionCopy = new ArrayList<>(); | ||
| metadataCollectionCopy.addAll(metadataCollection); |
There was a problem hiding this comment.
Suggested change
| List<Metadata> metadataCollectionCopy = new ArrayList<>(); | |
| metadataCollectionCopy.addAll(metadataCollection); | |
| List<Metadata> metadataCollectionCopy = new ArrayList<>(metadataCollection); |
| Helper.setMessage("overwriteDataOk", currentProcessTitle); | ||
| } | ||
| } catch (IOException e) { | ||
| Helper.setErrorMessage("overwriteDataError", currentProcessTitle + ":" + e.getMessage(), logger, e); |
There was a problem hiding this comment.
I am not sure if this will work. AFAIK only CDI managed beans have access to the FacesContext that is needed to render messages in the frontend pages. (same goes for the other usages of Helper.setMessage or Helper.setErrorMessage in this class.)
There was a problem hiding this comment.
It is actually working!
|
|
||
| import java.util.Collection; | ||
| import java.util.List; | ||
| import java.util.Objects; |
There was a problem hiding this comment.
Suggested change
| import java.util.Objects; |
solth
reviewed
Dec 9, 2020
| List<IncludedStructuralElement> allIncludedStructuralElements = workpiece | ||
| .getAllIncludedStructuralElements(); | ||
|
|
||
| IncludedStructuralElement child = allIncludedStructuralElements.get(0); |
There was a problem hiding this comment.
Same as above. I think you should check if allIncludedStructuralElements contains an element before "getting" it.
Kathrin-Huber
force-pushed
the
implement_variableReplacerForCopyData
branch
from
a5913ba to
6660bca
Compare
solth
approved these changes
Dec 11, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
integrates variable replacer for #3368
follow-up PR to #4111