TRUNK-4988: Fix code formatting violations using spotless:apply

Author: shivvani-r

api/src/main/java/org/openmrs/api/context/Context.java

@@ -64,7 +64,6 @@
 import org.openmrs.module.ModuleMustStartException;
 import org.openmrs.module.ModuleUtil;
 import org.openmrs.notification.AlertService;
-import org.openmrs.notification.MessageException;
 import org.openmrs.notification.MessagePreparator;
 import org.openmrs.notification.MessageSender;
 import org.openmrs.notification.MessageService;
@@ -570,19 +569,21 @@ public static MessageService getMessageService() {
 				List<MessagePreparator> preparators = getRegisteredComponents(MessagePreparator.class);
 				if (preparators != null && !preparators.isEmpty()) {
 					if (preparators.size() > 1) {
-						log.warn("Multiple MessagePreparators found. Using the first one: {}", preparators.get(0).getClass().getName());
+						log.warn("Multiple MessagePreparators found. Using the first one: {}",
+						    preparators.get(0).getClass().getName());
 					}
 					ms.setMessagePreparator(preparators.get(0));
 				} else {
 					ms.setMessagePreparator(new VelocityMessagePreparator());
 				}
 			}
-			
+
 			if (ms.getMessageSender() == null) {
 				List<MessageSender> senders = getRegisteredComponents(MessageSender.class);
 				if (senders != null && !senders.isEmpty()) {
 					if (senders.size() > 1) {
-						log.warn("Multiple MessageSenders found. Using the first one: {}", senders.get(0).getClass().getName());
+						log.warn("Multiple MessageSenders found. Using the first one: {}",
+						    senders.get(0).getClass().getName());
 					}
 					ms.setMessageSender(senders.get(0));
 				} else {
@@ -657,7 +658,7 @@ public PasswordAuthentication getPasswordAuthentication() {
 		}
 		return mailSession;
 	}
-	
+
 	/**
 	 * @return "active" user who has been authenticated, otherwise <code>null</code>
 	 */

api/src/test/java/org/openmrs/api/context/ContextTest.java

@@ -451,53 +451,65 @@ public void removeProxyPrivilege_shouldHandleNullArrayGracefully() {
 			authenticate();
 		}
 	}
-	
+
 	/**
 	 * Dummy implementations used strictly for testing dynamic Spring bean loading.
 	 */
 	class DummyTestMessageSender implements MessageSender {
+
 		@Override
 		public void send(Message message) throws MessageException {
 			// No operation required for the test
 		}
 	}
-	
+
 	class DummyTestMessagePreparator implements MessagePreparator {
+
 		@Override
 		public Message prepare(Template template) throws MessageException {
 			// No operation required for the test, returning null is perfectly fine
 			// because the test only checks if the object is loaded, not if it runs.
 			return null;
 		}
 	}
-	
+
 	/**
 	 * @see Context#getMessageService()
 	 */
 	@Test
 	public void getMessageService_shouldDynamicallyLoadMessageSenderAndPreparatorFromSpringContext() {
-		
+
 		MessageService service = Context.getMessageService();
 		service.setMessageSender(null);
 		service.setMessagePreparator(null);
-		
-		ConfigurableApplicationContext appContext =
-			(ConfigurableApplicationContext) Context.getServiceContext().getApplicationContext();
-		
-		DefaultListableBeanFactory beanFactory =
-			(DefaultListableBeanFactory) appContext.getBeanFactory();
-		
+
+		ConfigurableApplicationContext appContext = (ConfigurableApplicationContext) Context.getServiceContext()
+		        .getApplicationContext();
+
+		DefaultListableBeanFactory beanFactory = (DefaultListableBeanFactory) appContext.getBeanFactory();
+
 		DummyTestMessageSender dummySender = new DummyTestMessageSender();
 		DummyTestMessagePreparator dummyPreparator = new DummyTestMessagePreparator();
-		
-		beanFactory.registerSingleton("dummyTestMessageSender", dummySender);
-		beanFactory.registerSingleton("dummyTestMessagePreparator", dummyPreparator);
-		
-		MessageService reinitializedService = Context.getMessageService();
-		MessagePreparator activePreparator = reinitializedService.getMessagePreparator();
-		
-		MessageSender activeSender = reinitializedService.getMessageSender();
-		assertEquals(dummySender, activeSender, "The MessageService should use the dynamically registered DummyTestMessageSender");
-		assertEquals(dummyPreparator, activePreparator, "The MessageService should use the dynamically registered DummyTestMessagePreparator");
+
+		try {
+			beanFactory.registerSingleton("dummyTestMessageSender", dummySender);
+			beanFactory.registerSingleton("dummyTestMessagePreparator", dummyPreparator);
+
+			MessageService reinitializedService = Context.getMessageService();
+			MessagePreparator activePreparator = reinitializedService.getMessagePreparator();
+
+			MessageSender activeSender = reinitializedService.getMessageSender();
+			assertEquals(dummySender, activeSender,
+			    "The MessageService should use the dynamically registered DummyTestMessageSender");
+			assertEquals(dummyPreparator, activePreparator,
+			    "The MessageService should use the dynamically registered DummyTestMessagePreparator");
+
+		} finally {
+			beanFactory.destroySingleton("dummyTestMessageSender");
+			beanFactory.destroySingleton("dummyTestMessagePreparator");
+
+			Context.getMessageService().setMessageSender(null);
+			Context.getMessageService().setMessagePreparator(null);
+		}
 	}
 }