Skip to content

Commit 5f49902

Browse files
izeyeizeye
authored
Polish gh-5370 (#5598)
1 parent 3c252c2 commit 5f49902

File tree

2 files changed

+11
-14
lines changed

2 files changed

+11
-14
lines changed

Diff for: ‎micrometer-observation-test/src/main/java/io/micrometer/observation/tck/ObservationValidator.java

+2-5
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,7 @@ public boolean supportsContext(Context context) {
117117
}
118118

119119
private void addHistoryElement(Context context, EventName eventName) {
120-
if (!context.containsKey(History.class)) {
121-
context.put(History.class, new History());
122-
}
123-
History history = context.get(History.class);
120+
History history = context.computeIfAbsent(History.class, clazz -> new History());
124121
history.addHistoryElement(eventName);
125122
}
126123

@@ -147,7 +144,7 @@ private Status checkIfObservationWasStartedButNotStopped(String prefix, Context
147144
}
148145

149146
private static void throwInvalidObservationException(ValidationResult validationResult) {
150-
History history = validationResult.getContext().getOrDefault(History.class, new History());
147+
History history = validationResult.getContext().getOrDefault(History.class, () -> new History());
151148
throw new InvalidObservationException(validationResult.getMessage(), validationResult.getContext(),
152149
history.getHistoryElements());
153150
}

Diff for: ‎micrometer-observation-test/src/test/java/io/micrometer/observation/tck/ObservationValidatorTests.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ void doubleStartShouldBeInvalid() {
4343
.satisfies(exception -> assertThat(exception.toString()).matches(
4444
"(?s)^io\\.micrometer\\.observation\\.tck\\.InvalidObservationException: Invalid start: Observation 'test' has already been started\n"
4545
+ "START: app//io\\.micrometer\\.observation\\.tck\\.ObservationValidatorTests\\.lambda\\$doubleStartShouldBeInvalid\\$\\d+\\(ObservationValidatorTests\\.java:\\d+\\)\n"
46-
+ "START: app//io\\.micrometer\\.observation\\.tck\\.ObservationValidatorTests\\.lambda\\$doubleStartShouldBeInvalid\\$\\d+\\(ObservationValidatorTests.java:\\d+\\)$"));
46+
+ "START: app//io\\.micrometer\\.observation\\.tck\\.ObservationValidatorTests\\.lambda\\$doubleStartShouldBeInvalid\\$\\d+\\(ObservationValidatorTests\\.java:\\d+\\)$"));
4747
}
4848

4949
@Test
@@ -54,7 +54,7 @@ void stopBeforeStartShouldBeInvalid() {
5454
.hasMessage("Invalid stop: Observation 'test' has not been started yet")
5555
.satisfies(exception -> assertThat(exception.toString()).matches(
5656
"(?s)^io\\.micrometer\\.observation\\.tck\\.InvalidObservationException: Invalid stop: Observation 'test' has not been started yet\n"
57-
+ "STOP: app//io\\.micrometer\\.observation\\.tck\\.ObservationValidatorTests\\.lambda\\$stopBeforeStartShouldBeInvalid\\$\\d+\\(ObservationValidatorTests.java:\\d+\\)$"));
57+
+ "STOP: app//io\\.micrometer\\.observation\\.tck\\.ObservationValidatorTests\\.lambda\\$stopBeforeStartShouldBeInvalid\\$\\d+\\(ObservationValidatorTests\\.java:\\d+\\)$"));
5858
}
5959

6060
@Test
@@ -65,7 +65,7 @@ void errorBeforeStartShouldBeInvalid() {
6565
.hasMessage("Invalid error signal: Observation 'test' has not been started yet")
6666
.satisfies(exception -> assertThat(exception.toString()).matches(
6767
"(?s)^io\\.micrometer\\.observation\\.tck\\.InvalidObservationException: Invalid error signal: Observation 'test' has not been started yet\n"
68-
+ "ERROR: app//io\\.micrometer\\.observation\\.tck\\.ObservationValidatorTests\\.lambda\\$errorBeforeStartShouldBeInvalid\\$\\d+\\(ObservationValidatorTests.java:\\d+\\)$"));
68+
+ "ERROR: app//io\\.micrometer\\.observation\\.tck\\.ObservationValidatorTests\\.lambda\\$errorBeforeStartShouldBeInvalid\\$\\d+\\(ObservationValidatorTests\\.java:\\d+\\)$"));
6969
}
7070

7171
@Test
@@ -76,7 +76,7 @@ void eventBeforeStartShouldBeInvalid() {
7676
.hasMessage("Invalid event signal: Observation 'test' has not been started yet")
7777
.satisfies(exception -> assertThat(exception.toString()).matches(
7878
"(?s)^io\\.micrometer\\.observation\\.tck\\.InvalidObservationException: Invalid event signal: Observation 'test' has not been started yet\n"
79-
+ "EVENT: app//io\\.micrometer\\.observation\\.tck\\.ObservationValidatorTests\\.lambda\\$eventBeforeStartShouldBeInvalid\\$\\d+\\(ObservationValidatorTests.java:\\d+\\)$"));
79+
+ "EVENT: app//io\\.micrometer\\.observation\\.tck\\.ObservationValidatorTests\\.lambda\\$eventBeforeStartShouldBeInvalid\\$\\d+\\(ObservationValidatorTests\\.java:\\d+\\)$"));
8080
}
8181

8282
@Test
@@ -89,7 +89,7 @@ void scopeBeforeStartShouldBeInvalid() {
8989
.hasMessage("Invalid scope opening: Observation 'test' has not been started yet")
9090
.satisfies(exception -> assertThat(exception.toString()).matches(
9191
"(?s)^io\\.micrometer\\.observation\\.tck\\.InvalidObservationException: Invalid scope opening: Observation 'test' has not been started yet\n"
92-
+ "SCOPE_OPEN: app//io\\.micrometer\\.observation\\.tck\\.ObservationValidatorTests\\.lambda\\$scopeBeforeStartShouldBeInvalid\\$\\d+\\(ObservationValidatorTests.java:\\d+\\)$"));
92+
+ "SCOPE_OPEN: app//io\\.micrometer\\.observation\\.tck\\.ObservationValidatorTests\\.lambda\\$scopeBeforeStartShouldBeInvalid\\$\\d+\\(ObservationValidatorTests\\.java:\\d+\\)$"));
9393
}
9494

9595
@Test
@@ -101,7 +101,7 @@ void observeAfterStartShouldBeInvalid() {
101101
.satisfies(exception -> assertThat(exception.toString()).matches(
102102
"(?s)^io\\.micrometer\\.observation\\.tck\\.InvalidObservationException: Invalid start: Observation 'test' has already been started\n"
103103
+ "START: app//io\\.micrometer\\.observation\\.tck\\.ObservationValidatorTests\\.lambda\\$observeAfterStartShouldBeInvalid\\$\\d+\\(ObservationValidatorTests\\.java:\\d+\\)\n"
104-
+ "START: app//io\\.micrometer\\.observation\\.tck\\.ObservationValidatorTests\\.lambda\\$observeAfterStartShouldBeInvalid\\$\\d+\\(ObservationValidatorTests.java:\\d+\\)$"));
104+
+ "START: app//io\\.micrometer\\.observation\\.tck\\.ObservationValidatorTests\\.lambda\\$observeAfterStartShouldBeInvalid\\$\\d+\\(ObservationValidatorTests\\.java:\\d+\\)$"));
105105
}
106106

107107
@Test
@@ -117,7 +117,7 @@ void doubleStopShouldBeInvalid() {
117117
"(?s)^io\\.micrometer\\.observation\\.tck\\.InvalidObservationException: Invalid stop: Observation 'test' has already been stopped\n"
118118
+ "START: app//io\\.micrometer\\.observation\\.tck\\.ObservationValidatorTests\\.lambda\\$doubleStopShouldBeInvalid\\$\\d+\\(ObservationValidatorTests\\.java:\\d+\\)\n"
119119
+ "STOP: app//io\\.micrometer\\.observation\\.tck\\.ObservationValidatorTests\\.lambda\\$doubleStopShouldBeInvalid\\$\\d+\\(ObservationValidatorTests\\.java:\\d+\\)\n"
120-
+ "STOP: app//io\\.micrometer\\.observation\\.tck\\.ObservationValidatorTests\\.lambda\\$doubleStopShouldBeInvalid\\$\\d+\\(ObservationValidatorTests.java:\\d+\\)$"));
120+
+ "STOP: app//io\\.micrometer\\.observation\\.tck\\.ObservationValidatorTests\\.lambda\\$doubleStopShouldBeInvalid\\$\\d+\\(ObservationValidatorTests\\.java:\\d+\\)$"));
121121
}
122122

123123
@Test
@@ -133,7 +133,7 @@ void errorAfterStopShouldBeInvalid() {
133133
"(?s)^io\\.micrometer\\.observation\\.tck\\.InvalidObservationException: Invalid error signal: Observation 'test' has already been stopped\n"
134134
+ "START: app//io\\.micrometer\\.observation\\.tck\\.ObservationValidatorTests\\.lambda\\$errorAfterStopShouldBeInvalid\\$\\d+\\(ObservationValidatorTests\\.java:\\d+\\)\n"
135135
+ "STOP: app//io\\.micrometer\\.observation\\.tck\\.ObservationValidatorTests\\.lambda\\$errorAfterStopShouldBeInvalid\\$\\d+\\(ObservationValidatorTests\\.java:\\d+\\)\n"
136-
+ "ERROR: app//io\\.micrometer\\.observation\\.tck\\.ObservationValidatorTests\\.lambda\\$errorAfterStopShouldBeInvalid\\$\\d+\\(ObservationValidatorTests.java:\\d+\\)$"));
136+
+ "ERROR: app//io\\.micrometer\\.observation\\.tck\\.ObservationValidatorTests\\.lambda\\$errorAfterStopShouldBeInvalid\\$\\d+\\(ObservationValidatorTests\\.java:\\d+\\)$"));
137137
}
138138

139139
@Test
@@ -149,7 +149,7 @@ void eventAfterStopShouldBeInvalid() {
149149
"(?s)^io\\.micrometer\\.observation\\.tck\\.InvalidObservationException: Invalid event signal: Observation 'test' has already been stopped\n"
150150
+ "START: app//io\\.micrometer\\.observation\\.tck\\.ObservationValidatorTests\\.lambda\\$eventAfterStopShouldBeInvalid\\$\\d+\\(ObservationValidatorTests\\.java:\\d+\\)\n"
151151
+ "STOP: app//io\\.micrometer\\.observation\\.tck\\.ObservationValidatorTests\\.lambda\\$eventAfterStopShouldBeInvalid\\$\\d+\\(ObservationValidatorTests\\.java:\\d+\\)\n"
152-
+ "EVENT: app//io\\.micrometer\\.observation\\.tck\\.ObservationValidatorTests\\.lambda\\$eventAfterStopShouldBeInvalid\\$\\d+\\(ObservationValidatorTests.java:\\d+\\)$"));
152+
+ "EVENT: app//io\\.micrometer\\.observation\\.tck\\.ObservationValidatorTests\\.lambda\\$eventAfterStopShouldBeInvalid\\$\\d+\\(ObservationValidatorTests\\.java:\\d+\\)$"));
153153
}
154154

155155
@Test

0 commit comments

Comments
 (0)