GATT.UUID should be internal

PureSwift · Nov 24, 2018 · aaf53f7 · aaf53f7
1 parent a87337f
commit aaf53f7
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 21 deletions.
diff --git a/Sources/GATT.swift b/Sources/GATT.swift
@@ -18,7 +18,7 @@ import Foundation
 public enum GATT {
 
     /// GATT UUIDs
-    public enum UUID: UInt16 {
+    internal enum UUID: UInt16 {
 
         case primaryService         = 0x2800
         case secondaryService       = 0x2801
@@ -34,19 +34,10 @@ public enum GATT {
         /// Initializes from a Bluetooth UUID
         public init?(uuid: BluetoothUUID) {
 
-            switch uuid {
-
-            case let .bit16(value):
-
-                guard let gatt = GATT.UUID(rawValue: value)
-                    else { return nil }
-
-                self = gatt
-
-            default:
-
-                return nil
-            }
+            guard case let .bit16(value) = uuid
+                else { return nil }
+
+            self.init(rawValue: value)
         }
 
         /// Returns a Bluetooth UUID initialized with the `rawValue` of this GATT UUID.
@@ -55,7 +46,6 @@ public enum GATT {
             return .bit16(rawValue)
         }
     }
-
 }
 
 // MARK: - Characteristic Property

diff --git a/Sources/GATTClient.swift b/Sources/GATTClient.swift
@@ -687,7 +687,7 @@ public final class GATTClient {
                 let serviceUUID = BluetoothUUID(littleEndian: littleEndianServiceUUID)
 
                 let service = Service(uuid: serviceUUID,
-                                      type: operation.type,
+                                      isPrimary: operation.type == .primaryService,
                                       handle: serviceData.attributeHandle,
                                       end: serviceData.endGroupHandle)
 
@@ -747,7 +747,7 @@ public final class GATTClient {
             for serviceData in pdu.handles {
 
                 let service = Service(uuid: serviceUUID,
-                                      type: operation.type,
+                                      isPrimary: operation.type == .primaryService,
                                       handle: serviceData.foundAttribute,
                                       end: serviceData.groupEnd)
 
@@ -1240,11 +1240,17 @@ public extension GATTClient {
 
         public let uuid: BluetoothUUID
 
-        public let type: GATT.UUID
+        public let isPrimary: Bool
 
         public let handle: UInt16
 
         public let end: UInt16
+
+        @available(*, deprecated, renamed: "isPrimary")
+        public var type: BluetoothUUID {
+
+            return isPrimary ? .primaryService : .secondaryService
+        }
     }
 
     /// A discovered characteristic.

diff --git a/Tests/BluetoothTests/GATTTests.swift b/Tests/BluetoothTests/GATTTests.swift
@@ -13,6 +13,7 @@ import Foundation
 final class GATTTests: XCTestCase {
 
     static let allTests = [
+        ("testUUID", testUUID),
         ("testGATT", testGATT),
         ("testMTUExchange", testMTUExchange),
         ("testDiscoverPrimaryServicesNoMTUExchange", testDiscoverPrimaryServicesNoMTUExchange),
@@ -23,6 +24,11 @@ final class GATTTests: XCTestCase {
         ("testDiscoverServiceByUUID", testDiscoverServiceByUUID)
     ]
 
+    func testUUID() {
+
+
+    }
+
     func testMTUExchange() {
 
         guard let mtu = ATTMaximumTransmissionUnit(rawValue: 512)
@@ -603,7 +609,7 @@ final class GATTTests: XCTestCase {
                 XCTAssertEqual(foundService.uuid, services[0].uuid)
                 XCTAssertEqual(foundService.handle, database.serviceHandles(at: 0).start)
                 XCTAssertEqual(foundService.end, database.serviceHandles(at: 0).end)
-                XCTAssertEqual(foundService.type.uuid, database.first!.uuid)
+                XCTAssertEqual(foundService.isPrimary, database.first!.uuid == .primaryService)
 
                 client.discoverAllCharacteristics(of: foundService)  {
 
@@ -686,7 +692,7 @@ final class GATTTests: XCTestCase {
 
                 XCTAssertEqual(foundService.handle, database.serviceHandles(at: 0).start)
                 XCTAssertEqual(foundService.end, database.serviceHandles(at: 0).end)
-                XCTAssertEqual(foundService.type.uuid, database.first!.uuid)
+                XCTAssertEqual(foundService.isPrimary, database.first!.uuid == .primaryService)
 
                 client.discoverAllCharacteristics(of: foundService)  {
 
@@ -845,7 +851,7 @@ final class GATTTests: XCTestCase {
 
                     XCTAssertEqual(foundService.handle, database.serviceHandles(at: 0).start)
                     XCTAssertEqual(foundService.end, database.serviceHandles(at: 0).end)
-                    XCTAssertEqual(foundService.type.uuid, database[0].uuid)
+                    XCTAssertEqual(foundService.isPrimary, database.first!.uuid == .primaryService)
 
                     client.discoverAllCharacteristics(of: foundService)  {