This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 505ffd5 remove useless files
505ffd5 is described below
commit 505ffd5a5dd66e1ea7f383734ab5a5fb5b4e8867
Author: ken.lj <[email protected]>
AuthorDate: Tue Oct 29 17:21:20 2019 +0800
remove useless files
---
.../annotation/DubboConfigAliasPostProcessor.java | 74 ----------------------
.../src/test/resources/protobuf/GooglePB.proto | 53 ----------------
2 files changed, 127 deletions(-)
diff --git
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/DubboConfigAliasPostProcessor.java
b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/DubboConfigAliasPostProcessor.java
deleted file mode 100644
index ddbcbf0..0000000
---
a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/DubboConfigAliasPostProcessor.java
+++ /dev/null
@@ -1,74 +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.dubbo.config.spring.beans.factory.annotation;
-
-import org.apache.dubbo.config.AbstractConfig;
-import
org.apache.dubbo.config.spring.context.annotation.DubboConfigConfigurationRegistrar;
-
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.config.BeanPostProcessor;
-import
org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import
org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor;
-
-import static org.apache.dubbo.config.spring.util.BeanRegistrar.hasAlias;
-import static org.springframework.util.ObjectUtils.nullSafeEquals;
-import static org.springframework.util.StringUtils.hasText;
-
-/**
- * A Post-Processor class to set the alias of Dubbo Config bean using its
{@link AbstractConfig#getId()}
- *
- * @since 2.7.4
- */
-public class DubboConfigAliasPostProcessor implements
BeanDefinitionRegistryPostProcessor, BeanPostProcessor {
-
- /**
- * The bean name of {@link DubboConfigConfigurationRegistrar}
- */
- public final static String BEAN_NAME = "dubboConfigAliasPostProcessor";
-
- private BeanDefinitionRegistry registry;
-
- @Override
- public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry
registry) throws BeansException {
- this.registry = registry;
- }
-
- @Override
- public void postProcessBeanFactory(ConfigurableListableBeanFactory
beanFactory) throws BeansException {
- // DO NOTHING
- }
-
- @Override
- public Object postProcessBeforeInitialization(Object bean, String
beanName) throws BeansException {
- // DO NOTHING
- return bean;
- }
-
- @Override
- public Object postProcessAfterInitialization(Object bean, String beanName)
throws BeansException {
- if (bean instanceof AbstractConfig) {
- String id = ((AbstractConfig) bean).getId();
- if (hasText(id) // id MUST be
present in AbstractConfig
- && !nullSafeEquals(id, beanName) // id MUST NOT
be equal to bean name
- && !hasAlias(registry, beanName, id)) { // id MUST NOT
be present in AliasRegistry
- registry.registerAlias(beanName, id);
- }
- }
- return bean;
- }
-}
diff --git
a/dubbo-metadata-report/dubbo-metadata-definition-protobuf/src/test/resources/protobuf/GooglePB.proto
b/dubbo-metadata-report/dubbo-metadata-definition-protobuf/src/test/resources/protobuf/GooglePB.proto
deleted file mode 100644
index 6f4fe2b..0000000
---
a/dubbo-metadata-report/dubbo-metadata-definition-protobuf/src/test/resources/protobuf/GooglePB.proto
+++ /dev/null
@@ -1,53 +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.
- */
-syntax = "proto2";
-
-package org.apache.dubbo.common.serialize.protobuf.model;
-
-message PBRequestType {
- optional double money = 1;
- optional float cash = 2;
- optional int32 age = 3;
- optional int64 num = 4;
- optional bool sex = 5;
- optional string name = 6;
- optional bytes msg = 7;
- repeated org.apache.dubbo.common.serialize.protobuf.model.PhoneNumber
phone = 8;
- map<string, PhoneNumber> doubleMap = 9;
- repeated bytes bytesList = 10;
- map<string, bytes> bytesMap = 11;
-}
-
-message PBResponseType {
- optional string msg = 1;
- optional org.apache.dubbo.common.serialize.protobuf.model.PBRequestType
CDubboPBRequestType = 3;
-}
-
-message PhoneNumber {
- required string number = 1;
- optional org.apache.dubbo.common.serialize.protobuf.model.PhoneType type =
2 [default = HOME];
-}
-
-enum PhoneType {
- MOBILE = 0;
- HOME = 1;
- WORK = 2;
-}
-
-service CDubboPBService {
- rpc sayHello
(org.apache.dubbo.common.serialize.protobuf.model.PBRequestType) returns
(org.apache.dubbo.common.serialize.protobuf.model.PBResponseType);
-}
\ No newline at end of file
