modify role

src/main/java/org/springframework/samples/petclinic/configuration/WebSocketConfig.java

@@ -18,17 +18,14 @@ import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
 public class WebSocketConfig extends AbstractSecurityWebSocketMessageBrokerConfigurer {
 
 	/*
-	@Override
+	 * @Override public void registerStompEndpoints(StompEndpointRegistry
-	public void registerStompEndpoints(StompEndpointRegistry stompEndpointRegistry) {
+	 * stompEndpointRegistry) {
-		stompEndpointRegistry.addEndpoint("/websocket").withSockJS();
+	 * stompEndpointRegistry.addEndpoint("/websocket").withSockJS(); }
-	}
+	 *
-
+	 * @Override public void configureMessageBroker(MessageBrokerRegistry registry) {
-	@Override
+	 * registry.enableSimpleBroker("/topic");
-	public void configureMessageBroker(MessageBrokerRegistry registry) {
+	 * registry.setApplicationDestinationPrefixes("/app"); }
-		registry.enableSimpleBroker("/topic");
+	 *
-		registry.setApplicationDestinationPrefixes("/app");
-	}
-
 	 */
 	@Override
 	public void configureMessageBroker(MessageBrokerRegistry config) {
@@ -38,22 +35,18 @@ public class WebSocketConfig extends AbstractSecurityWebSocketMessageBrokerConfi
 
 	@Override
 	public void registerStompEndpoints(StompEndpointRegistry registry) {
-		registry.addEndpoint("/websocket")
+		registry.addEndpoint("/websocket").setAllowedOrigins("*").withSockJS();
-			.setAllowedOrigins("*")
-			.withSockJS();
 	}
 
 	@Override
 	protected void configureInbound(MessageSecurityMetadataSourceRegistry message) {
-		message
+		message.nullDestMatcher().permitAll().simpDestMatchers("/app/**").permitAll()
-			.nullDestMatcher().permitAll()
+				.simpSubscribeDestMatchers("/topic/**").permitAll().anyMessage().denyAll();
-			.simpDestMatchers("/app/**").permitAll()
-			.simpSubscribeDestMatchers("/topic/**").permitAll()
-			.anyMessage().denyAll();
 	}
 
 	@Override
 	protected boolean sameOriginDisabled() {
 		return true;
 	}
+
 }

src/main/java/org/springframework/samples/petclinic/dto/BaseDTO.java

@@ -41,8 +41,7 @@ public class BaseDTO implements Serializable {
 
 	@Override
 	public String toString() {
-		return "BaseDTO{" +
+		return "BaseDTO{" + "id=" + id + '}';
-			"id=" + id +
-			'}';
 	}
+
 }

src/main/java/org/springframework/samples/petclinic/dto/NamedDTO.java

@@ -50,5 +50,4 @@ public class NamedDTO extends BaseDTO {
 		return getName().equals(namedDTO.getName());
 	}
 
-
 }

src/main/java/org/springframework/samples/petclinic/dto/common/RoleDTO.java

@@ -15,4 +15,5 @@ public class RoleDTO extends NamedDTO implements Serializable {
 	public String toString() {
 		return super.toString();
 	}
+
 }

src/main/java/org/springframework/samples/petclinic/model/common/Role.java

@@ -2,9 +2,41 @@ package org.springframework.samples.petclinic.model.common;
 
 import javax.persistence.*;
 import java.io.Serializable;
+import java.util.Collection;
 
 @Entity(name = "Role")
 @Table(name = "roles")
-public class Role extends NamedEntity implements Serializable {
+public class Role implements Serializable {
 
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	private Long id;
+
+	private String name;
+	@ManyToMany(mappedBy = "roles")
+	private Collection<User> users;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public Collection<User> getUsers() {
+		return users;
+	}
+
+	public void setUsers(Collection<User> users) {
+		this.users = users;
+	}
 }

src/main/java/org/springframework/samples/petclinic/model/common/User.java

@@ -54,9 +54,9 @@ public class User extends Person implements Serializable, UserDetails {
 	private boolean credentialsNonExpired;
 
 	@ManyToMany(fetch = FetchType.EAGER)
-	@JoinTable(name = "users_roles", joinColumns = @JoinColumn(name = "user_id"),
+	@JoinTable(name = "users_roles", joinColumns = @JoinColumn(name = "user_id", referencedColumnName = "id"),
-			inverseJoinColumns = @JoinColumn(name = "role_id"))
+			inverseJoinColumns = @JoinColumn(name = "role_id", referencedColumnName = "id"))
-	private Set<Role> roles;
+	private Collection<Role> roles;
 
 	@Size(max = CommonParameter.PHONE_MAX, message = CommonError.FORMAT_LESS + CommonParameter.PHONE_MAX)
 	// @Pattern(regexp = CommonParameter.PHONE_REGEXP, message = CommonError.PHONE_FORMAT)
@@ -145,6 +145,14 @@ public class User extends Person implements Serializable, UserDetails {
 		this.credentialsNonExpired = credentialsNonExpired;
 	}
 
+	public Collection<Role> getRoles() {
+		return roles;
+	}
+
+	public void setRoles(Collection<Role> roles) {
+		this.roles = roles;
+	}
+
 	@Override
 	public Collection<? extends GrantedAuthority> getAuthorities() {
 		Set<GrantedAuthority> grantedAuthorities = new HashSet<>();
@@ -154,35 +162,6 @@ public class User extends Person implements Serializable, UserDetails {
 		return grantedAuthorities;
 	}
 
-	protected Set<Role> getRolesInternal() {
-		if (this.roles == null) {
-			this.roles = new HashSet<>();
-		}
-		return this.roles;
-	}
-
-	protected void setRolesInternal(Set<Role> roles) {
-		this.roles = roles;
-	}
-
-	@XmlElement
-	public List<Role> getRoles() {
-		List<Role> sortedRoles = new ArrayList<>(getRolesInternal());
-		PropertyComparator.sort(sortedRoles, new MutableSortDefinition("name", true, true));
-		return Collections.unmodifiableList(sortedRoles);
-	}
-
-	public int getNrOfRoles() {
-		return getRolesInternal().size();
-	}
-
-	public void addRole(Role role) {
-		getRolesInternal().add(role);
-	}
-
-	public void setRoles(Set<Role> roles) {
-		this.roles = roles;
-	}
 
 	public String getTelephone() {
 		return telephone;

src/main/java/org/springframework/samples/petclinic/repository/RoleRepository.java

@@ -3,7 +3,7 @@ package org.springframework.samples.petclinic.repository;
 import org.springframework.samples.petclinic.model.common.Role;
 import org.springframework.data.repository.Repository;
 
-import java.util.List;
+import java.util.Collection;
 
 /**
  * Repository class for <code>Role</code> domain objects All method names are compliant
@@ -31,7 +31,7 @@ public interface RoleRepository extends Repository<Role, Integer> {
 	 * Retrieve all {@link Role}s from the data store
 	 * @return a Collection of {@link Role}s (or an empty Collection if none
 	 */
-	List<Role> findAll();
+	Collection<Role> findAll();
 
 	/**
 	 * Save a {@link Role} to the data store, either inserting or updating it.

src/main/java/org/springframework/samples/petclinic/repository/UserRepository.java

@@ -3,6 +3,7 @@ package org.springframework.samples.petclinic.repository;
 import org.springframework.data.repository.Repository;
 import org.springframework.samples.petclinic.model.common.User;
 
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -23,7 +24,7 @@ public interface UserRepository extends Repository<User, Integer> {
 	 * Retrieve all {@link User}s from the data store
 	 * @return a Collection of {@link User}s (or an empty Collection if none
 	 */
-	List<User> findAll();
+	Collection<User> findAll();
 
 	/**
 	 * Save an {@link User} to the data store, either inserting or updating it.
@@ -38,4 +39,5 @@ public interface UserRepository extends Repository<User, Integer> {
 	 * @return the deleted {@link User}
 	 */
 	User delete(User user);
+
 }

src/main/java/org/springframework/samples/petclinic/service/common/RoleService.java

@@ -8,6 +8,7 @@ import org.springframework.samples.petclinic.service.business.BaseService;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -69,7 +70,14 @@ public class RoleService implements BaseService<Role, RoleDTO> {
 
 	@Override
 	public List<RoleDTO> findAll() {
-		return entitiesToDTOS(roleRepository.findAll());
+		Collection<Role> roles = roleRepository.findAll();
+		List<RoleDTO> roleDTOS = new ArrayList<>();
+
+		roles.forEach(role -> {
+			roleDTOS.add(entityToDTO(role));
+		});
+
+		return roleDTOS;
 	}
 
 	@Override

src/main/java/org/springframework/samples/petclinic/service/common/UserService.java

@@ -5,11 +5,13 @@ import org.springframework.samples.petclinic.dto.common.RoleDTO;
 import org.springframework.samples.petclinic.dto.common.UserDTO;
 import org.springframework.samples.petclinic.model.common.Role;
 import org.springframework.samples.petclinic.model.common.User;
+import org.springframework.samples.petclinic.repository.RoleRepository;
 import org.springframework.samples.petclinic.repository.UserRepository;
 import org.springframework.samples.petclinic.service.business.BaseService;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -88,9 +90,14 @@ public class UserService implements BaseService<User, UserDTO> {
 
 	@Override
 	public List<UserDTO> findAll() {
-		List<User> users = userRepository.findAll();
+		Collection<User> users = userRepository.findAll();
+		List<UserDTO> userDTOS = new ArrayList<>();
 
-		return entitiesToDTOS(users);
+		users.forEach(user -> {
+			userDTOS.add(entityToDTO(user));
+		});
+
+		return userDTOS;
 	}
 
 	@Override
@@ -105,6 +112,7 @@ public class UserService implements BaseService<User, UserDTO> {
 	public UserDTO findByEmail(String email) {
 		User user = userRepository.findByEmail(email);
 
+
 		return entityToDTO(user);
 	}
 

src/test/java/org/springframework/samples/petclinic/controller/WebSecurityConfig.java

@@ -20,21 +20,14 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 	@Override
 	protected void configure(AuthenticationManagerBuilder auth) throws Exception {
 		PasswordEncoder encoder = PasswordEncoderFactories.createDelegatingPasswordEncoder();
-		auth.inMemoryAuthentication()
+		auth.inMemoryAuthentication().passwordEncoder(encoder).withUser(TEST_USER).password(encoder.encode("secret"))
-			.passwordEncoder(encoder)
-			.withUser(TEST_USER)
-			.password(encoder.encode("secret"))
 				.roles("ROLE_USER");
 	}
 
 	@Override
 	protected void configure(HttpSecurity http) throws Exception {
-		http.authorizeRequests()
+		http.authorizeRequests().antMatchers("/owners/**", "/pets/**", "/users/**", "/visits/**").authenticated()
-			.antMatchers("/owners/**", "/pets/**", "/users/**", "/visits/**")
+				.antMatchers("/**").permitAll().and().httpBasic();
-			.authenticated()
-			.antMatchers("/**")
-			.permitAll()
-			.and()
-			.httpBasic();
 	}
+
 }