From 6d6b02658527052a147cd2526e62967a2f04b585 Mon Sep 17 00:00:00 2001 From: TobiasNx Date: Thu, 30 Jan 2025 13:53:36 +0100 Subject: [PATCH 1/8] Make language and refrence marker configurable #657 --- .../metafacture/linkeddata/RdfMacroPipe.java | 42 ++++++++++++++++++- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/metafacture-linkeddata/src/main/java/org/metafacture/linkeddata/RdfMacroPipe.java b/metafacture-linkeddata/src/main/java/org/metafacture/linkeddata/RdfMacroPipe.java index d3e3fa3b8..80cceca93 100644 --- a/metafacture-linkeddata/src/main/java/org/metafacture/linkeddata/RdfMacroPipe.java +++ b/metafacture-linkeddata/src/main/java/org/metafacture/linkeddata/RdfMacroPipe.java @@ -41,6 +41,8 @@ public final class RdfMacroPipe extends DefaultStreamPipe { public static final String RDF_ABOUT = "~rdf:about"; public static final String XML_LANG = "~xml:lang"; private String autoAddedSubject = ""; + private String refrenceMarker = REFERENCE_MARKER; + private String languageMarker = LANGUAGE_MARKER; /** * Creates an instance of {@link RdfMacroPipe}. @@ -57,6 +59,42 @@ public void setAutoAddedSubject(final String autoAddedSubject) { this.autoAddedSubject = autoAddedSubject; } + /** + * Sets the refrence marker. + * + * @param refrenceMarker the refrence marker + */ + public void setRefrenceMarker(final String refrenceMarker) { + this.refrenceMarker = refrenceMarker; + } + + /** + * Gets the refrence marker. + * + * @return the refrence marker + */ + public String getRefrenceMarker() { + return refrenceMarker; + } + + /** + * Sets the language marker. + * + * @param languageMarker the language marker + */ + public void setLanguageMarker(final String languageMarker) { + this.languageMarker = languageMarker; + } + + /** + * Gets the language marker. + * + * @return the language marker + */ + public String getLanguageMarker() { + return languageMarker; + } + @Override public void startRecord(final String identifier) { getReceiver().startRecord(identifier); @@ -87,8 +125,8 @@ public void endEntity() { @Override public void literal(final String name, final String value) { - final int index = name.indexOf(LANGUAGE_MARKER); - if (!name.isEmpty() && name.charAt(0) == REFERENCE_MARKER) { + final int index = name.indexOf(languageMarker); + if (!name.isEmpty() && name.charAt(0) == refrenceMarker) { getReceiver().startEntity(name.substring(1)); getReceiver().literal(RDF_REFERENCE, value); getReceiver().endEntity(); From fad521fb0ea7bd909e47cb3db3259b08c3fe12e4 Mon Sep 17 00:00:00 2001 From: TobiasNx Date: Thu, 30 Jan 2025 14:04:11 +0100 Subject: [PATCH 2/8] Change variable type to char #657 --- .../org/metafacture/linkeddata/RdfMacroPipe.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/metafacture-linkeddata/src/main/java/org/metafacture/linkeddata/RdfMacroPipe.java b/metafacture-linkeddata/src/main/java/org/metafacture/linkeddata/RdfMacroPipe.java index 80cceca93..5a5dff7d9 100644 --- a/metafacture-linkeddata/src/main/java/org/metafacture/linkeddata/RdfMacroPipe.java +++ b/metafacture-linkeddata/src/main/java/org/metafacture/linkeddata/RdfMacroPipe.java @@ -41,8 +41,8 @@ public final class RdfMacroPipe extends DefaultStreamPipe { public static final String RDF_ABOUT = "~rdf:about"; public static final String XML_LANG = "~xml:lang"; private String autoAddedSubject = ""; - private String refrenceMarker = REFERENCE_MARKER; - private String languageMarker = LANGUAGE_MARKER; + private char refrenceMarker = REFERENCE_MARKER; + private char languageMarker = LANGUAGE_MARKER; /** * Creates an instance of {@link RdfMacroPipe}. @@ -60,11 +60,11 @@ public void setAutoAddedSubject(final String autoAddedSubject) { } /** - * Sets the refrence marker. + * Sets the single char refrence marker. * * @param refrenceMarker the refrence marker */ - public void setRefrenceMarker(final String refrenceMarker) { + public void setRefrenceMarker(final char refrenceMarker) { this.refrenceMarker = refrenceMarker; } @@ -73,16 +73,16 @@ public void setRefrenceMarker(final String refrenceMarker) { * * @return the refrence marker */ - public String getRefrenceMarker() { + public char getRefrenceMarker() { return refrenceMarker; } /** - * Sets the language marker. + * Sets the single char language marker. * * @param languageMarker the language marker */ - public void setLanguageMarker(final String languageMarker) { + public void setLanguageMarker(final char languageMarker) { this.languageMarker = languageMarker; } @@ -91,7 +91,7 @@ public void setLanguageMarker(final String languageMarker) { * * @return the language marker */ - public String getLanguageMarker() { + public char getLanguageMarker() { return languageMarker; } From e613b8788950553d1f32a9d44846eb0b5daef9b8 Mon Sep 17 00:00:00 2001 From: TobiasNx Date: Thu, 30 Jan 2025 14:07:06 +0100 Subject: [PATCH 3/8] Fix typo #657 --- .../metafacture/linkeddata/RdfMacroPipe.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/metafacture-linkeddata/src/main/java/org/metafacture/linkeddata/RdfMacroPipe.java b/metafacture-linkeddata/src/main/java/org/metafacture/linkeddata/RdfMacroPipe.java index 5a5dff7d9..251e9c357 100644 --- a/metafacture-linkeddata/src/main/java/org/metafacture/linkeddata/RdfMacroPipe.java +++ b/metafacture-linkeddata/src/main/java/org/metafacture/linkeddata/RdfMacroPipe.java @@ -41,7 +41,7 @@ public final class RdfMacroPipe extends DefaultStreamPipe { public static final String RDF_ABOUT = "~rdf:about"; public static final String XML_LANG = "~xml:lang"; private String autoAddedSubject = ""; - private char refrenceMarker = REFERENCE_MARKER; + private char referenceMarker = REFERENCE_MARKER; private char languageMarker = LANGUAGE_MARKER; /** @@ -60,21 +60,21 @@ public void setAutoAddedSubject(final String autoAddedSubject) { } /** - * Sets the single char refrence marker. + * Sets the single char reference marker. * - * @param refrenceMarker the refrence marker + * @param referenceMarker the reference marker */ - public void setRefrenceMarker(final char refrenceMarker) { - this.refrenceMarker = refrenceMarker; + public void setReferenceMarker(final char referenceMarker) { + this.referenceMarker = referenceMarker; } /** - * Gets the refrence marker. + * Gets the reference marker. * - * @return the refrence marker + * @return the reference marker */ - public char getRefrenceMarker() { - return refrenceMarker; + public char getReferenceMarker() { + return referenceMarker; } /** @@ -126,7 +126,7 @@ public void endEntity() { @Override public void literal(final String name, final String value) { final int index = name.indexOf(languageMarker); - if (!name.isEmpty() && name.charAt(0) == refrenceMarker) { + if (!name.isEmpty() && name.charAt(0) == referenceMarker) { getReceiver().startEntity(name.substring(1)); getReceiver().literal(RDF_REFERENCE, value); getReceiver().endEntity(); From 05cb410da9de9d2101163df685941fdd34184689 Mon Sep 17 00:00:00 2001 From: TobiasNx Date: Thu, 30 Jan 2025 15:26:01 +0100 Subject: [PATCH 4/8] Adjust method to change string to char #657 --- .../java/org/metafacture/linkeddata/RdfMacroPipe.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/metafacture-linkeddata/src/main/java/org/metafacture/linkeddata/RdfMacroPipe.java b/metafacture-linkeddata/src/main/java/org/metafacture/linkeddata/RdfMacroPipe.java index 251e9c357..bb74ec44e 100644 --- a/metafacture-linkeddata/src/main/java/org/metafacture/linkeddata/RdfMacroPipe.java +++ b/metafacture-linkeddata/src/main/java/org/metafacture/linkeddata/RdfMacroPipe.java @@ -59,13 +59,14 @@ public void setAutoAddedSubject(final String autoAddedSubject) { this.autoAddedSubject = autoAddedSubject; } - /** + + /** * Sets the single char reference marker. * * @param referenceMarker the reference marker */ - public void setReferenceMarker(final char referenceMarker) { - this.referenceMarker = referenceMarker; + public void setReferenceMarker(final String referenceMarker) { + this.referenceMarker = referenceMarker.charAt(0); } /** @@ -82,8 +83,8 @@ public char getReferenceMarker() { * * @param languageMarker the language marker */ - public void setLanguageMarker(final char languageMarker) { - this.languageMarker = languageMarker; + public void setLanguageMarker(final String languageMarker) { + this.languageMarker = languageMarker.charAt(0); } /** From 8ce7cb36339b537a6f6718fd44809b80820fea6c Mon Sep 17 00:00:00 2001 From: TobiasNx <61879957+TobiasNx@users.noreply.github.com> Date: Thu, 30 Jan 2025 16:21:02 +0100 Subject: [PATCH 5/8] Update metafacture-linkeddata/src/main/java/org/metafacture/linkeddata/RdfMacroPipe.java Co-authored-by: Pascal Christoph --- .../src/main/java/org/metafacture/linkeddata/RdfMacroPipe.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metafacture-linkeddata/src/main/java/org/metafacture/linkeddata/RdfMacroPipe.java b/metafacture-linkeddata/src/main/java/org/metafacture/linkeddata/RdfMacroPipe.java index bb74ec44e..0a8d812df 100644 --- a/metafacture-linkeddata/src/main/java/org/metafacture/linkeddata/RdfMacroPipe.java +++ b/metafacture-linkeddata/src/main/java/org/metafacture/linkeddata/RdfMacroPipe.java @@ -60,7 +60,7 @@ public void setAutoAddedSubject(final String autoAddedSubject) { } - /** + /** * Sets the single char reference marker. * * @param referenceMarker the reference marker From eda87f8801bbb014b52c930aff6aeea698f4007f Mon Sep 17 00:00:00 2001 From: TobiasNx Date: Thu, 30 Jan 2025 16:26:15 +0100 Subject: [PATCH 6/8] Delete empty line #657 --- .../src/main/java/org/metafacture/linkeddata/RdfMacroPipe.java | 1 - 1 file changed, 1 deletion(-) diff --git a/metafacture-linkeddata/src/main/java/org/metafacture/linkeddata/RdfMacroPipe.java b/metafacture-linkeddata/src/main/java/org/metafacture/linkeddata/RdfMacroPipe.java index 0a8d812df..5a04490bf 100644 --- a/metafacture-linkeddata/src/main/java/org/metafacture/linkeddata/RdfMacroPipe.java +++ b/metafacture-linkeddata/src/main/java/org/metafacture/linkeddata/RdfMacroPipe.java @@ -59,7 +59,6 @@ public void setAutoAddedSubject(final String autoAddedSubject) { this.autoAddedSubject = autoAddedSubject; } - /** * Sets the single char reference marker. * From 420bdf7bfb42ce2c3bbd9eb307456a405dd692fb Mon Sep 17 00:00:00 2001 From: TobiasNx Date: Thu, 30 Jan 2025 16:31:51 +0100 Subject: [PATCH 7/8] Adjust description #657 --- .../src/main/java/org/metafacture/linkeddata/RdfMacroPipe.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metafacture-linkeddata/src/main/java/org/metafacture/linkeddata/RdfMacroPipe.java b/metafacture-linkeddata/src/main/java/org/metafacture/linkeddata/RdfMacroPipe.java index 5a04490bf..b8ea5f74f 100644 --- a/metafacture-linkeddata/src/main/java/org/metafacture/linkeddata/RdfMacroPipe.java +++ b/metafacture-linkeddata/src/main/java/org/metafacture/linkeddata/RdfMacroPipe.java @@ -29,7 +29,7 @@ * @author Markus Michael Geipel * */ -@Description("Expands some macros for RDF/XML") +@Description("Expands some macros for RDF/XML. When using fix configure `referenceMarker` to any char but the default `*`") @In(StreamReceiver.class) @Out(StreamReceiver.class) @FluxCommand("rdf-macros") From ab97285650ad8c70a29cf1b134a346b9b55d9f8c Mon Sep 17 00:00:00 2001 From: TobiasNx <61879957+TobiasNx@users.noreply.github.com> Date: Thu, 30 Jan 2025 17:03:41 +0100 Subject: [PATCH 8/8] Update metafacture-linkeddata/src/main/java/org/metafacture/linkeddata/RdfMacroPipe.java Co-authored-by: Jens Wille --- .../src/main/java/org/metafacture/linkeddata/RdfMacroPipe.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metafacture-linkeddata/src/main/java/org/metafacture/linkeddata/RdfMacroPipe.java b/metafacture-linkeddata/src/main/java/org/metafacture/linkeddata/RdfMacroPipe.java index b8ea5f74f..ea51ac446 100644 --- a/metafacture-linkeddata/src/main/java/org/metafacture/linkeddata/RdfMacroPipe.java +++ b/metafacture-linkeddata/src/main/java/org/metafacture/linkeddata/RdfMacroPipe.java @@ -29,7 +29,7 @@ * @author Markus Michael Geipel * */ -@Description("Expands some macros for RDF/XML. When using fix configure `referenceMarker` to any char but the default `*`") +@Description("Expands some macros for RDF/XML. When using Fix, configure `referenceMarker` to any char but the default `*`") @In(StreamReceiver.class) @Out(StreamReceiver.class) @FluxCommand("rdf-macros")