Skip to content

Commit 91393ef

Browse files
thomaswoehlkethomaswoehlke
committed
work
1 parent 16d1b69 commit 91393ef

File tree

7 files changed

+159
-80
lines changed

7 files changed

+159
-80
lines changed

‎pom.xml‎

Lines changed: 116 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,94 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
33
<modelVersion>4.0.0</modelVersion>
4+
45
<groupId>org.woehlke</groupId>
56
<artifactId>greenshop</artifactId>
6-
<version>0.5-SNAPSHOT</version>
7+
<version>0.6-SNAPSHOT</version>
8+
9+
<parent>
10+
<groupId>org.springframework.boot</groupId>
11+
<artifactId>spring-boot-starter-parent</artifactId>
12+
<version>2.7.5</version>
13+
</parent>
14+
715
<name>greenshop</name>
816
<url>http://shadowfax.fritz.box/p/greenshop</url>
917
<properties>
10-
<java-version>1.8</java-version>
11-
<org.springframework-version>4.2.3.RELEASE</org.springframework-version>
12-
<spring.integration.version>4.2.3.RELEASE</spring.integration.version>
13-
<spring.security.version>4.0.3.RELEASE</spring.security.version>
14-
<org.aspectj-version>1.6.12</org.aspectj-version>
18+
<java-version>11</java-version>
1519
<org.slf4j-version>1.7.6</org.slf4j-version>
16-
<maven.scm.version>1.9.4</maven.scm.version>
20+
<maven.scm.version>1.13.0</maven.scm.version>
1721
<encoding>UTF-8</encoding>
1822
</properties>
23+
1924
<dependencies>
25+
26+
<dependency>
27+
<groupId>org.springframework.boot</groupId>
28+
<artifactId>spring-boot-starter-web</artifactId>
29+
</dependency>
30+
31+
<dependency>
32+
<groupId>org.springframework.boot</groupId>
33+
<artifactId>spring-boot-starter-actuator</artifactId>
34+
</dependency>
35+
36+
<dependency>
37+
<groupId>org.springframework.boot</groupId>
38+
<artifactId>spring-boot-starter-aop</artifactId>
39+
</dependency>
40+
41+
<dependency>
42+
<groupId>org.springframework.boot</groupId>
43+
<artifactId>spring-boot-starter-security</artifactId>
44+
</dependency>
45+
46+
<dependency>
47+
<groupId>org.springframework.boot</groupId>
48+
<artifactId>spring-boot-starter-validation</artifactId>
49+
</dependency>
50+
51+
<dependency>
52+
<groupId>org.springframework.boot</groupId>
53+
<artifactId>spring-boot-starter-data-jpa</artifactId>
54+
</dependency>
55+
56+
<dependency>
57+
<groupId>org.springframework.boot</groupId>
58+
<artifactId>spring-boot-starter-jdbc</artifactId>
59+
</dependency>
60+
61+
<dependency>
62+
<groupId>org.springframework.boot</groupId>
63+
<artifactId>spring-boot-starter-mail</artifactId>
64+
</dependency>
65+
66+
<dependency>
67+
<groupId>org.springframework.boot</groupId>
68+
<artifactId>spring-boot-starter-thymeleaf</artifactId>
69+
</dependency>
70+
71+
<dependency>
72+
<groupId>org.springframework.boot</groupId>
73+
<artifactId>spring-boot-starter-tomcat</artifactId>
74+
</dependency>
75+
76+
<dependency>
77+
<groupId>org.springframework.boot</groupId>
78+
<artifactId>spring-boot-starter-integration</artifactId>
79+
</dependency>
80+
81+
<dependency>
82+
<groupId>org.springframework.boot</groupId>
83+
<artifactId>spring-boot-starter-test</artifactId>
84+
<scope>test</scope>
85+
</dependency>
86+
87+
2088
<!-- Spring -->
2189
<dependency>
2290
<groupId>org.springframework</groupId>
2391
<artifactId>spring-context</artifactId>
24-
<version>${org.springframework-version}</version>
2592
<exclusions>
2693
<!-- Exclude Commons Logging in favor of SLF4j -->
2794
<exclusion>
@@ -33,7 +100,6 @@
33100
<dependency>
34101
<groupId>org.springframework</groupId>
35102
<artifactId>spring-context-support</artifactId>
36-
<version>${org.springframework-version}</version>
37103
<exclusions>
38104
<!-- Exclude Commons Logging in favor of SLF4j -->
39105
<exclusion>
@@ -45,29 +111,24 @@
45111
<dependency>
46112
<groupId>org.springframework</groupId>
47113
<artifactId>spring-web</artifactId>
48-
<version>${org.springframework-version}</version>
49114
</dependency>
50115
<dependency>
51116
<groupId>org.springframework</groupId>
52117
<artifactId>spring-webmvc</artifactId>
53-
<version>${org.springframework-version}</version>
54118
</dependency>
55119
<dependency>
56120
<groupId>org.springframework</groupId>
57121
<artifactId>spring-expression</artifactId>
58-
<version>${org.springframework-version}</version>
59122
</dependency>
60123
<dependency>
61124
<groupId>org.springframework</groupId>
62125
<artifactId>spring-messaging</artifactId>
63-
<version>${org.springframework-version}</version>
64126
</dependency>
65127

66128
<!-- AspectJ -->
67129
<dependency>
68130
<groupId>org.aspectj</groupId>
69131
<artifactId>aspectjrt</artifactId>
70-
<version>${org.aspectj-version}</version>
71132
</dependency>
72133

73134
<!-- Logging -->
@@ -125,20 +186,19 @@
125186
<dependency>
126187
<groupId>org.hibernate</groupId>
127188
<artifactId>hibernate-entitymanager</artifactId>
189+
<!--
128190
<version>4.3.2.Final</version>
191+
-->
129192
</dependency>
193+
130194
<dependency>
131195
<groupId>org.hibernate</groupId>
132196
<artifactId>hibernate-core</artifactId>
197+
<!--
133198
<version>4.3.2.Final</version>
199+
-->
134200
</dependency>
135-
<!--
136-
<dependency>
137-
<groupId>org.hibernate</groupId>
138-
<artifactId>hibernate-annotations</artifactId>
139-
<version>3.5.6-Final</version>
140-
</dependency>
141-
-->
201+
142202
<dependency>
143203
<groupId>mysql</groupId>
144204
<artifactId>mysql-connector-java</artifactId>
@@ -161,17 +221,20 @@
161221
<dependency>
162222
<groupId>org.springframework</groupId>
163223
<artifactId>spring-aop</artifactId>
164-
<version>${org.springframework-version}</version>
165224
</dependency>
166225
<dependency>
167226
<groupId>org.springframework</groupId>
168227
<artifactId>spring-jdbc</artifactId>
228+
<!--
169229
<version>${org.springframework-version}</version>
230+
-->
170231
</dependency>
171232
<dependency>
172233
<groupId>org.springframework</groupId>
173234
<artifactId>spring-orm</artifactId>
235+
<!--
174236
<version>${org.springframework-version}</version>
237+
-->
175238
</dependency>
176239
<dependency>
177240
<groupId>commons-dbcp</groupId>
@@ -181,29 +244,39 @@
181244
<dependency>
182245
<groupId>org.springframework.data</groupId>
183246
<artifactId>spring-data-jpa</artifactId>
247+
<!--
184248
<version>1.7.2.RELEASE</version>
249+
-->
185250
</dependency>
186251

187252
<!-- Security -->
188253
<dependency>
189254
<groupId>org.springframework.security</groupId>
190255
<artifactId>spring-security-core</artifactId>
256+
<!--
191257
<version>${spring.security.version}</version>
258+
-->
192259
</dependency>
193260
<dependency>
194261
<groupId>org.springframework.security</groupId>
195262
<artifactId>spring-security-web</artifactId>
263+
<!--
196264
<version>${spring.security.version}</version>
265+
-->
197266
</dependency>
198267
<dependency>
199268
<groupId>org.springframework.security</groupId>
200269
<artifactId>spring-security-taglibs</artifactId>
270+
<!--
201271
<version>${spring.security.version}</version>
272+
-->
202273
</dependency>
203274
<dependency>
204275
<groupId>org.springframework.security</groupId>
205276
<artifactId>spring-security-config</artifactId>
277+
<!--
206278
<version>${spring.security.version}</version>
279+
-->
207280
</dependency>
208281

209282
<!-- Mail -->
@@ -221,10 +294,13 @@
221294
<version>4.11</version>
222295
<scope>test</scope>
223296
</dependency>
297+
224298
<dependency>
225299
<groupId>org.springframework</groupId>
226300
<artifactId>spring-test</artifactId>
301+
<!--
227302
<version>${org.springframework-version}</version>
303+
-->
228304
</dependency>
229305

230306
<dependency>
@@ -252,28 +328,30 @@
252328
<dependency>
253329
<groupId>org.springframework.integration</groupId>
254330
<artifactId>spring-integration-core</artifactId>
331+
<!--
255332
<version>${spring.integration.version}</version>
333+
-->
256334
</dependency>
257335

258336
<dependency>
259337
<groupId>org.springframework.integration</groupId>
260338
<artifactId>spring-integration-mongodb</artifactId>
261-
<version>${spring.integration.version}</version>
262-
</dependency>
263-
264-
<dependency>
265-
<groupId>org.springframework.integration</groupId>
266-
<artifactId>spring-integration-jpa</artifactId>
267-
<version>${spring.integration.version}</version>
268-
</dependency>
269-
270-
<dependency>
271-
<groupId>org.springframework.integration</groupId>
272-
<artifactId>spring-integration-test</artifactId>
273-
<version>${spring.integration.version}</version>
274-
</dependency>
275-
276-
<!-- Apache Tiles -->
339+
<!--
340+
<version>${spring.integration.version}</version>
341+
-->
342+
</dependency>
343+
344+
<dependency>
345+
<groupId>org.springframework.integration</groupId>
346+
<artifactId>spring-integration-jpa</artifactId>
347+
</dependency>
348+
349+
<dependency>
350+
<groupId>org.springframework.integration</groupId>
351+
<artifactId>spring-integration-test</artifactId>
352+
</dependency>
353+
354+
<!-- Apache Tiles -->
277355
<dependency>
278356
<groupId>org.apache.tiles</groupId>
279357
<artifactId>tiles-jsp</artifactId>

‎src/main/java/org/woehlke/greenshop/backend/taxes/CountryController.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class CountryController {
4545
public String countries(@RequestParam(value="page",defaultValue=FIRST_PAGE) int page, Model model){
4646
int menuCategory = AdminMenuCategory.LOCATION_TAXES.ordinal();
4747
model.addAttribute("menuCategory",menuCategory);
48-
Pageable pageRequest = new PageRequest(page,PAGE_SIZE, Sort.Direction.ASC, "name");
48+
Pageable pageRequest = PageRequest.of(page,PAGE_SIZE, Sort.Direction.ASC, "name");
4949
Page<Country> countries = countryService.findAllCountriesOrderByName(pageRequest);
5050
model.addAttribute("countries",countries);
5151
Country thisCountry = null;
@@ -63,7 +63,7 @@ public String countries( @RequestParam(value="page",defaultValue=FIRST_PAGE) int
6363
model.addAttribute("menuCategory",menuCategory);
6464
Country thisCountry = countryService.findCountryById(countryId);
6565
model.addAttribute("thisCountry",thisCountry);
66-
Pageable pageRequest = new PageRequest(page,PAGE_SIZE, Sort.Direction.ASC, "name");
66+
Pageable pageRequest = PageRequest.of(page,PAGE_SIZE, Sort.Direction.ASC, "name");
6767
Page<Country> countries = countryService.findAllCountriesOrderByName(pageRequest);
6868
model.addAttribute("countries",countries);
6969
return "admin/taxes/countries";
@@ -73,7 +73,7 @@ public String countries( @RequestParam(value="page",defaultValue=FIRST_PAGE) int
7373
public String countriesInsertForm(@RequestParam(value="page",defaultValue=FIRST_PAGE) int page, Model model){
7474
int menuCategory = AdminMenuCategory.LOCATION_TAXES.ordinal();
7575
model.addAttribute("menuCategory",menuCategory);
76-
Pageable pageRequest = new PageRequest(page,PAGE_SIZE, Sort.Direction.ASC, "name");
76+
Pageable pageRequest = PageRequest.of(page,PAGE_SIZE, Sort.Direction.ASC, "name");
7777
Page<Country> countries = countryService.findAllCountriesOrderByName(pageRequest);
7878
model.addAttribute("countries",countries);
7979
Country thisCountry = new Country();
@@ -90,7 +90,7 @@ public String countriesInsertPerform(@RequestParam(value="page",defaultValue=FIR
9090
if(result.hasErrors()){
9191
int menuCategory = AdminMenuCategory.LOCATION_TAXES.ordinal();
9292
model.addAttribute("menuCategory",menuCategory);
93-
Pageable pageRequest = new PageRequest(page,PAGE_SIZE, Sort.Direction.ASC, "name");
93+
Pageable pageRequest = PageRequest.of(page,PAGE_SIZE, Sort.Direction.ASC, "name");
9494
Page<Country> countries = countryService.findAllCountriesOrderByName(pageRequest);
9595
model.addAttribute("countries",countries);
9696
model.addAttribute("thisCountry",thisCountry);
@@ -111,7 +111,7 @@ public String countriesEditForm(@PathVariable long countryId,
111111
model.addAttribute("menuCategory",menuCategory);
112112
Country thisCountry = countryService.findCountryById(countryId);
113113
model.addAttribute("thisCountry",thisCountry);
114-
Pageable pageRequest = new PageRequest(page,PAGE_SIZE, Sort.Direction.ASC, "name");
114+
Pageable pageRequest = PageRequest.of(page,PAGE_SIZE, Sort.Direction.ASC, "name");
115115
Page<Country> countries = countryService.findAllCountriesOrderByName(pageRequest);
116116
model.addAttribute("countries",countries);
117117
List<AddressFormat> addressFormats = addressFormatService.findAllAddressFormat();
@@ -127,7 +127,7 @@ public String countriesEditSave(@PathVariable long countryId,
127127
if(result.hasErrors()){
128128
int menuCategory = AdminMenuCategory.LOCATION_TAXES.ordinal();
129129
model.addAttribute("menuCategory",menuCategory);
130-
Pageable pageRequest = new PageRequest(page,PAGE_SIZE, Sort.Direction.ASC, "name");
130+
Pageable pageRequest = PageRequest.of(page,PAGE_SIZE, Sort.Direction.ASC, "name");
131131
Page<Country> countries = countryService.findAllCountriesOrderByName(pageRequest);
132132
model.addAttribute("countries",countries);
133133
model.addAttribute("thisCountry",thisCountry);
@@ -149,7 +149,7 @@ public String countriesDeleteForm(@PathVariable long countryId,
149149
model.addAttribute("menuCategory",menuCategory);
150150
Country thisCountry = countryService.findCountryById(countryId);
151151
model.addAttribute("thisCountry",thisCountry);
152-
Pageable pageRequest = new PageRequest(page,PAGE_SIZE, Sort.Direction.ASC, "name");
152+
Pageable pageRequest = PageRequest.of(page,PAGE_SIZE, Sort.Direction.ASC, "name");
153153
Page<Country> countries = countryService.findAllCountriesOrderByName(pageRequest);
154154
model.addAttribute("countries",countries);
155155
return "admin/taxes/countriesDeleteForm";

0 commit comments

Comments
 (0)