Skip to content

Commit

Permalink
fix #6306. support TypeBuilder sort (#6365)
Browse files Browse the repository at this point in the history
* fix #6306. support TypeBuilder sort

* fix #6306. support TypeBuilder sort

* fix #6306. support TypeBuilder sort

* remove unused import

* add license for test file
  • Loading branch information
cvictory authored Jun 29, 2020
1 parent 7447f33 commit 80acc24
Show file tree
Hide file tree
Showing 6 changed files with 128 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;

import static org.apache.dubbo.common.utils.ClassUtils.isSimpleType;

Expand All @@ -36,15 +37,12 @@
*/
public class TypeDefinitionBuilder {
private static final Logger logger = LoggerFactory.getLogger(TypeDefinitionBuilder.class);
private static final List<TypeBuilder> BUILDERS;
static final List<TypeBuilder> BUILDERS;

static {
List<TypeBuilder> builders = new ArrayList<>();
ExtensionLoader<TypeBuilder> extensionLoader = ExtensionLoader.getExtensionLoader(TypeBuilder.class);
for (String extensionName : extensionLoader.getSupportedExtensions()) {
builders.add(extensionLoader.getExtension(extensionName));
}
BUILDERS = builders;
Set<TypeBuilder> tbs = extensionLoader.getSupportedExtensionInstances();
BUILDERS = new ArrayList<>(tbs);
}

public static TypeDefinition build(Type type, Class<?> clazz, Map<Class<?>, TypeDefinition> typeCache) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package org.apache.dubbo.metadata.definition.builder;

import org.apache.dubbo.common.extension.SPI;
import org.apache.dubbo.common.lang.Prioritized;
import org.apache.dubbo.metadata.definition.model.TypeDefinition;

import java.lang.reflect.Type;
Expand All @@ -26,7 +27,7 @@
* 2015/1/27.
*/
@SPI
public interface TypeBuilder {
public interface TypeBuilder extends Prioritized {

/**
* Whether the build accept the type or class passed in.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/*
* 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.metadata.definition;

import org.apache.dubbo.metadata.definition.builder.TypeBuilder;
import org.apache.dubbo.metadata.definition.model.TypeDefinition;

import java.lang.reflect.Type;
import java.util.Map;

/**
* test for sort
*/
public class Test3TypeBuilder implements TypeBuilder {
// it is smaller than the implements of TypeBuilder
public int getPriority(){
return 10;
}

@Override
public boolean accept(Type type, Class<?> clazz) {
return false;
}

@Override
public TypeDefinition build(Type type, Class<?> clazz, Map<Class<?>, TypeDefinition> typeCache) {
return null;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/*
* 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.metadata.definition;

import org.apache.dubbo.metadata.definition.builder.TypeBuilder;
import org.apache.dubbo.metadata.definition.model.TypeDefinition;

import java.lang.reflect.Type;
import java.util.Map;

/**
* test for sort
*/
public class TestTypeBuilder implements TypeBuilder {
// it is smaller than the implements of TypeBuilder
public int getPriority(){
return -3;
}

@Override
public boolean accept(Type type, Class<?> clazz) {
return false;
}

@Override
public TypeDefinition build(Type type, Class<?> clazz, Map<Class<?>, TypeDefinition> typeCache) {
return null;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/*
* 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.metadata.definition;

import org.apache.dubbo.metadata.definition.builder.TypeBuilder;

import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

public class TypeDefinitionBuilderTest {

@Test
public void testSortTypeBuilder(){
TypeBuilder tb = TypeDefinitionBuilder.BUILDERS.get(0);
Assertions.assertTrue(tb instanceof TestTypeBuilder);

tb = TypeDefinitionBuilder.BUILDERS.get(TypeDefinitionBuilder.BUILDERS.size()-1);
Assertions.assertTrue(tb instanceof Test3TypeBuilder);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
test=org.apache.dubbo.metadata.definition.TestTypeBuilder
test3=org.apache.dubbo.metadata.definition.Test3TypeBuilder

0 comments on commit 80acc24

Please sign in to comment.