Add nullable support to Swift4#3783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wing328 wants to merge 6 commits into from
Closed

Add nullable support to Swift4 #3783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0029d9a
[Swift] Ignore all Pods/ and Carthage/ under CodegenTests (#4099)
Oct 8, 2019
213efd8
remove pods from git (#4100)
Oct 8, 2019
0c8481b
add nullable support to swift4
wing328 Aug 28, 2019
8b2e25e
update doc, better code format
wing328 Aug 28, 2019
d933a69
remove unused files
Oct 8, 2019
cfeff0c
generate
Oct 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 0 additions & 1 deletion docs/generators/swift4.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@ sidebar_label: swift4
|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
|projectName|Project name in Xcode| |null|
|responseAs|Optionally use libraries to manage response. Currently PromiseKit, RxSwift are available.| |null|
|unwrapRequired|Treat 'required' properties in response as non-optional (which would crash the app if api returns null as opposed to required option specified in json schema| |null|
|objcCompatible|Add additional properties and methods for Objective-C compatibility (default: false)| |null|
|podSource|Source information used for Podspec| |null|
|podVersion|Version used for Podspec| |null|
Expand Down
35 changes: 3 additions & 32 deletions ...les/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,6 @@ public class Swift4Codegen extends DefaultCodegen implements CodegenConfig {

public static final String PROJECT_NAME = "projectName";
public static final String RESPONSE_AS = "responseAs";
public static final String UNWRAP_REQUIRED = "unwrapRequired";
public static final String OBJC_COMPATIBLE = "objcCompatible";
public static final String POD_SOURCE = "podSource";
public static final String POD_AUTHORS = "podAuthors";
Expand DownExpand Up@@ -125,8 +124,8 @@ public Swift4Codegen() {
// Added for Objective-C compatibility
"id", "description", "NSArray", "NSURL", "CGFloat", "NSSet", "NSString", "NSInteger", "NSUInteger",
"NSError", "NSDictionary"
)
);
)
);

reservedWords = new HashSet<>(
Arrays.asList(
Expand DownExpand Up@@ -209,10 +208,6 @@ public Swift4Codegen() {
"Optionally use libraries to manage response. Currently "
+ StringUtils.join(RESPONSE_LIBRARIES, ", ")
+ " are available."));
cliOptions.add(new CliOption(UNWRAP_REQUIRED,
"Treat 'required' properties in response as non-optional "
+ "(which would crash the app if api returns null as opposed "
+ "to required option specified in json schema"));
cliOptions.add(new CliOption(OBJC_COMPATIBLE,
"Add additional properties and methods for Objective-C "
+ "compatibility (default: false)"));
Expand DownExpand Up@@ -330,13 +325,6 @@ public void processOpts() {
}
sourceFolder = projectName + File.separator + sourceFolder;

// Setup unwrapRequired option, which makes all the
// properties with "required" non-optional
if (additionalProperties.containsKey(UNWRAP_REQUIRED)) {
setUnwrapRequired(convertPropertyToBooleanAndWriteBack(UNWRAP_REQUIRED));
}
additionalProperties.put(UNWRAP_REQUIRED, unwrapRequired);

// Setup objcCompatible option, which adds additional properties
// and methods for Objective-C compatibility
if (additionalProperties.containsKey(OBJC_COMPATIBLE)) {
Expand DownExpand Up@@ -712,10 +700,6 @@ public void setProjectName(String projectName) {
this.projectName = projectName;
}

public void setUnwrapRequired(boolean unwrapRequired) {
this.unwrapRequired = unwrapRequired;
}

public void setObjcCompatible(boolean objcCompatible) {
this.objcCompatible = objcCompatible;
}
Expand DownExpand Up@@ -863,22 +847,9 @@ public Map<String, Object> postProcessModels(Map<String, Object> objs) {
public void postProcessModelProperty(CodegenModel model, CodegenProperty property) {
super.postProcessModelProperty(model, property);

// The default template code has the following logic for
// assigning a type as Swift Optional:
//
// {{^unwrapRequired}}?{{/unwrapRequired}}
// {{#unwrapRequired}}{{^required}}?{{/required}}{{/unwrapRequired}}
//
// which means:
//
// boolean isSwiftOptional = !unwrapRequired || (unwrapRequired && !property.required);
//
// We can drop the check for unwrapRequired in (unwrapRequired && !property.required)
// due to short-circuit evaluation of the || operator.
boolean isSwiftOptional = !unwrapRequired || !property.required;
boolean isSwiftScalarType = property.isInteger || property.isLong || property.isFloat
|| property.isDouble || property.isBoolean;
if (isSwiftOptional && isSwiftScalarType) {
if ((!property.required || property.isNullable) && isSwiftScalarType) {
// Optional scalar types like Int?, Int64?, Float?, Double?, and Bool?
// do not translate to Objective-C. So we want to flag those
// properties in case we want to put special code in the templates
Expand Down
8 changes: 6 additions & 2 deletions modules/openapi-generator/src/main/resources/swift4/modelObject.mustache
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,12 +13,16 @@ public struct {{classname}}: Codable {
{{/isEnum}}
{{^isEnum}}
{{#description}}/** {{description}} */
{{/description}}public var {{name}}: {{{datatype}}}{{#unwrapRequired}}?{{/unwrapRequired}}{{^unwrapRequired}}{{^required}}?{{/required}}{{/unwrapRequired}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}{{#objcCompatible}}{{#vendorExtensions.x-swift-optional-scalar}}
{{/description}}public var {{name}}: {{{datatype}}}{{#required}}{{#isNullable}}?{{/isNullable}}{{/required}}{{^required}}?{{/required}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}
{{#objcCompatible}}
{{#vendorExtensions.x-swift-optional-scalar}}
public var {{name}}Num: NSNumber? {
get {
return {{name}}.map({ return NSNumber(value: $0) })
}
}{{/vendorExtensions.x-swift-optional-scalar}}{{/objcCompatible}}
}
{{/vendorExtensions.x-swift-optional-scalar}}
{{/objcCompatible}}
{{/isEnum}}
{{/allVars}}

Expand Down
1 change: 0 additions & 1 deletion ...enapi-generator/src/test/java/org/openapitools/codegen/options/Swift4OptionsProvider.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,6 @@ public Map<String, String> createOptions() {
.put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE)
.put(Swift4Codegen.PROJECT_NAME, PROJECT_NAME_VALUE)
.put(Swift4Codegen.RESPONSE_AS, RESPONSE_AS_VALUE)
.put(Swift4Codegen.UNWRAP_REQUIRED, UNWRAP_REQUIRED_VALUE)
.put(Swift4Codegen.OBJC_COMPATIBLE, OBJC_COMPATIBLE_VALUE)
.put(Swift4Codegen.LENIENT_TYPE_CAST, LENIENT_TYPE_CAST_VALUE)
.put(Swift4Codegen.POD_SOURCE, POD_SOURCE_VALUE)
Expand Down
2 changes: 0 additions & 2 deletions ...es/openapi-generator/src/test/java/org/openapitools/codegen/swift4/Swift4OptionsTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,8 +48,6 @@ protected void setExpectations() {
times = 1;
clientCodegen.setResponseAs(Swift4OptionsProvider.RESPONSE_AS_VALUE.split(","));
times = 1;
clientCodegen.setUnwrapRequired(Boolean.valueOf(Swift4OptionsProvider.UNWRAP_REQUIRED_VALUE));
times = 1;
clientCodegen.setObjcCompatible(Boolean.valueOf(Swift4OptionsProvider.OBJC_COMPATIBLE_VALUE));
times = 1;
clientCodegen.setLenientTypeCast(Boolean.valueOf(Swift4OptionsProvider.LENIENT_TYPE_CAST_VALUE));
Expand Down
5 changes: 0 additions & 5 deletions ...e/swift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-dummy.m
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions ...wift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-prefix.pch
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions ...wift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-umbrella.h
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions ...swift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.modulemap
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions ...petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Info.plist
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions ...ore/swift3/default/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/Info.plist
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions ...efault/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-dummy.m
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions ...ult/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-prefix.pch
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions ...ult/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-umbrella.h
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions ...ault/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.modulemap
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions ...swift3/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Info.plist
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions ...waggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-dummy.m
View file
Open in desktop

This file was deleted.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Add nullable support to Swift4#3783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

wing328
wants to merge
6
commits into

from

 Closed


Add nullable support to Swift4
#3783
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
0029d9a

[Swift] Ignore all Pods/ and Carthage/ under CodegenTests (#4099)

Oct 8, 2019
213efd8

remove pods from git (#4100)

Oct 8, 2019
0c8481b

add nullable support to swift4


wing328 Aug 28, 2019
8b2e25e

update doc, better code format


wing328 Aug 28, 2019
d933a69

remove unused files

Oct 8, 2019
cfeff0c

generate

Oct 8, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

The table of contents is too big for display.

 Diff view

 Diff view

  •  
  •  
  •  

1 change: 0 additions & 1 deletion
docs/generators/swift4.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@ sidebar_label: swift4
|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
|projectName|Project name in Xcode| |null|
|responseAs|Optionally use libraries to manage response. Currently PromiseKit, RxSwift are available.| |null|
|unwrapRequired|Treat 'required' properties in response as non-optional (which would crash the app if api returns null as opposed to required option specified in json schema| |null|
|objcCompatible|Add additional properties and methods for Objective-C compatibility (default: false)| |null|
|podSource|Source information used for Podspec| |null|
|podVersion|Version used for Podspec| |null|
Expand Down

35 changes: 3 additions & 32 deletions
...les/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,6 @@ public class Swift4Codegen extends DefaultCodegen implements CodegenConfig {

 public static final String PROJECT_NAME = "projectName";
 public static final String RESPONSE_AS = "responseAs";
 public static final String UNWRAP_REQUIRED = "unwrapRequired";
 public static final String OBJC_COMPATIBLE = "objcCompatible";
 public static final String POD_SOURCE = "podSource";
 public static final String POD_AUTHORS = "podAuthors";
Expand DownExpand Up@@ -125,8 +124,8 @@ public Swift4Codegen() {
 // Added for Objective-C compatibility
 "id", "description", "NSArray", "NSURL", "CGFloat", "NSSet", "NSString", "NSInteger", "NSUInteger",
 "NSError", "NSDictionary"
)
);
 )
 );

 reservedWords = new HashSet<>(
 Arrays.asList(
Expand DownExpand Up@@ -209,10 +208,6 @@ public Swift4Codegen() {
 "Optionally use libraries to manage response. Currently "
 + StringUtils.join(RESPONSE_LIBRARIES, ", ")
 + " are available."));
 cliOptions.add(new CliOption(UNWRAP_REQUIRED,
 "Treat 'required' properties in response as non-optional "
 + "(which would crash the app if api returns null as opposed "
 + "to required option specified in json schema"));
 cliOptions.add(new CliOption(OBJC_COMPATIBLE,
 "Add additional properties and methods for Objective-C "
 + "compatibility (default: false)"));
Expand DownExpand Up@@ -330,13 +325,6 @@ public void processOpts() {
 }
 sourceFolder = projectName + File.separator + sourceFolder;

 // Setup unwrapRequired option, which makes all the
 // properties with "required" non-optional
 if (additionalProperties.containsKey(UNWRAP_REQUIRED)) {
 setUnwrapRequired(convertPropertyToBooleanAndWriteBack(UNWRAP_REQUIRED));
 }
 additionalProperties.put(UNWRAP_REQUIRED, unwrapRequired);

 // Setup objcCompatible option, which adds additional properties
 // and methods for Objective-C compatibility
 if (additionalProperties.containsKey(OBJC_COMPATIBLE)) {
Expand DownExpand Up@@ -712,10 +700,6 @@ public void setProjectName(String projectName) {
 this.projectName = projectName;
 }

 public void setUnwrapRequired(boolean unwrapRequired) {
 this.unwrapRequired = unwrapRequired;
 }

 public void setObjcCompatible(boolean objcCompatible) {
 this.objcCompatible = objcCompatible;
 }
Expand DownExpand Up@@ -863,22 +847,9 @@ public Map<String, Object> postProcessModels(Map<String, Object> objs) {
 public void postProcessModelProperty(CodegenModel model, CodegenProperty property) {
 super.postProcessModelProperty(model, property);

 // The default template code has the following logic for
 // assigning a type as Swift Optional:
 //
 // {{^unwrapRequired}}?{{/unwrapRequired}}
 // {{#unwrapRequired}}{{^required}}?{{/required}}{{/unwrapRequired}}
 //
 // which means:
 //
 // boolean isSwiftOptional = !unwrapRequired || (unwrapRequired && !property.required);
 //
 // We can drop the check for unwrapRequired in (unwrapRequired && !property.required)
 // due to short-circuit evaluation of the || operator.
 boolean isSwiftOptional = !unwrapRequired || !property.required;
 boolean isSwiftScalarType = property.isInteger || property.isLong || property.isFloat
 || property.isDouble || property.isBoolean;
 if (isSwiftOptional && isSwiftScalarType) {
 if ((!property.required || property.isNullable) && isSwiftScalarType) {
 // Optional scalar types like Int?, Int64?, Float?, Double?, and Bool?
 // do not translate to Objective-C. So we want to flag those
 // properties in case we want to put special code in the templates
Expand Down

8 changes: 6 additions & 2 deletions
modules/openapi-generator/src/main/resources/swift4/modelObject.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,12 +13,16 @@ public struct {{classname}}: Codable {
{{/isEnum}}
{{^isEnum}}
 {{#description}}/** {{description}} */
 {{/description}}public var {{name}}: {{{datatype}}}{{#unwrapRequired}}?{{/unwrapRequired}}{{^unwrapRequired}}{{^required}}?{{/required}}{{/unwrapRequired}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}{{#objcCompatible}}{{#vendorExtensions.x-swift-optional-scalar}}
 {{/description}}public var {{name}}: {{{datatype}}}{{#required}}{{#isNullable}}?{{/isNullable}}{{/required}}{{^required}}?{{/required}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}
 {{#objcCompatible}}
 {{#vendorExtensions.x-swift-optional-scalar}}
 public var {{name}}Num: NSNumber? {
 get {
 return {{name}}.map({ return NSNumber(value: $0) })
 }
 }{{/vendorExtensions.x-swift-optional-scalar}}{{/objcCompatible}}
 }
 {{/vendorExtensions.x-swift-optional-scalar}}
 {{/objcCompatible}}
{{/isEnum}}
{{/allVars}}

Expand Down

1 change: 0 additions & 1 deletion
...enapi-generator/src/test/java/org/openapitools/codegen/options/Swift4OptionsProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,6 @@ public Map<String, String> createOptions() {
 .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE)
 .put(Swift4Codegen.PROJECT_NAME, PROJECT_NAME_VALUE)
 .put(Swift4Codegen.RESPONSE_AS, RESPONSE_AS_VALUE)
 .put(Swift4Codegen.UNWRAP_REQUIRED, UNWRAP_REQUIRED_VALUE)
 .put(Swift4Codegen.OBJC_COMPATIBLE, OBJC_COMPATIBLE_VALUE)
 .put(Swift4Codegen.LENIENT_TYPE_CAST, LENIENT_TYPE_CAST_VALUE)
 .put(Swift4Codegen.POD_SOURCE, POD_SOURCE_VALUE)
Expand Down

2 changes: 0 additions & 2 deletions
...es/openapi-generator/src/test/java/org/openapitools/codegen/swift4/Swift4OptionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,8 +48,6 @@ protected void setExpectations() {
 times = 1;
 clientCodegen.setResponseAs(Swift4OptionsProvider.RESPONSE_AS_VALUE.split(","));
 times = 1;
 clientCodegen.setUnwrapRequired(Boolean.valueOf(Swift4OptionsProvider.UNWRAP_REQUIRED_VALUE));
 times = 1;
 clientCodegen.setObjcCompatible(Boolean.valueOf(Swift4OptionsProvider.OBJC_COMPATIBLE_VALUE));
 times = 1;
 clientCodegen.setLenientTypeCast(Boolean.valueOf(Swift4OptionsProvider.LENIENT_TYPE_CAST_VALUE));
Expand Down

5 changes: 0 additions & 5 deletions
...e/swift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-dummy.m

View file


Open in desktop


This file was deleted.


12 changes: 0 additions & 12 deletions
...wift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-prefix.pch

View file


Open in desktop


This file was deleted.


16 changes: 0 additions & 16 deletions
...wift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-umbrella.h

View file


Open in desktop


This file was deleted.


6 changes: 0 additions & 6 deletions
...swift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.modulemap

View file


Open in desktop


This file was deleted.


26 changes: 0 additions & 26 deletions
...petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Info.plist

View file


Open in desktop


This file was deleted.


26 changes: 0 additions & 26 deletions
...ore/swift3/default/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/Info.plist

View file


Open in desktop


This file was deleted.


5 changes: 0 additions & 5 deletions
...efault/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-dummy.m

View file


Open in desktop


This file was deleted.


12 changes: 0 additions & 12 deletions
...ult/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-prefix.pch

View file


Open in desktop


This file was deleted.


16 changes: 0 additions & 16 deletions
...ult/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-umbrella.h

View file


Open in desktop


This file was deleted.


6 changes: 0 additions & 6 deletions
...ault/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.modulemap

View file


Open in desktop


This file was deleted.


26 changes: 0 additions & 26 deletions
...swift3/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Info.plist

View file


Open in desktop


This file was deleted.


5 changes: 0 additions & 5 deletions
...waggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-dummy.m

View file


Open in desktop


This file was deleted.

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add nullable support to Swift4#3783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

wing328
wants to merge
6
commits into

from

 Closed


Add nullable support to Swift4
#3783
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
0029d9a

[Swift] Ignore all Pods/ and Carthage/ under CodegenTests (#4099)

Oct 8, 2019
213efd8

remove pods from git (#4100)

Oct 8, 2019
0c8481b

add nullable support to swift4


wing328 Aug 28, 2019
8b2e25e

update doc, better code format


wing328 Aug 28, 2019
d933a69

remove unused files

Oct 8, 2019
cfeff0c

generate

Oct 8, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

The table of contents is too big for display.

 Diff view

 Diff view

  •  
  •  
  •  

1 change: 0 additions & 1 deletion
docs/generators/swift4.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@ sidebar_label: swift4
|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
|projectName|Project name in Xcode| |null|
|responseAs|Optionally use libraries to manage response. Currently PromiseKit, RxSwift are available.| |null|
|unwrapRequired|Treat 'required' properties in response as non-optional (which would crash the app if api returns null as opposed to required option specified in json schema| |null|
|objcCompatible|Add additional properties and methods for Objective-C compatibility (default: false)| |null|
|podSource|Source information used for Podspec| |null|
|podVersion|Version used for Podspec| |null|
Expand Down

35 changes: 3 additions & 32 deletions
...les/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,6 @@ public class Swift4Codegen extends DefaultCodegen implements CodegenConfig {

 public static final String PROJECT_NAME = "projectName";
 public static final String RESPONSE_AS = "responseAs";
 public static final String UNWRAP_REQUIRED = "unwrapRequired";
 public static final String OBJC_COMPATIBLE = "objcCompatible";
 public static final String POD_SOURCE = "podSource";
 public static final String POD_AUTHORS = "podAuthors";
Expand DownExpand Up@@ -125,8 +124,8 @@ public Swift4Codegen() {
 // Added for Objective-C compatibility
 "id", "description", "NSArray", "NSURL", "CGFloat", "NSSet", "NSString", "NSInteger", "NSUInteger",
 "NSError", "NSDictionary"
)
);
 )
 );

 reservedWords = new HashSet<>(
 Arrays.asList(
Expand DownExpand Up@@ -209,10 +208,6 @@ public Swift4Codegen() {
 "Optionally use libraries to manage response. Currently "
 + StringUtils.join(RESPONSE_LIBRARIES, ", ")
 + " are available."));
 cliOptions.add(new CliOption(UNWRAP_REQUIRED,
 "Treat 'required' properties in response as non-optional "
 + "(which would crash the app if api returns null as opposed "
 + "to required option specified in json schema"));
 cliOptions.add(new CliOption(OBJC_COMPATIBLE,
 "Add additional properties and methods for Objective-C "
 + "compatibility (default: false)"));
Expand DownExpand Up@@ -330,13 +325,6 @@ public void processOpts() {
 }
 sourceFolder = projectName + File.separator + sourceFolder;

 // Setup unwrapRequired option, which makes all the
 // properties with "required" non-optional
 if (additionalProperties.containsKey(UNWRAP_REQUIRED)) {
 setUnwrapRequired(convertPropertyToBooleanAndWriteBack(UNWRAP_REQUIRED));
 }
 additionalProperties.put(UNWRAP_REQUIRED, unwrapRequired);

 // Setup objcCompatible option, which adds additional properties
 // and methods for Objective-C compatibility
 if (additionalProperties.containsKey(OBJC_COMPATIBLE)) {
Expand DownExpand Up@@ -712,10 +700,6 @@ public void setProjectName(String projectName) {
 this.projectName = projectName;
 }

 public void setUnwrapRequired(boolean unwrapRequired) {
 this.unwrapRequired = unwrapRequired;
 }

 public void setObjcCompatible(boolean objcCompatible) {
 this.objcCompatible = objcCompatible;
 }
Expand DownExpand Up@@ -863,22 +847,9 @@ public Map<String, Object> postProcessModels(Map<String, Object> objs) {
 public void postProcessModelProperty(CodegenModel model, CodegenProperty property) {
 super.postProcessModelProperty(model, property);

 // The default template code has the following logic for
 // assigning a type as Swift Optional:
 //
 // {{^unwrapRequired}}?{{/unwrapRequired}}
 // {{#unwrapRequired}}{{^required}}?{{/required}}{{/unwrapRequired}}
 //
 // which means:
 //
 // boolean isSwiftOptional = !unwrapRequired || (unwrapRequired && !property.required);
 //
 // We can drop the check for unwrapRequired in (unwrapRequired && !property.required)
 // due to short-circuit evaluation of the || operator.
 boolean isSwiftOptional = !unwrapRequired || !property.required;
 boolean isSwiftScalarType = property.isInteger || property.isLong || property.isFloat
 || property.isDouble || property.isBoolean;
 if (isSwiftOptional && isSwiftScalarType) {
 if ((!property.required || property.isNullable) && isSwiftScalarType) {
 // Optional scalar types like Int?, Int64?, Float?, Double?, and Bool?
 // do not translate to Objective-C. So we want to flag those
 // properties in case we want to put special code in the templates
Expand Down

8 changes: 6 additions & 2 deletions
modules/openapi-generator/src/main/resources/swift4/modelObject.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,12 +13,16 @@ public struct {{classname}}: Codable {
{{/isEnum}}
{{^isEnum}}
 {{#description}}/** {{description}} */
 {{/description}}public var {{name}}: {{{datatype}}}{{#unwrapRequired}}?{{/unwrapRequired}}{{^unwrapRequired}}{{^required}}?{{/required}}{{/unwrapRequired}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}{{#objcCompatible}}{{#vendorExtensions.x-swift-optional-scalar}}
 {{/description}}public var {{name}}: {{{datatype}}}{{#required}}{{#isNullable}}?{{/isNullable}}{{/required}}{{^required}}?{{/required}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}
 {{#objcCompatible}}
 {{#vendorExtensions.x-swift-optional-scalar}}
 public var {{name}}Num: NSNumber? {
 get {
 return {{name}}.map({ return NSNumber(value: $0) })
 }
 }{{/vendorExtensions.x-swift-optional-scalar}}{{/objcCompatible}}
 }
 {{/vendorExtensions.x-swift-optional-scalar}}
 {{/objcCompatible}}
{{/isEnum}}
{{/allVars}}

Expand Down

1 change: 0 additions & 1 deletion
...enapi-generator/src/test/java/org/openapitools/codegen/options/Swift4OptionsProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,6 @@ public Map<String, String> createOptions() {
 .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE)
 .put(Swift4Codegen.PROJECT_NAME, PROJECT_NAME_VALUE)
 .put(Swift4Codegen.RESPONSE_AS, RESPONSE_AS_VALUE)
 .put(Swift4Codegen.UNWRAP_REQUIRED, UNWRAP_REQUIRED_VALUE)
 .put(Swift4Codegen.OBJC_COMPATIBLE, OBJC_COMPATIBLE_VALUE)
 .put(Swift4Codegen.LENIENT_TYPE_CAST, LENIENT_TYPE_CAST_VALUE)
 .put(Swift4Codegen.POD_SOURCE, POD_SOURCE_VALUE)
Expand Down

2 changes: 0 additions & 2 deletions
...es/openapi-generator/src/test/java/org/openapitools/codegen/swift4/Swift4OptionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,8 +48,6 @@ protected void setExpectations() {
 times = 1;
 clientCodegen.setResponseAs(Swift4OptionsProvider.RESPONSE_AS_VALUE.split(","));
 times = 1;
 clientCodegen.setUnwrapRequired(Boolean.valueOf(Swift4OptionsProvider.UNWRAP_REQUIRED_VALUE));
 times = 1;
 clientCodegen.setObjcCompatible(Boolean.valueOf(Swift4OptionsProvider.OBJC_COMPATIBLE_VALUE));
 times = 1;
 clientCodegen.setLenientTypeCast(Boolean.valueOf(Swift4OptionsProvider.LENIENT_TYPE_CAST_VALUE));
Expand Down

5 changes: 0 additions & 5 deletions
...e/swift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-dummy.m

View file


Open in desktop


This file was deleted.


12 changes: 0 additions & 12 deletions
...wift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-prefix.pch

View file


Open in desktop


This file was deleted.


16 changes: 0 additions & 16 deletions
...wift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-umbrella.h

View file


Open in desktop


This file was deleted.


6 changes: 0 additions & 6 deletions
...swift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.modulemap

View file


Open in desktop


This file was deleted.


26 changes: 0 additions & 26 deletions
...petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Info.plist

View file


Open in desktop


This file was deleted.


26 changes: 0 additions & 26 deletions
...ore/swift3/default/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/Info.plist

View file


Open in desktop


This file was deleted.


5 changes: 0 additions & 5 deletions
...efault/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-dummy.m

View file


Open in desktop


This file was deleted.


12 changes: 0 additions & 12 deletions
...ult/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-prefix.pch

View file


Open in desktop


This file was deleted.


16 changes: 0 additions & 16 deletions
...ult/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-umbrella.h

View file


Open in desktop


This file was deleted.


6 changes: 0 additions & 6 deletions
...ault/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.modulemap

View file


Open in desktop


This file was deleted.


26 changes: 0 additions & 26 deletions
...swift3/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Info.plist

View file


Open in desktop


This file was deleted.


5 changes: 0 additions & 5 deletions
...waggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-dummy.m

View file


Open in desktop


This file was deleted.

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add nullable support to Swift4#3783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

wing328
wants to merge
6
commits into

from

 Closed


Add nullable support to Swift4
#3783
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
0029d9a

[Swift] Ignore all Pods/ and Carthage/ under CodegenTests (#4099)

Oct 8, 2019
213efd8

remove pods from git (#4100)

Oct 8, 2019
0c8481b

add nullable support to swift4


wing328 Aug 28, 2019
8b2e25e

update doc, better code format


wing328 Aug 28, 2019
d933a69

remove unused files

Oct 8, 2019
cfeff0c

generate

Oct 8, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

The table of contents is too big for display.

 Diff view

 Diff view

  •  
  •  
  •  

1 change: 0 additions & 1 deletion
docs/generators/swift4.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@ sidebar_label: swift4
|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
|projectName|Project name in Xcode| |null|
|responseAs|Optionally use libraries to manage response. Currently PromiseKit, RxSwift are available.| |null|
|unwrapRequired|Treat 'required' properties in response as non-optional (which would crash the app if api returns null as opposed to required option specified in json schema| |null|
|objcCompatible|Add additional properties and methods for Objective-C compatibility (default: false)| |null|
|podSource|Source information used for Podspec| |null|
|podVersion|Version used for Podspec| |null|
Expand Down

35 changes: 3 additions & 32 deletions
...les/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,6 @@ public class Swift4Codegen extends DefaultCodegen implements CodegenConfig {

 public static final String PROJECT_NAME = "projectName";
 public static final String RESPONSE_AS = "responseAs";
 public static final String UNWRAP_REQUIRED = "unwrapRequired";
 public static final String OBJC_COMPATIBLE = "objcCompatible";
 public static final String POD_SOURCE = "podSource";
 public static final String POD_AUTHORS = "podAuthors";
Expand DownExpand Up@@ -125,8 +124,8 @@ public Swift4Codegen() {
 // Added for Objective-C compatibility
 "id", "description", "NSArray", "NSURL", "CGFloat", "NSSet", "NSString", "NSInteger", "NSUInteger",
 "NSError", "NSDictionary"
)
);
 )
 );

 reservedWords = new HashSet<>(
 Arrays.asList(
Expand DownExpand Up@@ -209,10 +208,6 @@ public Swift4Codegen() {
 "Optionally use libraries to manage response. Currently "
 + StringUtils.join(RESPONSE_LIBRARIES, ", ")
 + " are available."));
 cliOptions.add(new CliOption(UNWRAP_REQUIRED,
 "Treat 'required' properties in response as non-optional "
 + "(which would crash the app if api returns null as opposed "
 + "to required option specified in json schema"));
 cliOptions.add(new CliOption(OBJC_COMPATIBLE,
 "Add additional properties and methods for Objective-C "
 + "compatibility (default: false)"));
Expand DownExpand Up@@ -330,13 +325,6 @@ public void processOpts() {
 }
 sourceFolder = projectName + File.separator + sourceFolder;

 // Setup unwrapRequired option, which makes all the
 // properties with "required" non-optional
 if (additionalProperties.containsKey(UNWRAP_REQUIRED)) {
 setUnwrapRequired(convertPropertyToBooleanAndWriteBack(UNWRAP_REQUIRED));
 }
 additionalProperties.put(UNWRAP_REQUIRED, unwrapRequired);

 // Setup objcCompatible option, which adds additional properties
 // and methods for Objective-C compatibility
 if (additionalProperties.containsKey(OBJC_COMPATIBLE)) {
Expand DownExpand Up@@ -712,10 +700,6 @@ public void setProjectName(String projectName) {
 this.projectName = projectName;
 }

 public void setUnwrapRequired(boolean unwrapRequired) {
 this.unwrapRequired = unwrapRequired;
 }

 public void setObjcCompatible(boolean objcCompatible) {
 this.objcCompatible = objcCompatible;
 }
Expand DownExpand Up@@ -863,22 +847,9 @@ public Map<String, Object> postProcessModels(Map<String, Object> objs) {
 public void postProcessModelProperty(CodegenModel model, CodegenProperty property) {
 super.postProcessModelProperty(model, property);

 // The default template code has the following logic for
 // assigning a type as Swift Optional:
 //
 // {{^unwrapRequired}}?{{/unwrapRequired}}
 // {{#unwrapRequired}}{{^required}}?{{/required}}{{/unwrapRequired}}
 //
 // which means:
 //
 // boolean isSwiftOptional = !unwrapRequired || (unwrapRequired && !property.required);
 //
 // We can drop the check for unwrapRequired in (unwrapRequired && !property.required)
 // due to short-circuit evaluation of the || operator.
 boolean isSwiftOptional = !unwrapRequired || !property.required;
 boolean isSwiftScalarType = property.isInteger || property.isLong || property.isFloat
 || property.isDouble || property.isBoolean;
 if (isSwiftOptional && isSwiftScalarType) {
 if ((!property.required || property.isNullable) && isSwiftScalarType) {
 // Optional scalar types like Int?, Int64?, Float?, Double?, and Bool?
 // do not translate to Objective-C. So we want to flag those
 // properties in case we want to put special code in the templates
Expand Down

8 changes: 6 additions & 2 deletions
modules/openapi-generator/src/main/resources/swift4/modelObject.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,12 +13,16 @@ public struct {{classname}}: Codable {
{{/isEnum}}
{{^isEnum}}
 {{#description}}/** {{description}} */
 {{/description}}public var {{name}}: {{{datatype}}}{{#unwrapRequired}}?{{/unwrapRequired}}{{^unwrapRequired}}{{^required}}?{{/required}}{{/unwrapRequired}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}{{#objcCompatible}}{{#vendorExtensions.x-swift-optional-scalar}}
 {{/description}}public var {{name}}: {{{datatype}}}{{#required}}{{#isNullable}}?{{/isNullable}}{{/required}}{{^required}}?{{/required}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}
 {{#objcCompatible}}
 {{#vendorExtensions.x-swift-optional-scalar}}
 public var {{name}}Num: NSNumber? {
 get {
 return {{name}}.map({ return NSNumber(value: $0) })
 }
 }{{/vendorExtensions.x-swift-optional-scalar}}{{/objcCompatible}}
 }
 {{/vendorExtensions.x-swift-optional-scalar}}
 {{/objcCompatible}}
{{/isEnum}}
{{/allVars}}

Expand Down

1 change: 0 additions & 1 deletion
...enapi-generator/src/test/java/org/openapitools/codegen/options/Swift4OptionsProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,6 @@ public Map<String, String> createOptions() {
 .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE)
 .put(Swift4Codegen.PROJECT_NAME, PROJECT_NAME_VALUE)
 .put(Swift4Codegen.RESPONSE_AS, RESPONSE_AS_VALUE)
 .put(Swift4Codegen.UNWRAP_REQUIRED, UNWRAP_REQUIRED_VALUE)
 .put(Swift4Codegen.OBJC_COMPATIBLE, OBJC_COMPATIBLE_VALUE)
 .put(Swift4Codegen.LENIENT_TYPE_CAST, LENIENT_TYPE_CAST_VALUE)
 .put(Swift4Codegen.POD_SOURCE, POD_SOURCE_VALUE)
Expand Down

2 changes: 0 additions & 2 deletions
...es/openapi-generator/src/test/java/org/openapitools/codegen/swift4/Swift4OptionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,8 +48,6 @@ protected void setExpectations() {
 times = 1;
 clientCodegen.setResponseAs(Swift4OptionsProvider.RESPONSE_AS_VALUE.split(","));
 times = 1;
 clientCodegen.setUnwrapRequired(Boolean.valueOf(Swift4OptionsProvider.UNWRAP_REQUIRED_VALUE));
 times = 1;
 clientCodegen.setObjcCompatible(Boolean.valueOf(Swift4OptionsProvider.OBJC_COMPATIBLE_VALUE));
 times = 1;
 clientCodegen.setLenientTypeCast(Boolean.valueOf(Swift4OptionsProvider.LENIENT_TYPE_CAST_VALUE));
Expand Down

5 changes: 0 additions & 5 deletions
...e/swift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-dummy.m

View file


Open in desktop


This file was deleted.


12 changes: 0 additions & 12 deletions
...wift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-prefix.pch

View file


Open in desktop


This file was deleted.


16 changes: 0 additions & 16 deletions
...wift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-umbrella.h

View file


Open in desktop


This file was deleted.


6 changes: 0 additions & 6 deletions
...swift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.modulemap

View file


Open in desktop


This file was deleted.


26 changes: 0 additions & 26 deletions
...petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Info.plist

View file


Open in desktop


This file was deleted.


26 changes: 0 additions & 26 deletions
...ore/swift3/default/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/Info.plist

View file


Open in desktop


This file was deleted.


5 changes: 0 additions & 5 deletions
...efault/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-dummy.m

View file


Open in desktop


This file was deleted.


12 changes: 0 additions & 12 deletions
...ult/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-prefix.pch

View file


Open in desktop


This file was deleted.


16 changes: 0 additions & 16 deletions
...ult/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-umbrella.h

View file


Open in desktop


This file was deleted.


6 changes: 0 additions & 6 deletions
...ault/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.modulemap

View file


Open in desktop


This file was deleted.


26 changes: 0 additions & 26 deletions
...swift3/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Info.plist

View file


Open in desktop


This file was deleted.


5 changes: 0 additions & 5 deletions
...waggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-dummy.m

View file


Open in desktop


This file was deleted.

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Add nullable support to Swift4#3783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

wing328
wants to merge
6
commits into

from

 Closed


Add nullable support to Swift4
#3783
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
0029d9a

[Swift] Ignore all Pods/ and Carthage/ under CodegenTests (#4099)

Oct 8, 2019
213efd8

remove pods from git (#4100)

Oct 8, 2019
0c8481b

add nullable support to swift4


wing328 Aug 28, 2019
8b2e25e

update doc, better code format


wing328 Aug 28, 2019
d933a69

remove unused files

Oct 8, 2019
cfeff0c

generate

Oct 8, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

The table of contents is too big for display.

 Diff view

 Diff view

  •  
  •  
  •  

1 change: 0 additions & 1 deletion
docs/generators/swift4.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@ sidebar_label: swift4
|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
|projectName|Project name in Xcode| |null|
|responseAs|Optionally use libraries to manage response. Currently PromiseKit, RxSwift are available.| |null|
|unwrapRequired|Treat 'required' properties in response as non-optional (which would crash the app if api returns null as opposed to required option specified in json schema| |null|
|objcCompatible|Add additional properties and methods for Objective-C compatibility (default: false)| |null|
|podSource|Source information used for Podspec| |null|
|podVersion|Version used for Podspec| |null|
Expand Down

35 changes: 3 additions & 32 deletions
...les/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,6 @@ public class Swift4Codegen extends DefaultCodegen implements CodegenConfig {

 public static final String PROJECT_NAME = "projectName";
 public static final String RESPONSE_AS = "responseAs";
 public static final String UNWRAP_REQUIRED = "unwrapRequired";
 public static final String OBJC_COMPATIBLE = "objcCompatible";
 public static final String POD_SOURCE = "podSource";
 public static final String POD_AUTHORS = "podAuthors";
Expand DownExpand Up@@ -125,8 +124,8 @@ public Swift4Codegen() {
 // Added for Objective-C compatibility
 "id", "description", "NSArray", "NSURL", "CGFloat", "NSSet", "NSString", "NSInteger", "NSUInteger",
 "NSError", "NSDictionary"
)
);
 )
 );

 reservedWords = new HashSet<>(
 Arrays.asList(
Expand DownExpand Up@@ -209,10 +208,6 @@ public Swift4Codegen() {
 "Optionally use libraries to manage response. Currently "
 + StringUtils.join(RESPONSE_LIBRARIES, ", ")
 + " are available."));
 cliOptions.add(new CliOption(UNWRAP_REQUIRED,
 "Treat 'required' properties in response as non-optional "
 + "(which would crash the app if api returns null as opposed "
 + "to required option specified in json schema"));
 cliOptions.add(new CliOption(OBJC_COMPATIBLE,
 "Add additional properties and methods for Objective-C "
 + "compatibility (default: false)"));
Expand DownExpand Up@@ -330,13 +325,6 @@ public void processOpts() {
 }
 sourceFolder = projectName + File.separator + sourceFolder;

 // Setup unwrapRequired option, which makes all the
 // properties with "required" non-optional
 if (additionalProperties.containsKey(UNWRAP_REQUIRED)) {
 setUnwrapRequired(convertPropertyToBooleanAndWriteBack(UNWRAP_REQUIRED));
 }
 additionalProperties.put(UNWRAP_REQUIRED, unwrapRequired);

 // Setup objcCompatible option, which adds additional properties
 // and methods for Objective-C compatibility
 if (additionalProperties.containsKey(OBJC_COMPATIBLE)) {
Expand DownExpand Up@@ -712,10 +700,6 @@ public void setProjectName(String projectName) {
 this.projectName = projectName;
 }

 public void setUnwrapRequired(boolean unwrapRequired) {
 this.unwrapRequired = unwrapRequired;
 }

 public void setObjcCompatible(boolean objcCompatible) {
 this.objcCompatible = objcCompatible;
 }
Expand DownExpand Up@@ -863,22 +847,9 @@ public Map<String, Object> postProcessModels(Map<String, Object> objs) {
 public void postProcessModelProperty(CodegenModel model, CodegenProperty property) {
 super.postProcessModelProperty(model, property);

 // The default template code has the following logic for
 // assigning a type as Swift Optional:
 //
 // {{^unwrapRequired}}?{{/unwrapRequired}}
 // {{#unwrapRequired}}{{^required}}?{{/required}}{{/unwrapRequired}}
 //
 // which means:
 //
 // boolean isSwiftOptional = !unwrapRequired || (unwrapRequired && !property.required);
 //
 // We can drop the check for unwrapRequired in (unwrapRequired && !property.required)
 // due to short-circuit evaluation of the || operator.
 boolean isSwiftOptional = !unwrapRequired || !property.required;
 boolean isSwiftScalarType = property.isInteger || property.isLong || property.isFloat
 || property.isDouble || property.isBoolean;
 if (isSwiftOptional && isSwiftScalarType) {
 if ((!property.required || property.isNullable) && isSwiftScalarType) {
 // Optional scalar types like Int?, Int64?, Float?, Double?, and Bool?
 // do not translate to Objective-C. So we want to flag those
 // properties in case we want to put special code in the templates
Expand Down

8 changes: 6 additions & 2 deletions
modules/openapi-generator/src/main/resources/swift4/modelObject.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,12 +13,16 @@ public struct {{classname}}: Codable {
{{/isEnum}}
{{^isEnum}}
 {{#description}}/** {{description}} */
 {{/description}}public var {{name}}: {{{datatype}}}{{#unwrapRequired}}?{{/unwrapRequired}}{{^unwrapRequired}}{{^required}}?{{/required}}{{/unwrapRequired}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}{{#objcCompatible}}{{#vendorExtensions.x-swift-optional-scalar}}
 {{/description}}public var {{name}}: {{{datatype}}}{{#required}}{{#isNullable}}?{{/isNullable}}{{/required}}{{^required}}?{{/required}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}
 {{#objcCompatible}}
 {{#vendorExtensions.x-swift-optional-scalar}}
 public var {{name}}Num: NSNumber? {
 get {
 return {{name}}.map({ return NSNumber(value: $0) })
 }
 }{{/vendorExtensions.x-swift-optional-scalar}}{{/objcCompatible}}
 }
 {{/vendorExtensions.x-swift-optional-scalar}}
 {{/objcCompatible}}
{{/isEnum}}
{{/allVars}}

Expand Down

1 change: 0 additions & 1 deletion
...enapi-generator/src/test/java/org/openapitools/codegen/options/Swift4OptionsProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,6 @@ public Map<String, String> createOptions() {
 .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE)
 .put(Swift4Codegen.PROJECT_NAME, PROJECT_NAME_VALUE)
 .put(Swift4Codegen.RESPONSE_AS, RESPONSE_AS_VALUE)
 .put(Swift4Codegen.UNWRAP_REQUIRED, UNWRAP_REQUIRED_VALUE)
 .put(Swift4Codegen.OBJC_COMPATIBLE, OBJC_COMPATIBLE_VALUE)
 .put(Swift4Codegen.LENIENT_TYPE_CAST, LENIENT_TYPE_CAST_VALUE)
 .put(Swift4Codegen.POD_SOURCE, POD_SOURCE_VALUE)
Expand Down

2 changes: 0 additions & 2 deletions
...es/openapi-generator/src/test/java/org/openapitools/codegen/swift4/Swift4OptionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,8 +48,6 @@ protected void setExpectations() {
 times = 1;
 clientCodegen.setResponseAs(Swift4OptionsProvider.RESPONSE_AS_VALUE.split(","));
 times = 1;
 clientCodegen.setUnwrapRequired(Boolean.valueOf(Swift4OptionsProvider.UNWRAP_REQUIRED_VALUE));
 times = 1;
 clientCodegen.setObjcCompatible(Boolean.valueOf(Swift4OptionsProvider.OBJC_COMPATIBLE_VALUE));
 times = 1;
 clientCodegen.setLenientTypeCast(Boolean.valueOf(Swift4OptionsProvider.LENIENT_TYPE_CAST_VALUE));
Expand Down

5 changes: 0 additions & 5 deletions
...e/swift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-dummy.m

View file


Open in desktop


This file was deleted.


12 changes: 0 additions & 12 deletions
...wift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-prefix.pch

View file


Open in desktop


This file was deleted.


16 changes: 0 additions & 16 deletions
...wift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-umbrella.h

View file


Open in desktop


This file was deleted.


6 changes: 0 additions & 6 deletions
...swift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.modulemap

View file


Open in desktop


This file was deleted.


26 changes: 0 additions & 26 deletions
...petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Info.plist

View file


Open in desktop


This file was deleted.


26 changes: 0 additions & 26 deletions
...ore/swift3/default/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/Info.plist

View file


Open in desktop


This file was deleted.


5 changes: 0 additions & 5 deletions
...efault/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-dummy.m

View file


Open in desktop


This file was deleted.


12 changes: 0 additions & 12 deletions
...ult/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-prefix.pch

View file


Open in desktop


This file was deleted.


16 changes: 0 additions & 16 deletions
...ult/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-umbrella.h

View file


Open in desktop


This file was deleted.


6 changes: 0 additions & 6 deletions
...ault/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.modulemap

View file


Open in desktop


This file was deleted.


26 changes: 0 additions & 26 deletions
...swift3/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Info.plist

View file


Open in desktop


This file was deleted.


5 changes: 0 additions & 5 deletions
...waggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-dummy.m

View file


Open in desktop


This file was deleted.

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add nullable support to Swift4#3783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

wing328
wants to merge
6
commits into

from

 Closed


Add nullable support to Swift4
#3783
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
0029d9a

[Swift] Ignore all Pods/ and Carthage/ under CodegenTests (#4099)

Oct 8, 2019
213efd8

remove pods from git (#4100)

Oct 8, 2019
0c8481b

add nullable support to swift4


wing328 Aug 28, 2019
8b2e25e

update doc, better code format


wing328 Aug 28, 2019
d933a69

remove unused files

Oct 8, 2019
cfeff0c

generate

Oct 8, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

The table of contents is too big for display.

 Diff view

 Diff view

  •  
  •  
  •  

1 change: 0 additions & 1 deletion
docs/generators/swift4.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@ sidebar_label: swift4
|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
|projectName|Project name in Xcode| |null|
|responseAs|Optionally use libraries to manage response. Currently PromiseKit, RxSwift are available.| |null|
|unwrapRequired|Treat 'required' properties in response as non-optional (which would crash the app if api returns null as opposed to required option specified in json schema| |null|
|objcCompatible|Add additional properties and methods for Objective-C compatibility (default: false)| |null|
|podSource|Source information used for Podspec| |null|
|podVersion|Version used for Podspec| |null|
Expand Down

35 changes: 3 additions & 32 deletions
...les/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,6 @@ public class Swift4Codegen extends DefaultCodegen implements CodegenConfig {

 public static final String PROJECT_NAME = "projectName";
 public static final String RESPONSE_AS = "responseAs";
 public static final String UNWRAP_REQUIRED = "unwrapRequired";
 public static final String OBJC_COMPATIBLE = "objcCompatible";
 public static final String POD_SOURCE = "podSource";
 public static final String POD_AUTHORS = "podAuthors";
Expand DownExpand Up@@ -125,8 +124,8 @@ public Swift4Codegen() {
 // Added for Objective-C compatibility
 "id", "description", "NSArray", "NSURL", "CGFloat", "NSSet", "NSString", "NSInteger", "NSUInteger",
 "NSError", "NSDictionary"
)
);
 )
 );

 reservedWords = new HashSet<>(
 Arrays.asList(
Expand DownExpand Up@@ -209,10 +208,6 @@ public Swift4Codegen() {
 "Optionally use libraries to manage response. Currently "
 + StringUtils.join(RESPONSE_LIBRARIES, ", ")
 + " are available."));
 cliOptions.add(new CliOption(UNWRAP_REQUIRED,
 "Treat 'required' properties in response as non-optional "
 + "(which would crash the app if api returns null as opposed "
 + "to required option specified in json schema"));
 cliOptions.add(new CliOption(OBJC_COMPATIBLE,
 "Add additional properties and methods for Objective-C "
 + "compatibility (default: false)"));
Expand DownExpand Up@@ -330,13 +325,6 @@ public void processOpts() {
 }
 sourceFolder = projectName + File.separator + sourceFolder;

 // Setup unwrapRequired option, which makes all the
 // properties with "required" non-optional
 if (additionalProperties.containsKey(UNWRAP_REQUIRED)) {
 setUnwrapRequired(convertPropertyToBooleanAndWriteBack(UNWRAP_REQUIRED));
 }
 additionalProperties.put(UNWRAP_REQUIRED, unwrapRequired);

 // Setup objcCompatible option, which adds additional properties
 // and methods for Objective-C compatibility
 if (additionalProperties.containsKey(OBJC_COMPATIBLE)) {
Expand DownExpand Up@@ -712,10 +700,6 @@ public void setProjectName(String projectName) {
 this.projectName = projectName;
 }

 public void setUnwrapRequired(boolean unwrapRequired) {
 this.unwrapRequired = unwrapRequired;
 }

 public void setObjcCompatible(boolean objcCompatible) {
 this.objcCompatible = objcCompatible;
 }
Expand DownExpand Up@@ -863,22 +847,9 @@ public Map<String, Object> postProcessModels(Map<String, Object> objs) {
 public void postProcessModelProperty(CodegenModel model, CodegenProperty property) {
 super.postProcessModelProperty(model, property);

 // The default template code has the following logic for
 // assigning a type as Swift Optional:
 //
 // {{^unwrapRequired}}?{{/unwrapRequired}}
 // {{#unwrapRequired}}{{^required}}?{{/required}}{{/unwrapRequired}}
 //
 // which means:
 //
 // boolean isSwiftOptional = !unwrapRequired || (unwrapRequired && !property.required);
 //
 // We can drop the check for unwrapRequired in (unwrapRequired && !property.required)
 // due to short-circuit evaluation of the || operator.
 boolean isSwiftOptional = !unwrapRequired || !property.required;
 boolean isSwiftScalarType = property.isInteger || property.isLong || property.isFloat
 || property.isDouble || property.isBoolean;
 if (isSwiftOptional && isSwiftScalarType) {
 if ((!property.required || property.isNullable) && isSwiftScalarType) {
 // Optional scalar types like Int?, Int64?, Float?, Double?, and Bool?
 // do not translate to Objective-C. So we want to flag those
 // properties in case we want to put special code in the templates
Expand Down

8 changes: 6 additions & 2 deletions
modules/openapi-generator/src/main/resources/swift4/modelObject.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,12 +13,16 @@ public struct {{classname}}: Codable {
{{/isEnum}}
{{^isEnum}}
 {{#description}}/** {{description}} */
 {{/description}}public var {{name}}: {{{datatype}}}{{#unwrapRequired}}?{{/unwrapRequired}}{{^unwrapRequired}}{{^required}}?{{/required}}{{/unwrapRequired}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}{{#objcCompatible}}{{#vendorExtensions.x-swift-optional-scalar}}
 {{/description}}public var {{name}}: {{{datatype}}}{{#required}}{{#isNullable}}?{{/isNullable}}{{/required}}{{^required}}?{{/required}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}
 {{#objcCompatible}}
 {{#vendorExtensions.x-swift-optional-scalar}}
 public var {{name}}Num: NSNumber? {
 get {
 return {{name}}.map({ return NSNumber(value: $0) })
 }
 }{{/vendorExtensions.x-swift-optional-scalar}}{{/objcCompatible}}
 }
 {{/vendorExtensions.x-swift-optional-scalar}}
 {{/objcCompatible}}
{{/isEnum}}
{{/allVars}}

Expand Down

1 change: 0 additions & 1 deletion
...enapi-generator/src/test/java/org/openapitools/codegen/options/Swift4OptionsProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,6 @@ public Map<String, String> createOptions() {
 .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE)
 .put(Swift4Codegen.PROJECT_NAME, PROJECT_NAME_VALUE)
 .put(Swift4Codegen.RESPONSE_AS, RESPONSE_AS_VALUE)
 .put(Swift4Codegen.UNWRAP_REQUIRED, UNWRAP_REQUIRED_VALUE)
 .put(Swift4Codegen.OBJC_COMPATIBLE, OBJC_COMPATIBLE_VALUE)
 .put(Swift4Codegen.LENIENT_TYPE_CAST, LENIENT_TYPE_CAST_VALUE)
 .put(Swift4Codegen.POD_SOURCE, POD_SOURCE_VALUE)
Expand Down

2 changes: 0 additions & 2 deletions
...es/openapi-generator/src/test/java/org/openapitools/codegen/swift4/Swift4OptionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,8 +48,6 @@ protected void setExpectations() {
 times = 1;
 clientCodegen.setResponseAs(Swift4OptionsProvider.RESPONSE_AS_VALUE.split(","));
 times = 1;
 clientCodegen.setUnwrapRequired(Boolean.valueOf(Swift4OptionsProvider.UNWRAP_REQUIRED_VALUE));
 times = 1;
 clientCodegen.setObjcCompatible(Boolean.valueOf(Swift4OptionsProvider.OBJC_COMPATIBLE_VALUE));
 times = 1;
 clientCodegen.setLenientTypeCast(Boolean.valueOf(Swift4OptionsProvider.LENIENT_TYPE_CAST_VALUE));
Expand Down

5 changes: 0 additions & 5 deletions
...e/swift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-dummy.m

View file


Open in desktop


This file was deleted.


12 changes: 0 additions & 12 deletions
...wift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-prefix.pch

View file


Open in desktop


This file was deleted.


16 changes: 0 additions & 16 deletions
...wift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-umbrella.h

View file


Open in desktop


This file was deleted.


6 changes: 0 additions & 6 deletions
...swift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.modulemap

View file


Open in desktop


This file was deleted.


26 changes: 0 additions & 26 deletions
...petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Info.plist

View file


Open in desktop


This file was deleted.


26 changes: 0 additions & 26 deletions
...ore/swift3/default/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/Info.plist

View file


Open in desktop


This file was deleted.


5 changes: 0 additions & 5 deletions
...efault/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-dummy.m

View file


Open in desktop


This file was deleted.


12 changes: 0 additions & 12 deletions
...ult/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-prefix.pch

View file


Open in desktop


This file was deleted.


16 changes: 0 additions & 16 deletions
...ult/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-umbrella.h

View file


Open in desktop


This file was deleted.


6 changes: 0 additions & 6 deletions
...ault/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.modulemap

View file


Open in desktop


This file was deleted.


26 changes: 0 additions & 26 deletions
...swift3/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Info.plist

View file


Open in desktop


This file was deleted.


5 changes: 0 additions & 5 deletions
...waggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-dummy.m

View file


Open in desktop


This file was deleted.

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add nullable support to Swift4#3783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

wing328
wants to merge
6
commits into

from

 Closed


Add nullable support to Swift4
#3783
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
0029d9a

[Swift] Ignore all Pods/ and Carthage/ under CodegenTests (#4099)

Oct 8, 2019
213efd8

remove pods from git (#4100)

Oct 8, 2019
0c8481b

add nullable support to swift4


wing328 Aug 28, 2019
8b2e25e

update doc, better code format


wing328 Aug 28, 2019
d933a69

remove unused files

Oct 8, 2019
cfeff0c

generate

Oct 8, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

The table of contents is too big for display.

 Diff view

 Diff view

  •  
  •  
  •  

1 change: 0 additions & 1 deletion
docs/generators/swift4.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@ sidebar_label: swift4
|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
|projectName|Project name in Xcode| |null|
|responseAs|Optionally use libraries to manage response. Currently PromiseKit, RxSwift are available.| |null|
|unwrapRequired|Treat 'required' properties in response as non-optional (which would crash the app if api returns null as opposed to required option specified in json schema| |null|
|objcCompatible|Add additional properties and methods for Objective-C compatibility (default: false)| |null|
|podSource|Source information used for Podspec| |null|
|podVersion|Version used for Podspec| |null|
Expand Down

35 changes: 3 additions & 32 deletions
...les/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,6 @@ public class Swift4Codegen extends DefaultCodegen implements CodegenConfig {

 public static final String PROJECT_NAME = "projectName";
 public static final String RESPONSE_AS = "responseAs";
 public static final String UNWRAP_REQUIRED = "unwrapRequired";
 public static final String OBJC_COMPATIBLE = "objcCompatible";
 public static final String POD_SOURCE = "podSource";
 public static final String POD_AUTHORS = "podAuthors";
Expand DownExpand Up@@ -125,8 +124,8 @@ public Swift4Codegen() {
 // Added for Objective-C compatibility
 "id", "description", "NSArray", "NSURL", "CGFloat", "NSSet", "NSString", "NSInteger", "NSUInteger",
 "NSError", "NSDictionary"
)
);
 )
 );

 reservedWords = new HashSet<>(
 Arrays.asList(
Expand DownExpand Up@@ -209,10 +208,6 @@ public Swift4Codegen() {
 "Optionally use libraries to manage response. Currently "
 + StringUtils.join(RESPONSE_LIBRARIES, ", ")
 + " are available."));
 cliOptions.add(new CliOption(UNWRAP_REQUIRED,
 "Treat 'required' properties in response as non-optional "
 + "(which would crash the app if api returns null as opposed "
 + "to required option specified in json schema"));
 cliOptions.add(new CliOption(OBJC_COMPATIBLE,
 "Add additional properties and methods for Objective-C "
 + "compatibility (default: false)"));
Expand DownExpand Up@@ -330,13 +325,6 @@ public void processOpts() {
 }
 sourceFolder = projectName + File.separator + sourceFolder;

 // Setup unwrapRequired option, which makes all the
 // properties with "required" non-optional
 if (additionalProperties.containsKey(UNWRAP_REQUIRED)) {
 setUnwrapRequired(convertPropertyToBooleanAndWriteBack(UNWRAP_REQUIRED));
 }
 additionalProperties.put(UNWRAP_REQUIRED, unwrapRequired);

 // Setup objcCompatible option, which adds additional properties
 // and methods for Objective-C compatibility
 if (additionalProperties.containsKey(OBJC_COMPATIBLE)) {
Expand DownExpand Up@@ -712,10 +700,6 @@ public void setProjectName(String projectName) {
 this.projectName = projectName;
 }

 public void setUnwrapRequired(boolean unwrapRequired) {
 this.unwrapRequired = unwrapRequired;
 }

 public void setObjcCompatible(boolean objcCompatible) {
 this.objcCompatible = objcCompatible;
 }
Expand DownExpand Up@@ -863,22 +847,9 @@ public Map<String, Object> postProcessModels(Map<String, Object> objs) {
 public void postProcessModelProperty(CodegenModel model, CodegenProperty property) {
 super.postProcessModelProperty(model, property);

 // The default template code has the following logic for
 // assigning a type as Swift Optional:
 //
 // {{^unwrapRequired}}?{{/unwrapRequired}}
 // {{#unwrapRequired}}{{^required}}?{{/required}}{{/unwrapRequired}}
 //
 // which means:
 //
 // boolean isSwiftOptional = !unwrapRequired || (unwrapRequired && !property.required);
 //
 // We can drop the check for unwrapRequired in (unwrapRequired && !property.required)
 // due to short-circuit evaluation of the || operator.
 boolean isSwiftOptional = !unwrapRequired || !property.required;
 boolean isSwiftScalarType = property.isInteger || property.isLong || property.isFloat
 || property.isDouble || property.isBoolean;
 if (isSwiftOptional && isSwiftScalarType) {
 if ((!property.required || property.isNullable) && isSwiftScalarType) {
 // Optional scalar types like Int?, Int64?, Float?, Double?, and Bool?
 // do not translate to Objective-C. So we want to flag those
 // properties in case we want to put special code in the templates
Expand Down

8 changes: 6 additions & 2 deletions
modules/openapi-generator/src/main/resources/swift4/modelObject.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,12 +13,16 @@ public struct {{classname}}: Codable {
{{/isEnum}}
{{^isEnum}}
 {{#description}}/** {{description}} */
 {{/description}}public var {{name}}: {{{datatype}}}{{#unwrapRequired}}?{{/unwrapRequired}}{{^unwrapRequired}}{{^required}}?{{/required}}{{/unwrapRequired}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}{{#objcCompatible}}{{#vendorExtensions.x-swift-optional-scalar}}
 {{/description}}public var {{name}}: {{{datatype}}}{{#required}}{{#isNullable}}?{{/isNullable}}{{/required}}{{^required}}?{{/required}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}
 {{#objcCompatible}}
 {{#vendorExtensions.x-swift-optional-scalar}}
 public var {{name}}Num: NSNumber? {
 get {
 return {{name}}.map({ return NSNumber(value: $0) })
 }
 }{{/vendorExtensions.x-swift-optional-scalar}}{{/objcCompatible}}
 }
 {{/vendorExtensions.x-swift-optional-scalar}}
 {{/objcCompatible}}
{{/isEnum}}
{{/allVars}}

Expand Down

1 change: 0 additions & 1 deletion
...enapi-generator/src/test/java/org/openapitools/codegen/options/Swift4OptionsProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,6 @@ public Map<String, String> createOptions() {
 .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE)
 .put(Swift4Codegen.PROJECT_NAME, PROJECT_NAME_VALUE)
 .put(Swift4Codegen.RESPONSE_AS, RESPONSE_AS_VALUE)
 .put(Swift4Codegen.UNWRAP_REQUIRED, UNWRAP_REQUIRED_VALUE)
 .put(Swift4Codegen.OBJC_COMPATIBLE, OBJC_COMPATIBLE_VALUE)
 .put(Swift4Codegen.LENIENT_TYPE_CAST, LENIENT_TYPE_CAST_VALUE)
 .put(Swift4Codegen.POD_SOURCE, POD_SOURCE_VALUE)
Expand Down

2 changes: 0 additions & 2 deletions
...es/openapi-generator/src/test/java/org/openapitools/codegen/swift4/Swift4OptionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,8 +48,6 @@ protected void setExpectations() {
 times = 1;
 clientCodegen.setResponseAs(Swift4OptionsProvider.RESPONSE_AS_VALUE.split(","));
 times = 1;
 clientCodegen.setUnwrapRequired(Boolean.valueOf(Swift4OptionsProvider.UNWRAP_REQUIRED_VALUE));
 times = 1;
 clientCodegen.setObjcCompatible(Boolean.valueOf(Swift4OptionsProvider.OBJC_COMPATIBLE_VALUE));
 times = 1;
 clientCodegen.setLenientTypeCast(Boolean.valueOf(Swift4OptionsProvider.LENIENT_TYPE_CAST_VALUE));
Expand Down

5 changes: 0 additions & 5 deletions
...e/swift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-dummy.m

View file


Open in desktop


This file was deleted.


12 changes: 0 additions & 12 deletions
...wift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-prefix.pch

View file


Open in desktop


This file was deleted.


16 changes: 0 additions & 16 deletions
...wift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-umbrella.h

View file


Open in desktop


This file was deleted.


6 changes: 0 additions & 6 deletions
...swift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.modulemap

View file


Open in desktop


This file was deleted.


26 changes: 0 additions & 26 deletions
...petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Info.plist

View file


Open in desktop


This file was deleted.


26 changes: 0 additions & 26 deletions
...ore/swift3/default/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/Info.plist

View file


Open in desktop


This file was deleted.


5 changes: 0 additions & 5 deletions
...efault/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-dummy.m

View file


Open in desktop


This file was deleted.


12 changes: 0 additions & 12 deletions
...ult/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-prefix.pch

View file


Open in desktop


This file was deleted.


16 changes: 0 additions & 16 deletions
...ult/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-umbrella.h

View file


Open in desktop


This file was deleted.


6 changes: 0 additions & 6 deletions
...ault/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.modulemap

View file


Open in desktop


This file was deleted.


26 changes: 0 additions & 26 deletions
...swift3/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Info.plist

View file


Open in desktop


This file was deleted.


5 changes: 0 additions & 5 deletions
...waggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-dummy.m

View file


Open in desktop


This file was deleted.

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Add nullable support to Swift4#3783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

wing328
wants to merge
6
commits into

from

 Closed


Add nullable support to Swift4
#3783
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
0029d9a

[Swift] Ignore all Pods/ and Carthage/ under CodegenTests (#4099)

Oct 8, 2019
213efd8

remove pods from git (#4100)

Oct 8, 2019
0c8481b

add nullable support to swift4


wing328 Aug 28, 2019
8b2e25e

update doc, better code format


wing328 Aug 28, 2019
d933a69

remove unused files

Oct 8, 2019
cfeff0c

generate

Oct 8, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

The table of contents is too big for display.

 Diff view

 Diff view

  •  
  •  
  •  

1 change: 0 additions & 1 deletion
docs/generators/swift4.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@ sidebar_label: swift4
|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
|projectName|Project name in Xcode| |null|
|responseAs|Optionally use libraries to manage response. Currently PromiseKit, RxSwift are available.| |null|
|unwrapRequired|Treat 'required' properties in response as non-optional (which would crash the app if api returns null as opposed to required option specified in json schema| |null|
|objcCompatible|Add additional properties and methods for Objective-C compatibility (default: false)| |null|
|podSource|Source information used for Podspec| |null|
|podVersion|Version used for Podspec| |null|
Expand Down

35 changes: 3 additions & 32 deletions
...les/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,7 +41,6 @@ public class Swift4Codegen extends DefaultCodegen implements CodegenConfig {

 public static final String PROJECT_NAME = "projectName";
 public static final String RESPONSE_AS = "responseAs";
 public static final String UNWRAP_REQUIRED = "unwrapRequired";
 public static final String OBJC_COMPATIBLE = "objcCompatible";
 public static final String POD_SOURCE = "podSource";
 public static final String POD_AUTHORS = "podAuthors";
Expand DownExpand Up@@ -125,8 +124,8 @@ public Swift4Codegen() {
 // Added for Objective-C compatibility
 "id", "description", "NSArray", "NSURL", "CGFloat", "NSSet", "NSString", "NSInteger", "NSUInteger",
 "NSError", "NSDictionary"
)
);
 )
 );

 reservedWords = new HashSet<>(
 Arrays.asList(
Expand DownExpand Up@@ -209,10 +208,6 @@ public Swift4Codegen() {
 "Optionally use libraries to manage response. Currently "
 + StringUtils.join(RESPONSE_LIBRARIES, ", ")
 + " are available."));
 cliOptions.add(new CliOption(UNWRAP_REQUIRED,
 "Treat 'required' properties in response as non-optional "
 + "(which would crash the app if api returns null as opposed "
 + "to required option specified in json schema"));
 cliOptions.add(new CliOption(OBJC_COMPATIBLE,
 "Add additional properties and methods for Objective-C "
 + "compatibility (default: false)"));
Expand DownExpand Up@@ -330,13 +325,6 @@ public void processOpts() {
 }
 sourceFolder = projectName + File.separator + sourceFolder;

 // Setup unwrapRequired option, which makes all the
 // properties with "required" non-optional
 if (additionalProperties.containsKey(UNWRAP_REQUIRED)) {
 setUnwrapRequired(convertPropertyToBooleanAndWriteBack(UNWRAP_REQUIRED));
 }
 additionalProperties.put(UNWRAP_REQUIRED, unwrapRequired);

 // Setup objcCompatible option, which adds additional properties
 // and methods for Objective-C compatibility
 if (additionalProperties.containsKey(OBJC_COMPATIBLE)) {
Expand DownExpand Up@@ -712,10 +700,6 @@ public void setProjectName(String projectName) {
 this.projectName = projectName;
 }

 public void setUnwrapRequired(boolean unwrapRequired) {
 this.unwrapRequired = unwrapRequired;
 }

 public void setObjcCompatible(boolean objcCompatible) {
 this.objcCompatible = objcCompatible;
 }
Expand DownExpand Up@@ -863,22 +847,9 @@ public Map<String, Object> postProcessModels(Map<String, Object> objs) {
 public void postProcessModelProperty(CodegenModel model, CodegenProperty property) {
 super.postProcessModelProperty(model, property);

 // The default template code has the following logic for
 // assigning a type as Swift Optional:
 //
 // {{^unwrapRequired}}?{{/unwrapRequired}}
 // {{#unwrapRequired}}{{^required}}?{{/required}}{{/unwrapRequired}}
 //
 // which means:
 //
 // boolean isSwiftOptional = !unwrapRequired || (unwrapRequired && !property.required);
 //
 // We can drop the check for unwrapRequired in (unwrapRequired && !property.required)
 // due to short-circuit evaluation of the || operator.
 boolean isSwiftOptional = !unwrapRequired || !property.required;
 boolean isSwiftScalarType = property.isInteger || property.isLong || property.isFloat
 || property.isDouble || property.isBoolean;
 if (isSwiftOptional && isSwiftScalarType) {
 if ((!property.required || property.isNullable) && isSwiftScalarType) {
 // Optional scalar types like Int?, Int64?, Float?, Double?, and Bool?
 // do not translate to Objective-C. So we want to flag those
 // properties in case we want to put special code in the templates
Expand Down

8 changes: 6 additions & 2 deletions
modules/openapi-generator/src/main/resources/swift4/modelObject.mustache

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,12 +13,16 @@ public struct {{classname}}: Codable {
{{/isEnum}}
{{^isEnum}}
 {{#description}}/** {{description}} */
 {{/description}}public var {{name}}: {{{datatype}}}{{#unwrapRequired}}?{{/unwrapRequired}}{{^unwrapRequired}}{{^required}}?{{/required}}{{/unwrapRequired}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}{{#objcCompatible}}{{#vendorExtensions.x-swift-optional-scalar}}
 {{/description}}public var {{name}}: {{{datatype}}}{{#required}}{{#isNullable}}?{{/isNullable}}{{/required}}{{^required}}?{{/required}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}
 {{#objcCompatible}}
 {{#vendorExtensions.x-swift-optional-scalar}}
 public var {{name}}Num: NSNumber? {
 get {
 return {{name}}.map({ return NSNumber(value: $0) })
 }
 }{{/vendorExtensions.x-swift-optional-scalar}}{{/objcCompatible}}
 }
 {{/vendorExtensions.x-swift-optional-scalar}}
 {{/objcCompatible}}
{{/isEnum}}
{{/allVars}}

Expand Down

1 change: 0 additions & 1 deletion
...enapi-generator/src/test/java/org/openapitools/codegen/options/Swift4OptionsProvider.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,6 @@ public Map<String, String> createOptions() {
 .put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE)
 .put(Swift4Codegen.PROJECT_NAME, PROJECT_NAME_VALUE)
 .put(Swift4Codegen.RESPONSE_AS, RESPONSE_AS_VALUE)
 .put(Swift4Codegen.UNWRAP_REQUIRED, UNWRAP_REQUIRED_VALUE)
 .put(Swift4Codegen.OBJC_COMPATIBLE, OBJC_COMPATIBLE_VALUE)
 .put(Swift4Codegen.LENIENT_TYPE_CAST, LENIENT_TYPE_CAST_VALUE)
 .put(Swift4Codegen.POD_SOURCE, POD_SOURCE_VALUE)
Expand Down

2 changes: 0 additions & 2 deletions
...es/openapi-generator/src/test/java/org/openapitools/codegen/swift4/Swift4OptionsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,8 +48,6 @@ protected void setExpectations() {
 times = 1;
 clientCodegen.setResponseAs(Swift4OptionsProvider.RESPONSE_AS_VALUE.split(","));
 times = 1;
 clientCodegen.setUnwrapRequired(Boolean.valueOf(Swift4OptionsProvider.UNWRAP_REQUIRED_VALUE));
 times = 1;
 clientCodegen.setObjcCompatible(Boolean.valueOf(Swift4OptionsProvider.OBJC_COMPATIBLE_VALUE));
 times = 1;
 clientCodegen.setLenientTypeCast(Boolean.valueOf(Swift4OptionsProvider.LENIENT_TYPE_CAST_VALUE));
Expand Down

5 changes: 0 additions & 5 deletions
...e/swift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-dummy.m

View file


Open in desktop


This file was deleted.


12 changes: 0 additions & 12 deletions
...wift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-prefix.pch

View file


Open in desktop


This file was deleted.


16 changes: 0 additions & 16 deletions
...wift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire-umbrella.h

View file


Open in desktop


This file was deleted.


6 changes: 0 additions & 6 deletions
...swift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Alamofire.modulemap

View file


Open in desktop


This file was deleted.


26 changes: 0 additions & 26 deletions
...petstore/swift3/default/SwaggerClientTests/Pods/Target Support Files/Alamofire/Info.plist

View file


Open in desktop


This file was deleted.


26 changes: 0 additions & 26 deletions
...ore/swift3/default/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/Info.plist

View file


Open in desktop


This file was deleted.


5 changes: 0 additions & 5 deletions
...efault/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-dummy.m

View file


Open in desktop


This file was deleted.


12 changes: 0 additions & 12 deletions
...ult/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-prefix.pch

View file


Open in desktop


This file was deleted.


16 changes: 0 additions & 16 deletions
...ult/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient-umbrella.h

View file


Open in desktop


This file was deleted.


6 changes: 0 additions & 6 deletions
...ault/SwaggerClientTests/Pods/Target Support Files/PetstoreClient/PetstoreClient.modulemap

View file


Open in desktop


This file was deleted.


26 changes: 0 additions & 26 deletions
...swift3/default/SwaggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Info.plist

View file


Open in desktop


This file was deleted.


5 changes: 0 additions & 5 deletions
...waggerClientTests/Pods/Target Support Files/Pods-SwaggerClient/Pods-SwaggerClient-dummy.m

View file


Open in desktop


This file was deleted.

Loading