Skip to content

Commit

Permalink
Fix merge conflict (#3148)
Browse files Browse the repository at this point in the history
  • Loading branch information
g-duval authored Nov 27, 2024
1 parent 982181e commit 4c6396e
Showing 1 changed file with 3 additions and 6 deletions.
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
package com.redhat.cloud.notifications.routers;

import com.redhat.cloud.notifications.models.CurrentStatus;
import com.redhat.cloud.notifications.models.Status;
import com.redhat.cloud.notifications.oapi.OApiFilter;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.Response;
import org.eclipse.microprofile.openapi.annotations.tags.Tag;

import static com.redhat.cloud.notifications.Constants.API_NOTIFICATIONS_V_1_0;
Expand All @@ -25,9 +24,7 @@ public static class V2 extends StatusResource {
@GET
@Produces(APPLICATION_JSON)
@Tag(name = OApiFilter.PRIVATE)
public CurrentStatus getCurrentStatus() {
CurrentStatus cs = new CurrentStatus();
cs.setStatus(Status.UP);
return cs;
public Response getCurrentStatus() {
return Response.ok().build();
}
}

0 comments on commit 4c6396e

Please sign in to comment.