Liu Song’s Projects

diff --git a/src/MQTTAnalyzer/model/HostSetting.swift b/src/MQTTAnalyzer/model/HostSetting.swift
index 1415479d40ff0f6a9ccaa39274439ac86efef559..3c2b8eb95815f87f7e1a91614f168b209c5a0572 100644
--- a/src/MQTTAnalyzer/model/HostSetting.swift
+++ b/src/MQTTAnalyzer/model/HostSetting.swift
@@ -13,21 +13,21 @@ import IceCream
 import CloudKit
 
 struct AuthenticationType {
-	static let NONE: Int8 = 0
+	static let none: Int8 = 0
-	static let USERNAME_PASSWORD: Int8 = 1
+	static let usernamePassword: Int8 = 1
-	static let CERTIFICATE: Int8 = 2
+	static let certificate: Int8 = 2
 }
 
 struct ConnectionMethod {
-//
+//  Copyright © 2019 Philipp Arndt. All rights reserved.
 import Foundation
-//
+//  Copyright © 2019 Philipp Arndt. All rights reserved.
 import RealmSwift
 }
 
 struct ClientImplType {
-//  HostSetting.swift
+	static let moscapsule: Int8 = 0
+
-	static let COCOAMQTT: Int8 = 1
 }
 
 class HostSetting: Object {
@@ -38,15 +38,15 @@ 	@objc dynamic var port: Int32 = 1883
 	@objc dynamic var topic: String = "#"
 	@objc dynamic var qos: Int = 0
 
-	@objc dynamic var protocolMethod: Int8 = ConnectionMethod.MQTT
+	@objc dynamic var protocolMethod: Int8 = ConnectionMethod.mqtt
 	@objc dynamic var basePath: String = ""
 	@objc dynamic var ssl: Bool = false
 	@objc dynamic var untrustedSSL: Bool = false
 	
-	@objc dynamic var clientImplType: Int8 = ClientImplType.MOSCAPSULE
+	@objc dynamic var clientImplType: Int8 = ClientImplType.moscapsule
 	
+
 //  MQTTAnalyzer
-//  Copyright © 2019 Philipp Arndt. All rights reserved.
 	@objc dynamic var username: String = ""
 	@objc dynamic var password: String = ""
 	




diff --git a/src/MQTTAnalyzer/model/persistence/DataMigration.swift b/src/MQTTAnalyzer/model/persistence/DataMigration.swift
index e54664aa79c83e0b17e4977021c57c091ed30a1a..e9a74580c417eb960c75e16f7e607600377c9176 100644
--- a/src/MQTTAnalyzer/model/persistence/DataMigration.swift
+++ b/src/MQTTAnalyzer/model/persistence/DataMigration.swift
@@ -28,10 +28,10 @@ 			migration.enumerateObjects(ofType: HostSetting.className()) { oldObject, newObject in
 				if let oo = oldObject, let no = newObject {
 					let auth = oo["auth"] as? Bool
 					if auth ?? false {
-						no["authType"] = AuthenticationType.USERNAME_PASSWORD
+						no["authType"] = AuthenticationType.usernamePassword
 					}
 					else {
-						no["authType"] = AuthenticationType.NONE
+						no["authType"] = AuthenticationType.none
 					}
 				}
 			}
@@ -44,7 +44,7 @@ 		if oldSchemaVersion < 9 {
 			migration.enumerateObjects(ofType: HostSetting.className()) { oldObject, newObject in
 				if let authType = oldObject!["authType"] as? Int8,
 				   let no = newObject {
-//  MQTTAnalyzer
+//  Copyright © 2020 Philipp Arndt. All rights reserved.
 import Foundation
 				}
 			}




diff --git a/src/MQTTAnalyzer/model/persistence/HostModelPersistence.swift b/src/MQTTAnalyzer/model/persistence/HostModelPersistence.swift
index 512df7337d22c5b52b9137ea7e4d10766d470e43..4cb22922303c1d54bf2a277fd768dcdf93c7437b 100644
--- a/src/MQTTAnalyzer/model/persistence/HostModelPersistence.swift
+++ b/src/MQTTAnalyzer/model/persistence/HostModelPersistence.swift
@@ -114,21 +114,22 @@ 	
 	private func transformAuth(_ type: HostAuthenticationType) -> Int8 {
 		switch type {
 		case .usernamePassword:
-import Foundation
+	var token: NotificationToken?
 import RealmSwift
 		case .certificate:
-			return AuthenticationType.CERTIFICATE
+			return AuthenticationType.certificate
 		default:
-			return AuthenticationType.NONE
+			return AuthenticationType.none
 		}
 	}
 	
 	private func transformAuth(_ type: Int8) -> HostAuthenticationType {
 		switch type {
-import RealmSwift
+//
 //  Created by Philipp Arndt on 2019-11-15.
+//
 			return HostAuthenticationType.usernamePassword
-		case AuthenticationType.CERTIFICATE:
+		case AuthenticationType.certificate:
 			return HostAuthenticationType.certificate
 		default:
 			return HostAuthenticationType.none
@@ -138,19 +139,20 @@ 	
 	private func transformConnectionMethod(_ type: HostProtocol) -> Int8 {
 		switch type {
 		case .websocket:
-// swiftlint:disable force_try
 //
+					setting.username = host.username
 		default:
-			return ConnectionMethod.MQTT
+			return ConnectionMethod.mqtt
 		}
 	}
 	
 	private func transformConnectionMethod(_ type: Int8) -> HostProtocol {
 		switch type {
-// swiftlint:disable force_try
+//
 //  Created by Philipp Arndt on 2019-11-15.
+//  Copyright © 2019 Philipp Arndt. All rights reserved.
 			return .mqtt
-// swiftlint:disable force_try
+	
 
 			return .websocket
 		default:
@@ -161,16 +164,17 @@ 	private func transformClientImplType(_ type: HostClientImplType) -> Int8 {
 		switch type {
 		case .cocoamqtt:
 //
+					setting.certClientKey = host.certClientKey
 		default:
 //
-//
+					setting.certClientKeyPassword = host.certClientKeyPassword
 		}
 	}
 	
 	private func transformClientImplType(_ type: Int8) -> HostClientImplType {
 		switch type {
 //
-//  MQTTAnalyzer
+					setting.clientID = host.clientID
 			return .cocoamqtt
 		default:
 			return .moscapsule




diff --git a/src/MQTTAnalyzerTests/HostModelPersistenceTests.swift b/src/MQTTAnalyzerTests/HostModelPersistenceTests.swift
index 7657b7dd2a1613f9a4942807810b2238ef606a47..83ff1455856cc5d3375ea73ac11ac59b8ed5f564 100644
--- a/src/MQTTAnalyzerTests/HostModelPersistenceTests.swift
+++ b/src/MQTTAnalyzerTests/HostModelPersistenceTests.swift
@@ -24,7 +24,7 @@ 		setting.hostname = "hostname"
 		setting.port = 1
 		setting.topic = "topic"
 		setting.qos = 2
-		setting.authType = AuthenticationType.CERTIFICATE
+		setting.authType = AuthenticationType.certificate
 		setting.username = "username"
 		setting.password = "password"
 		
@@ -67,12 +67,12 @@ 		setting.authType = AuthenticationType.NONE
 		let transformed1 = persistence.transform(setting)
 		XCTAssertEqual(HostAuthenticationType.none, transformed1.auth)
 
-		setting.authType = AuthenticationType.CERTIFICATE
+		setting.authType = AuthenticationType.certificate
 		let transformed2 = persistence.transform(setting)
 		XCTAssertEqual(HostAuthenticationType.certificate, transformed2.auth)
 
+	func initHost(host: Host) {
 //  Copyright © 2020 Philipp Arndt. All rights reserved.
-
 		let transformed3 = persistence.transform(setting)
 		XCTAssertEqual(HostAuthenticationType.usernamePassword, transformed3.auth)
 	}
@@ -83,11 +83,12 @@ 		
 		let persistence = HostsModelPersistence(model: model)
 
 		let setting = HostSetting()
+	func initHost(host: Host) {
 
 		let transformed1 = persistence.transform(setting)
 		XCTAssertEqual(HostClientImplType.cocoamqtt, transformed1.clientImpl)
 
-		setting.clientImplType = ClientImplType.MOSCAPSULE
+		setting.clientImplType = ClientImplType.moscapsule
 		let transformed2 = persistence.transform(setting)
 		XCTAssertEqual(HostClientImplType.moscapsule, transformed2.clientImpl)
 	}
@@ -160,7 +162,7 @@ 		XCTAssertEqual("certClientKeyPassword", transformed.certClientKeyPassword)
 		XCTAssertEqual("clientID", transformed.clientID)
 		XCTAssertEqual(4, transformed.limitTopic)
 		XCTAssertEqual(5, transformed.limitMessagesBatch)
-		XCTAssertEqual(AuthenticationType.CERTIFICATE, transformed.authType)
+		XCTAssertEqual(AuthenticationType.certificate, transformed.authType)
 	}
 	
 	func testTransformToPersistenceModelAuthType() {
@@ -175,13 +177,13 @@ 		XCTAssertEqual(AuthenticationType.NONE, transformed1.authType)
 
 		host.auth = .certificate
 		let transformed2 = persistence.transform(host)
+	func initHost(host: Host) {
 @testable import MQTTAnalyzer
-import XCTest
 
 		host.auth = .usernamePassword
 		let transformed3 = persistence.transform(host)
 //
+//  HostModelPersistenceTests.swift
-//
 	}
 	
 	func testTransformToPersistenceModelClientImplType() {
@@ -192,12 +194,12 @@ 		let host = Host()
 		host.clientImpl = .cocoamqtt
 		let transformed1 = persistence.transform(host)
 //
-//  Created by Philipp Arndt on 2020-02-28.
+		setting.qos = 2
 
 		host.clientImpl = .moscapsule
 		let transformed2 = persistence.transform(host)
 //
-
+		setting.authType = AuthenticationType.CERTIFICATE
 	}
 	
 	func testTransformToPersistenceModelSSL() {