[juneau] branch master updated: Build fix.

[ja...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git


The following commit(s) were added to refs/heads/master by this push:
     new ddd31aa  Build fix.
ddd31aa is described below

commit ddd31aaedf8067edddbfdceb19fea3536fffb7ab
Author: JamesBognar <ja...@apache.org>
AuthorDate: Sun Sep 16 18:08:38 2018 -0400

    Build fix.
---
 .../src/main/java/org/apache/juneau/BeanTraverseSession.java        | 6 +++---
 .../src/main/java/org/apache/juneau/rest/BasicRestCallHandler.java  | 2 ++
 .../src/main/java/org/apache/juneau/rest/SwaggerGenerator.java      | 6 +++---
 .../test/java/org/apache/juneau/rest/BasicRestInfoProviderTest.java | 1 +
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseSession.java
index 9910a0b..e5d0a8c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseSession.java
@@ -175,7 +175,7 @@ public class BeanTraverseSession extends BeanSession {
 		super.addWarning(msg, args);
 	}
 
-	private static final class StackElement {
+	private final class StackElement {
 		final int depth;
 		final String name;
 		final Object o;
@@ -192,8 +192,8 @@ public class BeanTraverseSession extends BeanSession {
 			StringBuilder sb = new StringBuilder().append('[').append(depth).append(']').append(' ');
 			sb.append(isEmpty(name) ? "<noname>" : name).append(':');
 			sb.append(aType.toString(simple));
-			if (aType != aType.getSerializedClassMeta(null))
-				sb.append('/').append(aType.getSerializedClassMeta(null).toString(simple));
+			if (aType != aType.getSerializedClassMeta(BeanTraverseSession.this))
+				sb.append('/').append(aType.getSerializedClassMeta(BeanTraverseSession.this).toString(simple));
 			return sb.toString();
 		}
 	}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestCallHandler.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestCallHandler.java
index 409c33c..00ffd3e 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestCallHandler.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicRestCallHandler.java
@@ -19,6 +19,7 @@ import static org.apache.juneau.internal.StringUtils.*;
 
 import java.io.*;
 import java.util.*;
+import java.util.logging.*;
 
 import javax.servlet.*;
 import javax.servlet.http.*;
@@ -311,6 +312,7 @@ public class BasicRestCallHandler implements RestCallHandler {
 			String msg = '[' + Integer.toHexString(e.hashCode()) + '.' + e2.getStatus() + '.' + e2.getOccurrence() + "] HTTP " + req.getMethod() + " " + e2.getStatus() + " " + req.getRequestURI() + (qs == null ? "" : "?" + qs);
 			System.err.println(msg);  // NOT DEBUG
 			e.printStackTrace(System.err);
+			logger.log(Level.SEVERE, e, e.getLocalizedMessage());
 		}
 
 		logger.onError(req, res, e2);
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/SwaggerGenerator.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/SwaggerGenerator.java
index 99c44c1..09511bc 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/SwaggerGenerator.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/SwaggerGenerator.java
@@ -58,7 +58,7 @@ final class SwaggerGenerator {
 	private final BeanSession bs;
 	private final Locale locale;
 	private final RestContext context;
-	private final JsonParser jp = JsonParser.DEFAULT;
+	private final JsonParser jp = JsonParser.create().ignoreUnknownBeanProperties().build();
 	private final JsonSchemaGeneratorSession js;
 	private final Class<?> c;
 	private final Object resource;
@@ -739,7 +739,7 @@ final class SwaggerGenerator {
 			return schema;
 
 		ObjectMap om = fixSwaggerExtensions(schema.appendAll(js.getSchema(cm)));
-		
+
 		return nullIfEmpty(om);
 	}
 
@@ -770,7 +770,7 @@ final class SwaggerGenerator {
 
 		Object example = null;
 		if (isJson(sex)) {
-			example = JsonParser.DEFAULT.parse(sex, type);
+			example = jp.parse(sex, type);
 		} else {
 			ClassMeta<?> cm = js.getClassMeta(type);
 			if (cm.hasStringTransform()) {
diff --git a/juneau-rest/juneau-rest-server/src/test/java/org/apache/juneau/rest/BasicRestInfoProviderTest.java b/juneau-rest/juneau-rest-server/src/test/java/org/apache/juneau/rest/BasicRestInfoProviderTest.java
index 14aac88..7a00d01 100644
--- a/juneau-rest/juneau-rest-server/src/test/java/org/apache/juneau/rest/BasicRestInfoProviderTest.java
+++ b/juneau-rest/juneau-rest-server/src/test/java/org/apache/juneau/rest/BasicRestInfoProviderTest.java
@@ -2301,6 +2301,7 @@ public class BasicRestInfoProviderTest {
 		}
 	}
 
+	@Bean(sort=true)
 	public static class P01 {
 		private int f1;