refactor list creation to route through ConjureCollections

palantir · Nov 14, 2024 · 1eecccf · 1eecccf
1 parent e7a024c
commit 1eecccf
Show file tree

Hide file tree

Showing 20 changed files with 42 additions and 44 deletions.
diff --git a/conjure-java-core/src/integrationInput/java/com/palantir/product/CollectionsTestObject.java b/conjure-java-core/src/integrationInput/java/com/palantir/product/CollectionsTestObject.java
diff --git a/conjure-java-core/src/integrationInput/java/com/palantir/product/CovariantListExample.java b/conjure-java-core/src/integrationInput/java/com/palantir/product/CovariantListExample.java
diff --git a/conjure-java-core/src/integrationInput/java/com/palantir/product/ExternalLongExample.java b/conjure-java-core/src/integrationInput/java/com/palantir/product/ExternalLongExample.java
diff --git a/conjure-java-core/src/integrationInput/java/com/palantir/product/ListExample.java b/conjure-java-core/src/integrationInput/java/com/palantir/product/ListExample.java
diff --git a/conjure-java-core/src/integrationInput/java/com/palantir/product/ManyFieldExample.java b/conjure-java-core/src/integrationInput/java/com/palantir/product/ManyFieldExample.java
diff --git a/...ava-core/src/integrationInput/java/com/palantir/product/MultipleFieldsOnlyFinalStage.java b/...ava-core/src/integrationInput/java/com/palantir/product/MultipleFieldsOnlyFinalStage.java
diff --git a/...ure-java-core/src/integrationInput/java/com/palantir/product/SafeExternalLongExample.java b/...ure-java-core/src/integrationInput/java/com/palantir/product/SafeExternalLongExample.java
diff --git a/conjure-java-core/src/integrationInput/java/com/palantir/product/SafeLongExample.java b/conjure-java-core/src/integrationInput/java/com/palantir/product/SafeLongExample.java
diff --git a/conjure-java-core/src/integrationInput/java/com/palantir/product/StrictFourFields.java b/conjure-java-core/src/integrationInput/java/com/palantir/product/StrictFourFields.java
diff --git a/...c/integrationInput/java/com/palantir/product/StrictMultipleDeprecatedAndUnsafeFields.java b/...c/integrationInput/java/com/palantir/product/StrictMultipleDeprecatedAndUnsafeFields.java
diff --git a/...re-java-core/src/integrationInput/java/com/palantir/product/StrictOneCollectionField.java b/...re-java-core/src/integrationInput/java/com/palantir/product/StrictOneCollectionField.java
diff --git a/conjure-java-core/src/integrationInput/java/com/palantir/product/StrictThreeFields.java b/conjure-java-core/src/integrationInput/java/com/palantir/product/StrictThreeFields.java
diff --git a/...core/src/integrationInput/java/test/prefix/com/palantir/product/CovariantListExample.java b/...core/src/integrationInput/java/test/prefix/com/palantir/product/CovariantListExample.java
diff --git a/...-core/src/integrationInput/java/test/prefix/com/palantir/product/ExternalLongExample.java b/...-core/src/integrationInput/java/test/prefix/com/palantir/product/ExternalLongExample.java
diff --git a/...ure-java-core/src/integrationInput/java/test/prefix/com/palantir/product/ListExample.java b/...ure-java-core/src/integrationInput/java/test/prefix/com/palantir/product/ListExample.java
diff --git a/...ava-core/src/integrationInput/java/test/prefix/com/palantir/product/ManyFieldExample.java b/...ava-core/src/integrationInput/java/test/prefix/com/palantir/product/ManyFieldExample.java
diff --git a/...e/src/integrationInput/java/test/prefix/com/palantir/product/SafeExternalLongExample.java b/...e/src/integrationInput/java/test/prefix/com/palantir/product/SafeExternalLongExample.java
diff --git a/...java-core/src/integrationInput/java/test/prefix/com/palantir/product/SafeLongExample.java b/...java-core/src/integrationInput/java/test/prefix/com/palantir/product/SafeLongExample.java
diff --git a/conjure-java-core/src/main/java/com/palantir/conjure/java/types/BeanGenerator.java b/conjure-java-core/src/main/java/com/palantir/conjure/java/types/BeanGenerator.java
@@ -26,6 +26,7 @@
 import com.palantir.conjure.CaseConverter;
 import com.palantir.conjure.java.ConjureAnnotations;
 import com.palantir.conjure.java.Options;
+import com.palantir.conjure.java.lib.internal.ConjureCollections;
 import com.palantir.conjure.java.util.JavaNameSanitizer;
 import com.palantir.conjure.java.util.Javadoc;
 import com.palantir.conjure.java.util.Packages;
@@ -259,7 +260,7 @@ private static MethodSpec createConstructor(Collection<EnrichedField> fields, Co
             // is private and necessarily called from the builder, which does its own defensive copying.
             if (field.conjureDef().getType().accept(TypeVisitor.IS_LIST)) {
                 // TODO(melliot): contribute a fix to JavaPoet that parses $T correctly for a JavaPoet FieldSpec
-                body.addStatement("this.$1N = $2T.unmodifiableList($1N)", spec, Collections.class);
+                body.addStatement("this.$1N = $2T.unmodifiableList($1N)", spec, ConjureCollections.class);
             } else if (field.conjureDef().getType().accept(TypeVisitor.IS_SET)) {
                 body.addStatement("this.$1N = $2T.unmodifiableSet($1N)", spec, Collections.class);
             } else if (field.conjureDef().getType().accept(TypeVisitor.IS_MAP)) {

diff --git a/conjure-lib/src/main/java/com/palantir/conjure/java/lib/internal/ConjureCollections.java b/conjure-lib/src/main/java/com/palantir/conjure/java/lib/internal/ConjureCollections.java
@@ -20,6 +20,7 @@
 import com.palantir.logsafe.Preconditions;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
@@ -37,6 +38,12 @@ private ConjureCollections() {
         // cannot instantiate
     }
 
+    // Simple facade for right now, will be used in a future change
+    // to preserve some Jackson optimizations
+    public static <T> List<T> unmodifiableList(List<T> list) {
+        return Collections.unmodifiableList(list);
+    }
+
     @SuppressWarnings("unchecked")
     public static <T> void addAll(Collection<T> addTo, Iterable<? extends T> elementsToAdd) {
         Preconditions.checkNotNull(elementsToAdd, "elementsToAdd cannot be null");