You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by wu...@apache.org on 2018/05/28 03:23:17 UTC
[incubator-servicecomb-java-chassis] 01/08: [SCB-589] delete
useless code
This is an automated email from the ASF dual-hosted git repository.
wujimin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit 9858c2ef76d1f636e35141b8d5aa7fa39f4bde89
Author: wujimin <wu...@huawei.com>
AuthorDate: Tue May 22 09:52:29 2018 +0800
[SCB-589] delete useless code
---
.../schema/TestProducerSchemaFactory.java | 4 -
.../servicecomb/provider/common/MockUtil.java | 124 ---------
.../servicecomb/provider/common/MockUtil.java | 72 -----
.../servicecomb/provider/common/MockUtil.java | 299 ---------------------
.../servicecomb/transport/common/MockUtil.java | 12 -
5 files changed, 511 deletions(-)
diff --git a/core/src/test/java/org/apache/servicecomb/core/definition/schema/TestProducerSchemaFactory.java b/core/src/test/java/org/apache/servicecomb/core/definition/schema/TestProducerSchemaFactory.java
index 40e40cf..6ec3346 100644
--- a/core/src/test/java/org/apache/servicecomb/core/definition/schema/TestProducerSchemaFactory.java
+++ b/core/src/test/java/org/apache/servicecomb/core/definition/schema/TestProducerSchemaFactory.java
@@ -110,10 +110,6 @@ public class TestProducerSchemaFactory {
}
};
- // ApplicationContext applicationContext = Mockito.mock(ApplicationContext.class);
- // BeanUtils.setContext(applicationContext);
- // Mockito.when(applicationContext.getBean(ExecutorManager.EXECUTOR_REACTIVE)).thenReturn(new ReactiveExecutor());
-
UnitTestMeta.init();
schemaMeta = producerSchemaFactory.getOrCreateProducerSchema("app:ms",
diff --git a/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/common/MockUtil.java b/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/common/MockUtil.java
index ee119c3..bea8107 100644
--- a/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/common/MockUtil.java
+++ b/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/common/MockUtil.java
@@ -17,25 +17,9 @@
package org.apache.servicecomb.provider.common;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Proxy;
-
-import org.apache.servicecomb.core.definition.MicroserviceMeta;
import org.apache.servicecomb.core.definition.MicroserviceMetaManager;
-import org.apache.servicecomb.core.definition.OperationMeta;
-import org.apache.servicecomb.core.definition.SchemaMeta;
-import org.apache.servicecomb.core.provider.consumer.ConsumerProviderManager;
-import org.apache.servicecomb.core.provider.consumer.ReferenceConfig;
-import org.apache.servicecomb.core.provider.producer.AbstractProducerProvider;
import org.apache.servicecomb.foundation.common.utils.BeanUtils;
-import org.apache.servicecomb.provider.pojo.PojoConsumerProvider;
-import org.apache.servicecomb.provider.pojo.TestPojoConsumerProvider;
-import org.apache.servicecomb.provider.pojo.instance.PojoInstanceFactory;
-import org.apache.servicecomb.provider.pojo.reference.PojoReferenceMeta;
-import org.apache.servicecomb.provider.pojo.schema.PojoProducerMeta;
import org.mockito.Mockito;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
import org.springframework.context.ApplicationContext;
import mockit.Mock;
@@ -54,18 +38,6 @@ public class MockUtil {
return instance;
}
- public void mockProxy() {
-
- new MockUp<Proxy>() {
- @Mock
- Object newProxyInstance(ClassLoader loader,
- Class<?>[] interfaces,
- InvocationHandler h) throws IllegalArgumentException {
- return h;
- }
- };
- }
-
public void mockBeanUtils() {
new MockUp<BeanUtils>() {
@@ -96,100 +68,4 @@ public class MockUtil {
}
};
}
-
- public void mockRegisterManager() throws InstantiationException, IllegalAccessException {
- MicroserviceMeta microserviceMeta = new MicroserviceMeta("app:test");
- microserviceMetaManager.register("test", microserviceMeta);
- }
-
- public void mockMicroserviceMeta() {
-
- new MockUp<MicroserviceMeta>() {
- @Mock
- public SchemaMeta ensureFindSchemaMeta(String schemaId) {
- SchemaMeta lSchemaMeta = Mockito.mock(SchemaMeta.class);
- Mockito.when(lSchemaMeta.getSwaggerIntf())
- .thenAnswer(new Answer<Class<? extends TestPojoConsumerProvider>>() {
- @Override
- public Class<? extends TestPojoConsumerProvider> answer(
- InvocationOnMock invocation) throws Throwable {
- return TestPojoConsumerProvider.class;
- }
- });
- return lSchemaMeta;
- }
-
- @Mock
- public SchemaMeta ensureFindSchemaMeta(Class<?> schemaIntf) {
- return Mockito.mock(SchemaMeta.class);
- }
- };
- }
-
- public void mockPojoReferenceMeta() {
-
- new MockUp<PojoReferenceMeta>() {
- @Mock
- public void init() {
-
- }
-
- @Mock
- public SchemaMeta getSchemaMeta() {
- return Mockito.mock(SchemaMeta.class);
- }
- };
- }
-
- public void mockConsumerProviderManager() {
- new MockUp<ConsumerProviderManager>() {
- @Mock
- public ReferenceConfig getReferenceConfig(String microserviceName) {
- return null;
- }
- };
- }
-
- public void mockSchemaMeta() {
-
- new MockUp<SchemaMeta>() {
- @Mock
- public Class<?> getIntf() {
- return Object.class;
- }
- };
- }
-
- public void mockPojoInstanceFactory() {
-
- new MockUp<PojoInstanceFactory>() {
- @Mock
- public Object create(String className) {
- return Object.class;
- }
- };
- }
-
- public void mockPojoConsumerProvider() {
-
- new MockUp<PojoConsumerProvider>() {
- @Mock
- private void createInvoker(PojoReferenceMeta pojoReference) {
-
- }
- };
- }
-
- public void mockAbstractServiceProvider() {
-
- new MockUp<AbstractProducerProvider>() {
- @SuppressWarnings("unchecked")
- @Mock
- protected <T> T findProviderSchema(OperationMeta operationMeta) {
- PojoProducerMeta lPojoSchemaMeta = Mockito.mock(PojoProducerMeta.class);
- Mockito.when(lPojoSchemaMeta.getInstance()).thenReturn(lPojoSchemaMeta);
- return (T) lPojoSchemaMeta;
- }
- };
- }
}
diff --git a/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/common/MockUtil.java b/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/common/MockUtil.java
deleted file mode 100644
index a8aa600..0000000
--- a/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/common/MockUtil.java
+++ /dev/null
@@ -1,72 +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.
- */
-
-package org.apache.servicecomb.provider.common;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-
-import org.apache.servicecomb.foundation.common.utils.BeanUtils;
-import org.mockito.Mockito;
-import org.springframework.context.ApplicationContext;
-
-import mockit.Mock;
-import mockit.MockUp;
-
-public class MockUtil {
-
- private static MockUtil instance = new MockUtil();
-
- private MockUtil() {
-
- }
-
- public static MockUtil getInstance() {
- return instance;
- }
-
- public void mockBeanUtils() {
-
- new MockUp<BeanUtils>() {
- @Mock
- ApplicationContext getContext() {
- return Mockito.mock(ApplicationContext.class);
- }
- };
- }
-
- public void mockMethod() {
-
- new MockUp<Method>() {
- @Mock
- public Annotation[][] getParameterAnnotations() {
- Annotation[][] lAnnotation = new Annotation[1][1];
- lAnnotation[0][0] = Mockito.mock(Annotation.class);
- return lAnnotation;
- }
-
- @Mock
- public Type[] getGenericParameterTypes() {
- Type[] lType = new Type[1];
- lType[0] = Mockito.mock(Type.class);
- Mockito.when(lType[0].getTypeName()).thenReturn("javax.servlet.http.HttpServletRequest");
- return lType;
- }
- };
- }
-}
diff --git a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/common/MockUtil.java b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/common/MockUtil.java
index 278405a..3219774 100644
--- a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/common/MockUtil.java
+++ b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/common/MockUtil.java
@@ -18,47 +18,16 @@
package org.apache.servicecomb.provider.common;
import java.lang.reflect.Field;
-import java.net.URI;
-import java.util.Map;
-import org.apache.servicecomb.common.rest.definition.RestOperationMeta;
-import org.apache.servicecomb.common.rest.locator.OperationLocator;
-import org.apache.servicecomb.common.rest.locator.ServicePathManager;
-import org.apache.servicecomb.core.CseContext;
-import org.apache.servicecomb.core.Invocation;
-import org.apache.servicecomb.core.definition.MicroserviceMeta;
-import org.apache.servicecomb.core.definition.MicroserviceMetaManager;
-import org.apache.servicecomb.core.definition.OperationMeta;
-import org.apache.servicecomb.core.definition.SchemaMeta;
-import org.apache.servicecomb.core.definition.SchemaUtils;
-import org.apache.servicecomb.core.definition.schema.ConsumerSchemaFactory;
-import org.apache.servicecomb.core.provider.consumer.ConsumerProviderManager;
-import org.apache.servicecomb.core.provider.consumer.InvokerUtils;
-import org.apache.servicecomb.core.provider.consumer.ReferenceConfig;
-import org.apache.servicecomb.foundation.common.utils.BeanUtils;
import org.apache.servicecomb.provider.springmvc.reference.CseClientHttpRequest;
import org.apache.servicecomb.provider.springmvc.reference.CseClientHttpResponse;
-import org.apache.servicecomb.provider.springmvc.reference.RequestMeta;
import org.apache.servicecomb.swagger.invocation.Response;
-import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
-import org.mockito.Mockito;
-import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.RequestEntity;
-import org.springframework.http.ResponseEntity;
import org.springframework.util.ReflectionUtils;
-import org.springframework.web.client.RestClientException;
-import org.springframework.web.client.RestTemplate;
-import io.swagger.models.Operation;
-import io.swagger.models.Swagger;
import mockit.Mock;
import mockit.MockUp;
public class MockUtil {
- MicroserviceMetaManager microserviceMetaManager = new MicroserviceMetaManager();
-
private static MockUtil instance = new MockUtil();
private MockUtil() {
@@ -69,121 +38,6 @@ public class MockUtil {
return instance;
}
- public void mockConsumerProviderManager() {
- ConsumerProviderManager consumerProviderManager = new MockUp<ConsumerProviderManager>() {
- @Mock
- public ReferenceConfig getReferenceConfig(String microserviceName) {
- return new ReferenceConfig(CseContext.getInstance().getConsumerSchemaFactory(), "test", "test",
- "test");
- }
- }.getMockInstance();
-
- CseContext.getInstance().setConsumerProviderManager(consumerProviderManager);
- }
-
- public void mockRegisterManager() throws InstantiationException, IllegalAccessException {
-
- MicroserviceMeta microserviceMeta = microserviceMetaManager.getOrCreateMicroserviceMeta("app:test");
- microserviceMeta.putExtData("RestServicePathManager", new ServicePathManager(microserviceMeta));
-
- ConsumerSchemaFactory consumerSchemaFactory = new MockUp<ConsumerSchemaFactory>() {
- @Mock
- public MicroserviceMeta getOrCreateConsumer(String microserviceName) {
- return microserviceMeta;
- }
- }.getMockInstance();
- CseContext.getInstance().setConsumerSchemaFactory(consumerSchemaFactory);
- }
-
- public void mockServicePathManager() {
-
- new MockUp<ServicePathManager>() {
- @Mock
- public OperationLocator locateOperation(String path, String httpMethod) {
- OperationLocator locator = new OperationLocator();
- return locator;
- }
- };
- }
-
- public void mockOperationLocator() {
-
- new MockUp<OperationLocator>() {
- @Mock
- public RestOperationMeta getOperation() {
- RestOperationMeta rom = new RestOperationMeta();
- rom.init(Mockito.mock(OperationMeta.class));
-
- return rom;
- }
- };
- }
-
- public void mockSchemaMeta() {
-
- new MockUp<SchemaMeta>() {
- @Mock
- private void initOperations() throws Exception {
- }
- };
- }
-
- public void mockBeanUtils() {
-
- new MockUp<BeanUtils>() {
- @Mock
- <T> T getBean(String name) {
- return null;
- }
- };
- }
-
- public void mockRequestMeta() {
-
- new MockUp<RequestMeta>() {
- @Mock
- public OperationMeta getOperationMeta() throws Exception {
- OperationMeta om = new OperationMeta();
- om.init(new SchemaMeta(null, new MicroserviceMeta("test"), null),
- this.getClass().getMethods()[0],
- "path",
- "get",
- null);
-
- return om;
- }
- };
- }
-
- public void mockSchemaUtils() {
-
- new MockUp<SchemaUtils>() {
- @Mock
- Class<?> getJavaInterface(String schemaId, Swagger swagger) {
- return null;
- }
- };
- }
-
- public void mockOperationMeta() {
-
- new MockUp<OperationMeta>() {
- @Mock
- private void initException(SchemaMeta schemaMeta, Operation swaggerOperation) {
- }
- };
- }
-
- public void mockInvokerUtils() {
-
- new MockUp<InvokerUtils>() {
- @Mock
- Object syncInvoke(Invocation invocation) throws InvocationException {
- return invocation;
- }
- };
- }
-
public void mockReflectionUtils() {
new MockUp<ReflectionUtils>() {
@@ -204,157 +58,4 @@ public class MockUtil {
}
};
}
-
- public void mockRestTemplate() {
- new MockUp<RestTemplate>() {
- @Mock
- public void put(String url, Object request, Object... urlVariables) throws RestClientException {
- }
-
- @Mock
- public void put(URI url, Object request) throws RestClientException {
-
- }
-
- @Mock
- public void delete(URI url) throws RestClientException {
-
- }
-
- @Mock
- public <T> T getForObject(String url, Class<T> responseType,
- Object... urlVariables) throws RestClientException {
- return null;
- }
-
- @Mock
- public <T> ResponseEntity<T> getForEntity(String url, Class<T> responseType,
- Object... urlVariables) throws RestClientException {
- return null;
- }
-
- @Mock
- public <T> T postForObject(String url, Object request, Class<T> responseType,
- Object... uriVariables) throws RestClientException {
- return null;
- }
-
- @Mock
- public <T> ResponseEntity<T> postForEntity(String url, Object request, Class<T> responseType,
- Object... uriVariables) throws RestClientException {
- return null;
- }
-
- @Mock
- public <T> ResponseEntity<T> exchange(String url, HttpMethod method,
- HttpEntity<?> requestEntity, Class<T> responseType,
- Object... uriVariables) throws RestClientException {
- return null;
- }
-
- @Mock
- public void delete(String url, Object... urlVariables) throws RestClientException {
-
- }
-
- @Mock
- public void delete(String url, Map<String, ?> urlVariables) throws RestClientException {
-
- }
-
- @Mock
- public <T> T getForObject(String url, Class<T> responseType,
- Map<String, ?> urlVariables) throws RestClientException {
- return null;
- }
-
- @Mock
- public <T> ResponseEntity<T> getForEntity(String url, Class<T> responseType,
- Map<String, ?> urlVariables) throws RestClientException {
- return null;
- }
-
- @Mock
- public <T> T getForObject(URI url, Class<T> responseType) throws RestClientException {
- return null;
- }
-
- @Mock
- public <T> ResponseEntity<T> getForEntity(URI url, Class<T> responseType) throws RestClientException {
- return null;
- }
-
- @Mock
- public <T> T postForObject(String url, Object request, Class<T> responseType,
- Map<String, ?> uriVariables) throws RestClientException {
- return null;
- }
-
- @Mock
- public <T> T postForObject(URI url, Object request, Class<T> responseType) throws RestClientException {
- return null;
- }
-
- @Mock
- public <T> ResponseEntity<T> postForEntity(String url, Object request, Class<T> responseType,
- Map<String, ?> uriVariables) throws RestClientException {
- return null;
- }
-
- @Mock
- public <T> ResponseEntity<T> postForEntity(URI url, Object request,
- Class<T> responseType) throws RestClientException {
- return null;
- }
-
- @Mock
- public void put(String url, Object request, Map<String, ?> urlVariables) throws RestClientException {
-
- }
-
- @Mock
- public <T> ResponseEntity<T> exchange(String url, HttpMethod method,
- HttpEntity<?> requestEntity, Class<T> responseType,
- Map<String, ?> uriVariables) throws RestClientException {
- return null;
- }
-
- @Mock
- public <T> ResponseEntity<T> exchange(String url, HttpMethod method, HttpEntity<?> requestEntity,
- ParameterizedTypeReference<T> responseType,
- Map<String, ?> uriVariables) throws RestClientException {
- return null;
- }
-
- @Mock
- public <T> ResponseEntity<T> exchange(String url, HttpMethod method, HttpEntity<?> requestEntity,
- ParameterizedTypeReference<T> responseType, Object... uriVariables) throws RestClientException {
- return null;
- }
-
- @Mock
- public <T> ResponseEntity<T> exchange(RequestEntity<?> requestEntity,
- Class<T> responseType) throws RestClientException {
- return null;
- }
-
- @Mock
- public <T> ResponseEntity<T> exchange(RequestEntity<?> requestEntity,
- ParameterizedTypeReference<T> responseType) throws RestClientException {
- return null;
- }
-
- @Mock
- public <T> ResponseEntity<T> exchange(URI url, HttpMethod method, HttpEntity<?> requestEntity,
- Class<T> responseType) throws RestClientException {
- return null;
- }
-
- @Mock
- public <T> ResponseEntity<T> exchange(URI url, HttpMethod method, HttpEntity<?> requestEntity,
- ParameterizedTypeReference<T> responseType) throws RestClientException {
- return null;
- }
- };
- }
}
diff --git a/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/common/MockUtil.java b/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/common/MockUtil.java
index 127f61f..785b2cb 100644
--- a/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/common/MockUtil.java
+++ b/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/common/MockUtil.java
@@ -18,9 +18,7 @@
package org.apache.servicecomb.transport.common;
import org.apache.servicecomb.codec.protobuf.definition.OperationProtobuf;
-import org.apache.servicecomb.codec.protobuf.definition.ProtobufManager;
import org.apache.servicecomb.core.Invocation;
-import org.apache.servicecomb.core.definition.OperationMeta;
import org.apache.servicecomb.transport.highway.HighwayCodec;
import org.apache.servicecomb.transport.highway.HighwayConfig;
import org.apache.servicecomb.transport.highway.message.RequestHeader;
@@ -76,14 +74,4 @@ public class MockUtil {
}
};
}
-
- public void mockProtobufManager() {
-
- new MockUp<ProtobufManager>() {
- @Mock
- public OperationProtobuf getOrCreateOperation(OperationMeta operationMeta) throws Exception {
- return Mockito.mock(OperationProtobuf.class);
- }
- };
- }
}
--
To stop receiving notification emails like this one, please contact
wujimin@apache.org.