diff --git a/common-cli/src/test/java/io/cdap/common/cli/CommandSetTest.java b/common-cli/src/test/java/io/cdap/common/cli/CommandSetTest.java index b245571..7ff4f5e 100644 --- a/common-cli/src/test/java/io/cdap/common/cli/CommandSetTest.java +++ b/common-cli/src/test/java/io/cdap/common/cli/CommandSetTest.java @@ -16,7 +16,6 @@ package io.cdap.common.cli; -import com.google.common.base.Charsets; import com.google.common.base.Function; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; @@ -26,6 +25,7 @@ import java.io.ByteArrayOutputStream; import java.io.PrintStream; +import java.nio.charset.StandardCharsets; import java.util.concurrent.Callable; /** @@ -270,7 +270,7 @@ private void testCommand(Command command, Arguments args, String expectedOutput) PrintStream printStream = new PrintStream(outputStream); command.execute(args, printStream); - String output = new String(outputStream.toByteArray(), Charsets.UTF_8); + String output = new String(outputStream.toByteArray(), StandardCharsets.UTF_8); Assert.assertEquals(expectedOutput, output); } } diff --git a/common-cli/src/test/java/io/cdap/common/cli/command/HelpCommandTest.java b/common-cli/src/test/java/io/cdap/common/cli/command/HelpCommandTest.java index ebd181e..9a85fb9 100644 --- a/common-cli/src/test/java/io/cdap/common/cli/command/HelpCommandTest.java +++ b/common-cli/src/test/java/io/cdap/common/cli/command/HelpCommandTest.java @@ -17,7 +17,6 @@ package io.cdap.common.cli.command; -import com.google.common.base.Charsets; import com.google.common.collect.ImmutableList; import io.cdap.common.cli.Arguments; import io.cdap.common.cli.Command; @@ -28,6 +27,7 @@ import java.io.ByteArrayOutputStream; import java.io.PrintStream; +import java.nio.charset.StandardCharsets; /** * Tests for {@link HelpCommand} @@ -155,7 +155,7 @@ private void testCommandOutput(Command command, Arguments args, String expectedO PrintStream printStream = new PrintStream(outputStream); command.execute(args, printStream); - String output = new String(outputStream.toByteArray(), Charsets.UTF_8); + String output = new String(outputStream.toByteArray(), StandardCharsets.UTF_8); Assert.assertEquals(expectedOutput, output); } } diff --git a/common-core/src/main/java/io/cdap/common/Bytes.java b/common-core/src/main/java/io/cdap/common/Bytes.java index 6ed6b3a..72bd3d8 100644 --- a/common-core/src/main/java/io/cdap/common/Bytes.java +++ b/common-core/src/main/java/io/cdap/common/Bytes.java @@ -15,10 +15,10 @@ */ package io.cdap.common; -import com.google.common.base.Charsets; import com.google.common.collect.ImmutableSortedMap; import java.io.DataOutput; +import java.nio.charset.StandardCharsets; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.math.BigDecimal; @@ -208,7 +208,7 @@ public static String toString(ByteBuffer buf) { return null; } buf.mark(); - String s = Charsets.UTF_8.decode(buf).toString(); + String s = StandardCharsets.UTF_8.decode(buf).toString(); buf.reset(); return s; } diff --git a/common-core/src/main/java/io/cdap/common/ImmutablePair.java b/common-core/src/main/java/io/cdap/common/ImmutablePair.java index a70cfe1..b7d843a 100644 --- a/common-core/src/main/java/io/cdap/common/ImmutablePair.java +++ b/common-core/src/main/java/io/cdap/common/ImmutablePair.java @@ -16,7 +16,9 @@ package io.cdap.common; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; + +import java.util.Objects; /** * An {@link ImmutablePair} consists of two elements within. The elements once set @@ -79,7 +81,7 @@ public B getSecond() { */ @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("first", first) .add("second", second) .toString(); @@ -91,7 +93,7 @@ public String toString() { */ @Override public int hashCode() { - return Objects.hashCode(first, second); + return Objects.hash(first, second); } /** @@ -108,6 +110,6 @@ public boolean equals(Object o) { return false; } ImmutablePair other = (ImmutablePair) o; - return Objects.equal(first, other.first) && Objects.equal(second, other.second); + return Objects.equals(first, other.first) && Objects.equals(second, other.second); } } diff --git a/common-core/src/main/java/io/cdap/common/Networks.java b/common-core/src/main/java/io/cdap/common/Networks.java index 81d1281..140bea1 100644 --- a/common-core/src/main/java/io/cdap/common/Networks.java +++ b/common-core/src/main/java/io/cdap/common/Networks.java @@ -16,9 +16,8 @@ package io.cdap.common; -import com.google.common.base.Charsets; - import java.io.IOException; +import java.nio.charset.StandardCharsets; import java.io.UnsupportedEncodingException; import java.net.InetAddress; import java.net.ServerSocket; @@ -93,6 +92,6 @@ public static String normalizeWebappDiscoveryName(String name) throws Unsupporte name = name.replace(':', '_'); name = name.replace('/', '_'); - return URLEncoder.encode(name, Charsets.UTF_8.name()); + return URLEncoder.encode(name, StandardCharsets.UTF_8.name()); } } diff --git a/common-http/src/main/java/io/cdap/common/http/HttpRequest.java b/common-http/src/main/java/io/cdap/common/http/HttpRequest.java index 96a87f6..6ce14c6 100644 --- a/common-http/src/main/java/io/cdap/common/http/HttpRequest.java +++ b/common-http/src/main/java/io/cdap/common/http/HttpRequest.java @@ -16,11 +16,9 @@ package io.cdap.common.http; -import com.google.common.base.Charsets; import com.google.common.base.Preconditions; import com.google.common.collect.LinkedListMultimap; import com.google.common.collect.Multimap; -import com.google.common.io.InputSupplier; import io.cdap.common.ContentProvider; import io.cdap.common.io.ByteBufferInputStream; @@ -32,6 +30,7 @@ import java.net.URL; import java.nio.ByteBuffer; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.Map; import javax.annotation.Nullable; @@ -166,15 +165,6 @@ public Builder addHeaders(@Nullable Map headers) { return this; } - public Builder withBody(InputSupplier body) { - return withBody(new ContentProvider() { - @Override - public InputStream getInput() throws IOException { - return body.getInput(); - } - }); - } - public Builder withBody(ContentProvider body) { this.body = body; this.bodyLength = null; @@ -194,7 +184,7 @@ public InputStream getInput() throws IOException { } public Builder withBody(String body) { - return withBody(body, Charsets.UTF_8); + return withBody(body, StandardCharsets.UTF_8); } public Builder withBody(String body, Charset charset) { diff --git a/common-http/src/main/java/io/cdap/common/http/HttpResponse.java b/common-http/src/main/java/io/cdap/common/http/HttpResponse.java index 343e660..5ace0c8 100644 --- a/common-http/src/main/java/io/cdap/common/http/HttpResponse.java +++ b/common-http/src/main/java/io/cdap/common/http/HttpResponse.java @@ -15,8 +15,6 @@ */ package io.cdap.common.http; -import com.google.common.base.Charsets; -import com.google.common.base.Throwables; import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.Multimap; import com.google.common.io.ByteStreams; @@ -30,6 +28,7 @@ import java.net.HttpURLConnection; import java.nio.ByteBuffer; import java.nio.channels.Channels; +import java.nio.charset.StandardCharsets; import java.nio.channels.ReadableByteChannel; import java.nio.charset.Charset; import java.util.List; @@ -123,7 +122,7 @@ public byte[] getUncompressedResponseBody() { } public String getResponseBodyAsString() { - return getResponseBodyAsString(Charsets.UTF_8); + return getResponseBodyAsString(StandardCharsets.UTF_8); } public String getResponseBodyAsString(Charset charset) { @@ -176,7 +175,7 @@ private byte[] getResponseBodyFromStream() { } return ByteStreams.toByteArray(inputStream); } catch (IOException e) { - throw Throwables.propagate(e); + throw new RuntimeException(e); } finally { closeQuietly(inputStream); inputStream = null; diff --git a/common-http/src/main/java/io/cdap/common/http/ObjectResponse.java b/common-http/src/main/java/io/cdap/common/http/ObjectResponse.java index f66df44..b7fc723 100644 --- a/common-http/src/main/java/io/cdap/common/http/ObjectResponse.java +++ b/common-http/src/main/java/io/cdap/common/http/ObjectResponse.java @@ -15,11 +15,11 @@ */ package io.cdap.common.http; -import com.google.common.base.Charsets; import com.google.common.reflect.TypeToken; import com.google.gson.Gson; import java.lang.reflect.Type; +import java.nio.charset.StandardCharsets; /** * Convenient wrapper of {@link HttpResponse} that makes client code cleaner when dealing with java object that can be @@ -35,7 +35,7 @@ public final class ObjectResponse extends HttpResponse { @SuppressWarnings("unchecked") public static ObjectResponse fromJsonBody(HttpResponse response, Type typeOfObject, Gson gson) { T object = response.getResponseBody() == null ? - null : (T) gson.fromJson(new String(response.getResponseBody(), Charsets.UTF_8), typeOfObject); + null : (T) gson.fromJson(new String(response.getResponseBody(), StandardCharsets.UTF_8), typeOfObject); return new ObjectResponse(response, object); } diff --git a/common-http/src/test/java/io/cdap/common/http/HttpRequestsStreamTest.java b/common-http/src/test/java/io/cdap/common/http/HttpRequestsStreamTest.java index 561dda3..5765e18 100644 --- a/common-http/src/test/java/io/cdap/common/http/HttpRequestsStreamTest.java +++ b/common-http/src/test/java/io/cdap/common/http/HttpRequestsStreamTest.java @@ -30,12 +30,12 @@ public class HttpRequestsStreamTest extends HttpRequestsTestBase { @Before public void setUp() throws Exception { httpService = new TestHttpService(false); - httpService.startAndWait(); + httpService.startAsync().awaitRunning(); } @After public void tearDown() { - httpService.stopAndWait(); + httpService.stopAsync().awaitTerminated(); } @Override diff --git a/common-http/src/test/java/io/cdap/common/http/HttpRequestsTest.java b/common-http/src/test/java/io/cdap/common/http/HttpRequestsTest.java index 7dc3e58..fb043b1 100644 --- a/common-http/src/test/java/io/cdap/common/http/HttpRequestsTest.java +++ b/common-http/src/test/java/io/cdap/common/http/HttpRequestsTest.java @@ -33,12 +33,12 @@ public class HttpRequestsTest extends HttpRequestsTestBase { @Before public void setUp() throws Exception { httpService = new TestHttpService(false); - httpService.startAndWait(); + httpService.startAsync().awaitRunning(); } @After public void tearDown() { - httpService.stopAndWait(); + httpService.stopAsync().awaitTerminated(); } @Override diff --git a/common-http/src/test/java/io/cdap/common/http/HttpRequestsTestBase.java b/common-http/src/test/java/io/cdap/common/http/HttpRequestsTestBase.java index 7be6136..e24c7c2 100644 --- a/common-http/src/test/java/io/cdap/common/http/HttpRequestsTestBase.java +++ b/common-http/src/test/java/io/cdap/common/http/HttpRequestsTestBase.java @@ -16,7 +16,6 @@ package io.cdap.common.http; -import com.google.common.base.Charsets; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Multimap; @@ -86,8 +85,8 @@ public void testHttpStatus() throws Exception { // Expected headers for a request Multimap expectedHeaders = ArrayListMultimap.create(); - expectedHeaders.put("headerKey", "headerValue2"); expectedHeaders.put("headerKey", "headerValue1"); + expectedHeaders.put("headerKey", "headerValue2"); expectedHeaders.put(HttpHeaderNames.CONTENT_LENGTH.toString(), "0"); testGet("/api/testOkWithHeaders", only(200), only("OK"), only(""), only(expectedHeaders)); @@ -409,14 +408,14 @@ public void testConflictWithMessagePost(io.netty.handler.codec.http.HttpRequest public void testPost(FullHttpRequest request, HttpResponder responder) { responder.sendString(HttpResponseStatus.OK, - request.content().toString(Charsets.UTF_8) + request.headers().get("sdf")); + request.content().toString(StandardCharsets.UTF_8) + request.headers().get("sdf")); } @POST @Path("/testPost409") public void testPost409(FullHttpRequest request, HttpResponder responder) { - responder.sendString(HttpResponseStatus.CONFLICT, request.content().toString(Charsets.UTF_8) + responder.sendString(HttpResponseStatus.CONFLICT, request.content().toString(StandardCharsets.UTF_8) + request.headers().get("sdf") + "409"); } @@ -424,7 +423,7 @@ public void testPost409(FullHttpRequest request, @Path("/testPut") public void testPut(FullHttpRequest request, HttpResponder responder) { - responder.sendString(HttpResponseStatus.OK, request.content().toString(Charsets.UTF_8) + responder.sendString(HttpResponseStatus.OK, request.content().toString(StandardCharsets.UTF_8) + request.headers().get("sdf")); } @@ -432,7 +431,7 @@ public void testPut(FullHttpRequest request, @Path("/testPut409") public void testPut409(FullHttpRequest request, HttpResponder responder) { - responder.sendString(HttpResponseStatus.CONFLICT, request.content().toString(Charsets.UTF_8) + responder.sendString(HttpResponseStatus.CONFLICT, request.content().toString(StandardCharsets.UTF_8) + request.headers().get("sdf") + "409"); } diff --git a/common-http/src/test/java/io/cdap/common/http/HttpsRequestsTest.java b/common-http/src/test/java/io/cdap/common/http/HttpsRequestsTest.java index d93ae43..1da54b7 100644 --- a/common-http/src/test/java/io/cdap/common/http/HttpsRequestsTest.java +++ b/common-http/src/test/java/io/cdap/common/http/HttpsRequestsTest.java @@ -33,12 +33,12 @@ public class HttpsRequestsTest extends HttpRequestsTestBase { @Before public void setUp() throws Exception { httpsService = new TestHttpService(true); - httpsService.startAndWait(); + httpsService.startAsync().awaitRunning(); } @After public void tearDown() { - httpsService.stopAndWait(); + httpsService.stopAsync().awaitTerminated(); } @Override diff --git a/common-http/src/test/java/io/cdap/common/http/TestHttpService.java b/common-http/src/test/java/io/cdap/common/http/TestHttpService.java index 0b0d3d5..1685516 100644 --- a/common-http/src/test/java/io/cdap/common/http/TestHttpService.java +++ b/common-http/src/test/java/io/cdap/common/http/TestHttpService.java @@ -16,7 +16,7 @@ package io.cdap.common.http; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.util.concurrent.AbstractIdleService; import io.cdap.http.ChannelPipelineModifier; import io.cdap.http.NettyHttpService; @@ -90,7 +90,7 @@ public int getNumConnectionsOpened() { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("bindAddress", httpService.getBindAddress()) .toString(); } diff --git a/common-io/src/main/java/io/cdap/common/internal/io/ASMDatumWriterFactory.java b/common-io/src/main/java/io/cdap/common/internal/io/ASMDatumWriterFactory.java index a0b7fd5..fef028d 100644 --- a/common-io/src/main/java/io/cdap/common/internal/io/ASMDatumWriterFactory.java +++ b/common-io/src/main/java/io/cdap/common/internal/io/ASMDatumWriterFactory.java @@ -16,8 +16,6 @@ package io.cdap.common.internal.io; -import com.google.common.base.Objects; -import com.google.common.base.Throwables; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; @@ -27,6 +25,7 @@ import io.cdap.common.internal.asm.ClassDefinition; import java.util.Map; +import java.util.Objects; import javax.inject.Inject; /** @@ -61,7 +60,7 @@ public DatumWriter create(TypeToken type, Schema schema) { return (DatumWriter) writerClass.getConstructor(Schema.class, FieldAccessorFactory.class) .newInstance(schema, fieldAccessorFactory); } catch (Exception e) { - throw Throwables.propagate(e); + throw new RuntimeException(e); } } @@ -121,7 +120,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hashCode(schema, type); + return Objects.hash(schema, type); } } } diff --git a/common-io/src/main/java/io/cdap/common/internal/io/DatumWriterGenerator.java b/common-io/src/main/java/io/cdap/common/internal/io/DatumWriterGenerator.java index 3b1e4cf..aed26a4 100644 --- a/common-io/src/main/java/io/cdap/common/internal/io/DatumWriterGenerator.java +++ b/common-io/src/main/java/io/cdap/common/internal/io/DatumWriterGenerator.java @@ -17,7 +17,6 @@ package io.cdap.common.internal.io; import com.google.common.base.Preconditions; -import com.google.common.base.Throwables; import com.google.common.collect.HashMultimap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -795,7 +794,7 @@ private void encodeRecord(GeneratorAdapter mg, Schema schema, TypeToken outpu mg.invokeVirtual(classType, getEncodeMethod(fieldType, field.getSchema())); } } catch (Exception e) { - throw Throwables.propagate(e); + throw new RuntimeException(e); } } diff --git a/common-io/src/main/java/io/cdap/common/internal/io/FieldAccessorGenerator.java b/common-io/src/main/java/io/cdap/common/internal/io/FieldAccessorGenerator.java index d1d60b4..585ce18 100644 --- a/common-io/src/main/java/io/cdap/common/internal/io/FieldAccessorGenerator.java +++ b/common-io/src/main/java/io/cdap/common/internal/io/FieldAccessorGenerator.java @@ -16,7 +16,6 @@ package io.cdap.common.internal.io; -import com.google.common.base.Throwables; import com.google.common.reflect.TypeToken; import io.cdap.common.internal.asm.ClassDefinition; import io.cdap.common.internal.asm.Methods; @@ -117,7 +116,7 @@ private void initializeReflectionField(GeneratorAdapter mg, Field field) { this.field = field; } catch (Exception e) { - throw Throwables.propagate(e); + throw new RuntimeException(e); } */ Label beginTry = mg.newLabel(); @@ -148,8 +147,11 @@ private void initializeReflectionField(GeneratorAdapter mg, Field field) { int exception = mg.newLocal(Type.getType(IllegalAccessException.class)); mg.storeLocal(exception); mg.loadLocal(exception); - mg.invokeStatic(Type.getType(Throwables.class), - getMethod(RuntimeException.class, "propagate", Throwable.class)); + mg.newInstance(Type.getType(RuntimeException.class)); + mg.dupX1(); + mg.swap(); + mg.invokeConstructor(Type.getType(RuntimeException.class), + getMethod(void.class, "", Throwable.class)); mg.throwException(); mg.mark(endCatch); } @@ -196,7 +198,7 @@ private void invokeReflection(Method method, String signature) { * try { * // Call method * } catch (IllegalAccessException e) { - * throw Throwables.propagate(e); + * throw new RuntimeException(e); * } */ Label beginTry = mg.newLabel(); @@ -214,8 +216,11 @@ private void invokeReflection(Method method, String signature) { int exception = mg.newLocal(Type.getType(IllegalAccessException.class)); mg.storeLocal(exception); mg.loadLocal(exception); - mg.invokeStatic(Type.getType(Throwables.class), - getMethod(RuntimeException.class, "propagate", Throwable.class)); + mg.newInstance(Type.getType(RuntimeException.class)); + mg.dupX1(); + mg.swap(); + mg.invokeConstructor(Type.getType(RuntimeException.class), + getMethod(void.class, "", Throwable.class)); mg.throwException(); mg.endMethod(); diff --git a/common-io/src/main/java/io/cdap/common/internal/io/FieldEntry.java b/common-io/src/main/java/io/cdap/common/internal/io/FieldEntry.java index 688aa48..7487f55 100644 --- a/common-io/src/main/java/io/cdap/common/internal/io/FieldEntry.java +++ b/common-io/src/main/java/io/cdap/common/internal/io/FieldEntry.java @@ -16,9 +16,10 @@ package io.cdap.common.internal.io; -import com.google.common.base.Objects; import com.google.common.reflect.TypeToken; +import java.util.Objects; + /** * */ @@ -54,6 +55,6 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hashCode(type, fieldName); + return Objects.hash(type, fieldName); } } diff --git a/common-io/src/main/java/io/cdap/common/internal/io/ReflectionFieldAccessorFactory.java b/common-io/src/main/java/io/cdap/common/internal/io/ReflectionFieldAccessorFactory.java index 842e547..db54858 100644 --- a/common-io/src/main/java/io/cdap/common/internal/io/ReflectionFieldAccessorFactory.java +++ b/common-io/src/main/java/io/cdap/common/internal/io/ReflectionFieldAccessorFactory.java @@ -17,7 +17,6 @@ package io.cdap.common.internal.io; import com.google.common.base.Preconditions; -import com.google.common.base.Throwables; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; @@ -60,7 +59,7 @@ public void set(Object object, T value) { try { finalField.set(object, value); } catch (Exception e) { - throw Throwables.propagate(e); + throw new RuntimeException(e); } } @@ -70,7 +69,7 @@ public T get(Object object) { try { return (T) finalField.get(object); } catch (Exception e) { - throw Throwables.propagate(e); + throw new RuntimeException(e); } } diff --git a/common-io/src/main/java/io/cdap/common/internal/io/Schema.java b/common-io/src/main/java/io/cdap/common/internal/io/Schema.java index 6972e1a..3245948 100644 --- a/common-io/src/main/java/io/cdap/common/internal/io/Schema.java +++ b/common-io/src/main/java/io/cdap/common/internal/io/Schema.java @@ -17,7 +17,6 @@ package io.cdap.common.internal.io; import com.google.common.base.Preconditions; -import com.google.common.base.Throwables; import com.google.common.collect.BiMap; import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableBiMap; @@ -640,7 +639,7 @@ private String buildString() { return builder.toString(); } catch (IOException e) { // It should never throw IOException on the StringBuilder Writer, if it does, something very wrong. - throw Throwables.propagate(e); + throw new RuntimeException(e); } } } diff --git a/common-io/src/main/java/io/cdap/common/internal/io/SchemaHash.java b/common-io/src/main/java/io/cdap/common/internal/io/SchemaHash.java index 52d5fa9..831cc41 100644 --- a/common-io/src/main/java/io/cdap/common/internal/io/SchemaHash.java +++ b/common-io/src/main/java/io/cdap/common/internal/io/SchemaHash.java @@ -16,11 +16,10 @@ package io.cdap.common.internal.io; -import com.google.common.base.Charsets; -import com.google.common.base.Throwables; import com.google.common.collect.Sets; import java.nio.ByteBuffer; +import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Arrays; @@ -93,7 +92,7 @@ private byte[] computeHash(Schema schema) { MessageDigest md5 = updateHash(MessageDigest.getInstance("MD5"), schema, knownRecords); return md5.digest(); } catch (NoSuchAlgorithmException e) { - throw Throwables.propagate(e); + throw new RuntimeException(e); } } @@ -135,7 +134,7 @@ private MessageDigest updateHash(MessageDigest md5, Schema schema, Set k case ENUM: md5.update((byte) 8); for (String value : schema.getEnumValues()) { - md5.update(Charsets.UTF_8.encode(value)); + md5.update(StandardCharsets.UTF_8.encode(value)); } break; case ARRAY: @@ -151,7 +150,7 @@ private MessageDigest updateHash(MessageDigest md5, Schema schema, Set k md5.update((byte) 11); boolean notKnown = knownRecords.add(schema.getRecordName()); for (Schema.Field field : schema.getFields()) { - md5.update(Charsets.UTF_8.encode(field.getName())); + md5.update(StandardCharsets.UTF_8.encode(field.getName())); if (notKnown) { updateHash(md5, field.getSchema(), knownRecords); } diff --git a/common-io/src/main/java/io/cdap/common/internal/io/TypeRepresentation.java b/common-io/src/main/java/io/cdap/common/internal/io/TypeRepresentation.java index 5ccac1c..512145a 100644 --- a/common-io/src/main/java/io/cdap/common/internal/io/TypeRepresentation.java +++ b/common-io/src/main/java/io/cdap/common/internal/io/TypeRepresentation.java @@ -16,7 +16,7 @@ package io.cdap.common.internal.io; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; @@ -117,8 +117,8 @@ public Type[] getActualTypeArguments() { @Override public Type getRawType() { try { - ClassLoader cl = Objects.firstNonNull(classLoader, - Objects.firstNonNull(Thread.currentThread().getContextClassLoader(), + ClassLoader cl = MoreObjects.firstNonNull(classLoader, + MoreObjects.firstNonNull(Thread.currentThread().getContextClassLoader(), getClass().getClassLoader())); return cl.loadClass(this.rawType); } catch (ClassNotFoundException e) { diff --git a/common-io/src/main/java/io/cdap/common/io/BinaryDecoder.java b/common-io/src/main/java/io/cdap/common/io/BinaryDecoder.java index 5b57c10..7c36f01 100644 --- a/common-io/src/main/java/io/cdap/common/io/BinaryDecoder.java +++ b/common-io/src/main/java/io/cdap/common/io/BinaryDecoder.java @@ -16,12 +16,11 @@ package io.cdap.common.io; -import com.google.common.base.Charsets; - import java.io.EOFException; import java.io.IOException; import java.io.InputStream; import java.nio.ByteBuffer; +import java.nio.charset.StandardCharsets; /** * An {@link Decoder} for binary-format data. @@ -88,7 +87,7 @@ public double readDouble() throws IOException { @Override public String readString() throws IOException { - return new String(rawReadBytes(), Charsets.UTF_8); + return new String(rawReadBytes(), StandardCharsets.UTF_8); } @Override diff --git a/common-io/src/main/java/io/cdap/common/io/BinaryEncoder.java b/common-io/src/main/java/io/cdap/common/io/BinaryEncoder.java index 4e213b0..d0c4d0c 100644 --- a/common-io/src/main/java/io/cdap/common/io/BinaryEncoder.java +++ b/common-io/src/main/java/io/cdap/common/io/BinaryEncoder.java @@ -16,11 +16,10 @@ package io.cdap.common.io; -import com.google.common.base.Charsets; - import java.io.IOException; import java.io.OutputStream; import java.nio.ByteBuffer; +import java.nio.charset.StandardCharsets; /** * An {@link Encoder} for binary-format data. @@ -112,7 +111,7 @@ public Encoder writeDouble(double d) throws IOException { @Override public Encoder writeString(String s) throws IOException { - return writeBytes(Charsets.UTF_8.encode(s)); + return writeBytes(StandardCharsets.UTF_8.encode(s)); } @Override diff --git a/common-io/src/test/java/io/cdap/common/io/ASMDatumCodecTest.java b/common-io/src/test/java/io/cdap/common/io/ASMDatumCodecTest.java index 037db97..bc753ea 100644 --- a/common-io/src/test/java/io/cdap/common/io/ASMDatumCodecTest.java +++ b/common-io/src/test/java/io/cdap/common/io/ASMDatumCodecTest.java @@ -16,7 +16,7 @@ package io.cdap.common.io; -import com.google.common.base.Objects; +import java.util.Objects; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; @@ -270,7 +270,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hashCode(i, s, list, e); + return Objects.hash(i, s, list, e); } } @@ -356,7 +356,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hashCode(data, left, right); + return Objects.hash(data, left, right); } } diff --git a/common-lang/src/main/java/io/cdap/common/internal/lang/Reflections.java b/common-lang/src/main/java/io/cdap/common/internal/lang/Reflections.java index 4f1a9b9..927282a 100644 --- a/common-lang/src/main/java/io/cdap/common/internal/lang/Reflections.java +++ b/common-lang/src/main/java/io/cdap/common/internal/lang/Reflections.java @@ -15,7 +15,6 @@ */ package io.cdap.common.internal.lang; -import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; import com.google.common.reflect.TypeToken; @@ -83,7 +82,7 @@ public static void visit(Object instance, TypeToken inspectType, Visitor firs } } } catch (Exception e) { - throw Throwables.propagate(e); + throw new RuntimeException(e); } } diff --git a/common-lang/src/main/java/io/cdap/common/lang/ClassLoaders.java b/common-lang/src/main/java/io/cdap/common/lang/ClassLoaders.java index 43479fc..cd4ef27 100644 --- a/common-lang/src/main/java/io/cdap/common/lang/ClassLoaders.java +++ b/common-lang/src/main/java/io/cdap/common/lang/ClassLoaders.java @@ -16,7 +16,7 @@ package io.cdap.common.lang; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import javax.annotation.Nullable; @@ -39,7 +39,7 @@ private ClassLoaders() { } */ public static Class loadClass(String className, @Nullable ClassLoader classLoader, Object caller) throws ClassNotFoundException { - ClassLoader cl = Objects.firstNonNull(classLoader, caller.getClass().getClassLoader()); + ClassLoader cl = MoreObjects.firstNonNull(classLoader, caller.getClass().getClassLoader()); return cl.loadClass(className); } diff --git a/common-lang/src/main/java/io/cdap/common/lang/DirectoryClassLoader.java b/common-lang/src/main/java/io/cdap/common/lang/DirectoryClassLoader.java index 8a73c09..0681e4c 100644 --- a/common-lang/src/main/java/io/cdap/common/lang/DirectoryClassLoader.java +++ b/common-lang/src/main/java/io/cdap/common/lang/DirectoryClassLoader.java @@ -16,7 +16,6 @@ package io.cdap.common.lang; -import com.google.common.base.Throwables; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import org.slf4j.Logger; @@ -72,7 +71,7 @@ private static URL[] getClassPathURLs(File dir, Set libDirs) { } catch (MalformedURLException e) { // Should never happen LOG.error("Error in adding jar URLs to classPathUrls", e); - throw Throwables.propagate(e); + throw new RuntimeException(e); } } diff --git a/common-lang/src/main/java/io/cdap/common/lang/InstantiatorFactory.java b/common-lang/src/main/java/io/cdap/common/lang/InstantiatorFactory.java index 7342adc..9a9921e 100644 --- a/common-lang/src/main/java/io/cdap/common/lang/InstantiatorFactory.java +++ b/common-lang/src/main/java/io/cdap/common/lang/InstantiatorFactory.java @@ -16,7 +16,6 @@ package io.cdap.common.lang; -import com.google.common.base.Throwables; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; @@ -102,7 +101,7 @@ public T create() { try { return (T) defaultCons.newInstance(); } catch (Exception e) { - throw Throwables.propagate(e); + throw new RuntimeException(e); } } }; @@ -183,7 +182,7 @@ public T create() { Reflections.visit(instance, type, new FieldInitializer()); return (T) instance; } catch (InstantiationException e) { - throw Throwables.propagate(e); + throw new RuntimeException(e); } } }; diff --git a/pom.xml b/pom.xml index c49ce0d..8e57891 100644 --- a/pom.xml +++ b/pom.xml @@ -95,7 +95,7 @@ the License. 7.1 2.0.1 2.0.0 - 13.0.1 + 32.0.0-jre 4.0 2.2.4 1.5.0