spring version changes

pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.1.RELEASE</version>
+		<version>2.6.6</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com</groupId>
@@ -34,6 +34,11 @@
 			<artifactId>spring-boot-starter-mail</artifactId>
 		</dependency>
 		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-validation</artifactId>
+		</dependency>
+		
+		<dependency>
 		   <groupId>javax.servlet</groupId>
 		   <artifactId>javax.servlet-api</artifactId>
 		   <version>3.1.0</version>

src/main/java/com/ic/aspect/ServiceVersionAspect.java

@@ -17,6 +17,7 @@ import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.reflect.MethodSignature;
+import org.hibernate.validator.messageinterpolation.ParameterMessageInterpolator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -51,8 +52,14 @@ public class ServiceVersionAspect {
 		
 	    ResponseEntity re = null;
 	    if(joinPoint.getArgs().length > 0) {
-	    	ValidatorFactory validatorFactory = Validation.buildDefaultValidatorFactory();
-		    Validator validator = validatorFactory.usingContext().getValidator();
+//	    	ValidatorFactory validatorFactory = Validation.buildDefaultValidatorFactory();
+//		    Validator validator = validatorFactory.usingContext().getValidator();
+	    	Validator validator =
+	    			  Validation.byDefaultProvider()
+	    			    .configure()
+	    			    .messageInterpolator(new ParameterMessageInterpolator())
+	    			    .buildValidatorFactory()
+	    			    .getValidator();
 		    Set<ConstraintViolation<Object>> constrains = validator.validate(joinPoint.getArgs()[0]);
 		    if(constrains.size() > 0) {
 		    	String message = "";

src/main/java/com/ic/config/SecurityConfig.java

@@ -5,6 +5,7 @@ import java.util.Arrays;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.security.authentication.ProviderManager;
@@ -34,12 +35,17 @@ import com.ic.security.JwtAuthenticationFilter;
         prePostEnabled = true
 )
 public class SecurityConfig extends WebSecurityConfigurerAdapter {
-    @Autowired
+    
     CustomUserDetailsService customUserDetailsService;
 
     @Autowired
     private JwtAuthenticationEntryPoint unauthorizedHandler;
 
+    @Autowired
+    public SecurityConfig(@Lazy CustomUserDetailsService customUserDetailsService) {
+        this.customUserDetailsService = customUserDetailsService;
+    }
+
     @Bean
     public JwtAuthenticationFilter jwtAuthenticationFilter() {
         return new JwtAuthenticationFilter();

src/main/java/com/ic/modules/auth/service/impl/ConfigurationsServiceImpl.java

@@ -3,6 +3,7 @@ package com.ic.modules.auth.service.impl;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
@@ -20,8 +21,13 @@ public class ConfigurationsServiceImpl implements ConfigurationsService {
 	@Autowired
 	ConfigurationsRepository configRepo;
 	
-	@Autowired
 	DBConfig DBConfig;
+	
+	@Autowired
+    public ConfigurationsServiceImpl(@Lazy DBConfig DBConfig) {
+        this.DBConfig = DBConfig;
+    }
+	
 	public Configurations save(ConfigurationsDto dto,Boolean isCreate) {
 		 Configurations configuration = null;
 		 if(!isCreate) {

src/main/java/com/ic/modules/auth/service/impl/DTslabsMappingServiceImpl.java

-package com.ic.modules.auth.service.impl;
-
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Isolation;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.ic.constant.LeaderCalcConfig;
-import com.ic.exception.ResourceNotFoundException;
-import com.ic.modules.auth.model.DTSlabsMapping;
-import com.ic.modules.auth.payload.DTslabsDto;
-import com.ic.modules.auth.repository.DTslabsRepository;
-import com.ic.modules.auth.service.DTslabsService;
-
-
-@Service
-public class DTslabsMappingServiceImpl implements DTslabsService {
-
-	@Autowired
-	DTslabsRepository dtslabsrepo;
-	@Autowired
-	LeaderCalcConfig LeaderCalcConfig;
-
-	
-	
-	@Override
-	@Transactional(isolation=Isolation.READ_UNCOMMITTED)
-	public List<DTSlabsMapping> findAll() {  // neel gosrani 27-05-2020 Activation DT CR Function for fetch all data from DB   // neel gosrani 02-09-2020 Sql server migration
-	
-		return dtslabsrepo.findAll();
-	}
-	
-	public DTSlabsMapping save(DTslabsDto dto, Boolean isCreate) {   // neel gosrani 27-05-2020 Activation DT CR Function for save all data to DB
-		if(!isCreate) {
-			dtslabsrepo.findById(dto.getId()).orElseThrow(()->new ResourceNotFoundException("dtslabs","key",dto.getId()));
-		 }
-		
-		DTSlabsMapping dtslabsMapping = null;
-		
-		dtslabsMapping= new DTSlabsMapping();
-		dtslabsMapping.setId(dto.getId());
-		dtslabsMapping.setCBA(dto.getCBA());
-		dtslabsMapping.setBA(dto.getBA());
-		dtslabsMapping.setSBA(dto.getSBA());
-		dtslabsMapping.setMaxval(dto.getMaxval());
-		dtslabsMapping.setMinval(dto.getMinval());
-		dtslabsMapping.setPartner(dto.getPartner());
-		dtslabsMapping.setSenior_Partner(dto.getSenior_Partner());
-		
-		return dtslabsrepo.save(dtslabsMapping);
-	}
-
-	
-
-}
+package com.ic.modules.auth.service.impl;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Isolation;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.ic.constant.LeaderCalcConfig;
+import com.ic.exception.ResourceNotFoundException;
+import com.ic.modules.auth.model.DTSlabsMapping;
+import com.ic.modules.auth.payload.DTslabsDto;
+import com.ic.modules.auth.repository.DTslabsRepository;
+import com.ic.modules.auth.service.DTslabsService;
+
+
+@Service
+public class DTslabsMappingServiceImpl implements DTslabsService {
+
+	@Autowired
+	DTslabsRepository dtslabsrepo;
+
+	LeaderCalcConfig LeaderCalcConfig;
+
+	@Autowired
+    public DTslabsMappingServiceImpl(@Lazy LeaderCalcConfig LeaderCalcConfig) {
+        this.LeaderCalcConfig = LeaderCalcConfig;
+    }
+	
+	@Override
+	@Transactional(isolation=Isolation.READ_UNCOMMITTED)
+	public List<DTSlabsMapping> findAll() {  // neel gosrani 27-05-2020 Activation DT CR Function for fetch all data from DB   // neel gosrani 02-09-2020 Sql server migration
+	
+		return dtslabsrepo.findAll();
+	}
+	
+	public DTSlabsMapping save(DTslabsDto dto, Boolean isCreate) {   // neel gosrani 27-05-2020 Activation DT CR Function for save all data to DB
+		if(!isCreate) {
+			dtslabsrepo.findById(dto.getId()).orElseThrow(()->new ResourceNotFoundException("dtslabs","key",dto.getId()));
+		 }
+		
+		DTSlabsMapping dtslabsMapping = null;
+		
+		dtslabsMapping= new DTSlabsMapping();
+		dtslabsMapping.setId(dto.getId());
+		dtslabsMapping.setCBA(dto.getCBA());
+		dtslabsMapping.setBA(dto.getBA());
+		dtslabsMapping.setSBA(dto.getSBA());
+		dtslabsMapping.setMaxval(dto.getMaxval());
+		dtslabsMapping.setMinval(dto.getMinval());
+		dtslabsMapping.setPartner(dto.getPartner());
+		dtslabsMapping.setSenior_Partner(dto.getSenior_Partner());
+		
+		return dtslabsrepo.save(dtslabsMapping);
+	}
+
+	
+
+}

src/main/java/com/ic/modules/auth/service/impl/FycMappingServiceImpl.java

@@ -3,6 +3,7 @@ package com.ic.modules.auth.service.impl;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
@@ -20,8 +21,13 @@ public class FycMappingServiceImpl implements FycMappingService {
 	@Autowired
 	FycRepository fycRepo;
 	
-	@Autowired
 	LeaderCalcConfig LeaderCalcConfig;
+	
+	@Autowired
+    public FycMappingServiceImpl(@Lazy LeaderCalcConfig LeaderCalcConfig) {
+        this.LeaderCalcConfig = LeaderCalcConfig;
+    }
+	
 	public FycMapping save(fycDto dto,Boolean isCreate) {
 		
 		if(!isCreate) {

src/main/java/com/ic/modules/auth/service/impl/L1slabsMappingServiceImpl.java

@@ -3,6 +3,7 @@ package com.ic.modules.auth.service.impl;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
@@ -23,8 +24,13 @@ public class L1slabsMappingServiceImpl implements L1slabsMappingService {
 	@Autowired
 	L1slabsRepository l1slabsRepo;
 	
-	@Autowired
 	LeaderCalcConfig LeaderCalcConfig;
+	
+	@Autowired
+    public L1slabsMappingServiceImpl(@Lazy LeaderCalcConfig LeaderCalcConfig) {
+        this.LeaderCalcConfig = LeaderCalcConfig;
+    }
+	
 	@Override
 	@Transactional(isolation=Isolation.READ_UNCOMMITTED)
 	public List<L1slabsMapping> findAll() {    // neel gosrani 02-09-2020 Sql server migration

src/main/java/com/ic/modules/auth/service/impl/L2slabsMappingServiceImpl.java

@@ -3,6 +3,7 @@ package com.ic.modules.auth.service.impl;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
@@ -23,8 +24,13 @@ public class L2slabsMappingServiceImpl implements L2slabsMappingService {
 	@Autowired
 	L2slabsRepository l2slabsRepo;
 	
-	@Autowired
 	LeaderCalcConfig LeaderCalcConfig;
+	
+	@Autowired
+    public L2slabsMappingServiceImpl(@Lazy LeaderCalcConfig LeaderCalcConfig) {
+        this.LeaderCalcConfig = LeaderCalcConfig;
+    }
+	
 	@Override
 	@Transactional(isolation=Isolation.READ_UNCOMMITTED)
 	public List<L2slabsMapping> findAll() {    // neel gosrani 02-09-2020 Sql server migration

src/main/java/com/ic/modules/auth/service/impl/MDBMappingServiceImpl.java

@@ -3,6 +3,7 @@ package com.ic.modules.auth.service.impl;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
@@ -20,11 +21,13 @@ public class MDBMappingServiceImpl implements MDBMappingService {
 	@Autowired
 	MDBRepository mdbrepo;
 	
-	
-	@Autowired
 	LeaderCalcConfig LeaderCalcConfig;
 
-
+	@Autowired
+    public MDBMappingServiceImpl(@Lazy LeaderCalcConfig LeaderCalcConfig) {
+        this.LeaderCalcConfig = LeaderCalcConfig;
+    }
+	
 	@Override
 	@Transactional(isolation=Isolation.READ_UNCOMMITTED)
 	public List<MDBMapping> findAll() {    // neel gosrani 02-09-2020 Sql server migration

src/main/java/com/ic/modules/auth/service/impl/MpbMappingServiceImpl.java

@@ -3,6 +3,7 @@ package com.ic.modules.auth.service.impl;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
@@ -21,8 +22,13 @@ public class MpbMappingServiceImpl implements MpbMappingService{
 	@Autowired
 	MpbRepository mpbrepository;
 	
-	@Autowired
 	LeaderCalcConfig LeaderCalcConfig;
+	
+	@Autowired
+    public MpbMappingServiceImpl(@Lazy LeaderCalcConfig LeaderCalcConfig) {
+        this.LeaderCalcConfig = LeaderCalcConfig;
+    }
+	
 	@Override
 	@Transactional(isolation=Isolation.READ_UNCOMMITTED)
 	public List<MpbMapping> findAll() {    // neel gosrani 02-09-2020 Sql server migration

src/main/java/com/ic/modules/auth/service/impl/TemplatesServiceImpl.java

@@ -3,6 +3,7 @@ package com.ic.modules.auth.service.impl;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
@@ -20,9 +21,13 @@ public class TemplatesServiceImpl implements TemplatesService {
 	@Autowired
 	TemplatesRepository configRepo;
 	
-	@Autowired
 	TemplateConfig templateConfig;
 	
+	@Autowired
+    public TemplatesServiceImpl(@Lazy TemplateConfig templateConfig) {
+        this.templateConfig = templateConfig;
+    }
+	
 	public Templates save(TemplatesDto dto,Boolean isCreate) {
 		 Templates configuration = null;
 		 if(!isCreate) {

src/main/java/com/ic/modules/auth/service/impl/UserServiceImpl.java

@@ -3,6 +3,7 @@ package com.ic.modules.auth.service.impl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.security.crypto.password.PasswordEncoder;
@@ -32,9 +33,12 @@ public class UserServiceImpl implements UserService {
 		return userRepository.findAll(pageable);
 	}
 	
-	@Autowired
 	PasswordEncoder passwordEncoder;
 
+	@Autowired
+    public UserServiceImpl(@Lazy PasswordEncoder passwordEncoder) {
+        this.passwordEncoder = passwordEncoder;
+    }
 	
 	public User save(UserDto userDto) { 
 		User user = new User();

src/main/java/com/ic/security/CustomUserDetailsService.java

@@ -3,6 +3,7 @@ package com.ic.security;
 import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
@@ -18,9 +19,13 @@ import com.ic.modules.auth.service.UserService;
 @Service
 public class CustomUserDetailsService implements UserDetailsService {
 
-	@Autowired
 	UserService userService;
 
+	@Autowired
+    public CustomUserDetailsService(@Lazy UserService userService) {
+        this.userService = userService;
+    }
+	
 	@Override
 	@Transactional
 	public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {

src/main/resources/application.properties

@@ -84,8 +84,9 @@ spring.mail.properties.mail.smtp.auth=true
 spring.mail.properties.mail.smtp.connectiontimeout=5000
 spring.mail.properties.mail.smtp.timeout=5000
 spring.mail.properties.mail.smtp.writetimeout=5000
+spring.mvc.pathmatch.matching-strategy = ANT_PATH_MATCHER
 
 # TLS , port 587
 spring.mail.properties.mail.smtp.starttls.enable=true
 
-spring.sms.url= http://text160.in/otphttp.php?authkey=3TMBFENqamaHyaSSakB3&mobiles=##_numbers_##&message=##_message_##&sender=SMSAPP&route=4&country=91
+spring.sms.url= http://text160.in/otphttp.php?authkey=3TMBFENqamaHyaSSakB3&mobiles=##_numbers_##&message=##_message_##&sender=SMSAPP&route=4&country=91
\ No newline at end of file