Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Dubbo-3367], fail to parse config text with white space #3590

Merged
merged 2 commits into from
Mar 8, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public class ConfigurationUtils {
public static int getServerShutdownTimeout() {
int timeout = Constants.DEFAULT_SERVER_SHUTDOWN_TIMEOUT;
Configuration configuration = Environment.getInstance().getConfiguration();
String value = configuration.getString(Constants.SHUTDOWN_WAIT_KEY);
String value = StringUtils.trim(configuration.getString(Constants.SHUTDOWN_WAIT_KEY));
ralf0131 marked this conversation as resolved.
Show resolved Hide resolved

if (value != null && value.length() > 0) {
try {
Expand All @@ -47,7 +47,7 @@ public static int getServerShutdownTimeout() {
// ignore
}
} else {
value = configuration.getString(Constants.SHUTDOWN_WAIT_SECONDS_KEY);
value = StringUtils.trim(configuration.getString(Constants.SHUTDOWN_WAIT_SECONDS_KEY));
if (value != null && value.length() > 0) {
try {
timeout = Integer.parseInt(value) * 1000;
Expand All @@ -64,7 +64,7 @@ public static String getProperty(String property) {
}

public static String getProperty(String property, String defaultValue) {
return Environment.getInstance().getConfiguration().getString(property, defaultValue);
return StringUtils.trim(Environment.getInstance().getConfiguration().getString(property, defaultValue));
}

public static Map<String, String> parseProperties(String content) throws IOException {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -789,4 +789,8 @@ public static String toArgumentString(Object[] args) {
}
return buf.toString();
}

public static String trim(String str) {
return str == null ? null : str.trim();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
/*
* 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.common.config;

import org.apache.dubbo.common.Constants;

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

/**
*
*/
public class ConfigurationUtilsTest {

@Test
public void testGetServerShutdownTimeout () {
System.setProperty(Constants.SHUTDOWN_WAIT_KEY, " 10000");
Assertions.assertEquals(10000, ConfigurationUtils.getServerShutdownTimeout());
System.clearProperty(Constants.SHUTDOWN_WAIT_KEY);
}

@Test
public void testGetProperty () {
System.setProperty(Constants.SHUTDOWN_WAIT_KEY, " 10000");
Assertions.assertEquals("10000", ConfigurationUtils.getProperty(Constants.SHUTDOWN_WAIT_KEY));
System.clearProperty(Constants.SHUTDOWN_WAIT_KEY);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -287,4 +287,12 @@ public void testToArgumentString() throws Exception {
assertThat(s, containsString("0,"));
assertThat(s, containsString("{\"enabled\":true}"));
}

@Test
public void testTrim() {
assertEquals("left blank", StringUtils.trim(" left blank"));
assertEquals("right blank", StringUtils.trim("right blank "));
assertEquals("bi-side blank", StringUtils.trim(" bi-side blank "));

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ public void refresh() {
for (Method method : methods) {
if (ClassHelper.isSetter(method)) {
try {
String value = compositeConfiguration.getString(extractPropertyName(getClass(), method));
String value = StringUtils.trim(compositeConfiguration.getString(extractPropertyName(getClass(), method)));
// isTypeMatch() is called to avoid duplicate and incorrect update, for example, we have two 'setGeneric' methods in ReferenceConfig.
if (StringUtils.isNotEmpty(value) && ClassHelper.isTypeMatch(method.getParameterTypes()[0], value)) {
method.invoke(this, ClassHelper.convertPrimitive(method.getParameterTypes()[0], value));
Expand Down