Revert "Updated Gaffer version to 2.0.0-alpha-0.6 (#1067)"

This reverts commit a0d1388.

NOTICES

@@ -20,7 +20,7 @@ Gaffer tools is built using maven. This process will automatically pull in depen
  projects below.
 
 
-Gaffer (uk.gov.gchq.gaffer:gaffer2:2.0.0-alpha-0.6):
+Gaffer (uk.gov.gchq.gaffer:gaffer2:2.0.0-alpha-0.5):
 
 - Apache License, Version 2.0
 

pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>uk.gov.gchq.gaffer</groupId>
         <artifactId>gaffer2</artifactId>
-        <version>2.0.0-alpha-0.6</version>
+        <version>2.0.0-alpha-0.5</version>
     </parent>
 
     <artifactId>gaffer-tools</artifactId>
@@ -31,7 +31,7 @@
     <!-- For <modules> see default profile -->
 
     <properties>
-        <gaffer.version>2.0.0-alpha-0.6</gaffer.version>
+        <gaffer.version>2.0.0-alpha-0.5</gaffer.version>
         <scm.url>
             https://github.com/gchq/gaffer-tools
         </scm.url>

python-shell/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2.0.0-alpha-0.6"
+__version__ = "2.0.0-alpha-0.5"
 
 __title__ = "gafferpy"
 __description__ = "Gaffer Python Shell"

python-shell/src/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2.0.0-alpha-0.6"
+__version__ = "2.0.0-alpha-0.5"
 
 __title__ = "gafferpy"
 __description__ = "Gaffer Python Shell"

python-shell/src/fishbowl/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2.0.0-alpha-0.6"
+__version__ = "2.0.0-alpha-0.5"
 
 __title__ = "fishbowl"
 __description__ = "Gaffer Python Shell"

python-shell/src/gafferpy/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2.0.0-alpha-0.6"
+__version__ = "2.0.0-alpha-0.5"
 
 __title__ = "gafferpy"
 __description__ = "Gaffer Python Shell"

python-shell/src/gafferpy/generated_api/functions.py

@@ -214,86 +214,24 @@ def to_json(self):
         return super().to_json()
 
 
-class CsvGenerator(AbstractFunction):
-    CLASS = "uk.gov.gchq.gaffer.data.generator.CsvGenerator"
-
-    def __init__(
-            self,
-            quoted=None,
-            comma_replacement=None,
-            include_default_fields=None,
-            include_schema_properties=None,
-            constants=None,
-            fields=None):
-        super().__init__(_class_name=self.CLASS)
-        self.quoted = quoted
-        self.comma_replacement = comma_replacement
-        self.include_default_fields = include_default_fields
-        self.include_schema_properties = include_schema_properties
-        self.constants = constants
-        self.fields = fields
-
-    def to_json(self):
-        function_json = super().to_json()
-        if self.quoted is not None:
-            function_json["quoted"] = self.quoted
-        if self.comma_replacement is not None:
-            function_json["commaReplacement"] = self.comma_replacement
-        if self.include_default_fields is not None:
-            function_json["includeDefaultFields"] = self.include_default_fields
-        if self.include_schema_properties is not None:
-            function_json["includeSchemaProperties"] = self.include_schema_properties
-        if self.constants is not None:
-            function_json["constants"] = self.constants
-        if self.fields is not None:
-            function_json["fields"] = self.fields
-        return function_json
-
-
-class JsonToElementGenerator(AbstractFunction):
-    CLASS = "uk.gov.gchq.gaffer.data.generator.JsonToElementGenerator"
-
-    def __init__(self):
-        super().__init__(_class_name=self.CLASS)
-
-    def to_json(self):
-        return super().to_json()
-
-
-class MapGenerator(AbstractFunction):
-    CLASS = "uk.gov.gchq.gaffer.data.generator.MapGenerator"
-
-    def __init__(
-            self,
-            constants=None,
-            fields=None):
-        super().__init__(_class_name=self.CLASS)
-        self.constants = constants
-        self.fields = fields
-
-    def to_json(self):
-        function_json = super().to_json()
-        if self.constants is not None:
-            function_json["constants"] = self.constants
-        if self.fields is not None:
-            function_json["fields"] = self.fields
-        return function_json
-
-
-class Neo4jCsvElementGenerator(AbstractFunction):
-    CLASS = "uk.gov.gchq.gaffer.data.generator.Neo4jCsvElementGenerator"
+class CsvElementGenerator(AbstractFunction):
+    CLASS = "uk.gov.gchq.gaffer.data.generator.CsvElementGenerator"
 
     def __init__(
             self,
             first_row=None,
             trim=None,
             delimiter=None,
-            null_string=None):
+            null_string=None,
+            header=None,
+            csv_format=None):
         super().__init__(_class_name=self.CLASS)
         self.first_row = first_row
         self.trim = trim
         self.delimiter = delimiter
         self.null_string = null_string
+        self.header = header
+        self.csv_format = csv_format
 
     def to_json(self):
         function_json = super().to_json()
@@ -305,25 +243,25 @@ def to_json(self):
             function_json["delimiter"] = self.delimiter
         if self.null_string is not None:
             function_json["nullString"] = self.null_string
+        if self.header is not None:
+            function_json["header"] = self.header
+        if self.csv_format is not None:
+            function_json["csvFormat"] = self.csv_format
         return function_json
 
 
-class Neo4jCsvGenerator(AbstractFunction):
-    CLASS = "uk.gov.gchq.gaffer.data.generator.Neo4jCsvGenerator"
+class CsvGenerator(AbstractFunction):
+    CLASS = "uk.gov.gchq.gaffer.data.generator.CsvGenerator"
 
     def __init__(
             self,
             quoted=None,
             comma_replacement=None,
-            include_default_fields=None,
-            include_schema_properties=None,
             constants=None,
             fields=None):
         super().__init__(_class_name=self.CLASS)
         self.quoted = quoted
         self.comma_replacement = comma_replacement
-        self.include_default_fields = include_default_fields
-        self.include_schema_properties = include_schema_properties
         self.constants = constants
         self.fields = fields
 
@@ -333,74 +271,36 @@ def to_json(self):
             function_json["quoted"] = self.quoted
         if self.comma_replacement is not None:
             function_json["commaReplacement"] = self.comma_replacement
-        if self.include_default_fields is not None:
-            function_json["includeDefaultFields"] = self.include_default_fields
-        if self.include_schema_properties is not None:
-            function_json["includeSchemaProperties"] = self.include_schema_properties
         if self.constants is not None:
             function_json["constants"] = self.constants
         if self.fields is not None:
             function_json["fields"] = self.fields
         return function_json
 
 
-class NeptuneCsvElementGenerator(AbstractFunction):
-    CLASS = "uk.gov.gchq.gaffer.data.generator.NeptuneCsvElementGenerator"
+class JsonToElementGenerator(AbstractFunction):
+    CLASS = "uk.gov.gchq.gaffer.data.generator.JsonToElementGenerator"
 
-    def __init__(
-            self,
-            first_row=None,
-            trim=None,
-            delimiter=None,
-            null_string=None):
+    def __init__(self):
         super().__init__(_class_name=self.CLASS)
-        self.first_row = first_row
-        self.trim = trim
-        self.delimiter = delimiter
-        self.null_string = null_string
 
     def to_json(self):
-        function_json = super().to_json()
-        if self.first_row is not None:
-            function_json["firstRow"] = self.first_row
-        if self.trim is not None:
-            function_json["trim"] = self.trim
-        if self.delimiter is not None:
-            function_json["delimiter"] = self.delimiter
-        if self.null_string is not None:
-            function_json["nullString"] = self.null_string
-        return function_json
+        return super().to_json()
 
 
-class NeptuneCsvGenerator(AbstractFunction):
-    CLASS = "uk.gov.gchq.gaffer.data.generator.NeptuneCsvGenerator"
+class MapGenerator(AbstractFunction):
+    CLASS = "uk.gov.gchq.gaffer.data.generator.MapGenerator"
 
     def __init__(
             self,
-            quoted=None,
-            comma_replacement=None,
-            include_default_fields=None,
-            include_schema_properties=None,
             constants=None,
             fields=None):
         super().__init__(_class_name=self.CLASS)
-        self.quoted = quoted
-        self.comma_replacement = comma_replacement
-        self.include_default_fields = include_default_fields
-        self.include_schema_properties = include_schema_properties
         self.constants = constants
         self.fields = fields
 
     def to_json(self):
         function_json = super().to_json()
-        if self.quoted is not None:
-            function_json["quoted"] = self.quoted
-        if self.comma_replacement is not None:
-            function_json["commaReplacement"] = self.comma_replacement
-        if self.include_default_fields is not None:
-            function_json["includeDefaultFields"] = self.include_default_fields
-        if self.include_schema_properties is not None:
-            function_json["includeSchemaProperties"] = self.include_schema_properties
         if self.constants is not None:
             function_json["constants"] = self.constants
         if self.fields is not None: