clean(perception): Improve generics usage in perception module #416

schwepmo · 2024-09-24T14:33:40Z

Description

This PR implements a more coherent way to use generics when handling different SpatialObjects
Additionally some cleanup was done
This should be merged after build: migrate to Java 17 #410

Issue(s) related to this PR

not related to an issue

Affected parts of the online documentation

Changes in the documentation required?

Definition of Done

Prerequisites

You have read CONTRIBUTING.md carefully.
You have signed the Contributor License Agreement.
Your GitHub user id is linked with your Eclipse Account.

Required

The title of this merge request follows the scheme type(scope): description (in the style of Conventional Commits)
You have assigned a suitable label to this pull request (e.g., enhancement, or bugfix)
origin/main has been merged into your Fork.
Coding guidelines have been followed (see CONTRIBUTING.md).
All checks on GitHub pass.
All tests on Jenkins pass.

Requested (can be enforced by maintainers)

New functionality is covered by unit tests or integration tests. Code coverage must not decrease.
If a bug has been fixed, a new unit test has been written (beforehand) to prove misbehavior
There are no new SpotBugs warnings.

Special notes to reviewer

* furthermore some minor adjustments were made * code analysis warnings should also be improved Signed-off-by: Moritz Schweppenhäuser <[email protected]>

Signed-off-by: Moritz Schweppenhäuser <[email protected]>

* add gitignore * run `npm install` > new lockfile version * run `npx browserslist@latest --update-db` * run `npm audit fix` * run `npm audit fix --force` * fix: exclude the node_modules folder from build

…419) * chore: `npm run-script debug` output is now spanning multiple lines * fix: remove double bookkeeping (equippedVehicles) and directly add vehicles to the map, although there's no position yet * fix: take into account the vehicleClass, show 'unknown' if not a car * swap icons * feat: add bicycle and bus icons * refactor: remove line that has no effect * refactor: change tab size from 2 to 4 * fix: only display equipped traffic lights * fix: replace non-existing link

) * fix: disallow servers to read environmental data * fix: adapt ReleaseBarnimIT tests * fix: enable assert in ReleaseBarnimLibsumoIT

* fix: Use own position when logging at which point the route was changed * fix: separate event-tx and message-rx functionality * fix: rather print connections than nodes because that's the more critical information * fix: remove redundant information * refactor: use precise wording, as the route switch may still fail

* feat: fail hard when running ns3 on windows * fix: do not download if the file already exists * fix: remove assumption that glob resolves to only one file * fix: rewrite so that protobuf genereration can be skipped * fix: require protobuf-compiler * fix: improve error message

* build: store etc-files in mosaic-starter and copy them to bundle and integration tests * clean: remove unnecessary properties from copy-resources definition

* ci: use SUMO 1.21.0 for testing * feat(sumo): support SUMO 1.21.0 Added hint, that SUMO_HOME/bin must be present in the PATH variable. Pre-loading some libraries is not required anymore then.

* refactor: don't use this whenever possible

… routing (#428) * feat(sns): cleanup, minor performance improvement for flooding (early exit if flooding could not be progressed)

…nts (#420) * feat: introducing SensorModule to provide access to environmental events * feat(application): allow registration of callback for lidar sensor module * feat(application): re-use Perceptive interface for accessing new sensor modules

* feat: support win:mosaic-git together with wsl:omnet * fix: correctly log inside ObjectInstantiation * feat: throw error if omnetpp.ini file is missing * feat: throw error if ns3_federate_config.xml file is missing

* fix(workshop): Enabled color changing of externally added vehicles in SUMO * feat: Refactored AdHoc message routing * feat: Added hops argument for builder

* refactor: tabs to spaces * feat: provide dev mode where src files are not deleted * feat: make available over CL args

* fix: Added comments for CellMessageRoutingBuilder and fixed AdHocMessageRoutingBuilder

#432)

--------- Co-authored-by: Felix Hilgerdenaar <[email protected]>

…dded (#439) Co-authored-by: Felix Hilgerdenaar <[email protected]>

…ion-generics

schwepmo · 2024-12-02T16:19:26Z

@kschrab the commit history is somewhat destroyed, but the branch should be ready for review again.

kschrab · 2024-12-05T17:05:36Z

@schwepmo can you briefly elaborate what the main motivation/reason was for this PR? I see the changes, and they make sense, I just don't exactly found the starting point from where you improved the use of generics/wildcards here.

Signed-off-by: Moritz Schweppenhäuser <[email protected]>

schwepmo · 2024-12-06T09:12:15Z

@schwepmo can you briefly elaborate what the main motivation/reason was for this PR? I see the changes, and they make sense, I just don't exactly found the starting point from where you improved the use of generics/wildcards here.

@kschrab
I think I started from <T extends SpatialObject<T>> List<SpatialObject<T>> getPerceivedObjects(); in the PerceptionModule, as well as the apply-method in the PerceptionModifier class.
The AbstractPerceptionModule the overrides the return type of getPerceivedObjects with a raw version of SpatialObject. Now with the introduction of the upper-bounded wildcards a) the signature of getPerceivedObjects() is somewhat cleaner and b) we get rid of some IDE warnings.

Functionally these changes do nothing. Though in the MR of the extended part there is some cleanup of applications

kschrab and others added 19 commits September 9, 2024 18:21

feat: set Java 17 as source/target language level

c34b17c

refactor: use pattern matching for instanceof #java17

5cb1036

ci: upgrade spotbugs-maven-plugin, don't execute analysis in parallel

ce7d228

ci: upgrade spotbugs-maven-plugin

02038c4

refactor: use Stream.toList() #java17

0230f87

refactor: use switch expressions #java17

225299f

refactor: use record for some inner classes #java17

b8e7feb

fix: fix broken test

97381ce

refactor: use text blocks #java17

f1be237

ci: go back to spotbugs 4.2.3

4dc28b3

ci: update docker image for builds on eclipse CI

636a1d5

ci: go back to spotbugs 4.2.2

05d39ce

ci: use spotbugs 4.2.3

7c524f2

refactor: use pattern matching for instanceof and Stream.toList #java17

4878d86

build: use JDK 17 in github action

398c759

Merge remote-tracking branch 'origin/891-java-17' into 891-java-17

7b9c8ba

clean(sns): remove unnecessary default case

c5f6aa7

improvement(perception): improved generics handling in perception module

9b2559b

* furthermore some minor adjustments were made * code analysis warnings should also be improved Signed-off-by: Moritz Schweppenhäuser <[email protected]>

improvement(perception): adjusted some comments

41b2105

Signed-off-by: Moritz Schweppenhäuser <[email protected]>

schwepmo added the clean-up Aesthetically improving code label Sep 24, 2024

schwepmo changed the title ~~improvement(perception): Improve generics usag in perception module~~ improvement(perception): Improve generics usage in perception module Dec 2, 2024

hoelger and others added 9 commits December 2, 2024 17:14

chore: update webvisualizer tooling (#415)

acb0ffe

* add gitignore * run `npm install` > new lockfile version * run `npx browserslist@latest --update-db` * run `npm audit fix` * run `npm audit fix --force` * fix: exclude the node_modules folder from build

build: copy web-visualizer files to work with starter (#414)

3bb15fd

ci: use jdk17 container for deploy

c85d6dd

ci: use custom codeql action for jdk17

08c9736

docs: add JDK17 alert to README.md

8f853d0

feat(tutorial): WeatherServerApp now relays the last received DENM (#408

d515343

) * fix: disallow servers to read environmental data * fix: adapt ReleaseBarnimIT tests * fix: enable assert in ReleaseBarnimLibsumoIT

hoelger and others added 18 commits December 2, 2024 17:14

fix: show correct icons in barnim scenario (#422)

81f2abb

docs: link the new documentation page in the README (#421)

3bed192

build: store etc-files in mosaic-starter and copy them to bundle (#423)

407170b

* build: store etc-files in mosaic-starter and copy them to bundle and integration tests * clean: remove unnecessary properties from copy-resources definition

feat(sumo): support sumo 1.21.0 (#424)

6e19fc6

* ci: use SUMO 1.21.0 for testing * feat(sumo): support SUMO 1.21.0 Added hint, that SUMO_HOME/bin must be present in the PATH variable. Pre-loading some libraries is not required anymore then.

fix: remove VSimRTI from WebVisualizer (#426)

f35449f

feat: run windows-mosaic with wsl-ns3 (#425)

21670f6

* refactor: don't use this whenever possible

feat(sns): support multi-hop unicast for topological and geographical…

1af68db

… routing (#428) * feat(sns): cleanup, minor performance improvement for flooding (early exit if flooding could not be progressed)

feat: use WSL in Windows for execution of OMNeT++ federate (#431)

909ccfe

* feat: support win:mosaic-git together with wsl:omnet * fix: correctly log inside ObjectInstantiation * feat: throw error if omnetpp.ini file is missing * feat: throw error if ns3_federate_config.xml file is missing

feat: refactor AdHocMessageRoutingBuilder (#433)

ae41bdb

* fix(workshop): Enabled color changing of externally added vehicles in SUMO * feat: Refactored AdHoc message routing * feat: Added hops argument for builder

feat: add dev-option to ns3 installation script (#435)

53f118b

* refactor: tabs to spaces * feat: provide dev mode where src files are not deleted * feat: make available over CL args

feat: refactored CellMessageRoutingBuilder (#437)

21aefb5

* fix: Added comments for CellMessageRoutingBuilder and fixed AdHocMessageRoutingBuilder

refactor(application): move navigation module interface to api package (

d9b7a83

#432)

docs: fixed Jenkins badge

64da606

feat(bundle): build path to java binary with JAVA_HOME if set (#438)

a835f98

--------- Co-authored-by: Felix Hilgerdenaar <[email protected]>

fix(.gitignore): exception for "bundle/src/assembly/resources/bin/" a…

5fd5fb0

…dded (#439) Co-authored-by: Felix Hilgerdenaar <[email protected]>

feat: set Java 17 as source/target language level

3a3bcb5

Merge branch 'main' of github.com:eclipse/mosaic into improve-percept…

ed3050c

…ion-generics

schwepmo self-assigned this Dec 6, 2024

schwepmo requested a review from kschrab December 6, 2024 08:40

schwepmo added 2 commits December 6, 2024 10:08

cleanup(perception): moved inspection disabling to statement

1843b81

Signed-off-by: Moritz Schweppenhäuser <[email protected]>

cleanup(perception): improved comment

0356761

Signed-off-by: Moritz Schweppenhäuser <[email protected]>

kschrab changed the title ~~improvement(perception): Improve generics usage in perception module~~ clean(perception): Improve generics usage in perception module Dec 9, 2024

kschrab merged commit 6650436 into main Dec 9, 2024
5 checks passed

kschrab deleted the improve-perception-generics branch December 9, 2024 10:31

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

clean(perception): Improve generics usage in perception module #416

clean(perception): Improve generics usage in perception module #416

schwepmo commented Sep 24, 2024 •

edited by kschrab

Loading

schwepmo commented Dec 2, 2024

kschrab commented Dec 5, 2024

schwepmo commented Dec 6, 2024

clean(perception): Improve generics usage in perception module #416

clean(perception): Improve generics usage in perception module #416

Conversation

schwepmo commented Sep 24, 2024 • edited by kschrab Loading

Description

Issue(s) related to this PR

Affected parts of the online documentation

Definition of Done

Special notes to reviewer

schwepmo commented Dec 2, 2024

kschrab commented Dec 5, 2024

schwepmo commented Dec 6, 2024

schwepmo commented Sep 24, 2024 •

edited by kschrab

Loading