diff options
author | Fiete Ostkamp <Fiete.Ostkamp@telekom.de> | 2023-08-23 09:54:43 +0200 |
---|---|---|
committer | Fiete Ostkamp <Fiete.Ostkamp@telekom.de> | 2023-08-23 10:18:35 +0200 |
commit | 4b7cd5405dea9003f31af1aa9cd584d8ccf2141f (patch) | |
tree | 3ab06f13845946206260ffc3ad783882b99f9791 /app/src/test/java/org/onap/portalng/bff/preferences/PreferencesMocks.java | |
parent | 7348ffad6bb027b2e815b2081a9d9a827a84836e (diff) |
Consistently use the preferences and history names in the bff code base
- rename openapi clients (client-portal-prefs -> client-preferences, client-portal-history -> client-history, client-portal-keycloak -> client-keycloak)
- rename related spring configurations (portal-prefs -> preferences, portal-history -> history)
- rename related environment variables (PORTAL_PREFS_URL -> PREFERENCES_URL, PORTAL_HISTORY_URL -> HISTORY_URL)
Note that the changes to the configurations and variables affect external services using it and the bff chart
Issue-ID: PORTALNG-49
Change-Id: I434abdf130a5a81534c2387143b296122408d452
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
Diffstat (limited to 'app/src/test/java/org/onap/portalng/bff/preferences/PreferencesMocks.java')
-rw-r--r-- | app/src/test/java/org/onap/portalng/bff/preferences/PreferencesMocks.java | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/app/src/test/java/org/onap/portalng/bff/preferences/PreferencesMocks.java b/app/src/test/java/org/onap/portalng/bff/preferences/PreferencesMocks.java index 0d5b69a..9c5be75 100644 --- a/app/src/test/java/org/onap/portalng/bff/preferences/PreferencesMocks.java +++ b/app/src/test/java/org/onap/portalng/bff/preferences/PreferencesMocks.java @@ -30,8 +30,8 @@ import java.io.File; import java.io.IOException; import org.apache.http.HttpHeaders; import org.onap.portalng.bff.BaseIntegrationTest; -import org.onap.portalng.bff.openapi.client_portal_prefs.model.PreferencesPortalPrefsDto; -import org.onap.portalng.bff.openapi.client_portal_prefs.model.ProblemPortalPrefsDto; +import org.onap.portalng.bff.openapi.client_preferences.model.PreferencesPreferencesDto; +import org.onap.portalng.bff.openapi.client_preferences.model.ProblemPreferencesDto; import org.onap.portalng.bff.openapi.server.model.CreatePreferencesRequestApiDto; import org.onap.portalng.bff.openapi.server.model.PreferencesResponseApiDto; import org.springframework.http.HttpStatus; @@ -65,7 +65,7 @@ public class PreferencesMocks extends BaseIntegrationTest { .as(PreferencesResponseApiDto.class); } - protected void mockGetPreferences(PreferencesPortalPrefsDto preferencesPortalPrefsDto) + protected void mockGetPreferences(PreferencesPreferencesDto preferencesPreferencesDto) throws Exception { WireMock.stubFor( WireMock.get(WireMock.urlEqualTo("/v1/preferences")) @@ -73,10 +73,10 @@ public class PreferencesMocks extends BaseIntegrationTest { .willReturn( WireMock.aResponse() .withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) - .withBody(objectMapper.writeValueAsString(preferencesPortalPrefsDto)))); + .withBody(objectMapper.writeValueAsString(preferencesPreferencesDto)))); } - protected void mockGetPreferencesError(ProblemPortalPrefsDto problem) throws Exception { + protected void mockGetPreferencesError(ProblemPreferencesDto problem) throws Exception { WireMock.stubFor( WireMock.get(WireMock.urlEqualTo("/v1/preferences")) .withHeader("X-Request-Id", new EqualToPattern(X_REQUEST_ID)) @@ -104,35 +104,35 @@ public class PreferencesMocks extends BaseIntegrationTest { .as(PreferencesResponseApiDto.class); } - protected void mockCreatePreferences(PreferencesPortalPrefsDto preferencesPortalPrefsDto) + protected void mockCreatePreferences(PreferencesPreferencesDto preferencesPreferencesDto) throws Exception { WireMock.stubFor( WireMock.post(WireMock.urlEqualTo("/v1/preferences")) .withHeader("X-Request-Id", new EqualToPattern(X_REQUEST_ID)) .withRequestBody( WireMock.equalToJson( - objectMapper.writeValueAsString(preferencesPortalPrefsDto), true, false)) + objectMapper.writeValueAsString(preferencesPreferencesDto), true, false)) .willReturn( WireMock.aResponse() .withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) - .withBody(objectMapper.writeValueAsString(preferencesPortalPrefsDto)))); + .withBody(objectMapper.writeValueAsString(preferencesPreferencesDto)))); } protected void mockCreatePreferencesError( - PreferencesPortalPrefsDto preferencesPortalPrefsDto, - ProblemPortalPrefsDto problemPortalPrefsDto) + PreferencesPreferencesDto preferencesPreferencesDto, + ProblemPreferencesDto problemPreferencesDto) throws Exception { WireMock.stubFor( WireMock.post(WireMock.urlEqualTo("/v1/preferences")) .withHeader("X-Request-Id", new EqualToPattern(X_REQUEST_ID)) .withRequestBody( WireMock.equalToJson( - objectMapper.writeValueAsString(preferencesPortalPrefsDto), true, false)) + objectMapper.writeValueAsString(preferencesPreferencesDto), true, false)) .willReturn( WireMock.aResponse() .withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) .withStatus(HttpStatus.BAD_REQUEST.value()) - .withBody(objectMapper.writeValueAsString(problemPortalPrefsDto)))); + .withBody(objectMapper.writeValueAsString(problemPreferencesDto)))); } protected PreferencesResponseApiDto updatePreferences(CreatePreferencesRequestApiDto request) { @@ -150,33 +150,33 @@ public class PreferencesMocks extends BaseIntegrationTest { .as(PreferencesResponseApiDto.class); } - protected void mockUpdatePreferences(PreferencesPortalPrefsDto preferencesPortalPrefsDto) + protected void mockUpdatePreferences(PreferencesPreferencesDto preferencesPreferencesDto) throws Exception { WireMock.stubFor( WireMock.put(WireMock.urlEqualTo("/v1/preferences")) .withHeader("X-Request-Id", new EqualToPattern(X_REQUEST_ID)) .withRequestBody( WireMock.equalToJson( - objectMapper.writeValueAsString(preferencesPortalPrefsDto), true, false)) + objectMapper.writeValueAsString(preferencesPreferencesDto), true, false)) .willReturn( WireMock.aResponse() .withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) - .withBody(objectMapper.writeValueAsString(preferencesPortalPrefsDto)))); + .withBody(objectMapper.writeValueAsString(preferencesPreferencesDto)))); } protected void mockUpdatePreferencesError( - PreferencesPortalPrefsDto preferencesPortalPrefsDto, - ProblemPortalPrefsDto problemPortalPrefsDto) + PreferencesPreferencesDto preferencesPreferencesDto, + ProblemPreferencesDto problemPreferencesDto) throws Exception { WireMock.stubFor( WireMock.put(WireMock.urlEqualTo("/v1/preferences")) .withRequestBody( WireMock.equalToJson( - objectMapper.writeValueAsString(preferencesPortalPrefsDto), true, false)) + objectMapper.writeValueAsString(preferencesPreferencesDto), true, false)) .willReturn( WireMock.aResponse() .withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) .withStatus(HttpStatus.BAD_REQUEST.value()) - .withBody(objectMapper.writeValueAsString(problemPortalPrefsDto)))); + .withBody(objectMapper.writeValueAsString(problemPreferencesDto)))); } } |