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

Feature/fdp 2638 firmware files inlezen en naar maki #57

Merged
merged 84 commits into from
Oct 24, 2024
Merged

Feature/fdp 2638 firmware files inlezen en naar maki #57

merged 84 commits into from
Oct 24, 2024

Conversation

loesimmens
Copy link
Contributor

No description provided.

@loesimmens
FDP-2318: changed firmware entity to use version and not hash
1ee8623 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2318: firmware small change and dtos
25023fd 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: firmware upload, REST call and mapping draft
9e5601f 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: firmware mapper and unit test
b35a10d 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: saving to database works
ce9dede 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: handling non-existen previous firmware with an error message
1338deb 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: sending firmwares to maki
7031a0b 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: moved web component
a3b42db 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: working in one service with one port when ssl enabled false
6c01b0d 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: ssl back to need
a2e775a 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: added second server port
6d0e84d 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: working with two seperate filtered servers
75c2ad3 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: fix existing unit tests
ea63922 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: fix existing integration tests
be67cf5 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: Kafka Broker config and @DirtiesContext
11e662f 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: integration test added
7b80b01 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
Merge branch 'main' into feature/FDP-2638-firmware-files-inlezen-en-n…
aba6429 
…aar-maki

# Conflicts:
#	application/src/integrationTest/kotlin/org/gxf/crestdeviceservice/IntegrationTestHelper.kt
#	application/src/integrationTest/kotlin/org/gxf/crestdeviceservice/MakiCommandHandlingTest.kt
#	application/src/test/kotlin/org/gxf/crestdeviceservice/service/MessageProducerServiceTest.kt
#	components/firmware/src/main/kotlin/org/gxf/crestdeviceservice/firmware/entity/FirmwarePacket.kt
#	components/firmware/src/main/kotlin/org/gxf/crestdeviceservice/firmware/repository/FirmwarePacketRepository.kt
@loesimmens
FDP-2638: merge main formatted
c7b4ecf 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: some names and config
7058a21 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: unit tests
ddfe6ec 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: unit tests
f0a263e 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: remove spring boot from web component gradle plugins
4a94a8c 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: "/test" endpoint added to filter
903048a 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: firmware controller unit test
3ef0953 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: HttpClient unit test
5c96a32 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: unit test
474344c 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: mapper unit test
a0e3cb4 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: firmware web controller unit test
135c9a5 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: api access filter unit test
c0a26ab 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: fixed circular dependency and added missing dirtiescontext …
2226afe 
…annotation

Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: firmware controller unit test
4e1b088 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: HttpClient unit test
abf67f1 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: unit test
4391f3e 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: mapper unit test
46c0be4 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: firmware web controller unit test
b648684 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: api access filter unit test
b76357f 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: fixed circular dependency and added missing dirtiescontext …
88eaebb 
…annotation

Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: added integration test
104e686 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: fixed all tests
f49659d 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: added test file
b4bc78b 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: removed own ServerProperties
e3d4434 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: review comments
5db2826 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: fixed unit tests
0c0ab64 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: removed unnecessary controller
3ed7068 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: rebasing merge conflicts
db8594b 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
Merge remote-tracking branch 'origin/feature/FDP-2638-firmware-files-…
2f89d6a 
…inlezen-en-naar-maki' into feature/FDP-2638-firmware-files-inlezen-en-naar-maki

# Conflicts:
#	application/src/integrationTest/kotlin/org/gxf/crestdeviceservice/IntegrationTestHelper.kt
#	application/src/integrationTest/kotlin/org/gxf/crestdeviceservice/MakiCommandHandlingTest.kt
#	application/src/integrationTest/kotlin/org/gxf/crestdeviceservice/WebServerTest.kt
#	application/src/main/kotlin/org/gxf/crestdeviceservice/config/ApiAccessFilter.kt
#	application/src/main/kotlin/org/gxf/crestdeviceservice/controller/FirmwareController.kt
#	components/firmware/src/main/kotlin/org/gxf/crestdeviceservice/firmware/entity/Firmware.kt
#	components/firmware/src/main/kotlin/org/gxf/crestdeviceservice/firmware/entity/FirmwarePacketCompositeKey.kt
@loesimmens
FDP-2638: rebasing merge conflicts
a224d85 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: merging main conflicts fixed
0e88a1a 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: review comments
62ee03e 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: fix tests
ce4484c 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: mapper as component instead of service
aa4da50 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: change css name to be allowed in filter
c1733cb 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: unhappy flow
4b1042f 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: added kafka key
44a2d45 
Signed-off-by: Loes Immens <[email protected]>
@loesimmens
FDP-2638: fixes
46a23bc 
Signed-off-by: Loes Immens <[email protected]>
@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Oct 24, 2024

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
69.5% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

@sanderv sanderv merged commit 0fc1198 into main Oct 24, 2024
3 checks passed
@sanderv sanderv deleted the feature/FDP-2638-firmware-files-inlezen-en-naar-maki branch October 24, 2024 14:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sanderv sanderv sanderv approved these changes

@levi-h levi-h levi-h approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@loesimmens @sanderv @levi-h