Skip to content

Commit cb058f0

Browse files
thomaswoehlkethomaswoehlke
committed
work
1 parent fc21e2b commit cb058f0

File tree

6 files changed

+43
-128
lines changed

6 files changed

+43
-128
lines changed

‎pom.xml‎

Lines changed: 6 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<version>2.7.5</version>
1313
</parent>
1414

15-
<packaging>war</packaging>
1615
<name>greenshop</name>
1716
<url>http://shadowfax.fritz.box/p/greenshop</url>
1817

@@ -46,7 +45,6 @@
4645

4746
<properties>
4847
<java-version>11</java-version>
49-
<org.slf4j-version>1.7.6</org.slf4j-version>
5048
<maven.scm.version>1.13.0</maven.scm.version>
5149
<encoding>UTF-8</encoding>
5250
</properties>
@@ -164,50 +162,6 @@
164162
<groupId>org.aspectj</groupId>
165163
<artifactId>aspectjrt</artifactId>
166164
</dependency>
167-
168-
<!-- Logging -->
169-
<dependency>
170-
<groupId>org.slf4j</groupId>
171-
<artifactId>slf4j-api</artifactId>
172-
<version>${org.slf4j-version}</version>
173-
</dependency>
174-
<dependency>
175-
<groupId>org.slf4j</groupId>
176-
<artifactId>jcl-over-slf4j</artifactId>
177-
<version>${org.slf4j-version}</version>
178-
<scope>runtime</scope>
179-
</dependency>
180-
<dependency>
181-
<groupId>org.slf4j</groupId>
182-
<artifactId>slf4j-log4j12</artifactId>
183-
<version>${org.slf4j-version}</version>
184-
<scope>runtime</scope>
185-
</dependency>
186-
<dependency>
187-
<groupId>log4j</groupId>
188-
<artifactId>log4j</artifactId>
189-
<version>1.2.17</version>
190-
<exclusions>
191-
<exclusion>
192-
<groupId>javax.mail</groupId>
193-
<artifactId>mail</artifactId>
194-
</exclusion>
195-
<exclusion>
196-
<groupId>javax.jms</groupId>
197-
<artifactId>jms</artifactId>
198-
</exclusion>
199-
<exclusion>
200-
<groupId>com.sun.jdmk</groupId>
201-
<artifactId>jmxtools</artifactId>
202-
</exclusion>
203-
<exclusion>
204-
<groupId>com.sun.jmx</groupId>
205-
<artifactId>jmxri</artifactId>
206-
</exclusion>
207-
</exclusions>
208-
<scope>runtime</scope>
209-
</dependency>
210-
211165
<!-- @Inject -->
212166
<dependency>
213167
<groupId>javax.inject</groupId>
@@ -220,17 +174,11 @@
220174
<dependency>
221175
<groupId>org.hibernate</groupId>
222176
<artifactId>hibernate-entitymanager</artifactId>
223-
<!--
224-
<version>4.3.2.Final</version>
225-
-->
226177
</dependency>
227178

228179
<dependency>
229180
<groupId>org.hibernate</groupId>
230181
<artifactId>hibernate-core</artifactId>
231-
<!--
232-
<version>4.3.2.Final</version>
233-
-->
234182
</dependency>
235183

236184
<dependency>
@@ -259,58 +207,38 @@
259207
<dependency>
260208
<groupId>org.springframework</groupId>
261209
<artifactId>spring-jdbc</artifactId>
262-
<!--
263-
<version>${org.springframework-version}</version>
264-
-->
265-
</dependency>
266-
<dependency>
267-
<groupId>org.springframework</groupId>
268-
<artifactId>spring-orm</artifactId>
269-
<!--
270-
<version>${org.springframework-version}</version>
271-
-->
272210
</dependency>
211+
<!--
273212
<dependency>
274213
<groupId>commons-dbcp</groupId>
275214
<artifactId>commons-dbcp</artifactId>
276-
<version>1.3</version>
215+
</dependency>
216+
-->
217+
<dependency>
218+
<groupId>org.springframework</groupId>
219+
<artifactId>spring-orm</artifactId>
277220
</dependency>
278221
<dependency>
279222
<groupId>org.springframework.data</groupId>
280223
<artifactId>spring-data-jpa</artifactId>
281-
<!--
282-
<version>1.7.2.RELEASE</version>
283-
-->
284224
</dependency>
285225

286226
<!-- Security -->
287227
<dependency>
288228
<groupId>org.springframework.security</groupId>
289229
<artifactId>spring-security-core</artifactId>
290-
<!--
291-
<version>${spring.security.version}</version>
292-
-->
293230
</dependency>
294231
<dependency>
295232
<groupId>org.springframework.security</groupId>
296233
<artifactId>spring-security-web</artifactId>
297-
<!--
298-
<version>${spring.security.version}</version>
299-
-->
300234
</dependency>
301235
<dependency>
302236
<groupId>org.springframework.security</groupId>
303237
<artifactId>spring-security-taglibs</artifactId>
304-
<!--
305-
<version>${spring.security.version}</version>
306-
-->
307238
</dependency>
308239
<dependency>
309240
<groupId>org.springframework.security</groupId>
310241
<artifactId>spring-security-config</artifactId>
311-
<!--
312-
<version>${spring.security.version}</version>
313-
-->
314242
</dependency>
315243

316244
<!-- Mail -->
@@ -362,17 +290,11 @@
362290
<dependency>
363291
<groupId>org.springframework.integration</groupId>
364292
<artifactId>spring-integration-core</artifactId>
365-
<!--
366-
<version>${spring.integration.version}</version>
367-
-->
368293
</dependency>
369294

370295
<dependency>
371296
<groupId>org.springframework.integration</groupId>
372297
<artifactId>spring-integration-mongodb</artifactId>
373-
<!--
374-
<version>${spring.integration.version}</version>
375-
-->
376298
</dependency>
377299

378300
<dependency>

‎src/main/java/org/woehlke/greenshop/oodm/catalog/entities/Category.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package org.woehlke.greenshop.oodm.catalog.entities;
22

3+
import org.hibernate.annotations.LazyCollection;
4+
import org.hibernate.annotations.LazyCollectionOption;
5+
36
import java.util.Date;
47
import java.util.List;
58

@@ -39,8 +42,9 @@ public class Category {
3942
@Temporal(value=TemporalType.TIMESTAMP)
4043
@Column(name="last_modified")
4144
private Date lastModified;
42-
43-
@ManyToMany(fetch=FetchType.EAGER, mappedBy="categories")
45+
46+
@LazyCollection(LazyCollectionOption.FALSE)
47+
@ManyToMany(mappedBy="categories")
4448
private List<Product> products;
4549

4650
public Long getId() {

‎src/main/java/org/woehlke/greenshop/oodm/catalog/entities/Product.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
import javax.persistence.Temporal;
2020
import javax.persistence.TemporalType;
2121

22+
import org.hibernate.annotations.LazyCollection;
23+
import org.hibernate.annotations.LazyCollectionOption;
2224
import org.hibernate.annotations.NotFound;
2325
import org.hibernate.annotations.NotFoundAction;
2426

@@ -72,7 +74,8 @@ public class Product {
7274
@Column(name="products_ordered",columnDefinition = "INT(11)")
7375
private long ordered;
7476

75-
@ManyToMany(fetch=FetchType.EAGER, cascade = CascadeType.REFRESH)
77+
@LazyCollection(LazyCollectionOption.FALSE)
78+
@ManyToMany( cascade = CascadeType.REFRESH)
7679
@JoinTable(name = "products_to_categories",
7780
joinColumns = @JoinColumn(name = "products_id"),
7881
inverseJoinColumns = @JoinColumn(name = "categories_id"))

‎src/main/java/org/woehlke/greenshop/oodm/checkout/entities/OrderProduct.java‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,11 @@
22

33
import java.util.List;
44

5-
import javax.persistence.Column;
6-
import javax.persistence.Entity;
7-
import javax.persistence.FetchType;
8-
import javax.persistence.GeneratedValue;
9-
import javax.persistence.GenerationType;
10-
import javax.persistence.Id;
11-
import javax.persistence.JoinColumn;
12-
import javax.persistence.ManyToOne;
13-
import javax.persistence.OneToMany;
14-
import javax.persistence.Table;
5+
import javax.persistence.*;
156
import javax.validation.constraints.NotNull;
167

8+
import org.hibernate.annotations.LazyCollection;
9+
import org.hibernate.annotations.LazyCollectionOption;
1710
import org.woehlke.greenshop.oodm.catalog.entities.Product;
1811

1912

@@ -47,16 +40,17 @@ public class OrderProduct {
4740
private Long id;
4841

4942
@NotNull
50-
@ManyToOne
43+
@ManyToOne(cascade={CascadeType.MERGE,CascadeType.DETACH,CascadeType.REFRESH})
5144
@JoinColumn(name="orders_id")
5245
private Order order;
5346

5447
@NotNull
55-
@ManyToOne
48+
@ManyToOne(cascade={CascadeType.MERGE,CascadeType.DETACH,CascadeType.REFRESH})
5649
@JoinColumn(name="products_id")
5750
private Product product;
5851

59-
@OneToMany(mappedBy="orderProduct",fetch = FetchType.EAGER)
52+
@LazyCollection(LazyCollectionOption.FALSE)
53+
@OneToMany(mappedBy="orderProduct")
6054
private List<OrderProductAttribute> orderProductAttribute;
6155

6256
@Column(name="products_model",columnDefinition = "varchar(12)")

‎src/main/java/org/woehlke/greenshop/oodm/checkout/entities/OrderProductAttribute.java‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
package org.woehlke.greenshop.oodm.checkout.entities;
22

3-
import javax.persistence.Column;
4-
import javax.persistence.Entity;
5-
import javax.persistence.GeneratedValue;
6-
import javax.persistence.GenerationType;
7-
import javax.persistence.Id;
8-
import javax.persistence.JoinColumn;
9-
import javax.persistence.ManyToOne;
10-
import javax.persistence.Table;
3+
import javax.persistence.*;
114
import javax.validation.constraints.NotNull;
125

136
/**
@@ -39,17 +32,17 @@ public class OrderProductAttribute {
3932
private Long id;
4033

4134
@NotNull
42-
@ManyToOne
35+
@ManyToOne(cascade={CascadeType.MERGE,CascadeType.DETACH,CascadeType.REFRESH})
4336
@JoinColumn(name="orders_id")
4437
private Order order;
4538

4639
@NotNull
47-
@ManyToOne
40+
@ManyToOne(cascade={CascadeType.MERGE,CascadeType.DETACH,CascadeType.REFRESH})
4841
@JoinColumn(name="orders_products_id")
4942
private OrderProduct orderProduct;
5043

5144
@NotNull
52-
@Column(name="products_options",columnDefinition = "varchar(32)")
45+
@Column(name="products_options", columnDefinition = "varchar(32)")
5346
private String productOption;
5447

5548
@NotNull

‎src/main/resources/application.yml‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ server:
1212
enabled: true
1313
spring:
1414
config:
15-
name: bloodmoney
15+
name: greenshop
1616
liquibase:
1717
enabled: false
1818
devtools:
@@ -25,24 +25,24 @@ spring:
2525
url: jdbc:mysql://localhost:3306/oscommerce2
2626
username: oscommerce2
2727
password: oscommerce2pwd
28-
driver-class-name: com.mysql.jdbc.Driver
29-
jta:
30-
atomikos:
31-
connectionfactory:
32-
xa-connection-factory-class-name: com.mysql.jdbc.JDBC4Connection
28+
driver-class-name: com.mysql.cj.jdbc.Driver
29+
#jta:
30+
# atomikos:
31+
# connectionfactory:
32+
# xa-connection-factory-class-name: com.mysql.jdbc.JDBC4Connection
3333
jpa:
3434
open-in-view: true
3535
show-sql: true
36-
database-platform: MYSQL
36+
database-platform: MARIADB
3737
hibernate:
3838
#ddl-auto: create-drop update
39-
ddl-auto: update
39+
ddl-auto: validate
4040
naming:
4141
implicit-strategy: org.hibernate.boot.model.naming.ImplicitNamingStrategyJpaCompliantImpl
4242
physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
4343
properties:
4444
hibernate:
45-
dialect: org.hibernate.dialect.PostgreSQL95Dialect
45+
dialect: org.hibernate.dialect.MariaDB106Dialect
4646
temp:
4747
use_jdbc_metadata_defaults: false
4848
generate_statistics: true
@@ -59,7 +59,7 @@ spring:
5959
allow-bean-definition-overriding: true
6060
sql:
6161
init:
62-
platform: POSTGRESQL
62+
platform: MYSQL
6363
mode: ALWAYS
6464
org:
6565
woehlke:
@@ -76,7 +76,7 @@ org:
7676
webAddResourceHandlers:
7777
- "webjars/"
7878
webAddResourceHandlersStatic:
79-
- "bloodmoney/"
79+
- "greenshop/"
8080
- "icon/"
8181
- "languages/"
8282
- "test/"
@@ -91,8 +91,8 @@ org:
9191
invalidate-http-session: true
9292
antMatchersFullyAuthenticated: "/**"
9393
antMatchersPermitAll:
94-
- "/bloodmoney"
95-
- "/bloodmoney/**"
94+
- "/greenshop"
95+
- "/greenshop/**"
9696
- "/icon/**"
9797
- "/icon"
9898
- "/languages"
@@ -130,7 +130,7 @@ logging:
130130
mysql: WARN
131131
greenshop:
132132
java:
133-
bloodmoney: INFO
133+
greenshop: INFO
134134
debug: false
135135
---
136136
spring:
@@ -161,14 +161,14 @@ logging:
161161
postgresql: WARN
162162
woehlke:
163163
java:
164-
bloodmoney: INFO
164+
greenshop: INFO
165165
debug: false
166166
---
167167
spring:
168168
profiles:
169169
active: default
170170
datasource:
171-
url: jdbc:postgresql://localhost:5432/bloodmoney
171+
url: jdbc:mysql://localhost:3306/oscommerce2
172172
jta:
173173
atomikos:
174174
properties:
@@ -193,7 +193,6 @@ logging:
193193
internal: WARN
194194
ch:
195195
qos: WARN
196-
postgresql: WARN
197196
woehlke:
198197
java:
199198
bloodmoney: INFO

0 commit comments

Comments
 (0)