-
Notifications
You must be signed in to change notification settings - Fork 3.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Reimplement LogStash::Numeric setting in Java (#17127)
Reimplements `LogStash::Setting::Numeric` Ruby setting class into the `org.logstash.settings.NumericSetting` and exposes it through `java_import` as `LogStash::Setting::NumericSetting`. Updates the rspec tests: - verifies `java.lang.IllegalArgumentException` instead of `ArgumentError` is thrown because the kind of exception thrown by Java code, during verification.
- Loading branch information
Showing
6 changed files
with
136 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
58 changes: 58 additions & 0 deletions
58
logstash-core/src/main/java/org/logstash/settings/SettingNumeric.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| /* | ||
| * Licensed to Elasticsearch B.V. under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch B.V. 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.logstash.settings; | ||
|
|
||
| public class SettingNumeric extends Coercible<Number> { | ||
|
|
||
| public SettingNumeric(String name, Number defaultValue) { | ||
| super(name, defaultValue, true, noValidator()); | ||
| } | ||
|
|
||
| // constructor used only in tests, but needs to be public to be used in Ruby spec | ||
| public SettingNumeric(String name, Number defaultValue, boolean strict) { | ||
| super(name, defaultValue, strict, noValidator()); | ||
| } | ||
|
|
||
| @Override | ||
| public Number coerce(Object obj) { | ||
| if (obj == null) { | ||
| throw new IllegalArgumentException("Failed to coerce value to SettingNumeric. Received null"); | ||
| } | ||
| if (obj instanceof Number) { | ||
| return (Number) obj; | ||
| } | ||
| try { | ||
| return Integer.parseInt(obj.toString()); | ||
| } catch (NumberFormatException e) { | ||
| // ugly flow control | ||
| } | ||
| try { | ||
| return Float.parseFloat(obj.toString()); | ||
| } catch (NumberFormatException e) { | ||
| // ugly flow control | ||
| } | ||
|
|
||
| // no integer neither float parsing succeed, invalid coercion | ||
| throw new IllegalArgumentException(coercionFailureMessage(obj)); | ||
| } | ||
|
|
||
| private String coercionFailureMessage(Object obj) { | ||
| return String.format("Failed to coerce value to SettingNumeric. Received %s (%s)", obj, obj.getClass()); | ||
| } | ||
| } |
62 changes: 62 additions & 0 deletions
62
logstash-core/src/test/java/org/logstash/settings/SettingNumericTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| /* | ||
| * Licensed to Elasticsearch B.V. under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch B.V. 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.logstash.settings; | ||
|
|
||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
|
|
||
| import static org.junit.Assert.*; | ||
|
|
||
| // Mirrored from spec/logstash/settings/numeric_spec.rb | ||
| public class SettingNumericTest { | ||
|
|
||
| private SettingNumeric sut; | ||
|
|
||
| @Before | ||
| public void setUp() { | ||
| sut = new SettingNumeric("a number", null, false); | ||
| } | ||
|
|
||
| @Test(expected = IllegalArgumentException.class) | ||
| public void givenValueThatIsNotStringWhenSetIsInvokedThrowsException() { | ||
| sut.set("not-a-number"); | ||
| } | ||
|
|
||
| @Test | ||
| public void givenValueStringThatRepresentFloatWhenSetIsInvokedShouldCoerceThatStringToTheNumber() { | ||
| sut.set("1.1"); | ||
|
|
||
| float value = (Float) sut.value(); | ||
| assertEquals(1.1f, value, 0.001); | ||
| } | ||
|
|
||
| @Test | ||
| public void givenValueStringThatRepresentIntegerWhenSetIsInvokedShouldCoerceThatStringToTheNumber() { | ||
| sut.set("1"); | ||
|
|
||
| int value = (Integer) sut.value(); | ||
| assertEquals(1, value); | ||
| } | ||
|
|
||
| @Test(expected = IllegalArgumentException.class) | ||
| public void givenNullValueThenCoerceThrowSpecificError() { | ||
| sut.set(null); | ||
| } | ||
|
|
||
| } |