Skip to content

Commit

Permalink
Move Matts controllers to the payments/v3_1_8/vrp package
Browse files Browse the repository at this point in the history
For better comparison with the newly generated controllers in the
feature/36-variable-recurring-payments-for-3-1-8
branch.
  • Loading branch information
BohoCode committed Nov 26, 2021
1 parent 38b14cb commit db14cf3
Show file tree
Hide file tree
Showing 9 changed files with 361 additions and 443 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
Changelog of Git Changelog Maven plugin.
## Unreleased
<<<<<<< HEAD
<<<<<<< HEAD
[4833a4411f2b7f9](https://github.com/OpenBankingToolkit/openbanking-aspsp/commit/4833a4411f2b7f9) JamieB *2021-11-26 09:45:58*
Release candidate: prepare for next development iteration
## 1.5.6
Expand All @@ -20,6 +21,11 @@ currently in openbanking-reference-implementation, but master has

Issue: https://github.com/ForgeCloud/ob-deploy/issues/749
>>>>>>> cc8df318 (36: Initial controllers and their interfaces for VRPs)
=======
[4833a4411f2b7f9](https://github.com/OpenBankingToolkit/openbanking-aspsp/commit/4833a4411f2b7f9) JamieB *2021-11-26 09:45:58*
Release candidate: prepare for next development iteration
## 1.5.6
>>>>>>> 45ea6103 (Move Matts controllers to the payments/v3_1_8/vrp package)
### GitHub [#456](https://github.com/OpenBankingToolkit/openbanking-aspsp/pull/456) 794: UI redirection customer experience
[eb58e6dccb7cb99](https://github.com/OpenBankingToolkit/openbanking-aspsp/commit/eb58e6dccb7cb99) Jorge Sanchez Perez *2021-11-16 16:04:23*
794: UI redirection customer experience (#456)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,17 @@
* under the License.
*/
/**
<<<<<<< HEAD
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.1.0).
=======
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (4.3.1).
>>>>>>> 45ea6103 (Move Matts controllers to the payments/v3_1_8/vrp package)
* https://openapi-generator.tech
* Do not edit the class manually.
*/
package com.forgerock.openbanking.aspsp.rs.api.payment.v3_1_8.vrp;

<<<<<<< HEAD
import com.forgerock.openbanking.api.annotations.OBGroupName;
import com.forgerock.openbanking.api.annotations.OBReference;
import com.forgerock.openbanking.api.annotations.OpenBankingAPI;
Expand Down Expand Up @@ -328,5 +333,151 @@ ResponseEntity<OBDomesticVRPConsentResponse> domesticVrpConsentsPost(

Principal principal
) throws OBErrorResponseException;
=======
import com.forgerock.openbanking.exceptions.OBErrorResponseException;
import io.swagger.annotations.*;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import uk.org.openbanking.datamodel.vrp.OBDomesticVRPConsentRequest;
import uk.org.openbanking.datamodel.vrp.OBDomesticVRPConsentResponse;
import uk.org.openbanking.datamodel.vrp.OBVRPFundsConfirmationRequest;

import javax.validation.Valid;

import static org.springframework.web.bind.annotation.RequestMethod.DELETE;
import static org.springframework.web.bind.annotation.RequestMethod.POST;

@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-05-27T13:44:23.551801+01:00[Europe/London]")

//@OpenBankingAPI(
// obVersion = "3.1.8",
// obGroupName = OBGroupName.VRP,
// obReference = OBReference.VARIABLE_RECURRING_PAYMENTS
//)
@Validated
@Api(value = "domestic-vrp-consents", description = "the domestic-vrp-consents API")
public interface DomesticVrpConsentsApi {

static String DOMESTIC_VRP_CONSENTS = "/domestic-vrp-consents";

/**
* POST /domestic-vrp-consents : create a domestic vrp
* create a domestic vrp
*
* @return (status code 201)
*/
@ApiOperation(
value = "create a domestic vrp",
nickname = "domesticVrpConsentsPost",
notes = "create a domestic vrp",
response = OBDomesticVRPConsentResponse.class,
// authorizations = {
// @Authorization(value = "TPPOAuth2Security", scopes = {
// @AuthorizationScope(scope = "vrps", description = "Generic VRPs scope")
// })
// },
tags = {"variable-recurring-payments",})
@ApiResponses(value = {@ApiResponse(code = 201, message = "", response = OBDomesticVRPConsentResponse.class)})
//@PreAuthorize("hasAuthority('ROLE_VRP')")
//@OpenBankingAPI(
// obReference = OBReference.CREATE_DOMESTIC_VRP_CONSENT
//)
@RequestMapping(
value = DOMESTIC_VRP_CONSENTS,
produces = {"application/json"},
method = POST)
ResponseEntity<OBDomesticVRPConsentResponse> createDomesticVrpConsent(
@ApiParam(value = "Default", required = true)
@Valid
@RequestBody OBDomesticVRPConsentRequest domesticVRPConsentRequest // added manually
// none of the headers have been generated from the open-api spec
) throws OBErrorResponseException;

/**
* GET /domestic-vrp-consents/:consentId : create a domestic vrp
* create a domestic vrp
*
* @return (status code 200)
*/
@ApiOperation(
value = "create a domestic vrp",
nickname = "domesticVrpConsentsConsentIdGet",
notes = "create a domestic vrp",
response = OBDomesticVRPConsentResponse.class,
// authorizations = {
// @Authorization(value = "TPPOAuth2Security", scopes = {
// @AuthorizationScope(scope = "vrps", description = "Generic VRPs scope")
// })
// },
tags = {"variable-recurring-payments",})
@ApiResponses(value = {@ApiResponse(code = 200, message = "", response = OBDomesticVRPConsentResponse.class)})
//@PreAuthorize("hasAuthority('ROLE_VRP')")
//@OpenBankingAPI(
// obReference = OBReference.GET_DOMESTIC_VRP_CONSENT
//)
@RequestMapping(
value = DOMESTIC_VRP_CONSENTS + "/:consentId",
produces = {"application/json"},
method = RequestMethod.GET)
ResponseEntity<OBDomesticVRPConsentResponse> getDomesticVrpConsent() throws OBErrorResponseException;

/**
* DELETE /domestic-vrp-consents/:consentId : create a domestic vrp
* create a domestic vrp
*
* @return all good (status code 204)
*/
@ApiOperation(
value = "create a domestic vrp",
nickname = "domesticVrpConsentsConsentIdDelete",
notes = "create a domestic vrp",
// authorizations = {
// @Authorization(value = "TPPOAuth2Security", scopes = {
// @AuthorizationScope(scope = "vrps", description = "Generic VRPs scope")
// })
// },
tags = {"variable-recurring-payments",})
@ApiResponses(value = {@ApiResponse(code = 204, message = "all good")})
//@PreAuthorize("hasAuthority('ROLE_VRP')")
//@OpenBankingAPI(
// obReference = OBReference.DELETE_DOMESTIC_VRP_CONSENT
//)
@RequestMapping(value = DOMESTIC_VRP_CONSENTS + "/:consentId", method = DELETE)
ResponseEntity<Void> deleteDomesticVrpConsent() throws OBErrorResponseException;

/**
* POST /domestic-vrp-consents/:consentId/funds-confirmation : create a domestic vrp
* create a domestic vrp
*
* @return (status code 200)
*/
@ApiOperation(
value = "create a domestic vrp",
nickname = "domesticVrpConsentsConsentIdFundsConfirmationPost",
notes = "create a domestic vrp",
response = Object.class,
// authorizations = {
// @Authorization(value = "TPPOAuth2Security", scopes = {
// @AuthorizationScope(scope = "vrps", description = "Generic VRPs scope")
// })
// },
tags = {"variable-recurring-payments",})
@ApiResponses(value = {@ApiResponse(code = 200, message = "", response = Object.class)})
//@PreAuthorize("hasAuthority('ROLE_VRP')")
//@OpenBankingAPI(
// obReference = OBReference.CREATE_DOMESTIC_VRP_CONSENT_FUNDS_CONFIRMATION
//)
@RequestMapping(
value = DOMESTIC_VRP_CONSENTS + "/:consentId/funds-confirmation",
produces = {"application/json"},
method = POST)
ResponseEntity<Object> createDomesticVrpConsentsConsentFundsConfirmation(
@ApiParam(value = "Default", required = true)
@Valid
@RequestBody OBVRPFundsConfirmationRequest vrpFundsConfirmationRequest) throws OBErrorResponseException;
>>>>>>> 45ea6103 (Move Matts controllers to the payments/v3_1_8/vrp package)

}
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
*/
package com.forgerock.openbanking.aspsp.rs.api.payment.v3_1_8.vrp;

<<<<<<< HEAD
import com.forgerock.openbanking.aspsp.rs.wrappper.RSEndpointWrapperService;
import com.forgerock.openbanking.common.services.store.RsStoreGateway;
import com.forgerock.openbanking.exceptions.OBErrorResponseException;
Expand Down Expand Up @@ -100,5 +101,43 @@ public ResponseEntity<OBVRPFundsConfirmationResponse> domesticVrpConsentsFundsCo
HttpServletRequest request, Principal principal
) throws OBErrorResponseException {
return new ResponseEntity<OBVRPFundsConfirmationResponse>(HttpStatus.NOT_IMPLEMENTED);
=======
import com.forgerock.openbanking.exceptions.OBErrorResponseException;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import uk.org.openbanking.datamodel.vrp.OBDomesticVRPConsentRequest;
import uk.org.openbanking.datamodel.vrp.OBDomesticVRPConsentResponse;
import uk.org.openbanking.datamodel.vrp.OBVRPFundsConfirmationRequest;

@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2021-05-27T13:44:23.551801+01:00[Europe/London]")

@Controller("DomesticVrpConsentsApiControllerV3.1.8")
public class DomesticVrpConsentsApiController implements DomesticVrpConsentsApi {

@Override
public ResponseEntity<OBDomesticVRPConsentResponse> createDomesticVrpConsent(
OBDomesticVRPConsentRequest domesticVRPConsentRequest
) throws OBErrorResponseException {
return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
}

@Override
public ResponseEntity<OBDomesticVRPConsentResponse> getDomesticVrpConsent() {
return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
}

@Override
public ResponseEntity<Void> deleteDomesticVrpConsent() {
return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
}


@Override
public ResponseEntity<Object> createDomesticVrpConsentsConsentFundsConfirmation(
OBVRPFundsConfirmationRequest vrpFundsConfirmationRequest
) throws OBErrorResponseException {
return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
>>>>>>> 45ea6103 (Move Matts controllers to the payments/v3_1_8/vrp package)
}
}
Loading

0 comments on commit db14cf3

Please sign in to comment.