From 51ba418d5cc7e8d8fa453d5fcbf05db2467dd266 Mon Sep 17 00:00:00 2001 From: Sascha Doemer Date: Thu, 16 May 2024 10:47:57 +0200 Subject: [PATCH 1/6] Simplify request creation in RequestFactory This change consolidates the creation and acceptance of JSON type requests into a single line in the RequestFactory class. This refactoring boosts code readability and efficiency. --- .../java/com/dke/data/agrirouter/impl/RequestFactory.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/RequestFactory.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/RequestFactory.java index 54400e98..8efe0da0 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/RequestFactory.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/RequestFactory.java @@ -54,9 +54,7 @@ public static Invocation.Builder securedRequest( Environment.ENABLE_HTTP_REQUEST_LOGGING); } var target = client.target(url); - var request = target.request(MediaType.APPLICATION_JSON_TYPE); - request.accept(MediaType.APPLICATION_JSON_TYPE); - return request; + return target.request(MediaType.APPLICATION_JSON_TYPE); } private static Client createClient( From 2165b65d2b8eb909107d9590a0f4b16b52d55d24 Mon Sep 17 00:00:00 2001 From: Sascha Doemer Date: Thu, 16 May 2024 10:49:16 +0200 Subject: [PATCH 2/6] Refactor bearerTokenRequest method in RequestFactory Removed the redundant client creation and configuration logic within the bearerTokenRequest method in the RequestFactory class. Moreover, a separate method is introduced to generate a request with bearer token allowing simplification and code reuse. The change ensures cleaner and more efficient request generation. --- .../java/com/dke/data/agrirouter/impl/RequestFactory.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/RequestFactory.java b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/RequestFactory.java index 8efe0da0..c0eb44cf 100644 --- a/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/RequestFactory.java +++ b/agrirouter-sdk-java-impl/src/main/java/com/dke/data/agrirouter/impl/RequestFactory.java @@ -139,15 +139,9 @@ public static Invocation.Builder signedDeleteRequest( * @param accessToken - * @return Builder - */ - @SuppressWarnings("resource") public static Invocation.Builder bearerTokenRequest( String url, String accessToken, String applicationId, String signature) { - var client = ClientBuilder.newClient(); - client.property(LoggingFeature.LOGGING_FEATURE_LOGGER_LEVEL_CLIENT, "INFO"); - var target = client.target(url); - var request = target.request(MediaType.APPLICATION_JSON_TYPE); - request.accept(MediaType.APPLICATION_JSON_TYPE); - request.header(HttpHeaders.AUTHORIZATION, "Bearer " + accessToken); + var request = bearerTokenRequest(url, accessToken); request.header(AgrirouterHttpHeader.APPLICATION_ID, applicationId); request.header(AgrirouterHttpHeader.SIGNATURE, signature); return request; From 6c2dbdb6f412f0e3a76d65582aaebc0f484eb715 Mon Sep 17 00:00:00 2001 From: Sascha Doemer Date: Thu, 16 May 2024 10:57:54 +0200 Subject: [PATCH 3/6] Update onboarding parameters and response for farming software tests The onboarding parameters and response for the farming software tests have been updated. This includes changes to the registration code and a new response in the farming-software.json file which includes new id values and URLs. --- .../onboarding-responses/farming-software.json | 2 +- .../data/agrirouter/test/fixture/FarmingSoftwareFixture.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/agrirouter-sdk-java-tests/onboarding-responses/farming-software.json b/agrirouter-sdk-java-tests/onboarding-responses/farming-software.json index 1fdb8f5e..30653616 100644 --- a/agrirouter-sdk-java-tests/onboarding-responses/farming-software.json +++ b/agrirouter-sdk-java-tests/onboarding-responses/farming-software.json @@ -1 +1 @@ -{"deviceAlternateId":"14522ae1-4296-43de-9bba-fe3d99bc2669","capabilityAlternateId":"3035ec70-dca1-4d71-a000-e79eb5891f81","sensorAlternateId":"e306d63b-8b57-4956-bde7-43600e78dae4","connectionCriteria":{"gatewayId":"3","measures":"https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/measures/14522ae1-4296-43de-9bba-fe3d99bc2669","commands":"https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/commands/14522ae1-4296-43de-9bba-fe3d99bc2669"},"authentication":{"type":"P12","secret":"er7w24UOjW?FFABScSJmDkXHj98d7UqtU?zk","certificate":"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"}} \ No newline at end of file +{"deviceAlternateId":"93e12d85-5cb1-4afc-aa53-db2fd9472437","capabilityAlternateId":"3035ec70-dca1-4d71-a000-e79eb5891f81","sensorAlternateId":"b617b956-4145-43db-916b-fada868cb389","connectionCriteria":{"gatewayId":"3","measures":"https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/measures/93e12d85-5cb1-4afc-aa53-db2fd9472437","commands":"https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/commands/93e12d85-5cb1-4afc-aa53-db2fd9472437"},"authentication":{"type":"P12","secret":"pT#uh2yNg#0iQqnC24c5cII5YWmJDc1hqTz5","certificate":"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"}} \ No newline at end of file diff --git a/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/fixture/FarmingSoftwareFixture.java b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/fixture/FarmingSoftwareFixture.java index 4fbec28c..aa05754d 100644 --- a/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/fixture/FarmingSoftwareFixture.java +++ b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/fixture/FarmingSoftwareFixture.java @@ -38,7 +38,7 @@ void onboardFarmingSoftwareAndSaveToFile() throws IOException { OnboardingService onboardingService = new OnboardingServiceImpl(new QA() { }); SecuredOnboardingParameters onboardingParameters = new SecuredOnboardingParameters(); - onboardingParameters.setRegistrationCode("cf3a08a02f"); + onboardingParameters.setRegistrationCode("6a049384e3"); onboardingParameters.setApplicationId(farmingSoftware.getApplicationId()); onboardingParameters.setCertificationVersionId(farmingSoftware.getCertificationVersionId()); onboardingParameters.setCertificationType(CertificationType.P12); From cb577a5d9de31c0bb2a67ef2e5d107b155d6ac4d Mon Sep 17 00:00:00 2001 From: Sascha Doemer Date: Thu, 16 May 2024 11:21:09 +0200 Subject: [PATCH 4/6] Update registration code and onboarding responses in tests In the FarmingSoftwareFixture.java test file, the placeholder for the registration code has been replaced with an actual code and the test case has been enabled. Additionally, the onboarding response for farming-software-deactivated.json has been updated. These changes are essential to ensure that the tests can run successfully and reflect the current state of the system. --- .../onboarding-responses/farming-software-deactivated.json | 2 +- .../data/agrirouter/test/fixture/FarmingSoftwareFixture.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/agrirouter-sdk-java-tests/onboarding-responses/farming-software-deactivated.json b/agrirouter-sdk-java-tests/onboarding-responses/farming-software-deactivated.json index 102ad6b4..fee0535b 100644 --- a/agrirouter-sdk-java-tests/onboarding-responses/farming-software-deactivated.json +++ b/agrirouter-sdk-java-tests/onboarding-responses/farming-software-deactivated.json @@ -1 +1 @@ -{"deviceAlternateId":"7a8bf10c-627a-4f5f-aec5-65933f63c5f9","capabilityAlternateId":"3035ec70-dca1-4d71-a000-e79eb5891f81","sensorAlternateId":"5e6986a1-0dd7-4e64-b32c-76eef8b20390","connectionCriteria":{"gatewayId":"3","measures":"https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/measures/7a8bf10c-627a-4f5f-aec5-65933f63c5f9","commands":"https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/commands/7a8bf10c-627a-4f5f-aec5-65933f63c5f9"},"authentication":{"type":"P12","secret":"fcZQrLiM7406OxsHQf#YjJ5zOagTZml9iTNZ","certificate":"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"}} \ No newline at end of file +{"deviceAlternateId":"7a8bf10c-627a-4f5f-aec5-65933f63c5f9","capabilityAlternateId":"3035ec70-dca1-4d71-a000-e79eb5891f81","sensorAlternateId":"5e6986a1-0dd7-4e64-b32c-76eef8b20390","connectionCriteria":{"gatewayId":"3","measures":"https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/measures/7a8bf10c-627a-4f5f-aec5-65933f63c5f9","commands":"https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/commands/7a8bf10c-627a-4f5f-aec5-65933f63c5f9"},"authentication":{"type":"P12","secret":"kED0LHRBZMN5xYJ#hfp9mM1i3TVj46u#59Ve","certificate":"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"}} \ No newline at end of file diff --git a/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/fixture/FarmingSoftwareFixture.java b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/fixture/FarmingSoftwareFixture.java index aa05754d..17e0135e 100644 --- a/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/fixture/FarmingSoftwareFixture.java +++ b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/fixture/FarmingSoftwareFixture.java @@ -68,12 +68,12 @@ void onboardFarmingSoftwareAndSaveToFile() throws IOException { *

https://agrirouter-qa.cfapps.eu10.hana.ondemand.com/application/905152eb-c526-47a3-b871-aa46d065bb4c/authorize?response_type=onboard&state=my-custom-state-to-identify-the-request&redirect_uri= */ @Test - @Disabled("Please replace the placeholder for the registration code to run the test case.") + //@Disabled("Please replace the placeholder for the registration code to run the test case.") void onboardAndDeactivateFarmingSoftwareAndSaveToFile() throws IOException { OnboardingService onboardingService = new OnboardingServiceImpl(new QA() { }); SecuredOnboardingParameters onboardingParameters = new SecuredOnboardingParameters(); - onboardingParameters.setRegistrationCode("528bdeab8a"); + onboardingParameters.setRegistrationCode("573516b9a9"); onboardingParameters.setApplicationId(farmingSoftware.getApplicationId()); onboardingParameters.setCertificationVersionId(farmingSoftware.getCertificationVersionId()); onboardingParameters.setCertificationType(CertificationType.P12); From 85256fdaaaf4d2dec10e9c0f26e5e1a5c56a5cee Mon Sep 17 00:00:00 2001 From: Sascha Doemer Date: Thu, 16 May 2024 11:31:28 +0200 Subject: [PATCH 5/6] Update registration code and authentication details in tests The update involves renewing the registration code used in the farming software fixture for tests. Also, the authentication detail of the farming software in the test JSON response is updated to ensure the effectiveness and relevancy of the tests. --- .../onboarding-responses/farming-software-deactivated.json | 2 +- .../data/agrirouter/test/fixture/FarmingSoftwareFixture.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/agrirouter-sdk-java-tests/onboarding-responses/farming-software-deactivated.json b/agrirouter-sdk-java-tests/onboarding-responses/farming-software-deactivated.json index fee0535b..7e9076c7 100644 --- a/agrirouter-sdk-java-tests/onboarding-responses/farming-software-deactivated.json +++ b/agrirouter-sdk-java-tests/onboarding-responses/farming-software-deactivated.json @@ -1 +1 @@ -{"deviceAlternateId":"7a8bf10c-627a-4f5f-aec5-65933f63c5f9","capabilityAlternateId":"3035ec70-dca1-4d71-a000-e79eb5891f81","sensorAlternateId":"5e6986a1-0dd7-4e64-b32c-76eef8b20390","connectionCriteria":{"gatewayId":"3","measures":"https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/measures/7a8bf10c-627a-4f5f-aec5-65933f63c5f9","commands":"https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/commands/7a8bf10c-627a-4f5f-aec5-65933f63c5f9"},"authentication":{"type":"P12","secret":"kED0LHRBZMN5xYJ#hfp9mM1i3TVj46u#59Ve","certificate":"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"}} \ No newline at end of file +{"deviceAlternateId":"7a8bf10c-627a-4f5f-aec5-65933f63c5f9","capabilityAlternateId":"3035ec70-dca1-4d71-a000-e79eb5891f81","sensorAlternateId":"5e6986a1-0dd7-4e64-b32c-76eef8b20390","connectionCriteria":{"gatewayId":"3","measures":"https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/measures/7a8bf10c-627a-4f5f-aec5-65933f63c5f9","commands":"https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/commands/7a8bf10c-627a-4f5f-aec5-65933f63c5f9"},"authentication":{"type":"P12","secret":"#i4sjvzx!56Q#ahadlHSS23yxiZko!o!Hb18","certificate":"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"}} \ No newline at end of file diff --git a/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/fixture/FarmingSoftwareFixture.java b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/fixture/FarmingSoftwareFixture.java index 17e0135e..7b976905 100644 --- a/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/fixture/FarmingSoftwareFixture.java +++ b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/fixture/FarmingSoftwareFixture.java @@ -68,12 +68,12 @@ void onboardFarmingSoftwareAndSaveToFile() throws IOException { *

https://agrirouter-qa.cfapps.eu10.hana.ondemand.com/application/905152eb-c526-47a3-b871-aa46d065bb4c/authorize?response_type=onboard&state=my-custom-state-to-identify-the-request&redirect_uri= */ @Test - //@Disabled("Please replace the placeholder for the registration code to run the test case.") + @Disabled("Please replace the placeholder for the registration code to run the test case.") void onboardAndDeactivateFarmingSoftwareAndSaveToFile() throws IOException { OnboardingService onboardingService = new OnboardingServiceImpl(new QA() { }); SecuredOnboardingParameters onboardingParameters = new SecuredOnboardingParameters(); - onboardingParameters.setRegistrationCode("573516b9a9"); + onboardingParameters.setRegistrationCode("c9a36827a2"); onboardingParameters.setApplicationId(farmingSoftware.getApplicationId()); onboardingParameters.setCertificationVersionId(farmingSoftware.getCertificationVersionId()); onboardingParameters.setCertificationType(CertificationType.P12); From 4b1c11eb0d029fad061e26062f6023effc0e80df Mon Sep 17 00:00:00 2001 From: Sascha Doemer Date: Thu, 16 May 2024 11:35:16 +0200 Subject: [PATCH 6/6] Enable testcase and update registration code in FarmingSoftwareFixture The placeholder for the registration code in the test case "onboardAndDeactivateFarmingSoftwareAndSaveToFile" in FarmingSoftwareFixture file has been updated with actual code, and the test case is enabled back for execution. Additionally, relevant changes were made in the "farming-software-deactivated.json" file. --- .../onboarding-responses/farming-software-deactivated.json | 2 +- .../data/agrirouter/test/fixture/FarmingSoftwareFixture.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/agrirouter-sdk-java-tests/onboarding-responses/farming-software-deactivated.json b/agrirouter-sdk-java-tests/onboarding-responses/farming-software-deactivated.json index 7e9076c7..a6114a1b 100644 --- a/agrirouter-sdk-java-tests/onboarding-responses/farming-software-deactivated.json +++ b/agrirouter-sdk-java-tests/onboarding-responses/farming-software-deactivated.json @@ -1 +1 @@ -{"deviceAlternateId":"7a8bf10c-627a-4f5f-aec5-65933f63c5f9","capabilityAlternateId":"3035ec70-dca1-4d71-a000-e79eb5891f81","sensorAlternateId":"5e6986a1-0dd7-4e64-b32c-76eef8b20390","connectionCriteria":{"gatewayId":"3","measures":"https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/measures/7a8bf10c-627a-4f5f-aec5-65933f63c5f9","commands":"https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/commands/7a8bf10c-627a-4f5f-aec5-65933f63c5f9"},"authentication":{"type":"P12","secret":"#i4sjvzx!56Q#ahadlHSS23yxiZko!o!Hb18","certificate":"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"}} \ No newline at end of file +{"deviceAlternateId":"5c520765-33d6-49a8-bd16-e300375e56ec","capabilityAlternateId":"3035ec70-dca1-4d71-a000-e79eb5891f81","sensorAlternateId":"29a2f1a8-9f38-4375-b882-f9e1fe3c9dee","connectionCriteria":{"gatewayId":"3","measures":"https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/measures/5c520765-33d6-49a8-bd16-e300375e56ec","commands":"https://dke-qa.eu10.cp.iot.sap/iot/gateway/rest/commands/5c520765-33d6-49a8-bd16-e300375e56ec"},"authentication":{"type":"P12","secret":"NkCktQux#vyiRJF3ANHc2r9eTB2rqUK!XGdJ","certificate":"MIACAQMwgAYJKoZIhvcNAQcBoIAkgASCBAAwgDCABgkqhkiG9w0BBwGggCSABIIEADCCBRowggUWBgsqhkiG9w0BDAoBAqCCBO4wggTqMBwGCiqGSIb3DQEMAQMwDgQI/t18IWk0q90CAgfQBIIEyMXGqRXFZTPkdqYZMwlTW4xSYlaj5GfX4nDM0cTfkCZ7ll/LG6Uuj1YMejMGefGD+pNU6bID8jOBqlZIYbw+UKz+eaxLds0OENclBwp+d1zPG/uydgPh8BH0b9+IwSIvE1TmX4Y91tvkynR599Xgwg/4L6ZXOVOT/Oar4nkYeMOJ6dftxeXrMpp4mpb81V+Ih3cTDVrQrBvzDIGtlVV5fNJC19+C/31DXMD51hC7xoYptVSJdcl3nZp7KxQW7RroVq174/HKQULX0oB9+cBy1vR4yY4BgRDILYP9n8B3EJy7nMx8cpOL09DADKsEdmIT8DJ8q4HADWY9fqWpFra/22gVzxK1XY9EhjoizRTSivYiBRWCyi9s0XxIGlpGntHLkem5AhOK80l49IQVEZhz8tZWZWcG1RuUck/TEWYKzviykzaeYF/kvL8fhhzn8QoNVTxrYnJHjKQ3fj2cplTLzy7gT0a10AiR0q4ym39IKggpLg/C997Zzrkxl1ykIr+3jNgRePTOzqMjbbVog/83LxWNiHVNej6kERcXzJ9grkiko20CkhrGNhuzO3iH46pxSXDkkjrh007F9N0aJwepG6sAHIfEP0EQ+Y4cDcahp5Y4lZ4AQ0415vNNW3+ly343oz20wtT2qUxibVZtXipylTowIdEruBovQQ1k7jQwcbcfBt3Jyws5+4i0gES4m7oqUJ/GmlVlLgJ5kWLHkQ4zb27Zyh6yTzyy4WLxgCJXtIf+iZE2QfsjrCM+aoRtSn2S4JI1fUwwUT5T/MX+ZpGAxXW8WgyoCR9tKNw5IGHcq0f7rrO2FriCrArD/0pHyWGFA0ItzRngZUFaEwdjrmEUm9e1OXkS7u1KYx5zJhUt94dyNbY1UobVnqfnqZddjZ6cTtL2ZztEVGlhNBFXGletY8MMUt9ds8KdEzQSrlSNWCwznVPECBaYiK4Wn6NjDsCXFJEV7/Bcxdg1YM0UQTuFne5gE6sJy2Tcl3EcS15YMaxKnSzrBFrO2rdr5xSlCJ4k2C7Xj9jyeNqF1UVr2N0RfCgcqxizwRqtupUhulM1v0a4RA6UxX8lmSgFV5/H98YQ77ls0JsL4E7uICokOcAf1TQA4xEHe+eAczHhU+LCn8jRySeXuo5Li0ETlGxSTN6UcmE75ba/l2Fd8CTs+kgHtGpQnU5U6Qt3oyClvNGwLswtlMTDtaxL0zOryejud8p4a8VR2dkOA9fvPImA/f52WU1Lm9xP/nx6NvWKBIIEABgKAsp8Y7bkrXdi5dgeFrCjbNuy6W0wBIIBHuZwzsKxZ5i4qpF5HoY9BoMQd214idfT7yQ5vjeuRl1jWHJuNd8k/YyMDNDzRlZIuGRWLREthS3UbS2SHBvgZ4P5GWfgMl8JcpPJA8AORhHCvz79kv9x8s/5okROULovEKRFM2oZzHd6EtUfPT3Et/wZc2fzOLHOHR7BZq3BK2WtVAdMKC4Y34dlIhalIP1MU9tK66/5a10Cpcdq3H+BhMelIx6v/hV3tfEp5N4QuTXTzCtSh+t5lbwuscvN3i6TmEzOhmN5M3xNQaQzNlMCTF1w2B0826dWuZoqNJ3iDDTtF+9d8ov1C+xccWd/5VzNnESN0KB7YhGz0KCqMVtSSxLocuILljA6MRUwEwYJKoZIhvcNAQkVMQYEBAEAAAAAAAAAAAAwgAYJKoZIhvcNAQcGoIAwgAIBADCABgkqhkiG9w0BBwEwHAYKKoZIhvcNAQwBBjAOBAgOAOMLUJugJgICB9CggASCBcgk15N1Qt449bw6V4epyZAhue9ZqqkaWUBc2asbNKbC5/uUFCWZFFbcOGofgnP3S3tJ59bh/Gv3Y3rcQODTAwIb9nxvCtYtpIxtT9Y/N9hSATeHezNDe/yjyJtyiqwTTx6s0kiL7auhMonxFxZDketzt9T/x4JPAyHD2SXlMTG2WUIl0LgS3uxdgLWmqZW+WMWKX4cO2W2eYU3efRBD9uVsCuysXp/pkAM1NhNUh2WuvCoipsJ+prGLdFzpe7KSbod81ovRaggqU1qXDT6K4suyL2kP3jLYsjkYgpQRON4iIJvYFhVxQL4UzXEAqXYxtt6YH07yjXVBtO71xcVZviFy/6pJQ/WGa/au4AeQv1SBIC+QUvGU+p1iXUbPkP0Kq7kVLbsxqc7qzfpCx4K4ECSR5R7xEiQGPlODGN8lyESUl1so/RZlCYg1WRTXYt07ROtskbMEy8WjifptQpmnzon46WMxSETOS4q9bYQuk8TrQwURmK4ejyZo5lawyzdwEGoKohQSMeON9pZSvCuBk5pMeNIWvk9W0NNt7HQFifSWL9wWgcKSQCZWom/sJjc50nrQmLYK6CruhzVwwxn2DrYydcFlQwRFpZR6s1QgxWfdusLq3HV1TopTxCRqmIKkTWydJl3+bVNOhDlZeXt9wIVqZkeH4PuzFhJNjiCPdslqfm/CwjuwOcGTp/a9ribG9hiLugSjTZXwi2fcMERTAUxT7MGmj5gVXcKhbrF7rkTIY1lpKjgzRpzGDTZgBOMBFK9vvSzNoFpOiqdF4G1kfOwkBpQZQEtIObaszczIz43grD6dNvRXbIfM3Zkh1LmN2NXGiSnnfucByamWTjIEggNYjv4Lhcq/yfB6d9X9Xr/c2qvAlamZE+5fhcKCdxl9guzg29Gk7VFxEQeeCadwWsegSuC/7o8Kqc9lxReW0tN0QgP+6WN5fnjib4WF5+hCpaQTt7vCsYmwQA1nPtcVK0jOz8iCJXmfNVFbePrC+r7INs8tkl4xKZ/aDYKgD+h/3XrsWTkgML2mcokPL3r8wN4YpT0pfaqVhC7CP5Cf10uQiNOmU8icC42PB4RJ/OuZXYs5X5h0DD+pu+laW9RqATlFK/qvk9J7p+hTVFPti15IlRuPAZFj3DL+F4rsiQRNXbFhL75j7MK8zF+cG4PT55bwk+BwJj1/N0JtD+nwDYftdl0tWL/nORveXjUu/sijdUaPl4KGLvteTkCj7oiHfpLEtcuHqKBi0+ZV5GYmzf5OC9KhelmsyIf3v4VC94CiOIrb9Cw0KQ3CbiCa3TyGv/CFgcEWWFWo8S0QNaCosCNNfsJTJNfjyU0CuX+219Q3tKxxDZYoT2vxI61uNtEor1qwEdT1cmTaMmJzGjBFky5+5zbHVRjCTrdxWzuxz6sWuJ4oD7Kwa9nBHhIskaiveE1Bw+OHt3OVcYHiBp74TjKIQIJJdjGs47eR9JWvWiR6cTUAPCBsvNCACQVylqir3hEAP0dLodhoReKAA507ypg72Ci9JU+JM/W93su7BWrN0tAiMBZWrCad93hjFyhTIcNDOcOfV/gNx9kmdr+3dwpvm2XGzuZm7G8vIshahQ8g4rfL3ieoCmGhIzuU7ZWbE0tuQcqyWHBZMitE7R1LxHftYhbZLn1QxjTAYTFoL7khrjbFjl19NT/mqHNAXprLUdRZhGSf8karYpjfQynpXYO9TkN0Z7YFyzrUAIBV9d+5l/GWtRvHZpIad3EUcTq86JyOSYtnjIviXZ9dL7ohro0G4uRCM52CB4RJnAXJp4c/bd11kUIANPI6veFII5hmSFDXo32I5Pzw/mbSvPyn7Yh7Sgqq/sR0MMDEX4j1RDWTNpVHX7KDkUCLkrRB1sy2xBTXQFeCe5C42PJKdU15vQlrNn/K32mqCrNtrvJ2b6e1y1CKauT8Wtz2cMRWI5LB5RTwi1gdw5RFPkV6iP83V0nO/HtJMjGwIHaEQesSgwAAAAAAAAAAAAAAAAAAAAAAADAxMCEwCQYFKw4DAhoFAAQUI0CXKAtNkq588dilMAlGiaTFykIECPcSG57Mv/s5AgIH0AAA"}} \ No newline at end of file diff --git a/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/fixture/FarmingSoftwareFixture.java b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/fixture/FarmingSoftwareFixture.java index 7b976905..fd975c42 100644 --- a/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/fixture/FarmingSoftwareFixture.java +++ b/agrirouter-sdk-java-tests/src/test/java/com/dke/data/agrirouter/test/fixture/FarmingSoftwareFixture.java @@ -73,7 +73,7 @@ void onboardAndDeactivateFarmingSoftwareAndSaveToFile() throws IOException { OnboardingService onboardingService = new OnboardingServiceImpl(new QA() { }); SecuredOnboardingParameters onboardingParameters = new SecuredOnboardingParameters(); - onboardingParameters.setRegistrationCode("c9a36827a2"); + onboardingParameters.setRegistrationCode("4699be2f62"); onboardingParameters.setApplicationId(farmingSoftware.getApplicationId()); onboardingParameters.setCertificationVersionId(farmingSoftware.getCertificationVersionId()); onboardingParameters.setCertificationType(CertificationType.P12);