Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Correct MongoDB + Cloud Foundry setup
Fix #4363
- Loading branch information
Showing
5 changed files
with
91 additions
and
95 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
84 changes: 75 additions & 9 deletions
84
generators/server/templates/src/main/java/package/config/_CloudDatabaseConfiguration.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,95 @@ | ||
| package <%=packageName%>.config; | ||
| <%_ if (databaseType == 'mongodb') { _%> | ||
|
|
||
| import <%=packageName%>.domain.util.JSR310DateConverters.*; | ||
|
|
||
| import com.github.mongobee.Mongobee; | ||
| <%_ } _%> | ||
| <%_ if (authenticationType == 'oauth2') { _%> | ||
|
|
||
| import <%=packageName%>.config.oauth2.OAuth2AuthenticationReadConverter; | ||
| <%_ } _%> | ||
|
|
||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory;<% if (hibernateCache == 'hazelcast') { %> | ||
| import org.springframework.cache.CacheManager;<% } %> | ||
| import org.springframework.cloud.config.java.AbstractCloudConfig; | ||
| import org.springframework.context.annotation.*;<% if (databaseType == 'mongodb') { %> | ||
| import org.springframework.data.mongodb.MongoDbFactory;<% } %> | ||
| <% if (databaseType == 'sql') { %> | ||
| import javax.sql.DataSource;<% } %> | ||
| import org.springframework.context.annotation.*; | ||
| <%_ if (databaseType == 'mongodb') { _%> | ||
| import org.springframework.core.convert.converter.Converter; | ||
| import org.springframework.data.mongodb.MongoDbFactory; | ||
| import org.springframework.data.mongodb.core.convert.CustomConversions; | ||
| import org.springframework.data.mongodb.core.mapping.event.ValidatingMongoEventListener; | ||
| import org.springframework.data.mongodb.repository.config.EnableMongoRepositories; | ||
| import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean; | ||
| <%_ } _%> | ||
| <%_ if (databaseType == 'sql') { _%> | ||
|
|
||
| import javax.sql.DataSource; | ||
| <%_ } _%> | ||
| <%_ if (databaseType == 'mongodb') { _%> | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| <%_ } _%> | ||
|
|
||
| @Configuration | ||
| <%_ if (databaseType == 'mongodb') { _%> | ||
| @EnableMongoRepositories("<%=packageName%>.repository") | ||
| <%_ } _%> | ||
| @Profile(Constants.SPRING_PROFILE_CLOUD) | ||
| public class CloudDatabaseConfiguration extends AbstractCloudConfig { | ||
|
|
||
| private final Logger log = LoggerFactory.getLogger(CloudDatabaseConfiguration.class);<% if (databaseType == 'sql') { %> | ||
| private final Logger log = LoggerFactory.getLogger(CloudDatabaseConfiguration.class); | ||
| <%_ if (databaseType == 'sql') { _%> | ||
|
|
||
| @Bean | ||
| public DataSource dataSource(<% if (hibernateCache == 'hazelcast') { %>CacheManager cacheManager<% } %>) { | ||
| log.info("Configuring JDBC datasource from a cloud provider"); | ||
| return connectionFactory().dataSource(); | ||
| }<% } %><% if (databaseType == 'mongodb') { %> | ||
| } | ||
| <%_ } _%> | ||
| <%_ if (databaseType == 'mongodb') { _%> | ||
|
|
||
| @Bean | ||
| public MongoDbFactory mongoDbFactory() { | ||
| log.info("Configuring MongoDB datasource from a cloud provider"); | ||
| public MongoDbFactory mongoFactory() { | ||
| return connectionFactory().mongoDbFactory(); | ||
| }<% } %> | ||
| } | ||
|
|
||
| @Bean | ||
| public LocalValidatorFactoryBean validator() { | ||
| return new LocalValidatorFactoryBean(); | ||
| } | ||
|
|
||
| @Bean | ||
| public ValidatingMongoEventListener validatingMongoEventListener() { | ||
| return new ValidatingMongoEventListener(validator()); | ||
| } | ||
|
|
||
| @Bean | ||
| public CustomConversions customConversions() { | ||
| List<Converter<?, ?>> converterList = new ArrayList<>(); | ||
| <%_ if (authenticationType == 'oauth2') { _%> | ||
| converterList.add(new OAuth2AuthenticationReadConverter()); | ||
| <%_ } _%> | ||
| converterList.add(DateToZonedDateTimeConverter.INSTANCE); | ||
| converterList.add(ZonedDateTimeToDateConverter.INSTANCE); | ||
| converterList.add(DateToLocalDateConverter.INSTANCE); | ||
| converterList.add(LocalDateToDateConverter.INSTANCE); | ||
| converterList.add(DateToLocalDateTimeConverter.INSTANCE); | ||
| converterList.add(LocalDateTimeToDateConverter.INSTANCE); | ||
| return new CustomConversions(converterList); | ||
| } | ||
|
|
||
| @Bean | ||
| public Mongobee mongobee(MongoDbFactory mongoDbFactory) throws Exception { | ||
| log.debug("Configuring Mongobee"); | ||
| Mongobee mongobee = new Mongobee(mongoDbFactory.getDb().getMongo()); | ||
| mongobee.setDbName(mongoDbFactory.getDb().getName()); | ||
| // package to scan for migrations | ||
| mongobee.setChangeLogsScanPackage("<%=packageName%>.config.dbmigrations"); | ||
| mongobee.setEnabled(true); | ||
| return mongobee; | ||
| } | ||
| <%_ } _%> | ||
| } |
78 changes: 0 additions & 78 deletions
78
generators/server/templates/src/main/java/package/config/_CloudMongoDbConfiguration.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters