Skip to content

feat(notification): delete deprecated Notification#severity() #1651

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
May 26, 2025
Merged

feat(notification): delete deprecated Notification#severity() #1651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions driver/clirr-ignored-differences.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -806,4 +806,10 @@
<method>java.io.File certFile()</method>
</difference>

<difference>
<className>org/neo4j/driver/summary/Notification</className>
<differenceType>7002</differenceType>
<method>java.lang.String severity()</method>
</difference>

</differences>
11 changes: 0 additions & 11 deletions driver/src/main/java/org/neo4j/driver/summary/Notification.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,17 +72,6 @@ default Optional<InputPosition> inputPosition() {
return Optional.ofNullable(position());
}

/**
* The severity level of the notification.
*
* @deprecated superseded by {@link #severityLevel()} and {@link #rawSeverityLevel()}
* @return the severity level of the notification
*/
@Deprecated
default String severity() {
return rawSeverityLevel().orElse("N/A");
}

/**
* Returns the severity level of the notification derived from the diagnostic record.
*
Expand Down
2 changes: 0 additions & 2 deletions driver/src/test/java/org/neo4j/driver/integration/SummaryIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,6 @@ void shouldContainProfile() {
}

@Test
@SuppressWarnings("deprecation")
void shouldContainNotifications() {
// When
var summary =
Expand All @@ -243,7 +242,6 @@ void shouldContainNotifications() {
assertThat(notification.code(), notNullValue());
assertThat(notification.title(), notNullValue());
assertThat(notification.description(), notNullValue());
assertThat(notification.severity(), notNullValue());
assertThat(notification.severityLevel(), notNullValue());
assertThat(notification.rawSeverityLevel(), notNullValue());
assertThat(notification.position(), notNullValue());
Expand Down
5 changes: 2 additions & 3 deletions driver/src/test/java/org/neo4j/driver/internal/util/MetadataExtractorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,6 @@ void shouldBuildResultSummaryWithNotifications() {
assertEquals("Almost bad thing", firstNotification.description());
assertEquals("Neo.DummyNotification", firstNotification.code());
assertEquals("A title", firstNotification.title());
assertEquals("WARNING", firstNotification.severity());
assertEquals(
NotificationSeverity.WARNING, firstNotification.severityLevel().get());
assertEquals("WARNING", firstNotification.rawSeverityLevel().get());
Expand Down Expand Up @@ -280,7 +279,8 @@ void shouldBuildResultSummaryWithNotifications() {
assertEquals("Almost good thing", secondNotification.description());
assertEquals("Neo.GoodNotification", secondNotification.code());
assertEquals("Good", secondNotification.title());
assertEquals("INFO", secondNotification.severity());
assertFalse(secondNotification.severityLevel().isPresent());
assertEquals("INFO", secondNotification.rawSeverityLevel().get());
assertTrue(secondNotification.inputPosition().isEmpty());
assertNull(secondNotification.position());
assertEquals(
Expand Down Expand Up @@ -348,7 +348,6 @@ void shouldBuildResultSummaryWithGqlStatusObjects() {
assertEquals("notification_description", firstGqlStatusObject.description());
assertEquals("neo4j_code", firstGqlStatusObject.code());
assertEquals("title", firstGqlStatusObject.title());
assertEquals("WARNING", firstGqlStatusObject.severity());
assertEquals(
NotificationSeverity.WARNING,
firstGqlStatusObject.severityLevel().get());
Expand Down
1 change: 0 additions & 1 deletion testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SummaryUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ public static Summary.SummaryBody toSummaryBody(org.neo4j.driver.summary.ResultS
.title(s.title())
.description(s.description())
.position(toInputPosition(s.position()))
.severity(s.severity())
.severityLevel(s.severityLevel()
.map(InternalNotificationSeverity.class::cast)
.map(InternalNotificationSeverity::type)
Expand Down
2 changes: 0 additions & 2 deletions testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/Summary.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,6 @@ public static class Notification {

private InputPosition position;

private String severity;

private String severityLevel;

private String rawSeverityLevel;
Expand Down