From be2631d1c55ff872dec98389082478d4cf515b7d Mon Sep 17 00:00:00 2001
From: Jean de Klerk <deklerk@google.com>
Date: Mon, 12 Mar 2018 16:47:35 -0700
Subject: [PATCH 1/2] dlp: add a utility conversion function

Fixes issue #2321
---
 .../com/google/cloud/dlp/v2beta1/Colors.java  | 31 +++++++++++++++++++
 .../google/cloud/dlp/v2beta1/ColorTest.java   | 16 ++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/Colors.java
 create mode 100644 google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/ColorTest.java

diff --git a/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/Colors.java b/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/Colors.java
new file mode 100644
index 000000000000..e345392e4d26
--- /dev/null
+++ b/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/Colors.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.cloud.dlp.v2beta1;
+
+import com.google.privacy.dlp.v2beta1.Color;
+
+public class Colors {
+
+  private Colors() {}
+
+  public static final Color asDlpColor(java.awt.Color c) {
+    return Color.newBuilder()
+        .setBlue(c.getBlue())
+        .setGreen(c.getGreen())
+        .setRed(c.getRed())
+        .build();
+  }
+}
diff --git a/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/ColorTest.java b/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/ColorTest.java
new file mode 100644
index 000000000000..11bd893f25a2
--- /dev/null
+++ b/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/ColorTest.java
@@ -0,0 +1,16 @@
+package com.google.cloud.dlp.v2beta1;
+
+import com.google.privacy.dlp.v2beta1.Color;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class ColorTest {
+
+  @Test
+  public void asDlpColorTest() {
+    Color got = Colors.asDlpColor(java.awt.Color.GREEN);
+    Assert.assertEquals(got.getBlue(), 0, 0);
+    Assert.assertEquals(got.getGreen(), 255, 0);
+    Assert.assertEquals(got.getRed(), 0, 0);
+  }
+}

From fcf2880c1c4721136b7993cbbaf2aedcd15a7cdf Mon Sep 17 00:00:00 2001
From: Jean de Klerk <deklerk@google.com>
Date: Wed, 14 Mar 2018 15:46:43 -0700
Subject: [PATCH 2/2] add asAwtColor conversion function + test

---
 .../com/google/cloud/dlp/v2beta1/Colors.java   |  4 ++++
 .../google/cloud/dlp/v2beta1/ColorTest.java    | 18 ++++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/Colors.java b/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/Colors.java
index e345392e4d26..1ec834cf27d1 100644
--- a/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/Colors.java
+++ b/google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/Colors.java
@@ -28,4 +28,8 @@ public static final Color asDlpColor(java.awt.Color c) {
         .setRed(c.getRed())
         .build();
   }
+
+  public static final java.awt.Color asAwtColor(Color c) {
+    return new java.awt.Color(c.getRed() / 255, c.getGreen() / 255, c.getBlue() / 255);
+  }
 }
diff --git a/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/ColorTest.java b/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/ColorTest.java
index 11bd893f25a2..dce909ca675d 100644
--- a/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/ColorTest.java
+++ b/google-cloud-dlp/src/test/java/com/google/cloud/dlp/v2beta1/ColorTest.java
@@ -8,9 +8,19 @@ public class ColorTest {
 
   @Test
   public void asDlpColorTest() {
-    Color got = Colors.asDlpColor(java.awt.Color.GREEN);
-    Assert.assertEquals(got.getBlue(), 0, 0);
-    Assert.assertEquals(got.getGreen(), 255, 0);
-    Assert.assertEquals(got.getRed(), 0, 0);
+    Color got = Colors.asDlpColor(new java.awt.Color(1, 2, 3));
+    Assert.assertEquals(got.getBlue(), 3, 0);
+    Assert.assertEquals(got.getGreen(), 2, 0);
+    Assert.assertEquals(got.getRed(), 1, 0);
+  }
+
+  @Test
+  public void asAwtColorTest() {
+    java.awt.Color got =
+        Colors.asAwtColor(Color.newBuilder().setRed(1).setGreen(2).setBlue(3).build());
+
+    Assert.assertEquals(got.getBlue(), 3, 0);
+    Assert.assertEquals(got.getGreen(), 2, 0);
+    Assert.assertEquals(got.getRed(), 1, 0);
   }
 }