Merge pull request #2633 from smillidge/PAYARA-2687

PAYARA-2687 ensure Config built with ConfigBuilder has the default co…
payara · Apr 18, 2018 · 8579e5d · 8579e5d
2 parents 1cb8ece + 1111119
commit 8579e5d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/...src/main/java/fish/payara/nucleus/microprofile/config/spi/ConfigProviderResolverImpl.java b/...src/main/java/fish/payara/nucleus/microprofile/config/spi/ConfigProviderResolverImpl.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2017 Payara Foundation and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017-2018 Payara Foundation and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -90,16 +90,13 @@
 import org.eclipse.microprofile.config.spi.Converter;
 import org.glassfish.api.StartupRunLevel;
 import org.glassfish.api.admin.ServerEnvironment;
-import org.glassfish.api.event.EventListener;
-import org.glassfish.api.event.Events;
 import org.glassfish.api.invocation.ComponentInvocation;
 import org.glassfish.api.invocation.InvocationManager;
 import org.glassfish.hk2.runlevel.RunLevel;
 import org.glassfish.internal.api.ServerContext;
 import org.glassfish.internal.data.ApplicationInfo;
 import org.glassfish.internal.data.ApplicationRegistry;
 import org.glassfish.internal.data.ModuleInfo;
-import org.glassfish.internal.deployment.Deployment;
 import org.jvnet.hk2.annotations.Optional;
 import org.jvnet.hk2.annotations.Service;
 

diff --git a/...ervice/src/main/java/fish/payara/nucleus/microprofile/config/spi/PayaraConfigBuilder.java b/...ervice/src/main/java/fish/payara/nucleus/microprofile/config/spi/PayaraConfigBuilder.java
@@ -106,6 +106,7 @@ public ConfigBuilder withConverters(Converter<?>... converters) {
 
     @Override
     public Config build() {
+        this.converters.addAll(resolver.getDefaultConverters());
         return new PayaraConfig(sources, converters);
     }