assets independancy

Fixed dependancy of api assets from the parsed open api model

Author: kolodi

.gitignore

@@ -52,4 +52,6 @@ crashlytics-build.properties
 
 # Custom
 [Aa]ssets/Apis
-[Aa]ssets/Apis.meta
+[Aa]ssets/Apis.meta
+[Aa]ssets/Experiments
+[Aa]ssets/Experiments.meta

Assets/UnityOpenApi/Editor/OpenApiParser.cs

@@ -64,33 +64,218 @@ private MemoryStream CreateStream(string text)
  return stream;
  }
 
- public void GenerateAssets(OpenApiDocument openApiDocument)
+ public void GenerateAssets(OpenApiDocument doc)
  {
  string assetsPath = EditorUtility.OpenFolderPanel("Select assets folder", _lastAssetPath, "");
  _lastAssetPath = assetsPath;
  assetsPath = assetsPath.Substring(assetsPath.IndexOf("Assets"));
- ApiAsset apiAsset = AssetsHelper.GetOrCreateScriptableObject<ApiAsset>(assetsPath, openApiDocument.Info.Title);
- apiAsset.UpdateWithApiDocument(openApiDocument);
+ ApiAsset apiAsset = AssetsHelper.GetOrCreateScriptableObject<ApiAsset>(assetsPath, doc.Info.Title);
+
+ #region ApiAsset update
  apiAsset.Http = http;
+ apiAsset.info = new OAInfo()
+ {
+ Title = doc.Info.Title,
+ Description = doc.Info.Description,
+ Version = doc.Info.Version,
+ TermsOfService = doc.Info.TermsOfService == null ? "" : doc.Info.TermsOfService.ToString(),
+ Contact = CreateContact(doc.Info.Contact),
+ License = CreateLicence(doc.Info.License),
+ };
+
+ apiAsset.externalDocs = CreateExternalDocs(doc.ExternalDocs);
+
+ apiAsset.servers = doc.Servers.Select(s => CreateAOServer(s)).ToList();
+
 
  apiAsset.pathItemAssets = new List<PathItemAsset>();
 
- foreach (var p in openApiDocument.Paths)
+ #endregion
+
+ foreach (var p in doc.Paths)
  {
  string fileName = p.Key.Replace('/', '_');
  PathItemAsset a = AssetsHelper.GetOrCreateScriptableObject<PathItemAsset>(assetsPath, fileName);
  a.ApiAsset = apiAsset;
 
- a.UpdateWithPathData(p.Key, p.Value);
+ #region path item update
+
+
+ a.Path = p.Key;
+
+ a.Summary = p.Value.Summary;
+ a.Description = p.Value.Description;
+ a.Parameters = p.Value.Parameters.Select(par => CreateAOParameter(par)).ToList();
+ a.Operations = p.Value.Operations.Select(o => CreateAOOperation(o.Key, o.Value, a)).ToList();
+ a.Servers = p.Value.Servers.Select(s => CreateAOServer(s)).ToList();
+
+ #endregion
 
  apiAsset.pathItemAssets.Add(a);
  }
 
- 
+
 
  AssetDatabase.SaveAssets();
  }
 
+ private OAParameter CreateAOParameter(OpenApiParameter openApiParameter)
+ {
+ return new OAParameter()
+ {
+ Name = openApiParameter.Name,
+ Required = openApiParameter.Required,
+ AllowReserved = openApiParameter.AllowReserved,
+ Explode = openApiParameter.Explode,
+ AllowEmptyValue = openApiParameter.AllowEmptyValue,
+ Deprecated = openApiParameter.Deprecated,
+ Description = openApiParameter.Description,
+ UnresolvedReference = openApiParameter.UnresolvedReference,
+
+ In = (OAParameterLocation)openApiParameter.In,
+
+ Reference = CreateReference(openApiParameter.Reference),
+ };
+ }
+
+ private OAOperation CreateAOOperation(OperationType operationType, OpenApiOperation op, PathItemAsset pathItemAsset)
+ {
+ var operation = new OAOperation()
+ {
+ pathAsset = pathItemAsset,
+ OperationId = op.OperationId,
+ OperationType = (AOOperationType)operationType,
+ Summary = op.Summary,
+ Description = op.Description,
+ Deprecated = op.Deprecated,
+
+ Parameters = op.Parameters.Count > 0 ?
+ op.Parameters.Select(p => CreateAOParameter(p)).ToList() :
+ pathItemAsset.Parameters,
+
+
+ Servers = op.Servers.Select(s => CreateAOServer(s)).ToList(),
+
+ Tags = op.Tags.Select(t => CreateOATag(t)).ToList(),
+
+ RequestBody = CreateOARequestBody(op.RequestBody),
+
+ ExternalDocs = CreateExternalDocs(op.ExternalDocs),
+ };
+ operation.ParametersValues = operation.Parameters.Select(p => new ParameterValue { parameter = p }).ToList();
+
+ return operation;
+ }
+
+ private OATag CreateOATag(OpenApiTag openApiTag)
+ {
+ return new OATag()
+ {
+ Name = openApiTag.Name,
+ Description = openApiTag.Description,
+ ExternalDocs = CreateExternalDocs(openApiTag.ExternalDocs),
+ };
+ }
+
+ public OARequestBody CreateOARequestBody(OpenApiRequestBody requestBody)
+ {
+ if (requestBody == null) return new OARequestBody();
+
+ return new OARequestBody()
+ {
+ Description = requestBody.Description,
+ Required = requestBody.Required,
+ };
+ }
+
+ private OAReference CreateReference(OpenApiReference openApiReference)
+ {
+ if (openApiReference == null) return new OAReference();
+
+ return new OAReference()
+ {
+ IsPresent = true,
+ ExternalResource = openApiReference.ExternalResource,
+ Type = (OAReferenceType)openApiReference.Type,
+ Id = openApiReference.Id,
+ IsExternal = openApiReference.IsExternal,
+ IsLocal = openApiReference.IsLocal,
+ Reference = string.IsNullOrEmpty(openApiReference.ReferenceV2)
+ ? openApiReference.ReferenceV3 : openApiReference.ReferenceV2,
+ };
+ }
+
+ private OAContact CreateContact(OpenApiContact openApiContact)
+ {
+ if (openApiContact == null)
+ return new OAContact();
+
+ return new OAContact()
+ {
+ Url = openApiContact.Url.ToString(),
+ Name = openApiContact.Name,
+ Email = openApiContact.Email,
+ Present = true,
+ };
+ }
+
+ private OALicense CreateLicence(OpenApiLicense openApiLicense)
+ {
+ if (openApiLicense == null) return new OALicense();
+
+ return new OALicense()
+ {
+ Name = openApiLicense.Name,
+ Url = openApiLicense.Url.ToString(),
+ Present = true,
+ };
+ }
+
+ private OAExternalDocs CreateExternalDocs(OpenApiExternalDocs ExternalDocs)
+ {
+ if (ExternalDocs != null)
+ {
+ return new OAExternalDocs()
+ {
+ Description = ExternalDocs.Description,
+ Url = ExternalDocs.Url.ToString(),
+ };
+ }
+ return new OAExternalDocs();
+ }
+
+ private OAServer CreateAOServer(OpenApiServer s)
+ {
+ var server = new OAServer()
+ {
+ Description = s.Description,
+ Url = s.Url,
+ Variables = s.Variables.ToDictionary(v => v.Key, v => new OAServerVariable()
+ {
+ Name = v.Key,
+ Description = v.Value.Description,
+ Default = v.Value.Default,
+ Enum = new List<string>(v.Value.Enum),
+ Current = v.Value.Enum.IndexOf(v.Value.Default)
+ }).Values.ToList(),
+ };
+ server.Variables.ForEach(v =>
+ {
+ v.Default = v.Default.Trim('/');
+ if (v.Enum.Count == 0)
+ {
+ v.Enum = new List<string> { v.Default };
+ }
+ else
+ {
+ // trim all slashes for variants
+ v.Enum = new List<string>(v.Enum.Select(e => e.Trim('/')));
+ }
+ v.Current = 0;
+ });
+ return server;
+ }
+
 }
 
 [CustomEditor(typeof(OpenApiParser))]

Assets/UnityOpenApi/OA Models/OAContact.cs

@@ -10,18 +10,6 @@ public class OAContact
  public string Name;
  public string Url;
  public string Email;
- public bool Present = true;
-
- public OAContact (OpenApiContact openApiContact)
- {
- if(openApiContact == null)
- {
- Present = false;
- return;
- }
- Url = openApiContact.Url.ToString();
- Name = openApiContact.Name;
- Email = openApiContact.Email;
- }
+ public bool Present;
  }
 }

Assets/UnityOpenApi/OA Models/OAExternalDocs.cs

@@ -8,12 +8,5 @@ public class OAExternalDocs
  {
  public string Description;
  public string Url;
-
- public OAExternalDocs(OpenApiExternalDocs openApiExternalDocs)
- {
- if (openApiExternalDocs == null) return;
- Description = openApiExternalDocs.Description;
- Url = openApiExternalDocs.Url.ToString();
- }
  }
 }

Assets/UnityOpenApi/OA Models/OAInfo.cs

@@ -4,23 +4,13 @@
 namespace UnityOpenApi
 {
  [Serializable]
- internal class OAInfo
+ public class OAInfo
  {
  public string Title;
  public string Description;
  public string Version;
  public string TermsOfService;
  public OAContact Contact;
  public OALicense License;
-
- public OAInfo (OpenApiInfo openApiInfo)
- {
- Title = openApiInfo.Title;
- Description = openApiInfo.Description;
- Version = openApiInfo.Version;
- TermsOfService = openApiInfo.TermsOfService == null ? "" : openApiInfo.TermsOfService.ToString();
- Contact = new OAContact(openApiInfo.Contact);
- License = new OALicense(openApiInfo.License);
- }
  }
 }

Assets/UnityOpenApi/OA Models/OALicense.cs

@@ -8,17 +8,6 @@ public class OALicense
  {
  public string Name;
  public string Url;
- public bool Present = true;
-
- public OALicense(OpenApiLicense openApiLicense)
- {
- if(openApiLicense==null)
- {
- Present = false;
- return;
- }
- Name = openApiLicense.Name;
- Url = openApiLicense.Url.ToString();
- }
+ public bool Present;
  }
 }

Assets/UnityOpenApi/OA Models/OAOperation.cs

@@ -42,35 +42,6 @@ public int OperationCurrentHash
  }
  }
 
- public OAOperation(OperationType operationType, OpenApiOperation op, PathItemAsset pathItemAsset)
- {
- pathAsset = pathItemAsset;
- OperationId = op.OperationId;
- OperationType = (AOOperationType)operationType;
- Summary = op.Summary;
- Description = op.Description;
- Deprecated = op.Deprecated;
-
- if (op.Parameters.Count > 0)
- {
- Parameters = op.Parameters.Select(p => new OAParameter(p)).ToList();
- }
- else
- {
- Parameters = pathItemAsset.Parameters;
- }
-
- ParametersValues = Parameters.Select(p => new ParameterValue { parameter = p }).ToList();
-
- Servers = op.Servers.Select(s => new OAServer(s)).ToList();
-
- Tags = op.Tags.Select(t => new OATag(t)).ToList();
-
- RequestBody = new OARequestBody(op.RequestBody);
-
- ExternalDocs = new OAExternalDocs(op.ExternalDocs);
- }
-
  public void SetParameterValue(string parameterName, string val)
  {
  var parVal = ParametersValues.FirstOrDefault(p => p.parameter.Name == parameterName);

Assets/UnityOpenApi/OA Models/OAParameter.cs

@@ -18,21 +18,5 @@ public class OAParameter
  public OAReference Reference;
  public bool UnresolvedReference;
  //public IDictionary<string, OpenApiMediaType> Content;
-
- public OAParameter (OpenApiParameter openApiParameter)
- {
- Name = openApiParameter.Name;
- Required = openApiParameter.Required;
- AllowReserved = openApiParameter.AllowReserved;
- Explode = openApiParameter.Explode;
- AllowEmptyValue = openApiParameter.AllowEmptyValue;
- Deprecated = openApiParameter.Deprecated;
- Description = openApiParameter.Description;
- UnresolvedReference = openApiParameter.UnresolvedReference;
-
- In = (OAParameterLocation)openApiParameter.In;
-
- Reference = new OAReference(openApiParameter.Reference);
- }
  }
 }

Assets/UnityOpenApi/OA Models/OAReference.cs

@@ -13,19 +13,5 @@ public class OAReference
  public bool IsExternal;
  public bool IsLocal;
  public string Reference;
-
- public OAReference(OpenApiReference openApiReference)
- {
- if (openApiReference == null) return;
-
- IsPresent = true;
- ExternalResource = openApiReference.ExternalResource;
- Type = (OAReferenceType)openApiReference.Type;
- Id = openApiReference.Id;
- IsExternal = openApiReference.IsExternal;
- IsLocal = openApiReference.IsLocal;
- Reference = string.IsNullOrEmpty(openApiReference.ReferenceV2)
- ? openApiReference.ReferenceV3 : openApiReference.ReferenceV2;
- }
  }
 }