Fix consumer startup failure (#12204)
* fix #12099 * fix #12099 * add UT * fix #12099
This commit is contained in:
KamTo Hung
GitHub
parent
25a08a2b40
commit
a59a378de5
|
|
@ -688,7 +688,7 @@ public abstract class AbstractInterfaceConfig extends AbstractMethodConfig {
|
|||
}
|
||||
|
||||
public void setRegistry(RegistryConfig registry) {
|
||||
List<RegistryConfig> registries = new ArrayList<RegistryConfig>(1);
|
||||
List<RegistryConfig> registries = new ArrayList<>(1);
|
||||
registries.add(registry);
|
||||
setRegistries(registries);
|
||||
}
|
||||
|
|
@ -716,7 +716,6 @@ public abstract class AbstractInterfaceConfig extends AbstractMethodConfig {
|
|||
return methods;
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
public void setMethods(List<? extends MethodConfig> methods) {
|
||||
this.methods = (methods != null) ? new ArrayList<>(methods) : null;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ import static org.apache.dubbo.common.utils.StringUtils.join;
|
|||
|
||||
public class ReferenceBeanSupport {
|
||||
|
||||
private static List<String> IGNORED_ATTRS = Arrays.asList(ReferenceAttributes.ID, ReferenceAttributes.GROUP,
|
||||
private static final List<String> IGNORED_ATTRS = Arrays.asList(ReferenceAttributes.ID, ReferenceAttributes.GROUP,
|
||||
ReferenceAttributes.VERSION, ReferenceAttributes.INTERFACE, ReferenceAttributes.INTERFACE_NAME,
|
||||
ReferenceAttributes.INTERFACE_CLASS);
|
||||
|
||||
|
|
@ -65,7 +65,7 @@ public class ReferenceBeanSupport {
|
|||
if (interfaceName == null) {
|
||||
Object interfaceClassValue = attributes.get(ReferenceAttributes.INTERFACE_CLASS);
|
||||
if (interfaceClassValue instanceof Class) {
|
||||
interfaceName = ((Class) interfaceClassValue).getName();
|
||||
interfaceName = ((Class<?>) interfaceClassValue).getName();
|
||||
} else if (interfaceClassValue instanceof String) {
|
||||
if (interfaceClassValue.equals("void")) {
|
||||
attributes.remove(ReferenceAttributes.INTERFACE_CLASS);
|
||||
|
|
|
|||
|
|
@ -175,7 +175,10 @@ public class DubboBeanDefinitionParser implements BeanDefinitionParser {
|
|||
if ("registry".equals(property) && RegistryConfig.NO_AVAILABLE.equalsIgnoreCase(value)) {
|
||||
RegistryConfig registryConfig = new RegistryConfig();
|
||||
registryConfig.setAddress(RegistryConfig.NO_AVAILABLE);
|
||||
beanDefinition.getPropertyValues().addPropertyValue(beanProperty, registryConfig);
|
||||
// see AbstractInterfaceConfig#registries, It will be invoker setRegistries method when BeanDefinition is registered,
|
||||
beanDefinition.getPropertyValues().addPropertyValue("registries", registryConfig);
|
||||
// If registry is N/A, don't init it until the reference is invoked
|
||||
beanDefinition.setLazyInit(true);
|
||||
} else if ("provider".equals(property) || "registry".equals(property) || ("protocol".equals(property) && AbstractServiceConfig.class.isAssignableFrom(beanClass))) {
|
||||
/**
|
||||
* For 'provider' 'protocol' 'registry', keep literal value (should be id/name) and set the value to 'registryIds' 'providerIds' protocolIds'
|
||||
|
|
|
|||
|
|
@ -0,0 +1,36 @@
|
|||
/*
|
||||
* 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.dubbo.config.spring.reference.registryNA.consumer;
|
||||
|
||||
import org.apache.dubbo.config.spring.api.HelloService;
|
||||
import org.junit.jupiter.api.Assertions;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.context.support.ClassPathXmlApplicationContext;
|
||||
|
||||
class DubboXmlConsumerTest {
|
||||
|
||||
|
||||
@Test
|
||||
void testConsumer() {
|
||||
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("classpath:/org/apache/dubbo/config/spring/reference/registryNA/consumer/dubbo-registryNA-consumer.xml");
|
||||
context.start();
|
||||
HelloService helloService = context.getBean("helloService", HelloService.class);
|
||||
IllegalStateException exception = Assertions.assertThrows(IllegalStateException.class, () -> helloService.sayHello("dubbo"));
|
||||
Assertions.assertTrue(exception.getMessage().contains("No such any registry to reference org.apache.dubbo.config.spring.api.HelloService"));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,33 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!--
|
||||
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.
|
||||
-->
|
||||
<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"
|
||||
xmlns="http://www.springframework.org/schema/beans"
|
||||
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
|
||||
http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd">
|
||||
|
||||
<dubbo:application name="demo-consumer">
|
||||
</dubbo:application>
|
||||
|
||||
<dubbo:metadata-report address="zookeeper://127.0.0.1:2181"/>
|
||||
|
||||
<dubbo:registry id="demo1" address="zookeeper://127.0.0.1:2181?registry-type=service"/>
|
||||
|
||||
<dubbo:reference id="helloService" check="false" interface="org.apache.dubbo.config.spring.api.HelloService" />
|
||||
|
||||
</beans>
|
||||
|
|
@ -0,0 +1,33 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!--
|
||||
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.
|
||||
-->
|
||||
<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"
|
||||
xmlns="http://www.springframework.org/schema/beans"
|
||||
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
|
||||
http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd">
|
||||
|
||||
<dubbo:application name="demo-consumer">
|
||||
</dubbo:application>
|
||||
|
||||
<dubbo:metadata-report address="zookeeper://127.0.0.1:2181"/>
|
||||
|
||||
<dubbo:registry id="demo1" address="zookeeper://127.0.0.1:2181?registry-type=service"/>
|
||||
|
||||
<dubbo:reference id="helloService" check="false" interface="org.apache.dubbo.config.spring.api.HelloService" registry="N/A" />
|
||||
|
||||
</beans>
|
||||
|
|
@ -0,0 +1,51 @@
|
|||
/*
|
||||
* 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.dubbo.config.spring.reference.registryNA.provider;
|
||||
|
||||
import org.apache.dubbo.config.spring.api.HelloService;
|
||||
import org.apache.dubbo.rpc.RpcException;
|
||||
import org.junit.jupiter.api.Assertions;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.context.support.ClassPathXmlApplicationContext;
|
||||
|
||||
/**
|
||||
* @author <a href = "mailto:kamtohung@gmail.com">KamTo Hung</a>
|
||||
*/
|
||||
public class DubboXmlProviderTest {
|
||||
|
||||
@Test
|
||||
void testProvider() {
|
||||
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("classpath:/org/apache/dubbo/config/spring/reference/registryNA/provider/dubbo-provider.xml");
|
||||
context.start();
|
||||
Object bean = context.getBean("helloService");
|
||||
Assertions.assertNotNull(bean);
|
||||
}
|
||||
|
||||
@Test
|
||||
void testProvider2() {
|
||||
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("classpath:/org/apache/dubbo/config/spring/reference/registryNA/provider/dubbo-provider.xml");
|
||||
context.start();
|
||||
Assertions.assertNotNull(context.getBean("helloService"));
|
||||
ClassPathXmlApplicationContext context2 = new ClassPathXmlApplicationContext("classpath:/org/apache/dubbo/config/spring/reference/registryNA/consumer/dubbo-consumer.xml");
|
||||
context2.start();
|
||||
HelloService helloService = context2.getBean("helloService", HelloService.class);
|
||||
Assertions.assertNotNull(helloService);
|
||||
RpcException exception = Assertions.assertThrows(RpcException.class, () -> helloService.sayHello("dubbo"));
|
||||
Assertions.assertTrue(exception.getMessage().contains("Failed to invoke the method sayHello in the service org.apache.dubbo.config.spring.api.HelloService. No provider available for the service org.apache.dubbo.config.spring.api.HelloService"));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!--
|
||||
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.
|
||||
-->
|
||||
<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"
|
||||
xmlns="http://www.springframework.org/schema/beans"
|
||||
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
|
||||
http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd">
|
||||
|
||||
<dubbo:application name="demo-provider" >
|
||||
</dubbo:application>
|
||||
|
||||
<dubbo:config-center address="zookeeper://127.0.0.1:2181"/>
|
||||
<dubbo:metadata-report address="zookeeper://127.0.0.1:2181"/>
|
||||
<dubbo:registry id="registry1" address="zookeeper://127.0.0.1:2181?registry-type=service"/>
|
||||
|
||||
<dubbo:protocol name="dubbo" port="-1"/>
|
||||
<dubbo:protocol name="rest" port="-1"/>
|
||||
<dubbo:protocol name="tri" port="-1"/>
|
||||
|
||||
<bean id="helloService" class="org.apache.dubbo.config.spring.impl.HelloServiceImpl"/>
|
||||
|
||||
<dubbo:service delay="5000" interface="org.apache.dubbo.config.spring.api.HelloService" timeout="3000" ref="helloService" registry="N/A" protocol="dubbo"/>
|
||||
|
||||
</beans>
|
||||
Loading…
Reference in New Issue