Skip to content

[nancyfx] Issue #5196: make package GUID nonrandom for nancyfx samples #5209

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

Merged
wing328 merged 2 commits into from
Mar 27, 2017
Merged

[nancyfx] Issue #5196: make package GUID nonrandom for nancyfx samples #5209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6654625
Add packageGuid parameter to NancyFxServerCodegen.
Mar 26, 2017
dbf3f6a
Use packageGuid parameter for nancyfx petstore samples.
Mar 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/nancyfx-petstore-server.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ fi

# if you've executed sbt assembly previously it will use that instead.
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
ags="generate $@ -t modules/swagger-codegen/src/main/resources/nancyfx -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l nancyfx -o samples/server/petstore/nancyfx"
ags="generate $@ -t modules/swagger-codegen/src/main/resources/nancyfx -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l nancyfx -o samples/server/petstore/nancyfx --additional-properties packageGuid={768B8DC6-54EE-4D40-9B20-7857E1D742A4}"

java $JAVA_OPTS -jar $executable $ags
13 changes: 12 additions & 1 deletion modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NancyFXServerCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import static java.util.Arrays.asList;
import static java.util.UUID.randomUUID;
import static org.apache.commons.lang3.StringUtils.capitalize;

import io.swagger.codegen.CodegenModel;
import io.swagger.codegen.CodegenOperation;
import io.swagger.codegen.CodegenProperty;
Expand Down Expand Up @@ -47,7 +48,7 @@ public class NancyFXServerCodegen extends AbstractCSharpCodegen {
private static final Map<String, Predicate<Property>> propertyToSwaggerTypeMapping =
createPropertyToSwaggerTypeMapping();

private final String packageGuid = "{" + randomUUID().toString().toUpperCase() + "}";
private String packageGuid = "{" + randomUUID().toString().toUpperCase() + "}";

private final Map<String, DependencyInfo> dependencies = new HashMap<>();
private final Set<String> parentModels = new HashSet<>();
Expand All @@ -73,6 +74,7 @@ public NancyFXServerCodegen() {
addOption(PACKAGE_VERSION, "C# package version.", packageVersion);
addOption(SOURCE_FOLDER, SOURCE_FOLDER_DESC, sourceFolder);
addOption(INTERFACE_PREFIX, INTERFACE_PREFIX_DESC, interfacePrefix);
addOption(OPTIONAL_PROJECT_GUID,OPTIONAL_PROJECT_GUID_DESC, null);

// CLI Switches
addSwitch(SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_BY_REQUIRED_FLAG_DESC, sortParamsByRequiredFlag);
Expand Down Expand Up @@ -118,6 +120,11 @@ public void processOpts() {
supportingFiles.add(new SupportingFile("Solution.mustache", "", packageName + ".sln"));
supportingFiles.add(new SupportingFile("Project.mustache", sourceFolder(), packageName + ".csproj"));
}

if (additionalProperties.containsKey(OPTIONAL_PROJECT_GUID)) {
setPackageGuid((String) additionalProperties.get(OPTIONAL_PROJECT_GUID));
}

additionalProperties.put("packageGuid", packageGuid);

setupModelTemplate();
Expand Down Expand Up @@ -186,6 +193,10 @@ private String sourceFile(final String fileName) {
return sourceFolder() + File.separator + fileName;
}

public void setPackageGuid(String packageGuid) {
this.packageGuid = packageGuid;
}

@Override
public String apiFileFolder() {
return outputFolder + File.separator + sourceFolder() + File.separator + API_NAMESPACE;
Expand Down
2 changes: 2 additions & 0 deletions ...wagger-codegen/src/test/java/io/swagger/codegen/options/NancyFXServerOptionsProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ public class NancyFXServerOptionsProvider implements OptionsProvider {
public static final String PACKAGE_VERSION_VALUE = "1.0.0-SNAPSHOT";
public static final String SOURCE_FOLDER_VALUE = "src_nancyfx";
public static final String ALLOW_UNICODE_IDENTIFIERS_VALUE = "false";
public static final String PROJECT_GUID_VALUE = "{6885796E-A4C1-48EA-9766-CCD1563C90DF}";


@Override
Expand All @@ -25,6 +26,7 @@ public Map<String, String> createOptions() {
.put(PACKAGE_VERSION, PACKAGE_VERSION_VALUE)
.put(SOURCE_FOLDER, SOURCE_FOLDER_VALUE)
.put(SORT_PARAMS_BY_REQUIRED_FLAG, "true")
.put(OPTIONAL_PROJECT_GUID, PROJECT_GUID_VALUE)
.put(USE_DATETIME_OFFSET, "true")
.put(USE_COLLECTION, "false")
.put(RETURN_ICOLLECTION, "false")
Expand Down