Skip to content

Commit 2fcfcdf

Browse files
phasenraum2010phasenraum2010
phasenraum2010
authored and
phasenraum2010
committed
removed spring http session with jdbc
1 parent 59e5788 commit 2fcfcdf

File tree

7 files changed

+3
-114
lines changed

7 files changed

+3
-114
lines changed

pom.xml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -231,10 +231,6 @@
231231
<groupId>org.springframework.data</groupId>
232232
<artifactId>spring-data-rest-hal-browser</artifactId>
233233
</dependency>
234-
<dependency>
235-
<groupId>org.springframework.session</groupId>
236-
<artifactId>spring-session-core</artifactId>
237-
</dependency>
238234
<dependency>
239235
<groupId>org.neo4j</groupId>
240236
<artifactId>neo4j-ogm-api</artifactId>
@@ -288,10 +284,6 @@
288284
<artifactId>spring-boot-configuration-processor</artifactId>
289285
<optional>true</optional>
290286
</dependency>
291-
<dependency>
292-
<groupId>org.springframework.session</groupId>
293-
<artifactId>spring-session-jdbc</artifactId>
294-
</dependency>
295287
<dependency>
296288
<groupId>org.springframework.boot</groupId>
297289
<artifactId>spring-boot-starter-jdbc</artifactId>
@@ -307,6 +299,7 @@
307299
<groupId>org.springframework.boot</groupId>
308300
<artifactId>spring-boot-starter-security</artifactId>
309301
</dependency>
302+
310303
</dependencies>
311304

312305
<build>

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import org.springframework.boot.autoconfigure.SpringBootApplication;
55
import org.springframework.boot.context.properties.EnableConfigurationProperties;
66
import org.springframework.data.web.config.EnableSpringDataWebSupport;
7-
import org.springframework.session.jdbc.config.annotation.web.http.EnableJdbcHttpSession;
87
import org.woehlke.learn.learnneo4j.configuration.MyApplicationProperties;
98
import org.woehlke.learn.learnneo4j.configuration.properties.*;
109

@@ -18,7 +17,6 @@
1817
MySpringBootProperties.class
1918
})
2019

21-
@EnableJdbcHttpSession
2220
@EnableSpringDataWebSupport
2321
public class LearnNeo4jApplication {
2422

src/main/java/org/woehlke/learn/learnneo4j/configuration/properties/MySpringBootProperties.java

Lines changed: 0 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ public class MySpringBootProperties {
2424
@Valid
2525
private Jpa jpa = new Jpa();
2626

27-
@Valid
28-
private Session session = new Session();
29-
3027
@Valid
3128
private Template template = new Template();
3229

@@ -528,84 +525,6 @@ public String toString() {
528525
}
529526
}
530527

531-
@Validated
532-
public static class Session {
533-
534-
@NotNull
535-
private String storeType;
536-
537-
@Valid
538-
private Jdbc jdbc = new Jdbc();
539-
540-
@Validated
541-
public static class Jdbc {
542-
543-
@Valid
544-
private Initializer initializer = new Initializer();
545-
546-
@Validated
547-
public static class Initializer {
548-
549-
@NotNull
550-
private Boolean enabled;
551-
552-
public Boolean getEnabled() {
553-
return enabled;
554-
}
555-
556-
public void setEnabled(Boolean enabled) {
557-
this.enabled = enabled;
558-
}
559-
560-
@Override
561-
public String toString() {
562-
return "Initializer{" +
563-
"enabled=" + enabled +
564-
'}';
565-
}
566-
}
567-
568-
public Initializer getInitializer() {
569-
return initializer;
570-
}
571-
572-
public void setInitializer(Initializer initializer) {
573-
this.initializer = initializer;
574-
}
575-
576-
@Override
577-
public String toString() {
578-
return "Jdbc{" +
579-
"initializer=" + initializer +
580-
'}';
581-
}
582-
}
583-
584-
public String getStoreType() {
585-
return storeType;
586-
}
587-
588-
public void setStoreType(String storeType) {
589-
this.storeType = storeType;
590-
}
591-
592-
public Jdbc getJdbc() {
593-
return jdbc;
594-
}
595-
596-
public void setJdbc(Jdbc jdbc) {
597-
this.jdbc = jdbc;
598-
}
599-
600-
@Override
601-
public String toString() {
602-
return "Session{" +
603-
"storeType='" + storeType + '\'' +
604-
", jdbc=" + jdbc +
605-
'}';
606-
}
607-
}
608-
609528
@Validated
610529
public static class Template {
611530

@@ -666,14 +585,6 @@ public void setJpa(Jpa jpa) {
666585
this.jpa = jpa;
667586
}
668587

669-
public Session getSession() {
670-
return session;
671-
}
672-
673-
public void setSession(Session session) {
674-
this.session = session;
675-
}
676-
677588
public Template getTemplate() {
678589
return template;
679590
}
@@ -712,7 +623,6 @@ public String toString() {
712623
"profiles='" + profiles + '\'' +
713624
", datasource=" + datasource +
714625
", jpa=" + jpa +
715-
", session=" + session +
716626
", template=" + template +
717627
", thymeleaf=" + thymeleaf +
718628
", data=" + data +
@@ -728,8 +638,6 @@ public String toString2() {
728638
outputLines.add("spring.jpa.hibernate.ddl-auto = " + this.getJpa().getHibernate().getDdlAuto());
729639
outputLines.add("spring.jpa.properties.hibernate.dialect = " + this.getJpa().getProperties().getHibernate().getDialect());
730640
outputLines.add("spring.jpa.show-sql = " + this.getJpa().getShowSql());
731-
outputLines.add("spring.session.store-type = " + this.getSession().getStoreType());
732-
outputLines.add("spring.session.jdbc.initializer.enabled = " + this.getSession().getJdbc().getInitializer().getEnabled());
733641
outputLines.add("spring.datasource.driverClassName = " + this.getDatasource().getDriverClassName());
734642
outputLines.add("spring.datasource.platform = " + this.getDatasource().getPlatform());
735643
outputLines.add("spring.datasource.continue-on-error = " + this.getDatasource().getContinueOnError());

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import org.springframework.context.annotation.Primary;
99
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
1010
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
11-
import org.springframework.session.jdbc.config.annotation.web.http.JdbcHttpSessionConfiguration;
1211
import org.springframework.transaction.PlatformTransactionManager;
1312

1413
import javax.sql.DataSource;
@@ -18,7 +17,7 @@
1817
@EnableJpaRepositories({
1918
"org.woehlke.learn.learnneo4j.model.orm"
2019
})
21-
public class DataSourceConfig extends JdbcHttpSessionConfiguration {
20+
public class DataSourceConfig {
2221

2322
@Bean
2423
@Primary

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,13 @@
55
import org.springframework.context.annotation.Bean;
66
import org.springframework.context.annotation.Configuration;
77
import org.springframework.data.web.config.EnableSpringDataWebSupport;
8-
import org.springframework.session.jdbc.config.annotation.web.http.EnableJdbcHttpSession;
98
import org.springframework.validation.beanvalidation.MethodValidationPostProcessor;
109
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
1110
import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
1211
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
1312

1413

1514
@Configuration
16-
@EnableJdbcHttpSession
1715
@EnableSpringDataWebSupport
1816
public class WebMvcConfig extends WebMvcConfigurerAdapter {
1917

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,11 @@
88
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
99
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
1010
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
11-
import org.springframework.session.jdbc.config.annotation.web.http.EnableJdbcHttpSession;
1211
import org.woehlke.learn.learnneo4j.configuration.MyApplicationProperties;
1312

1413

1514
@Configuration
1615
@EnableWebSecurity
17-
@EnableJdbcHttpSession
1816
@EnableSpringDataWebSupport
1917
public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
2018

src/main/resources/application.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ spring:
6363
platform: POSTGRESQL
6464
tomcat:
6565
max-active: 20
66+
6667
jpa:
6768
database-platform: org.hibernate.dialect.PostgreSQL95Dialect
6869
hibernate:
@@ -76,12 +77,6 @@ spring:
7677
open-in-view: true
7778
generate-ddl: true
7879
show-sql: true
79-
session:
80-
store-type: jdbc
81-
jdbc:
82-
schema: classpath:org/springframework/session/jdbc/schema-postgresql.sql
83-
initializer:
84-
enabled: true
8580
devtools:
8681
livereload:
8782
enabled: true

0 commit comments

Comments
 (0)