From 874d9dc54a0d346ce070d2d4f2a61718d1ef8b96 Mon Sep 17 00:00:00 2001 From: wing328 Date: Fri, 12 Feb 2016 17:15:53 +0800 Subject: [PATCH 1/2] add uuid mapping to c# abstract base class --- .../io/swagger/codegen/languages/AbstractCSharpCodegen.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractCSharpCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractCSharpCodegen.java index 79659d841f5..2a5d9957fd1 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractCSharpCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractCSharpCodegen.java @@ -85,6 +85,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co "Int32", "Int64", "Float", + "Guid", "Stream", // not really a primitive, we include it to avoid model import "Object") ); @@ -110,6 +111,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co typeMapping.put("list", "List"); typeMapping.put("map", "Dictionary"); typeMapping.put("object", "Object"); + typeMapping.put("uuid", "Guid"); } public void setReturnICollection(boolean returnICollection) { From 81593bc4f6c910da7518b64ea91b8317af1e7096 Mon Sep 17 00:00:00 2001 From: wing328 Date: Fri, 12 Feb 2016 18:46:19 +0800 Subject: [PATCH 2/2] add delay script, update CI test to run ruby test first --- samples/client/petstore/ruby/press_anykey_to_continue.sh | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 samples/client/petstore/ruby/press_anykey_to_continue.sh diff --git a/samples/client/petstore/ruby/press_anykey_to_continue.sh b/samples/client/petstore/ruby/press_anykey_to_continue.sh new file mode 100644 index 00000000000..8976ca65367 --- /dev/null +++ b/samples/client/petstore/ruby/press_anykey_to_continue.sh @@ -0,0 +1,8 @@ +#!/bin/bash +# a script to simply wait for X seconds before contining the CI tests +# the delay can help prevent 2 CI tests running at the same time as +# all CI tests use the same petstore server for testing. + +TIMEOUT=$(( ( RANDOM % 60 ) + 1 )) + +read -p 'Press any key to continue or wait for $TIMEOUT seconds' -t $TIMEOUT