Revert MP Rest Client (#55)

* Reverting RC

* Reverting MP Rest Client

* Updating start dir

* Updated copyright year

Author: justineechen

README.adoc

@@ -1,4 +1,4 @@
-// Copyright (c) 2017 IBM Corporation and others.
+// Copyright (c) 2017, 2019 IBM Corporation and others.
 // Licensed under Creative Commons Attribution-NoDerivatives
 // 4.0 International (CC BY-ND 4.0)
 //   https://creativecommons.org/licenses/by-nd/4.0/
@@ -86,19 +86,13 @@ mvn liberty:start-server
 
 Make sure that your Zipkin server is running and point your browser to the {inv-url}/localhost URL. When you visit
 this endpoint, you make two GET HTTP requests, one to the `system` service and one to the `inventory`
-service. Both of these requests are configured to be traced, so two new traces will be recorded in Zipkin.
+service. Both of these requests are configured to be traced, so a new trace will be recorded in Zipkin.
 Visit the {zipkin-url} URL or another location where you configured Zipkin to run and sort the traces
-by newest first. Verify that two new traces have been recorded, one for `system` and one for `inventory`, 
-and that they contain spans with the following names:
-
-The `system` trace:
-
-- `get:io.openliberty.guides.system.systemresource.getproperties`
-
-The `inventory` trace:
+by newest first. Verify that this new trace contains three spans with the following names:
 
 - `get:io.openliberty.guides.inventory.inventoryresource.getpropertiesforhost`
-- `add() span`
+- `get:io.openliberty.guides.system.systemresource.getproperties`
+- `addtoinventory() span`
 
 // image::/guides/draft-guide-microprofile-opentracing/resources/disable-tracing.png[png][Disable tracing, width=100%]
 
@@ -109,13 +103,12 @@ If you examine the other traces, you might notice a red trace entry, which happe
 caught by the span. In this case, since one of the tests accesses the `/inventory/systems/badhostname`
 endpoint, which is invalid, an error is thrown. This behavior is expected.
 
-When you are done checking out the traces, stop both Open Liberty servers using the Maven
+When you are done checking out the services, stop both Open Liberty servers using the Maven
 `liberty:stop-server` goal:
 
 ```
 mvn liberty:stop-server
 ```
-
 // =================================================================================================
 // Running the application with Docker
 // =================================================================================================

finish/inventory/pom.xml

@@ -50,16 +50,6 @@
             <artifactId>cdi-2.0</artifactId>
             <type>esa</type>
         </dependency>
-        <dependency>
-            <groupId>io.openliberty.features</groupId>
-            <artifactId>mpConfig-1.3</artifactId>
-            <type>esa</type>
-        </dependency>
-        <dependency>
-            <groupId>io.openliberty.features</groupId>
-            <artifactId>mpRestClient-1.1</artifactId>
-            <type>esa</type>
-        </dependency>
         <dependency>
             <groupId>io.openliberty.features</groupId>
             <artifactId>mpOpenTracing-1.1</artifactId>

finish/inventory/src/main/java/io/openliberty/guides/inventory/InventoryManager.java

@@ -1,6 +1,6 @@
 //tag::copyright[]
 /*******************************************************************************
-* Copyright (c) 2017, 2018 IBM Corporation and others.
+* Copyright (c) 2017, 2019 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
@@ -22,25 +22,25 @@
 import java.util.Collections;
 
 import org.eclipse.microprofile.opentracing.Traced;
-import org.eclipse.microprofile.rest.client.inject.RestClient;
 
 import io.opentracing.Scope;
 import io.opentracing.Tracer;
 import io.openliberty.guides.inventory.model.*;
 
 @ApplicationScoped
 public class InventoryManager {
-
+    
     private List<SystemData> systems = Collections.synchronizedList(new ArrayList<>());
-    private InventoryUtils invUtils = new InventoryUtils();
+    private SystemClient systemClient = new SystemClient();
 
     // tag::custom-tracer[]
-    @Inject
-    Tracer tracer;
+    @Inject Tracer tracer;
     // end::custom-tracer[]
 
     public Properties get(String hostname) {
-        Properties properties = invUtils.getProperties(hostname);
+        systemClient.init(hostname, 9080);
+        Properties properties = systemClient.getProperties();
+        
         return properties;
     }
 
@@ -66,5 +66,5 @@ public void add(String hostname, Properties systemProps) {
     public InventoryList list() {
         return new InventoryList(systems);
     }
-
+    
 }

finish/inventory/src/main/java/io/openliberty/guides/inventory/InventoryResource.java

@@ -1,6 +1,6 @@
 // tag::copyright[]
 /*******************************************************************************
- * Copyright (c) 2017, 2018 IBM Corporation and others.
+ * Copyright (c) 2017, 2019 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -30,8 +30,7 @@
 @Path("/systems")
 public class InventoryResource {
 
-    @Inject
-    InventoryManager manager;
+    @Inject InventoryManager manager;
 
     @GET
     @Path("/{hostname}")
@@ -40,11 +39,10 @@ public Response getPropertiesForHost(@PathParam("hostname") String hostname) {
         Properties props = manager.get(hostname);
         if (props == null) {
             return Response.status(Response.Status.NOT_FOUND)
-                            .entity("ERROR: Unknown hostname or the system service may "
-                                + "not be running on " + hostname)
-                            .build();
+                           .entity("ERROR: Unknown hostname or the system service may " 
+                                 + "not be running on " + hostname)
+                           .build();
         }
-
         manager.add(hostname, props);
         return Response.ok(props).build();
     }
@@ -55,5 +53,5 @@ public Response getPropertiesForHost(@PathParam("hostname") String hostname) {
     public InventoryList listContents() {
         return manager.list();
     }
-
+    
 }

finish/inventory/src/main/java/io/openliberty/guides/inventory/InventoryUtils.java

@@ -1,6 +1,6 @@
 // tag::copyright[]
 /*******************************************************************************
- * Copyright (c) 2017, 2018 IBM Corporation and others.
+ * Copyright (c) 2017, 2019 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -10,26 +10,100 @@
  *     IBM Corporation - Initial implementation
  *******************************************************************************/
 // end::copyright[]
-package io.openliberty.guides.inventory.client;
+package io.openliberty.guides.inventory.client;	
 
-import java.util.Properties;
-import javax.enterprise.context.Dependent;
-import javax.ws.rs.ProcessingException;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
-import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+import javax.ws.rs.client.Client;		
+import javax.ws.rs.client.ClientBuilder;		
+import javax.ws.rs.client.Invocation.Builder;		
+import javax.ws.rs.core.HttpHeaders;		
+import javax.ws.rs.core.MediaType;		
+import javax.ws.rs.core.Response;		
+import javax.ws.rs.core.Response.Status;		
+import java.util.Properties;		 
+import java.net.URI;
 
-@Dependent
-@RegisterRestClient
-@RegisterProvider(UnknownUrlExceptionMapper.class)
-@Path("/properties")
-public interface SystemClient {
-
-  @GET
-  @Produces(MediaType.APPLICATION_JSON)
-  public Properties getProperties() throws UnknownUrlException, ProcessingException;
-  
+public class SystemClient {
+	
+	    // Constants for building URI to the system service.
+	    private final int DEFAULT_PORT = Integer.valueOf(System.getProperty("default.http.port"));
+	    private final String SYSTEM_PROPERTIES = "/system/properties";
+	    private final String PROTOCOL = "http";
+	
+	    private String url;
+	    private Builder clientBuilder;
+	
+	    // Used by the following guide(s): CDI, MP-METRICS, FAULT-TOLERANCE
+	    public void init(String hostname) {
+	        this.initHelper(hostname, DEFAULT_PORT);
+	    }
+	
+	    // Used by the following guide(s): MP-CONFIG, MP-HEALTH
+	    public void init(String hostname, int port) {
+	        this.initHelper(hostname, port);
+	    }
+	
+	    // Helper method to set the attributes.
+	    private void initHelper(String hostname, int port) {
+	        this.url = buildUrl(PROTOCOL, hostname, port, SYSTEM_PROPERTIES);
+	        this.clientBuilder = buildClientBuilder(this.url);
+	    }
+	
+	    // Wrapper function that gets properties
+	    public Properties getProperties() {
+	        return getPropertiesHelper(this.clientBuilder);
+	    }
+	
+	    // tag::doc[]
+	    /**
+	    * Builds the URI string to the system service for a particular host.
+	    * @param protocol
+	    *          - http or https.
+	    * @param host
+	    *          - name of host.
+	    * @param port
+	    *          - port number.
+	    * @param path
+	    *          - Note that the path needs to start with a slash!!!
+	    * @return String representation of the URI to the system properties service.
+	    */
+	    // end::doc[]
+	    protected String buildUrl(String protocol, String host, int port, String path) {
+	        try {
+	            URI uri = new URI(protocol, null, host, port, path, null, null);
+	            return uri.toString();
+	        } catch (Exception e) {
+	            System.out.println("URISyntaxException");
+	            return null;
+	        }
+	    }
+	
+	    // Method that creates the client builder
+	    protected Builder buildClientBuilder(String urlString) {
+	        try {
+	            Client client = ClientBuilder.newClient();
+	            Builder builder = client.target(urlString).request();
+	            return builder.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON);
+	        } catch (Exception e) {
+	            System.out.println("ClientBuilderException");
+	            return null;
+	        }
+	    }
+	
+	    // Helper method that processes the request
+	    protected Properties getPropertiesHelper(Builder builder) {
+	        try {
+	            Response response = builder.get();
+	            if (response.getStatus() == Status.OK.getStatusCode()) {
+	                return response.readEntity(Properties.class);
+	            } else {
+	                System.out.println("Response Status is not OK.");
+	            }
+	        } catch (RuntimeException e) {
+	            System.out.println("Runtime exception: " + e.getMessage());
+	        } catch (Exception e) {
+	            System.out.println("Exception thrown while invoking the request.");
+	        }
+	        return null;
+	    }
 }
+