remove redundant exception

alfio-event · Jan 27, 2020 · 1d14a6a · 1d14a6a
1 parent 4623256
commit 1d14a6a
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/src/main/java/alfio/manager/payment/PayPalManager.java b/src/main/java/alfio/manager/payment/PayPalManager.java
@@ -144,7 +144,7 @@ private String createCheckoutRequest(PaymentSpecification spec) throws Exception
                 if("APPROVED".equals(status)) {
                     saveToken(reservation.getId(), spec.getEvent(), new PayPalToken(order.payer().payerId(), order.id(), hmac));
                 }
-                throw new AlreadyApprovedException();
+                return "/event/"+spec.getEvent().getShortName()+"/reservation/"+spec.getReservationId();
             } else if("CREATED".equals(status)) {
                 //add 15 minutes of validity in case the paypal flow is slow
                 ticketReservationRepository.updateValidity(spec.getReservationId(), DateUtils.addMinutes(reservation.getValidity(), 15));
@@ -329,8 +329,6 @@ public PaymentResult getToken(PaymentSpecification spec) {
                 return PaymentResult.initialized(gatewayToken.getToken());
             }
             return PaymentResult.redirect(createCheckoutRequest(spec));
-        } catch(AlreadyApprovedException ex) {
-            return PaymentResult.redirect("/event/"+spec.getEvent().getShortName()+"/reservation/"+spec.getReservationId());
         } catch (Exception e) {
             log.error(e);
             return PaymentResult.failed( ErrorsCode.STEP_2_PAYMENT_REQUEST_CREATION );
@@ -403,10 +401,6 @@ private static class PayPalChargeDetails {
         private final long payPalFee;
     }
 
-    private static class AlreadyApprovedException extends RuntimeException {
-
-    }
-
     private static boolean statusCodeIsSuccessful(HttpResponse<?> response) {
         return requireNonNull(HttpStatus.resolve(response.statusCode())).is2xxSuccessful();
     }