Merge pull request #1033 from Zhack47/dev

 ignore and warn adding duplicate component, #993

Author: AlmasB

fxgl-entity/src/main/java/com/almasb/fxgl/entity/Entity.java

@@ -389,9 +389,9 @@ public final List<Component> getComponents() {
     public final void addComponent(Component component) {
         checkNotUpdating();
 
-        checkRequirementsMet(component.getClass());
-
-        addComponentNoChecks(component);
+        if (checkRequirementsMet(component.getClass())) {
+            addComponentNoChecks(component);
+        }
     }
 
     private void addComponentNoChecks(Component component) {
@@ -533,20 +533,18 @@ private boolean isCoreComponent(Class<? extends Component> type) {
         return type.getAnnotation(CoreComponent.class) != null;
     }
 
-    private void checkRequirementsMet(Class<? extends Component> type) {
-        checkNotDuplicate(type);
-
+    private boolean checkRequirementsMet(Class<? extends Component> type) {
+        // check if not duplicate;
+        if (hasComponent(type)) {
+            log.warning("Entity already has component: " + type.getCanonicalName());
+            return false;
+        }
         for (Required r : type.getAnnotationsByType(Required.class)) {
             if (!hasComponent(r.value())) {
                 throw new IllegalStateException("Required component: [" + r.value().getSimpleName() + "] for: " + type.getSimpleName() + " is missing");
             }
         }
-    }
-
-    private void checkNotDuplicate(Class<? extends Component> type) {
-        if (hasComponent(type)) {
-            throw new IllegalArgumentException("Entity already has component: " + type.getCanonicalName());
-        }
+        return true;
     }
 
     private void checkNotRequiredByAny(Class<? extends Component> type) {

fxgl-entity/src/test/kotlin/com/almasb/fxgl/entity/EntityTest.kt

@@ -48,8 +48,8 @@ class EntityTest {
     }
 
     @Test
-    fun `Add component fails if same type already exists`() {
-        val exception = assertThrows(IllegalArgumentException::class.java) {
+    fun `Add component is ignored if same type already exists`() {
+        val exception = assertDoesNotThrow {
             entity.addComponent(TestComponent())
             entity.addComponent(TestComponent())
         }
@@ -170,16 +170,6 @@ class EntityTest {
         assertThat(entity.components, hasItem(control))
     }
 
-    @Test
-    fun `Add control fails if same type exists`() {
-        val control = TestControl()
-        entity.addComponent(control)
-
-        assertThrows(IllegalArgumentException::class.java, {
-            entity.addComponent(control)
-        })
-    }
-
     @Test
     fun `Add control fails if required module is missing`() {
         assertThrows(IllegalStateException::class.java, {
@@ -878,7 +868,7 @@ class EntityTest {
         assertThat(entity.opacityProperty().value, `is`(0.5))
 
         entity.isVisible = false
-        
+
         assertFalse(entity.isVisible)
         assertFalse(entity.viewComponent.isVisible)
     }
@@ -1027,4 +1017,4 @@ class EntityTest {
             data = bundle.get("data")
         }
     }
-}
+}