You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2020/02/07 12:12:50 UTC
[servicecomb-java-chassis] branch master updated: [SCB-1749] fix
OperationConfig setter problem
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new 12f3384 [SCB-1749] fix OperationConfig setter problem
12f3384 is described below
commit 12f338481f869a10a67b4fc069837e401ab2fd96
Author: liubao <bi...@qq.com>
AuthorDate: Fri Feb 7 16:04:33 2020 +0800
[SCB-1749] fix OperationConfig setter problem
---
.../common/utils/LambdaMetafactoryUtils.java | 2 +-
.../common/utils/bean/SetterWrapper.java | 50 ++++++++++++++++++++++
.../config/inject/ConfigObjectFactory.java | 7 +--
.../protobuf/internal/bean/BeanDescriptor.java | 2 +-
4 files changed, 56 insertions(+), 5 deletions(-)
diff --git a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/LambdaMetafactoryUtils.java b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/LambdaMetafactoryUtils.java
index d88cbdc..fffdf49 100644
--- a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/LambdaMetafactoryUtils.java
+++ b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/LambdaMetafactoryUtils.java
@@ -169,7 +169,7 @@ public final class LambdaMetafactoryUtils {
}
}
- public static <T> T createSetter(Method setMethod) throws Throwable {
+ public static <T> T createSetter(Method setMethod) {
Class<?> setterCls = SETTER_MAP.getOrDefault(setMethod.getParameterTypes()[0], Setter.class);
return createLambda(setMethod, setterCls);
}
diff --git a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/bean/SetterWrapper.java b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/bean/SetterWrapper.java
new file mode 100644
index 0000000..aa73d69
--- /dev/null
+++ b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/bean/SetterWrapper.java
@@ -0,0 +1,50 @@
+/*
+ * 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.foundation.common.utils.bean;
+
+@SuppressWarnings({"rawtypes", "unchecked"})
+public class SetterWrapper {
+ private Object setter;
+
+ public SetterWrapper(Object setter) {
+ this.setter = setter;
+ }
+
+ public void set(Object instance, Object value) {
+ if (setter instanceof Setter) {
+ ((Setter) setter).set(instance, value);
+ } else if (setter instanceof BoolSetter) {
+ ((BoolSetter) setter).set(instance, (boolean) value);
+ } else if (setter instanceof ByteSetter) {
+ ((ByteSetter) setter).set(instance, (byte) value);
+ } else if (setter instanceof CharSetter) {
+ ((CharSetter) setter).set(instance, (char) value);
+ } else if (setter instanceof ShortSetter) {
+ ((ShortSetter) setter).set(instance, (short) value);
+ } else if (setter instanceof IntSetter) {
+ ((IntSetter) setter).set(instance, (int) value);
+ } else if (setter instanceof LongSetter) {
+ ((LongSetter) setter).set(instance, (long) value);
+ } else if (setter instanceof FloatSetter) {
+ ((FloatSetter) setter).set(instance, (float) value);
+ } else if (setter instanceof DoubleSetter) {
+ ((DoubleSetter) setter).set(instance, (double) value);
+ } else {
+ throw new IllegalStateException("unexpected setter " + setter.getClass().getName());
+ }
+ }
+}
diff --git a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/inject/ConfigObjectFactory.java b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/inject/ConfigObjectFactory.java
index 400e08a..8dee778 100644
--- a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/inject/ConfigObjectFactory.java
+++ b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/inject/ConfigObjectFactory.java
@@ -26,6 +26,7 @@ import org.apache.servicecomb.config.priority.PriorityPropertyManager;
import org.apache.servicecomb.foundation.common.utils.JsonUtils;
import org.apache.servicecomb.foundation.common.utils.LambdaMetafactoryUtils;
import org.apache.servicecomb.foundation.common.utils.bean.Setter;
+import org.apache.servicecomb.foundation.common.utils.bean.SetterWrapper;
import com.fasterxml.jackson.databind.BeanDescription;
import com.fasterxml.jackson.databind.JavaType;
@@ -98,9 +99,9 @@ public class ConfigObjectFactory {
continue;
}
- Setter<Object, Object> setter = propertyDefinition.getSetter() == null ?
- LambdaMetafactoryUtils.createSetter(propertyDefinition.getField().getAnnotated()) :
- LambdaMetafactoryUtils.createLambda(propertyDefinition.getSetter().getAnnotated(), Setter.class);
+ SetterWrapper setter = propertyDefinition.getSetter() == null ?
+ new SetterWrapper(LambdaMetafactoryUtils.createSetter(propertyDefinition.getField().getAnnotated())) :
+ new SetterWrapper(LambdaMetafactoryUtils.createSetter(propertyDefinition.getSetter().getAnnotated()));
PriorityProperty<?> priorityProperty = createPriorityProperty(propertyDefinition.getField().getAnnotated());
priorityProperty.setCallback(value -> setter.set(instance, value));
diff --git a/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/internal/bean/BeanDescriptor.java b/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/internal/bean/BeanDescriptor.java
index fa8ceaa..752d9c1 100644
--- a/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/internal/bean/BeanDescriptor.java
+++ b/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/internal/bean/BeanDescriptor.java
@@ -83,7 +83,7 @@ public class BeanDescriptor {
return null;
}
- protected Object initSetter(BeanPropertyDefinition propertyDefinition) throws Throwable {
+ protected Object initSetter(BeanPropertyDefinition propertyDefinition) {
if (propertyDefinition.hasSetter()) {
return LambdaMetafactoryUtils.createSetter(propertyDefinition.getSetter().getAnnotated());
}