SafeLoggable exception for invalid UUID values

changelog/@unreleased/pr-2212.v2.yml

@@ -0,0 +1,5 @@
+type: improvement
+improvement:
+  description: SafeLoggable exception for invalid UUID values
+  links:
+  - https://github.com/palantir/conjure-java/pull/2212

conjure-java-core/src/main/java/com/palantir/conjure/java/types/AliasGenerator.java

@@ -39,6 +39,8 @@
 import com.palantir.conjure.visitor.TypeVisitor;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.logsafe.Safe;
+import com.palantir.logsafe.UnsafeArg;
+import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
 import com.squareup.javapoet.AnnotationSpec;
 import com.squareup.javapoet.ClassName;
 import com.squareup.javapoet.CodeBlock;
@@ -385,7 +387,14 @@ private static CodeBlock valueOfFactoryMethodForPrimitive(PrimitiveType primitiv
                         .build();
             case UUID:
                 return CodeBlock.builder()
+                        .beginControlFlow("try")
                         .addStatement("return of($T.fromString(value))", aliasTypeName.withoutAnnotations())
+                        .nextControlFlow("catch (IllegalArgumentException e)")
+                        .addStatement(
+                                "throw new $T(\"Unable to parse as UUID\", e, $T.of(\"input\", value))",
+                                SafeIllegalArgumentException.class,
+                                UnsafeArg.class)
+                        .endControlFlow()
                         .build();
             case DATETIME:
                 return CodeBlock.builder()

conjure-java-core/src/test/java/com/palantir/conjure/java/types/AliasTests.java

@@ -16,17 +16,21 @@
 
 package com.palantir.conjure.java.types;
 
+import static com.palantir.logsafe.testing.Assertions.assertThatLoggableExceptionThrownBy;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.palantir.conjure.java.serialization.ObjectMappers;
+import com.palantir.logsafe.UnsafeArg;
+import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
 import com.palantir.logsafe.exceptions.SafeNullPointerException;
 import com.palantir.product.DoubleAliasExample;
 import com.palantir.product.ExternalLongAliasOne;
 import com.palantir.product.ExternalLongAliasTwo;
 import com.palantir.product.UuidAliasExample;
+import java.util.UUID;
 import org.junit.jupiter.api.Test;
 
 public class AliasTests {
@@ -39,6 +43,20 @@ public void testNullValueSafeLoggable() {
                 .hasMessage("value cannot be null");
     }
 
+    @Test
+    void testValueOf_validUuid_succeeds() {
+        UUID uuid = UUID.randomUUID();
+        assertThat(UuidAliasExample.valueOf(uuid.toString())).isEqualTo(UuidAliasExample.of(uuid));
+    }
+
+    @Test
+    void testValueOf_invalidUuid_throwsSafeException() {
+        assertThatLoggableExceptionThrownBy(() -> UuidAliasExample.valueOf("not-a-uuid"))
+                .isInstanceOf(SafeIllegalArgumentException.class)
+                .hasMessageContaining("Unable to parse as UUID")
+                .hasExactlyArgs(UnsafeArg.of("input", "not-a-uuid"));
+    }
+
     @Test
     public void testValueOf_external() {
         assertThat(ExternalLongAliasOne.valueOf("123")).isEqualTo(ExternalLongAliasOne.of(123L));