Skip to content

Apply sonar improvements. #161

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
mfl28 merged 1 commit into from
Mar 15, 2025
Merged

Apply sonar improvements. #161

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
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM eclipse-temurin:17-jdk AS builder-base
FROM eclipse-temurin:21-jdk AS builder-base
RUN apt-get update && \
apt-get install -y --no-install-recommends \
dos2unix \
binutils \
dos2unix \
fakeroot \
rpm && \
rm -rf /var/lib/apt/lists/*
Expand Down
10 changes: 5 additions & 5 deletions src/test/java/com/github/mfl28/boundingboxeditor/BoundingBoxEditorTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ protected static Stage getTopModalStage(FxRobot robot, String title) {
// It is needed to get the first found modal window.
return robot.listWindows()
.stream()
.filter(window -> window instanceof Stage)
.map(window -> (Stage) window)
.filter(Stage.class::isInstance)
.map(Stage.class::cast)
.filter(stage -> stage.getModality() == Modality.APPLICATION_MODAL)
.filter(stage -> stage.getTitle().equals(title))
.findFirst()
Expand Down Expand Up @@ -247,7 +247,7 @@ protected void onStart(Stage stage) {
}

@AfterEach
protected void tearDown() throws TimeoutException {
void tearDown() throws TimeoutException {
FxToolkit.cleanupStages();
FxToolkit.hideStage();
// Make sure FileChangeWatcher is interrupted.
Expand Down Expand Up @@ -554,8 +554,8 @@ private <T extends Node> boolean nodePresentAndVisibleAs(FxRobot robot, String i
private boolean isTopModalStagePresent(FxRobot robot) {
return robot.listWindows()
.stream()
.filter(window -> window instanceof Stage)
.map(window -> (Stage) window)
.filter(Stage.class::isInstance)
.map(Stage.class::cast)
.anyMatch(stage -> stage.getModality() == Modality.APPLICATION_MODAL);
}

Expand Down
16 changes: 8 additions & 8 deletions src/test/java/com/github/mfl28/boundingboxeditor/controller/ControllerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,11 @@ void onExportAnnotation_PVOC_WhenPreviouslyImportedAnnotation_ShouldProduceEquiv
.isHasAssignedBoundingShapes()
&& mainView.getCurrentBoundingShapes()
.stream()
.filter(viewable -> viewable instanceof BoundingBoxView)
.filter(BoundingBoxView.class::isInstance)
.count() == 8
&& mainView.getCurrentBoundingShapes()
.stream()
.filter(viewable -> viewable instanceof BoundingPolygonView)
.filter(BoundingPolygonView.class::isInstance)
.count() == 1),
() -> saveScreenshotAndReturnMessage(testinfo,
"Bounding shape counts did not match " +
Expand Down Expand Up @@ -273,11 +273,11 @@ void onExportAnnotation_YOLO_WhenPreviouslyImportedAnnotation_ShouldProduceEquiv
.isHasAssignedBoundingShapes()
&& mainView.getCurrentBoundingShapes()
.stream()
.filter(viewable -> viewable instanceof BoundingBoxView)
.filter(BoundingBoxView.class::isInstance)
.count() == 9
&& mainView.getCurrentBoundingShapes()
.stream()
.filter(viewable -> viewable instanceof BoundingPolygonView)
.filter(BoundingPolygonView.class::isInstance)
.count() == 1),
() -> saveScreenshotAndReturnMessage(testinfo,
"Bounding shape counts did not match " +
Expand Down Expand Up @@ -407,11 +407,11 @@ void onExportAnnotation_JSON_WhenPreviouslyImportedAnnotation_ShouldProduceEquiv
.isHasAssignedBoundingShapes()
&& mainView.getCurrentBoundingShapes()
.stream()
.filter(viewable -> viewable instanceof BoundingBoxView)
.filter(BoundingBoxView.class::isInstance)
.count() == 8
&& mainView.getCurrentBoundingShapes()
.stream()
.filter(viewable -> viewable instanceof BoundingPolygonView)
.filter(BoundingPolygonView.class::isInstance)
.count() == 1),
() -> saveScreenshotAndReturnMessage(testinfo,
"Bounding shape counts did not match " +
Expand Down Expand Up @@ -1227,10 +1227,10 @@ void onExportAnnotation_CSV_WhenPreviouslyImportedAnnotation_ShouldProduceEquiva
.isHasAssignedBoundingShapes()
&& mainView.getCurrentBoundingShapes()
.stream()
.filter(viewable -> viewable instanceof BoundingBoxView)
.filter(BoundingBoxView.class::isInstance)
.count() == 3
&& mainView.getCurrentBoundingShapes()
.stream().noneMatch(viewable -> viewable instanceof BoundingPolygonView)),
.stream().noneMatch(BoundingPolygonView.class::isInstance)),
() -> saveScreenshotAndReturnMessage(testinfo,
"Bounding shape counts did not match " +
"within " + TIMEOUT_DURATION_IN_SEC +
Expand Down