Skip to content
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

Jump to bottom

[rest] Allow skipping ignored things in inbox #4108

Merged
merged 4 commits into from
Mar 15, 2024
Merged

[rest] Allow skipping ignored things in inbox #4108

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fadb55e
Do not return ignored inbox items by default
seime Feb 23, 2024
5a05833
Do not return ignored inbox items by default
seime Feb 23, 2024
180e4a3
Default to true to maintain backwards compat
seime Mar 10, 2024
b7f57cc
Spotless
seime Mar 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 10 additions & 3 deletions ...st.core/src/main/java/org/openhab/core/io/rest/core/internal/discovery/InboxResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import javax.annotation.security.RolesAllowed;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
import javax.ws.rs.DefaultValue;
import javax.ws.rs.GET;
import javax.ws.rs.HeaderParam;
import javax.ws.rs.POST;
Expand All @@ -32,6 +33,7 @@
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.openhab.core.auth.Role;
import org.openhab.core.config.discovery.DiscoveryResult;
import org.openhab.core.config.discovery.DiscoveryResultFlag;
import org.openhab.core.config.discovery.dto.DiscoveryResultDTO;
import org.openhab.core.config.discovery.dto.DiscoveryResultDTOMapper;
Expand Down Expand Up @@ -153,9 +155,14 @@ public Response delete(@PathParam("thingUID") @Parameter(description = "thingUID
@Produces({ MediaType.APPLICATION_JSON })
@Operation(operationId = "getDiscoveredInboxItems", summary = "Get all discovered things.", responses = {
@ApiResponse(responseCode = "200", description = "OK", content = @Content(array = @ArraySchema(schema = @Schema(implementation = DiscoveryResultDTO.class)))) })
public Response getAll() {
Stream<DiscoveryResultDTO> discoveryStream = inbox.getAll().stream().map(DiscoveryResultDTOMapper::map);
return Response.ok(new Stream2JSONInputStream(discoveryStream)).build();
public Response getAll(
@QueryParam("includeIgnored") @DefaultValue("true") @Parameter(description = "If true, include ignored inbox entries. Defaults to true") boolean includeIgnored) {
Stream<DiscoveryResult> discoveryStream = inbox.getAll().stream();
if (!includeIgnored) {
discoveryStream = discoveryStream
.filter(discoveryResult -> discoveryResult.getFlag() != DiscoveryResultFlag.IGNORED);
}
return Response.ok(new Stream2JSONInputStream(discoveryStream.map(DiscoveryResultDTOMapper::map))).build();
}

@POST
Expand Down