From 129a47d868256176904c62090601cb295351a0cc Mon Sep 17 00:00:00 2001 From: wusheng Date: Sat, 7 Nov 2015 12:14:08 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=88=87=E6=8D=A2=E4=BA=86=E6=96=B0=E7=9A=84?= =?UTF-8?q?conf=E5=8A=A0=E8=BD=BD=E7=AE=97=E6=B3=95=E3=80=82=202.=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=BA=86conf=E5=8A=A0=E8=BD=BD=E7=AE=97=E6=B3=95?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=B1=BB=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reciever/conf/ConfigInitializer.java | 21 ------------------ .../conf/ConfigInitailizerTest.java | 22 +++++++++++++++++++ 2 files changed, 22 insertions(+), 21 deletions(-) create mode 100644 skywalking-server/src/test/java/com/ai/cloud/skywalking/conf/ConfigInitailizerTest.java diff --git a/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/conf/ConfigInitializer.java b/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/conf/ConfigInitializer.java index a729b5ce4..40bfc0e70 100644 --- a/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/conf/ConfigInitializer.java +++ b/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/conf/ConfigInitializer.java @@ -13,27 +13,6 @@ public class ConfigInitializer { public static Logger logger = LogManager.getLogger(ConfigInitializer.class); public static void initialize(Properties properties, Class rootConfigType) throws IllegalAccessException { - for (Class innerConfiguration : rootConfigType.getClasses()) { - for (Field field : innerConfiguration.getFields()) { - if (9 != field.getModifiers()) - continue; - String configKey = (innerConfiguration.getSimpleName() + "." + - field.getName()).toLowerCase(); - String value = properties.getProperty(configKey); - if (value != null) { - if (field.getType().equals(int.class)) - field.set(null, Integer.valueOf(value)); - if (field.getType().equals(String.class)) - field.set(null, value); - if (field.getType().equals(long.class)) - field.set(null, Long.valueOf(value)); - } - logger.debug("{}={}", configKey, value); - } - } - } - - public static void initialize2(Properties properties, Class rootConfigType) throws IllegalAccessException { initNextLevel(properties, rootConfigType, new ConfigDesc()); } diff --git a/skywalking-server/src/test/java/com/ai/cloud/skywalking/conf/ConfigInitailizerTest.java b/skywalking-server/src/test/java/com/ai/cloud/skywalking/conf/ConfigInitailizerTest.java new file mode 100644 index 000000000..31f3cbff5 --- /dev/null +++ b/skywalking-server/src/test/java/com/ai/cloud/skywalking/conf/ConfigInitailizerTest.java @@ -0,0 +1,22 @@ +package com.ai.cloud.skywalking.conf; + +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; + +import org.junit.Test; + +import com.ai.cloud.skywalking.reciever.conf.Config; +import com.ai.cloud.skywalking.reciever.conf.ConfigInitializer; + +public class ConfigInitailizerTest { + @Test + public void testInitialize2() throws IOException, IllegalAccessException{ + Properties p = new Properties(); + InputStream in = ConfigInitializer.class.getResourceAsStream("/config.properties"); + p.load(in); + in.close(); + + ConfigInitializer.initialize(p, Config.class); + } +}