From 8f3ad25c637381da3f499f992c3477768cb636f9 Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Thu, 7 Dec 2017 16:49:26 +0100 Subject: jvpp: remove special request<>reply mappings Since L2FibTable removal and introduction of dedicated SW Interface Event, special message handling code can be removed. The patch also fixes issues found by Intelij's code inspection tool. Change-Id: Ic4b2fd12ac30c7627f4cd6769716e4bb52ec0b10 Signed-off-by: Marek Gradzki --- src/vpp-api/java/jvpp/gen/jvppgen/dto_gen.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/vpp-api/java/jvpp/gen/jvppgen/dto_gen.py') diff --git a/src/vpp-api/java/jvpp/gen/jvppgen/dto_gen.py b/src/vpp-api/java/jvpp/gen/jvppgen/dto_gen.py index e94bbc5cb28..5f2cdc2ad05 100644 --- a/src/vpp-api/java/jvpp/gen/jvppgen/dto_gen.py +++ b/src/vpp-api/java/jvpp/gen/jvppgen/dto_gen.py @@ -72,7 +72,7 @@ def generate_dtos(func_list, base_package, plugin_package, plugin_name, dto_pack camel_case_method_name = util.underscore_to_camelcase(func['name']) dto_path = os.path.join(dto_package, camel_case_dto_name + ".java") - if util.is_ignored(func['name']) or util.is_control_ping(camel_case_dto_name): + if util.is_control_ping(camel_case_dto_name): continue fields = generate_dto_fields(camel_case_dto_name, func) @@ -83,7 +83,7 @@ def generate_dtos(func_list, base_package, plugin_package, plugin_name, dto_pack if not util.is_just_notification(func["name"]): if util.is_reply(camel_case_dto_name): description = "reply DTO" - request_dto_name = get_request_name(camel_case_dto_name, func['name']) + request_dto_name = util.remove_reply_suffix(camel_case_dto_name) if util.is_details(camel_case_dto_name): # FIXME assumption that dump calls end with "Dump" suffix. Not enforced in vpe.api base_type += "JVppReply<%s.%s.%s>" % (plugin_package, dto_package, request_dto_name + "Dump") @@ -272,13 +272,6 @@ dump_dto_suffix = "ReplyDump" dump_reply_artificial_dtos = {} -# Returns request name or special one from unconventional_naming_rep_req map -def get_request_name(camel_case_dto_name, func_name): - return util.underscore_to_camelcase_upper( - util.unconventional_naming_rep_req[func_name]) if func_name in util.unconventional_naming_rep_req \ - else util.remove_reply_suffix(camel_case_dto_name) - - def flush_dump_reply_dtos(inputfile): for dump_reply_artificial_dto in dump_reply_artificial_dtos.values(): dto_path = os.path.join(dump_reply_artificial_dto['dto_package'], -- cgit 1.2.3-korg