Modified the 'FileSystem' class and the serialization method to skip …

…allow non-serializable file system (skip the serialization of a fs if 'fs.serializer()' returns null/undefined)
OpenMarshal · Jul 2, 2017 · 43acf3f · 43acf3f
1 parent 218d907
commit 43acf3f
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 2 deletions.
diff --git a/lib/manager/v2/fileSystem/FileSystem.d.ts b/lib/manager/v2/fileSystem/FileSystem.d.ts
@@ -16,6 +16,8 @@ export declare abstract class FileSystem implements ISerializableFileSystem {
     private __serializer;
     constructor(serializer: FileSystemSerializer);
     serializer(): FileSystemSerializer;
+    setSerializer(serializer: FileSystemSerializer): void;
+    doNotSerialize(): void;
     contextualize(ctx: RequestContext): ContextualFileSystem;
     resource(ctx: RequestContext, path: Path): Resource;
     fastExistCheckEx(ctx: RequestContext, _path: Path | string, errorCallback: SimpleCallback, callback: () => void): void;

diff --git a/lib/manager/v2/fileSystem/FileSystem.js b/lib/manager/v2/fileSystem/FileSystem.js
@@ -38,6 +38,12 @@ var FileSystem = (function () {
     FileSystem.prototype.serializer = function () {
         return this.__serializer;
     };
+    FileSystem.prototype.setSerializer = function (serializer) {
+        this.__serializer = serializer;
+    };
+    FileSystem.prototype.doNotSerialize = function () {
+        this.__serializer = null;
+    };
     FileSystem.prototype.contextualize = function (ctx) {
         return new ContextualFileSystem_1.ContextualFileSystem(this, ctx);
     };
@@ -780,7 +786,10 @@ var FileSystem = (function () {
         });
     };
     FileSystem.prototype.serialize = function (callback) {
-        this.serializer().serialize(this, callback);
+        var serializer = this.serializer();
+        if (!serializer)
+            return callback();
+        serializer.serialize(this, callback);
     };
     return FileSystem;
 }());

diff --git a/lib/manager/v2/fileSystem/Serialization.js b/lib/manager/v2/fileSystem/Serialization.js
@@ -8,6 +8,8 @@ function serialize(fileSystems, callback) {
         .each(Object.keys(fileSystems), function (path, cb) {
         var fs = fileSystems[path];
         var serializer = fs.serializer();
+        if (!serializer)
+            return cb(); // Skip serialization
         serializer.serialize(fs, function (e, data) {
             if (!e)
                 result[path] = {

diff --git a/src/manager/v2/fileSystem/FileSystem.ts b/src/manager/v2/fileSystem/FileSystem.ts
@@ -57,6 +57,14 @@ export abstract class FileSystem implements ISerializableFileSystem
     {
         return this.__serializer;
     }
+    setSerializer(serializer : FileSystemSerializer)
+    {
+        this.__serializer = serializer;
+    }
+    doNotSerialize()
+    {
+        this.__serializer = null;
+    }
 
     contextualize(ctx : RequestContext) : ContextualFileSystem
     {
@@ -1036,7 +1044,11 @@ export abstract class FileSystem implements ISerializableFileSystem
 
     serialize(callback : ReturnCallback<any>) : void
     {
-        this.serializer().serialize(this, callback);
+        const serializer = this.serializer();
+        if(!serializer)
+            return callback();
+
+        serializer.serialize(this, callback);
     }
 }
 

diff --git a/src/manager/v2/fileSystem/Serialization.ts b/src/manager/v2/fileSystem/Serialization.ts
@@ -44,6 +44,9 @@ export function serialize(fileSystems : UnserializedData, callback : ReturnCallb
         .each(Object.keys(fileSystems), (path, cb) => {
             const fs = fileSystems[path];
             const serializer = fs.serializer();
+            if(!serializer)
+                return cb(); // Skip serialization
+
             serializer.serialize(fs, (e, data) => {
                 if(!e)
                     result[path] = {