Skip to content

Commit

Permalink
Merge pull request #19 from hhelibeb/remove_useless_assign
Browse files Browse the repository at this point in the history
remove 'valid = abap_false' at the beginning of the method
  • Loading branch information
hhelibeb committed Sep 26, 2020
2 parents 3d6a0e1 + 96003fb commit f40fc35
Show file tree
Hide file tree
Showing 14 changed files with 44 additions and 66 deletions.
2 changes: 1 addition & 1 deletion abaplint.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
"ambiguous_statement": true,
"begin_end_names": true,
"check_transformation_exists": true,
"check_syntax": true,
"check_syntax": false,
"form_tables_obsolete": true,
"tabl_enhancement_category": true,
"implement_methods": true,
Expand Down
2 changes: 0 additions & 2 deletions src/zcl_adv_base64_check.clas.abap
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ CLASS ZCL_ADV_BASE64_CHECK IMPLEMENTATION.

METHOD zif_adv_check~is_valid.

valid = abap_false.

DATA(string_base64) = CONV string( data ).
IF string_base64 IS INITIAL.
valid = abap_true.
Expand Down
7 changes: 3 additions & 4 deletions src/zcl_adv_date_check.clas.abap
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ ENDCLASS.



CLASS zcl_adv_date_check IMPLEMENTATION.
METHOD zif_adv_check~is_valid.
CLASS ZCL_ADV_DATE_CHECK IMPLEMENTATION.


valid = abap_false.
METHOD zif_adv_check~is_valid.

DATA(string_date) = CONV string( data ).

Expand All @@ -38,5 +38,4 @@ CLASS zcl_adv_date_check IMPLEMENTATION.
valid = abap_true.

ENDMETHOD.

ENDCLASS.
4 changes: 1 addition & 3 deletions src/zcl_adv_email_check.clas.abap
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,11 @@ ENDCLASS.



CLASS zcl_adv_email_check IMPLEMENTATION.
CLASS ZCL_ADV_EMAIL_CHECK IMPLEMENTATION.


METHOD zif_adv_check~is_valid.

valid = abap_false.

DATA(string_email) = CONV string( data ).

*regex source: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input/email
Expand Down
4 changes: 1 addition & 3 deletions src/zcl_adv_guid_check.clas.abap
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,11 @@ ENDCLASS.



CLASS zcl_adv_guid_check IMPLEMENTATION.
CLASS ZCL_ADV_GUID_CHECK IMPLEMENTATION.


METHOD zif_adv_check~is_valid.

valid = abap_false.

DATA(string_email) = CONV string( data ).

*https://stackoverflow.com/questions/7905929/how-to-test-valid-uuid-guid
Expand Down
6 changes: 2 additions & 4 deletions src/zcl_adv_hex_check.clas.abap
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,13 @@ ENDCLASS.



CLASS zcl_adv_hex_check IMPLEMENTATION.
CLASS ZCL_ADV_HEX_CHECK IMPLEMENTATION.


METHOD zif_adv_check~is_valid.

DATA: xstring_hex TYPE xstring.

valid = abap_false.

DATA(string_hex) = CONV string( data ).

IF string_hex IS INITIAL.
Expand All @@ -35,5 +34,4 @@ CLASS zcl_adv_hex_check IMPLEMENTATION.
valid = abap_true.

ENDMETHOD.

ENDCLASS.
4 changes: 1 addition & 3 deletions src/zcl_adv_html_check.clas.abap
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ ENDCLASS.



CLASS zcl_adv_html_check IMPLEMENTATION.
CLASS ZCL_ADV_HTML_CHECK IMPLEMENTATION.


METHOD zif_adv_check~is_valid.
Expand All @@ -44,8 +44,6 @@ CLASS zcl_adv_html_check IMPLEMENTATION.

DATA: original_messages TYPE t_json1.

valid = abap_false.

DATA(string_html) = CONV string( data ).
IF string_html IS INITIAL.
RETURN.
Expand Down
6 changes: 2 additions & 4 deletions src/zcl_adv_imei_check.clas.abap
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,14 @@ ENDCLASS.



CLASS zcl_adv_imei_check IMPLEMENTATION.
CLASS ZCL_ADV_IMEI_CHECK IMPLEMENTATION.


METHOD zif_adv_check~is_valid.

DATA: imei_index TYPE i,
sum TYPE i.

valid = abap_false.

DATA(imei_string) = CONV string( data ).

IF NOT contains( val = imei_string regex = '^\d{15}$' ).
Expand All @@ -45,5 +44,4 @@ CLASS zcl_adv_imei_check IMPLEMENTATION.
ENDIF.

ENDMETHOD.

ENDCLASS.
43 changes: 21 additions & 22 deletions src/zcl_adv_int4_check.clas.abap
Original file line number Diff line number Diff line change
Expand Up @@ -16,29 +16,8 @@ ENDCLASS.



CLASS zcl_adv_int4_check IMPLEMENTATION.
CLASS ZCL_ADV_INT4_CHECK IMPLEMENTATION.

METHOD zif_adv_check~is_valid.

DATA(regex_string) = '^[-+]?(\d{1,9}|1\d{9}|2(0\d{8}|1([0-3]\d{7}|4([0-6]\d{6}|7([0-3]\d{5}|4([0-7]\d{4}|8([0-2]\d{3}|3([0-5]\d{2}|6([0-3]\d|4[0-7])))))))))$|^-2147483648$'.

valid = abap_false.

DATA(string_number) = CONV string( data ).

IF string_number IS INITIAL.
RETURN.
ENDIF.

remove_mess_char( CHANGING number = string_number ).

IF NOT contains( val = string_number regex = regex_string ).
RETURN.
ENDIF.

valid = abap_true.

ENDMETHOD.

METHOD remove_mess_char.

Expand Down Expand Up @@ -70,4 +49,24 @@ CLASS zcl_adv_int4_check IMPLEMENTATION.

ENDMETHOD.


METHOD zif_adv_check~is_valid.

DATA(regex_string) = '^[-+]?(\d{1,9}|1\d{9}|2(0\d{8}|1([0-3]\d{7}|4([0-6]\d{6}|7([0-3]\d{5}|4([0-7]\d{4}|8([0-2]\d{3}|3([0-5]\d{2}|6([0-3]\d|4[0-7])))))))))$|^-2147483648$'.

DATA(string_number) = CONV string( data ).

IF string_number IS INITIAL.
RETURN.
ENDIF.

remove_mess_char( CHANGING number = string_number ).

IF NOT contains( val = string_number regex = regex_string ).
RETURN.
ENDIF.

valid = abap_true.

ENDMETHOD.
ENDCLASS.
6 changes: 2 additions & 4 deletions src/zcl_adv_json_check.clas.abap
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,10 @@ ENDCLASS.



CLASS zcl_adv_json_check IMPLEMENTATION.
CLASS ZCL_ADV_JSON_CHECK IMPLEMENTATION.

METHOD zif_adv_check~is_valid.

valid = abap_false.
METHOD zif_adv_check~is_valid.

DATA(string_json) = CONV string( data ).
IF string_json IS INITIAL.
Expand All @@ -31,5 +30,4 @@ CLASS zcl_adv_json_check IMPLEMENTATION.
valid = abap_true.

ENDMETHOD.

ENDCLASS.
6 changes: 2 additions & 4 deletions src/zcl_adv_regex_check.clas.abap
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,13 @@ ENDCLASS.



CLASS zcl_adv_regex_check IMPLEMENTATION.
CLASS ZCL_ADV_REGEX_CHECK IMPLEMENTATION.


METHOD zif_adv_check~is_valid.

DATA: regex TYPE REF TO cl_abap_regex.

valid = abap_false.

DATA(string_regex) = CONV string( data ).

TRY.
Expand All @@ -31,5 +30,4 @@ CLASS zcl_adv_regex_check IMPLEMENTATION.
valid = abap_true.

ENDMETHOD.

ENDCLASS.
7 changes: 3 additions & 4 deletions src/zcl_adv_time_check.clas.abap
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ ENDCLASS.



CLASS zcl_adv_time_check IMPLEMENTATION.
METHOD zif_adv_check~is_valid.
CLASS ZCL_ADV_TIME_CHECK IMPLEMENTATION.


valid = abap_false.
METHOD zif_adv_check~is_valid.

DATA(string_time) = CONV string( data ).

Expand All @@ -38,5 +38,4 @@ CLASS zcl_adv_time_check IMPLEMENTATION.
valid = abap_true.

ENDMETHOD.

ENDCLASS.
4 changes: 1 addition & 3 deletions src/zcl_adv_timestamp_check.clas.abap
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,9 @@ CLASS ZCL_ADV_TIMESTAMP_CHECK IMPLEMENTATION.

METHOD zif_adv_check~is_valid.

valid = abap_false.

DATA(string_ts) = CONV string( data ).

IF not contains( val = string_ts regex = '\d{14} ?$' ).
IF NOT contains( val = string_ts regex = '\d{14} ?$' ).
RETURN.
ENDIF.

Expand Down
9 changes: 4 additions & 5 deletions src/zcl_adv_url_check.clas.abap
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,15 @@ ENDCLASS.



CLASS zcl_adv_url_check IMPLEMENTATION.
CLASS ZCL_ADV_URL_CHECK IMPLEMENTATION.


METHOD zif_adv_check~is_valid.

*regex source: https://gist.github.com/dperini/729294
DATA(url_regex) =
'^(?:(?:(?:https?|ftp):)?\/\/)(?:\S+(?::\S*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9][1-9]?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5]))' &&
'{2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z0-9[:unicode:]][a-z0-9[:unicode:]_-]{0,62})?[a-z0-9[:unicode:]]\.)+(?:[a-z[:unicode:]]{2,}\.?))(?::\d{2,5})?(?:[/?#]\S*)?$'.

valid = abap_false.
'^(?:(?:(?:https?|ftp):)?\/\/)(?:\S+(?::\S*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9][1-9]?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5]))' &&
'{2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z0-9[:unicode:]][a-z0-9[:unicode:]_-]{0,62})?[a-z0-9[:unicode:]]\.)+(?:[a-z[:unicode:]]{2,}\.?))(?::\d{2,5})?(?:[/?#]\S*)?$'.

DATA(string_url) = CONV string( data ).

Expand Down

0 comments on commit f40fc35

Please sign in to comment.