diff --git a/libreplan-business/src/main/java/org/libreplan/business/common/daos/ConnectorDAO.java b/libreplan-business/src/main/java/org/libreplan/business/common/daos/ConnectorDAO.java index 90e055384..884b13879 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/common/daos/ConnectorDAO.java +++ b/libreplan-business/src/main/java/org/libreplan/business/common/daos/ConnectorDAO.java @@ -49,27 +49,27 @@ public class ConnectorDAO extends GenericDAOHibernate @Override @Transactional(readOnly = true) - public Connector findUniqueByMajorId(String majorId) { + public Connector findUniqueByName(String name) { Criteria c = getSession().createCriteria(Connector.class).add( - Restrictions.eq("majorId", majorId)); + Restrictions.eq("name", name)); return (Connector) c.uniqueResult(); } @Override @Transactional(readOnly = true, propagation = Propagation.REQUIRES_NEW) public boolean existsByNameAnotherTransaction(Connector connector) { - return existsOtherConnectorByMajorId(connector); + return existsOtherConnectorByName(connector); } - private boolean existsOtherConnectorByMajorId(Connector connector) { - Connector found = findUniqueByMajorId(connector.getMajorId()); + private boolean existsOtherConnectorByName(Connector connector) { + Connector found = findUniqueByName(connector.getName()); return found != null && found != connector; } @Override @Transactional(readOnly = true, propagation = Propagation.REQUIRES_NEW) - public Connector findUniqueByMajorIdAnotherTransaction(String majorId) { - return findUniqueByMajorId(majorId); + public Connector findUniqueByNameAnotherTransaction(String name) { + return findUniqueByName(name); } } diff --git a/libreplan-business/src/main/java/org/libreplan/business/common/daos/IConnectorDAO.java b/libreplan-business/src/main/java/org/libreplan/business/common/daos/IConnectorDAO.java index 5e818970c..82ab2119c 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/common/daos/IConnectorDAO.java +++ b/libreplan-business/src/main/java/org/libreplan/business/common/daos/IConnectorDAO.java @@ -33,10 +33,10 @@ public interface IConnectorDAO extends IGenericDAO { List getAll(); - Connector findUniqueByMajorId(String majorId); + Connector findUniqueByName(String name); boolean existsByNameAnotherTransaction(Connector connector); - Connector findUniqueByMajorIdAnotherTransaction(String majorId); + Connector findUniqueByNameAnotherTransaction(String name); } diff --git a/libreplan-business/src/main/java/org/libreplan/business/common/entities/Connector.java b/libreplan-business/src/main/java/org/libreplan/business/common/entities/Connector.java index b1aca7e85..d7a6aaf57 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/common/entities/Connector.java +++ b/libreplan-business/src/main/java/org/libreplan/business/common/entities/Connector.java @@ -37,9 +37,8 @@ import org.libreplan.business.common.daos.IConnectorDAO; * Connector entity, represents a connector in order that LibrePlan interchange * some data with other application. * - * A connector is identified by a string called majorId and it has - * a list of pairs key-value in order to store the configuration parameters of - * the connector. + * A connector is identified by a name and it has a list of pairs + * key-value in order to store the configuration parameters of the connector. * * This entity should be used to create new connectors in LibrePlan. * @@ -48,11 +47,11 @@ import org.libreplan.business.common.daos.IConnectorDAO; */ public class Connector extends BaseEntity { - public static Connector create(String majorId) { - return create(new Connector(majorId)); + public static Connector create(String name) { + return create(new Connector(name)); } - private String majorId; + private String name; private List properties = new ArrayList(); @@ -62,17 +61,17 @@ public class Connector extends BaseEntity { protected Connector() { } - private Connector(String majorId) { - this.majorId = majorId; + private Connector(String name) { + this.name = name; } - @NotEmpty(message = "major id not specified") - public String getMajorId() { - return majorId; + @NotEmpty(message = "name not specified") + public String getName() { + return name; } - public void setMajorId(String majorId) { - this.majorId = majorId; + public void setName(String name) { + this.name = name; } @Valid @@ -96,9 +95,9 @@ public class Connector extends BaseEntity { return map; } - @AssertTrue(message = "connector major id is already being used") - public boolean checkConstraintUniqueConnectorMajorId() { - if (StringUtils.isBlank(majorId)) { + @AssertTrue(message = "connector name is already being used") + public boolean checkConstraintUniqueConnectorName() { + if (StringUtils.isBlank(name)) { return true; } @@ -107,7 +106,7 @@ public class Connector extends BaseEntity { return !connectorDAO.existsByNameAnotherTransaction(this); } else { Connector found = connectorDAO - .findUniqueByMajorIdAnotherTransaction(majorId); + .findUniqueByNameAnotherTransaction(name); return found == null || found.getId().equals(getId()); } diff --git a/libreplan-business/src/main/java/org/libreplan/business/common/entities/ConnectorBootstrap.java b/libreplan-business/src/main/java/org/libreplan/business/common/entities/ConnectorBootstrap.java index 90a693d84..a47ff19be 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/common/entities/ConnectorBootstrap.java +++ b/libreplan-business/src/main/java/org/libreplan/business/common/entities/ConnectorBootstrap.java @@ -43,11 +43,11 @@ public class ConnectorBootstrap implements IConnectorBootstrap { public void loadRequiredData() { for (PredefinedConnectors predefinedConnector : PredefinedConnectors .values()) { - String majorId = predefinedConnector.getMajorId(); + String name = predefinedConnector.getName(); - Connector connector = connectorDAO.findUniqueByMajorId(majorId); + Connector connector = connectorDAO.findUniqueByName(name); if (connector == null) { - connector = Connector.create(majorId); + connector = Connector.create(name); connector.setProperties(predefinedConnector.getProperties()); connectorDAO.save(connector); } diff --git a/libreplan-business/src/main/java/org/libreplan/business/common/entities/PredefinedConnectors.java b/libreplan-business/src/main/java/org/libreplan/business/common/entities/PredefinedConnectors.java index a7a3cd6ea..caa1adfc3 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/common/entities/PredefinedConnectors.java +++ b/libreplan-business/src/main/java/org/libreplan/business/common/entities/PredefinedConnectors.java @@ -42,17 +42,17 @@ public enum PredefinedConnectors { ConnectorProperty.create(PredefinedConnectorProperties.TIM_DEPARTAMENTS_IMPORT_ROSTER, "0") ); - private String majorId; + private String name; private List properties; - private PredefinedConnectors(String majorId, + private PredefinedConnectors(String name, ConnectorProperty... properties) { - this.majorId = majorId; + this.name = name; this.properties = Arrays.asList(properties); } - public String getMajorId() { - return majorId; + public String getName() { + return name; } public List getProperties() { 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 24677cb41..8f5f7c66c 100644 --- a/libreplan-business/src/main/resources/db.changelog-1.3.xml +++ b/libreplan-business/src/main/resources/db.changelog-1.3.xml @@ -345,7 +345,7 @@ - + diff --git a/libreplan-business/src/main/resources/org/libreplan/business/common/entities/Connector.hbm.xml b/libreplan-business/src/main/resources/org/libreplan/business/common/entities/Connector.hbm.xml index fd9f70543..f85f60867 100644 --- a/libreplan-business/src/main/resources/org/libreplan/business/common/entities/Connector.hbm.xml +++ b/libreplan-business/src/main/resources/org/libreplan/business/common/entities/Connector.hbm.xml @@ -12,7 +12,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 1eda4acba..ff236c4be 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/importers/ExportTimesheetsToTim.java +++ b/libreplan-webapp/src/main/java/org/libreplan/importers/ExportTimesheetsToTim.java @@ -94,8 +94,8 @@ public class ExportTimesheetsToTim implements IExportTimesheetsToTim { @Override @Transactional(readOnly = true) public void exportTimesheets() { - String majorId = PredefinedConnectors.TIM.getMajorId(); - Connector connector = connectorDAO.findUniqueByMajorId(majorId); + String name = PredefinedConnectors.TIM.getName(); + Connector connector = connectorDAO.findUniqueByName(name); if (connector == null) { return; } @@ -104,7 +104,7 @@ public class ExportTimesheetsToTim implements IExportTimesheetsToTim { for (Order order : orders) { OrderSyncInfo orderSyncInfo = orderSyncInfoDAO .findLastSynchronizedInfoByOrderAndConnectorId(order, - majorId); + name); if (orderSyncInfo == null) { LOG.warn("Order '" + order.getName() + "' is not yet synchronized"); @@ -126,7 +126,7 @@ public class ExportTimesheetsToTim implements IExportTimesheetsToTim { throw new RuntimeException("Order should not be empty"); } Connector connector = connectorDAO - .findUniqueByMajorId(PredefinedConnectors.TIM.getMajorId()); + .findUniqueByName(PredefinedConnectors.TIM.getName()); if (connector == null) { throw new RuntimeException("Tim connector not found"); } @@ -229,7 +229,7 @@ public class ExportTimesheetsToTim implements IExportTimesheetsToTim { @Override public Void execute() { OrderSyncInfo orderSyncInfo = OrderSyncInfo.create( - order, PredefinedConnectors.TIM.getMajorId()); + order, PredefinedConnectors.TIM.getName()); orderSyncInfo.setKey(productCode); orderSyncInfoDAO.save(orderSyncInfo); return null; @@ -286,7 +286,7 @@ public class ExportTimesheetsToTim implements IExportTimesheetsToTim { @Transactional(readOnly = true) public OrderSyncInfo getOrderLastSyncInfo(Order order) { return orderSyncInfoDAO.findLastSynchronizedInfoByOrderAndConnectorId( - order, PredefinedConnectors.TIM.getMajorId()); + order, PredefinedConnectors.TIM.getName()); } } diff --git a/libreplan-webapp/src/main/java/org/libreplan/importers/ImportRosterFromTim.java b/libreplan-webapp/src/main/java/org/libreplan/importers/ImportRosterFromTim.java index f294bef6a..10b5556ef 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/importers/ImportRosterFromTim.java +++ b/libreplan-webapp/src/main/java/org/libreplan/importers/ImportRosterFromTim.java @@ -126,8 +126,8 @@ public class ImportRosterFromTim implements IImportRosterFromTim { @Transactional public void importRosters() { Connector connector = connectorDAO - .findUniqueByMajorId( - PredefinedConnectors.TIM.getMajorId()); + .findUniqueByName( + PredefinedConnectors.TIM.getName()); if (connector == null) { return; } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java index 6dd6f3118..7c4ca0c52 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java @@ -335,8 +335,8 @@ public class ConfigurationController extends GenericForwardComposer { String password = properties .get(PredefinedConnectorProperties.PASSWORD); - if (selectedConnector.getMajorId().equals( - PredefinedConnectors.TIM.getMajorId())) { + if (selectedConnector.getName().equals( + PredefinedConnectors.TIM.getName())) { testTimConnection(url, username, password); } else { throw new RuntimeException("Unknown connector"); @@ -407,8 +407,8 @@ public class ConfigurationController extends GenericForwardComposer { private void reloadConnectors() { selectedConnector = configurationModel - .getConnectorByMajorId(selectedConnector != null ? selectedConnector - .getMajorId() : null); + .getConnectorByName(selectedConnector != null ? selectedConnector + .getName() : null); Util.reloadBindings(connectorCombo); Util.reloadBindings(connectorPropertriesGrid); } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java index 0152ef561..a89ba5b11 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java @@ -735,13 +735,13 @@ public class ConfigurationModel implements IConfigurationModel { } @Override - public Connector getConnectorByMajorId(String majorId) { - if (majorId == null || connectors == null) { + public Connector getConnectorByName(String name) { + if (name == null || connectors == null) { return null; } for (Connector connector : connectors) { - if (connector.getMajorId().equals(majorId)) { + if (connector.getName().equals(name)) { return connector; } } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/IConfigurationModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/IConfigurationModel.java index 639f27fa4..1ce2889f8 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/common/IConfigurationModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/IConfigurationModel.java @@ -197,6 +197,6 @@ public interface IConfigurationModel { List getConnectors(); - Connector getConnectorByMajorId(String majorId); + Connector getConnectorByName(String name); } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/TimSynchronizationController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/TimSynchronizationController.java index 9458ca87d..c632a0c04 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/TimSynchronizationController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/TimSynchronizationController.java @@ -104,7 +104,7 @@ public class TimSynchronizationController extends GenericForwardComposer { public boolean isTimActivated() { Connector connector = connectorDAO - .findUniqueByMajorId(PredefinedConnectors.TIM.getMajorId()); + .findUniqueByName(PredefinedConnectors.TIM.getName()); if (connector == null) { return false; } diff --git a/libreplan-webapp/src/main/webapp/common/configuration.zul b/libreplan-webapp/src/main/webapp/common/configuration.zul index 6410b2d4a..dbcac2674 100644 --- a/libreplan-webapp/src/main/webapp/common/configuration.zul +++ b/libreplan-webapp/src/main/webapp/common/configuration.zul @@ -466,7 +466,7 @@ selectedItem="@{configurationController.selectedConnector}">