Skip to content

Commit

Permalink
cleanup, works now with heroku's postgreSQL
Browse files Browse the repository at this point in the history
  • Loading branch information
tuomokar committed Apr 26, 2016
1 parent dca6e2b commit ed5f699
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 74 deletions.
14 changes: 1 addition & 13 deletions src/main/java/ohtuhatut/domain/Reference.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,7 @@
@DiscriminatorOptions(force = true)
@Table(name = "Reference")
public class Reference extends AbstractPersistable<Long> {

@ManyToMany(fetch = FetchType.LAZY,
cascade = CascadeType.ALL)
private List<ReferenceList> referenceLists;


@Transient
protected String type;

Expand Down Expand Up @@ -466,13 +462,5 @@ public void setOrganization(String organization) {
public void setId(Long id) {
super.setId(id);
}

public List<ReferenceList> getReferenceLists() {
return referenceLists;
}

public void setReferenceLists(List<ReferenceList> referenceLists) {
this.referenceLists = referenceLists;
}

}
60 changes: 0 additions & 60 deletions src/main/java/ohtuhatut/profile/ProductionProfile.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,65 +31,5 @@ public class ProductionProfile {
public DataSource dataSource() {
return DataSourceBuilder.create().build();
}

/*
@Bean
public LocalContainerEntityManagerFactoryBean entityManagerFactory() throws URISyntaxException {
LocalContainerEntityManagerFactoryBean factory = new LocalContainerEntityManagerFactoryBean();
// factory.setJpaDialect(new HibernateJpaDialect());
HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
vendorAdapter.setGenerateDdl(true);
factory.setJpaVendorAdapter(vendorAdapter);
factory.setPersistenceUnitName("production");
factory.setPackagesToScan("ohtuhatut.domain");
factory.afterPropertiesSet();
return factory;
}
*/
/*
private static Connection getConnection() throws URISyntaxException, SQLException {
URI dbUri = new URI(System.getenv("DATABASE_URL"));
String username = dbUri.getUserInfo().split(":")[0];
String password = dbUri.getUserInfo().split(":")[1];
String dbUrl = "jdbc:postgresql://" + dbUri.getHost() + ':' + dbUri.getPort() + dbUri.getPath();
return DriverManager.getConnection(dbUrl, username, password);
}
*/

/*
@Bean
public PlatformTransactionManager transactionManager() throws URISyntaxException {
JpaTransactionManager transactionManager = new JpaTransactionManager();
transactionManager.setEntityManagerFactory(entityManagerFactory().getObject());
return transactionManager;
}
@Bean
public DataSource dataSource() throws URISyntaxException {
URI dbUri = new URI(System.getenv("DATABASE_URL"));

String username = dbUri.getUserInfo().split(":")[0];
String password = dbUri.getUserInfo().split(":")[1];
String dbUrl = "jdbc:postgresql://" + dbUri.getHost() + ':' + dbUri.getPort() + dbUri.getPath();
BasicDataSource basicDataSource = new BasicDataSource();
basicDataSource.setDriverClassName("org.postgresql.Driver");
basicDataSource.setUrl(dbUrl);
basicDataSource.setUsername(username);
basicDataSource.setPassword(password);
return basicDataSource;
}
*/
}
1 change: 0 additions & 1 deletion src/main/resources/application-production.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
spring.thymeleaf.cache=false

#spring.jpa.database-platform = org.hibernate.dialect.PostgreSQL9Dialect
spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.PostgreSQL9Dialect
spring.datasource.driverClassName=org.postgresql.Driver
spring.datasource.url=${JDBC_DATABASE_URL}
Expand Down

0 comments on commit ed5f699

Please sign in to comment.