Merge pull request #31 from PSMRI/test/upgrade

deployment issues fixed

pom.xml

@@ -231,6 +231,17 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<!-- https://mvnrepository.com/artifact/org.springframework.session/spring-session-data-redis -->
+<dependency>
+    <groupId>org.springframework.session</groupId>
+    <artifactId>spring-session-data-redis</artifactId>
+    <version>3.2.1</version>
+</dependency>
+<!-- Actuator -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
 	</dependencies>
 	<build>
 		<finalName>mmuapi-v1.0</finalName>

src/main/java/com/iemr/mmu/config/InterceptorConfig.java → src/main/java/com/iemr/mmu/config/HttpInterceptorConfig.java

@@ -26,17 +26,17 @@
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-import com.iemr.mmu.utils.http.HTTPRequestInterceptor;
+import com.iemr.mmu.utils.http.HttpInterceptor;
+
 
 @Configuration
-public class InterceptorConfig implements WebMvcConfigurer {
+public class HttpInterceptorConfig implements WebMvcConfigurer {
 
 	@Autowired
-	HTTPRequestInterceptor requestInterceptor;
+	private HttpInterceptor httpInterceptor;
 
 	@Override
 	public void addInterceptors(InterceptorRegistry registry) {
-		 registry.addInterceptor(new BlockingHttpMethodInterceptor())
-         .addPathPatterns("/**"); 
+		registry.addInterceptor(httpInterceptor);
 	}
-}
+}

src/main/java/com/iemr/mmu/utils/redis/RedisSessionException.java → src/main/java/com/iemr/mmu/config/RedisConfig.java

@@ -19,16 +19,22 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see https://www.gnu.org/licenses/.
 */
-package com.iemr.mmu.utils.redis;
+package com.iemr.mmu.config;
 
-import com.iemr.mmu.utils.exception.IEMRException;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
 
-public class RedisSessionException extends IEMRException {
-	public RedisSessionException(String message, Throwable cause) {
-		super(message, cause);
-	}
+@Configuration
+public class RedisConfig {
+
+	private @Value("${spring.redis.host}") String redisHost;
+	private @Value("${spring.redis.port}") int redisPort;
 
-	public RedisSessionException(String message) {
-		super(message);
+	@Bean
+	LettuceConnectionFactory lettuceConnectionFactory() {
+		return new LettuceConnectionFactory(redisHost, redisPort);
 	}
+
 }

src/main/java/com/iemr/mmu/utils/AESEncryption/AESEncryptionDecryption.java

@@ -34,7 +34,6 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-import com.iemr.mmu.utils.config.ConfigProperties;
 
 /*
 *
@@ -47,7 +46,7 @@
 public class AESEncryptionDecryption {
 
 
-	private  Logger logger = LoggerFactory.getLogger(ConfigProperties.class);
+	private  Logger logger = LoggerFactory.getLogger(AESEncryptionDecryption.class);
 	private static SecretKeySpec secretKey;
 	private  byte[] key;
 	final String secret = "amrith$%2022@&*piramal@@swasthya!#";

src/main/java/com/iemr/mmu/utils/CommonMain.java

@@ -21,16 +21,31 @@
 */
 package com.iemr.mmu.utils;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+import org.springframework.session.data.redis.config.annotation.web.http.RedisHttpSessionConfiguration;
+
+import com.iemr.mmu.utils.redis.RedisStorage;
 
 @EnableAutoConfiguration
 public class CommonMain {
-	/*
-	 * @Bean public ConfigProperties configProperties() { return new
-	 * ConfigProperties(); }
-	 * 
-	 * @Bean public RedisHttpSessionConfiguration redisSession() { return new
-	 * RedisHttpSessionConfiguration(); }
-	 * 
-	 * @Bean public RedisStorage redisStorage() { return new RedisStorage(); }
-	 */}
+
+	private @Value("${spring.redis.host}") String redisHost;
+	private @Value("${spring.redis.port}") int redisPort;
+
+
+	@Bean
+	public RedisHttpSessionConfiguration redisSession() {
+		return new RedisHttpSessionConfiguration();
+	}
+
+	  @Bean public LettuceConnectionFactory connectionFactory() { return new
+	  LettuceConnectionFactory(redisHost, redisPort); }
+
+	@Bean
+	public RedisStorage redisStorage() {
+		return new RedisStorage();
+	}
+	}

src/main/java/com/iemr/mmu/utils/IEMRApplBeans.java

@@ -21,31 +21,17 @@
 */
 package com.iemr.mmu.utils;
 
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.JavaMailSenderImpl;
 
-import com.iemr.mmu.utils.config.ConfigProperties;
 import com.iemr.mmu.utils.gateway.email.EmailService;
 import com.iemr.mmu.utils.gateway.email.GenericEmailServiceImpl;
-import com.iemr.mmu.utils.redis.RedisStorage;
-import com.iemr.mmu.utils.sessionobject.SessionObject;
-import com.iemr.mmu.utils.validator.Validator;
 
 @Configuration
 public class IEMRApplBeans {
 
-	private @Value("${spring.redis.host}") String redisHost;
-	private @Value("${spring.redis.port}") int redisPort;
-
-	@Bean
-	public Validator getVaidator() {
-		return new Validator();
-	}
-
 	@Bean
 	public EmailService getEmailService() {
 		return new GenericEmailServiceImpl();
@@ -56,23 +42,4 @@ public JavaMailSender getJavaMailSender() {
 		return new JavaMailSenderImpl();
 	}
 
-	@Bean
-	public ConfigProperties configProperties() {
-		return new ConfigProperties();
-	}
-
-	@Bean
-	public SessionObject sessionObject() {
-		return new SessionObject();
-	}
-
-	@Bean
-	public RedisStorage redisStorage() {
-		return new RedisStorage();
-	}
-
-	@Bean
-	public LettuceConnectionFactory connectionFactory() {
-		return new LettuceConnectionFactory(redisHost, redisPort);
-	}
 }