Restore mutability to previously mutable properties

Author: JordonPhillips

smithy-aws-cloudformation-traits/src/main/java/software/amazon/smithy/aws/cloudformation/traits/CfnResourceProperty.java

@@ -5,6 +5,7 @@
 package software.amazon.smithy.aws.cloudformation.traits;
 
 import java.util.Set;
+import java.util.TreeSet;
 import software.amazon.smithy.aws.cloudformation.traits.CfnResourceIndex.Mutability;
 import software.amazon.smithy.model.shapes.ShapeId;
 import software.amazon.smithy.utils.BuilderRef;
@@ -20,7 +21,7 @@ public final class CfnResourceProperty implements ToSmithyBuilder<CfnResourcePro
     private final boolean hasExplicitMutability;
 
     private CfnResourceProperty(Builder builder) {
-        shapeIds = builder.shapeIds.copy();
+        shapeIds = new TreeSet<>(builder.shapeIds.peek());
         mutabilities = builder.mutabilities.copy();
         hasExplicitMutability = builder.hasExplicitMutability;
     }

smithy-aws-cloudformation/src/main/java/software/amazon/smithy/aws/cloudformation/schema/model/Property.java

@@ -43,7 +43,7 @@ private Property(Builder builder) {
         }
 
         if (!builder.dependencies.peek().isEmpty()) {
-            schemaBuilder.putExtension("dependencies", Node.fromStrings(builder.dependencies.copy()));
+            schemaBuilder.putExtension("dependencies", Node.fromStrings(builder.dependencies.peek()));
         }
 
         this.schema = schemaBuilder.build();

smithy-aws-cloudformation/src/main/java/software/amazon/smithy/aws/cloudformation/schema/model/Remote.java

@@ -5,6 +5,7 @@
 package software.amazon.smithy.aws.cloudformation.schema.model;
 
 import java.util.Map;
+import java.util.TreeMap;
 import software.amazon.smithy.jsonschema.Schema;
 import software.amazon.smithy.model.node.Node;
 import software.amazon.smithy.model.node.NodeMapper;
@@ -25,8 +26,8 @@ public final class Remote implements ToNode, ToSmithyBuilder<Remote> {
     private final Map<String, Property> properties;
 
     private Remote(Builder builder) {
-        definitions = builder.definitions.copy();
-        properties = builder.properties.copy();
+        definitions = new TreeMap<>(builder.definitions.copy());
+        properties = new TreeMap<>(builder.properties.copy());
     }
 
     @Override

smithy-aws-cloudformation/src/main/java/software/amazon/smithy/aws/cloudformation/schema/model/ResourceSchema.java

@@ -12,6 +12,8 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
 import software.amazon.smithy.aws.cloudformation.schema.CfnException;
 import software.amazon.smithy.jsonschema.Schema;
 import software.amazon.smithy.model.node.Node;
@@ -60,15 +62,15 @@ private ResourceSchema(Builder builder) {
         required = builder.required.copy();
         sourceUrl = builder.sourceUrl;
         documentationUrl = builder.documentationUrl;
-        definitions = builder.definitions.copy();
-        readOnlyProperties = builder.readOnlyProperties.copy();
-        writeOnlyProperties = builder.writeOnlyProperties.copy();
-        primaryIdentifier = builder.primaryIdentifier.copy();
-        createOnlyProperties = builder.createOnlyProperties.copy();
-        deprecatedProperties = builder.deprecatedProperties.copy();
+        definitions = new TreeMap<>(builder.definitions.peek());
+        readOnlyProperties = new TreeSet<>(builder.readOnlyProperties.peek());
+        writeOnlyProperties = new TreeSet<>(builder.writeOnlyProperties.peek());
+        primaryIdentifier = new TreeSet<>(builder.primaryIdentifier.peek());
+        createOnlyProperties = new TreeSet<>(builder.createOnlyProperties.peek());
+        deprecatedProperties = new TreeSet<>(builder.deprecatedProperties.peek());
         additionalIdentifiers = builder.additionalIdentifiers.copy();
-        handlers = builder.handlers.copy();
-        remotes = builder.remotes.copy();
+        handlers = new TreeMap<>(builder.handlers.peek());
+        remotes = new TreeMap<>(builder.remotes.peek());
         tagging = builder.tagging;
         additionalProperties = builder.additionalProperties;
     }

smithy-jsonschema/src/main/java/software/amazon/smithy/jsonschema/JsonSchemaConverter.java

@@ -59,7 +59,7 @@ public final class JsonSchemaConverter implements ToSmithyBuilder<JsonSchemaConv
     private final boolean unitTargetedByUnion;
 
     private JsonSchemaConverter(Builder builder) {
-        mappers = builder.mappers.copy();
+        mappers = new ArrayList<>(builder.mappers.peek());
         config = SmithyBuilder.requiredState("config", builder.config);
         propertyNamingStrategy = SmithyBuilder.requiredState("propertyNamingStrategy", builder.propertyNamingStrategy);
 

smithy-jsonschema/src/main/java/software/amazon/smithy/jsonschema/Schema.java

@@ -7,6 +7,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -130,13 +131,13 @@ private Schema(Builder builder) {
         minItems = builder.minItems;
         uniqueItems = builder.uniqueItems;
 
-        properties = builder.properties.copy();
+        properties = new LinkedHashMap<>(builder.properties.peek());
         additionalProperties = builder.additionalProperties;
         required = builder.required.copy();
         maxProperties = builder.maxProperties;
         minProperties = builder.minProperties;
         propertyNames = builder.propertyNames;
-        patternProperties = builder.patternProperties.copy();
+        patternProperties = new LinkedHashMap<>(builder.patternProperties.peek());
 
         allOf = builder.allOf.copy();
         oneOf = builder.oneOf.copy();

smithy-openapi/src/main/java/software/amazon/smithy/openapi/model/Component.java

@@ -75,7 +75,7 @@ public abstract static class Builder<B extends Builder, C extends Component> imp
         private final BuilderRef<Map<String, Node>> extensions = BuilderRef.forSortedMap();
 
         public Map<String, Node> getExtensions() {
-            return extensions.copy();
+            return extensions.get();
         }
 
         @SuppressWarnings("unchecked")

smithy-openapi/src/main/java/software/amazon/smithy/openapi/model/ComponentsObject.java

@@ -5,6 +5,7 @@
 package software.amazon.smithy.openapi.model;
 
 import java.util.Map;
+import java.util.TreeMap;
 import software.amazon.smithy.jsonschema.Schema;
 import software.amazon.smithy.model.node.Node;
 import software.amazon.smithy.model.node.ObjectNode;
@@ -23,14 +24,14 @@ public final class ComponentsObject extends Component implements ToSmithyBuilder
 
     private ComponentsObject(Builder builder) {
         super(builder);
-        schemas = builder.schemas.copy();
-        responses = builder.responses.copy();
-        parameters = builder.parameters.copy();
-        requestBodies = builder.requestBodies.copy();
-        headers = builder.headers.copy();
-        securitySchemes = builder.securitySchemes.copy();
-        links = builder.links.copy();
-        callbacks = builder.callbacks.copy();
+        schemas = new TreeMap<>(builder.schemas.peek());
+        responses = new TreeMap<>(builder.responses.peek());
+        parameters = new TreeMap<>(builder.parameters.peek());
+        requestBodies = new TreeMap<>(builder.requestBodies.peek());
+        headers = new TreeMap<>(builder.headers.peek());
+        securitySchemes = new TreeMap<>(builder.securitySchemes.peek());
+        links = new TreeMap<>(builder.links.peek());
+        callbacks = new TreeMap<>(builder.callbacks.peek());
     }
 
     public static Builder builder() {

smithy-openapi/src/main/java/software/amazon/smithy/openapi/model/EncodingObject.java

@@ -6,6 +6,7 @@
 
 import java.util.Map;
 import java.util.Optional;
+import java.util.TreeMap;
 import software.amazon.smithy.model.node.Node;
 import software.amazon.smithy.model.node.ObjectNode;
 import software.amazon.smithy.utils.BuilderRef;
@@ -20,7 +21,7 @@ public final class EncodingObject extends Component implements ToSmithyBuilder<E
 
     private EncodingObject(Builder builder) {
         super(builder);
-        headers = builder.headers.copy();
+        headers = new TreeMap<>(builder.headers.peek());
         contentType = builder.contentType;
         style = builder.style;
         explode = builder.explode;

smithy-openapi/src/main/java/software/amazon/smithy/openapi/model/LinkObject.java

@@ -6,6 +6,7 @@
 
 import java.util.Map;
 import java.util.Optional;
+import java.util.TreeMap;
 import software.amazon.smithy.model.node.Node;
 import software.amazon.smithy.model.node.ObjectNode;
 import software.amazon.smithy.utils.BuilderRef;
@@ -21,7 +22,7 @@ public final class LinkObject extends Component implements ToSmithyBuilder<LinkO
 
     private LinkObject(Builder builder) {
         super(builder);
-        parameters = builder.parameters.copy();
+        parameters = new TreeMap<>(builder.parameters.peek());
         operationId = builder.operationId;
         operationRef = builder.operationRef;
         requestBody = builder.requestBody;