From 8d7e483bbd2b29d6fb497ccddcd30df44bc99e57 Mon Sep 17 00:00:00 2001 From: "ken.lj" Date: Fri, 15 Nov 2019 13:22:35 +0800 Subject: [PATCH] Revert "mreged changes from metadata" This reverts commit 5f890391771d8b2b289296de5b19223a889f2774, reversing changes made to d4ba7f906a026cab3a671728b0504efb4c2d065d. --- .../CollectionTypeDefinitionBuilderTest.java | 10 +++++----- .../builder/MapTypeDefinitionBuilderTest.java | 10 +++++----- .../PrimitiveTypeDefinitionBuilderTest.java | 16 ++++++++-------- .../util/ServiceAnnotationUtilsTest.java | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dubbo-metadata/dubbo-metadata-processor/src/test/java/org/apache/dubbo/metadata/annotation/processing/builder/CollectionTypeDefinitionBuilderTest.java b/dubbo-metadata/dubbo-metadata-processor/src/test/java/org/apache/dubbo/metadata/annotation/processing/builder/CollectionTypeDefinitionBuilderTest.java index 7f1a2b2fcb..1bfb32e0d4 100644 --- a/dubbo-metadata/dubbo-metadata-processor/src/test/java/org/apache/dubbo/metadata/annotation/processing/builder/CollectionTypeDefinitionBuilderTest.java +++ b/dubbo-metadata/dubbo-metadata-processor/src/test/java/org/apache/dubbo/metadata/annotation/processing/builder/CollectionTypeDefinitionBuilderTest.java @@ -58,11 +58,11 @@ public class CollectionTypeDefinitionBuilderTest extends AbstractAnnotationProce protected void beforeEach() { builder = new CollectionTypeDefinitionBuilder(); TypeElement testType = getType(CollectionTypeModel.class); - stringsField = findField(testType, "strings"); - colorsField = findField(testType, "colors"); - primitiveTypeModelsField = findField(testType, "primitiveTypeModels"); - modelsField = findField(testType, "models"); - modelArraysField = findField(testType, "modelArrays"); + stringsField = findField( testType, "strings"); + colorsField = findField( testType, "colors"); + primitiveTypeModelsField = findField( testType, "primitiveTypeModels"); + modelsField = findField( testType, "models"); + modelArraysField = findField( testType, "modelArrays"); assertEquals("strings", stringsField.getSimpleName().toString()); assertEquals("colors", colorsField.getSimpleName().toString()); diff --git a/dubbo-metadata/dubbo-metadata-processor/src/test/java/org/apache/dubbo/metadata/annotation/processing/builder/MapTypeDefinitionBuilderTest.java b/dubbo-metadata/dubbo-metadata-processor/src/test/java/org/apache/dubbo/metadata/annotation/processing/builder/MapTypeDefinitionBuilderTest.java index cc75c9136c..3229c31b3d 100644 --- a/dubbo-metadata/dubbo-metadata-processor/src/test/java/org/apache/dubbo/metadata/annotation/processing/builder/MapTypeDefinitionBuilderTest.java +++ b/dubbo-metadata/dubbo-metadata-processor/src/test/java/org/apache/dubbo/metadata/annotation/processing/builder/MapTypeDefinitionBuilderTest.java @@ -61,11 +61,11 @@ public class MapTypeDefinitionBuilderTest extends AbstractAnnotationProcessingTe protected void beforeEach() { builder = new MapTypeDefinitionBuilder(); TypeElement testType = getType(MapTypeModel.class); - stringsField = findField(testType, "strings"); - colorsField = findField(testType, "colors"); - primitiveTypeModelsField = findField(testType, "primitiveTypeModels"); - modelsField = findField(testType, "models"); - modelArraysField = findField(testType, "modelArrays"); + stringsField = findField( testType, "strings"); + colorsField = findField( testType, "colors"); + primitiveTypeModelsField = findField( testType, "primitiveTypeModels"); + modelsField = findField( testType, "models"); + modelArraysField = findField( testType, "modelArrays"); assertEquals("strings", stringsField.getSimpleName().toString()); assertEquals("colors", colorsField.getSimpleName().toString()); diff --git a/dubbo-metadata/dubbo-metadata-processor/src/test/java/org/apache/dubbo/metadata/annotation/processing/builder/PrimitiveTypeDefinitionBuilderTest.java b/dubbo-metadata/dubbo-metadata-processor/src/test/java/org/apache/dubbo/metadata/annotation/processing/builder/PrimitiveTypeDefinitionBuilderTest.java index 3b32173482..0953885dbe 100644 --- a/dubbo-metadata/dubbo-metadata-processor/src/test/java/org/apache/dubbo/metadata/annotation/processing/builder/PrimitiveTypeDefinitionBuilderTest.java +++ b/dubbo-metadata/dubbo-metadata-processor/src/test/java/org/apache/dubbo/metadata/annotation/processing/builder/PrimitiveTypeDefinitionBuilderTest.java @@ -69,14 +69,14 @@ public class PrimitiveTypeDefinitionBuilderTest extends AbstractAnnotationProces TypeElement testType = getType(PrimitiveTypeModel.class); - zField = findField(testType, "z"); - bField = findField(testType, "b"); - cField = findField(testType, "c"); - sField = findField(testType, "s"); - iField = findField(testType, "i"); - lField = findField(testType, "l"); - fField = findField(testType, "f"); - dField = findField(testType, "d"); + zField = findField( testType, "z"); + bField = findField( testType, "b"); + cField = findField( testType, "c"); + sField = findField( testType, "s"); + iField = findField( testType, "i"); + lField = findField( testType, "l"); + fField = findField( testType, "f"); + dField = findField( testType, "d"); assertEquals("boolean", zField.asType().toString()); assertEquals("byte", bField.asType().toString()); diff --git a/dubbo-metadata/dubbo-metadata-processor/src/test/java/org/apache/dubbo/metadata/annotation/processing/util/ServiceAnnotationUtilsTest.java b/dubbo-metadata/dubbo-metadata-processor/src/test/java/org/apache/dubbo/metadata/annotation/processing/util/ServiceAnnotationUtilsTest.java index 4bc92d5870..a575d4ea3a 100644 --- a/dubbo-metadata/dubbo-metadata-processor/src/test/java/org/apache/dubbo/metadata/annotation/processing/util/ServiceAnnotationUtilsTest.java +++ b/dubbo-metadata/dubbo-metadata-processor/src/test/java/org/apache/dubbo/metadata/annotation/processing/util/ServiceAnnotationUtilsTest.java @@ -125,7 +125,7 @@ public class ServiceAnnotationUtilsTest extends AbstractAnnotationProcessingTest @Test public void testGetGroup() { TypeElement type = getType(TestServiceImpl.class); - assertEquals("test", getGroup(getAnnotation(type))); + assertEquals("test",getGroup(getAnnotation(type))); type = getType(GenericTestService.class); assertEquals("generic", getGroup(getAnnotation(type)));