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

Bug fix from 3.6.4 missing in 3.7 #84

Open
wants to merge 2 commits into
base: 3.7
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,12 @@ public JsonObject readAsJson(JsonObject configuration, InputStream byteStream) t

private JsonObject toJson(Stream<String> stream) {
return stream
.filter( line -> {
line.trim();
return !line.isEmpty()
&& !line.startsWith("#")
&& !line.startsWith("!");
})
.map(line -> line.split("="))
.map(raw -> {
String property = raw[0].trim();
Expand Down
24 changes: 24 additions & 0 deletions vertx-config/src/test/resources/file/hierarchical.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,29 @@
#
# Copyright (c) 2014 Red Hat, Inc. and others
#
# Red Hat 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.
#
#

# some properties
server.port=8080
!# server.port=8081
#! server.port=8081
server.host=http://localhost
some.double.value=1.0

some.integer.values=1,2,3
! Some comments
single=0