Pick up new mime types.

Author: mfine

java/src/com/swiftnav/sbp/drivers/SBPDriverHTTP.java

@@ -26,7 +26,7 @@ protected void openStream() throws IOException {
         //http.setDoOutput(true);
         //http.setChunkedStreamingMode(200);
         http.setRequestProperty("Device-Uid", uid);
-        http.setRequestProperty("Accept", "application/vnd.swiftnav.broker.v1+sbp");
+        http.setRequestProperty("Accept", "application/vnd.swiftnav.broker.v1+sbp2");
         //http.setRequestProperty("Content-Type", "application/sbp");
 
         http.connect();

javascript/test_http_stream.js

@@ -6,7 +6,7 @@ var options = {
   url: 'http://broker.testing.skylark.swiftnav.com',
   headers: {
     'Device-Uid': 'cb781db1-8e5f-5a65-980a-fef75f4b6519',
-    'Accept': 'application/vnd.swiftnav.broker.v1+sbp'
+    'Accept': 'application/vnd.swiftnav.broker.v1+sbp2'
   }
 };
 

python/sbp/client/drivers/network_drivers.py

@@ -96,7 +96,7 @@ class HTTPException(Exception):
 DEFAULT_RETRIES = (MAX_CONNECT_RETRIES, MAX_READ_RETRIES)
 MAX_REDIRECTS = 0
 DEFAULT_BACKOFF_FACTOR = 0.2
-BROKER_SBP_TYPE = 'application/vnd.swiftnav.broker.v1+sbp'
+BROKER_SBP_TYPE = 'application/vnd.swiftnav.broker.v1+sbp2'
 
 class HTTPDriver(BaseDriver):
   """HTTPDriver

python/tests/sbp/client/test_driver.py

@@ -67,11 +67,11 @@ def test_http_test_pass():
   register_uri(GET,
                BASE_STATION_URI,
                msg.to_binary(),
-               content_type="application/vnd.swiftnav.broker.v1+sbp")
+               content_type="application/vnd.swiftnav.broker.v1+sbp2")
   register_uri(PUT,
                BASE_STATION_URI,
                '',
-               content_type="application/vnd.swiftnav.broker.v1+sbp")
+               content_type="application/vnd.swiftnav.broker.v1+sbp2")
   with HTTPDriver(device_uid="Swift22", url=BASE_STATION_URI) as driver:
     assert not driver.read_ok
     assert driver.connect_read()
@@ -102,12 +102,12 @@ def test_http_test_fail():
   register_uri(GET,
                BASE_STATION_URI,
                msg.to_binary(),
-               content_type="application/vnd.swiftnav.broker.v1+sbp",
+               content_type="application/vnd.swiftnav.broker.v1+sbp2",
                status=400)
   register_uri(PUT,
                BASE_STATION_URI,
                '',
-               content_type="application/vnd.swiftnav.broker.v1+sbp",
+               content_type="application/vnd.swiftnav.broker.v1+sbp2",
                status=400)
   with HTTPDriver(device_uid="Swift22", url=BASE_STATION_URI) as driver:
     assert not driver.connect_read()
@@ -129,12 +129,12 @@ def test_http_test_pass_streaming():
   register_uri(GET,
                BASE_STATION_URI,
                mock_streaming_msgs([m.to_binary() for m in msgs]),
-               content_type="application/vnd.swiftnav.broker.v1+sbp",
+               content_type="application/vnd.swiftnav.broker.v1+sbp2",
                streaming=True)
   register_uri(PUT,
                BASE_STATION_URI,
                body='',
-               content_type="application/vnd.swiftnav.broker.v1+sbp",
+               content_type="application/vnd.swiftnav.broker.v1+sbp2",
                streaming=True)
   with HTTPDriver(device_uid="Swift22", url=BASE_STATION_URI) as driver:
     assert driver.connect_read()
@@ -153,16 +153,16 @@ def test_http_test_pass_retry():
   msg = MsgPrintDep(text='abcd')
   get_responses = [Response(body="first response",
                             status=500,
-                            content_type="application/vnd.swiftnav.broker.v1+sbp"),
+                            content_type="application/vnd.swiftnav.broker.v1+sbp2"),
                    Response(body='second and last response',
                             status=200,
-                            content_type="application/vnd.swiftnav.broker.v1+sbp")]
+                            content_type="application/vnd.swiftnav.broker.v1+sbp2")]
   post_responses = [Response(body="",
                              status=500,
-                             content_type="application/vnd.swiftnav.broker.v1+sbp"),
+                             content_type="application/vnd.swiftnav.broker.v1+sbp2"),
                     Response(body='',
                              status=200,
-                             content_type="application/vnd.swiftnav.broker.v1+sbp")]
+                             content_type="application/vnd.swiftnav.broker.v1+sbp2")]
   register_uri(GET, BASE_STATION_URI, get_responses)
   register_uri(PUT, BASE_STATION_URI, post_responses)
   with HTTPDriver(device_uid="Swift22", url=BASE_STATION_URI) as driver: