change requested in review

3 files changed, 5 insertions, 15 deletions

diff --git a/utils/generator/templates/struct_function_template.java b/utils/generator/templates/struct_function_template.java
index eb89b9bc8..f48b8ec88 100644
--- a/utils/generator/templates/struct_function_template.java
+++ b/utils/generator/templates/struct_function_template.java
@@ -18,7 +18,7 @@ public class {{class_name}} extends {{extends_class}} {
     @Deprecated
     {%- endif %}
     {%- if p.name is defined %}
-    private {% if p.modifier is defined %}{{p.modifier}} {% endif %}{{p.return_type}} {{p.name}}{% if p.value is defined %} = {{p.value}}{% endif %};
+    private {{p.return_type}} {{p.name}}{% if p.value is defined %} = {{p.value}}{% endif %};
     {%- else %}
     public static final String {{p.key}} = "{{p.origin}}";
     {%- endif %}
@@ -61,9 +61,7 @@ public class {{class_name}} extends {{extends_class}} {
     {%- endif %}
     {%- endif %}
 
-    {%- if params is defined and ((kind is defined and kind != "response") or kind is not defined) %}
     {%- block setter %}
     {%- endblock%}
-    {%- endif %}
 }
 {% endblock -%}
diff --git a/utils/generator/transformers/enums_producer.py b/utils/generator/transformers/enums_producer.py
index b748f9c2a..b63dc0b6d 100644
--- a/utils/generator/transformers/enums_producer.py
+++ b/utils/generator/transformers/enums_producer.py
@@ -41,13 +41,8 @@ class EnumsProducer(InterfaceProducerCommon):
         """
         imports = set()
         params = OrderedDict()
-        if any(map(lambda l: l.name != self.converted(l.name) and getattr(l, 'value', None) is not None,
+        if any(map(lambda l: l.name != self.converted(l.name) or getattr(l, 'value', None) is not None,
                    getattr(item, self.container_name).values())):
-            kind = 'complex'
-            imports.add('java.util.EnumSet')
-        elif any(map(lambda l:
-                     l.name != self.converted(l.name) or l.name[0].isdigit() or getattr(l, 'value', None) is not None,
-                     getattr(item, self.container_name).values())):
             kind = 'custom'
             imports.add('java.util.EnumSet')
         else:
diff --git a/utils/generator/transformers/functions_producer.py b/utils/generator/transformers/functions_producer.py
index 1df0ee703..d8958ed00 100644
--- a/utils/generator/transformers/functions_producer.py
+++ b/utils/generator/transformers/functions_producer.py
@@ -36,6 +36,7 @@ class FunctionsProducer(InterfaceProducerCommon):
         :param item: particular element from initial Model
         :return: dictionary to be applied to jinja2 template
         """
+        list(map(item.params.__delitem__, filter(item.params.__contains__, ['success', 'resultCode', 'info'])))
         class_name = self.replace_sync(item.name[:1].upper() + item.name[1:])
 
         imports = {'java.util.Hashtable', 'com.smartdevicelink.protocol.enums.FunctionID'}
@@ -66,7 +67,7 @@ class FunctionsProducer(InterfaceProducerCommon):
         render = OrderedDict()
         render['kind'] = item.message_type.name
         render['package_name'] = self.package_name
-        render['imports'] = imports
+        render['imports'] = self.sort_imports(imports)
         render['function_id'] = self.key(self.replace_sync(item.name))
         render['class_name'] = class_name
         render['extends_class'] = extends_class
@@ -76,13 +77,9 @@ class FunctionsProducer(InterfaceProducerCommon):
         description = self.extract_description(item.description)
         if description:
             render['description'] = description
-        if params:
-            render['params'] = params
 
-        if 'imports' in render:
-            render['imports'] = self.sort_imports(render['imports'])
         if params:
-            render['params'] = tuple(render['params'].values())
+            render['params'] = tuple(params.values())
         if 'description' in render and isinstance(render['description'], str):
             render['description'] = textwrap.wrap(render['description'], 90)