reset codegen

Author: phil-lopreiato

android/src/main/java/com/thebluealliance/androidclient/api/call/TbaApiV3.java

@@ -1,25 +1,29 @@
 package com.thebluealliance.androidclient.api.call;
 
 
+
+import retrofit2.Call;
+import retrofit2.http.*;
+
+import okhttp3.RequestBody;
+
 import com.thebluealliance.androidclient.models.ApiStatus;
-import com.thebluealliance.androidclient.models.Award;
+import com.thebluealliance.androidclient.models.Event;
 import com.thebluealliance.androidclient.models.District;
 import com.thebluealliance.androidclient.models.DistrictRanking;
-import com.thebluealliance.androidclient.models.Event;
+import com.thebluealliance.androidclient.models.Team;
 import com.thebluealliance.androidclient.models.EventAlliance;
+import com.thebluealliance.androidclient.models.Award;
 import com.thebluealliance.androidclient.models.Match;
-import com.thebluealliance.androidclient.models.Media;
 import com.thebluealliance.androidclient.models.RankingResponseObject;
-import com.thebluealliance.androidclient.models.Robot;
-import com.thebluealliance.androidclient.models.Team;
 import com.thebluealliance.androidclient.models.TeamAtEventStatus;
+import com.thebluealliance.androidclient.models.Media;
+import com.thebluealliance.androidclient.models.Robot;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
-
-import retrofit2.Call;
-import retrofit2.http.GET;
-import retrofit2.http.Header;
-import retrofit2.http.Path;
+import java.util.Map;
 
 public interface TbaApiV3 {
   /**

android/src/main/java/com/thebluealliance/androidclient/api/rx/TbaApiV3.java

@@ -1,26 +1,30 @@
 package com.thebluealliance.androidclient.api.rx;
 
 import com.google.gson.JsonElement;
+import rx.Observable;
+import retrofit2.Response;
+
+import retrofit2.http.*;
+
+import okhttp3.RequestBody;
+
 import com.thebluealliance.androidclient.models.ApiStatus;
-import com.thebluealliance.androidclient.models.Award;
+import com.thebluealliance.androidclient.models.Event;
 import com.thebluealliance.androidclient.models.District;
 import com.thebluealliance.androidclient.models.DistrictRanking;
-import com.thebluealliance.androidclient.models.Event;
+import com.thebluealliance.androidclient.models.Team;
 import com.thebluealliance.androidclient.models.EventAlliance;
+import com.thebluealliance.androidclient.models.Award;
 import com.thebluealliance.androidclient.models.Match;
-import com.thebluealliance.androidclient.models.Media;
 import com.thebluealliance.androidclient.models.RankingResponseObject;
-import com.thebluealliance.androidclient.models.Robot;
-import com.thebluealliance.androidclient.models.Team;
 import com.thebluealliance.androidclient.models.TeamAtEventStatus;
+import com.thebluealliance.androidclient.models.Media;
+import com.thebluealliance.androidclient.models.Robot;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
-
-import retrofit2.Response;
-import retrofit2.http.GET;
-import retrofit2.http.Header;
-import retrofit2.http.Path;
-import rx.Observable;
+import java.util.Map;
 
 public interface TbaApiV3 {
   /**

libTba/swagger/mutate_spec.py

@@ -1,20 +1,24 @@
 #! /usr/bin/env python3
 
-import collections
 import sys
 import json
 from optparse import OptionParser
 from glob import glob
 
+try:
+    from collections.abc import Mapping
+except ImportError: # Python 2.7 compatibility
+    from collections import Mapping
+
 # Dict keys we merge into the same key in the real spec
 MERGE_KEYS = ["paths", "definitions"]
 HEADER_KEY = "headers"
 ALL_PROPERTIES_KEY = "allProperties"
 
 
 def update(d, u):
-    for k, v in u.items():
-        if isinstance(v, collections.Mapping):
+    for k, v in list(u.items()):
+        if isinstance(v, Mapping):
             r = update(d.get(k, {}), v)
             d[k] = r
         else:
@@ -50,18 +54,18 @@ def main():
             print("Data file is invalid")
             sys.exit(-1)
 
-        for key, value in data.items():
+        for key, value in list(data.items()):
             if key in MERGE_KEYS:
                 if key not in swagger_data:
                     swagger_data[key] = {}
                 update(swagger_data[key], value)
             elif key == HEADER_KEY:
-                for path, obj in swagger_data["paths"].items():
+                for path, obj in list(swagger_data["paths"].items()):
                     if not isinstance(obj.get("parameters", None), list):
                         obj["parameters"] = []
                     obj["parameters"].extend(value)
             elif key == ALL_PROPERTIES_KEY:
-                for model, obj in swagger_data["definitions"].items():
+                for model, obj in list(swagger_data["definitions"].items()):
                   if model not in value.get("exclude", []) and "parameters" in value:
                         swagger_data["definitions"][model]["properties"].update(value["parameters"])