Skip to content

Commit 2ef128c

Browse files
darrachequesnedarrachequesne
authored
[chore] update dependencies (using spring bom) (darrachequesne#36)
1 parent f6fdf54 commit 2ef128c

File tree

3 files changed

+19
-73
lines changed

3 files changed

+19
-73
lines changed

‎pom.xml‎

Lines changed: 6 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55

6+
<parent>
7+
<groupId>io.spring.platform</groupId>
8+
<artifactId>platform-bom</artifactId>
9+
<version>2.0.5.RELEASE</version>
10+
</parent>
11+
612
<groupId>com.github.darrachequesne</groupId>
713
<artifactId>spring-data-jpa-datatables</artifactId>
814
<version>3.0.0-SNAPSHOT</version>
@@ -48,10 +54,6 @@
4854

4955
<properties>
5056
<!-- Version of maven plugins -->
51-
<version.plugin.maven-compiler-plugin>3.3</version.plugin.maven-compiler-plugin>
52-
<version.plugin.maven-resources-plugin>2.7</version.plugin.maven-resources-plugin>
53-
<version.plugin.maven-source-plugin>2.4</version.plugin.maven-source-plugin>
54-
<version.plugin.maven-javadoc-plugin>2.10.3</version.plugin.maven-javadoc-plugin>
5557
<version.plugin.maven-release-plugin>2.5.2</version.plugin.maven-release-plugin>
5658
<version.plugin.nexus-staging-maven-plugin>1.6.5</version.plugin.nexus-staging-maven-plugin>
5759
<version.plugin.maven-gpg-plugin>1.6</version.plugin.maven-gpg-plugin>
@@ -61,157 +63,122 @@
6163
<maven.compiler.source>${java.version}</maven.compiler.source>
6264
<maven.compiler.target>${java.version}</maven.compiler.target>
6365
<source.encoding>UTF-8</source.encoding>
64-
65-
<lombok.version>1.14.8</lombok.version>
66-
<spring.version>4.2.0.RELEASE</spring.version>
67-
<spring.data.jpa.version>1.8.2.RELEASE</spring.data.jpa.version>
68-
<hibernate.version>4.3.11.Final</hibernate.version>
69-
<hibernate.validator.version>5.2.0.Final</hibernate.validator.version>
70-
<jackson.version>2.6.0</jackson.version>
71-
<javax.el.api.version>2.2.5</javax.el.api.version>
72-
<slf4j.version>1.7.10</slf4j.version>
73-
<querydsl.version>3.7.1</querydsl.version>
74-
<h2.version>1.3.166</h2.version>
75-
<mysql.version>5.1.39</mysql.version>
76-
<postgresql.version>9.4.1209.jre7</postgresql.version>
7766
</properties>
7867

7968
<dependencies>
8069
<dependency>
8170
<groupId>org.projectlombok</groupId>
8271
<artifactId>lombok</artifactId>
83-
<version>${lombok.version}</version>
8472
<scope>provided</scope>
8573
</dependency>
8674

8775
<dependency>
8876
<groupId>org.springframework.data</groupId>
8977
<artifactId>spring-data-jpa</artifactId>
90-
<version>${spring.data.jpa.version}</version>
9178
</dependency>
9279

9380
<dependency>
9481
<groupId>org.springframework</groupId>
9582
<artifactId>spring-aop</artifactId>
96-
<version>${spring.version}</version>
9783
</dependency>
9884

9985
<dependency>
10086
<groupId>org.springframework</groupId>
10187
<artifactId>spring-orm</artifactId>
102-
<version>${spring.version}</version>
10388
</dependency>
10489

10590
<dependency>
10691
<groupId>org.springframework</groupId>
10792
<artifactId>spring-jdbc</artifactId>
108-
<version>${spring.version}</version>
10993
</dependency>
11094

11195
<dependency>
11296
<groupId>org.springframework</groupId>
11397
<artifactId>spring-tx</artifactId>
114-
<version>${spring.version}</version>
11598
</dependency>
11699

117100
<dependency>
118101
<groupId>org.springframework</groupId>
119102
<artifactId>spring-context</artifactId>
120-
<version>${spring.version}</version>
121103
</dependency>
122104

123105
<dependency>
124106
<groupId>org.springframework</groupId>
125107
<artifactId>spring-beans</artifactId>
126-
<version>${spring.version}</version>
127108
</dependency>
128109

129110
<dependency>
130111
<groupId>org.springframework</groupId>
131112
<artifactId>spring-core</artifactId>
132-
<version>${spring.version}</version>
133113
</dependency>
134114

135115
<dependency>
136116
<groupId>com.fasterxml.jackson.core</groupId>
137117
<artifactId>jackson-databind</artifactId>
138-
<version>${jackson.version}</version>
139118
</dependency>
140119

141120
<!-- Hibernate -->
142121
<dependency>
143122
<groupId>org.hibernate</groupId>
144123
<artifactId>hibernate-core</artifactId>
145-
<version>${hibernate.version}</version>
146124
</dependency>
147125
<dependency>
148126
<groupId>org.hibernate</groupId>
149127
<artifactId>hibernate-entitymanager</artifactId>
150-
<version>${hibernate.version}</version>
151128
</dependency>
152129
<dependency>
153130
<groupId>org.hibernate</groupId>
154131
<artifactId>hibernate-validator</artifactId>
155-
<version>${hibernate.validator.version}</version>
156132
</dependency>
157133
<dependency>
158134
<groupId>javax.el</groupId>
159135
<artifactId>javax.el-api</artifactId>
160-
<version>${javax.el.api.version}</version>
161136
</dependency>
162137

163138
<dependency>
164139
<groupId>com.mysema.querydsl</groupId>
165140
<artifactId>querydsl-apt</artifactId>
166-
<version>${querydsl.version}</version>
167141
</dependency>
168142

169143
<dependency>
170144
<groupId>com.mysema.querydsl</groupId>
171145
<artifactId>querydsl-jpa</artifactId>
172-
<version>${querydsl.version}</version>
173146
</dependency>
174147

175148
<!-- Test -->
176149
<dependency>
177150
<groupId>junit</groupId>
178151
<artifactId>junit</artifactId>
179-
<version>4.11</version>
180152
<scope>test</scope>
181153
</dependency>
182154

183155
<dependency>
184156
<groupId>org.springframework</groupId>
185157
<artifactId>spring-test</artifactId>
186-
<version>${spring.version}</version>
187158
<scope>test</scope>
188159
</dependency>
189160

190161
<dependency>
191162
<groupId>com.h2database</groupId>
192163
<artifactId>h2</artifactId>
193-
<version>${h2.version}</version>
194164
<scope>test</scope>
195165
</dependency>
196166

197167
<dependency>
198168
<groupId>mysql</groupId>
199169
<artifactId>mysql-connector-java</artifactId>
200-
<version>${mysql.version}</version>
201170
<scope>test</scope>
202171
</dependency>
203172

204173
<dependency>
205174
<groupId>org.postgresql</groupId>
206175
<artifactId>postgresql</artifactId>
207-
<version>${postgresql.version}</version>
208176
<scope>test</scope>
209177
</dependency>
210178

211179
<dependency>
212180
<groupId>org.slf4j</groupId>
213181
<artifactId>slf4j-log4j12</artifactId>
214-
<version>${slf4j.version}</version>
215182
<scope>test</scope>
216183
</dependency>
217184

@@ -238,7 +205,6 @@
238205
<plugin>
239206
<groupId>org.apache.maven.plugins</groupId>
240207
<artifactId>maven-compiler-plugin</artifactId>
241-
<version>${version.plugin.maven-compiler-plugin}</version>
242208
<configuration>
243209
<source>${maven.compiler.source}</source>
244210
<target>${maven.compiler.target}</target>
@@ -248,15 +214,13 @@
248214
<plugin>
249215
<groupId>org.apache.maven.plugins</groupId>
250216
<artifactId>maven-resources-plugin</artifactId>
251-
<version>${version.plugin.maven-resources-plugin}</version>
252217
<configuration>
253218
<encoding>${source.encoding}</encoding>
254219
</configuration>
255220
</plugin>
256221
<plugin>
257222
<groupId>org.apache.maven.plugins</groupId>
258223
<artifactId>maven-source-plugin</artifactId>
259-
<version>${version.plugin.maven-source-plugin}</version>
260224
<configuration>
261225
<encoding>${source.encoding}</encoding>
262226
</configuration>
@@ -275,7 +239,6 @@
275239
<plugin>
276240
<groupId>org.apache.maven.plugins</groupId>
277241
<artifactId>maven-javadoc-plugin</artifactId>
278-
<version>${version.plugin.maven-javadoc-plugin}</version>
279242
</plugin>
280243
<!-- Nexus Staging Maven Plugin for Deployment and Release into Sonatype
281244
OSSRH -->

‎src/main/java/org/springframework/data/jpa/datatables/qrepository/QDataTablesRepositoryFactoryBean.java‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
import org.springframework.beans.factory.FactoryBean;
88
import org.springframework.data.jpa.repository.JpaRepository;
9-
import org.springframework.data.jpa.repository.support.JpaEntityInformation;
109
import org.springframework.data.jpa.repository.support.JpaRepositoryFactory;
1110
import org.springframework.data.jpa.repository.support.JpaRepositoryFactoryBean;
1211
import org.springframework.data.repository.core.RepositoryMetadata;
@@ -27,25 +26,18 @@ protected RepositoryFactorySupport createRepositoryFactory(EntityManager entityM
2726
private static class DataTablesRepositoryFactory<T, ID extends Serializable>
2827
extends JpaRepositoryFactory {
2928

30-
private final EntityManager entityManager;
31-
3229
public DataTablesRepositoryFactory(EntityManager entityManager) {
3330
super(entityManager);
34-
this.entityManager = entityManager;
3531
}
3632

37-
@SuppressWarnings({"unchecked"})
38-
protected Object getTargetRepository(RepositoryMetadata metadata) {
39-
JpaEntityInformation<T, ID> entityInformation =
40-
(JpaEntityInformation<T, ID>) getEntityInformation(metadata.getDomainType());
33+
protected Class<?> getRepositoryBaseClass(RepositoryMetadata metadata) {
4134
Class<?> repositoryInterface = metadata.getRepositoryInterface();
42-
return QDataTablesRepository.class.isAssignableFrom(repositoryInterface)
43-
? new QDataTablesRepositoryImpl<T, ID>(entityInformation, entityManager)
44-
: super.getTargetRepository(metadata);
45-
}
35+
if (QDataTablesRepository.class.isAssignableFrom(repositoryInterface)) {
36+
return QDataTablesRepositoryImpl.class;
37+
} else {
38+
return super.getRepositoryBaseClass(metadata);
39+
}
4640

47-
protected Class<?> getRepositoryBaseClass(RepositoryMetadata metadata) {
48-
return QDataTablesRepositoryImpl.class;
4941
}
5042
}
5143
}

‎src/main/java/org/springframework/data/jpa/datatables/repository/DataTablesRepositoryFactoryBean.java‎

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
import org.springframework.beans.factory.FactoryBean;
88
import org.springframework.data.jpa.repository.JpaRepository;
9-
import org.springframework.data.jpa.repository.support.JpaEntityInformation;
109
import org.springframework.data.jpa.repository.support.JpaRepositoryFactory;
1110
import org.springframework.data.jpa.repository.support.JpaRepositoryFactoryBean;
1211
import org.springframework.data.repository.core.RepositoryMetadata;
@@ -27,26 +26,18 @@ protected RepositoryFactorySupport createRepositoryFactory(EntityManager entityM
2726
private static class DataTablesRepositoryFactory<T, ID extends Serializable>
2827
extends JpaRepositoryFactory {
2928

30-
private final EntityManager entityManager;
31-
3229
public DataTablesRepositoryFactory(EntityManager entityManager) {
33-
3430
super(entityManager);
35-
this.entityManager = entityManager;
36-
}
37-
38-
@SuppressWarnings({"unchecked"})
39-
protected Object getTargetRepository(RepositoryMetadata metadata) {
40-
JpaEntityInformation<T, Serializable> entityInformation =
41-
(JpaEntityInformation<T, Serializable>) getEntityInformation(metadata.getDomainType());
42-
Class<?> repositoryInterface = metadata.getRepositoryInterface();
43-
return DataTablesRepository.class.isAssignableFrom(repositoryInterface)
44-
? new DataTablesRepositoryImpl<T, ID>(entityInformation, entityManager)
45-
: super.getTargetRepository(metadata);
4631
}
4732

33+
@Override
4834
protected Class<?> getRepositoryBaseClass(RepositoryMetadata metadata) {
49-
return DataTablesRepositoryImpl.class;
35+
Class<?> repositoryInterface = metadata.getRepositoryInterface();
36+
if (DataTablesRepository.class.isAssignableFrom(repositoryInterface)) {
37+
return DataTablesRepositoryImpl.class;
38+
} else {
39+
return super.getRepositoryBaseClass(metadata);
40+
}
5041
}
5142
}
5243
}

0 commit comments

Comments
 (0)