Implement getServices()

Nathanael Jourdane
1 parent 1240d52f
Showing 5 changed files with 36 additions and 30 deletions Show diff stats
src/main/java/eu/omp/irap/vespa/epntapclient/EpnTapFacade.java
src/main/java/eu/omp/irap/vespa/epntapclient/EpnTapInterface.java
src/main/java/eu/omp/irap/vespa/epntapclient/granule/GranuleCtrl.java
src/main/java/eu/omp/irap/vespa/epntapclient/service/Queries.java
src/test/java/eu/omp/irap/vespa/epntapclient/TestEpnTapFacade.java
@@ -17,6 +17,7 @@
 package eu.omp.irap.vespa.epntapclient;
 import java.text.ParseException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
@@ -83,7 +84,7 @@ public class EpnTapFacade implements EpnTapInterface {
 	@Override
 	public VOTABLE getEPNService(String ivoid, List<String> attributes)
 			throws CantGetVOTableException {
-		// TODO: 2 requêtes pour obtenir tableName et URL = pas super opti.
+		// TODO: optimiser le nombre de requêtes
 		String tableName = getEPNCoreTableName(ivoid);
 		String query = String.format(Queries.SELECT_FROM, StringJoiner.join(attributes), tableName);
 		VOTableController ctrl = new VOTableController(getTAPURL(ivoid), query);
@@ -94,25 +95,35 @@ public class EpnTapFacade implements EpnTapInterface {
 	// *** Services ***
 	@Override
-	public VOTABLE getEPNServices() throws CantGetVOTableException {
-		// TODO: CantDisplayVOTableException -> Pas le bon nom d'erreur, le pb n'est pas l'affichage
-		String query = String.format(Queries.GET_TAP_SERVICES_WHERE_CORE, ServiceCore.EPNCORE);
-		VOTableController ctrl = new VOTableController(Consts.DEFAULT_REGISTRY_URL, query);
-		ctrl.readTable();
-		return ctrl.getVOTable();
+	public List<VOTABLE> getEPNServices() throws VOResourceException {
+		List<VOTABLE> voTables = new ArrayList<>();
+		List<String> ivoids = VOResourceCtrl.getIvoidResources(ServiceCore.EPNCORE);
+		// TODO: optimiser le nombre de requêtes
+		for (String ivoid : ivoids) {
+			try {
+				String query = String.format(Queries.SELECT_ALL, getEPNCoreTableName(ivoid));
+				VOTableController ctrl = new VOTableController(getTAPURL(ivoid), query);
+				ctrl.readTable();
+				voTables.add(ctrl.getVOTable());
+			} catch (CantGetVOTableException e) {
+				logger.info("Can not get the service " + ivoid + ", skipping...");
+			}
+		}
+		return voTables;
 	}
 	@Override
-	public VOTABLE getEPNServices(List<String> attributes) throws CantGetVOTableException {
+	public List<VOTABLE> getEPNServices(List<String> attributes)
+			throws CantGetVOTableException, VOResourceException {
 		// TODO process attributes
-		return getEPNServices();
+		return null;
 	}
 	@Override
-	public VOTABLE getEPNServices(Map<String, String> keywords, List<String> attributes)
-			throws CantGetVOTableException {
+	public List<VOTABLE> getEPNServices(Map<String, String> keywords, List<String> attributes)
+			throws CantGetVOTableException, VOResourceException {
 		// TODO process attributes and keywords
-		return getEPNServices();
+		return null;
 	}
 	// *** Getters ***
@@ -78,7 +78,7 @@ public interface EpnTapInterface {
 	 * @throws CantGetXMLException
 	 * @throws CantDisplayVOTableException
 	 */
-	public VOTABLE getEPNServices() throws CantGetVOTableException;
+	public List<VOTABLE> getEPNServices() throws CantGetVOTableException, VOResourceException;
 	/**
 	 * returns a VOTable containing the list of EPN-TAP services and their attributes (from the list
@@ -87,7 +87,8 @@ public interface EpnTapInterface {
 	 * @throws CantGetXMLException
 	 * @throws CantDisplayVOTableException
 	 */
-	public VOTABLE getEPNServices(List<String> attributes) throws CantGetVOTableException;
+	public List<VOTABLE> getEPNServices(List<String> attributes)
+			throws CantGetVOTableException, VOResourceException;
 	/**
 	 * returns a VOTable containing the list of EPN-TAP services corresponding to the keywords and
@@ -96,8 +97,8 @@ public interface EpnTapInterface {
 	 * @throws CantGetXMLException
 	 * @throws CantDisplayVOTableException
 	 */
-	public VOTABLE getEPNServices(Map<String, String> keywords, List<String> attributes)
-			throws CantGetVOTableException;
+	public List<VOTABLE> getEPNServices(Map<String, String> keywords, List<String> attributes)
+			throws CantGetVOTableException, VOResourceException;
 	// *** Getters ***
@@ -111,7 +111,6 @@ public class GranuleCtrl {
 		//@format
 		if (!g.isValid()) {
-			System.out.println(data.getCell(rowId, "polar_radius"));
 			throw new IllegalArgumentException("One or more EPN parameter is null.");
 		}
 		return g;
@@ -70,6 +70,9 @@ public final class Queries {
 	public static final String SELECT_FROM =
 			"SELECT %s FROM %s";
+	public static final String SELECT_ALL =
+			"SELECT * FROM %s";
+
 	//@format
 	/** Constructor to hide the implicit public one. */
@@ -23,7 +23,6 @@ import java.util.Map;
 import java.util.logging.Logger;
 import eu.omp.irap.vespa.epntapclient.granule.Granule;
-import eu.omp.irap.vespa.epntapclient.service.ServiceCore;
 import eu.omp.irap.vespa.epntapclient.voresource.VOResourceCtrl;
 import eu.omp.irap.vespa.epntapclient.voresource.VOResourceException;
 import eu.omp.irap.vespa.epntapclient.voresource.model.Resource;
@@ -65,8 +64,6 @@ public class TestEpnTapFacade {
 		String strKeywords = "[shortName=IKS]";
 		try {
-			facade.getEPNServices();
-
 			System.out.println("\n*** 1. Resource ***\n");
 			Resource resource = VOResourceCtrl.getVOresource(TEST_RESOURCE_IVOID);
@@ -75,10 +72,6 @@ public class TestEpnTapFacade {
 			System.out.println("\n*** 2. Resources ***\n");
-			List<String> ivoids = VOResourceCtrl.getIvoidResources(ServiceCore.EPNCORE);
-			System.out.println("2.0 getIvoidResources(ServiceCore.EPNCORE)\n\t" +
-					StringJoiner.join(ivoids));
-
 			List<Resource> resources = facade.getEPNVOResources();
 			System.out.println("2.1 getEPNVOResources()\n\t"
 					+ Debug.toJson(resources));
@@ -100,16 +93,15 @@ public class TestEpnTapFacade {
 			System.out.println("\n*** 4. Services ***\n");
-			VOTABLE epnServices = facade.getEPNServices();
+			List<VOTABLE> epnServices = facade.getEPNServices();
 			System.out.println("4.1 getEPNServices()\n\t"
 					+ Debug.toJson(epnServices));
-			VOTABLE epnServices2 = facade.getEPNServices(SERVICE_ATTRIBUTES);
-			System.out.println(
-					"4.2 getEPNServices(" + strServiceAttributes + ")\n\t"
-							+ Debug.toJson(epnServices2));
+			List<VOTABLE> epnServices2 = facade.getEPNServices(SERVICE_ATTRIBUTES);
+			System.out.println("4.2 getEPNServices(" + strServiceAttributes + ")\n\t"
+					+ Debug.toJson(epnServices2));
-			VOTABLE epnServices3 = facade.getEPNServices(KEYWORDS, SERVICE_ATTRIBUTES);
+			List<VOTABLE> epnServices3 = facade.getEPNServices(KEYWORDS, SERVICE_ATTRIBUTES);
 			System.out.println("4.3 getEPNServices(" + strKeywords + ", "
 					+ strServiceAttributes + ")\n\t"
 					+ Debug.toJson(epnServices3));