Skip to content

Commit eba672e

Browse files
author
eugenp
committed
cleanup work
1 parent 91b65da commit eba672e

10 files changed

Lines changed: 101 additions & 104 deletions

File tree

‎querydsl/.classpath‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<attribute name="maven.pomderived" value="true"/>
77
</attributes>
88
</classpathentry>
9+
<classpathentry kind="src" path="target/metamodel"/>
910
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
1011
<attributes>
1112
<attribute name="maven.pomderived" value="true"/>

‎querydsl/src/main/java/org/baeldung/dao/PersonDao.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
package org.baeldung.dao;
22

3-
import org.baeldung.entity.Person;
4-
5-
import javax.persistence.Tuple;
63
import java.util.List;
74
import java.util.Map;
85

6+
import org.baeldung.entity.Person;
7+
98
public interface PersonDao {
109

1110
public Person save(Person person);

‎querydsl/src/main/java/org/baeldung/dao/PersonDaoImpl.java‎

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,66 @@
11
package org.baeldung.dao;
22

3-
import com.mysema.query.group.GroupBy;
4-
import com.mysema.query.jpa.impl.JPAQuery;
5-
import com.mysema.query.jpa.impl.JPAQueryFactory;
3+
import java.util.List;
4+
import java.util.Map;
5+
6+
import javax.persistence.EntityManager;
7+
import javax.persistence.PersistenceContext;
8+
69
import org.baeldung.entity.Person;
710
import org.baeldung.entity.QPerson;
811
import org.springframework.stereotype.Repository;
912

10-
import javax.inject.Provider;
11-
import javax.persistence.EntityManager;
12-
import javax.persistence.PersistenceContext;
13-
import javax.persistence.Tuple;
14-
import java.util.List;
15-
import java.util.Map;
13+
import com.mysema.query.group.GroupBy;
14+
import com.mysema.query.jpa.impl.JPAQuery;
1615

1716
@Repository
1817
public class PersonDaoImpl implements PersonDao {
1918

2019
@PersistenceContext
2120
private EntityManager em;
2221

23-
public Person save(Person person) {
22+
@Override
23+
public Person save(final Person person) {
2424
em.persist(person);
2525
return person;
2626
}
2727

2828
@Override
29-
public List<Person> findPersonsByFirstnameQueryDSL(String firstname) {
30-
JPAQuery query = new JPAQuery(em);
31-
QPerson person = QPerson.person;
29+
public List<Person> findPersonsByFirstnameQueryDSL(final String firstname) {
30+
final JPAQuery query = new JPAQuery(em);
31+
final QPerson person = QPerson.person;
3232

3333
return query.from(person).where(person.firstname.eq(firstname)).list(person);
3434
}
3535

3636
@Override
37-
public List<Person> findPersonsByFirstnameAndSurnameQueryDSL(String firstname, String surname) {
38-
JPAQuery query = new JPAQuery(em);
39-
QPerson person = QPerson.person;
37+
public List<Person> findPersonsByFirstnameAndSurnameQueryDSL(final String firstname, final String surname) {
38+
final JPAQuery query = new JPAQuery(em);
39+
final QPerson person = QPerson.person;
4040

41-
return query.from(person).where(person.firstname.eq(firstname).and(
42-
person.surname.eq(surname))).list(person);
41+
return query.from(person).where(person.firstname.eq(firstname).and(person.surname.eq(surname))).list(person);
4342
}
4443

4544
@Override
46-
public List<Person> findPersonsByFirstnameInDescendingOrderQueryDSL(String firstname) {
47-
JPAQuery query = new JPAQuery(em);
48-
QPerson person = QPerson.person;
45+
public List<Person> findPersonsByFirstnameInDescendingOrderQueryDSL(final String firstname) {
46+
final JPAQuery query = new JPAQuery(em);
47+
final QPerson person = QPerson.person;
4948

50-
return query.from(person).where(person.firstname.eq(firstname)).orderBy(
51-
person.surname.desc()).list(person);
49+
return query.from(person).where(person.firstname.eq(firstname)).orderBy(person.surname.desc()).list(person);
5250
}
5351

5452
@Override
5553
public int findMaxAge() {
56-
JPAQuery query = new JPAQuery(em);
57-
QPerson person = QPerson.person;
54+
final JPAQuery query = new JPAQuery(em);
55+
final QPerson person = QPerson.person;
5856

5957
return query.from(person).list(person.age.max()).get(0);
6058
}
6159

6260
@Override
6361
public Map<String, Integer> findMaxAgeByName() {
64-
JPAQuery query = new JPAQuery(em);
65-
QPerson person = QPerson.person;
62+
final JPAQuery query = new JPAQuery(em);
63+
final QPerson person = QPerson.person;
6664

6765
return query.from(person).transform(GroupBy.groupBy(person.firstname).as(GroupBy.max(person.age)));
6866
}

‎querydsl/src/main/java/org/baeldung/entity/Person.java‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
package org.baeldung.entity;
22

3-
import javax.persistence.*;
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;
48

59
@Entity
610
public class Person {
@@ -21,12 +25,12 @@ public class Person {
2125
Person() {
2226
}
2327

24-
public Person(String firstname, String surname) {
28+
public Person(final String firstname, final String surname) {
2529
this.firstname = firstname;
2630
this.surname = surname;
2731
}
2832

29-
public Person(String firstname, String surname, int age) {
33+
public Person(final String firstname, final String surname, final int age) {
3034
this(firstname, surname);
3135
this.age = age;
3236
}
@@ -35,31 +39,31 @@ public Long getId() {
3539
return id;
3640
}
3741

38-
public void setId(Long id) {
42+
public void setId(final Long id) {
3943
this.id = id;
4044
}
4145

4246
public String getFirstname() {
4347
return firstname;
4448
}
4549

46-
public void setFirstname(String firstname) {
50+
public void setFirstname(final String firstname) {
4751
this.firstname = firstname;
4852
}
4953

5054
public String getSurname() {
5155
return surname;
5256
}
5357

54-
public void setSurname(String surname) {
58+
public void setSurname(final String surname) {
5559
this.surname = surname;
5660
}
5761

5862
public int getAge() {
5963
return age;
6064
}
6165

62-
public void setAge(int age) {
66+
public void setAge(final int age) {
6367
this.age = age;
6468
}
6569
}

‎querydsl/src/test/java/org/baeldung/dao/PersonDaoTest.java‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.baeldung.dao;
22

3-
import junit.framework.Assert;
3+
import java.util.Map;
4+
45
import org.baeldung.entity.Person;
56
import org.junit.Test;
67
import org.junit.runner.RunWith;
@@ -10,47 +11,48 @@
1011
import org.springframework.test.context.transaction.TransactionConfiguration;
1112
import org.springframework.transaction.annotation.Transactional;
1213

13-
import java.util.Map;
14-
14+
import junit.framework.Assert;
1515

1616
@ContextConfiguration("/test-context.xml")
1717
@RunWith(SpringJUnit4ClassRunner.class)
1818
@Transactional
19-
@TransactionConfiguration(defaultRollback=true)
19+
@TransactionConfiguration(defaultRollback = true)
2020
public class PersonDaoTest {
2121

2222
@Autowired
2323
private PersonDao personDao;
2424

25+
//
26+
2527
@Test
2628
public void testCreation() {
2729
personDao.save(new Person("Erich", "Gamma"));
28-
Person person = new Person("Kent", "Beck");
30+
final Person person = new Person("Kent", "Beck");
2931
personDao.save(person);
3032
personDao.save(new Person("Ralph", "Johnson"));
3133

32-
Person personFromDb = personDao.findPersonsByFirstnameQueryDSL("Kent").get(0);
34+
final Person personFromDb = personDao.findPersonsByFirstnameQueryDSL("Kent").get(0);
3335
Assert.assertEquals(person.getId(), personFromDb.getId());
3436
}
3537

3638
@Test
3739
public void testMultipleFilter() {
3840
personDao.save(new Person("Erich", "Gamma"));
39-
Person person = personDao.save(new Person("Ralph", "Beck"));
40-
Person person2 = personDao.save(new Person("Ralph", "Johnson"));
41+
final Person person = personDao.save(new Person("Ralph", "Beck"));
42+
final Person person2 = personDao.save(new Person("Ralph", "Johnson"));
4143

42-
Person personFromDb = personDao.findPersonsByFirstnameAndSurnameQueryDSL("Ralph", "Johnson").get(0);
44+
final Person personFromDb = personDao.findPersonsByFirstnameAndSurnameQueryDSL("Ralph", "Johnson").get(0);
4345
Assert.assertNotSame(person.getId(), personFromDb.getId());
4446
Assert.assertEquals(person2.getId(), personFromDb.getId());
4547
}
4648

4749
@Test
4850
public void testOrdering() {
49-
Person person = personDao.save(new Person("Kent", "Gamma"));
51+
final Person person = personDao.save(new Person("Kent", "Gamma"));
5052
personDao.save(new Person("Ralph", "Johnson"));
51-
Person person2 = personDao.save(new Person("Kent", "Zivago"));
53+
final Person person2 = personDao.save(new Person("Kent", "Zivago"));
5254

53-
Person personFromDb = personDao.findPersonsByFirstnameInDescendingOrderQueryDSL("Kent").get(0);
55+
final Person personFromDb = personDao.findPersonsByFirstnameInDescendingOrderQueryDSL("Kent").get(0);
5456
Assert.assertNotSame(person.getId(), personFromDb.getId());
5557
Assert.assertEquals(person2.getId(), personFromDb.getId());
5658
}
@@ -61,7 +63,7 @@ public void testMaxAge() {
6163
personDao.save(new Person("Ralph", "Johnson", 35));
6264
personDao.save(new Person("Kent", "Zivago", 30));
6365

64-
int maxAge = personDao.findMaxAge();
66+
final int maxAge = personDao.findMaxAge();
6567
Assert.assertTrue(maxAge == 35);
6668
}
6769

@@ -71,7 +73,7 @@ public void testMaxAgeByName() {
7173
personDao.save(new Person("Ralph", "Johnson", 35));
7274
personDao.save(new Person("Kent", "Zivago", 30));
7375

74-
Map<String, Integer> maxAge = personDao.findMaxAgeByName();
76+
final Map<String, Integer> maxAge = personDao.findMaxAgeByName();
7577
Assert.assertTrue(maxAge.size() == 2);
7678
Assert.assertSame(35, maxAge.get("Ralph"));
7779
Assert.assertSame(30, maxAge.get("Kent"));

‎spring-mvc-xml/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,12 @@
102102
<dependency>
103103
<groupId>com.fasterxml.jackson.core</groupId>
104104
<artifactId>jackson-core</artifactId>
105-
<version>2.1.2</version>
105+
<version>2.7.2</version>
106106
</dependency>
107107
<dependency>
108108
<groupId>com.fasterxml.jackson.core</groupId>
109109
<artifactId>jackson-databind</artifactId>
110-
<version>2.1.2</version>
110+
<version>2.7.2</version>
111111
</dependency>
112112

113113
</dependencies>

‎spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/service/MyUserDetailsService.java‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,21 @@ public class MyUserDetailsService implements UserDetailsService {
2525

2626
private final Log logger = LogFactory.getLog(this.getClass());
2727

28-
private Map<String, User> availableUsers = new HashMap<String, User>();
28+
private final Map<String, User> availableUsers = new HashMap<String, User>();
2929

3030
public MyUserDetailsService() {
3131

3232
populateDemoUsers();
3333

3434
}
3535

36-
@Override
37-
public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
36+
//
3837

38+
@Override
39+
public UserDetails loadUserByUsername(final String username) throws UsernameNotFoundException {
3940
logger.info("Load user by username " + username);
4041

41-
UserDetails user = availableUsers.get(username);
42+
final UserDetails user = availableUsers.get(username);
4243
if (user == null) {
4344
throw new UsernameNotFoundException("Username not found");
4445
} else {
@@ -52,7 +53,6 @@ public UserDetails loadUserByUsername(String username) throws UsernameNotFoundEx
5253
* in database or retrieved from another system).
5354
*/
5455
private void populateDemoUsers() {
55-
5656
logger.info("Populate demo users");
5757

5858
availableUsers.put("user", createUser("user", "password", Arrays.asList(SecurityRole.ROLE_USER)));
@@ -70,12 +70,11 @@ private void populateDemoUsers() {
7070
* Role names user is assigned to
7171
* @return User
7272
*/
73-
private User createUser(String username, String password, List<SecurityRole> roles) {
74-
73+
private User createUser(final String username, final String password, final List<SecurityRole> roles) {
7574
logger.info("Create user " + username);
7675

77-
List<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>();
78-
for (SecurityRole role : roles) {
76+
final List<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>();
77+
for (final SecurityRole role : roles) {
7978
authorities.add(new SimpleGrantedAuthority(role.toString()));
8079
}
8180
return new User(username, password, true, true, true, true, authorities);

spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/spring/DatabaseConfig.java renamed to spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/spring/PersistenceConfig.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,13 @@
1818
@Configuration
1919
@EnableTransactionManagement
2020
@PropertySource({ "classpath:persistence-h2.properties" })
21-
public class DatabaseConfig {
21+
public class PersistenceConfig {
2222

2323
@Autowired
2424
private Environment env;
2525

26+
//
27+
2628
@Bean
2729
public DataSource dataSource() {
2830
final DriverManagerDataSource dataSource = new DriverManagerDataSource();
@@ -32,4 +34,5 @@ public DataSource dataSource() {
3234
dataSource.setPassword(Preconditions.checkNotNull(env.getProperty("jdbc.pass")));
3335
return dataSource;
3436
}
37+
3538
}

‎spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/spring/SecurityConfig.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
package org.baeldung.spring;
22

3-
import org.springframework.beans.factory.annotation.Autowired;
43
import org.springframework.context.annotation.Configuration;
54
import org.springframework.context.annotation.ImportResource;
65
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
76
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
8-
import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
97

108
/**
119
* Spring Security Configuration.
@@ -15,9 +13,6 @@
1513
@ImportResource({ "classpath:webSecurityConfig.xml" })
1614
public class SecurityConfig extends WebSecurityConfigurerAdapter {
1715

18-
@Autowired
19-
private AuthenticationSuccessHandler mySimpleUrlAuthenticationSuccessHandler;
20-
2116
public SecurityConfig() {
2217
super();
2318
}

0 commit comments

Comments
 (0)