Remove @Component annotations in Procedure Types loaders and related classes

Author: wikumChamith

api-2.7/src/test/java/org/openmrs/module/initializer/api/billing/CashierItemPriceLineProcessorTest.java

@@ -30,29 +30,29 @@
 import org.openmrs.module.stockmanagement.api.model.StockItem;
 
 public class CashierItemPriceLineProcessorTest {
-
+	
 	private static final String PAYMENT_MODE_UUID = "pm-0000-0000-0000-000000000001";
-
+	
 	private static final String STOCK_ITEM_UUID = "si-0000-0000-0000-000000000001";
-
+	
 	private static final String BILLABLE_SERVICE_UUID = "bs-0000-0000-0000-000000000001";
-
+	
 	private static final String[] HEADERS = new String[] { "Uuid", "name", "price", "payment mode", "stock item",
 	        "billable service" };
-
+	
 	@Mock
 	private PaymentModeService paymentModeService;
-
+	
 	@Mock
 	private StockManagementService stockManagementService;
-
+	
 	@Mock
 	private BillableServiceService billableServiceService;
-
+	
 	private CashierItemPriceLineProcessor processor;
-
+	
 	private PaymentMode paymentMode;
-
+	
 	@Before
 	public void setUp() {
 		MockitoAnnotations.initMocks(this);
@@ -61,76 +61,76 @@ public void setUp() {
 		paymentMode.setUuid(PAYMENT_MODE_UUID);
 		when(paymentModeService.getPaymentModeByUuid(PAYMENT_MODE_UUID)).thenReturn(paymentMode);
 	}
-
+	
 	@Test
 	public void fill_shouldClearBillableServiceWhenSwitchingToStockItem() {
 		CashierItemPrice instance = new CashierItemPrice();
 		BillableService existing = new BillableService();
 		existing.setUuid(BILLABLE_SERVICE_UUID);
 		instance.setBillableService(existing);
-
+		
 		StockItem stockItem = new StockItem();
 		stockItem.setUuid(STOCK_ITEM_UUID);
 		when(stockManagementService.getStockItemByUuid(STOCK_ITEM_UUID)).thenReturn(stockItem);
-
+		
 		CsvLine line = new CsvLine(HEADERS,
 		        new String[] { "", "Switched Price", "100.00", PAYMENT_MODE_UUID, STOCK_ITEM_UUID, "" });
-
+		
 		processor.fill(instance, line);
-
+		
 		assertSame(stockItem, instance.getItem());
 		assertNull(instance.getBillableService());
 	}
-
+	
 	@Test
 	public void fill_shouldClearItemWhenSwitchingToBillableService() {
 		CashierItemPrice instance = new CashierItemPrice();
 		StockItem existing = new StockItem();
 		existing.setUuid(STOCK_ITEM_UUID);
 		instance.setItem(existing);
-
+		
 		BillableService billableService = new BillableService();
 		billableService.setUuid(BILLABLE_SERVICE_UUID);
 		when(billableServiceService.getBillableServiceByUuid(BILLABLE_SERVICE_UUID)).thenReturn(billableService);
-
+		
 		CsvLine line = new CsvLine(HEADERS,
 		        new String[] { "", "Switched Price", "100.00", PAYMENT_MODE_UUID, "", BILLABLE_SERVICE_UUID });
-
+		
 		processor.fill(instance, line);
-
+		
 		assertSame(billableService, instance.getBillableService());
 		assertNull(instance.getItem());
 	}
-
+	
 	@Test
 	public void fill_shouldSetBasicFields() {
 		CashierItemPrice instance = new CashierItemPrice();
 		BillableService billableService = new BillableService();
 		billableService.setUuid(BILLABLE_SERVICE_UUID);
 		when(billableServiceService.getBillableServiceByUuid(BILLABLE_SERVICE_UUID)).thenReturn(billableService);
-
+		
 		CsvLine line = new CsvLine(HEADERS,
 		        new String[] { "", "ANC Service Price", "150.00", PAYMENT_MODE_UUID, "", BILLABLE_SERVICE_UUID });
-
+		
 		processor.fill(instance, line);
-
+		
 		assertEquals("ANC Service Price", instance.getName());
 		assertEquals(new BigDecimal("150.00"), instance.getPrice());
 		assertSame(paymentMode, instance.getPaymentMode());
 	}
-
+	
 	@Test(expected = IllegalArgumentException.class)
 	public void fill_shouldRejectWhenBothAssociationsSet() {
 		CashierItemPrice instance = new CashierItemPrice();
-		CsvLine line = new CsvLine(HEADERS, new String[] { "", "Price", "100.00", PAYMENT_MODE_UUID, STOCK_ITEM_UUID,
-		        BILLABLE_SERVICE_UUID });
+		CsvLine line = new CsvLine(HEADERS,
+		        new String[] { "", "Price", "100.00", PAYMENT_MODE_UUID, STOCK_ITEM_UUID, BILLABLE_SERVICE_UUID });
 		processor.fill(instance, line);
 	}
-
+	
 	@Test(expected = IllegalArgumentException.class)
 	public void fill_shouldRejectWhenNeitherAssociationSet() {
 		CashierItemPrice instance = new CashierItemPrice();
 		CsvLine line = new CsvLine(HEADERS, new String[] { "", "Price", "100.00", PAYMENT_MODE_UUID, "", "" });
 		processor.fill(instance, line);
 	}
-}
+}

api-2.8/src/main/java/org/openmrs/module/initializer/api/procedure/ProcedureTypeLineProcessor.java

@@ -8,7 +8,6 @@
 import org.springframework.stereotype.Component;
 
 @OpenmrsProfile(modules = { "emrapi:3.4.* - 9.*" })
-@Component
 public class ProcedureTypeLineProcessor extends BaseLineProcessor<ProcedureType> {
 
 	@Override

api-2.8/src/main/java/org/openmrs/module/initializer/api/procedure/ProcedureTypesCsvParser.java

@@ -16,7 +16,6 @@
 import org.springframework.stereotype.Component;
 
 @OpenmrsProfile(modules = { "emrapi:3.4.* - 9.*" })
-@Component
 public class ProcedureTypesCsvParser extends CsvParser<ProcedureType, BaseLineProcessor<ProcedureType>> {
 
 	private final ProcedureService procedureService;

api-2.8/src/main/java/org/openmrs/module/initializer/api/procedure/ProcedureTypesLoader.java

@@ -7,7 +7,6 @@
 import org.springframework.stereotype.Component;
 
 @OpenmrsProfile(modules = { "emrapi:3.4.* - 9.*" })
-@Component
 public class ProcedureTypesLoader extends BaseCsvLoader<ProcedureType, ProcedureTypesCsvParser> {
 
 	@Autowired