Merge branch 'dev' of http://192.168.1.220:10080/chenweida/jw2.0 into dev

svr/svr-quota/src/main/java/com/yihu/jw/quota/dao/jpa/TjQuotaDao.java

@@ -1,7 +1,6 @@
package com.yihu.jw.quota.dao.jpa;
import com.yihu.jw.quota.model.jpa.TjQuota;
import com.yihu.jw.quota.model.jpa.compute.TjCompute;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;

svr/svr-quota/src/main/java/com/yihu/jw/quota/dao/jpa/compute/TjComputeDao.java

@@ -1,12 +0,0 @@
package com.yihu.jw.quota.dao.jpa.compute;
import com.yihu.jw.quota.model.jpa.compute.TjCompute;
import com.yihu.jw.quota.model.jpa.rule.TjCleanRule;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by chenweida on 2017/6/1.
 */
public interface TjComputeDao extends PagingAndSortingRepository<TjCompute, Long>, JpaSpecificationExecutor<TjCompute> {
}

svr/svr-quota/src/main/java/com/yihu/jw/quota/dao/jpa/dimension/TjDimensionMainDao.java

@@ -1,6 +1,5 @@
package com.yihu.jw.quota.dao.jpa.dimension;
import com.yihu.jw.quota.model.jpa.compute.TjCompute;
import com.yihu.jw.quota.model.jpa.dimension.TjDimensionMain;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;

svr/svr-quota/src/main/java/com/yihu/jw/quota/dao/jpa/dimension/TjDimensionSlaveDao.java

@@ -1,6 +1,5 @@
package com.yihu.jw.quota.dao.jpa.dimension;
import com.yihu.jw.quota.model.jpa.compute.TjCompute;
import com.yihu.jw.quota.model.jpa.dimension.TjDimensionSlave;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;

svr/svr-quota/src/main/java/com/yihu/jw/quota/dao/jpa/dimension/TjQuotaDimensionMainDao.java

@@ -1,6 +1,5 @@
package com.yihu.jw.quota.dao.jpa.dimension;
import com.yihu.jw.quota.model.jpa.compute.TjCompute;
import com.yihu.jw.quota.model.jpa.dimension.TjQuotaDimensionMain;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;

svr/svr-quota/src/main/java/com/yihu/jw/quota/dao/jpa/dimension/TjQuotaDimensionSlaveDao.java

@@ -1,6 +1,5 @@
package com.yihu.jw.quota.dao.jpa.dimension;
import com.yihu.jw.quota.model.jpa.compute.TjCompute;
import com.yihu.jw.quota.model.jpa.dimension.TjQuotaDimensionSlave;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;

svr/svr-quota/src/main/java/com/yihu/jw/quota/dao/jpa/rule/TjCleanRuleDao.java

@@ -1,11 +0,0 @@
package com.yihu.jw.quota.dao.jpa.rule;
import com.yihu.jw.quota.model.jpa.rule.TjCleanRule;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by chenweida on 2017/6/1.
 */
public interface TjCleanRuleDao extends PagingAndSortingRepository<TjCleanRule, Long>, JpaSpecificationExecutor<TjCleanRule> {
}

svr/svr-quota/src/main/java/com/yihu/jw/quota/dao/jpa/rule/TjQuotaRuleDao.java

@@ -1,12 +0,0 @@
package com.yihu.jw.quota.dao.jpa.rule;
import com.yihu.jw.quota.model.jpa.compute.TjCompute;
import com.yihu.jw.quota.model.jpa.rule.TjQuotaRule;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by chenweida on 2017/6/1.
 */
public interface TjQuotaRuleDao extends PagingAndSortingRepository<TjQuotaRule, Long>, JpaSpecificationExecutor<TjQuotaRule> {
}

svr/svr-quota/src/main/java/com/yihu/jw/quota/dao/jpa/save/TjDataSaveDao.java

@@ -1,6 +1,5 @@
package com.yihu.jw.quota.dao.jpa.save;
import com.yihu.jw.quota.model.jpa.compute.TjCompute;
import com.yihu.jw.quota.model.jpa.save.TjDataSave;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;

svr/svr-quota/src/main/java/com/yihu/jw/quota/dao/jpa/save/TjQuotaDataSaveDao.java

@@ -1,6 +1,5 @@
package com.yihu.jw.quota.dao.jpa.save;
import com.yihu.jw.quota.model.jpa.compute.TjCompute;
import com.yihu.jw.quota.model.jpa.source.TjQuotaDataSource;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;

svr/svr-quota/src/main/java/com/yihu/jw/quota/dao/jpa/source/TjDataSourceDao.java

@@ -1,8 +1,6 @@
package com.yihu.jw.quota.dao.jpa.source;
import com.yihu.jw.quota.model.jpa.compute.TjCompute;
import com.yihu.jw.quota.model.jpa.source.TjDataSource;
import com.yihu.jw.quota.model.jpa.source.TjQuotaDataSource;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;

svr/svr-quota/src/main/java/com/yihu/jw/quota/etl/Contant.java

@@ -1,7 +1,15 @@
package com.yihu.jw.quota.etl;
import java.util.ArrayList;
import java.util.List;
import org.joda.time.DateTime;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.time.temporal.TemporalAccessor;
import java.time.temporal.TemporalField;
import java.time.temporal.WeekFields;
import java.util.*;
/**
 * Created by chenweida on 2017/6/1.
@@ -50,9 +58,9 @@ public class Contant {
        public static final String area_team = "9";//行政区划  团队
    }
    public static class quota{
        public static final String dataLeval_all="1";
        public static final String dataLeval_oneDay="2";
    public static class quota {
        public static final String dataLeval_all = "1";
        public static final String dataLeval_oneDay = "2";
    }
@@ -88,6 +96,10 @@ public class Contant {
        }
    }
    public static void main(String[] args) {
        System.out.println(main_dimension_timeLevel.getStartTime("1"));
    }
    /**
     * 主维度 时间维度
     */
@@ -96,52 +108,129 @@ public class Contant {
        public static final String month = "2";
        public static final String week = "3";
        public static final String day = "4";
    }
    /**
     * 从维度常量
     */
    public static class slave_dimension {
        public static final String sex = "1";//性别
        public static final String age = "2";//年龄段
    }
        public static String getStartTime(String key) {
            LocalDate today = LocalDate.now();
            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
            switch (key) {
                case year: {
                    //去年度第一天
                    return simpleDateFormat.format(getCurrYearFirst(-1));
                }
                case month: {
                    //上个月第一天
                    return getYesterMonthDay(simpleDateFormat, -1);
                }
                case week: {
                    //上周周第一天
                    return getStartDayOfWeek(simpleDateFormat, -1);
                }
                case day: {
                    //昨天
                    return getYesterday();
                }
            }
            return getYesterday();
        }
        /**
         * 获取这个月第一天
         *
         * @param today
         * @return
         */
        private static String getCurrentMonthDay(LocalDate today) {
            LocalDate firstday = LocalDate.of(today.getYear(), today.getMonth(), 1);
            return firstday.format(DateTimeFormatter.ISO_DATE);
        }
    public static class slave_dimension_key {
        public static final String one = "one";
        public static final String two = "two";
        /**
         * 获取上个月第一天
         *
         * @return
         */
        private static String getYesterMonthDay(SimpleDateFormat simpleDateFormat, Integer n) {
            Calendar calendar = Calendar.getInstance();
            int month = calendar.get(Calendar.MONTH);
            calendar.set(Calendar.MONTH, month + n);
            calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMinimum(Calendar.DAY_OF_MONTH));
            Date strDateTo = calendar.getTime();
            return simpleDateFormat.format(strDateTo);
        }
        /**
         * 获取本周第一天
         *
         * @param simpleDateFormat
         * @param n                为推迟的周数，1本周，-1向前推迟一周，2下周，依次类推
         * @return
         */
        private static String getStartDayOfWeek(SimpleDateFormat simpleDateFormat, Integer n) {
            Calendar cal = Calendar.getInstance();
            cal.add(Calendar.DATE, n * 7);
            cal.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
            cal.set(Calendar.HOUR_OF_DAY, 0);
            cal.set(Calendar.MINUTE, 0);
            cal.set(Calendar.SECOND, 0);
            Date date = cal.getTime();
            return simpleDateFormat.format(date);
        }
        /**
         * 获取去年的第一天
         *
         * @return
         */
        private static Date getCurrYearFirst(Integer n) {
            Calendar currCal = Calendar.getInstance();
            int currentYear = currCal.get(Calendar.YEAR) + n;
            return getYearFirst(currentYear);
        }
        /**
         * 获取某年第一天日期
         *
         * @param year 年份
         * @return Date
         */
        private static Date getYearFirst(int year) {
            Calendar calendar = Calendar.getInstance();
            calendar.clear();
            calendar.set(Calendar.YEAR, year);
            Date currYearFirst = calendar.getTime();
            return currYearFirst;
        }
        /**
         * 获取昨天
         *
         * @return
         */
        private static String getYesterday() {
            return new org.joda.time.LocalDate(new DateTime().minusDays(1)).toString("yyyy-MM-dd");
        }
    }
    public static class save_status {
        public static final String success = "1";
        public static final String fail = "0";
    }
    /**
     * 数据过滤用到的参量
     */
    public static class role {
        public static final String not_null = "1";//非空
    }
    public static class save {
        public static final String es = "1";
        public static final String mysql = "2";
    }
    public static class convert {
        public static String level_age_1 = "1";
        public static String level_age_2 = "2";
        public static String level_age_3 = "3";
        public static String level_age_4 = "4";
        public static String level_age_5 = "5";
        public static String level_age_6 = "6";
        public static String level_age_1_name = "0~6";
        public static String level_age_2_name = "7~18";
        public static String level_age_3_name = "19~30";
        public static String level_age_4_name = "31~50";
        public static String level_age_5_name = "51~65";
        public static String level_age_6_name = ">65";
    public static class quartz_cron {
        //每年 1月1号 0点 0点0秒触发
        public static final String everyYearFirstDay = "0 0 0 1 1 ? *";
        //每个月1号 0点 0点0秒触发
        public static final String everyMonthFirstDay = "0 0 0 1 * ?";
        //每周一 0点 0点0秒触发
        public static final String everyWeekFirstDay = "0 0 0 ? * MON";
        //每天0点0分 0秒触发
        public static final String everyDay = "0 0 0 * * ?";
    }
}

svr/svr-quota/src/main/java/com/yihu/jw/quota/job/EsQuotaJob.java

@@ -5,7 +5,6 @@ import com.yihu.jw.quota.etl.Contant;
import com.yihu.jw.quota.etl.extract.ExtractHelper;
import com.yihu.jw.quota.etl.save.SaveHelper;
import com.yihu.jw.quota.model.jpa.TjQuotaLog;
import com.yihu.jw.quota.service.compute.TjComputeService;
import com.yihu.jw.quota.util.SpringUtil;
import com.yihu.jw.quota.vo.QuotaVO;
import com.yihu.jw.quota.vo.SaveModel;
@@ -40,8 +39,6 @@ public class EsQuotaJob implements Job {
    private String timeLevel;//时间
    @Autowired
    private TjQuotaLogDao tjQuotaLogDao;
    @Autowired
    private TjComputeService computeService;
    @Override
    public void execute(JobExecutionContext context) throws JobExecutionException {
@@ -115,8 +112,9 @@ public class EsQuotaJob implements Job {
        }
        this.startTime = map.getString("startTime");
        if (StringUtils.isEmpty(startTime)) {
            startTime = new LocalDate(new DateTime().minusDays(1)).toString("yyyy-MM-dd"); //默认昨天
            startTime = Contant.main_dimension_timeLevel.getStartTime(timeLevel);
        }
        this.quotaVO = (QuotaVO) map.get("quota");

svr/svr-quota/src/main/java/com/yihu/jw/quota/model/jpa/compute/TjCompute.java

@@ -1,171 +0,0 @@
package com.yihu.jw.quota.model.jpa.compute;// default package
import java.util.Date;
import javax.persistence.*;
import static javax.persistence.GenerationType.IDENTITY;
/**
 * TjCompute entity. @author MyEclipse Persistence Tools
 */
@Entity
@Table(name = "tj_compute")
public class TjCompute implements java.io.Serializable {
	// Fields
	private Integer id;
	private String code;
	private String name;
	private Date createTime;
	private String createUser;
	private String createUserName;
	private Date modifyTime;
	private String updateUser;
	private String updateUserName;
	private String status;
	private String remark;
	private String type;
	// Constructors
	/** default constructor */
	public TjCompute() {
	}
	/** minimal constructor */
	public TjCompute(Date createTime, Date modifyTime) {
		this.createTime = createTime;
		this.modifyTime = modifyTime;
	}
	/** full constructor */
	public TjCompute(String code, String name, Date createTime,
			String createUser, String createUserName, Date modifyTime,
			String updateUser, String updateUserName, String status,
			String remark, String type) {
		this.code = code;
		this.name = name;
		this.createTime = createTime;
		this.createUser = createUser;
		this.createUserName = createUserName;
		this.modifyTime = modifyTime;
		this.updateUser = updateUser;
		this.updateUserName = updateUserName;
		this.status = status;
		this.remark = remark;
		this.type = type;
	}
	// Property accessors
	@Id
	@GeneratedValue(strategy = IDENTITY)
	@Column(name = "id", unique = true, nullable = false)
	public Integer getId() {
		return this.id;
	}
	public void setId(Integer id) {
		this.id = id;
	}
	@Column(name = "code", length = 100)
	public String getCode() {
		return this.code;
	}
	public void setCode(String code) {
		this.code = code;
	}
	@Column(name = "name", length = 200)
	public String getName() {
		return this.name;
	}
	public void setName(String name) {
		this.name = name;
	}
	@Temporal(TemporalType.TIMESTAMP)
	@Column(name = "create_time", nullable = false, length = 0)
	public Date getCreateTime() {
		return this.createTime;
	}
	public void setCreateTime(Date createTime) {
		this.createTime = createTime;
	}
	@Column(name = "create_user", length = 100)
	public String getCreateUser() {
		return this.createUser;
	}
	public void setCreateUser(String createUser) {
		this.createUser = createUser;
	}
	@Column(name = "create_user_name", length = 50)
	public String getCreateUserName() {
		return this.createUserName;
	}
	public void setCreateUserName(String createUserName) {
		this.createUserName = createUserName;
	}
	@Temporal(TemporalType.TIMESTAMP)
	@Column(name = "modify_time", nullable = false, length = 0)
	public Date getModifyTime() {
		return this.modifyTime;
	}
	public void setModifyTime(Date modifyTime) {
		this.modifyTime = modifyTime;
	}
	@Column(name = "update_user", length = 100)
	public String getUpdateUser() {
		return this.updateUser;
	}
	public void setUpdateUser(String updateUser) {
		this.updateUser = updateUser;
	}
	@Column(name = "update_user_name", length = 50)
	public String getUpdateUserName() {
		return this.updateUserName;
	}
	public void setUpdateUserName(String updateUserName) {
		this.updateUserName = updateUserName;
	}
	@Column(name = "status", length = 1)
	public String getStatus() {
		return this.status;
	}
	public void setStatus(String status) {
		this.status = status;
	}
	@Column(name = "remark", length = 1500)
	public String getRemark() {
		return this.remark;
	}
	public void setRemark(String remark) {
		this.remark = remark;
	}
	@Column(name = "type", length = 2)
	public String getType() {
		return this.type;
	}
	public void setType(String type) {
		this.type = type;
	}
}

svr/svr-quota/src/main/java/com/yihu/jw/quota/model/jpa/rule/TjCleanRule.java

@@ -1,155 +0,0 @@
package com.yihu.jw.quota.model.jpa.rule;// default package
import java.util.Date;
import javax.persistence.*;
import static javax.persistence.GenerationType.IDENTITY;
/**
 * TjCleanRule entity. @author MyEclipse Persistence Tools
 */
@Entity
@Table(name = "tj_clean_rule")
public class TjCleanRule implements java.io.Serializable {
	// Fields
	private Integer id;
	private String code;
	private String name;
	private String type;//1非空
	private Date createTime;
	private String createUser;
	private String createUserName;
	private Date updateTime;
	private String updateUser;
	private String updateUserName;
	private String status;
	private String remark;
	// Constructors
	/** default constructor */
	public TjCleanRule() {
	}
	/** minimal constructor */
	public TjCleanRule(String code, Date createTime, Date updateTime) {
		this.code = code;
		this.createTime = createTime;
		this.updateTime = updateTime;
	}
	// Property accessors
	@Id
	@GeneratedValue(strategy = IDENTITY)
	@Column(name = "id", unique = true, nullable = false)
	public Integer getId() {
		return this.id;
	}
	public void setId(Integer id) {
		this.id = id;
	}
	@Column(name = "code", nullable = false, length = 100)
	public String getCode() {
		return this.code;
	}
	public void setCode(String code) {
		this.code = code;
	}
	@Column(name = "name", length = 200)
	public String getName() {
		return this.name;
	}
	public void setName(String name) {
		this.name = name;
	}
	@Temporal(TemporalType.TIMESTAMP)
	@Column(name = "create_time", nullable = false, length = 0)
	public Date getCreateTime() {
		return this.createTime;
	}
	public void setCreateTime(Date createTime) {
		this.createTime = createTime;
	}
	@Column(name = "create_user", length = 100)
	public String getCreateUser() {
		return this.createUser;
	}
	public void setCreateUser(String createUser) {
		this.createUser = createUser;
	}
	@Column(name = "create_user_name", length = 50)
	public String getCreateUserName() {
		return this.createUserName;
	}
	public void setCreateUserName(String createUserName) {
		this.createUserName = createUserName;
	}
	@Temporal(TemporalType.TIMESTAMP)
	@Column(name = "update_time", nullable = false, length = 0)
	public Date getUpdateTime() {
		return this.updateTime;
	}
	public void setUpdateTime(Date updateTime) {
		this.updateTime = updateTime;
	}
	@Column(name = "update_user", length = 100)
	public String getUpdateUser() {
		return this.updateUser;
	}
	public void setUpdateUser(String updateUser) {
		this.updateUser = updateUser;
	}
	@Column(name = "update_user_name", length = 50)
	public String getUpdateUserName() {
		return this.updateUserName;
	}
	public void setUpdateUserName(String updateUserName) {
		this.updateUserName = updateUserName;
	}
	@Column(name = "status", length = 1)
	public String getStatus() {
		return this.status;
	}
	public void setStatus(String status) {
		this.status = status;
	}
	public String getType() {
		return type;
	}
	public void setType(String type) {
		this.type = type;
	}
	@Column(name = "remark", length = 1500)
	public String getRemark() {
		return this.remark;
	}
	public void setRemark(String remark) {
		this.remark = remark;
	}
}

svr/svr-quota/src/main/java/com/yihu/jw/quota/model/jpa/rule/TjQuotaRule.java

@@ -1,77 +0,0 @@
package com.yihu.jw.quota.model.jpa.rule;// default package
import javax.persistence.*;
import static javax.persistence.GenerationType.IDENTITY;
import javax.transaction.Transactional;
/**
 * TjQuotaRule entity. @author MyEclipse Persistence Tools
 */
@Entity
@Table(name = "tj_quota_rule")
public class TjQuotaRule implements java.io.Serializable {
    // Fields
    private Integer id;
    private String quotaCode;
    private String ruleCode;
    private String type;// 1数据非空
    // Constructors
    /**
     * default constructor
     */
    public TjQuotaRule() {
    }
    /**
     * full constructor
     */
    public TjQuotaRule(String quotaCode, String ruleCode) {
        this.quotaCode = quotaCode;
        this.ruleCode = ruleCode;
    }
    // Property accessors
    @Id
    @GeneratedValue(strategy = IDENTITY)
    @Column(name = "id", unique = true, nullable = false)
    public Integer getId() {
        return this.id;
    }
    public void setId(Integer id) {
        this.id = id;
    }
    @Column(name = "quota_code", length = 100)
    public String getQuotaCode() {
        return this.quotaCode;
    }
    public void setQuotaCode(String quotaCode) {
        this.quotaCode = quotaCode;
    }
    @Column(name = "rule_code", length = 100)
    public String getRuleCode() {
        return this.ruleCode;
    }
    public void setRuleCode(String ruleCode) {
        this.ruleCode = ruleCode;
    }
    @Transient
    public String getType() {
        return type;
    }
    public void setType(String type) {
        this.type = type;
    }
}

svr/svr-quota/src/main/java/com/yihu/jw/quota/service/compute/TjComputeService.java

@@ -1,35 +0,0 @@
package com.yihu.jw.quota.service.compute;
import com.yihu.jw.quota.dao.jpa.compute.TjComputeDao;
import com.yihu.jw.quota.model.jpa.compute.TjCompute;
import com.yihu.jw.quota.model.jpa.rule.TjQuotaRule;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import java.util.List;
/**
 * Created by chenweida on 2017/6/1.
 */
@Service
public class TjComputeService {
    @Autowired
    private TjComputeDao computeDao;
    @Autowired
    private JdbcTemplate jdbcTemplate;
    public TjCompute findByQuotaCode(String code) {
        String sql=" SELECT " +
                "  tc.* " +
                " FROM " +
                "  tj_compute tc, " +
                "  tj_quota_compute tqc " +
                " WHERE " +
                "  tc.`code` = tqc.compute_code " +
                " AND tqc.quota_code = ? ";
        List<TjCompute> quotaDataSources = jdbcTemplate.query(sql, new BeanPropertyRowMapper(TjCompute.class), code);
        return quotaDataSources.get(0);
    }
}

svr/svr-quota/src/main/java/com/yihu/jw/quota/service/rule/TjCleanRuleService.java

@@ -1,34 +0,0 @@
package com.yihu.jw.quota.service.rule;
import com.yihu.jw.quota.model.jpa.dimension.TjDimensionSlave;
import com.yihu.jw.quota.model.jpa.rule.TjQuotaRule;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import java.sql.JDBCType;
import java.util.List;
/**
 * Created by chenweida on 2017/6/1.
 */
@Service
public class TjCleanRuleService {
    @Autowired
    private JdbcTemplate jdbcTemplate;
    public List<TjQuotaRule> findByQuotaCode(String code) {
        String sql="SELECT " +
                "  qr.*, " +
                "cr.type " +
                "FROM " +
                "  tj_clean_rule cr, " +
                "  tj_quota_rule qr " +
                "WHERE " +
                "  cr.`code`=qr.rule_code " +
                "AND qr.quota_code = ?";
        List<TjQuotaRule> quotaDataSources = jdbcTemplate.query(sql, new BeanPropertyRowMapper(TjQuotaRule.class), code);
        return quotaDataSources;
    }
}