Merge pull request #12 from lillo42/fixes-error-to-integrate-with-gat…

…eway Fixes error to integrate with gateway
lillo42 · Feb 12, 2020 · e58a57a · e58a57a
2 parents bf7dc38 + e2b35a9
commit e58a57a
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 21 deletions.
diff --git a/sample/Multi/Startup.cs b/sample/Multi/Startup.cs
@@ -31,7 +31,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
                 app.UseDeveloperExceptionPage();
             }
 
-            app.UseHttpsRedirection();
+            //app.UseHttpsRedirection();
 
             app.UseRouting();
 

diff --git a/sample/Multi/Things/ExampleDimmableLight.cs b/sample/Multi/Things/ExampleDimmableLight.cs
@@ -108,7 +108,7 @@ public class FadeAction : Action
 
             protected override async ValueTask ExecuteAsync(CancellationToken cancellation)
             {
-                int value = Input["input"] as int? ?? 0;
+                int value = Input?["input"] as int? ?? 0;
                 await Task.Delay(value, cancellation);
 
                 var property = Thing.Properties.FirstOrDefault(x => x.Name == "brightness");

diff --git a/sample/Multi/appsettings.json b/sample/Multi/appsettings.json
@@ -1,7 +1,7 @@
 {
   "Logging": {
     "LogLevel": {
-      "Default": "Warning"
+      "Default": "Debug"
     }
   },
   "AllowedHosts": "*"

diff --git a/sample/Single/Startup.cs b/sample/Single/Startup.cs
@@ -33,7 +33,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
                 app.UseDeveloperExceptionPage();
             }
 
-            app.UseHttpsRedirection();
+            //app.UseHttpsRedirection();
 
             app.UseRouting();
 

diff --git a/sample/Single/appsettings.json b/sample/Single/appsettings.json
@@ -1,7 +1,7 @@
 {
   "Logging": {
     "LogLevel": {
-      "Default": "Warning"
+      "Default": "Debug"
     }
   },
   "AllowedHosts": "*"

diff --git a/src/Mozilla.IoT.WebThing/Activator/ThingActivator.cs b/src/Mozilla.IoT.WebThing/Activator/ThingActivator.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -38,6 +38,13 @@ public void Register<T>(IServiceProvider service) where T : Thing
         {
             string name = typeof(T).Name;
             Register<T>(service, name.Replace("Thing", ""));
+
+            var thing = CreateInstance(service, name.Replace("Thing", ""));
+
+            if (thing.Name != null)
+            {
+                _thingType.TryAdd(thing.Name, typeof(T));
+            }
         }
 
         public void Register<T>(IServiceProvider service, string thing)
@@ -53,6 +60,7 @@ public void Register<T>(IServiceProvider service, T thing)
         {
             _thingType.TryAdd(thing.Name, typeof(T));
             _typeActivatorCache.TryAdd(typeof(T), thing);
+
             BindingThingNotify(thing, service, thing.Name);
         }
 

diff --git a/src/Mozilla.IoT.WebThing/Property.cs b/src/Mozilla.IoT.WebThing/Property.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 
@@ -20,18 +20,16 @@ public Property(string name, object value, IDictionary<string, object> metadata)
         {
         }
 
+        private T _value;
+
         public new virtual T Value
         {
-            get
+            get => _value;
+            set
             {
-                if (base.Value == null)
-                {
-                    return default;
-                }
-
-                return (T)base.Value;
+                _value = value;
+                OnValueChanged();
             }
-            set => base.Value = value;
         }
 
         internal override Type Type => typeof(T);

diff --git a/src/Mozilla.IoT.WebThing/ServiceRouteBuilder.cs b/src/Mozilla.IoT.WebThing/ServiceRouteBuilder.cs
@@ -27,7 +27,7 @@ internal IEnumerable<IEndpointConventionBuilder> Build(IEndpointRouteBuilder end
 
                 if (!_option.IsSingleThing)
                 {
-                    prefix = "/{{thing}}";
+                    prefix = "/things/{thing}";
                     result.AddLast(endpointRouteBuilder.MapGet("/", GetThings.Invoke));
                     result.AddLast(endpointRouteBuilder.MapGet(prefix, GetThing.Invoke));
 

diff --git a/src/Mozilla.IoT.WebThing/ThingEndpointRouteBuilderExtensions.cs b/src/Mozilla.IoT.WebThing/ThingEndpointRouteBuilderExtensions.cs
@@ -70,9 +70,7 @@ public static ThingEndpointConventionBuilder MapThing<T>(this IEndpointRouteBuil
 
             var activator = builder.ServiceProvider.GetService<IThingActivator>();
             activator.Register<T>(builder.ServiceProvider, thing);
-
-
-
+
             var serviceRouteBuilder = builder.ServiceProvider.GetRequiredService<ServiceRouteBuilder>();
             var endpointConventionBuilders = serviceRouteBuilder.Build(builder);
 

diff --git a/test/Mozilla.IoT.WebThing.Test/Activator/ThingActivatorTest.cs b/test/Mozilla.IoT.WebThing.Test/Activator/ThingActivatorTest.cs
@@ -1,4 +1,4 @@
-using Mozilla.IoT.WebThing.Activator;
+using Mozilla.IoT.WebThing.Activator;
 #if DEBUG
 using System.Linq;
 using System;
@@ -295,7 +295,6 @@ public void GetEnumerator_Should_ReturnAllInstance()
 
         private class SampleThing : Thing
         {
-
         }
     }
 }