Update Product List to Match Cymbal Branding/Story (GoogleCloudPlatform#600)

* Update product list (and images)

All new photos were taken by me (Nim).
We received approval from Google's Open Source Licensing team
to use these photos.

* Update ads to match new product list

* Update comments about product categories

* Update productcatalogservice/server_test.go

Author: NimJay

pb/demo.proto

@@ -79,7 +79,7 @@ message Product {
     string picture = 4;
     Money price_usd = 5;
 
-    // Categories such as "vintage" or "gardening" that can be used to look up
+    // Categories such as "clothing" or "kitchen" that can be used to look up
     // other related products.
     repeated string categories = 6;
 }

src/adservice/src/main/java/hipstershop/AdService.java

@@ -171,47 +171,48 @@ private void blockUntilShutdown() throws InterruptedException {
   }
 
   private static ImmutableListMultimap<String, Ad> createAdsMap() {
-    Ad camera =
+    Ad hairdryer =
         Ad.newBuilder()
             .setRedirectUrl("/product/2ZYFJ3GM2N")
-            .setText("Film camera for sale. 50% off.")
+            .setText("Hairdryer for sale. 50% off.")
             .build();
-    Ad lens =
+    Ad tankTop =
         Ad.newBuilder()
             .setRedirectUrl("/product/66VCHSJNUP")
-            .setText("Vintage camera lens for sale. 20% off.")
+            .setText("Tank top for sale. 20% off.")
             .build();
-    Ad recordPlayer =
+    Ad candleHolder =
         Ad.newBuilder()
             .setRedirectUrl("/product/0PUK6V6EV0")
-            .setText("Vintage record player for sale. 30% off.")
+            .setText("Candle holder for sale. 30% off.")
             .build();
-    Ad bike =
+    Ad bambooGlassJar =
         Ad.newBuilder()
             .setRedirectUrl("/product/9SIQT8TOJO")
-            .setText("City Bike for sale. 10% off.")
+            .setText("Bamboo glass jar for sale. 10% off.")
             .build();
-    Ad baristaKit =
+    Ad watch =
         Ad.newBuilder()
             .setRedirectUrl("/product/1YMWWN1N4O")
-            .setText("Home Barista kitchen kit for sale. Buy one, get second kit for free")
+            .setText("Watch for sale. Buy one, get second kit for free")
             .build();
-    Ad airPlant =
+    Ad mug =
         Ad.newBuilder()
             .setRedirectUrl("/product/6E92ZMYYFZ")
-            .setText("Air plants for sale. Buy two, get third one for free")
+            .setText("Mug for sale. Buy two, get third one for free")
             .build();
-    Ad terrarium =
+    Ad loafers =
         Ad.newBuilder()
             .setRedirectUrl("/product/L9ECAV7KIM")
-            .setText("Terrarium for sale. Buy one, get second one for free")
+            .setText("Loafers for sale. Buy one, get second one for free")
             .build();
     return ImmutableListMultimap.<String, Ad>builder()
-        .putAll("photography", camera, lens)
-        .putAll("vintage", camera, lens, recordPlayer)
-        .put("cycling", bike)
-        .put("cookware", baristaKit)
-        .putAll("gardening", airPlant, terrarium)
+        .putAll("clothing", tankTop)
+        .putAll("accessories", watch)
+        .putAll("footwear", loafers)
+        .putAll("hair", hairdryer)
+        .putAll("decor", candleHolder)
+        .putAll("kitchen", bambooGlassJar, mug)
         .build();
   }
 

src/adservice/src/main/proto/demo.proto

@@ -79,7 +79,7 @@ message Product {
     string picture = 4;
     Money price_usd = 5;
 
-    // Categories such as "vintage" or "gardening" that can be used to look up
+    // Categories such as "clothing" or "kitchen" that can be used to look up
     // other related products.
     repeated string categories = 6;
 }

src/checkoutservice/genproto/demo.pb.go

@@ -79,7 +79,7 @@ message Product {
     string picture = 4;
     Money price_usd = 5;
 
-    // Categories such as "vintage" or "gardening" that can be used to look up
+    // Categories such as "clothing" or "kitchen" that can be used to look up
     // other related products.
     repeated string categories = 6;
 }