diff --git a/Jenkinsfile b/Jenkinsfile index 0c3e1ad..6334347 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,7 +12,7 @@ kind: Pod spec: containers: - name: maven - image: registry.prod.factual.com/maven-with-thrift:0.2 + image: registry.prod.factual.com/maven-with-thrift:0.14.1 command: ['cat'] tty: true """ diff --git a/pom.xml b/pom.xml index 09cd3e2..cf68649 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ com.factual haeinsa - 1.0.5.11-factual + 1.0.5.12-factual jar haeinsa @@ -133,7 +133,7 @@ org.apache.thrift libthrift - 0.13.0 + 0.14.1 org.apache.hbase diff --git a/src/main/java/kr/co/vcnc/haeinsa/thrift/TRowLocks.java b/src/main/java/kr/co/vcnc/haeinsa/thrift/TRowLocks.java index 9f8816a..87798ae 100644 --- a/src/main/java/kr/co/vcnc/haeinsa/thrift/TRowLocks.java +++ b/src/main/java/kr/co/vcnc/haeinsa/thrift/TRowLocks.java @@ -29,6 +29,7 @@ import org.apache.thrift.TSerializer; import org.apache.thrift.protocol.TCompactProtocol; import org.apache.thrift.protocol.TProtocolFactory; +import org.apache.thrift.transport.TTransportException; /** * Static class for TRowLock (Thrift class) Provide static method to @@ -41,11 +42,11 @@ private TRowLocks() {} private static final TProtocolFactory PROTOCOL_FACTORY = new TCompactProtocol.Factory(); - private static TSerializer createSerializer() { + private static TSerializer createSerializer() throws TTransportException { return new TSerializer(PROTOCOL_FACTORY); } - private static TDeserializer createDeserializer() { + private static TDeserializer createDeserializer() throws TTransportException { return new TDeserializer(PROTOCOL_FACTORY); } @@ -53,9 +54,9 @@ public static TRowLock deserialize(byte[] rowLockBytes) throws IOException { if (rowLockBytes == null) { return new TRowLock(ROW_LOCK_VERSION, TRowLockState.STABLE, Long.MIN_VALUE); } - TRowLock rowLock = new TRowLock(); - TDeserializer deserializer = createDeserializer(); try { + TRowLock rowLock = new TRowLock(); + TDeserializer deserializer = createDeserializer(); deserializer.deserialize(rowLock, rowLockBytes); return rowLock; } catch (TException e) { @@ -67,8 +68,8 @@ public static byte[] serialize(TRowLock rowLock) throws IOException { if (rowLock.getCommitTimestamp() == Long.MIN_VALUE) { return null; } - TSerializer serializer = createSerializer(); try { + TSerializer serializer = createSerializer(); return serializer.serialize(rowLock); } catch (TException e) { throw new IOException(e.getMessage(), e);