Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pom.xml

src/main/java/org/supertribe/Phone.java → src/main/java/io/microprofile/showcase/web/Phone.java

@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.supertribe;
+package io.microprofile.showcase.web;
 
 
 import javax.xml.bind.annotation.XmlRootElement;
@@ -31,7 +31,7 @@ public class Phone {
     public Phone() {
     }
 
-    public Phone(int age, String carrier, String id, String name, String snippet) {
+    public Phone(final int age, final String carrier, final String id, final String name, final String snippet) {
         this.age = age;
         this.carrier = carrier;
         this.id = id;
@@ -43,7 +43,7 @@ public class Phone {
         return age;
     }
 
-    public void setAge(int age) {
+    public void setAge(final int age) {
         this.age = age;
     }
 
@@ -51,7 +51,7 @@ public class Phone {
         return carrier;
     }
 
-    public void setCarrier(String carrier) {
+    public void setCarrier(final String carrier) {
         this.carrier = carrier;
     }
 
@@ -59,7 +59,7 @@ public class Phone {
         return id;
     }
 
-    public void setId(String id) {
+    public void setId(final String id) {
         this.id = id;
     }
 
@@ -67,7 +67,7 @@ public class Phone {
         return name;
     }
 
-    public void setName(String name) {
+    public void setName(final String name) {
         this.name = name;
     }
 
@@ -75,7 +75,7 @@ public class Phone {
         return snippet;
     }
 
-    public void setSnippet(String snippet) {
+    public void setSnippet(final String snippet) {
         this.snippet = snippet;
     }
 

src/main/java/org/supertribe/PhoneService.java → src/main/java/io/microprofile/showcase/web/PhoneService.java

@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.supertribe;
+package io.microprofile.showcase.web;
 
 import javax.ejb.Lock;
 import javax.ejb.Singleton;

src/test/java/org/supertribe/PhoneServiceTest.java → src/test/java/io/microprofile/showcase/web/PhoneServiceTest.java

@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.supertribe;
+package io.microprofile.showcase.web;
 
 import org.apache.cxf.jaxrs.client.WebClient;
 import org.jboss.arquillian.container.test.api.Deployment;
@@ -33,25 +33,24 @@ import java.util.Iterator;
 
 /**
  * Arquillian will start the container, deploy all @Deployment bundles, then run all the @Test methods.
- *
+ * <p>
  * A strong value-add for Arquillian is that the test is abstracted from the server.
  * It is possible to rerun the same test against multiple adapters or server configurations.
- *
+ * <p>
  * A second value-add is it is possible to build WebArchives that are slim and trim and therefore
  * isolate the functionality being tested.  This also makes it easier to swap out one implementation
  * of a class for another allowing for easy mocking.
- *
  */
 @RunWith(Arquillian.class)
 public class PhoneServiceTest extends Assert {
 
     /**
      * ShrinkWrap is used to create a war file on the fly.
-     *
+     * <p>
      * The API is quite expressive and can build any possible
      * flavor of war file.  It can quite easily return a rebuilt
      * war file as well.
-     *
+     * <p>
      * More than one @Deployment method is allowed.
      */
     @Deployment
@@ -61,12 +60,11 @@ public class PhoneServiceTest extends Assert {
 
     /**
      * This URL will contain the following URL data
-     *
+     * <p>
      * - http://<host>:<port>/<webapp>/
-     *
+     * <p>
      * This allows the test itself to be agnostic of server information or even
      * the name of the webapp
-     *
      */
     @ArquillianResource
     private URL webappUrl;