Update turtle-formatter. Fixes #10.

atextor · Sep 25, 2023 · da2dc91 · da2dc91
1 parent 3968d29
commit da2dc91
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/cli/src/main/java/de/atextor/owlcli/OWLCLIWriteCommand.java b/cli/src/main/java/de/atextor/owlcli/OWLCLIWriteCommand.java
@@ -195,6 +195,7 @@ public void run() {
             .objectOrder( objectOrder )
             .anonymousNodeIdGenerator( buildAnonymousNodeIdGenerator( anonymousNodeIdPattern ) )
             .knownPrefixes( buildKnownPrefixes( prefixMap ) )
+            .emptyRdfBase( "https://github.com/atextor/owl-cli/internal" )
             .build();
 
         final Configuration.ConfigurationBuilder configurationBuilder = Configuration.builder()

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -33,6 +33,7 @@ ext.deps = [
     slf4j_api:               'org.slf4j:slf4j-api:2.0.7',
     svm:                     'org.graalvm.nativeimage:svm:22.3.1',
     turtle_formatter:        'de.atextor:turtle-formatter:1.2.7',
+    turtle_formatter:        'de.atextor:turtle-formatter:1.2.9',
     vavr:                    'io.vavr:vavr:0.10.4',
 
     // Test

diff --git a/infer/src/main/java/de/atextor/owlcli/infer/Configuration.java b/infer/src/main/java/de/atextor/owlcli/infer/Configuration.java
@@ -25,7 +25,7 @@ public class Configuration {
     public Format inputFormat = Format.TURTLE;
 
     @Builder.Default
-    public String base = TurtleFormatter.EMPTY_BASE;
+    public String base = TurtleFormatter.DEFAULT_EMPTY_BASE;
 
     public enum Format {
         TURTLE,

diff --git a/write/src/main/java/de/atextor/owlcli/write/Configuration.java b/write/src/main/java/de/atextor/owlcli/write/Configuration.java
@@ -28,9 +28,6 @@ public class Configuration {
     @Builder.Default
     public Format inputFormat = Format.TURTLE;
 
-    @Builder.Default
-    public String base = TurtleFormatter.EMPTY_BASE;
-
     @Builder.Default
     public FormattingStyle formattingStyle = FormattingStyle.DEFAULT;
 

diff --git a/write/src/main/java/de/atextor/owlcli/write/RdfWriter.java b/write/src/main/java/de/atextor/owlcli/write/RdfWriter.java
@@ -62,7 +62,8 @@ public Try<Void> write( final InputStream input, final OutputStream output, fina
         final Model model = ModelFactory.createDefaultModel();
 
         try {
-            model.read( input, configuration.base, configurationFormatToJenaFormat( configuration.inputFormat ) );
+            model.read( input, configuration.formattingStyle.emptyRdfBase,
+                configurationFormatToJenaFormat( configuration.inputFormat ) );
             if ( configuration.outputFormat == Configuration.Format.TURTLE ) {
                 return writeTurtle( model, output, configuration.formattingStyle );
             }

diff --git a/write/src/test/java/de/atextor/owlcli/write/RdfWriterTest.java b/write/src/test/java/de/atextor/owlcli/write/RdfWriterTest.java
@@ -145,14 +145,14 @@ public void testParsingEscapedUri() {
         assertThatCode( () -> {
             final Model model = ModelFactory.createDefaultModel();
             final InputStream stream = new ByteArrayInputStream( modelString.getBytes( StandardCharsets.UTF_8 ) );
-            model.read( stream, TurtleFormatter.EMPTY_BASE, "TURTLE" );
+            model.read( stream, TurtleFormatter.DEFAULT_EMPTY_BASE, "TURTLE" );
         } ).doesNotThrowAnyException();
     }
 
     private Model modelFromString( final String content ) {
         final Model model = ModelFactory.createDefaultModel();
         final InputStream stream = new ByteArrayInputStream( content.getBytes( StandardCharsets.UTF_8 ) );
-        model.read( stream, TurtleFormatter.EMPTY_BASE, "TURTLE" );
+        model.read( stream, TurtleFormatter.DEFAULT_EMPTY_BASE, "TURTLE" );
         return model;
     }
 }