merge to fix #14

Revert back to using InvocationData

examples/Hangfire.Raven.Examples.AspNetCore/Startup.cs

@@ -62,8 +62,7 @@ namespace Hangfire.Raven.Examples.AspNetCore
             app.UseHangfireDashboard();
 
             // Run once
-            // BUG: https://github.com/cady-io/hangfire-ravendb/issues/14
-            //BackgroundJob.Enqueue(() => System.Console.WriteLine("Background Job: Hello, world!"));
+            BackgroundJob.Enqueue(() => System.Console.WriteLine("Background Job: Hello, world!"));
 
             BackgroundJob.Enqueue(() => Test());
 

examples/Hangfire.Raven.Examples.AspNetCore/project.json

@@ -44,7 +44,7 @@
     },
     "dependencies": {
         "Hangfire.AspNetCore": "1.6.7",
-        "Hangfire.Raven": "2.1.0",
+        "Hangfire.Raven": "2.1.1",
         "Microsoft.NETCore.App": {
             "version": "1.0.1",
             "type": "platform"

examples/Hangfire.Raven.Examples.AspNetCore/project.lock.json

@@ -4174,7 +4174,7 @@
           "lib/netstandard1.3/System.Xml.XPath.XDocument.dll": {}
         }
       },
-      "Hangfire.Raven/2.1.0": {
+      "Hangfire.Raven/2.1.1": {
         "type": "project",
         "framework": ".NETCoreApp,Version=v1.0",
         "dependencies": {
@@ -10838,7 +10838,7 @@
         "ref/xamarinwatchos10/_._"
       ]
     },
-    "Hangfire.Raven/2.1.0": {
+    "Hangfire.Raven/2.1.1": {
       "type": "project",
       "path": "../../src/Hangfire.Raven/project.json",
       "msbuildProject": "../../src/Hangfire.Raven/Hangfire.Raven.xproj"
@@ -10847,7 +10847,7 @@
   "projectFileDependencyGroups": {
     "": [
       "Hangfire.AspNetCore >= 1.6.7",
-      "Hangfire.Raven >= 2.1.0",
+      "Hangfire.Raven >= 2.1.1",
       "Microsoft.AspNetCore.Diagnostics >= 1.0.0",
       "Microsoft.AspNetCore.Mvc >= 1.0.1",
       "Microsoft.AspNetCore.Razor.Tools >= 1.0.0-preview2-final",

examples/Hangfire.Raven.Examples.Console/Program.cs

@@ -29,9 +29,7 @@ namespace Hangfire.Raven.Examples.Console
                 var client = new BackgroundJobServer();
 
                 // Run once
-
-                // BUG: https://github.com/cady-io/hangfire-ravendb/issues/14
-                //BackgroundJob.Enqueue(() => System.Console.WriteLine("Background Job: Hello, world!"));
+                BackgroundJob.Enqueue(() => System.Console.WriteLine("Background Job: Hello, world!"));
 
                 BackgroundJob.Enqueue(() => Test());
 

examples/Hangfire.Raven.Examples.Console/project.json

@@ -52,7 +52,7 @@
         "net452": { }
     },
     "dependencies": {
-        "Hangfire.Raven": "2.1.0",
+        "Hangfire.Raven": "2.1.1",
         "System.ComponentModel.Primitives": "4.3.0"
     }
 }

examples/Hangfire.Raven.Examples.Console/project.lock.json

@@ -61,7 +61,7 @@
           "lib/net45/System.ComponentModel.Primitives.dll": {}
         }
       },
-      "Hangfire.Raven/2.1.0": {
+      "Hangfire.Raven/2.1.1": {
         "type": "project",
         "framework": ".NETFramework,Version=v4.5",
         "dependencies": {
@@ -140,7 +140,7 @@
           "lib/net45/System.ComponentModel.Primitives.dll": {}
         }
       },
-      "Hangfire.Raven/2.1.0": {
+      "Hangfire.Raven/2.1.1": {
         "type": "project",
         "framework": ".NETFramework,Version=v4.5",
         "dependencies": {
@@ -268,7 +268,7 @@
         "ref/xamarinwatchos10/_._"
       ]
     },
-    "Hangfire.Raven/2.1.0": {
+    "Hangfire.Raven/2.1.1": {
       "type": "project",
       "path": "../../src/Hangfire.Raven/project.json",
       "msbuildProject": "../../src/Hangfire.Raven/Hangfire.Raven.xproj"
@@ -276,7 +276,7 @@
   },
   "projectFileDependencyGroups": {
     "": [
-      "Hangfire.Raven >= 2.1.0",
+      "Hangfire.Raven >= 2.1.1",
       "System.ComponentModel.Primitives >= 4.3.0"
     ],
     ".NETFramework,Version=v4.5.2": []

src/Hangfire.Raven/Assemblies.cs

@@ -1,54 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-#if !NET45
-using Microsoft.Extensions.DependencyModel;
-#endif
-
-namespace Hangfire.Raven
-{
-    /// <summary>
-    /// Helper class for getting assemblies
-    /// </summary>
-    public static class Assemblies
-    {
-        /// <summary>
-        /// Get all loaded assemblies
-        /// </summary>
-        /// <returns></returns>
-        public static IEnumerable<Assembly> Get()
-        {
-#if NET45
-            return AppDomain.CurrentDomain.GetAssemblies().Where(a => a != null);
-#else
-            return (from compilationLibrary in DependencyContext.Default.CompileLibraries
-                    where compilationLibrary.Name.Contains(typeof(Assemblies).Namespace)
-                    select Assembly.Load(new AssemblyName(compilationLibrary.Name)))
-                    .ToList();
-#endif
-        }
-
-        /// <summary>
-        /// Get class by name within an assembly
-        /// </summary>
-        /// <param name="assembly">Assembly</param>
-        /// <param name="type">Name of type</param>
-        /// <returns></returns>
-        public static Type GetClass(Assembly assembly, string type)
-        {
-            return (from t in assembly.GetTypes()
-                    where t.FullName == type //&& !t.IsAbstract && t.IsClass
-                    select t).FirstOrDefault();
-        }
-
-        public static string GetAssemblyName(MemberInfo value)
-        {
-#if NET45
-            return value.DeclaringType.Assembly.GetName().Name;
-#else
-            return value.DeclaringType.GetTypeInfo().Assembly.GetName().Name;
-#endif
-        }
-    }
-}

src/Hangfire.Raven/Entities/RavenJob.cs

@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
 using Hangfire.Common;
 using Hangfire.Storage;
 using Hangfire.Storage.Monitoring;
@@ -15,31 +13,9 @@ namespace Hangfire.Raven.Entities
             this.Parameters = new Dictionary<string, string>();
             this.History = new List<StateHistoryDto>();
         }
-        public class JobWrapper
-        {
-            public IEnumerable<object> Arguments { get; set; }
-            public Type Type { get; set; }
-            public MethodInfo Method { get; set; }
-
-            public Job GetJob()
-            {
-                return new Job(this.Type, this.Method, this.Arguments.ToArray());
-            }
-
-            public static JobWrapper Create(Job job)
-            {
-                var toReturn = new JobWrapper();
-
-                toReturn.Arguments = job.Args;
-                toReturn.Method = job.Method;
-                toReturn.Type = job.Type;
-
-                return toReturn;
-            }
-        }
 
         public string Id { get; set; }
-        public JobWrapper Job { get; set; }
+        public InvocationData InvocationData { get; set; }
         public IDictionary<string, string> Parameters { get; set; }
         public DateTime CreatedAt { get; set; }
 

src/Hangfire.Raven/RavenConnection.cs

@@ -77,11 +77,13 @@ namespace Hangfire.Raven
             parameters.ThrowIfNull("parameters");
 
             using (var repository = _storage.Repository.OpenSession()) {
+                var invocationData = InvocationData.Serialize(job);
+
                 var guid = Guid.NewGuid().ToString();
 
                 var ravenJob = new RavenJob {
                     Id = Repository.GetId(typeof(RavenJob), guid),
-                    Job = JobWrapper.Create(job),
+                    InvocationData = invocationData,
                     CreatedAt = createdAt,
                     Parameters = parameters
                 };
@@ -107,12 +109,23 @@ namespace Hangfire.Raven
                     return null;
                 }
 
-                var job = jobData.Job.GetJob();
+                Job job = null;
+                JobLoadException loadException = null;
+
+                try
+                {
+                    job = jobData.InvocationData.Deserialize();
+                }
+                catch (JobLoadException ex)
+                {
+                    loadException = ex;
+                }
 
                 return new JobData {
                     Job = job,
                     State = jobData.StateData?.Name,
-                    CreatedAt = jobData.CreatedAt
+                    CreatedAt = jobData.CreatedAt,
+                    LoadException = loadException
                 };
             }
         }

src/Hangfire.Raven/RavenJsonConverters.cs

@@ -1,133 +0,0 @@
-using System;
-using System.Linq;
-using System.Reflection;
-using Raven.Imports.Newtonsoft.Json;
-using Raven.Imports.Newtonsoft.Json.Linq;
-
-namespace Hangfire.Raven
-{
-    /// <summary>
-    /// Base class for Raven Json Converters
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    public abstract class RavenJsonConverterBase<T>
-        : JsonConverter
-    {
-        public RavenJsonConverterBase()
-        {
-        }
-
-        /// <summary>
-        /// Read Json and convert to T
-        /// </summary>
-        /// <param name="type"></param>
-        /// <param name="value">Object to convert</param>
-        /// <param name="serializer">JsonSerializer</param>
-        /// <returns>Object</returns>
-        protected abstract T Read(Type type, object value, JsonSerializer serializer);
-
-        /// <summary>
-        /// Write Json and convert T to text
-        /// </summary>
-        /// <param name="value">Input</param>
-        /// <returns>Input as text</returns>
-        protected abstract object Write(T value, JsonSerializer serializer);
-
-        /// <summary>
-        /// Overriding the CanConvert of JsonConvert
-        /// </summary>
-        /// <param name="type"></param>
-        /// <returns></returns>
-        public override bool CanConvert(Type type) => typeof(T).IsAssignableFrom(type);
-
-        /// <summary>
-        /// Overriding the ReadJson of JsonConvert
-        /// </summary>
-        /// <param name="reader"></param>
-        /// <param name="type"></param>
-        /// <param name="existingValue"></param>
-        /// <param name="serializer"></param>
-        /// <returns></returns>
-        public override object ReadJson(JsonReader reader, Type type, object existingValue, JsonSerializer serializer)
-        {
-            T toReturn;
-
-            switch (reader.TokenType) {
-                case JsonToken.StartArray:
-                    toReturn = Read(type, JArray.Load(reader), serializer);
-                    break;
-                case JsonToken.StartObject:
-                    toReturn = Read(type, JObject.Load(reader), serializer);
-                    break;
-                default:
-                    toReturn = Read(type, reader.Value, serializer);
-                    break;
-            }
-
-            return toReturn;
-        }
-
-        /// <summary>
-        /// Overriding the WriteJson of JsonConvert
-        /// </summary>
-        /// <param name="writer"></param>
-        /// <param name="value"></param>
-        /// <param name="serializer"></param>
-        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
-        {
-            serializer.Serialize(writer, Write((T)value, serializer));
-        }
-    }
-
-    public class RavenJsonMethodConverter
-        : RavenJsonConverterBase<MethodInfo>
-    {
-        protected override MethodInfo Read(Type type, object value, JsonSerializer serializer)
-        {
-            if (value == null) {
-                return null;
-            }
-
-            var splitted = value.ToString().Split(';');
-
-            if (splitted.Count() == 3) {
-                var assembly = Assemblies.Get().Where(a => a.GetName().Name == splitted[0]).First();
-                var assemblyClass = Assemblies.GetClass(assembly, splitted[1]);
-
-                if (assemblyClass != null) {
-                    return assemblyClass.GetMethod(splitted[2]);
-                }
-            }
-
-            return null;
-        }
-
-        protected override object Write(MethodInfo value, JsonSerializer serializer) => $"{value.DeclaringType.GetTypeInfo().Assembly.GetName().Name};{value.DeclaringType.FullName};{value.Name}";
-    }
-
-    public class RavenJsonPropertyConverter
-        : RavenJsonConverterBase<PropertyInfo>
-    {
-        protected override PropertyInfo Read(Type type, object value, JsonSerializer serializer)
-        {
-            if (value == null) {
-                return null;
-            }
-
-            var splitted = value.ToString().Split(';');
-
-            if (splitted.Count() == 3) {
-                var assembly = Assemblies.Get().Where(a => a.GetName().Name == splitted[0]).First();
-                var assemblyType = Assemblies.GetClass(assembly, splitted[1]);
-
-                if (assemblyType != null) {
-                    return assemblyType.GetProperty(splitted[2]);
-                }
-            }
-
-            return null;
-        }
-
-        protected override object Write(PropertyInfo value, JsonSerializer serializer) => $"{value.DeclaringType.GetTypeInfo().Assembly.GetName().Name};{value.DeclaringType.FullName};{value.Name}";
-    }
-}

src/Hangfire.Raven/Repository.cs

@@ -7,7 +7,6 @@ using Raven.Abstractions.Data;
 using Raven.Client;
 using Raven.Client.Document;
 using Raven.Client.Indexes;
-using Raven.Imports.Newtonsoft.Json;
 
 namespace Hangfire.Raven
 {
@@ -26,7 +25,7 @@ namespace Hangfire.Raven
 
         public RepositoryObserver(Action<T> input)
         {
-            this._action = input;
+            _action = input;
         }
 
         public void OnCompleted()
@@ -41,7 +40,7 @@ namespace Hangfire.Raven
 
         public void OnNext(T value)
         {
-            this._action.Invoke(value);
+            _action.Invoke(value);
         }
     }
 
@@ -56,25 +55,13 @@ namespace Hangfire.Raven
 
             if (!string.IsNullOrEmpty(_config.ConnectionStringName)) {
                 _documentStore = new DocumentStore {
-                    ConnectionStringName = _config.ConnectionStringName,
-                    Conventions = new DocumentConvention() {
-                        CustomizeJsonSerializer = delegate (JsonSerializer input) {
-                            input.Converters.Add(new RavenJsonPropertyConverter());
-                            input.Converters.Add(new RavenJsonMethodConverter());
-                        }
-                    }
+                    ConnectionStringName = _config.ConnectionStringName
                 };
             } else {
                 _documentStore = new DocumentStore {
                     Url = _config.ConnectionUrl,
                     ApiKey = _config.ApiKey,
-                    DefaultDatabase = _config.Database,
-                    Conventions = new DocumentConvention() {
-                        CustomizeJsonSerializer = delegate (JsonSerializer input) {
-                            input.Converters.Add(new RavenJsonPropertyConverter());
-                            input.Converters.Add(new RavenJsonMethodConverter());
-                        }
-                    }
+                    DefaultDatabase = _config.Database
                 };
             }
 

src/Hangfire.Raven/Storage/RavenStorageMonitoringApi.cs

@@ -285,7 +285,7 @@ namespace Hangfire.Raven.Storage
                 return new JobDetailsDto {
                     CreatedAt = job.CreatedAt,
                     ExpireAt = repository.Advanced.GetExpire(job),
-                    Job = job.Job.GetJob(),
+                    Job = DeserializeJob(job.InvocationData),
                     History = job.History,
                     Properties = job.Parameters
                 };
@@ -399,7 +399,7 @@ namespace Hangfire.Raven.Storage
                          let stateData = job.StateData.Data != null
                              ? new Dictionary<string, string>(job.StateData.Data, StringComparer.OrdinalIgnoreCase)
                              : null
-                         let dto = selector(job, job.Job.GetJob(), stateData)
+                         let dto = selector(job, DeserializeJob(job.InvocationData), stateData)
                          select new KeyValuePair<string, TDto>(job.Id.Split(new char[] { '/' }, 2)[1], dto);
 
             return new JobList<TDto>(result);

src/Hangfire.Raven/project.json

@@ -1,6 +1,6 @@
 {
     "title": "Hangfire.Raven",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "description": "RavenDB job storage for Hangfire",
     "copyright": "Copyright @ 2016 Cady, LLC",
     "authors": [