Emit marc:leader as first element #549
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
dr0i
force-pushed
the
548-emitMarcLeaderAsFirst
branch
from
9970929
to
df203ee
Compare
Following hints from IDE: - remove ignored blank lines in javadoc - remove unused variables - inline variable - simplify expressions that are always true
dr0i
force-pushed
the
548-emitMarcLeaderAsFirst
branch
from
df203ee
to
07aa5fb
Compare
fsteeg
approved these changes
Jul 12, 2024
blackwinter
reviewed
Jul 23, 2024
| @@ -247,11 +239,12 @@ private static class Encoder extends DefaultStreamPipe<ObjectReceiver<String>> { | |||
| private String currentEntity = ""; | |||
|
|
|||
| private boolean emitNamespace = true; | |||
| private Object[] namespacePrefix = new Object[]{emitNamespace ? NAMESPACE_PREFIX : EMPTY}; | |||
| private Object[] namespacePrefix = new Object[]{NAMESPACE_PREFIX}; | |||
There was a problem hiding this comment.
Why did you change this? Now one has to remember to adjust this line as well should the default for emitNamespace be switched one day.
| @@ -353,7 +346,7 @@ else if (!appendLeader(name, value)) { | |||
| if (value != null) { | |||
| writeEscaped(value.trim()); | |||
| } | |||
| writeTag(Tag.controlfield::close); | |||
| writeTag(Tag.controlfield::close, false); | |||
There was a problem hiding this comment.
What does this change do? It seems to be ineffective. And also counterintuitive: Why would a close tag have arguments/attributes?
| @@ -408,9 +401,20 @@ private void writeFooter() { | |||
| * @param str the unescaped sequence to be written | |||
| */ | |||
| private void writeRaw(final String str) { | |||
|
|
|||
| @@ -432,11 +436,11 @@ private void writeEscaped(final String str) { | |||
|
|
|||
| private void writeLeader() { | |||
| final String leader = leaderBuilder.toString(); | |||
| if (!leader.isEmpty()) { | |||
| if (leaderBuilder.length() > 0) { | |||
| String actual = resultCollector.toString(); | ||
| assertEquals(expected, actual); | ||
| } | ||
|
|
||
| @Test | ||
| public void issue548_failWhenLeaderIsNotFirst() { |
There was a problem hiding this comment.
What's the purpose of this test? It's already covered by the previous one.
| @@ -136,7 +133,6 @@ public void setEmitNamespace(final boolean emitNamespace) { | |||
|
|
|||
| /** | |||
| * Sets the flag to decide whether to omit the XML declaration. | |||
| * | |||
There was a problem hiding this comment.
The previous formatting looked much clearer to me...
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.
Fixes #548.