unused ExternalService class removed

service/src/main/java/lcsb/mapviewer/services/interfaces/IExternalServicesService.java

-package lcsb.mapviewer.services.interfaces;
-
-import java.util.List;
-
-import lcsb.mapviewer.annotation.services.ExternalServiceStatus;
-import lcsb.mapviewer.annotation.services.IExternalService;
-
-/**
- * Service that retrieves information about services that access external
- * resources (like chebi, chembl, etc.).
- * 
- * @author Piotr Gawron
- * 
- */
-public interface IExternalServicesService {
-
-	/**
-	 * Returns status information about all services.
-	 * 
-	 * @return status information about all services
-	 */
-	List<ExternalServiceStatus> getExternalServiceStatuses();
-
-	/**
-	 * Registers service that access external resource.
-	 * 
-	 * @param service
-	 *          service that access external resource
-	 */
-	void registerService(IExternalService service);
-
-	/**
-	 * Registers default list of services.
-	 */
-	void registerDefaultServices();
-
-	/**
-	 * Clears list of known services.
-	 */
-	void clearServices();
-
-}

service/src/test/java/lcsb/mapviewer/services/ServiceTestFunctions.java

@@ -69,7 +69,6 @@ import lcsb.mapviewer.persist.dao.user.PrivilegeDao;
 import lcsb.mapviewer.persist.dao.user.UserDao;
 import lcsb.mapviewer.services.interfaces.ICommentService;
 import lcsb.mapviewer.services.interfaces.IConfigurationService;
-import lcsb.mapviewer.services.interfaces.IExternalServicesService;
 import lcsb.mapviewer.services.interfaces.ILayoutService;
 import lcsb.mapviewer.services.interfaces.IModelService;
 import lcsb.mapviewer.services.interfaces.IProjectService;
@@ -85,9 +84,6 @@ import lcsb.mapviewer.services.search.drug.IDrugService;
 public abstract class ServiceTestFunctions {
   private Logger logger = LogManager.getLogger(ServiceTestFunctions.class);
 
-  @Autowired
-  protected ChEMBLParser chemblParser;
-
   @Autowired
   protected DrugbankHTMLParser drugBankHTMLParser;
 
@@ -102,9 +98,6 @@ public abstract class ServiceTestFunctions {
   @Autowired
   protected IModelService modelService;
 
-  @Autowired
-  protected IExternalServicesService externalServicesService;
-
   @Autowired
   protected ILayoutService layoutService;
 

service/src/test/java/lcsb/mapviewer/services/impl/AllImplServiceTests.java

@@ -7,7 +7,6 @@ import org.junit.runners.Suite.SuiteClasses;
 @RunWith(Suite.class)
 @SuiteClasses({ CommentServiceTest.class,
     ConfigurationServiceTest.class,
-    ExternalServicesServiceTest.class,
     LayoutServiceTest.class,
     LdapServiceTest.class,
     Md5PasswordEncoderTest.class,

service/src/test/java/lcsb/mapviewer/services/impl/ExternalServicesServiceTest.java

-package lcsb.mapviewer.services.impl;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.List;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import lcsb.mapviewer.annotation.services.ExternalServiceStatus;
-import lcsb.mapviewer.annotation.services.ExternalServiceStatusType;
-import lcsb.mapviewer.services.ServiceTestFunctions;
-
-public class ExternalServicesServiceTest extends ServiceTestFunctions {
-
-	@Before
-	public void setUp() throws Exception {
-	}
-
-	@After
-	public void tearDown() throws Exception {
-	}
-
-	@Test(timeout = 60000)
-	@Ignore("Bug 451")
-	public void testDefaultServices() throws Exception {
-		try {
-			externalServicesService.clearServices();
-			externalServicesService.registerDefaultServices();
-			List<ExternalServiceStatus> statuses = externalServicesService.getExternalServiceStatuses();
-			assertNotNull(statuses);
-			assertTrue(statuses.size() > 0);
-
-			for (ExternalServiceStatus externalServiceStatus : statuses) {
-				assertEquals(externalServiceStatus.getName() + " is down", ExternalServiceStatusType.OK, externalServiceStatus.getStatus());
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-			throw e;
-		}
-	}
-
-	@Test
-	public void testRegister() throws Exception {
-		try {
-			externalServicesService.clearServices();
-			externalServicesService.registerService(new OkServiceMock());
-			externalServicesService.registerService(new FailServiceMock());
-
-			List<ExternalServiceStatus> statuses = externalServicesService.getExternalServiceStatuses();
-			assertNotNull(statuses);
-			assertEquals(2, statuses.size());
-
-			assertEquals(ExternalServiceStatusType.OK, statuses.get(0).getStatus());
-			assertEquals(ExternalServiceStatusType.DOWN, statuses.get(1).getStatus());
-
-		} catch (Exception e) {
-			e.printStackTrace();
-			throw e;
-		}
-	}
-
-}