From 2ec511c2c0a90318b487c8fa1369b248d3e01953 Mon Sep 17 00:00:00 2001
From: t92549 <80890692+t92549@users.noreply.github.com>
Date: Tue, 1 Mar 2022 11:20:54 +0000
Subject: [PATCH] Revert "gh-974: Fix gafferpy to work with Gaffer alpha 1"

This reverts commit cf9d754d152cf2a332368a5d6e4bbe66675f5e4c.
---
 .../src/gafferpy/gaffer_operations.py         | 22 +------------------
 python-shell/src/test/test_connector.py       |  1 -
 .../src/test/test_connector_requests.py       |  1 -
 3 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/python-shell/src/gafferpy/gaffer_operations.py b/python-shell/src/gafferpy/gaffer_operations.py
index ceab7815b..0519f8ab6 100755
--- a/python-shell/src/gafferpy/gaffer_operations.py
+++ b/python-shell/src/gafferpy/gaffer_operations.py
@@ -683,7 +683,7 @@ class GetTraits(Operation):
     CLASS = 'uk.gov.gchq.gaffer.store.operation.GetTraits'
 
     def __init__(self,
-                 current_traits=True,
+                 current_traits,
                  options=None):
         super().__init__(
             _class_name=self.CLASS, options=options)
@@ -696,26 +696,6 @@ def to_json(self):
         operation['currentTraits'] = self.current_traits
         return operation
 
-class HasTrait(Operation):
-    CLASS = 'uk.gov.gchq.gaffer.store.operation.HasTrait'
-
-    def __init__(self,
-                 trait,
-                 current_traits=True,
-                 options=None):
-        super().__init__(
-            _class_name=self.CLASS, options=options)
-
-        self.trait = trait
-        self.current_traits = current_traits
-
-    def to_json(self):
-        operation = super().to_json()
-
-        operation['trait'] = self.trait
-        operation['currentTraits'] = self.current_traits
-        return operation
-
 
 class AddElements(Operation):
     """
diff --git a/python-shell/src/test/test_connector.py b/python-shell/src/test/test_connector.py
index 95ca43b57..4726794cb 100755
--- a/python-shell/src/test/test_connector.py
+++ b/python-shell/src/test/test_connector.py
@@ -202,7 +202,6 @@ def test_execute_get(self):
             "uk.gov.gchq.gaffer.operation.impl.function.Filter",
             "uk.gov.gchq.gaffer.operation.impl.function.Transform",
             "uk.gov.gchq.gaffer.operation.impl.function.Aggregate",
-            "uk.gov.gchq.gaffer.store.operation.HasTrait",
             "uk.gov.gchq.gaffer.store.operation.GetTraits",
             "uk.gov.gchq.gaffer.mapstore.operation.CountAllElementsDefaultView",
             "uk.gov.gchq.gaffer.operation.export.graph.ExportToOtherAuthorisedGraph",
diff --git a/python-shell/src/test/test_connector_requests.py b/python-shell/src/test/test_connector_requests.py
index 9f48b4033..218888287 100755
--- a/python-shell/src/test/test_connector_requests.py
+++ b/python-shell/src/test/test_connector_requests.py
@@ -202,7 +202,6 @@ def test_execute_get(self):
             "uk.gov.gchq.gaffer.operation.impl.function.Filter",
             "uk.gov.gchq.gaffer.operation.impl.function.Transform",
             "uk.gov.gchq.gaffer.operation.impl.function.Aggregate",
-            "uk.gov.gchq.gaffer.store.operation.HasTrait",
             "uk.gov.gchq.gaffer.store.operation.GetTraits",
             "uk.gov.gchq.gaffer.mapstore.operation.CountAllElementsDefaultView",
             "uk.gov.gchq.gaffer.operation.export.graph.ExportToOtherAuthorisedGraph",