This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
commit b1785a6d1024933d251619fe9f0652963eb244b7
Author: yaohaishi <yaohai...@huawei.com>
AuthorDate: Mon Nov 12 10:08:30 2018 +0800
[SCB-1014] rename ExceptionToResponseConverter
---
...ustomExceptionToProducerResponseConverter.java} | 5 +-
...exception.ExceptionToProducerResponseConverter} | 2 +-
...faultExceptionToProducerResponseConverter.java} | 4 +-
.../invocation/exception/ExceptionFactory.java | 4 +-
...a => ExceptionToProducerResponseConverter.java} | 2 +-
... => ExceptionToProducerResponseConverters.java} | 18 +++----
...ationExceptionToProducerResponseConverter.java} | 3 +-
...exception.ExceptionToProducerResponseConverter} | 4 +-
....java => ErrorToProducerResponseConverter.java} | 2 +-
...faultExceptionToProducerResponseConverter.java} | 4 +-
...TestExceptionToProducerResponseConverters.java} | 62 +++++++++++-----------
...ationExceptionToProducerResponseConverter.java} | 4 +-
...exception.ExceptionToProducerResponseConverter} | 36 ++++++-------
...ationExceptionToProducerResponseConverter.java} | 6 +--
...exception.ExceptionToProducerResponseConverter} | 2 +-
15 files changed, 80 insertions(+), 78 deletions(-)
diff --git
a/demo/demo-edge/business-2.0.0/src/main/java/org/apache/servicecomb/demo/edge/business/error/CustomExceptionToResponseConverter.java
b/demo/demo-edge/business-2.0.0/src/main/java/org/apache/servicecomb/demo/edge/business/error/CustomExceptionToProducerResponseConverter.java
similarity index 91%
rename from
demo/demo-edge/business-2.0.0/src/main/java/org/apache/servicecomb/demo/edge/business/error/CustomExceptionToResponseConverter.java
rename to
demo/demo-edge/business-2.0.0/src/main/java/org/apache/servicecomb/demo/edge/business/error/CustomExceptionToProducerResponseConverter.java
index fd2ccd9..9894b6d 100644
---
a/demo/demo-edge/business-2.0.0/src/main/java/org/apache/servicecomb/demo/edge/business/error/CustomExceptionToResponseConverter.java
+++
b/demo/demo-edge/business-2.0.0/src/main/java/org/apache/servicecomb/demo/edge/business/error/CustomExceptionToProducerResponseConverter.java
@@ -21,10 +21,11 @@ import javax.ws.rs.core.Response.Status;
import org.apache.servicecomb.swagger.invocation.Response;
import org.apache.servicecomb.swagger.invocation.SwaggerInvocation;
-import
org.apache.servicecomb.swagger.invocation.exception.ExceptionToResponseConverter;
+import
org.apache.servicecomb.swagger.invocation.exception.ExceptionToProducerResponseConverter;
import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
-public class CustomExceptionToResponseConverter implements
ExceptionToResponseConverter<IllegalStateException> {
+public class CustomExceptionToProducerResponseConverter implements
+ ExceptionToProducerResponseConverter<IllegalStateException> {
@Override
public Class<IllegalStateException> getExceptionClass() {
return IllegalStateException.class;
diff --git
a/demo/demo-edge/business-2.0.0/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.exception.ExceptionToResponseConverter
b/demo/demo-edge/business-2.0.0/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.exception.ExceptionToProducerResponseConverter
similarity index 97%
rename from
demo/demo-edge/business-2.0.0/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.exception.ExceptionToResponseConverter
rename to
demo/demo-edge/business-2.0.0/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.exception.ExceptionToProducerResponseConverter
index 9a43331..1633f69 100644
---
a/demo/demo-edge/business-2.0.0/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.exception.ExceptionToResponseConverter
+++
b/demo/demo-edge/business-2.0.0/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.exception.ExceptionToProducerResponseConverter
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.servicecomb.demo.edge.business.error.CustomExceptionToResponseConverter
\ No newline at end of file
+org.apache.servicecomb.demo.edge.business.error.CustomExceptionToProducerResponseConverter
\ No newline at end of file
diff --git
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/DefaultExceptionToResponseConverter.java
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/DefaultExceptionToProducerResponseConverter.java
similarity index 89%
rename from
swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/DefaultExceptionToResponseConverter.java
rename to
swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/DefaultExceptionToProducerResponseConverter.java
index 03d4cb3..a64405e 100644
---
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/DefaultExceptionToResponseConverter.java
+++
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/DefaultExceptionToProducerResponseConverter.java
@@ -21,8 +21,8 @@ import
org.apache.servicecomb.swagger.invocation.SwaggerInvocation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class DefaultExceptionToResponseConverter implements
ExceptionToResponseConverter<Throwable> {
- private static final Logger LOGGER =
LoggerFactory.getLogger(DefaultExceptionToResponseConverter.class);
+public class DefaultExceptionToProducerResponseConverter implements
ExceptionToProducerResponseConverter<Throwable> {
+ private static final Logger LOGGER =
LoggerFactory.getLogger(DefaultExceptionToProducerResponseConverter.class);
@Override
public Class<Throwable> getExceptionClass() {
diff --git
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/ExceptionFactory.java
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/ExceptionFactory.java
index 7b9757e..7bdd7f7 100644
---
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/ExceptionFactory.java
+++
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/ExceptionFactory.java
@@ -44,7 +44,7 @@ public final class ExceptionFactory {
public static final String CONSUMER_INNER_REASON_PHRASE = "Cse Internal Bad
Request";
- private static ExceptionToResponseConverters exceptionToResponseConverters =
new ExceptionToResponseConverters();
+ private static ExceptionToProducerResponseConverters
exceptionToProducerResponseConverters = new
ExceptionToProducerResponseConverters();
public static final StatusType CONSUMER_INNER_STATUS =
new HttpStatus(CONSUMER_INNER_STATUS_CODE, CONSUMER_INNER_REASON_PHRASE);
@@ -125,6 +125,6 @@ public final class ExceptionFactory {
}
public static Response convertExceptionToResponse(SwaggerInvocation
swaggerInvocation, Throwable e) {
- return
exceptionToResponseConverters.convertExceptionToResponse(swaggerInvocation, e);
+ return
exceptionToProducerResponseConverters.convertExceptionToResponse(swaggerInvocation,
e);
}
}
diff --git
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/ExceptionToResponseConverter.java
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/ExceptionToProducerResponseConverter.java
similarity index 93%
rename from
swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/ExceptionToResponseConverter.java
rename to
swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/ExceptionToProducerResponseConverter.java
index 4c14ad8..a74b471 100644
---
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/ExceptionToResponseConverter.java
+++
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/ExceptionToProducerResponseConverter.java
@@ -19,7 +19,7 @@ package org.apache.servicecomb.swagger.invocation.exception;
import org.apache.servicecomb.swagger.invocation.Response;
import org.apache.servicecomb.swagger.invocation.SwaggerInvocation;
-public interface ExceptionToResponseConverter<T extends Throwable> {
+public interface ExceptionToProducerResponseConverter<T extends Throwable> {
Class<T> getExceptionClass();
default int getOrder() {
diff --git
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/ExceptionToResponseConverters.java
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/ExceptionToProducerResponseConverters.java
similarity index 69%
rename from
swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/ExceptionToResponseConverters.java
rename to
swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/ExceptionToProducerResponseConverters.java
index 3c78cdf..d9f50da 100644
---
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/ExceptionToResponseConverters.java
+++
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/ExceptionToProducerResponseConverters.java
@@ -23,19 +23,19 @@ import
org.apache.servicecomb.foundation.common.utils.SPIServiceUtils;
import org.apache.servicecomb.swagger.invocation.Response;
import org.apache.servicecomb.swagger.invocation.SwaggerInvocation;
-public class ExceptionToResponseConverters {
- private Map<Class<?>, ExceptionToResponseConverter<Throwable>>
exceptionToResponseConverters =
+public class ExceptionToProducerResponseConverters {
+ private Map<Class<?>, ExceptionToProducerResponseConverter<Throwable>>
exceptionToProducerResponseConverters =
new HashMap<>();
- private ExceptionToResponseConverter<Throwable> defaultConverter;
+ private ExceptionToProducerResponseConverter<Throwable> defaultConverter;
/**
- * Load the {@link ExceptionToResponseConverter} implementations. Ensure
that those converters whose {@link ExceptionToResponseConverter#getOrder()}
+ * Load the {@link ExceptionToProducerResponseConverter} implementations.
Ensure that those converters whose {@link
ExceptionToProducerResponseConverter#getOrder()}
* return smaller value takes higher priority.
*/
@SuppressWarnings("unchecked")
- public ExceptionToResponseConverters() {
-
SPIServiceUtils.getSortedService(ExceptionToResponseConverter.class).forEach(converter
-> {
+ public ExceptionToProducerResponseConverters() {
+
SPIServiceUtils.getSortedService(ExceptionToProducerResponseConverter.class).forEach(converter
-> {
if (converter.getExceptionClass() == null) {
if (defaultConverter == null) {
defaultConverter = converter;
@@ -43,15 +43,15 @@ public class ExceptionToResponseConverters {
return;
}
- exceptionToResponseConverters.putIfAbsent(converter.getExceptionClass(),
converter);
+
exceptionToProducerResponseConverters.putIfAbsent(converter.getExceptionClass(),
converter);
});
}
public Response convertExceptionToResponse(SwaggerInvocation
swaggerInvocation, Throwable e) {
- ExceptionToResponseConverter<Throwable> converter = null;
+ ExceptionToProducerResponseConverter<Throwable> converter = null;
Class<?> clazz = e.getClass();
while (converter == null) {
- converter = exceptionToResponseConverters.get(clazz);
+ converter = exceptionToProducerResponseConverters.get(clazz);
if (clazz == Throwable.class) {
break;
}
diff --git
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/InvocationExceptionToResponseConverter.java
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/InvocationExceptionToProducerResponseConverter.java
similarity index 90%
rename from
swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/InvocationExceptionToResponseConverter.java
rename to
swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/InvocationExceptionToProducerResponseConverter.java
index 368b114..2c3ddfd 100644
---
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/InvocationExceptionToResponseConverter.java
+++
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/InvocationExceptionToProducerResponseConverter.java
@@ -19,7 +19,8 @@ package org.apache.servicecomb.swagger.invocation.exception;
import org.apache.servicecomb.swagger.invocation.Response;
import org.apache.servicecomb.swagger.invocation.SwaggerInvocation;
-public class InvocationExceptionToResponseConverter implements
ExceptionToResponseConverter<InvocationException> {
+public class InvocationExceptionToProducerResponseConverter implements
+ ExceptionToProducerResponseConverter<InvocationException> {
@Override
public Class<InvocationException> getExceptionClass() {
return InvocationException.class;
diff --git
a/swagger/swagger-invocation/invocation-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.exception.ExceptionToResponseConverter
b/swagger/swagger-invocation/invocation-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.exception.ExceptionToProducerResponseConverter
similarity index 93%
rename from
swagger/swagger-invocation/invocation-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.exception.ExceptionToResponseConverter
rename to
swagger/swagger-invocation/invocation-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.exception.ExceptionToProducerResponseConverter
index b717491..f7315d6 100644
---
a/swagger/swagger-invocation/invocation-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.exception.ExceptionToResponseConverter
+++
b/swagger/swagger-invocation/invocation-core/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.exception.ExceptionToProducerResponseConverter
@@ -15,5 +15,5 @@
# limitations under the License.
#
-org.apache.servicecomb.swagger.invocation.exception.InvocationExceptionToResponseConverter
-org.apache.servicecomb.swagger.invocation.exception.DefaultExceptionToResponseConverter
+org.apache.servicecomb.swagger.invocation.exception.InvocationExceptionToProducerResponseConverter
+org.apache.servicecomb.swagger.invocation.exception.DefaultExceptionToProducerResponseConverter
diff --git
a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/ErrorToResponseConverter.java
b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/ErrorToProducerResponseConverter.java
similarity index 92%
rename from
swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/ErrorToResponseConverter.java
rename to
swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/ErrorToProducerResponseConverter.java
index 241869a..87eaae4 100644
---
a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/ErrorToResponseConverter.java
+++
b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/ErrorToProducerResponseConverter.java
@@ -21,7 +21,7 @@ import javax.ws.rs.core.Response.Status;
import org.apache.servicecomb.swagger.invocation.Response;
import org.apache.servicecomb.swagger.invocation.SwaggerInvocation;
-public class ErrorToResponseConverter implements
ExceptionToResponseConverter<Error> {
+public class ErrorToProducerResponseConverter implements
ExceptionToProducerResponseConverter<Error> {
@Override
public Class<Error> getExceptionClass() {
return Error.class;
diff --git
a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestDefaultExceptionToResponseConverter.java
b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestDefaultExceptionToProducerResponseConverter.java
similarity index 89%
rename from
swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestDefaultExceptionToResponseConverter.java
rename to
swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestDefaultExceptionToProducerResponseConverter.java
index 9fbe32d..c90d5e7 100644
---
a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestDefaultExceptionToResponseConverter.java
+++
b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestDefaultExceptionToProducerResponseConverter.java
@@ -23,8 +23,8 @@ import org.junit.Test;
import mockit.Mocked;
-public class TestDefaultExceptionToResponseConverter {
- DefaultExceptionToResponseConverter converter = new
DefaultExceptionToResponseConverter();
+public class TestDefaultExceptionToProducerResponseConverter {
+ DefaultExceptionToProducerResponseConverter converter = new
DefaultExceptionToProducerResponseConverter();
@Test
public void getExceptionClass() {
diff --git
a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestExceptionToResponseConverters.java
b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestExceptionToProducerResponseConverters.java
similarity index 64%
rename from
swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestExceptionToResponseConverters.java
rename to
swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestExceptionToProducerResponseConverters.java
index dbb7e1c..319e411 100644
---
a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestExceptionToResponseConverters.java
+++
b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestExceptionToProducerResponseConverters.java
@@ -30,17 +30,17 @@ import org.junit.Test;
import mockit.Expectations;
import mockit.Mocked;
-public class TestExceptionToResponseConverters {
+public class TestExceptionToProducerResponseConverters {
@Test
public void convertExceptionToResponse(
- @Mocked ExceptionToResponseConverter<Throwable> c1,
+ @Mocked ExceptionToProducerResponseConverter<Throwable> c1,
@Mocked Response r1,
- @Mocked ExceptionToResponseConverter<Throwable> c2,
+ @Mocked ExceptionToProducerResponseConverter<Throwable> c2,
@Mocked Response r2,
- @Mocked ExceptionToResponseConverter<Throwable> cDef) {
+ @Mocked ExceptionToProducerResponseConverter<Throwable> cDef) {
new Expectations(SPIServiceUtils.class) {
{
- SPIServiceUtils.getSortedService(ExceptionToResponseConverter.class);
+
SPIServiceUtils.getSortedService(ExceptionToProducerResponseConverter.class);
result = Arrays.asList(c1, c2, cDef);
c1.getExceptionClass();
@@ -58,29 +58,29 @@ public class TestExceptionToResponseConverters {
}
};
- ExceptionToResponseConverters exceptionToResponseConverters = new
ExceptionToResponseConverters();
+ ExceptionToProducerResponseConverters
exceptionToProducerResponseConverters = new
ExceptionToProducerResponseConverters();
Assert.assertSame(r1,
- exceptionToResponseConverters.convertExceptionToResponse(null, new
Throwable()));
+ exceptionToProducerResponseConverters.convertExceptionToResponse(null,
new Throwable()));
Assert.assertSame(r2,
- exceptionToResponseConverters.convertExceptionToResponse(null, new
Exception()));
+ exceptionToProducerResponseConverters.convertExceptionToResponse(null,
new Exception()));
Assert.assertSame(r2,
- exceptionToResponseConverters.convertExceptionToResponse(null,
+ exceptionToProducerResponseConverters.convertExceptionToResponse(null,
new IllegalStateException()));
}
@Test
public void convertExceptionToResponse_checkDefaultConverterPriority(
- @Mocked ExceptionToResponseConverter<Throwable> c1,
+ @Mocked ExceptionToProducerResponseConverter<Throwable> c1,
@Mocked Response r1,
- @Mocked ExceptionToResponseConverter<Throwable> c2,
+ @Mocked ExceptionToProducerResponseConverter<Throwable> c2,
@Mocked Response r2,
- @Mocked ExceptionToResponseConverter<Throwable> cDef,
+ @Mocked ExceptionToProducerResponseConverter<Throwable> cDef,
@Mocked Response rDef,
- @Mocked ExceptionToResponseConverter<Throwable> cDef2) {
+ @Mocked ExceptionToProducerResponseConverter<Throwable> cDef2) {
new Expectations(SPIServiceUtils.class) {
{
- SPIServiceUtils.getSortedService(ExceptionToResponseConverter.class);
+
SPIServiceUtils.getSortedService(ExceptionToProducerResponseConverter.class);
result = Arrays.asList(c1, c2, cDef, cDef2);
c1.getExceptionClass();
@@ -103,33 +103,33 @@ public class TestExceptionToResponseConverters {
}
};
- ExceptionToResponseConverters exceptionToResponseConverters = new
ExceptionToResponseConverters();
+ ExceptionToProducerResponseConverters
exceptionToProducerResponseConverters = new
ExceptionToProducerResponseConverters();
Assert.assertSame(r2,
- exceptionToResponseConverters
+ exceptionToProducerResponseConverters
.convertExceptionToResponse(null, new
InvocationException(Status.UNAUTHORIZED, "")));
Assert.assertSame(r1,
- exceptionToResponseConverters.convertExceptionToResponse(null, new
RuntimeException()));
+ exceptionToProducerResponseConverters.convertExceptionToResponse(null,
new RuntimeException()));
Assert.assertSame(rDef,
- exceptionToResponseConverters.convertExceptionToResponse(null,
+ exceptionToProducerResponseConverters.convertExceptionToResponse(null,
new IOException()));
}
@Test
public void convertExceptionToResponse_CheckCommonConvertPriority(
- @Mocked ExceptionToResponseConverter<RuntimeException0> cR0,
- @Mocked ExceptionToResponseConverter<RuntimeException0> cR0_LowPriority,
- @Mocked ExceptionToResponseConverter<RuntimeException1> cR1,
- @Mocked ExceptionToResponseConverter<RuntimeException> cR,
- @Mocked ExceptionToResponseConverter<Throwable> cT,
- @Mocked ExceptionToResponseConverter<?> cDef,
+ @Mocked ExceptionToProducerResponseConverter<RuntimeException0> cR0,
+ @Mocked ExceptionToProducerResponseConverter<RuntimeException0>
cR0_LowPriority,
+ @Mocked ExceptionToProducerResponseConverter<RuntimeException1> cR1,
+ @Mocked ExceptionToProducerResponseConverter<RuntimeException> cR,
+ @Mocked ExceptionToProducerResponseConverter<Throwable> cT,
+ @Mocked ExceptionToProducerResponseConverter<?> cDef,
@Mocked Response rR0,
@Mocked Response rR1,
@Mocked Response rR,
@Mocked Response rT) {
new Expectations(SPIServiceUtils.class) {
{
- SPIServiceUtils.getSortedService(ExceptionToResponseConverter.class);
+
SPIServiceUtils.getSortedService(ExceptionToProducerResponseConverter.class);
result = Arrays.asList(cR, cR0, cR0_LowPriority, cR1, cDef, cT);
cR0.getExceptionClass();
@@ -160,19 +160,19 @@ public class TestExceptionToResponseConverters {
}
};
- ExceptionToResponseConverters exceptionToResponseConverters = new
ExceptionToResponseConverters();
+ ExceptionToProducerResponseConverters
exceptionToProducerResponseConverters = new
ExceptionToProducerResponseConverters();
Assert.assertSame(rR0,
- exceptionToResponseConverters.convertExceptionToResponse(null, new
RuntimeException0_0()));
+ exceptionToProducerResponseConverters.convertExceptionToResponse(null,
new RuntimeException0_0()));
Assert.assertSame(rR0,
- exceptionToResponseConverters.convertExceptionToResponse(null, new
RuntimeException0()));
+ exceptionToProducerResponseConverters.convertExceptionToResponse(null,
new RuntimeException0()));
Assert.assertSame(rR1,
- exceptionToResponseConverters.convertExceptionToResponse(null, new
RuntimeException1()));
+ exceptionToProducerResponseConverters.convertExceptionToResponse(null,
new RuntimeException1()));
Assert.assertSame(rR,
- exceptionToResponseConverters.convertExceptionToResponse(null, new
RuntimeException()));
+ exceptionToProducerResponseConverters.convertExceptionToResponse(null,
new RuntimeException()));
// Actually, a Throwable exception converter will act like a default
converter, as our implementation expects.
Assert.assertSame(rT,
- exceptionToResponseConverters.convertExceptionToResponse(null, new
IOException()));
+ exceptionToProducerResponseConverters.convertExceptionToResponse(null,
new IOException()));
}
static class RuntimeException0 extends RuntimeException {
diff --git
a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestInvocationExceptionToResponseConverter.java
b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestInvocationExceptionToProducerResponseConverter.java
similarity index 88%
rename from
swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestInvocationExceptionToResponseConverter.java
rename to
swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestInvocationExceptionToProducerResponseConverter.java
index 38e66ca..49dbd59 100644
---
a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestInvocationExceptionToResponseConverter.java
+++
b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestInvocationExceptionToProducerResponseConverter.java
@@ -23,8 +23,8 @@ import org.junit.Test;
import mockit.Mocked;
-public class TestInvocationExceptionToResponseConverter {
- InvocationExceptionToResponseConverter converter = new
InvocationExceptionToResponseConverter();
+public class TestInvocationExceptionToProducerResponseConverter {
+ InvocationExceptionToProducerResponseConverter converter = new
InvocationExceptionToProducerResponseConverter();
@Test
public void getExceptionClass() {
diff --git
a/swagger/swagger-invocation/invocation-core/src/test/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.exception.ExceptionToResponseConverter
b/swagger/swagger-invocation/invocation-core/src/test/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.exception.ExceptionToProducerResponseConverter
similarity index 89%
rename from
swagger/swagger-invocation/invocation-core/src/test/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.exception.ExceptionToResponseConverter
rename to
swagger/swagger-invocation/invocation-core/src/test/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.exception.ExceptionToProducerResponseConverter
index a7cfecd..a3afa77 100644
---
a/swagger/swagger-invocation/invocation-core/src/test/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.exception.ExceptionToResponseConverter
+++
b/swagger/swagger-invocation/invocation-core/src/test/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.exception.ExceptionToProducerResponseConverter
@@ -1,18 +1,18 @@
-#
-# 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.
-#
-
-org.apache.servicecomb.swagger.invocation.exception.ErrorToResponseConverter
\ No newline at end of file
+#
+# 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.
+#
+
+org.apache.servicecomb.swagger.invocation.exception.ErrorToProducerResponseConverter
\ No newline at end of file
diff --git
a/swagger/swagger-invocation/invocation-validator/src/main/java/org/apache/servicecomb/swagger/invocation/validator/ConstraintViolationExceptionToResponseConverter.java
b/swagger/swagger-invocation/invocation-validator/src/main/java/org/apache/servicecomb/swagger/invocation/validator/ConstraintViolationExceptionToProducerResponseConverter.java
similarity index 89%
rename from
swagger/swagger-invocation/invocation-validator/src/main/java/org/apache/servicecomb/swagger/invocation/validator/ConstraintViolationExceptionToResponseConverter.java
rename to
swagger/swagger-invocation/invocation-validator/src/main/java/org/apache/servicecomb/swagger/invocation/validator/ConstraintViolationExceptionToProducerResponseConverter.java
index 5ade951..58e3e4e 100644
---
a/swagger/swagger-invocation/invocation-validator/src/main/java/org/apache/servicecomb/swagger/invocation/validator/ConstraintViolationExceptionToResponseConverter.java
+++
b/swagger/swagger-invocation/invocation-validator/src/main/java/org/apache/servicecomb/swagger/invocation/validator/ConstraintViolationExceptionToProducerResponseConverter.java
@@ -21,11 +21,11 @@ import javax.ws.rs.core.Response.Status;
import org.apache.servicecomb.swagger.invocation.Response;
import org.apache.servicecomb.swagger.invocation.SwaggerInvocation;
-import
org.apache.servicecomb.swagger.invocation.exception.ExceptionToResponseConverter;
+import
org.apache.servicecomb.swagger.invocation.exception.ExceptionToProducerResponseConverter;
import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
-public class ConstraintViolationExceptionToResponseConverter
- implements ExceptionToResponseConverter<ConstraintViolationException> {
+public class ConstraintViolationExceptionToProducerResponseConverter
+ implements
ExceptionToProducerResponseConverter<ConstraintViolationException> {
@Override
public Class<ConstraintViolationException> getExceptionClass() {
return ConstraintViolationException.class;
diff --git
a/swagger/swagger-invocation/invocation-validator/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.exception.ExceptionToResponseConverter
b/swagger/swagger-invocation/invocation-validator/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.exception.ExceptionToProducerResponseConverter
similarity index 95%
rename from
swagger/swagger-invocation/invocation-validator/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.exception.ExceptionToResponseConverter
rename to
swagger/swagger-invocation/invocation-validator/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.exception.ExceptionToProducerResponseConverter
index 9667b7a..f6d6fd9 100644
---
a/swagger/swagger-invocation/invocation-validator/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.exception.ExceptionToResponseConverter
+++
b/swagger/swagger-invocation/invocation-validator/src/main/resources/META-INF/services/org.apache.servicecomb.swagger.invocation.exception.ExceptionToProducerResponseConverter
@@ -15,4 +15,4 @@
# limitations under the License.
#
-org.apache.servicecomb.swagger.invocation.validator.ConstraintViolationExceptionToResponseConverter
\ No newline at end of file
+org.apache.servicecomb.swagger.invocation.validator.ConstraintViolationExceptionToProducerResponseConverter
\ No newline at end of file
