Skip to content

Commit 499fbdb

Browse files
zenginzengin
committed
fix namespace resolution errors
1 parent 2a8b42b commit 499fbdb

File tree

7 files changed

+77
-106
lines changed

7 files changed

+77
-106
lines changed

‎Templates/Java/requests_extensions/BaseEntityRequest.java.tt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -236,19 +236,19 @@ classDeclaration += c.TypeName();
236236
sb.Append(host.CreatePackageDefinition());
237237
var importFormat = @"import {0}.{1}.{2};";
238238
sb.AppendFormat(importFormat,
239-
host.CurrentModel.GetNamespace(),
239+
host.CurrentModel.GetNamespace().NamespaceName(),
240240
"requests.extensions",
241241
host.CurrentType.ITypeRequest());
242242
sb.Append("\n");
243243

244244
sb.AppendFormat(importFormat,
245-
host.CurrentModel.GetNamespace(),
245+
host.CurrentModel.GetNamespace().NamespaceName(),
246246
"requests.extensions",
247247
host.CurrentType.TypeRequest());
248248
sb.Append("\n");
249249

250250
sb.AppendFormat(importFormat,
251-
host.CurrentModel.GetNamespace(),
251+
host.CurrentModel.GetNamespace().NamespaceName(),
252252
"models.extensions",
253253
host.CurrentType.AsOdcmClass().TypeName());
254254
sb.Append("\n");

‎Templates/Java/requests_extensions/BaseEntityRequestBuilder.java.tt‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -160,12 +160,12 @@ if (c.AsOdcmClass() != null)
160160

161161
var importFormat = @"import {0}.{1}.{2};";
162162
sb.AppendFormat(importFormat,
163-
host.CurrentModel.GetNamespace(),
163+
host.CurrentModel.GetNamespace().NamespaceName(),
164164
"requests.extensions",
165165
host.CurrentType.ITypeRequest());
166166
sb.Append("\n");
167167
sb.AppendFormat(importFormat,
168-
host.CurrentModel.GetNamespace(),
168+
host.CurrentModel.GetNamespace().NamespaceName(),
169169
"requests.extensions",
170170
host.CurrentType.TypeRequest());
171171
sb.Append("\n");
@@ -177,25 +177,25 @@ if (c.AsOdcmClass() != null)
177177
if (prop.IsCollection()) {
178178

179179
sb.AppendFormat(importFormat,
180-
host.CurrentModel.GetNamespace(),
180+
host.CurrentModel.GetNamespace().NamespaceName(),
181181
"requests.extensions",
182182
prop.ITypeCollectionRequestBuilder());
183183
sb.Append("\n");
184184

185185
sb.AppendFormat(importFormat,
186-
host.CurrentModel.GetNamespace(),
186+
host.CurrentModel.GetNamespace().NamespaceName(),
187187
"requests.extensions",
188188
prop.TypeCollectionRequestBuilder());
189189
sb.Append("\n");
190190
}
191191
sb.AppendFormat(importFormat,
192-
host.CurrentModel.GetNamespace(),
192+
host.CurrentModel.GetNamespace().NamespaceName(),
193193
"requests.extensions",
194194
prop.ITypeRequestBuilder());
195195
sb.Append("\n");
196196

197197
sb.AppendFormat(importFormat,
198-
host.CurrentModel.GetNamespace(),
198+
host.CurrentModel.GetNamespace().NamespaceName(),
199199
"requests.extensions",
200200
prop.TypeRequestBuilder());
201201
sb.Append("\n");
@@ -205,13 +205,13 @@ if (c.AsOdcmClass() != null)
205205
{
206206
var propRequestBuilder = prop.TypeRequestBuilder();
207207
sb.AppendFormat(importFormat,
208-
host.CurrentModel.GetNamespace(),
208+
host.CurrentModel.GetNamespace().NamespaceName(),
209209
"requests.extensions",
210210
"I" + propRequestBuilder);
211211
sb.Append("\n");
212212

213213
sb.AppendFormat(importFormat,
214-
host.CurrentModel.GetNamespace(),
214+
host.CurrentModel.GetNamespace().NamespaceName(),
215215
"requests.extensions",
216216
propRequestBuilder);
217217
sb.Append("\n");
@@ -220,13 +220,13 @@ if (c.AsOdcmClass() != null)
220220
if (c is OdcmMediaClass)
221221
{
222222
sb.AppendFormat(importFormat,
223-
host.CurrentModel.GetNamespace(),
223+
host.CurrentModel.GetNamespace().NamespaceName(),
224224
"requests.extensions",
225225
host.CurrentType.ITypeStreamRequestBuilder());
226226
sb.Append("\n");
227227

228228
sb.AppendFormat(importFormat,
229-
host.CurrentModel.GetNamespace(),
229+
host.CurrentModel.GetNamespace().NamespaceName(),
230230
"requests.extensions",
231231
host.CurrentType.TypeStreamRequestBuilder());
232232
sb.Append("\n");
@@ -246,7 +246,7 @@ if (c.AsOdcmClass() != null)
246246
typeString = typeString.Substring(0, typeString.Length-1);
247247
}
248248
sb.AppendFormat(importFormat,
249-
host.CurrentModel.GetNamespace(),
249+
host.CurrentModel.GetNamespace().NamespaceName(),
250250
p.GetPackagePrefix(),
251251
typeString);
252252
sb.Append("\n");
@@ -255,25 +255,25 @@ if (c.AsOdcmClass() != null)
255255

256256
if (method.IsCollection) {
257257
sb.AppendFormat(importFormat,
258-
host.CurrentModel.GetNamespace(),
258+
host.CurrentModel.GetNamespace().NamespaceName(),
259259
"requests.extensions",
260260
method.ITypeCollectionRequestBuilder());
261261
sb.Append("\n");
262262

263263
sb.AppendFormat(importFormat,
264-
host.CurrentModel.GetNamespace(),
264+
host.CurrentModel.GetNamespace().NamespaceName(),
265265
"requests.extensions",
266266
method.TypeCollectionRequestBuilder());
267267
sb.Append("\n");
268268
} else {
269269
sb.AppendFormat(importFormat,
270-
host.CurrentModel.GetNamespace(),
270+
host.CurrentModel.GetNamespace().NamespaceName(),
271271
"requests.extensions",
272272
method.ITypeRequestBuilder());
273273
sb.Append("\n");
274274

275275
sb.AppendFormat(importFormat,
276-
host.CurrentModel.GetNamespace(),
276+
host.CurrentModel.GetNamespace().NamespaceName(),
277277
"requests.extensions",
278278
method.TypeRequestBuilder());
279279
sb.Append("\n");

‎Templates/Java/requests_extensions/Client.java.tt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<#=writer.WriteHeader()#>
66
<#=host.CreatePackageDef()#>
77

8-
import <#=host.CurrentModel.GetNamespace()#>.authentication.*;
9-
import <#=host.CurrentModel.GetNamespace()#>.logger.*;
8+
import <#=host.CurrentModel.GetNamespace().NamespaceName()#>.authentication.*;
9+
import <#=host.CurrentModel.GetNamespace().NamespaceName()#>.logger.*;
1010
import com.google.gson.JsonObject;
1111

1212
<#=TypeHelperJava.CreateClassDef(c.ClientType(host), c.BaseClientType(host), c.IClientType(host))#>

‎Templates/Java/requests_extensions/IBaseEntityRequestBuilder.java.tt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ if (c.AsOdcmClass() != null)
133133
sb.Append(host.CreatePackageDefinition());
134134
var importFormat = @"import {0}.{1}.{2};";
135135
sb.AppendFormat(importFormat,
136-
host.CurrentModel.GetNamespace(),
136+
host.CurrentModel.GetNamespace().NamespaceName(),
137137
"requests.extensions",
138138
host.CurrentType.ITypeRequest());
139139
sb.Append("\n");
@@ -145,19 +145,19 @@ if (c.AsOdcmClass() != null)
145145
if (prop.IsCollection()) {
146146

147147
sb.AppendFormat(importFormat,
148-
host.CurrentModel.GetNamespace(),
148+
host.CurrentModel.GetNamespace().NamespaceName(),
149149
"requests.extensions",
150150
prop.ITypeCollectionRequestBuilder());
151151
sb.Append("\n");
152152

153153
sb.AppendFormat(importFormat,
154-
host.CurrentModel.GetNamespace(),
154+
host.CurrentModel.GetNamespace().NamespaceName(),
155155
"requests.extensions",
156156
prop.ITypeRequestBuilder());
157157
sb.Append("\n");
158158
} else {
159159
sb.AppendFormat(importFormat,
160-
host.CurrentModel.GetNamespace(),
160+
host.CurrentModel.GetNamespace().NamespaceName(),
161161
"requests.extensions",
162162
prop.ITypeRequestBuilder());
163163
sb.Append("\n");
@@ -168,7 +168,7 @@ if (c.AsOdcmClass() != null)
168168
{
169169
var propRequestBuilder = prop.TypeRequestBuilder();
170170
sb.AppendFormat(importFormat,
171-
host.CurrentModel.GetNamespace(),
171+
host.CurrentModel.GetNamespace().NamespaceName(),
172172
"requests.extensions",
173173
"I" + propRequestBuilder);
174174
sb.Append("\n");
@@ -177,7 +177,7 @@ if (c.AsOdcmClass() != null)
177177
if (c is OdcmMediaClass)
178178
{
179179
sb.AppendFormat(importFormat,
180-
host.CurrentModel.GetNamespace(),
180+
host.CurrentModel.GetNamespace().NamespaceName(),
181181
"requests.extensions",
182182
host.CurrentType.ITypeStreamRequestBuilder());
183183
sb.Append("\n");
@@ -197,7 +197,7 @@ if (c.AsOdcmClass() != null)
197197
typeString = typeString.Substring(0, typeString.Length-1);
198198
}
199199
sb.AppendFormat(importFormat,
200-
host.CurrentModel.GetNamespace(),
200+
host.CurrentModel.GetNamespace().NamespaceName(),
201201
p.GetPackagePrefix(),
202202
typeString);
203203
sb.Append("\n");
@@ -206,13 +206,13 @@ if (c.AsOdcmClass() != null)
206206

207207
if (method.IsCollection) {
208208
sb.AppendFormat(importFormat,
209-
host.CurrentModel.GetNamespace(),
209+
host.CurrentModel.GetNamespace().NamespaceName(),
210210
"requests.extensions",
211211
method.ITypeCollectionRequestBuilder());
212212
sb.Append("\n");
213213
} else {
214214
sb.AppendFormat(importFormat,
215-
host.CurrentModel.GetNamespace(),
215+
host.CurrentModel.GetNamespace().NamespaceName(),
216216
"requests.extensions",
217217
method.ITypeRequestBuilder());
218218
sb.Append("\n");

0 commit comments

Comments
 (0)