This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
The following commit(s) were added to refs/heads/main by this push:
new 50bfc07946 Update libthift 0.16.0 to 0.17.0
new bd2a17bde4 Merge pull request #1570 from afs/thrift
50bfc07946 is described below
commit 50bfc079465941e94048b338beffa370eee48ba2
Author: Andy Seaborne <[email protected]>
AuthorDate: Sat Oct 1 16:44:12 2022 +0100
Update libthift 0.16.0 to 0.17.0
Regenerate riot/thrift/wire.
Remove use of javax.annotation.
---
jena-arq/Grammar/RDF-Thrift/gen-thrift | 8 ++++--
.../org/apache/jena/riot/thrift/wire/RDF_ANY.java | 5 +---
.../apache/jena/riot/thrift/wire/RDF_BNode.java | 7 ++---
.../jena/riot/thrift/wire/RDF_DataTuple.java | 9 ++----
.../apache/jena/riot/thrift/wire/RDF_Decimal.java | 9 ++----
.../org/apache/jena/riot/thrift/wire/RDF_IRI.java | 7 ++---
.../apache/jena/riot/thrift/wire/RDF_Literal.java | 13 ++++-----
.../jena/riot/thrift/wire/RDF_PrefixDecl.java | 9 ++----
.../jena/riot/thrift/wire/RDF_PrefixName.java | 9 ++----
.../org/apache/jena/riot/thrift/wire/RDF_Quad.java | 13 ++++-----
.../apache/jena/riot/thrift/wire/RDF_REPEAT.java | 5 +---
.../jena/riot/thrift/wire/RDF_StreamRow.java | 12 +++-----
.../org/apache/jena/riot/thrift/wire/RDF_Term.java | 33 ++++++++--------------
.../apache/jena/riot/thrift/wire/RDF_Triple.java | 11 +++-----
.../apache/jena/riot/thrift/wire/RDF_UNDEF.java | 5 +---
.../org/apache/jena/riot/thrift/wire/RDF_VAR.java | 7 ++---
.../apache/jena/riot/thrift/wire/RDF_VarTuple.java | 9 ++----
pom.xml | 2 +-
18 files changed, 60 insertions(+), 113 deletions(-)
diff --git a/jena-arq/Grammar/RDF-Thrift/gen-thrift
b/jena-arq/Grammar/RDF-Thrift/gen-thrift
index 426ba10483..19b0c607f7 100755
--- a/jena-arq/Grammar/RDF-Thrift/gen-thrift
+++ b/jena-arq/Grammar/RDF-Thrift/gen-thrift
@@ -11,11 +11,15 @@ fi
PKG=../../src/main/java/org/apache/jena/riot/thrift/wire
rm -f "$PKG"/*.java
-thrift -r -out ../../src/main/java -gen java "$@"
+## Avoid needing a dependency javax.annotations
+## generated_annotations=[undated|suppress]:
+## undated: suppress the date at @Generated annotations
+## suppress: suppress @Generated annotations entirely
+
+thrift -r -out ../../src/main/java -gen 'java:generated_annotations=suppress'
"$@"
for f in "$PKG"/*.java
do
-## perl -i.bak -p -e 's/^public
(class|enum)/\@SuppressWarnings("all")\npublic $1/' $f
perl -i.bak -p -e 's/^\@SuppressWarnings.*$/\@SuppressWarnings("all")/' $f
rm -f $f.bak
done
diff --git
a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_ANY.java
b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_ANY.java
index 6df8bfcad8..9358fa9f0a 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_ANY.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_ANY.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.16.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -7,7 +7,6 @@
package org.apache.jena.riot.thrift.wire;
@SuppressWarnings("all")
[email protected](value = "Autogenerated by Thrift Compiler
(0.13.0)", date = "2020-05-24")
public class RDF_ANY implements org.apache.thrift.TBase<RDF_ANY,
RDF_ANY._Fields>, java.io.Serializable, Cloneable, Comparable<RDF_ANY> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new
org.apache.thrift.protocol.TStruct("RDF_ANY");
@@ -122,8 +121,6 @@ public class RDF_ANY implements
org.apache.thrift.TBase<RDF_ANY, RDF_ANY._Fields
@Override
public boolean equals(java.lang.Object that) {
- if (that == null)
- return false;
if (that instanceof RDF_ANY)
return this.equals((RDF_ANY)that);
return false;
diff --git
a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_BNode.java
b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_BNode.java
index 26a17c2296..17b988355e 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_BNode.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_BNode.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.16.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -7,7 +7,6 @@
package org.apache.jena.riot.thrift.wire;
@SuppressWarnings("all")
[email protected](value = "Autogenerated by Thrift Compiler
(0.13.0)", date = "2020-05-24")
public class RDF_BNode implements org.apache.thrift.TBase<RDF_BNode,
RDF_BNode._Fields>, java.io.Serializable, Cloneable, Comparable<RDF_BNode> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new
org.apache.thrift.protocol.TStruct("RDF_BNode");
@@ -179,8 +178,6 @@ public class RDF_BNode implements
org.apache.thrift.TBase<RDF_BNode, RDF_BNode._
@Override
public boolean equals(java.lang.Object that) {
- if (that == null)
- return false;
if (that instanceof RDF_BNode)
return this.equals((RDF_BNode)that);
return false;
@@ -223,7 +220,7 @@ public class RDF_BNode implements
org.apache.thrift.TBase<RDF_BNode, RDF_BNode._
int lastComparison = 0;
- lastComparison =
java.lang.Boolean.valueOf(isSetLabel()).compareTo(other.isSetLabel());
+ lastComparison = java.lang.Boolean.compare(isSetLabel(),
other.isSetLabel());
if (lastComparison != 0) {
return lastComparison;
}
diff --git
a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_DataTuple.java
b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_DataTuple.java
index 7f10a97113..63e65a0365 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_DataTuple.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_DataTuple.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.16.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -7,7 +7,6 @@
package org.apache.jena.riot.thrift.wire;
@SuppressWarnings("all")
[email protected](value = "Autogenerated by Thrift Compiler
(0.13.0)", date = "2020-05-24")
public class RDF_DataTuple implements org.apache.thrift.TBase<RDF_DataTuple,
RDF_DataTuple._Fields>, java.io.Serializable, Cloneable,
Comparable<RDF_DataTuple> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new
org.apache.thrift.protocol.TStruct("RDF_DataTuple");
@@ -200,8 +199,6 @@ public class RDF_DataTuple implements
org.apache.thrift.TBase<RDF_DataTuple, RDF
@Override
public boolean equals(java.lang.Object that) {
- if (that == null)
- return false;
if (that instanceof RDF_DataTuple)
return this.equals((RDF_DataTuple)that);
return false;
@@ -244,7 +241,7 @@ public class RDF_DataTuple implements
org.apache.thrift.TBase<RDF_DataTuple, RDF
int lastComparison = 0;
- lastComparison =
java.lang.Boolean.valueOf(isSetRow()).compareTo(other.isSetRow());
+ lastComparison = java.lang.Boolean.compare(isSetRow(), other.isSetRow());
if (lastComparison != 0) {
return lastComparison;
}
@@ -410,7 +407,7 @@ public class RDF_DataTuple implements
org.apache.thrift.TBase<RDF_DataTuple, RDF
java.util.BitSet incoming = iprot.readBitSet(1);
if (incoming.get(0)) {
{
- org.apache.thrift.protocol.TList _list13 = new
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT,
iprot.readI32());
+ org.apache.thrift.protocol.TList _list13 =
iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
struct.row = new java.util.ArrayList<RDF_Term>(_list13.size);
@org.apache.thrift.annotation.Nullable RDF_Term _elem14;
for (int _i15 = 0; _i15 < _list13.size; ++_i15)
diff --git
a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Decimal.java
b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Decimal.java
index d28ed236f5..cc1ede922a 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Decimal.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Decimal.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.16.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -7,7 +7,6 @@
package org.apache.jena.riot.thrift.wire;
@SuppressWarnings("all")
[email protected](value = "Autogenerated by Thrift Compiler
(0.13.0)", date = "2020-05-24")
public class RDF_Decimal implements org.apache.thrift.TBase<RDF_Decimal,
RDF_Decimal._Fields>, java.io.Serializable, Cloneable, Comparable<RDF_Decimal> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new
org.apache.thrift.protocol.TStruct("RDF_Decimal");
@@ -230,8 +229,6 @@ public class RDF_Decimal implements
org.apache.thrift.TBase<RDF_Decimal, RDF_Dec
@Override
public boolean equals(java.lang.Object that) {
- if (that == null)
- return false;
if (that instanceof RDF_Decimal)
return this.equals((RDF_Decimal)that);
return false;
@@ -283,7 +280,7 @@ public class RDF_Decimal implements
org.apache.thrift.TBase<RDF_Decimal, RDF_Dec
int lastComparison = 0;
- lastComparison =
java.lang.Boolean.valueOf(isSetValue()).compareTo(other.isSetValue());
+ lastComparison = java.lang.Boolean.compare(isSetValue(),
other.isSetValue());
if (lastComparison != 0) {
return lastComparison;
}
@@ -293,7 +290,7 @@ public class RDF_Decimal implements
org.apache.thrift.TBase<RDF_Decimal, RDF_Dec
return lastComparison;
}
}
- lastComparison =
java.lang.Boolean.valueOf(isSetScale()).compareTo(other.isSetScale());
+ lastComparison = java.lang.Boolean.compare(isSetScale(),
other.isSetScale());
if (lastComparison != 0) {
return lastComparison;
}
diff --git
a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_IRI.java
b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_IRI.java
index 4bc74ff72e..8b56dd4225 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_IRI.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_IRI.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.16.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -7,7 +7,6 @@
package org.apache.jena.riot.thrift.wire;
@SuppressWarnings("all")
[email protected](value = "Autogenerated by Thrift Compiler
(0.13.0)", date = "2020-05-24")
public class RDF_IRI implements org.apache.thrift.TBase<RDF_IRI,
RDF_IRI._Fields>, java.io.Serializable, Cloneable, Comparable<RDF_IRI> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new
org.apache.thrift.protocol.TStruct("RDF_IRI");
@@ -179,8 +178,6 @@ public class RDF_IRI implements
org.apache.thrift.TBase<RDF_IRI, RDF_IRI._Fields
@Override
public boolean equals(java.lang.Object that) {
- if (that == null)
- return false;
if (that instanceof RDF_IRI)
return this.equals((RDF_IRI)that);
return false;
@@ -223,7 +220,7 @@ public class RDF_IRI implements
org.apache.thrift.TBase<RDF_IRI, RDF_IRI._Fields
int lastComparison = 0;
- lastComparison =
java.lang.Boolean.valueOf(isSetIri()).compareTo(other.isSetIri());
+ lastComparison = java.lang.Boolean.compare(isSetIri(), other.isSetIri());
if (lastComparison != 0) {
return lastComparison;
}
diff --git
a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Literal.java
b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Literal.java
index feb5e6252f..67944a5ada 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Literal.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Literal.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.16.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -7,7 +7,6 @@
package org.apache.jena.riot.thrift.wire;
@SuppressWarnings("all")
[email protected](value = "Autogenerated by Thrift Compiler
(0.13.0)", date = "2020-05-24")
public class RDF_Literal implements org.apache.thrift.TBase<RDF_Literal,
RDF_Literal._Fields>, java.io.Serializable, Cloneable, Comparable<RDF_Literal> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new
org.apache.thrift.protocol.TStruct("RDF_Literal");
@@ -327,8 +326,6 @@ public class RDF_Literal implements
org.apache.thrift.TBase<RDF_Literal, RDF_Lit
@Override
public boolean equals(java.lang.Object that) {
- if (that == null)
- return false;
if (that instanceof RDF_Literal)
return this.equals((RDF_Literal)that);
return false;
@@ -410,7 +407,7 @@ public class RDF_Literal implements
org.apache.thrift.TBase<RDF_Literal, RDF_Lit
int lastComparison = 0;
- lastComparison =
java.lang.Boolean.valueOf(isSetLex()).compareTo(other.isSetLex());
+ lastComparison = java.lang.Boolean.compare(isSetLex(), other.isSetLex());
if (lastComparison != 0) {
return lastComparison;
}
@@ -420,7 +417,7 @@ public class RDF_Literal implements
org.apache.thrift.TBase<RDF_Literal, RDF_Lit
return lastComparison;
}
}
- lastComparison =
java.lang.Boolean.valueOf(isSetLangtag()).compareTo(other.isSetLangtag());
+ lastComparison = java.lang.Boolean.compare(isSetLangtag(),
other.isSetLangtag());
if (lastComparison != 0) {
return lastComparison;
}
@@ -430,7 +427,7 @@ public class RDF_Literal implements
org.apache.thrift.TBase<RDF_Literal, RDF_Lit
return lastComparison;
}
}
- lastComparison =
java.lang.Boolean.valueOf(isSetDatatype()).compareTo(other.isSetDatatype());
+ lastComparison = java.lang.Boolean.compare(isSetDatatype(),
other.isSetDatatype());
if (lastComparison != 0) {
return lastComparison;
}
@@ -440,7 +437,7 @@ public class RDF_Literal implements
org.apache.thrift.TBase<RDF_Literal, RDF_Lit
return lastComparison;
}
}
- lastComparison =
java.lang.Boolean.valueOf(isSetDtPrefix()).compareTo(other.isSetDtPrefix());
+ lastComparison = java.lang.Boolean.compare(isSetDtPrefix(),
other.isSetDtPrefix());
if (lastComparison != 0) {
return lastComparison;
}
diff --git
a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_PrefixDecl.java
b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_PrefixDecl.java
index 5d5b8c5718..c94b2c0ca4 100644
---
a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_PrefixDecl.java
+++
b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_PrefixDecl.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.16.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -7,7 +7,6 @@
package org.apache.jena.riot.thrift.wire;
@SuppressWarnings("all")
[email protected](value = "Autogenerated by Thrift Compiler
(0.13.0)", date = "2020-05-24")
public class RDF_PrefixDecl implements org.apache.thrift.TBase<RDF_PrefixDecl,
RDF_PrefixDecl._Fields>, java.io.Serializable, Cloneable,
Comparable<RDF_PrefixDecl> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new
org.apache.thrift.protocol.TStruct("RDF_PrefixDecl");
@@ -230,8 +229,6 @@ public class RDF_PrefixDecl implements
org.apache.thrift.TBase<RDF_PrefixDecl, R
@Override
public boolean equals(java.lang.Object that) {
- if (that == null)
- return false;
if (that instanceof RDF_PrefixDecl)
return this.equals((RDF_PrefixDecl)that);
return false;
@@ -287,7 +284,7 @@ public class RDF_PrefixDecl implements
org.apache.thrift.TBase<RDF_PrefixDecl, R
int lastComparison = 0;
- lastComparison =
java.lang.Boolean.valueOf(isSetPrefix()).compareTo(other.isSetPrefix());
+ lastComparison = java.lang.Boolean.compare(isSetPrefix(),
other.isSetPrefix());
if (lastComparison != 0) {
return lastComparison;
}
@@ -297,7 +294,7 @@ public class RDF_PrefixDecl implements
org.apache.thrift.TBase<RDF_PrefixDecl, R
return lastComparison;
}
}
- lastComparison =
java.lang.Boolean.valueOf(isSetUri()).compareTo(other.isSetUri());
+ lastComparison = java.lang.Boolean.compare(isSetUri(), other.isSetUri());
if (lastComparison != 0) {
return lastComparison;
}
diff --git
a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_PrefixName.java
b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_PrefixName.java
index afb5efdd37..0687b0906b 100644
---
a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_PrefixName.java
+++
b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_PrefixName.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.16.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -7,7 +7,6 @@
package org.apache.jena.riot.thrift.wire;
@SuppressWarnings("all")
[email protected](value = "Autogenerated by Thrift Compiler
(0.13.0)", date = "2020-05-24")
public class RDF_PrefixName implements org.apache.thrift.TBase<RDF_PrefixName,
RDF_PrefixName._Fields>, java.io.Serializable, Cloneable,
Comparable<RDF_PrefixName> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new
org.apache.thrift.protocol.TStruct("RDF_PrefixName");
@@ -230,8 +229,6 @@ public class RDF_PrefixName implements
org.apache.thrift.TBase<RDF_PrefixName, R
@Override
public boolean equals(java.lang.Object that) {
- if (that == null)
- return false;
if (that instanceof RDF_PrefixName)
return this.equals((RDF_PrefixName)that);
return false;
@@ -287,7 +284,7 @@ public class RDF_PrefixName implements
org.apache.thrift.TBase<RDF_PrefixName, R
int lastComparison = 0;
- lastComparison =
java.lang.Boolean.valueOf(isSetPrefix()).compareTo(other.isSetPrefix());
+ lastComparison = java.lang.Boolean.compare(isSetPrefix(),
other.isSetPrefix());
if (lastComparison != 0) {
return lastComparison;
}
@@ -297,7 +294,7 @@ public class RDF_PrefixName implements
org.apache.thrift.TBase<RDF_PrefixName, R
return lastComparison;
}
}
- lastComparison =
java.lang.Boolean.valueOf(isSetLocalName()).compareTo(other.isSetLocalName());
+ lastComparison = java.lang.Boolean.compare(isSetLocalName(),
other.isSetLocalName());
if (lastComparison != 0) {
return lastComparison;
}
diff --git
a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Quad.java
b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Quad.java
index 3a4a262785..96f3935049 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Quad.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Quad.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.16.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -7,7 +7,6 @@
package org.apache.jena.riot.thrift.wire;
@SuppressWarnings("all")
[email protected](value = "Autogenerated by Thrift Compiler
(0.13.0)", date = "2020-05-24")
public class RDF_Quad implements org.apache.thrift.TBase<RDF_Quad,
RDF_Quad._Fields>, java.io.Serializable, Cloneable, Comparable<RDF_Quad> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new
org.apache.thrift.protocol.TStruct("RDF_Quad");
@@ -331,8 +330,6 @@ public class RDF_Quad implements
org.apache.thrift.TBase<RDF_Quad, RDF_Quad._Fie
@Override
public boolean equals(java.lang.Object that) {
- if (that == null)
- return false;
if (that instanceof RDF_Quad)
return this.equals((RDF_Quad)that);
return false;
@@ -414,7 +411,7 @@ public class RDF_Quad implements
org.apache.thrift.TBase<RDF_Quad, RDF_Quad._Fie
int lastComparison = 0;
- lastComparison =
java.lang.Boolean.valueOf(isSetS()).compareTo(other.isSetS());
+ lastComparison = java.lang.Boolean.compare(isSetS(), other.isSetS());
if (lastComparison != 0) {
return lastComparison;
}
@@ -424,7 +421,7 @@ public class RDF_Quad implements
org.apache.thrift.TBase<RDF_Quad, RDF_Quad._Fie
return lastComparison;
}
}
- lastComparison =
java.lang.Boolean.valueOf(isSetP()).compareTo(other.isSetP());
+ lastComparison = java.lang.Boolean.compare(isSetP(), other.isSetP());
if (lastComparison != 0) {
return lastComparison;
}
@@ -434,7 +431,7 @@ public class RDF_Quad implements
org.apache.thrift.TBase<RDF_Quad, RDF_Quad._Fie
return lastComparison;
}
}
- lastComparison =
java.lang.Boolean.valueOf(isSetO()).compareTo(other.isSetO());
+ lastComparison = java.lang.Boolean.compare(isSetO(), other.isSetO());
if (lastComparison != 0) {
return lastComparison;
}
@@ -444,7 +441,7 @@ public class RDF_Quad implements
org.apache.thrift.TBase<RDF_Quad, RDF_Quad._Fie
return lastComparison;
}
}
- lastComparison =
java.lang.Boolean.valueOf(isSetG()).compareTo(other.isSetG());
+ lastComparison = java.lang.Boolean.compare(isSetG(), other.isSetG());
if (lastComparison != 0) {
return lastComparison;
}
diff --git
a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_REPEAT.java
b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_REPEAT.java
index 715ffd3af8..acfc94f5dd 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_REPEAT.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_REPEAT.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.16.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -7,7 +7,6 @@
package org.apache.jena.riot.thrift.wire;
@SuppressWarnings("all")
[email protected](value = "Autogenerated by Thrift Compiler
(0.13.0)", date = "2020-05-24")
public class RDF_REPEAT implements org.apache.thrift.TBase<RDF_REPEAT,
RDF_REPEAT._Fields>, java.io.Serializable, Cloneable, Comparable<RDF_REPEAT> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new
org.apache.thrift.protocol.TStruct("RDF_REPEAT");
@@ -122,8 +121,6 @@ public class RDF_REPEAT implements
org.apache.thrift.TBase<RDF_REPEAT, RDF_REPEA
@Override
public boolean equals(java.lang.Object that) {
- if (that == null)
- return false;
if (that instanceof RDF_REPEAT)
return this.equals((RDF_REPEAT)that);
return false;
diff --git
a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_StreamRow.java
b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_StreamRow.java
index 0c9526fc41..0e46b885ca 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_StreamRow.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_StreamRow.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.16.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -7,7 +7,6 @@
package org.apache.jena.riot.thrift.wire;
@SuppressWarnings("all")
[email protected](value = "Autogenerated by Thrift Compiler
(0.13.0)", date = "2020-05-24")
public class RDF_StreamRow extends org.apache.thrift.TUnion<RDF_StreamRow,
RDF_StreamRow._Fields> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new
org.apache.thrift.protocol.TStruct("RDF_StreamRow");
private static final org.apache.thrift.protocol.TField
PREFIX_DECL_FIELD_DESC = new org.apache.thrift.protocol.TField("prefixDecl",
org.apache.thrift.protocol.TType.STRUCT, (short)1);
@@ -301,9 +300,8 @@ public class RDF_StreamRow extends
org.apache.thrift.TUnion<RDF_StreamRow, RDF_S
}
public void setPrefixDecl(RDF_PrefixDecl value) {
- if (value == null) throw new java.lang.NullPointerException();
setField_ = _Fields.PREFIX_DECL;
- value_ = value;
+ value_ = java.util.Objects.requireNonNull(value,"_Fields.PREFIX_DECL");
}
public RDF_Triple getTriple() {
@@ -315,9 +313,8 @@ public class RDF_StreamRow extends
org.apache.thrift.TUnion<RDF_StreamRow, RDF_S
}
public void setTriple(RDF_Triple value) {
- if (value == null) throw new java.lang.NullPointerException();
setField_ = _Fields.TRIPLE;
- value_ = value;
+ value_ = java.util.Objects.requireNonNull(value,"_Fields.TRIPLE");
}
public RDF_Quad getQuad() {
@@ -329,9 +326,8 @@ public class RDF_StreamRow extends
org.apache.thrift.TUnion<RDF_StreamRow, RDF_S
}
public void setQuad(RDF_Quad value) {
- if (value == null) throw new java.lang.NullPointerException();
setField_ = _Fields.QUAD;
- value_ = value;
+ value_ = java.util.Objects.requireNonNull(value,"_Fields.QUAD");
}
public boolean isSetPrefixDecl() {
diff --git
a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Term.java
b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Term.java
index 69ad8b0c0e..6b92bfcd35 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Term.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Term.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.16.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -7,7 +7,6 @@
package org.apache.jena.riot.thrift.wire;
@SuppressWarnings("all")
[email protected](value = "Autogenerated by Thrift Compiler
(0.13.0)", date = "2020-05-24")
public class RDF_Term extends org.apache.thrift.TUnion<RDF_Term,
RDF_Term._Fields> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new
org.apache.thrift.protocol.TStruct("RDF_Term");
private static final org.apache.thrift.protocol.TField IRI_FIELD_DESC = new
org.apache.thrift.protocol.TField("iri",
org.apache.thrift.protocol.TType.STRUCT, (short)1);
@@ -675,9 +674,8 @@ public class RDF_Term extends
org.apache.thrift.TUnion<RDF_Term, RDF_Term._Field
}
public void setIri(RDF_IRI value) {
- if (value == null) throw new java.lang.NullPointerException();
setField_ = _Fields.IRI;
- value_ = value;
+ value_ = java.util.Objects.requireNonNull(value,"_Fields.IRI");
}
public RDF_BNode getBnode() {
@@ -689,9 +687,8 @@ public class RDF_Term extends
org.apache.thrift.TUnion<RDF_Term, RDF_Term._Field
}
public void setBnode(RDF_BNode value) {
- if (value == null) throw new java.lang.NullPointerException();
setField_ = _Fields.BNODE;
- value_ = value;
+ value_ = java.util.Objects.requireNonNull(value,"_Fields.BNODE");
}
public RDF_Literal getLiteral() {
@@ -703,9 +700,8 @@ public class RDF_Term extends
org.apache.thrift.TUnion<RDF_Term, RDF_Term._Field
}
public void setLiteral(RDF_Literal value) {
- if (value == null) throw new java.lang.NullPointerException();
setField_ = _Fields.LITERAL;
- value_ = value;
+ value_ = java.util.Objects.requireNonNull(value,"_Fields.LITERAL");
}
public RDF_PrefixName getPrefixName() {
@@ -717,9 +713,8 @@ public class RDF_Term extends
org.apache.thrift.TUnion<RDF_Term, RDF_Term._Field
}
public void setPrefixName(RDF_PrefixName value) {
- if (value == null) throw new java.lang.NullPointerException();
setField_ = _Fields.PREFIX_NAME;
- value_ = value;
+ value_ = java.util.Objects.requireNonNull(value,"_Fields.PREFIX_NAME");
}
public RDF_VAR getVariable() {
@@ -731,9 +726,8 @@ public class RDF_Term extends
org.apache.thrift.TUnion<RDF_Term, RDF_Term._Field
}
public void setVariable(RDF_VAR value) {
- if (value == null) throw new java.lang.NullPointerException();
setField_ = _Fields.VARIABLE;
- value_ = value;
+ value_ = java.util.Objects.requireNonNull(value,"_Fields.VARIABLE");
}
public RDF_ANY getAny() {
@@ -745,9 +739,8 @@ public class RDF_Term extends
org.apache.thrift.TUnion<RDF_Term, RDF_Term._Field
}
public void setAny(RDF_ANY value) {
- if (value == null) throw new java.lang.NullPointerException();
setField_ = _Fields.ANY;
- value_ = value;
+ value_ = java.util.Objects.requireNonNull(value,"_Fields.ANY");
}
public RDF_UNDEF getUndefined() {
@@ -759,9 +752,8 @@ public class RDF_Term extends
org.apache.thrift.TUnion<RDF_Term, RDF_Term._Field
}
public void setUndefined(RDF_UNDEF value) {
- if (value == null) throw new java.lang.NullPointerException();
setField_ = _Fields.UNDEFINED;
- value_ = value;
+ value_ = java.util.Objects.requireNonNull(value,"_Fields.UNDEFINED");
}
public RDF_REPEAT getRepeat() {
@@ -773,9 +765,8 @@ public class RDF_Term extends
org.apache.thrift.TUnion<RDF_Term, RDF_Term._Field
}
public void setRepeat(RDF_REPEAT value) {
- if (value == null) throw new java.lang.NullPointerException();
setField_ = _Fields.REPEAT;
- value_ = value;
+ value_ = java.util.Objects.requireNonNull(value,"_Fields.REPEAT");
}
public RDF_Triple getTripleTerm() {
@@ -787,9 +778,8 @@ public class RDF_Term extends
org.apache.thrift.TUnion<RDF_Term, RDF_Term._Field
}
public void setTripleTerm(RDF_Triple value) {
- if (value == null) throw new java.lang.NullPointerException();
setField_ = _Fields.TRIPLE_TERM;
- value_ = value;
+ value_ = java.util.Objects.requireNonNull(value,"_Fields.TRIPLE_TERM");
}
public long getValInteger() {
@@ -827,9 +817,8 @@ public class RDF_Term extends
org.apache.thrift.TUnion<RDF_Term, RDF_Term._Field
}
public void setValDecimal(RDF_Decimal value) {
- if (value == null) throw new java.lang.NullPointerException();
setField_ = _Fields.VAL_DECIMAL;
- value_ = value;
+ value_ = java.util.Objects.requireNonNull(value,"_Fields.VAL_DECIMAL");
}
public boolean isSetIri() {
diff --git
a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Triple.java
b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Triple.java
index 61cd2666f2..c328ee3800 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Triple.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Triple.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.16.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -7,7 +7,6 @@
package org.apache.jena.riot.thrift.wire;
@SuppressWarnings("all")
[email protected](value = "Autogenerated by Thrift Compiler
(0.13.0)", date = "2020-05-24")
public class RDF_Triple implements org.apache.thrift.TBase<RDF_Triple,
RDF_Triple._Fields>, java.io.Serializable, Cloneable, Comparable<RDF_Triple> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new
org.apache.thrift.protocol.TStruct("RDF_Triple");
@@ -281,8 +280,6 @@ public class RDF_Triple implements
org.apache.thrift.TBase<RDF_Triple, RDF_Tripl
@Override
public boolean equals(java.lang.Object that) {
- if (that == null)
- return false;
if (that instanceof RDF_Triple)
return this.equals((RDF_Triple)that);
return false;
@@ -351,7 +348,7 @@ public class RDF_Triple implements
org.apache.thrift.TBase<RDF_Triple, RDF_Tripl
int lastComparison = 0;
- lastComparison =
java.lang.Boolean.valueOf(isSetS()).compareTo(other.isSetS());
+ lastComparison = java.lang.Boolean.compare(isSetS(), other.isSetS());
if (lastComparison != 0) {
return lastComparison;
}
@@ -361,7 +358,7 @@ public class RDF_Triple implements
org.apache.thrift.TBase<RDF_Triple, RDF_Tripl
return lastComparison;
}
}
- lastComparison =
java.lang.Boolean.valueOf(isSetP()).compareTo(other.isSetP());
+ lastComparison = java.lang.Boolean.compare(isSetP(), other.isSetP());
if (lastComparison != 0) {
return lastComparison;
}
@@ -371,7 +368,7 @@ public class RDF_Triple implements
org.apache.thrift.TBase<RDF_Triple, RDF_Tripl
return lastComparison;
}
}
- lastComparison =
java.lang.Boolean.valueOf(isSetO()).compareTo(other.isSetO());
+ lastComparison = java.lang.Boolean.compare(isSetO(), other.isSetO());
if (lastComparison != 0) {
return lastComparison;
}
diff --git
a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_UNDEF.java
b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_UNDEF.java
index 1afc2800b7..7c91d78caf 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_UNDEF.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_UNDEF.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.16.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -7,7 +7,6 @@
package org.apache.jena.riot.thrift.wire;
@SuppressWarnings("all")
[email protected](value = "Autogenerated by Thrift Compiler
(0.13.0)", date = "2020-05-24")
public class RDF_UNDEF implements org.apache.thrift.TBase<RDF_UNDEF,
RDF_UNDEF._Fields>, java.io.Serializable, Cloneable, Comparable<RDF_UNDEF> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new
org.apache.thrift.protocol.TStruct("RDF_UNDEF");
@@ -122,8 +121,6 @@ public class RDF_UNDEF implements
org.apache.thrift.TBase<RDF_UNDEF, RDF_UNDEF._
@Override
public boolean equals(java.lang.Object that) {
- if (that == null)
- return false;
if (that instanceof RDF_UNDEF)
return this.equals((RDF_UNDEF)that);
return false;
diff --git
a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_VAR.java
b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_VAR.java
index 725a413f2a..7c738c2653 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_VAR.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_VAR.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.16.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -7,7 +7,6 @@
package org.apache.jena.riot.thrift.wire;
@SuppressWarnings("all")
[email protected](value = "Autogenerated by Thrift Compiler
(0.13.0)", date = "2020-05-24")
public class RDF_VAR implements org.apache.thrift.TBase<RDF_VAR,
RDF_VAR._Fields>, java.io.Serializable, Cloneable, Comparable<RDF_VAR> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new
org.apache.thrift.protocol.TStruct("RDF_VAR");
@@ -179,8 +178,6 @@ public class RDF_VAR implements
org.apache.thrift.TBase<RDF_VAR, RDF_VAR._Fields
@Override
public boolean equals(java.lang.Object that) {
- if (that == null)
- return false;
if (that instanceof RDF_VAR)
return this.equals((RDF_VAR)that);
return false;
@@ -223,7 +220,7 @@ public class RDF_VAR implements
org.apache.thrift.TBase<RDF_VAR, RDF_VAR._Fields
int lastComparison = 0;
- lastComparison =
java.lang.Boolean.valueOf(isSetName()).compareTo(other.isSetName());
+ lastComparison = java.lang.Boolean.compare(isSetName(), other.isSetName());
if (lastComparison != 0) {
return lastComparison;
}
diff --git
a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_VarTuple.java
b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_VarTuple.java
index 02aa9c5be5..d415706183 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_VarTuple.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_VarTuple.java
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.13.0)
+ * Autogenerated by Thrift Compiler (0.16.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -7,7 +7,6 @@
package org.apache.jena.riot.thrift.wire;
@SuppressWarnings("all")
[email protected](value = "Autogenerated by Thrift Compiler
(0.13.0)", date = "2020-05-24")
public class RDF_VarTuple implements org.apache.thrift.TBase<RDF_VarTuple,
RDF_VarTuple._Fields>, java.io.Serializable, Cloneable,
Comparable<RDF_VarTuple> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new
org.apache.thrift.protocol.TStruct("RDF_VarTuple");
@@ -200,8 +199,6 @@ public class RDF_VarTuple implements
org.apache.thrift.TBase<RDF_VarTuple, RDF_V
@Override
public boolean equals(java.lang.Object that) {
- if (that == null)
- return false;
if (that instanceof RDF_VarTuple)
return this.equals((RDF_VarTuple)that);
return false;
@@ -244,7 +241,7 @@ public class RDF_VarTuple implements
org.apache.thrift.TBase<RDF_VarTuple, RDF_V
int lastComparison = 0;
- lastComparison =
java.lang.Boolean.valueOf(isSetVars()).compareTo(other.isSetVars());
+ lastComparison = java.lang.Boolean.compare(isSetVars(), other.isSetVars());
if (lastComparison != 0) {
return lastComparison;
}
@@ -410,7 +407,7 @@ public class RDF_VarTuple implements
org.apache.thrift.TBase<RDF_VarTuple, RDF_V
java.util.BitSet incoming = iprot.readBitSet(1);
if (incoming.get(0)) {
{
- org.apache.thrift.protocol.TList _list5 = new
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT,
iprot.readI32());
+ org.apache.thrift.protocol.TList _list5 =
iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
struct.vars = new java.util.ArrayList<RDF_VAR>(_list5.size);
@org.apache.thrift.annotation.Nullable RDF_VAR _elem6;
for (int _i7 = 0; _i7 < _list5.size; ++_i7)
diff --git a/pom.xml b/pom.xml
index 2e1afba3dc..e8e35c2034 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,7 @@
<ver.shiro>1.9.1</ver.shiro>
<ver.protobuf>3.21.7</ver.protobuf>
- <ver.libthrift>0.16.0</ver.libthrift>
+ <ver.libthrift>0.17.0</ver.libthrift>
<!-- JSON-LD 1.1 -->
<ver.titanium-json-ld>1.3.1</ver.titanium-json-ld>
