Merge pull request #105 from yiduwangkai/master

add IncompleteAnnotationException And AnnotationTypeMismatchException

java_exception.go

@@ -17,6 +17,7 @@ package hessian
 import "github.com/dubbogo/hessian2/java_exception"
 
 func init() {
+	RegisterPOJO(&java_exception.Method{})
 	RegisterPOJO(&java_exception.Class{})
 	RegisterPOJO(&java_exception.Throwable{})
 	RegisterPOJO(&java_exception.Exception{})
@@ -105,4 +106,6 @@ func init() {
 	RegisterPOJO(&java_exception.MissingFormatArgumentException{})
 	RegisterPOJO(&java_exception.MissingFormatWidthException{})
 	RegisterPOJO(&java_exception.DubboGenericException{})
+	RegisterPOJO(&java_exception.IncompleteAnnotationException{})
+	RegisterPOJO(&java_exception.AnnotationTypeMismatchException{})
 }

java_exception/annotation_type_mismatch_exception.go

@@ -0,0 +1,37 @@
+// Copyright 2016-2019 yiduwangkai@gmail.com
+//
+// Licensed 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.
+
+package java_exception
+
+type AnnotationTypeMismatchException struct {
+	SerialVersionUID     int64
+	DetailMessage        string
+	StackTrace           []StackTraceElement
+	FoundType            string
+	Element              Method
+	SuppressedExceptions []Throwabler
+	Cause                Throwabler
+}
+
+func NewAnnotationTypeMismatchException(detailMessage string) *AnnotationTypeMismatchException {
+	return &AnnotationTypeMismatchException{DetailMessage: detailMessage, StackTrace: []StackTraceElement{}}
+}
+
+func (e AnnotationTypeMismatchException) Error() string {
+	return e.DetailMessage
+}
+
+func (AnnotationTypeMismatchException) JavaClassName() string {
+	return "java.lang.annotation.AnnotationTypeMismatchException"
+}

java_exception/exception.go

@@ -90,6 +90,15 @@ type Class struct {
 	Name string
 }
 
+type Method struct {
+	Name string
+}
+
+
+func (Method) JavaClassName() string {
+	return "java.lang.reflect.Method"
+}
+
 func (Class) JavaClassName() string {
 	return "java.lang.Class"
 }

java_exception/incomplete_annotation_exception.go

@@ -0,0 +1,37 @@
+// Copyright 2016-2019 yiduwangkai@gmail.com
+//
+// Licensed 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.
+
+package java_exception
+
+type IncompleteAnnotationException struct {
+	SerialVersionUID     int64
+	DetailMessage        string
+	StackTrace           []StackTraceElement
+	ElementName          string
+	AnnotationType       Class
+	SuppressedExceptions []Throwabler
+	Cause                Throwabler
+}
+
+func NewIncompleteAnnotationException(detailMessage string) *IncompleteAnnotationException {
+	return &IncompleteAnnotationException{DetailMessage: detailMessage, StackTrace: []StackTraceElement{}}
+}
+
+func (e IncompleteAnnotationException) Error() string {
+	return e.DetailMessage
+}
+
+func (IncompleteAnnotationException) JavaClassName() string {
+	return "java.lang.annotation.IncompleteAnnotationException"
+}

java_exception_test.go

@@ -107,6 +107,8 @@ func TestException(t *testing.T) {
 	doTestException(t, "throw_MissingFormatArgumentException", "Format specifier 'MissingFormatArgumentException'")
 	doTestException(t, "throw_MissingFormatWidthException", "MissingFormatWidthException")
 	doTestException(t, "throw_DubboGenericException", "DubboGenericException")
+	doTestException(t, "throw_IncompleteAnnotationException", "java.lang.Override missing element IncompleteAnnotationException")
+	doTestException(t, "throw_AnnotationTypeMismatchException", "Incorrectly typed data found for annotation element null (Found data of type AnnotationTypeMismatchException)")
 }
 
 func doTestException(t *testing.T, method, content string) {

test_hessian/src/main/java/test/TestThrowable.java

@@ -18,6 +18,8 @@
 import com.alibaba.dubbo.rpc.service.GenericException;
 
 import java.io.*;
+import java.lang.annotation.AnnotationTypeMismatchException;
+import java.lang.annotation.IncompleteAnnotationException;
 import java.lang.instrument.IllegalClassFormatException;
 import java.lang.instrument.UnmodifiableClassException;
 import java.lang.invoke.LambdaConversionException;
@@ -395,4 +397,13 @@ public static Object throw_MissingFormatWidthException() {
   public static Object throw_DubboGenericException() {
     return new GenericException("DubboGenericExceptionClass","DubboGenericException");
   }
+
+  public static Object throw_IncompleteAnnotationException() {
+    return new IncompleteAnnotationException(Override.class, "IncompleteAnnotationException");
+  }
+
+  public static Object throw_AnnotationTypeMismatchException() {
+    return new AnnotationTypeMismatchException(Override.class.getEnclosingMethod(), "AnnotationTypeMismatchException");
+  }
+
 }