You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by sb...@apache.org on 2016/11/29 03:01:32 UTC
[2/2] incubator-streams git commit: Streams-441: Minimize use of
Guava Apis
Streams-441: Minimize use of Guava Apis
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/10944954
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/10944954
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/10944954
Branch: refs/heads/master
Commit: 10944954a0ce833a429295e1fd9f852dac234498
Parents: 125a992
Author: smarthi <sm...@apache.org>
Authored: Mon Nov 28 19:23:45 2016 -0500
Committer: smarthi <sm...@apache.org>
Committed: Mon Nov 28 19:23:45 2016 -0500
----------------------------------------------------------------------
.../streams/converter/LineReadWriteUtil.java | 8 +++-----
.../test/ElasticsearchParentChildUpdaterIT.java | 18 +++++++++---------
.../test/ElasticsearchParentChildWriterIT.java | 18 +++++++++---------
.../test/ElasticsearchPersistUpdaterIT.java | 6 +++---
.../test/ElasticsearchPersistWriterIT.java | 10 +++++-----
.../test/TestMetadataFromDocumentProcessor.java | 4 ++--
.../apache/streams/hdfs/test/TestHdfsPersist.java | 4 ++--
.../apache/streams/mongo/test/MongoPersistIT.java | 10 +++++-----
.../streams/pojo/test/ActivitySerDeTest.java | 4 ++--
.../test/SchemaValidationTest.java | 4 ++--
.../w3c/activitystreams/test/ExamplesSerDeIT.java | 10 +++++-----
11 files changed, 47 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/10944954/streams-components/streams-converters/src/main/java/org/apache/streams/converter/LineReadWriteUtil.java
----------------------------------------------------------------------
diff --git a/streams-components/streams-converters/src/main/java/org/apache/streams/converter/LineReadWriteUtil.java b/streams-components/streams-converters/src/main/java/org/apache/streams/converter/LineReadWriteUtil.java
index 9ffc653..d680541 100644
--- a/streams-components/streams-converters/src/main/java/org/apache/streams/converter/LineReadWriteUtil.java
+++ b/streams-components/streams-converters/src/main/java/org/apache/streams/converter/LineReadWriteUtil.java
@@ -73,9 +73,7 @@ public class LineReadWriteUtil {
* @return result
*/
public static LineReadWriteUtil getInstance(LineReadWriteConfiguration configuration) {
- if ( INSTANCE_MAP.containsKey(configuration)
- &&
- INSTANCE_MAP.get(configuration) != null) {
+ if (INSTANCE_MAP.containsKey(configuration) && INSTANCE_MAP.get(configuration) != null) {
return INSTANCE_MAP.get(configuration);
} else {
INSTANCE_MAP.put(configuration, new LineReadWriteUtil(configuration));
@@ -96,7 +94,7 @@ public class LineReadWriteUtil {
}
String[] parsedFields = line.split(fieldDelimiter);
- if ( parsedFields.length == 0) {
+ if (parsedFields.length == 0) {
return null;
}
@@ -248,7 +246,7 @@ public class LineReadWriteUtil {
}
private String trimLineDelimiter(String str) {
- if ( !StringUtils.isNotBlank(str)) {
+ if (!StringUtils.isNotBlank(str)) {
if (str.endsWith(lineDelimiter)) {
return str.substring(0, str.length() - 1);
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/10944954/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchParentChildUpdaterIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchParentChildUpdaterIT.java b/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchParentChildUpdaterIT.java
index d3b1fd3..2764318 100644
--- a/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchParentChildUpdaterIT.java
+++ b/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchParentChildUpdaterIT.java
@@ -28,12 +28,11 @@ import org.apache.streams.pojo.json.Activity;
import org.apache.streams.pojo.json.ActivityObject;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Strings;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
import com.typesafe.config.ConfigParseOptions;
-import org.apache.commons.io.Charsets;
import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsRequest;
@@ -55,12 +54,13 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Set;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertTrue;
/**
* Integration Test for
@@ -73,12 +73,12 @@ public class ElasticsearchParentChildUpdaterIT {
private static ObjectMapper MAPPER = StreamsJacksonMapper.getInstance();
- protected ElasticsearchWriterConfiguration testConfiguration;
- protected Client testClient;
+ private ElasticsearchWriterConfiguration testConfiguration;
+ private Client testClient;
- Set<Class<? extends ActivityObject>> objectTypes;
+ private Set<Class<? extends ActivityObject>> objectTypes;
- List<String> files;
+ private List<String> files;
@Before
public void prepareTest() throws Exception {
@@ -106,7 +106,7 @@ public class ElasticsearchParentChildUpdaterIT {
InputStream testActivityFolderStream = ElasticsearchParentChildUpdaterIT.class.getClassLoader()
.getResourceAsStream("activities");
- files = IOUtils.readLines(testActivityFolderStream, Charsets.UTF_8);
+ files = IOUtils.readLines(testActivityFolderStream, StandardCharsets.UTF_8);
}
@@ -123,7 +123,7 @@ public class ElasticsearchParentChildUpdaterIT {
Activity activity = MAPPER.readValue(testActivityFileStream, Activity.class);
activity.setAdditionalProperty("updated", Boolean.TRUE);
StreamsDatum datum = new StreamsDatum(activity, activity.getVerb());
- if( !Strings.isNullOrEmpty(activity.getObject().getObjectType())) {
+ if(StringUtils.isNotBlank(activity.getObject().getObjectType())) {
datum.getMetadata().put("parent", activity.getObject().getObjectType());
datum.getMetadata().put("type", "activity");
testPersistUpdater.write(datum);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/10944954/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchParentChildWriterIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchParentChildWriterIT.java b/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchParentChildWriterIT.java
index d35b8a2..4cbc8bc 100644
--- a/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchParentChildWriterIT.java
+++ b/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchParentChildWriterIT.java
@@ -29,12 +29,11 @@ import org.apache.streams.pojo.json.ActivityObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.base.Strings;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
import com.typesafe.config.ConfigParseOptions;
-import org.apache.commons.io.Charsets;
import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest;
@@ -59,12 +58,13 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.InputStream;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Set;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertTrue;
/**
* Integration Test for
@@ -77,12 +77,12 @@ public class ElasticsearchParentChildWriterIT {
private static ObjectMapper MAPPER = StreamsJacksonMapper.getInstance();
- protected ElasticsearchWriterConfiguration testConfiguration;
- protected Client testClient;
+ private ElasticsearchWriterConfiguration testConfiguration;
+ private Client testClient;
- Set<Class<? extends ActivityObject>> objectTypes;
+ private Set<Class<? extends ActivityObject>> objectTypes;
- List<String> files;
+ private List<String> files;
@Before
public void prepareTest() throws Exception {
@@ -122,7 +122,7 @@ public class ElasticsearchParentChildWriterIT {
InputStream testActivityFolderStream = ElasticsearchParentChildWriterIT.class.getClassLoader()
.getResourceAsStream("activities");
- files = IOUtils.readLines(testActivityFolderStream, Charsets.UTF_8);
+ files = IOUtils.readLines(testActivityFolderStream, StandardCharsets.UTF_8);
}
@@ -153,7 +153,7 @@ public class ElasticsearchParentChildWriterIT {
.getResourceAsStream("activities/" + file);
Activity activity = MAPPER.readValue(testActivityFileStream, Activity.class);
StreamsDatum datum = new StreamsDatum(activity, activity.getVerb());
- if( !Strings.isNullOrEmpty(activity.getObject().getObjectType())) {
+ if(StringUtils.isNotBlank(activity.getObject().getObjectType())) {
datum.getMetadata().put("parent", activity.getObject().getObjectType());
datum.getMetadata().put("type", "activity");
testPersistWriter.write(datum);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/10944954/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchPersistUpdaterIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchPersistUpdaterIT.java b/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchPersistUpdaterIT.java
index 603ec5f..54303ea 100644
--- a/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchPersistUpdaterIT.java
+++ b/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchPersistUpdaterIT.java
@@ -31,7 +31,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
import com.typesafe.config.ConfigParseOptions;
-import org.apache.commons.io.Charsets;
import org.apache.commons.io.IOUtils;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
@@ -50,11 +49,12 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
import java.util.List;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertTrue;
/**
* Integration Test for
@@ -109,7 +109,7 @@ public class ElasticsearchPersistUpdaterIT {
InputStream testActivityFolderStream = ElasticsearchPersistUpdaterIT.class.getClassLoader()
.getResourceAsStream("activities");
- List<String> files = IOUtils.readLines(testActivityFolderStream, Charsets.UTF_8);
+ List<String> files = IOUtils.readLines(testActivityFolderStream, StandardCharsets.UTF_8);
for( String file : files) {
LOGGER.info("File: " + file );
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/10944954/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchPersistWriterIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchPersistWriterIT.java b/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchPersistWriterIT.java
index 3fec9f3..50331ec 100644
--- a/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchPersistWriterIT.java
+++ b/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/ElasticsearchPersistWriterIT.java
@@ -30,7 +30,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
import com.typesafe.config.ConfigParseOptions;
-import org.apache.commons.io.Charsets;
import org.apache.commons.io.IOUtils;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
@@ -50,11 +49,12 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
import java.util.List;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertTrue;
/**
* Integration Test for
@@ -66,8 +66,8 @@ public class ElasticsearchPersistWriterIT {
private static ObjectMapper MAPPER = StreamsJacksonMapper.getInstance();
- protected ElasticsearchWriterConfiguration testConfiguration;
- protected Client testClient;
+ private ElasticsearchWriterConfiguration testConfiguration;
+ private Client testClient;
@Before
public void prepareTest() throws Exception {
@@ -102,7 +102,7 @@ public class ElasticsearchPersistWriterIT {
InputStream testActivityFolderStream = ElasticsearchPersistWriterIT.class.getClassLoader()
.getResourceAsStream("activities");
- List<String> files = IOUtils.readLines(testActivityFolderStream, Charsets.UTF_8);
+ List<String> files = IOUtils.readLines(testActivityFolderStream, StandardCharsets.UTF_8);
for( String file : files) {
LOGGER.info("File: " + file );
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/10944954/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/TestMetadataFromDocumentProcessor.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/TestMetadataFromDocumentProcessor.java b/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/TestMetadataFromDocumentProcessor.java
index 7bd4341..7d89201 100644
--- a/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/TestMetadataFromDocumentProcessor.java
+++ b/streams-contrib/streams-persist-elasticsearch/src/test/java/org/apache/streams/elasticsearch/test/TestMetadataFromDocumentProcessor.java
@@ -26,7 +26,6 @@ import org.apache.streams.pojo.json.ActivityObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Sets;
-import org.apache.commons.io.Charsets;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.SerializationUtils;
import org.junit.Before;
@@ -35,6 +34,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Set;
@@ -69,7 +69,7 @@ public class TestMetadataFromDocumentProcessor {
InputStream testActivityFolderStream = TestMetadataFromDocumentProcessor.class.getClassLoader()
.getResourceAsStream("activities");
- List<String> files = IOUtils.readLines(testActivityFolderStream, Charsets.UTF_8);
+ List<String> files = IOUtils.readLines(testActivityFolderStream, StandardCharsets.UTF_8);
Set<ActivityObject> objects = Sets.newHashSet();
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/10944954/streams-contrib/streams-persist-hdfs/src/test/java/org/apache/streams/hdfs/test/TestHdfsPersist.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-hdfs/src/test/java/org/apache/streams/hdfs/test/TestHdfsPersist.java b/streams-contrib/streams-persist-hdfs/src/test/java/org/apache/streams/hdfs/test/TestHdfsPersist.java
index 1ab1693..1ee1e39 100644
--- a/streams-contrib/streams-persist-hdfs/src/test/java/org/apache/streams/hdfs/test/TestHdfsPersist.java
+++ b/streams-contrib/streams-persist-hdfs/src/test/java/org/apache/streams/hdfs/test/TestHdfsPersist.java
@@ -29,7 +29,6 @@ import org.apache.streams.jackson.StreamsJacksonMapper;
import org.apache.streams.pojo.json.Activity;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.commons.io.Charsets;
import org.apache.commons.io.IOUtils;
import org.junit.Assert;
import org.junit.Before;
@@ -39,6 +38,7 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -90,7 +90,7 @@ public class TestHdfsPersist {
InputStream testActivityFolderStream = TestHdfsPersist.class.getClassLoader()
.getResourceAsStream("activities");
- List<String> files = IOUtils.readLines(testActivityFolderStream, Charsets.UTF_8);
+ List<String> files = IOUtils.readLines(testActivityFolderStream, StandardCharsets.UTF_8);
int count = 0;
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/10944954/streams-contrib/streams-persist-mongo/src/test/java/org/apache/streams/mongo/test/MongoPersistIT.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-mongo/src/test/java/org/apache/streams/mongo/test/MongoPersistIT.java b/streams-contrib/streams-persist-mongo/src/test/java/org/apache/streams/mongo/test/MongoPersistIT.java
index 7688b04..db0acb5 100644
--- a/streams-contrib/streams-persist-mongo/src/test/java/org/apache/streams/mongo/test/MongoPersistIT.java
+++ b/streams-contrib/streams-persist-mongo/src/test/java/org/apache/streams/mongo/test/MongoPersistIT.java
@@ -31,7 +31,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
import com.typesafe.config.ConfigParseOptions;
-import org.apache.commons.io.Charsets;
import org.apache.commons.io.IOUtils;
import org.junit.Before;
import org.junit.Test;
@@ -40,6 +39,7 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
import java.util.List;
import static org.junit.Assert.assertEquals;
@@ -51,11 +51,11 @@ public class MongoPersistIT {
private static final Logger LOGGER = LoggerFactory.getLogger(MongoPersistIT.class);
- ObjectMapper MAPPER = StreamsJacksonMapper.getInstance();
+ private ObjectMapper MAPPER = StreamsJacksonMapper.getInstance();
- MongoConfiguration testConfiguration;
+ private MongoConfiguration testConfiguration;
- int count = 0;
+ private int count = 0;
@Before
public void setup() throws Exception {
@@ -78,7 +78,7 @@ public class MongoPersistIT {
InputStream testActivityFolderStream = MongoPersistIT.class.getClassLoader()
.getResourceAsStream("activities");
- List<String> files = IOUtils.readLines(testActivityFolderStream, Charsets.UTF_8);
+ List<String> files = IOUtils.readLines(testActivityFolderStream, StandardCharsets.UTF_8);
for( String file : files) {
LOGGER.info("File: " + file );
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/10944954/streams-pojo/src/test/java/org/apache/streams/pojo/test/ActivitySerDeTest.java
----------------------------------------------------------------------
diff --git a/streams-pojo/src/test/java/org/apache/streams/pojo/test/ActivitySerDeTest.java b/streams-pojo/src/test/java/org/apache/streams/pojo/test/ActivitySerDeTest.java
index 258108c..cb0360e 100644
--- a/streams-pojo/src/test/java/org/apache/streams/pojo/test/ActivitySerDeTest.java
+++ b/streams-pojo/src/test/java/org/apache/streams/pojo/test/ActivitySerDeTest.java
@@ -22,7 +22,6 @@ import org.apache.streams.jackson.StreamsJacksonMapper;
import org.apache.streams.pojo.json.Activity;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.commons.io.Charsets;
import org.apache.commons.io.IOUtils;
import org.junit.Test;
import org.reflections.Reflections;
@@ -33,6 +32,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
import java.util.LinkedList;
import java.util.List;
import java.util.Set;
@@ -55,7 +55,7 @@ public class ActivitySerDeTest {
InputStream testActivityFolderStream = ActivitySerDeTest.class.getClassLoader()
.getResourceAsStream("activitystreams-testdocs/activities");
- List<String> files = IOUtils.readLines(testActivityFolderStream, Charsets.UTF_8);
+ List<String> files = IOUtils.readLines(testActivityFolderStream, StandardCharsets.UTF_8);
for ( String file : files) {
LOGGER.info("File: " + file );
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/10944954/streams-schemas/streams-schema-activitystreams/src/test/java/org/w3c/activitystreams/test/SchemaValidationTest.java
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams/src/test/java/org/w3c/activitystreams/test/SchemaValidationTest.java b/streams-schemas/streams-schema-activitystreams/src/test/java/org/w3c/activitystreams/test/SchemaValidationTest.java
index 6344c3c..a06c2f5 100644
--- a/streams-schemas/streams-schema-activitystreams/src/test/java/org/w3c/activitystreams/test/SchemaValidationTest.java
+++ b/streams-schemas/streams-schema-activitystreams/src/test/java/org/w3c/activitystreams/test/SchemaValidationTest.java
@@ -25,13 +25,13 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
import com.networknt.schema.JsonSchema;
import com.networknt.schema.JsonSchemaFactory;
import com.networknt.schema.ValidationMessage;
-import org.apache.commons.io.Charsets;
import org.apache.commons.io.IOUtils;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.List;
@@ -61,7 +61,7 @@ public class SchemaValidationTest {
InputStream testActivityFolderStream = SchemaValidationTest.class.getClassLoader()
.getResourceAsStream("activities");
- List<String> files = IOUtils.readLines(testActivityFolderStream, Charsets.UTF_8);
+ List<String> files = IOUtils.readLines(testActivityFolderStream, StandardCharsets.UTF_8);
for (String file : files) {
if ( !file.startsWith(".") ) {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/10944954/streams-schemas/streams-schema-activitystreams2/src/test/java/org/w3c/activitystreams/test/ExamplesSerDeIT.java
----------------------------------------------------------------------
diff --git a/streams-schemas/streams-schema-activitystreams2/src/test/java/org/w3c/activitystreams/test/ExamplesSerDeIT.java b/streams-schemas/streams-schema-activitystreams2/src/test/java/org/w3c/activitystreams/test/ExamplesSerDeIT.java
index 8500efd..e588901 100644
--- a/streams-schemas/streams-schema-activitystreams2/src/test/java/org/w3c/activitystreams/test/ExamplesSerDeIT.java
+++ b/streams-schemas/streams-schema-activitystreams2/src/test/java/org/w3c/activitystreams/test/ExamplesSerDeIT.java
@@ -21,7 +21,6 @@ package org.w3c.activitystreams.test;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.commons.io.Charsets;
import org.apache.commons.io.IOUtils;
import org.junit.Ignore;
import org.junit.Test;
@@ -29,6 +28,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.List;
@@ -52,7 +52,7 @@ public class ExamplesSerDeIT {
InputStream testActivityFolderStream = ExamplesSerDeIT.class.getClassLoader()
.getResourceAsStream("w3c/activitystreams-master/test");
- List<String> files = IOUtils.readLines(testActivityFolderStream, Charsets.UTF_8);
+ List<String> files = IOUtils.readLines(testActivityFolderStream, StandardCharsets.UTF_8);
for (String file : files) {
if ( !file.startsWith(".") && file.contains("core-ex") ) {
@@ -75,7 +75,7 @@ public class ExamplesSerDeIT {
InputStream testActivityFolderStream = ExamplesSerDeIT.class.getClassLoader()
.getResourceAsStream("w3c/activitystreams-master/test");
- List<String> files = IOUtils.readLines(testActivityFolderStream, Charsets.UTF_8);
+ List<String> files = IOUtils.readLines(testActivityFolderStream, StandardCharsets.UTF_8);
for (String file : files) {
if ( !file.startsWith(".") && file.contains("simple") ) {
@@ -99,7 +99,7 @@ public class ExamplesSerDeIT {
InputStream testActivityFolderStream = ExamplesSerDeIT.class.getClassLoader()
.getResourceAsStream("w3c/activitystreams-master/test");
- List<String> files = IOUtils.readLines(testActivityFolderStream, Charsets.UTF_8);
+ List<String> files = IOUtils.readLines(testActivityFolderStream, StandardCharsets.UTF_8);
for (String file : files) {
if ( !file.startsWith(".") && file.contains("vocabulary-ex") ) {
@@ -123,7 +123,7 @@ public class ExamplesSerDeIT {
InputStream testActivityFolderStream = ExamplesSerDeIT.class.getClassLoader()
.getResourceAsStream("w3c/activitystreams-master/test/fail");
- List<String> files = IOUtils.readLines(testActivityFolderStream, Charsets.UTF_8);
+ List<String> files = IOUtils.readLines(testActivityFolderStream, StandardCharsets.UTF_8);
for (String file : files) {
if ( !file.startsWith(".") && file.contains("vocabulary-ex") ) {