Skip to content

Commit

Permalink
Merge pull request #20632 from radcortez/fix-20618
Browse files Browse the repository at this point in the history
Use Config API to check if property exists
  • Loading branch information
aloubyansky authored Oct 8, 2021
2 parents 69a9751 + 1008866 commit ff74fa6
Showing 1 changed file with 6 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
import javax.persistence.spi.PersistenceUnitTransactionType;
import javax.transaction.TransactionManager;

import org.eclipse.microprofile.config.ConfigProvider;
import org.hibernate.MultiTenancyStrategy;
import org.hibernate.boot.archive.scan.spi.ClassDescriptor;
import org.hibernate.boot.archive.scan.spi.PackageDescriptor;
Expand Down Expand Up @@ -130,6 +129,7 @@
import io.quarkus.panache.common.deployment.HibernateEnhancersRegisteredBuildItem;
import io.quarkus.panache.common.deployment.HibernateModelClassCandidatesForFieldAccessBuildItem;
import io.quarkus.runtime.LaunchMode;
import io.quarkus.runtime.configuration.ConfigUtils;
import io.quarkus.runtime.configuration.ConfigurationException;
import net.bytebuddy.description.type.TypeDescription;
import net.bytebuddy.dynamic.DynamicType;
Expand Down Expand Up @@ -196,10 +196,9 @@ void devServicesAutoGenerateByDefault(DevServicesLauncherConfigResultBuildItem d
dsName = "quarkus.datasource." + config.defaultPersistenceUnit.datasource.get() + ".username";
}

if (ConfigProvider.getConfig().getOptionalValue(dsName, String.class).isEmpty()) {
if (!ConfigUtils.isPropertyPresent(dsName)) {
if (devServicesResult.getConfig().containsKey(dsName)) {
if (ConfigProvider.getConfig().getOptionalValue("quarkus.hibernate-orm.database.generation", String.class)
.isEmpty()) {
if (!ConfigUtils.isPropertyPresent("quarkus.hibernate-orm.database.generation")) {
LOG.info(
"Setting quarkus.hibernate-orm.database.generation=drop-and-create to initialize Dev Services managed database");
runTimeConfigurationDefaultBuildItemBuildProducer.produce(new RunTimeConfigurationDefaultBuildItem(
Expand All @@ -215,10 +214,10 @@ void devServicesAutoGenerateByDefault(DevServicesLauncherConfigResultBuildItem d
} else {
dsName = "quarkus.datasource." + entry.getValue().datasource.get() + ".username";
}
if (ConfigProvider.getConfig().getOptionalValue(dsName, String.class).isEmpty()) {
if (!ConfigUtils.isPropertyPresent(dsName)) {
if (devServicesResult.getConfig().containsKey(dsName)) {
String propertyName = "quarkus.hibernate-orm." + entry.getKey() + ".database.generation";
if (ConfigProvider.getConfig().getOptionalValue(propertyName, String.class).isEmpty()) {
if (!ConfigUtils.isPropertyPresent(propertyName)) {
LOG.info("Setting " + propertyName + "=drop-and-create to initialize Dev Services managed database");
runTimeConfigurationDefaultBuildItemBuildProducer
.produce(new RunTimeConfigurationDefaultBuildItem(propertyName, "drop-and-create"));
Expand Down Expand Up @@ -1506,4 +1505,4 @@ static final class CachedProxy {
this.interfaces = interfaces;
}
}
}
}

0 comments on commit ff74fa6

Please sign in to comment.