#1555 - Support .yaml extension (in addition to the existing .yml extension) for application.yaml and application-test.yaml

src/main/java/io/ebean/config/properties/Loader.java

@@ -101,7 +101,7 @@ class Loader {
   }
 
   void loadWithExtensionCheck(String fileName) {
-    if (fileName.endsWith("yml")) {
+    if (fileName.endsWith("yaml") || fileName.endsWith("yml")) {
       loadYaml(fileName, Source.FILE);
     } else if (fileName.endsWith("properties")) {
       loadProperties(fileName, Source.FILE);

src/test/java/io/ebean/config/properties/LoaderTest.java

@@ -38,8 +38,10 @@ public class LoaderTest {
     Loader loader = new Loader();
     loader.loadWithExtensionCheck("test-dummy.properties");
     loader.loadWithExtensionCheck("test-dummy.yml");
+    loader.loadWithExtensionCheck("test-dummy2.yaml");
 
     Properties properties = loader.eval();
+    assertThat(properties.getProperty("dummy.yaml.bar")).isEqualTo("baz");
     assertThat(properties.getProperty("dummy.yml.foo")).isEqualTo("bar");
     assertThat(properties.getProperty("dummy.properties.foo")).isEqualTo("bar");
   }

test-dummy2.yaml

@@ -0,0 +1,3 @@
+dummy:
+  yaml:
+    bar: baz