Skip to content

Commit

Permalink
Remove Booleans use from XContent and ToXContent (#28768)
Browse files Browse the repository at this point in the history
* Remove Booleans use from XContent and ToXContent

This removes the use of the `common.Boolean` class from two of the XContent
classes, so they can be decoupled from the ES code as much as possible.

Related to #28754, #28504
  • Loading branch information
dakrone committed Mar 9, 2018
1 parent 01f6788 commit b081967
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 5 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright
* ownership. Elasticsearch 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.elasticsearch.common.xcontent;

/**
* Helpers for dealing with boolean values. Package-visible only so that only XContent classes use them.
*/
final class Booleans {
/**
* Parse {@code value} with values "true", "false", or null, returning the
* default value if null or the empty string is used. Any other input
* results in an {@link IllegalArgumentException} being thrown.
*/
static boolean parseBoolean(String value, Boolean defaultValue) {
if (value != null && value.length() > 0) {
switch (value) {
case "true":
return true;
case "false":
return false;
default:
throw new IllegalArgumentException("Failed to parse param [" + value + "] as only [true] or [false] are allowed.");
}
} else {
return defaultValue;
}
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@

package org.elasticsearch.common.xcontent;

import org.elasticsearch.common.Booleans;

import java.io.IOException;
import java.util.Map;

Expand Down Expand Up @@ -132,4 +130,5 @@ public Boolean paramAsBoolean(String key, Boolean defaultValue) {
default boolean isFragment() {
return true;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@

package org.elasticsearch.common.xcontent;

import org.elasticsearch.common.Booleans;

import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
Expand Down Expand Up @@ -51,7 +49,7 @@ public interface XContent {
*/
static boolean isStrictDuplicateDetectionEnabled() {
// Don't allow duplicate keys in JSON content by default but let the user opt out
return Booleans.parseBoolean(System.getProperty("es.xcontent.strict_duplicate_detection", "true"));
return Booleans.parseBoolean(System.getProperty("es.xcontent.strict_duplicate_detection", "true"), true);
}

/**
Expand Down

0 comments on commit b081967

Please sign in to comment.