From 713e7a658404d2fb1b16e7440a8a3074d5de4738 Mon Sep 17 00:00:00 2001
From: Ole Lensmar <ole.lensmar@smartbear.com>
Date: Wed, 20 May 2015 18:06:37 -0600
Subject: [PATCH] updated core dependency version to 1.5.2-M2 with related
 fixes

---
 .../wordnik/swagger/codegen/CodegenProperty.java  |  5 ++++-
 .../wordnik/swagger/codegen/DefaultCodegen.java   |  4 ++--
 .../codegen/examples/ExampleGenerator.java        |  4 ++--
 pom.xml                                           | 15 +--------------
 4 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenProperty.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenProperty.java
index b00c962ba6b..921ca90f189 100644
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenProperty.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenProperty.java
@@ -16,7 +16,10 @@ public class CodegenProperty {
   public String example;
 
   public String jsonSchema;
-  public Double minimum, maximum, exclusiveMinimum, exclusiveMaximum;
+  public Double minimum;
+  public Double maximum;
+  public Boolean exclusiveMinimum;
+  public Boolean exclusiveMaximum;
   public Boolean hasMore = null, required = null, secondaryParam = null;
   public Boolean isPrimitiveType, isContainer, isNotContainer;
   public boolean isEnum;
diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java
index 6f51374c536..f9c304f794a 100644
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java
@@ -1024,13 +1024,13 @@ public class DefaultCodegen {
     return secs;
   }
 
-  protected List<Map<String, String>> toExamples(Map<String, String> examples) {
+  protected List<Map<String, String>> toExamples(Map<String, Object> examples) {
     if(examples == null)
       return null;
 
     List<Map<String, String>> output = new ArrayList<Map<String, String>>();
     for(String key: examples.keySet()) {
-      String value = examples.get(key);
+      String value = String.valueOf(examples.get(key));
 
       Map<String, String> kv = new HashMap<String, String>();
       kv.put("contentType", key);
diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/examples/ExampleGenerator.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/examples/ExampleGenerator.java
index 80063625440..b0fbf34a07f 100644
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/examples/ExampleGenerator.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/examples/ExampleGenerator.java
@@ -22,7 +22,7 @@ public class ExampleGenerator {
     this.examples = examples;
   }
 
-  public List<Map<String, String>> generate(Map<String, String> examples, List<String> mediaTypes, Property property) {
+  public List<Map<String, String>> generate(Map<String, Object> examples, List<String> mediaTypes, Property property) {
     List<Map<String, String>> output = new ArrayList<Map<String, String>>();
     Set<String> processedModels = new HashSet<String>();
     if(examples == null ) {
@@ -54,7 +54,7 @@ public class ExampleGenerator {
     }
     else {
       for(String key: examples.keySet()) {
-        String value = examples.get(key);
+        String value = String.valueOf(examples.get(key));
 
         Map<String, String> kv = new HashMap<String, String>();
         kv.put("contentType", key);
diff --git a/pom.xml b/pom.xml
index e28a46bb442..b7c837b42e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -302,18 +302,6 @@
         <module>samples/client/petstore/java</module>
       </modules>
     </profile>
-    <profile>
-      <id>scala-client</id>
-      <activation>
-        <property>
-          <name>env</name>
-          <value>scala</value>
-        </property>
-      </activation>
-      <modules>
-        <module>samples/client/petstore/scala</module>
-      </modules>
-    </profile>
     <profile>
       <id>objc-client</id>
       <activation>
@@ -373,7 +361,6 @@
       <modules>
         <module>samples/client/petstore/android-java</module>
         <module>samples/client/petstore/java</module>
-        <module>samples/client/petstore/scala</module>
         <module>samples/server/petstore/jaxrs</module>
         <module>samples/server/petstore/spring-mvc</module>
         <module>samples/client/petstore/objc</module>
@@ -453,7 +440,7 @@
     <swagger-parser-version>1.0.6-SNAPSHOT</swagger-parser-version>
     <scala-version>2.10.4</scala-version>
     <felix-version>2.3.4</felix-version>
-    <swagger-core-version>1.5.1-M2</swagger-core-version>
+    <swagger-core-version>1.5.2-M2</swagger-core-version>
     <scala-test-version>2.1.4</scala-test-version>
     <commons-io-version>2.3</commons-io-version>
     <commons-cli-version>1.2</commons-cli-version>