Merge pull request #1490 from wind57/more-changes

use Preconditions::precondition + add tests

Author: k8s-ci-robot

util/src/main/java/io/kubernetes/client/apimachinery/GroupVersionKind.java

@@ -12,6 +12,8 @@
 */
 package io.kubernetes.client.apimachinery;
 
+import static io.kubernetes.client.util.Preconditions.precondition;
+
 import java.util.Objects;
 
 public class GroupVersionKind extends GroupVersion {
@@ -20,10 +22,7 @@ public class GroupVersionKind extends GroupVersion {
 
   public GroupVersionKind(String group, String version, String kind) {
     super(group, version);
-    if (kind == null) {
-      throw new IllegalArgumentException("kind must not be null");
-    }
-    this.kind = kind;
+    this.kind = precondition(kind, Objects::isNull, () -> "kind must not be null");
   }
 
   public String getKind() {

util/src/main/java/io/kubernetes/client/apimachinery/GroupVersionResource.java

@@ -12,6 +12,8 @@
 */
 package io.kubernetes.client.apimachinery;
 
+import static io.kubernetes.client.util.Preconditions.precondition;
+
 import java.util.Objects;
 
 public class GroupVersionResource extends GroupVersion {
@@ -20,10 +22,7 @@ public class GroupVersionResource extends GroupVersion {
 
   public GroupVersionResource(String group, String version, String resource) {
     super(group, version);
-    if (resource == null) {
-      throw new IllegalArgumentException("resource must not be null");
-    }
-    this.resource = resource;
+    this.resource = precondition(resource, Objects::isNull, () -> "resource must not be null");
   }
 
   @Override

util/src/main/java/io/kubernetes/client/apimachinery/NamespaceName.java

@@ -12,6 +12,8 @@
 */
 package io.kubernetes.client.apimachinery;
 
+import static io.kubernetes.client.util.Preconditions.precondition;
+
 import java.util.Objects;
 
 public class NamespaceName {
@@ -20,8 +22,8 @@ public class NamespaceName {
   private final String name;
 
   public NamespaceName(String namespace, String name) {
-    this.namespace = namespace;
-    this.name = name;
+    this.namespace = precondition(namespace, Objects::isNull, () -> "namespace must not be null");
+    this.name = precondition(name, Objects::isNull, () -> "name must not be null");
   }
 
   public String getNamespace() {

util/src/test/java/io/kubernetes/client/apimachinery/GroupVersionKindTest.java

@@ -0,0 +1,34 @@
+/*
+Copyright 2021 The Kubernetes Authors.
+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
+http://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 io.kubernetes.client.apimachinery;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+
+public class GroupVersionKindTest {
+
+  @Test
+  public void testInvalidKind() {
+    assertThatThrownBy(() -> new GroupVersionKind("group", "version", null))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessage("kind must not be null");
+  }
+
+  @Test
+  public void testValidKind() {
+    Assertions.assertThatNoException()
+        .isThrownBy(() -> new GroupVersionKind("group", "version", "kind"));
+  }
+}

util/src/test/java/io/kubernetes/client/apimachinery/GroupVersionResourceTest.java

@@ -0,0 +1,33 @@
+/*
+Copyright 2021 The Kubernetes Authors.
+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
+http://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 io.kubernetes.client.apimachinery;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+
+public class GroupVersionResourceTest {
+  @Test
+  public void testInvalidResource() {
+    assertThatThrownBy(() -> new GroupVersionResource("group", "version", null))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessage("resource must not be null");
+  }
+
+  @Test
+  public void testValidResource() {
+    Assertions.assertThatNoException()
+        .isThrownBy(() -> new GroupVersionResource("group", "version", "resource"));
+  }
+}

util/src/test/java/io/kubernetes/client/apimachinery/GroupVersionTest.java

@@ -14,7 +14,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.Assert.*;
 
 import io.kubernetes.client.openapi.models.V1Deployment;
 import io.kubernetes.client.openapi.models.V1Pod;

util/src/test/java/io/kubernetes/client/apimachinery/NamespaceNameTest.java

@@ -0,0 +1,40 @@
+/*
+Copyright 2021 The Kubernetes Authors.
+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
+http://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 io.kubernetes.client.apimachinery;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+
+public class NamespaceNameTest {
+
+  @Test
+  public void testInvalidNamespace() {
+    assertThatThrownBy(() -> new NamespaceName(null, "name"))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessage("namespace must not be null");
+  }
+
+  @Test
+  public void testInvalidName() {
+    assertThatThrownBy(() -> new NamespaceName("namespace", null))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessage("name must not be null");
+  }
+
+  @Test
+  public void testValidNamespaceName() {
+    Assertions.assertThatNoException().isThrownBy(() -> new NamespaceName("namespace", "name"));
+  }
+}