Skip to content

Commit efcb13c

Browse files
antoineatstariongroupantoineatstariongroup
committed
Extension method renamed
1 parent f452fe4 commit efcb13c

11 files changed

Lines changed: 34 additions & 34 deletions

‎SysML2.NET.CodeGenerator/Extensions/XmiReaderResultExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public static class XmiReaderResultExtensions
4040
/// <param name="xmiReaderResult">The <see cref="XmiReaderResult"/> that contains all read elements</param>
4141
/// <param name="rootName">The name of the root package to query</param>
4242
/// <returns>A <see cref="IReadOnlyCollection{T}"/> of all contained <see cref="IPackage"/> under the root <see cref="IPackage"/></returns>
43-
public static IReadOnlyList<IPackage> QueryAllExistingPackages(this XmiReaderResult xmiReaderResult, string rootName)
43+
public static IReadOnlyList<IPackage> QueryContainedAndImported(this XmiReaderResult xmiReaderResult, string rootName)
4444
{
4545
ArgumentNullException.ThrowIfNull(xmiReaderResult);
4646

‎SysML2.NET.CodeGenerator/Generators/UmlHandleBarsGenerators/UmlCoreDalFactoryGenerator.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ private async Task GeneratePocoFactoryInternal(XmiReaderResult xmiReaderResult,
122122
{
123123
var template = this.Templates[PocoFactoryTemplateName];
124124

125-
var classes = xmiReaderResult.QueryAllExistingPackages("SysML")
125+
var classes = xmiReaderResult.QueryContainedAndImported("SysML")
126126
.SelectMany(x => x.PackagedElement.OfType<IClass>())
127127
.Where(x => !x.IsAbstract)
128128
.ToList();
@@ -175,7 +175,7 @@ private async Task<string> GenerateDalPocoFactoryInternal(XmiReaderResult xmiRea
175175
{
176176
var template = this.Templates[PocoFactoryTemplateName];
177177

178-
var classToGenerate = xmiReaderResult.QueryAllExistingPackages("SysML")
178+
var classToGenerate = xmiReaderResult.QueryContainedAndImported("SysML")
179179
.SelectMany(x => x.PackagedElement.OfType<IClass>())
180180
.Single(x => x.Name == className);
181181

@@ -221,7 +221,7 @@ private async Task GenerateElementFactoryInternal(XmiReaderResult xmiReaderResul
221221
{
222222
var template = this.Templates[ElementFactoryTemplateName];
223223

224-
var classes = xmiReaderResult.QueryAllExistingPackages("SysML")
224+
var classes = xmiReaderResult.QueryContainedAndImported("SysML")
225225
.SelectMany(x => x.PackagedElement.OfType<IClass>())
226226
.Where(x => !x.IsAbstract)
227227
.OrderBy(x => x.Name)

‎SysML2.NET.CodeGenerator/Generators/UmlHandleBarsGenerators/UmlCoreDalPocoExtensionsGenerator.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ private async Task GeneratePocoExtensionsInternal(XmiReaderResult xmiReaderResul
100100
{
101101
var template = this.Templates[PocoExtensionsTemplateName];
102102

103-
var classes = xmiReaderResult.QueryAllExistingPackages("SysML")
103+
var classes = xmiReaderResult.QueryContainedAndImported("SysML")
104104
.SelectMany(x => x.PackagedElement.OfType<IClass>())
105105
.Where(x => !x.IsAbstract)
106106
.ToList();
@@ -153,7 +153,7 @@ private async Task<string> GenerateDalPocoExtensionInternal(XmiReaderResult xmiR
153153
{
154154
var template = this.Templates[PocoExtensionsTemplateName];
155155

156-
var classToGenerate = xmiReaderResult.QueryAllExistingPackages("SysML")
156+
var classToGenerate = xmiReaderResult.QueryContainedAndImported("SysML")
157157
.SelectMany(x => x.PackagedElement.OfType<IClass>())
158158
.Single(x => x.Name == className);
159159

@@ -222,7 +222,7 @@ private async Task GenerateElementExtensionsInternal(XmiReaderResult xmiReaderRe
222222
{
223223
var template = this.Templates[ElementExtensionsTemplateName];
224224

225-
var classes = xmiReaderResult.QueryAllExistingPackages("SysML")
225+
var classes = xmiReaderResult.QueryContainedAndImported("SysML")
226226
.SelectMany(x => x.PackagedElement.OfType<IClass>())
227227
.Where(x => !x.IsAbstract)
228228
.OrderBy(x => x.Name)

‎SysML2.NET.CodeGenerator/Generators/UmlHandleBarsGenerators/UmlCoreDtoGenerator.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ private async Task GenerateDataTransferObjectInterfacesInternalAsync(XmiReaderRe
190190
{
191191
var template = this.Templates["core-dto-interface-uml-template"];
192192

193-
var classes = xmiReaderResult.QueryAllExistingPackages("SysML")
193+
var classes = xmiReaderResult.QueryContainedAndImported("SysML")
194194
.SelectMany(x => x.PackagedElement.OfType<IClass>());
195195

196196
foreach (var @class in classes)
@@ -224,7 +224,7 @@ private async Task<string> GenerateDataTransferObjectInterfaceInternalAsync(XmiR
224224
{
225225
var template = this.Templates["core-dto-interface-uml-template"];
226226

227-
var classes = xmiReaderResult.QueryAllExistingPackages("SysML")
227+
var classes = xmiReaderResult.QueryContainedAndImported("SysML")
228228
.SelectMany(x => x.PackagedElement.OfType<IClass>());
229229

230230
var @class = classes.Single(x => x.Name == name);
@@ -256,7 +256,7 @@ private async Task GenerateDataTransferObjectClassesInternalAsync(XmiReaderResul
256256
{
257257
var template = this.Templates["core-dto-class-uml-template"];
258258

259-
var classes = xmiReaderResult.QueryAllExistingPackages("SysML")
259+
var classes = xmiReaderResult.QueryContainedAndImported("SysML")
260260
.SelectMany(x => x.PackagedElement.OfType<IClass>())
261261
.Where(x => !x.IsAbstract)
262262
.ToList();
@@ -292,7 +292,7 @@ private async Task<string> GenerateDataTransferObjectClassInternalAsync(XmiReade
292292
{
293293
var template = this.Templates["core-dto-class-uml-template"];
294294

295-
var classes = xmiReaderResult.QueryAllExistingPackages("SysML")
295+
var classes = xmiReaderResult.QueryContainedAndImported("SysML")
296296
.SelectMany(x => x.PackagedElement.OfType<IClass>());
297297

298298
var @class = classes.Single(x => x.Name == name);

‎SysML2.NET.CodeGenerator/Generators/UmlHandleBarsGenerators/UmlCoreEnumGenerator.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ private async Task GenerateEnumerationsInternalAsync(XmiReaderResult xmiReaderRe
143143
{
144144
var template = this.Templates["core-enumeration-uml-template"];
145145

146-
var enumerations = xmiReaderResult.QueryAllExistingPackages("SysML")
146+
var enumerations = xmiReaderResult.QueryContainedAndImported("SysML")
147147
.SelectMany(x => x.PackagedElement.OfType<IEnumeration>())
148148
.ToList();
149149

@@ -178,7 +178,7 @@ private async Task<string> GenerateEnumerationInternalAsync(XmiReaderResult xmiR
178178
{
179179
var template = this.Templates["core-enumeration-uml-template"];
180180

181-
var enumerations = xmiReaderResult.QueryAllExistingPackages("SysML")
181+
var enumerations = xmiReaderResult.QueryContainedAndImported("SysML")
182182
.SelectMany(x => x.PackagedElement.OfType<IEnumeration>())
183183
.ToList();
184184

‎SysML2.NET.CodeGenerator/Generators/UmlHandleBarsGenerators/UmlCoreEnumProviderGenerator.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ private async Task GenerateEnumerationProvidersInternalAsync(XmiReaderResult xmi
146146
{
147147
var template = this.Templates["core-enumprovider-uml-template"];
148148

149-
var enumerations = xmiReaderResult.QueryAllExistingPackages("SysML")
149+
var enumerations = xmiReaderResult.QueryContainedAndImported("SysML")
150150
.SelectMany(x => x.PackagedElement.OfType<IEnumeration>())
151151
.ToList();
152152

@@ -181,7 +181,7 @@ private async Task<string> GenerateEnumerationProviderInternalAsync(XmiReaderRes
181181
{
182182
var template = this.Templates["core-enumprovider-uml-template"];
183183

184-
var enumerations = xmiReaderResult.QueryAllExistingPackages("SysML")
184+
var enumerations = xmiReaderResult.QueryContainedAndImported("SysML")
185185
.SelectMany(x => x.PackagedElement.OfType<IEnumeration>())
186186
.ToList();
187187

‎SysML2.NET.CodeGenerator/Generators/UmlHandleBarsGenerators/UmlCoreJsonDtoDeSerializerGenerator.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ private async Task GenerateEnumJsonDeSerializerInternal(XmiReaderResult xmiReade
109109
{
110110
var template = this.Templates[EnumDeSerializerTemplateName];
111111

112-
var enumerations = xmiReaderResult.QueryAllExistingPackages("SysML")
112+
var enumerations = xmiReaderResult.QueryContainedAndImported("SysML")
113113
.SelectMany(x => x.PackagedElement.OfType<IEnumeration>())
114114
.ToList();
115115

@@ -182,7 +182,7 @@ private async Task GenerateDeSerializationProviderInternal(XmiReaderResult xmiRe
182182
{
183183
var template = this.Templates[DtoDeSerializerProviderTemplateName];
184184

185-
var classes = xmiReaderResult.QueryAllExistingPackages("SysML")
185+
var classes = xmiReaderResult.QueryContainedAndImported("SysML")
186186
.SelectMany(x => x.PackagedElement.OfType<IClass>())
187187
.Where(x => !x.IsAbstract)
188188
.OrderBy(x => x.Name)
@@ -229,7 +229,7 @@ private async Task GenerateDtoJsonDeSerializerInternal(XmiReaderResult xmiReader
229229
{
230230
var template = this.Templates[DtoDeSerializerTemplateName];
231231

232-
var classes = xmiReaderResult.QueryAllExistingPackages("SysML")
232+
var classes = xmiReaderResult.QueryContainedAndImported("SysML")
233233
.SelectMany(x => x.PackagedElement.OfType<IClass>())
234234
.Where(x => !x.IsAbstract)
235235
.ToList();
@@ -282,7 +282,7 @@ private async Task<string> GenerateDtoDeSerializerClassInternal(XmiReaderResult
282282
{
283283
var template = this.Templates[DtoDeSerializerTemplateName];
284284

285-
var classToGenerate = xmiReaderResult.QueryAllExistingPackages("SysML")
285+
var classToGenerate = xmiReaderResult.QueryContainedAndImported("SysML")
286286
.SelectMany(x => x.PackagedElement.OfType<IClass>())
287287
.Single(x => x.Name == className);
288288

‎SysML2.NET.CodeGenerator/Generators/UmlHandleBarsGenerators/UmlCoreJsonDtoSerializerGenerator.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ private async Task GenerateSerializationProviderInternal(XmiReaderResult xmiRead
126126
{
127127
var template = this.Templates[DtoSerializerProviderTemplateName];
128128

129-
var classes = xmiReaderResult.QueryAllExistingPackages("SysML")
129+
var classes = xmiReaderResult.QueryContainedAndImported("SysML")
130130
.SelectMany(x => x.PackagedElement.OfType<IClass>())
131131
.Where(x => !x.IsAbstract)
132132
.OrderBy(x => x.Name)
@@ -173,7 +173,7 @@ private async Task GenerateDtoJsonSerializerInternal(XmiReaderResult xmiReaderRe
173173
{
174174
var template = this.Templates[DtoSerializerTemplateName];
175175

176-
var classes = xmiReaderResult.QueryAllExistingPackages("SysML")
176+
var classes = xmiReaderResult.QueryContainedAndImported("SysML")
177177
.SelectMany(x => x.PackagedElement.OfType<IClass>())
178178
.Where(x => !x.IsAbstract)
179179
.ToList();
@@ -226,7 +226,7 @@ private async Task<string> GenerateDtoSerializerClassInternal(XmiReaderResult xm
226226
{
227227
var template = this.Templates[DtoSerializerTemplateName];
228228

229-
var classToGenerate = xmiReaderResult.QueryAllExistingPackages("SysML")
229+
var classToGenerate = xmiReaderResult.QueryContainedAndImported("SysML")
230230
.SelectMany(x => x.PackagedElement.OfType<IClass>())
231231
.Single(x => x.Name == className);
232232

‎SysML2.NET.CodeGenerator/Generators/UmlHandleBarsGenerators/UmlCorePocoGenerator.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ private async Task GeneratePocoClassesInternalAsync(XmiReaderResult xmiReaderRes
173173
{
174174
var template = this.Templates[ClassTemplateName];
175175

176-
var classes = xmiReaderResult.QueryAllExistingPackages("SysML")
176+
var classes = xmiReaderResult.QueryContainedAndImported("SysML")
177177
.SelectMany(x => x.PackagedElement.OfType<IClass>())
178178
.Where(x => !x.IsAbstract)
179179
.ToList();
@@ -202,7 +202,7 @@ private async Task GeneratePocoInterfacesInternalAsync(XmiReaderResult xmiReader
202202
{
203203
var template = this.Templates[InterfaceTemplateName];
204204

205-
var classes = xmiReaderResult.QueryAllExistingPackages("SysML")
205+
var classes = xmiReaderResult.QueryContainedAndImported("SysML")
206206
.SelectMany(x => x.PackagedElement.OfType<IClass>())
207207
.ToList();
208208

@@ -229,7 +229,7 @@ private async Task<string> GeneratePocoInteraceInternalAsync(XmiReaderResult xmi
229229
{
230230
var template = this.Templates[InterfaceTemplateName];
231231

232-
var umlClass = xmiReaderResult.QueryAllExistingPackages("SysML")
232+
var umlClass = xmiReaderResult.QueryContainedAndImported("SysML")
233233
.SelectMany(x => x.PackagedElement.OfType<IClass>())
234234
.Single(x => x.Name == className);
235235

@@ -275,7 +275,7 @@ private async Task<string> GenerateDataTransferObjectClassInternalAsync(XmiReade
275275
{
276276
var template = this.Templates[ClassTemplateName];
277277

278-
var umlClass = xmiReaderResult.QueryAllExistingPackages("SysML")
278+
var umlClass = xmiReaderResult.QueryContainedAndImported("SysML")
279279
.SelectMany(x => x.PackagedElement.OfType<IClass>())
280280
.Single(x => x.Name == className);
281281

‎SysML2.NET.CodeGenerator/Generators/UmlHandleBarsGenerators/UmlMessagePackGenerator.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public async Task<string> GenerateMessagePackPayloadFactory(XmiReaderResult xmiR
9898
{
9999
var template = this.Templates[MessagePackPayloadFactoryTemplateName];
100100

101-
var classes = xmiReaderResult.QueryAllExistingPackages("SysML")
101+
var classes = xmiReaderResult.QueryContainedAndImported("SysML")
102102
.SelectMany(x => x.PackagedElement.OfType<IClass>())
103103
.Where(x => !x.IsAbstract)
104104
.OrderBy(x => x.Name)
@@ -131,7 +131,7 @@ public async Task<string> GenerateMessagePackPayload(XmiReaderResult xmiReaderRe
131131
{
132132
var template = this.Templates[MessagePackPayloadTemplateName];
133133

134-
var classes = xmiReaderResult.QueryAllExistingPackages("SysML")
134+
var classes = xmiReaderResult.QueryContainedAndImported("SysML")
135135
.SelectMany(x => x.PackagedElement.OfType<IClass>())
136136
.Where(x => !x.IsAbstract)
137137
.OrderBy(x => x.Name)
@@ -164,7 +164,7 @@ public async Task<string> GenerateDataResolverGetFormatterHelper(XmiReaderResult
164164
{
165165
var template = this.Templates[MessagePackDataResolverGetFormatterHelper];
166166

167-
var classes = xmiReaderResult.QueryAllExistingPackages("SysML")
167+
var classes = xmiReaderResult.QueryContainedAndImported("SysML")
168168
.SelectMany(x => x.PackagedElement.OfType<IClass>())
169169
.Where(x => !x.IsAbstract)
170170
.OrderBy(x => x.Name)
@@ -197,7 +197,7 @@ public async Task<string> GenerateMessagePackPayloadMessagePackFormatter(XmiRead
197197
{
198198
var template = this.Templates[PayloadMessagePackFormatterTemplateName];
199199

200-
var classes = xmiReaderResult.QueryAllExistingPackages("SysML")
200+
var classes = xmiReaderResult.QueryContainedAndImported("SysML")
201201
.SelectMany(x => x.PackagedElement.OfType<IClass>())
202202
.Where(x => !x.IsAbstract)
203203
.OrderBy(x => x.Name)
@@ -230,7 +230,7 @@ public async Task GenerateMessagePackFormatters(XmiReaderResult xmiReaderResult,
230230
{
231231
var template = this.Templates[DtoMessagePackFormatterTemplateName];
232232

233-
var classes = xmiReaderResult.QueryAllExistingPackages("SysML")
233+
var classes = xmiReaderResult.QueryContainedAndImported("SysML")
234234
.SelectMany(x => x.PackagedElement.OfType<IClass>())
235235
.Where(x => !x.IsAbstract)
236236
.OrderBy(x => x.Name)
@@ -267,7 +267,7 @@ public async Task<string> GenerateMessagePackFormatter(XmiReaderResult xmiReader
267267
{
268268
var template = this.Templates[DtoMessagePackFormatterTemplateName];
269269

270-
var @class = xmiReaderResult.QueryAllExistingPackages("SysML")
270+
var @class = xmiReaderResult.QueryContainedAndImported("SysML")
271271
.SelectMany(x => x.PackagedElement.OfType<IClass>())
272272
.Where(x => !x.IsAbstract)
273273
.Single(x => x.Name == className);

0 commit comments

Comments
 (0)