Update logic for dateType validation (#360)

Author: Yauhenikapl

esmf-semantic-aspect-meta-model/src/main/resources/samm/characteristic/2.3.0/characteristic-shapes.ttl

@@ -683,7 +683,13 @@ samm-c:SingleEntityShape
             select $this $value ?code ?highlight
             where {
                $this samm:dataType ?value .
-               filter( not exists { ?value rdf:type* samm:Entity } && not exists { ?value rdf:type* samm:AbstractEntity } )
+               filter( isLiteral( ?value )
+                        || strstarts( str( ?value ), str( xsd: ) )
+                        || ( isIRI( ?value )
+                            && not exists { ?value rdf:type* samm:Entity }
+                            && not exists { ?value rdf:type* samm:AbstractEntity }
+                           )
+                      )
                bind( 'ERR_WRONG_DATATYPE' as ?code )
                bind( ?value as ?highlight )
             }

esmf-semantic-aspect-meta-model/src/test/java/org/eclipse/esmf/samm/SingleEntityShapeTest.java

@@ -18,18 +18,18 @@
 
 import org.eclipse.esmf.samm.validation.SemanticError;
 
-public class SingleEntityShapeTest extends AbstractShapeTest {
+class SingleEntityShapeTest extends AbstractShapeTest {
 
    @ParameterizedTest
    @MethodSource( value = "allVersions" )
-   public void testCharacteristicInstanceWithEntityDataTypeValidationExpectSuccess(
+   void testCharacteristicInstanceWithEntityDataTypeValidationExpectSuccess(
          final KnownVersion metaModelVersion ) {
       checkValidity( "single-entity-shape", "TestSingleEntityWithEntityDataType", metaModelVersion );
    }
 
    @ParameterizedTest
    @MethodSource( value = "allVersions" )
-   public void testSingleEntityWithXsdDataTypeExpectFailure( final KnownVersion metaModelVersion ) {
+   void testSingleEntityWithXsdDataTypeExpectFailure( final KnownVersion metaModelVersion ) {
       final SammUrns sammUrns = new SammUrns( metaModelVersion );
       final String focusNode = testNamespacePrefix + "TestSingleEntityWithXSDDataType";
       final String expectedMessage = validator.getMessageText( "samm-c:SingleEntityShape", "samm:dataType", "ERR_WRONG_DATATYPE",
@@ -40,4 +40,5 @@ public void testSingleEntityWithXsdDataTypeExpectFailure( final KnownVersion met
       expectSemanticValidationErrors( "single-entity-shape", "TestSingleEntityWithXSDDataType",
             metaModelVersion, resultForDataType );
    }
+
 }