Assertions refactoring #1580
There are no files selected for viewing
This file contains hidden or 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,68 @@ | ||
| /* | ||
| * Copyright The OpenTelemetry Authors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package io.opentelemetry.contrib.jmxscraper.assertions; | ||
|
|
||
| import static io.opentelemetry.contrib.jmxscraper.assertions.AttributeValueMatcher.ANY_VALUE_MATCHER; | ||
|
|
||
| import java.util.Objects; | ||
|
|
||
| /** Implements functionality of matching data point attributes. */ | ||
| public class AttributeMatcher { | ||
| private final String name; | ||
| private final AttributeValueMatcher attributeValueMatcher; | ||
|
|
||
| /** | ||
| * Create instance used to match data point attribute with te same name and with any value. | ||
| * | ||
| * @param name attribute name | ||
| */ | ||
| AttributeMatcher(String name) { | ||
| this.name = name; | ||
| this.attributeValueMatcher = ANY_VALUE_MATCHER; | ||
| } | ||
|
|
||
| /** | ||
| * Create instance used to match data point attribute with te same name and with the same value. | ||
| * | ||
| * @param name attribute name | ||
| * @param value attribute value | ||
| */ | ||
| AttributeMatcher(String name, String value) { | ||
| this.name = name; | ||
| this.attributeValueMatcher = new AttributeValueMatcher(value); | ||
| } | ||
|
|
||
| public String getName() { | ||
| return name; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { | ||
| if (this == o) { | ||
| return true; | ||
| } | ||
| if (!(o instanceof AttributeMatcher)) { | ||
| return false; | ||
| } | ||
| AttributeMatcher other = (AttributeMatcher) o; | ||
| return Objects.equals(name, other.name) | ||
| && attributeValueMatcher.matchValue(other.attributeValueMatcher); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| // Do not use value matcher here to support value wildcards | ||
| return Objects.hash(name); | ||
| } | ||
|
||
|
|
||
| @Override | ||
| public String toString() { | ||
| return attributeValueMatcher.getValue() == null | ||
| ? '{' + name + '}' | ||
| : '{' + name + '=' + attributeValueMatcher.getValue() + '}'; | ||
| } | ||
| ; | ||
| } | ||
This file contains hidden or 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,41 @@ | ||
| /* | ||
| * Copyright The OpenTelemetry Authors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package io.opentelemetry.contrib.jmxscraper.assertions; | ||
|
|
||
| import java.util.Objects; | ||
|
|
||
| class AttributeValueMatcher { | ||
| static final AttributeValueMatcher ANY_VALUE_MATCHER = new AttributeValueMatcher(); | ||
|
|
||
| private final String value; | ||
|
|
||
| AttributeValueMatcher() { | ||
| this(null); | ||
| } | ||
|
|
||
| AttributeValueMatcher(String value) { | ||
| this.value = value; | ||
| } | ||
|
|
||
| String getValue() { | ||
| return value; | ||
| } | ||
|
|
||
| /** | ||
| * Match the value held by this and the other AttributeValueMatcher instances. Null value means | ||
| * "any value", that's why if any of the values is null they are considered as matching. If both | ||
| * values are not null then they must be equal. | ||
| * | ||
| * @param other the other matcher to compare value with | ||
| * @return true if values held by both matchers are matching, false otherwise. | ||
| */ | ||
| boolean matchValue(AttributeValueMatcher other) { | ||
| if ((value == null) || (other.value == null)) { | ||
| return true; | ||
| } | ||
| return Objects.equals(value, other.value); | ||
| } | ||
| } |
This file contains hidden or 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,30 @@ | ||
| /* | ||
| * Copyright The OpenTelemetry Authors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package io.opentelemetry.contrib.jmxscraper.assertions; | ||
|
|
||
| import java.util.Arrays; | ||
| import java.util.Set; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| /** | ||
| * Utility class implementing convenience static methods to construct data point attribute matchers | ||
| * and sets of matchers. | ||
| */ | ||
| public class DataPointAttributes { | ||
| private DataPointAttributes() {} | ||
|
|
||
| public static AttributeMatcher attribute(String name, String value) { | ||
|
Contributor
There was a problem hiding this comment. [minor] add javadoc to explain the differences between all those methods: exact match, match with any value (even if the method name is quite clear on the latter, but not on the first on the exact match here). |
||
| return new AttributeMatcher(name, value); | ||
| } | ||
|
|
||
| public static AttributeMatcher attributeWithAnyValue(String name) { | ||
| return new AttributeMatcher(name); | ||
| } | ||
|
|
||
| public static Set<AttributeMatcher> attributeSet(AttributeMatcher... attributes) { | ||
| return Arrays.stream(attributes).collect(Collectors.toSet()); | ||
| } | ||
| } | ||
This file contains hidden or 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
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[minor] add javadoc that it returns the name of the attribute