Skip to content

Commit a7378b5

Browse files
committed
remove unnecessary imports
1 parent 5e52d42 commit a7378b5

File tree

2 files changed

+25
-4
lines changed

2 files changed

+25
-4
lines changed

src/GraphODataTemplateWriter/CodeHelpers/Java/TypeHelperJava.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1132,8 +1132,7 @@ public static string CreatePackageDef(this CustomT4Host host)
11321132
11331133
import {2}.concurrency.*;
11341134
import {2}.core.*;
1135-
import {0}.models.extensions.*;
1136-
import {0}.models.generated.*;{3}{4}
1135+
import {0}.models.extensions.*;{3}{4}
11371136
import {2}.http.*;
11381137
import {0}.requests.extensions.*;
11391138
import {2}.serializer.*;

src/GraphODataTemplateWriter/TemplateProcessor/TemplateProcessor.cs

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ namespace Microsoft.Graph.ODataTemplateWriter.TemplateProcessor
1717
using Vipr.Core.CodeModel;
1818
using NLog;
1919
using Microsoft.Graph.ODataTemplateWriter.CodeHelpers.CSharp;
20+
using System.Windows.Markup;
2021

2122
public class TemplateProcessor : ITemplateProcessor
2223
{
@@ -348,8 +349,29 @@ protected TextFile ProcessTemplate(ITemplateInfo templateInfo, OdcmObject odcmOb
348349
throw new InvalidOperationException(errors);
349350
}
350351

351-
var @namespace = (odcmObject as OdcmType)?.Namespace.GetNamespaceName()
352-
?? (odcmObject as OdcmProperty)?.Class.Namespace.GetNamespaceName();
352+
string @namespace;
353+
switch (odcmObject)
354+
{
355+
case OdcmType t:
356+
@namespace = t.Namespace.GetNamespaceName();
357+
break;
358+
case OdcmProperty p:
359+
if (templateInfo.TemplateLanguage.Equals("java", StringComparison.OrdinalIgnoreCase))
360+
{
361+
@namespace = p.Type.Namespace.Name;
362+
if (@namespace == "Edm")
363+
{
364+
@namespace = "Microsoft.Graph";
365+
}
366+
}
367+
else
368+
{
369+
@namespace = p?.Class.Namespace.GetNamespaceName();
370+
}
371+
break;
372+
default:
373+
throw new ArgumentException(nameof(odcmObject));
374+
}
353375

354376
var path = this.PathWriter.WritePath(templateInfo, @namespace, fileName);
355377
logger.Debug("Wrote template to path {0}", path);

0 commit comments

Comments
 (0)