Skip to content

Commit af27b7f

Browse files
jzheauxjzheaux
authored
Merge pull request #8886 from Maiklins/JAVA-841-Standardize-packages-spring-security-mvc-boot
JAVA-841 standardize packages spring security mvc boot
2 parents 992659b + cccec36 commit af27b7f

93 files changed

Lines changed: 175 additions & 191 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎spring-security-modules/spring-security-mvc-boot-1/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,10 @@
222222
</profiles>
223223

224224
<properties>
225-
<start-class>org.baeldung.custom.Application</start-class>
225+
<start-class>com.baeldung.roles.custom.Application</start-class>
226226
<!--If you want to run the example with the voters comment the tag
227227
above and uncomment the one below -->
228-
<!--<start-class>org.baeldung.voter.VoterApplication</start-class> -->
228+
<!--<start-class>com.baeldung.roles.voter.VoterApplication</start-class> -->
229229

230230
<taglibs-standard.version>1.1.2</taglibs-standard.version>
231231
<cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>

spring-security-modules/spring-security-mvc-boot-1/src/main/java/com/baeldung/AppConfig.java renamed to spring-security-modules/spring-security-mvc-boot-1/src/main/java/com/baeldung/relationships/AppConfig.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.baeldung;
1+
package com.baeldung.relationships;
22

33
import java.util.Properties;
44

@@ -19,7 +19,7 @@
1919

2020
@SpringBootApplication
2121
@PropertySource({"classpath:persistence-h2.properties", "classpath:application-defaults.properties"})
22-
@EnableJpaRepositories(basePackages = { "com.baeldung.data.repositories" })
22+
@EnableJpaRepositories(basePackages = {"com.baeldung.relationships.repositories"})
2323
@EnableWebMvc
2424
@Import(SpringSecurityConfig.class)
2525
public class AppConfig extends WebMvcConfigurerAdapter {
@@ -41,7 +41,7 @@ public DataSource dataSource() {
4141
public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
4242
final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
4343
em.setDataSource(dataSource());
44-
em.setPackagesToScan(new String[] { "com.baeldung.models" });
44+
em.setPackagesToScan(new String[] { "com.baeldung.relationships.models" });
4545
em.setJpaVendorAdapter(new HibernateJpaVendorAdapter());
4646
em.setJpaProperties(additionalProperties());
4747
return em;

spring-security-modules/spring-security-mvc-boot-1/src/main/java/com/baeldung/SpringSecurityConfig.java renamed to spring-security-modules/spring-security-mvc-boot-1/src/main/java/com/baeldung/relationships/SpringSecurityConfig.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.baeldung;
1+
package com.baeldung.relationships;
22

33
import javax.annotation.PostConstruct;
44
import javax.sql.DataSource;
@@ -18,8 +18,8 @@
1818
import org.springframework.security.data.repository.query.SecurityEvaluationContextExtension;
1919
import org.springframework.web.context.WebApplicationContext;
2020

21-
import com.baeldung.security.AuthenticationSuccessHandlerImpl;
22-
import com.baeldung.security.CustomUserDetailsService;
21+
import com.baeldung.relationships.security.AuthenticationSuccessHandlerImpl;
22+
import com.baeldung.relationships.security.CustomUserDetailsService;
2323

2424
@Configuration
2525
@EnableWebSecurity

spring-security-modules/spring-security-mvc-boot-1/src/main/java/com/baeldung/models/AppUser.java renamed to spring-security-modules/spring-security-mvc-boot-1/src/main/java/com/baeldung/relationships/models/AppUser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.baeldung.models;
1+
package com.baeldung.relationships.models;
22

33
import java.util.Date;
44

spring-security-modules/spring-security-mvc-boot-1/src/main/java/com/baeldung/models/Tweet.java renamed to spring-security-modules/spring-security-mvc-boot-1/src/main/java/com/baeldung/relationships/models/Tweet.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.baeldung.models;
1+
package com.baeldung.relationships.models;
22

33
import java.util.HashSet;
44
import java.util.Set;

spring-security-modules/spring-security-mvc-boot-1/src/main/java/com/baeldung/data/repositories/TweetRepository.java renamed to spring-security-modules/spring-security-mvc-boot-1/src/main/java/com/baeldung/relationships/repositories/TweetRepository.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package com.baeldung.data.repositories;
1+
package com.baeldung.relationships.repositories;
22

33
import org.springframework.data.domain.Page;
44
import org.springframework.data.domain.Pageable;
55
import org.springframework.data.jpa.repository.Query;
66
import org.springframework.data.repository.PagingAndSortingRepository;
77

8-
import com.baeldung.models.Tweet;
8+
import com.baeldung.relationships.models.Tweet;
99

1010
public interface TweetRepository extends PagingAndSortingRepository<Tweet, Long> {
1111

spring-security-modules/spring-security-mvc-boot-1/src/main/java/com/baeldung/data/repositories/UserRepository.java renamed to spring-security-modules/spring-security-mvc-boot-1/src/main/java/com/baeldung/relationships/repositories/UserRepository.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
1-
package com.baeldung.data.repositories;
1+
package com.baeldung.relationships.repositories;
22

33
import java.util.Date;
44
import java.util.List;
55

6-
import org.springframework.data.domain.Page;
7-
import org.springframework.data.domain.Pageable;
86
import org.springframework.data.jpa.repository.Modifying;
97
import org.springframework.data.jpa.repository.Query;
108
import org.springframework.data.repository.CrudRepository;
119
import org.springframework.data.repository.query.Param;
12-
import org.springframework.stereotype.Repository;
1310
import org.springframework.transaction.annotation.Transactional;
1411

15-
import com.baeldung.models.AppUser;
12+
import com.baeldung.relationships.models.AppUser;
1613

1714
public interface UserRepository extends CrudRepository<AppUser, Long> {
1815
AppUser findByUsername(String username);

spring-security-modules/spring-security-mvc-boot-1/src/main/java/com/baeldung/security/AppUserPrincipal.java renamed to spring-security-modules/spring-security-mvc-boot-1/src/main/java/com/baeldung/relationships/security/AppUserPrincipal.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.baeldung.security;
1+
package com.baeldung.relationships.security;
22

33
import java.util.Collection;
44
import java.util.Collections;
@@ -8,7 +8,7 @@
88
import org.springframework.security.core.authority.SimpleGrantedAuthority;
99
import org.springframework.security.core.userdetails.UserDetails;
1010

11-
import com.baeldung.models.AppUser;
11+
import com.baeldung.relationships.models.AppUser;
1212

1313
public class AppUserPrincipal implements UserDetails {
1414

spring-security-modules/spring-security-mvc-boot-1/src/main/java/com/baeldung/security/AuthenticationSuccessHandlerImpl.java renamed to spring-security-modules/spring-security-mvc-boot-1/src/main/java/com/baeldung/relationships/security/AuthenticationSuccessHandlerImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.baeldung.security;
1+
package com.baeldung.relationships.security;
22

33
import java.io.IOException;
44
import java.util.Date;
@@ -12,7 +12,7 @@
1212
import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
1313
import org.springframework.stereotype.Component;
1414

15-
import com.baeldung.data.repositories.UserRepository;
15+
import com.baeldung.relationships.repositories.UserRepository;
1616

1717
@Component
1818
public class AuthenticationSuccessHandlerImpl implements AuthenticationSuccessHandler {

spring-security-modules/spring-security-mvc-boot-1/src/main/java/com/baeldung/security/CustomUserDetailsService.java renamed to spring-security-modules/spring-security-mvc-boot-1/src/main/java/com/baeldung/relationships/security/CustomUserDetailsService.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.baeldung.security;
1+
package com.baeldung.relationships.security;
22

33
import javax.annotation.PostConstruct;
44

@@ -9,8 +9,8 @@
99
import org.springframework.stereotype.Service;
1010
import org.springframework.web.context.WebApplicationContext;
1111

12-
import com.baeldung.data.repositories.UserRepository;
13-
import com.baeldung.models.AppUser;
12+
import com.baeldung.relationships.repositories.UserRepository;
13+
import com.baeldung.relationships.models.AppUser;
1414

1515
@Service
1616
public class CustomUserDetailsService implements UserDetailsService {

0 commit comments

Comments
 (0)