Heroku database config and other changes for heroku (pom and aplication properties)

Author: pablocjm

backend/pom.xml

@@ -76,6 +76,18 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
+				<configuration>
+					<image>
+						<env>
+							<BPE_OVERRIDE_JAVA_TOOL_OPTIONS>
+								-Xss256K
+								-XX:ReservedCodeCacheSize=64M
+								-XX:MaxMetaspaceSize=100000K
+								-Xmx64M
+							</BPE_OVERRIDE_JAVA_TOOL_OPTIONS>
+						</env>
+					</image>
+				</configuration>
 			</plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

backend/src/main/java/com/youdemy/DatabaseConfig.java

@@ -0,0 +1,38 @@
+package com.youdemy;
+
+import com.zaxxer.hikari.HikariConfig;
+import com.zaxxer.hikari.HikariDataSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import javax.sql.DataSource;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+@Configuration
+public class DatabaseConfig {
+    private static Logger log = LoggerFactory.getLogger(DatabaseConfig.class);
+    @Value("${DATABASE_URL:postgres://iyfppowuslcaqo:661b996dbc1d0774b74d7ff1daa66973d931d1a1225c06d5e97e0c47ca6542e9@ec2-52-73-155-171.compute-1.amazonaws.com:5432/d6rf3u9o1nmqk5}")
+    private String databaseUrl;
+    @Bean
+    @ConditionalOnProperty("DATABASE_URL")
+    public DataSource dataSource() throws URISyntaxException {
+        log.info("Using database configured in DATABASE_URL=", databaseUrl);
+        HikariConfig config = new HikariConfig();
+        URI uri = new URI(databaseUrl);
+        String url = "jdbc:" + new URI("postgresql", null, uri.getHost(), uri.getPort(), uri.getPath(),
+                uri.getQuery(), uri.getFragment()).toString();
+        String[] userInfoParts = uri.getUserInfo().split(":");
+        String username = userInfoParts[0];
+        String password = userInfoParts[1];
+        config.setJdbcUrl(url);
+        config.setUsername(username);
+        config.setPassword(password);
+        config.setAutoCommit(false);
+        return new HikariDataSource(config);
+    }
+}

backend/src/main/resources/application.properties

@@ -1,7 +1,8 @@
 spring.mustache.suffix=.html
-spring.datasource.url=jdbc:postgresql://${POSTGRE_IP}/${POSTGRE_DB}
-spring.datasource.username=${POSTGRE_USER}
-spring.datasource.password=${POSTGRE_PASS}
+spring.datasource.url=jdbc:postgresql://localhost:5432/postgres
+spring.datasource.driver-class-name=org.postgresql.Driver
+spring.datasource.username=postgres
+spring.datasource.password=1234
 spring.jpa.hibernate.ddl-auto=create-drop
 spring.datasource.hikari.auto-commit=false
 spring.mustache.cache=false
@@ -14,7 +15,7 @@ spring.jpa.properties.hibernate.format_sql=true
 logging.level.org.hibernate.SQL=DEBUG
 logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
 
-server.port = 8443
+server.port = ${PORT:8080}
 server.ssl.key-store = classpath:keystore.jks
 server.ssl.key-store-password = password
 server.ssl.key-password = secret