MARMOTTA-271: Upgraded Jackson dependency
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/a0b38a5f Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/a0b38a5f Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/a0b38a5f Branch: refs/heads/develop Commit: a0b38a5f834558fb61266d213bcb8dde31fd2370 Parents: 8ab6998 Author: Jakob Frank <[email protected]> Authored: Thu Dec 19 11:49:09 2013 +0100 Committer: Jakob Frank <[email protected]> Committed: Thu Dec 19 15:12:08 2013 +0100 ---------------------------------------------------------------------- client/marmotta-client-java/pom.xml | 8 ++-- .../client/clients/ConfigurationClient.java | 21 +++++---- .../marmotta/client/clients/ImportClient.java | 19 ++++---- .../marmotta/client/clients/LDPathClient.java | 19 ++++---- .../ldclient/ldclient-provider-facebook/pom.xml | 9 ++-- .../facebook/FacebookGraphProvider.java | 49 ++++++++++++-------- parent/pom.xml | 32 +++++++------ platform/marmotta-core/pom.xml | 18 +++---- .../platform/core/api/task/TaskInfo.java | 4 +- .../platform/core/util/WebServiceUtil.java | 10 ++-- .../config/ConfigurationWebService.java | 30 ++++++------ .../webservices/logging/LoggingWebService.java | 45 +++++++++--------- .../config/ConfigurationWebServiceTest.java | 5 +- .../platform/core/test/ld/LinkedDataTest.java | 26 ++++++----- 14 files changed, 162 insertions(+), 133 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/a0b38a5f/client/marmotta-client-java/pom.xml ---------------------------------------------------------------------- diff --git a/client/marmotta-client-java/pom.xml b/client/marmotta-client-java/pom.xml index 5172827..4a35c78 100644 --- a/client/marmotta-client-java/pom.xml +++ b/client/marmotta-client-java/pom.xml @@ -93,12 +93,12 @@ <artifactId>guava</artifactId> </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core-asl</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> </dependency> <dependency> <groupId>org.openrdf.sesame</groupId> http://git-wip-us.apache.org/repos/asf/marmotta/blob/a0b38a5f/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/clients/ConfigurationClient.java ---------------------------------------------------------------------- diff --git a/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/clients/ConfigurationClient.java b/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/clients/ConfigurationClient.java index 6811191..5ee7e32 100644 --- a/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/clients/ConfigurationClient.java +++ b/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/clients/ConfigurationClient.java @@ -17,6 +17,15 @@ */ package org.apache.marmotta.client.clients; +import java.io.IOException; +import java.io.OutputStream; +import java.net.URLEncoder; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpDelete; @@ -29,19 +38,11 @@ import org.apache.marmotta.client.exception.MarmottaClientException; import org.apache.marmotta.client.exception.NotFoundException; import org.apache.marmotta.client.model.config.Configuration; import org.apache.marmotta.client.util.HTTPUtil; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.TypeReference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; -import java.io.OutputStream; -import java.net.URLEncoder; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; /** * A client that supports accessing the configuration webservice of the Apache Marmotta. May be used for http://git-wip-us.apache.org/repos/asf/marmotta/blob/a0b38a5f/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/clients/ImportClient.java ---------------------------------------------------------------------- diff --git a/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/clients/ImportClient.java b/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/clients/ImportClient.java index b5314a0..0d5a62d 100644 --- a/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/clients/ImportClient.java +++ b/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/clients/ImportClient.java @@ -17,7 +17,13 @@ */ package org.apache.marmotta.client.clients; -import com.google.common.io.ByteStreams; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.HashSet; +import java.util.Set; + import org.apache.http.HttpResponse; import org.apache.http.client.ClientProtocolException; import org.apache.http.client.HttpClient; @@ -30,17 +36,12 @@ import org.apache.http.util.EntityUtils; import org.apache.marmotta.client.ClientConfiguration; import org.apache.marmotta.client.exception.MarmottaClientException; import org.apache.marmotta.client.util.HTTPUtil; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.TypeReference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.HashSet; -import java.util.Set; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.io.ByteStreams; /** * This client class provides support for importing ontologies in various formats into the Apache Marmotta. http://git-wip-us.apache.org/repos/asf/marmotta/blob/a0b38a5f/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/clients/LDPathClient.java ---------------------------------------------------------------------- diff --git a/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/clients/LDPathClient.java b/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/clients/LDPathClient.java index a679860..e6475f7 100644 --- a/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/clients/LDPathClient.java +++ b/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/clients/LDPathClient.java @@ -17,6 +17,13 @@ */ package org.apache.marmotta.client.clients; +import java.io.IOException; +import java.net.URLEncoder; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpGet; @@ -27,18 +34,12 @@ import org.apache.marmotta.client.exception.NotFoundException; import org.apache.marmotta.client.model.rdf.RDFNode; import org.apache.marmotta.client.util.HTTPUtil; import org.apache.marmotta.client.util.RDFJSONParser; -import org.codehaus.jackson.JsonParser; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.TypeReference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; -import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; /** * Add file description here! http://git-wip-us.apache.org/repos/asf/marmotta/blob/a0b38a5f/libraries/ldclient/ldclient-provider-facebook/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/ldclient/ldclient-provider-facebook/pom.xml b/libraries/ldclient/ldclient-provider-facebook/pom.xml index 00bf00e..2dcbb85 100644 --- a/libraries/ldclient/ldclient-provider-facebook/pom.xml +++ b/libraries/ldclient/ldclient-provider-facebook/pom.xml @@ -52,15 +52,14 @@ <artifactId>guava</artifactId> </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core-asl</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> http://git-wip-us.apache.org/repos/asf/marmotta/blob/a0b38a5f/libraries/ldclient/ldclient-provider-facebook/src/main/java/org/apache/marmotta/ldclient/provider/facebook/FacebookGraphProvider.java ---------------------------------------------------------------------- diff --git a/libraries/ldclient/ldclient-provider-facebook/src/main/java/org/apache/marmotta/ldclient/provider/facebook/FacebookGraphProvider.java b/libraries/ldclient/ldclient-provider-facebook/src/main/java/org/apache/marmotta/ldclient/provider/facebook/FacebookGraphProvider.java index e9d606a..9da22a7 100644 --- a/libraries/ldclient/ldclient-provider-facebook/src/main/java/org/apache/marmotta/ldclient/provider/facebook/FacebookGraphProvider.java +++ b/libraries/ldclient/ldclient-provider-facebook/src/main/java/org/apache/marmotta/ldclient/provider/facebook/FacebookGraphProvider.java @@ -17,13 +17,23 @@ package org.apache.marmotta.ldclient.provider.facebook; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import org.apache.http.Header; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; import org.apache.http.client.ClientProtocolException; import org.apache.http.client.methods.HttpGet; -import org.apache.http.impl.cookie.DateParseException; -import org.apache.http.impl.cookie.DateUtils; +import org.apache.http.client.utils.DateUtils; import org.apache.http.util.EntityUtils; import org.apache.marmotta.commons.http.UriUtil; import org.apache.marmotta.commons.vocabulary.DCTERMS; @@ -34,10 +44,6 @@ import org.apache.marmotta.ldclient.api.ldclient.LDClientService; import org.apache.marmotta.ldclient.api.provider.DataProvider; import org.apache.marmotta.ldclient.exception.DataRetrievalException; import org.apache.marmotta.ldclient.model.ClientResponse; -import org.codehaus.jackson.JsonParseException; -import org.codehaus.jackson.map.JsonMappingException; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.TypeReference; import org.openrdf.model.URI; import org.openrdf.model.ValueFactory; import org.openrdf.model.vocabulary.RDF; @@ -50,11 +56,10 @@ import org.openrdf.sail.memory.MemoryStore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; -import java.io.InputStream; -import java.util.*; -import java.util.regex.Matcher; -import java.util.regex.Pattern; +import com.fasterxml.jackson.core.JsonParseException; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.JsonMappingException; +import com.fasterxml.jackson.databind.ObjectMapper; /** * A provider that accesses objects exposed by the Facebook Graph API (in JSON format). The provider will map the @@ -248,8 +253,8 @@ public class FacebookGraphProvider implements DataProvider { con.add(subject,FOAF.nick, vf.createLiteral(data.get("username").toString())); } - if(data.get("cover") != null && data.get("cover") instanceof Map && ((Map)data.get("cover")).get("source") != null) { - con.add(subject,FOAF.thumbnail, vf.createURI(((Map) data.get("cover")).get("source").toString())); + if(data.get("cover") != null && data.get("cover") instanceof Map && ((Map<?,?>)data.get("cover")).get("source") != null) { + con.add(subject,FOAF.thumbnail, vf.createURI(((Map<?,?>) data.get("cover")).get("source").toString())); } @@ -278,7 +283,7 @@ public class FacebookGraphProvider implements DataProvider { throw new DataRetrievalException("error while accessing Facebook Graph API",e); } - return Collections.EMPTY_LIST; + return Collections.emptyList(); } /** @@ -421,7 +426,7 @@ public class FacebookGraphProvider implements DataProvider { } - private class ResponseHandler implements org.apache.http.client.ResponseHandler<List<String>> { + protected class ResponseHandler implements org.apache.http.client.ResponseHandler<List<String>> { private Date expiresDate; @@ -468,11 +473,7 @@ public class FacebookGraphProvider implements DataProvider { if (expiresDate == null) { Header expires = response.getFirstHeader("Expires"); if (expires != null) { - try { - expiresDate = DateUtils.parseDate(expires.getValue()); - } catch (DateParseException e) { - log.debug("error parsing Expires: header"); - } + expiresDate = DateUtils.parseDate(expires.getValue()); } } @@ -507,6 +508,14 @@ public class FacebookGraphProvider implements DataProvider { return requestUrls; } + public Endpoint getEndpoint() { + return endpoint; + } + + public int getHttpStatus() { + return httpStatus; + } + } } http://git-wip-us.apache.org/repos/asf/marmotta/blob/a0b38a5f/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index ce72ed6..1e74d63 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -51,6 +51,7 @@ <mysql.version>5.1.21</mysql.version> <jetty.version>9.0.3.v20130506</jetty.version> <resteasy.version>3.0.6.Final</resteasy.version> + <jackson.version>2.2.3</jackson.version> </properties> <prerequisites> @@ -787,28 +788,33 @@ </dependency> <dependency> <groupId>org.jboss.resteasy</groupId> - <artifactId>resteasy-jackson-provider</artifactId> + <artifactId>resteasy-jackson2-provider</artifactId> <version>${resteasy.version}</version> </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core-asl</artifactId> - <version>1.9.13</version> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + <version>${jackson.version}</version> </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - <version>1.9.13</version> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + <version>${jackson.version}</version> </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-jaxrs</artifactId> - <version>1.9.13</version> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>${jackson.version}</version> </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-xc</artifactId> - <version>1.9.13</version> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <artifactId>jackson-jaxrs-json-provider</artifactId> + <version>${jackson.version}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.module</groupId> + <artifactId>jackson-module-jaxb-annotations</artifactId> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>org.json</groupId> http://git-wip-us.apache.org/repos/asf/marmotta/blob/a0b38a5f/platform/marmotta-core/pom.xml ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/pom.xml b/platform/marmotta-core/pom.xml index 2f0ae17..648e59d 100644 --- a/platform/marmotta-core/pom.xml +++ b/platform/marmotta-core/pom.xml @@ -290,23 +290,23 @@ </dependency> <dependency> <groupId>org.jboss.resteasy</groupId> - <artifactId>resteasy-jackson-provider</artifactId> + <artifactId>resteasy-jackson2-provider</artifactId> </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core-asl</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-jaxrs</artifactId> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <artifactId>jackson-jaxrs-json-provider</artifactId> </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-xc</artifactId> + <groupId>com.fasterxml.jackson.module</groupId> + <artifactId>jackson-module-jaxb-annotations</artifactId> </dependency> <!-- Front-end --> http://git-wip-us.apache.org/repos/asf/marmotta/blob/a0b38a5f/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/task/TaskInfo.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/task/TaskInfo.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/task/TaskInfo.java index 1803d1f..4da205a 100644 --- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/task/TaskInfo.java +++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/task/TaskInfo.java @@ -17,13 +17,13 @@ */ package org.apache.marmotta.platform.core.api.task; -import org.codehaus.jackson.annotate.JsonIgnore; - import java.util.Collections; import java.util.Date; import java.util.LinkedHashMap; import java.util.Map; +import com.fasterxml.jackson.annotation.JsonIgnore; + public abstract class TaskInfo { protected final long started; http://git-wip-us.apache.org/repos/asf/marmotta/blob/a0b38a5f/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/util/WebServiceUtil.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/util/WebServiceUtil.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/util/WebServiceUtil.java index 490bef4..ce715b3 100644 --- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/util/WebServiceUtil.java +++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/util/WebServiceUtil.java @@ -17,15 +17,17 @@ */ package org.apache.marmotta.platform.core.util; -import org.apache.commons.lang3.exception.ExceptionUtils; -import org.codehaus.jackson.map.ObjectMapper; - -import javax.ws.rs.Path; import java.io.IOException; import java.io.OutputStream; import java.util.HashMap; import java.util.Map; +import javax.ws.rs.Path; + +import org.apache.commons.lang3.exception.ExceptionUtils; + +import com.fasterxml.jackson.databind.ObjectMapper; + /** * Utility methods for web services * <p/> http://git-wip-us.apache.org/repos/asf/marmotta/blob/a0b38a5f/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/config/ConfigurationWebService.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/config/ConfigurationWebService.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/config/ConfigurationWebService.java index 1da3836..54cafcd 100644 --- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/config/ConfigurationWebService.java +++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/config/ConfigurationWebService.java @@ -17,13 +17,13 @@ */ package org.apache.marmotta.platform.core.webservices.config; -import org.apache.commons.configuration.ConversionException; -import org.apache.marmotta.platform.core.api.config.ConfigurationService; -import org.codehaus.jackson.JsonParseException; -import org.codehaus.jackson.map.JsonMappingException; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.TypeReference; -import org.slf4j.Logger; +import java.io.BufferedReader; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; @@ -38,13 +38,15 @@ import javax.ws.rs.Produces; import javax.ws.rs.QueryParam; import javax.ws.rs.core.Context; import javax.ws.rs.core.Response; -import java.io.BufferedReader; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; + +import org.apache.commons.configuration.ConversionException; +import org.apache.marmotta.platform.core.api.config.ConfigurationService; +import org.slf4j.Logger; + +import com.fasterxml.jackson.core.JsonParseException; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.JsonMappingException; +import com.fasterxml.jackson.databind.ObjectMapper; /** * Manage the system configuration of the Apache Marmotta Server. Provides methods for displaying and updating the configuration http://git-wip-us.apache.org/repos/asf/marmotta/blob/a0b38a5f/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/logging/LoggingWebService.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/logging/LoggingWebService.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/logging/LoggingWebService.java index 56ee852..b5afd70 100644 --- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/logging/LoggingWebService.java +++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/logging/LoggingWebService.java @@ -1,21 +1,10 @@ package org.apache.marmotta.platform.core.webservices.logging; -import ch.qos.logback.classic.Level; -import com.google.common.base.Function; -import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; -import org.apache.commons.lang3.StringUtils; -import org.apache.marmotta.platform.core.api.config.ConfigurationService; -import org.apache.marmotta.platform.core.api.logging.LoggingModule; -import org.apache.marmotta.platform.core.api.logging.LoggingService; -import org.apache.marmotta.platform.core.model.logging.ConsoleOutput; -import org.apache.marmotta.platform.core.model.logging.LogFileOutput; -import org.apache.marmotta.platform.core.model.logging.LoggingOutput; -import org.apache.marmotta.platform.core.model.logging.SyslogOutput; -import org.codehaus.jackson.JsonParseException; -import org.codehaus.jackson.map.JsonMappingException; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.TypeReference; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; @@ -28,11 +17,25 @@ import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.ws.rs.core.Context; import javax.ws.rs.core.Response; -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; + +import org.apache.commons.lang3.StringUtils; +import org.apache.marmotta.platform.core.api.config.ConfigurationService; +import org.apache.marmotta.platform.core.api.logging.LoggingModule; +import org.apache.marmotta.platform.core.api.logging.LoggingService; +import org.apache.marmotta.platform.core.model.logging.ConsoleOutput; +import org.apache.marmotta.platform.core.model.logging.LogFileOutput; +import org.apache.marmotta.platform.core.model.logging.LoggingOutput; +import org.apache.marmotta.platform.core.model.logging.SyslogOutput; + +import ch.qos.logback.classic.Level; + +import com.fasterxml.jackson.core.JsonParseException; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.JsonMappingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.base.Function; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; /** * Listing and modifying logging configuration for appenders and logging modules. JSON format for each appender is: http://git-wip-us.apache.org/repos/asf/marmotta/blob/a0b38a5f/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/config/ConfigurationWebServiceTest.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/config/ConfigurationWebServiceTest.java b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/config/ConfigurationWebServiceTest.java index 9a29337..08fa8ce 100644 --- a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/config/ConfigurationWebServiceTest.java +++ b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/config/ConfigurationWebServiceTest.java @@ -19,19 +19,20 @@ package org.apache.marmotta.platform.core.test.config; import static com.jayway.restassured.RestAssured.expect; import static com.jayway.restassured.RestAssured.given; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.hasItem; +import static org.hamcrest.Matchers.hasItems; import java.io.IOException; import org.apache.marmotta.platform.core.api.config.ConfigurationService; import org.apache.marmotta.platform.core.test.base.JettyMarmotta; import org.apache.marmotta.platform.core.webservices.config.ConfigurationWebService; -import org.codehaus.jackson.map.ObjectMapper; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Lists; import com.jayway.restassured.RestAssured; http://git-wip-us.apache.org/repos/asf/marmotta/blob/a0b38a5f/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/ld/LinkedDataTest.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/ld/LinkedDataTest.java b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/ld/LinkedDataTest.java index b48d747..1aa384f 100644 --- a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/ld/LinkedDataTest.java +++ b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/ld/LinkedDataTest.java @@ -17,7 +17,14 @@ package org.apache.marmotta.platform.core.test.ld; -import com.jayway.restassured.RestAssured; +import static com.jayway.restassured.RestAssured.expect; +import static com.jayway.restassured.RestAssured.given; + +import java.io.IOException; +import java.io.StringReader; +import java.io.StringWriter; +import java.util.Random; + import org.apache.commons.io.IOUtils; import org.apache.commons.lang.RandomStringUtils; import org.apache.marmotta.platform.core.api.triplestore.ContextService; @@ -26,8 +33,11 @@ import org.apache.marmotta.platform.core.test.base.JettyMarmotta; import org.apache.marmotta.platform.core.webservices.resource.ContentWebService; import org.apache.marmotta.platform.core.webservices.resource.MetaWebService; import org.apache.marmotta.platform.core.webservices.resource.ResourceWebService; -import org.codehaus.jackson.map.ObjectMapper; -import org.junit.*; +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Ignore; +import org.junit.Test; import org.openrdf.model.Statement; import org.openrdf.model.URI; import org.openrdf.repository.Repository; @@ -40,14 +50,8 @@ import org.openrdf.rio.RDFParseException; import org.openrdf.rio.Rio; import org.openrdf.sail.memory.MemoryStore; -import java.io.IOException; -import java.io.StringReader; -import java.io.StringWriter; -import java.util.Random; - -import static com.jayway.restassured.RestAssured.expect; -import static com.jayway.restassured.RestAssured.form; -import static com.jayway.restassured.RestAssured.given; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.jayway.restassured.RestAssured; /** * This test verifies the functionality of the Linked Data endpoint
