1 files changed, 32 insertions, 14 deletions

diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/adapter/DateUtils.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/adapter/DateUtils.java
index c0f25892..1921d857 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/adapter/DateUtils.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/adapter/DateUtils.java
@@ -45,13 +45,18 @@ import java.util.Date;
 import java.util.List;
 import java.util.TimeZone;
 
+import org.bouncycastle.asn1.dvcs.Data;
 import org.onap.portalsdk.core.domain.FusionObject;
 import org.onap.portalsdk.core.domain.User;
 import org.onap.portalsdk.core.service.DataAccessService;
 import org.onap.portalsdk.core.util.SystemProperties;
 import org.onap.portalsdk.core.web.support.AppUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
 
-
+@Component
 public class DateUtils implements Serializable, FusionObject{
 	
 	public static final String US_PACIFIC = "US/Pacific";
@@ -67,14 +72,21 @@ public class DateUtils implements Serializable, FusionObject{
 	private static final String DB_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
 	private static final String GET_CURRENT_DATE = "getCurrentDate";
 	
+	
+	//@Autowired
 	private static DataAccessService dataAccessService;
 	
-	public static DataAccessService getDataAccessService() {
-		return dataAccessService;
-	}
-
-	public void setDataAccessService(DataAccessService dataAccessService) {
-		this.dataAccessService = dataAccessService;
+//	public static DataAccessService getDataAccessService() {
+//		return dataAccessService;
+//	}
+//
+//	public void setDataAccessService(DataAccessService dataAccessService) {
+//		DateUtils.dataAccessService = dataAccessService;
+//	}
+	
+	@Autowired
+	public DateUtils(DataAccessService dataAccessService) {
+		DateUtils.dataAccessService =  dataAccessService; 
 	}
 
 	/**
@@ -124,7 +136,8 @@ public class DateUtils implements Serializable, FusionObject{
 	 * 
 	 */
 	public static Date parseUserDate(String dateValue, String inPattern,	Long userId) throws Exception{	
-		User user = (User)getDataAccessService().getDomainObject(User.class, userId, null);
+//		User user = (User)getDataAccessService().getDomainObject(User.class, userId, null);
+		User user = (User)dataAccessService.getDomainObject(User.class, userId, null);
 
 		String userTimeZone = null;
 		Long     timezoneId = user.getTimeZoneId();
@@ -230,8 +243,8 @@ public class DateUtils implements Serializable, FusionObject{
 	 * 
 	 */
 	public static String formatUserDate(String dateValue,String inPattern, Long userId,String outPattern,String requiredTimeZone) throws Exception{
-		User user = (User)getDataAccessService().getDomainObject(User.class, userId, null);
-
+		//User user = (User)getDataAccessService().getDomainObject(User.class, userId, null);
+		User user = (User)dataAccessService.getDomainObject(User.class, userId, null);
 		String userTimeZone = null;
 		Long     timezoneId = user.getTimeZoneId();
 		
@@ -255,7 +268,8 @@ public class DateUtils implements Serializable, FusionObject{
 	 * 
 	 */
 	public static String formatUserDateForDBTimeZone(String dateValue,String inPattern, Long userId,String outPattern) throws Exception{
-		User user = (User)getDataAccessService().getDomainObject(User.class, userId, null);
+//		User user = (User)getDataAccessService().getDomainObject(User.class, userId, null);
+		User user = (User)dataAccessService.getDomainObject(User.class, userId, null);
 
 		String userTimeZone = null;
 		Long     timezoneId = user.getTimeZoneId();
@@ -275,8 +289,11 @@ public class DateUtils implements Serializable, FusionObject{
 	 */
 	public static Date getCurrentDBDate()throws Exception{
 		String dbTimeZone = SystemProperties.getProperty(SystemProperties.DATABASE_TIME_ZONE);
-		List results = (List)getDataAccessService().executeNamedQuery(GET_CURRENT_DATE, null, null);
-		return parseDate(((Object[])results.get(0))[0]+" "+((Object[])results.get(0))[1],DB_DATE_FORMAT,dbTimeZone);
+		//List results = (List)getDataAccessService().executeNamedQuery(GET_CURRENT_DATE, null, null);
+		List results = (List) dataAccessService.executeNamedQuery(GET_CURRENT_DATE, null, null);
+		/*Object[]  currentDate =  (Object[]) results.get(0) ; 
+		System.out.println(currentDate[0]);*/
+		return parseDate((String)results.get(0),DB_DATE_FORMAT,dbTimeZone);
 	}
 	
 	/**
@@ -288,7 +305,8 @@ public class DateUtils implements Serializable, FusionObject{
 	 * @throws Exception
 	 */
 	public static String getCurrentDBDateForUser(String outPattern,Long userId)throws Exception{
-		User user = (User)getDataAccessService().getDomainObject(User.class, userId, null);
+		//User user = (User)getDataAccessService().getDomainObject(User.class, userId, null);
+		User user = (User)dataAccessService.getDomainObject(User.class, userId, null);
 
 		String userTimeZone = null;
 		Long     timezoneId = user.getTimeZoneId();