Skip to content

Commit 384b084

Browse files
kneekey23kneekey23
authored
fix: revert public modifier change (#406)
1 parent 26e62d1 commit 384b084

File tree

7 files changed

+80
-80
lines changed

7 files changed

+80
-80
lines changed

‎smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/StructureGenerator.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ class StructureGenerator(
126126
}
127127

128128
writer.writeAvailableAttribute(model, it)
129-
writer.write("var \$L: \$T", memberName, memberSymbol)
129+
writer.write("public var \$L: \$T", memberName, memberSymbol)
130130
}
131131
}
132132

‎smithy-swift-codegen/src/test/kotlin/HashableShapeTransformerTests.kt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ class HashableShapeTransformerTests {
7070
Assertions.assertNotNull(hashableShapeInput)
7171
val expected = """
7272
public struct HashableShapesInput: Swift.Equatable {
73-
var `set`: Swift.Set<ExampleClientTypes.HashableStructure>?
74-
var bar: Swift.String?
73+
public var `set`: Swift.Set<ExampleClientTypes.HashableStructure>?
74+
public var bar: Swift.String?
7575
7676
public init (
7777
`set`: Swift.Set<ExampleClientTypes.HashableStructure>? = nil,
@@ -90,7 +90,7 @@ class HashableShapeTransformerTests {
9090
Assertions.assertNotNull(hashableShapeOutput)
9191
val expectedOutput = """
9292
public struct HashableShapesOutputResponse: Swift.Equatable {
93-
var quz: Swift.String?
93+
public var quz: Swift.String?
9494
9595
public init (
9696
quz: Swift.String? = nil
@@ -108,8 +108,8 @@ class HashableShapeTransformerTests {
108108
val expectedStructureShape = """
109109
extension ExampleClientTypes {
110110
public struct HashableStructure: Swift.Equatable, Swift.Hashable {
111-
var baz: ExampleClientTypes.NestedHashableStructure?
112-
var foo: Swift.String?
111+
public var baz: ExampleClientTypes.NestedHashableStructure?
112+
public var foo: Swift.String?
113113
114114
public init (
115115
baz: ExampleClientTypes.NestedHashableStructure? = nil,
@@ -131,8 +131,8 @@ class HashableShapeTransformerTests {
131131
val expectedNestedStructureShape = """
132132
extension ExampleClientTypes {
133133
public struct NestedHashableStructure: Swift.Equatable, Swift.Hashable {
134-
var bar: Swift.String?
135-
var quz: Swift.Int?
134+
public var bar: Swift.String?
135+
public var quz: Swift.Int?
136136
137137
public init (
138138
bar: Swift.String? = nil,

‎smithy-swift-codegen/src/test/kotlin/RecursiveShapeBoxerTests.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ internal class RecursiveShapeBoxerTests {
5151
val expected =
5252
"""
5353
public struct RecursiveShapesInput: Swift.Equatable {
54-
var nested: ExampleClientTypes.RecursiveShapesInputOutputNested1?
54+
public var nested: ExampleClientTypes.RecursiveShapesInputOutputNested1?
5555
5656
public init (
5757
nested: ExampleClientTypes.RecursiveShapesInputOutputNested1? = nil
@@ -69,7 +69,7 @@ internal class RecursiveShapeBoxerTests {
6969
val expected2 =
7070
"""
7171
public struct RecursiveShapesOutputResponse: Swift.Equatable {
72-
var nested: ExampleClientTypes.RecursiveShapesInputOutputNested1?
72+
public var nested: ExampleClientTypes.RecursiveShapesInputOutputNested1?
7373
7474
public init (
7575
nested: ExampleClientTypes.RecursiveShapesInputOutputNested1? = nil
@@ -88,8 +88,8 @@ internal class RecursiveShapeBoxerTests {
8888
"""
8989
extension ExampleClientTypes {
9090
public struct RecursiveShapesInputOutputNested1: Swift.Equatable {
91-
var foo: Swift.String?
92-
var nested: Box<ExampleClientTypes.RecursiveShapesInputOutputNested2>?
91+
public var foo: Swift.String?
92+
public var nested: Box<ExampleClientTypes.RecursiveShapesInputOutputNested2>?
9393
9494
public init (
9595
foo: Swift.String? = nil,
@@ -112,8 +112,8 @@ internal class RecursiveShapeBoxerTests {
112112
"""
113113
extension ExampleClientTypes {
114114
public struct RecursiveShapesInputOutputNested2: Swift.Equatable {
115-
var bar: Swift.String?
116-
var recursiveMember: ExampleClientTypes.RecursiveShapesInputOutputNested1?
115+
public var bar: Swift.String?
116+
public var recursiveMember: ExampleClientTypes.RecursiveShapesInputOutputNested1?
117117
118118
public init (
119119
bar: Swift.String? = nil,

‎smithy-swift-codegen/src/test/kotlin/ServiceRenamesTests.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class ServiceRenamesTests {
2222
val expectedContents =
2323
"""
2424
public struct MyTestOperationInput: Swift.Equatable {
25-
var bar: ExampleClientTypes.RenamedGreeting?
25+
public var bar: ExampleClientTypes.RenamedGreeting?
2626
2727
public init (
2828
bar: ExampleClientTypes.RenamedGreeting? = nil
@@ -50,7 +50,7 @@ class ServiceRenamesTests {
5050
val expectedContents =
5151
"""
5252
public struct MyTestOperationOutputResponse: Swift.Equatable {
53-
var baz: ExampleClientTypes.GreetingStruct?
53+
public var baz: ExampleClientTypes.GreetingStruct?
5454
5555
public init (
5656
baz: ExampleClientTypes.GreetingStruct? = nil
@@ -79,7 +79,7 @@ class ServiceRenamesTests {
7979
"""
8080
extension ExampleClientTypes {
8181
public struct GreetingStruct: Swift.Equatable {
82-
var hi: Swift.String?
82+
public var hi: Swift.String?
8383
8484
public init (
8585
hi: Swift.String? = nil
@@ -111,7 +111,7 @@ class ServiceRenamesTests {
111111
"""
112112
extension ExampleClientTypes {
113113
public struct RenamedGreeting: Swift.Equatable {
114-
var salutation: Swift.String?
114+
public var salutation: Swift.String?
115115
116116
public init (
117117
salutation: Swift.String? = nil

‎smithy-swift-codegen/src/test/kotlin/StructEncodeGenerationIsolatedTests.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ class StructEncodeGenerationIsolatedTests {
3535
val expectedContents =
3636
"""
3737
public struct EnumInputInput: Swift.Equatable {
38-
var enumHeader: ExampleClientTypes.MyEnum?
39-
var nestedWithEnum: ExampleClientTypes.NestedEnum?
38+
public var enumHeader: ExampleClientTypes.MyEnum?
39+
public var nestedWithEnum: ExampleClientTypes.NestedEnum?
4040
""".trimIndent()
4141
contents.shouldContainOnlyOnce(expectedContents)
4242
}

‎smithy-swift-codegen/src/test/kotlin/StructureGeneratorTests.kt‎

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ class StructureGeneratorTests {
3636
"""
3737
/// This is documentation about the shape.
3838
public struct MyStruct: Swift.Equatable {
39-
var bar: Swift.Int
39+
public var bar: Swift.Int
4040
/// This is documentation about the member.
41-
var baz: Swift.Int?
42-
var foo: Swift.String?
41+
public var baz: Swift.Int?
42+
public var foo: Swift.String?
4343
4444
public init (
4545
bar: Swift.Int = 0,
@@ -69,21 +69,21 @@ class StructureGeneratorTests {
6969
val expected =
7070
"""
7171
public struct PrimitiveTypesInput: Swift.Equatable {
72-
var booleanVal: Swift.Bool?
73-
var byteVal: Swift.Int8?
74-
var doubleVal: Swift.Double?
75-
var floatVal: Swift.Float?
76-
var intVal: Swift.Int?
77-
var longVal: Swift.Int?
78-
var primitiveBooleanVal: Swift.Bool
79-
var primitiveByteVal: Swift.Int8
80-
var primitiveDoubleVal: Swift.Double
81-
var primitiveFloatVal: Swift.Float
82-
var primitiveIntVal: Swift.Int
83-
var primitiveLongVal: Swift.Int
84-
var primitiveShortVal: Swift.Int16
85-
var shortVal: Swift.Int16?
86-
var str: Swift.String?
72+
public var booleanVal: Swift.Bool?
73+
public var byteVal: Swift.Int8?
74+
public var doubleVal: Swift.Double?
75+
public var floatVal: Swift.Float?
76+
public var intVal: Swift.Int?
77+
public var longVal: Swift.Int?
78+
public var primitiveBooleanVal: Swift.Bool
79+
public var primitiveByteVal: Swift.Int8
80+
public var primitiveDoubleVal: Swift.Double
81+
public var primitiveFloatVal: Swift.Float
82+
public var primitiveIntVal: Swift.Int
83+
public var primitiveLongVal: Swift.Int
84+
public var primitiveShortVal: Swift.Int16
85+
public var shortVal: Swift.Int16?
86+
public var str: Swift.String?
8787
8888
public init (
8989
booleanVal: Swift.Bool? = nil,
@@ -140,8 +140,8 @@ class StructureGeneratorTests {
140140
val expected =
141141
"""
142142
public struct RecursiveShapesInputOutputNested1: Swift.Equatable {
143-
var foo: Swift.String?
144-
var nested: Box<RecursiveShapesInputOutputNested2>?
143+
public var foo: Swift.String?
144+
public var nested: Box<RecursiveShapesInputOutputNested2>?
145145
146146
public init (
147147
foo: Swift.String? = nil,
@@ -154,8 +154,8 @@ public struct RecursiveShapesInputOutputNested1: Swift.Equatable {
154154
}
155155
156156
public struct RecursiveShapesInputOutputNested2: Swift.Equatable {
157-
var bar: Swift.String?
158-
var recursiveMember: RecursiveShapesInputOutputNested1?
157+
public var bar: Swift.String?
158+
public var recursiveMember: RecursiveShapesInputOutputNested1?
159159
160160
public init (
161161
bar: Swift.String? = nil,
@@ -169,7 +169,7 @@ public struct RecursiveShapesInputOutputNested2: Swift.Equatable {
169169
170170
/// This is documentation about the shape.
171171
public struct RecursiveShapesInputOutput: Swift.Equatable {
172-
var nested: RecursiveShapesInputOutputNested1?
172+
public var nested: RecursiveShapesInputOutputNested1?
173173
174174
public init (
175175
nested: RecursiveShapesInputOutputNested1? = nil
@@ -198,8 +198,8 @@ public struct RecursiveShapesInputOutput: Swift.Equatable {
198198
val expected =
199199
"""
200200
public struct RecursiveShapesInputOutputNestedList1: Swift.Equatable {
201-
var foo: Swift.String?
202-
var recursiveList: [RecursiveShapesInputOutputNested2]?
201+
public var foo: Swift.String?
202+
public var recursiveList: [RecursiveShapesInputOutputNested2]?
203203
204204
public init (
205205
foo: Swift.String? = nil,
@@ -212,8 +212,8 @@ public struct RecursiveShapesInputOutputNestedList1: Swift.Equatable {
212212
}
213213
214214
public struct RecursiveShapesInputOutputNested2: Swift.Equatable {
215-
var bar: Swift.String?
216-
var recursiveMember: RecursiveShapesInputOutputNested1?
215+
public var bar: Swift.String?
216+
public var recursiveMember: RecursiveShapesInputOutputNested1?
217217
218218
public init (
219219
bar: Swift.String? = nil,
@@ -227,7 +227,7 @@ public struct RecursiveShapesInputOutputNested2: Swift.Equatable {
227227
228228
/// This is documentation about the shape.
229229
public struct RecursiveShapesInputOutputLists: Swift.Equatable {
230-
var nested: RecursiveShapesInputOutputNested1?
230+
public var nested: RecursiveShapesInputOutputNested1?
231231
232232
public init (
233233
nested: RecursiveShapesInputOutputNested1? = nil
@@ -311,13 +311,13 @@ public struct RecursiveShapesInputOutputLists: Swift.Equatable {
311311
val expectedContents =
312312
"""
313313
public struct JsonListsInput: Swift.Equatable {
314-
var booleanList: [Swift.Bool]?
315-
var integerList: [Swift.Int]?
316-
var nestedStringList: [[Swift.String]]?
317-
var sparseStringList: [Swift.String?]?
318-
var stringList: [Swift.String]?
319-
var stringSet: Swift.Set<Swift.String>?
320-
var timestampList: [ClientRuntime.Date]?
314+
public var booleanList: [Swift.Bool]?
315+
public var integerList: [Swift.Int]?
316+
public var nestedStringList: [[Swift.String]]?
317+
public var sparseStringList: [Swift.String?]?
318+
public var stringList: [Swift.String]?
319+
public var stringSet: Swift.Set<Swift.String>?
320+
public var timestampList: [ClientRuntime.Date]?
321321
322322
public init (
323323
booleanList: [Swift.Bool]? = nil,
@@ -359,14 +359,14 @@ public struct RecursiveShapesInputOutputLists: Swift.Equatable {
359359
val expectedJsonMapsInput =
360360
"""
361361
public struct JsonMapsInput: Swift.Equatable {
362-
var denseBooleanMap: [Swift.String:Swift.Bool]?
363-
var denseNumberMap: [Swift.String:Swift.Int]?
364-
var denseStringMap: [Swift.String:Swift.String]?
365-
var denseStructMap: [Swift.String:ExampleClientTypes.GreetingStruct]?
366-
var sparseBooleanMap: [Swift.String:Swift.Bool?]?
367-
var sparseNumberMap: [Swift.String:Swift.Int?]?
368-
var sparseStringMap: [Swift.String:Swift.String?]?
369-
var sparseStructMap: [Swift.String:ExampleClientTypes.GreetingStruct?]?
362+
public var denseBooleanMap: [Swift.String:Swift.Bool]?
363+
public var denseNumberMap: [Swift.String:Swift.Int]?
364+
public var denseStringMap: [Swift.String:Swift.String]?
365+
public var denseStructMap: [Swift.String:ExampleClientTypes.GreetingStruct]?
366+
public var sparseBooleanMap: [Swift.String:Swift.Bool?]?
367+
public var sparseNumberMap: [Swift.String:Swift.Int?]?
368+
public var sparseStringMap: [Swift.String:Swift.String?]?
369+
public var sparseStructMap: [Swift.String:ExampleClientTypes.GreetingStruct?]?
370370
371371
public init (
372372
denseBooleanMap: [Swift.String:Swift.Bool]? = nil,
@@ -398,14 +398,14 @@ public struct RecursiveShapesInputOutputLists: Swift.Equatable {
398398
val expectedJsonMapsOutput =
399399
"""
400400
public struct JsonMapsOutputResponse: Swift.Equatable {
401-
var denseBooleanMap: [Swift.String:Swift.Bool]?
402-
var denseNumberMap: [Swift.String:Swift.Int]?
403-
var denseStringMap: [Swift.String:Swift.String]?
404-
var denseStructMap: [Swift.String:ExampleClientTypes.GreetingStruct]?
405-
var sparseBooleanMap: [Swift.String:Swift.Bool?]?
406-
var sparseNumberMap: [Swift.String:Swift.Int?]?
407-
var sparseStringMap: [Swift.String:Swift.String?]?
408-
var sparseStructMap: [Swift.String:ExampleClientTypes.GreetingStruct?]?
401+
public var denseBooleanMap: [Swift.String:Swift.Bool]?
402+
public var denseNumberMap: [Swift.String:Swift.Int]?
403+
public var denseStringMap: [Swift.String:Swift.String]?
404+
public var denseStructMap: [Swift.String:ExampleClientTypes.GreetingStruct]?
405+
public var sparseBooleanMap: [Swift.String:Swift.Bool?]?
406+
public var sparseNumberMap: [Swift.String:Swift.Int?]?
407+
public var sparseStringMap: [Swift.String:Swift.String?]?
408+
public var sparseStructMap: [Swift.String:ExampleClientTypes.GreetingStruct?]?
409409
410410
public init (
411411
denseBooleanMap: [Swift.String:Swift.Bool]? = nil,
@@ -474,15 +474,15 @@ public struct RecursiveShapesInputOutputLists: Swift.Equatable {
474474
val structContainsDeprecatedMember = """
475475
@available(*, deprecated, message: "This shape is no longer used. API deprecated since 1.3")
476476
public struct OperationWithDeprecatedTraitInput: Swift.Equatable {
477-
var bool: Swift.Bool?
478-
var foo: ExampleClientTypes.Foo?
479-
var intVal: Swift.Int?
477+
public var bool: Swift.Bool?
478+
public var foo: ExampleClientTypes.Foo?
479+
public var intVal: Swift.Int?
480480
@available(*, deprecated)
481-
var string: Swift.String?
481+
public var string: Swift.String?
482482
@available(*, deprecated, message: " API deprecated since 2019-03-21")
483-
var structSincePropertySet: ExampleClientTypes.StructSincePropertySet?
483+
public var structSincePropertySet: ExampleClientTypes.StructSincePropertySet?
484484
@available(*, deprecated, message: "This shape is no longer used. API deprecated since 1.3")
485-
var structWithDeprecatedTrait: ExampleClientTypes.StructWithDeprecatedTrait?
485+
public var structWithDeprecatedTrait: ExampleClientTypes.StructWithDeprecatedTrait?
486486
""".trimIndent()
487487
structWithDeprecatedTraitMember.shouldContain(structContainsDeprecatedMember)
488488
}
@@ -502,9 +502,9 @@ public struct RecursiveShapesInputOutputLists: Swift.Equatable {
502502
public struct Foo: Swift.Equatable {
503503
/// Test documentation with deprecated
504504
@available(*, deprecated)
505-
var baz: Swift.String?
505+
public var baz: Swift.String?
506506
/// Test documentation with deprecated
507-
var qux: Swift.String?
507+
public var qux: Swift.String?
508508
""".trimIndent()
509509
structWithDeprecatedTraitMember.shouldContain(structContainsDeprecatedMember)
510510
}

‎smithy-swift-codegen/src/test/kotlin/serde/awsjson11/NestedListEncodeJSONGenerationTests.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class NestedListEncodeJSONGenerationTests {
1818
val expectedContents =
1919
"""
2020
public struct ListOfMapsOperationInput: Swift.Equatable {
21-
var targetMaps: [[Swift.String:[Swift.String]]]?
21+
public var targetMaps: [[Swift.String:[Swift.String]]]?
2222
2323
public init (
2424
targetMaps: [[Swift.String:[Swift.String]]]? = nil

0 commit comments

Comments
 (0)