Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

{WIP} Comment out lang_string, as that will require more thought #577

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

{WIP} Comment out lang_string, as that will require more thought #577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions common/rdf/src/main/java/dev/enola/rdf/RdfThingConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,11 @@ private static dev.enola.thing.Value.Builder convert(
if (CoreDatatype.XSD.STRING.getIri().equals(datatype)) {
value.setString(rdfValue.stringValue());

} else if (optLang.isPresent()) {
var langString = dev.enola.thing.Value.LangString.newBuilder();
langString.setText(rdfLiteral.stringValue());
langString.setLang(optLang.get());
value.setLangString(langString);
// } else if (optLang.isPresent()) {
// var langString = dev.enola.thing.Value.LangString.newBuilder();
// langString.setText(rdfLiteral.stringValue());
// langString.setLang(optLang.get());
// value.setLangString(langString);

} else {
var literal = dev.enola.thing.Value.Literal.newBuilder();
Expand Down
10 changes: 5 additions & 5 deletions common/rdf/src/main/java/dev/enola/rdf/ThingRdfConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import dev.enola.common.convert.ConverterInto;
import dev.enola.thing.Thing;
import dev.enola.thing.ThingOrBuilder;
import dev.enola.thing.Value.LangString;

import org.eclipse.rdf4j.model.BNode;
import org.eclipse.rdf4j.model.IRI;
Expand Down Expand Up @@ -118,10 +117,11 @@ yield singleton(
vf.createLiteral(literal.getValue(), createIRI(literal.getDatatype())));
}

case LANG_STRING -> {
LangString langString = value.getLangString();
yield singleton(vf.createLiteral(langString.getText(), langString.getLang()));
}
// case LANG_STRING -> {
// LangString langString = value.getLangString();
// yield singleton(vf.createLiteral(langString.getText(),
// langString.getLang()));
// }

case STRUCT -> {
BNode bNode;
Expand Down
2 changes: 1 addition & 1 deletion common/rdf/src/test/resources/picasso.thing.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

iri: http://example.enola.dev/Picasso
fields:
http://www.w3.org/ns/locn#location: { lang_string: { text: "Spain", lang: en } }
http://www.w3.org/ns/locn#location: { string: "Spain" } # { lang_string: { text: "Spain", lang: en } }
# TODO http://www.w3.org/ns/locn#location: { lang_string: { text: "España", lang: es } }
http://xmlns.com/foaf/0.1/firstName: { string: "Pablo" }
http://www.w3.org/1999/02/22-rdf-syntax-ns#type: { link: { iri: "http://example.enola.dev/Artist" } }
Expand Down
16 changes: 8 additions & 8 deletions common/thing/thing.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ message Value {

// TODO Keep or remove this? See
// https://github.com/enola-dev/enola/pull/540...
LangString lang_string = 4;
// LangString lang_string = 4;

// Sub-structure (contained) Thing.
Thing struct = 18;
Expand Down Expand Up @@ -105,13 +105,13 @@ message Value {

// TODO Keep or remove this? See
// https://github.com/enola-dev/enola/pull/540...
message LangString {
// Text, for humans.
string text = 1;

// BCP 47 “language tag” (e.g. “de-ch”) of the text.
string lang = 2;
}
// message LangString {
// // Text, for humans.
// string text = 1;
//
// // BCP 47 “language tag” (e.g. “de-ch”) of the text.
// string lang = 2;
// }

message List {
repeated Value values = 1;
Expand Down
110 changes: 110 additions & 0 deletions t
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@

Δ common/rdf/src/main/java/dev/enola/rdf/RdfThingConverter.java
────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────

────────────────────────────────────────────────────────────────────────────────────┐
• 134: class RdfThingConverter implements Converter<Model, Stream<Thing.Builder>> { │
────────────────────────────────────────────────────────────────────────────────────┘
 if (CoreDatatype.XSD.STRING.getIri().equals(datatype)) {
 value.setString(rdfValue.stringValue());

 } else if (optLang.isPresent()) {
 var langString = dev.enola.thing.Value.LangString.newBuilder();
 langString.setText(rdfLiteral.stringValue());
 langString.setLang(optLang.get());
 value.setLangString(langString);
  // } else if (optLang.isPresent()) {
 // var langString = dev.enola.thing.Value.LangString.newBuilder();
 // langString.setText(rdfLiteral.stringValue());
 // langString.setLang(optLang.get());
 // value.setLangString(langString);

 } else {
 var literal = dev.enola.thing.Value.Literal.newBuilder();

Δ common/rdf/src/main/java/dev/enola/rdf/ThingRdfConverter.java
────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────

─────────────────────────────────────────────────┐
• 27: import dev.enola.common.convert.Converter; │
─────────────────────────────────────────────────┘
import dev.enola.common.convert.ConverterInto;
import dev.enola.thing.Thing;
import dev.enola.thing.ThingOrBuilder;
import dev.enola.thing.Value.LangString;

import org.eclipse.rdf4j.model.BNode;
import org.eclipse.rdf4j.model.IRI;

───────────────────────────────┐
• 117: class ThingRdfConverter │
───────────────────────────────┘
 vf.createLiteral(literal.getValue(), createIRI(literal.getDatatype())));
 }

 case LANG_STRING -> {
 LangString langString = value.getLangString();
 yield singleton(vf.createLiteral(langString.getText(), langString.getLang()));
 }
  // case LANG_STRING -> {
 // LangString langString = value.getLangString();
 // yield singleton(vf.createLiteral(langString.getText(),
 // langString.getLang()));
  // }

 case STRUCT -> {
 BNode bNode;

Δ common/rdf/src/test/resources/picasso.thing.yaml
────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────

──────┐
• 16: │
──────┘

iri: http://example.enola.dev/Picasso
fields:
 http://www.w3.org/ns/locn#location: { lang_string: { text: "Spain", lang: en } }
 http://www.w3.org/ns/locn#location: { string: "Spain" } # { lang_string: { text: "Spain", lang: en } }
 # TODO http://www.w3.org/ns/locn#location: { lang_string: { text: "España", lang: es } }
 http://xmlns.com/foaf/0.1/firstName: { string: "Pablo" }
 http://www.w3.org/1999/02/22-rdf-syntax-ns#type: { link: { iri: "http://example.enola.dev/Artist" } }

Δ common/thing/thing.proto
────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────

──────────────────────┐
• 54: message Value { │
──────────────────────┘

 // TODO Keep or remove this? See
 // https://github.com/enola-dev/enola/pull/540...
 LangString lang_string = 4;
 // LangString lang_string = 4;

 // Sub-structure (contained) Thing.
 Thing struct = 18;

───────────────────────┐
• 105: message Value { │
───────────────────────┘

 // TODO Keep or remove this? See
 // https://github.com/enola-dev/enola/pull/540...
 message LangString {
 // Text, for humans.
 string text = 1;

 // BCP 47 “language tag” (e.g. “de-ch”) of the text.
 string lang = 2;
 }
 // message LangString {
 //  // Text, for humans.
 //  string text = 1;
 //
 //  // BCP 47 “language tag” (e.g. “de-ch”) of the text.
 //  string lang = 2;
 // }

 message List {
 repeated Value values = 1;