Skip to content

Commit 6b896d8

Browse files
phasenraum2010phasenraum2010
phasenraum2010
authored and
phasenraum2010
committed
changed propeterties
1 parent c27a54c commit 6b896d8

File tree

17 files changed

+123
-27
lines changed

17 files changed

+123
-27
lines changed

‎pom.xml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -337,16 +337,13 @@
337337
<artifactId>maven-changelog-plugin</artifactId>
338338
<version>2.3</version>
339339
</plugin>
340-
<plugin>
341-
<groupId>org.apache.maven.plugins</groupId>
342-
<artifactId>maven-changelog-plugin</artifactId>
343-
<version>2.3</version>
344-
</plugin>
340+
<!--
345341
<plugin>
346342
<groupId>org.codehaus.mojo</groupId>
347343
<artifactId>cobertura-maven-plugin</artifactId>
348344
<version>2.7</version>
349345
</plugin>
346+
-->
350347
<plugin>
351348
<groupId>org.apache.maven.plugins</groupId>
352349
<artifactId>maven-project-info-reports-plugin</artifactId>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
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;
78
import org.woehlke.learn.learnneo4j.configuration.MyApplicationProperties;
89
import org.woehlke.learn.learnneo4j.configuration.properties.*;
910

@@ -16,6 +17,8 @@
1617
MyServerProperties.class,
1718
MySpringBootProperties.class
1819
})
20+
21+
@EnableJdbcHttpSession
1922
@EnableSpringDataWebSupport
2023
public class LearnNeo4jApplication {
2124

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,21 @@
77
import org.springframework.context.annotation.Configuration;
88
import org.springframework.context.annotation.Primary;
99
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
10+
import org.springframework.data.web.config.EnableSpringDataWebSupport;
11+
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
12+
import org.springframework.session.jdbc.config.annotation.web.http.EnableJdbcHttpSession;
1013
import org.springframework.session.jdbc.config.annotation.web.http.JdbcHttpSessionConfiguration;
14+
import org.springframework.transaction.PlatformTransactionManager;
1115

1216
import javax.sql.DataSource;
1317

18+
1419
@Configuration
1520
@EnableJpaRepositories({
1621
"org.woehlke.learn.learnneo4j.model.orm"
1722
})
23+
@EnableJdbcHttpSession
24+
@EnableSpringDataWebSupport
1825
public class DataSourceConfig extends JdbcHttpSessionConfiguration {
1926

2027
@Bean
@@ -24,4 +31,8 @@ public DataSource dataSource() {
2431
return DataSourceBuilder.create().build();
2532
}
2633

34+
@Bean
35+
public PlatformTransactionManager transactionManager(DataSource dataSource) {
36+
return new DataSourceTransactionManager(dataSource);
37+
}
2738
}

‎src/main/java/org/woehlke/learn/learnneo4j/configuration/spring/HttpSessionConfig.java

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

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
package org.woehlke.learn.learnneo4j.configuration.spring;
22

3+
import org.springframework.boot.web.servlet.error.DefaultErrorAttributes;
4+
import org.springframework.boot.web.servlet.error.ErrorAttributes;
35
import org.springframework.context.annotation.Bean;
46
import org.springframework.context.annotation.Configuration;
57
import org.springframework.data.web.config.EnableSpringDataWebSupport;
8+
import org.springframework.session.jdbc.config.annotation.web.http.EnableJdbcHttpSession;
69
import org.springframework.validation.beanvalidation.MethodValidationPostProcessor;
710
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
811
import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
912
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
1013

1114

1215
@Configuration
16+
@EnableJdbcHttpSession
1317
@EnableSpringDataWebSupport
1418
public class WebMvcConfig extends WebMvcConfigurerAdapter {
1519

@@ -39,4 +43,11 @@ public void addResourceHandlers(ResourceHandlerRegistry registry) {
3943
MethodValidationPostProcessor methodValidationPostProcessor() {
4044
return new MethodValidationPostProcessor();
4145
}
46+
47+
@Bean
48+
public ErrorAttributes errorAttributes(){
49+
return new DefaultErrorAttributes();
50+
}
51+
52+
4253
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,14 @@
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;
1112
import org.woehlke.learn.learnneo4j.configuration.MyApplicationProperties;
1213

14+
1315
@Configuration
14-
@EnableSpringDataWebSupport
1516
@EnableWebSecurity
17+
@EnableJdbcHttpSession
18+
@EnableSpringDataWebSupport
1619
public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
1720

1821
@Override

‎src/main/java/org/woehlke/learn/learnneo4j/model/graph/category/CategoryController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public String findAll(Model model) {
2929
}
3030
model.addAttribute("all", all);
3131
model.addAttribute("tizle", "Category.findAll");
32-
PageContent pageContent = pageContentPopulator.pageContentSetSTandardValues("/adm//portinfo/available/fetch");
32+
PageContent pageContent = pageContentPopulator.pageContentSetSTandardValues("/graph/category/all");
3333
log.debug(pageContent.toString());
3434
model.addAttribute("pageContent", pageContent);
3535
log.info("graph/category/all");

‎src/test/java/org/woehlke/learn/learnneo4j/frontend/control/closed/terminal/test/TerminalControllerTests.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
import org.apache.commons.logging.Log;
55
import org.apache.commons.logging.LogFactory;
6+
import org.junit.Test;
67
import org.junit.runner.RunWith;
78
import org.springframework.boot.test.context.SpringBootTest;
89
import org.springframework.test.context.junit4.SpringRunner;
@@ -13,4 +14,9 @@
1314
public class TerminalControllerTests {
1415

1516
private static final Log log = LogFactory.getLog(PortinfoServiceImpl.class);
17+
18+
@Test
19+
public void contextLoads() {
20+
log.info("contextLoads");
21+
}
1622
}

‎src/test/java/org/woehlke/learn/learnneo4j/frontend/control/open/home/test/WelcomeControllerTests.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
import org.apache.commons.logging.Log;
55
import org.apache.commons.logging.LogFactory;
6+
import org.junit.Test;
67
import org.junit.runner.RunWith;
78
import org.springframework.boot.test.context.SpringBootTest;
89
import org.springframework.test.context.junit4.SpringRunner;
@@ -13,4 +14,9 @@
1314
public class WelcomeControllerTests {
1415

1516
private static final Log log = LogFactory.getLog(PortinfoServiceImpl.class);
17+
18+
@Test
19+
public void contextLoads() {
20+
log.info("contextLoads");
21+
}
1622
}

‎src/test/java/org/woehlke/learn/learnneo4j/home/test/WelcomeControllerTests.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import org.apache.commons.logging.Log;
44
import org.apache.commons.logging.LogFactory;
5+
import org.junit.Test;
56
import org.junit.runner.RunWith;
67
import org.springframework.boot.test.context.SpringBootTest;
78
import org.springframework.test.context.junit4.SpringRunner;
@@ -12,4 +13,9 @@
1213
public class WelcomeControllerTests {
1314

1415
private static final Log log = LogFactory.getLog(PortinfoServiceImpl.class);
16+
17+
@Test
18+
public void contextLoads() {
19+
log.info("contextLoads");
20+
}
1521
}

‎src/test/java/org/woehlke/learn/learnneo4j/model/graph/category/test/CategoryControllerTests.java

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,50 @@
22

33
import org.apache.commons.logging.Log;
44
import org.apache.commons.logging.LogFactory;
5+
import org.junit.Test;
56
import org.junit.runner.RunWith;
7+
import org.springframework.beans.factory.annotation.Autowired;
8+
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
69
import org.springframework.boot.test.context.SpringBootTest;
10+
import org.springframework.boot.test.mock.mockito.MockBean;
11+
import org.springframework.http.MediaType;
712
import org.springframework.test.context.junit4.SpringRunner;
13+
import org.springframework.test.web.reactive.server.WebTestClient;
14+
import org.springframework.test.web.servlet.MockMvc;
15+
import org.woehlke.learn.learnneo4j.model.graph.Category;
16+
import org.woehlke.learn.learnneo4j.model.graph.category.CategoryController;
17+
import org.woehlke.learn.learnneo4j.model.graph.category.CategoryService;
818
import org.woehlke.learn.learnneo4j.model.orm.portinfo.PortinfoServiceImpl;
919

20+
import static org.mockito.BDDMockito.given;
21+
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
22+
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
23+
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
24+
25+
1026
@RunWith(SpringRunner.class)
11-
@SpringBootTest
27+
@WebMvcTest(CategoryController.class)
1228
public class CategoryControllerTests {
1329

1430
private static final Log log = LogFactory.getLog(PortinfoServiceImpl.class);
31+
32+
@Autowired
33+
private MockMvc mvc;
34+
35+
@MockBean
36+
private CategoryService categoryService;
37+
38+
@Test
39+
public void testExample() throws Exception {
40+
log.info("testExample Start");
41+
Iterable<Category> result = this.categoryService.findAll();
42+
43+
given(this.categoryService.findAll())
44+
.willReturn(result);
45+
this.mvc.perform(get("/graph/category/alll").accept(MediaType.TEXT_HTML))
46+
.andExpect(status().isOk()).andExpect(content().string("My default pageTitle"));
47+
48+
log.info("testExample Done");
49+
}
50+
1551
}

‎src/test/java/org/woehlke/learn/learnneo4j/model/graph/licens/test/LicenseControllerTests.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import org.apache.commons.logging.Log;
44
import org.apache.commons.logging.LogFactory;
5+
import org.junit.Test;
56
import org.junit.runner.RunWith;
67
import org.springframework.boot.test.context.SpringBootTest;
78
import org.springframework.test.context.junit4.SpringRunner;
@@ -12,4 +13,9 @@
1213
public class LicenseControllerTests {
1314

1415
private static final Log log = LogFactory.getLog(PortinfoServiceImpl.class);
16+
17+
@Test
18+
public void contextLoads() {
19+
log.info("contextLoads");
20+
}
1521
}

‎src/test/java/org/woehlke/learn/learnneo4j/model/graph/maintainer/test/MaintainerConrollerTests.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
import org.apache.commons.logging.Log;
55
import org.apache.commons.logging.LogFactory;
6+
import org.junit.Test;
67
import org.junit.runner.RunWith;
78
import org.springframework.boot.test.context.SpringBootTest;
89
import org.springframework.test.context.junit4.SpringRunner;
@@ -13,4 +14,9 @@
1314
public class MaintainerConrollerTests {
1415

1516
private static final Log log = LogFactory.getLog(PortinfoServiceImpl.class);
17+
18+
@Test
19+
public void contextLoads() {
20+
log.info("contextLoads");
21+
}
1622
}

‎src/test/java/org/woehlke/learn/learnneo4j/model/graph/platform/test/PlatformControllerTests.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import org.apache.commons.logging.Log;
44
import org.apache.commons.logging.LogFactory;
5+
import org.junit.Test;
56
import org.junit.runner.RunWith;
67
import org.springframework.boot.test.context.SpringBootTest;
78
import org.springframework.test.context.junit4.SpringRunner;
@@ -12,4 +13,9 @@
1213
public class PlatformControllerTests {
1314

1415
private static final Log log = LogFactory.getLog(PortinfoServiceImpl.class);
16+
17+
@Test
18+
public void contextLoads() {
19+
log.info("contextLoads");
20+
}
1521
}

‎src/test/java/org/woehlke/learn/learnneo4j/model/graph/port/test/PortControllerTests.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
import org.apache.commons.logging.Log;
55
import org.apache.commons.logging.LogFactory;
6+
import org.junit.Test;
67
import org.junit.runner.RunWith;
78
import org.springframework.boot.test.context.SpringBootTest;
89
import org.springframework.test.context.junit4.SpringRunner;
@@ -13,4 +14,9 @@
1314
public class PortControllerTests {
1415

1516
private static final Log log = LogFactory.getLog(PortinfoServiceImpl.class);
17+
18+
@Test
19+
public void contextLoads() {
20+
log.info("contextLoads");
21+
}
1622
}

‎src/test/java/org/woehlke/learn/learnneo4j/model/graph/variant/test/VariantControllerTests.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import org.apache.commons.logging.Log;
44
import org.apache.commons.logging.LogFactory;
5+
import org.junit.Test;
56
import org.junit.runner.RunWith;
67
import org.springframework.boot.test.context.SpringBootTest;
78
import org.springframework.test.context.junit4.SpringRunner;
@@ -12,4 +13,9 @@
1213
public class VariantControllerTests {
1314

1415
private static final Log log = LogFactory.getLog(PortinfoServiceImpl.class);
16+
17+
@Test
18+
public void contextLoads() {
19+
log.info("contextLoads");
20+
}
1521
}

‎src/test/java/org/woehlke/learn/learnneo4j/model/orm/portinfo/test/PortinfoControllerTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
import org.apache.commons.logging.Log;
55
import org.apache.commons.logging.LogFactory;
6+
import org.junit.Test;
67
import org.junit.runner.RunWith;
78
import org.springframework.boot.test.context.SpringBootTest;
89
import org.springframework.test.context.junit4.SpringRunner;
@@ -13,4 +14,9 @@
1314
public class PortinfoControllerTest {
1415

1516
private static final Log log = LogFactory.getLog(PortinfoServiceImpl.class);
17+
18+
@Test
19+
public void contextLoads() {
20+
log.info("contextLoads");
21+
}
1622
}

0 commit comments

Comments
 (0)