Skip to content

Commit 428a7bd

Browse files
michelu89michelu89
authored
Extend shared file handling (#43)
* Extend shared file handling Shared files are now be able to set typical special characters like dashes or underscore. For example Shared-Model.ttl.
1 parent 30b725a commit 428a7bd

File tree

69 files changed

+481
-325
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+481
-325
lines changed

‎core/apps/ame-e2e/src/fixtures/valid-open-api.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,14 +93,14 @@
9393
}
9494
}
9595
},
96-
"urn_bamm_org.eclipse.digitaltwin_1.0.0_Characteristic1": {
96+
"urn_samm_org.eclipse.digitaltwin_1.0.0_Characteristic1": {
9797
"type": "string"
9898
},
9999
"AspectDefault": {
100100
"type": "object",
101101
"properties": {
102102
"property1": {
103-
"$ref": "#/components/schemas/urn_bamm_org.eclipse.digitaltwin_1.0.0_Characteristic1"
103+
"$ref": "#/components/schemas/urn_samm_org.eclipse.digitaltwin_1.0.0_Characteristic1"
104104
}
105105
},
106106
"required": [

‎core/apps/ame-e2e/src/fixtures/valid-open-api.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,13 @@ components:
7373
code:
7474
type: string
7575
nullable: true
76-
urn_bamm_org.eclipse.digitaltwin_1.0.0_Characteristic1:
76+
urn_samm_org.eclipse.digitaltwin_1.0.0_Characteristic1:
7777
type: string
7878
AspectDefault:
7979
type: object
8080
properties:
8181
property1:
82-
$ref: '#/components/schemas/urn_bamm_org.eclipse.digitaltwin_1.0.0_Characteristic1'
82+
$ref: '#/components/schemas/urn_samm_org.eclipse.digitaltwin_1.0.0_Characteristic1'
8383
required:
8484
- property1
8585
responses:

‎core/apps/ame-e2e/src/integration/editor/drag-and-drop-external-reference.spec.ts‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ describe('Test drag and drop', () => {
9090
{
9191
method: 'GET',
9292
url: 'http://localhost:9091/ame/api/models',
93-
headers: {'Ame-model-Urn': 'org.eclipse.digitaltwin:1.0.0:external-property-reference.txt'},
93+
headers: {namespace: 'org.eclipse.digitaltwin:1.0.0', 'file-name': 'external-property-reference.txt'},
9494
},
9595
{
9696
fixture: '/external-reference/same-namespace/without-childrens/external-property-reference.txt',
@@ -126,7 +126,10 @@ describe('Test drag and drop', () => {
126126
{
127127
method: 'GET',
128128
url: 'http://localhost:9091/ame/api/models',
129-
headers: {'Ame-model-Urn': 'org.eclipse.digitaltwin:1.0.0:external-characteristic-reference.txt'},
129+
headers: {
130+
namespace: 'org.eclipse.digitaltwin:1.0.0',
131+
'file-name': 'external-characteristic-reference.txt',
132+
},
130133
},
131134
{
132135
fixture: '/external-reference/same-namespace/without-childrens/external-characteristic-reference.txt',
@@ -161,7 +164,10 @@ describe('Test drag and drop', () => {
161164
{
162165
method: 'GET',
163166
url: 'http://localhost:9091/ame/api/models',
164-
headers: {'Ame-model-Urn': 'org.eclipse.digitaltwin:1.0.0:external-constraint-reference.txt'},
167+
headers: {
168+
namespace: 'org.eclipse.digitaltwin:1.0.0',
169+
'file-name': 'external-constraint-reference.txt',
170+
},
165171
},
166172
{
167173
fixture: '/external-reference/same-namespace/without-childrens/external-constraint-reference.txt',
@@ -205,7 +211,7 @@ describe('Test drag and drop', () => {
205211
{
206212
method: 'GET',
207213
url: 'http://localhost:9091/ame/api/models',
208-
headers: {'Ame-model-Urn': 'org.eclipse.digitaltwin:1.0.0:external-entity-reference.txt'},
214+
headers: {namespace: 'org.eclipse.digitaltwin:1.0.0', 'file-name': 'external-entity-reference.txt'},
209215
},
210216
{
211217
fixture: '/external-reference/same-namespace/without-childrens/external-entity-reference.txt',
@@ -243,7 +249,7 @@ describe('Test drag and drop', () => {
243249
{
244250
method: 'GET',
245251
url: 'http://localhost:9091/ame/api/models',
246-
headers: {'Ame-model-Urn': 'org.eclipse.different:1.0.0:external-property-reference.txt'},
252+
headers: {namespace: 'org.eclipse.different:1.0.0', 'file-name': 'external-property-reference.txt'},
247253
},
248254
{
249255
fixture: '/external-reference/different-namespace/without-childrens/external-property-reference.txt',
@@ -282,7 +288,7 @@ describe('Test drag and drop', () => {
282288
{
283289
method: 'GET',
284290
url: 'http://localhost:9091/ame/api/models',
285-
headers: {'Ame-model-Urn': 'org.eclipse.different:1.0.0:external-characteristic-reference.txt'},
291+
headers: {namespace: 'org.eclipse.different:1.0.0', 'file-name': 'external-characteristic-reference.txt'},
286292
},
287293
{
288294
fixture: '/external-reference/different-namespace/without-childrens/external-characteristic-reference.txt',
@@ -320,7 +326,7 @@ describe('Test drag and drop', () => {
320326
{
321327
method: 'GET',
322328
url: 'http://localhost:9091/ame/api/models',
323-
headers: {'Ame-model-Urn': 'org.eclipse.different:1.0.0:external-constraint-reference.txt'},
329+
headers: {namespace: 'org.eclipse.different:1.0.0', 'file-name': 'external-constraint-reference.txt'},
324330
},
325331
{
326332
fixture: '/external-reference/different-namespace/without-childrens/external-constraint-reference.txt',
@@ -366,7 +372,7 @@ describe('Test drag and drop', () => {
366372
{
367373
method: 'GET',
368374
url: 'http://localhost:9091/ame/api/models',
369-
headers: {'Ame-model-Urn': 'org.eclipse.different:1.0.0:external-entity-reference.txt'},
375+
headers: {namespace: 'org.eclipse.different:1.0.0', 'file-name': 'external-entity-reference.txt'},
370376
},
371377
{
372378
fixture: '/external-reference/different-namespace/without-childrens/external-entity-reference.txt',
@@ -406,7 +412,7 @@ describe('Test drag and drop', () => {
406412
{
407413
method: 'GET',
408414
url: 'http://localhost:9091/ame/api/models',
409-
headers: {'Ame-model-Urn': 'org.eclipse.digitaltwin:1.0.0:external-property-reference.txt'},
415+
headers: {namespace: 'org.eclipse.digitaltwin:1.0.0', 'file-name': 'external-property-reference.txt'},
410416
},
411417
{
412418
fixture: '/external-reference/same-namespace/with-childrens/external-property-reference.txt',
@@ -450,7 +456,7 @@ describe('Test drag and drop', () => {
450456
{
451457
method: 'GET',
452458
url: 'http://localhost:9091/ame/api/models',
453-
headers: {'Ame-model-Urn': 'org.eclipse.different:1.0.0:external-property-reference.txt'},
459+
headers: {namespace: 'org.eclipse.different:1.0.0', 'file-name': 'external-property-reference.txt'},
454460
},
455461
{
456462
fixture: '/external-reference/different-namespace/with-childrens/external-property-reference.txt',

‎core/apps/ame-e2e/src/integration/editor/edit-property.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ describe('Test edit property', () => {
6969
{
7070
method: 'GET',
7171
url: 'http://localhost:9091/ame/api/models',
72-
headers: {'Ame-Model-Urn': 'org.eclipse.digitaltwin:1.0.0:external-property-reference-with-children.txt'},
72+
headers: {namespace: 'org.eclipse.digitaltwin:1.0.0', 'file-name': 'external-property-reference-with-children.txt'},
7373
},
7474
{
7575
fixture: '/external-reference/same-namespace/with-childrens/external-property-reference.txt',

‎core/apps/ame-e2e/src/integration/editor/load-external-references-different-namespace.spec.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ describe('Test drag and drop', () => {
2727
{
2828
method: 'GET',
2929
url: 'http://localhost:9091/ame/api/models',
30-
headers: {'Ame-model-Urn': 'org.eclipse.different:1.0.0:external-property-reference.txt'},
30+
headers: {namespace: 'org.eclipse.different:1.0.0', 'file-name': 'external-property-reference.txt'},
3131
},
3232
{
3333
fixture: '/external-reference/different-namespace/with-childrens/external-property-reference.txt',
@@ -83,7 +83,7 @@ describe('Test drag and drop', () => {
8383
{
8484
method: 'GET',
8585
url: 'http://localhost:9091/ame/api/models',
86-
headers: {'Ame-model-Urn': 'org.eclipse.different:1.0.0:external-operation-reference-with-children.txt'},
86+
headers: {namespace: 'org.eclipse.different:1.0.0', 'file-name': 'external-operation-reference-with-children.txt'},
8787
},
8888
{
8989
fixture: '/external-reference/different-namespace/with-childrens/external-operation-reference.txt',
@@ -158,7 +158,7 @@ describe('Test drag and drop', () => {
158158
{
159159
method: 'GET',
160160
url: 'http://localhost:9091/ame/api/models',
161-
headers: {'Ame-model-Urn': 'org.eclipse.different:1.0.0:external-characteristic-reference.txt'},
161+
headers: {namespace: 'org.eclipse.different:1.0.0', 'file-name': 'external-characteristic-reference.txt'},
162162
},
163163
{
164164
fixture: '/external-reference/different-namespace/with-childrens/external-characteristic-reference.txt',
@@ -215,7 +215,7 @@ describe('Test drag and drop', () => {
215215
{
216216
method: 'GET',
217217
url: 'http://localhost:9091/ame/api/models',
218-
headers: {'Ame-model-Urn': 'org.eclipse.different:1.0.0:external-entity-reference.txt'},
218+
headers: {namespace: 'org.eclipse.different:1.0.0', 'file-name': 'external-entity-reference.txt'},
219219
},
220220
{
221221
fixture: '/external-reference/different-namespace/with-childrens/external-entity-reference.txt',
@@ -273,7 +273,7 @@ describe('Test drag and drop', () => {
273273
{
274274
method: 'GET',
275275
url: 'http://localhost:9091/ame/api/models',
276-
headers: {'Ame-model-Urn': 'org.eclipse.different:1.0.0:external-unit-reference.txt'},
276+
headers: {namespace: 'org.eclipse.different:1.0.0', 'file-name': 'external-unit-reference.txt'},
277277
},
278278
{
279279
fixture: '/external-reference/different-namespace/without-childrens/external-unit-reference.txt',
@@ -326,7 +326,7 @@ describe('Test drag and drop', () => {
326326
{
327327
method: 'GET',
328328
url: 'http://localhost:9091/ame/api/models',
329-
headers: {'Ame-model-Urn': 'org.eclipse.different:1.0.0:external-entity-reference.txt'},
329+
headers: {namespace: 'org.eclipse.different:1.0.0', 'file-name': 'external-entity-reference.txt'},
330330
},
331331
{
332332
fixture: '/external-reference/different-namespace/without-childrens/external-entity-reference.txt',
@@ -337,7 +337,7 @@ describe('Test drag and drop', () => {
337337
{
338338
method: 'GET',
339339
url: 'http://localhost:9091/ame/api/models',
340-
headers: {'Ame-model-Urn': 'org.eclipse.different:1.0.0:external-characteristic-reference.txt'},
340+
headers: {namespace: 'org.eclipse.different:1.0.0', 'file-name': 'external-characteristic-reference.txt'},
341341
},
342342
{
343343
fixture: '/external-reference/different-namespace/without-childrens/external-characteristic-reference.txt',
@@ -348,7 +348,7 @@ describe('Test drag and drop', () => {
348348
{
349349
method: 'GET',
350350
url: 'http://localhost:9091/ame/api/models',
351-
headers: {'Ame-model-Urn': 'org.eclipse.different:1.0.0:external-property-reference.txt'},
351+
headers: {namespace: 'org.eclipse.different:1.0.0', 'file-name': 'external-property-reference.txt'},
352352
},
353353
{
354354
fixture: '/external-reference/different-namespace/without-childrens/external-property-reference.txt',
@@ -359,7 +359,7 @@ describe('Test drag and drop', () => {
359359
{
360360
method: 'GET',
361361
url: 'http://localhost:9091/ame/api/models',
362-
headers: {'Ame-model-Urn': 'org.eclipse.different:1.0.0:external-operation-reference.txt'},
362+
headers: {namespace: 'org.eclipse.different:1.0.0', 'file-name': 'external-operation-reference.txt'},
363363
},
364364
{
365365
fixture: '/external-reference/different-namespace/without-childrens/external-operation-reference.txt',
@@ -370,7 +370,7 @@ describe('Test drag and drop', () => {
370370
{
371371
method: 'GET',
372372
url: 'http://localhost:9091/ame/api/models',
373-
headers: {'Ame-model-Urn': 'org.eclipse.different:1.0.0:external-trait-reference.txt'},
373+
headers: {namespace: 'org.eclipse.different:1.0.0', 'file-name': 'external-trait-reference.txt'},
374374
},
375375
{
376376
fixture: '/external-reference/different-namespace/with-childrens/external-trait-reference.txt',
@@ -381,7 +381,7 @@ describe('Test drag and drop', () => {
381381
{
382382
method: 'GET',
383383
url: 'http://localhost:9091/ame/api/models',
384-
headers: {'Ame-model-Urn': 'org.eclipse.different:1.0.0:external-constraint-reference.txt'},
384+
headers: {namespace: 'org.eclipse.different:1.0.0', 'file-name': 'external-constraint-reference.txt'},
385385
},
386386
{
387387
fixture: '/external-reference/different-namespace/without-childrens/external-constraint-reference.txt',

‎core/apps/ame-e2e/src/integration/editor/load-external-references-same-namespace.spec.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ describe('Test load external reference with same namespace', () => {
2727
{
2828
method: 'GET',
2929
url: 'http://localhost:9091/ame/api/models',
30-
headers: {'Ame-model-Urn': 'org.eclipse.digitaltwin:1.0.0:external-property-reference-with-children.txt'},
30+
headers: {namespace: 'org.eclipse.digitaltwin:1.0.0', 'file-name': 'external-property-reference-with-children.txt'},
3131
},
3232
{
3333
fixture: '/external-reference/same-namespace/with-childrens/external-property-reference.txt',
@@ -83,7 +83,7 @@ describe('Test load external reference with same namespace', () => {
8383
{
8484
method: 'GET',
8585
url: 'http://localhost:9091/ame/api/models',
86-
headers: {'Ame-model-Urn': 'org.eclipse.digitaltwin:1.0.0:external-operation-reference-with-children.txt'},
86+
headers: {namespace: 'org.eclipse.digitaltwin:1.0.0', 'file-name': 'external-operation-reference-with-children.txt'},
8787
},
8888
{
8989
fixture: '/external-reference/same-namespace/with-childrens/external-operation-reference.txt',
@@ -158,7 +158,7 @@ describe('Test load external reference with same namespace', () => {
158158
{
159159
method: 'GET',
160160
url: 'http://localhost:9091/ame/api/models',
161-
headers: {'Ame-model-Urn': 'org.eclipse.digitaltwin:1.0.0:external-characteristic-reference-with-children.txt'},
161+
headers: {namespace: 'org.eclipse.digitaltwin:1.0.0', 'file-name': 'external-characteristic-reference-with-children.txt'},
162162
},
163163
{
164164
fixture: '/external-reference/same-namespace/with-childrens/external-characteristic-reference.txt',
@@ -215,7 +215,7 @@ describe('Test load external reference with same namespace', () => {
215215
{
216216
method: 'GET',
217217
url: 'http://localhost:9091/ame/api/models',
218-
headers: {'Ame-model-Urn': 'org.eclipse.digitaltwin:1.0.0:external-unit-reference.txt'},
218+
headers: {namespace: 'org.eclipse.digitaltwin:1.0.0', 'file-name': 'external-unit-reference.txt'},
219219
},
220220
{
221221
fixture: '/external-reference/same-namespace/without-childrens/external-unit-reference.txt',
@@ -261,7 +261,7 @@ describe('Test load external reference with same namespace', () => {
261261
{
262262
method: 'GET',
263263
url: 'http://localhost:9091/ame/api/models',
264-
headers: {'Ame-model-Urn': 'org.eclipse.digitaltwin:1.0.0:external-entity-reference-with-children.txt'},
264+
headers: {namespace: 'org.eclipse.digitaltwin:1.0.0', 'file-name': 'external-entity-reference-with-children.txt'},
265265
},
266266
{
267267
fixture: '/external-reference/same-namespace/with-childrens/external-entity-reference.txt',
@@ -324,7 +324,7 @@ describe('Test load external reference with same namespace', () => {
324324
{
325325
method: 'GET',
326326
url: 'http://localhost:9091/ame/api/models',
327-
headers: {'Ame-model-Urn': 'org.eclipse.digitaltwin:1.0.0:external-entity-reference.txt'},
327+
headers: {namespace: 'org.eclipse.digitaltwin:1.0.0', 'file-name': 'external-entity-reference.txt'},
328328
},
329329
{
330330
fixture: '/external-reference/same-namespace/without-childrens/external-entity-reference.txt',
@@ -335,7 +335,7 @@ describe('Test load external reference with same namespace', () => {
335335
{
336336
method: 'GET',
337337
url: 'http://localhost:9091/ame/api/models',
338-
headers: {'Ame-model-Urn': 'org.eclipse.digitaltwin:1.0.0:external-characteristic-reference.txt'},
338+
headers: {namespace: 'org.eclipse.digitaltwin:1.0.0', 'file-name': 'external-characteristic-reference.txt'},
339339
},
340340
{
341341
fixture: '/external-reference/same-namespace/without-childrens/external-characteristic-reference.txt',
@@ -346,7 +346,7 @@ describe('Test load external reference with same namespace', () => {
346346
{
347347
method: 'GET',
348348
url: 'http://localhost:9091/ame/api/models',
349-
headers: {'Ame-model-Urn': 'org.eclipse.digitaltwin:1.0.0:external-property-reference.txt'},
349+
headers: {namespace: 'org.eclipse.digitaltwin:1.0.0', 'file-name': 'external-property-reference.txt'},
350350
},
351351
{
352352
fixture: '/external-reference/same-namespace/without-childrens/external-property-reference.txt',
@@ -357,7 +357,7 @@ describe('Test load external reference with same namespace', () => {
357357
{
358358
method: 'GET',
359359
url: 'http://localhost:9091/ame/api/models',
360-
headers: {'Ame-model-Urn': 'org.eclipse.digitaltwin:1.0.0:external-operation-reference.txt'},
360+
headers: {namespace: 'org.eclipse.digitaltwin:1.0.0', 'file-name': 'external-operation-reference.txt'},
361361
},
362362
{
363363
fixture: '/external-reference/same-namespace/without-childrens/external-operation-reference.txt',
@@ -368,7 +368,7 @@ describe('Test load external reference with same namespace', () => {
368368
{
369369
method: 'GET',
370370
url: 'http://localhost:9091/ame/api/models',
371-
headers: {'Ame-model-Urn': 'org.eclipse.digitaltwin:1.0.0:external-trait-reference.txt'},
371+
headers: {namespace: 'org.eclipse.digitaltwin:1.0.0', 'file-name': 'external-trait-reference.txt'},
372372
},
373373
{
374374
fixture: '/external-reference/same-namespace/with-childrens/external-trait-reference.txt',
@@ -379,7 +379,7 @@ describe('Test load external reference with same namespace', () => {
379379
{
380380
method: 'GET',
381381
url: 'http://localhost:9091/ame/api/models',
382-
headers: {'Ame-model-Urn': 'org.eclipse.digitaltwin:1.0.0:external-constraint-reference.txt'},
382+
headers: {namespace: 'org.eclipse.digitaltwin:1.0.0', 'file-name': 'external-constraint-reference.txt'},
383383
},
384384
{
385385
fixture: '/external-reference/same-namespace/without-childrens/external-constraint-reference.txt',

0 commit comments

Comments
 (0)