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.

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

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

Merged
merged 84 commits into from
Oct 24, 2024

Commits on Oct 3, 2024

  1. Configuration menu
    Copy the full SHA
    1ee8623 View commit details
    Browse the repository at this point in the history
  2. FDP-2318: firmware small change and dtos

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    25023fd View commit details
    Browse the repository at this point in the history
  3. FDP-2638: firmware upload, REST call and mapping draft

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    9e5601f View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2024

  1. FDP-2638: firmware mapper and unit test

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    b35a10d View commit details
    Browse the repository at this point in the history
  2. FDP-2638: saving to database works

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    ce9dede View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    1338deb View commit details
    Browse the repository at this point in the history
  4. FDP-2638: sending firmwares to maki

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    7031a0b View commit details
    Browse the repository at this point in the history
  5. FDP-2638: moved web component

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    a3b42db View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    6c01b0d View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2024

  1. FDP-2638: ssl back to need

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    a2e775a View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2024

  1. FDP-2638: added second server port

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    6d0e84d View commit details
    Browse the repository at this point in the history
  2. FDP-2638: working with two seperate filtered servers

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    75c2ad3 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2024

  1. FDP-2638: fix existing unit tests

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    ea63922 View commit details
    Browse the repository at this point in the history
  2. FDP-2638: fix existing integration tests

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    be67cf5 View commit details
    Browse the repository at this point in the history
  3. FDP-2638: Kafka Broker config and @DirtiesContext

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    11e662f View commit details
    Browse the repository at this point in the history
  4. FDP-2638: integration test added

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    7b80b01 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2024

  1. Merge branch 'main' into feature/FDP-2638-firmware-files-inlezen-en-n…

    …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 committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    aba6429 View commit details
    Browse the repository at this point in the history
  2. FDP-2638: merge main formatted

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    c7b4ecf View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2024

  1. FDP-2638: some names and config

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    7058a21 View commit details
    Browse the repository at this point in the history
  2. FDP-2638: unit tests

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    ddfe6ec View commit details
    Browse the repository at this point in the history
  3. FDP-2638: unit tests

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    f0a263e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    4a94a8c View commit details
    Browse the repository at this point in the history
  5. FDP-2638: "/test" endpoint added to filter

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    903048a View commit details
    Browse the repository at this point in the history
  6. FDP-2638: firmware controller unit test

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    3ef0953 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2024

  1. FDP-2638: HttpClient unit test

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    5c96a32 View commit details
    Browse the repository at this point in the history
  2. FDP-2638: unit test

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    474344c View commit details
    Browse the repository at this point in the history
  3. FDP-2638: mapper unit test

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    a0e3cb4 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2024

  1. FDP-2638: firmware web controller unit test

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    135c9a5 View commit details
    Browse the repository at this point in the history
  2. FDP-2638: api access filter unit test

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    c0a26ab View commit details
    Browse the repository at this point in the history
  3. FDP-2638: fixed circular dependency and added missing dirtiescontext …

    …annotation
    
    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    2226afe View commit details
    Browse the repository at this point in the history
  4. FDP-2638: added integration test

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    8f3d453 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2024

  1. FDP-2638: fixed all tests

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    13968fa View commit details
    Browse the repository at this point in the history
  2. FDP-2638: added test file

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    0bab52f View commit details
    Browse the repository at this point in the history
  3. FDP-2638: removed own ServerProperties

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    9e12529 View commit details
    Browse the repository at this point in the history
  4. FDP-2638: review comments

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    682065b View commit details
    Browse the repository at this point in the history
  5. FDP-2638: fixed unit tests

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    5597dee View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2024

  1. FDP-2638: removed unnecessary controller

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    0e58dfc View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3285c9f View commit details
    Browse the repository at this point in the history
  3. FDP-2318: firmware small change and dtos

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    bf52049 View commit details
    Browse the repository at this point in the history
  4. FDP-2638: firmware upload, REST call and mapping draft

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    539c22e View commit details
    Browse the repository at this point in the history
  5. FDP-2638: firmware mapper and unit test

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    4be69dc View commit details
    Browse the repository at this point in the history
  6. FDP-2638: saving to database works

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    812e2a6 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    b228be8 View commit details
    Browse the repository at this point in the history
  8. FDP-2638: sending firmwares to maki

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    d0efbe2 View commit details
    Browse the repository at this point in the history
  9. FDP-2638: moved web component

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    e43192f View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    7fad53e View commit details
    Browse the repository at this point in the history
  11. FDP-2638: ssl back to need

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    172f170 View commit details
    Browse the repository at this point in the history
  12. FDP-2638: added second server port

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    ae632cc View commit details
    Browse the repository at this point in the history
  13. FDP-2638: working with two seperate filtered servers

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    a5f6ab5 View commit details
    Browse the repository at this point in the history
  14. FDP-2638: fix existing unit tests

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    58d1d05 View commit details
    Browse the repository at this point in the history
  15. FDP-2638: fix existing integration tests

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    0c853c5 View commit details
    Browse the repository at this point in the history
  16. FDP-2638: Kafka Broker config and @DirtiesContext

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    91dc66a View commit details
    Browse the repository at this point in the history
  17. FDP-2638: integration test added

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    37ac356 View commit details
    Browse the repository at this point in the history
  18. FDP-2638: merge main formatted

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    081cb38 View commit details
    Browse the repository at this point in the history
  19. FDP-2638: some names and config

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    ee83ae0 View commit details
    Browse the repository at this point in the history
  20. FDP-2638: unit tests

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    7121fd0 View commit details
    Browse the repository at this point in the history
  21. FDP-2638: unit tests

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    9431f22 View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    97a81da View commit details
    Browse the repository at this point in the history
  23. FDP-2638: "/test" endpoint added to filter

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    ff0b189 View commit details
    Browse the repository at this point in the history
  24. FDP-2638: firmware controller unit test

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    4e1b088 View commit details
    Browse the repository at this point in the history
  25. FDP-2638: HttpClient unit test

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    abf67f1 View commit details
    Browse the repository at this point in the history
  26. FDP-2638: unit test

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    4391f3e View commit details
    Browse the repository at this point in the history
  27. FDP-2638: mapper unit test

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    46c0be4 View commit details
    Browse the repository at this point in the history
  28. FDP-2638: firmware web controller unit test

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    b648684 View commit details
    Browse the repository at this point in the history
  29. FDP-2638: api access filter unit test

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    b76357f View commit details
    Browse the repository at this point in the history
  30. FDP-2638: fixed circular dependency and added missing dirtiescontext …

    …annotation
    
    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    88eaebb View commit details
    Browse the repository at this point in the history
  31. FDP-2638: added integration test

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    104e686 View commit details
    Browse the repository at this point in the history
  32. FDP-2638: fixed all tests

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    f49659d View commit details
    Browse the repository at this point in the history
  33. FDP-2638: added test file

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    b4bc78b View commit details
    Browse the repository at this point in the history
  34. FDP-2638: removed own ServerProperties

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    e3d4434 View commit details
    Browse the repository at this point in the history
  35. FDP-2638: review comments

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    5db2826 View commit details
    Browse the repository at this point in the history
  36. FDP-2638: fixed unit tests

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    0c0ab64 View commit details
    Browse the repository at this point in the history
  37. FDP-2638: removed unnecessary controller

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    3ed7068 View commit details
    Browse the repository at this point in the history
  38. FDP-2638: rebasing merge conflicts

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    db8594b View commit details
    Browse the repository at this point in the history
  39. Merge remote-tracking branch 'origin/feature/FDP-2638-firmware-files-…

    …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 committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    2f89d6a View commit details
    Browse the repository at this point in the history
  40. FDP-2638: rebasing merge conflicts

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    a224d85 View commit details
    Browse the repository at this point in the history
  41. FDP-2638: merging main conflicts fixed

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    0e88a1a View commit details
    Browse the repository at this point in the history
  42. FDP-2638: review comments

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    62ee03e View commit details
    Browse the repository at this point in the history
  43. FDP-2638: fix tests

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    ce4484c View commit details
    Browse the repository at this point in the history
  44. FDP-2638: mapper as component instead of service

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    aa4da50 View commit details
    Browse the repository at this point in the history
  45. FDP-2638: change css name to be allowed in filter

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    c1733cb View commit details
    Browse the repository at this point in the history
  46. FDP-2638: unhappy flow

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    4b1042f View commit details
    Browse the repository at this point in the history
  47. FDP-2638: added kafka key

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    44a2d45 View commit details
    Browse the repository at this point in the history
  48. FDP-2638: fixes

    Signed-off-by: Loes Immens <[email protected]>
    loesimmens committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    46a23bc View commit details
    Browse the repository at this point in the history