Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 273EE200C5D for ; Fri, 7 Apr 2017 20:25:42 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 25E8E160B84; Fri, 7 Apr 2017 18:25:42 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 207E6160BA2 for ; Fri, 7 Apr 2017 20:25:39 +0200 (CEST) Received: (qmail 23699 invoked by uid 500); 7 Apr 2017 18:25:39 -0000 Mailing-List: contact commits-help@juneau.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@juneau.incubator.apache.org Delivered-To: mailing list commits@juneau.incubator.apache.org Received: (qmail 23690 invoked by uid 99); 7 Apr 2017 18:25:39 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Apr 2017 18:25:39 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id D5530C0FF5 for ; Fri, 7 Apr 2017 18:25:38 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.222 X-Spam-Level: X-Spam-Status: No, score=-4.222 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001, SPF_PASS=-0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id QguwVg21mi0q for ; Fri, 7 Apr 2017 18:25:35 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id CB68C5FCD9 for ; Fri, 7 Apr 2017 18:25:30 +0000 (UTC) Received: (qmail 23334 invoked by uid 99); 7 Apr 2017 18:25:28 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Apr 2017 18:25:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5E38EE038D; Fri, 7 Apr 2017 18:25:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jamesbognar@apache.org To: commits@juneau.incubator.apache.org Date: Fri, 07 Apr 2017 18:25:30 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [03/51] [partial] incubator-juneau-website git commit: Update Javadocs. archived-at: Fri, 07 Apr 2017 18:25:42 -0000 http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/3fcb8e91/content/site/apidocs/src-html/org/apache/juneau/jso/JsoSerializerBuilder.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/jso/JsoSerializerBuilder.html b/content/site/apidocs/src-html/org/apache/juneau/jso/JsoSerializerBuilder.html index 4bb7be2..25e804b 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/jso/JsoSerializerBuilder.html +++ b/content/site/apidocs/src-html/org/apache/juneau/jso/JsoSerializerBuilder.html @@ -157,384 +157,390 @@ 149 return this; 150 } 151 -152 @Override /* CoreObjectBuilder */ -153 public JsoSerializerBuilder beansRequireDefaultConstructor(boolean value) { -154 super.beansRequireDefaultConstructor(value); +152 @Override /* SerializerBuilder */ +153 public JsoSerializerBuilder abridged(boolean value) { +154 super.abridged(value); 155 return this; 156 } 157 158 @Override /* CoreObjectBuilder */ -159 public JsoSerializerBuilder beansRequireSerializable(boolean value) { -160 super.beansRequireSerializable(value); +159 public JsoSerializerBuilder beansRequireDefaultConstructor(boolean value) { +160 super.beansRequireDefaultConstructor(value); 161 return this; 162 } 163 164 @Override /* CoreObjectBuilder */ -165 public JsoSerializerBuilder beansRequireSettersForGetters(boolean value) { -166 super.beansRequireSettersForGetters(value); +165 public JsoSerializerBuilder beansRequireSerializable(boolean value) { +166 super.beansRequireSerializable(value); 167 return this; 168 } 169 170 @Override /* CoreObjectBuilder */ -171 public JsoSerializerBuilder beansRequireSomeProperties(boolean value) { -172 super.beansRequireSomeProperties(value); +171 public JsoSerializerBuilder beansRequireSettersForGetters(boolean value) { +172 super.beansRequireSettersForGetters(value); 173 return this; 174 } 175 176 @Override /* CoreObjectBuilder */ -177 public JsoSerializerBuilder beanMapPutReturnsOldValue(boolean value) { -178 super.beanMapPutReturnsOldValue(value); +177 public JsoSerializerBuilder beansRequireSomeProperties(boolean value) { +178 super.beansRequireSomeProperties(value); 179 return this; 180 } 181 182 @Override /* CoreObjectBuilder */ -183 public JsoSerializerBuilder beanConstructorVisibility(Visibility value) { -184 super.beanConstructorVisibility(value); +183 public JsoSerializerBuilder beanMapPutReturnsOldValue(boolean value) { +184 super.beanMapPutReturnsOldValue(value); 185 return this; 186 } 187 188 @Override /* CoreObjectBuilder */ -189 public JsoSerializerBuilder beanClassVisibility(Visibility value) { -190 super.beanClassVisibility(value); +189 public JsoSerializerBuilder beanConstructorVisibility(Visibility value) { +190 super.beanConstructorVisibility(value); 191 return this; 192 } 193 194 @Override /* CoreObjectBuilder */ -195 public JsoSerializerBuilder beanFieldVisibility(Visibility value) { -196 super.beanFieldVisibility(value); +195 public JsoSerializerBuilder beanClassVisibility(Visibility value) { +196 super.beanClassVisibility(value); 197 return this; 198 } 199 200 @Override /* CoreObjectBuilder */ -201 public JsoSerializerBuilder methodVisibility(Visibility value) { -202 super.methodVisibility(value); +201 public JsoSerializerBuilder beanFieldVisibility(Visibility value) { +202 super.beanFieldVisibility(value); 203 return this; 204 } 205 206 @Override /* CoreObjectBuilder */ -207 public JsoSerializerBuilder useJavaBeanIntrospector(boolean value) { -208 super.useJavaBeanIntrospector(value); +207 public JsoSerializerBuilder methodVisibility(Visibility value) { +208 super.methodVisibility(value); 209 return this; 210 } 211 212 @Override /* CoreObjectBuilder */ -213 public JsoSerializerBuilder useInterfaceProxies(boolean value) { -214 super.useInterfaceProxies(value); +213 public JsoSerializerBuilder useJavaBeanIntrospector(boolean value) { +214 super.useJavaBeanIntrospector(value); 215 return this; 216 } 217 218 @Override /* CoreObjectBuilder */ -219 public JsoSerializerBuilder ignoreUnknownBeanProperties(boolean value) { -220 super.ignoreUnknownBeanProperties(value); +219 public JsoSerializerBuilder useInterfaceProxies(boolean value) { +220 super.useInterfaceProxies(value); 221 return this; 222 } 223 224 @Override /* CoreObjectBuilder */ -225 public JsoSerializerBuilder ignoreUnknownNullBeanProperties(boolean value) { -226 super.ignoreUnknownNullBeanProperties(value); +225 public JsoSerializerBuilder ignoreUnknownBeanProperties(boolean value) { +226 super.ignoreUnknownBeanProperties(value); 227 return this; 228 } 229 230 @Override /* CoreObjectBuilder */ -231 public JsoSerializerBuilder ignorePropertiesWithoutSetters(boolean value) { -232 super.ignorePropertiesWithoutSetters(value); +231 public JsoSerializerBuilder ignoreUnknownNullBeanProperties(boolean value) { +232 super.ignoreUnknownNullBeanProperties(value); 233 return this; 234 } 235 236 @Override /* CoreObjectBuilder */ -237 public JsoSerializerBuilder ignoreInvocationExceptionsOnGetters(boolean value) { -238 super.ignoreInvocationExceptionsOnGetters(value); +237 public JsoSerializerBuilder ignorePropertiesWithoutSetters(boolean value) { +238 super.ignorePropertiesWithoutSetters(value); 239 return this; 240 } 241 242 @Override /* CoreObjectBuilder */ -243 public JsoSerializerBuilder ignoreInvocationExceptionsOnSetters(boolean value) { -244 super.ignoreInvocationExceptionsOnSetters(value); +243 public JsoSerializerBuilder ignoreInvocationExceptionsOnGetters(boolean value) { +244 super.ignoreInvocationExceptionsOnGetters(value); 245 return this; 246 } 247 248 @Override /* CoreObjectBuilder */ -249 public JsoSerializerBuilder sortProperties(boolean value) { -250 super.sortProperties(value); +249 public JsoSerializerBuilder ignoreInvocationExceptionsOnSetters(boolean value) { +250 super.ignoreInvocationExceptionsOnSetters(value); 251 return this; 252 } 253 254 @Override /* CoreObjectBuilder */ -255 public JsoSerializerBuilder notBeanPackages(String...values) { -256 super.notBeanPackages(values); +255 public JsoSerializerBuilder sortProperties(boolean value) { +256 super.sortProperties(value); 257 return this; 258 } 259 260 @Override /* CoreObjectBuilder */ -261 public JsoSerializerBuilder notBeanPackages(Collection<String> values) { +261 public JsoSerializerBuilder notBeanPackages(String...values) { 262 super.notBeanPackages(values); 263 return this; 264 } 265 266 @Override /* CoreObjectBuilder */ -267 public JsoSerializerBuilder setNotBeanPackages(String...values) { -268 super.setNotBeanPackages(values); +267 public JsoSerializerBuilder notBeanPackages(Collection<String> values) { +268 super.notBeanPackages(values); 269 return this; 270 } 271 272 @Override /* CoreObjectBuilder */ -273 public JsoSerializerBuilder setNotBeanPackages(Collection<String> values) { +273 public JsoSerializerBuilder setNotBeanPackages(String...values) { 274 super.setNotBeanPackages(values); 275 return this; 276 } 277 278 @Override /* CoreObjectBuilder */ -279 public JsoSerializerBuilder removeNotBeanPackages(String...values) { -280 super.removeNotBeanPackages(values); +279 public JsoSerializerBuilder setNotBeanPackages(Collection<String> values) { +280 super.setNotBeanPackages(values); 281 return this; 282 } 283 284 @Override /* CoreObjectBuilder */ -285 public JsoSerializerBuilder removeNotBeanPackages(Collection<String> values) { +285 public JsoSerializerBuilder removeNotBeanPackages(String...values) { 286 super.removeNotBeanPackages(values); 287 return this; 288 } 289 290 @Override /* CoreObjectBuilder */ -291 public JsoSerializerBuilder notBeanClasses(Class<?>...values) { -292 super.notBeanClasses(values); +291 public JsoSerializerBuilder removeNotBeanPackages(Collection<String> values) { +292 super.removeNotBeanPackages(values); 293 return this; 294 } 295 296 @Override /* CoreObjectBuilder */ -297 public JsoSerializerBuilder notBeanClasses(Collection<Class<?>> values) { +297 public JsoSerializerBuilder notBeanClasses(Class<?>...values) { 298 super.notBeanClasses(values); 299 return this; 300 } 301 302 @Override /* CoreObjectBuilder */ -303 public JsoSerializerBuilder setNotBeanClasses(Class<?>...values) { -304 super.setNotBeanClasses(values); +303 public JsoSerializerBuilder notBeanClasses(Collection<Class<?>> values) { +304 super.notBeanClasses(values); 305 return this; 306 } 307 308 @Override /* CoreObjectBuilder */ -309 public JsoSerializerBuilder setNotBeanClasses(Collection<Class<?>> values) { +309 public JsoSerializerBuilder setNotBeanClasses(Class<?>...values) { 310 super.setNotBeanClasses(values); 311 return this; 312 } 313 314 @Override /* CoreObjectBuilder */ -315 public JsoSerializerBuilder removeNotBeanClasses(Class<?>...values) { -316 super.removeNotBeanClasses(values); +315 public JsoSerializerBuilder setNotBeanClasses(Collection<Class<?>> values) { +316 super.setNotBeanClasses(values); 317 return this; 318 } 319 320 @Override /* CoreObjectBuilder */ -321 public JsoSerializerBuilder removeNotBeanClasses(Collection<Class<?>> values) { +321 public JsoSerializerBuilder removeNotBeanClasses(Class<?>...values) { 322 super.removeNotBeanClasses(values); 323 return this; 324 } 325 326 @Override /* CoreObjectBuilder */ -327 public JsoSerializerBuilder beanFilters(Class<?>...values) { -328 super.beanFilters(values); +327 public JsoSerializerBuilder removeNotBeanClasses(Collection<Class<?>> values) { +328 super.removeNotBeanClasses(values); 329 return this; 330 } 331 332 @Override /* CoreObjectBuilder */ -333 public JsoSerializerBuilder beanFilters(Collection<Class<?>> values) { +333 public JsoSerializerBuilder beanFilters(Class<?>...values) { 334 super.beanFilters(values); 335 return this; 336 } 337 338 @Override /* CoreObjectBuilder */ -339 public JsoSerializerBuilder setBeanFilters(Class<?>...values) { -340 super.setBeanFilters(values); +339 public JsoSerializerBuilder beanFilters(Collection<Class<?>> values) { +340 super.beanFilters(values); 341 return this; 342 } 343 344 @Override /* CoreObjectBuilder */ -345 public JsoSerializerBuilder setBeanFilters(Collection<Class<?>> values) { +345 public JsoSerializerBuilder setBeanFilters(Class<?>...values) { 346 super.setBeanFilters(values); 347 return this; 348 } 349 350 @Override /* CoreObjectBuilder */ -351 public JsoSerializerBuilder removeBeanFilters(Class<?>...values) { -352 super.removeBeanFilters(values); +351 public JsoSerializerBuilder setBeanFilters(Collection<Class<?>> values) { +352 super.setBeanFilters(values); 353 return this; 354 } 355 356 @Override /* CoreObjectBuilder */ -357 public JsoSerializerBuilder removeBeanFilters(Collection<Class<?>> values) { +357 public JsoSerializerBuilder removeBeanFilters(Class<?>...values) { 358 super.removeBeanFilters(values); 359 return this; 360 } 361 362 @Override /* CoreObjectBuilder */ -363 public JsoSerializerBuilder pojoSwaps(Class<?>...values) { -364 super.pojoSwaps(values); +363 public JsoSerializerBuilder removeBeanFilters(Collection<Class<?>> values) { +364 super.removeBeanFilters(values); 365 return this; 366 } 367 368 @Override /* CoreObjectBuilder */ -369 public JsoSerializerBuilder pojoSwaps(Collection<Class<?>> values) { +369 public JsoSerializerBuilder pojoSwaps(Class<?>...values) { 370 super.pojoSwaps(values); 371 return this; 372 } 373 374 @Override /* CoreObjectBuilder */ -375 public JsoSerializerBuilder setPojoSwaps(Class<?>...values) { -376 super.setPojoSwaps(values); +375 public JsoSerializerBuilder pojoSwaps(Collection<Class<?>> values) { +376 super.pojoSwaps(values); 377 return this; 378 } 379 380 @Override /* CoreObjectBuilder */ -381 public JsoSerializerBuilder setPojoSwaps(Collection<Class<?>> values) { +381 public JsoSerializerBuilder setPojoSwaps(Class<?>...values) { 382 super.setPojoSwaps(values); 383 return this; 384 } 385 386 @Override /* CoreObjectBuilder */ -387 public JsoSerializerBuilder removePojoSwaps(Class<?>...values) { -388 super.removePojoSwaps(values); +387 public JsoSerializerBuilder setPojoSwaps(Collection<Class<?>> values) { +388 super.setPojoSwaps(values); 389 return this; 390 } 391 392 @Override /* CoreObjectBuilder */ -393 public JsoSerializerBuilder removePojoSwaps(Collection<Class<?>> values) { +393 public JsoSerializerBuilder removePojoSwaps(Class<?>...values) { 394 super.removePojoSwaps(values); 395 return this; 396 } 397 398 @Override /* CoreObjectBuilder */ -399 public JsoSerializerBuilder implClasses(Map<Class<?>,Class<?>> values) { -400 super.implClasses(values); +399 public JsoSerializerBuilder removePojoSwaps(Collection<Class<?>> values) { +400 super.removePojoSwaps(values); 401 return this; 402 } 403 404 @Override /* CoreObjectBuilder */ -405 public <T> JsoSerializerBuilder implClass(Class<T> interfaceClass, Class<? extends T> implClass) { -406 super.implClass(interfaceClass, implClass); +405 public JsoSerializerBuilder implClasses(Map<Class<?>,Class<?>> values) { +406 super.implClasses(values); 407 return this; 408 } 409 410 @Override /* CoreObjectBuilder */ -411 public JsoSerializerBuilder beanDictionary(Class<?>...values) { -412 super.beanDictionary(values); +411 public <T> JsoSerializerBuilder implClass(Class<T> interfaceClass, Class<? extends T> implClass) { +412 super.implClass(interfaceClass, implClass); 413 return this; 414 } 415 416 @Override /* CoreObjectBuilder */ -417 public JsoSerializerBuilder beanDictionary(Collection<Class<?>> values) { +417 public JsoSerializerBuilder beanDictionary(Class<?>...values) { 418 super.beanDictionary(values); 419 return this; 420 } 421 422 @Override /* CoreObjectBuilder */ -423 public JsoSerializerBuilder setBeanDictionary(Class<?>...values) { -424 super.setBeanDictionary(values); +423 public JsoSerializerBuilder beanDictionary(Collection<Class<?>> values) { +424 super.beanDictionary(values); 425 return this; 426 } 427 428 @Override /* CoreObjectBuilder */ -429 public JsoSerializerBuilder setBeanDictionary(Collection<Class<?>> values) { +429 public JsoSerializerBuilder setBeanDictionary(Class<?>...values) { 430 super.setBeanDictionary(values); 431 return this; 432 } 433 434 @Override /* CoreObjectBuilder */ -435 public JsoSerializerBuilder removeFromBeanDictionary(Class<?>...values) { -436 super.removeFromBeanDictionary(values); +435 public JsoSerializerBuilder setBeanDictionary(Collection<Class<?>> values) { +436 super.setBeanDictionary(values); 437 return this; 438 } 439 440 @Override /* CoreObjectBuilder */ -441 public JsoSerializerBuilder removeFromBeanDictionary(Collection<Class<?>> values) { +441 public JsoSerializerBuilder removeFromBeanDictionary(Class<?>...values) { 442 super.removeFromBeanDictionary(values); 443 return this; 444 } 445 446 @Override /* CoreObjectBuilder */ -447 public JsoSerializerBuilder beanTypePropertyName(String value) { -448 super.beanTypePropertyName(value); +447 public JsoSerializerBuilder removeFromBeanDictionary(Collection<Class<?>> values) { +448 super.removeFromBeanDictionary(values); 449 return this; 450 } 451 452 @Override /* CoreObjectBuilder */ -453 public JsoSerializerBuilder defaultParser(Class<?> value) { -454 super.defaultParser(value); +453 public JsoSerializerBuilder beanTypePropertyName(String value) { +454 super.beanTypePropertyName(value); 455 return this; 456 } 457 458 @Override /* CoreObjectBuilder */ -459 public JsoSerializerBuilder locale(Locale value) { -460 super.locale(value); +459 public JsoSerializerBuilder defaultParser(Class<?> value) { +460 super.defaultParser(value); 461 return this; 462 } 463 464 @Override /* CoreObjectBuilder */ -465 public JsoSerializerBuilder timeZone(TimeZone value) { -466 super.timeZone(value); +465 public JsoSerializerBuilder locale(Locale value) { +466 super.locale(value); 467 return this; 468 } 469 470 @Override /* CoreObjectBuilder */ -471 public JsoSerializerBuilder mediaType(MediaType value) { -472 super.mediaType(value); +471 public JsoSerializerBuilder timeZone(TimeZone value) { +472 super.timeZone(value); 473 return this; 474 } 475 476 @Override /* CoreObjectBuilder */ -477 public JsoSerializerBuilder debug(boolean value) { -478 super.debug(value); +477 public JsoSerializerBuilder mediaType(MediaType value) { +478 super.mediaType(value); 479 return this; 480 } 481 482 @Override /* CoreObjectBuilder */ -483 public JsoSerializerBuilder property(String name, Object value) { -484 super.property(name, value); +483 public JsoSerializerBuilder debug(boolean value) { +484 super.debug(value); 485 return this; 486 } 487 488 @Override /* CoreObjectBuilder */ -489 public JsoSerializerBuilder properties(Map<String,Object> properties) { -490 super.properties(properties); +489 public JsoSerializerBuilder property(String name, Object value) { +490 super.property(name, value); 491 return this; 492 } 493 494 @Override /* CoreObjectBuilder */ -495 public JsoSerializerBuilder addToProperty(String name, Object value) { -496 super.addToProperty(name, value); +495 public JsoSerializerBuilder properties(Map<String,Object> properties) { +496 super.properties(properties); 497 return this; 498 } 499 500 @Override /* CoreObjectBuilder */ -501 public JsoSerializerBuilder putToProperty(String name, Object key, Object value) { -502 super.putToProperty(name, key, value); +501 public JsoSerializerBuilder addToProperty(String name, Object value) { +502 super.addToProperty(name, value); 503 return this; 504 } 505 506 @Override /* CoreObjectBuilder */ -507 public JsoSerializerBuilder putToProperty(String name, Object value) { -508 super.putToProperty(name, value); +507 public JsoSerializerBuilder putToProperty(String name, Object key, Object value) { +508 super.putToProperty(name, key, value); 509 return this; 510 } 511 512 @Override /* CoreObjectBuilder */ -513 public JsoSerializerBuilder removeFromProperty(String name, Object value) { -514 super.removeFromProperty(name, value); +513 public JsoSerializerBuilder putToProperty(String name, Object value) { +514 super.putToProperty(name, value); 515 return this; 516 } 517 518 @Override /* CoreObjectBuilder */ -519 public JsoSerializerBuilder classLoader(ClassLoader classLoader) { -520 super.classLoader(classLoader); +519 public JsoSerializerBuilder removeFromProperty(String name, Object value) { +520 super.removeFromProperty(name, value); 521 return this; 522 } 523 524 @Override /* CoreObjectBuilder */ -525 public JsoSerializerBuilder apply(PropertyStore copyFrom) { -526 super.apply(copyFrom); +525 public JsoSerializerBuilder classLoader(ClassLoader classLoader) { +526 super.classLoader(classLoader); 527 return this; 528 } -529} +529 +530 @Override /* CoreObjectBuilder */ +531 public JsoSerializerBuilder apply(PropertyStore copyFrom) { +532 super.apply(copyFrom); +533 return this; +534 } +535} http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/3fcb8e91/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.Strict.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.Strict.html b/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.Strict.html index 9100ae9..2e13019 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.Strict.html +++ b/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.Strict.html @@ -223,7 +223,7 @@ 215 } else if (c == '{') { 216 Map m = new ObjectMap(session); 217 parseIntoMap2(session, r, m, sType.getKeyType(), sType.getValueType(), pMeta); -218 if (m.containsKey(session.getBeanTypePropertyName())) +218 if (m.containsKey(session.getBeanTypePropertyName(eType))) 219 o = session.cast((ObjectMap)m, pMeta, eType); 220 else 221 throw new ParseException(session, "Class ''{0}'' could not be instantiated. Reason: ''{1}''", sType.getInnerClass().getName(), sType.getNotABeanReason()); @@ -278,9 +278,9 @@ 270 271 // '01' is not a valid number, but '0.1', '0e1', '0e+1' are valid. 272 if (c == '0' && s.length() > (isNegative ? 2 : 1)) { -273 char c2 = s.charAt((isNegative ? 2 : 1)); -274 if (c2 != '.' && c2 != 'e' && c2 != 'E') -275 throw new ParseException(session, "Invalid JSON number: '"+s+"'"); +273 char c2 = s.charAt((isNegative ? 2 : 1)); +274 if (c2 != '.' && c2 != 'e' && c2 != 'E') +275 throw new ParseException(session, "Invalid JSON number: '"+s+"'"); 276 } 277 278 // JSON doesn't allow '1.' or '0.e1'. @@ -501,7 +501,7 @@ 493 if (session.isCommentOrWhitespace(c)) { 494 skipCommentsAndSpace(session, r.unread()); 495 } else { -496 if (! currAttr.equals(session.getBeanTypePropertyName())) { +496 if (! currAttr.equals(session.getBeanTypePropertyName(m.getClassMeta()))) { 497 BeanPropertyMeta pMeta = m.getPropertyMeta(currAttr); 498 session.setCurrentProperty(pMeta); 499 if (pMeta == null) { http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/3fcb8e91/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.html b/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.html index 9100ae9..2e13019 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.html +++ b/content/site/apidocs/src-html/org/apache/juneau/json/JsonParser.html @@ -223,7 +223,7 @@ 215 } else if (c == '{') { 216 Map m = new ObjectMap(session); 217 parseIntoMap2(session, r, m, sType.getKeyType(), sType.getValueType(), pMeta); -218 if (m.containsKey(session.getBeanTypePropertyName())) +218 if (m.containsKey(session.getBeanTypePropertyName(eType))) 219 o = session.cast((ObjectMap)m, pMeta, eType); 220 else 221 throw new ParseException(session, "Class ''{0}'' could not be instantiated. Reason: ''{1}''", sType.getInnerClass().getName(), sType.getNotABeanReason()); @@ -278,9 +278,9 @@ 270 271 // '01' is not a valid number, but '0.1', '0e1', '0e+1' are valid. 272 if (c == '0' && s.length() > (isNegative ? 2 : 1)) { -273 char c2 = s.charAt((isNegative ? 2 : 1)); -274 if (c2 != '.' && c2 != 'e' && c2 != 'E') -275 throw new ParseException(session, "Invalid JSON number: '"+s+"'"); +273 char c2 = s.charAt((isNegative ? 2 : 1)); +274 if (c2 != '.' && c2 != 'e' && c2 != 'E') +275 throw new ParseException(session, "Invalid JSON number: '"+s+"'"); 276 } 277 278 // JSON doesn't allow '1.' or '0.e1'. @@ -501,7 +501,7 @@ 493 if (session.isCommentOrWhitespace(c)) { 494 skipCommentsAndSpace(session, r.unread()); 495 } else { -496 if (! currAttr.equals(session.getBeanTypePropertyName())) { +496 if (! currAttr.equals(session.getBeanTypePropertyName(m.getClassMeta()))) { 497 BeanPropertyMeta pMeta = m.getPropertyMeta(currAttr); 498 session.setCurrentProperty(pMeta); 499 if (pMeta == null) { http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/3fcb8e91/content/site/apidocs/src-html/org/apache/juneau/json/JsonSchemaSerializer.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/json/JsonSchemaSerializer.html b/content/site/apidocs/src-html/org/apache/juneau/json/JsonSchemaSerializer.html index 5e2206e..5bd1e55 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/json/JsonSchemaSerializer.html +++ b/content/site/apidocs/src-html/org/apache/juneau/json/JsonSchemaSerializer.html @@ -86,7 +86,7 @@ 078 protected void doSerialize(SerializerSession session, Object o) throws Exception { 079 JsonSerializerSession s = (JsonSerializerSession)session; 080 ObjectMap schema = getSchema(s, session.getClassMetaForObject(o), "root", null); -081 serializeAnything(s, s.getWriter(), schema, null, "root", null); +081 serializeAnything(s, s.getWriter(), schema, s.getExpectedRootType(o), "root", null); 082 } 083 084 /*