Merge pull request #337 from bci-oss/load-legacy-models

atextor · web-flow · commit 7e16ed4fe24b · 2023-03-29T19:08:26.000+02:00
Enable loading of legacy models
diff --git a/core/esmf-aspect-model-resolver/src/main/java/org/eclipse/esmf/aspectmodel/resolver/AspectModelResolver.java b/core/esmf-aspect-model-resolver/src/main/java/org/eclipse/esmf/aspectmodel/resolver/AspectModelResolver.java
@@ -303,8 +303,7 @@ private Try<Model> getModelForUrn( final String urn, final ResolutionStrategy re
       }
 
       try {
-//         final AspectModelUrn aspectModelUrn = AspectModelUrn.fromUrn( replaceLegacyBammUrn( urn ) );
-         final AspectModelUrn aspectModelUrn = AspectModelUrn.fromUrn( urn );
+         final AspectModelUrn aspectModelUrn = AspectModelUrn.fromUrn( replaceLegacyBammUrn( urn ) );
          if ( aspectModelUrn.getElementType() != ElementType.NONE ) {
             return Try.success( EMPTY_MODEL );
          }

Original file line number	Diff line number	Diff line change
`@@ -303,8 +303,7 @@ private Try<Model> getModelForUrn( final String urn, final ResolutionStrategy re`
`303`	`303`	`}`
`304`	`304`
`305`	`305`	`try {`
`306`		`-// final AspectModelUrn aspectModelUrn = AspectModelUrn.fromUrn( replaceLegacyBammUrn( urn ) );`
`307`		`- final AspectModelUrn aspectModelUrn = AspectModelUrn.fromUrn( urn );`
	`306`	`+ final AspectModelUrn aspectModelUrn = AspectModelUrn.fromUrn( replaceLegacyBammUrn( urn ) );`
`308`	`307`	`if ( aspectModelUrn.getElementType() != ElementType.NONE ) {`
`309`	`308`	`return Try.success( EMPTY_MODEL );`
`310`	`309`	`}`