From 6b128e203be2bab8ebd6dd94a9c0903ef79982ee Mon Sep 17 00:00:00 2001 From: Nathanael Jourdane Date: Thu, 19 May 2016 11:30:33 +0200 Subject: [PATCH] Add lasts Javadoc comments. --- src/main/java/eu/omp/irap/vespa/epntapclient/EpnTapConnection.java | 6 +++--- src/main/java/eu/omp/irap/vespa/epntapclient/RequestCtrl.java | 2 +- src/main/java/eu/omp/irap/vespa/epntapclient/voresource/VOResourceCtrl.java | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/eu/omp/irap/vespa/epntapclient/EpnTapConnection.java b/src/main/java/eu/omp/irap/vespa/epntapclient/EpnTapConnection.java index 6ad0143..8375d20 100644 --- a/src/main/java/eu/omp/irap/vespa/epntapclient/EpnTapConnection.java +++ b/src/main/java/eu/omp/irap/vespa/epntapclient/EpnTapConnection.java @@ -31,7 +31,7 @@ import eu.omp.irap.vespa.epntapclient.voresource.model.Resource; import eu.omp.irap.vespa.epntapclient.votable.model.VOTABLE; import eu.omp.irap.vespa.votable.controller.VOTableController; import eu.omp.irap.vespa.votable.controller.VOTableException; -import eu.omp.irap.vespa.votable.controller.VOTableException.CantReadVOTableException; +import eu.omp.irap.vespa.votable.controller.VOTableException.CantParseVOTableException; import eu.omp.irap.vespa.votable.utils.StringJoiner; import eu.omp.irap.vespa.votable.votabledata.VOTableData; @@ -134,7 +134,7 @@ public class EpnTapConnection implements EpnTapInterface { GranuleCtrl gc = new GranuleCtrl(data); granules = gc.getGranules(); } catch (ParseException e) { - throw new CantReadVOTableException("Parsing error on a granule.", e); + throw new CantParseVOTableException("Parsing error on a granule.", e); } return granules; } @@ -152,7 +152,7 @@ public class EpnTapConnection implements EpnTapInterface { GranuleCtrl gc = new GranuleCtrl(data); granules = gc.getGranules(); } catch (ParseException e) { - throw new CantReadVOTableException("Parsing error on a granule.", e); + throw new CantParseVOTableException("Parsing error on a granule.", e); } return granules; } diff --git a/src/main/java/eu/omp/irap/vespa/epntapclient/RequestCtrl.java b/src/main/java/eu/omp/irap/vespa/epntapclient/RequestCtrl.java index f5c873b..77c6f6a 100644 --- a/src/main/java/eu/omp/irap/vespa/epntapclient/RequestCtrl.java +++ b/src/main/java/eu/omp/irap/vespa/epntapclient/RequestCtrl.java @@ -99,7 +99,7 @@ public class RequestCtrl { Map params = new HashMap<>(); params.put("q", "\"" + begining + "\""); - String query = Network.buildQuery(RESOLVER_URL, params); + String query = Network.buildGetRequest(RESOLVER_URL, params); JsonObject root = Network.readJson(query); int count = Integer.parseInt(root.get("count").toString()); String[] targetNames = new String[count]; diff --git a/src/main/java/eu/omp/irap/vespa/epntapclient/voresource/VOResourceCtrl.java b/src/main/java/eu/omp/irap/vespa/epntapclient/voresource/VOResourceCtrl.java index d024ed2..3850fbe 100644 --- a/src/main/java/eu/omp/irap/vespa/epntapclient/voresource/VOResourceCtrl.java +++ b/src/main/java/eu/omp/irap/vespa/epntapclient/voresource/VOResourceCtrl.java @@ -91,7 +91,7 @@ public class VOResourceCtrl { parameters.put("keywords", "datamodel:\"" + core.toString() + "\""); parameters.put("max", String.valueOf(MAX_VORESOURCES)); - String query = Network.buildQuery(GET_JSONRESOURCES_URL, parameters); + String query = Network.buildGetRequest(GET_JSONRESOURCES_URL, parameters); try { ivoidResources = parseIvoidResources(Network.readJson(query)); } catch (CantSendQueryException e) { @@ -120,7 +120,7 @@ public class VOResourceCtrl { "datamodel:\"" + core.toString() + "\" subjects:\"" + subjects + "\""); parameters.put("max", String.valueOf(MAX_VORESOURCES)); - String query = Network.buildQuery(GET_JSONRESOURCES_URL, parameters); + String query = Network.buildGetRequest(GET_JSONRESOURCES_URL, parameters); try { ivoidResources = parseIvoidResources(Network.readJson(query)); } catch (CantSendQueryException e) { @@ -144,7 +144,7 @@ public class VOResourceCtrl { try { LOGGER.info("Trying to get VOResource '" + identifier + "'..."); - String query = Network.buildQuery(GET_VORESOURCE_URL, parameters); + String query = Network.buildGetRequest(GET_VORESOURCE_URL, parameters); voResourcePath = Network.saveQuery(query); } catch (CantSendQueryException e) { throw new CantGetVOResourceException(GET_VORESOURCE_URL, e); -- libgit2 0.21.2