Skip to content

Commit db0d2a1

Browse files
mediumTajmediumTaj
authored
Merge pull request #405 from watson-developer-cloud/404-error-in-runtime
404 error in runtime
2 parents 4a17e07 + 685334c commit db0d2a1

File tree

5 files changed

+125
-63
lines changed

5 files changed

+125
-63
lines changed

‎Examples/ServiceExamples/Scripts/ExampleDiscovery.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
using IBM.Watson.DeveloperCloud.Utilities;
2121
using System.Collections;
2222
using System.Collections.Generic;
23-
using UnityEditor;
2423
using UnityEngine;
2524

2625
public class ExampleDiscovery : MonoBehaviour
@@ -157,7 +156,7 @@ private IEnumerator Examples()
157156

158157
// Add Configuration
159158
Log.Debug("TestDiscovery.RunTest()", "Attempting to add configuration");
160-
if (!_service.AddConfiguration(OnAddConfiguration, OnFail, _environmentId, _configurationJson.Replace("{guid}", GUID.Generate().ToString())))
159+
if (!_service.AddConfiguration(OnAddConfiguration, OnFail, _environmentId, _configurationJson.Replace("{guid}", System.Guid.NewGuid().ToString())))
161160
Log.Debug("TestDiscovery.AddConfiguration()", "Failed to add configuration");
162161
while (!_addConfigurationTested)
163162
yield return null;
@@ -185,7 +184,7 @@ private IEnumerator Examples()
185184

186185
// Add Collection
187186
Log.Debug("TestDiscovery.RunTest()", "Attempting to add collection");
188-
if (!_service.AddCollection(OnAddCollection, OnFail, _environmentId, _createdCollectionName + GUID.Generate().ToString(), _createdCollectionDescription, _environmentId))
187+
if (!_service.AddCollection(OnAddCollection, OnFail, _environmentId, _createdCollectionName + System.Guid.NewGuid().ToString(), _createdCollectionDescription, _environmentId))
189188
Log.Debug("TestDiscovery.AddCollection()", "Failed to add collection");
190189
while (!_addCollectionTested)
191190
yield return null;

‎Examples/ServiceExamples/ServiceExamples.unity

Lines changed: 110 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ OcclusionCullingSettings:
1313
--- !u!104 &2
1414
RenderSettings:
1515
m_ObjectHideFlags: 0
16-
serializedVersion: 8
16+
serializedVersion: 9
1717
m_Fog: 0
1818
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
1919
m_FogMode: 3
@@ -39,6 +39,7 @@ RenderSettings:
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
4141
m_IndirectSpecularColor: {r: 0.37311926, g: 0.38073996, b: 0.35872692, a: 1}
42+
m_UseRadianceAmbientProbe: 0
4243
--- !u!157 &3
4344
LightmapSettings:
4445
m_ObjectHideFlags: 0
@@ -54,11 +55,10 @@ LightmapSettings:
5455
m_EnableBakedLightmaps: 1
5556
m_EnableRealtimeLightmaps: 1
5657
m_LightmapEditorSettings:
57-
serializedVersion: 9
58+
serializedVersion: 10
5859
m_Resolution: 2
5960
m_BakeResolution: 40
60-
m_TextureWidth: 1024
61-
m_TextureHeight: 1024
61+
m_AtlasSize: 1024
6262
m_AO: 0
6363
m_AOMaxDistance: 1
6464
m_CompAOExponent: 0
@@ -90,7 +90,7 @@ LightmapSettings:
9090
m_PVRFilteringAtrousPositionSigmaAO: 1
9191
m_ShowResolutionOverlay: 1
9292
m_LightingDataAsset: {fileID: 0}
93-
m_UseShadowmask: 1
93+
m_UseShadowmask: 0
9494
--- !u!196 &4
9595
NavMeshSettings:
9696
serializedVersion: 2
@@ -140,10 +140,12 @@ MonoBehaviour:
140140
m_Script: {fileID: 11500000, guid: 852d029fa9fc2ad43a8ce3838c3fb70b, type: 3}
141141
m_Name:
142142
m_EditorClassIdentifier:
143+
_serviceUrl:
144+
_versionDate:
143145
_username:
144146
_password:
145-
_url:
146-
_versionDate:
147+
_iamApikey:
148+
_iamUrl:
147149
--- !u!4 &85803342
148150
Transform:
149151
m_ObjectHideFlags: 0
@@ -155,7 +157,7 @@ Transform:
155157
m_LocalScale: {x: 1, y: 1, z: 1}
156158
m_Children: []
157159
m_Father: {fileID: 0}
158-
m_RootOrder: 7
160+
m_RootOrder: 8
159161
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
160162
--- !u!1 &525603453
161163
GameObject:
@@ -167,7 +169,7 @@ GameObject:
167169
- component: {fileID: 525603455}
168170
- component: {fileID: 525603454}
169171
m_Layer: 0
170-
m_Name: ExampleLanguageTranslator
172+
m_Name: ExampleLanguageTranslatorV2
171173
m_TagString: Untagged
172174
m_Icon: {fileID: 0}
173175
m_NavMeshLayer: 0
@@ -181,12 +183,15 @@ MonoBehaviour:
181183
m_GameObject: {fileID: 525603453}
182184
m_Enabled: 1
183185
m_EditorHideFlags: 0
184-
m_Script: {fileID: 11500000, guid: d33458a9d3f434f2889ac182de6fa097, type: 3}
186+
m_Script: {fileID: 11500000, guid: 9d75f17512b67b842859cd865f1f5e08, type: 3}
185187
m_Name:
186188
m_EditorClassIdentifier:
189+
_serviceUrl:
190+
_versionDate:
187191
_username:
188192
_password:
189-
_url:
193+
_iamApikey:
194+
_iamUrl:
190195
--- !u!4 &525603455
191196
Transform:
192197
m_ObjectHideFlags: 0
@@ -287,7 +292,7 @@ Transform:
287292
m_LocalScale: {x: 1, y: 1, z: 1}
288293
m_Children: []
289294
m_Father: {fileID: 0}
290-
m_RootOrder: 11
295+
m_RootOrder: 12
291296
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
292297
--- !u!1 &832860416
293298
GameObject:
@@ -321,6 +326,9 @@ MonoBehaviour:
321326
_assistantUrl:
322327
_assistantWorkspaceId:
323328
_assistantVersionDate:
329+
_speechToTextUsername:
330+
_speechToTextPassword:
331+
_speechToTextUrl:
324332
--- !u!4 &832860418
325333
Transform:
326334
m_ObjectHideFlags: 0
@@ -332,7 +340,7 @@ Transform:
332340
m_LocalScale: {x: 1, y: 1, z: 1}
333341
m_Children: []
334342
m_Father: {fileID: 0}
335-
m_RootOrder: 13
343+
m_RootOrder: 14
336344
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
337345
--- !u!1 &854511683
338346
GameObject:
@@ -361,10 +369,12 @@ MonoBehaviour:
361369
m_Script: {fileID: 11500000, guid: cd2e3d3910ea1bd46b55eb5943a057f7, type: 3}
362370
m_Name:
363371
m_EditorClassIdentifier:
372+
_serviceUrl:
373+
_versionDate:
364374
_username:
365375
_password:
366-
_url:
367-
_versionDate:
376+
_iamApikey:
377+
_iamUrl:
368378
--- !u!4 &854511685
369379
Transform:
370380
m_ObjectHideFlags: 0
@@ -405,11 +415,13 @@ MonoBehaviour:
405415
m_Script: {fileID: 11500000, guid: 87040e721f2394a4a9f444ecbaf9d991, type: 3}
406416
m_Name:
407417
m_EditorClassIdentifier:
408-
_username:
409-
_password:
410-
_url:
418+
_serviceUrl:
411419
_workspaceId:
412420
_versionDate:
421+
_username:
422+
_password:
423+
_iamApikey:
424+
_iamUrl:
413425
--- !u!4 &859102724
414426
Transform:
415427
m_ObjectHideFlags: 0
@@ -421,7 +433,7 @@ Transform:
421433
m_LocalScale: {x: 1, y: 1, z: 1}
422434
m_Children: []
423435
m_Father: {fileID: 0}
424-
m_RootOrder: 5
436+
m_RootOrder: 6
425437
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
426438
--- !u!1 &1073418922
427439
GameObject:
@@ -450,10 +462,12 @@ MonoBehaviour:
450462
m_Script: {fileID: 11500000, guid: d4dd8308135b04c28945ad3e8489aa7f, type: 3}
451463
m_Name:
452464
m_EditorClassIdentifier:
465+
_serviceUrl:
466+
_versionDate:
453467
_username:
454468
_password:
455-
_url:
456-
_versionDate:
469+
_iamApikey:
470+
_iamUrl:
457471
--- !u!4 &1073418924
458472
Transform:
459473
m_ObjectHideFlags: 0
@@ -494,9 +508,11 @@ MonoBehaviour:
494508
m_Script: {fileID: 11500000, guid: 26bb17691cf8f4f44ad0b84e5d240b8f, type: 3}
495509
m_Name:
496510
m_EditorClassIdentifier:
511+
_serviceUrl:
497512
_username:
498513
_password:
499-
_url:
514+
_iamApikey:
515+
_iamUrl:
500516
--- !u!4 &1160237480
501517
Transform:
502518
m_ObjectHideFlags: 0
@@ -508,7 +524,7 @@ Transform:
508524
m_LocalScale: {x: 1, y: 1, z: 1}
509525
m_Children: []
510526
m_Father: {fileID: 0}
511-
m_RootOrder: 9
527+
m_RootOrder: 10
512528
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
513529
--- !u!1 &1194016994
514530
GameObject:
@@ -537,9 +553,12 @@ MonoBehaviour:
537553
m_Script: {fileID: 11500000, guid: ad04eacf696634a8398e0edcb39a9f15, type: 3}
538554
m_Name:
539555
m_EditorClassIdentifier:
556+
_serviceUrl:
557+
_versionDate:
540558
_username:
541559
_password:
542-
_url:
560+
_iamApikey:
561+
_iamUrl:
543562
--- !u!4 &1194016996
544563
Transform:
545564
m_ObjectHideFlags: 0
@@ -551,7 +570,7 @@ Transform:
551570
m_LocalScale: {x: 1, y: 1, z: 1}
552571
m_Children: []
553572
m_Father: {fileID: 0}
554-
m_RootOrder: 4
573+
m_RootOrder: 5
555574
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
556575
--- !u!1 &1646373635
557576
GameObject:
@@ -580,10 +599,12 @@ MonoBehaviour:
580599
m_Script: {fileID: 11500000, guid: a2bd480466fdc154fa059d91ab9b79a8, type: 3}
581600
m_Name:
582601
m_EditorClassIdentifier:
602+
_serviceUrl:
603+
_versionDate:
583604
_username:
584605
_password:
585-
_url:
586-
_versionDate:
606+
_iamApikey:
607+
_iamUrl:
587608
--- !u!4 &1646373637
588609
Transform:
589610
m_ObjectHideFlags: 0
@@ -595,7 +616,7 @@ Transform:
595616
m_LocalScale: {x: 1, y: 1, z: 1}
596617
m_Children: []
597618
m_Father: {fileID: 0}
598-
m_RootOrder: 8
619+
m_RootOrder: 9
599620
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
600621
--- !u!1 &1713392457
601622
GameObject:
@@ -624,9 +645,11 @@ MonoBehaviour:
624645
m_Script: {fileID: 11500000, guid: b7e385580aba14ae58cfdb1b5246dce6, type: 3}
625646
m_Name:
626647
m_EditorClassIdentifier:
627-
_apikey:
628-
_url:
648+
_serviceUrl:
629649
_versionDate:
650+
_apikey:
651+
_iamApikey:
652+
_iamUrl:
630653
--- !u!4 &1713392459
631654
Transform:
632655
m_ObjectHideFlags: 0
@@ -638,7 +661,53 @@ Transform:
638661
m_LocalScale: {x: 1, y: 1, z: 1}
639662
m_Children: []
640663
m_Father: {fileID: 0}
641-
m_RootOrder: 6
664+
m_RootOrder: 7
665+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
666+
--- !u!1 &1724361712
667+
GameObject:
668+
m_ObjectHideFlags: 0
669+
m_PrefabParentObject: {fileID: 0}
670+
m_PrefabInternal: {fileID: 0}
671+
serializedVersion: 5
672+
m_Component:
673+
- component: {fileID: 1724361714}
674+
- component: {fileID: 1724361713}
675+
m_Layer: 0
676+
m_Name: ExampleLanguageTranslatorV3
677+
m_TagString: Untagged
678+
m_Icon: {fileID: 0}
679+
m_NavMeshLayer: 0
680+
m_StaticEditorFlags: 0
681+
m_IsActive: 0
682+
--- !u!114 &1724361713
683+
MonoBehaviour:
684+
m_ObjectHideFlags: 0
685+
m_PrefabParentObject: {fileID: 0}
686+
m_PrefabInternal: {fileID: 0}
687+
m_GameObject: {fileID: 1724361712}
688+
m_Enabled: 1
689+
m_EditorHideFlags: 0
690+
m_Script: {fileID: 11500000, guid: 7f930490a8266dd44afb6661b870ded9, type: 3}
691+
m_Name:
692+
m_EditorClassIdentifier:
693+
_serviceUrl:
694+
_versionDate:
695+
_username:
696+
_password:
697+
_iamApikey:
698+
_iamUrl:
699+
--- !u!4 &1724361714
700+
Transform:
701+
m_ObjectHideFlags: 0
702+
m_PrefabParentObject: {fileID: 0}
703+
m_PrefabInternal: {fileID: 0}
704+
m_GameObject: {fileID: 1724361712}
705+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
706+
m_LocalPosition: {x: 0, y: 1, z: -10}
707+
m_LocalScale: {x: 1, y: 1, z: 1}
708+
m_Children: []
709+
m_Father: {fileID: 0}
710+
m_RootOrder: 4
642711
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
643712
--- !u!1 &1740459831
644713
GameObject:
@@ -667,9 +736,11 @@ MonoBehaviour:
667736
m_Script: {fileID: 11500000, guid: fbd939a6f78384e5898a22dda7832b0a, type: 3}
668737
m_Name:
669738
m_EditorClassIdentifier:
739+
_serviceUrl:
670740
_username:
671741
_password:
672-
_url:
742+
_iamApikey:
743+
_iamUrl:
673744
--- !u!4 &1740459833
674745
Transform:
675746
m_ObjectHideFlags: 0
@@ -681,7 +752,7 @@ Transform:
681752
m_LocalScale: {x: 1, y: 1, z: 1}
682753
m_Children: []
683754
m_Father: {fileID: 0}
684-
m_RootOrder: 10
755+
m_RootOrder: 11
685756
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
686757
--- !u!1 &2041722972
687758
GameObject:
@@ -710,7 +781,7 @@ Transform:
710781
m_LocalScale: {x: 1, y: 1, z: 1}
711782
m_Children: []
712783
m_Father: {fileID: 0}
713-
m_RootOrder: 12
784+
m_RootOrder: 13
714785
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
715786
--- !u!114 &2041722974
716787
MonoBehaviour:
@@ -757,11 +828,13 @@ MonoBehaviour:
757828
m_Script: {fileID: 11500000, guid: 9848745df680ac7438f802aac3f4b8f2, type: 3}
758829
m_Name:
759830
m_EditorClassIdentifier:
831+
_serviceUrl:
832+
_workspaceId:
833+
_versionDate:
760834
_username:
761835
_password:
762-
_url:
763-
_versionDate:
764-
_workspaceId:
836+
_iamApikey:
837+
_iamUrl:
765838
--- !u!4 &2118312581
766839
Transform:
767840
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)