Skip to content

Commit 1ca8aeb

Browse files
phasenraum2010phasenraum2010
authored andcommitted
removed spring http session with jdbc
1 parent 2fcfcdf commit 1ca8aeb

37 files changed

+104
-107
lines changed

pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,11 +305,13 @@
305305
<build>
306306
<pluginManagement>
307307
<plugins>
308+
<!--
308309
<plugin>
309310
<groupId>org.apache.maven.plugins</groupId>
310311
<artifactId>maven-changelog-plugin</artifactId>
311312
<version>2.3</version>
312313
</plugin>
314+
-->
313315
<plugin>
314316
<groupId>org.codehaus.mojo</groupId>
315317
<artifactId>cobertura-maven-plugin</artifactId>

src/main/java/org/woehlke/learn/learnneo4j/LearnNeo4jApplication.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
MyServerProperties.class,
1717
MySpringBootProperties.class
1818
})
19-
20-
@EnableSpringDataWebSupport
2119
public class LearnNeo4jApplication {
2220

2321
public static void main(String[] args) {
Lines changed: 42 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,62 @@
1-
package org.woehlke.learn.learnneo4j.configuration.spring;
1+
package org.woehlke.learn.learnneo4j.configuration;
22

33
import org.springframework.beans.factory.annotation.Autowired;
4+
import org.springframework.boot.context.properties.ConfigurationProperties;
5+
import org.springframework.boot.jdbc.DataSourceBuilder;
6+
import org.springframework.boot.web.servlet.error.DefaultErrorAttributes;
7+
import org.springframework.boot.web.servlet.error.ErrorAttributes;
8+
import org.springframework.context.annotation.Bean;
49
import org.springframework.context.annotation.Configuration;
10+
import org.springframework.context.annotation.Primary;
11+
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
512
import org.springframework.data.web.config.EnableSpringDataWebSupport;
13+
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
614
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
715
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
816
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
917
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
1018
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
11-
import org.woehlke.learn.learnneo4j.configuration.MyApplicationProperties;
19+
import org.springframework.transaction.PlatformTransactionManager;
20+
import org.springframework.validation.beanvalidation.MethodValidationPostProcessor;
1221

22+
import javax.sql.DataSource;
1323

1424
@Configuration
25+
@EnableJpaRepositories({
26+
"org.woehlke.learn.learnneo4j.model.orm"
27+
})
1528
@EnableWebSecurity
1629
@EnableSpringDataWebSupport
17-
public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
30+
public class Config extends WebSecurityConfigurerAdapter {
31+
/*
32+
@Bean
33+
@Primary
34+
@ConfigurationProperties(prefix = "spring.datasource")
35+
public DataSource dataSource() {
36+
return DataSourceBuilder.create().build();
37+
}
38+
39+
@Bean
40+
public PlatformTransactionManager transactionManager(DataSource dataSource) {
41+
return new DataSourceTransactionManager(dataSource);
42+
}
43+
44+
@Bean
45+
MethodValidationPostProcessor methodValidationPostProcessor() {
46+
return new MethodValidationPostProcessor();
47+
}
48+
49+
@Bean
50+
public ErrorAttributes errorAttributes(){
51+
return new DefaultErrorAttributes();
52+
}
53+
*/
1854

19-
@Override
2055
protected void configure(HttpSecurity http) throws Exception {
2156
http
2257
.authorizeRequests()
2358
.antMatchers(
24-
myApplicationProperties.getWebSecurityConfigPublicPathsAsArray()
59+
myApplicationProperties.getWebSecurityConfigPublicPathsAsArray()
2560
)
2661
.permitAll()
2762
.anyRequest().authenticated()
@@ -49,8 +84,8 @@ public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception
4984
}
5085

5186
@Autowired
52-
public WebSecurityConfig(MyApplicationProperties myApplicationProperties) {
53-
this.myApplicationProperties = myApplicationProperties;
87+
public Config(MyApplicationProperties myApplicationProperties) {
88+
this.myApplicationProperties = myApplicationProperties;
5489
}
5590

5691
private final MyApplicationProperties myApplicationProperties;

src/main/java/org/woehlke/learn/learnneo4j/configuration/spring/DataSourceConfig.java

Lines changed: 0 additions & 33 deletions
This file was deleted.

src/main/java/org/woehlke/learn/learnneo4j/configuration/spring/WebMvcConfig.java

Lines changed: 0 additions & 51 deletions
This file was deleted.

src/main/java/org/woehlke/learn/learnneo4j/frontend/control/open/home/WelcomeController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class WelcomeController {
1414

1515
@GetMapping("/welcome")
1616
public String home(Model model) {
17-
PageContent pageContent = pageContentPopulator.pageContentSetSTandardValues("/adm//portinfo/available/fetch");
17+
PageContent pageContent = pageContentPopulator.pageContentSetSTandardValues("open/welcome");
1818
log.debug(pageContent.toString());
1919
model.addAttribute("pageContent", pageContent);
2020
return "open/welcome";
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
package org.woehlke.learn.learnneo4j.frontend.control.open.login;
2+
3+
import org.apache.commons.logging.Log;
4+
import org.apache.commons.logging.LogFactory;
5+
import org.springframework.beans.factory.annotation.Autowired;
6+
import org.springframework.stereotype.Controller;
7+
import org.springframework.ui.Model;
8+
import org.springframework.web.bind.annotation.GetMapping;
9+
import org.woehlke.learn.learnneo4j.configuration.PageContentPopulator;
10+
import org.woehlke.learn.learnneo4j.frontend.control.open.home.WelcomeController;
11+
import org.woehlke.learn.learnneo4j.frontend.model.PageContent;
12+
13+
@Controller
14+
public class LoginController {
15+
16+
@GetMapping("/login")
17+
public String loginForm(Model model) {
18+
PageContent pageContent = pageContentPopulator.pageContentSetSTandardValues("open/login");
19+
log.debug(pageContent.toString());
20+
model.addAttribute("pageContent", pageContent);
21+
return "open/login";
22+
}
23+
24+
private final PageContentPopulator pageContentPopulator;
25+
26+
@Autowired
27+
public LoginController(PageContentPopulator pageContentPopulator) {
28+
this.pageContentPopulator = pageContentPopulator;
29+
}
30+
31+
private static final Log log = LogFactory.getLog(WelcomeController.class);
32+
}

src/main/resources/application.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,13 @@ org:
105105
pageSubTitle: Graph DB. Power of cool Persistence with Neo4J and Spring-Boot.
106106
webSecurityConfigPublicPaths:
107107
- "/welcome"
108+
- "/welcome/*"
108109
- "/welcome/**"
110+
- "/open/*"
109111
- "/open/**"
112+
- "/graph/*"
110113
- "/graph/**"
114+
- "/db/*"
111115
- "/db/**"
112116
- "/img/*"
113117
- "/img/**"

0 commit comments

Comments
 (0)