Merge pull request #286 from adrienlauer/bugfix/coffig-class-array

Upgrade coffig, test for class array config

Author: adrienlauer

.travis.yml

@@ -11,8 +11,6 @@ install:
   - echo "<settings><servers><server><id>ossrh</id><username>\${env.SONATYPE_USER}</username><password>\${env.SONATYPE_PASSWORD}</password></server></servers></settings>" > ~/.m2/settings.xml
   - if [[ $TRAVIS_PULL_REQUEST = false ]] && [[ $TRAVIS_BRANCH = master || $TRAVIS_BRANCH = dev-* ]] || [[ $TRAVIS_TAG = v* ]]; then GOAL=deploy; else GOAL=install; fi
   - if [[ $TRAVIS_TAG = v* ]]; then ADDITIONAL_PROFILES=release; mvn -q -U org.seedstack:seedstack-maven-plugin:release; fi
-  - echo $ADDITIONAL_PROFILES
-  - echo $GOAL
 
 script: mvn -U -Pbuild-number,compatibility,javadoc,$ADDITIONAL_PROFILES $GOAL
 

core/src/test/java/org/seedstack/seed/core/ConfigurationIT.java

@@ -9,6 +9,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.util.List;
+
 import com.google.inject.Injector;
 
 import javax.inject.Inject;
@@ -24,6 +26,8 @@
 import org.seedstack.seed.Bind;
 import org.seedstack.seed.ClassConfiguration;
 import org.seedstack.seed.Configuration;
+import org.seedstack.seed.core.fixtures.Dummy;
+import org.seedstack.seed.core.fixtures.DummyService1;
 import org.seedstack.seed.core.fixtures.Service;
 import org.seedstack.seed.core.fixtures.SomeEnum;
 import org.seedstack.seed.testing.junit4.SeedITRunner;
@@ -184,6 +188,18 @@ public void applicationInfo() {
         assertThat(application.getVersion()).isEqualTo("1.0.0");
     }
 
+    @Test
+    public void testClassArrayConfiguration() {
+        ClassArray underTest = injector.getInstance(Holder.class).classArray;
+
+        assertThat(underTest).isNotNull();
+        assertThat(underTest.singleClazz).isNotNull().isEqualTo(Dummy.class);
+        assertThat(underTest.string).isNotNull().hasSize(2).containsExactly(Dummy.class.getCanonicalName(),
+                DummyService1.class.getCanonicalName());
+        assertThat(underTest.list).isNotNull().hasSize(2).containsExactly(Dummy.class, DummyService1.class);
+        assertThat(underTest.clazz).isNotNull().hasSize(2).containsExactly(Dummy.class, DummyService1.class);
+    }
+
     @Bind
     private static class Holder {
         @Inject
@@ -218,6 +234,18 @@ private static class Holder {
 
         @Configuration(injectDefault = false)
         OtherConfigObject otherConfigObject3;
+
+        @Configuration
+        ClassArray classArray;
+    }
+
+    @Config("classArray")
+    private static class ClassArray {
+        Class<?> clazz[];
+        String string[];
+        List<Class<?>> list;
+        Class<?> singleClazz;
+
     }
 
     @Config("someObject")

core/src/test/resources/application.yaml

@@ -79,3 +79,15 @@ functions:
   availableTcpPort: $availableTcpPort('port1')
   availableUdpPort: $availableUdpPort('port2')
   randomUuid: $randomUuid()
+classArray:
+  singleClazz: org.seedstack.seed.core.fixtures.Dummy
+  clazz: 
+  - org.seedstack.seed.core.fixtures.Dummy
+  - org.seedstack.seed.core.fixtures.DummyService1
+  string: 
+  - org.seedstack.seed.core.fixtures.Dummy
+  - org.seedstack.seed.core.fixtures.DummyService1
+  list:  
+  - org.seedstack.seed.core.fixtures.Dummy
+  - org.seedstack.seed.core.fixtures.DummyService1
+  

pom.xml

@@ -26,7 +26,7 @@
         <nuun-kernel.version>1.0.M11</nuun-kernel.version>
         <javassist.version>3.24.1-GA</javassist.version>
         <shed.version>1.1.6</shed.version>
-        <coffig.version>3.1.6</coffig.version>
+        <coffig.version>3.1.7-SNAPSHOT</coffig.version>
         <commons-cli.version>1.4</commons-cli.version>
         <guice.version>5.0.1</guice.version>
         <guava.version>30.1.1-jre</guava.version>