POLYGENE-122 : Adding name to Null constraint on set() method on Property of Transient instance.

Author: niclash

core/api/src/main/java/org/apache/polygene/api/constraint/ConstraintViolationException.java

@@ -190,14 +190,17 @@ public String localizedMessageFrom( ResourceBundle bundle )
                            : instanceTypes.stream()
                                           .map( this::nameOf )
                                           .collect( Collectors.joining( "," ) );
-            String name;
-            if( longNames )
+            String name = "";
+            if( primaryType != null )
             {
-                name = primaryType.getName();
-            }
-            else
-            {
-                name = primaryType.getSimpleName();
+                if( longNames )
+                {
+                    name = primaryType.getName();
+                }
+                else
+                {
+                    name = primaryType.getSimpleName();
+                }
             }
             Object[] args = new Object[]{ name, instanceToString, identity, types };
             MessageFormat formatter = new MessageFormat( compositePattern, locale );

core/runtime/src/main/java/org/apache/polygene/runtime/injection/DependencyModel.java

@@ -261,10 +261,7 @@ public void bind( Resolution resolution )
 
             if( injectionProvider == null && !optional )
             {
-                String message =
-                    "[Module " + resolution.module()
-                        .name() + "] Non-optional @" + rawInjectionClass.getName() + " was not bound in " + injectedClass
-                        .getName();
+                String message = "[Module " + resolution.module().name() + "] Non-optional @" + rawInjectionClass.getName() + " was not bound in " + injectedClass.getName();
                 throw new ConstructionException( message );
             }
         }
@@ -301,9 +298,7 @@ public Object inject( InjectionContext context )
         if( injectedValue == null && !optional )
         {
             String simpleName = injectionAnnotation.annotationType().getSimpleName();
-            String message = "[Module " + context.module().name() + "] Non-optional @" +
-                             simpleName + " " + injectionType.toString() +
-                             " was null in " + injectedClass.getName();
+            String message = "[Module " + context.module().name() + "] Non-optional @" + simpleName + " " + injectionType.toString() + " was null in " + injectedClass.getName();
             if( simpleName.toLowerCase().contains( "service" )
                 && !isServiceInjectionProvider() )
             {

core/runtime/src/main/java/org/apache/polygene/runtime/property/PropertyInstance.java

@@ -29,6 +29,7 @@
 import java.util.Map;
 import java.util.Set;
 import org.apache.polygene.api.composite.Composite;
+import org.apache.polygene.api.constraint.ConstraintViolationException;
 import org.apache.polygene.api.property.Property;
 import org.apache.polygene.api.property.PropertyDescriptor;
 import org.apache.polygene.api.property.PropertyWrapper;
@@ -97,7 +98,15 @@ public void set( T aNewValue )
             throw new IllegalStateException( "Property [" + model.qualifiedName() + "] is immutable." );
         }
 
-        model.checkConstraints( aNewValue );
+        try
+        {
+            model.checkConstraints( aNewValue );
+        }
+        catch( ConstraintViolationException e )
+        {
+            e.setInstanceString( model.qualifiedName().toString() );
+            throw e;
+        }
 
         value = aNewValue;
     }

core/runtime/src/test/java/org/apache/polygene/api/common/OptionalTest.java

@@ -42,8 +42,7 @@
 /**
  * Tests for @Optional
  */
-public class OptionalTest
-    extends AbstractPolygeneTest
+public class OptionalTest extends AbstractPolygeneTest
 {
     public void assemble( ModuleAssembly module )
         throws AssemblyException
@@ -100,6 +99,19 @@ public void givenMandatoryPropertyWhenMandatoryMissingThenException()
         assertThrows( ConstraintViolationException.class, () -> transientBuilderFactory.newTransient( TestComposite2.class ) );
     }
 
+    @Test
+    public void givenMandatoryPropertyWhenSettingPropertyToNullOnBuiltInstanceThenException()
+    {
+        TransientBuilder<TestComposite2> builder = transientBuilderFactory.newTransientBuilder( TestComposite2.class );
+        builder.prototype().mandatoryProperty().set( "Hello" );
+        builder.prototype().optionalProperty().set( "World" );
+        TestComposite2 testComposite2 = builder.newInstance();
+        testComposite2.optionalProperty().set( null );
+        assertThrows( ConstraintViolationException.class, () -> {
+            testComposite2.mandatoryProperty().set( null );
+        } );
+    }
+
     @Test
     public void givenOptionalAssociationWhenOptionalMissingThenNoException()
         throws Exception