diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/daos/IOrderSyncInfoDAO.java b/libreplan-business/src/main/java/org/libreplan/business/orders/daos/IOrderSyncInfoDAO.java index f4d954f6d..4b8fc7cdb 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/orders/daos/IOrderSyncInfoDAO.java +++ b/libreplan-business/src/main/java/org/libreplan/business/orders/daos/IOrderSyncInfoDAO.java @@ -34,50 +34,52 @@ public interface IOrderSyncInfoDAO extends IGenericDAO { /** * Search last synchronized info for the specified - * {@link Order} and connectorId + * {@link Order} and connectorName * * @param order * the order to search for - * @param connectorId - * the connector-id + * @param connectorName + * the connector name * * @return Last synchronized info */ - OrderSyncInfo findLastSynchronizedInfoByOrderAndConnectorId(Order order, - String connectorId); + OrderSyncInfo findLastSynchronizedInfoByOrderAndConnectorName(Order order, + String connectorName); /** * Search last synchronized infos for the specified - * {@link Order} and connectorId + * {@link Order} and connectorName * * @param order * the order to search for - * @param connectorId - * the connector-id + * @param connectorName + * the connector name * @return list of last synchronized infos */ - List findLastSynchronizedInfosByOrderAndConnectorId( - Order order, String connectorId); + List findLastSynchronizedInfosByOrderAndConnectorName( + Order order, String connectorName); /** * Searches and returns {@link OrderSyncInfo} for the specified - * key and connectorId + * key and connectorName * * @param key * the unique key with in connector id - * @param order the order - * @param connectorId - * the connector id + * @param order + * the order + * @param connectorName + * the connector name */ - OrderSyncInfo findByKeyOrderAndConnectorId(String key, Order order, String connectorId); + OrderSyncInfo findByKeyOrderAndConnectorName(String key, Order order, + String connectorName); /** * Finds the {@link OrderSyncInfo}s for the specified - * connectorId + * connectorName * - * @param connectorId - * the connectorId + * @param connectorName + * the connector name * @return a list of OrderSyncInfo if found and null if not */ - List findByConnectorId(String connectorId); + List findByConnectorName(String connectorName); } diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/daos/OrderSyncInfoDAO.java b/libreplan-business/src/main/java/org/libreplan/business/orders/daos/OrderSyncInfoDAO.java index 3512aecdd..e13323566 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/orders/daos/OrderSyncInfoDAO.java +++ b/libreplan-business/src/main/java/org/libreplan/business/orders/daos/OrderSyncInfoDAO.java @@ -41,10 +41,10 @@ public class OrderSyncInfoDAO extends GenericDAOHibernate implements IOrderSyncInfoDAO { @Override - public OrderSyncInfo findLastSynchronizedInfoByOrderAndConnectorId( - Order order, String connectorId) { - List orderSyncInfoList = findLastSynchronizedInfosByOrderAndConnectorId( - order, connectorId); + public OrderSyncInfo findLastSynchronizedInfoByOrderAndConnectorName( + Order order, String connectorName) { + List orderSyncInfoList = findLastSynchronizedInfosByOrderAndConnectorName( + order, connectorName); if (orderSyncInfoList == null || orderSyncInfoList.isEmpty()) { return null; } @@ -53,28 +53,29 @@ public class OrderSyncInfoDAO extends GenericDAOHibernate @Override @SuppressWarnings("unchecked") - public List findLastSynchronizedInfosByOrderAndConnectorId( - Order order, String connectorId) { + public List findLastSynchronizedInfosByOrderAndConnectorName( + Order order, String connectorName) { Criteria criteria = getSession().createCriteria(OrderSyncInfo.class); criteria.add(Restrictions.eq("order", order)); - criteria.add(Restrictions.eq("connectorId", connectorId)); + criteria.add(Restrictions.eq("connectorName", connectorName)); criteria.addOrder(org.hibernate.criterion.Order.desc("lastSyncDate")); return criteria.list(); } @Override - public OrderSyncInfo findByKeyOrderAndConnectorId(String key, Order order, String connectorId) { + public OrderSyncInfo findByKeyOrderAndConnectorName(String key, + Order order, String connectorName) { Criteria criteria = getSession().createCriteria(OrderSyncInfo.class); criteria.add(Restrictions.eq("key", key)); criteria.add(Restrictions.eq("order", order)); - criteria.add(Restrictions.eq("connectorId", connectorId)); + criteria.add(Restrictions.eq("connectorName", connectorName)); return (OrderSyncInfo) criteria.uniqueResult(); } @Override - public List findByConnectorId(String connectorId) { + public List findByConnectorName(String connectorName) { Criteria criteria = getSession().createCriteria(OrderSyncInfo.class); - criteria.add(Restrictions.eq("connectorId", connectorId)); + criteria.add(Restrictions.eq("connectorName", connectorName)); return criteria.list(); } diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderSyncInfo.java b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderSyncInfo.java index f100274b1..c4efb7992 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderSyncInfo.java +++ b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderSyncInfo.java @@ -24,6 +24,7 @@ import java.util.Date; import org.apache.commons.lang.Validate; import org.hibernate.validator.NotNull; import org.libreplan.business.common.BaseEntity; +import org.libreplan.business.common.entities.Connector; /** * OrderSyncInfo entity. This entity holds order synchronization info. Each time @@ -35,7 +36,7 @@ import org.libreplan.business.common.BaseEntity; *
    *
  • lastSyncDate: last date where synchronization took place
  • *
  • key: an identifier, which connector's key is last synchronized
  • - *
  • connectorId: an identifier to distinguish which connector has running the + *
  • connectorName: the name of the {@link Connector} that has running the * synchronization
  • *
  • order: order that is synchronized
  • *
@@ -46,15 +47,15 @@ public class OrderSyncInfo extends BaseEntity { private Date lastSyncDate; private String key; - private String connectorId; + private String connectorName; private Order order; public static OrderSyncInfo create(String key, Order order, - String connectorId) { + String connectorName) { Validate.notEmpty(key); Validate.notNull(order); - Validate.notEmpty(connectorId); - return create(new OrderSyncInfo(key, order, connectorId)); + Validate.notEmpty(connectorName); + return create(new OrderSyncInfo(key, order, connectorName)); } /** @@ -63,11 +64,11 @@ public class OrderSyncInfo extends BaseEntity { protected OrderSyncInfo() { } - private OrderSyncInfo(String key, Order order, String connectorId) { + private OrderSyncInfo(String key, Order order, String connectorName) { this.lastSyncDate = new Date(); this.key = key; this.order = order; - this.connectorId = connectorId; + this.connectorName = connectorName; } @NotNull(message = "last synchronized date not specified") @@ -88,13 +89,13 @@ public class OrderSyncInfo extends BaseEntity { this.key = key; } - @NotNull(message = "connector id not specified") - public String getConnectorId() { - return connectorId; + @NotNull(message = "connector name not specified") + public String getConnectorName() { + return connectorName; } - public void setConnectorId(String connectorId) { - this.connectorId = connectorId; + public void setConnectorName(String connectorName) { + this.connectorName = connectorName; } public Order getOrder() { diff --git a/libreplan-business/src/main/resources/db.changelog-1.3.xml b/libreplan-business/src/main/resources/db.changelog-1.3.xml index d4ad46eb4..55f7ede49 100644 --- a/libreplan-business/src/main/resources/db.changelog-1.3.xml +++ b/libreplan-business/src/main/resources/db.changelog-1.3.xml @@ -224,7 +224,7 @@ - + diff --git a/libreplan-business/src/main/resources/org/libreplan/business/orders/entities/Orders.hbm.xml b/libreplan-business/src/main/resources/org/libreplan/business/orders/entities/Orders.hbm.xml index 58424ec82..fc2f5abf5 100644 --- a/libreplan-business/src/main/resources/org/libreplan/business/orders/entities/Orders.hbm.xml +++ b/libreplan-business/src/main/resources/org/libreplan/business/orders/entities/Orders.hbm.xml @@ -306,7 +306,7 @@ - + diff --git a/libreplan-webapp/src/main/java/org/libreplan/importers/ExportTimesheetsToTim.java b/libreplan-webapp/src/main/java/org/libreplan/importers/ExportTimesheetsToTim.java index 695c58092..8ad2a329d 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/importers/ExportTimesheetsToTim.java +++ b/libreplan-webapp/src/main/java/org/libreplan/importers/ExportTimesheetsToTim.java @@ -100,7 +100,7 @@ public class ExportTimesheetsToTim implements IExportTimesheetsToTim { List syncInfos = new ArrayList(); - List orderSyncInfos = orderSyncInfoDAO.findByConnectorId(PredefinedConnectors.TIM.getName()); + List orderSyncInfos = orderSyncInfoDAO.findByConnectorName(PredefinedConnectors.TIM.getName()); if (orderSyncInfos == null || orderSyncInfos.isEmpty()) { LOG.warn("No items found in 'OrderSyncInfo' to export to Tim"); synchronizationInfo.addFailedReason(_("No items found in 'OrderSyncInfo' to export to Tim")); @@ -257,7 +257,7 @@ public class ExportTimesheetsToTim implements IExportTimesheetsToTim { @Override public Void execute() { OrderSyncInfo orderSyncInfo = orderSyncInfoDAO - .findByKeyOrderAndConnectorId(productCode, + .findByKeyOrderAndConnectorName(productCode, order, PredefinedConnectors.TIM.getName()); if (orderSyncInfo == null) { @@ -321,7 +321,7 @@ public class ExportTimesheetsToTim implements IExportTimesheetsToTim { @Override @Transactional(readOnly = true) public OrderSyncInfo getOrderLastSyncInfo(Order order) { - return orderSyncInfoDAO.findLastSynchronizedInfoByOrderAndConnectorId( + return orderSyncInfoDAO.findLastSynchronizedInfoByOrderAndConnectorName( order, PredefinedConnectors.TIM.getName()); } diff --git a/libreplan-webapp/src/main/java/org/libreplan/importers/JiraOrderElementSynchronizer.java b/libreplan-webapp/src/main/java/org/libreplan/importers/JiraOrderElementSynchronizer.java index e1ad94ba8..354188e24 100755 --- a/libreplan-webapp/src/main/java/org/libreplan/importers/JiraOrderElementSynchronizer.java +++ b/libreplan-webapp/src/main/java/org/libreplan/importers/JiraOrderElementSynchronizer.java @@ -477,7 +477,7 @@ public class JiraOrderElementSynchronizer implements IJiraOrderElementSynchroniz @Override public Void execute() { OrderSyncInfo orderSyncInfo = orderSyncInfoDAO - .findByKeyOrderAndConnectorId(key, order, + .findByKeyOrderAndConnectorName(key, order, PredefinedConnectors.JIRA.getName()); if (orderSyncInfo == null) { orderSyncInfo = OrderSyncInfo.create(key, order, @@ -494,7 +494,7 @@ public class JiraOrderElementSynchronizer implements IJiraOrderElementSynchroniz @Override @Transactional(readOnly = true) public OrderSyncInfo getOrderLastSyncInfo(Order order) { - return orderSyncInfoDAO.findLastSynchronizedInfoByOrderAndConnectorId( + return orderSyncInfoDAO.findLastSynchronizedInfoByOrderAndConnectorName( order, PredefinedConnectors.JIRA.getName()); } @@ -512,7 +512,7 @@ public class JiraOrderElementSynchronizer implements IJiraOrderElementSynchroniz } List orderSyncInfos = orderSyncInfoDAO - .findByConnectorId(PredefinedConnectors.JIRA.getName()); + .findByConnectorName(PredefinedConnectors.JIRA.getName()); synchronizationInfo = new SynchronizationInfo(_("Synchronization")); diff --git a/libreplan-webapp/src/main/java/org/libreplan/importers/JiraTimesheetSynchronizer.java b/libreplan-webapp/src/main/java/org/libreplan/importers/JiraTimesheetSynchronizer.java index 991421353..fb3e68d6c 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/importers/JiraTimesheetSynchronizer.java +++ b/libreplan-webapp/src/main/java/org/libreplan/importers/JiraTimesheetSynchronizer.java @@ -117,7 +117,7 @@ public class JiraTimesheetSynchronizer implements IJiraTimesheetSynchronizer { } OrderSyncInfo orderSyncInfo = orderSyncInfoDAO - .findLastSynchronizedInfoByOrderAndConnectorId(order, + .findLastSynchronizedInfoByOrderAndConnectorName(order, PredefinedConnectors.JIRA.getName()); if (orderSyncInfo == null) { synchronizationInfo.addFailedReason(_(