Renamed OrderContext.addAttribute to setAttribute and added some debu…

…gging lines when getting the order number generator - TRUNK-4270
openmrs · Mar 12, 2014 · b738e2f · b738e2f
1 parent 5ad6a65
commit b738e2f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 11 deletions.
diff --git a/api/src/main/java/org/openmrs/api/OrderContext.java b/api/src/main/java/org/openmrs/api/OrderContext.java
@@ -95,7 +95,7 @@ public Object getAttribute(String attributeName) {
 	 * @param attributeName the attribute name
 	 * @param attributeValue the attribute value
 	 */
-	public void addAttribute(String attributeName, Object attributeValue) {
+	public void setAttribute(String attributeName, Object attributeValue) {
 		getContextAttributes().put(attributeName, attributeValue);
 	}
 

diff --git a/api/src/main/java/org/openmrs/api/db/hibernate/HibernateOrderDAO.java b/api/src/main/java/org/openmrs/api/db/hibernate/HibernateOrderDAO.java
@@ -177,23 +177,20 @@ public Long getNextOrderNumberSeedSequenceValue() {
 		    OpenmrsConstants.GP_NEXT_ORDER_NUMBER_SEED, LockOptions.UPGRADE);
 
 		if (globalProperty == null) {
-			throw new APIException("Missing global property named: "
-			        + OpenmrsConstants.GP_NEXT_ORDER_NUMBER_SEED);
+			throw new APIException("Missing global property named: " + OpenmrsConstants.GP_NEXT_ORDER_NUMBER_SEED);
 		}
 
 		String gpTextValue = globalProperty.getPropertyValue();
 		if (StringUtils.isBlank(gpTextValue)) {
-			throw new APIException("Invalid value for global property named: "
-			        + OpenmrsConstants.GP_NEXT_ORDER_NUMBER_SEED);
+			throw new APIException("Invalid value for global property named: " + OpenmrsConstants.GP_NEXT_ORDER_NUMBER_SEED);
 		}
 
 		Long gpNumericValue = null;
 		try {
 			gpNumericValue = Long.parseLong(gpTextValue);
 		}
 		catch (NumberFormatException ex) {
-			throw new APIException("Invalid value for global property named: "
-			        + OpenmrsConstants.GP_NEXT_ORDER_NUMBER_SEED);
+			throw new APIException("Invalid value for global property named: " + OpenmrsConstants.GP_NEXT_ORDER_NUMBER_SEED);
 		}
 
 		globalProperty.setPropertyValue(String.valueOf(gpNumericValue + 1));

diff --git a/api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java b/api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java
@@ -14,7 +14,6 @@
 package org.openmrs.api.impl;
 
 import java.lang.reflect.Field;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -126,8 +125,10 @@ private OrderNumberGenerator getOrderNumberGenerator() {
 			    OpenmrsConstants.GP_ORDER_NUMBER_GENERATOR_BEAN_ID);
 			if (StringUtils.hasText(generatorBeanId)) {
 				orderNumberGenerator = Context.getRegisteredComponent(generatorBeanId, OrderNumberGenerator.class);
+				log.info("Successfully set the configured order number generator");
 			} else {
 				orderNumberGenerator = this;
+				log.info("Setting default order number generator");
 			}
 		}
 

diff --git a/api/src/main/java/org/openmrs/util/OpenmrsConstants.java b/api/src/main/java/org/openmrs/util/OpenmrsConstants.java
@@ -1442,8 +1442,7 @@ public static final List<GlobalProperty> CORE_GLOBAL_PROPERTIES() {
 		props.add(new GlobalProperty(GLOBAL_PROPERTY_USER_REQUIRE_EMAIL_AS_USERNAME, "false",
 		        "Indicates whether a username must be a valid e-mail or not.", BooleanDatatype.class, null));
 
-		props.add(new GlobalProperty(GP_NEXT_ORDER_NUMBER_SEED, "1",
-		        "The next order number available for assignment"));
+		props.add(new GlobalProperty(GP_NEXT_ORDER_NUMBER_SEED, "1", "The next order number available for assignment"));
 
 		props.add(new GlobalProperty(GP_ORDER_NUMBER_GENERATOR_BEAN_ID, "",
 		        "Specifies spring bean id of the order generator to use when assigning order numbers"));

diff --git a/api/src/test/java/org/openmrs/api/OrderServiceTest.java b/api/src/test/java/org/openmrs/api/OrderServiceTest.java
@@ -1181,7 +1181,7 @@ public void saveOrder_shouldSetOrderNumberSpecifiedInTheContextIfSpecified() thr
 		order.setStartDate(new Date());
 		OrderContext orderCtxt = new OrderContext();
 		final String expectedOrderNumber = "Testing";
-		orderCtxt.addAttribute(TimestampOrderNumberGenerator.NEXT_ORDER_NUMBER, expectedOrderNumber);
+		orderCtxt.setAttribute(TimestampOrderNumberGenerator.NEXT_ORDER_NUMBER, expectedOrderNumber);
 		order = orderService.saveOrder(order, orderCtxt);
 		assertEquals(expectedOrderNumber, order.getOrderNumber());
 	}