diff --git a/querydsl/.classpath b/querydsl/.classpath index 534b5e52fa..264bb653bb 100644 --- a/querydsl/.classpath +++ b/querydsl/.classpath @@ -6,6 +6,7 @@ + diff --git a/querydsl/src/main/java/org/baeldung/dao/PersonDao.java b/querydsl/src/main/java/org/baeldung/dao/PersonDao.java index 17be05bff8..7df4ebb22d 100644 --- a/querydsl/src/main/java/org/baeldung/dao/PersonDao.java +++ b/querydsl/src/main/java/org/baeldung/dao/PersonDao.java @@ -1,11 +1,10 @@ package org.baeldung.dao; -import org.baeldung.entity.Person; - -import javax.persistence.Tuple; import java.util.List; import java.util.Map; +import org.baeldung.entity.Person; + public interface PersonDao { public Person save(Person person); diff --git a/querydsl/src/main/java/org/baeldung/dao/PersonDaoImpl.java b/querydsl/src/main/java/org/baeldung/dao/PersonDaoImpl.java index 209ff699af..555ec226ce 100644 --- a/querydsl/src/main/java/org/baeldung/dao/PersonDaoImpl.java +++ b/querydsl/src/main/java/org/baeldung/dao/PersonDaoImpl.java @@ -1,18 +1,17 @@ package org.baeldung.dao; -import com.mysema.query.group.GroupBy; -import com.mysema.query.jpa.impl.JPAQuery; -import com.mysema.query.jpa.impl.JPAQueryFactory; +import java.util.List; +import java.util.Map; + +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; + import org.baeldung.entity.Person; import org.baeldung.entity.QPerson; import org.springframework.stereotype.Repository; -import javax.inject.Provider; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.Tuple; -import java.util.List; -import java.util.Map; +import com.mysema.query.group.GroupBy; +import com.mysema.query.jpa.impl.JPAQuery; @Repository public class PersonDaoImpl implements PersonDao { @@ -20,49 +19,48 @@ public class PersonDaoImpl implements PersonDao { @PersistenceContext private EntityManager em; - public Person save(Person person) { + @Override + public Person save(final Person person) { em.persist(person); return person; } @Override - public List findPersonsByFirstnameQueryDSL(String firstname) { - JPAQuery query = new JPAQuery(em); - QPerson person = QPerson.person; + public List findPersonsByFirstnameQueryDSL(final String firstname) { + final JPAQuery query = new JPAQuery(em); + final QPerson person = QPerson.person; return query.from(person).where(person.firstname.eq(firstname)).list(person); } @Override - public List findPersonsByFirstnameAndSurnameQueryDSL(String firstname, String surname) { - JPAQuery query = new JPAQuery(em); - QPerson person = QPerson.person; + public List findPersonsByFirstnameAndSurnameQueryDSL(final String firstname, final String surname) { + final JPAQuery query = new JPAQuery(em); + final QPerson person = QPerson.person; - return query.from(person).where(person.firstname.eq(firstname).and( - person.surname.eq(surname))).list(person); + return query.from(person).where(person.firstname.eq(firstname).and(person.surname.eq(surname))).list(person); } @Override - public List findPersonsByFirstnameInDescendingOrderQueryDSL(String firstname) { - JPAQuery query = new JPAQuery(em); - QPerson person = QPerson.person; + public List findPersonsByFirstnameInDescendingOrderQueryDSL(final String firstname) { + final JPAQuery query = new JPAQuery(em); + final QPerson person = QPerson.person; - return query.from(person).where(person.firstname.eq(firstname)).orderBy( - person.surname.desc()).list(person); + return query.from(person).where(person.firstname.eq(firstname)).orderBy(person.surname.desc()).list(person); } @Override public int findMaxAge() { - JPAQuery query = new JPAQuery(em); - QPerson person = QPerson.person; + final JPAQuery query = new JPAQuery(em); + final QPerson person = QPerson.person; return query.from(person).list(person.age.max()).get(0); } @Override public Map findMaxAgeByName() { - JPAQuery query = new JPAQuery(em); - QPerson person = QPerson.person; + final JPAQuery query = new JPAQuery(em); + final QPerson person = QPerson.person; return query.from(person).transform(GroupBy.groupBy(person.firstname).as(GroupBy.max(person.age))); } diff --git a/querydsl/src/main/java/org/baeldung/entity/Person.java b/querydsl/src/main/java/org/baeldung/entity/Person.java index 056b2eb79c..6f04210d90 100644 --- a/querydsl/src/main/java/org/baeldung/entity/Person.java +++ b/querydsl/src/main/java/org/baeldung/entity/Person.java @@ -1,6 +1,10 @@ package org.baeldung.entity; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; @Entity public class Person { @@ -21,12 +25,12 @@ public class Person { Person() { } - public Person(String firstname, String surname) { + public Person(final String firstname, final String surname) { this.firstname = firstname; this.surname = surname; } - public Person(String firstname, String surname, int age) { + public Person(final String firstname, final String surname, final int age) { this(firstname, surname); this.age = age; } @@ -35,7 +39,7 @@ public class Person { return id; } - public void setId(Long id) { + public void setId(final Long id) { this.id = id; } @@ -43,7 +47,7 @@ public class Person { return firstname; } - public void setFirstname(String firstname) { + public void setFirstname(final String firstname) { this.firstname = firstname; } @@ -51,7 +55,7 @@ public class Person { return surname; } - public void setSurname(String surname) { + public void setSurname(final String surname) { this.surname = surname; } @@ -59,7 +63,7 @@ public class Person { return age; } - public void setAge(int age) { + public void setAge(final int age) { this.age = age; } } \ No newline at end of file diff --git a/querydsl/src/test/java/org/baeldung/dao/PersonDaoTest.java b/querydsl/src/test/java/org/baeldung/dao/PersonDaoTest.java index da3a95b7f8..0e5996a8c8 100644 --- a/querydsl/src/test/java/org/baeldung/dao/PersonDaoTest.java +++ b/querydsl/src/test/java/org/baeldung/dao/PersonDaoTest.java @@ -1,6 +1,7 @@ package org.baeldung.dao; -import junit.framework.Assert; +import java.util.Map; + import org.baeldung.entity.Person; import org.junit.Test; import org.junit.runner.RunWith; @@ -10,47 +11,48 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.transaction.TransactionConfiguration; import org.springframework.transaction.annotation.Transactional; -import java.util.Map; - +import junit.framework.Assert; @ContextConfiguration("/test-context.xml") @RunWith(SpringJUnit4ClassRunner.class) @Transactional -@TransactionConfiguration(defaultRollback=true) +@TransactionConfiguration(defaultRollback = true) public class PersonDaoTest { @Autowired private PersonDao personDao; + // + @Test public void testCreation() { personDao.save(new Person("Erich", "Gamma")); - Person person = new Person("Kent", "Beck"); + final Person person = new Person("Kent", "Beck"); personDao.save(person); personDao.save(new Person("Ralph", "Johnson")); - Person personFromDb = personDao.findPersonsByFirstnameQueryDSL("Kent").get(0); + final Person personFromDb = personDao.findPersonsByFirstnameQueryDSL("Kent").get(0); Assert.assertEquals(person.getId(), personFromDb.getId()); } @Test public void testMultipleFilter() { personDao.save(new Person("Erich", "Gamma")); - Person person = personDao.save(new Person("Ralph", "Beck")); - Person person2 = personDao.save(new Person("Ralph", "Johnson")); + final Person person = personDao.save(new Person("Ralph", "Beck")); + final Person person2 = personDao.save(new Person("Ralph", "Johnson")); - Person personFromDb = personDao.findPersonsByFirstnameAndSurnameQueryDSL("Ralph", "Johnson").get(0); + final Person personFromDb = personDao.findPersonsByFirstnameAndSurnameQueryDSL("Ralph", "Johnson").get(0); Assert.assertNotSame(person.getId(), personFromDb.getId()); Assert.assertEquals(person2.getId(), personFromDb.getId()); } @Test public void testOrdering() { - Person person = personDao.save(new Person("Kent", "Gamma")); + final Person person = personDao.save(new Person("Kent", "Gamma")); personDao.save(new Person("Ralph", "Johnson")); - Person person2 = personDao.save(new Person("Kent", "Zivago")); + final Person person2 = personDao.save(new Person("Kent", "Zivago")); - Person personFromDb = personDao.findPersonsByFirstnameInDescendingOrderQueryDSL("Kent").get(0); + final Person personFromDb = personDao.findPersonsByFirstnameInDescendingOrderQueryDSL("Kent").get(0); Assert.assertNotSame(person.getId(), personFromDb.getId()); Assert.assertEquals(person2.getId(), personFromDb.getId()); } @@ -61,7 +63,7 @@ public class PersonDaoTest { personDao.save(new Person("Ralph", "Johnson", 35)); personDao.save(new Person("Kent", "Zivago", 30)); - int maxAge = personDao.findMaxAge(); + final int maxAge = personDao.findMaxAge(); Assert.assertTrue(maxAge == 35); } @@ -71,7 +73,7 @@ public class PersonDaoTest { personDao.save(new Person("Ralph", "Johnson", 35)); personDao.save(new Person("Kent", "Zivago", 30)); - Map maxAge = personDao.findMaxAgeByName(); + final Map maxAge = personDao.findMaxAgeByName(); Assert.assertTrue(maxAge.size() == 2); Assert.assertSame(35, maxAge.get("Ralph")); Assert.assertSame(30, maxAge.get("Kent")); diff --git a/spring-mvc-xml/pom.xml b/spring-mvc-xml/pom.xml index 50cafb44b5..f77efe501b 100644 --- a/spring-mvc-xml/pom.xml +++ b/spring-mvc-xml/pom.xml @@ -102,12 +102,12 @@ com.fasterxml.jackson.core jackson-core - 2.1.2 + 2.7.2 com.fasterxml.jackson.core jackson-databind - 2.1.2 + 2.7.2 diff --git a/spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/service/MyUserDetailsService.java b/spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/service/MyUserDetailsService.java index ac2aa6beb6..2baf88a62d 100644 --- a/spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/service/MyUserDetailsService.java +++ b/spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/service/MyUserDetailsService.java @@ -25,7 +25,7 @@ public class MyUserDetailsService implements UserDetailsService { private final Log logger = LogFactory.getLog(this.getClass()); - private Map availableUsers = new HashMap(); + private final Map availableUsers = new HashMap(); public MyUserDetailsService() { @@ -33,12 +33,13 @@ public class MyUserDetailsService implements UserDetailsService { } - @Override - public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { + // + @Override + public UserDetails loadUserByUsername(final String username) throws UsernameNotFoundException { logger.info("Load user by username " + username); - UserDetails user = availableUsers.get(username); + final UserDetails user = availableUsers.get(username); if (user == null) { throw new UsernameNotFoundException("Username not found"); } else { @@ -52,7 +53,6 @@ public class MyUserDetailsService implements UserDetailsService { * in database or retrieved from another system). */ private void populateDemoUsers() { - logger.info("Populate demo users"); availableUsers.put("user", createUser("user", "password", Arrays.asList(SecurityRole.ROLE_USER))); @@ -70,12 +70,11 @@ public class MyUserDetailsService implements UserDetailsService { * Role names user is assigned to * @return User */ - private User createUser(String username, String password, List roles) { - + private User createUser(final String username, final String password, final List roles) { logger.info("Create user " + username); - List authorities = new ArrayList(); - for (SecurityRole role : roles) { + final List authorities = new ArrayList(); + for (final SecurityRole role : roles) { authorities.add(new SimpleGrantedAuthority(role.toString())); } return new User(username, password, true, true, true, true, authorities); diff --git a/spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/spring/DatabaseConfig.java b/spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/spring/PersistenceConfig.java similarity index 96% rename from spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/spring/DatabaseConfig.java rename to spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/spring/PersistenceConfig.java index 7f0428df77..02308e64fb 100644 --- a/spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/spring/DatabaseConfig.java +++ b/spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/spring/PersistenceConfig.java @@ -18,11 +18,13 @@ import com.google.common.base.Preconditions; @Configuration @EnableTransactionManagement @PropertySource({ "classpath:persistence-h2.properties" }) -public class DatabaseConfig { +public class PersistenceConfig { @Autowired private Environment env; + // + @Bean public DataSource dataSource() { final DriverManagerDataSource dataSource = new DriverManagerDataSource(); @@ -32,4 +34,5 @@ public class DatabaseConfig { dataSource.setPassword(Preconditions.checkNotNull(env.getProperty("jdbc.pass"))); return dataSource; } + } diff --git a/spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/spring/SecurityConfig.java b/spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/spring/SecurityConfig.java index b3549511fc..2d9bb8e731 100644 --- a/spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/spring/SecurityConfig.java +++ b/spring-security-mvc-persisted-remember-me/src/main/java/org/baeldung/spring/SecurityConfig.java @@ -1,11 +1,9 @@ package org.baeldung.spring; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.ImportResource; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; -import org.springframework.security.web.authentication.AuthenticationSuccessHandler; /** * Spring Security Configuration. @@ -15,9 +13,6 @@ import org.springframework.security.web.authentication.AuthenticationSuccessHand @ImportResource({ "classpath:webSecurityConfig.xml" }) public class SecurityConfig extends WebSecurityConfigurerAdapter { - @Autowired - private AuthenticationSuccessHandler mySimpleUrlAuthenticationSuccessHandler; - public SecurityConfig() { super(); } diff --git a/spring-security-mvc-persisted-remember-me/src/main/resources/webSecurityConfig.xml b/spring-security-mvc-persisted-remember-me/src/main/resources/webSecurityConfig.xml index a11f13c9ab..d1f081cb9b 100644 --- a/spring-security-mvc-persisted-remember-me/src/main/resources/webSecurityConfig.xml +++ b/spring-security-mvc-persisted-remember-me/src/main/resources/webSecurityConfig.xml @@ -1,55 +1,51 @@ - + http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-4.2.xsd" +> - - - + + + - + - + - + - + - - + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + \ No newline at end of file