Performance Improvement

core/esmf-aspect-model-urn/src/main/java/org/eclipse/esmf/aspectmodel/urn/AspectModelUrn.java

@@ -15,7 +15,7 @@
 
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.text.MessageFormat;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -119,18 +119,7 @@ public static AspectModelUrn fromUrn( final String urn ) {
    public static AspectModelUrn fromUrn( final URI urn ) {
       checkNotEmpty( urn );
 
-      final List<String> urnParts;
-      if ( urn.toString().contains( "#" ) ) {
-         urnParts = ImmutableList.copyOf( urn.toString().split( "[:|#]" ) );
-      } else {
-         final String[] parts = urn.toString().split( ":" );
-         final ImmutableList.Builder<String> builder = ImmutableList.builder();
-         for ( final String part : parts ) {
-            builder.add( part );
-         }
-         builder.add( "" );
-         urnParts = builder.build();
-      }
+      final List<String> urnParts = getStrings( urn );
 
       final int numberOfUrnParts = urnParts.size();
       checkUrn( numberOfUrnParts >= 5, UrnSyntaxException.URN_IS_MISSING_SECTIONS_MESSAGE );
@@ -157,6 +146,29 @@ public static AspectModelUrn fromUrn( final URI urn ) {
       return new AspectModelUrn( urn, elementName, namespace, elementType, version, isSammUrn );
    }
 
+   private static List<String> getStrings( final URI urn ) {
+      final List<String> urnParts;
+      if ( urn.toString().contains( "#" ) ) {
+         final String urnStr = urn.toString();
+         final String[] baseAndFragment = urnStr.split( "#", 2 ); // [0]=before #, [1]=after #
+         final String[] parts = baseAndFragment[0].split( ":", -1 ); // base parts of URN
+
+         urnParts = new ArrayList<>( Arrays.asList( parts ) );
+         if ( baseAndFragment.length == 2 ) {
+            urnParts.add( baseAndFragment[1] );
+         }
+      } else {
+         final String[] parts = urn.toString().split( ":" );
+         final ImmutableList.Builder<String> builder = ImmutableList.builder();
+         for ( final String part : parts ) {
+            builder.add( part );
+         }
+         builder.add( "" );
+         urnParts = builder.build();
+      }
+      return urnParts;
+   }
+
    /**
     * Checked version of {@link #fromUrn(String)}
     *
@@ -450,12 +462,18 @@ public AspectModelUrn withName( final String name ) {
     * @param errorMessage the exception message to use if the check is successful
     * @throws UrnSyntaxException if {@code expression} is false
     */
-   private static void checkUrn( final boolean expression, final String errorMessage,
-         final Object... errorMessageArguments ) {
-      final String formattedErrorMessage = MessageFormat.format( errorMessage, errorMessageArguments );
+   private static void checkUrn( final boolean expression, final String errorMessage, final Object... errorMessageArguments ) {
       if ( !expression ) {
-         throw new UrnSyntaxException( formattedErrorMessage );
+         String msg = formatSimple( errorMessage, errorMessageArguments );
+         throw new UrnSyntaxException( msg );
+      }
+   }
+
+   private static String formatSimple( String pattern, final Object... args ) {
+      for ( int i = 0; i < args.length; i++ ) {
+         pattern = pattern.replace( "{" + i + "}", String.valueOf( args[i] ) );
       }
+      return pattern;
    }
 
    @Override