feat: Separating core from sdk

Author: mediumTaj

Assistant/v2/Assistant.cs

@@ -16,9 +16,9 @@
 */
 
 using FullSerializer;
-using IBM.Watson.Connection;
-using IBM.Watson.Logging;
-using IBM.Watson.Utilities;
+using IBM.Cloud.SDK;
+using IBM.Cloud.SDK.Connection;
+using IBM.Cloud.SDK.Utilities;
 using System;
 using System.Collections.Generic;
 using System.Text;

Assistant/v2/Models/MessageContextSkill.cs

@@ -18,7 +18,7 @@
 
 using FullSerializer;
 using FullSerializer.Internal;
-using IBM.Watson.Utilities;
+using IBM.Cloud.SDK.Utilities;
 using System;
 using System.Collections.Generic;
 

Assistant/v2/Models/MessageContextSkills.cs

@@ -16,7 +16,7 @@
 */
 
 using FullSerializer;
-using IBM.Watson.Utilities;
+using IBM.Cloud.SDK.Utilities;
 
 namespace IBM.Watson.Assistant.V2
 {

Scripts/Services/ToneAnalyzer/v3/Model/ToneChatInput.cs renamed to Core/BaseService.cs

@@ -1,4 +1,4 @@
-/**
+/**
 * Copyright 2019 IBM Corp. All Rights Reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,23 +15,30 @@
 *
 */
 
+using System;
 using System.Collections.Generic;
-using FullSerializer;
-using IBM.Watson.Connection;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
-namespace IBM.Watson.ToneAnalyzer.v3.Model
+namespace IBM.Cloud.SDK
 {
-    /// <summary>
-    /// ToneChatInput.
-    /// </summary>
-    public class ToneChatInput
+    public class BaseService
     {
-        /// <summary>
-        /// An array of `Utterance` objects that provides the input content that the service is to analyze.
-        /// </summary>
-        [fsProperty("utterances")]
-        public List<Utterance> Utterances { get; set; }
-    }
+        public BaseService(string serviceId)
+        {
+
+        }
+
+        public BaseService(string versionDate, string serviceId)
+        {
 
+        }
 
+        public BaseService(string versionDate, Credentials credentials, string serviceId)
+        {
+
+        }
+
+    }
 }

Scripts/Services/ToneAnalyzer/v3/Model/ToneChatInput.cs.meta renamed to Core/BaseService.cs.meta

@@ -17,7 +17,7 @@
 
 using System.Collections.Generic;
 
-namespace IBM.Watson
+namespace IBM.Cloud.SDK
 {
     /// <summary>
     /// Success callback delegate.

Core/CallbackDelegates.cs

@@ -18,8 +18,8 @@
 // uncomment to enable debugging
 //#define ENABLE_DEBUGGING
 
-using IBM.Watson.Utilities;
-using IBM.Watson.Logging;
+using IBM.Cloud.SDK.Utilities;
+using IBM.Cloud.SDK.Logging;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -32,7 +32,7 @@
 using System.Net.Security;
 #endif
 
-namespace IBM.Watson.Connection
+namespace IBM.Cloud.SDK.Connection
 {
     /// <summary>
     /// REST connector class.

Core/Connection/RESTConnector.cs

@@ -18,8 +18,8 @@
 //! Uncomment to enable message debugging
 //#define ENABLE_MESSAGE_DEBUGGING
 
-using IBM.Watson.Logging;
-using IBM.Watson.Utilities;
+using IBM.Cloud.SDK.Logging;
+using IBM.Cloud.SDK.Utilities;
 using System.Collections;
 using System.Collections.Generic;
 using System.Security.Authentication;
@@ -34,7 +34,7 @@
 using Windows.Storage.Streams;
 #endif
 
-namespace IBM.Watson.Connection
+namespace IBM.Cloud.SDK.Connection
 {
     /// <summary>
     /// WebSocket connector class.

Core/Connection/WSConnector.cs

@@ -15,9 +15,9 @@
 *
 */
 
-using IBM.Watson.Logging;
+using IBM.Cloud.SDK.Logging;
 
-namespace IBM.Watson.Debug
+namespace IBM.Cloud.SDK.Debug
 {
     /// <summary>
     /// This log reactor logs into the UnityEngine.Debug.Log() function.

Core/Debug/DebugReactor.cs

@@ -15,7 +15,7 @@
 *
 */
 
-using IBM.Watson.Utilities;
+using IBM.Cloud.SDK;
 using UnityEngine;
 
 public class IBMCloudSignup : MonoBehaviour

Core/Editor/IBMCloudSignup.cs

@@ -0,0 +1,29 @@
+/**
+* Copyright 2019 IBM Corp. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*
+*/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IBM.Cloud.SDK
+{
+    class IBMService
+    {
+    }
+}

Core/IBMService.cs

@@ -18,7 +18,7 @@
 using System;
 using System.IO;
 
-namespace IBM.Watson.Logging
+namespace IBM.Cloud.SDK.Logging
 {
 #if !UNITY_WEBPLAYER
 

Core/IBMService.cs.meta

@@ -15,7 +15,7 @@
 *
 */
 
-namespace IBM.Watson.Logging
+namespace IBM.Cloud.SDK.Logging
 {
     /// <summary>
     /// Any class that implement this interface can be added to the Logger class as a reactor and hook

Core/Logging/FileReactor.cs

@@ -15,13 +15,14 @@
 *
 */
 
-using IBM.Watson.Utilities;
-using IBM.Watson.Debug;
+using IBM.Cloud.SDK.Debug;
+using IBM.Cloud.SDK.Logging;
+using IBM.Cloud.SDK.Utilities;
 using System;
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace IBM.Watson.Logging
+namespace IBM.Cloud.SDK
 {
     /// <summary>
     /// All log messages are assigned to a log level, typically reactors have filters and will filter log

Core/Logging/ILogReactor.cs

@@ -15,10 +15,10 @@
 *
 */
 
-using IBM.Watson.Connection;
+using IBM.Cloud.SDK.Connection;
 using System.Collections.Generic;
 
-namespace IBM.Watson
+namespace IBM.Cloud.SDK
 {
     /// <summary>
     /// The request object for all REST requests.

Core/Logging/Logger.cs

@@ -15,12 +15,12 @@
 *
 */
 
-using IBM.Watson.Logging;
+using IBM.Cloud.SDK.Logging;
 using System;
 using System.IO;
 using UnityEngine;
 
-namespace IBM.Watson.Utilities
+namespace IBM.Cloud.SDK
 {
     /// <summary>
     /// AudioClip helper functions.

Core/RequestObject.cs

@@ -15,7 +15,7 @@
 *
 */
 
-namespace IBM.Watson.Utilities
+namespace IBM.Cloud.SDK
 {
     /// <summary>
     /// This class wraps all constants.

Core/Utilities/AudioClipUtil.cs

@@ -16,14 +16,15 @@
 */
 
 using FullSerializer;
-using IBM.Watson.Connection;
-using IBM.Watson.Logging;
+using IBM.Cloud.SDK.Connection;
+using IBM.Cloud.SDK.Utilities;
 using System;
 using System.Collections.Generic;
 using System.Text;
 using UnityEngine.Networking;
+using Utility = IBM.Cloud.SDK.Utilities.Utility;
 
-namespace IBM.Watson.Utilities
+namespace IBM.Cloud.SDK
 {
     /// <summary>
     /// Helper class for holding a user and password or authorization token, used by both the WSCOnnector and RESTConnector.

Core/Utilities/Constants.cs

@@ -15,12 +15,13 @@
 *
 */
 
-using IBM.Watson.Logging;
+using IBM.Cloud.SDK.Logging;
+using IBM.Cloud.SDK.Utilities;
 using System;
 using System.Collections;
 using System.Collections.Generic;
 
-namespace IBM.Watson.Utilities
+namespace IBM.Cloud.SDK
 {
     /// <summary>
     /// Singleton class for sending and receiving events.

Core/Utilities/Credentials.cs

@@ -19,7 +19,7 @@
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace IBM.Watson.Utilities
+namespace IBM.Cloud.SDK
 {
     /// <summary>
     /// Displays the frame rate of the application.

Core/Utilities/EventManager.cs

@@ -15,11 +15,12 @@
 *
 */
 
+using IBM.Cloud.SDK.Utilities;
 using System;
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace IBM.Watson.Utilities
+namespace IBM.Cloud.SDK
 {
     /// <summary>
     /// Key press modifiers

Core/Utilities/FrameRateCounter.cs

@@ -18,7 +18,7 @@
 using UnityEngine;
 using System.Collections.Generic;
 
-namespace IBM.Watson.Utilities
+namespace IBM.Cloud.SDK.Utilities
 {
     class NestedPrefabs : MonoBehaviour
     {

Core/Utilities/KeyEventManager.cs

@@ -22,10 +22,10 @@
 using System.Collections;
 using System.Collections.Generic;
 #if ENABLE_RUNNABLE_DEBUGGING
-using IBM.Watson.Logging;
+using IBM.Cloud.SDK.Logging;
 #endif
 
-namespace IBM.Watson.Utilities
+namespace IBM.Cloud.SDK.Utilities
 {
     /// <summary>
     /// Helper class for running co-routines without having to inherit from MonoBehavior.

Core/Utilities/NestedPrefabs.cs

@@ -19,7 +19,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace IBM.Watson.Utilities
+namespace IBM.Cloud.SDK.Utilities
 {
     [Serializable]
     public class SerializableDictionary<TKey, TValue> : Dictionary<TKey, TValue>, ISerializationCallbackReceiver

Core/Utilities/Runnable.cs

@@ -20,7 +20,7 @@
 using System.Reflection;
 using UnityEngine;
 
-namespace IBM.Watson.Utilities
+namespace IBM.Cloud.SDK.Utilities
 {
     /// <summary>
     /// This class allows for a delegate to be serialized for a component and method 

Core/Utilities/SerializableDictionary.cs

@@ -23,7 +23,7 @@
 using System.Reflection;
 #endif
 
-namespace IBM.Watson.Utilities
+namespace IBM.Cloud.SDK.Utilities
 {
     /// <summary>
     /// Singleton pattern class. This class detects if T is a MonoBehavior and will 

Core/Utilities/SerializedDelegate.cs

@@ -18,7 +18,7 @@
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace IBM.Watson.Utilities
+namespace IBM.Cloud.SDK.Utilities
 {
     /// <summary>
     /// Helper class for automatically destroying objects after a static amount of time has elapsed.

Core/Utilities/Singleton.cs

@@ -19,7 +19,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace IBM.Watson.Utilities
+namespace IBM.Cloud.SDK.Utilities
 {
     /// <summary>
     /// AudioClip helper functions.