Skip to content

Commit

Permalink
identatoin
Browse files Browse the repository at this point in the history
  • Loading branch information
chaudharydeepak committed Mar 27, 2021
1 parent 2a0ebd9 commit 313cfc0
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
@EnableWebSecurity
public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter {

private BCryptPasswordEncoder bCryptPasswordEncoder;
private UserDetailsServiceImpl userDetailsService;
private final BCryptPasswordEncoder bCryptPasswordEncoder;
private final UserDetailsServiceImpl userDetailsService;

private static final String[] AUTH_WHITELIST = {
"/v2/api-docs",
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/dccorp/urlshortner/entity/AppUser.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
public class AppUser implements Serializable {

@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@GeneratedValue(strategy = GenerationType.IDENTITY)
private long id;

@Column(name = "first_name")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
@Slf4j
public class AuthenticationFilter extends UsernamePasswordAuthenticationFilter {

private AuthenticationManager authenticationManager;
private final AuthenticationManager authenticationManager;

public AuthenticationFilter(AuthenticationManager authenticationManager) {
this.authenticationManager = authenticationManager;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
@Service
public class UserDetailsServiceImpl implements UserDetailsService {

private RegistrationRepository userRepository;
private final RegistrationRepository userRepository;

public UserDetailsServiceImpl(RegistrationRepository userRepository) {
this.userRepository = userRepository;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.dccorp.urlshortner.entity.UrlCodeMappingEntity;
import com.dccorp.urlshortner.repository.CodeActiveRepository;
import com.dccorp.urlshortner.repository.URLCodeRepository;
import com.dccorp.urlshortner.util.AppUtility;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.Authentication;
Expand All @@ -28,18 +29,17 @@ public ShortnerService(URLCodeRepository codeRepository, CodeActiveRepository co
this.codeRepository = codeRepository;
this.codeActiveRepository = codeActiveRepository;
}




public ServiceResponse createShortCode(ServiceRequest serviceRequest) {
UrlCodeMappingEntity urlCodeMapping = new UrlCodeMappingEntity();
urlCodeMapping.setCode(serviceRequest.getRequestedShortCode());
urlCodeMapping.setUrl(serviceRequest.getRequestURL());
urlCodeMapping.setCreatedDate((LocalDateTime.now()));
urlCodeMapping.setUpdatedDate((LocalDateTime.now()));
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
String currentPrincipalName = authentication.getName();
urlCodeMapping.setRequestedBy(currentPrincipalName);

AppUtility ctx = () -> SecurityContextHolder.getContext().getAuthentication().getName();

urlCodeMapping.setRequestedBy(ctx.fetchUserFrmCtx());
UrlCodeMappingEntity codeMappingEntityResponse = codeRepository.save(urlCodeMapping);

CodeActiveEntity codeActiveEntity = new CodeActiveEntity();
Expand Down
8 changes: 1 addition & 7 deletions src/main/java/com/dccorp/urlshortner/util/AppUtility.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,5 @@
@FunctionalInterface
public interface AppUtility {

void printLog(String logString);

default String provideDefFuntionality()
{
System.out.println("providing provideDefFuntionality");
return "provideDefFuntionality";
}
String fetchUserFrmCtx();
}

0 comments on commit 313cfc0

Please sign in to comment.