Skip to content

Commit 9c6f822

Browse files
mbtoolsmbtools
committed
New exceptions
1 parent 4f1d33c commit 9c6f822

File tree

3 files changed

+35
-23
lines changed

3 files changed

+35
-23
lines changed

‎src/zcl_strust2.clas.abap

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -189,11 +189,11 @@ CLASS zcl_strust2 IMPLEMENTATION.
189189
ASSIGN base64 TO FIELD-SYMBOL(<data>).
190190
ASSERT sy-subrc = 0.
191191
ELSE.
192-
zcx_error=>raise( 'Inconsistent certificate format'(010) ).
192+
RAISE EXCEPTION TYPE zcx_error_text EXPORTING text = 'Inconsistent certificate format'(010).
193193
ENDIF.
194194
CATCH cx_sy_regex_too_complex.
195195
" e.g. multiple PEM frames in file
196-
zcx_error=>raise( 'Inconsistent certificate format'(010) ).
196+
RAISE EXCEPTION TYPE zcx_error_text EXPORTING text = 'Inconsistent certificate format'(010).
197197
ENDTRY.
198198

199199
TRY.
@@ -218,7 +218,7 @@ CLASS zcl_strust2 IMPLEMENTATION.
218218
OTHERS = 5.
219219
IF sy-subrc <> 0.
220220
_unlock( ).
221-
zcx_error=>raise_t100( ).
221+
RAISE EXCEPTION TYPE zcx_error_t100.
222222
ENDIF.
223223

224224
cert_new-date_from = cert_new-validfrom(8).
@@ -227,7 +227,7 @@ CLASS zcl_strust2 IMPLEMENTATION.
227227

228228
CATCH cx_abap_x509_certificate.
229229
_unlock( ).
230-
zcx_error=>raise_t100( ).
230+
RAISE EXCEPTION TYPE zcx_error_t100.
231231
ENDTRY.
232232

233233
result = me.
@@ -269,7 +269,7 @@ CLASS zcl_strust2 IMPLEMENTATION.
269269
pse_not_found = 1
270270
OTHERS = 2.
271271
IF sy-subrc <> 0.
272-
zcx_error=>raise_t100( ).
272+
RAISE EXCEPTION TYPE zcx_error_t100.
273273
ENDIF.
274274

275275
ENDMETHOD.
@@ -310,7 +310,7 @@ CLASS zcl_strust2 IMPLEMENTATION.
310310
OTHERS = 6.
311311
IF sy-subrc <> 0.
312312
_unlock( ).
313-
zcx_error=>raise_t100( ).
313+
RAISE EXCEPTION TYPE zcx_error_t100.
314314
ENDIF.
315315

316316
LOOP AT certlist ASSIGNING <certlist>.
@@ -334,7 +334,7 @@ CLASS zcl_strust2 IMPLEMENTATION.
334334
OTHERS = 5.
335335
IF sy-subrc <> 0.
336336
_unlock( ).
337-
zcx_error=>raise_t100( ).
337+
RAISE EXCEPTION TYPE zcx_error_t100.
338338
ENDIF.
339339

340340
certificate-date_from = certificate-validfrom(8).
@@ -367,7 +367,7 @@ CLASS zcl_strust2 IMPLEMENTATION.
367367
OTHERS = 6.
368368
IF sy-subrc <> 0.
369369
_unlock( ).
370-
zcx_error=>raise_t100( ).
370+
RAISE EXCEPTION TYPE zcx_error_t100.
371371
ENDIF.
372372

373373
CALL FUNCTION 'SSFC_PARSE_CERTIFICATE'
@@ -387,7 +387,7 @@ CLASS zcl_strust2 IMPLEMENTATION.
387387
OTHERS = 5.
388388
IF sy-subrc <> 0.
389389
_unlock( ).
390-
zcx_error=>raise_t100( ).
390+
RAISE EXCEPTION TYPE zcx_error_t100.
391391
ENDIF.
392392

393393
cert_current-date_from = cert_current-validfrom(8).
@@ -420,7 +420,7 @@ CLASS zcl_strust2 IMPLEMENTATION.
420420
id = id
421421
org = org ).
422422
ELSE.
423-
zcx_error=>raise_t100( ).
423+
RAISE EXCEPTION TYPE zcx_error_t100.
424424
ENDIF.
425425
ENDIF.
426426

@@ -450,7 +450,7 @@ CLASS zcl_strust2 IMPLEMENTATION.
450450
OTHERS = 6.
451451
IF sy-subrc <> 0.
452452
_unlock( ).
453-
zcx_error=>raise_t100( ).
453+
RAISE EXCEPTION TYPE zcx_error_t100.
454454
ENDIF.
455455

456456
is_dirty = abap_true.
@@ -493,7 +493,7 @@ CLASS zcl_strust2 IMPLEMENTATION.
493493
OTHERS = 6.
494494
IF sy-subrc <> 0.
495495
_unlock( ).
496-
zcx_error=>raise_t100( ).
496+
RAISE EXCEPTION TYPE zcx_error_t100.
497497
ENDIF.
498498

499499
is_dirty = abap_true.
@@ -524,7 +524,7 @@ CLASS zcl_strust2 IMPLEMENTATION.
524524
OTHERS = 6.
525525
IF sy-subrc <> 0.
526526
_unlock( ).
527-
zcx_error=>raise_t100( ).
527+
RAISE EXCEPTION TYPE zcx_error_t100.
528528
ENDIF.
529529

530530
is_dirty = abap_true.
@@ -582,7 +582,7 @@ CLASS zcl_strust2 IMPLEMENTATION.
582582
ssf_unknown_error = 1
583583
OTHERS = 2.
584584
IF sy-subrc <> 0.
585-
zcx_error=>raise_t100( ).
585+
RAISE EXCEPTION TYPE zcx_error_t100.
586586
ENDIF.
587587

588588
tempfile = psepath.
@@ -603,7 +603,7 @@ CLASS zcl_strust2 IMPLEMENTATION.
603603
internal_error = 3
604604
OTHERS = 4.
605605
IF sy-subrc <> 0.
606-
zcx_error=>raise_t100( ).
606+
RAISE EXCEPTION TYPE zcx_error_t100.
607607
ENDIF.
608608

609609
ENDMETHOD.
@@ -616,7 +616,7 @@ CLASS zcl_strust2 IMPLEMENTATION.
616616
ENDIF.
617617

618618
IF profile IS INITIAL.
619-
zcx_error=>raise( 'Missing profile. Call "load" first' ).
619+
RAISE EXCEPTION TYPE zcx_error_text EXPORTING text = 'Missing profile. Call "load" first'(011).
620620
ENDIF.
621621

622622
ENDMETHOD.
@@ -644,7 +644,7 @@ CLASS zcl_strust2 IMPLEMENTATION.
644644
OTHERS = 4.
645645
IF sy-subrc <> 0.
646646
_unlock( ).
647-
zcx_error=>raise_t100( ).
647+
RAISE EXCEPTION TYPE zcx_error_t100.
648648
ENDIF.
649649

650650
IF profile(3) = 'SSL'.
@@ -677,9 +677,13 @@ CLASS zcl_strust2 IMPLEMENTATION.
677677
TRY.
678678
DELETE DATASET tempfile.
679679
CATCH cx_sy_file_open.
680-
zcx_error=>raise( 'Error deleting file'(020) && | { tempfile }| ).
680+
RAISE EXCEPTION TYPE zcx_error_text
681+
EXPORTING
682+
text = 'Error deleting file'(020) && | { tempfile }|.
681683
CATCH cx_sy_file_authority.
682-
zcx_error=>raise( 'Not authorized to delete file'(030) && | { tempfile }| ).
684+
RAISE EXCEPTION TYPE zcx_error_text
685+
EXPORTING
686+
text = 'Not authorized to delete file'(030) && | { tempfile }|.
683687
ENDTRY.
684688

685689
" Unlock PSE
@@ -692,7 +696,7 @@ CLASS zcl_strust2 IMPLEMENTATION.
692696
internal_error = 3
693697
OTHERS = 4.
694698
IF sy-subrc <> 0.
695-
zcx_error=>raise_t100( ).
699+
RAISE EXCEPTION TYPE zcx_error_t100.
696700
ENDIF.
697701

698702
ENDMETHOD.

‎src/zcl_strust2.clas.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@
1818
<ENTRY>Inconsistent certificate format</ENTRY>
1919
<LENGTH>80</LENGTH>
2020
</item>
21+
<item>
22+
<ID>I</ID>
23+
<KEY>011</KEY>
24+
<ENTRY>Missing profile. Call &quot;load&quot; first</ENTRY>
25+
<LENGTH>80</LENGTH>
26+
</item>
2127
<item>
2228
<ID>I</ID>
2329
<KEY>020</KEY>

‎src/zcl_strust2_cert_api.clas.abap

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,9 @@ CLASS zcl_strust2_cert_api IMPLEMENTATION.
8383
ENDIF.
8484

8585
IF json_response IS INITIAL OR json_response(1) <> '{'.
86-
zcx_error=>raise( 'Invalid response (expected JSON):' && json_response ).
86+
RAISE EXCEPTION TYPE zcx_error_text
87+
EXPORTING
88+
text = |Invalid response (expected JSON): { json_response }|.
8789
ENDIF.
8890

8991
result = json_response.
@@ -102,7 +104,7 @@ CLASS zcl_strust2_cert_api IMPLEMENTATION.
102104
EXCEPTIONS
103105
OTHERS = 99 ).
104106
IF sy-subrc <> 0.
105-
zcx_error=>raise_t100( ).
107+
RAISE EXCEPTION TYPE zcx_error_t100.
106108
ENDIF.
107109

108110
result->request->set_header_field(
@@ -166,7 +168,7 @@ CLASS zcl_strust2_cert_api IMPLEMENTATION.
166168
IMPORTING
167169
code = status_code
168170
message = message ).
169-
zcx_error=>raise( |{ message } (HTTP/{ status_code })| ).
171+
RAISE EXCEPTION TYPE zcx_error_text EXPORTING text = |{ message } (HTTP/{ status_code })|.
170172
ENDIF.
171173

172174
result = http_client->response.

0 commit comments

Comments
 (0)