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

Migrate to Jena 4.1.0 & jersey 2.35 #212

Closed
wants to merge 1 commit into from
Closed

Migrate to Jena 4.1.0 & jersey 2.35 #212

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
6 changes: 6 additions & 0 deletions client/oslc-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,12 @@
<version>${v.jersey}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
<version>${v.jersey}</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down
16 changes: 8 additions & 8 deletions ...ovider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/AbstractOslcRdfXmlProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
import javax.ws.rs.ext.Providers;
import org.apache.jena.rdf.model.Model;
import org.apache.jena.rdf.model.ModelFactory;
import org.apache.jena.rdf.model.RDFReader;
import org.apache.jena.rdf.model.RDFWriter;
import org.apache.jena.rdf.model.RDFReaderI;
import org.apache.jena.rdf.model.RDFWriterI;
import org.apache.jena.riot.RDFLanguages;
import org.apache.jena.util.FileUtils;
import org.eclipse.lyo.oslc4j.core.OSLC4JConstants;
Expand Down Expand Up @@ -132,7 +132,7 @@ private void writeObjectsTo(final Object[] objects, final OutputStream outputStr
responseInfo,
objects,
properties);
RDFWriter writer = getRdfWriter(serializationLanguage, model);
RDFWriterI writer = getRdfWriter(serializationLanguage, model);

if (serializationLanguage.equals(FileUtils.langXML) || serializationLanguage.equals(FileUtils.langXMLAbbrev))
{
Expand All @@ -154,8 +154,8 @@ private void writeObjectsTo(final Object[] objects, final OutputStream outputStr
}
}

private RDFWriter getRdfWriter(final String serializationLanguage, final Model model) {
RDFWriter writer;
private RDFWriterI getRdfWriter(final String serializationLanguage, final Model model) {
RDFWriterI writer;
if (serializationLanguage.equals(FileUtils.langXMLAbbrev))
{
writer = new RdfXmlAbbreviatedWriter();
Expand Down Expand Up @@ -290,7 +290,7 @@ protected Object[] readFrom(final Class<?> type,
{
final Model model = ModelFactory.createDefaultModel();

RDFReader reader = getRdfReader(mediaType, model);
RDFReaderI reader = getRdfReader(mediaType, model);

try
{
Expand All @@ -313,8 +313,8 @@ protected Object[] readFrom(final Class<?> type,
}
}

private RDFReader getRdfReader(final MediaType mediaType, final Model model) {
RDFReader reader;
private RDFReaderI getRdfReader(final MediaType mediaType, final Model model) {
RDFReaderI reader;
final String language = getSerializationLanguage(mediaType);
if (language.equals(FileUtils.langXMLAbbrev))
{
Expand Down
2 changes: 1 addition & 1 deletion ...-provider/src/main/java/org/eclipse/lyo/oslc4j/provider/jena/RdfXmlAbbreviatedWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
* @see RDFWriter
*/
@SuppressWarnings("FieldCanBeLocal")
public class RdfXmlAbbreviatedWriter implements RDFWriter {
public class RdfXmlAbbreviatedWriter implements RDFWriterI {

private final Map<AnonId, String> resourceIdToShortIdMap;
private int shortIdCounter = 0;
Expand Down
4 changes: 2 additions & 2 deletions core/oslc4j-utils/src/main/java/org/eclipse/lyo/core/utils/marshallers/OSLC4JMarshaller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import org.eclipse.lyo.oslc4j.provider.json4j.JsonHelper;

import org.apache.jena.rdf.model.Model;
import org.apache.jena.rdf.model.RDFWriter;
import org.apache.jena.rdf.model.RDFWriterI;
import org.apache.jena.util.FileUtils;

import static org.eclipse.lyo.core.utils.marshallers.MarshallerConstants.*;
Expand Down Expand Up @@ -58,7 +58,7 @@ public void marshal(Object[] resources, OutputStream os) throws WebApplicationEx
}else if (mediaType.isCompatible(MT_N3)) {
format = FileUtils.langN3;
}
final RDFWriter writer = model.getWriter(format);
final RDFWriterI writer = model.getWriter(format);
if (mediaType.isCompatible(MT_RDF_XML)
|| mediaType.isCompatible(MediaType.APPLICATION_XML_TYPE)
|| mediaType.isCompatible(MT_OSLC_COMPACT)){
Expand Down
6 changes: 3 additions & 3 deletions ...oslc4j-utils/src/main/java/org/eclipse/lyo/core/utils/marshallers/OSLC4JUnmarshaller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

import org.apache.jena.rdf.model.Model;
import org.apache.jena.rdf.model.ModelFactory;
import org.apache.jena.rdf.model.RDFReader;
import org.apache.jena.rdf.model.RDFReaderI;
import org.apache.jena.util.FileUtils;

public class OSLC4JUnmarshaller {
Expand All @@ -42,7 +42,7 @@ public class OSLC4JUnmarshaller {
@SuppressWarnings("unchecked")
public <T> T unmarshal(InputStream inputStream, Class<T> clazz) throws IllegalArgumentException, SecurityException, DatatypeConfigurationException, IllegalAccessException, InstantiationException, InvocationTargetException, OslcCoreApplicationException, URISyntaxException, NoSuchMethodException{
final Model model = ModelFactory.createDefaultModel();
final RDFReader reader = getReader(model);
final RDFReaderI reader = getReader(model);
if (reader == null) { // unsupported media type
return null;
}
Expand All @@ -67,7 +67,7 @@ public <T> T unmarshal(InputStream inputStream, Class<T> clazz) throws IllegalAr
return ret;
}

private RDFReader getReader(final Model model) {
private RDFReaderI getReader(final Model model) {
if (mediaType.isCompatible(MT_RDF_XML) || mediaType.isCompatible(MediaType.APPLICATION_XML_TYPE)) {
return model.getReader(); // Default reader handles both xml and abbreviated xml
}
Expand Down
12 changes: 6 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
<v.kotlin>1.5.10</v.kotlin>
<v.dokka>1.4.32</v.dokka>

<v.jena>3.16.0</v.jena>
<v.jersey>2.25.1</v.jersey>
<v.jena>4.1.0</v.jena>
<v.jersey>2.35</v.jersey>
<v.slf4j>1.7.32</v.slf4j>
<v.servlet>3.1.0</v.servlet>
<v.httpclient>4.5.13</v.httpclient>
Expand Down Expand Up @@ -320,12 +320,12 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.12.0</version>
<version>2.12.3</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.12.0</version>
<version>2.12.3</version>
</dependency>

<dependency>
Expand All @@ -336,7 +336,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.11</version>
<version>3.12.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand All @@ -353,7 +353,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.7</version>
<version>2.8.0</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
Expand Down
2 changes: 0 additions & 2 deletions ...re-core/src/main/java/org/eclipse/lyo/store/internals/query/DatasetQueryExecutorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
import org.apache.jena.query.QueryExecutionFactory;
import org.apache.jena.tdb.TDB;
import org.apache.jena.tdb.TDBFactory;
import org.apache.jena.update.GraphStore;
import org.apache.jena.update.GraphStoreFactory;
import org.apache.jena.update.UpdateExecutionFactory;
import org.apache.jena.update.UpdateFactory;
import org.apache.jena.update.UpdateProcessor;
Expand Down
6 changes: 6 additions & 0 deletions trs/server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,12 @@
<version>${v.jersey}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
<version>${v.jersey}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.test-framework</groupId>
<artifactId>jersey-test-framework-core</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions trs/server/src/main/java/org/eclipse/lyo/oslc4j/trs/server/TRSUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import org.apache.commons.lang.math.RandomUtils;
import org.apache.jena.rdf.model.Model;
import org.apache.jena.rdf.model.ModelFactory;
import org.apache.jena.rdf.model.RDFWriter;
import org.apache.jena.rdf.model.RDFWriterI;
import org.apache.jena.rdf.model.ResIterator;
import org.apache.jena.rdf.model.Resource;
import org.apache.jena.vocabulary.RDF;
Expand Down Expand Up @@ -172,7 +172,7 @@ public static void writeModelToFile(Model jenaModel, String filePath) throws IOE

final OutputStream os = new FileOutputStream(file);

final RDFWriter rdfWriter = jenaModel.getWriter("RDF/XML");
final RDFWriterI rdfWriter = jenaModel.getWriter("RDF/XML");
rdfWriter.setProperty("showXmlDeclaration", true);
rdfWriter.setProperty("allowBadURIs", "true");
rdfWriter.setProperty("relativeURIs", "");
Expand Down