diff options
| author | Roberto E. Escobar | 2014-06-10 18:47:10 +0000 |
|---|---|---|
| committer | Roberto E. Escobar | 2014-08-28 23:58:30 +0000 |
| commit | 2cba21dbf75f6e7bed63a267036ddd7192eb4b77 (patch) | |
| tree | 65fb5b5ebd623c6a769f22b8ba8ead02d59720c8 /plugins/org.eclipse.osee.ote.master.rest | |
| parent | fc1724d32fd8d2e3e5c8c1e004c7a2b249a99c24 (diff) | |
| download | org.eclipse.osee-2cba21dbf75f6e7bed63a267036ddd7192eb4b77.tar.gz org.eclipse.osee-2cba21dbf75f6e7bed63a267036ddd7192eb4b77.tar.xz org.eclipse.osee-2cba21dbf75f6e7bed63a267036ddd7192eb4b77.zip | |
refactor[ats_ATS64244]: Update OTE to use JAX-RS Client
Change-Id: I15c6b492f124b30acc5c991e2416e5d050d430ae
Diffstat (limited to 'plugins/org.eclipse.osee.ote.master.rest')
| -rw-r--r-- | plugins/org.eclipse.osee.ote.master.rest/src/org/eclipse/osee/ote/master/rest/internal/OTEAvailableServersResource.java | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/plugins/org.eclipse.osee.ote.master.rest/src/org/eclipse/osee/ote/master/rest/internal/OTEAvailableServersResource.java b/plugins/org.eclipse.osee.ote.master.rest/src/org/eclipse/osee/ote/master/rest/internal/OTEAvailableServersResource.java index 26f4b6030f2..724d0f34135 100644 --- a/plugins/org.eclipse.osee.ote.master.rest/src/org/eclipse/osee/ote/master/rest/internal/OTEAvailableServersResource.java +++ b/plugins/org.eclipse.osee.ote.master.rest/src/org/eclipse/osee/ote/master/rest/internal/OTEAvailableServersResource.java @@ -1,13 +1,9 @@ package org.eclipse.osee.ote.master.rest.internal; -import java.io.IOException; import java.net.MalformedURLException; -import java.net.URISyntaxException; -import java.text.ParseException; import java.util.ArrayList; import java.util.List; import java.util.concurrent.ExecutionException; - import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; import javax.ws.rs.GET; @@ -19,14 +15,13 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Request; import javax.ws.rs.core.UriBuilderException; import javax.ws.rs.core.UriInfo; - import org.eclipse.osee.ote.master.OTELookup; import org.eclipse.osee.ote.master.OTELookupServerEntry; import org.eclipse.osee.ote.master.rest.model.OTEServer; @Path("servers") public class OTEAvailableServersResource { - + // Allows to insert contextual objects into the class, // e.g. ServletContext, Request, Response, UriInfo @Context @@ -40,22 +35,22 @@ public class OTEAvailableServersResource { OTELookup oteLookup = OTERestApplication.getOTELookup(); List<OTELookupServerEntry> availableServers = oteLookup.getAvailableServers(); List<OTEServer> servers = new ArrayList<OTEServer>(); - for(OTELookupServerEntry entry:availableServers){ + for (OTELookupServerEntry entry : availableServers) { servers.add(Util.convert(entry)); } return servers; } - + @GET @Produces(MediaType.TEXT_HTML) public String getAsHtml() { OTELookup oteLookup = OTERestApplication.getOTELookup(); List<OTELookupServerEntry> availableServers = oteLookup.getAvailableServers(); - + StringBuilder builder = new StringBuilder(); builder.append("<html><body>"); builder.append("<table border=\"1\">"); - + builder.append("<tr>\n"); builder.append("<th>"); builder.append("Station"); @@ -70,7 +65,7 @@ public class OTEAvailableServersResource { builder.append("StartTime"); builder.append("</th>"); builder.append("</tr>\n"); - + for (OTELookupServerEntry entry : availableServers) { builder.append("<tr>\n"); builder.append("<td>"); @@ -92,19 +87,19 @@ public class OTEAvailableServersResource { builder.append("</body></html>"); return builder.toString(); } - + @POST @Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) - public void updateServer(OTEServer server) throws IOException, InterruptedException, ExecutionException, ParseException, URISyntaxException { + public void updateServer(OTEServer server) throws Exception { OTELookup oteLookup = OTERestApplication.getOTELookup(); oteLookup.addServer(Util.convert(server)); } - + @DELETE @Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) - public void removeServer(OTEServer server) throws IOException, InterruptedException, ExecutionException, ParseException, URISyntaxException { + public void removeServer(OTEServer server) throws Exception { OTELookup oteLookup = OTERestApplication.getOTELookup(); oteLookup.removeServer(Util.convert(server)); } - + } |