Skip to content

Commit 4000fd5

Browse files
author
phasenraum2010
committed
ongoing work on #34 #39
1 parent ff9dff8 commit 4000fd5

File tree

4 files changed

+15
-5
lines changed

4 files changed

+15
-5
lines changed

src/main/java/org/woehlke/humanrights/digital/defense/defcon1/config/StorageConfig.java

+9-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import org.neo4j.ogm.session.SessionFactory;
44
import org.springframework.boot.autoconfigure.data.neo4j.Neo4jProperties;
5-
import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
5+
//import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
66
import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties;
77
import org.springframework.boot.context.properties.EnableConfigurationProperties;
88
import org.springframework.context.annotation.Bean;
@@ -19,6 +19,8 @@
1919

2020
/**
2121
* Created by tw on 25.06.18.
22+
*
23+
* TODO: #38
2224
*/
2325
@Configuration
2426
@EnableNeo4jRepositories(
@@ -31,8 +33,8 @@
3133
@EnableTransactionManagement
3234
@EnableConfigurationProperties({
3335
JpaProperties.class,
34-
Neo4jProperties.class,
35-
DataSourceProperties.class
36+
Neo4jProperties.class//,
37+
//DataSourceProperties.class
3638
})
3739
public class StorageConfig {
3840

@@ -41,24 +43,28 @@ public Neo4jTransactionManager neo4jTransactionManager(SessionFactory sessionFac
4143
return new Neo4jTransactionManager(sessionFactory);
4244
}
4345

46+
// TODO: #38
4447
@Bean
4548
public JedisConnectionFactory jedisConnFactory() {
4649
JedisConnectionFactory fac = new JedisConnectionFactory(new RedisStandaloneConfiguration());
4750
return fac;
4851
}
4952

53+
// TODO: #38
5054
@Bean
5155
public RedisTemplate redisTemplate(){
5256
RedisTemplate redisTemplate = new RedisTemplate();
5357
//redisTemplate.setEnableTransactionSupport(true);
5458
return redisTemplate;
5559
}
5660

61+
// TODO: #38
5762
@Bean
5863
public RedisConnectionFactory redisConnectionFactory(JedisConnectionFactory jedisConnFactory) {
5964
return (RedisConnectionFactory) jedisConnFactory;
6065
}
6166

67+
// TODO: #38
6268
@Bean
6369
public RedisOperationsSessionRepository sessionRepository(RedisTemplate redisTemplate){
6470
return new RedisOperationsSessionRepository(redisTemplate);

src/main/java/org/woehlke/humanrights/digital/defense/defcon1/config/StorageConfigurationDistributed.java

+2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515

1616
/**
1717
* @author Natural-Born-Coder
18+
*
19+
* TODO: #38
1820
*/
1921
@Configuration
2022
@Profile({

src/main/java/org/woehlke/humanrights/digital/defense/defcon1/config/StorageConfigurationEmbedded.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222

2323
/**
2424
* @author Natural-Born-Coder
25+
*
26+
* TODO: #38
2527
*/
2628
@Configuration
2729
@Profile({
@@ -71,8 +73,6 @@ public SessionFactory sessionFactory(Driver neo4jDriver) {
7173
return new SessionFactory(neo4jDriver , packages );
7274
}
7375

74-
75-
7676
@Autowired
7777
private Neo4jConfigurationLogger neo4jConfigurationLogger;
7878

src/main/java/org/woehlke/humanrights/digital/defense/defcon1/config/WebMvcWebSecurityConfig.java

+2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525

2626
/**
2727
* Created by tw on 24.06.18.
28+
*
29+
* TODO: #38
2830
*/
2931
@Configuration
3032
@EnableWebMvc

0 commit comments

Comments
 (0)