THRIFT-5521: [java gen] use jdk8 option type in java generator code

Client: Java
Patch: Jiayu Liu

This closes #2525

5 files changed, 0 insertions, 194 deletions

diff --git a/test/JavaBeansTest.thrift b/test/JavaBeansTest.thrift
deleted file mode 100644
index b6c3ea861..000000000
--- a/test/JavaBeansTest.thrift
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-namespace java thrift.test
-
-struct OneOfEachBeans {
-  1: bool boolean_field,
-  2: byte a_bite,
-  3: i16 integer16,
-  4: i32 integer32,
-  5: i64 integer64,
-  6: double double_precision,
-  7: string some_characters,
-  8: binary base64,
-  9: list<byte> byte_list,
-  10: list<i16> i16_list,
-  11: list<i64> i64_list
-}
-
-
-service Service {
-  i64 mymethod(i64 blah);
-}
\ No newline at end of file
diff --git a/test/JavaBinaryDefault.thrift b/test/JavaBinaryDefault.thrift
deleted file mode 100644
index 5517802c7..000000000
--- a/test/JavaBinaryDefault.thrift
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-namespace java thrift.test
-
-struct StringAndBinary {
-  1: optional string strval = ""
-  2: optional binary binval = ""
-}
diff --git a/test/JavaDeepCopyTest.thrift b/test/JavaDeepCopyTest.thrift
deleted file mode 100644
index fc974aefd..000000000
--- a/test/JavaDeepCopyTest.thrift
+++ /dev/null
@@ -1,19 +0,0 @@
-include "JavaTypes.thrift"
-
-namespace java thrift.test
-
-struct DeepCopyFoo {
-  1: optional list<DeepCopyBar> l,
-  2: optional set<DeepCopyBar> s,
-  3: optional map<string, DeepCopyBar> m,
-  4: optional list<JavaTypes.Object> li,
-  5: optional set<JavaTypes.Object> si,
-  6: optional map<string, JavaTypes.Object> mi,
-  7: optional DeepCopyBar bar,
-}
-
-struct DeepCopyBar {
-  1: optional string a,
-  2: optional i32 b,
-  3: optional bool c,
-}
diff --git a/test/JavaTypes.thrift b/test/JavaTypes.thrift
deleted file mode 100644
index 555334082..000000000
--- a/test/JavaTypes.thrift
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-namespace java thrift.test
-
-struct Integer {
-  1: i32 val
-}
-
-struct String {
-  1: string val
-}
-
-struct Binary {
-  1: binary val
-}
-
-struct Boolean {
-  1: bool val
-}
-
-struct Double {
-  1: double val
-}
-
-struct Long {
-  1: i64 val
-}
-
-struct Byte {
-  1: byte val
-}
-
-struct Float {
-  1: double val
-}
-
-struct List {
-  1: list<string> vals
-}
-
-struct ArrayList {
-  1: list<string> vals
-}
-
-struct SortedMap {
-  1: map<string, string> vals
-}
-
-struct TreeMap {
-  1: map<string, string> vals
-}
-
-struct HashMap {
-  1: map<string, String> vals
-}
-
-struct Map {
-  1: map<double, Double> vals
-}
-
-struct Object {
-  1: Integer integer,
-  2: String str,
-  3: Boolean boolean_field,
-  4: Double dbl,
-  5: Byte bite,
-  6: map<i32, Integer> intmap,
-  7: Map somemap,
-}
-
-exception Exception {
-  1: string msg
-}
-
-service AsyncNonblockingService {
-  Object mymethod(
-    1: Integer integer,
-    2: String str,
-    3: Boolean boolean_field,
-    4: Double dbl,
-    5: Byte bite,
-    6: map<i32, Integer> intmap,
-    7: Map somemap,
-  ) throws (1:Exception ex);
-}
-
-struct SafeBytes {
-  1: binary bytes;
-}
-
diff --git a/test/Makefile.am b/test/Makefile.am
index 58482f2d2..d428086bd 100755
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -142,10 +142,6 @@ EXTRA_DIST = \
 	Include.thrift \
 	Identifiers.thrift \
 	Int64Test.thrift \
-	JavaBeansTest.thrift \
-	JavaBinaryDefault.thrift \
-	JavaDeepCopyTest.thrift \
-	JavaTypes.thrift \
 	JsDeepConstructorTest.thrift \
 	ManyOptionals.thrift \
 	ManyTypedefs.thrift \