From 3485b7bc5c57372f41c75bdd7a777f82c7e19386 Mon Sep 17 00:00:00 2001 From: Konstantin Shefov Date: Tue, 16 Jul 2013 17:40:15 -0300 Subject: [PATCH 001/120] 8017585: Exclude two failing tests from Nashorn CC run Reviewed-by: jlaskey, sundar, attila --- nashorn/exclude/exclude_list.txt | 4 ++++ nashorn/exclude/exclude_list_cc.txt | 6 ++++++ nashorn/make/build.xml | 6 ++++++ 3 files changed, 16 insertions(+) create mode 100644 nashorn/exclude/exclude_list.txt create mode 100644 nashorn/exclude/exclude_list_cc.txt diff --git a/nashorn/exclude/exclude_list.txt b/nashorn/exclude/exclude_list.txt new file mode 100644 index 00000000000..89618933148 --- /dev/null +++ b/nashorn/exclude/exclude_list.txt @@ -0,0 +1,4 @@ + + + + diff --git a/nashorn/exclude/exclude_list_cc.txt b/nashorn/exclude/exclude_list_cc.txt new file mode 100644 index 00000000000..a66476b8e16 --- /dev/null +++ b/nashorn/exclude/exclude_list_cc.txt @@ -0,0 +1,6 @@ + + + + + + diff --git a/nashorn/make/build.xml b/nashorn/make/build.xml index 2bda503fd88..4aaac75c909 100644 --- a/nashorn/make/build.xml +++ b/nashorn/make/build.xml @@ -51,6 +51,11 @@ + + + + + @@ -316,6 +321,7 @@ grant codeBase "file:/${basedir}/test/script/basic/JDK-8010946-privileged.js" { + From 2c90f36ca0262c03c8d17dd21db00568c20aab55 Mon Sep 17 00:00:00 2001 From: James Laskey Date: Wed, 17 Jul 2013 11:53:09 -0300 Subject: [PATCH 002/120] 8020596: Initialization of white space strings in scanner should be done with \u strings Reviewed-by: attila, hannesw --- .../jdk/nashorn/internal/parser/Lexer.java | 127 +++++++++--------- 1 file changed, 63 insertions(+), 64 deletions(-) diff --git a/nashorn/src/jdk/nashorn/internal/parser/Lexer.java b/nashorn/src/jdk/nashorn/internal/parser/Lexer.java index adb1445c9a4..ca4734a2542 100644 --- a/nashorn/src/jdk/nashorn/internal/parser/Lexer.java +++ b/nashorn/src/jdk/nashorn/internal/parser/Lexer.java @@ -83,12 +83,70 @@ public class Lexer extends Scanner { /** Type of last token added. */ private TokenType last; - private static final String JAVASCRIPT_WHITESPACE; - private static final String JAVASCRIPT_WHITESPACE_EOL; - private static final String JAVASCRIPT_WHITESPACE_IN_REGEXP; + private static final String SPACETAB = " \t"; // ASCII space and tab + private static final String LFCR = "\n\r"; // line feed and carriage return (ctrl-m) - private static final String JSON_WHITESPACE; - private static final String JSON_WHITESPACE_EOL; + private static final String JSON_WHITESPACE_EOL = LFCR; + private static final String JSON_WHITESPACE = SPACETAB + LFCR; + + private static final String JAVASCRIPT_WHITESPACE_EOL = + LFCR + + "\u2028" + // line separator + "\u2029" // paragraph separator + ; + private static final String JAVASCRIPT_WHITESPACE = + SPACETAB + + JAVASCRIPT_WHITESPACE_EOL + + "\u000b" + // tabulation line + "\u000c" + // ff (ctrl-l) + "\u00a0" + // Latin-1 space + "\u1680" + // Ogham space mark + "\u180e" + // separator, Mongolian vowel + "\u2000" + // en quad + "\u2001" + // em quad + "\u2002" + // en space + "\u2003" + // em space + "\u2004" + // three-per-em space + "\u2005" + // four-per-em space + "\u2006" + // six-per-em space + "\u2007" + // figure space + "\u2008" + // punctuation space + "\u2009" + // thin space + "\u200a" + // hair space + "\u202f" + // narrow no-break space + "\u205f" + // medium mathematical space + "\u3000" + // ideographic space + "\ufeff" // byte order mark + ; + + private static final String JAVASCRIPT_WHITESPACE_IN_REGEXP = + "\\u000a" + // line feed + "\\u000d" + // carriage return (ctrl-m) + "\\u2028" + // line separator + "\\u2029" + // paragraph separator + "\\u0009" + // tab + "\\u0020" + // ASCII space + "\\u000b" + // tabulation line + "\\u000c" + // ff (ctrl-l) + "\\u00a0" + // Latin-1 space + "\\u1680" + // Ogham space mark + "\\u180e" + // separator, Mongolian vowel + "\\u2000" + // en quad + "\\u2001" + // em quad + "\\u2002" + // en space + "\\u2003" + // em space + "\\u2004" + // three-per-em space + "\\u2005" + // four-per-em space + "\\u2006" + // six-per-em space + "\\u2007" + // figure space + "\\u2008" + // punctuation space + "\\u2009" + // thin space + "\\u200a" + // hair space + "\\u202f" + // narrow no-break space + "\\u205f" + // medium mathematical space + "\\u3000" + // ideographic space + "\\ufeff" // byte order mark + ; static String unicodeEscape(final char ch) { final StringBuilder sb = new StringBuilder(); @@ -104,65 +162,6 @@ public class Lexer extends Scanner { return sb.toString(); } - static { - final StringBuilder ws = new StringBuilder(); - final StringBuilder wsEOL = new StringBuilder(); - final StringBuilder wsRegExp = new StringBuilder(); - final StringBuilder jsonWs = new StringBuilder(); - - jsonWs.append((char)0x000a); - jsonWs.append((char)0x000d); - JSON_WHITESPACE_EOL = jsonWs.toString(); - - jsonWs.append((char)0x0009); - jsonWs.append((char)0x0020); - JSON_WHITESPACE = jsonWs.toString(); - - for (int i = 0; i <= 0xffff; i++) { - switch (i) { - case 0x000a: // line feed - case 0x000d: // carriage return (ctrl-m) - case 0x2028: // line separator - case 0x2029: // paragraph separator - wsEOL.append((char)i); - case 0x0009: // tab - case 0x0020: // ASCII space - case 0x000b: // tabulation line - case 0x000c: // ff (ctrl-l) - case 0x00a0: // Latin-1 space - case 0x1680: // Ogham space mark - case 0x180e: // separator, Mongolian vowel - case 0x2000: // en quad - case 0x2001: // em quad - case 0x2002: // en space - case 0x2003: // em space - case 0x2004: // three-per-em space - case 0x2005: // four-per-em space - case 0x2006: // six-per-em space - case 0x2007: // figure space - case 0x2008: // punctuation space - case 0x2009: // thin space - case 0x200a: // hair space - case 0x202f: // narrow no-break space - case 0x205f: // medium mathematical space - case 0x3000: // ideographic space - case 0xfeff: // byte order mark - ws.append((char)i); - - wsRegExp.append(Lexer.unicodeEscape((char)i)); - break; - - default: - break; - } - } - - JAVASCRIPT_WHITESPACE = ws.toString(); - JAVASCRIPT_WHITESPACE_EOL = wsEOL.toString(); - JAVASCRIPT_WHITESPACE_IN_REGEXP = wsRegExp.toString(); - - } - /** * Constructor * From c4bea48ac1287910557dcae4614adeb41c0bf255 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= Date: Wed, 17 Jul 2013 18:20:40 +0200 Subject: [PATCH 003/120] 8020356: ClassCastException Undefined->Scope on spiltter class generated for a large switch statement Reviewed-by: jlaskey, attila --- .../internal/codegen/CodeGenerator.java | 32 +- .../jdk/nashorn/internal/codegen/Label.java | 12 + .../nashorn/internal/codegen/Splitter.java | 24 +- .../nashorn/internal/codegen/WeighNodes.java | 38 +- .../src/jdk/nashorn/internal/ir/Block.java | 1 - .../jdk/nashorn/internal/ir/FunctionNode.java | 5 +- .../nashorn/internal/ir/LexicalContext.java | 8 +- nashorn/test/script/basic/JDK-8020356.js | 10435 ++++++++++++++++ .../test/script/basic/JDK-8020356.js.EXPECTED | 2 + 9 files changed, 10507 insertions(+), 50 deletions(-) create mode 100644 nashorn/test/script/basic/JDK-8020356.js create mode 100644 nashorn/test/script/basic/JDK-8020356.js.EXPECTED diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java index 9503e95a4b2..6066cd042f3 100644 --- a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java +++ b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java @@ -1143,22 +1143,23 @@ final class CodeGenerator extends NodeOperatorVisitor { long weight = WeighNodes.weigh(functionNode); final boolean top = fn.isProgram(); //compiler.getFunctionNode() == outermost; + // We know that our LexicalContext is empty outside the call to functionNode.accept(this) below, + // so we can pass null to all methods expecting a LexicalContext parameter. + assert lc.isEmpty() : "LexicalContext not empty"; + if (weight >= SPLIT_THRESHOLD) { LOG.finest("Splitting '", functionNode.getName(), "' as its weight ", weight, " exceeds split threshold ", SPLIT_THRESHOLD); functionNode = (FunctionNode)functionNode.accept(this); @@ -103,11 +107,12 @@ final class Splitter extends NodeVisitor { if (functionNode.isSplit()) { // Weight has changed so weigh again, this time using block weight cache weight = WeighNodes.weigh(functionNode, weightCache); - functionNode = functionNode.setBody(lc, functionNode.getBody().setNeedsScope(lc)); + functionNode = functionNode.setBody(null, functionNode.getBody().setNeedsScope(null)); } if (weight >= SPLIT_THRESHOLD) { - functionNode = functionNode.setBody(lc, splitBlock(functionNode.getBody(), functionNode)); + functionNode = functionNode.setBody(null, splitBlock(functionNode.getBody(), functionNode)); + functionNode = functionNode.setFlag(null, FunctionNode.IS_SPLIT); weight = WeighNodes.weigh(functionNode.getBody(), weightCache); } } @@ -116,10 +121,10 @@ final class Splitter extends NodeVisitor { if (top) { assert outermostCompileUnit != null : "outermost compile unit is null"; - functionNode = functionNode.setCompileUnit(lc, outermostCompileUnit); + functionNode = functionNode.setCompileUnit(null, outermostCompileUnit); outermostCompileUnit.addWeight(weight + WeighNodes.FUNCTION_WEIGHT); } else { - functionNode = functionNode.setCompileUnit(lc, findUnit(weight)); + functionNode = functionNode.setCompileUnit(null, findUnit(weight)); } final Block body = functionNode.getBody(); @@ -138,11 +143,11 @@ final class Splitter extends NodeVisitor { return split; } }); - functionNode = functionNode.setBody(lc, newBody); + functionNode = functionNode.setBody(null, newBody); assert functionNode.getCompileUnit() != null; - return functionNode.setState(lc, CompilationState.SPLIT); + return functionNode.setState(null, CompilationState.SPLIT); } private static List directChildren(final FunctionNode functionNode) { @@ -179,7 +184,6 @@ final class Splitter extends NodeVisitor { * @return new weight for the resulting block. */ private Block splitBlock(final Block block, final FunctionNode function) { - lc.setFlag(lc.getCurrentFunction(), FunctionNode.IS_SPLIT); final List splits = new ArrayList<>(); List statements = new ArrayList<>(); @@ -255,8 +259,10 @@ final class Splitter extends NodeVisitor { // been split already, so weigh again before splitting. long weight = WeighNodes.weigh(block, weightCache); if (weight >= SPLIT_THRESHOLD) { - newBlock = splitBlock(block, lc.getFunction(block)); + final FunctionNode currentFunction = lc.getCurrentFunction(); + newBlock = splitBlock(block, currentFunction); weight = WeighNodes.weigh(newBlock, weightCache); + lc.setFlag(currentFunction, FunctionNode.IS_SPLIT); } weightCache.put(newBlock, weight); return newBlock; @@ -289,7 +295,7 @@ final class Splitter extends NodeVisitor { final Node element = value[postset]; weight = WeighNodes.weigh(element); - totalWeight += weight; + totalWeight += WeighNodes.AASTORE_WEIGHT + weight; if (totalWeight >= SPLIT_THRESHOLD) { final CompileUnit unit = compiler.findUnit(totalWeight - weight); diff --git a/nashorn/src/jdk/nashorn/internal/codegen/WeighNodes.java b/nashorn/src/jdk/nashorn/internal/codegen/WeighNodes.java index 57b3bafa797..9ecfccd6126 100644 --- a/nashorn/src/jdk/nashorn/internal/codegen/WeighNodes.java +++ b/nashorn/src/jdk/nashorn/internal/codegen/WeighNodes.java @@ -68,24 +68,25 @@ final class WeighNodes extends NodeOperatorVisitor { /* * Weight constants. */ - static final long FUNCTION_WEIGHT = 40; - private static final long ACCESS_WEIGHT = 4; - private static final long ADD_WEIGHT = 10; - private static final long BREAK_WEIGHT = 1; - private static final long CALL_WEIGHT = 10; - private static final long CATCH_WEIGHT = 10; - private static final long CONTINUE_WEIGHT = 1; - private static final long IF_WEIGHT = 2; - private static final long LITERAL_WEIGHT = 10; - private static final long LOOP_WEIGHT = 4; - private static final long NEW_WEIGHT = 6; - private static final long FUNC_EXPR_WEIGHT = 20; - private static final long RETURN_WEIGHT = 2; - private static final long SPLIT_WEIGHT = 40; - private static final long SWITCH_WEIGHT = 8; - private static final long THROW_WEIGHT = 2; - private static final long VAR_WEIGHT = 40; - private static final long WITH_WEIGHT = 8; + static final long FUNCTION_WEIGHT = 40; + static final long AASTORE_WEIGHT = 2; + static final long ACCESS_WEIGHT = 4; + static final long ADD_WEIGHT = 10; + static final long BREAK_WEIGHT = 1; + static final long CALL_WEIGHT = 10; + static final long CATCH_WEIGHT = 10; + static final long CONTINUE_WEIGHT = 1; + static final long IF_WEIGHT = 2; + static final long LITERAL_WEIGHT = 10; + static final long LOOP_WEIGHT = 4; + static final long NEW_WEIGHT = 6; + static final long FUNC_EXPR_WEIGHT = 20; + static final long RETURN_WEIGHT = 2; + static final long SPLIT_WEIGHT = 40; + static final long SWITCH_WEIGHT = 8; + static final long THROW_WEIGHT = 2; + static final long VAR_WEIGHT = 40; + static final long WITH_WEIGHT = 8; /** Accumulated weight. */ private long weight; @@ -210,6 +211,7 @@ final class WeighNodes extends NodeOperatorVisitor { if (units == null) { for (final int postset : postsets) { + weight += AASTORE_WEIGHT; final Node element = value[postset]; if (element != null) { diff --git a/nashorn/src/jdk/nashorn/internal/ir/Block.java b/nashorn/src/jdk/nashorn/internal/ir/Block.java index c411401e710..694e6732623 100644 --- a/nashorn/src/jdk/nashorn/internal/ir/Block.java +++ b/nashorn/src/jdk/nashorn/internal/ir/Block.java @@ -95,7 +95,6 @@ public class Block extends Node implements BreakableNode, Flags { /** * Constructor * - * @param lineNumber line number * @param token token * @param finish finish * @param statements statements diff --git a/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java b/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java index 311a7f917b7..97dffef2a0b 100644 --- a/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java +++ b/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java @@ -540,12 +540,13 @@ public final class FunctionNode extends LexicalContextExpression implements Flag /** * Check if this function's generated Java method needs a {@code callee} parameter. Functions that need access to * their parent scope, functions that reference themselves, and non-strict functions that need an Arguments object - * (since it exposes {@code arguments.callee} property) will need to have a callee parameter. + * (since it exposes {@code arguments.callee} property) will need to have a callee parameter. We also return true + * for split functions to make sure symbols slots are the same in the main and split methods. * * @return true if the function's generated Java method needs a {@code callee} parameter. */ public boolean needsCallee() { - return needsParentScope() || needsSelfSymbol() || (needsArguments() && !isStrict()); + return needsParentScope() || needsSelfSymbol() || isSplit() || (needsArguments() && !isStrict()); } /** diff --git a/nashorn/src/jdk/nashorn/internal/ir/LexicalContext.java b/nashorn/src/jdk/nashorn/internal/ir/LexicalContext.java index ed0ca62f9b9..666be7e3fc1 100644 --- a/nashorn/src/jdk/nashorn/internal/ir/LexicalContext.java +++ b/nashorn/src/jdk/nashorn/internal/ir/LexicalContext.java @@ -350,10 +350,12 @@ public class LexicalContext { * @return the innermost function in the context. */ public FunctionNode getCurrentFunction() { - if (isEmpty()) { - return null; + for (int i = sp - 1; i >= 0; i--) { + if (stack[i] instanceof FunctionNode) { + return (FunctionNode) stack[i]; + } } - return new NodeIterator<>(FunctionNode.class).next(); + return null; } /** diff --git a/nashorn/test/script/basic/JDK-8020356.js b/nashorn/test/script/basic/JDK-8020356.js new file mode 100644 index 00000000000..062a5412372 --- /dev/null +++ b/nashorn/test/script/basic/JDK-8020356.js @@ -0,0 +1,10435 @@ +/* + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * JDK-8020356: ClassCastException Undefined->Scope on spiltter class generated for a large switch statement + * + * @test + * @run + */ + +print(hugeSwitch.apply({i: 20})); +print(hugeArrayLiteral.apply({i: 10})); + +function hugeSwitch() { + switch (1) { + case 1: + return this.i; + case 2: + return this.i; + case 3: + return this.i; + case 4: + return this.i; + case 5: + return this.i; + case 6: + return this.i; + case 7: + return this.i; + case 8: + return this.i; + case 9: + return this.i; + case 10: + return this.i; + case 11: + return this.i; + case 12: + return this.i; + case 13: + return this.i; + case 14: + return this.i; + case 15: + return this.i; + case 16: + return this.i; + case 17: + return this.i; + case 18: + return this.i; + case 19: + return this.i; + case 20: + return this.i; + case 21: + return this.i; + case 22: + return this.i; + case 23: + return this.i; + case 24: + return this.i; + case 25: + return this.i; + case 26: + return this.i; + case 27: + return this.i; + case 28: + return this.i; + case 29: + return this.i; + case 30: + return this.i; + case 31: + return this.i; + case 32: + return this.i; + case 33: + return this.i; + case 34: + return this.i; + case 35: + return this.i; + case 36: + return this.i; + case 37: + return this.i; + case 38: + return this.i; + case 39: + return this.i; + case 40: + return this.i; + case 41: + return this.i; + case 42: + return this.i; + case 43: + return this.i; + case 44: + return this.i; + case 45: + return this.i; + case 46: + return this.i; + case 47: + return this.i; + case 48: + return this.i; + case 49: + return this.i; + case 50: + return this.i; + case 51: + return this.i; + case 52: + return this.i; + case 53: + return this.i; + case 54: + return this.i; + case 55: + return this.i; + case 56: + return this.i; + case 57: + return this.i; + case 58: + return this.i; + case 59: + return this.i; + case 60: + return this.i; + case 61: + return this.i; + case 62: + return this.i; + case 63: + return this.i; + case 64: + return this.i; + case 65: + return this.i; + case 66: + return this.i; + case 67: + return this.i; + case 68: + return this.i; + case 69: + return this.i; + case 70: + return this.i; + case 71: + return this.i; + case 72: + return this.i; + case 73: + return this.i; + case 74: + return this.i; + case 75: + return this.i; + case 76: + return this.i; + case 77: + return this.i; + case 78: + return this.i; + case 79: + return this.i; + case 80: + return this.i; + case 81: + return this.i; + case 82: + return this.i; + case 83: + return this.i; + case 84: + return this.i; + case 85: + return this.i; + case 86: + return this.i; + case 87: + return this.i; + case 88: + return this.i; + case 89: + return this.i; + case 90: + return this.i; + case 91: + return this.i; + case 92: + return this.i; + case 93: + return this.i; + case 94: + return this.i; + case 95: + return this.i; + case 96: + return this.i; + case 97: + return this.i; + case 98: + return this.i; + case 99: + return this.i; + case 100: + return this.i; + case 101: + return this.i; + case 102: + return this.i; + case 103: + return this.i; + case 104: + return this.i; + case 105: + return this.i; + case 106: + return this.i; + case 107: + return this.i; + case 108: + return this.i; + case 109: + return this.i; + case 110: + return this.i; + case 111: + return this.i; + case 112: + return this.i; + case 113: + return this.i; + case 114: + return this.i; + case 115: + return this.i; + case 116: + return this.i; + case 117: + return this.i; + case 118: + return this.i; + case 119: + return this.i; + case 120: + return this.i; + case 121: + return this.i; + case 122: + return this.i; + case 123: + return this.i; + case 124: + return this.i; + case 125: + return this.i; + case 126: + return this.i; + case 127: + return this.i; + case 128: + return this.i; + case 129: + return this.i; + case 130: + return this.i; + case 131: + return this.i; + case 132: + return this.i; + case 133: + return this.i; + case 134: + return this.i; + case 135: + return this.i; + case 136: + return this.i; + case 137: + return this.i; + case 138: + return this.i; + case 139: + return this.i; + case 140: + return this.i; + case 141: + return this.i; + case 142: + return this.i; + case 143: + return this.i; + case 144: + return this.i; + case 145: + return this.i; + case 146: + return this.i; + case 147: + return this.i; + case 148: + return this.i; + case 149: + return this.i; + case 150: + return this.i; + case 151: + return this.i; + case 152: + return this.i; + case 153: + return this.i; + case 154: + return this.i; + case 155: + return this.i; + case 156: + return this.i; + case 157: + return this.i; + case 158: + return this.i; + case 159: + return this.i; + case 160: + return this.i; + case 161: + return this.i; + case 162: + return this.i; + case 163: + return this.i; + case 164: + return this.i; + case 165: + return this.i; + case 166: + return this.i; + case 167: + return this.i; + case 168: + return this.i; + case 169: + return this.i; + case 170: + return this.i; + case 171: + return this.i; + case 172: + return this.i; + case 173: + return this.i; + case 174: + return this.i; + case 175: + return this.i; + case 176: + return this.i; + case 177: + return this.i; + case 178: + return this.i; + case 179: + return this.i; + case 180: + return this.i; + case 181: + return this.i; + case 182: + return this.i; + case 183: + return this.i; + case 184: + return this.i; + case 185: + return this.i; + case 186: + return this.i; + case 187: + return this.i; + case 188: + return this.i; + case 189: + return this.i; + case 190: + return this.i; + case 191: + return this.i; + case 192: + return this.i; + case 193: + return this.i; + case 194: + return this.i; + case 195: + return this.i; + case 196: + return this.i; + case 197: + return this.i; + case 198: + return this.i; + case 199: + return this.i; + case 200: + return this.i; + case 201: + return this.i; + case 202: + return this.i; + case 203: + return this.i; + case 204: + return this.i; + case 205: + return this.i; + case 206: + return this.i; + case 207: + return this.i; + case 208: + return this.i; + case 209: + return this.i; + case 210: + return this.i; + case 211: + return this.i; + case 212: + return this.i; + case 213: + return this.i; + case 214: + return this.i; + case 215: + return this.i; + case 216: + return this.i; + case 217: + return this.i; + case 218: + return this.i; + case 219: + return this.i; + case 220: + return this.i; + case 221: + return this.i; + case 222: + return this.i; + case 223: + return this.i; + case 224: + return this.i; + case 225: + return this.i; + case 226: + return this.i; + case 227: + return this.i; + case 228: + return this.i; + case 229: + return this.i; + case 230: + return this.i; + case 231: + return this.i; + case 232: + return this.i; + case 233: + return this.i; + case 234: + return this.i; + case 235: + return this.i; + case 236: + return this.i; + case 237: + return this.i; + case 238: + return this.i; + case 239: + return this.i; + case 240: + return this.i; + case 241: + return this.i; + case 242: + return this.i; + case 243: + return this.i; + case 244: + return this.i; + case 245: + return this.i; + case 246: + return this.i; + case 247: + return this.i; + case 248: + return this.i; + case 249: + return this.i; + case 250: + return this.i; + case 251: + return this.i; + case 252: + return this.i; + case 253: + return this.i; + case 254: + return this.i; + case 255: + return this.i; + case 256: + return this.i; + case 257: + return this.i; + case 258: + return this.i; + case 259: + return this.i; + case 260: + return this.i; + case 261: + return this.i; + case 262: + return this.i; + case 263: + return this.i; + case 264: + return this.i; + case 265: + return this.i; + case 266: + return this.i; + case 267: + return this.i; + case 268: + return this.i; + case 269: + return this.i; + case 270: + return this.i; + case 271: + return this.i; + case 272: + return this.i; + case 273: + return this.i; + case 274: + return this.i; + case 275: + return this.i; + case 276: + return this.i; + case 277: + return this.i; + case 278: + return this.i; + case 279: + return this.i; + case 280: + return this.i; + case 281: + return this.i; + case 282: + return this.i; + case 283: + return this.i; + case 284: + return this.i; + case 285: + return this.i; + case 286: + return this.i; + case 287: + return this.i; + case 288: + return this.i; + case 289: + return this.i; + case 290: + return this.i; + case 291: + return this.i; + case 292: + return this.i; + case 293: + return this.i; + case 294: + return this.i; + case 295: + return this.i; + case 296: + return this.i; + case 297: + return this.i; + case 298: + return this.i; + case 299: + return this.i; + case 300: + return this.i; + case 301: + return this.i; + case 302: + return this.i; + case 303: + return this.i; + case 304: + return this.i; + case 305: + return this.i; + case 306: + return this.i; + case 307: + return this.i; + case 308: + return this.i; + case 309: + return this.i; + case 310: + return this.i; + case 311: + return this.i; + case 312: + return this.i; + case 313: + return this.i; + case 314: + return this.i; + case 315: + return this.i; + case 316: + return this.i; + case 317: + return this.i; + case 318: + return this.i; + case 319: + return this.i; + case 320: + return this.i; + case 321: + return this.i; + case 322: + return this.i; + case 323: + return this.i; + case 324: + return this.i; + case 325: + return this.i; + case 326: + return this.i; + case 327: + return this.i; + case 328: + return this.i; + case 329: + return this.i; + case 330: + return this.i; + case 331: + return this.i; + case 332: + return this.i; + case 333: + return this.i; + case 334: + return this.i; + case 335: + return this.i; + case 336: + return this.i; + case 337: + return this.i; + case 338: + return this.i; + case 339: + return this.i; + case 340: + return this.i; + case 341: + return this.i; + case 342: + return this.i; + case 343: + return this.i; + case 344: + return this.i; + case 345: + return this.i; + case 346: + return this.i; + case 347: + return this.i; + case 348: + return this.i; + case 349: + return this.i; + case 350: + return this.i; + case 351: + return this.i; + case 352: + return this.i; + case 353: + return this.i; + case 354: + return this.i; + case 355: + return this.i; + case 356: + return this.i; + case 357: + return this.i; + case 358: + return this.i; + case 359: + return this.i; + case 360: + return this.i; + case 361: + return this.i; + case 362: + return this.i; + case 363: + return this.i; + case 364: + return this.i; + case 365: + return this.i; + case 366: + return this.i; + case 367: + return this.i; + case 368: + return this.i; + case 369: + return this.i; + case 370: + return this.i; + case 371: + return this.i; + case 372: + return this.i; + case 373: + return this.i; + case 374: + return this.i; + case 375: + return this.i; + case 376: + return this.i; + case 377: + return this.i; + case 378: + return this.i; + case 379: + return this.i; + case 380: + return this.i; + case 381: + return this.i; + case 382: + return this.i; + case 383: + return this.i; + case 384: + return this.i; + case 385: + return this.i; + case 386: + return this.i; + case 387: + return this.i; + case 388: + return this.i; + case 389: + return this.i; + case 390: + return this.i; + case 391: + return this.i; + case 392: + return this.i; + case 393: + return this.i; + case 394: + return this.i; + case 395: + return this.i; + case 396: + return this.i; + case 397: + return this.i; + case 398: + return this.i; + case 399: + return this.i; + case 400: + return this.i; + case 401: + return this.i; + case 402: + return this.i; + case 403: + return this.i; + case 404: + return this.i; + case 405: + return this.i; + case 406: + return this.i; + case 407: + return this.i; + case 408: + return this.i; + case 409: + return this.i; + case 410: + return this.i; + case 411: + return this.i; + case 412: + return this.i; + case 413: + return this.i; + case 414: + return this.i; + case 415: + return this.i; + case 416: + return this.i; + case 417: + return this.i; + case 418: + return this.i; + case 419: + return this.i; + case 420: + return this.i; + case 421: + return this.i; + case 422: + return this.i; + case 423: + return this.i; + case 424: + return this.i; + case 425: + return this.i; + case 426: + return this.i; + case 427: + return this.i; + case 428: + return this.i; + case 429: + return this.i; + case 430: + return this.i; + case 431: + return this.i; + case 432: + return this.i; + case 433: + return this.i; + case 434: + return this.i; + case 435: + return this.i; + case 436: + return this.i; + case 437: + return this.i; + case 438: + return this.i; + case 439: + return this.i; + case 440: + return this.i; + case 441: + return this.i; + case 442: + return this.i; + case 443: + return this.i; + case 444: + return this.i; + case 445: + return this.i; + case 446: + return this.i; + case 447: + return this.i; + case 448: + return this.i; + case 449: + return this.i; + case 450: + return this.i; + case 451: + return this.i; + case 452: + return this.i; + case 453: + return this.i; + case 454: + return this.i; + case 455: + return this.i; + case 456: + return this.i; + case 457: + return this.i; + case 458: + return this.i; + case 459: + return this.i; + case 460: + return this.i; + case 461: + return this.i; + case 462: + return this.i; + case 463: + return this.i; + case 464: + return this.i; + case 465: + return this.i; + case 466: + return this.i; + case 467: + return this.i; + case 468: + return this.i; + case 469: + return this.i; + case 470: + return this.i; + case 471: + return this.i; + case 472: + return this.i; + case 473: + return this.i; + case 474: + return this.i; + case 475: + return this.i; + case 476: + return this.i; + case 477: + return this.i; + case 478: + return this.i; + case 479: + return this.i; + case 480: + return this.i; + case 481: + return this.i; + case 482: + return this.i; + case 483: + return this.i; + case 484: + return this.i; + case 485: + return this.i; + case 486: + return this.i; + case 487: + return this.i; + case 488: + return this.i; + case 489: + return this.i; + case 490: + return this.i; + case 491: + return this.i; + case 492: + return this.i; + case 493: + return this.i; + case 494: + return this.i; + case 495: + return this.i; + case 496: + return this.i; + case 497: + return this.i; + case 498: + return this.i; + case 499: + return this.i; + case 500: + return this.i; + case 501: + return this.i; + case 502: + return this.i; + case 503: + return this.i; + case 504: + return this.i; + case 505: + return this.i; + case 506: + return this.i; + case 507: + return this.i; + case 508: + return this.i; + case 509: + return this.i; + case 510: + return this.i; + case 511: + return this.i; + case 512: + return this.i; + case 513: + return this.i; + case 514: + return this.i; + case 515: + return this.i; + case 516: + return this.i; + case 517: + return this.i; + case 518: + return this.i; + case 519: + return this.i; + case 520: + return this.i; + case 521: + return this.i; + case 522: + return this.i; + case 523: + return this.i; + case 524: + return this.i; + case 525: + return this.i; + case 526: + return this.i; + case 527: + return this.i; + case 528: + return this.i; + case 529: + return this.i; + case 530: + return this.i; + case 531: + return this.i; + case 532: + return this.i; + case 533: + return this.i; + case 534: + return this.i; + case 535: + return this.i; + case 536: + return this.i; + case 537: + return this.i; + case 538: + return this.i; + case 539: + return this.i; + case 540: + return this.i; + case 541: + return this.i; + case 542: + return this.i; + case 543: + return this.i; + case 544: + return this.i; + case 545: + return this.i; + case 546: + return this.i; + case 547: + return this.i; + case 548: + return this.i; + case 549: + return this.i; + case 550: + return this.i; + case 551: + return this.i; + case 552: + return this.i; + case 553: + return this.i; + case 554: + return this.i; + case 555: + return this.i; + case 556: + return this.i; + case 557: + return this.i; + case 558: + return this.i; + case 559: + return this.i; + case 560: + return this.i; + case 561: + return this.i; + case 562: + return this.i; + case 563: + return this.i; + case 564: + return this.i; + case 565: + return this.i; + case 566: + return this.i; + case 567: + return this.i; + case 568: + return this.i; + case 569: + return this.i; + case 570: + return this.i; + case 571: + return this.i; + case 572: + return this.i; + case 573: + return this.i; + case 574: + return this.i; + case 575: + return this.i; + case 576: + return this.i; + case 577: + return this.i; + case 578: + return this.i; + case 579: + return this.i; + case 580: + return this.i; + case 581: + return this.i; + case 582: + return this.i; + case 583: + return this.i; + case 584: + return this.i; + case 585: + return this.i; + case 586: + return this.i; + case 587: + return this.i; + case 588: + return this.i; + case 589: + return this.i; + case 590: + return this.i; + case 591: + return this.i; + case 592: + return this.i; + case 593: + return this.i; + case 594: + return this.i; + case 595: + return this.i; + case 596: + return this.i; + case 597: + return this.i; + case 598: + return this.i; + case 599: + return this.i; + case 600: + return this.i; + case 601: + return this.i; + case 602: + return this.i; + case 603: + return this.i; + case 604: + return this.i; + case 605: + return this.i; + case 606: + return this.i; + case 607: + return this.i; + case 608: + return this.i; + case 609: + return this.i; + case 610: + return this.i; + case 611: + return this.i; + case 612: + return this.i; + case 613: + return this.i; + case 614: + return this.i; + case 615: + return this.i; + case 616: + return this.i; + case 617: + return this.i; + case 618: + return this.i; + case 619: + return this.i; + case 620: + return this.i; + case 621: + return this.i; + case 622: + return this.i; + case 623: + return this.i; + case 624: + return this.i; + case 625: + return this.i; + case 626: + return this.i; + case 627: + return this.i; + case 628: + return this.i; + case 629: + return this.i; + case 630: + return this.i; + case 631: + return this.i; + case 632: + return this.i; + case 633: + return this.i; + case 634: + return this.i; + case 635: + return this.i; + case 636: + return this.i; + case 637: + return this.i; + case 638: + return this.i; + case 639: + return this.i; + case 640: + return this.i; + case 641: + return this.i; + case 642: + return this.i; + case 643: + return this.i; + case 644: + return this.i; + case 645: + return this.i; + case 646: + return this.i; + case 647: + return this.i; + case 648: + return this.i; + case 649: + return this.i; + case 650: + return this.i; + case 651: + return this.i; + case 652: + return this.i; + case 653: + return this.i; + case 654: + return this.i; + case 655: + return this.i; + case 656: + return this.i; + case 657: + return this.i; + case 658: + return this.i; + case 659: + return this.i; + case 660: + return this.i; + case 661: + return this.i; + case 662: + return this.i; + case 663: + return this.i; + case 664: + return this.i; + case 665: + return this.i; + case 666: + return this.i; + case 667: + return this.i; + case 668: + return this.i; + case 669: + return this.i; + case 670: + return this.i; + case 671: + return this.i; + case 672: + return this.i; + case 673: + return this.i; + case 674: + return this.i; + case 675: + return this.i; + case 676: + return this.i; + case 677: + return this.i; + case 678: + return this.i; + case 679: + return this.i; + case 680: + return this.i; + case 681: + return this.i; + case 682: + return this.i; + case 683: + return this.i; + case 684: + return this.i; + case 685: + return this.i; + case 686: + return this.i; + case 687: + return this.i; + case 688: + return this.i; + case 689: + return this.i; + case 690: + return this.i; + case 691: + return this.i; + case 692: + return this.i; + case 693: + return this.i; + case 694: + return this.i; + case 695: + return this.i; + case 696: + return this.i; + case 697: + return this.i; + case 698: + return this.i; + case 699: + return this.i; + case 700: + return this.i; + case 701: + return this.i; + case 702: + return this.i; + case 703: + return this.i; + case 704: + return this.i; + case 705: + return this.i; + case 706: + return this.i; + case 707: + return this.i; + case 708: + return this.i; + case 709: + return this.i; + case 710: + return this.i; + case 711: + return this.i; + case 712: + return this.i; + case 713: + return this.i; + case 714: + return this.i; + case 715: + return this.i; + case 716: + return this.i; + case 717: + return this.i; + case 718: + return this.i; + case 719: + return this.i; + case 720: + return this.i; + case 721: + return this.i; + case 722: + return this.i; + case 723: + return this.i; + case 724: + return this.i; + case 725: + return this.i; + case 726: + return this.i; + case 727: + return this.i; + case 728: + return this.i; + case 729: + return this.i; + case 730: + return this.i; + case 731: + return this.i; + case 732: + return this.i; + case 733: + return this.i; + case 734: + return this.i; + case 735: + return this.i; + case 736: + return this.i; + case 737: + return this.i; + case 738: + return this.i; + case 739: + return this.i; + case 740: + return this.i; + case 741: + return this.i; + case 742: + return this.i; + case 743: + return this.i; + case 744: + return this.i; + case 745: + return this.i; + case 746: + return this.i; + case 747: + return this.i; + case 748: + return this.i; + case 749: + return this.i; + case 750: + return this.i; + case 751: + return this.i; + case 752: + return this.i; + case 753: + return this.i; + case 754: + return this.i; + case 755: + return this.i; + case 756: + return this.i; + case 757: + return this.i; + case 758: + return this.i; + case 759: + return this.i; + case 760: + return this.i; + case 761: + return this.i; + case 762: + return this.i; + case 763: + return this.i; + case 764: + return this.i; + case 765: + return this.i; + case 766: + return this.i; + case 767: + return this.i; + case 768: + return this.i; + case 769: + return this.i; + case 770: + return this.i; + case 771: + return this.i; + case 772: + return this.i; + case 773: + return this.i; + case 774: + return this.i; + case 775: + return this.i; + case 776: + return this.i; + case 777: + return this.i; + case 778: + return this.i; + case 779: + return this.i; + case 780: + return this.i; + case 781: + return this.i; + case 782: + return this.i; + case 783: + return this.i; + case 784: + return this.i; + case 785: + return this.i; + case 786: + return this.i; + case 787: + return this.i; + case 788: + return this.i; + case 789: + return this.i; + case 790: + return this.i; + case 791: + return this.i; + case 792: + return this.i; + case 793: + return this.i; + case 794: + return this.i; + case 795: + return this.i; + case 796: + return this.i; + case 797: + return this.i; + case 798: + return this.i; + case 799: + return this.i; + case 800: + return this.i; + case 801: + return this.i; + case 802: + return this.i; + case 803: + return this.i; + case 804: + return this.i; + case 805: + return this.i; + case 806: + return this.i; + case 807: + return this.i; + case 808: + return this.i; + case 809: + return this.i; + case 810: + return this.i; + case 811: + return this.i; + case 812: + return this.i; + case 813: + return this.i; + case 814: + return this.i; + case 815: + return this.i; + case 816: + return this.i; + case 817: + return this.i; + case 818: + return this.i; + case 819: + return this.i; + case 820: + return this.i; + case 821: + return this.i; + case 822: + return this.i; + case 823: + return this.i; + case 824: + return this.i; + case 825: + return this.i; + case 826: + return this.i; + case 827: + return this.i; + case 828: + return this.i; + case 829: + return this.i; + case 830: + return this.i; + case 831: + return this.i; + case 832: + return this.i; + case 833: + return this.i; + case 834: + return this.i; + case 835: + return this.i; + case 836: + return this.i; + case 837: + return this.i; + case 838: + return this.i; + case 839: + return this.i; + case 840: + return this.i; + case 841: + return this.i; + case 842: + return this.i; + case 843: + return this.i; + case 844: + return this.i; + case 845: + return this.i; + case 846: + return this.i; + case 847: + return this.i; + case 848: + return this.i; + case 849: + return this.i; + case 850: + return this.i; + case 851: + return this.i; + case 852: + return this.i; + case 853: + return this.i; + case 854: + return this.i; + case 855: + return this.i; + case 856: + return this.i; + case 857: + return this.i; + case 858: + return this.i; + case 859: + return this.i; + case 860: + return this.i; + case 861: + return this.i; + case 862: + return this.i; + case 863: + return this.i; + case 864: + return this.i; + case 865: + return this.i; + case 866: + return this.i; + case 867: + return this.i; + case 868: + return this.i; + case 869: + return this.i; + case 870: + return this.i; + case 871: + return this.i; + case 872: + return this.i; + case 873: + return this.i; + case 874: + return this.i; + case 875: + return this.i; + case 876: + return this.i; + case 877: + return this.i; + case 878: + return this.i; + case 879: + return this.i; + case 880: + return this.i; + case 881: + return this.i; + case 882: + return this.i; + case 883: + return this.i; + case 884: + return this.i; + case 885: + return this.i; + case 886: + return this.i; + case 887: + return this.i; + case 888: + return this.i; + case 889: + return this.i; + case 890: + return this.i; + case 891: + return this.i; + case 892: + return this.i; + case 893: + return this.i; + case 894: + return this.i; + case 895: + return this.i; + case 896: + return this.i; + case 897: + return this.i; + case 898: + return this.i; + case 899: + return this.i; + case 900: + return this.i; + case 901: + return this.i; + case 902: + return this.i; + case 903: + return this.i; + case 904: + return this.i; + case 905: + return this.i; + case 906: + return this.i; + case 907: + return this.i; + case 908: + return this.i; + case 909: + return this.i; + case 910: + return this.i; + case 911: + return this.i; + case 912: + return this.i; + case 913: + return this.i; + case 914: + return this.i; + case 915: + return this.i; + case 916: + return this.i; + case 917: + return this.i; + case 918: + return this.i; + case 919: + return this.i; + case 920: + return this.i; + case 921: + return this.i; + case 922: + return this.i; + case 923: + return this.i; + case 924: + return this.i; + case 925: + return this.i; + case 926: + return this.i; + case 927: + return this.i; + case 928: + return this.i; + case 929: + return this.i; + case 930: + return this.i; + case 931: + return this.i; + case 932: + return this.i; + case 933: + return this.i; + case 934: + return this.i; + case 935: + return this.i; + case 936: + return this.i; + case 937: + return this.i; + case 938: + return this.i; + case 939: + return this.i; + case 940: + return this.i; + case 941: + return this.i; + case 942: + return this.i; + case 943: + return this.i; + case 944: + return this.i; + case 945: + return this.i; + case 946: + return this.i; + case 947: + return this.i; + case 948: + return this.i; + case 949: + return this.i; + case 950: + return this.i; + case 951: + return this.i; + case 952: + return this.i; + case 953: + return this.i; + case 954: + return this.i; + case 955: + return this.i; + case 956: + return this.i; + case 957: + return this.i; + case 958: + return this.i; + case 959: + return this.i; + case 960: + return this.i; + case 961: + return this.i; + case 962: + return this.i; + case 963: + return this.i; + case 964: + return this.i; + case 965: + return this.i; + case 966: + return this.i; + case 967: + return this.i; + case 968: + return this.i; + case 969: + return this.i; + case 970: + return this.i; + case 971: + return this.i; + case 972: + return this.i; + case 973: + return this.i; + case 974: + return this.i; + case 975: + return this.i; + case 976: + return this.i; + case 977: + return this.i; + case 978: + return this.i; + case 979: + return this.i; + case 980: + return this.i; + case 981: + return this.i; + case 982: + return this.i; + case 983: + return this.i; + case 984: + return this.i; + case 985: + return this.i; + case 986: + return this.i; + case 987: + return this.i; + case 988: + return this.i; + case 989: + return this.i; + case 990: + return this.i; + case 991: + return this.i; + case 992: + return this.i; + case 993: + return this.i; + case 994: + return this.i; + case 995: + return this.i; + case 996: + return this.i; + case 997: + return this.i; + case 998: + return this.i; + case 999: + return this.i; + case 1000: + return this.i; + case 1001: + return this.i; + case 1002: + return this.i; + case 1003: + return this.i; + case 1004: + return this.i; + case 1005: + return this.i; + case 1006: + return this.i; + case 1007: + return this.i; + case 1008: + return this.i; + case 1009: + return this.i; + case 1010: + return this.i; + case 1011: + return this.i; + case 1012: + return this.i; + case 1013: + return this.i; + case 1014: + return this.i; + case 1015: + return this.i; + case 1016: + return this.i; + case 1017: + return this.i; + case 1018: + return this.i; + case 1019: + return this.i; + case 1020: + return this.i; + case 1021: + return this.i; + case 1022: + return this.i; + case 1023: + return this.i; + case 1024: + return this.i; + case 1025: + return this.i; + case 1026: + return this.i; + case 1027: + return this.i; + case 1028: + return this.i; + case 1029: + return this.i; + case 1030: + return this.i; + case 1031: + return this.i; + case 1032: + return this.i; + case 1033: + return this.i; + case 1034: + return this.i; + case 1035: + return this.i; + case 1036: + return this.i; + case 1037: + return this.i; + case 1038: + return this.i; + case 1039: + return this.i; + case 1040: + return this.i; + case 1041: + return this.i; + case 1042: + return this.i; + case 1043: + return this.i; + case 1044: + return this.i; + case 1045: + return this.i; + case 1046: + return this.i; + case 1047: + return this.i; + case 1048: + return this.i; + case 1049: + return this.i; + case 1050: + return this.i; + case 1051: + return this.i; + case 1052: + return this.i; + case 1053: + return this.i; + case 1054: + return this.i; + case 1055: + return this.i; + case 1056: + return this.i; + case 1057: + return this.i; + case 1058: + return this.i; + case 1059: + return this.i; + case 1060: + return this.i; + case 1061: + return this.i; + case 1062: + return this.i; + case 1063: + return this.i; + case 1064: + return this.i; + case 1065: + return this.i; + case 1066: + return this.i; + case 1067: + return this.i; + case 1068: + return this.i; + case 1069: + return this.i; + case 1070: + return this.i; + case 1071: + return this.i; + case 1072: + return this.i; + case 1073: + return this.i; + case 1074: + return this.i; + case 1075: + return this.i; + case 1076: + return this.i; + case 1077: + return this.i; + case 1078: + return this.i; + case 1079: + return this.i; + case 1080: + return this.i; + case 1081: + return this.i; + case 1082: + return this.i; + case 1083: + return this.i; + case 1084: + return this.i; + case 1085: + return this.i; + case 1086: + return this.i; + case 1087: + return this.i; + case 1088: + return this.i; + case 1089: + return this.i; + case 1090: + return this.i; + case 1091: + return this.i; + case 1092: + return this.i; + case 1093: + return this.i; + case 1094: + return this.i; + case 1095: + return this.i; + case 1096: + return this.i; + case 1097: + return this.i; + case 1098: + return this.i; + case 1099: + return this.i; + case 1100: + return this.i; + case 1101: + return this.i; + case 1102: + return this.i; + case 1103: + return this.i; + case 1104: + return this.i; + case 1105: + return this.i; + case 1106: + return this.i; + case 1107: + return this.i; + case 1108: + return this.i; + case 1109: + return this.i; + case 1110: + return this.i; + case 1111: + return this.i; + case 1112: + return this.i; + case 1113: + return this.i; + case 1114: + return this.i; + case 1115: + return this.i; + case 1116: + return this.i; + case 1117: + return this.i; + case 1118: + return this.i; + case 1119: + return this.i; + case 1120: + return this.i; + case 1121: + return this.i; + case 1122: + return this.i; + case 1123: + return this.i; + case 1124: + return this.i; + case 1125: + return this.i; + case 1126: + return this.i; + case 1127: + return this.i; + case 1128: + return this.i; + case 1129: + return this.i; + case 1130: + return this.i; + case 1131: + return this.i; + case 1132: + return this.i; + case 1133: + return this.i; + case 1134: + return this.i; + case 1135: + return this.i; + case 1136: + return this.i; + case 1137: + return this.i; + case 1138: + return this.i; + case 1139: + return this.i; + case 1140: + return this.i; + case 1141: + return this.i; + case 1142: + return this.i; + case 1143: + return this.i; + case 1144: + return this.i; + case 1145: + return this.i; + case 1146: + return this.i; + case 1147: + return this.i; + case 1148: + return this.i; + case 1149: + return this.i; + case 1150: + return this.i; + case 1151: + return this.i; + case 1152: + return this.i; + case 1153: + return this.i; + case 1154: + return this.i; + case 1155: + return this.i; + case 1156: + return this.i; + case 1157: + return this.i; + case 1158: + return this.i; + case 1159: + return this.i; + case 1160: + return this.i; + case 1161: + return this.i; + case 1162: + return this.i; + case 1163: + return this.i; + case 1164: + return this.i; + case 1165: + return this.i; + case 1166: + return this.i; + case 1167: + return this.i; + case 1168: + return this.i; + case 1169: + return this.i; + case 1170: + return this.i; + case 1171: + return this.i; + case 1172: + return this.i; + case 1173: + return this.i; + case 1174: + return this.i; + case 1175: + return this.i; + case 1176: + return this.i; + case 1177: + return this.i; + case 1178: + return this.i; + case 1179: + return this.i; + case 1180: + return this.i; + case 1181: + return this.i; + case 1182: + return this.i; + case 1183: + return this.i; + case 1184: + return this.i; + case 1185: + return this.i; + case 1186: + return this.i; + case 1187: + return this.i; + case 1188: + return this.i; + case 1189: + return this.i; + case 1190: + return this.i; + case 1191: + return this.i; + case 1192: + return this.i; + case 1193: + return this.i; + case 1194: + return this.i; + case 1195: + return this.i; + case 1196: + return this.i; + case 1197: + return this.i; + case 1198: + return this.i; + case 1199: + return this.i; + case 1200: + return this.i; + case 1201: + return this.i; + case 1202: + return this.i; + case 1203: + return this.i; + case 1204: + return this.i; + case 1205: + return this.i; + case 1206: + return this.i; + case 1207: + return this.i; + case 1208: + return this.i; + case 1209: + return this.i; + case 1210: + return this.i; + case 1211: + return this.i; + case 1212: + return this.i; + case 1213: + return this.i; + case 1214: + return this.i; + case 1215: + return this.i; + case 1216: + return this.i; + case 1217: + return this.i; + case 1218: + return this.i; + case 1219: + return this.i; + case 1220: + return this.i; + case 1221: + return this.i; + case 1222: + return this.i; + case 1223: + return this.i; + case 1224: + return this.i; + case 1225: + return this.i; + case 1226: + return this.i; + case 1227: + return this.i; + case 1228: + return this.i; + case 1229: + return this.i; + case 1230: + return this.i; + case 1231: + return this.i; + case 1232: + return this.i; + case 1233: + return this.i; + case 1234: + return this.i; + case 1235: + return this.i; + case 1236: + return this.i; + case 1237: + return this.i; + case 1238: + return this.i; + case 1239: + return this.i; + case 1240: + return this.i; + case 1241: + return this.i; + case 1242: + return this.i; + case 1243: + return this.i; + case 1244: + return this.i; + case 1245: + return this.i; + case 1246: + return this.i; + case 1247: + return this.i; + case 1248: + return this.i; + case 1249: + return this.i; + case 1250: + return this.i; + case 1251: + return this.i; + case 1252: + return this.i; + case 1253: + return this.i; + case 1254: + return this.i; + case 1255: + return this.i; + case 1256: + return this.i; + case 1257: + return this.i; + case 1258: + return this.i; + case 1259: + return this.i; + case 1260: + return this.i; + case 1261: + return this.i; + case 1262: + return this.i; + case 1263: + return this.i; + case 1264: + return this.i; + case 1265: + return this.i; + case 1266: + return this.i; + case 1267: + return this.i; + case 1268: + return this.i; + case 1269: + return this.i; + case 1270: + return this.i; + case 1271: + return this.i; + case 1272: + return this.i; + case 1273: + return this.i; + case 1274: + return this.i; + case 1275: + return this.i; + case 1276: + return this.i; + case 1277: + return this.i; + case 1278: + return this.i; + case 1279: + return this.i; + case 1280: + return this.i; + case 1281: + return this.i; + case 1282: + return this.i; + case 1283: + return this.i; + case 1284: + return this.i; + case 1285: + return this.i; + case 1286: + return this.i; + case 1287: + return this.i; + case 1288: + return this.i; + case 1289: + return this.i; + case 1290: + return this.i; + case 1291: + return this.i; + case 1292: + return this.i; + case 1293: + return this.i; + case 1294: + return this.i; + case 1295: + return this.i; + case 1296: + return this.i; + case 1297: + return this.i; + case 1298: + return this.i; + case 1299: + return this.i; + case 1300: + return this.i; + case 1301: + return this.i; + case 1302: + return this.i; + case 1303: + return this.i; + case 1304: + return this.i; + case 1305: + return this.i; + case 1306: + return this.i; + case 1307: + return this.i; + case 1308: + return this.i; + case 1309: + return this.i; + case 1310: + return this.i; + case 1311: + return this.i; + case 1312: + return this.i; + case 1313: + return this.i; + case 1314: + return this.i; + case 1315: + return this.i; + case 1316: + return this.i; + case 1317: + return this.i; + case 1318: + return this.i; + case 1319: + return this.i; + case 1320: + return this.i; + case 1321: + return this.i; + case 1322: + return this.i; + case 1323: + return this.i; + case 1324: + return this.i; + case 1325: + return this.i; + case 1326: + return this.i; + case 1327: + return this.i; + case 1328: + return this.i; + case 1329: + return this.i; + case 1330: + return this.i; + case 1331: + return this.i; + case 1332: + return this.i; + case 1333: + return this.i; + case 1334: + return this.i; + case 1335: + return this.i; + case 1336: + return this.i; + case 1337: + return this.i; + case 1338: + return this.i; + case 1339: + return this.i; + case 1340: + return this.i; + case 1341: + return this.i; + case 1342: + return this.i; + case 1343: + return this.i; + case 1344: + return this.i; + case 1345: + return this.i; + case 1346: + return this.i; + case 1347: + return this.i; + case 1348: + return this.i; + case 1349: + return this.i; + case 1350: + return this.i; + case 1351: + return this.i; + case 1352: + return this.i; + case 1353: + return this.i; + case 1354: + return this.i; + case 1355: + return this.i; + case 1356: + return this.i; + case 1357: + return this.i; + case 1358: + return this.i; + case 1359: + return this.i; + case 1360: + return this.i; + case 1361: + return this.i; + case 1362: + return this.i; + case 1363: + return this.i; + case 1364: + return this.i; + case 1365: + return this.i; + case 1366: + return this.i; + case 1367: + return this.i; + case 1368: + return this.i; + case 1369: + return this.i; + case 1370: + return this.i; + case 1371: + return this.i; + case 1372: + return this.i; + case 1373: + return this.i; + case 1374: + return this.i; + case 1375: + return this.i; + case 1376: + return this.i; + case 1377: + return this.i; + case 1378: + return this.i; + case 1379: + return this.i; + case 1380: + return this.i; + case 1381: + return this.i; + case 1382: + return this.i; + case 1383: + return this.i; + case 1384: + return this.i; + case 1385: + return this.i; + case 1386: + return this.i; + case 1387: + return this.i; + case 1388: + return this.i; + case 1389: + return this.i; + case 1390: + return this.i; + case 1391: + return this.i; + case 1392: + return this.i; + case 1393: + return this.i; + case 1394: + return this.i; + case 1395: + return this.i; + case 1396: + return this.i; + case 1397: + return this.i; + case 1398: + return this.i; + case 1399: + return this.i; + case 1400: + return this.i; + case 1401: + return this.i; + case 1402: + return this.i; + case 1403: + return this.i; + case 1404: + return this.i; + case 1405: + return this.i; + case 1406: + return this.i; + case 1407: + return this.i; + case 1408: + return this.i; + case 1409: + return this.i; + case 1410: + return this.i; + case 1411: + return this.i; + case 1412: + return this.i; + case 1413: + return this.i; + case 1414: + return this.i; + case 1415: + return this.i; + case 1416: + return this.i; + case 1417: + return this.i; + case 1418: + return this.i; + case 1419: + return this.i; + case 1420: + return this.i; + case 1421: + return this.i; + case 1422: + return this.i; + case 1423: + return this.i; + case 1424: + return this.i; + case 1425: + return this.i; + case 1426: + return this.i; + case 1427: + return this.i; + case 1428: + return this.i; + case 1429: + return this.i; + case 1430: + return this.i; + case 1431: + return this.i; + case 1432: + return this.i; + case 1433: + return this.i; + case 1434: + return this.i; + case 1435: + return this.i; + case 1436: + return this.i; + case 1437: + return this.i; + case 1438: + return this.i; + case 1439: + return this.i; + case 1440: + return this.i; + case 1441: + return this.i; + case 1442: + return this.i; + case 1443: + return this.i; + case 1444: + return this.i; + case 1445: + return this.i; + case 1446: + return this.i; + case 1447: + return this.i; + case 1448: + return this.i; + case 1449: + return this.i; + case 1450: + return this.i; + case 1451: + return this.i; + case 1452: + return this.i; + case 1453: + return this.i; + case 1454: + return this.i; + case 1455: + return this.i; + case 1456: + return this.i; + case 1457: + return this.i; + case 1458: + return this.i; + case 1459: + return this.i; + case 1460: + return this.i; + case 1461: + return this.i; + case 1462: + return this.i; + case 1463: + return this.i; + case 1464: + return this.i; + case 1465: + return this.i; + case 1466: + return this.i; + case 1467: + return this.i; + case 1468: + return this.i; + case 1469: + return this.i; + case 1470: + return this.i; + case 1471: + return this.i; + case 1472: + return this.i; + case 1473: + return this.i; + case 1474: + return this.i; + case 1475: + return this.i; + case 1476: + return this.i; + case 1477: + return this.i; + case 1478: + return this.i; + case 1479: + return this.i; + case 1480: + return this.i; + case 1481: + return this.i; + case 1482: + return this.i; + case 1483: + return this.i; + case 1484: + return this.i; + case 1485: + return this.i; + case 1486: + return this.i; + case 1487: + return this.i; + case 1488: + return this.i; + case 1489: + return this.i; + case 1490: + return this.i; + case 1491: + return this.i; + case 1492: + return this.i; + case 1493: + return this.i; + case 1494: + return this.i; + case 1495: + return this.i; + case 1496: + return this.i; + case 1497: + return this.i; + case 1498: + return this.i; + case 1499: + return this.i; + case 1500: + return this.i; + case 1501: + return this.i; + case 1502: + return this.i; + case 1503: + return this.i; + case 1504: + return this.i; + case 1505: + return this.i; + case 1506: + return this.i; + case 1507: + return this.i; + case 1508: + return this.i; + case 1509: + return this.i; + case 1510: + return this.i; + case 1511: + return this.i; + case 1512: + return this.i; + case 1513: + return this.i; + case 1514: + return this.i; + case 1515: + return this.i; + case 1516: + return this.i; + case 1517: + return this.i; + case 1518: + return this.i; + case 1519: + return this.i; + case 1520: + return this.i; + case 1521: + return this.i; + case 1522: + return this.i; + case 1523: + return this.i; + case 1524: + return this.i; + case 1525: + return this.i; + case 1526: + return this.i; + case 1527: + return this.i; + case 1528: + return this.i; + case 1529: + return this.i; + case 1530: + return this.i; + case 1531: + return this.i; + case 1532: + return this.i; + case 1533: + return this.i; + case 1534: + return this.i; + case 1535: + return this.i; + case 1536: + return this.i; + case 1537: + return this.i; + case 1538: + return this.i; + case 1539: + return this.i; + case 1540: + return this.i; + case 1541: + return this.i; + case 1542: + return this.i; + case 1543: + return this.i; + case 1544: + return this.i; + case 1545: + return this.i; + case 1546: + return this.i; + case 1547: + return this.i; + case 1548: + return this.i; + case 1549: + return this.i; + case 1550: + return this.i; + case 1551: + return this.i; + case 1552: + return this.i; + case 1553: + return this.i; + case 1554: + return this.i; + case 1555: + return this.i; + case 1556: + return this.i; + case 1557: + return this.i; + case 1558: + return this.i; + case 1559: + return this.i; + case 1560: + return this.i; + case 1561: + return this.i; + case 1562: + return this.i; + case 1563: + return this.i; + case 1564: + return this.i; + case 1565: + return this.i; + case 1566: + return this.i; + case 1567: + return this.i; + case 1568: + return this.i; + case 1569: + return this.i; + case 1570: + return this.i; + case 1571: + return this.i; + case 1572: + return this.i; + case 1573: + return this.i; + case 1574: + return this.i; + case 1575: + return this.i; + case 1576: + return this.i; + case 1577: + return this.i; + case 1578: + return this.i; + case 1579: + return this.i; + case 1580: + return this.i; + case 1581: + return this.i; + case 1582: + return this.i; + case 1583: + return this.i; + case 1584: + return this.i; + case 1585: + return this.i; + case 1586: + return this.i; + case 1587: + return this.i; + case 1588: + return this.i; + case 1589: + return this.i; + case 1590: + return this.i; + case 1591: + return this.i; + case 1592: + return this.i; + case 1593: + return this.i; + case 1594: + return this.i; + case 1595: + return this.i; + case 1596: + return this.i; + case 1597: + return this.i; + case 1598: + return this.i; + case 1599: + return this.i; + case 1600: + return this.i; + case 1601: + return this.i; + case 1602: + return this.i; + case 1603: + return this.i; + case 1604: + return this.i; + case 1605: + return this.i; + case 1606: + return this.i; + case 1607: + return this.i; + case 1608: + return this.i; + case 1609: + return this.i; + case 1610: + return this.i; + case 1611: + return this.i; + case 1612: + return this.i; + case 1613: + return this.i; + case 1614: + return this.i; + case 1615: + return this.i; + case 1616: + return this.i; + case 1617: + return this.i; + case 1618: + return this.i; + case 1619: + return this.i; + case 1620: + return this.i; + case 1621: + return this.i; + case 1622: + return this.i; + case 1623: + return this.i; + case 1624: + return this.i; + case 1625: + return this.i; + case 1626: + return this.i; + case 1627: + return this.i; + case 1628: + return this.i; + case 1629: + return this.i; + case 1630: + return this.i; + case 1631: + return this.i; + case 1632: + return this.i; + case 1633: + return this.i; + case 1634: + return this.i; + case 1635: + return this.i; + case 1636: + return this.i; + case 1637: + return this.i; + case 1638: + return this.i; + case 1639: + return this.i; + case 1640: + return this.i; + case 1641: + return this.i; + case 1642: + return this.i; + case 1643: + return this.i; + case 1644: + return this.i; + case 1645: + return this.i; + case 1646: + return this.i; + case 1647: + return this.i; + case 1648: + return this.i; + case 1649: + return this.i; + case 1650: + return this.i; + case 1651: + return this.i; + case 1652: + return this.i; + case 1653: + return this.i; + case 1654: + return this.i; + case 1655: + return this.i; + case 1656: + return this.i; + case 1657: + return this.i; + case 1658: + return this.i; + case 1659: + return this.i; + case 1660: + return this.i; + case 1661: + return this.i; + case 1662: + return this.i; + case 1663: + return this.i; + case 1664: + return this.i; + case 1665: + return this.i; + case 1666: + return this.i; + case 1667: + return this.i; + case 1668: + return this.i; + case 1669: + return this.i; + case 1670: + return this.i; + case 1671: + return this.i; + case 1672: + return this.i; + case 1673: + return this.i; + case 1674: + return this.i; + case 1675: + return this.i; + case 1676: + return this.i; + case 1677: + return this.i; + case 1678: + return this.i; + case 1679: + return this.i; + case 1680: + return this.i; + case 1681: + return this.i; + case 1682: + return this.i; + case 1683: + return this.i; + case 1684: + return this.i; + case 1685: + return this.i; + case 1686: + return this.i; + case 1687: + return this.i; + case 1688: + return this.i; + case 1689: + return this.i; + case 1690: + return this.i; + case 1691: + return this.i; + case 1692: + return this.i; + case 1693: + return this.i; + case 1694: + return this.i; + case 1695: + return this.i; + case 1696: + return this.i; + case 1697: + return this.i; + case 1698: + return this.i; + case 1699: + return this.i; + case 1700: + return this.i; + case 1701: + return this.i; + case 1702: + return this.i; + case 1703: + return this.i; + case 1704: + return this.i; + case 1705: + return this.i; + case 1706: + return this.i; + case 1707: + return this.i; + case 1708: + return this.i; + case 1709: + return this.i; + case 1710: + return this.i; + case 1711: + return this.i; + case 1712: + return this.i; + case 1713: + return this.i; + case 1714: + return this.i; + case 1715: + return this.i; + case 1716: + return this.i; + case 1717: + return this.i; + case 1718: + return this.i; + case 1719: + return this.i; + case 1720: + return this.i; + case 1721: + return this.i; + case 1722: + return this.i; + case 1723: + return this.i; + case 1724: + return this.i; + case 1725: + return this.i; + case 1726: + return this.i; + case 1727: + return this.i; + case 1728: + return this.i; + case 1729: + return this.i; + case 1730: + return this.i; + case 1731: + return this.i; + case 1732: + return this.i; + case 1733: + return this.i; + case 1734: + return this.i; + case 1735: + return this.i; + case 1736: + return this.i; + case 1737: + return this.i; + case 1738: + return this.i; + case 1739: + return this.i; + case 1740: + return this.i; + case 1741: + return this.i; + case 1742: + return this.i; + case 1743: + return this.i; + case 1744: + return this.i; + case 1745: + return this.i; + case 1746: + return this.i; + case 1747: + return this.i; + case 1748: + return this.i; + case 1749: + return this.i; + case 1750: + return this.i; + case 1751: + return this.i; + case 1752: + return this.i; + case 1753: + return this.i; + case 1754: + return this.i; + case 1755: + return this.i; + case 1756: + return this.i; + case 1757: + return this.i; + case 1758: + return this.i; + case 1759: + return this.i; + case 1760: + return this.i; + case 1761: + return this.i; + case 1762: + return this.i; + case 1763: + return this.i; + case 1764: + return this.i; + case 1765: + return this.i; + case 1766: + return this.i; + case 1767: + return this.i; + case 1768: + return this.i; + case 1769: + return this.i; + case 1770: + return this.i; + case 1771: + return this.i; + case 1772: + return this.i; + case 1773: + return this.i; + case 1774: + return this.i; + case 1775: + return this.i; + case 1776: + return this.i; + case 1777: + return this.i; + case 1778: + return this.i; + case 1779: + return this.i; + case 1780: + return this.i; + case 1781: + return this.i; + case 1782: + return this.i; + case 1783: + return this.i; + case 1784: + return this.i; + case 1785: + return this.i; + case 1786: + return this.i; + case 1787: + return this.i; + case 1788: + return this.i; + case 1789: + return this.i; + case 1790: + return this.i; + case 1791: + return this.i; + case 1792: + return this.i; + case 1793: + return this.i; + case 1794: + return this.i; + case 1795: + return this.i; + case 1796: + return this.i; + case 1797: + return this.i; + case 1798: + return this.i; + case 1799: + return this.i; + case 1800: + return this.i; + case 1801: + return this.i; + case 1802: + return this.i; + case 1803: + return this.i; + case 1804: + return this.i; + case 1805: + return this.i; + case 1806: + return this.i; + case 1807: + return this.i; + case 1808: + return this.i; + case 1809: + return this.i; + case 1810: + return this.i; + case 1811: + return this.i; + case 1812: + return this.i; + case 1813: + return this.i; + case 1814: + return this.i; + case 1815: + return this.i; + case 1816: + return this.i; + case 1817: + return this.i; + case 1818: + return this.i; + case 1819: + return this.i; + case 1820: + return this.i; + case 1821: + return this.i; + case 1822: + return this.i; + case 1823: + return this.i; + case 1824: + return this.i; + case 1825: + return this.i; + case 1826: + return this.i; + case 1827: + return this.i; + case 1828: + return this.i; + case 1829: + return this.i; + case 1830: + return this.i; + case 1831: + return this.i; + case 1832: + return this.i; + case 1833: + return this.i; + case 1834: + return this.i; + case 1835: + return this.i; + case 1836: + return this.i; + case 1837: + return this.i; + case 1838: + return this.i; + case 1839: + return this.i; + case 1840: + return this.i; + case 1841: + return this.i; + case 1842: + return this.i; + case 1843: + return this.i; + case 1844: + return this.i; + case 1845: + return this.i; + case 1846: + return this.i; + case 1847: + return this.i; + case 1848: + return this.i; + case 1849: + return this.i; + case 1850: + return this.i; + case 1851: + return this.i; + case 1852: + return this.i; + case 1853: + return this.i; + case 1854: + return this.i; + case 1855: + return this.i; + case 1856: + return this.i; + case 1857: + return this.i; + case 1858: + return this.i; + case 1859: + return this.i; + case 1860: + return this.i; + case 1861: + return this.i; + case 1862: + return this.i; + case 1863: + return this.i; + case 1864: + return this.i; + case 1865: + return this.i; + case 1866: + return this.i; + case 1867: + return this.i; + case 1868: + return this.i; + case 1869: + return this.i; + case 1870: + return this.i; + case 1871: + return this.i; + case 1872: + return this.i; + case 1873: + return this.i; + case 1874: + return this.i; + case 1875: + return this.i; + case 1876: + return this.i; + case 1877: + return this.i; + case 1878: + return this.i; + case 1879: + return this.i; + case 1880: + return this.i; + case 1881: + return this.i; + case 1882: + return this.i; + case 1883: + return this.i; + case 1884: + return this.i; + case 1885: + return this.i; + case 1886: + return this.i; + case 1887: + return this.i; + case 1888: + return this.i; + case 1889: + return this.i; + case 1890: + return this.i; + case 1891: + return this.i; + case 1892: + return this.i; + case 1893: + return this.i; + case 1894: + return this.i; + case 1895: + return this.i; + case 1896: + return this.i; + case 1897: + return this.i; + case 1898: + return this.i; + case 1899: + return this.i; + case 1900: + return this.i; + case 1901: + return this.i; + case 1902: + return this.i; + case 1903: + return this.i; + case 1904: + return this.i; + case 1905: + return this.i; + case 1906: + return this.i; + case 1907: + return this.i; + case 1908: + return this.i; + case 1909: + return this.i; + case 1910: + return this.i; + case 1911: + return this.i; + case 1912: + return this.i; + case 1913: + return this.i; + case 1914: + return this.i; + case 1915: + return this.i; + case 1916: + return this.i; + case 1917: + return this.i; + case 1918: + return this.i; + case 1919: + return this.i; + case 1920: + return this.i; + case 1921: + return this.i; + case 1922: + return this.i; + case 1923: + return this.i; + case 1924: + return this.i; + case 1925: + return this.i; + case 1926: + return this.i; + case 1927: + return this.i; + case 1928: + return this.i; + case 1929: + return this.i; + case 1930: + return this.i; + case 1931: + return this.i; + case 1932: + return this.i; + case 1933: + return this.i; + case 1934: + return this.i; + case 1935: + return this.i; + case 1936: + return this.i; + case 1937: + return this.i; + case 1938: + return this.i; + case 1939: + return this.i; + case 1940: + return this.i; + case 1941: + return this.i; + case 1942: + return this.i; + case 1943: + return this.i; + case 1944: + return this.i; + case 1945: + return this.i; + case 1946: + return this.i; + case 1947: + return this.i; + case 1948: + return this.i; + case 1949: + return this.i; + case 1950: + return this.i; + case 1951: + return this.i; + case 1952: + return this.i; + case 1953: + return this.i; + case 1954: + return this.i; + case 1955: + return this.i; + case 1956: + return this.i; + case 1957: + return this.i; + case 1958: + return this.i; + case 1959: + return this.i; + case 1960: + return this.i; + case 1961: + return this.i; + case 1962: + return this.i; + case 1963: + return this.i; + case 1964: + return this.i; + case 1965: + return this.i; + case 1966: + return this.i; + case 1967: + return this.i; + case 1968: + return this.i; + case 1969: + return this.i; + case 1970: + return this.i; + case 1971: + return this.i; + case 1972: + return this.i; + case 1973: + return this.i; + case 1974: + return this.i; + case 1975: + return this.i; + case 1976: + return this.i; + case 1977: + return this.i; + case 1978: + return this.i; + case 1979: + return this.i; + case 1980: + return this.i; + case 1981: + return this.i; + case 1982: + return this.i; + case 1983: + return this.i; + case 1984: + return this.i; + case 1985: + return this.i; + case 1986: + return this.i; + case 1987: + return this.i; + case 1988: + return this.i; + case 1989: + return this.i; + case 1990: + return this.i; + case 1991: + return this.i; + case 1992: + return this.i; + case 1993: + return this.i; + case 1994: + return this.i; + case 1995: + return this.i; + case 1996: + return this.i; + case 1997: + return this.i; + case 1998: + return this.i; + case 1999: + return this.i; + case 2000: + return this.i; + case 2001: + return this.i; + case 2002: + return this.i; + case 2003: + return this.i; + case 2004: + return this.i; + case 2005: + return this.i; + case 2006: + return this.i; + case 2007: + return this.i; + case 2008: + return this.i; + case 2009: + return this.i; + case 2010: + return this.i; + case 2011: + return this.i; + case 2012: + return this.i; + case 2013: + return this.i; + case 2014: + return this.i; + case 2015: + return this.i; + case 2016: + return this.i; + case 2017: + return this.i; + case 2018: + return this.i; + case 2019: + return this.i; + case 2020: + return this.i; + case 2021: + return this.i; + case 2022: + return this.i; + case 2023: + return this.i; + case 2024: + return this.i; + case 2025: + return this.i; + case 2026: + return this.i; + case 2027: + return this.i; + case 2028: + return this.i; + case 2029: + return this.i; + case 2030: + return this.i; + case 2031: + return this.i; + case 2032: + return this.i; + case 2033: + return this.i; + case 2034: + return this.i; + case 2035: + return this.i; + case 2036: + return this.i; + case 2037: + return this.i; + case 2038: + return this.i; + case 2039: + return this.i; + case 2040: + return this.i; + case 2041: + return this.i; + case 2042: + return this.i; + case 2043: + return this.i; + case 2044: + return this.i; + case 2045: + return this.i; + case 2046: + return this.i; + } +} + +// Test if this is working in split array literal +function hugeArrayLiteral() { + return [ + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i, + this.i + ][30]; +} diff --git a/nashorn/test/script/basic/JDK-8020356.js.EXPECTED b/nashorn/test/script/basic/JDK-8020356.js.EXPECTED new file mode 100644 index 00000000000..8f369679332 --- /dev/null +++ b/nashorn/test/script/basic/JDK-8020356.js.EXPECTED @@ -0,0 +1,2 @@ +20 +10 From 89197f0946b7d9e14ff201ba7e5422c8415b9144 Mon Sep 17 00:00:00 2001 From: Jonathan Gibbons Date: Wed, 17 Jul 2013 18:18:45 -0700 Subject: [PATCH 004/120] 8014636: TestLiteralCodeInPre fails on windows Reviewed-by: ksrini --- .../formats/html/HtmlDocletWriter.java | 1 + .../formats/html/TagletWriterImpl.java | 4 +-- .../doclets/internal/toolkit/util/Util.java | 26 +++++++++++++++++++ .../TestCRLineSeparator.java | 6 ++--- .../testLeadingSpaces/LeadingSpaces.java | 20 +++++++------- .../testLinkTaglet/TestLinkTaglet.java | 20 +++++++------- .../TestLiteralCodeInPre.java | 4 +-- .../testRelativeLinks/TestRelativeLinks.java | 14 +++++----- 8 files changed, 60 insertions(+), 35 deletions(-) diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java index ba62e7cccec..cde30f30d32 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java @@ -1621,6 +1621,7 @@ public class HtmlDocletWriter extends HtmlDocWriter { text = removeNonInlineHtmlTags(text); } text = Util.replaceTabs(configuration, text); + text = Util.normalizeNewlines(text); result.addContent(new RawHtml(text)); } } diff --git a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java index 1939d68f9fc..fc63f4f8654 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java @@ -71,7 +71,7 @@ public class TagletWriterImpl extends TagletWriter { * {@inheritDoc} */ protected Content codeTagOutput(Tag tag) { - Content result = HtmlTree.CODE(new StringContent(tag.text())); + Content result = HtmlTree.CODE(new StringContent(Util.normalizeNewlines(tag.text()))); return result; } @@ -135,7 +135,7 @@ public class TagletWriterImpl extends TagletWriter { * {@inheritDoc} */ protected Content literalTagOutput(Tag tag) { - Content result = new StringContent(tag.text()); + Content result = new StringContent(Util.normalizeNewlines(tag.text())); return result; } diff --git a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java index acdae4545a7..289f34804e1 100644 --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java @@ -631,6 +631,32 @@ public class Util { return result.toString(); } + public static String normalizeNewlines(String text) { + StringBuilder sb = new StringBuilder(); + final int textLength = text.length(); + final String NL = DocletConstants.NL; + int pos = 0; + for (int i = 0; i < textLength; i++) { + char ch = text.charAt(i); + switch (ch) { + case '\n': + sb.append(text, pos, i); + sb.append(NL); + pos = i + 1; + break; + case '\r': + sb.append(text, pos, i); + sb.append(NL); + if (i + 1 < textLength && text.charAt(i + 1) == '\n') + i++; + pos = i + 1; + break; + } + } + sb.append(text, pos, textLength); + return sb.toString(); + } + /** * The documentation for values() and valueOf() in Enums are set by the * doclet. diff --git a/langtools/test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java b/langtools/test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java index 99b523335e5..e12feabbebf 100644 --- a/langtools/test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java +++ b/langtools/test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -38,7 +38,7 @@ import java.util.*; public class TestCRLineSeparator extends JavadocTester { //Test information. - private static final String BUG_ID = "4979486"; + private static final String BUG_ID = "4979486-8014636"; //Javadoc arguments. private static final String[] ARGS = new String[] { @@ -47,7 +47,7 @@ public class TestCRLineSeparator extends JavadocTester { //Input for string search tests. private static final String[][] TEST = { - {BUG_ID + FS + "pkg" + FS + "MyClass.html", "Line 1\n Line 2"} + {BUG_ID + FS + "pkg" + FS + "MyClass.html", "Line 1" + NL + " Line 2"} }; private static final String[][] NEGATED_TEST = NO_TEST; diff --git a/langtools/test/com/sun/javadoc/testLeadingSpaces/LeadingSpaces.java b/langtools/test/com/sun/javadoc/testLeadingSpaces/LeadingSpaces.java index 65df0626c85..11c3eaba738 100644 --- a/langtools/test/com/sun/javadoc/testLeadingSpaces/LeadingSpaces.java +++ b/langtools/test/com/sun/javadoc/testLeadingSpaces/LeadingSpaces.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,11 +23,11 @@ /* * @test - * @bug 4232882 + * @bug 4232882 8014636 * @summary Javadoc strips all of the leading spaces when the comment * does not begin with a star. This RFE allows users to * begin their comment without a leading star without leading - * spaces striped + * spaces stripped * @author jamieh * @library ../lib/ * @build JavadocTester @@ -37,15 +37,15 @@ public class LeadingSpaces extends JavadocTester { - private static final String BUG_ID = "4232882"; + private static final String BUG_ID = "4232882-8014636"; private static final String[][] TEST = { {BUG_ID + FS + "LeadingSpaces.html", -" 1\n" + -" 2\n" + -" 3\n" + -" 4\n" + -" 5\n" + -" 6\n" + +" 1" + NL + +" 2" + NL + +" 3" + NL + +" 4" + NL + +" 5" + NL + +" 6" + NL + " 7"} }; private static final String[][] NEGATED_TEST = NO_TEST; diff --git a/langtools/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java b/langtools/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java index 74e81a8ed74..4720fe4d2be 100644 --- a/langtools/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java +++ b/langtools/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,7 +23,7 @@ /* * @test - * @bug 4732864 6280605 7064544 + * @bug 4732864 6280605 7064544 8014636 * @summary Make sure that you can link from one member to another using * non-qualified name, furthermore, ensure the right one is linked. * @author jamieh @@ -36,7 +36,7 @@ public class TestLinkTaglet extends JavadocTester { //Test information. - private static final String BUG_ID = "4732864-6280605-7064544"; + private static final String BUG_ID = "4732864-6280605-7064544-8014636"; //Javadoc arguments. private static final String[] ARGS = new String[] { @@ -46,16 +46,16 @@ public class TestLinkTaglet extends JavadocTester { //Input for string search tests. private static final String[][] TEST = { {BUG_ID + FS + "pkg" + FS + "C.html", - "Qualified Link: C.InnerC.
\n" + - " Unqualified Link1: C.InnerC.
\n" + - " Unqualified Link2: C.InnerC.
\n" + - " Qualified Link: method(pkg.C.InnerC, pkg.C.InnerC2).
\n" + - " Unqualified Link: method(C.InnerC, C.InnerC2).
\n" + + "Qualified Link: C.InnerC.
" + NL + + " Unqualified Link1: C.InnerC.
" + NL + + " Unqualified Link2: C.InnerC.
" + NL + + " Qualified Link: method(pkg.C.InnerC, pkg.C.InnerC2).
" + NL + + " Unqualified Link: method(C.InnerC, C.InnerC2).
" + NL + " Unqualified Link: method(InnerC, InnerC2).
" }, {BUG_ID + FS + "pkg" + FS + "C.InnerC.html", - "Link to member in outer class: C.MEMBER
\n" + - " Link to member in inner class: C.InnerC2.MEMBER2
\n" + + "Link to member in outer class: C.MEMBER
" + NL + + " Link to member in inner class: C.InnerC2.MEMBER2
" + NL + " Link to another inner class: C.InnerC2" }, {BUG_ID + FS + "pkg" + FS + "C.InnerC2.html", diff --git a/langtools/test/com/sun/javadoc/testLiteralCodeInPre/TestLiteralCodeInPre.java b/langtools/test/com/sun/javadoc/testLiteralCodeInPre/TestLiteralCodeInPre.java index bce27a98c00..592dd524d28 100644 --- a/langtools/test/com/sun/javadoc/testLiteralCodeInPre/TestLiteralCodeInPre.java +++ b/langtools/test/com/sun/javadoc/testLiteralCodeInPre/TestLiteralCodeInPre.java @@ -23,7 +23,7 @@ /* * @test - * @bug 8002387 + * @bug 8002387 8014636 * @summary Improve rendered HTML formatting for {@code} * @library ../lib/ * @build JavadocTester TestLiteralCodeInPre @@ -33,7 +33,7 @@ public class TestLiteralCodeInPre extends JavadocTester { //Test information. - private static final String BUG_ID = "8002387"; + private static final String BUG_ID = "8002387-8014636"; private static final String OUTPUT_DIR = BUG_ID; //Javadoc arguments. diff --git a/langtools/test/com/sun/javadoc/testRelativeLinks/TestRelativeLinks.java b/langtools/test/com/sun/javadoc/testRelativeLinks/TestRelativeLinks.java index e8c2d057753..513d738f684 100644 --- a/langtools/test/com/sun/javadoc/testRelativeLinks/TestRelativeLinks.java +++ b/langtools/test/com/sun/javadoc/testRelativeLinks/TestRelativeLinks.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,11 +23,9 @@ /* * @test - * @bug 4460354 + * @bug 4460354 8014636 * @summary Test to make sure that relative paths are redirected in the * output so that they are not broken. - * NOTE: these tests have \\n instead of NL because they are user - * generated new lines, not Java generated. * @author jamieh * @library ../lib/ * @build JavadocTester @@ -38,7 +36,7 @@ public class TestRelativeLinks extends JavadocTester { //Test information. - private static final String BUG_ID = "4460354"; + private static final String BUG_ID = "4460354-8014636"; //Javadoc arguments. private static final String[] ARGS = new String[] { @@ -58,7 +56,7 @@ public class TestRelativeLinks extends JavadocTester { {BUG_ID + FS + "pkg" + FS + "package-summary.html", "relative package link"}, {BUG_ID + FS + "pkg" + FS + "C.html", - " relative-multi-line-link."}, //These relative paths should be redirected because they are in different @@ -74,7 +72,7 @@ public class TestRelativeLinks extends JavadocTester { {BUG_ID + FS + "index-all.html", "relative package link"}, {BUG_ID + FS + "index-all.html", - " relative-multi-line-link."}, @@ -92,7 +90,7 @@ public class TestRelativeLinks extends JavadocTester { {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "C.html", "relative package link"}, {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "C.html", - " relative-multi-line-link."}, //PACKAGE OVERVIEW From 772640d4e80df5e000a0220cb199383b75069194 Mon Sep 17 00:00:00 2001 From: Jonathan Gibbons Date: Wed, 17 Jul 2013 19:12:03 -0700 Subject: [PATCH 005/120] 8020313: doclint doesn't reset HTML anchors correctly Reviewed-by: mcimadamore --- .../com/sun/tools/doclint/Checker.java | 21 ++++++++++++++----- langtools/test/tools/doclint/AnchorTest2.java | 20 ++++++++++++++++++ langtools/test/tools/doclint/AnchorTest2.out | 4 ++++ .../test/tools/doclint/AnchorTest2a.java | 7 +++++++ 4 files changed, 47 insertions(+), 5 deletions(-) create mode 100644 langtools/test/tools/doclint/AnchorTest2.java create mode 100644 langtools/test/tools/doclint/AnchorTest2.out create mode 100644 langtools/test/tools/doclint/AnchorTest2a.java diff --git a/langtools/src/share/classes/com/sun/tools/doclint/Checker.java b/langtools/src/share/classes/com/sun/tools/doclint/Checker.java index d7b185900ba..ece896cc6b4 100644 --- a/langtools/src/share/classes/com/sun/tools/doclint/Checker.java +++ b/langtools/src/share/classes/com/sun/tools/doclint/Checker.java @@ -31,9 +31,11 @@ import java.net.URI; import java.net.URISyntaxException; import java.util.Deque; import java.util.EnumSet; +import java.util.HashMap; import java.util.HashSet; import java.util.LinkedList; import java.util.List; +import java.util.Map; import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -45,6 +47,7 @@ import javax.lang.model.element.Name; import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeMirror; import javax.tools.Diagnostic.Kind; +import javax.tools.JavaFileObject; import com.sun.source.doctree.AttributeTree; import com.sun.source.doctree.AuthorTree; @@ -88,9 +91,9 @@ import static com.sun.tools.doclint.Messages.Group.*; public class Checker extends DocTreePathScanner { final Env env; - Set foundParams = new HashSet(); - Set foundThrows = new HashSet(); - Set foundAnchors = new HashSet(); + Set foundParams = new HashSet<>(); + Set foundThrows = new HashSet<>(); + Map> foundAnchors = new HashMap<>(); boolean foundInheritDoc = false; boolean foundReturn = false; @@ -129,7 +132,7 @@ public class Checker extends DocTreePathScanner { Checker(Env env) { env.getClass(); this.env = env; - tagStack = new LinkedList(); + tagStack = new LinkedList<>(); implicitHeaderLevel = env.implicitHeaderLevel; } @@ -508,7 +511,7 @@ public class Checker extends DocTreePathScanner { if (!validName.matcher(value).matches()) { env.messages.error(HTML, tree, "dc.invalid.anchor", value); } - if (!foundAnchors.add(value)) { + if (!checkAnchor(value)) { env.messages.error(HTML, tree, "dc.anchor.already.defined", value); } } @@ -551,6 +554,14 @@ public class Checker extends DocTreePathScanner { return super.visitAttribute(tree, ignore); } + private boolean checkAnchor(String name) { + JavaFileObject fo = env.currPath.getCompilationUnit().getSourceFile(); + Set set = foundAnchors.get(fo); + if (set == null) + foundAnchors.put(fo, set = new HashSet<>()); + return set.add(name); + } + // http://www.w3.org/TR/html401/types.html#type-name private static final Pattern validName = Pattern.compile("[A-Za-z][A-Za-z0-9-_:.]*"); diff --git a/langtools/test/tools/doclint/AnchorTest2.java b/langtools/test/tools/doclint/AnchorTest2.java new file mode 100644 index 00000000000..7d7441fbd37 --- /dev/null +++ b/langtools/test/tools/doclint/AnchorTest2.java @@ -0,0 +1,20 @@ +/* + * @test /nodynamiccopyright/ + * @bug 8020313 + * @summary doclint doesn't reset HTML anchors correctly + * @build DocLintTester + * @run main DocLintTester -ref AnchorTest2.out AnchorTest2.java AnchorTest2a.java + * @run main DocLintTester -ref AnchorTest2.out AnchorTest2a.java AnchorTest2.java + */ + +/** */ +public class AnchorTest2 { + /** */ + public void a_name_AnchorTest2() { } + + /** */ + public void a_name_AnchorTest2_already_defined() { } + + /** */ + public void a_name_AnchorTest2a_defined_in_other_file() { } +} diff --git a/langtools/test/tools/doclint/AnchorTest2.out b/langtools/test/tools/doclint/AnchorTest2.out new file mode 100644 index 00000000000..a9762949686 --- /dev/null +++ b/langtools/test/tools/doclint/AnchorTest2.out @@ -0,0 +1,4 @@ +AnchorTest2.java:15: error: anchor already defined: AnchorTest2 + /** */ + ^ +1 error diff --git a/langtools/test/tools/doclint/AnchorTest2a.java b/langtools/test/tools/doclint/AnchorTest2a.java new file mode 100644 index 00000000000..3a197138931 --- /dev/null +++ b/langtools/test/tools/doclint/AnchorTest2a.java @@ -0,0 +1,7 @@ +/* /nodynamiccopyright/ */ + +/** + * + */ +public class AnchorTest2a { } + From c42bcf4526f5c34d6465b953e6744bcbc1bc1525 Mon Sep 17 00:00:00 2001 From: Jonathan Gibbons Date: Wed, 17 Jul 2013 19:16:12 -0700 Subject: [PATCH 006/120] 8020664: doclint gives incorrect warnings on normal package statements Reviewed-by: mcimadamore --- .../com/sun/tools/doclint/DocLint.java | 22 ++++++++--- .../doclint/resources/doclint.properties | 1 + .../tools/doclint/BadPackageCommentTest.out | 4 ++ .../test/tools/doclint/DocLintTester.java | 2 +- .../tools/doclint/packageTests/bad/Test.java | 14 +++++++ .../tools/doclint/packageTests/bad/Test.out | 4 ++ .../packageTests/bad/package-info.java | 11 ++++++ .../doclint/packageTests/bad/package-info.out | 4 ++ .../tools/doclint/packageTests/good/Test.java | 37 +++++++++++++++++++ .../packageTests/good/package-info.java | 34 +++++++++++++++++ 10 files changed, 127 insertions(+), 6 deletions(-) create mode 100644 langtools/test/tools/doclint/packageTests/bad/Test.java create mode 100644 langtools/test/tools/doclint/packageTests/bad/Test.out create mode 100644 langtools/test/tools/doclint/packageTests/bad/package-info.java create mode 100644 langtools/test/tools/doclint/packageTests/bad/package-info.out create mode 100644 langtools/test/tools/doclint/packageTests/good/Test.java create mode 100644 langtools/test/tools/doclint/packageTests/good/package-info.java diff --git a/langtools/src/share/classes/com/sun/tools/doclint/DocLint.java b/langtools/src/share/classes/com/sun/tools/doclint/DocLint.java index 0e5be61120c..ca448ebe2a8 100644 --- a/langtools/src/share/classes/com/sun/tools/doclint/DocLint.java +++ b/langtools/src/share/classes/com/sun/tools/doclint/DocLint.java @@ -30,9 +30,10 @@ import java.io.IOException; import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; -import java.util.regex.Pattern; import javax.lang.model.element.Name; +import javax.tools.Diagnostic; +import javax.tools.JavaFileObject; import javax.tools.StandardLocation; import com.sun.source.doctree.DocCommentTree; @@ -151,6 +152,18 @@ public class DocLint implements Plugin { TreePath p = getCurrentPath(); DocCommentTree dc = env.trees.getDocCommentTree(p); + if (p.getLeaf() == p.getCompilationUnit()) { + JavaFileObject fo = p.getCompilationUnit().getSourceFile(); + boolean pkgInfo = fo.isNameCompatible("package-info", JavaFileObject.Kind.SOURCE); + if (!pkgInfo) { + if (dc == null) + return; + env.setCurrent(p, dc); + env.messages.report(Messages.Group.REFERENCE, Diagnostic.Kind.WARNING, p.getLeaf(), + "dc.unexpected.comment"); + } + } + checker.scan(dc, p); } }; @@ -166,8 +179,8 @@ public class DocLint implements Plugin { } void processArgs(String... args) throws BadArgs { - javacOpts = new ArrayList(); - javacFiles = new ArrayList(); + javacOpts = new ArrayList<>(); + javacFiles = new ArrayList<>(); if (args.length == 0) needHelp = true; @@ -214,7 +227,7 @@ public class DocLint implements Plugin { } List splitPath(String path) { - List files = new ArrayList(); + List files = new ArrayList<>(); for (String f: path.split(File.pathSeparator)) { if (f.length() > 0) files.add(new File(f)); @@ -279,7 +292,6 @@ public class DocLint implements Plugin { TaskListener tl = new TaskListener() { @Override public void started(TaskEvent e) { - return; } @Override diff --git a/langtools/src/share/classes/com/sun/tools/doclint/resources/doclint.properties b/langtools/src/share/classes/com/sun/tools/doclint/resources/doclint.properties index 8905235d082..37470976141 100644 --- a/langtools/src/share/classes/com/sun/tools/doclint/resources/doclint.properties +++ b/langtools/src/share/classes/com/sun/tools/doclint/resources/doclint.properties @@ -67,6 +67,7 @@ dc.tag.self.closing = self-closing element not allowed dc.tag.start.unmatched = end tag missing: dc.tag.unknown = unknown tag: {0} dc.text.not.allowed = text not allowed in <{0}> element +dc.unexpected.comment=documentation comment not expected here dc.main.ioerror=IO error: {0} dc.main.no.files.given=No files given diff --git a/langtools/test/tools/doclint/BadPackageCommentTest.out b/langtools/test/tools/doclint/BadPackageCommentTest.out index 57b4db9c1b2..768d9cb457d 100644 --- a/langtools/test/tools/doclint/BadPackageCommentTest.out +++ b/langtools/test/tools/doclint/BadPackageCommentTest.out @@ -1,3 +1,6 @@ +BadPackageCommentTest.java:13: warning: documentation comment not expected here +package p; +^ BadPackageCommentTest.java:11: error: no tag name after @ * @@@ ^ @@ -8,3 +11,4 @@ BadPackageCommentTest.java:11: error: no tag name after @ * @@@ ^ 3 errors +1 warning diff --git a/langtools/test/tools/doclint/DocLintTester.java b/langtools/test/tools/doclint/DocLintTester.java index 848e284b57d..78c052a695c 100644 --- a/langtools/test/tools/doclint/DocLintTester.java +++ b/langtools/test/tools/doclint/DocLintTester.java @@ -123,7 +123,7 @@ public class DocLintTester { private static final Pattern dirFileLine = Pattern.compile( "(?m)" // multi-line mode + "^(.*?)" // directory part of file name - + "([A-Za-z0-9.]+:[0-9]+:)"); // file name and line number + + "([-A-Za-z0-9.]+:[0-9]+:)"); // file name and line number String removeFileNames(String s) { Matcher m = dirFileLine.matcher(s); diff --git a/langtools/test/tools/doclint/packageTests/bad/Test.java b/langtools/test/tools/doclint/packageTests/bad/Test.java new file mode 100644 index 00000000000..25ce3621acb --- /dev/null +++ b/langtools/test/tools/doclint/packageTests/bad/Test.java @@ -0,0 +1,14 @@ +/* + * @test /nodynamiccopyright/ + * @bug 8020664 + * @summary doclint gives incorrect warnings on normal package statements + * @library ../.. + * @build DocLintTester + * @run main DocLintTester -ref Test.out Test.java + */ + +/** Unexpected comment */ +package bad; + +class Test { } + diff --git a/langtools/test/tools/doclint/packageTests/bad/Test.out b/langtools/test/tools/doclint/packageTests/bad/Test.out new file mode 100644 index 00000000000..de980ea0028 --- /dev/null +++ b/langtools/test/tools/doclint/packageTests/bad/Test.out @@ -0,0 +1,4 @@ +Test.java:11: warning: documentation comment not expected here +package bad; +^ +1 warning diff --git a/langtools/test/tools/doclint/packageTests/bad/package-info.java b/langtools/test/tools/doclint/packageTests/bad/package-info.java new file mode 100644 index 00000000000..9ebdbbc990f --- /dev/null +++ b/langtools/test/tools/doclint/packageTests/bad/package-info.java @@ -0,0 +1,11 @@ +/* + * @test /nodynamiccopyright/ + * @bug 8020664 + * @summary doclint gives incorrect warnings on normal package statements + * @library ../.. + * @build DocLintTester + * @run main DocLintTester -ref package-info.out package-info.java + */ + +// missing comment +package bad; diff --git a/langtools/test/tools/doclint/packageTests/bad/package-info.out b/langtools/test/tools/doclint/packageTests/bad/package-info.out new file mode 100644 index 00000000000..fd4377caadb --- /dev/null +++ b/langtools/test/tools/doclint/packageTests/bad/package-info.out @@ -0,0 +1,4 @@ +package-info.java:11: warning: no comment +package bad; +^ +1 warning diff --git a/langtools/test/tools/doclint/packageTests/good/Test.java b/langtools/test/tools/doclint/packageTests/good/Test.java new file mode 100644 index 00000000000..84db8d5ee8e --- /dev/null +++ b/langtools/test/tools/doclint/packageTests/good/Test.java @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test /nodynamiccopyright/ + * @bug 8020664 + * @summary doclint gives incorrect warnings on normal package statements + * @library ../.. + * @build DocLintTester + * @run main DocLintTester Test.java + */ + +// no doc comment +package good; + +class Test { } + diff --git a/langtools/test/tools/doclint/packageTests/good/package-info.java b/langtools/test/tools/doclint/packageTests/good/package-info.java new file mode 100644 index 00000000000..598feaed23c --- /dev/null +++ b/langtools/test/tools/doclint/packageTests/good/package-info.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test /nodynamiccopyright/ + * @bug 8020664 + * @summary doclint gives incorrect warnings on normal package statements + * @library ../.. + * @build DocLintTester + * @run main DocLintTester package-info.java + */ + +/** Description. */ +package good; From 21be9aded638b024acf5eecce02d9f184597a0fb Mon Sep 17 00:00:00 2001 From: Athijegannathan Sundararajan Date: Thu, 18 Jul 2013 18:08:26 +0530 Subject: [PATCH 007/120] 8020731: Revisit checkPermission calls in Context class Reviewed-by: attila, hannesw --- .../api/scripting/NashornScriptEngine.java | 39 +++----- .../api/scripting/ScriptObjectMirror.java | 24 ++--- .../jdk/nashorn/internal/objects/Global.java | 27 ++++-- .../jdk/nashorn/internal/runtime/Context.java | 16 +-- .../internal/runtime/NativeJavaPackage.java | 2 +- .../internal/runtime/ScriptRuntime.java | 4 +- .../nashorn/internal/runtime/WithObject.java | 4 +- .../linker/JavaAdapterBytecodeGenerator.java | 33 ++++--- .../linker/JavaAdapterClassLoader.java | 97 +------------------ .../linker/JavaAdapterGeneratorBase.java | 56 ----------- 10 files changed, 73 insertions(+), 229 deletions(-) delete mode 100644 nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterGeneratorBase.java diff --git a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java index 682975a85d5..1ec4ff8b0b1 100644 --- a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java +++ b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java @@ -209,10 +209,10 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C } try { - final ScriptObject oldGlobal = getNashornGlobal(); + final ScriptObject oldGlobal = Context.getGlobal(); try { if(oldGlobal != ctxtGlobal) { - setNashornGlobal(ctxtGlobal); + Context.setGlobal(ctxtGlobal); } if (! isInterfaceImplemented(clazz, realSelf)) { @@ -221,7 +221,7 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C return clazz.cast(JavaAdapterFactory.getConstructor(realSelf.getClass(), clazz).invoke(realSelf)); } finally { if(oldGlobal != ctxtGlobal) { - setNashornGlobal(oldGlobal); + Context.setGlobal(oldGlobal); } } } catch(final RuntimeException|Error e) { @@ -357,7 +357,7 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C } private Object invokeImpl(final Object selfObject, final String name, final Object... args) throws ScriptException, NoSuchMethodException { - final ScriptObject oldGlobal = getNashornGlobal(); + final ScriptObject oldGlobal = Context.getGlobal(); final ScriptObject ctxtGlobal = getNashornGlobalFrom(context); final boolean globalChanged = (oldGlobal != ctxtGlobal); @@ -365,7 +365,7 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C try { if (globalChanged) { - setNashornGlobal(ctxtGlobal); + Context.setGlobal(ctxtGlobal); } ScriptObject sobj; @@ -398,7 +398,7 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C throw new NoSuchMethodException(name); } finally { if (globalChanged) { - setNashornGlobal(oldGlobal); + Context.setGlobal(oldGlobal); } } } @@ -411,12 +411,12 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C if (script == null) { return null; } - final ScriptObject oldGlobal = getNashornGlobal(); + final ScriptObject oldGlobal = Context.getGlobal(); final ScriptObject ctxtGlobal = getNashornGlobalFrom(ctxt); final boolean globalChanged = (oldGlobal != ctxtGlobal); try { if (globalChanged) { - setNashornGlobal(ctxtGlobal); + Context.setGlobal(ctxtGlobal); } setContextVariables(ctxt); @@ -426,7 +426,7 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C throw new AssertionError("should not reach here"); } finally { if (globalChanged) { - setNashornGlobal(oldGlobal); + Context.setGlobal(oldGlobal); } } } @@ -469,12 +469,12 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C } private ScriptFunction compileImpl(final Source source, final ScriptContext ctxt) throws ScriptException { - final ScriptObject oldGlobal = getNashornGlobal(); + final ScriptObject oldGlobal = Context.getGlobal(); final ScriptObject ctxtGlobal = getNashornGlobalFrom(ctxt); final boolean globalChanged = (oldGlobal != ctxtGlobal); try { if (globalChanged) { - setNashornGlobal(ctxtGlobal); + Context.setGlobal(ctxtGlobal); } return nashornContext.compileScript(source, ctxtGlobal); @@ -483,7 +483,7 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C throw new AssertionError("should not reach here"); } finally { if (globalChanged) { - setNashornGlobal(oldGlobal); + Context.setGlobal(oldGlobal); } } } @@ -502,19 +502,4 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C } return true; } - - // don't make this public!! - static ScriptObject getNashornGlobal() { - return Context.getGlobal(); - } - - static void setNashornGlobal(final ScriptObject newGlobal) { - AccessController.doPrivileged(new PrivilegedAction() { - @Override - public Void run() { - Context.setGlobal(newGlobal); - return null; - } - }); - } } diff --git a/nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java b/nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java index c7c384e7df5..0c235d7a233 100644 --- a/nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java +++ b/nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java @@ -79,12 +79,12 @@ public final class ScriptObjectMirror extends JSObject implements Bindings { // JSObject methods @Override public Object call(final String functionName, final Object... args) { - final ScriptObject oldGlobal = NashornScriptEngine.getNashornGlobal(); + final ScriptObject oldGlobal = Context.getGlobal(); final boolean globalChanged = (oldGlobal != global); try { if (globalChanged) { - NashornScriptEngine.setNashornGlobal(global); + Context.setGlobal(global); } final Object val = functionName == null? sobj : sobj.get(functionName); @@ -100,19 +100,19 @@ public final class ScriptObjectMirror extends JSObject implements Bindings { throw new RuntimeException(t); } finally { if (globalChanged) { - NashornScriptEngine.setNashornGlobal(oldGlobal); + Context.setGlobal(oldGlobal); } } } @Override public Object newObject(final String functionName, final Object... args) { - final ScriptObject oldGlobal = NashornScriptEngine.getNashornGlobal(); + final ScriptObject oldGlobal = Context.getGlobal(); final boolean globalChanged = (oldGlobal != global); try { if (globalChanged) { - NashornScriptEngine.setNashornGlobal(global); + Context.setGlobal(global); } final Object val = functionName == null? sobj : sobj.get(functionName); @@ -128,7 +128,7 @@ public final class ScriptObjectMirror extends JSObject implements Bindings { throw new RuntimeException(t); } finally { if (globalChanged) { - NashornScriptEngine.setNashornGlobal(oldGlobal); + Context.setGlobal(oldGlobal); } } } @@ -272,7 +272,7 @@ public final class ScriptObjectMirror extends JSObject implements Bindings { @Override public Object put(final String key, final Object value) { - final ScriptObject oldGlobal = NashornScriptEngine.getNashornGlobal(); + final ScriptObject oldGlobal = Context.getGlobal(); final boolean globalChanged = (oldGlobal != global); return inGlobal(new Callable() { @Override public Object call() { @@ -284,7 +284,7 @@ public final class ScriptObjectMirror extends JSObject implements Bindings { @Override public void putAll(final Map map) { - final ScriptObject oldGlobal = NashornScriptEngine.getNashornGlobal(); + final ScriptObject oldGlobal = Context.getGlobal(); final boolean globalChanged = (oldGlobal != global); inGlobal(new Callable() { @Override public Object call() { @@ -535,7 +535,7 @@ public final class ScriptObjectMirror extends JSObject implements Bindings { * @return wrapped object */ public static Object wrap(final Object obj, final ScriptObject homeGlobal) { - return (obj instanceof ScriptObject) ? new ScriptObjectMirror((ScriptObject)obj, homeGlobal) : obj; + return (obj instanceof ScriptObject && homeGlobal != null) ? new ScriptObjectMirror((ScriptObject)obj, homeGlobal) : obj; } /** @@ -613,10 +613,10 @@ public final class ScriptObjectMirror extends JSObject implements Bindings { // internals only below this. private V inGlobal(final Callable callable) { - final ScriptObject oldGlobal = NashornScriptEngine.getNashornGlobal(); + final ScriptObject oldGlobal = Context.getGlobal(); final boolean globalChanged = (oldGlobal != global); if (globalChanged) { - NashornScriptEngine.setNashornGlobal(global); + Context.setGlobal(global); } try { return callable.call(); @@ -626,7 +626,7 @@ public final class ScriptObjectMirror extends JSObject implements Bindings { throw new AssertionError("Cannot happen", e); } finally { if (globalChanged) { - NashornScriptEngine.setNashornGlobal(oldGlobal); + Context.setGlobal(oldGlobal); } } } diff --git a/nashorn/src/jdk/nashorn/internal/objects/Global.java b/nashorn/src/jdk/nashorn/internal/objects/Global.java index e54fbb45e6d..9483475ac0a 100644 --- a/nashorn/src/jdk/nashorn/internal/objects/Global.java +++ b/nashorn/src/jdk/nashorn/internal/objects/Global.java @@ -411,18 +411,33 @@ public final class Global extends ScriptObject implements GlobalObject, Scope { // initialized by nasgen private static PropertyMap $nasgenmap$; + // performs initialization checks for Global constructor and returns the + // PropertyMap, if everything is fine. + private static PropertyMap checkAndGetMap(final Context context) { + // security check first + final SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission("nashorn.newGlobal")); + } + + // null check on context + context.getClass(); + + /* + * Duplicate global's map and use it. This way the initial Map filled + * by nasgen (referenced from static field in this class) is retained + * 'as is' (as that one is process wide singleton. + */ + return $nasgenmap$.duplicate(); + } + /** * Constructor * * @param context the context */ public Global(final Context context) { - /* - * Duplicate global's map and use it. This way the initial Map filled - * by nasgen (referenced from static field in this class) is retained - * 'as is' (as that one is process wide singleton. - */ - super($nasgenmap$.duplicate()); + super(checkAndGetMap(context)); this.setContext(context); this.setIsScope(); diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Context.java b/nashorn/src/jdk/nashorn/internal/runtime/Context.java index 6638ae60e83..f9e86741884 100644 --- a/nashorn/src/jdk/nashorn/internal/runtime/Context.java +++ b/nashorn/src/jdk/nashorn/internal/runtime/Context.java @@ -121,11 +121,6 @@ public final class Context { * @param global the global scope */ public static void setGlobal(final ScriptObject global) { - final SecurityManager sm = System.getSecurityManager(); - if (sm != null) { - sm.checkPermission(new RuntimePermission("nashorn.setGlobal")); - } - if (global != null && !(global instanceof Global)) { throw new IllegalArgumentException("global is not an instance of Global!"); } @@ -645,12 +640,7 @@ public final class Context { * @return the global script object */ public ScriptObject newGlobal() { - final SecurityManager sm = System.getSecurityManager(); - if (sm != null) { - sm.checkPermission(new RuntimePermission("nashorn.newGlobal")); - } - - return newGlobalTrusted(); + return new Global(this); } /** @@ -828,10 +818,6 @@ public final class Context { }); } - private ScriptObject newGlobalTrusted() { - return new Global(this); - } - private long getUniqueScriptId() { return uniqueScriptId.getAndIncrement(); } diff --git a/nashorn/src/jdk/nashorn/internal/runtime/NativeJavaPackage.java b/nashorn/src/jdk/nashorn/internal/runtime/NativeJavaPackage.java index 145afac6a26..9e725e339df 100644 --- a/nashorn/src/jdk/nashorn/internal/runtime/NativeJavaPackage.java +++ b/nashorn/src/jdk/nashorn/internal/runtime/NativeJavaPackage.java @@ -84,8 +84,8 @@ public final class NativeJavaPackage extends ScriptObject { * @param proto proto */ public NativeJavaPackage(final String name, final ScriptObject proto) { + super(proto, null); this.name = name; - this.setProto(proto); } @Override diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java index f0b68c52ddf..1cf370e1032 100644 --- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java +++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java @@ -335,9 +335,7 @@ public final class ScriptRuntime { */ public static Object checkAndApply(final ScriptFunction target, final Object self, final Object... args) { final ScriptObject global = Context.getGlobalTrusted(); - if (! (global instanceof GlobalObject)) { - throw new IllegalStateException("No current global set"); - } + assert (global instanceof GlobalObject): "No current global set"; if (target.getContext() != global.getContext()) { throw new IllegalArgumentException("'target' function is not from current Context"); diff --git a/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java b/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java index ca3fcac973e..37dbc6acf5f 100644 --- a/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java +++ b/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java @@ -58,10 +58,8 @@ public final class WithObject extends ScriptObject implements Scope { * @param expression with expression */ public WithObject(final ScriptObject scope, final Object expression) { - super(); - + super(scope, null); setIsScope(); - setProto(scope); this.expression = expression; } diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java index 1fe76954391..2bce232c18a 100644 --- a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java +++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java @@ -121,7 +121,23 @@ import jdk.nashorn.internal.runtime.ScriptObject; * constructor's trailing position and thus provide further instance-specific overrides. The order of invocation is * always instance-specified method, then a class-specified method, and finally the superclass method. */ -final class JavaAdapterBytecodeGenerator extends JavaAdapterGeneratorBase { +final class JavaAdapterBytecodeGenerator { + static final Type CONTEXT_TYPE = Type.getType(Context.class); + static final Type OBJECT_TYPE = Type.getType(Object.class); + static final Type SCRIPT_OBJECT_TYPE = Type.getType(ScriptObject.class); + + static final String CONTEXT_TYPE_NAME = CONTEXT_TYPE.getInternalName(); + static final String OBJECT_TYPE_NAME = OBJECT_TYPE.getInternalName(); + + static final String INIT = ""; + + static final String GLOBAL_FIELD_NAME = "global"; + + static final String SCRIPT_OBJECT_TYPE_DESCRIPTOR = SCRIPT_OBJECT_TYPE.getDescriptor(); + + static final String SET_GLOBAL_METHOD_DESCRIPTOR = Type.getMethodDescriptor(Type.VOID_TYPE, SCRIPT_OBJECT_TYPE); + static final String VOID_NOARG_METHOD_DESCRIPTOR = Type.getMethodDescriptor(Type.VOID_TYPE); + private static final Type SCRIPT_FUNCTION_TYPE = Type.getType(ScriptFunction.class); private static final Type STRING_TYPE = Type.getType(String.class); private static final Type METHOD_TYPE_TYPE = Type.getType(MethodType.class); @@ -151,7 +167,7 @@ final class JavaAdapterBytecodeGenerator extends JavaAdapterGeneratorBase { // Class name suffix used to append to the adaptee class name, when it can be defined in the adaptee's package. private static final String ADAPTER_CLASS_NAME_SUFFIX = "$$NashornJavaAdapter"; private static final String JAVA_PACKAGE_PREFIX = "java/"; - private static final int MAX_GENERATED_TYPE_NAME_LENGTH = 238; //255 - 17; 17 is the maximum possible length for the global setter inner class suffix + private static final int MAX_GENERATED_TYPE_NAME_LENGTH = 255; private static final String CLASS_INIT = ""; private static final String STATIC_GLOBAL_FIELD_NAME = "staticGlobal"; @@ -175,8 +191,6 @@ final class JavaAdapterBytecodeGenerator extends JavaAdapterGeneratorBase { private final String superClassName; // Binary name of the generated class. private final String generatedClassName; - // Binary name of the PrivilegedAction inner class that is used to - private final String globalSetterClassName; private final Set usedFieldNames = new HashSet<>(); private final Set abstractMethodNames = new HashSet<>(); private final String samName; @@ -220,9 +234,6 @@ final class JavaAdapterBytecodeGenerator extends JavaAdapterGeneratorBase { l = random.nextLong(); } - // NOTE: they way this class name is calculated affects the value of MAX_GENERATED_TYPE_NAME_LENGTH constant. If - // you change the calculation of globalSetterClassName, adjust the constant too. - globalSetterClassName = generatedClassName.concat("$" + Long.toHexString(l & Long.MAX_VALUE)); cw.visit(Opcodes.V1_7, ACC_PUBLIC | ACC_SUPER | ACC_FINAL, generatedClassName, null, superClassName, getInternalTypeNames(interfaces)); generateGlobalFields(); @@ -250,7 +261,7 @@ final class JavaAdapterBytecodeGenerator extends JavaAdapterGeneratorBase { } JavaAdapterClassLoader createAdapterClassLoader() { - return new JavaAdapterClassLoader(generatedClassName, cw.toByteArray(), globalSetterClassName); + return new JavaAdapterClassLoader(generatedClassName, cw.toByteArray()); } boolean isAutoConvertibleFromFunction() { @@ -511,8 +522,8 @@ final class JavaAdapterBytecodeGenerator extends JavaAdapterGeneratorBase { mv.invokestatic(CONTEXT_TYPE_NAME, "getGlobal", GET_GLOBAL_METHOD_DESCRIPTOR); } - private void invokeSetGlobal(final InstructionAdapter mv) { - mv.invokestatic(globalSetterClassName, "setGlobal", SET_GLOBAL_METHOD_DESCRIPTOR); + private static void invokeSetGlobal(final InstructionAdapter mv) { + mv.invokestatic(CONTEXT_TYPE_NAME, "setGlobal", SET_GLOBAL_METHOD_DESCRIPTOR); } /** @@ -794,7 +805,7 @@ final class JavaAdapterBytecodeGenerator extends JavaAdapterGeneratorBase { * entry. * @param globalsDifferVar index of the boolean local variable that is true if the global needs to be restored. */ - private void emitFinally(final InstructionAdapter mv, final int currentGlobalVar, final int globalsDifferVar) { + private static void emitFinally(final InstructionAdapter mv, final int currentGlobalVar, final int globalsDifferVar) { // Emit code to restore the previous Nashorn global if needed mv.visitVarInsn(ILOAD, globalsDifferVar); final Label skip = new Label(); diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterClassLoader.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterClassLoader.java index a3f4718b25b..09f8a0082bf 100644 --- a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterClassLoader.java +++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterClassLoader.java @@ -25,16 +25,6 @@ package jdk.nashorn.internal.runtime.linker; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_FINAL; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PRIVATE; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PUBLIC; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_STATIC; -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_SUPER; -import static jdk.internal.org.objectweb.asm.Opcodes.ACONST_NULL; -import static jdk.internal.org.objectweb.asm.Opcodes.ALOAD; -import static jdk.internal.org.objectweb.asm.Opcodes.ARETURN; -import static jdk.internal.org.objectweb.asm.Opcodes.RETURN; - import java.security.AccessController; import java.security.AllPermission; import java.security.CodeSigner; @@ -45,12 +35,6 @@ import java.security.ProtectionDomain; import java.security.SecureClassLoader; import jdk.internal.dynalink.beans.StaticClass; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.Opcodes; -import jdk.internal.org.objectweb.asm.Type; -import jdk.internal.org.objectweb.asm.commons.InstructionAdapter; -import jdk.nashorn.internal.runtime.Context; -import jdk.nashorn.internal.runtime.ScriptObject; /** * This class encapsulates the bytecode of the adapter class and can be used to load it into the JVM as an actual Class. @@ -60,22 +44,15 @@ import jdk.nashorn.internal.runtime.ScriptObject; * class are normally created by {@link JavaAdapterBytecodeGenerator}. */ @SuppressWarnings("javadoc") -class JavaAdapterClassLoader extends JavaAdapterGeneratorBase { - private static final Type PRIVILEGED_ACTION_TYPE = Type.getType(PrivilegedAction.class); - - private static final String PRIVILEGED_ACTION_TYPE_NAME = PRIVILEGED_ACTION_TYPE.getInternalName(); - private static final String PRIVILEGED_RUN_METHOD_DESCRIPTOR = Type.getMethodDescriptor(OBJECT_TYPE); - +final class JavaAdapterClassLoader { private static final ProtectionDomain GENERATED_PROTECTION_DOMAIN = createGeneratedProtectionDomain(); private final String className; private final byte[] classBytes; - private final String globalSetterClassName; - JavaAdapterClassLoader(String className, byte[] classBytes, String globalSetterClassName) { + JavaAdapterClassLoader(String className, byte[] classBytes) { this.className = className.replace('/', '.'); this.classBytes = classBytes; - this.globalSetterClassName = globalSetterClassName.replace('/', '.'); } /** @@ -116,7 +93,6 @@ class JavaAdapterClassLoader extends JavaAdapterGeneratorBase { private ClassLoader createClassLoader(final ClassLoader parentLoader) { return new AdapterLoader(parentLoader) { private final ClassLoader myLoader = getClass().getClassLoader(); - private final ProtectionDomain myProtectionDomain = getClass().getProtectionDomain(); @Override public Class loadClass(final String name, final boolean resolve) throws ClassNotFoundException { @@ -138,9 +114,6 @@ class JavaAdapterClassLoader extends JavaAdapterGeneratorBase { protected Class findClass(final String name) throws ClassNotFoundException { if(name.equals(className)) { return defineClass(name, classBytes, 0, classBytes.length, GENERATED_PROTECTION_DOMAIN); - } else if(name.equals(globalSetterClassName)) { - final byte[] bytes = generatePrivilegedActionClassBytes(globalSetterClassName.replace('.', '/')); - return defineClass(name, bytes, 0, bytes.length, myProtectionDomain); } else { throw new ClassNotFoundException(name); } @@ -158,70 +131,4 @@ class JavaAdapterClassLoader extends JavaAdapterGeneratorBase { permissions.add(new AllPermission()); return new ProtectionDomain(new CodeSource(null, (CodeSigner[])null), permissions); } - - /** - * Generates a PrivilegedAction implementation class for invoking {@link Context#setGlobal(ScriptObject)} from the - * adapter class. - */ - private static byte[] generatePrivilegedActionClassBytes(final String className) { - final ClassWriter w = new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS); - // class GlobalSetter implements PrivilegedAction { - w.visit(Opcodes.V1_7, ACC_SUPER | ACC_FINAL, className, null, OBJECT_TYPE_NAME, new String[] { - PRIVILEGED_ACTION_TYPE_NAME - }); - - // private final ScriptObject global; - w.visitField(ACC_PRIVATE | ACC_FINAL, GLOBAL_FIELD_NAME, SCRIPT_OBJECT_TYPE_DESCRIPTOR, null, null).visitEnd(); - - // private GlobalSetter(ScriptObject global) { - InstructionAdapter mv = new InstructionAdapter(w.visitMethod(ACC_PRIVATE, INIT, - SET_GLOBAL_METHOD_DESCRIPTOR, null, new String[0])); - mv.visitCode(); - // super(); - mv.visitVarInsn(ALOAD, 0); - mv.invokespecial(OBJECT_TYPE_NAME, INIT, VOID_NOARG_METHOD_DESCRIPTOR); - // this.global = global; - mv.visitVarInsn(ALOAD, 0); - mv.visitVarInsn(ALOAD, 1); - mv.putfield(className, GLOBAL_FIELD_NAME, SCRIPT_OBJECT_TYPE_DESCRIPTOR); - - mv.visitInsn(RETURN); - mv.visitEnd(); - mv.visitMaxs(0, 0); - - // public Object run() { - mv = new InstructionAdapter(w.visitMethod(ACC_PUBLIC, "run", PRIVILEGED_RUN_METHOD_DESCRIPTOR, null, - new String[0])); - mv.visitCode(); - // Context.setGlobal(this.global); - mv.visitVarInsn(ALOAD, 0); - mv.getfield(className, GLOBAL_FIELD_NAME, SCRIPT_OBJECT_TYPE_DESCRIPTOR); - mv.invokestatic(CONTEXT_TYPE_NAME, "setGlobal", SET_GLOBAL_METHOD_DESCRIPTOR); - // return null; - mv.visitInsn(ACONST_NULL); - mv.visitInsn(ARETURN); - - mv.visitEnd(); - mv.visitMaxs(0, 0); - - // static void setGlobal(ScriptObject global) { - mv = new InstructionAdapter(w.visitMethod(ACC_STATIC, "setGlobal", SET_GLOBAL_METHOD_DESCRIPTOR, null, - new String[0])); - mv.visitCode(); - // new GlobalSetter(ScriptObject global) - mv.anew(Type.getType("L" + className + ";")); - mv.dup(); - mv.visitVarInsn(ALOAD, 0); - mv.invokespecial(className, INIT, SET_GLOBAL_METHOD_DESCRIPTOR); - // AccessController.doPrivileged(...) - mv.invokestatic(Type.getInternalName(AccessController.class), "doPrivileged", Type.getMethodDescriptor( - OBJECT_TYPE, PRIVILEGED_ACTION_TYPE)); - mv.pop(); - mv.visitInsn(RETURN); - - mv.visitEnd(); - mv.visitMaxs(0, 0); - - return w.toByteArray(); - } } diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterGeneratorBase.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterGeneratorBase.java deleted file mode 100644 index ff33ba6ef72..00000000000 --- a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterGeneratorBase.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -package jdk.nashorn.internal.runtime.linker; - -import jdk.internal.org.objectweb.asm.Type; -import jdk.nashorn.internal.runtime.Context; -import jdk.nashorn.internal.runtime.ScriptObject; - -/** - * Base class for both {@link JavaAdapterBytecodeGenerator} and {@link JavaAdapterClassLoader}, containing those - * bytecode types, type names and method descriptor that are used by both. - */ -@SuppressWarnings("javadoc") -abstract class JavaAdapterGeneratorBase { - static final Type CONTEXT_TYPE = Type.getType(Context.class); - static final Type OBJECT_TYPE = Type.getType(Object.class); - static final Type SCRIPT_OBJECT_TYPE = Type.getType(ScriptObject.class); - - static final String CONTEXT_TYPE_NAME = CONTEXT_TYPE.getInternalName(); - static final String OBJECT_TYPE_NAME = OBJECT_TYPE.getInternalName(); - - static final String INIT = ""; - - static final String GLOBAL_FIELD_NAME = "global"; - - static final String SCRIPT_OBJECT_TYPE_DESCRIPTOR = SCRIPT_OBJECT_TYPE.getDescriptor(); - - static final String SET_GLOBAL_METHOD_DESCRIPTOR = Type.getMethodDescriptor(Type.VOID_TYPE, SCRIPT_OBJECT_TYPE); - static final String VOID_NOARG_METHOD_DESCRIPTOR = Type.getMethodDescriptor(Type.VOID_TYPE); - - protected JavaAdapterGeneratorBase() { - } -} From 3a0f1e0653aab62cea4e97c50911895934d210d6 Mon Sep 17 00:00:00 2001 From: Attila Szegedi Date: Thu, 18 Jul 2013 16:22:25 +0200 Subject: [PATCH 008/120] 8020809: Java adapter should not allow overriding of caller sensitive methods Reviewed-by: jlaskey, sundar --- .../linker/JavaAdapterBytecodeGenerator.java | 10 +++- nashorn/test/script/trusted/JDK-8020809.js | 47 +++++++++++++++++++ .../script/trusted/JDK-8020809.js.EXPECTED | 1 + 3 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 nashorn/test/script/trusted/JDK-8020809.js create mode 100644 nashorn/test/script/trusted/JDK-8020809.js.EXPECTED diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java index 2bce232c18a..77373ff1c63 100644 --- a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java +++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java @@ -45,6 +45,7 @@ import static jdk.nashorn.internal.runtime.linker.AdaptationResult.Outcome.ERROR import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodType; +import java.lang.reflect.AccessibleObject; import java.lang.reflect.Constructor; import java.lang.reflect.Method; import java.lang.reflect.Modifier; @@ -66,6 +67,7 @@ import jdk.internal.org.objectweb.asm.commons.InstructionAdapter; import jdk.nashorn.internal.runtime.Context; import jdk.nashorn.internal.runtime.ScriptFunction; import jdk.nashorn.internal.runtime.ScriptObject; +import sun.reflect.CallerSensitive; /** * Generates bytecode for a Java adapter class. Used by the {@link JavaAdapterFactory}. @@ -378,7 +380,7 @@ final class JavaAdapterBytecodeGenerator { boolean gotCtor = false; for (final Constructor ctor: superClass.getDeclaredConstructors()) { final int modifier = ctor.getModifiers(); - if((modifier & (Modifier.PUBLIC | Modifier.PROTECTED)) != 0) { + if((modifier & (Modifier.PUBLIC | Modifier.PROTECTED)) != 0 && !isCallerSensitive(ctor)) { generateConstructors(ctor); gotCtor = true; } @@ -843,7 +845,7 @@ final class JavaAdapterBytecodeGenerator { } if (Modifier.isPublic(m) || Modifier.isProtected(m)) { final MethodInfo mi = new MethodInfo(typeMethod); - if (Modifier.isFinal(m)) { + if (Modifier.isFinal(m) || isCallerSensitive(typeMethod)) { finalMethods.add(mi); } else if (!finalMethods.contains(mi) && methodInfos.add(mi)) { if (Modifier.isAbstract(m)) { @@ -920,4 +922,8 @@ final class JavaAdapterBytecodeGenerator { final Class superClass = c1.getSuperclass(); return superClass.isAssignableFrom(c2) ? superClass : assignableSuperClass(superClass, c2); } + + private static boolean isCallerSensitive(final AccessibleObject e) { + return e.getAnnotation(CallerSensitive.class) != null; + } } diff --git a/nashorn/test/script/trusted/JDK-8020809.js b/nashorn/test/script/trusted/JDK-8020809.js new file mode 100644 index 00000000000..6e0296c693c --- /dev/null +++ b/nashorn/test/script/trusted/JDK-8020809.js @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * JDK-8020809: Java adapter should not allow overriding of caller sensitive methods + * + * @test + * @run + */ + +// This test runs as trusted as we need the +// "enableContextClassLoaderOverride" runtime permission. + +var T = Java.extend(java.lang.Thread, { + getContextClassLoader: function() { + // Since getContextClassLoader is caller sensitive, this won't + // actually act as an override; it will be ignored. If we could + // invoke it, it would be an error. + throw new Error() + } +}) + +// Retrieve the context ClassLoader on our Thread adapter, ensure the +// method was not, in fact, overridden. +var cl = (new T()).contextClassLoader + +print("cl is class loader: " + (cl instanceof java.lang.ClassLoader)) diff --git a/nashorn/test/script/trusted/JDK-8020809.js.EXPECTED b/nashorn/test/script/trusted/JDK-8020809.js.EXPECTED new file mode 100644 index 00000000000..e787d7ae5c6 --- /dev/null +++ b/nashorn/test/script/trusted/JDK-8020809.js.EXPECTED @@ -0,0 +1 @@ +cl is class loader: true From 566991e98e21274cfa8b71372a01c05a03749448 Mon Sep 17 00:00:00 2001 From: Attila Szegedi Date: Thu, 18 Jul 2013 16:47:45 +0200 Subject: [PATCH 009/120] 8020820: Limit access to static members of reflective classes Reviewed-by: jlaskey, sundar --- nashorn/make/build.xml | 5 ++ .../linker/NashornStaticClassLinker.java | 3 +- nashorn/test/script/basic/JDK-8010946-2.js | 3 +- .../script/basic/JDK-8010946-2.js.EXPECTED | 1 - nashorn/test/script/basic/NASHORN-473.js | 2 +- nashorn/test/script/basic/classloader.js | 41 ++++++++++++++ .../test/script/basic/classloader.js.EXPECTED | 1 + nashorn/test/script/basic/javaarray.js | 10 ++-- .../script/sandbox/classloader.js.EXPECTED | 2 +- nashorn/test/script/sandbox/reflection.js | 3 +- .../api/javaaccess/BooleanAccessTest.java | 8 +-- .../api/javaaccess/NumberAccessTest.java | 56 +++++++++---------- .../api/javaaccess/ObjectAccessTest.java | 8 +-- .../api/javaaccess/StringAccessTest.java | 8 +-- 14 files changed, 98 insertions(+), 53 deletions(-) create mode 100644 nashorn/test/script/basic/classloader.js create mode 100644 nashorn/test/script/basic/classloader.js.EXPECTED diff --git a/nashorn/make/build.xml b/nashorn/make/build.xml index 4aaac75c909..98502bd9bbf 100644 --- a/nashorn/make/build.xml +++ b/nashorn/make/build.xml @@ -267,6 +267,11 @@ grant codeBase "file:/${basedir}/test/script/basic/*" { grant codeBase "file:/${basedir}/test/script/basic/JDK-8010946-privileged.js" { permission java.util.PropertyPermission "java.security.policy", "read"; }; + +grant codeBase "file:/${basedir}/test/script/basic/classloader.js" { + permission java.lang.RuntimePermission "nashorn.JavaReflection"; +}; + \/ diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java index 67c1d8db5f8..292647023da 100644 --- a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java +++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java @@ -63,10 +63,11 @@ final class NashornStaticClassLinker implements TypeBasedGuardingDynamicLinker { if (self.getClass() != StaticClass.class) { return null; } + final Class receiverClass = ((StaticClass) self).getRepresentedClass(); + Bootstrap.checkReflectionAccess(receiverClass); final CallSiteDescriptor desc = request.getCallSiteDescriptor(); // We intercept "new" on StaticClass instances to provide additional capabilities if ("new".equals(desc.getNameToken(CallSiteDescriptor.OPERATOR))) { - final Class receiverClass = ((StaticClass) self).getRepresentedClass(); // Is the class abstract? (This includes interfaces.) if (NashornLinker.isAbstractClass(receiverClass)) { // Change this link request into a link request on the adapter class. diff --git a/nashorn/test/script/basic/JDK-8010946-2.js b/nashorn/test/script/basic/JDK-8010946-2.js index c3dc2889a6c..bf808d0e05a 100644 --- a/nashorn/test/script/basic/JDK-8010946-2.js +++ b/nashorn/test/script/basic/JDK-8010946-2.js @@ -30,9 +30,8 @@ * @run */ -// Ensure these are CallerSensitiveDynamicMethods +// Ensure this is CallerSensitiveDynamicMethod print(java.security.AccessController["doPrivileged(PrivilegedAction)"]) -print(java.lang.Class["forName(String)"]) // Ensure this is not print(java.lang.String["valueOf(char)"]) diff --git a/nashorn/test/script/basic/JDK-8010946-2.js.EXPECTED b/nashorn/test/script/basic/JDK-8010946-2.js.EXPECTED index d573510c9de..cced7632420 100644 --- a/nashorn/test/script/basic/JDK-8010946-2.js.EXPECTED +++ b/nashorn/test/script/basic/JDK-8010946-2.js.EXPECTED @@ -1,3 +1,2 @@ [jdk.internal.dynalink.beans.CallerSensitiveDynamicMethod Object java.security.AccessController.doPrivileged(PrivilegedAction)] -[jdk.internal.dynalink.beans.CallerSensitiveDynamicMethod Class java.lang.Class.forName(String)] [jdk.internal.dynalink.beans.SimpleDynamicMethod String java.lang.String.valueOf(char)] diff --git a/nashorn/test/script/basic/NASHORN-473.js b/nashorn/test/script/basic/NASHORN-473.js index 3819d15b2ca..1b935aed87c 100644 --- a/nashorn/test/script/basic/NASHORN-473.js +++ b/nashorn/test/script/basic/NASHORN-473.js @@ -28,7 +28,7 @@ * @run */ -var boolArr = java.lang.reflect.Array.newInstance(java.lang.Boolean.TYPE, 2); +var boolArr = new (Java.type("boolean[]"))(2); boolArr[0] = true; boolArr[1] = false; diff --git a/nashorn/test/script/basic/classloader.js b/nashorn/test/script/basic/classloader.js new file mode 100644 index 00000000000..7676496060d --- /dev/null +++ b/nashorn/test/script/basic/classloader.js @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * Try to extend ClassLoader. + * + * @test + * @security + */ + +try { + var l = new (Java.extend(java.lang.ClassLoader))({}); + fail("should have thrown SecurityException"); +} catch (e) { + if (e instanceof java.lang.SecurityException) { + print(e); + } else { + fail("expected SecurityException, got " + e); + } +} + diff --git a/nashorn/test/script/basic/classloader.js.EXPECTED b/nashorn/test/script/basic/classloader.js.EXPECTED new file mode 100644 index 00000000000..e08cc9f8b40 --- /dev/null +++ b/nashorn/test/script/basic/classloader.js.EXPECTED @@ -0,0 +1 @@ +java.security.AccessControlException: access denied ("java.lang.RuntimePermission" "createClassLoader") diff --git a/nashorn/test/script/basic/javaarray.js b/nashorn/test/script/basic/javaarray.js index 389b9530096..5a1588894d6 100644 --- a/nashorn/test/script/basic/javaarray.js +++ b/nashorn/test/script/basic/javaarray.js @@ -30,7 +30,7 @@ (function() { var nargs = arguments.length; - var args = java.lang.reflect.Array.newInstance(java.lang.Object.class, nargs); + var args = new (Java.type("java.lang.Object[]"))(nargs); print(args.length); for (var i = 0; i < nargs; i++) { var arg = arguments[i]; @@ -41,7 +41,7 @@ var z; // undefined -var intArray = java.lang.reflect.Array.newInstance(java.lang.Integer.TYPE, 1); +var intArray = new (Java.type("int[]"))(1); intArray[0] = 10; print(intArray[0]); print(intArray.length); @@ -50,19 +50,19 @@ print(intArray[0]); intArray[0] = 10.1; print(intArray[0]); -var boolArray = java.lang.reflect.Array.newInstance(java.lang.Boolean.TYPE, 2); +var boolArray = new (Java.type("boolean[]"))(2); boolArray[0] = true; print(boolArray[0]); print(boolArray[1]); print(boolArray.length); -var charArray = java.lang.reflect.Array.newInstance(java.lang.Character.TYPE, 1); +var charArray = new (Java.type("char[]"))(1); charArray[0] = 'j'; print(charArray[0]); print(charArray.length); -var doubleArray = java.lang.reflect.Array.newInstance(java.lang.Double.TYPE, 1) +var doubleArray = new (Java.type("double[]"))(1) doubleArray[0]=z print(doubleArray[0]) doubleArray[0]=1 diff --git a/nashorn/test/script/sandbox/classloader.js.EXPECTED b/nashorn/test/script/sandbox/classloader.js.EXPECTED index e08cc9f8b40..356053d4e1d 100644 --- a/nashorn/test/script/sandbox/classloader.js.EXPECTED +++ b/nashorn/test/script/sandbox/classloader.js.EXPECTED @@ -1 +1 @@ -java.security.AccessControlException: access denied ("java.lang.RuntimePermission" "createClassLoader") +java.security.AccessControlException: access denied ("java.lang.RuntimePermission" "nashorn.JavaReflection") diff --git a/nashorn/test/script/sandbox/reflection.js b/nashorn/test/script/sandbox/reflection.js index e892c646d44..4fdc58fdad8 100644 --- a/nashorn/test/script/sandbox/reflection.js +++ b/nashorn/test/script/sandbox/reflection.js @@ -35,9 +35,8 @@ function check(e) { } } -var cl = java.lang.Class.class; try { - cl.getDeclaredMethods(); + var cl = java.lang.Class.class; } catch(e) { check(e); } diff --git a/nashorn/test/src/jdk/nashorn/api/javaaccess/BooleanAccessTest.java b/nashorn/test/src/jdk/nashorn/api/javaaccess/BooleanAccessTest.java index b6e5bbcddc9..030bb1e522c 100644 --- a/nashorn/test/src/jdk/nashorn/api/javaaccess/BooleanAccessTest.java +++ b/nashorn/test/src/jdk/nashorn/api/javaaccess/BooleanAccessTest.java @@ -72,7 +72,7 @@ public class BooleanAccessTest { e.eval("var p_boolean_array = o.publicBooleanArray;"); assertEquals(o.publicBooleanArray[0], e.eval("o.publicBooleanArray[0]")); assertTrue(Arrays.equals(o.publicBooleanArray, (boolean[])e.get("p_boolean_array"))); - e.eval("var t_boolean_arr = java.lang.reflect.Array.newInstance(java.lang.Boolean.TYPE, 3);" + + e.eval("var t_boolean_arr = new (Java.type(\"boolean[]\"))(3);" + "t_boolean_arr[0] = true;" + "t_boolean_arr[1] = false;" + "t_boolean_arr[2] = false;" + @@ -96,7 +96,7 @@ public class BooleanAccessTest { e.eval("var ps_boolean_array = SharedObject.publicStaticBooleanArray;"); assertEquals(SharedObject.publicStaticBooleanArray[0], e.eval("SharedObject.publicStaticBooleanArray[0]")); assertTrue(Arrays.equals(SharedObject.publicStaticBooleanArray, (boolean[])e.get("ps_boolean_array"))); - e.eval("var ts_boolean_arr = java.lang.reflect.Array.newInstance(java.lang.Boolean.TYPE, 3);" + + e.eval("var ts_boolean_arr = new (Java.type(\"boolean[]\"))(3);" + "ts_boolean_arr[0] = true;" + "ts_boolean_arr[1] = false;" + "ts_boolean_arr[2] = true;" + @@ -120,7 +120,7 @@ public class BooleanAccessTest { e.eval("var pf_boolean_array = o.publicFinalBooleanArray;"); assertEquals(o.publicFinalBooleanArray[0], e.eval("o.publicFinalBooleanArray[0]")); assertTrue(Arrays.equals(o.publicFinalBooleanArray, (boolean[])e.get("pf_boolean_array"))); - e.eval("var tf_boolean_arr = java.lang.reflect.Array.newInstance(java.lang.Boolean.TYPE, 3);" + + e.eval("var tf_boolean_arr = new (Java.type(\"boolean[]\"))(3);" + "tf_boolean_arr[0] = false;" + "tf_boolean_arr[1] = false;" + "tf_boolean_arr[2] = true;" + @@ -144,7 +144,7 @@ public class BooleanAccessTest { e.eval("var psf_boolean_array = SharedObject.publicStaticFinalBooleanArray;"); assertEquals(SharedObject.publicStaticFinalBooleanArray[0], e.eval("SharedObject.publicStaticFinalBooleanArray[0]")); assertTrue(Arrays.equals(SharedObject.publicStaticFinalBooleanArray, (boolean[])e.get("psf_boolean_array"))); - e.eval("var tsf_boolean_arr = java.lang.reflect.Array.newInstance(java.lang.Boolean.TYPE, 3);" + + e.eval("var tsf_boolean_arr = new (Java.type(\"boolean[]\"))(3);" + "tsf_boolean_arr[0] = false;" + "tsf_boolean_arr[1] = true;" + "tsf_boolean_arr[2] = false;" + diff --git a/nashorn/test/src/jdk/nashorn/api/javaaccess/NumberAccessTest.java b/nashorn/test/src/jdk/nashorn/api/javaaccess/NumberAccessTest.java index 0b7cb027b61..49f193e91bc 100644 --- a/nashorn/test/src/jdk/nashorn/api/javaaccess/NumberAccessTest.java +++ b/nashorn/test/src/jdk/nashorn/api/javaaccess/NumberAccessTest.java @@ -73,7 +73,7 @@ public class NumberAccessTest { e.eval("var p_long_array = o.publicLongArray;"); assertEquals(o.publicLongArray[0], e.eval("o.publicLongArray[0];")); assertArrayEquals(o.publicLongArray, (long[])e.get("p_long_array")); - e.eval("var t_long_arr = java.lang.reflect.Array.newInstance(java.lang.Long.TYPE, 3);" + + e.eval("var t_long_arr = new (Java.type(\"long[]\"))(3);" + "t_long_arr[0] = -189009;" + "t_long_arr[1] = 456;" + "t_long_arr[2] = 600000001;" + @@ -97,7 +97,7 @@ public class NumberAccessTest { e.eval("var ps_long_array = SharedObject.publicStaticLongArray;"); assertEquals(SharedObject.publicStaticLongArray[0], e.eval("SharedObject.publicStaticLongArray[0];")); assertArrayEquals(SharedObject.publicStaticLongArray, (long[])e.get("ps_long_array")); - e.eval("var ts_long_arr = java.lang.reflect.Array.newInstance(java.lang.Long.TYPE, 3);" + + e.eval("var ts_long_arr = new (Java.type(\"long[]\"))(3);" + "ts_long_arr[0] = -189009;" + "ts_long_arr[1] = 456;" + "ts_long_arr[2] = 600000001;" + @@ -121,7 +121,7 @@ public class NumberAccessTest { e.eval("var pf_long_array = o.publicFinalLongArray;"); assertEquals(o.publicFinalLongArray[0], e.eval("o.publicFinalLongArray[0];")); assertArrayEquals(o.publicFinalLongArray, (long[])e.get("pf_long_array")); - e.eval("var tf_long_arr = java.lang.reflect.Array.newInstance(java.lang.Long.TYPE, 3);" + + e.eval("var tf_long_arr = new (Java.type(\"long[]\"))(3);" + "tf_long_arr[0] = -189009;" + "tf_long_arr[1] = 456;" + "tf_long_arr[2] = 600000001;" + @@ -145,7 +145,7 @@ public class NumberAccessTest { e.eval("var psf_long_array = SharedObject.publicStaticFinalLongArray;"); assertEquals(SharedObject.publicStaticFinalLongArray[0], e.eval("SharedObject.publicStaticFinalLongArray[0];")); assertArrayEquals(SharedObject.publicStaticFinalLongArray, (long[])e.get("psf_long_array")); - e.eval("var tsf_long_arr = java.lang.reflect.Array.newInstance(java.lang.Long.TYPE, 3);" + + e.eval("var tsf_long_arr = new (Java.type(\"long[]\"))(3);" + "tsf_long_arr[0] = -189009;" + "tsf_long_arr[1] = 456;" + "tsf_long_arr[2] = 600000001;" + @@ -171,7 +171,7 @@ public class NumberAccessTest { e.eval("var p_int_array = o.publicIntArray;"); assertEquals(o.publicIntArray[0], e.eval("o.publicIntArray[0];")); assertArrayEquals(o.publicIntArray, (int[])e.get("p_int_array")); - e.eval("var t_int_arr = java.lang.reflect.Array.newInstance(java.lang.Integer.TYPE, 3);" + + e.eval("var t_int_arr = new (Java.type(\"int[]\"))(3);" + "t_int_arr[0] = 4;" + "t_int_arr[1] = 5;" + "t_int_arr[2] = 6;" + @@ -194,7 +194,7 @@ public class NumberAccessTest { e.eval("var ps_int_array = SharedObject.publicStaticIntArray;"); assertEquals(SharedObject.publicStaticIntArray[0], e.eval("SharedObject.publicStaticIntArray[0];")); assertArrayEquals(SharedObject.publicStaticIntArray, (int[])e.get("ps_int_array")); - e.eval("var ts_int_arr = java.lang.reflect.Array.newInstance(java.lang.Integer.TYPE, 3);" + + e.eval("var ts_int_arr = new (Java.type(\"int[]\"))(3);" + "ts_int_arr[0] = 4;" + "ts_int_arr[1] = 5;" + "ts_int_arr[2] = 6;" + @@ -218,7 +218,7 @@ public class NumberAccessTest { e.eval("var pf_int_array = o.publicFinalIntArray;"); assertEquals(o.publicFinalIntArray[0], e.eval("o.publicFinalIntArray[0];")); assertArrayEquals(o.publicFinalIntArray, (int[])e.get("pf_int_array")); - e.eval("var tf_int_arr = java.lang.reflect.Array.newInstance(java.lang.Integer.TYPE, 3);" + + e.eval("var tf_int_arr = new (Java.type(\"int[]\"))(3);" + "tf_int_arr[0] = 4;" + "tf_int_arr[1] = 5;" + "tf_int_arr[2] = 6;" + @@ -241,7 +241,7 @@ public class NumberAccessTest { e.eval("var psf_int_array = SharedObject.publicStaticFinalIntArray;"); assertEquals(SharedObject.publicStaticFinalIntArray[0], e.eval("SharedObject.publicStaticFinalIntArray[0];")); assertArrayEquals(SharedObject.publicStaticFinalIntArray, (int[])e.get("psf_int_array")); - e.eval("var tsf_int_arr = java.lang.reflect.Array.newInstance(java.lang.Integer.TYPE, 3);" + + e.eval("var tsf_int_arr = new (Java.type(\"int[]\"))(3);" + "tsf_int_arr[0] = 4;" + "tsf_int_arr[1] = 5;" + "tsf_int_arr[2] = 6;" + @@ -266,7 +266,7 @@ public class NumberAccessTest { e.eval("var p_byte_array = o.publicByteArray;"); assertEquals(o.publicByteArray[0], e.eval("o.publicByteArray[0];")); assertArrayEquals(o.publicByteArray, (byte[])e.get("p_byte_array")); - e.eval("var t_byte_arr = java.lang.reflect.Array.newInstance(java.lang.Byte.TYPE, 3);" + + e.eval("var t_byte_arr = new (Java.type(\"byte[]\"))(3);" + "t_byte_arr[0] = -18;" + "t_byte_arr[1] = 56;" + "t_byte_arr[2] = 60;" + @@ -289,7 +289,7 @@ public class NumberAccessTest { e.eval("var ps_byte_array = SharedObject.publicStaticByteArray;"); assertEquals(SharedObject.publicStaticByteArray[0], e.eval("SharedObject.publicStaticByteArray[0];")); assertArrayEquals(SharedObject.publicStaticByteArray, (byte[])e.get("ps_byte_array")); - e.eval("var ts_byte_arr = java.lang.reflect.Array.newInstance(java.lang.Byte.TYPE, 3);" + + e.eval("var ts_byte_arr = new (Java.type(\"byte[]\"))(3);" + "ts_byte_arr[0] = -18;" + "ts_byte_arr[1] = 56;" + "ts_byte_arr[2] = 60;" + @@ -312,7 +312,7 @@ public class NumberAccessTest { e.eval("var pf_byte_array = o.publicFinalByteArray;"); assertEquals(o.publicFinalByteArray[0], e.eval("o.publicFinalByteArray[0];")); assertArrayEquals(o.publicFinalByteArray, (byte[])e.get("pf_byte_array")); - e.eval("var tf_byte_arr = java.lang.reflect.Array.newInstance(java.lang.Byte.TYPE, 3);" + + e.eval("var tf_byte_arr = new (Java.type(\"byte[]\"))(3);" + "tf_byte_arr[0] = -18;" + "tf_byte_arr[1] = 56;" + "tf_byte_arr[2] = 60;" + @@ -335,7 +335,7 @@ public class NumberAccessTest { e.eval("var psf_byte_array = SharedObject.publicStaticFinalByteArray;"); assertEquals(SharedObject.publicStaticFinalByteArray[0], e.eval("SharedObject.publicStaticFinalByteArray[0];")); assertArrayEquals(SharedObject.publicStaticFinalByteArray, (byte[])e.get("psf_byte_array")); - e.eval("var tsf_byte_arr = java.lang.reflect.Array.newInstance(java.lang.Byte.TYPE, 3);" + + e.eval("var tsf_byte_arr = new (Java.type(\"byte[]\"))(3);" + "tsf_byte_arr[0] = -18;" + "tsf_byte_arr[1] = 56;" + "tsf_byte_arr[2] = 60;" + @@ -360,7 +360,7 @@ public class NumberAccessTest { e.eval("var p_short_array = o.publicShortArray;"); assertEquals(o.publicShortArray[0], e.eval("o.publicShortArray[0];")); assertArrayEquals(o.publicShortArray, (short[])e.get("p_short_array")); - e.eval("var t_short_arr = java.lang.reflect.Array.newInstance(java.lang.Short.TYPE, 3);" + + e.eval("var t_short_arr = new (Java.type(\"short[]\"))(3);" + "t_short_arr[0] = 90;" + "t_short_arr[1] = 5;" + "t_short_arr[2] = -6000;" + @@ -383,7 +383,7 @@ public class NumberAccessTest { e.eval("var ps_short_array = SharedObject.publicStaticShortArray;"); assertEquals(SharedObject.publicStaticShortArray[0], e.eval("SharedObject.publicStaticShortArray[0];")); assertArrayEquals(SharedObject.publicStaticShortArray, (short[])e.get("ps_short_array")); - e.eval("var ts_short_arr = java.lang.reflect.Array.newInstance(java.lang.Short.TYPE, 3);" + + e.eval("var ts_short_arr = new (Java.type(\"short[]\"))(3);" + "ts_short_arr[0] = 90;" + "ts_short_arr[1] = 5;" + "ts_short_arr[2] = -6000;" + @@ -406,7 +406,7 @@ public class NumberAccessTest { e.eval("var pf_short_array = o.publicFinalShortArray;"); assertEquals(o.publicFinalShortArray[0], e.eval("o.publicFinalShortArray[0];")); assertArrayEquals(o.publicFinalShortArray, (short[])e.get("pf_short_array")); - e.eval("var tf_short_arr = java.lang.reflect.Array.newInstance(java.lang.Short.TYPE, 3);" + + e.eval("var tf_short_arr = new (Java.type(\"short[]\"))(3);" + "tf_short_arr[0] = 90;" + "tf_short_arr[1] = 5;" + "tf_short_arr[2] = -6000;" + @@ -429,7 +429,7 @@ public class NumberAccessTest { e.eval("var psf_short_array = SharedObject.publicStaticFinalShortArray;"); assertEquals(SharedObject.publicStaticFinalShortArray[0], e.eval("SharedObject.publicStaticFinalShortArray[0];")); assertArrayEquals(SharedObject.publicStaticFinalShortArray, (short[])e.get("psf_short_array")); - e.eval("var tsf_short_arr = java.lang.reflect.Array.newInstance(java.lang.Short.TYPE, 3);" + + e.eval("var tsf_short_arr = new (Java.type(\"short[]\"))(3);" + "tsf_short_arr[0] = 90;" + "tsf_short_arr[1] = 5;" + "tsf_short_arr[2] = -6000;" + @@ -463,7 +463,7 @@ public class NumberAccessTest { e.eval("var p_char_array = o.publicCharArray;"); assertEquals(o.publicCharArray[0], e.eval("o.publicCharArray[0];")); assertArrayEquals(o.publicCharArray, (char[])e.get("p_char_array")); - e.eval("var t_char_arr = java.lang.reflect.Array.newInstance(java.lang.Character.TYPE, 3);" + + e.eval("var t_char_arr = new (Java.type(\"char[]\"))(3);" + "t_char_arr[0] = 'F';" + "t_char_arr[1] = 'o';" + "t_char_arr[2] = 'o';" + @@ -486,7 +486,7 @@ public class NumberAccessTest { e.eval("var ps_char_array = SharedObject.publicStaticCharArray;"); assertEquals(SharedObject.publicStaticCharArray[0], e.eval("SharedObject.publicStaticCharArray[0];")); assertArrayEquals(SharedObject.publicStaticCharArray, (char[])e.get("ps_char_array")); - e.eval("var ts_char_arr = java.lang.reflect.Array.newInstance(java.lang.Character.TYPE, 3);" + + e.eval("var ts_char_arr = new (Java.type(\"char[]\"))(3);" + "ts_char_arr[0] = 'G';" + "ts_char_arr[1] = 'o';" + "ts_char_arr[2] = 'o';" + @@ -509,7 +509,7 @@ public class NumberAccessTest { e.eval("var pf_char_array = o.publicFinalCharArray;"); assertEquals(o.publicFinalCharArray[0], e.eval("o.publicFinalCharArray[0];")); assertArrayEquals(o.publicFinalCharArray, (char[])e.get("pf_char_array")); - e.eval("var tf_char_arr = java.lang.reflect.Array.newInstance(java.lang.Character.TYPE, 3);" + + e.eval("var tf_char_arr = new (Java.type(\"char[]\"))(3);" + "tf_char_arr[0] = 'F';" + "tf_char_arr[1] = 'o';" + "tf_char_arr[2] = 'o';" + @@ -532,7 +532,7 @@ public class NumberAccessTest { e.eval("var psf_char_array = SharedObject.publicStaticFinalCharArray;"); assertEquals(SharedObject.publicStaticFinalCharArray[0], e.eval("SharedObject.publicStaticFinalCharArray[0];")); assertArrayEquals(SharedObject.publicStaticFinalCharArray, (char[])e.get("psf_char_array")); - e.eval("var tsf_char_arr = java.lang.reflect.Array.newInstance(java.lang.Character.TYPE, 3);" + + e.eval("var tsf_char_arr = new (Java.type(\"char[]\"))(3);" + "tsf_char_arr[0] = 'Z';" + "tsf_char_arr[1] = 'o';" + "tsf_char_arr[2] = 'o';" + @@ -569,7 +569,7 @@ public class NumberAccessTest { e.eval("var p_float_array = o.publicFloatArray;"); assertEquals(o.publicFloatArray[0], e.eval("o.publicFloatArray[0];")); assertArrayEquals(o.publicFloatArray, (float[])e.get("p_float_array"), 1e-10f); - e.eval("var t_float_arr = java.lang.reflect.Array.newInstance(java.lang.Float.TYPE, 3);" + + e.eval("var t_float_arr = new (Java.type(\"float[]\"))(3);" + "t_float_arr[0] = 9.0;" + "t_float_arr[1] = 5.12345;" + "t_float_arr[2] = -60.03;" + @@ -604,7 +604,7 @@ public class NumberAccessTest { e.eval("var ps_float_array = SharedObject.publicStaticFloatArray;"); assertEquals(SharedObject.publicStaticFloatArray[0], e.eval("SharedObject.publicStaticFloatArray[0];")); assertArrayEquals(SharedObject.publicStaticFloatArray, (float[])e.get("ps_float_array"), 1e-10f); - e.eval("var ts_float_arr = java.lang.reflect.Array.newInstance(java.lang.Float.TYPE, 3);" + + e.eval("var ts_float_arr = new (Java.type(\"float[]\"))(3);" + "ts_float_arr[0] = 9.0;" + "ts_float_arr[1] = 5.12345;" + "ts_float_arr[2] = -60.03;" + @@ -627,7 +627,7 @@ public class NumberAccessTest { e.eval("var pf_float_array = o.publicFinalFloatArray;"); assertEquals(o.publicFinalFloatArray[0], e.eval("o.publicFinalFloatArray[0];")); assertArrayEquals(o.publicFinalFloatArray, (float[])e.get("pf_float_array"), 1e-10f); - e.eval("var tf_float_arr = java.lang.reflect.Array.newInstance(java.lang.Float.TYPE, 3);" + + e.eval("var tf_float_arr = new (Java.type(\"float[]\"))(3);" + "tf_float_arr[0] = 9.0;" + "tf_float_arr[1] = 5.12345;" + "tf_float_arr[2] = -60.03;" + @@ -650,7 +650,7 @@ public class NumberAccessTest { e.eval("var psf_float_array = SharedObject.publicStaticFinalFloatArray;"); assertEquals(SharedObject.publicStaticFinalFloatArray[0], e.eval("SharedObject.publicStaticFinalFloatArray[0];")); assertArrayEquals(SharedObject.publicStaticFinalFloatArray, (float[])e.get("psf_float_array"), 1e-10f); - e.eval("var tsf_float_arr = java.lang.reflect.Array.newInstance(java.lang.Float.TYPE, 3);" + + e.eval("var tsf_float_arr = new (Java.type(\"float[]\"))(3);" + "tsf_float_arr[0] = 9.0;" + "tsf_float_arr[1] = 5.12345;" + "tsf_float_arr[2] = -60.03;" + @@ -687,7 +687,7 @@ public class NumberAccessTest { e.eval("var p_double_array = o.publicDoubleArray;"); assertEquals(o.publicDoubleArray[0], e.eval("o.publicDoubleArray[0];")); assertArrayEquals(o.publicDoubleArray, (double[])e.get("p_double_array"), 1e-10); - e.eval("var t_double_arr = java.lang.reflect.Array.newInstance(java.lang.Double.TYPE, 3);" + + e.eval("var t_double_arr = new (Java.type(\"double[]\"))(3);" + "t_double_arr[0] = 9e10;" + "t_double_arr[1] = 0.677777;" + "t_double_arr[2] = -0.0000001;" + @@ -722,7 +722,7 @@ public class NumberAccessTest { e.eval("var ps_double_array = SharedObject.publicStaticDoubleArray;"); assertEquals(SharedObject.publicStaticDoubleArray[0], e.eval("SharedObject.publicStaticDoubleArray[0];")); assertArrayEquals(SharedObject.publicStaticDoubleArray, (double[])e.get("ps_double_array"), 1e-10); - e.eval("var ts_double_arr = java.lang.reflect.Array.newInstance(java.lang.Double.TYPE, 3);" + + e.eval("var ts_double_arr = new (Java.type(\"double[]\"))(3);" + "ts_double_arr[0] = 9e10;" + "ts_double_arr[1] = 0.677777;" + "ts_double_arr[2] = -0.0000001;" + @@ -745,7 +745,7 @@ public class NumberAccessTest { e.eval("var pf_double_array = o.publicFinalDoubleArray;"); assertEquals(o.publicFinalDoubleArray[0], e.eval("o.publicFinalDoubleArray[0];")); assertArrayEquals(o.publicFinalDoubleArray, (double[])e.get("pf_double_array"), 1e-10); - e.eval("var tf_double_arr = java.lang.reflect.Array.newInstance(java.lang.Double.TYPE, 3);" + + e.eval("var tf_double_arr = new (Java.type(\"double[]\"))(3);" + "tf_double_arr[0] = 9e10;" + "tf_double_arr[1] = 0.677777;" + "tf_double_arr[2] = -0.0000001;" + @@ -768,7 +768,7 @@ public class NumberAccessTest { e.eval("var psf_double_array = SharedObject.publicStaticFinalDoubleArray;"); assertEquals(SharedObject.publicStaticFinalDoubleArray[0], e.eval("SharedObject.publicStaticFinalDoubleArray[0];")); assertArrayEquals(SharedObject.publicStaticFinalDoubleArray, (double[])e.get("psf_double_array"), 1e-10); - e.eval("var tsf_double_arr = java.lang.reflect.Array.newInstance(java.lang.Double.TYPE, 3);" + + e.eval("var tsf_double_arr = new (Java.type(\"double[]\"))(3);" + "tsf_double_arr[0] = 9e10;" + "tsf_double_arr[1] = 0.677777;" + "tsf_double_arr[2] = -0.0000001;" + diff --git a/nashorn/test/src/jdk/nashorn/api/javaaccess/ObjectAccessTest.java b/nashorn/test/src/jdk/nashorn/api/javaaccess/ObjectAccessTest.java index 2a51e7a9ce1..de0fd8ee152 100644 --- a/nashorn/test/src/jdk/nashorn/api/javaaccess/ObjectAccessTest.java +++ b/nashorn/test/src/jdk/nashorn/api/javaaccess/ObjectAccessTest.java @@ -72,7 +72,7 @@ public class ObjectAccessTest { e.eval("var p_object_array = o.publicObjectArray;"); assertEquals(o.publicObjectArray[0], e.eval("o.publicObjectArray[0]")); assertArrayEquals(o.publicObjectArray, (Object[])e.get("p_object_array")); - e.eval("var t_object_arr = java.lang.reflect.Array.newInstance(Person.class, 3);" + + e.eval("var t_object_arr = new (Java.type(\"jdk.nashorn.api.javaaccess.Person[]\"))(3);" + "t_object_arr[0] = new Person(100);" + "t_object_arr[1] = new Person(120);" + "t_object_arr[2] = new Person(140);" + @@ -96,7 +96,7 @@ public class ObjectAccessTest { e.eval("var ps_object_array = SharedObject.publicStaticObjectArray;"); assertEquals(SharedObject.publicStaticObjectArray[0], e.eval("SharedObject.publicStaticObjectArray[0]")); assertArrayEquals(SharedObject.publicStaticObjectArray, (Object[])e.get("ps_object_array")); - e.eval("var ts_object_arr = java.lang.reflect.Array.newInstance(Person.class, 3);" + + e.eval("var ts_object_arr = new (Java.type(\"jdk.nashorn.api.javaaccess.Person[]\"))(3);" + "ts_object_arr[0] = new Person(100);" + "ts_object_arr[1] = new Person(120);" + "ts_object_arr[2] = new Person(140);" + @@ -120,7 +120,7 @@ public class ObjectAccessTest { e.eval("var pf_object_array = o.publicFinalObjectArray;"); assertEquals(o.publicFinalObjectArray[0], e.eval("o.publicFinalObjectArray[0]")); assertArrayEquals(o.publicFinalObjectArray, (Object[])e.get("pf_object_array")); - e.eval("var tf_object_arr = java.lang.reflect.Array.newInstance(Person.class, 3);" + + e.eval("var tf_object_arr = new (Java.type(\"jdk.nashorn.api.javaaccess.Person[]\"))(3);" + "tf_object_arr[0] = new Person(100);" + "tf_object_arr[1] = new Person(120);" + "tf_object_arr[2] = new Person(140);" + @@ -144,7 +144,7 @@ public class ObjectAccessTest { e.eval("var psf_object_array = SharedObject.publicStaticFinalObjectArray;"); assertEquals(SharedObject.publicStaticFinalObjectArray[0], e.eval("SharedObject.publicStaticFinalObjectArray[0]")); assertArrayEquals(SharedObject.publicStaticFinalObjectArray, (Object[])e.get("psf_object_array")); - e.eval("var tsf_object_arr = java.lang.reflect.Array.newInstance(Person.class, 3);" + + e.eval("var tsf_object_arr = new (Java.type(\"jdk.nashorn.api.javaaccess.Person[]\"))(3);" + "tsf_object_arr[0] = new Person(100);" + "tsf_object_arr[1] = new Person(120);" + "tsf_object_arr[2] = new Person(140);" + diff --git a/nashorn/test/src/jdk/nashorn/api/javaaccess/StringAccessTest.java b/nashorn/test/src/jdk/nashorn/api/javaaccess/StringAccessTest.java index dd4b5020787..55624360824 100644 --- a/nashorn/test/src/jdk/nashorn/api/javaaccess/StringAccessTest.java +++ b/nashorn/test/src/jdk/nashorn/api/javaaccess/StringAccessTest.java @@ -71,7 +71,7 @@ public class StringAccessTest { e.eval("var p_string_array = o.publicStringArray;"); assertEquals(o.publicStringArray[0], e.eval("o.publicStringArray[0]")); assertArrayEquals(o.publicStringArray, (String[])e.get("p_string_array")); - e.eval("var t_string_arr = java.lang.reflect.Array.newInstance(java.lang.String.class, 3);" + + e.eval("var t_string_arr = new (Java.type(\"java.lang.String[]\"))(3);" + "t_string_arr[0] = 'abc';" + "t_string_arr[1] = '123';" + "t_string_arr[2] = 'xyzzzz';" + @@ -95,7 +95,7 @@ public class StringAccessTest { e.eval("var ps_string_array = SharedObject.publicStaticStringArray;"); assertEquals(SharedObject.publicStaticStringArray[0], e.eval("SharedObject.publicStaticStringArray[0]")); assertArrayEquals(SharedObject.publicStaticStringArray, (String[])e.get("ps_string_array")); - e.eval("var ts_string_arr = java.lang.reflect.Array.newInstance(java.lang.String.class, 3);" + + e.eval("var ts_string_arr = new (Java.type(\"java.lang.String[]\"))(3);" + "ts_string_arr[0] = 'abc';" + "ts_string_arr[1] = '123';" + "ts_string_arr[2] = 'xyzzzz';" + @@ -119,7 +119,7 @@ public class StringAccessTest { e.eval("var pf_string_array = o.publicFinalStringArray;"); assertEquals(o.publicFinalStringArray[0], e.eval("o.publicFinalStringArray[0]")); assertArrayEquals(o.publicFinalStringArray, (String[])e.get("pf_string_array")); - e.eval("var tf_string_arr = java.lang.reflect.Array.newInstance(java.lang.String.class, 3);" + + e.eval("var tf_string_arr = new (Java.type(\"java.lang.String[]\"))(3);" + "tf_string_arr[0] = 'abc';" + "tf_string_arr[1] = '123';" + "tf_string_arr[2] = 'xyzzzz';" + @@ -143,7 +143,7 @@ public class StringAccessTest { e.eval("var psf_string_array = SharedObject.publicStaticFinalStringArray;"); assertEquals(SharedObject.publicStaticFinalStringArray[0], e.eval("SharedObject.publicStaticFinalStringArray[0]")); assertArrayEquals(SharedObject.publicStaticFinalStringArray, (String[])e.get("psf_string_array")); - e.eval("var tsf_string_arr = java.lang.reflect.Array.newInstance(java.lang.String.class, 3);" + + e.eval("var tsf_string_arr = new (Java.type(\"java.lang.String[]\"))(3);" + "tsf_string_arr[0] = 'abc';" + "tsf_string_arr[1] = '123';" + "tsf_string_arr[2] = 'xyzzzz';" + From 3c5d7e26d15fce1d15407b9a7673f72ee2499bec Mon Sep 17 00:00:00 2001 From: Jason Uh Date: Thu, 18 Jul 2013 10:49:08 -0700 Subject: [PATCH 010/120] 8020426: Fix doclint accessibility issues in java.io Reviewed-by: mduigou, darcy, chegar --- jdk/src/share/classes/java/io/DataInput.java | 131 ++++++------------ jdk/src/share/classes/java/io/File.java | 2 +- .../classes/java/io/ObjectStreamField.java | 4 +- .../classes/java/io/RandomAccessFile.java | 2 +- 4 files changed, 48 insertions(+), 91 deletions(-) diff --git a/jdk/src/share/classes/java/io/DataInput.java b/jdk/src/share/classes/java/io/DataInput.java index 4dad59d55f3..58a3a2bfd3f 100644 --- a/jdk/src/share/classes/java/io/DataInput.java +++ b/jdk/src/share/classes/java/io/DataInput.java @@ -48,132 +48,87 @@ package java.io; * may be thrown if the input stream has been * closed. * - *

Modified UTF-8

+ *

Modified UTF-8

*

* Implementations of the DataInput and DataOutput interfaces represent * Unicode strings in a format that is a slight modification of UTF-8. * (For information regarding the standard UTF-8 format, see section * 3.9 Unicode Encoding Forms of The Unicode Standard, Version * 4.0). - * Note that in the following tables, the most significant bit appears in the + * Note that in the following table, the most significant bit appears in the * far left-hand column. - *

- * All characters in the range {@code '\u005Cu0001'} to - * {@code '\u005Cu007F'} are represented by a single byte: * *

- * * + * + * + * * - * + * * * * - * + * + * + * * - *
+ * All characters in the range {@code '\u005Cu0001'} to + * {@code '\u005Cu007F'} are represented by a single byte:
Bit ValuesBit Values
Byte 1 - * - * - * - *
0
- *
bits 6-0
- *
- *
0
+ *
bits 6-0
+ *
+ * The null character {@code '\u005Cu0000'} and characters + * in the range {@code '\u005Cu0080'} to {@code '\u005Cu07FF'} are + * represented by a pair of bytes:
- *
- * - *

- * The null character {@code '\u005Cu0000'} and characters in the - * range {@code '\u005Cu0080'} to {@code '\u005Cu07FF'} are - * represented by a pair of bytes: - * - *

- * * * - * + * * * * - * + * * * - * + * + * + * * - *
Bit ValuesBit Values
Byte 1 - * - * - * - *
1
- *
1
- *
0
- *
bits 10-6
- *
- *
1
+ *
1
+ *
0
+ *
bits 10-6
*
Byte 2 - * - * - * - *
1
- *
0
- *
bits 5-0
- *
- *
1
+ *
0
+ *
bits 5-0
+ *
+ * {@code char} values in the range {@code '\u005Cu0800'} + * to {@code '\u005CuFFFF'} are represented by three bytes:
- *
- * - *
- * {@code char} values in the range {@code '\u005Cu0800'} to - * {@code '\u005CuFFFF'} are represented by three bytes: - * - *
- * * * - * + * * * * - * + * * * - * + * * * - * + * *
Bit ValuesBit Values
Byte 1 - * - * - * - *
1
- *
1
- *
1
- *
0
- *
bits 15-12
- *
- *
1
+ *
1
+ *
1
+ *
0
+ *
bits 15-12
*
Byte 2 - * - * - * - *
1
- *
0
- *
bits 11-6
- *
- *
1
+ *
0
+ *
bits 11-6
*
Byte 3 - * - * - * - *
1
- *
0
- *
bits 5-0
- *
- *
1
+ *
0
+ *
bits 5-0
*
- *
- * + * *

* The differences between this format and the * standard UTF-8 format are the following: diff --git a/jdk/src/share/classes/java/io/File.java b/jdk/src/share/classes/java/io/File.java index 6bab9bb21fe..f11530d2f67 100644 --- a/jdk/src/share/classes/java/io/File.java +++ b/jdk/src/share/classes/java/io/File.java @@ -129,7 +129,7 @@ import sun.security.action.GetPropertyAction; * created, the abstract pathname represented by a File object * will never change. * - *

Interoperability with {@code java.nio.file} package

+ *

Interoperability with {@code java.nio.file} package

* *

The {@code java.nio.file} * package defines interfaces and classes for the Java virtual machine to access diff --git a/jdk/src/share/classes/java/io/ObjectStreamField.java b/jdk/src/share/classes/java/io/ObjectStreamField.java index ceae3fd188e..981e4ba8ca2 100644 --- a/jdk/src/share/classes/java/io/ObjectStreamField.java +++ b/jdk/src/share/classes/java/io/ObjectStreamField.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -240,6 +240,8 @@ public class ObjectStreamField * Returns boolean value indicating whether or not the serializable field * represented by this ObjectStreamField instance is unshared. * + * @return {@code true} if this field is unshared + * * @since 1.4 */ public boolean isUnshared() { diff --git a/jdk/src/share/classes/java/io/RandomAccessFile.java b/jdk/src/share/classes/java/io/RandomAccessFile.java index 5e32ad5dba1..440cd225c80 100644 --- a/jdk/src/share/classes/java/io/RandomAccessFile.java +++ b/jdk/src/share/classes/java/io/RandomAccessFile.java @@ -128,7 +128,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable { * meanings are: * * - * + * * * * * - * + * * * * @@ -126,10 +128,10 @@ import sun.util.logging.PlatformLogger; *

* Selecting the chronology from the locale uses {@link Chronology#ofLocale} * to find the Chronology based on Locale supported BCP 47 extension mechanism - * to request a specific calendar ("ca") and variant ("cv"). For example, + * to request a specific calendar ("ca"). For example, *

* 
- *      Locale locale = Locale.forLanguageTag("en-US-u-ca-islamic-cv-umalqura");
+ *      Locale locale = Locale.forLanguageTag("en-US-u-ca-islamic-umalqura");
  *      Chronology chrono = Chronology.ofLocale(locale);
  *
* @@ -472,11 +474,16 @@ public final class HijrahChronology extends Chronology implements Serializable { * @param prolepticYear the proleptic-year * @param dayOfYear the day-of-year * @return the Hijrah local date, not null - * @throws DateTimeException if unable to create the date + * @throws DateTimeException if the value of the year is out of range, + * or if the day-of-year is invalid for the year */ @Override public HijrahDate dateYearDay(int prolepticYear, int dayOfYear) { - return HijrahDate.of(this, prolepticYear, 1, 1).plusDays(dayOfYear - 1); // TODO better + HijrahDate date = HijrahDate.of(this, prolepticYear, 1, 1); + if (dayOfYear > date.lengthOfYear()) { + throw new DateTimeException("Invalid dayOfYear: " + dayOfYear); + } + return date.plusDays(dayOfYear - 1); } /** @@ -515,16 +522,19 @@ public final class HijrahChronology extends Chronology implements Serializable { } @Override + @SuppressWarnings("unchecked") public ChronoLocalDateTime localDateTime(TemporalAccessor temporal) { return (ChronoLocalDateTime) super.localDateTime(temporal); } @Override + @SuppressWarnings("unchecked") public ChronoZonedDateTime zonedDateTime(TemporalAccessor temporal) { return (ChronoZonedDateTime) super.zonedDateTime(temporal); } @Override + @SuppressWarnings("unchecked") public ChronoZonedDateTime zonedDateTime(Instant instant, ZoneId zone) { return (ChronoZonedDateTime) super.zonedDateTime(instant, zone); } @@ -550,7 +560,7 @@ public final class HijrahChronology extends Chronology implements Serializable { } @Override - public Era eraOf(int eraValue) { + public HijrahEra eraOf(int eraValue) { switch (eraValue) { case 1: return HijrahEra.AH; @@ -580,6 +590,8 @@ public final class HijrahChronology extends Chronology implements Serializable { case YEAR: case YEAR_OF_ERA: return ValueRange.of(getMinimumYear(), getMaximumYear()); + case ERA: + return ValueRange.of(1, 1); default: return field.range(); } @@ -587,6 +599,13 @@ public final class HijrahChronology extends Chronology implements Serializable { return field.range(); } + //----------------------------------------------------------------------- + @Override // override for return type + public HijrahDate resolveDate(Map fieldValues, ResolverStyle resolverStyle) { + return (HijrahDate) super.resolveDate(fieldValues, resolverStyle); + } + + //----------------------------------------------------------------------- /** * Check the validity of a year. * diff --git a/jdk/src/share/classes/java/time/chrono/HijrahDate.java b/jdk/src/share/classes/java/time/chrono/HijrahDate.java index 3c01e94b980..ef40b6dc948 100644 --- a/jdk/src/share/classes/java/time/chrono/HijrahDate.java +++ b/jdk/src/share/classes/java/time/chrono/HijrahDate.java @@ -109,7 +109,7 @@ import java.time.temporal.ValueRange; */ public final class HijrahDate extends ChronoDateImpl - implements ChronoLocalDate, Serializable { + implements ChronoLocalDate, Serializable { /** * Serialization version. @@ -204,7 +204,7 @@ public final class HijrahDate * @throws DateTimeException if the current date cannot be obtained */ public static HijrahDate now(Clock clock) { - return HijrahChronology.INSTANCE.date(LocalDate.now(clock)); + return HijrahDate.ofEpochDay(HijrahChronology.INSTANCE, LocalDate.now(clock).toEpochDay()); } /** @@ -349,7 +349,7 @@ public final class HijrahDate } return getChronology().range(f); } - throw new UnsupportedTemporalTypeException("Unsupported field: " + field.getName()); + throw new UnsupportedTemporalTypeException("Unsupported field: " + field); } return field.rangeRefinedBy(this); } @@ -372,7 +372,7 @@ public final class HijrahDate case YEAR: return prolepticYear; case ERA: return getEraValue(); } - throw new UnsupportedTemporalTypeException("Unsupported field: " + field.getName()); + throw new UnsupportedTemporalTypeException("Unsupported field: " + field); } return field.getFrom(this); } @@ -393,7 +393,7 @@ public final class HijrahDate case ALIGNED_DAY_OF_WEEK_IN_MONTH: return plusDays(newValue - getLong(ALIGNED_DAY_OF_WEEK_IN_MONTH)); case ALIGNED_DAY_OF_WEEK_IN_YEAR: return plusDays(newValue - getLong(ALIGNED_DAY_OF_WEEK_IN_YEAR)); case DAY_OF_MONTH: return resolvePreviousValid(prolepticYear, monthOfYear, nvalue); - case DAY_OF_YEAR: return resolvePreviousValid(prolepticYear, ((nvalue - 1) / 30) + 1, ((nvalue - 1) % 30) + 1); + case DAY_OF_YEAR: return plusDays(Math.min(nvalue, lengthOfYear()) - getDayOfYear()); case EPOCH_DAY: return new HijrahDate(chrono, newValue); case ALIGNED_WEEK_OF_MONTH: return plusDays((newValue - getLong(ALIGNED_WEEK_OF_MONTH)) * 7); case ALIGNED_WEEK_OF_YEAR: return plusDays((newValue - getLong(ALIGNED_WEEK_OF_YEAR)) * 7); @@ -403,9 +403,9 @@ public final class HijrahDate case YEAR: return resolvePreviousValid(nvalue, monthOfYear, dayOfMonth); case ERA: return resolvePreviousValid(1 - prolepticYear, monthOfYear, dayOfMonth); } - throw new UnsupportedTemporalTypeException("Unsupported field: " + field.getName()); + throw new UnsupportedTemporalTypeException("Unsupported field: " + field); } - return ChronoLocalDate.super.with(field, newValue); + return super.with(field, newValue); } private HijrahDate resolvePreviousValid(int prolepticYear, int month, int day) { @@ -479,7 +479,7 @@ public final class HijrahDate * @return the day-of-year */ private int getDayOfYear() { - return chrono.getDayOfYear(prolepticYear, monthOfYear); + return chrono.getDayOfYear(prolepticYear, monthOfYear) + dayOfMonth; } /** @@ -575,12 +575,13 @@ public final class HijrahDate } @Override // for javadoc and covariant return type + @SuppressWarnings("unchecked") public final ChronoLocalDateTime atTime(LocalTime localTime) { - return super.atTime(localTime); + return (ChronoLocalDateTime)super.atTime(localTime); } @Override - public Period periodUntil(ChronoLocalDate endDate) { + public Period until(ChronoLocalDate endDate) { // TODO: untested HijrahDate end = getChronology().date(endDate); long totalMonths = (end.prolepticYear - this.prolepticYear) * 12 + (end.monthOfYear - this.monthOfYear); // safe @@ -622,7 +623,7 @@ public final class HijrahDate return this; } - static ChronoLocalDate readExternal(ObjectInput in) throws IOException, ClassNotFoundException { + static HijrahDate readExternal(ObjectInput in) throws IOException, ClassNotFoundException { HijrahChronology chrono = (HijrahChronology) in.readObject(); int year = in.readInt(); int month = in.readByte(); diff --git a/jdk/src/share/classes/java/time/chrono/IsoChronology.java b/jdk/src/share/classes/java/time/chrono/IsoChronology.java index 66b0dc10d23..a2f6badeaa5 100644 --- a/jdk/src/share/classes/java/time/chrono/IsoChronology.java +++ b/jdk/src/share/classes/java/time/chrono/IsoChronology.java @@ -61,25 +61,16 @@ */ package java.time.chrono; -import static java.time.temporal.ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH; -import static java.time.temporal.ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR; -import static java.time.temporal.ChronoField.ALIGNED_WEEK_OF_MONTH; -import static java.time.temporal.ChronoField.ALIGNED_WEEK_OF_YEAR; import static java.time.temporal.ChronoField.DAY_OF_MONTH; -import static java.time.temporal.ChronoField.DAY_OF_WEEK; -import static java.time.temporal.ChronoField.DAY_OF_YEAR; -import static java.time.temporal.ChronoField.EPOCH_DAY; import static java.time.temporal.ChronoField.ERA; import static java.time.temporal.ChronoField.MONTH_OF_YEAR; import static java.time.temporal.ChronoField.PROLEPTIC_MONTH; import static java.time.temporal.ChronoField.YEAR; import static java.time.temporal.ChronoField.YEAR_OF_ERA; -import static java.time.temporal.TemporalAdjuster.nextOrSame; import java.io.Serializable; import java.time.Clock; import java.time.DateTimeException; -import java.time.DayOfWeek; import java.time.Instant; import java.time.LocalDate; import java.time.LocalDateTime; @@ -398,7 +389,7 @@ public final class IsoChronology extends Chronology implements Serializable { } @Override - public Era eraOf(int eraValue) { + public IsoEra eraOf(int eraValue) { return IsoEra.of(eraValue); } @@ -421,7 +412,7 @@ public final class IsoChronology extends Chronology implements Serializable { * as follows. *
    *
  • {@code EPOCH_DAY} - If present, this is converted to a {@code LocalDate} - * all other date fields are then cross-checked against the date + * and all other date fields are then cross-checked against the date. *
  • {@code PROLEPTIC_MONTH} - If present, then it is split into the * {@code YEAR} and {@code MONTH_OF_YEAR}. If the mode is strict or smart * then the field is validated. @@ -430,7 +421,7 @@ public final class IsoChronology extends Chronology implements Serializable { * range is not validated, in smart and strict mode it is. The {@code ERA} is * validated for range in all three modes. If only the {@code YEAR_OF_ERA} is * present, and the mode is smart or lenient, then the current era (CE/AD) - * is assumed. In strict mode, no ers is assumed and the {@code YEAR_OF_ERA} is + * is assumed. In strict mode, no era is assumed and the {@code YEAR_OF_ERA} is * left untouched. If only the {@code ERA} is present, then it is left untouched. *
  • {@code YEAR}, {@code MONTH_OF_YEAR} and {@code DAY_OF_MONTH} - * If all three are present, then they are combined to form a {@code LocalDate}. @@ -495,48 +486,11 @@ public final class IsoChronology extends Chronology implements Serializable { */ @Override // override for performance public LocalDate resolveDate(Map fieldValues, ResolverStyle resolverStyle) { - // check epoch-day before inventing era - if (fieldValues.containsKey(EPOCH_DAY)) { - return LocalDate.ofEpochDay(fieldValues.remove(EPOCH_DAY)); - } - - // fix proleptic month before inventing era - resolveProlepticMonth(fieldValues, resolverStyle); - - // invent era if necessary to resolve year-of-era - resolveYearOfEra(fieldValues, resolverStyle); - - // build date - if (fieldValues.containsKey(YEAR)) { - if (fieldValues.containsKey(MONTH_OF_YEAR)) { - if (fieldValues.containsKey(DAY_OF_MONTH)) { - return resolveYMD(fieldValues, resolverStyle); - } - if (fieldValues.containsKey(ALIGNED_WEEK_OF_MONTH)) { - if (fieldValues.containsKey(ALIGNED_DAY_OF_WEEK_IN_MONTH)) { - return resolveYMAA(fieldValues, resolverStyle); - } - if (fieldValues.containsKey(DAY_OF_WEEK)) { - return resolveYMAD(fieldValues, resolverStyle); - } - } - } - if (fieldValues.containsKey(DAY_OF_YEAR)) { - return resolveYD(fieldValues, resolverStyle); - } - if (fieldValues.containsKey(ALIGNED_WEEK_OF_YEAR)) { - if (fieldValues.containsKey(ALIGNED_DAY_OF_WEEK_IN_YEAR)) { - return resolveYAA(fieldValues, resolverStyle); - } - if (fieldValues.containsKey(DAY_OF_WEEK)) { - return resolveYAD(fieldValues, resolverStyle); - } - } - } - return null; + return (LocalDate) super.resolveDate(fieldValues, resolverStyle); } - private void resolveProlepticMonth(Map fieldValues, ResolverStyle resolverStyle) { + @Override // override for better proleptic algorithm + void resolveProlepticMonth(Map fieldValues, ResolverStyle resolverStyle) { Long pMonth = fieldValues.remove(PROLEPTIC_MONTH); if (pMonth != null) { if (resolverStyle != ResolverStyle.LENIENT) { @@ -547,7 +501,8 @@ public final class IsoChronology extends Chronology implements Serializable { } } - private void resolveYearOfEra(Map fieldValues, ResolverStyle resolverStyle) { + @Override // override for enhanced behaviour + LocalDate resolveYearOfEra(Map fieldValues, ResolverStyle resolverStyle) { Long yoeLong = fieldValues.remove(YEAR_OF_ERA); if (yoeLong != null) { if (resolverStyle != ResolverStyle.LENIENT) { @@ -575,10 +530,14 @@ public final class IsoChronology extends Chronology implements Serializable { } else { throw new DateTimeException("Invalid value for era: " + era); } + } else if (fieldValues.containsKey(ERA)) { + ERA.checkValidValue(fieldValues.get(ERA)); // always validated } + return null; } - private LocalDate resolveYMD(Map fieldValues, ResolverStyle resolverStyle) { + @Override // override for performance + LocalDate resolveYMD(Map fieldValues, ResolverStyle resolverStyle) { int y = YEAR.checkValidIntValue(fieldValues.remove(YEAR)); if (resolverStyle == ResolverStyle.LENIENT) { long months = Math.subtractExact(fieldValues.remove(MONTH_OF_YEAR), 1); @@ -598,96 +557,6 @@ public final class IsoChronology extends Chronology implements Serializable { return LocalDate.of(y, moy, dom); } - private LocalDate resolveYD(Map fieldValues, ResolverStyle resolverStyle) { - int y = YEAR.checkValidIntValue(fieldValues.remove(YEAR)); - if (resolverStyle == ResolverStyle.LENIENT) { - long days = Math.subtractExact(fieldValues.remove(DAY_OF_YEAR), 1); - return LocalDate.of(y, 1, 1).plusDays(days); - } - int doy = DAY_OF_YEAR.checkValidIntValue(fieldValues.remove(DAY_OF_YEAR)); - return LocalDate.ofYearDay(y, doy); // smart is same as strict - } - - private LocalDate resolveYMAA(Map fieldValues, ResolverStyle resolverStyle) { - int y = YEAR.checkValidIntValue(fieldValues.remove(YEAR)); - if (resolverStyle == ResolverStyle.LENIENT) { - long months = Math.subtractExact(fieldValues.remove(MONTH_OF_YEAR), 1); - long weeks = Math.subtractExact(fieldValues.remove(ALIGNED_WEEK_OF_MONTH), 1); - long days = Math.subtractExact(fieldValues.remove(ALIGNED_DAY_OF_WEEK_IN_MONTH), 1); - return LocalDate.of(y, 1, 1).plusMonths(months).plusWeeks(weeks).plusDays(days); - } - int moy = MONTH_OF_YEAR.checkValidIntValue(fieldValues.remove(MONTH_OF_YEAR)); - int aw = ALIGNED_WEEK_OF_MONTH.checkValidIntValue(fieldValues.remove(ALIGNED_WEEK_OF_MONTH)); - int ad = ALIGNED_DAY_OF_WEEK_IN_MONTH.checkValidIntValue(fieldValues.remove(ALIGNED_DAY_OF_WEEK_IN_MONTH)); - LocalDate date = LocalDate.of(y, moy, 1).plusDays((aw - 1) * 7 + (ad - 1)); - if (resolverStyle == ResolverStyle.STRICT && date.getMonthValue() != moy) { - throw new DateTimeException("Strict mode rejected resolved date as it is in a different month"); - } - return date; - } - - private LocalDate resolveYMAD(Map fieldValues, ResolverStyle resolverStyle) { - int y = YEAR.checkValidIntValue(fieldValues.remove(YEAR)); - if (resolverStyle == ResolverStyle.LENIENT) { - long months = Math.subtractExact(fieldValues.remove(MONTH_OF_YEAR), 1); - long weeks = Math.subtractExact(fieldValues.remove(ALIGNED_WEEK_OF_MONTH), 1); - long dow = Math.subtractExact(fieldValues.remove(DAY_OF_WEEK), 1); - return resolveAligned(y, months, weeks, dow); - } - int moy = MONTH_OF_YEAR.checkValidIntValue(fieldValues.remove(MONTH_OF_YEAR)); - int aw = ALIGNED_WEEK_OF_MONTH.checkValidIntValue(fieldValues.remove(ALIGNED_WEEK_OF_MONTH)); - int dow = DAY_OF_WEEK.checkValidIntValue(fieldValues.remove(DAY_OF_WEEK)); - LocalDate date = LocalDate.of(y, moy, 1).plusDays((aw - 1) * 7).with(nextOrSame(DayOfWeek.of(dow))); - if (resolverStyle == ResolverStyle.STRICT && date.getMonthValue() != moy) { - throw new DateTimeException("Strict mode rejected resolved date as it is in a different month"); - } - return date; - } - - private LocalDate resolveYAA(Map fieldValues, ResolverStyle resolverStyle) { - int y = YEAR.checkValidIntValue(fieldValues.remove(YEAR)); - if (resolverStyle == ResolverStyle.LENIENT) { - long weeks = Math.subtractExact(fieldValues.remove(ALIGNED_WEEK_OF_YEAR), 1); - long days = Math.subtractExact(fieldValues.remove(ALIGNED_DAY_OF_WEEK_IN_YEAR), 1); - return LocalDate.of(y, 1, 1).plusWeeks(weeks).plusDays(days); - } - int aw = ALIGNED_WEEK_OF_YEAR.checkValidIntValue(fieldValues.remove(ALIGNED_WEEK_OF_YEAR)); - int ad = ALIGNED_DAY_OF_WEEK_IN_YEAR.checkValidIntValue(fieldValues.remove(ALIGNED_DAY_OF_WEEK_IN_YEAR)); - LocalDate date = LocalDate.of(y, 1, 1).plusDays((aw - 1) * 7 + (ad - 1)); - if (resolverStyle == ResolverStyle.STRICT && date.getYear() != y) { - throw new DateTimeException("Strict mode rejected resolved date as it is in a different year"); - } - return date; - } - - private LocalDate resolveYAD(Map fieldValues, ResolverStyle resolverStyle) { - int y = YEAR.checkValidIntValue(fieldValues.remove(YEAR)); - if (resolverStyle == ResolverStyle.LENIENT) { - long weeks = Math.subtractExact(fieldValues.remove(ALIGNED_WEEK_OF_YEAR), 1); - long dow = Math.subtractExact(fieldValues.remove(DAY_OF_WEEK), 1); - return resolveAligned(y, 0, weeks, dow); - } - int aw = ALIGNED_WEEK_OF_YEAR.checkValidIntValue(fieldValues.remove(ALIGNED_WEEK_OF_YEAR)); - int dow = DAY_OF_WEEK.checkValidIntValue(fieldValues.remove(DAY_OF_WEEK)); - LocalDate date = LocalDate.of(y, 1, 1).plusDays((aw - 1) * 7).with(nextOrSame(DayOfWeek.of(dow))); - if (resolverStyle == ResolverStyle.STRICT && date.getYear() != y) { - throw new DateTimeException("Strict mode rejected resolved date as it is in a different year"); - } - return date; - } - - private LocalDate resolveAligned(int y, long months, long weeks, long dow) { - LocalDate date = LocalDate.of(y, 1, 1).plusMonths(months).plusWeeks(weeks); - if (dow > 7) { - date = date.plusWeeks((dow - 1) / 7); - dow = ((dow - 1) % 7) + 1; - } else if (dow < 1) { - date = date.plusWeeks(Math.subtractExact(dow, 7) / 7); - dow = ((dow + 6) % 7) + 1; - } - return date.with(nextOrSame(DayOfWeek.of((int) dow))); - } - //----------------------------------------------------------------------- @Override public ValueRange range(ChronoField field) { diff --git a/jdk/src/share/classes/java/time/chrono/JapaneseChronology.java b/jdk/src/share/classes/java/time/chrono/JapaneseChronology.java index 1aead71b8ad..68a12755ea3 100644 --- a/jdk/src/share/classes/java/time/chrono/JapaneseChronology.java +++ b/jdk/src/share/classes/java/time/chrono/JapaneseChronology.java @@ -56,6 +56,15 @@ */ package java.time.chrono; +import static java.time.temporal.ChronoField.DAY_OF_MONTH; +import static java.time.temporal.ChronoField.DAY_OF_YEAR; +import static java.time.temporal.ChronoField.ERA; +import static java.time.temporal.ChronoField.MONTH_OF_YEAR; +import static java.time.temporal.ChronoField.YEAR; +import static java.time.temporal.ChronoField.YEAR_OF_ERA; +import static java.time.temporal.ChronoUnit.DAYS; +import static java.time.temporal.ChronoUnit.MONTHS; + import java.io.Serializable; import java.time.Clock; import java.time.DateTimeException; @@ -63,13 +72,18 @@ import java.time.Instant; import java.time.LocalDate; import java.time.Year; import java.time.ZoneId; +import java.time.format.ResolverStyle; import java.time.temporal.ChronoField; import java.time.temporal.TemporalAccessor; +import java.time.temporal.TemporalAdjuster; +import java.time.temporal.TemporalField; +import java.time.temporal.UnsupportedTemporalTypeException; import java.time.temporal.ValueRange; import java.util.Arrays; import java.util.Calendar; import java.util.List; import java.util.Locale; +import java.util.Map; import sun.util.calendar.CalendarSystem; import sun.util.calendar.LocalGregorianCalendar; @@ -82,8 +96,22 @@ import sun.util.calendar.LocalGregorianCalendar; * The Japanese Imperial calendar system is the same as the ISO calendar system * apart from the era-based year numbering. *

    - * Only Meiji (1865-04-07 - 1868-09-07) and later eras are supported. - * Older eras are handled as an unknown era where the year-of-era is the ISO year. + * Japan introduced the Gregorian calendar starting with Meiji 6. + * Only Meiji and later eras are supported; + * dates before Meiji 6, January 1 are not supported. + *

    + * The supported {@code ChronoField} instances are: + *

      + *
    • {@code DAY_OF_WEEK} + *
    • {@code DAY_OF_MONTH} + *
    • {@code DAY_OF_YEAR} + *
    • {@code EPOCH_DAY} + *
    • {@code MONTH_OF_YEAR} + *
    • {@code PROLEPTIC_MONTH} + *
    • {@code YEAR_OF_ERA} + *
    • {@code YEAR} + *
    • {@code ERA} + *
    * * @implSpec * This class is immutable and thread-safe. @@ -91,7 +119,6 @@ import sun.util.calendar.LocalGregorianCalendar; * @since 1.8 */ public final class JapaneseChronology extends Chronology implements Serializable { - // TODO: definition for unknown era may break requirement that year-of-era >= 1 static final LocalGregorianCalendar JCAL = (LocalGregorianCalendar) CalendarSystem.forName("japanese"); @@ -152,6 +179,16 @@ public final class JapaneseChronology extends Chronology implements Serializable /** * Obtains a local date in Japanese calendar system from the * era, year-of-era, month-of-year and day-of-month fields. + *

    + * The Japanese month and day-of-month are the same as those in the + * ISO calendar system. They are not reset when the era changes. + * For example: + * 

    +     *  6th Jan Showa 64 = ISO 1989-01-06
+     *  7th Jan Showa 64 = ISO 1989-01-07
+     *  8th Jan Heisei 1 = ISO 1989-01-08
+     *  9th Jan Heisei 1 = ISO 1989-01-09
+     *
    * * @param era the Japanese era, not null * @param yearOfEra the year-of-era @@ -172,6 +209,9 @@ public final class JapaneseChronology extends Chronology implements Serializable /** * Obtains a local date in Japanese calendar system from the * proleptic-year, month-of-year and day-of-month fields. + *

    + * The Japanese proleptic year, month and day-of-month are the same as those + * in the ISO calendar system. They are not reset when the era changes. * * @param prolepticYear the proleptic-year * @param month the month-of-year @@ -187,6 +227,17 @@ public final class JapaneseChronology extends Chronology implements Serializable /** * Obtains a local date in Japanese calendar system from the * era, year-of-era and day-of-year fields. + *

    + * The day-of-year in this factory is expressed relative to the start of the year-of-era. + * This definition changes the normal meaning of day-of-year only in those years + * where the year-of-era is reset to one due to a change in the era. + * For example: + * 

    +     *  6th Jan Showa 64 = day-of-year 6
+     *  7th Jan Showa 64 = day-of-year 7
+     *  8th Jan Heisei 1 = day-of-year 1
+     *  9th Jan Heisei 1 = day-of-year 2
+     *
    * * @param era the Japanese era, not null * @param yearOfEra the year-of-era @@ -203,6 +254,10 @@ public final class JapaneseChronology extends Chronology implements Serializable /** * Obtains a local date in Japanese calendar system from the * proleptic-year and day-of-year fields. + *

    + * The day-of-year in this factory is expressed relative to the start of the proleptic year. + * The Japanese proleptic year and day-of-year are the same as those in the ISO calendar system. + * They are not reset when the era changes. * * @param prolepticYear the proleptic-year * @param dayOfYear the day-of-year @@ -211,8 +266,7 @@ public final class JapaneseChronology extends Chronology implements Serializable */ @Override public JapaneseDate dateYearDay(int prolepticYear, int dayOfYear) { - LocalDate date = LocalDate.ofYearDay(prolepticYear, dayOfYear); - return date(prolepticYear, date.getMonthValue(), date.getDayOfMonth()); + return new JapaneseDate(LocalDate.ofYearDay(prolepticYear, dayOfYear)); } /** @@ -290,15 +344,6 @@ public final class JapaneseChronology extends Chronology implements Serializable throw new ClassCastException("Era must be JapaneseEra"); } - if (era == JapaneseEra.SEIREKI) { - JapaneseEra nextEra = JapaneseEra.values()[1]; - int nextEraYear = nextEra.getPrivateEra().getSinceDate().getYear(); - if (yearOfEra >= nextEraYear || yearOfEra < Year.MIN_VALUE) { - throw new DateTimeException("Invalid yearOfEra value"); - } - return yearOfEra; - } - JapaneseEra jera = (JapaneseEra) era; int gregorianYear = jera.getPrivateEra().getSinceDate().getYear() + yearOfEra - 1; if (yearOfEra == 1) { @@ -320,14 +365,13 @@ public final class JapaneseChronology extends Chronology implements Serializable * See the description of each Era for the numeric values of: * {@link JapaneseEra#HEISEI}, {@link JapaneseEra#SHOWA},{@link JapaneseEra#TAISHO}, * {@link JapaneseEra#MEIJI}), only Meiji and later eras are supported. - * Prior to Meiji {@link JapaneseEra#SEIREKI} is used. * * @param eraValue the era value * @return the Japanese {@code Era} for the given numeric era value * @throws DateTimeException if {@code eraValue} is invalid */ @Override - public Era eraOf(int eraValue) { + public JapaneseEra eraOf(int eraValue) { return JapaneseEra.of(eraValue); } @@ -346,49 +390,117 @@ public final class JapaneseChronology extends Chronology implements Serializable @Override public ValueRange range(ChronoField field) { switch (field) { - case YEAR: - case DAY_OF_MONTH: - case DAY_OF_WEEK: - case MICRO_OF_DAY: - case MICRO_OF_SECOND: - case HOUR_OF_DAY: - case HOUR_OF_AMPM: - case MINUTE_OF_DAY: - case MINUTE_OF_HOUR: - case SECOND_OF_DAY: - case SECOND_OF_MINUTE: - case MILLI_OF_DAY: - case MILLI_OF_SECOND: - case NANO_OF_DAY: - case NANO_OF_SECOND: - case CLOCK_HOUR_OF_DAY: - case CLOCK_HOUR_OF_AMPM: - case EPOCH_DAY: - case PROLEPTIC_MONTH: - case MONTH_OF_YEAR: - return field.range(); - case ERA: - return ValueRange.of(JapaneseEra.SEIREKI.getValue(), - getCurrentEra().getValue()); - } - Calendar jcal = Calendar.getInstance(LOCALE); - int fieldIndex; - switch (field) { + case ALIGNED_DAY_OF_WEEK_IN_MONTH: + case ALIGNED_DAY_OF_WEEK_IN_YEAR: + case ALIGNED_WEEK_OF_MONTH: + case ALIGNED_WEEK_OF_YEAR: + throw new UnsupportedTemporalTypeException("Unsupported field: " + field); case YEAR_OF_ERA: { + Calendar jcal = Calendar.getInstance(LOCALE); int startYear = getCurrentEra().getPrivateEra().getSinceDate().getYear(); - return ValueRange.of(Year.MIN_VALUE, jcal.getGreatestMinimum(Calendar.YEAR), + return ValueRange.of(1, jcal.getGreatestMinimum(Calendar.YEAR), jcal.getLeastMaximum(Calendar.YEAR) + 1, // +1 due to the different definitions Year.MAX_VALUE - startYear); } - case DAY_OF_YEAR: - fieldIndex = Calendar.DAY_OF_YEAR; - break; + case DAY_OF_YEAR: { + Calendar jcal = Calendar.getInstance(LOCALE); + int fieldIndex = Calendar.DAY_OF_YEAR; + return ValueRange.of(jcal.getMinimum(fieldIndex), jcal.getGreatestMinimum(fieldIndex), + jcal.getLeastMaximum(fieldIndex), jcal.getMaximum(fieldIndex)); + } + case YEAR: + return ValueRange.of(JapaneseDate.MEIJI_6_ISODATE.getYear(), Year.MAX_VALUE); + case ERA: + return ValueRange.of(JapaneseEra.MEIJI.getValue(), getCurrentEra().getValue()); default: - // TODO: review the remaining fields - throw new UnsupportedOperationException("Unimplementable field: " + field); + return field.range(); } - return ValueRange.of(jcal.getMinimum(fieldIndex), jcal.getGreatestMinimum(fieldIndex), - jcal.getLeastMaximum(fieldIndex), jcal.getMaximum(fieldIndex)); + } + + //----------------------------------------------------------------------- + @Override // override for return type + public JapaneseDate resolveDate(Map fieldValues, ResolverStyle resolverStyle) { + return (JapaneseDate) super.resolveDate(fieldValues, resolverStyle); + } + + @Override // override for special Japanese behavior + ChronoLocalDate resolveYearOfEra(Map fieldValues, ResolverStyle resolverStyle) { + // validate era and year-of-era + Long eraLong = fieldValues.get(ERA); + JapaneseEra era = null; + if (eraLong != null) { + era = eraOf(range(ERA).checkValidIntValue(eraLong, ERA)); // always validated + } + Long yoeLong = fieldValues.get(YEAR_OF_ERA); + int yoe = 0; + if (yoeLong != null) { + yoe = range(YEAR_OF_ERA).checkValidIntValue(yoeLong, YEAR_OF_ERA); // always validated + } + // if only year-of-era and no year then invent era unless strict + if (era == null && yoeLong != null && fieldValues.containsKey(YEAR) == false && resolverStyle != ResolverStyle.STRICT) { + era = JapaneseEra.values()[JapaneseEra.values().length - 1]; + } + // if both present, then try to create date + if (yoeLong != null && era != null) { + if (fieldValues.containsKey(MONTH_OF_YEAR)) { + if (fieldValues.containsKey(DAY_OF_MONTH)) { + return resolveYMD(era, yoe, fieldValues, resolverStyle); + } + } + if (fieldValues.containsKey(DAY_OF_YEAR)) { + return resolveYD(era, yoe, fieldValues, resolverStyle); + } + } + return null; + } + + private int prolepticYearLenient(JapaneseEra era, int yearOfEra) { + return era.getPrivateEra().getSinceDate().getYear() + yearOfEra - 1; + } + + private ChronoLocalDate resolveYMD(JapaneseEra era, int yoe, Map fieldValues, ResolverStyle resolverStyle) { + fieldValues.remove(ERA); + fieldValues.remove(YEAR_OF_ERA); + if (resolverStyle == ResolverStyle.LENIENT) { + int y = prolepticYearLenient(era, yoe); + long months = Math.subtractExact(fieldValues.remove(MONTH_OF_YEAR), 1); + long days = Math.subtractExact(fieldValues.remove(DAY_OF_MONTH), 1); + return date(y, 1, 1).plus(months, MONTHS).plus(days, DAYS); + } + int moy = range(MONTH_OF_YEAR).checkValidIntValue(fieldValues.remove(MONTH_OF_YEAR), MONTH_OF_YEAR); + int dom = range(DAY_OF_MONTH).checkValidIntValue(fieldValues.remove(DAY_OF_MONTH), DAY_OF_MONTH); + if (resolverStyle == ResolverStyle.SMART) { // previous valid + if (yoe < 1) { + throw new DateTimeException("Invalid YearOfEra: " + yoe); + } + int y = prolepticYearLenient(era, yoe); + JapaneseDate result; + try { + result = date(y, moy, dom); + } catch (DateTimeException ex) { + result = date(y, moy, 1).with(TemporalAdjuster.lastDayOfMonth()); + } + // handle the era being changed + // only allow if the new date is in the same Jan-Dec as the era change + // determine by ensuring either original yoe or result yoe is 1 + if (result.getEra() != era && result.get(YEAR_OF_ERA) > 1 && yoe > 1) { + throw new DateTimeException("Invalid YearOfEra for Era: " + era + " " + yoe); + } + return result; + } + return date(era, yoe, moy, dom); + } + + private ChronoLocalDate resolveYD(JapaneseEra era, int yoe, Map fieldValues, ResolverStyle resolverStyle) { + fieldValues.remove(ERA); + fieldValues.remove(YEAR_OF_ERA); + if (resolverStyle == ResolverStyle.LENIENT) { + int y = prolepticYearLenient(era, yoe); + long days = Math.subtractExact(fieldValues.remove(DAY_OF_YEAR), 1); + return dateYearDay(y, 1).plus(days, DAYS); + } + int doy = range(DAY_OF_YEAR).checkValidIntValue(fieldValues.remove(DAY_OF_YEAR), DAY_OF_YEAR); + return dateYearDay(era, yoe, doy); // smart is same as strict } } diff --git a/jdk/src/share/classes/java/time/chrono/JapaneseDate.java b/jdk/src/share/classes/java/time/chrono/JapaneseDate.java index 646315b3d80..e49a8f33c75 100644 --- a/jdk/src/share/classes/java/time/chrono/JapaneseDate.java +++ b/jdk/src/share/classes/java/time/chrono/JapaneseDate.java @@ -56,9 +56,15 @@ */ package java.time.chrono; +import static java.time.temporal.ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH; +import static java.time.temporal.ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR; +import static java.time.temporal.ChronoField.ALIGNED_WEEK_OF_MONTH; +import static java.time.temporal.ChronoField.ALIGNED_WEEK_OF_YEAR; import static java.time.temporal.ChronoField.DAY_OF_MONTH; +import static java.time.temporal.ChronoField.DAY_OF_YEAR; import static java.time.temporal.ChronoField.MONTH_OF_YEAR; import static java.time.temporal.ChronoField.YEAR; +import static java.time.temporal.ChronoField.YEAR_OF_ERA; import java.io.DataInput; import java.io.DataOutput; @@ -96,6 +102,10 @@ import sun.util.calendar.LocalGregorianCalendar; * apart from the era-based year numbering. The proleptic-year is defined to be * equal to the ISO proleptic-year. *

    + * Japan introduced the Gregorian calendar starting with Meiji 6. + * Only Meiji and later eras are supported; + * dates before Meiji 6, January 1 are not supported. + *

    * For example, the Japanese year "Heisei 24" corresponds to ISO year "2012".
    * Calling {@code japaneseDate.get(YEAR_OF_ERA)} will return 24.
    * Calling {@code japaneseDate.get(YEAR)} will return 2012.
    @@ -109,7 +119,7 @@ import sun.util.calendar.LocalGregorianCalendar; */ public final class JapaneseDate extends ChronoDateImpl - implements ChronoLocalDate, Serializable { + implements ChronoLocalDate, Serializable { /** * Serialization version. @@ -129,6 +139,11 @@ public final class JapaneseDate */ private transient int yearOfEra; + /** + * The first day supported by the JapaneseChronology is Meiji 6, January 1st. + */ + final static LocalDate MEIJI_6_ISODATE = LocalDate.of(1873, 1, 1); + //----------------------------------------------------------------------- /** * Obtains the current {@code JapaneseDate} from the system clock in the default time-zone. @@ -173,7 +188,7 @@ public final class JapaneseDate * @throws DateTimeException if the current date cannot be obtained */ public static JapaneseDate now(Clock clock) { - return JapaneseChronology.INSTANCE.date(LocalDate.now(clock)); + return new JapaneseDate(LocalDate.now(clock)); } /** @@ -182,6 +197,16 @@ public final class JapaneseDate *

    * This returns a {@code JapaneseDate} with the specified fields. * The day must be valid for the year and month, otherwise an exception will be thrown. + *

    + * The Japanese month and day-of-month are the same as those in the + * ISO calendar system. They are not reset when the era changes. + * For example: + * 

    +     *  6th Jan Showa 64 = ISO 1989-01-06
+     *  7th Jan Showa 64 = ISO 1989-01-07
+     *  8th Jan Heisei 1 = ISO 1989-01-08
+     *  9th Jan Heisei 1 = ISO 1989-01-09
+     *
    * * @param era the Japanese era, not null * @param yearOfEra the Japanese year-of-era @@ -192,11 +217,15 @@ public final class JapaneseDate * or if the day-of-month is invalid for the month-year, * or if the date is not a Japanese era */ - public static JapaneseDate of(Era era, int yearOfEra, int month, int dayOfMonth) { - if (era instanceof JapaneseEra == false) { - throw new ClassCastException("Era must be JapaneseEra"); + public static JapaneseDate of(JapaneseEra era, int yearOfEra, int month, int dayOfMonth) { + Objects.requireNonNull(era, "era"); + LocalGregorianCalendar.Date jdate = JapaneseChronology.JCAL.newCalendarDate(null); + jdate.setEra(era.getPrivateEra()).setDate(yearOfEra, month, dayOfMonth); + if (!JapaneseChronology.JCAL.validate(jdate)) { + throw new DateTimeException("year, month, and day not valid for Era"); } - return JapaneseDate.of((JapaneseEra) era, yearOfEra, month, dayOfMonth); + LocalDate date = LocalDate.of(jdate.getNormalizedYear(), month, dayOfMonth); + return new JapaneseDate(era, yearOfEra, date); } /** @@ -205,6 +234,9 @@ public final class JapaneseDate *

    * This returns a {@code JapaneseDate} with the specified fields. * The day must be valid for the year and month, otherwise an exception will be thrown. + *

    + * The Japanese proleptic year, month and day-of-month are the same as those + * in the ISO calendar system. They are not reset when the era changes. * * @param prolepticYear the Japanese proleptic-year * @param month the Japanese month-of-year, from 1 to 12 @@ -219,23 +251,31 @@ public final class JapaneseDate /** * Obtains a {@code JapaneseDate} representing a date in the Japanese calendar - * system from the proleptic-year and day-of-year fields. + * system from the era, year-of-era and day-of-year fields. *

    * This returns a {@code JapaneseDate} with the specified fields. * The day must be valid for the year, otherwise an exception will be thrown. + *

    + * The day-of-year in this factory is expressed relative to the start of the year-of-era. + * This definition changes the normal meaning of day-of-year only in those years + * where the year-of-era is reset to one due to a change in the era. + * For example: + * 

    +     *  6th Jan Showa 64 = day-of-year 6
+     *  7th Jan Showa 64 = day-of-year 7
+     *  8th Jan Heisei 1 = day-of-year 1
+     *  9th Jan Heisei 1 = day-of-year 2
+     *
    * - * @param prolepticYear the chronology proleptic-year + * @param era the Japanese era, not null + * @param yearOfEra the Japanese year-of-era * @param dayOfYear the chronology day-of-year, from 1 to 366 * @return the date in Japanese calendar system, not null * @throws DateTimeException if the value of any field is out of range, * or if the day-of-year is invalid for the year */ - public static JapaneseDate ofYearDay(int prolepticYear, int dayOfYear) { - LocalDate date = LocalDate.ofYearDay(prolepticYear, dayOfYear); - return of(prolepticYear, date.getMonthValue(), date.getDayOfMonth()); - } - static JapaneseDate ofYearDay(JapaneseEra era, int yearOfEra, int dayOfYear) { + Objects.requireNonNull(era, "era"); CalendarDate firstDay = era.getPrivateEra().getSinceDate(); LocalGregorianCalendar.Date jdate = JapaneseChronology.JCAL.newCalendarDate(null); jdate.setEra(era.getPrivateEra()); @@ -253,32 +293,6 @@ public final class JapaneseDate return new JapaneseDate(era, yearOfEra, localdate); } - /** - * Obtains a {@code JapaneseDate} representing a date in the Japanese calendar - * system from the era, year-of-era, month-of-year and day-of-month fields. - *

    - * This returns a {@code JapaneseDate} with the specified fields. - * The day must be valid for the year and month, otherwise an exception will be thrown. - * - * @param era the Japanese era, not null - * @param yearOfEra the Japanese year-of-era - * @param month the Japanese month-of-year, from 1 to 12 - * @param dayOfMonth the Japanese day-of-month, from 1 to 31 - * @return the date in Japanese calendar system, not null - * @throws DateTimeException if the value of any field is out of range, - * or if the day-of-month is invalid for the month-year - */ - static JapaneseDate of(JapaneseEra era, int yearOfEra, int month, int dayOfMonth) { - Objects.requireNonNull(era, "era"); - LocalGregorianCalendar.Date jdate = JapaneseChronology.JCAL.newCalendarDate(null); - jdate.setEra(era.getPrivateEra()).setDate(yearOfEra, month, dayOfMonth); - if (!JapaneseChronology.JCAL.validate(jdate)) { - throw new DateTimeException("year, month, and day not valid for Era"); - } - LocalDate date = LocalDate.of(jdate.getNormalizedYear(), month, dayOfMonth); - return new JapaneseDate(era, yearOfEra, date); - } - /** * Obtains a {@code JapaneseDate} from a temporal object. *

    @@ -307,6 +321,9 @@ public final class JapaneseDate * @param isoDate the standard local date, validated not null */ JapaneseDate(LocalDate isoDate) { + if (isoDate.isBefore(MEIJI_6_ISODATE)) { + throw new DateTimeException("JapaneseDate before Meiji 6 is not supported"); + } LocalGregorianCalendar.Date jdate = toPrivateJapaneseDate(isoDate); this.era = JapaneseEra.toJapaneseEra(jdate.getEra()); this.yearOfEra = jdate.getYear(); @@ -322,6 +339,9 @@ public final class JapaneseDate * @param isoDate the standard local date, validated not null */ JapaneseDate(JapaneseEra era, int year, LocalDate isoDate) { + if (isoDate.isBefore(MEIJI_6_ISODATE)) { + throw new DateTimeException("JapaneseDate before Meiji 6 is not supported"); + } this.era = era; this.yearOfEra = year; this.isoDate = isoDate; @@ -366,55 +386,99 @@ public final class JapaneseDate return isoDate.lengthOfMonth(); } + @Override + public int lengthOfYear() { + Calendar jcal = Calendar.getInstance(JapaneseChronology.LOCALE); + jcal.set(Calendar.ERA, era.getValue() + JapaneseEra.ERA_OFFSET); + jcal.set(yearOfEra, isoDate.getMonthValue() - 1, isoDate.getDayOfMonth()); + return jcal.getActualMaximum(Calendar.DAY_OF_YEAR); + } + //----------------------------------------------------------------------- + /** + * Checks if the specified field is supported. + *

    + * This checks if this date can be queried for the specified field. + * If false, then calling the {@link #range(TemporalField) range} and + * {@link #get(TemporalField) get} methods will throw an exception. + *

    + * If the field is a {@link ChronoField} then the query is implemented here. + * The supported fields are: + *

      + *
    • {@code DAY_OF_WEEK} + *
    • {@code DAY_OF_MONTH} + *
    • {@code DAY_OF_YEAR} + *
    • {@code EPOCH_DAY} + *
    • {@code MONTH_OF_YEAR} + *
    • {@code PROLEPTIC_MONTH} + *
    • {@code YEAR_OF_ERA} + *
    • {@code YEAR} + *
    • {@code ERA} + *
    + * All other {@code ChronoField} instances will return false. + *

    + * If the field is not a {@code ChronoField}, then the result of this method + * is obtained by invoking {@code TemporalField.isSupportedBy(TemporalAccessor)} + * passing {@code this} as the argument. + * Whether the field is supported is determined by the field. + * + * @param field the field to check, null returns false + * @return true if the field is supported on this date, false if not + */ + @Override + public boolean isSupported(TemporalField field) { + if (field == ALIGNED_DAY_OF_WEEK_IN_MONTH || field == ALIGNED_DAY_OF_WEEK_IN_YEAR || + field == ALIGNED_WEEK_OF_MONTH || field == ALIGNED_WEEK_OF_YEAR) { + return false; + } + return ChronoLocalDate.super.isSupported(field); + } + @Override public ValueRange range(TemporalField field) { if (field instanceof ChronoField) { if (isSupported(field)) { ChronoField f = (ChronoField) field; switch (f) { - case DAY_OF_MONTH: - case ALIGNED_WEEK_OF_MONTH: - return isoDate.range(field); - case DAY_OF_YEAR: - return actualRange(Calendar.DAY_OF_YEAR); - case YEAR_OF_ERA: - return actualRange(Calendar.YEAR); + case DAY_OF_MONTH: return ValueRange.of(1, lengthOfMonth()); + case DAY_OF_YEAR: return ValueRange.of(1, lengthOfYear()); + case YEAR_OF_ERA: { + Calendar jcal = Calendar.getInstance(JapaneseChronology.LOCALE); + jcal.set(Calendar.ERA, era.getValue() + JapaneseEra.ERA_OFFSET); + jcal.set(yearOfEra, isoDate.getMonthValue() - 1, isoDate.getDayOfMonth()); + return ValueRange.of(1, jcal.getActualMaximum(Calendar.YEAR)); + } } return getChronology().range(f); } - throw new UnsupportedTemporalTypeException("Unsupported field: " + field.getName()); + throw new UnsupportedTemporalTypeException("Unsupported field: " + field); } return field.rangeRefinedBy(this); } - private ValueRange actualRange(int calendarField) { - Calendar jcal = Calendar.getInstance(JapaneseChronology.LOCALE); - jcal.set(Calendar.ERA, era.getValue() + JapaneseEra.ERA_OFFSET); // TODO: cannot calculate this way for SEIREKI - jcal.set(yearOfEra, isoDate.getMonthValue() - 1, isoDate.getDayOfMonth()); - return ValueRange.of(jcal.getActualMinimum(calendarField), - jcal.getActualMaximum(calendarField)); - } - @Override public long getLong(TemporalField field) { if (field instanceof ChronoField) { // same as ISO: - // DAY_OF_WEEK, ALIGNED_DAY_OF_WEEK_IN_MONTH, DAY_OF_MONTH, EPOCH_DAY, - // ALIGNED_WEEK_OF_MONTH, MONTH_OF_YEAR, PROLEPTIC_MONTH, YEAR + // DAY_OF_WEEK, DAY_OF_MONTH, EPOCH_DAY, MONTH_OF_YEAR, PROLEPTIC_MONTH, YEAR // // calendar specific fields - // ALIGNED_DAY_OF_WEEK_IN_YEAR, DAY_OF_YEAR, ALIGNED_WEEK_OF_YEAR, YEAR_OF_ERA, ERA + // DAY_OF_YEAR, YEAR_OF_ERA, ERA switch ((ChronoField) field) { + case ALIGNED_DAY_OF_WEEK_IN_MONTH: + case ALIGNED_DAY_OF_WEEK_IN_YEAR: + case ALIGNED_WEEK_OF_MONTH: + case ALIGNED_WEEK_OF_YEAR: + throw new UnsupportedTemporalTypeException("Unsupported field: " + field); case YEAR_OF_ERA: return yearOfEra; case ERA: return era.getValue(); - case DAY_OF_YEAR: { - LocalGregorianCalendar.Date jdate = toPrivateJapaneseDate(isoDate); - return JapaneseChronology.JCAL.getDayOfYear(jdate); - } - // TODO: ALIGNED_DAY_OF_WEEK_IN_YEAR and ALIGNED_WEEK_OF_YEAR ??? + case DAY_OF_YEAR: + Calendar jcal = Calendar.getInstance(JapaneseChronology.LOCALE); + jcal.set(Calendar.ERA, era.getValue() + JapaneseEra.ERA_OFFSET); + jcal.set(yearOfEra, isoDate.getMonthValue() - 1, isoDate.getDayOfMonth()); + return jcal.get(Calendar.DAY_OF_YEAR); } return isoDate.getLong(field); } @@ -444,7 +508,7 @@ public final class JapaneseDate public JapaneseDate with(TemporalField field, long newValue) { if (field instanceof ChronoField) { ChronoField f = (ChronoField) field; - if (getLong(f) == newValue) { + if (getLong(f) == newValue) { // getLong() validates for supported fields return this; } switch (f) { @@ -464,10 +528,9 @@ public final class JapaneseDate } } // YEAR, PROLEPTIC_MONTH and others are same as ISO - // TODO: review other fields, such as WEEK_OF_YEAR return with(isoDate.with(field, newValue)); } - return ChronoLocalDate.super.with(field, newValue); + return super.with(field, newValue); } /** @@ -592,13 +655,14 @@ public final class JapaneseDate } @Override // for javadoc and covariant return type + @SuppressWarnings("unchecked") public final ChronoLocalDateTime atTime(LocalTime localTime) { - return super.atTime(localTime); + return (ChronoLocalDateTime)super.atTime(localTime); } @Override - public Period periodUntil(ChronoLocalDate endDate) { - return isoDate.periodUntil(endDate); + public Period until(ChronoLocalDate endDate) { + return isoDate.until(endDate); } @Override // override for performance @@ -624,14 +688,6 @@ public final class JapaneseDate return getChronology().getId().hashCode() ^ isoDate.hashCode(); } - @Override - public String toString() { - if (era == JapaneseEra.SEIREKI) { - return getChronology().getId() + " " + isoDate.toString(); - } - return super.toString(); - } - //----------------------------------------------------------------------- private Object writeReplace() { return new Ser(Ser.JAPANESE_DATE_TYPE, this); diff --git a/jdk/src/share/classes/java/time/chrono/JapaneseEra.java b/jdk/src/share/classes/java/time/chrono/JapaneseEra.java index 17635793b08..ba9fb434bf9 100644 --- a/jdk/src/share/classes/java/time/chrono/JapaneseEra.java +++ b/jdk/src/share/classes/java/time/chrono/JapaneseEra.java @@ -61,6 +61,7 @@ */ package java.time.chrono; +import static java.time.chrono.JapaneseDate.MEIJI_6_ISODATE; import static java.time.temporal.ChronoField.ERA; import java.io.DataInput; @@ -84,12 +85,9 @@ import sun.util.calendar.CalendarDate; * An era in the Japanese Imperial calendar system. *

    * This class defines the valid eras for the Japanese chronology. - * Only Meiji (1868-09-08 - 1912-07-29) and later eras are supported. - * Japan introduced the Gregorian calendar since Meiji 6. The dates - * between Meiji 1 - 5 are not historically correct. - * The older eras are recognized as Seireki (Western calendar) era, - * and the year of era of Seireki is proleptic Gregorian year. - * (The Julian to Gregorian transition is not supported.) + * Japan introduced the Gregorian calendar starting with Meiji 6. + * Only Meiji and later eras are supported; + * dates before Meiji 6, January 1 are not supported. * * @implSpec * This class is immutable and thread-safe. @@ -100,16 +98,11 @@ public final class JapaneseEra implements Era, Serializable { // The offset value to 0-based index from the era value. - // i.e., getValue() + ERA_OFFSET == 0-based index; except that -999 is mapped to zero + // i.e., getValue() + ERA_OFFSET == 0-based index static final int ERA_OFFSET = 2; static final sun.util.calendar.Era[] ERA_CONFIG; - /** - * The singleton instance for the before Meiji era ( - 1868-09-07) - * which has the value -999. - */ - public static final JapaneseEra SEIREKI = new JapaneseEra(-999, LocalDate.MIN); /** * The singleton instance for the 'Meiji' era (1868-09-08 - 1912-07-29) * which has the value -1. @@ -144,17 +137,13 @@ public final class JapaneseEra private static final JapaneseEra[] KNOWN_ERAS; static { - sun.util.calendar.Era[] sunEras = JapaneseChronology.JCAL.getEras(); - ERA_CONFIG = new sun.util.calendar.Era[sunEras.length + 1]; - for (int i = 1; i < ERA_CONFIG.length; i++) { - ERA_CONFIG[i] = sunEras[i - 1]; - } + ERA_CONFIG = JapaneseChronology.JCAL.getEras(); + KNOWN_ERAS = new JapaneseEra[ERA_CONFIG.length]; - KNOWN_ERAS[0] = SEIREKI; - KNOWN_ERAS[1] = MEIJI; - KNOWN_ERAS[2] = TAISHO; - KNOWN_ERAS[3] = SHOWA; - KNOWN_ERAS[4] = HEISEI; + KNOWN_ERAS[0] = MEIJI; + KNOWN_ERAS[1] = TAISHO; + KNOWN_ERAS[2] = SHOWA; + KNOWN_ERAS[3] = HEISEI; for (int i = N_ERA_CONSTANTS; i < ERA_CONFIG.length; i++) { CalendarDate date = ERA_CONFIG[i].getSinceDate(); LocalDate isoDate = LocalDate.of(date.getYear(), date.getMonth(), date.getDayOfMonth()); @@ -203,10 +192,8 @@ public final class JapaneseEra //----------------------------------------------------------------------- /** * Returns the Sun private Era instance corresponding to this {@code JapaneseEra}. - * SEIREKI doesn't have its corresponding one. * - * @return the Sun private Era instance for this {@code JapaneseEra}, - * or null for SEIREKI. + * @return the Sun private Era instance for this {@code JapaneseEra}. */ sun.util.calendar.Era getPrivateEra() { return ERA_CONFIG[ordinal(eraValue)]; @@ -218,16 +205,14 @@ public final class JapaneseEra *

    * The {@link #SHOWA} era that contains 1970-01-01 (ISO calendar system) has the value 1 * Later era is numbered 2 ({@link #HEISEI}). Earlier eras are numbered 0 ({@link #TAISHO}), - * -1 ({@link #MEIJI}), only Meiji and later eras are supported. The prior to Meiji, - * {@link #SEIREKI} is used. + * -1 ({@link #MEIJI}), only Meiji and later eras are supported. * * @param japaneseEra the era to represent * @return the {@code JapaneseEra} singleton, not null * @throws DateTimeException if the value is invalid */ public static JapaneseEra of(int japaneseEra) { - if (japaneseEra != SEIREKI.eraValue && - (japaneseEra < MEIJI.eraValue || japaneseEra > HEISEI.eraValue)) { + if (japaneseEra < MEIJI.eraValue || japaneseEra > HEISEI.eraValue) { throw new DateTimeException("Invalid era: " + japaneseEra); } return KNOWN_ERAS[ordinal(japaneseEra)]; @@ -276,22 +261,25 @@ public final class JapaneseEra * @return the Era singleton, never null */ static JapaneseEra from(LocalDate date) { + if (date.isBefore(MEIJI_6_ISODATE)) { + throw new DateTimeException("JapaneseDate before Meiji 6 are not supported"); + } for (int i = KNOWN_ERAS.length - 1; i > 0; i--) { JapaneseEra era = KNOWN_ERAS[i]; if (date.compareTo(era.since) >= 0) { return era; } } - return SEIREKI; + return null; } static JapaneseEra toJapaneseEra(sun.util.calendar.Era privateEra) { - for (int i = ERA_CONFIG.length - 1; i > 0; i--) { + for (int i = ERA_CONFIG.length - 1; i >= 0; i--) { if (ERA_CONFIG[i].equals(privateEra)) { return KNOWN_ERAS[i]; } } - return SEIREKI; + return null; } static sun.util.calendar.Era privateEraFrom(LocalDate isoDate) { @@ -306,13 +294,13 @@ public final class JapaneseEra /** * Returns the index into the arrays from the Era value. - * the eraValue is a valid Era number, -999, -1..2. + * the eraValue is a valid Era number, -1..2. * * @param eraValue the era value to convert to the index * @return the index of the current Era */ private static int ordinal(int eraValue) { - return (eraValue == SEIREKI.eraValue) ? 0 : eraValue + ERA_OFFSET; + return eraValue + ERA_OFFSET - 1; } //----------------------------------------------------------------------- @@ -321,7 +309,7 @@ public final class JapaneseEra *

    * The {@link #SHOWA} era that contains 1970-01-01 (ISO calendar system) has the value 1. * Later eras are numbered from 2 ({@link #HEISEI}). - * Earlier eras are numbered 0 ({@link #TAISHO}), -1 ({@link #MEIJI}), and -999 ({@link #SEIREKI}). + * Earlier eras are numbered 0 ({@link #TAISHO}), -1 ({@link #MEIJI})). * * @return the era value */ @@ -374,11 +362,7 @@ public final class JapaneseEra } String getName() { - int index = ordinal(getValue()); - if (index == 0) { - return "Seireki"; - } - return ERA_CONFIG[index].getName(); + return ERA_CONFIG[ordinal(getValue())].getName(); } @Override diff --git a/jdk/src/share/classes/java/time/chrono/MinguoChronology.java b/jdk/src/share/classes/java/time/chrono/MinguoChronology.java index 1c9c2e34c16..088588004c3 100644 --- a/jdk/src/share/classes/java/time/chrono/MinguoChronology.java +++ b/jdk/src/share/classes/java/time/chrono/MinguoChronology.java @@ -65,12 +65,15 @@ import java.time.DateTimeException; import java.time.Instant; import java.time.LocalDate; import java.time.ZoneId; +import java.time.format.ResolverStyle; import java.time.temporal.ChronoField; import java.time.temporal.TemporalAccessor; +import java.time.temporal.TemporalField; import java.time.temporal.ValueRange; import java.util.Arrays; import java.util.List; import java.util.Locale; +import java.util.Map; /** * The Minguo calendar system. @@ -253,16 +256,19 @@ public final class MinguoChronology extends Chronology implements Serializable { } @Override + @SuppressWarnings("unchecked") public ChronoLocalDateTime localDateTime(TemporalAccessor temporal) { return (ChronoLocalDateTime)super.localDateTime(temporal); } @Override + @SuppressWarnings("unchecked") public ChronoZonedDateTime zonedDateTime(TemporalAccessor temporal) { return (ChronoZonedDateTime)super.zonedDateTime(temporal); } @Override + @SuppressWarnings("unchecked") public ChronoZonedDateTime zonedDateTime(Instant instant, ZoneId zone) { return (ChronoZonedDateTime)super.zonedDateTime(instant, zone); } @@ -292,7 +298,7 @@ public final class MinguoChronology extends Chronology implements Serializable { } @Override - public Era eraOf(int eraValue) { + public MinguoEra eraOf(int eraValue) { return MinguoEra.of(eraValue); } @@ -321,4 +327,10 @@ public final class MinguoChronology extends Chronology implements Serializable { return field.range(); } + //----------------------------------------------------------------------- + @Override // override for return type + public MinguoDate resolveDate(Map fieldValues, ResolverStyle resolverStyle) { + return (MinguoDate) super.resolveDate(fieldValues, resolverStyle); + } + } diff --git a/jdk/src/share/classes/java/time/chrono/MinguoDate.java b/jdk/src/share/classes/java/time/chrono/MinguoDate.java index b6a5582ef98..e15b0e90a15 100644 --- a/jdk/src/share/classes/java/time/chrono/MinguoDate.java +++ b/jdk/src/share/classes/java/time/chrono/MinguoDate.java @@ -96,7 +96,7 @@ import java.util.Objects; */ public final class MinguoDate extends ChronoDateImpl - implements ChronoLocalDate, Serializable { + implements ChronoLocalDate, Serializable { /** * Serialization version. @@ -152,7 +152,7 @@ public final class MinguoDate * @throws DateTimeException if the current date cannot be obtained */ public static MinguoDate now(Clock clock) { - return MinguoChronology.INSTANCE.date(LocalDate.now(clock)); + return new MinguoDate(LocalDate.now(clock)); } /** @@ -264,7 +264,7 @@ public final class MinguoDate } return getChronology().range(f); } - throw new UnsupportedTemporalTypeException("Unsupported field: " + field.getName()); + throw new UnsupportedTemporalTypeException("Unsupported field: " + field); } return field.rangeRefinedBy(this); } @@ -325,7 +325,7 @@ public final class MinguoDate } return with(isoDate.with(field, newValue)); } - return ChronoLocalDate.super.with(field, newValue); + return super.with(field, newValue); } /** @@ -369,6 +369,11 @@ public final class MinguoDate return with(isoDate.plusMonths(months)); } + @Override + MinguoDate plusWeeks(long weeksToAdd) { + return super.plusWeeks(weeksToAdd); + } + @Override MinguoDate plusDays(long days) { return with(isoDate.plusDays(days)); @@ -384,11 +389,6 @@ public final class MinguoDate return super.minus(amountToAdd, unit); } - @Override - MinguoDate plusWeeks(long weeksToAdd) { - return super.plusWeeks(weeksToAdd); - } - @Override MinguoDate minusYears(long yearsToSubtract) { return super.minusYears(yearsToSubtract); @@ -414,13 +414,14 @@ public final class MinguoDate } @Override // for javadoc and covariant return type + @SuppressWarnings("unchecked") public final ChronoLocalDateTime atTime(LocalTime localTime) { - return super.atTime(localTime); + return (ChronoLocalDateTime)super.atTime(localTime); } @Override - public Period periodUntil(ChronoLocalDate endDate) { - return isoDate.periodUntil(endDate); + public Period until(ChronoLocalDate endDate) { + return isoDate.until(endDate); } @Override // override for performance @@ -458,7 +459,7 @@ public final class MinguoDate out.writeByte(get(DAY_OF_MONTH)); } - static ChronoLocalDate readExternal(DataInput in) throws IOException { + static MinguoDate readExternal(DataInput in) throws IOException { int year = in.readInt(); int month = in.readByte(); int dayOfMonth = in.readByte(); diff --git a/jdk/src/share/classes/java/time/chrono/ThaiBuddhistChronology.java b/jdk/src/share/classes/java/time/chrono/ThaiBuddhistChronology.java index 27c98a6f079..04f59ceb93c 100644 --- a/jdk/src/share/classes/java/time/chrono/ThaiBuddhistChronology.java +++ b/jdk/src/share/classes/java/time/chrono/ThaiBuddhistChronology.java @@ -65,13 +65,16 @@ import java.time.DateTimeException; import java.time.Instant; import java.time.LocalDate; import java.time.ZoneId; +import java.time.format.ResolverStyle; import java.time.temporal.ChronoField; import java.time.temporal.TemporalAccessor; +import java.time.temporal.TemporalField; import java.time.temporal.ValueRange; import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Locale; +import java.util.Map; /** * The Thai Buddhist calendar system. @@ -289,16 +292,19 @@ public final class ThaiBuddhistChronology extends Chronology implements Serializ } @Override + @SuppressWarnings("unchecked") public ChronoLocalDateTime localDateTime(TemporalAccessor temporal) { return (ChronoLocalDateTime)super.localDateTime(temporal); } @Override + @SuppressWarnings("unchecked") public ChronoZonedDateTime zonedDateTime(TemporalAccessor temporal) { return (ChronoZonedDateTime)super.zonedDateTime(temporal); } @Override + @SuppressWarnings("unchecked") public ChronoZonedDateTime zonedDateTime(Instant instant, ZoneId zone) { return (ChronoZonedDateTime)super.zonedDateTime(instant, zone); } @@ -328,7 +334,7 @@ public final class ThaiBuddhistChronology extends Chronology implements Serializ } @Override - public Era eraOf(int eraValue) { + public ThaiBuddhistEra eraOf(int eraValue) { return ThaiBuddhistEra.of(eraValue); } @@ -357,4 +363,10 @@ public final class ThaiBuddhistChronology extends Chronology implements Serializ return field.range(); } + //----------------------------------------------------------------------- + @Override // override for return type + public ThaiBuddhistDate resolveDate(Map fieldValues, ResolverStyle resolverStyle) { + return (ThaiBuddhistDate) super.resolveDate(fieldValues, resolverStyle); + } + } diff --git a/jdk/src/share/classes/java/time/chrono/ThaiBuddhistDate.java b/jdk/src/share/classes/java/time/chrono/ThaiBuddhistDate.java index 973c7b8ab0f..67799ad5af8 100644 --- a/jdk/src/share/classes/java/time/chrono/ThaiBuddhistDate.java +++ b/jdk/src/share/classes/java/time/chrono/ThaiBuddhistDate.java @@ -96,7 +96,7 @@ import java.util.Objects; */ public final class ThaiBuddhistDate extends ChronoDateImpl - implements ChronoLocalDate, Serializable { + implements ChronoLocalDate, Serializable { /** * Serialization version. @@ -152,7 +152,7 @@ public final class ThaiBuddhistDate * @throws DateTimeException if the current date cannot be obtained */ public static ThaiBuddhistDate now(Clock clock) { - return ThaiBuddhistChronology.INSTANCE.date(LocalDate.now(clock)); + return new ThaiBuddhistDate(LocalDate.now(clock)); } /** @@ -264,7 +264,7 @@ public final class ThaiBuddhistDate } return getChronology().range(f); } - throw new UnsupportedTemporalTypeException("Unsupported field: " + field.getName()); + throw new UnsupportedTemporalTypeException("Unsupported field: " + field); } return field.rangeRefinedBy(this); } @@ -325,7 +325,7 @@ public final class ThaiBuddhistDate } return with(isoDate.with(field, newValue)); } - return ChronoLocalDate.super.with(field, newValue); + return super.with(field, newValue); } /** @@ -414,13 +414,14 @@ public final class ThaiBuddhistDate } @Override // for javadoc and covariant return type + @SuppressWarnings("unchecked") public final ChronoLocalDateTime atTime(LocalTime localTime) { - return super.atTime(localTime); + return (ChronoLocalDateTime) super.atTime(localTime); } @Override - public Period periodUntil(ChronoLocalDate endDate) { - return isoDate.periodUntil(endDate); + public Period until(ChronoLocalDate endDate) { + return isoDate.until(endDate); } @Override // override for performance diff --git a/jdk/src/share/classes/java/time/chrono/package-info.java b/jdk/src/share/classes/java/time/chrono/package-info.java index 4f2a3f6e78c..9273a770f82 100644 --- a/jdk/src/share/classes/java/time/chrono/package-info.java +++ b/jdk/src/share/classes/java/time/chrono/package-info.java @@ -103,7 +103,7 @@ * // Enumerate the list of available calendars and print todays date for each. * Set<Chronology> chronos = Chronology.getAvailableChronologies(); * for (Chronology chrono : chronos) { - * ChronoLocalDate<?> date = chrono.dateNow(); + * ChronoLocalDate date = chrono.dateNow(); * System.out.printf(" %20s: %s%n", chrono.getId(), date.toString()); * } * @@ -113,7 +113,7 @@ *

    * 
      *   // Print the Thai Buddhist date
- *       ChronoLocalDate<?> now1 = Chronology.of("ThaiBuddhist").dateNow();
+ *       ChronoLocalDate now1 = Chronology.of("ThaiBuddhist").dateNow();
  *       int day = now1.get(ChronoField.DAY_OF_MONTH);
  *       int dow = now1.get(ChronoField.DAY_OF_WEEK);
  *       int month = now1.get(ChronoField.MONTH_OF_YEAR);
@@ -121,10 +121,10 @@
  *       System.out.printf("  Today is %s %s %d-%s-%d%n", now1.getChronology().getId(),
  *                 dow, day, month, year);
  *   // Print today's date and the last day of the year for the Thai Buddhist Calendar.
- *       ChronoLocalDate<?> first = now1
+ *       ChronoLocalDate first = now1
  *                 .with(ChronoField.DAY_OF_MONTH, 1)
  *                 .with(ChronoField.MONTH_OF_YEAR, 1);
- *       ChronoLocalDate<?> last = first
+ *       ChronoLocalDate last = first
  *                 .plus(1, ChronoUnit.YEARS)
  *                 .minus(1, ChronoUnit.DAYS);
  *       System.out.printf("  %s: 1st of year: %s; end of year: %s%n", last.getChronology().getId(),
diff --git a/jdk/src/share/classes/java/time/format/DateTimeFormatter.java b/jdk/src/share/classes/java/time/format/DateTimeFormatter.java
index 2552f96e5ad..0c0a5979b14 100644
--- a/jdk/src/share/classes/java/time/format/DateTimeFormatter.java
+++ b/jdk/src/share/classes/java/time/format/DateTimeFormatter.java
@@ -265,7 +265,7 @@ import java.util.Set;
  * 
    
  * For example:
  * 
    - *  DateTimeFormatter formatter = DateTimeFormatter.pattern("yyyy MM dd");
+ *  DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy MM dd");
  *  String text = date.toString(formatter);
  *  LocalDate date = LocalDate.parse(text, formatter);
  * 
    
@@ -460,7 +460,7 @@ import java.util.Set;
  * 
  • The {@code ChronoField} time fields are resolved.
  * This is documented on {@link ChronoField} and is the same for all chronologies.
  * 
  • Any fields that are not {@code ChronoField} are processed.
- * This is achieved using {@link TemporalField#resolve(TemporalAccessor, long, ResolverStyle)}.
+ * This is achieved using {@link TemporalField#resolve(Map, Chronology, ZoneId, ResolverStyle)}.
  * Documentation about field resolution is located in the implementation
  * of {@code TemporalField}.
  * 
  • The {@code ChronoField} date and time fields are re-resolved.
diff --git a/jdk/src/share/classes/java/time/format/DateTimeFormatterBuilder.java b/jdk/src/share/classes/java/time/format/DateTimeFormatterBuilder.java
index cec07840439..f4983b48861 100644
--- a/jdk/src/share/classes/java/time/format/DateTimeFormatterBuilder.java
+++ b/jdk/src/share/classes/java/time/format/DateTimeFormatterBuilder.java
@@ -77,7 +77,6 @@ import java.math.BigInteger;
 import java.math.RoundingMode;
 import java.text.ParsePosition;
 import java.time.DateTimeException;
-import java.time.Duration;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -962,12 +961,9 @@ public final class DateTimeFormatterBuilder {
      * 
          *   "Europe/London"           -- ZoneId.of("Europe/London")
      *   "Z"                       -- ZoneOffset.UTC
-     *   "UT"                      -- ZoneOffset.UTC
-     *   "UTC"                     -- ZoneOffset.UTC
-     *   "GMT"                     -- ZoneOffset.UTC
-     *   "UT0"                     -- ZoneOffset.UTC
-     *   "UTC0"                    -- ZoneOffset.UTC
-     *   "GMT0"                    -- ZoneOffset.UTC
+     *   "UT"                      -- ZoneId.of("UT")
+     *   "UTC"                     -- ZoneId.of("UTC")
+     *   "GMT"                     -- ZoneId.of("GMT")
      *   "+01:30"                  -- ZoneOffset.of("+01:30")
      *   "UT+01:30"                -- ZoneOffset.of("+01:30")
      *   "UTC+01:30"               -- ZoneOffset.of("+01:30")
@@ -1016,12 +1012,9 @@ public final class DateTimeFormatterBuilder {
      * 
          *   "Europe/London"           -- ZoneId.of("Europe/London")
      *   "Z"                       -- ZoneOffset.UTC
-     *   "UT"                      -- ZoneOffset.UTC
-     *   "UTC"                     -- ZoneOffset.UTC
-     *   "GMT"                     -- ZoneOffset.UTC
-     *   "UT0"                     -- ZoneOffset.UTC
-     *   "UTC0"                    -- ZoneOffset.UTC
-     *   "GMT0"                    -- ZoneOffset.UTC
+     *   "UT"                      -- ZoneId.of("UT")
+     *   "UTC"                     -- ZoneId.of("UTC")
+     *   "GMT"                     -- ZoneId.of("GMT")
      *   "+01:30"                  -- ZoneOffset.of("+01:30")
      *   "UT+01:30"                -- ZoneOffset.of("+01:30")
      *   "UTC+01:30"               -- ZoneOffset.of("+01:30")
@@ -1077,16 +1070,13 @@ public final class DateTimeFormatterBuilder {
      * 
          *   "Europe/London"           -- ZoneId.of("Europe/London")
      *   "Z"                       -- ZoneOffset.UTC
-     *   "UT"                      -- ZoneOffset.UTC
-     *   "UTC"                     -- ZoneOffset.UTC
-     *   "GMT"                     -- ZoneOffset.UTC
-     *   "UT0"                     -- ZoneOffset.UTC
-     *   "UTC0"                    -- ZoneOffset.UTC
-     *   "GMT0"                    -- ZoneOffset.UTC
+     *   "UT"                      -- ZoneId.of("UT")
+     *   "UTC"                     -- ZoneId.of("UTC")
+     *   "GMT"                     -- ZoneId.of("GMT")
      *   "+01:30"                  -- ZoneOffset.of("+01:30")
-     *   "UT+01:30"                -- ZoneOffset.of("+01:30")
-     *   "UTC+01:30"               -- ZoneOffset.of("+01:30")
-     *   "GMT+01:30"               -- ZoneOffset.of("+01:30")
+     *   "UT+01:30"                -- ZoneOffset.of("UT+01:30")
+     *   "UTC+01:30"               -- ZoneOffset.of("UTC+01:30")
+     *   "GMT+01:30"               -- ZoneOffset.of("GMT+01:30")
      * 
    
      * 
    
      * Note that this method is is identical to {@code appendZoneId()} except
@@ -2530,7 +2520,7 @@ public final class DateTimeFormatterBuilder {
             DecimalStyle decimalStyle = context.getDecimalStyle();
             String str = (value == Long.MIN_VALUE ? "9223372036854775808" : Long.toString(Math.abs(value)));
             if (str.length() > maxWidth) {
-                throw new DateTimeException("Field " + field.getName() +
+                throw new DateTimeException("Field " + field +
                     " cannot be printed as the value " + value +
                     " exceeds the maximum print width of " + maxWidth);
             }
@@ -2555,7 +2545,7 @@ public final class DateTimeFormatterBuilder {
                         buf.append(decimalStyle.getNegativeSign());
                         break;
                     case NOT_NEGATIVE:
-                        throw new DateTimeException("Field " + field.getName() +
+                        throw new DateTimeException("Field " + field +
                             " cannot be printed as the value " + value +
                             " cannot be negative according to the SignStyle");
                 }
@@ -2699,12 +2689,12 @@ public final class DateTimeFormatterBuilder {
         @Override
         public String toString() {
             if (minWidth == 1 && maxWidth == 19 && signStyle == SignStyle.NORMAL) {
-                return "Value(" + field.getName() + ")";
+                return "Value(" + field + ")";
             }
             if (minWidth == maxWidth && signStyle == SignStyle.NOT_NEGATIVE) {
-                return "Value(" + field.getName() + "," + minWidth + ")";
+                return "Value(" + field + "," + minWidth + ")";
             }
-            return "Value(" + field.getName() + "," + minWidth + "," + maxWidth + "," + signStyle + ")";
+            return "Value(" + field + "," + minWidth + "," + maxWidth + "," + signStyle + ")";
         }
     }
 
@@ -2817,7 +2807,7 @@ public final class DateTimeFormatterBuilder {
 
         @Override
         public String toString() {
-            return "ReducedValue(" + field.getName() + "," + minWidth + "," + maxWidth + "," + baseValue + ")";
+            return "ReducedValue(" + field + "," + minWidth + "," + maxWidth + "," + baseValue + ")";
         }
     }
 
@@ -2842,7 +2832,7 @@ public final class DateTimeFormatterBuilder {
         FractionPrinterParser(TemporalField field, int minWidth, int maxWidth, boolean decimalPoint) {
             Objects.requireNonNull(field, "field");
             if (field.range().isFixed() == false) {
-                throw new IllegalArgumentException("Field must have a fixed set of values: " + field.getName());
+                throw new IllegalArgumentException("Field must have a fixed set of values: " + field);
             }
             if (minWidth < 0 || minWidth > 9) {
                 throw new IllegalArgumentException("Minimum width must be from 0 to 9 inclusive but was " + minWidth);
@@ -2984,7 +2974,7 @@ public final class DateTimeFormatterBuilder {
         @Override
         public String toString() {
             String decimal = (decimalPoint ? ",DecimalPoint" : "");
-            return "Fraction(" + field.getName() + "," + minWidth + "," + maxWidth + decimal + ")";
+            return "Fraction(" + field + "," + minWidth + "," + maxWidth + decimal + ")";
         }
     }
 
@@ -3079,9 +3069,9 @@ public final class DateTimeFormatterBuilder {
         @Override
         public String toString() {
             if (textStyle == TextStyle.FULL) {
-                return "Text(" + field.getName() + ")";
+                return "Text(" + field + ")";
             }
-            return "Text(" + field.getName() + "," + textStyle + ")";
+            return "Text(" + field + "," + textStyle + ")";
         }
     }
 
@@ -3756,17 +3746,17 @@ public final class DateTimeFormatterBuilder {
             // handle fixed time-zone IDs
             char nextChar = text.charAt(position);
             if (nextChar == '+' || nextChar == '-') {
-                return parseOffsetBased(context, text, position, OffsetIdPrinterParser.INSTANCE_ID_Z);
+                return parseOffsetBased(context, text, position, position, OffsetIdPrinterParser.INSTANCE_ID_Z);
             } else if (length >= position + 2) {
                 char nextNextChar = text.charAt(position + 1);
                 if (context.charEquals(nextChar, 'U') && context.charEquals(nextNextChar, 'T')) {
                     if (length >= position + 3 && context.charEquals(text.charAt(position + 2), 'C')) {
-                        return parseOffsetBased(context, text, position + 3, OffsetIdPrinterParser.INSTANCE_ID_ZERO);
+                        return parseOffsetBased(context, text, position, position + 3, OffsetIdPrinterParser.INSTANCE_ID_ZERO);
                     }
-                    return parseOffsetBased(context, text, position + 2, OffsetIdPrinterParser.INSTANCE_ID_ZERO);
+                    return parseOffsetBased(context, text, position, position + 2, OffsetIdPrinterParser.INSTANCE_ID_ZERO);
                 } else if (context.charEquals(nextChar, 'G') && length >= position + 3 &&
                         context.charEquals(nextNextChar, 'M') && context.charEquals(text.charAt(position + 2), 'T')) {
-                    return parseOffsetBased(context, text, position + 3, OffsetIdPrinterParser.INSTANCE_ID_ZERO);
+                    return parseOffsetBased(context, text, position, position + 3, OffsetIdPrinterParser.INSTANCE_ID_ZERO);
                 }
             }
 
@@ -3785,20 +3775,49 @@ public final class DateTimeFormatterBuilder {
             return ppos.getIndex();
         }
 
-        private int parseOffsetBased(DateTimeParseContext context, CharSequence text, int position, OffsetIdPrinterParser parser) {
-            DateTimeParseContext newContext = context.copy();
-            int endPos = parser.parse(newContext, text, position);
-            if (endPos < 0) {
-                if (parser == OffsetIdPrinterParser.INSTANCE_ID_Z) {
-                    return ~position;
-                }
-                context.setParsed(ZoneOffset.UTC);
+        /**
+         * Parse an offset following a prefix and set the ZoneId if it is valid.
+         * To matching the parsing of ZoneId.of the values are not normalized
+         * to ZoneOffsets.
+         *
+         * @param context the parse context
+         * @param text the input text
+         * @param prefixPos start of the prefix
+         * @param position start of text after the prefix
+         * @param parser parser for the value after the prefix
+         * @return the position after the parse
+         */
+        private int parseOffsetBased(DateTimeParseContext context, CharSequence text, int prefixPos, int position, OffsetIdPrinterParser parser) {
+            String prefix = text.toString().substring(prefixPos, position).toUpperCase();
+            if (position >= text.length()) {
+                context.setParsed(ZoneId.of(prefix));
                 return position;
             }
-            int offset = (int) newContext.getParsed(OFFSET_SECONDS).longValue();
-            ZoneId zone = ZoneOffset.ofTotalSeconds(offset);
-            context.setParsed(zone);
-            return endPos;
+
+            // '0' or 'Z' after prefix is not part of a valid ZoneId; use bare prefix
+            if (text.charAt(position) == '0' ||
+                context.charEquals(text.charAt(position), 'Z')) {
+                context.setParsed(ZoneId.of(prefix));
+                return position;
+            }
+
+            DateTimeParseContext newContext = context.copy();
+            int endPos = parser.parse(newContext, text, position);
+            try {
+                if (endPos < 0) {
+                    if (parser == OffsetIdPrinterParser.INSTANCE_ID_Z) {
+                        return ~prefixPos;
+                    }
+                    context.setParsed(ZoneId.of(prefix));
+                    return position;
+                }
+                int offset = (int) newContext.getParsed(OFFSET_SECONDS).longValue();
+                ZoneOffset zoneOffset = ZoneOffset.ofTotalSeconds(offset);
+                context.setParsed(ZoneId.ofOffset(prefix, zoneOffset));
+                return endPos;
+            } catch (DateTimeException dte) {
+                return ~prefixPos;
+            }
         }
 
         @Override
diff --git a/jdk/src/share/classes/java/time/format/DateTimePrintContext.java b/jdk/src/share/classes/java/time/format/DateTimePrintContext.java
index 3e3f90fb5eb..e744bb7d946 100644
--- a/jdk/src/share/classes/java/time/format/DateTimePrintContext.java
+++ b/jdk/src/share/classes/java/time/format/DateTimePrintContext.java
@@ -157,7 +157,7 @@ final class DateTimePrintContext {
             }
         }
         final ZoneId effectiveZone = (overrideZone != null ? overrideZone : temporalZone);
-        final ChronoLocalDate effectiveDate;
+        final ChronoLocalDate effectiveDate;
         if (overrideChrono != null) {
             if (temporal.isSupported(EPOCH_DAY)) {
                 effectiveDate = effectiveChrono.date(temporal);
diff --git a/jdk/src/share/classes/java/time/format/Parsed.java b/jdk/src/share/classes/java/time/format/Parsed.java
index b0a7fe810d9..42223d6c1d9 100644
--- a/jdk/src/share/classes/java/time/format/Parsed.java
+++ b/jdk/src/share/classes/java/time/format/Parsed.java
@@ -143,7 +143,7 @@ final class Parsed implements TemporalAccessor {
     /**
      * The resolved date.
      */
-    private ChronoLocalDate date;
+    private ChronoLocalDate date;
     /**
      * The resolved time.
      */
@@ -197,7 +197,7 @@ final class Parsed implements TemporalAccessor {
             return time.getLong(field);
         }
         if (field instanceof ChronoField) {
-            throw new UnsupportedTemporalTypeException("Unsupported field: " + field.getName());
+            throw new UnsupportedTemporalTypeException("Unsupported field: " + field);
         }
         return field.getFrom(this);
     }
@@ -255,42 +255,34 @@ final class Parsed implements TemporalAccessor {
         // if any other fields, handle them
         // any lenient date resolution should return epoch-day
         if (fieldValues.size() > 0) {
-            boolean changed = false;
+            int changedCount = 0;
             outer:
-            while (true) {
+            while (changedCount < 50) {
                 for (Map.Entry entry : fieldValues.entrySet()) {
                     TemporalField targetField = entry.getKey();
-                    Map changes = targetField.resolve(this, entry.getValue(), resolverStyle);
-                    if (changes != null) {
-                        changed = true;
-                        resolveFieldsMakeChanges(targetField, changes);
-                        fieldValues.remove(targetField);  // helps avoid infinite loops
+                    ChronoLocalDate resolvedDate = targetField.resolve(fieldValues, chrono, zone, resolverStyle);
+                    if (resolvedDate != null) {
+                        updateCheckConflict(resolvedDate);
+                        changedCount++;
+                        continue outer;  // have to restart to avoid concurrent modification
+                    } else if (fieldValues.containsKey(targetField) == false) {
+                        changedCount++;
                         continue outer;  // have to restart to avoid concurrent modification
                     }
                 }
                 break;
             }
+            if (changedCount == 50) {  // catch infinite loops
+                throw new DateTimeException("One of the parsed fields has an incorrectly implemented resolve method");
+            }
             // if something changed then have to redo ChronoField resolve
-            if (changed) {
+            if (changedCount > 0) {
                 resolveDateFields();
                 resolveTimeFields();
             }
         }
     }
 
-    private void resolveFieldsMakeChanges(TemporalField targetField, Map changes) {
-        for (Map.Entry change : changes.entrySet()) {
-            TemporalField changeField = change.getKey();
-            Long changeValue = change.getValue();
-            Objects.requireNonNull(changeField, "changeField");
-            if (changeValue != null) {
-                updateCheckConflict(targetField, changeField, changeValue);
-            } else {
-                fieldValues.remove(changeField);
-            }
-        }
-    }
-
     private void updateCheckConflict(TemporalField targetField, TemporalField changeField, Long changeValue) {
         Long old = fieldValues.put(changeField, changeValue);
         if (old != null && old.longValue() != changeValue.longValue()) {
@@ -305,7 +297,7 @@ final class Parsed implements TemporalAccessor {
         updateCheckConflict(chrono.resolveDate(fieldValues, resolverStyle));
     }
 
-    private void updateCheckConflict(ChronoLocalDate cld) {
+    private void updateCheckConflict(ChronoLocalDate cld) {
         if (date != null) {
             if (cld != null && date.equals(cld) == false) {
                 throw new DateTimeException("Conflict found: Fields resolved to two different dates: " + date + " " + cld);
diff --git a/jdk/src/share/classes/java/time/temporal/ChronoField.java b/jdk/src/share/classes/java/time/temporal/ChronoField.java
index ac4522bb60b..fe3254e60ab 100644
--- a/jdk/src/share/classes/java/time/temporal/ChronoField.java
+++ b/jdk/src/share/classes/java/time/temporal/ChronoField.java
@@ -403,6 +403,12 @@ public enum ChronoField implements TemporalField {
      * Non-ISO calendar systems should implement this field using the most recognized
      * day-of-year values for users of the calendar system.
      * Normally, this is a count of days from 1 to the length of the year.
+     * 
    
+     * Note that a non-ISO calendar system may have year numbering system that changes
+     * at a different point to the natural reset in the month numbering. An example
+     * of this is the Japanese calendar system where a change of era, which resets
+     * the year number to 1, can happen on any date. The era and year reset also cause
+     * the day-of-year to be reset to 1, but not the month-of-year or day-of-month.
      */
     DAY_OF_YEAR("DayOfYear", DAYS, YEARS, ValueRange.of(1, 365, 366)),
     /**
@@ -559,12 +565,11 @@ public enum ChronoField implements TemporalField {
      * 
    
      * This represents the concept of the sequential count of seconds where
      * 1970-01-01T00:00Z (ISO) is zero.
-     * This field may be used with {@link #NANO_OF_DAY} to represent the fraction of the day.
+     * This field may be used with {@link #NANO_OF_SECOND} to represent the fraction of the second.
      * 
    
      * An {@link Instant} represents an instantaneous point on the time-line.
-     * On their own they have no elements which allow a local date-time to be obtained.
-     * Only when paired with an offset or time-zone can the local date or time be found.
-     * This field allows the seconds part of the instant to be queried.
+     * On their own, an instant has insufficient information to allow a local date-time to be obtained.
+     * Only when paired with an offset or time-zone can the local date or time be calculated.
      * 
    
      * This field is strictly defined to have the same meaning in all calendar systems.
      * This is necessary to ensure interoperation between calendars.
@@ -608,24 +613,18 @@ public enum ChronoField implements TemporalField {
         this.displayNameKey = displayNameKey;
     }
 
-    //-----------------------------------------------------------------------
-    @Override
-    public String getName() {
-        return name;
-    }
-
     @Override
     public String getDisplayName(Locale locale) {
         Objects.requireNonNull(locale, "locale");
         if (displayNameKey == null) {
-            return getName();
+            return name;
         }
 
         LocaleResources lr = LocaleProviderAdapter.getResourceBundleBased()
                                     .getLocaleResources(locale);
         ResourceBundle rb = lr.getJavaTimeFormatData();
         String key = "field." + displayNameKey;
-        return rb.containsKey(key) ? rb.getString(key) : getName();
+        return rb.containsKey(key) ? rb.getString(key) : name;
     }
 
     @Override
@@ -748,7 +747,7 @@ public enum ChronoField implements TemporalField {
     //-----------------------------------------------------------------------
     @Override
     public String toString() {
-        return getName();
+        return name;
     }
 
 }
diff --git a/jdk/src/share/classes/java/time/temporal/ChronoUnit.java b/jdk/src/share/classes/java/time/temporal/ChronoUnit.java
index 661960c28fb..19a37e46f4c 100644
--- a/jdk/src/share/classes/java/time/temporal/ChronoUnit.java
+++ b/jdk/src/share/classes/java/time/temporal/ChronoUnit.java
@@ -57,9 +57,6 @@
 package java.time.temporal;
 
 import java.time.Duration;
-import java.time.chrono.ChronoLocalDate;
-import java.time.chrono.ChronoLocalDateTime;
-import java.time.chrono.ChronoZonedDateTime;
 
 /**
  * A standard set of date periods units.
@@ -200,12 +197,6 @@ public enum ChronoUnit implements TemporalUnit {
         this.duration = estimatedDuration;
     }
 
-    //-----------------------------------------------------------------------
-    @Override
-    public String getName() {
-        return name;
-    }
-
     //-----------------------------------------------------------------------
     /**
      * Gets the estimated duration of this unit in the ISO calendar system.
@@ -233,41 +224,40 @@ public enum ChronoUnit implements TemporalUnit {
      */
     @Override
     public boolean isDurationEstimated() {
-        return isDateUnit();
+        return this.compareTo(DAYS) >= 0;
     }
 
     //-----------------------------------------------------------------------
     /**
      * Checks if this unit is a date unit.
+     * 
    
+     * All units from days to eras inclusive are date-based.
+     * Time-based units and {@code FOREVER} return false.
      *
      * @return true if a date unit, false if a time unit
      */
-    public boolean isDateUnit() {
-        return this.compareTo(DAYS) >= 0;
+    @Override
+    public boolean isDateBased() {
+        return this.compareTo(DAYS) >= 0 && this != FOREVER;
     }
 
     /**
      * Checks if this unit is a time unit.
+     * 
    
+     * All units from nanos to half-days inclusive are time-based.
+     * Date-based units and {@code FOREVER} return false.
      *
      * @return true if a time unit, false if a date unit
      */
-    public boolean isTimeUnit() {
+    @Override
+    public boolean isTimeBased() {
         return this.compareTo(DAYS) < 0;
     }
 
     //-----------------------------------------------------------------------
     @Override
     public boolean isSupportedBy(Temporal temporal) {
-        if (this == FOREVER) {
-            return false;
-        }
-        if (temporal instanceof ChronoLocalDate) {
-            return isDateUnit();
-        }
-        if (temporal instanceof ChronoLocalDateTime || temporal instanceof ChronoZonedDateTime) {
-            return true;
-        }
-        return TemporalUnit.super.isSupportedBy(temporal);
+        return temporal.isSupported(this);
     }
 
     @SuppressWarnings("unchecked")
@@ -279,13 +269,13 @@ public enum ChronoUnit implements TemporalUnit {
     //-----------------------------------------------------------------------
     @Override
     public long between(Temporal temporal1, Temporal temporal2) {
-        return temporal1.periodUntil(temporal2, this);
+        return temporal1.until(temporal2, this);
     }
 
     //-----------------------------------------------------------------------
     @Override
     public String toString() {
-        return getName();
+        return name;
     }
 
 }
diff --git a/jdk/src/share/classes/java/time/temporal/IsoFields.java b/jdk/src/share/classes/java/time/temporal/IsoFields.java
index e335c434d23..eae057afb2a 100644
--- a/jdk/src/share/classes/java/time/temporal/IsoFields.java
+++ b/jdk/src/share/classes/java/time/temporal/IsoFields.java
@@ -71,6 +71,8 @@ import static java.time.temporal.ChronoUnit.YEARS;
 
 import java.time.Duration;
 import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.chrono.ChronoLocalDate;
 import java.time.chrono.Chronology;
 import java.time.chrono.IsoChronology;
 import java.time.format.ResolverStyle;
@@ -288,10 +290,6 @@ public final class IsoFields {
      */
     private static enum Field implements TemporalField {
         DAY_OF_QUARTER {
-            @Override
-            public String getName() {
-                return "DayOfQuarter";
-            }
             @Override
             public TemporalUnit getBaseUnit() {
                 return DAYS;
@@ -344,17 +342,21 @@ public final class IsoFields {
                 return (R) temporal.with(DAY_OF_YEAR, temporal.getLong(DAY_OF_YEAR) + (newValue - curValue));
             }
             @Override
-            public Map resolve(TemporalAccessor temporal, long doq, ResolverStyle resolverStyle) {
-                if ((temporal.isSupported(YEAR) && temporal.isSupported(QUARTER_OF_YEAR)) == false) {
+            public ChronoLocalDate resolve(
+                    Map fieldValues, Chronology chronology, ZoneId zone, ResolverStyle resolverStyle) {
+                Long yearLong = fieldValues.get(YEAR);
+                Long qoyLong = fieldValues.get(QUARTER_OF_YEAR);
+                if (yearLong == null || qoyLong == null) {
                     return null;
                 }
-                int y = temporal.get(YEAR);  // validated
+                int y = YEAR.checkValidIntValue(yearLong);  // always validate
+                long doq = fieldValues.get(DAY_OF_QUARTER);
                 LocalDate date;
                 if (resolverStyle == ResolverStyle.LENIENT) {
-                    long qoy = temporal.getLong(QUARTER_OF_YEAR);  // unvalidated
-                    date = LocalDate.of(y, 1, 1).plusMonths(Math.multiplyExact(Math.subtractExact(qoy, 1), 3));
+                    date = LocalDate.of(y, 1, 1).plusMonths(Math.multiplyExact(Math.subtractExact(qoyLong, 1), 3));
+                    doq = Math.subtractExact(doq, 1);
                 } else {
-                    int qoy = temporal.get(QUARTER_OF_YEAR);  // validated
+                    int qoy = QUARTER_OF_YEAR.range().checkValidIntValue(qoyLong, QUARTER_OF_YEAR);  // validated
                     date = LocalDate.of(y, ((qoy - 1) * 3) + 1, 1);
                     if (doq < 1 || doq > 90) {
                         if (resolverStyle == ResolverStyle.STRICT) {
@@ -363,20 +365,19 @@ public final class IsoFields {
                             range().checkValidValue(doq, this);  // allow 1-92 rolling into next quarter
                         }
                     }
+                    doq--;
                 }
-                long epochDay = Math.addExact(date.toEpochDay(), Math.subtractExact(doq, 1));
-                Map result = new HashMap<>(4, 1.0f);
-                result.put(EPOCH_DAY, epochDay);
-                result.put(YEAR, null);
-                result.put(QUARTER_OF_YEAR, null);
-                return result;
+                fieldValues.remove(this);
+                fieldValues.remove(YEAR);
+                fieldValues.remove(QUARTER_OF_YEAR);
+                return date.plusDays(doq);
+            }
+            @Override
+            public String toString() {
+                return "DayOfQuarter";
             }
         },
         QUARTER_OF_YEAR {
-            @Override
-            public String getName() {
-                return "QuarterOfYear";
-            }
             @Override
             public TemporalUnit getBaseUnit() {
                 return QUARTER_YEARS;
@@ -409,20 +410,19 @@ public final class IsoFields {
                 range().checkValidValue(newValue, this);  // strictly check from 1 to 4
                 return (R) temporal.with(MONTH_OF_YEAR, temporal.getLong(MONTH_OF_YEAR) + (newValue - curValue) * 3);
             }
+            @Override
+            public String toString() {
+                return "QuarterOfYear";
+            }
         },
         WEEK_OF_WEEK_BASED_YEAR {
-            @Override
-            public String getName() {
-                return "WeekOfWeekBasedYear";
-            }
-
             @Override
             public String getDisplayName(Locale locale) {
                 Objects.requireNonNull(locale, "locale");
                 LocaleResources lr = LocaleProviderAdapter.getResourceBundleBased()
                                             .getLocaleResources(locale);
                 ResourceBundle rb = lr.getJavaTimeFormatData();
-                return rb.containsKey("field.week") ? rb.getString("field.week") : getName();
+                return rb.containsKey("field.week") ? rb.getString("field.week") : toString();
             }
 
             @Override
@@ -463,14 +463,18 @@ public final class IsoFields {
                 return (R) temporal.plus(Math.subtractExact(newValue, getFrom(temporal)), WEEKS);
             }
             @Override
-            public Map resolve(TemporalAccessor temporal, long wowby, ResolverStyle resolverStyle) {
-                if ((temporal.isSupported(WEEK_BASED_YEAR) && temporal.isSupported(DAY_OF_WEEK)) == false) {
+            public ChronoLocalDate resolve(
+                    Map fieldValues, Chronology chronology, ZoneId zone, ResolverStyle resolverStyle) {
+                Long wbyLong = fieldValues.get(WEEK_BASED_YEAR);
+                Long dowLong = fieldValues.get(DAY_OF_WEEK);
+                if (wbyLong == null || dowLong == null) {
                     return null;
                 }
-                int wby = temporal.get(WEEK_BASED_YEAR);  // validated
+                int wby = WEEK_BASED_YEAR.range().checkValidIntValue(wbyLong, WEEK_BASED_YEAR);  // always validate
+                long wowby = fieldValues.get(WEEK_OF_WEEK_BASED_YEAR);
                 LocalDate date = LocalDate.of(wby, 1, 4);
                 if (resolverStyle == ResolverStyle.LENIENT) {
-                    long dow = temporal.getLong(DAY_OF_WEEK);  // unvalidated
+                    long dow = dowLong;  // unvalidated
                     if (dow > 7) {
                         date = date.plusWeeks((dow - 1) / 7);
                         dow = ((dow - 1) % 7) + 1;
@@ -480,7 +484,7 @@ public final class IsoFields {
                     }
                     date = date.plusWeeks(Math.subtractExact(wowby, 1)).with(DAY_OF_WEEK, dow);
                 } else {
-                    int dow = temporal.get(DAY_OF_WEEK);  // validated
+                    int dow = DAY_OF_WEEK.checkValidIntValue(dowLong);  // validated
                     if (wowby < 1 || wowby > 52) {
                         if (resolverStyle == ResolverStyle.STRICT) {
                             getWeekRange(date).checkValidValue(wowby, this);  // only allow exact range
@@ -490,18 +494,17 @@ public final class IsoFields {
                     }
                     date = date.plusWeeks(wowby - 1).with(DAY_OF_WEEK, dow);
                 }
-                Map result = new HashMap<>(2, 1.0f);
-                result.put(EPOCH_DAY, date.toEpochDay());
-                result.put(WEEK_BASED_YEAR, null);
-                result.put(DAY_OF_WEEK, null);
-                return result;
+                fieldValues.remove(this);
+                fieldValues.remove(WEEK_BASED_YEAR);
+                fieldValues.remove(DAY_OF_WEEK);
+                return date;
+            }
+            @Override
+            public String toString() {
+                return "WeekOfWeekBasedYear";
             }
         },
         WEEK_BASED_YEAR {
-            @Override
-            public String getName() {
-                return "WeekBasedYear";
-            }
             @Override
             public TemporalUnit getBaseUnit() {
                 return WEEK_BASED_YEARS;
@@ -537,6 +540,10 @@ public final class IsoFields {
                 date = date.withDayOfYear(180).withYear(newVal).with(WEEK_OF_WEEK_BASED_YEAR, week);
                 return (R) date.with(date);
             }
+            @Override
+            public String toString() {
+                return "WeekBasedYear";
+            }
         };
 
         @Override
@@ -545,13 +552,13 @@ public final class IsoFields {
         }
 
         @Override
-        public ValueRange rangeRefinedBy(TemporalAccessor temporal) {
-            return range();
+        public boolean isTimeBased() {
+            return false;
         }
 
         @Override
-        public String toString() {
-            return getName();
+        public ValueRange rangeRefinedBy(TemporalAccessor temporal) {
+            return range();
         }
 
         //-------------------------------------------------------------------------
@@ -635,11 +642,6 @@ public final class IsoFields {
             this.duration = estimatedDuration;
         }
 
-        @Override
-        public String getName() {
-            return name;
-        }
-
         @Override
         public Duration getDuration() {
             return duration;
@@ -650,6 +652,16 @@ public final class IsoFields {
             return true;
         }
 
+        @Override
+        public boolean isDateBased() {
+            return true;
+        }
+
+        @Override
+        public boolean isTimeBased() {
+            return false;
+        }
+
         @Override
         public boolean isSupportedBy(Temporal temporal) {
             return temporal.isSupported(EPOCH_DAY);
@@ -658,7 +670,7 @@ public final class IsoFields {
         @SuppressWarnings("unchecked")
         @Override
         public  R addTo(R temporal, long amount) {
-            switch(this) {
+            switch (this) {
                 case WEEK_BASED_YEARS:
                     return (R) temporal.with(WEEK_BASED_YEAR,
                             Math.addExact(temporal.get(WEEK_BASED_YEAR), amount));
@@ -678,7 +690,7 @@ public final class IsoFields {
                     return Math.subtractExact(temporal2.getLong(WEEK_BASED_YEAR),
                             temporal1.getLong(WEEK_BASED_YEAR));
                 case QUARTER_YEARS:
-                    return temporal1.periodUntil(temporal2, MONTHS) / 3;
+                    return temporal1.until(temporal2, MONTHS) / 3;
                 default:
                     throw new IllegalStateException("Unreachable");
             }
@@ -686,8 +698,7 @@ public final class IsoFields {
 
         @Override
         public String toString() {
-            return getName();
-
+            return name;
         }
     }
 }
diff --git a/jdk/src/share/classes/java/time/temporal/JulianFields.java b/jdk/src/share/classes/java/time/temporal/JulianFields.java
index 95400addcaa..326f20d222f 100644
--- a/jdk/src/share/classes/java/time/temporal/JulianFields.java
+++ b/jdk/src/share/classes/java/time/temporal/JulianFields.java
@@ -66,6 +66,9 @@ import static java.time.temporal.ChronoUnit.DAYS;
 import static java.time.temporal.ChronoUnit.FOREVER;
 
 import java.time.DateTimeException;
+import java.time.ZoneId;
+import java.time.chrono.ChronoLocalDate;
+import java.time.chrono.Chronology;
 import java.time.format.ResolverStyle;
 import java.util.Collections;
 import java.util.Map;
@@ -232,11 +235,6 @@ public final class JulianFields {
         }
 
         //-----------------------------------------------------------------------
-        @Override
-        public String getName() {
-            return name;
-        }
-
         @Override
         public TemporalUnit getBaseUnit() {
             return baseUnit;
@@ -252,6 +250,11 @@ public final class JulianFields {
             return true;
         }
 
+        @Override
+        public boolean isTimeBased() {
+            return false;
+        }
+
         @Override
         public ValueRange range() {
             return range;
@@ -287,15 +290,14 @@ public final class JulianFields {
 
         //-----------------------------------------------------------------------
         @Override
-        public Map resolve(TemporalAccessor temporal, long value, ResolverStyle resolverStyle) {
-            long epochDay;
+        public ChronoLocalDate resolve(
+                Map fieldValues, Chronology chronology, ZoneId zone, ResolverStyle resolverStyle) {
+            long value = fieldValues.remove(this);
             if (resolverStyle == ResolverStyle.LENIENT) {
-                epochDay = Math.subtractExact(value, offset);
-            } else {
-                range().checkValidValue(value, this);
-                epochDay = value - offset;
+                return chronology.dateEpochDay(Math.subtractExact(value, offset));
             }
-            return Collections.singletonMap(EPOCH_DAY, epochDay);
+            range().checkValidValue(value, this);
+            return chronology.dateEpochDay(value - offset);
         }
 
         //-----------------------------------------------------------------------
diff --git a/jdk/src/share/classes/java/time/temporal/Temporal.java b/jdk/src/share/classes/java/time/temporal/Temporal.java
index 1928186b285..af8424c1560 100644
--- a/jdk/src/share/classes/java/time/temporal/Temporal.java
+++ b/jdk/src/share/classes/java/time/temporal/Temporal.java
@@ -62,7 +62,6 @@
 package java.time.temporal;
 
 import java.time.DateTimeException;
-import java.time.ZoneId;
 
 /**
  * Framework-level interface defining read-write access to a temporal object,
@@ -81,7 +80,8 @@ import java.time.ZoneId;
  * See {@link ChronoField} for the standard set of fields.
  * 
    
  * Two pieces of date/time information cannot be represented by numbers,
- * the {@linkplain java.time.chrono.Chronology chronology} and the {@linkplain ZoneId time-zone}.
+ * the {@linkplain java.time.chrono.Chronology chronology} and the
+ * {@linkplain java.time.ZoneId time-zone}.
  * These can be accessed via {@link #query(TemporalQuery) queries} using
  * the static methods defined on {@link TemporalQuery}.
  * 
    
@@ -128,6 +128,29 @@ import java.time.ZoneId;
  */
 public interface Temporal extends TemporalAccessor {
 
+    /**
+     * Checks if the specified unit is supported.
+     * 
    
+     * This checks if the specified unit can be added to, or subtracted from, this date-time.
+     * If false, then calling the {@link #plus(long, TemporalUnit)} and
+     * {@link #minus(long, TemporalUnit) minus} methods will throw an exception.
+     *
+     * @implSpec
+     * Implementations must check and handle all units defined in {@link ChronoUnit}.
+     * If the unit is supported, then true must be returned, otherwise false must be returned.
+     * 
    
+     * If the field is not a {@code ChronoUnit}, then the result of this method
+     * is obtained by invoking {@code TemporalUnit.isSupportedBy(Temporal)}
+     * passing {@code this} as the argument.
+     * 
    
+     * Implementations must ensure that no observable state is altered when this
+     * read-only method is invoked.
+     *
+     * @param unit  the unit to check, null returns false
+     * @return true if the unit can be added/subtracted, false if not
+     */
+    boolean isSupported(TemporalUnit unit);
+
     /**
      * Returns an adjusted object of the same type as this object with the adjustment made.
      * 
    
@@ -352,7 +375,7 @@ public interface Temporal extends TemporalAccessor {
      * The start and end points are {@code this} and the specified temporal.
      * The result will be negative if the end is before the start.
      * For example, the period in hours between two temporal objects can be
-     * calculated using {@code startTime.periodUntil(endTime, HOURS)}.
+     * calculated using {@code startTime.until(endTime, HOURS)}.
      * 
    
      * The calculation returns a whole number, representing the number of
      * complete units between the two temporals.
@@ -364,7 +387,7 @@ public interface Temporal extends TemporalAccessor {
      * The second is to use {@link TemporalUnit#between(Temporal, Temporal)}:
      * 
          *   // these two lines are equivalent
-     *   temporal = start.periodUntil(end, unit);
+     *   temporal = start.until(end, unit);
      *   temporal = unit.between(start, end);
      * 
    
      * The choice should be made based on which makes the code more readable.
@@ -372,7 +395,7 @@ public interface Temporal extends TemporalAccessor {
      * For example, this method allows the number of days between two dates to
      * be calculated:
      * 
    -     *  long daysBetween = start.periodUntil(end, DAYS);
+     *  long daysBetween = start.until(end, DAYS);
      *  // or alternatively
      *  long daysBetween = DAYS.between(start, end);
      * 
    
@@ -399,7 +422,8 @@ public interface Temporal extends TemporalAccessor {
      *  return unit.between(this, endTemporal);
      * 
    
      * 
    
-     * Neither this object, nor the specified temporal, may be altered.
+     * Implementations must ensure that no observable state is altered when this
+     * read-only method is invoked.
      *
      * @param endTemporal  the end temporal, of the same type as this object, not null
      * @param unit  the unit to measure the amount in, not null
@@ -410,6 +434,6 @@ public interface Temporal extends TemporalAccessor {
      * @throws UnsupportedTemporalTypeException if the unit is not supported
      * @throws ArithmeticException if numeric overflow occurs
      */
-    long periodUntil(Temporal endTemporal, TemporalUnit unit);
+    long until(Temporal endTemporal, TemporalUnit unit);
 
 }
diff --git a/jdk/src/share/classes/java/time/temporal/TemporalAccessor.java b/jdk/src/share/classes/java/time/temporal/TemporalAccessor.java
index a212be85981..343447e36b9 100644
--- a/jdk/src/share/classes/java/time/temporal/TemporalAccessor.java
+++ b/jdk/src/share/classes/java/time/temporal/TemporalAccessor.java
@@ -62,7 +62,6 @@
 package java.time.temporal;
 
 import java.time.DateTimeException;
-import java.time.ZoneId;
 import java.util.Objects;
 
 /**
@@ -80,7 +79,8 @@ import java.util.Objects;
  * See {@link ChronoField} for the standard set of fields.
  * 
    
  * Two pieces of date/time information cannot be represented by numbers,
- * the {@linkplain java.time.chrono.Chronology chronology} and the {@linkplain ZoneId time-zone}.
+ * the {@linkplain java.time.chrono.Chronology chronology} and the
+ * {@linkplain java.time.ZoneId time-zone}.
  * These can be accessed via {@linkplain #query(TemporalQuery) queries} using
  * the static methods defined on {@link TemporalQuery}.
  * 
    
@@ -111,13 +111,14 @@ public interface TemporalAccessor {
      *
      * @implSpec
      * Implementations must check and handle all fields defined in {@link ChronoField}.
-     * If the field is supported, then true is returned, otherwise false
+     * If the field is supported, then true must be returned, otherwise false must be returned.
      * 
    
      * If the field is not a {@code ChronoField}, then the result of this method
      * is obtained by invoking {@code TemporalField.isSupportedBy(TemporalAccessor)}
      * passing {@code this} as the argument.
      * 
    
-     * Implementations must not alter either this object.
+     * Implementations must ensure that no observable state is altered when this
+     * read-only method is invoked.
      *
      * @param field  the field to check, null returns false
      * @return true if this date-time can be queried for the field, false if not
@@ -146,7 +147,8 @@ public interface TemporalAccessor {
      * is obtained by invoking {@code TemporalField.rangeRefinedBy(TemporalAccessorl)}
      * passing {@code this} as the argument.
      * 
    
-     * Implementations must not alter either this object.
+     * Implementations must ensure that no observable state is altered when this
+     * read-only method is invoked.
      * 
    
      * The default implementation must behave equivalent to this code:
      * 
    @@ -154,7 +156,7 @@ public interface TemporalAccessor {
      *    if (isSupported(field)) {
      *      return field.range();
      *    }
-     *    throw new UnsupportedTemporalTypeException("Unsupported field: " + field.getName());
+     *    throw new UnsupportedTemporalTypeException("Unsupported field: " + field);
      *  }
      *  return field.rangeRefinedBy(this);
      * 
    
@@ -169,7 +171,7 @@ public interface TemporalAccessor {
             if (isSupported(field)) {
                 return field.range();
             }
-            throw new UnsupportedTemporalTypeException("Unsupported field: " + field.getName());
+            throw new UnsupportedTemporalTypeException("Unsupported field: " + field);
         }
         Objects.requireNonNull(field, "field");
         return field.rangeRefinedBy(this);
@@ -193,7 +195,8 @@ public interface TemporalAccessor {
      * is obtained by invoking {@code TemporalField.getFrom(TemporalAccessor)}
      * passing {@code this} as the argument.
      * 
    
-     * Implementations must not alter this object.
+     * Implementations must ensure that no observable state is altered when this
+     * read-only method is invoked.
      * 
    
      * The default implementation must behave equivalent to this code:
      * 
    @@ -240,7 +243,8 @@ public interface TemporalAccessor {
      * is obtained by invoking {@code TemporalField.getFrom(TemporalAccessor)}
      * passing {@code this} as the argument.
      * 
    
-     * Implementations must not alter either this object.
+     * Implementations must ensure that no observable state is altered when this
+     * read-only method is invoked.
      *
      * @param field  the field to get, not null
      * @return the value for the field
@@ -291,6 +295,9 @@ public interface TemporalAccessor {
      *  }
      *  return TemporalAccessor.super.query(query);
      * 
    
+     * 
    
+     * Implementations must ensure that no observable state is altered when this
+     * read-only method is invoked.
      *
      * @param  the type of the result
      * @param query  the query to invoke, not null
diff --git a/jdk/src/share/classes/java/time/temporal/TemporalField.java b/jdk/src/share/classes/java/time/temporal/TemporalField.java
index cce2dfbd4de..e4d6b407783 100644
--- a/jdk/src/share/classes/java/time/temporal/TemporalField.java
+++ b/jdk/src/share/classes/java/time/temporal/TemporalField.java
@@ -62,6 +62,9 @@
 package java.time.temporal;
 
 import java.time.DateTimeException;
+import java.time.ZoneId;
+import java.time.chrono.ChronoLocalDate;
+import java.time.chrono.Chronology;
 import java.time.format.ResolverStyle;
 import java.util.Locale;
 import java.util.Map;
@@ -92,30 +95,20 @@ import java.util.Objects;
  */
 public interface TemporalField {
 
-    /**
-     * Gets a descriptive name for the field.
-     * 
    
-     * The should be of the format 'BaseOfRange', such as 'MonthOfYear',
-     * unless the field has a range of {@code FOREVER}, when only
-     * the base unit is mentioned, such as 'Year' or 'Era'.
-     *
-     * @return the name, not null
-     */
-    String getName();
-
     /**
      * Gets the display name for the field in the requested locale.
      * 
    
-     * If there is no display name for the locale the value of {@code getName}
-     * is returned.
+     * If there is no display name for the locale then a suitable default must be returned.
+     * 
    
+     * The default implementation must check the locale is not null
+     * and return {@code toString()}.
      *
      * @param locale  the locale to use, not null
-     * @return the display name for the locale or the value of {@code getName},
-     *     not null
+     * @return the display name for the locale or a suitable default, not null
      */
     default String getDisplayName(Locale locale) {
-        Objects.requireNonNull(locale, "local");
-        return getName();
+        Objects.requireNonNull(locale, "locale");
+        return toString();
     }
 
     /**
@@ -164,28 +157,24 @@ public interface TemporalField {
      * 
    
      * A field is date-based if it can be derived from
      * {@link ChronoField#EPOCH_DAY EPOCH_DAY}.
-     * 
    
-     * The default implementation must return false.
+     * Note that it is valid for both {@code isDateBased()} and {@code isTimeBased()}
+     * to return false, such as when representing a field like minute-of-week.
      *
      * @return true if this field is a component of a date
      */
-    default boolean isDateBased() {
-        return false;
-    }
+    boolean isDateBased();
 
     /**
      * Checks if this field represents a component of a time.
      * 
    
      * A field is time-based if it can be derived from
      * {@link ChronoField#NANO_OF_DAY NANO_OF_DAY}.
-     * 
    
-     * The default implementation must return false.
+     * Note that it is valid for both {@code isDateBased()} and {@code isTimeBased()}
+     * to return false, such as when representing a field like minute-of-week.
      *
      * @return true if this field is a component of a time
      */
-    default boolean isTimeBased() {
-        return false;
-    }
+    boolean isTimeBased();
 
     //-----------------------------------------------------------------------
     /**
@@ -319,45 +308,79 @@ public interface TemporalField {
      R adjustInto(R temporal, long newValue);
 
     /**
-     * Resolves this field to provide a simpler alternative.
+     * Resolves this field to provide a simpler alternative or a date.
      * 
    
      * This method is invoked during the resolve phase of parsing.
      * It is designed to allow application defined fields to be simplified into
-     * more standard fields, such as those on {@code ChronoField}.
+     * more standard fields, such as those on {@code ChronoField}, or into a date.
      * 
    
-     * The method will only be invoked if the specified temporal supports this field.
-     * The value of this field is provided.
+     * Applications should not normally invoke this method directly.
+     *
+     * @implSpec
+     * If an implementation represents a field that can be simplified, or
+     * combined with others, then this method must be implemented.
      * 
    
-     * The temporal must be queried using the methods of {@code TemporalAccessor},
-     * not using {@code getFrom}, {@code isSupportedBy} or {@code rangeRefinedBy}.
-     * Before querying any field, implementations must ensure it is supported, as
-     * exceptions of this type would negatively affect the calculation of a parsed result.
+     * The specified map contains the current state of the parse.
+     * The map is mutable and must be mutated to resolve the field and
+     * any related fields. This method will only be invoked during parsing
+     * if the map contains this field, and implementations should therefore
+     * assume this field is present.
      * 
    
-     * If this field can resolve, it must return a map, if not it must return null.
-     * The returned map contains the changes to be made to the temporal, expressed
-     * as field-value pairs. If the value for a field is null, the field is to be
-     * removed from the temporal. A null key must not be added to the result map.
+     * Resolving a field will consist of looking at the value of this field,
+     * and potentially other fields, and either updating the map with a
+     * simpler value, such as a {@code ChronoField}, or returning a
+     * complete {@code ChronoLocalDate}. If a resolve is successful,
+     * the code must remove all the fields that were resolved from the map,
+     * including this field.
      * 
    
-     * If the result is non-null, this field will be removed from the temporal.
-     * This field should not be added to the result map.
+     * For example, the {@code IsoFields} class contains the quarter-of-year
+     * and day-of-quarter fields. The implementation of this method in that class
+     * resolves the two fields plus the {@link ChronoField#YEAR YEAR} into a
+     * complete {@code LocalDate}. The resolve method will remove all three
+     * fields from the map before returning the {@code LocalDate}.
      * 
    
-     * The {@link ResolverStyle} should be used by implementations to determine
-     * how to perform the resolve.
+     * If resolution should be possible, but the data is invalid, the resolver
+     * style should be used to determine an appropriate level of leniency, which
+     * may require throwing a {@code DateTimeException} or {@code ArithmeticException}.
+     * If no resolution is possible, the resolve method must return null.
+     * 
    
+     * When resolving time fields, the map will be altered and null returned.
+     * When resolving date fields, the date is normally returned from the method,
+     * with the map altered to remove the resolved fields. However, it would also
+     * be acceptable for the date fields to be resolved into other {@code ChronoField}
+     * instances that can produce a date, such as {@code EPOCH_DAY}.
+     * 
    
+     * The zone is not normally required for resolution, but is provided for completeness.
      * 
    
      * The default implementation must return null.
      *
-     * @param temporal  the temporal to resolve, not null
-     * @param value  the value of this field
+     * @param fieldValues  the map of fields to values, which can be updated, not null
+     * @param chronology  the effective chronology, not null
+     * @param zone  the effective zone, not null
      * @param resolverStyle  the requested type of resolve, not null
-     * @return a map of fields to update in the temporal, with a mapping to null
-     *  indicating a deletion. The whole map must be null if no resolving occurred
+     * @return the resolved date; null if resolving only changed the map,
+     *  or no resolve occurred
+     * @throws ArithmeticException if numeric overflow occurs
      * @throws DateTimeException if resolving results in an error. This must not be thrown
      *  by querying a field on the temporal without first checking if it is supported
-     * @throws ArithmeticException if numeric overflow occurs
      */
-    default Map resolve(
-            TemporalAccessor temporal, long value, ResolverStyle resolverStyle) {
+    default ChronoLocalDate resolve(
+            Map fieldValues, Chronology chronology,
+            ZoneId zone, ResolverStyle resolverStyle) {
         return null;
     }
 
+    /**
+     * Gets a descriptive name for the field.
+     * 
    
+     * The should be of the format 'BaseOfRange', such as 'MonthOfYear',
+     * unless the field has a range of {@code FOREVER}, when only
+     * the base unit is mentioned, such as 'Year' or 'Era'.
+     *
+     * @return the name of the field, not null
+     */
+    @Override
+    String toString();
+
+
 }
diff --git a/jdk/src/share/classes/java/time/temporal/TemporalUnit.java b/jdk/src/share/classes/java/time/temporal/TemporalUnit.java
index 01ab406f85a..05577d713f8 100644
--- a/jdk/src/share/classes/java/time/temporal/TemporalUnit.java
+++ b/jdk/src/share/classes/java/time/temporal/TemporalUnit.java
@@ -63,7 +63,11 @@ package java.time.temporal;
 
 import java.time.DateTimeException;
 import java.time.Duration;
+import java.time.LocalTime;
 import java.time.Period;
+import java.time.chrono.ChronoLocalDate;
+import java.time.chrono.ChronoLocalDateTime;
+import java.time.chrono.ChronoZonedDateTime;
 
 /**
  * A unit of date-time, such as Days or Hours.
@@ -92,15 +96,6 @@ import java.time.Period;
  */
 public interface TemporalUnit {
 
-    /**
-     * Gets a descriptive name for the unit.
-     * 
    
-     * This should be in the plural and upper-first camel case, such as 'Days' or 'Minutes'.
-     *
-     * @return the name, not null
-     */
-    String getName();
-
     /**
      * Gets the duration of this unit, which may be an estimate.
      * 
    
@@ -130,6 +125,33 @@ public interface TemporalUnit {
      */
     boolean isDurationEstimated();
 
+    //-----------------------------------------------------------------------
+    /**
+     * Checks if this unit represents a component of a date.
+     * 
    
+     * A date is time-based if it can be used to imply meaning from a date.
+     * It must have a {@linkplain #getDuration() duration} that is an integral
+     * multiple of the length of a standard day.
+     * Note that it is valid for both {@code isDateBased()} and {@code isTimeBased()}
+     * to return false, such as when representing a unit like 36 hours.
+     *
+     * @return true if this unit is a component of a date
+     */
+    boolean isDateBased();
+
+    /**
+     * Checks if this unit represents a component of a time.
+     * 
    
+     * A unit is time-based if it can be used to imply meaning from a time.
+     * It must have a {@linkplain #getDuration() duration} that divides into
+     * the length of a standard day without remainder.
+     * Note that it is valid for both {@code isDateBased()} and {@code isTimeBased()}
+     * to return false, such as when representing a unit like 36 hours.
+     *
+     * @return true if this unit is a component of a time
+     */
+    boolean isTimeBased();
+
     //-----------------------------------------------------------------------
     /**
      * Checks if this unit is supported by the specified temporal object.
@@ -144,6 +166,15 @@ public interface TemporalUnit {
      * @return true if the unit is supported
      */
     default boolean isSupportedBy(Temporal temporal) {
+        if (temporal instanceof LocalTime) {
+            return isTimeBased();
+        }
+        if (temporal instanceof ChronoLocalDate) {
+            return isDateBased();
+        }
+        if (temporal instanceof ChronoLocalDateTime || temporal instanceof ChronoZonedDateTime) {
+            return true;
+        }
         try {
             temporal.plus(1, this);
             return true;
@@ -212,11 +243,11 @@ public interface TemporalUnit {
      * 
    
      * There are two equivalent ways of using this method.
      * The first is to invoke this method directly.
-     * The second is to use {@link Temporal#periodUntil(Temporal, TemporalUnit)}:
+     * The second is to use {@link Temporal#until(Temporal, TemporalUnit)}:
      * 
          *   // these two lines are equivalent
      *   between = thisUnit.between(start, end);
-     *   between = start.periodUntil(end, thisUnit);
+     *   between = start.until(end, thisUnit);
      * 
    
      * The choice should be made based on which makes the code more readable.
      * 
    
@@ -225,7 +256,7 @@ public interface TemporalUnit {
      * 
          *  long daysBetween = DAYS.between(start, end);
      *  // or alternatively
-     *  long daysBetween = start.periodUntil(end, DAYS);
+     *  long daysBetween = start.until(end, DAYS);
      * 
    
      * 
    
      * Implementations should perform any queries or calculations using the units
@@ -245,7 +276,9 @@ public interface TemporalUnit {
 
     //-----------------------------------------------------------------------
     /**
-     * Outputs this unit as a {@code String} using the name.
+     * Gets a descriptive name for the unit.
+     * 
    
+     * This should be in the plural and upper-first camel case, such as 'Days' or 'Minutes'.
      *
      * @return the name of this unit, not null
      */
diff --git a/jdk/src/share/classes/java/time/temporal/ValueRange.java b/jdk/src/share/classes/java/time/temporal/ValueRange.java
index 4ac8e74402a..e003f114adc 100644
--- a/jdk/src/share/classes/java/time/temporal/ValueRange.java
+++ b/jdk/src/share/classes/java/time/temporal/ValueRange.java
@@ -331,7 +331,7 @@ public final class ValueRange implements Serializable {
 
     private String genInvalidFieldMessage(TemporalField field, long value) {
         if (field != null) {
-            return "Invalid value for " + field.getName() + " (valid values " + this + "): " + value;
+            return "Invalid value for " + field + " (valid values " + this + "): " + value;
         } else {
             return "Invalid value (valid values " + this + "): " + value;
         }
diff --git a/jdk/src/share/classes/java/time/temporal/WeekFields.java b/jdk/src/share/classes/java/time/temporal/WeekFields.java
index 07ffa91d2a3..b3eb1383450 100644
--- a/jdk/src/share/classes/java/time/temporal/WeekFields.java
+++ b/jdk/src/share/classes/java/time/temporal/WeekFields.java
@@ -75,7 +75,9 @@ import static java.time.temporal.ChronoUnit.YEARS;
 
 import java.io.InvalidObjectException;
 import java.io.Serializable;
+import java.time.DateTimeException;
 import java.time.DayOfWeek;
+import java.time.ZoneId;
 import java.time.chrono.ChronoLocalDate;
 import java.time.chrono.Chronology;
 import java.time.format.ResolverStyle;
@@ -395,6 +397,11 @@ public final class WeekFields implements Serializable {
      * 
    
      * For example, if the first day-of-week is Sunday, then that will have the
      * value 1, with other days ranging from Monday as 2 to Saturday as 7.
+     * 
    
+     * In the resolving phase of parsing, a localized day-of-week will be converted
+     * to a standardized {@code ChronoField} day-of-week.
+     * The day-of-week must be in the valid range 1 to 7.
+     * Other fields in this class build dates using the standardized day-of-week.
      *
      * @return a field providing access to the day-of-week with localized numbering, not null
      */
@@ -421,6 +428,26 @@ public final class WeekFields implements Serializable {
      * - if the 5th day of the month is a Monday, week two starts on the 5th and the 1st to 4th is in week one
    
      * 
    
      * This field can be used with any calendar system.
+     * 
    
+     * In the resolving phase of parsing, a date can be created from a year,
+     * week-of-month, month-of-year and day-of-week.
+     * 
    
+     * In {@linkplain ResolverStyle#STRICT strict mode}, all four fields are
+     * validated against their range of valid values. The week-of-month field
+     * is validated to ensure that the resulting month is the month requested.
+     * 
    
+     * In {@linkplain ResolverStyle#SMART smart mode}, all four fields are
+     * validated against their range of valid values. The week-of-month field
+     * is validated from 0 to 6, meaning that the resulting date can be in a
+     * different month to that specified.
+     * 
    
+     * In {@linkplain ResolverStyle#LENIENT lenient mode}, the year and day-of-week
+     * are validated against the range of valid values. The resulting date is calculated
+     * equivalent to the following four stage approach.
+     * First, create a date on the first day of the first week of January in the requested year.
+     * Then take the month-of-year, subtract one, and add the amount in months to the date.
+     * Then take the week-of-month, subtract one, and add the amount in weeks to the date.
+     * Finally, adjust to the correct day-of-week within the localized week.
      *
      * @return a field providing access to the week-of-month, not null
      */
@@ -447,6 +474,25 @@ public final class WeekFields implements Serializable {
      * - if the 5th day of the year is a Monday, week two starts on the 5th and the 1st to 4th is in week one
    
      * 
    
      * This field can be used with any calendar system.
+     * 
    
+     * In the resolving phase of parsing, a date can be created from a year,
+     * week-of-year and day-of-week.
+     * 
    
+     * In {@linkplain ResolverStyle#STRICT strict mode}, all three fields are
+     * validated against their range of valid values. The week-of-year field
+     * is validated to ensure that the resulting year is the year requested.
+     * 
    
+     * In {@linkplain ResolverStyle#SMART smart mode}, all three fields are
+     * validated against their range of valid values. The week-of-year field
+     * is validated from 0 to 54, meaning that the resulting date can be in a
+     * different year to that specified.
+     * 
    
+     * In {@linkplain ResolverStyle#LENIENT lenient mode}, the year and day-of-week
+     * are validated against the range of valid values. The resulting date is calculated
+     * equivalent to the following three stage approach.
+     * First, create a date on the first day of the first week in the requested year.
+     * Then take the week-of-year, subtract one, and add the amount in weeks to the date.
+     * Finally, adjust to the correct day-of-week within the localized week.
      *
      * @return a field providing access to the week-of-year, not null
      */
@@ -477,6 +523,26 @@ public final class WeekFields implements Serializable {
      *   the 1st to 4th is in week one
    
      * 
    
      * This field can be used with any calendar system.
+     * 
    
+     * In the resolving phase of parsing, a date can be created from a week-based-year,
+     * week-of-year and day-of-week.
+     * 
    
+     * In {@linkplain ResolverStyle#STRICT strict mode}, all three fields are
+     * validated against their range of valid values. The week-of-year field
+     * is validated to ensure that the resulting week-based-year is the
+     * week-based-year requested.
+     * 
    
+     * In {@linkplain ResolverStyle#SMART smart mode}, all three fields are
+     * validated against their range of valid values. The week-of-week-based-year field
+     * is validated from 1 to 53, meaning that the resulting date can be in the
+     * following week-based-year to that specified.
+     * 
    
+     * In {@linkplain ResolverStyle#LENIENT lenient mode}, the year and day-of-week
+     * are validated against the range of valid values. The resulting date is calculated
+     * equivalent to the following three stage approach.
+     * First, create a date on the first day of the first week in the requested week-based-year.
+     * Then take the week-of-week-based-year, subtract one, and add the amount in weeks to the date.
+     * Finally, adjust to the correct day-of-week within the localized week.
      *
      * @return a field providing access to the week-of-week-based-year, not null
      */
@@ -499,6 +565,26 @@ public final class WeekFields implements Serializable {
      * is in the last week of the previous year.
      * 
    
      * This field can be used with any calendar system.
+     * 
    
+     * In the resolving phase of parsing, a date can be created from a week-based-year,
+     * week-of-year and day-of-week.
+     * 
    
+     * In {@linkplain ResolverStyle#STRICT strict mode}, all three fields are
+     * validated against their range of valid values. The week-of-year field
+     * is validated to ensure that the resulting week-based-year is the
+     * week-based-year requested.
+     * 
    
+     * In {@linkplain ResolverStyle#SMART smart mode}, all three fields are
+     * validated against their range of valid values. The week-of-week-based-year field
+     * is validated from 1 to 53, meaning that the resulting date can be in the
+     * following week-based-year to that specified.
+     * 
    
+     * In {@linkplain ResolverStyle#LENIENT lenient mode}, the year and day-of-week
+     * are validated against the range of valid values. The resulting date is calculated
+     * equivalent to the following three stage approach.
+     * First, create a date on the first day of the first week in the requested week-based-year.
+     * Then take the week-of-week-based-year, subtract one, and add the amount in weeks to the date.
+     * Finally, adjust to the correct day-of-week within the localized week.
      *
      * @return a field providing access to the week-based-year, not null
      */
@@ -615,9 +701,9 @@ public final class WeekFields implements Serializable {
          * @param dow the day of the week
          * @return a ChronoLocalDate for the requested year, week of year, and day of week
          */
-        private ChronoLocalDate ofWeekBasedYear(Chronology chrono,
+        private ChronoLocalDate ofWeekBasedYear(Chronology chrono,
                 int yowby, int wowby, int dow) {
-            ChronoLocalDate date = chrono.date(yowby, 1, 1);
+            ChronoLocalDate date = chrono.date(yowby, 1, 1);
             int ldow = localizedDayOfWeek(date);
             int offset = startOfWeekOffset(1, ldow);
 
@@ -671,6 +757,11 @@ public final class WeekFields implements Serializable {
             return Math.floorMod(isoDow - sow, 7) + 1;
         }
 
+        private int localizedDayOfWeek(int isoDow) {
+            int sow = weekDef.getFirstDayOfWeek().getValue();
+            return Math.floorMod(isoDow - sow, 7) + 1;
+        }
+
         private long localizedWeekOfMonth(TemporalAccessor temporal) {
             int dow = localizedDayOfWeek(temporal);
             int dom = temporal.get(DAY_OF_MONTH);
@@ -800,75 +891,121 @@ public final class WeekFields implements Serializable {
         }
 
         @Override
-        public Map resolve(TemporalAccessor temporal, long value, ResolverStyle resolverStyle) {
-            int newValue = range.checkValidIntValue(value, this);
-            int sow = weekDef.getFirstDayOfWeek().getValue();
+        public ChronoLocalDate resolve(
+                Map fieldValues, Chronology chronology, ZoneId zone, ResolverStyle resolverStyle) {
+            final long value = fieldValues.get(this);
+            final int newValue = Math.toIntExact(value);  // broad limit makes overflow checking lighter
+            // first convert localized day-of-week to ISO day-of-week
+            // doing this first handles case where both ISO and localized were parsed and might mismatch
+            // day-of-week is always strict as two different day-of-week values makes lenient complex
             if (rangeUnit == WEEKS) {  // day-of-week
-                int isoDow = Math.floorMod((sow - 1) + (newValue - 1), 7) + 1;
-                return Collections.singletonMap(DAY_OF_WEEK, (long) isoDow);
-            }
-            if (temporal.isSupported(DAY_OF_WEEK) == false) {
+                final int checkedValue = range.checkValidIntValue(value, this);  // no leniency as too complex
+                final int startDow = weekDef.getFirstDayOfWeek().getValue();
+                long isoDow = Math.floorMod((startDow - 1) + (checkedValue - 1), 7) + 1;
+                fieldValues.remove(this);
+                fieldValues.put(DAY_OF_WEEK, isoDow);
                 return null;
             }
-            Chronology chrono = Chronology.from(temporal);  // defaults to ISO
-            int dow = localizedDayOfWeek(temporal);
-            if (temporal.isSupported(YEAR)) {
-                int year = temporal.get(YEAR);
-                if (rangeUnit == MONTHS) {  // week-of-month
-                    if (temporal.isSupported(MONTH_OF_YEAR) == false) {
-                        return null;
-                    }
-                    int month = temporal.get(ChronoField.MONTH_OF_YEAR);
-                @SuppressWarnings("rawtypes")
-                    ChronoLocalDate date = chrono.date(year, month, 1);
-                    int dateDow = localizedDayOfWeek(date);
-                    long weeks = newValue - localizedWeekOfMonth(date);
-                    int days = dow - dateDow;
-                    date = date.plus(weeks * 7 + days, DAYS);
-                    Map result = new HashMap<>(4, 1.0f);
-                    result.put(EPOCH_DAY, date.toEpochDay());
-                    result.put(YEAR, null);
-                    result.put(MONTH_OF_YEAR, null);
-                    result.put(DAY_OF_WEEK, null);
-                    return result;
-                } else if (rangeUnit == YEARS) {  // week-of-year
-                @SuppressWarnings("rawtypes")
-                    ChronoLocalDate date = chrono.date(year, 1, 1);
-                    int dateDow = localizedDayOfWeek(date);
-                    long weeks = newValue - localizedWeekOfYear(date);
-                    int days = dow - dateDow;
-                    date = date.plus(weeks * 7 + days, DAYS);
-                    Map result = new HashMap<>(4, 1.0f);
-                    result.put(EPOCH_DAY, date.toEpochDay());
-                    result.put(YEAR, null);
-                    result.put(DAY_OF_WEEK, null);
-                    return result;
-                }
-            } else if (rangeUnit == WEEK_BASED_YEARS || rangeUnit == FOREVER) {
-                if (temporal.isSupported(weekDef.weekBasedYear) &&
-                    temporal.isSupported(weekDef.weekOfWeekBasedYear)) {
-                    // week-of-week-based-year and year-of-week-based-year
-                    int yowby = temporal.get(weekDef.weekBasedYear);
-                    int wowby = temporal.get(weekDef.weekOfWeekBasedYear);
-                    ChronoLocalDate date = ofWeekBasedYear(Chronology.from(temporal), yowby, wowby, dow);
 
-                    Map result = new HashMap<>(4, 1.0f);
-                    result.put(EPOCH_DAY, date.toEpochDay());
-                    result.put(DAY_OF_WEEK, null);
-                    result.put(weekDef.weekOfWeekBasedYear, null);
-                    result.put(weekDef.weekBasedYear, null);
-                    return result;
+            // can only build date if ISO day-of-week is present
+            if (fieldValues.containsKey(DAY_OF_WEEK) == false) {
+                return null;
+            }
+            int isoDow = DAY_OF_WEEK.checkValidIntValue(fieldValues.get(DAY_OF_WEEK));
+            int dow = localizedDayOfWeek(isoDow);
+
+            // build date
+            if (fieldValues.containsKey(YEAR)) {
+                int year = YEAR.checkValidIntValue(fieldValues.get(YEAR));  // validate
+                if (rangeUnit == MONTHS && fieldValues.containsKey(MONTH_OF_YEAR)) {  // week-of-month
+                    long month = fieldValues.get(MONTH_OF_YEAR);  // not validated yet
+                    return resolveWoM(fieldValues, chronology, year, month, newValue, dow, resolverStyle);
                 }
+                if (rangeUnit == YEARS) {  // week-of-year
+                    return resolveWoY(fieldValues, chronology, year, newValue, dow, resolverStyle);
+                }
+            } else if ((rangeUnit == WEEK_BASED_YEARS || rangeUnit == FOREVER) &&
+                    fieldValues.containsKey(weekDef.weekBasedYear) &&
+                    fieldValues.containsKey(weekDef.weekOfWeekBasedYear)) { // week-of-week-based-year and year-of-week-based-year
+                return resolveWBY(fieldValues, chronology, dow, resolverStyle);
             }
             return null;
         }
 
-        //-----------------------------------------------------------------------
-        @Override
-        public String getName() {
-            return name;
+        private ChronoLocalDate resolveWoM(
+                Map fieldValues, Chronology chrono, int year, long month, long wom, int localDow, ResolverStyle resolverStyle) {
+            ChronoLocalDate date;
+            if (resolverStyle == ResolverStyle.LENIENT) {
+                date = chrono.date(year, 1, 1).plus(Math.subtractExact(month, 1), MONTHS);
+                long weeks = Math.subtractExact(wom, localizedWeekOfMonth(date));
+                int days = localDow - localizedDayOfWeek(date);  // safe from overflow
+                date = date.plus(Math.addExact(Math.multiplyExact(weeks, 7), days), DAYS);
+            } else {
+                int monthValid = MONTH_OF_YEAR.checkValidIntValue(month);  // validate
+                date = chrono.date(year, monthValid, 1);
+                int womInt = range.checkValidIntValue(wom, this);  // validate
+                int weeks = (int) (womInt - localizedWeekOfMonth(date));  // safe from overflow
+                int days = localDow - localizedDayOfWeek(date);  // safe from overflow
+                date = date.plus(weeks * 7 + days, DAYS);
+                if (resolverStyle == ResolverStyle.STRICT && date.getLong(MONTH_OF_YEAR) != month) {
+                    throw new DateTimeException("Strict mode rejected resolved date as it is in a different month");
+                }
+            }
+            fieldValues.remove(this);
+            fieldValues.remove(YEAR);
+            fieldValues.remove(MONTH_OF_YEAR);
+            fieldValues.remove(DAY_OF_WEEK);
+            return date;
         }
 
+        private ChronoLocalDate resolveWoY(
+                Map fieldValues, Chronology chrono, int year, long woy, int localDow, ResolverStyle resolverStyle) {
+            ChronoLocalDate date = chrono.date(year, 1, 1);
+            if (resolverStyle == ResolverStyle.LENIENT) {
+                long weeks = Math.subtractExact(woy, localizedWeekOfYear(date));
+                int days = localDow - localizedDayOfWeek(date);  // safe from overflow
+                date = date.plus(Math.addExact(Math.multiplyExact(weeks, 7), days), DAYS);
+            } else {
+                int womInt = range.checkValidIntValue(woy, this);  // validate
+                int weeks = (int) (womInt - localizedWeekOfYear(date));  // safe from overflow
+                int days = localDow - localizedDayOfWeek(date);  // safe from overflow
+                date = date.plus(weeks * 7 + days, DAYS);
+                if (resolverStyle == ResolverStyle.STRICT && date.getLong(YEAR) != year) {
+                    throw new DateTimeException("Strict mode rejected resolved date as it is in a different year");
+                }
+            }
+            fieldValues.remove(this);
+            fieldValues.remove(YEAR);
+            fieldValues.remove(DAY_OF_WEEK);
+            return date;
+        }
+
+        private ChronoLocalDate resolveWBY(
+                Map fieldValues, Chronology chrono, int localDow, ResolverStyle resolverStyle) {
+            int yowby = weekDef.weekBasedYear.range().checkValidIntValue(
+                    fieldValues.get(weekDef.weekBasedYear), weekDef.weekBasedYear);
+            ChronoLocalDate date;
+            if (resolverStyle == ResolverStyle.LENIENT) {
+                date = ofWeekBasedYear(chrono, yowby, 1, localDow);
+                long wowby = fieldValues.get(weekDef.weekOfWeekBasedYear);
+                long weeks = Math.subtractExact(wowby, 1);
+                date = date.plus(weeks, WEEKS);
+            } else {
+                int wowby = weekDef.weekOfWeekBasedYear.range().checkValidIntValue(
+                        fieldValues.get(weekDef.weekOfWeekBasedYear), weekDef.weekOfWeekBasedYear);  // validate
+                date = ofWeekBasedYear(chrono, yowby, wowby, localDow);
+                if (resolverStyle == ResolverStyle.STRICT && localizedWeekBasedYear(date) != yowby) {
+                    throw new DateTimeException("Strict mode rejected resolved date as it is in a different week-based-year");
+                }
+            }
+            fieldValues.remove(this);
+            fieldValues.remove(weekDef.weekBasedYear);
+            fieldValues.remove(weekDef.weekOfWeekBasedYear);
+            fieldValues.remove(DAY_OF_WEEK);
+            return date;
+        }
+
+        //-----------------------------------------------------------------------
         @Override
         public String getDisplayName(Locale locale) {
             Objects.requireNonNull(locale, "locale");
@@ -876,9 +1013,9 @@ public final class WeekFields implements Serializable {
                 LocaleResources lr = LocaleProviderAdapter.getResourceBundleBased()
                         .getLocaleResources(locale);
                 ResourceBundle rb = lr.getJavaTimeFormatData();
-                return rb.containsKey("field.week") ? rb.getString("field.week") : getName();
+                return rb.containsKey("field.week") ? rb.getString("field.week") : name;
             }
-            return getName();
+            return name;
         }
 
         @Override
@@ -896,6 +1033,11 @@ public final class WeekFields implements Serializable {
             return true;
         }
 
+        @Override
+        public boolean isTimeBased() {
+            return false;
+        }
+
         @Override
         public ValueRange range() {
             return range;
@@ -988,7 +1130,7 @@ public final class WeekFields implements Serializable {
         //-----------------------------------------------------------------------
         @Override
         public String toString() {
-            return getName() + "[" + weekDef.toString() + "]";
+            return name + "[" + weekDef.toString() + "]";
         }
     }
 }
diff --git a/jdk/src/share/lib/hijrah-config-umalqura.properties b/jdk/src/share/lib/hijrah-config-umalqura.properties
index ac16c7e222f..1786c14de97 100644
--- a/jdk/src/share/lib/hijrah-config-umalqura.properties
+++ b/jdk/src/share/lib/hijrah-config-umalqura.properties
@@ -1,58 +1,369 @@
-#
-# hijrah-config-umalqura.properties
-#
-#
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-#
-# This properties file defines a Hijrah calendar variant.
-#
-# Fields:
-#
-#        ::= 'version' '=' 
-#             ::= 'id' '=' 
-#           ::= 'type' '=' 
-#      ::= 'iso-start' '=' 
-#           ::=  '=' 
-#
-# version ... (Required)
-#
-# id ... (Required)
-#    Identifies the Java Chronology
-#
-# type ... (Required)
-#    Identifies the type of calendar in the standard calendar ID scheme
-# iso-start ... (Required)
-#    Specifies the corresponding ISO date to the first Hijrah day
-#    in the defined range of dates
-#
-# year ... (Required)
-#    Number of days for each month of a Hijrah year
-#    * Each line defines a year. The years must be in the chronological
-#      order and no gap is allowed.
-#    * Each line is in the form indicated above.  is a Hijrah year and
-#      nn is the number of days for a month listed in the order of the months.
-#    * Each year must have 12 months.
-#    * Each month should be 29 or 30 days long.
-#    * There must be one or more space characters between the months.
-#
-
-# indicates the version of this definition
-version=1.8.0_1
-
-# Java chronology ID
-id=Hijrah-umalqura
-
-# Standard calendar type specification
-type=islamic-umalqura
-
-# defines the corresponding ISO date to the earliest Hijrah date
-iso-start=2010-12-07
-
-#
-# the data section; defines the dates with the number of days for each month
-#
-# Placeholder data until full Umm alQura data can be validated
-1432=29 30 30 30 29 30 29 30 29 30 29 29
-1433=30 29 30 30 29 30 30 29 30 29 30 29
-1434=29 30 29 30 29 30 30 29 30 30 29 29
-1435=30 29 30 29 30 29 30 29 30 30 29 30
+# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+# This properties file defines a Hijrah calendar variant.
+#
+# Fields:
+#
+#        ::= 'version' '=' 
+#             ::= 'id' '=' 
+#           ::= 'type' '=' 
+#      ::= 'iso-start' '=' 
+#           ::=  '=' 
+#
+# version ... (Required)
+#
+# id ... (Required)
+#    Identifies the Java Chronology
+#
+# type ... (Required)
+#    Identifies the type of calendar in the standard calendar ID scheme
+# iso-start ... (Required)
+#    Specifies the corresponding ISO date to the first Hijrah day
+#    in the defined range of dates
+#
+# year ... (Required)
+#    Number of days for each month of a Hijrah year
+#    * Each line defines a year. The years must be in chronological
+#      order and no gap is allowed.
+#    * Each line is in the form indicated above.  is a Hijrah year and
+#      nn is the number of days for a month listed in the order of the months.
+#    * Each year must have 12 months.
+#    * Each month should be 29 or 30 days long.
+#    * There must be one or more space characters between the months.
+#
+
+# Version of this definition
+version=1.8.0_1
+
+# Java chronology ID
+id=Hijrah-umalqura
+
+# Standard calendar type specification
+type=islamic-umalqura
+
+# defines the corresponding ISO date to the earliest Hijrah date
+iso-start=1882-11-12
+
+#     1  2  3  4  5  6  7  8  9 10 11 12
+1300=30 29 30 29 30 29 30 29 30 29 30 29
+1301=30 30 29 30 29 30 29 30 29 30 29 29
+1302=30 30 30 29 30 30 29 29 30 29 29 30
+1303=29 30 30 29 30 30 29 30 29 30 29 29
+1304=29 30 30 29 30 30 30 29 30 29 30 29
+1305=29 29 30 30 29 30 30 29 30 30 29 29
+1306=30 29 30 29 30 29 30 29 30 30 29 30
+1307=29 30 29 30 29 30 29 30 29 30 29 30
+1308=29 30 30 29 30 29 30 29 30 29 29 30
+1309=29 30 30 30 30 29 29 30 29 29 30 29
+1310=30 29 30 30 30 29 30 29 30 29 29 30
+1311=29 30 29 30 30 30 29 30 29 30 29 29
+1312=30 29 30 29 30 30 29 30 30 29 30 29
+1313=29 30 29 30 29 30 29 30 30 30 29 29
+1314=30 30 29 30 29 29 30 29 30 30 29 30
+1315=29 30 30 29 30 29 29 30 29 30 29 30
+1316=29 30 30 30 29 30 29 29 30 29 30 29
+1317=30 29 30 30 29 30 29 30 29 30 29 29
+1318=30 29 30 30 29 30 30 29 30 29 30 29
+1319=29 30 29 30 30 29 30 29 30 30 29 30
+1320=29 30 29 29 30 29 30 29 30 30 30 29
+1321=30 29 30 29 29 30 29 29 30 30 30 30
+1322=29 30 29 30 29 29 29 30 29 30 30 30
+1323=29 30 30 29 30 29 29 29 30 29 30 30
+1324=29 30 30 29 30 29 30 29 29 30 29 30
+1325=30 29 30 29 30 30 29 30 29 30 29 30
+1326=29 29 30 29 30 30 29 30 29 30 30 29
+1327=30 29 29 30 29 30 29 30 30 29 30 30
+1328=29 30 29 29 30 29 29 30 30 30 29 30
+1329=30 29 30 29 29 30 29 29 30 30 29 30
+1330=30 30 29 30 29 29 30 29 29 30 30 29
+1331=30 30 29 30 30 29 29 30 29 30 29 30
+1332=29 30 29 30 30 29 30 29 30 30 29 29
+1333=30 29 29 30 30 29 30 30 29 30 30 29
+1334=29 29 30 29 30 29 30 30 30 29 30 29
+1335=30 29 30 29 29 30 29 30 30 29 30 30
+1336=29 30 29 30 29 29 30 29 30 29 30 30
+1337=30 29 30 29 30 29 29 30 29 30 29 30
+1338=29 30 30 29 30 30 29 29 30 29 30 29
+1339=30 29 30 29 30 30 30 29 30 29 29 30
+1340=29 29 30 29 30 30 30 30 29 30 29 29
+1341=30 29 29 30 29 30 30 30 29 30 30 29
+1342=29 29 30 29 30 29 30 30 29 30 30 29
+1343=30 29 29 30 29 30 29 30 29 30 30 29
+1344=30 29 30 29 30 30 29 29 30 29 30 29
+1345=30 29 30 30 30 29 30 29 29 30 29 29
+1346=30 29 30 30 30 30 29 30 29 29 30 29
+1347=29 30 29 30 30 30 29 30 30 29 29 30
+1348=29 29 30 29 30 30 29 30 30 30 29 29
+1349=30 29 29 30 29 30 30 29 30 30 29 30
+1350=29 30 29 30 29 30 29 29 30 30 29 30
+1351=30 29 30 29 30 29 30 29 29 30 29 30
+1352=30 29 30 30 29 30 29 30 29 29 30 29
+1353=30 29 30 30 30 29 30 29 29 30 29 30
+1354=29 30 29 30 30 29 30 30 29 30 29 29
+1355=30 29 29 30 30 29 30 30 29 30 30 29
+1356=29 30 29 30 29 30 29 30 29 30 30 30
+1357=29 29 30 29 30 29 29 30 29 30 30 30
+1358=29 30 29 30 29 30 29 29 30 29 30 30
+1359=29 30 30 29 30 29 30 29 29 29 30 30
+1360=29 30 30 30 29 30 29 30 29 29 30 29
+1361=30 29 30 30 29 30 30 29 29 30 29 30
+1362=29 30 29 30 29 30 30 29 30 29 30 29
+1363=30 29 30 29 30 29 30 29 30 29 30 30
+1364=29 30 29 30 29 29 30 29 30 29 30 30
+1365=30 30 29 29 30 29 29 30 29 30 29 30
+1366=30 30 29 30 29 30 29 29 30 29 30 29
+1367=30 30 29 30 30 29 30 29 29 30 29 30
+1368=29 30 29 30 30 30 29 29 30 29 30 29
+1369=30 29 30 29 30 30 29 30 29 30 30 29
+1370=30 29 29 30 29 30 29 30 29 30 30 30
+1371=29 30 29 29 30 29 30 29 30 29 30 30
+1372=30 29 29 30 29 30 29 29 30 29 30 30
+1373=30 29 30 29 30 29 30 29 29 30 29 30
+1374=30 29 30 30 29 30 29 30 29 29 30 29
+1375=30 29 30 30 29 30 30 29 30 29 30 29
+1376=29 30 29 30 29 30 30 30 29 30 29 30
+1377=29 29 30 29 29 30 30 30 29 30 30 29
+1378=30 29 29 29 30 29 30 30 29 30 30 30
+1379=29 30 29 29 29 30 29 30 30 29 30 30
+1380=29 30 29 30 29 30 29 30 29 30 29 30
+1381=29 30 29 30 30 29 30 29 30 29 29 30
+1382=29 30 29 30 30 29 30 30 29 30 29 29
+1383=30 29 29 30 30 30 29 30 30 29 30 29
+1384=29 30 29 29 30 30 29 30 30 30 29 30
+1385=29 29 30 29 29 30 30 29 30 30 30 29
+1386=30 29 29 30 29 29 30 30 29 30 30 29
+1387=30 29 30 29 30 29 30 29 30 29 30 29
+1388=30 30 29 30 29 30 29 30 29 30 29 29
+1389=30 30 29 30 30 29 30 30 29 29 30 29
+1390=29 30 29 30 30 30 29 30 29 30 29 30
+1391=29 29 30 29 30 30 29 30 30 29 30 29
+1392=30 29 29 30 29 30 29 30 30 29 30 30
+1393=29 30 29 29 30 29 30 29 30 29 30 30
+1394=30 29 30 29 29 30 29 30 29 30 29 30
+1395=30 29 30 30 29 30 29 29 30 29 29 30
+1396=30 29 30 30 29 30 30 29 29 30 29 29
+1397=30 29 30 30 29 30 30 30 29 29 29 30
+1398=29 30 29 30 30 29 30 30 29 30 29 29
+1399=30 29 30 29 30 29 30 30 29 30 29 30
+1400=30 29 30 29 29 30 29 30 29 30 29 30
+1401=30 30 29 30 29 29 30 29 29 30 29 30
+1402=30 30 30 29 30 29 29 30 29 29 30 29
+1403=30 30 30 29 30 30 29 29 30 29 29 30
+1404=29 30 30 29 30 30 29 30 29 30 29 29
+1405=30 29 30 29 30 30 30 29 30 29 29 30
+1406=30 29 29 30 29 30 30 29 30 29 30 30
+1407=29 30 29 29 30 29 30 29 30 29 30 30
+1408=30 29 30 29 30 29 29 30 29 29 30 30
+1409=30 30 29 30 29 30 29 29 30 29 29 30
+1410=30 30 29 30 30 29 30 29 29 30 29 29
+1411=30 30 29 30 30 29 30 30 29 29 30 29
+1412=30 29 30 29 30 29 30 30 30 29 29 30
+1413=29 30 29 29 30 29 30 30 30 29 30 29
+1414=30 29 30 29 29 30 29 30 30 29 30 30
+1415=29 30 29 30 29 29 30 29 30 29 30 30
+1416=30 29 30 29 30 29 29 30 29 30 29 30
+1417=30 29 30 30 29 29 30 29 30 29 30 29
+1418=30 29 30 30 29 30 29 30 29 30 29 30
+1419=29 30 29 30 29 30 29 30 30 30 29 29
+1420=29 30 29 29 30 29 30 30 30 30 29 30
+1421=29 29 30 29 29 29 30 30 30 30 29 30
+1422=30 29 29 30 29 29 29 30 30 30 29 30
+1423=30 29 30 29 30 29 29 30 29 30 29 30
+1424=30 29 30 30 29 30 29 29 30 29 30 29
+1425=30 29 30 30 29 30 29 30 30 29 30 29
+1426=29 30 29 30 29 30 30 29 30 30 29 30
+1427=29 29 30 29 30 29 30 30 29 30 30 29
+1428=30 29 29 30 29 29 30 30 30 29 30 30
+1429=29 30 29 29 30 29 29 30 30 29 30 30
+1430=29 30 30 29 29 30 29 30 29 30 29 30
+1431=29 30 30 29 30 29 30 29 30 29 29 30
+1432=29 30 30 30 29 30 29 30 29 30 29 29
+1433=30 29 30 30 29 30 30 29 30 29 30 29
+1434=29 30 29 30 29 30 30 29 30 30 29 29
+1435=30 29 30 29 30 29 30 29 30 30 29 30
+1436=29 30 29 30 29 30 29 30 29 30 29 30
+1437=30 29 30 30 29 29 30 29 30 29 29 30
+1438=30 29 30 30 30 29 29 30 29 29 30 29
+1439=30 29 30 30 30 29 30 29 30 29 29 30
+1440=29 30 29 30 30 30 29 30 29 30 29 29
+1441=30 29 30 29 30 30 29 30 30 29 30 29
+1442=29 30 29 30 29 30 29 30 30 29 30 29
+1443=30 29 30 29 30 29 30 29 30 29 30 30
+1444=29 30 29 30 30 29 29 30 29 30 29 30
+1445=29 30 30 30 29 30 29 29 30 29 29 30
+1446=29 30 30 30 29 30 30 29 29 30 29 29
+1447=30 29 30 30 30 29 30 29 30 29 30 29
+1448=29 30 29 30 30 29 30 30 29 30 29 30
+1449=29 29 30 29 30 29 30 30 29 30 30 29
+1450=30 29 30 29 29 30 29 30 29 30 30 29
+1451=30 30 30 29 29 30 29 29 30 30 29 30
+1452=30 29 30 30 29 29 30 29 29 30 29 30
+1453=30 29 30 30 29 30 29 30 29 29 30 29
+1454=30 29 30 30 29 30 30 29 30 29 30 29
+1455=29 30 29 30 30 29 30 29 30 30 29 30
+1456=29 29 30 29 30 29 30 29 30 30 30 29
+1457=30 29 29 30 29 29 30 29 30 30 30 30
+1458=29 30 29 29 30 29 29 30 29 30 30 30
+1459=29 30 30 29 29 30 29 29 30 29 30 30
+1460=29 30 30 29 30 29 30 29 29 30 29 30
+1461=29 30 30 29 30 29 30 29 30 30 29 29
+1462=30 29 30 29 30 30 29 30 29 30 30 29
+1463=29 30 29 30 29 30 29 30 30 30 29 30
+1464=29 30 29 29 30 29 29 30 30 30 29 30
+1465=30 29 30 29 29 30 29 29 30 30 29 30
+1466=30 30 29 30 29 29 29 30 29 30 30 29
+1467=30 30 29 30 30 29 29 30 29 30 29 30
+1468=29 30 29 30 30 29 30 29 30 29 30 29
+1469=29 30 29 30 30 29 30 30 29 30 29 30
+1470=29 29 30 29 30 30 29 30 30 29 30 29
+1471=30 29 29 30 29 30 29 30 30 29 30 30
+1472=29 30 29 29 30 29 30 29 30 30 29 30
+1473=29 30 29 30 30 29 29 30 29 30 29 30
+1474=29 30 30 29 30 30 29 29 30 29 30 29
+1475=29 30 30 29 30 30 30 29 29 30 29 29
+1476=30 29 30 29 30 30 30 29 30 29 30 29
+1477=29 30 29 29 30 30 30 30 29 30 29 30
+1478=29 29 30 29 30 29 30 30 29 30 30 29
+1479=30 29 29 30 29 30 29 30 29 30 30 29
+1480=30 29 30 29 30 29 30 29 30 29 30 29
+1481=30 29 30 30 29 30 29 30 29 30 29 29
+1482=30 29 30 30 30 30 29 30 29 29 30 29
+1483=29 30 29 30 30 30 29 30 30 29 29 30
+1484=29 29 30 29 30 30 30 29 30 29 30 29
+1485=30 29 29 30 29 30 30 29 30 30 29 30
+1486=29 30 29 29 30 29 30 29 30 30 29 30
+1487=30 29 30 29 30 29 29 30 29 30 29 30
+1488=30 29 30 30 29 30 29 29 30 29 30 29
+1489=30 29 30 30 30 29 30 29 29 30 29 30
+1490=29 30 29 30 30 29 30 30 29 29 30 29
+1491=30 29 29 30 30 29 30 30 29 30 29 30
+1492=29 30 29 29 30 30 29 30 29 30 30 29
+1493=30 29 30 29 30 29 29 30 29 30 30 30
+1494=29 30 29 30 29 30 29 29 29 30 30 30
+1495=29 30 30 29 30 29 29 30 29 29 30 30
+1496=29 30 30 30 29 30 29 29 30 29 29 30
+1497=30 29 30 30 29 30 29 30 29 30 29 30
+1498=29 30 29 30 29 30 30 29 30 29 30 29
+1499=30 29 30 29 29 30 30 29 30 29 30 30
+1500=29 30 29 30 29 29 30 29 30 29 30 30
+1501=30 29 30 29 30 29 29 29 30 29 30 30
+1502=30 30 29 30 29 30 29 29 29 30 30 29
+1503=30 30 29 30 30 29 30 29 29 29 30 30
+1504=29 30 29 30 30 30 29 29 30 29 30 29
+1505=30 29 30 29 30 30 29 30 29 30 30 29
+1506=29 30 29 29 30 30 29 30 30 29 30 30
+1507=29 29 30 29 29 30 30 29 30 29 30 30
+1508=30 29 29 30 29 30 29 29 30 29 30 30
+1509=30 29 30 29 30 29 30 29 29 30 29 30
+1510=30 29 30 30 29 30 29 30 29 29 30 29
+1511=30 29 30 30 29 30 30 29 30 29 29 30
+1512=29 30 29 30 29 30 30 30 29 30 29 30
+1513=29 29 29 30 29 30 30 30 29 30 30 29
+1514=30 29 29 29 30 29 30 30 29 30 30 30
+1515=29 29 30 29 29 30 29 30 30 29 30 30
+1516=29 30 29 30 29 29 30 29 30 29 30 30
+1517=29 30 29 30 29 30 30 29 29 30 29 30
+1518=29 30 29 30 30 29 30 30 29 30 29 29
+1519=30 29 29 30 30 30 29 30 30 29 30 29
+1520=29 30 29 29 30 30 30 29 30 30 29 30
+1521=29 29 29 30 29 30 30 29 30 30 29 30
+1522=30 29 29 29 30 29 30 30 29 30 30 29
+1523=30 29 30 29 30 29 30 29 29 30 30 29
+1524=30 30 29 30 29 30 29 30 29 29 30 29
+1525=30 30 29 30 30 29 30 29 30 29 29 30
+1526=29 30 29 30 30 30 29 30 29 30 29 29
+1527=30 29 30 29 30 30 29 30 30 29 30 29
+1528=30 29 29 30 29 30 29 30 30 29 30 30
+1529=29 30 29 29 30 29 30 29 30 29 30 30
+1530=29 30 30 29 29 30 29 30 29 29 30 30
+1531=29 30 30 30 29 29 30 29 30 29 29 30
+1532=29 30 30 30 29 30 30 29 29 29 30 29
+1533=30 29 30 30 30 29 30 29 30 29 29 30
+1534=29 30 29 30 30 29 30 30 29 29 30 29
+1535=30 29 30 29 30 29 30 30 29 30 29 30
+1536=29 30 29 30 29 30 29 30 29 30 29 30
+1537=30 29 30 30 29 29 30 29 29 30 29 30
+1538=30 30 29 30 30 29 29 30 29 29 30 29
+1539=30 30 30 29 30 30 29 29 30 29 29 30
+1540=29 30 30 29 30 30 29 30 29 29 30 29
+1541=30 29 30 29 30 30 30 29 30 29 29 30
+1542=29 30 29 30 29 30 30 29 30 29 30 30
+1543=29 30 29 29 30 29 30 29 30 29 30 30
+1544=30 29 30 29 29 30 29 30 29 30 29 30
+1545=30 30 29 30 29 29 30 29 30 29 29 30
+1546=30 30 29 30 29 30 29 30 29 30 29 29
+1547=30 30 29 30 30 29 30 29 30 29 30 29
+1548=30 29 29 30 30 29 30 30 29 30 29 30
+1549=29 30 29 29 30 29 30 30 30 29 30 29
+1550=30 29 30 29 29 29 30 30 30 29 30 30
+1551=29 30 29 29 30 29 29 30 30 29 30 30
+1552=30 29 30 29 29 30 29 29 30 30 29 30
+1553=30 29 30 29 30 29 30 29 30 29 30 29
+1554=30 29 30 29 30 30 29 30 29 30 29 30
+1555=29 29 30 29 30 30 29 30 30 29 30 29
+1556=30 29 29 30 29 30 29 30 30 30 29 30
+1557=29 30 29 29 29 30 29 30 30 30 30 29
+1558=30 29 30 29 29 29 30 29 30 30 30 29
+1559=30 30 29 29 30 29 29 30 30 29 30 29
+1560=30 30 29 30 29 30 29 30 29 30 29 30
+1561=29 30 30 29 30 29 30 30 29 29 30 29
+1562=29 30 30 29 30 29 30 30 30 29 29 30
+1563=29 30 29 29 30 29 30 30 30 29 30 29
+1564=30 29 30 29 29 30 29 30 30 30 29 30
+1565=29 30 29 30 29 29 30 29 30 30 29 30
+1566=30 29 30 29 30 29 29 30 29 30 29 30
+1567=30 29 30 30 29 30 29 30 29 29 30 29
+1568=30 29 30 30 30 29 30 29 30 29 29 29
+1569=30 29 30 30 30 29 30 30 29 30 29 29
+1570=29 30 29 30 30 29 30 30 30 29 29 30
+1571=29 29 30 29 30 30 29 30 30 29 30 29
+1572=30 29 29 30 29 30 29 30 30 29 30 29
+1573=30 29 30 30 29 30 29 29 30 29 30 29
+1574=30 30 29 30 30 29 30 29 29 30 29 29
+1575=30 30 30 29 30 30 29 30 29 29 29 30
+1576=29 30 30 29 30 30 30 29 30 29 29 29
+1577=30 29 30 30 29 30 30 29 30 29 30 29
+1578=29 30 29 30 29 30 30 29 30 30 29 30
+1579=29 30 29 30 29 29 30 30 29 30 29 30
+1580=29 30 30 29 30 29 29 30 29 30 29 30
+1581=30 30 29 30 29 30 29 29 30 29 30 29
+1582=30 30 29 30 30 29 30 29 30 29 29 29
+1583=30 30 29 30 30 30 29 30 29 30 29 29
+1584=29 30 30 29 30 30 29 30 30 29 30 29
+1585=29 30 29 30 29 30 29 30 30 29 30 30
+1586=29 29 30 29 30 29 29 30 30 30 29 30
+1587=29 30 30 29 29 29 30 29 30 29 30 30
+1588=30 29 30 30 29 29 29 30 29 30 29 30
+1589=30 29 30 30 29 30 29 29 30 29 30 29
+1590=30 29 30 30 30 29 29 30 29 30 29 30
+1591=29 30 29 30 30 29 30 29 30 29 30 29
+1592=30 29 30 29 30 29 30 29 30 30 30 29
+1593=30 29 29 30 29 29 30 29 30 30 30 29
+1594=30 30 29 29 30 29 29 29 30 30 30 30
+1595=29 30 29 30 29 29 30 29 29 30 30 30
+1596=29 30 30 29 30 29 29 30 29 30 29 30
+1597=29 30 30 29 30 29 30 29 30 29 30 29
+1598=30 29 30 29 30 30 29 30 29 30 30 29
+1599=29 30 29 30 29 30 29 30 30 30 29 30
+1600=29 29 30 29 30 29 29 30 30 30 29 30
diff --git a/jdk/test/java/time/tck/java/time/MockSimplePeriod.java b/jdk/test/java/time/tck/java/time/MockSimplePeriod.java
index 7b008341592..1548e2e98f9 100644
--- a/jdk/test/java/time/tck/java/time/MockSimplePeriod.java
+++ b/jdk/test/java/time/tck/java/time/MockSimplePeriod.java
@@ -176,7 +176,7 @@ public final class MockSimplePeriod
 
     @Override
     public String toString() {
-        return amount + " " + unit.getName();
+        return amount + " " + unit;
     }
 
 }
diff --git a/jdk/test/java/time/tck/java/time/TCKClock_Fixed.java b/jdk/test/java/time/tck/java/time/TCKClock_Fixed.java
index 13cc7b4093d..ef9f12acc47 100644
--- a/jdk/test/java/time/tck/java/time/TCKClock_Fixed.java
+++ b/jdk/test/java/time/tck/java/time/TCKClock_Fixed.java
@@ -91,6 +91,7 @@ public class TCKClock_Fixed extends AbstractTCKTest {
         Clock test = Clock.fixed(INSTANT, PARIS);
         assertEquals(test.instant(), INSTANT);
         assertEquals(test.getZone(), PARIS);
+   assertEquals(test.instant().getEpochSecond()*1000, test.millis());
     }
 
     @Test(expectedExceptions = NullPointerException.class)
diff --git a/jdk/test/java/time/tck/java/time/TCKDayOfWeek.java b/jdk/test/java/time/tck/java/time/TCKDayOfWeek.java
index 671d9ec53e9..3bf782ba954 100644
--- a/jdk/test/java/time/tck/java/time/TCKDayOfWeek.java
+++ b/jdk/test/java/time/tck/java/time/TCKDayOfWeek.java
@@ -158,6 +158,44 @@ public class TCKDayOfWeek extends AbstractDateTimeTest {
         DayOfWeek.from((TemporalAccessor) null);
     }
 
+    //-----------------------------------------------------------------------
+    // isSupported(TemporalField)
+    //-----------------------------------------------------------------------
+    @Test
+    public void test_isSupported_TemporalField() {
+        assertEquals(DayOfWeek.THURSDAY.isSupported((TemporalField) null), false);
+        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.NANO_OF_SECOND), false);
+        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.NANO_OF_DAY), false);
+        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.MICRO_OF_SECOND), false);
+        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.MICRO_OF_DAY), false);
+        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.MILLI_OF_SECOND), false);
+        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.MILLI_OF_DAY), false);
+        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.SECOND_OF_MINUTE), false);
+        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.SECOND_OF_DAY), false);
+        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.MINUTE_OF_HOUR), false);
+        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.MINUTE_OF_DAY), false);
+        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.HOUR_OF_AMPM), false);
+        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.CLOCK_HOUR_OF_AMPM), false);
+        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.HOUR_OF_DAY), false);
+        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.CLOCK_HOUR_OF_DAY), false);
+        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.AMPM_OF_DAY), false);
+        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.DAY_OF_WEEK), true);
+        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH), false);
+        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR), false);
+        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.DAY_OF_MONTH), false);
+        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.DAY_OF_YEAR), false);
+        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.EPOCH_DAY), false);
+        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.ALIGNED_WEEK_OF_MONTH), false);
+        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.ALIGNED_WEEK_OF_YEAR), false);
+        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.MONTH_OF_YEAR), false);
+        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.PROLEPTIC_MONTH), false);
+        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.YEAR), false);
+        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.YEAR_OF_ERA), false);
+        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.ERA), false);
+        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.INSTANT_SECONDS), false);
+        assertEquals(DayOfWeek.THURSDAY.isSupported(ChronoField.OFFSET_SECONDS), false);
+    }
+
     //-----------------------------------------------------------------------
     // get(TemporalField)
     //-----------------------------------------------------------------------
diff --git a/jdk/test/java/time/tck/java/time/TCKInstant.java b/jdk/test/java/time/tck/java/time/TCKInstant.java
index bdf5fcccb70..05d7b83fcf1 100644
--- a/jdk/test/java/time/tck/java/time/TCKInstant.java
+++ b/jdk/test/java/time/tck/java/time/TCKInstant.java
@@ -569,10 +569,6 @@ public class TCKInstant extends AbstractDateTimeTest {
     // truncated(TemporalUnit)
     //-----------------------------------------------------------------------
     TemporalUnit NINETY_MINS = new TemporalUnit() {
-        @Override
-        public String getName() {
-            return "NinetyMins";
-        }
         @Override
         public Duration getDuration() {
             return Duration.ofMinutes(90);
@@ -582,6 +578,14 @@ public class TCKInstant extends AbstractDateTimeTest {
             return false;
         }
         @Override
+        public boolean isDateBased() {
+            return false;
+        }
+        @Override
+        public boolean isTimeBased() {
+            return true;
+        }
+        @Override
         public boolean isSupportedBy(Temporal temporal) {
             return false;
         }
@@ -593,13 +597,13 @@ public class TCKInstant extends AbstractDateTimeTest {
         public long between(Temporal temporal1, Temporal temporal2) {
             throw new UnsupportedOperationException();
         }
+        @Override
+        public String toString() {
+            return "NinetyMins";
+        }
     };
 
     TemporalUnit NINETY_FIVE_MINS = new TemporalUnit() {
-        @Override
-        public String getName() {
-            return "NinetyFiveMins";
-        }
         @Override
         public Duration getDuration() {
             return Duration.ofMinutes(95);
@@ -609,6 +613,14 @@ public class TCKInstant extends AbstractDateTimeTest {
             return false;
         }
         @Override
+        public boolean isDateBased() {
+            return false;
+        }
+        @Override
+        public boolean isTimeBased() {
+            return false;
+        }
+        @Override
         public boolean isSupportedBy(Temporal temporal) {
             return false;
         }
@@ -620,6 +632,10 @@ public class TCKInstant extends AbstractDateTimeTest {
         public long between(Temporal temporal1, Temporal temporal2) {
             throw new UnsupportedOperationException();
         }
+        @Override
+        public String toString() {
+            return "NinetyFiveMins";
+        }
     };
 
     @DataProvider(name="truncatedToValid")
@@ -1709,7 +1725,7 @@ public class TCKInstant extends AbstractDateTimeTest {
     }
 
     //-----------------------------------------------------------------------
-    // periodUntil(Temporal, TemporalUnit)
+    // until(Temporal, TemporalUnit)
     //-----------------------------------------------------------------------
     @DataProvider(name="periodUntilUnit")
     Object[][] data_periodUntilUnit() {
@@ -1805,7 +1821,7 @@ public class TCKInstant extends AbstractDateTimeTest {
     public void test_periodUntil_TemporalUnit(long seconds1, int nanos1, long seconds2, long nanos2, TemporalUnit unit, long expected) {
         Instant i1 = Instant.ofEpochSecond(seconds1, nanos1);
         Instant i2 = Instant.ofEpochSecond(seconds2, nanos2);
-        long amount = i1.periodUntil(i2, unit);
+        long amount = i1.until(i2, unit);
         assertEquals(amount, expected);
     }
 
@@ -1813,23 +1829,23 @@ public class TCKInstant extends AbstractDateTimeTest {
     public void test_periodUntil_TemporalUnit_negated(long seconds1, int nanos1, long seconds2, long nanos2, TemporalUnit unit, long expected) {
         Instant i1 = Instant.ofEpochSecond(seconds1, nanos1);
         Instant i2 = Instant.ofEpochSecond(seconds2, nanos2);
-        long amount = i2.periodUntil(i1, unit);
+        long amount = i2.until(i1, unit);
         assertEquals(amount, -expected);
     }
 
     @Test(expectedExceptions = UnsupportedTemporalTypeException.class)
     public void test_periodUntil_TemporalUnit_unsupportedUnit() {
-        TEST_12345_123456789.periodUntil(TEST_12345_123456789, MONTHS);
+        TEST_12345_123456789.until(TEST_12345_123456789, MONTHS);
     }
 
     @Test(expectedExceptions = NullPointerException.class)
     public void test_periodUntil_TemporalUnit_nullEnd() {
-        TEST_12345_123456789.periodUntil(null, HOURS);
+        TEST_12345_123456789.until(null, HOURS);
     }
 
     @Test(expectedExceptions = NullPointerException.class)
     public void test_periodUntil_TemporalUnit_nullUnit() {
-        TEST_12345_123456789.periodUntil(TEST_12345_123456789, null);
+        TEST_12345_123456789.until(TEST_12345_123456789, null);
     }
 
     //-----------------------------------------------------------------------
diff --git a/jdk/test/java/time/tck/java/time/TCKLocalDate.java b/jdk/test/java/time/tck/java/time/TCKLocalDate.java
index 926aca4a761..597dd4f6574 100644
--- a/jdk/test/java/time/tck/java/time/TCKLocalDate.java
+++ b/jdk/test/java/time/tck/java/time/TCKLocalDate.java
@@ -619,6 +619,68 @@ public class TCKLocalDate extends AbstractDateTimeTest {
         LocalDate.parse("ANY", null);
     }
 
+    //-----------------------------------------------------------------------
+    // isSupported(TemporalField)
+    //-----------------------------------------------------------------------
+    @Test
+    public void test_isSupported_TemporalField() {
+        assertEquals(TEST_2007_07_15.isSupported((TemporalField) null), false);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoField.NANO_OF_SECOND), false);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoField.NANO_OF_DAY), false);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoField.MICRO_OF_SECOND), false);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoField.MICRO_OF_DAY), false);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoField.MILLI_OF_SECOND), false);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoField.MILLI_OF_DAY), false);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoField.SECOND_OF_MINUTE), false);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoField.SECOND_OF_DAY), false);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoField.MINUTE_OF_HOUR), false);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoField.MINUTE_OF_DAY), false);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoField.HOUR_OF_AMPM), false);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoField.CLOCK_HOUR_OF_AMPM), false);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoField.HOUR_OF_DAY), false);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoField.CLOCK_HOUR_OF_DAY), false);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoField.AMPM_OF_DAY), false);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoField.DAY_OF_WEEK), true);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH), true);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR), true);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoField.DAY_OF_MONTH), true);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoField.DAY_OF_YEAR), true);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoField.EPOCH_DAY), true);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoField.ALIGNED_WEEK_OF_MONTH), true);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoField.ALIGNED_WEEK_OF_YEAR), true);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoField.MONTH_OF_YEAR), true);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoField.PROLEPTIC_MONTH), true);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoField.YEAR), true);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoField.YEAR_OF_ERA), true);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoField.ERA), true);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoField.INSTANT_SECONDS), false);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoField.OFFSET_SECONDS), false);
+    }
+
+    //-----------------------------------------------------------------------
+    // isSupported(TemporalUnit)
+    //-----------------------------------------------------------------------
+    @Test
+    public void test_isSupported_TemporalUnit() {
+        assertEquals(TEST_2007_07_15.isSupported((TemporalUnit) null), false);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoUnit.NANOS), false);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoUnit.MICROS), false);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoUnit.MILLIS), false);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoUnit.SECONDS), false);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoUnit.MINUTES), false);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoUnit.HOURS), false);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoUnit.HALF_DAYS), false);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoUnit.DAYS), true);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoUnit.WEEKS), true);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoUnit.MONTHS), true);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoUnit.YEARS), true);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoUnit.DECADES), true);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoUnit.CENTURIES), true);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoUnit.MILLENNIA), true);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoUnit.ERAS), true);
+        assertEquals(TEST_2007_07_15.isSupported(ChronoUnit.FOREVER), false);
+    }
+
     //-----------------------------------------------------------------------
     // get(TemporalField)
     //-----------------------------------------------------------------------
@@ -1635,7 +1697,7 @@ public class TCKLocalDate extends AbstractDateTimeTest {
     }
 
     //-----------------------------------------------------------------------
-    // periodUntil(Temporal, TemporalUnit)
+    // until(Temporal, TemporalUnit)
     //-----------------------------------------------------------------------
     @DataProvider(name="periodUntilUnit")
     Object[][] data_periodUntilUnit() {
@@ -1684,35 +1746,35 @@ public class TCKLocalDate extends AbstractDateTimeTest {
 
     @Test(dataProvider="periodUntilUnit")
     public void test_periodUntil_TemporalUnit(LocalDate date1, LocalDate date2, TemporalUnit unit, long expected) {
-        long amount = date1.periodUntil(date2, unit);
+        long amount = date1.until(date2, unit);
         assertEquals(amount, expected);
     }
 
     @Test(dataProvider="periodUntilUnit")
     public void test_periodUntil_TemporalUnit_negated(LocalDate date1, LocalDate date2, TemporalUnit unit, long expected) {
-        long amount = date2.periodUntil(date1, unit);
+        long amount = date2.until(date1, unit);
         assertEquals(amount, -expected);
     }
 
     @Test(expectedExceptions = UnsupportedTemporalTypeException.class)
     public void test_periodUntil_TemporalUnit_unsupportedUnit() {
-        TEST_2007_07_15.periodUntil(TEST_2007_07_15, HOURS);
+        TEST_2007_07_15.until(TEST_2007_07_15, HOURS);
     }
 
     @Test(expectedExceptions = NullPointerException.class)
     public void test_periodUntil_TemporalUnit_nullEnd() {
-        TEST_2007_07_15.periodUntil(null, DAYS);
+        TEST_2007_07_15.until(null, DAYS);
     }
 
     @Test(expectedExceptions = NullPointerException.class)
     public void test_periodUntil_TemporalUnit_nullUnit() {
-        TEST_2007_07_15.periodUntil(TEST_2007_07_15, null);
+        TEST_2007_07_15.until(TEST_2007_07_15, null);
     }
 
     //-----------------------------------------------------------------------
-    // periodUntil(ChronoLocalDate)
+    // until(ChronoLocalDate)
     //-----------------------------------------------------------------------
-    @DataProvider(name="periodUntil")
+    @DataProvider(name="until")
     Object[][] data_periodUntil() {
         return new Object[][] {
                 {2010, 1, 1, 2010, 1, 1, 0, 0, 0},
@@ -1799,11 +1861,11 @@ public class TCKLocalDate extends AbstractDateTimeTest {
         };
     }
 
-    @Test(dataProvider="periodUntil")
+    @Test(dataProvider="until")
     public void test_periodUntil_LocalDate(int y1, int m1, int d1, int y2, int m2, int d2, int ye, int me, int de) {
         LocalDate start = LocalDate.of(y1, m1, d1);
         LocalDate end = LocalDate.of(y2, m2, d2);
-        Period test = start.periodUntil(end);
+        Period test = start.until(end);
         assertEquals(test.getYears(), ye);
         assertEquals(test.getMonths(), me);
         assertEquals(test.getDays(), de);
@@ -1812,12 +1874,12 @@ public class TCKLocalDate extends AbstractDateTimeTest {
     @Test
     public void test_periodUntil_LocalDate_max() {
         int years = Math.toIntExact((long) Year.MAX_VALUE - (long) Year.MIN_VALUE);
-        assertEquals(LocalDate.MIN.periodUntil(LocalDate.MAX), Period.of(years, 11, 30));
+        assertEquals(LocalDate.MIN.until(LocalDate.MAX), Period.of(years, 11, 30));
     }
 
     @Test(expectedExceptions=NullPointerException.class)
     public void test_periodUntil_LocalDate_null() {
-        TEST_2007_07_15.periodUntil(null);
+        TEST_2007_07_15.until(null);
     }
 
     //-----------------------------------------------------------------------
diff --git a/jdk/test/java/time/tck/java/time/TCKLocalDateTime.java b/jdk/test/java/time/tck/java/time/TCKLocalDateTime.java
index f7d5c9ed1f4..f55bdb4a961 100644
--- a/jdk/test/java/time/tck/java/time/TCKLocalDateTime.java
+++ b/jdk/test/java/time/tck/java/time/TCKLocalDateTime.java
@@ -937,6 +937,68 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
         LocalDateTime.parse("ANY", null);
     }
 
+    //-----------------------------------------------------------------------
+    // isSupported(TemporalField)
+    //-----------------------------------------------------------------------
+    @Test
+    public void test_isSupported_TemporalField() {
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported((TemporalField) null), false);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.NANO_OF_SECOND), true);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.NANO_OF_DAY), true);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.MICRO_OF_SECOND), true);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.MICRO_OF_DAY), true);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.MILLI_OF_SECOND), true);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.MILLI_OF_DAY), true);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.SECOND_OF_MINUTE), true);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.SECOND_OF_DAY), true);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.MINUTE_OF_HOUR), true);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.MINUTE_OF_DAY), true);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.HOUR_OF_AMPM), true);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.CLOCK_HOUR_OF_AMPM), true);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.HOUR_OF_DAY), true);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.CLOCK_HOUR_OF_DAY), true);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.AMPM_OF_DAY), true);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.DAY_OF_WEEK), true);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH), true);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR), true);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.DAY_OF_MONTH), true);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.DAY_OF_YEAR), true);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.EPOCH_DAY), true);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.ALIGNED_WEEK_OF_MONTH), true);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.ALIGNED_WEEK_OF_YEAR), true);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.MONTH_OF_YEAR), true);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.PROLEPTIC_MONTH), true);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.YEAR), true);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.YEAR_OF_ERA), true);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.ERA), true);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.INSTANT_SECONDS), false);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoField.OFFSET_SECONDS), false);
+    }
+
+    //-----------------------------------------------------------------------
+    // isSupported(TemporalUnit)
+    //-----------------------------------------------------------------------
+    @Test
+    public void test_isSupported_TemporalUnit() {
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported((TemporalUnit) null), false);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.NANOS), true);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.MICROS), true);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.MILLIS), true);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.SECONDS), true);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.MINUTES), true);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.HOURS), true);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.HALF_DAYS), true);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.DAYS), true);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.WEEKS), true);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.MONTHS), true);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.YEARS), true);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.DECADES), true);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.CENTURIES), true);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.MILLENNIA), true);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.ERAS), true);
+        assertEquals(TEST_2007_07_15_12_30_40_987654321.isSupported(ChronoUnit.FOREVER), false);
+    }
+
     //-----------------------------------------------------------------------
     // get(TemporalField)
     //-----------------------------------------------------------------------
@@ -2717,7 +2779,7 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
     }
 
     //-----------------------------------------------------------------------
-    // periodUntil(Temporal, TemporalUnit)
+    // until(Temporal, TemporalUnit)
     //-----------------------------------------------------------------------
     @DataProvider(name="periodUntilUnit")
     Object[][] data_periodUntilUnit() {
@@ -2859,24 +2921,24 @@ public class TCKLocalDateTime extends AbstractDateTimeTest {
 
     @Test(dataProvider="periodUntilUnit")
     public void test_periodUntil_TemporalUnit(LocalDateTime dt1, LocalDateTime dt2, TemporalUnit unit, long expected) {
-        long amount = dt1.periodUntil(dt2, unit);
+        long amount = dt1.until(dt2, unit);
         assertEquals(amount, expected);
     }
 
     @Test(dataProvider="periodUntilUnit")
     public void test_periodUntil_TemporalUnit_negated(LocalDateTime dt1, LocalDateTime dt2, TemporalUnit unit, long expected) {
-        long amount = dt2.periodUntil(dt1, unit);
+        long amount = dt2.until(dt1, unit);
         assertEquals(amount, -expected);
     }
 
     @Test(expectedExceptions = NullPointerException.class)
     public void test_periodUntil_TemporalUnit_nullEnd() {
-        TEST_2007_07_15_12_30_40_987654321.periodUntil(null, HOURS);
+        TEST_2007_07_15_12_30_40_987654321.until(null, HOURS);
     }
 
     @Test(expectedExceptions = NullPointerException.class)
     public void test_periodUntil_TemporalUnit_nullUnit() {
-        TEST_2007_07_15_12_30_40_987654321.periodUntil(TEST_2007_07_15_12_30_40_987654321, null);
+        TEST_2007_07_15_12_30_40_987654321.until(TEST_2007_07_15_12_30_40_987654321, null);
     }
 
     //-----------------------------------------------------------------------
diff --git a/jdk/test/java/time/tck/java/time/TCKLocalTime.java b/jdk/test/java/time/tck/java/time/TCKLocalTime.java
index 28c59491501..e0ef94cdadc 100644
--- a/jdk/test/java/time/tck/java/time/TCKLocalTime.java
+++ b/jdk/test/java/time/tck/java/time/TCKLocalTime.java
@@ -619,6 +619,68 @@ public class TCKLocalTime extends AbstractDateTimeTest {
         LocalTime.parse("ANY", null);
     }
 
+    //-----------------------------------------------------------------------
+    // isSupported(TemporalField)
+    //-----------------------------------------------------------------------
+    @Test
+    public void test_isSupported_TemporalField() {
+        assertEquals(TEST_12_30_40_987654321.isSupported((TemporalField) null), false);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.NANO_OF_SECOND), true);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.NANO_OF_DAY), true);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.MICRO_OF_SECOND), true);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.MICRO_OF_DAY), true);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.MILLI_OF_SECOND), true);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.MILLI_OF_DAY), true);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.SECOND_OF_MINUTE), true);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.SECOND_OF_DAY), true);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.MINUTE_OF_HOUR), true);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.MINUTE_OF_DAY), true);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.HOUR_OF_AMPM), true);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.CLOCK_HOUR_OF_AMPM), true);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.HOUR_OF_DAY), true);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.CLOCK_HOUR_OF_DAY), true);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.AMPM_OF_DAY), true);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.DAY_OF_WEEK), false);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH), false);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR), false);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.DAY_OF_MONTH), false);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.DAY_OF_YEAR), false);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.EPOCH_DAY), false);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.ALIGNED_WEEK_OF_MONTH), false);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.ALIGNED_WEEK_OF_YEAR), false);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.MONTH_OF_YEAR), false);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.PROLEPTIC_MONTH), false);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.YEAR), false);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.YEAR_OF_ERA), false);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.ERA), false);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.INSTANT_SECONDS), false);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoField.OFFSET_SECONDS), false);
+    }
+
+    //-----------------------------------------------------------------------
+    // isSupported(TemporalUnit)
+    //-----------------------------------------------------------------------
+    @Test
+    public void test_isSupported_TemporalUnit() {
+        assertEquals(TEST_12_30_40_987654321.isSupported((TemporalUnit) null), false);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoUnit.NANOS), true);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoUnit.MICROS), true);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoUnit.MILLIS), true);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoUnit.SECONDS), true);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoUnit.MINUTES), true);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoUnit.HOURS), true);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoUnit.HALF_DAYS), true);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoUnit.DAYS), false);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoUnit.WEEKS), false);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoUnit.MONTHS), false);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoUnit.YEARS), false);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoUnit.DECADES), false);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoUnit.CENTURIES), false);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoUnit.MILLENNIA), false);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoUnit.ERAS), false);
+        assertEquals(TEST_12_30_40_987654321.isSupported(ChronoUnit.FOREVER), false);
+    }
+
     //-----------------------------------------------------------------------
     // get(TemporalField)
     //-----------------------------------------------------------------------
@@ -952,10 +1014,6 @@ public class TCKLocalTime extends AbstractDateTimeTest {
     // truncated(TemporalUnit)
     //-----------------------------------------------------------------------
     TemporalUnit NINETY_MINS = new TemporalUnit() {
-        @Override
-        public String getName() {
-            return "NinetyMins";
-        }
         @Override
         public Duration getDuration() {
             return Duration.ofMinutes(90);
@@ -965,6 +1023,14 @@ public class TCKLocalTime extends AbstractDateTimeTest {
             return false;
         }
         @Override
+        public boolean isDateBased() {
+            return false;
+        }
+        @Override
+        public boolean isTimeBased() {
+            return true;
+        }
+        @Override
         public boolean isSupportedBy(Temporal temporal) {
             return false;
         }
@@ -976,13 +1042,13 @@ public class TCKLocalTime extends AbstractDateTimeTest {
         public long between(Temporal temporal1, Temporal temporal2) {
             throw new UnsupportedOperationException();
         }
+        @Override
+        public String toString() {
+            return "NinetyMins";
+        }
     };
 
     TemporalUnit NINETY_FIVE_MINS = new TemporalUnit() {
-        @Override
-        public String getName() {
-            return "NinetyFiveMins";
-        }
         @Override
         public Duration getDuration() {
             return Duration.ofMinutes(95);
@@ -992,6 +1058,14 @@ public class TCKLocalTime extends AbstractDateTimeTest {
             return false;
         }
         @Override
+        public boolean isDateBased() {
+            return false;
+        }
+        @Override
+        public boolean isTimeBased() {
+            return false;
+        }
+        @Override
         public boolean isSupportedBy(Temporal temporal) {
             return false;
         }
@@ -1003,6 +1077,10 @@ public class TCKLocalTime extends AbstractDateTimeTest {
         public long between(Temporal temporal1, Temporal temporal2) {
             throw new UnsupportedOperationException();
         }
+        @Override
+        public String toString() {
+            return "NinetyFiveMins";
+        }
     };
 
     @DataProvider(name="truncatedToValid")
@@ -1922,7 +2000,7 @@ public class TCKLocalTime extends AbstractDateTimeTest {
     }
 
     //-----------------------------------------------------------------------
-    // periodUntil(Temporal, TemporalUnit)
+    // until(Temporal, TemporalUnit)
     //-----------------------------------------------------------------------
     @DataProvider(name="periodUntilUnit")
     Object[][] data_periodUntilUnit() {
@@ -1962,29 +2040,29 @@ public class TCKLocalTime extends AbstractDateTimeTest {
 
     @Test(dataProvider="periodUntilUnit")
     public void test_periodUntil_TemporalUnit(LocalTime time1, LocalTime time2, TemporalUnit unit, long expected) {
-        long amount = time1.periodUntil(time2, unit);
+        long amount = time1.until(time2, unit);
         assertEquals(amount, expected);
     }
 
     @Test(dataProvider="periodUntilUnit")
     public void test_periodUntil_TemporalUnit_negated(LocalTime time1, LocalTime time2, TemporalUnit unit, long expected) {
-        long amount = time2.periodUntil(time1, unit);
+        long amount = time2.until(time1, unit);
         assertEquals(amount, -expected);
     }
 
     @Test(expectedExceptions = UnsupportedTemporalTypeException.class)
     public void test_periodUntil_TemporalUnit_unsupportedUnit() {
-        TEST_12_30_40_987654321.periodUntil(TEST_12_30_40_987654321, DAYS);
+        TEST_12_30_40_987654321.until(TEST_12_30_40_987654321, DAYS);
     }
 
     @Test(expectedExceptions = NullPointerException.class)
     public void test_periodUntil_TemporalUnit_nullEnd() {
-        TEST_12_30_40_987654321.periodUntil(null, HOURS);
+        TEST_12_30_40_987654321.until(null, HOURS);
     }
 
     @Test(expectedExceptions = NullPointerException.class)
     public void test_periodUntil_TemporalUnit_nullUnit() {
-        TEST_12_30_40_987654321.periodUntil(TEST_12_30_40_987654321, null);
+        TEST_12_30_40_987654321.until(TEST_12_30_40_987654321, null);
     }
 
     //-----------------------------------------------------------------------
diff --git a/jdk/test/java/time/tck/java/time/TCKMonth.java b/jdk/test/java/time/tck/java/time/TCKMonth.java
index 77e9eef7a96..3bff8c9beb6 100644
--- a/jdk/test/java/time/tck/java/time/TCKMonth.java
+++ b/jdk/test/java/time/tck/java/time/TCKMonth.java
@@ -150,6 +150,44 @@ public class TCKMonth extends AbstractDateTimeTest {
         Month.from((TemporalAccessor) null);
     }
 
+    //-----------------------------------------------------------------------
+    // isSupported(TemporalField)
+    //-----------------------------------------------------------------------
+    @Test
+    public void test_isSupported_TemporalField() {
+        assertEquals(Month.AUGUST.isSupported((TemporalField) null), false);
+        assertEquals(Month.AUGUST.isSupported(ChronoField.NANO_OF_SECOND), false);
+        assertEquals(Month.AUGUST.isSupported(ChronoField.NANO_OF_DAY), false);
+        assertEquals(Month.AUGUST.isSupported(ChronoField.MICRO_OF_SECOND), false);
+        assertEquals(Month.AUGUST.isSupported(ChronoField.MICRO_OF_DAY), false);
+        assertEquals(Month.AUGUST.isSupported(ChronoField.MILLI_OF_SECOND), false);
+        assertEquals(Month.AUGUST.isSupported(ChronoField.MILLI_OF_DAY), false);
+        assertEquals(Month.AUGUST.isSupported(ChronoField.SECOND_OF_MINUTE), false);
+        assertEquals(Month.AUGUST.isSupported(ChronoField.SECOND_OF_DAY), false);
+        assertEquals(Month.AUGUST.isSupported(ChronoField.MINUTE_OF_HOUR), false);
+        assertEquals(Month.AUGUST.isSupported(ChronoField.MINUTE_OF_DAY), false);
+        assertEquals(Month.AUGUST.isSupported(ChronoField.HOUR_OF_AMPM), false);
+        assertEquals(Month.AUGUST.isSupported(ChronoField.CLOCK_HOUR_OF_AMPM), false);
+        assertEquals(Month.AUGUST.isSupported(ChronoField.HOUR_OF_DAY), false);
+        assertEquals(Month.AUGUST.isSupported(ChronoField.CLOCK_HOUR_OF_DAY), false);
+        assertEquals(Month.AUGUST.isSupported(ChronoField.AMPM_OF_DAY), false);
+        assertEquals(Month.AUGUST.isSupported(ChronoField.DAY_OF_WEEK), false);
+        assertEquals(Month.AUGUST.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH), false);
+        assertEquals(Month.AUGUST.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR), false);
+        assertEquals(Month.AUGUST.isSupported(ChronoField.DAY_OF_MONTH), false);
+        assertEquals(Month.AUGUST.isSupported(ChronoField.DAY_OF_YEAR), false);
+        assertEquals(Month.AUGUST.isSupported(ChronoField.EPOCH_DAY), false);
+        assertEquals(Month.AUGUST.isSupported(ChronoField.ALIGNED_WEEK_OF_MONTH), false);
+        assertEquals(Month.AUGUST.isSupported(ChronoField.ALIGNED_WEEK_OF_YEAR), false);
+        assertEquals(Month.AUGUST.isSupported(ChronoField.MONTH_OF_YEAR), true);
+        assertEquals(Month.AUGUST.isSupported(ChronoField.PROLEPTIC_MONTH), false);
+        assertEquals(Month.AUGUST.isSupported(ChronoField.YEAR), false);
+        assertEquals(Month.AUGUST.isSupported(ChronoField.YEAR_OF_ERA), false);
+        assertEquals(Month.AUGUST.isSupported(ChronoField.ERA), false);
+        assertEquals(Month.AUGUST.isSupported(ChronoField.INSTANT_SECONDS), false);
+        assertEquals(Month.AUGUST.isSupported(ChronoField.OFFSET_SECONDS), false);
+    }
+
     //-----------------------------------------------------------------------
     // get(TemporalField)
     //-----------------------------------------------------------------------
diff --git a/jdk/test/java/time/tck/java/time/TCKMonthDay.java b/jdk/test/java/time/tck/java/time/TCKMonthDay.java
index 0bcbdef8195..f2a2b93f473 100644
--- a/jdk/test/java/time/tck/java/time/TCKMonthDay.java
+++ b/jdk/test/java/time/tck/java/time/TCKMonthDay.java
@@ -387,6 +387,44 @@ public class TCKMonthDay extends AbstractDateTimeTest {
         MonthDay.parse("ANY", null);
     }
 
+    //-----------------------------------------------------------------------
+    // isSupported(TemporalField)
+    //-----------------------------------------------------------------------
+    @Test
+    public void test_isSupported_TemporalField() {
+        assertEquals(TEST_07_15.isSupported((TemporalField) null), false);
+        assertEquals(TEST_07_15.isSupported(ChronoField.NANO_OF_SECOND), false);
+        assertEquals(TEST_07_15.isSupported(ChronoField.NANO_OF_DAY), false);
+        assertEquals(TEST_07_15.isSupported(ChronoField.MICRO_OF_SECOND), false);
+        assertEquals(TEST_07_15.isSupported(ChronoField.MICRO_OF_DAY), false);
+        assertEquals(TEST_07_15.isSupported(ChronoField.MILLI_OF_SECOND), false);
+        assertEquals(TEST_07_15.isSupported(ChronoField.MILLI_OF_DAY), false);
+        assertEquals(TEST_07_15.isSupported(ChronoField.SECOND_OF_MINUTE), false);
+        assertEquals(TEST_07_15.isSupported(ChronoField.SECOND_OF_DAY), false);
+        assertEquals(TEST_07_15.isSupported(ChronoField.MINUTE_OF_HOUR), false);
+        assertEquals(TEST_07_15.isSupported(ChronoField.MINUTE_OF_DAY), false);
+        assertEquals(TEST_07_15.isSupported(ChronoField.HOUR_OF_AMPM), false);
+        assertEquals(TEST_07_15.isSupported(ChronoField.CLOCK_HOUR_OF_AMPM), false);
+        assertEquals(TEST_07_15.isSupported(ChronoField.HOUR_OF_DAY), false);
+        assertEquals(TEST_07_15.isSupported(ChronoField.CLOCK_HOUR_OF_DAY), false);
+        assertEquals(TEST_07_15.isSupported(ChronoField.AMPM_OF_DAY), false);
+        assertEquals(TEST_07_15.isSupported(ChronoField.DAY_OF_WEEK), false);
+        assertEquals(TEST_07_15.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH), false);
+        assertEquals(TEST_07_15.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR), false);
+        assertEquals(TEST_07_15.isSupported(ChronoField.DAY_OF_MONTH), true);
+        assertEquals(TEST_07_15.isSupported(ChronoField.DAY_OF_YEAR), false);
+        assertEquals(TEST_07_15.isSupported(ChronoField.EPOCH_DAY), false);
+        assertEquals(TEST_07_15.isSupported(ChronoField.ALIGNED_WEEK_OF_MONTH), false);
+        assertEquals(TEST_07_15.isSupported(ChronoField.ALIGNED_WEEK_OF_YEAR), false);
+        assertEquals(TEST_07_15.isSupported(ChronoField.MONTH_OF_YEAR), true);
+        assertEquals(TEST_07_15.isSupported(ChronoField.PROLEPTIC_MONTH), false);
+        assertEquals(TEST_07_15.isSupported(ChronoField.YEAR), false);
+        assertEquals(TEST_07_15.isSupported(ChronoField.YEAR_OF_ERA), false);
+        assertEquals(TEST_07_15.isSupported(ChronoField.ERA), false);
+        assertEquals(TEST_07_15.isSupported(ChronoField.INSTANT_SECONDS), false);
+        assertEquals(TEST_07_15.isSupported(ChronoField.OFFSET_SECONDS), false);
+    }
+
     //-----------------------------------------------------------------------
     // get(TemporalField)
     //-----------------------------------------------------------------------
diff --git a/jdk/test/java/time/tck/java/time/TCKOffsetDateTime.java b/jdk/test/java/time/tck/java/time/TCKOffsetDateTime.java
index a6bb7c30418..7cfc2a61dec 100644
--- a/jdk/test/java/time/tck/java/time/TCKOffsetDateTime.java
+++ b/jdk/test/java/time/tck/java/time/TCKOffsetDateTime.java
@@ -126,6 +126,7 @@ import java.time.temporal.TemporalAccessor;
 import java.time.temporal.TemporalAdjuster;
 import java.time.temporal.TemporalField;
 import java.time.temporal.TemporalQuery;
+import java.time.temporal.TemporalUnit;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -554,6 +555,68 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
         assertEquals(a.toString(), localDateTime.toString() + offset.toString());
     }
 
+    //-----------------------------------------------------------------------
+    // isSupported(TemporalField)
+    //-----------------------------------------------------------------------
+    @Test
+    public void test_isSupported_TemporalField() {
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported((TemporalField) null), false);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.NANO_OF_SECOND), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.NANO_OF_DAY), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.MICRO_OF_SECOND), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.MICRO_OF_DAY), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.MILLI_OF_SECOND), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.MILLI_OF_DAY), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.SECOND_OF_MINUTE), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.SECOND_OF_DAY), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.MINUTE_OF_HOUR), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.MINUTE_OF_DAY), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.HOUR_OF_AMPM), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.CLOCK_HOUR_OF_AMPM), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.HOUR_OF_DAY), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.CLOCK_HOUR_OF_DAY), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.AMPM_OF_DAY), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.DAY_OF_WEEK), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.DAY_OF_MONTH), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.DAY_OF_YEAR), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.EPOCH_DAY), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.ALIGNED_WEEK_OF_MONTH), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.ALIGNED_WEEK_OF_YEAR), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.MONTH_OF_YEAR), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.PROLEPTIC_MONTH), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.YEAR), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.YEAR_OF_ERA), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.ERA), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.INSTANT_SECONDS), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoField.OFFSET_SECONDS), true);
+    }
+
+    //-----------------------------------------------------------------------
+    // isSupported(TemporalUnit)
+    //-----------------------------------------------------------------------
+    @Test
+    public void test_isSupported_TemporalUnit() {
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported((TemporalUnit) null), false);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.NANOS), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.MICROS), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.MILLIS), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.SECONDS), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.MINUTES), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.HOURS), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.HALF_DAYS), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.DAYS), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.WEEKS), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.MONTHS), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.YEARS), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.DECADES), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.CENTURIES), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.MILLENNIA), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.ERAS), true);
+        assertEquals(TEST_2008_6_30_11_30_59_000000500.isSupported(ChronoUnit.FOREVER), false);
+    }
+
     //-----------------------------------------------------------------------
     // get(TemporalField)
     //-----------------------------------------------------------------------
@@ -1203,6 +1266,7 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
         assertEquals(a.compareTo(a) == 0, true);
         assertEquals(b.compareTo(b) == 0, true);
         assertEquals(a.toInstant().compareTo(b.toInstant()) < 0, true);
+        assertEquals(OffsetDateTime.timeLineOrder().compare(a, b) < 0, true);
     }
 
     @Test
@@ -1214,6 +1278,7 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
         assertEquals(a.compareTo(a) == 0, true);
         assertEquals(b.compareTo(b) == 0, true);
         assertEquals(a.toInstant().compareTo(b.toInstant()) < 0, true);
+        assertEquals(OffsetDateTime.timeLineOrder().compare(a, b) < 0, true);
     }
 
     @Test
@@ -1225,6 +1290,7 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
         assertEquals(a.compareTo(a) == 0, true);
         assertEquals(b.compareTo(b) == 0, true);
         assertEquals(a.toInstant().compareTo(b.toInstant()) < 0, true);
+        assertEquals(OffsetDateTime.timeLineOrder().compare(a, b) < 0, true);
     }
 
     @Test
@@ -1236,6 +1302,7 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
         assertEquals(a.compareTo(a) == 0, true);
         assertEquals(b.compareTo(b) == 0, true);
         assertEquals(a.toInstant().compareTo(b.toInstant()) < 0, true);
+        assertEquals(OffsetDateTime.timeLineOrder().compare(a, b) < 0, true);
     }
 
     @Test
@@ -1247,6 +1314,7 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
         assertEquals(a.compareTo(a) == 0, true);
         assertEquals(b.compareTo(b) == 0, true);
         assertEquals(a.toInstant().compareTo(b.toInstant()) < 0, true);
+        assertEquals(OffsetDateTime.timeLineOrder().compare(a, b) < 0, true);
     }
 
     @Test
@@ -1258,6 +1326,7 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
         assertEquals(a.compareTo(a) == 0, true);
         assertEquals(b.compareTo(b) == 0, true);
         assertEquals(a.toInstant().compareTo(b.toInstant()) < 0, true);
+        assertEquals(OffsetDateTime.timeLineOrder().compare(a, b) < 0, true);
     }
 
     @Test
@@ -1269,6 +1338,14 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
         assertEquals(a.compareTo(a) == 0, true);
         assertEquals(b.compareTo(b) == 0, true);
         assertEquals(a.toInstant().compareTo(b.toInstant()) < 0, true);
+        assertEquals(OffsetDateTime.timeLineOrder().compare(a, b) < 0, true);
+    }
+
+    @Test
+    public void test_compareTo_bothInstantComparator() {
+        OffsetDateTime a = OffsetDateTime.of(2008, 6, 30, 11, 20, 40, 4, OFFSET_PTWO);
+        OffsetDateTime b = OffsetDateTime.of(2008, 6, 30, 10, 20, 40, 5, OFFSET_PONE);
+        assertEquals(a.compareTo(b), OffsetDateTime.timeLineOrder().compare(a,b), "for nano != nano, compareTo and timeLineOrder() should be the same");
     }
 
     @Test
diff --git a/jdk/test/java/time/tck/java/time/TCKOffsetTime.java b/jdk/test/java/time/tck/java/time/TCKOffsetTime.java
index 7b97380e4de..b3d7e5b26a9 100644
--- a/jdk/test/java/time/tck/java/time/TCKOffsetTime.java
+++ b/jdk/test/java/time/tck/java/time/TCKOffsetTime.java
@@ -542,6 +542,68 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
         assertEquals(a.getNano(), localTime.getNano());
     }
 
+    //-----------------------------------------------------------------------
+    // isSupported(TemporalField)
+    //-----------------------------------------------------------------------
+    @Test
+    public void test_isSupported_TemporalField() {
+        assertEquals(TEST_11_30_59_500_PONE.isSupported((TemporalField) null), false);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.NANO_OF_SECOND), true);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.NANO_OF_DAY), true);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.MICRO_OF_SECOND), true);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.MICRO_OF_DAY), true);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.MILLI_OF_SECOND), true);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.MILLI_OF_DAY), true);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.SECOND_OF_MINUTE), true);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.SECOND_OF_DAY), true);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.MINUTE_OF_HOUR), true);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.MINUTE_OF_DAY), true);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.HOUR_OF_AMPM), true);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.CLOCK_HOUR_OF_AMPM), true);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.HOUR_OF_DAY), true);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.CLOCK_HOUR_OF_DAY), true);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.AMPM_OF_DAY), true);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.DAY_OF_WEEK), false);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH), false);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR), false);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.DAY_OF_MONTH), false);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.DAY_OF_YEAR), false);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.EPOCH_DAY), false);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.ALIGNED_WEEK_OF_MONTH), false);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.ALIGNED_WEEK_OF_YEAR), false);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.MONTH_OF_YEAR), false);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.PROLEPTIC_MONTH), false);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.YEAR), false);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.YEAR_OF_ERA), false);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.ERA), false);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.INSTANT_SECONDS), false);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoField.OFFSET_SECONDS), true);
+    }
+
+    //-----------------------------------------------------------------------
+    // isSupported(TemporalUnit)
+    //-----------------------------------------------------------------------
+    @Test
+    public void test_isSupported_TemporalUnit() {
+        assertEquals(TEST_11_30_59_500_PONE.isSupported((TemporalUnit) null), false);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoUnit.NANOS), true);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoUnit.MICROS), true);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoUnit.MILLIS), true);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoUnit.SECONDS), true);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoUnit.MINUTES), true);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoUnit.HOURS), true);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoUnit.HALF_DAYS), true);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoUnit.DAYS), false);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoUnit.WEEKS), false);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoUnit.MONTHS), false);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoUnit.YEARS), false);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoUnit.DECADES), false);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoUnit.CENTURIES), false);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoUnit.MILLENNIA), false);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoUnit.ERAS), false);
+        assertEquals(TEST_11_30_59_500_PONE.isSupported(ChronoUnit.FOREVER), false);
+    }
+
     //-----------------------------------------------------------------------
     // get(TemporalField)
     //-----------------------------------------------------------------------
@@ -1038,7 +1100,7 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
     }
 
     //-----------------------------------------------------------------------
-    // periodUntil(Temporal, TemporalUnit)
+    // until(Temporal, TemporalUnit)
     //-----------------------------------------------------------------------
     @DataProvider(name="periodUntilUnit")
     Object[][] data_periodUntilUnit() {
@@ -1063,13 +1125,13 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
 
     @Test(dataProvider="periodUntilUnit")
     public void test_periodUntil_TemporalUnit(OffsetTime offsetTime1, OffsetTime offsetTime2, TemporalUnit unit, long expected) {
-        long amount = offsetTime1.periodUntil(offsetTime2, unit);
+        long amount = offsetTime1.until(offsetTime2, unit);
         assertEquals(amount, expected);
     }
 
     @Test(dataProvider="periodUntilUnit")
     public void test_periodUntil_TemporalUnit_negated(OffsetTime offsetTime1, OffsetTime offsetTime2, TemporalUnit unit, long expected) {
-        long amount = offsetTime2.periodUntil(offsetTime1, unit);
+        long amount = offsetTime2.until(offsetTime1, unit);
         assertEquals(amount, -expected);
     }
 
@@ -1077,14 +1139,14 @@ public class TCKOffsetTime extends AbstractDateTimeTest {
     public void test_periodUntil_InvalidType() {
         OffsetTime offsetTime = OffsetTime.of(LocalTime.of(1, 1, 1), ZoneOffset.ofHours(1));
         OffsetDateTime offsetDateTime = offsetTime.atDate(LocalDate.of(1980, 2, 10));
-        offsetTime.periodUntil(offsetDateTime, SECONDS);
+        offsetTime.until(offsetDateTime, SECONDS);
     }
 
     @Test(expectedExceptions=DateTimeException.class)
     public void test_periodUntil_InvalidTemporalUnit() {
         OffsetTime offsetTime1 = OffsetTime.of(LocalTime.of(1, 1, 1), ZoneOffset.ofHours(1));
         OffsetTime offsetTime2 = OffsetTime.of(LocalTime.of(2, 1, 1), ZoneOffset.ofHours(1));
-        offsetTime1.periodUntil(offsetTime2, MONTHS);
+        offsetTime1.until(offsetTime2, MONTHS);
     }
 
     //-----------------------------------------------------------------------
diff --git a/jdk/test/java/time/tck/java/time/TCKPeriod.java b/jdk/test/java/time/tck/java/time/TCKPeriod.java
index 95907b237a7..7a06b95e6ef 100644
--- a/jdk/test/java/time/tck/java/time/TCKPeriod.java
+++ b/jdk/test/java/time/tck/java/time/TCKPeriod.java
@@ -120,11 +120,24 @@ public class TCKPeriod extends AbstractTCKTest {
         assertPeriod(Period.ofMonths(Integer.MIN_VALUE), 0, Integer.MIN_VALUE, 0);
     }
 
+    //-----------------------------------------------------------------------
+    // ofWeeks(int)
+    //-----------------------------------------------------------------------
+    @Test
+    public void factory_ofWeeks_int() {
+        assertPeriod(Period.ofWeeks(0), 0, 0, 0);
+        assertPeriod(Period.ofWeeks(1), 0, 0, 7);
+        assertPeriod(Period.ofWeeks(234), 0, 0, 234 * 7);
+        assertPeriod(Period.ofWeeks(-100), 0, 0, -100 * 7);
+        assertPeriod(Period.ofWeeks(Integer.MAX_VALUE / 7), 0, 0, (Integer.MAX_VALUE / 7) * 7);
+        assertPeriod(Period.ofWeeks(Integer.MIN_VALUE / 7), 0, 0, (Integer.MIN_VALUE / 7) * 7);
+    }
+
     //-----------------------------------------------------------------------
     // ofDays(int)
     //-----------------------------------------------------------------------
     @Test
-    public void factory_ofDay_int() {
+    public void factory_ofDays_int() {
         assertPeriod(Period.ofDays(0), 0, 0, 0);
         assertPeriod(Period.ofDays(1), 0, 0, 1);
         assertPeriod(Period.ofDays(234), 0, 0, 234);
@@ -251,6 +264,18 @@ public class TCKPeriod extends AbstractTCKTest {
                 {"P" + Integer.MAX_VALUE + "M", Period.ofMonths(Integer.MAX_VALUE)},
                 {"P" + Integer.MIN_VALUE + "M", Period.ofMonths(Integer.MIN_VALUE)},
 
+                {"P1W", Period.ofDays(1 * 7)},
+                {"P12W", Period.ofDays(12 * 7)},
+                {"P7654321W", Period.ofDays(7654321 * 7)},
+                {"P+1W", Period.ofDays(1 * 7)},
+                {"P+12W", Period.ofDays(12 * 7)},
+                {"P+7654321W", Period.ofDays(7654321 * 7)},
+                {"P+0W", Period.ofDays(0)},
+                {"P0W", Period.ofDays(0)},
+                {"P-0W", Period.ofDays(0)},
+                {"P-25W", Period.ofDays(-25 * 7)},
+                {"P-7654321W", Period.ofDays(-7654321 * 7)},
+
                 {"P1D", Period.ofDays(1)},
                 {"P12D", Period.ofDays(12)},
                 {"P987654321D", Period.ofDays(987654321)},
@@ -274,6 +299,10 @@ public class TCKPeriod extends AbstractTCKTest {
                 {"P2Y-3M25D", Period.of(2, -3, 25)},
                 {"P2Y3M-25D", Period.of(2, 3, -25)},
                 {"P-2Y-3M-25D", Period.of(-2, -3, -25)},
+
+                {"P0Y0M0W0D", Period.of(0, 0, 0)},
+                {"P2Y3M4W25D", Period.of(2, 3, 4 * 7 + 25)},
+                {"P-2Y-3M-4W-25D", Period.of(-2, -3, -4 * 7 - 25)},
         };
     }
 
@@ -334,6 +363,13 @@ public class TCKPeriod extends AbstractTCKTest {
                 {"P1Y2Y"},
                 {"PT1M+3S"},
 
+                {"P1M2Y"},
+                {"P1W2Y"},
+                {"P1D2Y"},
+                {"P1W2M"},
+                {"P1D2M"},
+                {"P1D2W"},
+
                 {"PT1S1"},
                 {"PT1S."},
                 {"PT1SA"},
diff --git a/jdk/test/java/time/tck/java/time/TCKYear.java b/jdk/test/java/time/tck/java/time/TCKYear.java
index ac25f0b4fb3..53f0db0b56e 100644
--- a/jdk/test/java/time/tck/java/time/TCKYear.java
+++ b/jdk/test/java/time/tck/java/time/TCKYear.java
@@ -347,6 +347,68 @@ public class TCKYear extends AbstractDateTimeTest {
         Year.parse("ANY", null);
     }
 
+    //-----------------------------------------------------------------------
+    // isSupported(TemporalField)
+    //-----------------------------------------------------------------------
+    @Test
+    public void test_isSupported_TemporalField() {
+        assertEquals(TEST_2008.isSupported((TemporalField) null), false);
+        assertEquals(TEST_2008.isSupported(ChronoField.NANO_OF_SECOND), false);
+        assertEquals(TEST_2008.isSupported(ChronoField.NANO_OF_DAY), false);
+        assertEquals(TEST_2008.isSupported(ChronoField.MICRO_OF_SECOND), false);
+        assertEquals(TEST_2008.isSupported(ChronoField.MICRO_OF_DAY), false);
+        assertEquals(TEST_2008.isSupported(ChronoField.MILLI_OF_SECOND), false);
+        assertEquals(TEST_2008.isSupported(ChronoField.MILLI_OF_DAY), false);
+        assertEquals(TEST_2008.isSupported(ChronoField.SECOND_OF_MINUTE), false);
+        assertEquals(TEST_2008.isSupported(ChronoField.SECOND_OF_DAY), false);
+        assertEquals(TEST_2008.isSupported(ChronoField.MINUTE_OF_HOUR), false);
+        assertEquals(TEST_2008.isSupported(ChronoField.MINUTE_OF_DAY), false);
+        assertEquals(TEST_2008.isSupported(ChronoField.HOUR_OF_AMPM), false);
+        assertEquals(TEST_2008.isSupported(ChronoField.CLOCK_HOUR_OF_AMPM), false);
+        assertEquals(TEST_2008.isSupported(ChronoField.HOUR_OF_DAY), false);
+        assertEquals(TEST_2008.isSupported(ChronoField.CLOCK_HOUR_OF_DAY), false);
+        assertEquals(TEST_2008.isSupported(ChronoField.AMPM_OF_DAY), false);
+        assertEquals(TEST_2008.isSupported(ChronoField.DAY_OF_WEEK), false);
+        assertEquals(TEST_2008.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH), false);
+        assertEquals(TEST_2008.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR), false);
+        assertEquals(TEST_2008.isSupported(ChronoField.DAY_OF_MONTH), false);
+        assertEquals(TEST_2008.isSupported(ChronoField.DAY_OF_YEAR), false);
+        assertEquals(TEST_2008.isSupported(ChronoField.EPOCH_DAY), false);
+        assertEquals(TEST_2008.isSupported(ChronoField.ALIGNED_WEEK_OF_MONTH), false);
+        assertEquals(TEST_2008.isSupported(ChronoField.ALIGNED_WEEK_OF_YEAR), false);
+        assertEquals(TEST_2008.isSupported(ChronoField.MONTH_OF_YEAR), false);
+        assertEquals(TEST_2008.isSupported(ChronoField.PROLEPTIC_MONTH), false);
+        assertEquals(TEST_2008.isSupported(ChronoField.YEAR), true);
+        assertEquals(TEST_2008.isSupported(ChronoField.YEAR_OF_ERA), true);
+        assertEquals(TEST_2008.isSupported(ChronoField.ERA), true);
+        assertEquals(TEST_2008.isSupported(ChronoField.INSTANT_SECONDS), false);
+        assertEquals(TEST_2008.isSupported(ChronoField.OFFSET_SECONDS), false);
+    }
+
+    //-----------------------------------------------------------------------
+    // isSupported(TemporalUnit)
+    //-----------------------------------------------------------------------
+    @Test
+    public void test_isSupported_TemporalUnit() {
+        assertEquals(TEST_2008.isSupported((TemporalUnit) null), false);
+        assertEquals(TEST_2008.isSupported(ChronoUnit.NANOS), false);
+        assertEquals(TEST_2008.isSupported(ChronoUnit.MICROS), false);
+        assertEquals(TEST_2008.isSupported(ChronoUnit.MILLIS), false);
+        assertEquals(TEST_2008.isSupported(ChronoUnit.SECONDS), false);
+        assertEquals(TEST_2008.isSupported(ChronoUnit.MINUTES), false);
+        assertEquals(TEST_2008.isSupported(ChronoUnit.HOURS), false);
+        assertEquals(TEST_2008.isSupported(ChronoUnit.HALF_DAYS), false);
+        assertEquals(TEST_2008.isSupported(ChronoUnit.DAYS), false);
+        assertEquals(TEST_2008.isSupported(ChronoUnit.WEEKS), false);
+        assertEquals(TEST_2008.isSupported(ChronoUnit.MONTHS), false);
+        assertEquals(TEST_2008.isSupported(ChronoUnit.YEARS), true);
+        assertEquals(TEST_2008.isSupported(ChronoUnit.DECADES), true);
+        assertEquals(TEST_2008.isSupported(ChronoUnit.CENTURIES), true);
+        assertEquals(TEST_2008.isSupported(ChronoUnit.MILLENNIA), true);
+        assertEquals(TEST_2008.isSupported(ChronoUnit.ERAS), true);
+        assertEquals(TEST_2008.isSupported(ChronoUnit.FOREVER), false);
+    }
+
     //-----------------------------------------------------------------------
     // get(TemporalField)
     //-----------------------------------------------------------------------
@@ -829,7 +891,7 @@ public class TCKYear extends AbstractDateTimeTest {
     }
 
     //-----------------------------------------------------------------------
-    // periodUntil(Temporal, TemporalUnit)
+    // until(Temporal, TemporalUnit)
     //-----------------------------------------------------------------------
     @DataProvider(name="periodUntilUnit")
     Object[][] data_periodUntilUnit() {
@@ -881,29 +943,29 @@ public class TCKYear extends AbstractDateTimeTest {
 
     @Test(dataProvider="periodUntilUnit")
     public void test_periodUntil_TemporalUnit(Year year1, Year year2, TemporalUnit unit, long expected) {
-        long amount = year1.periodUntil(year2, unit);
+        long amount = year1.until(year2, unit);
         assertEquals(amount, expected);
     }
 
     @Test(dataProvider="periodUntilUnit")
     public void test_periodUntil_TemporalUnit_negated(Year year1, Year year2, TemporalUnit unit, long expected) {
-        long amount = year2.periodUntil(year1, unit);
+        long amount = year2.until(year1, unit);
         assertEquals(amount, -expected);
     }
 
     @Test(expectedExceptions = UnsupportedTemporalTypeException.class)
     public void test_periodUntil_TemporalUnit_unsupportedUnit() {
-        TEST_2008.periodUntil(TEST_2008, MONTHS);
+        TEST_2008.until(TEST_2008, MONTHS);
     }
 
     @Test(expectedExceptions = NullPointerException.class)
     public void test_periodUntil_TemporalUnit_nullEnd() {
-        TEST_2008.periodUntil(null, DAYS);
+        TEST_2008.until(null, DAYS);
     }
 
     @Test(expectedExceptions = NullPointerException.class)
     public void test_periodUntil_TemporalUnit_nullUnit() {
-        TEST_2008.periodUntil(TEST_2008, null);
+        TEST_2008.until(TEST_2008, null);
     }
 
     //-----------------------------------------------------------------------
diff --git a/jdk/test/java/time/tck/java/time/TCKYearMonth.java b/jdk/test/java/time/tck/java/time/TCKYearMonth.java
index 14ccc774b27..66f691b0746 100644
--- a/jdk/test/java/time/tck/java/time/TCKYearMonth.java
+++ b/jdk/test/java/time/tck/java/time/TCKYearMonth.java
@@ -407,6 +407,68 @@ public class TCKYearMonth extends AbstractDateTimeTest {
         YearMonth.parse("ANY", null);
     }
 
+    //-----------------------------------------------------------------------
+    // isSupported(TemporalField)
+    //-----------------------------------------------------------------------
+    @Test
+    public void test_isSupported_TemporalField() {
+        assertEquals(TEST_2008_06.isSupported((TemporalField) null), false);
+        assertEquals(TEST_2008_06.isSupported(ChronoField.NANO_OF_SECOND), false);
+        assertEquals(TEST_2008_06.isSupported(ChronoField.NANO_OF_DAY), false);
+        assertEquals(TEST_2008_06.isSupported(ChronoField.MICRO_OF_SECOND), false);
+        assertEquals(TEST_2008_06.isSupported(ChronoField.MICRO_OF_DAY), false);
+        assertEquals(TEST_2008_06.isSupported(ChronoField.MILLI_OF_SECOND), false);
+        assertEquals(TEST_2008_06.isSupported(ChronoField.MILLI_OF_DAY), false);
+        assertEquals(TEST_2008_06.isSupported(ChronoField.SECOND_OF_MINUTE), false);
+        assertEquals(TEST_2008_06.isSupported(ChronoField.SECOND_OF_DAY), false);
+        assertEquals(TEST_2008_06.isSupported(ChronoField.MINUTE_OF_HOUR), false);
+        assertEquals(TEST_2008_06.isSupported(ChronoField.MINUTE_OF_DAY), false);
+        assertEquals(TEST_2008_06.isSupported(ChronoField.HOUR_OF_AMPM), false);
+        assertEquals(TEST_2008_06.isSupported(ChronoField.CLOCK_HOUR_OF_AMPM), false);
+        assertEquals(TEST_2008_06.isSupported(ChronoField.HOUR_OF_DAY), false);
+        assertEquals(TEST_2008_06.isSupported(ChronoField.CLOCK_HOUR_OF_DAY), false);
+        assertEquals(TEST_2008_06.isSupported(ChronoField.AMPM_OF_DAY), false);
+        assertEquals(TEST_2008_06.isSupported(ChronoField.DAY_OF_WEEK), false);
+        assertEquals(TEST_2008_06.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH), false);
+        assertEquals(TEST_2008_06.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR), false);
+        assertEquals(TEST_2008_06.isSupported(ChronoField.DAY_OF_MONTH), false);
+        assertEquals(TEST_2008_06.isSupported(ChronoField.DAY_OF_YEAR), false);
+        assertEquals(TEST_2008_06.isSupported(ChronoField.EPOCH_DAY), false);
+        assertEquals(TEST_2008_06.isSupported(ChronoField.ALIGNED_WEEK_OF_MONTH), false);
+        assertEquals(TEST_2008_06.isSupported(ChronoField.ALIGNED_WEEK_OF_YEAR), false);
+        assertEquals(TEST_2008_06.isSupported(ChronoField.MONTH_OF_YEAR), true);
+        assertEquals(TEST_2008_06.isSupported(ChronoField.PROLEPTIC_MONTH), true);
+        assertEquals(TEST_2008_06.isSupported(ChronoField.YEAR), true);
+        assertEquals(TEST_2008_06.isSupported(ChronoField.YEAR_OF_ERA), true);
+        assertEquals(TEST_2008_06.isSupported(ChronoField.ERA), true);
+        assertEquals(TEST_2008_06.isSupported(ChronoField.INSTANT_SECONDS), false);
+        assertEquals(TEST_2008_06.isSupported(ChronoField.OFFSET_SECONDS), false);
+    }
+
+    //-----------------------------------------------------------------------
+    // isSupported(TemporalUnit)
+    //-----------------------------------------------------------------------
+    @Test
+    public void test_isSupported_TemporalUnit() {
+        assertEquals(TEST_2008_06.isSupported((TemporalUnit) null), false);
+        assertEquals(TEST_2008_06.isSupported(ChronoUnit.NANOS), false);
+        assertEquals(TEST_2008_06.isSupported(ChronoUnit.MICROS), false);
+        assertEquals(TEST_2008_06.isSupported(ChronoUnit.MILLIS), false);
+        assertEquals(TEST_2008_06.isSupported(ChronoUnit.SECONDS), false);
+        assertEquals(TEST_2008_06.isSupported(ChronoUnit.MINUTES), false);
+        assertEquals(TEST_2008_06.isSupported(ChronoUnit.HOURS), false);
+        assertEquals(TEST_2008_06.isSupported(ChronoUnit.HALF_DAYS), false);
+        assertEquals(TEST_2008_06.isSupported(ChronoUnit.DAYS), false);
+        assertEquals(TEST_2008_06.isSupported(ChronoUnit.WEEKS), false);
+        assertEquals(TEST_2008_06.isSupported(ChronoUnit.MONTHS), true);
+        assertEquals(TEST_2008_06.isSupported(ChronoUnit.YEARS), true);
+        assertEquals(TEST_2008_06.isSupported(ChronoUnit.DECADES), true);
+        assertEquals(TEST_2008_06.isSupported(ChronoUnit.CENTURIES), true);
+        assertEquals(TEST_2008_06.isSupported(ChronoUnit.MILLENNIA), true);
+        assertEquals(TEST_2008_06.isSupported(ChronoUnit.ERAS), true);
+        assertEquals(TEST_2008_06.isSupported(ChronoUnit.FOREVER), false);
+    }
+
     //-----------------------------------------------------------------------
     // get(TemporalField)
     //-----------------------------------------------------------------------
@@ -1120,7 +1182,7 @@ public class TCKYearMonth extends AbstractDateTimeTest {
     }
 
     //-----------------------------------------------------------------------
-    // periodUntil(Temporal, TemporalUnit)
+    // until(Temporal, TemporalUnit)
     //-----------------------------------------------------------------------
     @DataProvider(name="periodUntilUnit")
     Object[][] data_periodUntilUnit() {
@@ -1200,29 +1262,29 @@ public class TCKYearMonth extends AbstractDateTimeTest {
 
     @Test(dataProvider="periodUntilUnit")
     public void test_periodUntil_TemporalUnit(YearMonth ym1, YearMonth ym2, TemporalUnit unit, long expected) {
-        long amount = ym1.periodUntil(ym2, unit);
+        long amount = ym1.until(ym2, unit);
         assertEquals(amount, expected);
     }
 
     @Test(dataProvider="periodUntilUnit")
     public void test_periodUntil_TemporalUnit_negated(YearMonth ym1, YearMonth ym2, TemporalUnit unit, long expected) {
-        long amount = ym2.periodUntil(ym1, unit);
+        long amount = ym2.until(ym1, unit);
         assertEquals(amount, -expected);
     }
 
     @Test(expectedExceptions = UnsupportedTemporalTypeException.class)
     public void test_periodUntil_TemporalUnit_unsupportedUnit() {
-        TEST_2008_06.periodUntil(TEST_2008_06, HOURS);
+        TEST_2008_06.until(TEST_2008_06, HOURS);
     }
 
     @Test(expectedExceptions = NullPointerException.class)
     public void test_periodUntil_TemporalUnit_nullEnd() {
-        TEST_2008_06.periodUntil(null, DAYS);
+        TEST_2008_06.until(null, DAYS);
     }
 
     @Test(expectedExceptions = NullPointerException.class)
     public void test_periodUntil_TemporalUnit_nullUnit() {
-        TEST_2008_06.periodUntil(TEST_2008_06, null);
+        TEST_2008_06.until(TEST_2008_06, null);
     }
 
     //-----------------------------------------------------------------------
diff --git a/jdk/test/java/time/tck/java/time/TCKZoneId.java b/jdk/test/java/time/tck/java/time/TCKZoneId.java
index dd37d804dff..c63b393d29d 100644
--- a/jdk/test/java/time/tck/java/time/TCKZoneId.java
+++ b/jdk/test/java/time/tck/java/time/TCKZoneId.java
@@ -464,6 +464,53 @@ public class TCKZoneId extends AbstractTCKTest {
         return id;
     }
 
+    //-----------------------------------------------------------------------
+    @DataProvider(name="prefixValid")
+    Object[][] data_prefixValid() {
+        return new Object[][] {
+                {"GMT", "+01:00"},
+                {"UTC", "+01:00"},
+                {"UT", "+01:00"},
+                {"", "+01:00"},
+        };
+    }
+
+    @Test(dataProvider="prefixValid")
+    public void test_prefixOfOffset(String prefix, String offset) {
+        ZoneOffset zoff = ZoneOffset.of(offset);
+        ZoneId zoneId = ZoneId.ofOffset(prefix, zoff);
+        assertEquals(zoneId.getId(), prefix + zoff.getId(), "in correct id for : " + prefix + ", zoff: " + zoff);
+
+    }
+
+    //-----------------------------------------------------------------------
+    @DataProvider(name="prefixInvalid")
+    Object[][] data_prefixInvalid() {
+        return new Object[][] {
+                {"GM", "+01:00"},
+                {"U", "+01:00"},
+                {"UTC0", "+01:00"},
+                {"A", "+01:00"},
+        };
+    }
+
+    @Test(dataProvider="prefixInvalid", expectedExceptions=java.lang.IllegalArgumentException.class)
+    public void test_invalidPrefixOfOffset(String prefix, String offset) {
+        ZoneOffset zoff = ZoneOffset.of(offset);
+        ZoneId zoneId = ZoneId.ofOffset(prefix, zoff);
+        fail("should have thrown an exception for prefix: " + prefix);
+    }
+
+    @Test(expectedExceptions=java.lang.NullPointerException.class)
+    public void test_nullPrefixOfOffset() {
+        ZoneId.ofOffset(null, ZoneOffset.ofTotalSeconds(1));
+    }
+
+    @Test(expectedExceptions=java.lang.NullPointerException.class)
+    public void test_nullOffsetOfOffset() {
+        ZoneId.ofOffset("GMT", null);
+    }
+
     //-----------------------------------------------------------------------
     @DataProvider(name="offsetBasedValidOther")
     Object[][] data_offsetBasedValidOther() {
diff --git a/jdk/test/java/time/tck/java/time/TCKZonedDateTime.java b/jdk/test/java/time/tck/java/time/TCKZonedDateTime.java
index 3bf1dbfa6e6..d1db67fca90 100644
--- a/jdk/test/java/time/tck/java/time/TCKZonedDateTime.java
+++ b/jdk/test/java/time/tck/java/time/TCKZonedDateTime.java
@@ -127,6 +127,7 @@ import java.time.temporal.TemporalAdjuster;
 import java.time.temporal.TemporalAmount;
 import java.time.temporal.TemporalField;
 import java.time.temporal.TemporalQuery;
+import java.time.temporal.TemporalUnit;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -723,10 +724,12 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
             public boolean isSupported(TemporalField field) {
                 return TEST_DATE_TIME_PARIS.toLocalDateTime().isSupported(field);
             }
+
             @Override
             public long getLong(TemporalField field) {
                 return TEST_DATE_TIME_PARIS.toLocalDateTime().getLong(field);
             }
+
             @SuppressWarnings("unchecked")
             @Override
             public  R query(TemporalQuery query) {
@@ -791,17 +794,18 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
     @DataProvider(name="parseAdditional")
     Object[][] data_parseAdditional() {
         return new Object[][] {
-                {"2012-06-30T12:30:40Z[GMT]", 2012, 6, 30, 12, 30, 40, 0, "Z"},
-                {"2012-06-30T12:30:40Z[UT]", 2012, 6, 30, 12, 30, 40, 0, "Z"},
-                {"2012-06-30T12:30:40Z[UTC]", 2012, 6, 30, 12, 30, 40, 0, "Z"},
+                {"2012-06-30T12:30:40Z[GMT]", 2012, 6, 30, 12, 30, 40, 0, "GMT"},
+                {"2012-06-30T12:30:40Z[UT]", 2012, 6, 30, 12, 30, 40, 0, "UT"},
+                {"2012-06-30T12:30:40Z[UTC]", 2012, 6, 30, 12, 30, 40, 0, "UTC"},
+                {"2012-06-30T12:30:40+01:00[Z]", 2012, 6, 30, 12, 30, 40, 0, "Z"},
                 {"2012-06-30T12:30:40+01:00[+01:00]", 2012, 6, 30, 12, 30, 40, 0, "+01:00"},
-                {"2012-06-30T12:30:40+01:00[GMT+01:00]", 2012, 6, 30, 12, 30, 40, 0, "+01:00"},
-                {"2012-06-30T12:30:40+01:00[UT+01:00]", 2012, 6, 30, 12, 30, 40, 0, "+01:00"},
-                {"2012-06-30T12:30:40+01:00[UTC+01:00]", 2012, 6, 30, 12, 30, 40, 0, "+01:00"},
+                {"2012-06-30T12:30:40+01:00[GMT+01:00]", 2012, 6, 30, 12, 30, 40, 0, "GMT+01:00"},
+                {"2012-06-30T12:30:40+01:00[UT+01:00]", 2012, 6, 30, 12, 30, 40, 0, "UT+01:00"},
+                {"2012-06-30T12:30:40+01:00[UTC+01:00]", 2012, 6, 30, 12, 30, 40, 0, "UTC+01:00"},
                 {"2012-06-30T12:30:40-01:00[-01:00]", 2012, 6, 30, 12, 30, 40, 0, "-01:00"},
-                {"2012-06-30T12:30:40-01:00[GMT-01:00]", 2012, 6, 30, 12, 30, 40, 0, "-01:00"},
-                {"2012-06-30T12:30:40-01:00[UT-01:00]", 2012, 6, 30, 12, 30, 40, 0, "-01:00"},
-                {"2012-06-30T12:30:40-01:00[UTC-01:00]", 2012, 6, 30, 12, 30, 40, 0, "-01:00"},
+                {"2012-06-30T12:30:40-01:00[GMT-01:00]", 2012, 6, 30, 12, 30, 40, 0, "GMT-01:00"},
+                {"2012-06-30T12:30:40-01:00[UT-01:00]", 2012, 6, 30, 12, 30, 40, 0, "UT-01:00"},
+                {"2012-06-30T12:30:40-01:00[UTC-01:00]", 2012, 6, 30, 12, 30, 40, 0, "UTC-01:00"},
                 {"2012-06-30T12:30:40+01:00[Europe/London]", 2012, 6, 30, 12, 30, 40, 0, "Europe/London"},
         };
     }
@@ -899,6 +903,68 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         }
     }
 
+    //-----------------------------------------------------------------------
+    // isSupported(TemporalField)
+    //-----------------------------------------------------------------------
+    @Test
+    public void test_isSupported_TemporalField() {
+        assertEquals(TEST_DATE_TIME.isSupported((TemporalField) null), false);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.NANO_OF_SECOND), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.NANO_OF_DAY), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.MICRO_OF_SECOND), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.MICRO_OF_DAY), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.MILLI_OF_SECOND), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.MILLI_OF_DAY), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.SECOND_OF_MINUTE), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.SECOND_OF_DAY), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.MINUTE_OF_HOUR), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.MINUTE_OF_DAY), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.HOUR_OF_AMPM), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.CLOCK_HOUR_OF_AMPM), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.HOUR_OF_DAY), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.CLOCK_HOUR_OF_DAY), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.AMPM_OF_DAY), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.DAY_OF_WEEK), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.DAY_OF_MONTH), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.DAY_OF_YEAR), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.EPOCH_DAY), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.ALIGNED_WEEK_OF_MONTH), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.ALIGNED_WEEK_OF_YEAR), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.MONTH_OF_YEAR), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.PROLEPTIC_MONTH), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.YEAR), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.YEAR_OF_ERA), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.ERA), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.INSTANT_SECONDS), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoField.OFFSET_SECONDS), true);
+    }
+
+    //-----------------------------------------------------------------------
+    // isSupported(TemporalUnit)
+    //-----------------------------------------------------------------------
+    @Test
+    public void test_isSupported_TemporalUnit() {
+        assertEquals(TEST_DATE_TIME.isSupported((TemporalUnit) null), false);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoUnit.NANOS), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoUnit.MICROS), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoUnit.MILLIS), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoUnit.SECONDS), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoUnit.MINUTES), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoUnit.HOURS), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoUnit.HALF_DAYS), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoUnit.DAYS), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoUnit.WEEKS), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoUnit.MONTHS), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoUnit.YEARS), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoUnit.DECADES), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoUnit.CENTURIES), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoUnit.MILLENNIA), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoUnit.ERAS), true);
+        assertEquals(TEST_DATE_TIME.isSupported(ChronoUnit.FOREVER), false);
+    }
+
     //-----------------------------------------------------------------------
     // get(TemporalField)
     //-----------------------------------------------------------------------
@@ -1977,37 +2043,37 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
     }
 
     //-----------------------------------------------------------------------
-    // periodUntil(Temporal,TemporalUnit)
+    // until(Temporal,TemporalUnit)
     //-----------------------------------------------------------------------
     // TODO: more tests for period between two different zones
-    // compare results to OffsetDateTime.periodUntil, especially wrt dates
+    // compare results to OffsetDateTime.until, especially wrt dates
 
     @Test(dataProvider="plusDays")
     public void test_periodUntil_days(ZonedDateTime base, long expected, ZonedDateTime end) {
         if (base.toLocalTime().equals(end.toLocalTime()) == false) {
             return;  // avoid DST gap input values
         }
-        assertEquals(base.periodUntil(end, DAYS), expected);
+        assertEquals(base.until(end, DAYS), expected);
     }
 
     @Test(dataProvider="plusTime")
     public void test_periodUntil_hours(ZonedDateTime base, long expected, ZonedDateTime end) {
-        assertEquals(base.periodUntil(end, HOURS), expected);
+        assertEquals(base.until(end, HOURS), expected);
     }
 
     @Test(dataProvider="plusTime")
     public void test_periodUntil_minutes(ZonedDateTime base, long expected, ZonedDateTime end) {
-        assertEquals(base.periodUntil(end, MINUTES), expected * 60);
+        assertEquals(base.until(end, MINUTES), expected * 60);
     }
 
     @Test(dataProvider="plusTime")
     public void test_periodUntil_seconds(ZonedDateTime base, long expected, ZonedDateTime end) {
-        assertEquals(base.periodUntil(end, SECONDS), expected * 3600);
+        assertEquals(base.until(end, SECONDS), expected * 3600);
     }
 
     @Test(dataProvider="plusTime")
     public void test_periodUntil_nanos(ZonedDateTime base, long expected, ZonedDateTime end) {
-        assertEquals(base.periodUntil(end, NANOS), expected * 3600_000_000_000L);
+        assertEquals(base.until(end, NANOS), expected * 3600_000_000_000L);
     }
 
     @Test
@@ -2017,13 +2083,13 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         ZonedDateTime oneAm1 = LocalDateTime.of(2012, 6, 29, 1, 0).atZone(ZONE_PARIS);
         ZonedDateTime midnightParis2 = LocalDate.of(2012, 6, 30).atStartOfDay(ZONE_PARIS);
 
-        assertEquals(midnightLondon.periodUntil(midnightParis1, HOURS), 23);
-        assertEquals(midnightLondon.periodUntil(oneAm1, HOURS), 24);
-        assertEquals(midnightLondon.periodUntil(midnightParis2, HOURS), 23 + 24);
+        assertEquals(midnightLondon.until(midnightParis1, HOURS), 23);
+        assertEquals(midnightLondon.until(oneAm1, HOURS), 24);
+        assertEquals(midnightLondon.until(midnightParis2, HOURS), 23 + 24);
 
-        assertEquals(midnightLondon.periodUntil(midnightParis1, DAYS), 0);
-        assertEquals(midnightLondon.periodUntil(oneAm1, DAYS), 1);
-        assertEquals(midnightLondon.periodUntil(midnightParis2, DAYS), 1);
+        assertEquals(midnightLondon.until(midnightParis1, DAYS), 0);
+        assertEquals(midnightLondon.until(oneAm1, DAYS), 1);
+        assertEquals(midnightLondon.until(midnightParis2, DAYS), 1);
     }
 
     @Test
@@ -2031,8 +2097,8 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         ZonedDateTime before = TEST_PARIS_GAP_2008_03_30_02_30.withHour(0).withMinute(0).atZone(ZONE_PARIS);
         ZonedDateTime after = TEST_PARIS_GAP_2008_03_30_02_30.withHour(0).withMinute(0).plusDays(1).atZone(ZONE_PARIS);
 
-        assertEquals(before.periodUntil(after, HOURS), 23);
-        assertEquals(before.periodUntil(after, DAYS), 1);
+        assertEquals(before.until(after, HOURS), 23);
+        assertEquals(before.until(after, DAYS), 1);
     }
 
     @Test
@@ -2040,23 +2106,23 @@ public class TCKZonedDateTime extends AbstractDateTimeTest {
         ZonedDateTime before = TEST_PARIS_OVERLAP_2008_10_26_02_30.withHour(0).withMinute(0).atZone(ZONE_PARIS);
         ZonedDateTime after = TEST_PARIS_OVERLAP_2008_10_26_02_30.withHour(0).withMinute(0).plusDays(1).atZone(ZONE_PARIS);
 
-        assertEquals(before.periodUntil(after, HOURS), 25);
-        assertEquals(before.periodUntil(after, DAYS), 1);
+        assertEquals(before.until(after, HOURS), 25);
+        assertEquals(before.until(after, DAYS), 1);
     }
 
     @Test(expectedExceptions=DateTimeException.class)
     public void test_periodUntil_differentType() {
-        TEST_DATE_TIME_PARIS.periodUntil(TEST_LOCAL_2008_06_30_11_30_59_500, DAYS);
+        TEST_DATE_TIME_PARIS.until(TEST_LOCAL_2008_06_30_11_30_59_500, DAYS);
     }
 
     @Test(expectedExceptions=NullPointerException.class)
     public void test_periodUntil_nullTemporal() {
-        TEST_DATE_TIME_PARIS.periodUntil(null, DAYS);
+        TEST_DATE_TIME_PARIS.until(null, DAYS);
     }
 
     @Test(expectedExceptions=NullPointerException.class)
     public void test_periodUntil_nullUnit() {
-        TEST_DATE_TIME_PARIS.periodUntil(TEST_DATE_TIME_PARIS, null);
+        TEST_DATE_TIME_PARIS.until(TEST_DATE_TIME_PARIS, null);
     }
 
     //-----------------------------------------------------------------------
diff --git a/jdk/test/java/time/tck/java/time/chrono/CopticDate.java b/jdk/test/java/time/tck/java/time/chrono/CopticDate.java
index aa2d627058c..eca228adecb 100644
--- a/jdk/test/java/time/tck/java/time/chrono/CopticDate.java
+++ b/jdk/test/java/time/tck/java/time/chrono/CopticDate.java
@@ -87,7 +87,7 @@ import java.time.temporal.UnsupportedTemporalTypeException;
  * This class is immutable and thread-safe.
  */
 public final class CopticDate
-        implements ChronoLocalDate, Serializable {
+        implements ChronoLocalDate, Serializable {
 
     /**
      * Serialization version.
@@ -202,7 +202,7 @@ public final class CopticDate
                 }
                 return getChronology().range(f);
             }
-            throw new UnsupportedTemporalTypeException("Unsupported field: " + field.getName());
+            throw new UnsupportedTemporalTypeException("Unsupported field: " + field);
         }
         return field.rangeRefinedBy(this);
     }
@@ -224,7 +224,7 @@ public final class CopticDate
                 case YEAR: return prolepticYear;
                 case ERA: return (prolepticYear >= 1 ? 1 : 0);
             }
-            throw new UnsupportedTemporalTypeException("Unsupported field: " + field.getName());
+            throw new UnsupportedTemporalTypeException("Unsupported field: " + field);
         }
         return field.getFrom(this);
     }
@@ -249,7 +249,7 @@ public final class CopticDate
                 case YEAR: return resolvePreviousValid(nvalue, month, day);
                 case ERA: return resolvePreviousValid(1 - prolepticYear, month, day);
             }
-            throw new UnsupportedTemporalTypeException("Unsupported field: " + field.getName());
+            throw new UnsupportedTemporalTypeException("Unsupported field: " + field);
         }
         return field.adjustInto(this, newValue);
     }
@@ -268,7 +268,7 @@ public final class CopticDate
                 case CENTURIES: return plusYears(Math.multiplyExact(amountToAdd, 100));
                 case MILLENNIA: return plusYears(Math.multiplyExact(amountToAdd, 1000));
             }
-            throw new UnsupportedTemporalTypeException("Unsupported unit: " + unit.getName());
+            throw new UnsupportedTemporalTypeException("Unsupported unit: " + unit);
         }
         return unit.addTo(this, amountToAdd);
     }
@@ -297,22 +297,22 @@ public final class CopticDate
     }
 
     @Override
-    public long periodUntil(Temporal endDateTime, TemporalUnit unit) {
+    public long until(Temporal endDateTime, TemporalUnit unit) {
         if (endDateTime instanceof ChronoLocalDate == false) {
             throw new DateTimeException("Unable to calculate period between objects of two different types");
         }
-        ChronoLocalDate end = (ChronoLocalDate) endDateTime;
+        ChronoLocalDate end = (ChronoLocalDate) endDateTime;
         if (getChronology().equals(end.getChronology()) == false) {
             throw new DateTimeException("Unable to calculate period between two different chronologies");
         }
         if (unit instanceof ChronoUnit) {
-            return LocalDate.from(this).periodUntil(end, unit);  // TODO: this is wrong
+            return LocalDate.from(this).until(end, unit);  // TODO: this is wrong
         }
         return unit.between(this, endDateTime);
     }
 
     @Override
-    public Period periodUntil(ChronoLocalDate endDate) {
+    public Period until(ChronoLocalDate endDate) {
         // TODO: untested
         CopticDate end = (CopticDate) getChronology().date(endDate);
         long totalMonths = (end.prolepticYear - this.prolepticYear) * 13 + (end.month - this.month);  // safe
diff --git a/jdk/test/java/time/tck/java/time/chrono/TCKChronoLocalDate.java b/jdk/test/java/time/tck/java/time/chrono/TCKChronoLocalDate.java
index b30a255995c..92f083ef6f4 100644
--- a/jdk/test/java/time/tck/java/time/chrono/TCKChronoLocalDate.java
+++ b/jdk/test/java/time/tck/java/time/chrono/TCKChronoLocalDate.java
@@ -113,10 +113,10 @@ public class TCKChronoLocalDate {
     @Test(dataProvider="calendars")
     public void test_badWithAdjusterChrono(Chronology chrono) {
         LocalDate refDate = LocalDate.of(2013, 1, 1);
-        ChronoLocalDate date = chrono.date(refDate);
+        ChronoLocalDate date = chrono.date(refDate);
         for (Chronology[] clist : data_of_calendars()) {
             Chronology chrono2 = clist[0];
-            ChronoLocalDate date2 = chrono2.date(refDate);
+            ChronoLocalDate date2 = chrono2.date(refDate);
             TemporalAdjuster adjuster = new FixedAdjuster(date2);
             if (chrono != chrono2) {
                 try {
@@ -127,7 +127,7 @@ public class TCKChronoLocalDate {
                 }
             } else {
                 // Same chronology,
-                ChronoLocalDate result = date.with(adjuster);
+                ChronoLocalDate result = date.with(adjuster);
                 assertEquals(result, date2, "WithAdjuster failed to replace date");
             }
         }
@@ -136,10 +136,10 @@ public class TCKChronoLocalDate {
     @Test(dataProvider="calendars")
     public void test_badPlusAdjusterChrono(Chronology chrono) {
         LocalDate refDate = LocalDate.of(2013, 1, 1);
-        ChronoLocalDate date = chrono.date(refDate);
+        ChronoLocalDate date = chrono.date(refDate);
         for (Chronology[] clist : data_of_calendars()) {
             Chronology chrono2 = clist[0];
-            ChronoLocalDate date2 = chrono2.date(refDate);
+            ChronoLocalDate date2 = chrono2.date(refDate);
             TemporalAmount adjuster = new FixedAdjuster(date2);
             if (chrono != chrono2) {
                 try {
@@ -150,7 +150,7 @@ public class TCKChronoLocalDate {
                 }
             } else {
                 // Same chronology,
-                ChronoLocalDate result = date.plus(adjuster);
+                ChronoLocalDate result = date.plus(adjuster);
                 assertEquals(result, date2, "WithAdjuster failed to replace date");
             }
         }
@@ -159,10 +159,10 @@ public class TCKChronoLocalDate {
     @Test(dataProvider="calendars")
     public void test_badMinusAdjusterChrono(Chronology chrono) {
         LocalDate refDate = LocalDate.of(2013, 1, 1);
-        ChronoLocalDate date = chrono.date(refDate);
+        ChronoLocalDate date = chrono.date(refDate);
         for (Chronology[] clist : data_of_calendars()) {
             Chronology chrono2 = clist[0];
-            ChronoLocalDate date2 = chrono2.date(refDate);
+            ChronoLocalDate date2 = chrono2.date(refDate);
             TemporalAmount adjuster = new FixedAdjuster(date2);
             if (chrono != chrono2) {
                 try {
@@ -173,7 +173,7 @@ public class TCKChronoLocalDate {
                 }
             } else {
                 // Same chronology,
-                ChronoLocalDate result = date.minus(adjuster);
+                ChronoLocalDate result = date.minus(adjuster);
                 assertEquals(result, date2, "WithAdjuster failed to replace date");
             }
         }
@@ -182,10 +182,10 @@ public class TCKChronoLocalDate {
     @Test(dataProvider="calendars")
     public void test_badPlusTemporalUnitChrono(Chronology chrono) {
         LocalDate refDate = LocalDate.of(2013, 1, 1);
-        ChronoLocalDate date = chrono.date(refDate);
+        ChronoLocalDate date = chrono.date(refDate);
         for (Chronology[] clist : data_of_calendars()) {
             Chronology chrono2 = clist[0];
-            ChronoLocalDate date2 = chrono2.date(refDate);
+            ChronoLocalDate date2 = chrono2.date(refDate);
             TemporalUnit adjuster = new FixedTemporalUnit(date2);
             if (chrono != chrono2) {
                 try {
@@ -197,7 +197,7 @@ public class TCKChronoLocalDate {
                 }
             } else {
                 // Same chronology,
-                ChronoLocalDate result = date.plus(1, adjuster);
+                ChronoLocalDate result = date.plus(1, adjuster);
                 assertEquals(result, date2, "WithAdjuster failed to replace date");
             }
         }
@@ -206,10 +206,10 @@ public class TCKChronoLocalDate {
     @Test(dataProvider="calendars")
     public void test_badMinusTemporalUnitChrono(Chronology chrono) {
         LocalDate refDate = LocalDate.of(2013, 1, 1);
-        ChronoLocalDate date = chrono.date(refDate);
+        ChronoLocalDate date = chrono.date(refDate);
         for (Chronology[] clist : data_of_calendars()) {
             Chronology chrono2 = clist[0];
-            ChronoLocalDate date2 = chrono2.date(refDate);
+            ChronoLocalDate date2 = chrono2.date(refDate);
             TemporalUnit adjuster = new FixedTemporalUnit(date2);
             if (chrono != chrono2) {
                 try {
@@ -221,7 +221,7 @@ public class TCKChronoLocalDate {
                 }
             } else {
                 // Same chronology,
-                ChronoLocalDate result = date.minus(1, adjuster);
+                ChronoLocalDate result = date.minus(1, adjuster);
                 assertEquals(result, date2, "WithAdjuster failed to replace date");
             }
         }
@@ -230,10 +230,10 @@ public class TCKChronoLocalDate {
     @Test(dataProvider="calendars")
     public void test_badTemporalFieldChrono(Chronology chrono) {
         LocalDate refDate = LocalDate.of(2013, 1, 1);
-        ChronoLocalDate date = chrono.date(refDate);
+        ChronoLocalDate date = chrono.date(refDate);
         for (Chronology[] clist : data_of_calendars()) {
             Chronology chrono2 = clist[0];
-            ChronoLocalDate date2 = chrono2.date(refDate);
+            ChronoLocalDate date2 = chrono2.date(refDate);
             TemporalField adjuster = new FixedTemporalField(date2);
             if (chrono != chrono2) {
                 try {
@@ -245,7 +245,7 @@ public class TCKChronoLocalDate {
                 }
             } else {
                 // Same chronology,
-                ChronoLocalDate result = date.with(adjuster, 1);
+                ChronoLocalDate result = date.with(adjuster, 1);
                 assertEquals(result, date2, "TemporalField doSet failed to replace date");
             }
         }
@@ -258,7 +258,7 @@ public class TCKChronoLocalDate {
     public void test_date_comparisons(Chronology chrono) {
         List dates = new ArrayList<>();
 
-        ChronoLocalDate date = chrono.date(LocalDate.of(2013, 1, 1));
+        ChronoLocalDate date = chrono.date(LocalDate.of(2013, 1, 1));
 
         // Insert dates in order, no duplicates
         dates.add(date.minus(1, ChronoUnit.YEARS));
@@ -273,17 +273,17 @@ public class TCKChronoLocalDate {
 
         // Check these dates against the corresponding dates for every calendar
         for (Chronology[] clist : data_of_calendars()) {
-            List> otherDates = new ArrayList<>();
+            List otherDates = new ArrayList<>();
             Chronology chrono2 = clist[0];
-            for (ChronoLocalDate d : dates) {
+            for (ChronoLocalDate d : dates) {
                 otherDates.add(chrono2.date(d));
             }
 
             // Now compare  the sequence of original dates with the sequence of converted dates
             for (int i = 0; i < dates.size(); i++) {
-                ChronoLocalDate a = dates.get(i);
+                ChronoLocalDate a = dates.get(i);
                 for (int j = 0; j < otherDates.size(); j++) {
-                    ChronoLocalDate b = otherDates.get(j);
+                    ChronoLocalDate b = otherDates.get(j);
                     int cmp = ChronoLocalDate.timeLineOrder().compare(a, b);
                     if (i < j) {
                         assertTrue(cmp < 0, a + " compare " + b);
@@ -312,7 +312,7 @@ public class TCKChronoLocalDate {
     @Test( dataProvider="calendars")
     public void test_ChronoSerialization(Chronology chrono) throws Exception {
         LocalDate ref = LocalDate.of(2013, 1, 5);
-        ChronoLocalDate orginal = chrono.date(ref);
+        ChronoLocalDate orginal = chrono.date(ref);
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         ObjectOutputStream out = new ObjectOutputStream(baos);
         out.writeObject(orginal);
@@ -320,7 +320,7 @@ public class TCKChronoLocalDate {
         ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
         ObjectInputStream in = new ObjectInputStream(bais);
         @SuppressWarnings("unchecked")
-        ChronoLocalDate ser = (ChronoLocalDate) in.readObject();
+        ChronoLocalDate ser = (ChronoLocalDate) in.readObject();
         assertEquals(ser, orginal, "deserialized date is wrong");
     }
 
@@ -328,12 +328,12 @@ public class TCKChronoLocalDate {
     @Test(dataProvider="calendars")
     public void test_from_TemporalAccessor(Chronology chrono) {
         LocalDate refDate = LocalDate.of(2013, 1, 1);
-        ChronoLocalDate date = chrono.date(refDate);
-        ChronoLocalDate test1 = ChronoLocalDate.from(date);
+        ChronoLocalDate date = chrono.date(refDate);
+        ChronoLocalDate test1 = ChronoLocalDate.from(date);
         assertEquals(test1, date);
-        ChronoLocalDate test2 = ChronoLocalDate.from(date.atTime(LocalTime.of(12, 30)));
+        ChronoLocalDate test2 = ChronoLocalDate.from(date.atTime(LocalTime.of(12, 30)));
         assertEquals(test2, date);
-        ChronoLocalDate test3 = ChronoLocalDate.from(date.atTime(LocalTime.of(12, 30)).atZone(ZoneOffset.UTC));
+        ChronoLocalDate test3 = ChronoLocalDate.from(date.atTime(LocalTime.of(12, 30)).atZone(ZoneOffset.UTC));
         assertEquals(test3, date);
     }
 
@@ -396,11 +396,6 @@ public class TCKChronoLocalDate {
             this.temporal = temporal;
         }
 
-        @Override
-        public String getName() {
-            return "FixedTemporalUnit";
-        }
-
         @Override
         public Duration getDuration() {
             throw new UnsupportedOperationException("Not supported yet.");
@@ -411,6 +406,16 @@ public class TCKChronoLocalDate {
             throw new UnsupportedOperationException("Not supported yet.");
         }
 
+        @Override
+        public boolean isDateBased() {
+            return false;
+        }
+
+        @Override
+        public boolean isTimeBased() {
+            return false;
+        }
+
         @Override
         public boolean isSupportedBy(Temporal temporal) {
             throw new UnsupportedOperationException("Not supported yet.");
@@ -426,6 +431,11 @@ public class TCKChronoLocalDate {
         public long between(Temporal temporal1, Temporal temporal2) {
             throw new UnsupportedOperationException("Not supported yet.");
         }
+
+        @Override
+        public String toString() {
+            return "FixedTemporalUnit";
+        }
     }
 
     /**
@@ -438,11 +448,6 @@ public class TCKChronoLocalDate {
             this.temporal = temporal;
         }
 
-        @Override
-        public String getName() {
-            return "FixedTemporalField";
-        }
-
         @Override
         public TemporalUnit getBaseUnit() {
             throw new UnsupportedOperationException("Not supported yet.");
@@ -458,6 +463,16 @@ public class TCKChronoLocalDate {
             throw new UnsupportedOperationException("Not supported yet.");
         }
 
+        @Override
+        public boolean isDateBased() {
+            return false;
+        }
+
+        @Override
+        public boolean isTimeBased() {
+            return false;
+        }
+
         @Override
         public boolean isSupportedBy(TemporalAccessor temporal) {
             throw new UnsupportedOperationException("Not supported yet.");
@@ -478,5 +493,10 @@ public class TCKChronoLocalDate {
         public  R adjustInto(R temporal, long newValue) {
             return (R) this.temporal;
         }
+
+        @Override
+        public String toString() {
+            return "FixedTemporalField";
+        }
     }
 }
diff --git a/jdk/test/java/time/tck/java/time/chrono/TCKChronoLocalDateTime.java b/jdk/test/java/time/tck/java/time/chrono/TCKChronoLocalDateTime.java
index 251c071d318..129a1903998 100644
--- a/jdk/test/java/time/tck/java/time/chrono/TCKChronoLocalDateTime.java
+++ b/jdk/test/java/time/tck/java/time/chrono/TCKChronoLocalDateTime.java
@@ -410,11 +410,6 @@ public class TCKChronoLocalDateTime {
             this.temporal = temporal;
         }
 
-        @Override
-        public String getName() {
-            return "FixedTemporalUnit";
-        }
-
         @Override
         public Duration getDuration() {
             throw new UnsupportedOperationException("Not supported yet.");
@@ -425,6 +420,16 @@ public class TCKChronoLocalDateTime {
             throw new UnsupportedOperationException("Not supported yet.");
         }
 
+        @Override
+        public boolean isDateBased() {
+            return false;
+        }
+
+        @Override
+        public boolean isTimeBased() {
+            return false;
+        }
+
         @Override
         public boolean isSupportedBy(Temporal temporal) {
             throw new UnsupportedOperationException("Not supported yet.");
@@ -440,6 +445,11 @@ public class TCKChronoLocalDateTime {
         public long between(Temporal temporal1, Temporal temporal2) {
             throw new UnsupportedOperationException("Not supported yet.");
         }
+
+        @Override
+        public String toString() {
+            return "FixedTemporalUnit";
+        }
     }
 
     /**
@@ -452,11 +462,6 @@ public class TCKChronoLocalDateTime {
             this.temporal = temporal;
         }
 
-        @Override
-        public String getName() {
-            return "FixedTemporalField";
-        }
-
         @Override
         public TemporalUnit getBaseUnit() {
             throw new UnsupportedOperationException("Not supported yet.");
@@ -472,6 +477,16 @@ public class TCKChronoLocalDateTime {
             throw new UnsupportedOperationException("Not supported yet.");
         }
 
+        @Override
+        public boolean isDateBased() {
+            return false;
+        }
+
+        @Override
+        public boolean isTimeBased() {
+            return false;
+        }
+
         @Override
         public boolean isSupportedBy(TemporalAccessor temporal) {
             throw new UnsupportedOperationException("Not supported yet.");
@@ -492,5 +507,10 @@ public class TCKChronoLocalDateTime {
         public  R adjustInto(R temporal, long newValue) {
             return (R) this.temporal;
         }
+
+        @Override
+        public String toString() {
+            return "FixedTemporalField";
+        }
     }
 }
diff --git a/jdk/test/java/time/tck/java/time/chrono/TCKChronoZonedDateTime.java b/jdk/test/java/time/tck/java/time/chrono/TCKChronoZonedDateTime.java
index 611c9258df9..3b89857fa45 100644
--- a/jdk/test/java/time/tck/java/time/chrono/TCKChronoZonedDateTime.java
+++ b/jdk/test/java/time/tck/java/time/chrono/TCKChronoZonedDateTime.java
@@ -256,7 +256,7 @@ public class TCKChronoZonedDateTime {
     }
 
     //-----------------------------------------------------------------------
-    // isBefore, isAfter, isEqual, INSTANT_COMPARATOR  test a Chronology against the other Chronos
+    // isBefore, isAfter, isEqual, timeLineOrder()  test a Chronology against the other Chronos
     //-----------------------------------------------------------------------
     @Test(dataProvider="calendars")
     public void test_zonedDateTime_comparisons(Chronology chrono) {
@@ -412,11 +412,6 @@ public class TCKChronoZonedDateTime {
             this.temporal = temporal;
         }
 
-        @Override
-        public String getName() {
-            return "FixedTemporalUnit";
-        }
-
         @Override
         public Duration getDuration() {
             throw new UnsupportedOperationException("Not supported yet.");
@@ -427,6 +422,16 @@ public class TCKChronoZonedDateTime {
             throw new UnsupportedOperationException("Not supported yet.");
         }
 
+        @Override
+        public boolean isDateBased() {
+            return false;
+        }
+
+        @Override
+        public boolean isTimeBased() {
+            return false;
+        }
+
         @Override
         public boolean isSupportedBy(Temporal temporal) {
             throw new UnsupportedOperationException("Not supported yet.");
@@ -442,6 +447,12 @@ public class TCKChronoZonedDateTime {
         public long between(Temporal temporal1, Temporal temporal2) {
             throw new UnsupportedOperationException("Not supported yet.");
         }
+
+        @Override
+        public String toString() {
+            return "FixedTemporalUnit";
+        }
+
     }
 
     /**
@@ -454,11 +465,6 @@ public class TCKChronoZonedDateTime {
             this.temporal = temporal;
         }
 
-        @Override
-        public String getName() {
-            return "FixedTemporalField";
-        }
-
         @Override
         public TemporalUnit getBaseUnit() {
             throw new UnsupportedOperationException("Not supported yet.");
@@ -474,6 +480,16 @@ public class TCKChronoZonedDateTime {
             throw new UnsupportedOperationException("Not supported yet.");
         }
 
+        @Override
+        public boolean isDateBased() {
+            return false;
+        }
+
+        @Override
+        public boolean isTimeBased() {
+            return false;
+        }
+
         @Override
         public boolean isSupportedBy(TemporalAccessor temporal) {
             throw new UnsupportedOperationException("Not supported yet.");
@@ -494,5 +510,10 @@ public class TCKChronoZonedDateTime {
         public  R adjustInto(R temporal, long newValue) {
             return (R) this.temporal;
         }
+
+        @Override
+        public String toString() {
+            return "FixedTemporalField";
+        }
     }
 }
diff --git a/jdk/test/java/time/tck/java/time/chrono/TCKChronology.java b/jdk/test/java/time/tck/java/time/chrono/TCKChronology.java
index 0077be55315..c705f9794ce 100644
--- a/jdk/test/java/time/tck/java/time/chrono/TCKChronology.java
+++ b/jdk/test/java/time/tck/java/time/chrono/TCKChronology.java
@@ -64,18 +64,27 @@ import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertSame;
 import static org.testng.Assert.assertTrue;
 
+import java.util.Locale;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.time.ZoneId;
+import java.time.Clock;
 import java.time.DateTimeException;
 import java.time.chrono.ChronoLocalDate;
 import java.time.chrono.Chronology;
 import java.time.chrono.HijrahChronology;
+import java.time.chrono.HijrahEra;
 import java.time.chrono.IsoChronology;
+import java.time.chrono.IsoEra;
 import java.time.chrono.JapaneseChronology;
+import java.time.chrono.JapaneseEra;
 import java.time.chrono.MinguoChronology;
+import java.time.chrono.MinguoEra;
 import java.time.chrono.ThaiBuddhistChronology;
+import java.time.chrono.ThaiBuddhistEra;
+import java.time.format.TextStyle;
 import java.time.temporal.ChronoField;
 import java.util.Locale;
 import java.util.Set;
@@ -133,15 +142,35 @@ public class TCKChronology {
                 + ", expected >= " + data_of_calendars().length);
     }
 
+    //-----------------------------------------------------------------------
+    // getDisplayName()
+    //-----------------------------------------------------------------------
+    @DataProvider(name = "calendarDisplayName")
+    Object[][] data_of_calendarDisplayNames() {
+        return new Object[][] {
+                    {"Hijrah", "Hijrah-umalqura"},
+                    {"ISO", "ISO"},
+                    {"Japanese", "Japanese Calendar"},
+                    {"Minguo", "Minguo Calendar"},
+                    {"ThaiBuddhist", "Buddhist Calendar"},
+                };
+    }
+
+    @Test(dataProvider = "calendarDisplayName")
+    public void test_getDisplayName(String chronoId, String calendarDisplayName) {
+        Chronology chrono = Chronology.of(chronoId);
+        assertEquals(chrono.getDisplayName(TextStyle.FULL, Locale.ENGLISH), calendarDisplayName);
+    }
+
     /**
      * Compute the number of days from the Epoch and compute the date from the number of days.
      */
     @Test(dataProvider = "calendarNameAndType")
     public void test_epoch(String name, String alias) {
         Chronology chrono = Chronology.of(name); // a chronology. In practice this is rarely hardcoded
-        ChronoLocalDate date1 = chrono.dateNow();
+        ChronoLocalDate date1 = chrono.dateNow();
         long epoch1 = date1.getLong(ChronoField.EPOCH_DAY);
-        ChronoLocalDate date2 = date1.with(ChronoField.EPOCH_DAY, epoch1);
+        ChronoLocalDate date2 = date1.with(ChronoField.EPOCH_DAY, epoch1);
         assertEquals(date1, date2, "Date from epoch day is not same date: " + date1 + " != " + date2);
         long epoch2 = date1.getLong(ChronoField.EPOCH_DAY);
         assertEquals(epoch1, epoch2, "Epoch day not the same: " + epoch1 + " != " + epoch2);
@@ -150,9 +179,9 @@ public class TCKChronology {
     @Test(dataProvider = "calendarNameAndType")
     public void test_dateEpochDay(String name, String alias) {
         Chronology chrono = Chronology.of(name);
-        ChronoLocalDate date = chrono.dateNow();
+        ChronoLocalDate date = chrono.dateNow();
         long epochDay = date.getLong(ChronoField.EPOCH_DAY);
-        ChronoLocalDate test = chrono.dateEpochDay(epochDay);
+        ChronoLocalDate test = chrono.dateEpochDay(epochDay);
         assertEquals(test, date);
     }
 
@@ -184,6 +213,101 @@ public class TCKChronology {
         assertEquals(Chronology.ofLocale(locale), chrono);
     }
 
+    //-----------------------------------------------------------------------
+    // dateNow()
+    //-----------------------------------------------------------------------
+    @Test
+    public void test_MinguoChronology_dateNow() {
+        ZoneId zoneId_paris = ZoneId.of("Europe/Paris");
+        Clock clock = Clock.system(zoneId_paris);
+
+        Chronology chrono = Chronology.of("Minguo");
+        assertEquals(chrono.dateNow(), MinguoChronology.INSTANCE.dateNow());
+        assertEquals(chrono.dateNow(zoneId_paris), MinguoChronology.INSTANCE.dateNow(zoneId_paris));
+        assertEquals(chrono.dateNow(clock), MinguoChronology.INSTANCE.dateNow(clock));
+    }
+
+    @Test
+    public void test_IsoChronology_dateNow() {
+        ZoneId zoneId_paris = ZoneId.of("Europe/Paris");
+        Clock clock = Clock.system(zoneId_paris);
+
+        Chronology chrono = Chronology.of("ISO");
+        assertEquals(chrono.dateNow(), IsoChronology.INSTANCE.dateNow());
+        assertEquals(chrono.dateNow(zoneId_paris), IsoChronology.INSTANCE.dateNow(zoneId_paris));
+        assertEquals(chrono.dateNow(clock), IsoChronology.INSTANCE.dateNow(clock));
+    }
+
+    @Test
+    public void test_JapaneseChronology_dateNow() {
+        ZoneId zoneId_paris = ZoneId.of("Europe/Paris");
+        Clock clock = Clock.system(zoneId_paris);
+
+        Chronology chrono = Chronology.of("Japanese");
+        assertEquals(chrono.dateNow(), JapaneseChronology.INSTANCE.dateNow());
+        assertEquals(chrono.dateNow(zoneId_paris), JapaneseChronology.INSTANCE.dateNow(zoneId_paris));
+        assertEquals(chrono.dateNow(clock), JapaneseChronology.INSTANCE.dateNow(clock));
+    }
+
+    @Test
+    public void test_ThaiBuddhistChronology_dateNow() {
+        ZoneId zoneId_paris = ZoneId.of("Europe/Paris");
+        Clock clock = Clock.system(zoneId_paris);
+
+        Chronology chrono = Chronology.of("ThaiBuddhist");
+        assertEquals(chrono.dateNow(), ThaiBuddhistChronology.INSTANCE.dateNow());
+        assertEquals(chrono.dateNow(zoneId_paris), ThaiBuddhistChronology.INSTANCE.dateNow(zoneId_paris));
+        assertEquals(chrono.dateNow(clock), ThaiBuddhistChronology.INSTANCE.dateNow(clock));
+    }
+
+    //-----------------------------------------------------------------------
+    // dateYearDay() and date()
+    //-----------------------------------------------------------------------
+    @Test
+    public void test_HijrahChronology_dateYearDay() {
+        Chronology chrono = Chronology.of("Hijrah");
+        ChronoLocalDate date1 = chrono.dateYearDay(HijrahEra.AH, 1434, 178);
+        ChronoLocalDate date2 = chrono.date(HijrahEra.AH, 1434, 7, 1);
+        assertEquals(date1, HijrahChronology.INSTANCE.dateYearDay(HijrahEra.AH, 1434, 178));
+        assertEquals(date2, HijrahChronology.INSTANCE.dateYearDay(HijrahEra.AH, 1434, 178));
+    }
+
+    @Test
+    public void test_MinguoChronology_dateYearDay() {
+        Chronology chrono = Chronology.of("Minguo");
+        ChronoLocalDate date1 = chrono.dateYearDay(MinguoEra.ROC, 5, 60);
+        ChronoLocalDate date2 = chrono.date(MinguoEra.ROC, 5, 2, 29);
+        assertEquals(date1, MinguoChronology.INSTANCE.dateYearDay(MinguoEra.ROC, 5, 60));
+        assertEquals(date2, MinguoChronology.INSTANCE.dateYearDay(MinguoEra.ROC, 5, 60));
+    }
+
+    @Test
+    public void test_IsoChronology_dateYearDay() {
+        Chronology chrono = Chronology.of("ISO");
+        ChronoLocalDate date1 = chrono.dateYearDay(IsoEra.CE, 5, 60);
+        ChronoLocalDate date2 = chrono.date(IsoEra.CE, 5, 3, 1);
+        assertEquals(date1, IsoChronology.INSTANCE.dateYearDay(IsoEra.CE, 5, 60));
+        assertEquals(date2, IsoChronology.INSTANCE.dateYearDay(IsoEra.CE, 5, 60));
+    }
+
+    @Test
+    public void test_JapaneseChronology_dateYearDay() {
+        Chronology chrono = Chronology.of("Japanese");
+        ChronoLocalDate date1 = chrono.dateYearDay(JapaneseEra.HEISEI, 8, 60);
+        ChronoLocalDate date2 = chrono.date(JapaneseEra.HEISEI, 8, 2, 29);
+        assertEquals(date1, JapaneseChronology.INSTANCE.dateYearDay(JapaneseEra.HEISEI, 8, 60));
+        assertEquals(date2, JapaneseChronology.INSTANCE.dateYearDay(JapaneseEra.HEISEI, 8, 60));
+    }
+
+    @Test
+    public void test_ThaiBuddhistChronology_dateYearDay() {
+        Chronology chrono = Chronology.of("ThaiBuddhist");
+        ChronoLocalDate date1 = chrono.dateYearDay(ThaiBuddhistEra.BE, 2459, 60);
+        ChronoLocalDate date2 = chrono.date(ThaiBuddhistEra.BE, 2459, 2, 29);
+        assertEquals(date1, ThaiBuddhistChronology.INSTANCE.dateYearDay(ThaiBuddhistEra.BE, 2459, 60));
+        assertEquals(date2, ThaiBuddhistChronology.INSTANCE.dateYearDay(ThaiBuddhistEra.BE, 2459, 60));
+    }
+
     /**
      * Test lookup by calendarType of each chronology.
      * Verify that the calendar can be found by {@link java.time.chrono.Chronology#ofLocale}.
diff --git a/jdk/test/java/time/tck/java/time/chrono/TCKHijrahChronology.java b/jdk/test/java/time/tck/java/time/chrono/TCKHijrahChronology.java
index 81b3ab740ae..61c19ab16cf 100644
--- a/jdk/test/java/time/tck/java/time/chrono/TCKHijrahChronology.java
+++ b/jdk/test/java/time/tck/java/time/chrono/TCKHijrahChronology.java
@@ -56,18 +56,13 @@
  */
 package tck.java.time.chrono;
 
-import static java.time.temporal.ChronoField.DAY_OF_WEEK;
+import java.time.Clock;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
 
-import java.time.Clock;
 import java.time.DateTimeException;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.Month;
-import java.time.Period;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.time.chrono.ChronoLocalDate;
@@ -77,11 +72,12 @@ import java.time.chrono.HijrahChronology;
 import java.time.chrono.HijrahDate;
 import java.time.chrono.HijrahEra;
 import java.time.chrono.IsoChronology;
-import java.time.chrono.MinguoChronology;
-import java.time.chrono.MinguoDate;
-import java.time.temporal.ChronoUnit;
-import java.time.temporal.TemporalAdjuster;
+import java.time.format.ResolverStyle;
+import java.time.temporal.ChronoField;
+import java.time.temporal.TemporalField;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
@@ -106,49 +102,7 @@ public class TCKHijrahChronology {
         Assert.assertEquals(test, c);
     }
 
-    //-----------------------------------------------------------------------
-    // creation, toLocalDate()
-    //-----------------------------------------------------------------------
-    @DataProvider(name="samples")
-    Object[][] data_samples() {
-        return new Object[][] {
-            //{HijrahChronology.INSTANCE.date(1320, 1, 1), LocalDate.of(1902, 4, 9)},
-            //{HijrahChronology.INSTANCE.date(1320, 1, 2), LocalDate.of(1902, 4, 10)},
-            //{HijrahChronology.INSTANCE.date(1320, 1, 3), LocalDate.of(1902, 4, 11)},
-
-            //{HijrahChronology.INSTANCE.date(1322, 1, 1), LocalDate.of(1904, 3, 18)},
-            //{HijrahChronology.INSTANCE.date(1323, 1, 1), LocalDate.of(1905, 3, 7)},
-            //{HijrahChronology.INSTANCE.date(1323, 12, 6), LocalDate.of(1906, 1, 30)},
-            //{HijrahChronology.INSTANCE.date(1324, 1, 1), LocalDate.of(1906, 2, 24)},
-            //{HijrahChronology.INSTANCE.date(1324, 7, 3), LocalDate.of(1906, 8, 23)},
-            //{HijrahChronology.INSTANCE.date(1324, 7, 4), LocalDate.of(1906, 8, 24)},
-            //{HijrahChronology.INSTANCE.date(1325, 1, 1), LocalDate.of(1907, 2, 13)},
-
-            {HijrahChronology.INSTANCE.date(1434, 7, 1), LocalDate.of(2013, 5, 11)},
-            {HijrahChronology.INSTANCE.date(HijrahEra.AH, 1434, 7, 1), LocalDate.of(2013, 5, 11)},
-            {HijrahChronology.INSTANCE.dateYearDay(HijrahEra.AH, 1434, 178), LocalDate.of(2013, 5, 11)},
-            {HijrahChronology.INSTANCE.dateYearDay(1434, 178), LocalDate.of(2013, 5, 11)},
-            //{HijrahChronology.INSTANCE.date(1500, 3, 3), LocalDate.of(2079, 1, 5)},
-            //{HijrahChronology.INSTANCE.date(1500, 10, 28), LocalDate.of(2079, 8, 25)},
-            //{HijrahChronology.INSTANCE.date(1500, 10, 29), LocalDate.of(2079, 8, 26)},
-        };
-    }
-
-    @Test(dataProvider="samples")
-    public void test_toLocalDate(ChronoLocalDate hijrahDate, LocalDate iso) {
-        assertEquals(LocalDate.from(hijrahDate), iso);
-    }
-
-    @Test(dataProvider="samples")
-    public void test_fromCalendrical(ChronoLocalDate hijrahDate, LocalDate iso) {
-        assertEquals(HijrahChronology.INSTANCE.date(iso), hijrahDate);
-    }
-
-    @Test(dataProvider="samples")
-    public void test_dayOfWeekEqualIsoDayOfWeek(ChronoLocalDate hijrahDate, LocalDate iso) {
-        assertEquals(hijrahDate.get(DAY_OF_WEEK), iso.get(DAY_OF_WEEK), "Hijrah day of week should be same as ISO day of week");
-    }
-
+    // Tests for dateNow() method
     @Test
     public void test_dateNow(){
         assertEquals(HijrahChronology.INSTANCE.dateNow(), HijrahDate.now()) ;
@@ -169,31 +123,41 @@ public class TCKHijrahChronology {
         assertEquals(HijrahChronology.INSTANCE.dateNow(ZoneId.of(ZoneOffset.UTC.getId())), HijrahChronology.INSTANCE.dateNow(Clock.systemUTC())) ;
     }
 
+    // Sample invalid dates
     @DataProvider(name="badDates")
     Object[][] data_badDates() {
         return new Object[][] {
-            {1434, 0, 0},
-
+            {1299, 12, 29},
+            {1320, 1, 29 + 1},
+            {1320, 12, 29 + 1},
             {1434, -1, 1},
+            {1605, 1, 29},
             {1434, 0, 1},
             {1434, 14, 1},
             {1434, 15, 1},
-
             {1434, 1, -1},
             {1434, 1, 0},
             {1434, 1, 32},
-
             {1434, 12, -1},
             {1434, 12, 0},
             {1434, 12, 32},
         };
     }
 
+    // This is a negative test to verify if the API throws exception if an invalid date is provided
     @Test(dataProvider="badDates", expectedExceptions=DateTimeException.class)
     public void test_badDates(int year, int month, int dom) {
         HijrahChronology.INSTANCE.date(year, month, dom);
     }
 
+    // Negative test or dateYearDay with day too large
+    @Test(expectedExceptions=java.time.DateTimeException.class)
+    public void test_ofYearDayTooLarge() {
+        int year = 1435;
+        int lengthOfYear = HijrahChronology.INSTANCE.dateYearDay(year, 1).lengthOfYear();
+        HijrahDate hd = HijrahChronology.INSTANCE.dateYearDay(year, lengthOfYear + 1);
+    }
+
     //-----------------------------------------------------------------------
     // Bad Era for Chronology.date(era,...) and Chronology.prolepticYear(Era,...)
     //-----------------------------------------------------------------------
@@ -213,7 +177,7 @@ public class TCKHijrahChronology {
                     ; // ignore expected exception
                 }
 
-                /* TODO: Test for missing HijrahDate.of(Era, y, m, d) method.
+                /* TODO: Test for checking HijrahDate.of(Era, y, m, d) method if it is added.
                 try {
                     @SuppressWarnings("unused")
                     HijrahDate jdate = HijrahDate.of(era, 1, 1, 1);
@@ -233,102 +197,344 @@ public class TCKHijrahChronology {
             }
         }
     }
-
     //-----------------------------------------------------------------------
-    // with(WithAdjuster)
+    // Tests for HijrahChronology resolve
     //-----------------------------------------------------------------------
-    @Test
-    public void test_adjust1() {
-        ChronoLocalDate base = HijrahChronology.INSTANCE.date(1434, 5, 15);
-        ChronoLocalDate test = base.with(TemporalAdjuster.lastDayOfMonth());
-        assertEquals(test, HijrahChronology.INSTANCE.date(1434, 5, 29));
+    @DataProvider(name = "resolve_styleByEra")
+    Object[][] data_resolve_styleByEra() {
+        Object[][] result = new Object[ResolverStyle.values().length * HijrahEra.values().length][];
+        int i = 0;
+        for (ResolverStyle style : ResolverStyle.values()) {
+            for (HijrahEra era : HijrahEra.values()) {
+                result[i++] = new Object[] {style, era};
+            }
+        }
+        return result;
     }
 
-    @Test
-    public void test_adjust2() {
-        ChronoLocalDate base = HijrahChronology.INSTANCE.date(1434, 6, 2);
-        ChronoLocalDate test = base.with(TemporalAdjuster.lastDayOfMonth());
-        assertEquals(test, HijrahChronology.INSTANCE.date(1434, 6, 30));
+    @Test(dataProvider = "resolve_styleByEra")
+    public void test_resolve_yearOfEra_eraOnly_valid(ResolverStyle style, HijrahEra era) {
+        Map fieldValues = new HashMap<>();
+        fieldValues.put(ChronoField.ERA, (long) era.getValue());
+        HijrahDate date = HijrahChronology.INSTANCE.resolveDate(fieldValues, style);
+        assertEquals(date, null);
+        assertEquals(fieldValues.get(ChronoField.ERA), (Long) (long) era.getValue());
+        assertEquals(fieldValues.size(), 1);
+    }
+
+    @Test(dataProvider = "resolve_styleByEra")
+    public void test_resolve_yearOfEra_eraAndYearOfEraOnly_valid(ResolverStyle style, HijrahEra era) {
+        Map fieldValues = new HashMap<>();
+        fieldValues.put(ChronoField.ERA, (long) era.getValue());
+        fieldValues.put(ChronoField.YEAR_OF_ERA, 1343L);
+        HijrahDate date = HijrahChronology.INSTANCE.resolveDate(fieldValues, style);
+        assertEquals(date, null);
+        assertEquals(fieldValues.get(ChronoField.ERA), null);
+        assertEquals(fieldValues.get(ChronoField.YEAR_OF_ERA), null);
+        assertEquals(fieldValues.get(ChronoField.YEAR), (Long) 1343L);
+        assertEquals(fieldValues.size(), 1);
+    }
+
+    @Test(dataProvider = "resolve_styleByEra")
+    public void test_resolve_yearOfEra_eraAndYearOnly_valid(ResolverStyle style, HijrahEra era) {
+        Map fieldValues = new HashMap<>();
+        fieldValues.put(ChronoField.ERA, (long) era.getValue());
+        fieldValues.put(ChronoField.YEAR, 1343L);
+        HijrahDate date = HijrahChronology.INSTANCE.resolveDate(fieldValues, style);
+        assertEquals(date, null);
+        assertEquals(fieldValues.get(ChronoField.ERA), (Long) (long) era.getValue());
+        assertEquals(fieldValues.get(ChronoField.YEAR), (Long) 1343L);
+        assertEquals(fieldValues.size(), 2);
+    }
+
+    @DataProvider(name = "resolve_styles")
+    Object[][] data_resolve_styles() {
+        Object[][] result = new Object[ResolverStyle.values().length][];
+        int i = 0;
+        for (ResolverStyle style : ResolverStyle.values()) {
+            result[i++] = new Object[] {style};
+        }
+        return result;
+    }
+
+    @Test(dataProvider = "resolve_styles")
+    public void test_resolve_yearOfEra_yearOfEraOnly_valid(ResolverStyle style) {
+        Map fieldValues = new HashMap<>();
+        fieldValues.put(ChronoField.YEAR_OF_ERA, 1343L);
+        HijrahDate date = HijrahChronology.INSTANCE.resolveDate(fieldValues, style);
+        assertEquals(date, null);
+        assertEquals(fieldValues.get(ChronoField.YEAR_OF_ERA), (style != ResolverStyle.STRICT) ? null : (Long) 1343L);
+        assertEquals(fieldValues.get(ChronoField.YEAR), (style == ResolverStyle.STRICT) ? null : (Long) 1343L);
+        assertEquals(fieldValues.size(), 1);
+    }
+
+    @Test(dataProvider = "resolve_styles")
+    public void test_resolve_yearOfEra_yearOfEraAndYearOnly_valid(ResolverStyle style) {
+        Map fieldValues = new HashMap<>();
+        fieldValues.put(ChronoField.YEAR_OF_ERA, 1343L);
+        fieldValues.put(ChronoField.YEAR, 1343L);
+        HijrahDate date = HijrahChronology.INSTANCE.resolveDate(fieldValues, style);
+        assertEquals(date, null);
+        assertEquals(fieldValues.get(ChronoField.YEAR_OF_ERA), null);
+        assertEquals(fieldValues.get(ChronoField.YEAR), (Long) 1343L);
+        assertEquals(fieldValues.size(), 1);
     }
 
     //-----------------------------------------------------------------------
-    // HijrahDate.with(Local*)
+    // Sample Hijrah Calendar data; official data is in lib/hijrah-ummalqura.properties
+    // 1432=29 30 30 30 29 30 29 30 29 30 29 29  total = 354
+    // 1433=30 29 30 30 29 30 30 29 30 29 30 29  total = 355
+    // 1434=29 30 29 30 29 30 30 29 30 30 29 29  total = 354
+    // 1435=30 29 30 29 30 29 30 29 30 30 29 30  total = 355
     //-----------------------------------------------------------------------
-    @Test
-    public void test_adjust_toLocalDate() {
-        ChronoLocalDate hijrahDate = HijrahChronology.INSTANCE.date(1435, 1, 4);
-        ChronoLocalDate test = hijrahDate.with(LocalDate.of(2012, 7, 6));
-        assertEquals(test, HijrahChronology.INSTANCE.date(1433, 8, 16));
-    }
+    @DataProvider(name = "resolve_ymd")
+    Object[][] data_resolve_ymd() {
+        // Compute the number of days in various month and years so that test cases
+        // are not dependent on specific calendar data
+        // Month numbers are always 1..12 so they can be used literally
+        final int year = 1434;
+        final int yearP1 = year + 1;
+        final int yearP2 = year + 2;
+        final int yearM1 = year - 1;
+        final int yearM2 = year - 2;
+        final int lastDayInYear = dateYearDay(year, 1).lengthOfYear();
+        final int lastDayInYearP1 = dateYearDay(yearP1, 1).lengthOfYear();
+        final int lastDayInYearM1 = dateYearDay(yearM1, 1).lengthOfYear();
+        final int lastDayInYearM2 = dateYearDay(yearM2, 1).lengthOfYear();
+        final int lastDayInMonthM1 = date(yearM1, 12, 1).lengthOfMonth();
+        final int lastDayInMonthM2 = date(yearM1, 11, 1).lengthOfMonth();
+        final int lastDayInMonthM11 = date(yearM1, 2, 1).lengthOfMonth();
 
-    @Test(expectedExceptions=DateTimeException.class)
-    public void test_adjust_toMonth() {
-        ChronoLocalDate hijrahDate = HijrahChronology.INSTANCE.date(1435, 1, 4);
-        hijrahDate.with(Month.APRIL);
-    }
+        final int lastDayInMonth1 = date(year, 1, 1).lengthOfMonth();
+        final int lastDayInMonth2 = date(year, 2, 1).lengthOfMonth();
+        final int lastDayInMonth4 = date(year, 4, 1).lengthOfMonth();
+        final int lastDayInMonth5 = date(year, 5, 1).lengthOfMonth();
+        final int lastDayInMonth6 = date(year, 6, 1).lengthOfMonth();
+        final int lastDayInMonth7 = date(year, 7, 1).lengthOfMonth();
 
-    //-----------------------------------------------------------------------
-    // LocalDate.with(HijrahDate)
-    //-----------------------------------------------------------------------
-    @Test
-    public void test_LocalDate_adjustToHijrahDate() {
-        ChronoLocalDate hijrahDate = HijrahChronology.INSTANCE.date(1434, 5, 15);
-        LocalDate test = LocalDate.MIN.with(hijrahDate);
-        assertEquals(test, LocalDate.of(2013, 3, 27));
-    }
-
-    @Test
-    public void test_LocalDateTime_adjustToHijrahDate() {
-        ChronoLocalDate hijrahDate = HijrahChronology.INSTANCE.date(1435, 5, 15);
-        LocalDateTime test = LocalDateTime.MIN.with(hijrahDate);
-        assertEquals(test, LocalDateTime.of(2014, 3, 16, 0, 0));
-    }
-
-    //-----------------------------------------------------------------------
-    // PeriodUntil()
-    //-----------------------------------------------------------------------
-    @Test
-    public void test_periodUntilDate() {
-        HijrahDate mdate1 = HijrahDate.of(1434, 1, 1);
-        HijrahDate mdate2 = HijrahDate.of(1435, 2, 2);
-        Period period = mdate1.periodUntil(mdate2);
-        assertEquals(period, Period.of(1, 1, 1));
-    }
-
-    @Test
-    public void test_periodUntilUnit() {
-        HijrahDate mdate1 = HijrahDate.of(1434, 1, 1);
-        HijrahDate mdate2 = HijrahDate.of(1435, 2, 2);
-        long months = mdate1.periodUntil(mdate2, ChronoUnit.MONTHS);
-        assertEquals(months, 13);
-    }
-
-    @Test
-    public void test_periodUntilDiffChrono() {
-        HijrahDate mdate1 = HijrahDate.of(1434, 1, 1);
-        HijrahDate mdate2 = HijrahDate.of(1435, 2, 2);
-        MinguoDate ldate2 = MinguoChronology.INSTANCE.date(mdate2);
-        Period period = mdate1.periodUntil(ldate2);
-        assertEquals(period, Period.of(1, 1, 1));
-    }
-
-    //-----------------------------------------------------------------------
-    // toString()
-    //-----------------------------------------------------------------------
-    @DataProvider(name="toString")
-    Object[][] data_toString() {
         return new Object[][] {
-            //{HijrahChronology.INSTANCE.date(1320, 1, 1), "Hijrah AH 1320-01-01"},
-            //{HijrahChronology.INSTANCE.date(1500, 10, 28), "Hijrah AH 1500-10-28"},
-            //{HijrahChronology.INSTANCE.date(1500, 10, 29), "Hijrah AH 1500-10-29"},
-            {HijrahChronology.INSTANCE.date(1434, 12, 5), "Hijrah-umalqura AH 1434-12-05"},
-            {HijrahChronology.INSTANCE.date(1434, 12, 6), "Hijrah-umalqura AH 1434-12-06"},
+                {year, 1, -lastDayInYearM1, dateYearDay(yearM2, lastDayInYearM2), false, false},
+                {year, 1, -lastDayInYearM1 + 1, date(yearM1, 1, 1), false, false},
+                {year, 1, -lastDayInMonthM1, date(yearM1, 11, lastDayInMonthM2), false, false},
+                {year, 1, -lastDayInMonthM1 + 1, date(yearM1, 12, 1), false, false},
+                {year, 1, -12, date(yearM1, 12, lastDayInMonthM1 - 12), false, false},
+                {year, 1, 1, date(year, 1, 1), true, true},
+                {year, 1, lastDayInMonth1 + lastDayInMonth2 - 1, date(year, 2, lastDayInMonth2 - 1), false, false},
+                {year, 1, lastDayInMonth1 + lastDayInMonth2, date(year, 2, lastDayInMonth2), false, false},
+                {year, 1, lastDayInMonth1 + lastDayInMonth2 + 1 , date(year, 3, 1), false, false},
+                {year, 1, lastDayInYear, dateYearDay(year, lastDayInYear), false, false},
+                {year, 1, lastDayInYear + 1, date(1435, 1, 1), false, false},
+                {year, 1, lastDayInYear + lastDayInYearP1, dateYearDay(yearP1, lastDayInYearP1), false, false},
+                {year, 1, lastDayInYear + lastDayInYearP1 + 1, date(yearP2, 1, 1), false, false},
+
+                {year, 2, 1, date(year, 2, 1), true, true},
+                {year, 2, lastDayInMonth2 - 2, date(year, 2, lastDayInMonth2 - 2), true, true},
+                {year, 2, lastDayInMonth2 - 1, date(year, 2, lastDayInMonth2 - 1), true, true},
+                {year, 2, lastDayInMonth2, date(year, 2, lastDayInMonth2), date(year, 2, lastDayInMonth2), true},
+                {year, 2, lastDayInMonth2 + 1, date(year, 3, 1), false, false},
+
+                {year, -12, 1, date(yearM2, 12, 1), false, false},
+                {year, -11, 1, date(yearM1, 1, 1), false, false},
+                {year, -1, 1, date(yearM1, 11, 1), false, false},
+                {year, 0, 1, date(yearM1, 12, 1), false, false},
+                {year, 1, 1, date(year, 1, 1), true, true},
+                {year, 12, 1, date(year, 12, 1), true, true},
+                {year, 13, 1, date(yearP1, 1, 1), false, false},
+                {year, 24, 1, date(yearP1, 12, 1), false, false},
+                {year, 25, 1, date(yearP2, 1, 1), false, false},
+
+                {year, 6, -lastDayInMonth5, date(year, 4, lastDayInMonth4), false, false},
+                {year, 6, -lastDayInMonth5 + 1, date(year, 5, 1), false, false},
+                {year, 6, -1, date(year, 5, lastDayInMonth5 - 1), false, false},
+                {year, 6, 0, date(year, 5, lastDayInMonth5), false, false},
+                {year, 6, 1, date(year, 6, 1), true, true},
+                {year, 6, lastDayInMonth6 - 1 , date(year, 6, lastDayInMonth6 - 1), true, true},
+                {year, 6, lastDayInMonth6, date(year, 6, lastDayInMonth6), date(year, 6, lastDayInMonth6), true},
+                {year, 6, lastDayInMonth6 + 1, date(year, 7, 1), false, false},
+                {year, 6, lastDayInMonth6 + lastDayInMonth7 , date(year, 7, lastDayInMonth7), false, false},
+                {year, 6, lastDayInMonth6 + lastDayInMonth7 + 1, date(year, 8, 1), false, false},
+
+                {yearM1, 2, 1, date(yearM1, 2, 1), true, true},
+                {yearM1, 2, lastDayInMonthM11 - 1, date(yearM1, 2, lastDayInMonthM11 - 1), true, true},
+                {yearM1, 2, lastDayInMonthM11, date(yearM1, 2, lastDayInMonthM11), true, true},
+                {yearM1, 2, lastDayInMonthM11 + 1, date(yearM1, 3, 1), date(yearM1, 2, lastDayInMonthM11), false},
+                {yearM1, 2, lastDayInMonthM11 + 2, date(yearM1, 3, 2), false, false},
+                // Bad dates
+                {1299, 12, 1, null, false, false},
+                {1601, 1, 1, null, false, false},
+
         };
     }
 
-    @Test(dataProvider="toString")
-    public void test_toString(ChronoLocalDate hijrahDate, String expected) {
-        assertEquals(hijrahDate.toString(), expected);
+    @Test(dataProvider = "resolve_ymd")
+    public void test_resolve_ymd_lenient(int y, int m, int d, HijrahDate expected, Object smart, boolean strict) {
+        Map fieldValues = new HashMap<>();
+        fieldValues.put(ChronoField.YEAR, (long) y);
+        fieldValues.put(ChronoField.MONTH_OF_YEAR, (long) m);
+        fieldValues.put(ChronoField.DAY_OF_MONTH, (long) d);
+
+        if (expected != null) {
+            HijrahDate date = HijrahChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.LENIENT);
+            assertEquals(date, expected);
+            assertEquals(fieldValues.size(), 0);
+        } else {
+            try {
+                HijrahDate date = HijrahChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.LENIENT);
+                fail("Should have failed, returned: " + date);
+            } catch (DateTimeException ex) {
+                // expected
+            }
+        }
+    }
+
+    @Test(dataProvider = "resolve_ymd")
+    public void test_resolve_ymd_smart(int y, int m, int d, HijrahDate expected, Object smart, boolean strict) {
+        Map fieldValues = new HashMap<>();
+        fieldValues.put(ChronoField.YEAR, (long) y);
+        fieldValues.put(ChronoField.MONTH_OF_YEAR, (long) m);
+        fieldValues.put(ChronoField.DAY_OF_MONTH, (long) d);
+        if (Boolean.TRUE.equals(smart)) {
+            HijrahDate date = HijrahChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
+            assertEquals(date, expected);
+            assertEquals(fieldValues.size(), 0);
+        } else if (smart instanceof HijrahDate) {
+            HijrahDate date = HijrahChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
+            assertEquals(date, smart);
+        } else {
+            try {
+                HijrahDate date = HijrahChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
+                fail("Should have failed, returned: " + date);
+            } catch (DateTimeException ex) {
+                // expected
+            }
+        }
+    }
+
+    @Test(dataProvider = "resolve_ymd")
+    public void test_resolve_ymd_strict(int y, int m, int d, HijrahDate expected, Object smart, boolean strict) {
+        Map fieldValues = new HashMap<>();
+        fieldValues.put(ChronoField.YEAR, (long) y);
+        fieldValues.put(ChronoField.MONTH_OF_YEAR, (long) m);
+        fieldValues.put(ChronoField.DAY_OF_MONTH, (long) d);
+        if (strict) {
+            HijrahDate date = HijrahChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
+            assertEquals(date, expected, "Resolved to incorrect date");
+            assertEquals(fieldValues.size(), 0);
+        } else {
+            try {
+                HijrahDate date = HijrahChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
+                fail("Should have failed, returned: " + date);
+            } catch (DateTimeException ex) {
+                // expected
+            }
+        }
+    }
+
+    //-----------------------------------------------------------------------
+    @DataProvider(name = "resolve_yd")
+    Object[][] data_resolve_yd() {
+        // Compute the number of days in various month and years so that test cases
+        // are not dependent on specific calendar data
+        // Month numbers are always 1..12 so they can be used literally
+        final int year = 1343;
+        final int yearP1 = year + 1;
+        final int yearP2 = year + 2;
+        final int yearM1 = year - 1;
+        final int yearM2 = year - 2;
+        final int lastDayInYear = dateYearDay(year, 1).lengthOfYear();
+        final int lastDayInYearP1 = dateYearDay(yearP1, 1).lengthOfYear();
+        final int lastDayInYearM1 = dateYearDay(yearM1, 1).lengthOfYear();
+        final int lastDayInYearM2 = dateYearDay(yearM2, 1).lengthOfYear();
+
+        final int lastDayInMonthM1 = date(yearM1, 12, 1).lengthOfMonth();
+        final int lastDayInMonthM2 = date(yearM1, 11, 1).lengthOfMonth();
+        final int lastDayInMonthM11 = date(yearM1, 2, 1).lengthOfMonth();
+
+        final int lastDayInMonth1 = date(year, 1, 1).lengthOfMonth();
+        final int lastDayInMonth2 = date(year, 2, 1).lengthOfMonth();
+        final int lastDayInMonth4 = date(year, 4, 1).lengthOfMonth();
+        final int lastDayInMonth5 = date(year, 5, 1).lengthOfMonth();
+        final int lastDayInMonth6 = date(year, 6, 1).lengthOfMonth();
+        final int lastDayInMonth7 = date(year, 7, 1).lengthOfMonth();
+
+        return new Object[][] {
+                {year, -lastDayInYearM1, dateYearDay(yearM2, lastDayInYearM2), false, false},
+                {year, -lastDayInYearM1 + 1, date(yearM1, 1, 1), false, false},
+                {year, -lastDayInMonthM1, date(yearM1, 11, lastDayInMonthM2), false, false},
+                {year, -lastDayInMonthM1 + 1, date(yearM1, 12, 1), false, false},
+                {year, -12, date(yearM1, 12, lastDayInMonthM1 - 12), false, false},
+                {year, -1, date(yearM1, 12, lastDayInMonthM1 - 1), false, false},
+                {year, 0, date(yearM1, 12, lastDayInMonthM1), false, false},
+                {year, 1, date(year, 1, 1), true, true},
+                {year, 2, date(year, 1, 2), true, true},
+                {year, lastDayInMonth1, date(year, 1, lastDayInMonth1), true, true},
+                {year, lastDayInMonth1 + 1, date(year, 2, 1), true, true},
+                {year, lastDayInMonth1 + lastDayInMonth2 - 1, date(year, 2, lastDayInMonth2 - 1), true, true},
+                {year, lastDayInMonth1 + lastDayInMonth2, date(year, 2, lastDayInMonth2), true, true},
+                {year, lastDayInMonth1 + lastDayInMonth2 + 1, date(year, 3, 1), true, true},
+                {year, lastDayInYear - 1, dateYearDay(year, lastDayInYear - 1), true, true},
+                {year, lastDayInYear, dateYearDay(year, lastDayInYear), true, true},
+                {year, lastDayInYear + 1, date(yearP1, 1, 1), false, false},
+                {year, lastDayInYear + lastDayInYearP1, dateYearDay(yearP1, lastDayInYearP1), false, false},
+                {year, lastDayInYear + lastDayInYearP1 + 1, date(yearP2, 1, 1), false, false},
+        };
+    }
+
+    @Test(dataProvider = "resolve_yd")
+    public void test_resolve_yd_lenient(int y, int d, HijrahDate expected, boolean smart, boolean strict) {
+        Map fieldValues = new HashMap<>();
+        fieldValues.put(ChronoField.YEAR, (long) y);
+        fieldValues.put(ChronoField.DAY_OF_YEAR, (long) d);
+        HijrahDate date = HijrahChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.LENIENT);
+        assertEquals(date, expected);
+        assertEquals(fieldValues.size(), 0);
+    }
+
+    @Test(dataProvider = "resolve_yd")
+    public void test_resolve_yd_smart(int y, int d, HijrahDate expected, boolean smart, boolean strict) {
+        Map fieldValues = new HashMap<>();
+        fieldValues.put(ChronoField.YEAR, (long) y);
+        fieldValues.put(ChronoField.DAY_OF_YEAR, (long) d);
+        if (smart) {
+            HijrahDate date = HijrahChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
+            assertEquals(date, expected);
+            assertEquals(fieldValues.size(), 0);
+        } else {
+            try {
+                HijrahDate date = HijrahChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
+                fail("Should have failed, returned date: " + date);
+            } catch (DateTimeException ex) {
+                // expected
+            }
+        }
+    }
+
+    @Test(dataProvider = "resolve_yd")
+    public void test_resolve_yd_strict(int y, int d, HijrahDate expected, boolean smart, boolean strict) {
+        Map fieldValues = new HashMap<>();
+        fieldValues.put(ChronoField.YEAR, (long) y);
+        fieldValues.put(ChronoField.DAY_OF_YEAR, (long) d);
+        if (strict) {
+            HijrahDate date = HijrahChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
+            assertEquals(date, expected);
+            assertEquals(fieldValues.size(), 0);
+        } else {
+            try {
+                HijrahDate date = HijrahChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
+                fail("Should have failed, returned date: " + date);
+            } catch (DateTimeException ex) {
+                // expected
+            }
+        }
+    }
+
+    //-----------------------------------------------------------------------
+    private static HijrahDate date(int y, int m, int d) {
+        return HijrahDate.of(y, m, d);
+    }
+
+    private static HijrahDate dateYearDay(int y, int doy) {
+        return HijrahChronology.INSTANCE.dateYearDay(y, doy);
     }
 
     //-----------------------------------------------------------------------
@@ -343,5 +549,4 @@ public class TCKHijrahChronology {
     public void test_equals_false() {
         assertFalse(HijrahChronology.INSTANCE.equals(IsoChronology.INSTANCE));
     }
-
 }
diff --git a/jdk/test/java/time/tck/java/time/chrono/TCKHijrahEra.java b/jdk/test/java/time/tck/java/time/chrono/TCKHijrahEra.java
index 569eff0f3f4..23eaf3aaed8 100644
--- a/jdk/test/java/time/tck/java/time/chrono/TCKHijrahEra.java
+++ b/jdk/test/java/time/tck/java/time/chrono/TCKHijrahEra.java
@@ -85,6 +85,8 @@ public class TCKHijrahEra {
     @Test(dataProvider="HijrahEras")
     public void test_valueOf(HijrahEra era , String eraName, int eraValue) {
         assertEquals(era.getValue(), eraValue);
+
+        assertEquals(HijrahChronology.INSTANCE.eraOf(eraValue), era);
         assertEquals(HijrahEra.of(eraValue), era);
         assertEquals(HijrahEra.valueOf(eraName), era);
     }
diff --git a/jdk/test/java/time/tck/java/time/chrono/TCKIsoChronology.java b/jdk/test/java/time/tck/java/time/chrono/TCKIsoChronology.java
index b30c1ffbfcc..a69f556b5cd 100644
--- a/jdk/test/java/time/tck/java/time/chrono/TCKIsoChronology.java
+++ b/jdk/test/java/time/tck/java/time/chrono/TCKIsoChronology.java
@@ -278,91 +278,88 @@ public class TCKIsoChronology {
     @DataProvider(name = "resolve_yearOfEra")
     Object[][] data_resolve_yearOfEra() {
         return new Object[][] {
-                {-1, 2012, null, null, false, false},
-                {0, 2012, null, -2011, true, true},
-                {1, 2012, null, 2012, true, true},
-                {2, 2012, null, null, false, false},
+                // era only
+                {ResolverStyle.STRICT, -1, null, null, null, null},
+                {ResolverStyle.SMART, -1, null, null, null, null},
+                {ResolverStyle.LENIENT, -1, null, null, null, null},
 
-                {null, 2012, null, 2012, true, null},
-                {null, 2012, 2012, 2012, true, true},
-                {null, 2012, -2011, -2011, true, true},
-                {null, 2012, 2013, null, false, false},
-                {null, 2012, -2013, null, false, false},
+                {ResolverStyle.STRICT, 0, null, null, ChronoField.ERA, 0},
+                {ResolverStyle.SMART, 0, null, null, ChronoField.ERA, 0},
+                {ResolverStyle.LENIENT, 0, null, null, ChronoField.ERA, 0},
+
+                {ResolverStyle.STRICT, 1, null, null, ChronoField.ERA, 1},
+                {ResolverStyle.SMART, 1, null, null, ChronoField.ERA, 1},
+                {ResolverStyle.LENIENT, 1, null, null, ChronoField.ERA, 1},
+
+                {ResolverStyle.STRICT, 2, null, null, null, null},
+                {ResolverStyle.SMART, 2, null, null, null, null},
+                {ResolverStyle.LENIENT, 2, null, null, null, null},
+
+                // era and year-of-era
+                {ResolverStyle.STRICT, -1, 2012, null, null, null},
+                {ResolverStyle.SMART, -1, 2012, null, null, null},
+                {ResolverStyle.LENIENT, -1, 2012, null, null, null},
+
+                {ResolverStyle.STRICT, 0, 2012, null, ChronoField.YEAR, -2011},
+                {ResolverStyle.SMART, 0, 2012, null, ChronoField.YEAR, -2011},
+                {ResolverStyle.LENIENT, 0, 2012, null, ChronoField.YEAR, -2011},
+
+                {ResolverStyle.STRICT, 1, 2012, null, ChronoField.YEAR, 2012},
+                {ResolverStyle.SMART, 1, 2012, null, ChronoField.YEAR, 2012},
+                {ResolverStyle.LENIENT, 1, 2012, null, ChronoField.YEAR, 2012},
+
+                {ResolverStyle.STRICT, 2, 2012, null, null, null},
+                {ResolverStyle.SMART, 2, 2012, null, null, null},
+                {ResolverStyle.LENIENT, 2, 2012, null, null, null},
+
+                // year-of-era only
+                {ResolverStyle.STRICT, null, 2012, null, ChronoField.YEAR_OF_ERA, 2012},
+                {ResolverStyle.SMART, null, 2012, null, ChronoField.YEAR, 2012},
+                {ResolverStyle.LENIENT, null, 2012, null, ChronoField.YEAR, 2012},
+
+                {ResolverStyle.STRICT, null, Integer.MAX_VALUE, null, null, null},
+                {ResolverStyle.SMART, null, Integer.MAX_VALUE, null, null, null},
+                {ResolverStyle.LENIENT, null, Integer.MAX_VALUE, null, ChronoField.YEAR, Integer.MAX_VALUE},
+
+                // year-of-era and year
+                {ResolverStyle.STRICT, null, 2012, 2012, ChronoField.YEAR, 2012},
+                {ResolverStyle.SMART, null, 2012, 2012, ChronoField.YEAR, 2012},
+                {ResolverStyle.LENIENT, null, 2012, 2012, ChronoField.YEAR, 2012},
+
+                {ResolverStyle.STRICT, null, 2012, -2011, ChronoField.YEAR, -2011},
+                {ResolverStyle.SMART, null, 2012, -2011, ChronoField.YEAR, -2011},
+                {ResolverStyle.LENIENT, null, 2012, -2011, ChronoField.YEAR, -2011},
+
+                {ResolverStyle.STRICT, null, 2012, 2013, null, null},
+                {ResolverStyle.SMART, null, 2012, 2013, null, null},
+                {ResolverStyle.LENIENT, null, 2012, 2013, null, null},
+
+                {ResolverStyle.STRICT, null, 2012, -2013, null, null},
+                {ResolverStyle.SMART, null, 2012, -2013, null, null},
+                {ResolverStyle.LENIENT, null, 2012, -2013, null, null},
         };
     }
 
     @Test(dataProvider = "resolve_yearOfEra")
-    public void test_resolve_yearOfEra_lenient(Integer e, int yoe, Integer y, Integer expected, boolean smart, Boolean strict) {
+    public void test_resolve_yearOfEra(ResolverStyle style, Integer e, Integer yoe, Integer y, ChronoField field, Integer expected) {
         Map fieldValues = new HashMap<>();
         if (e != null) {
             fieldValues.put(ChronoField.ERA, (long) e);
         }
-        fieldValues.put(ChronoField.YEAR_OF_ERA, (long) yoe);
+        if (yoe != null) {
+            fieldValues.put(ChronoField.YEAR_OF_ERA, (long) yoe);
+        }
         if (y != null) {
             fieldValues.put(ChronoField.YEAR, (long) y);
         }
-        if (smart) {
-            LocalDate date = IsoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.LENIENT);
+        if (field != null) {
+            LocalDate date = IsoChronology.INSTANCE.resolveDate(fieldValues, style);
             assertEquals(date, null);
-            assertEquals(fieldValues.get(ChronoField.YEAR), (Long) (long) expected);
+            assertEquals(fieldValues.get(field), (Long) expected.longValue());
             assertEquals(fieldValues.size(), 1);
         } else {
             try {
-                IsoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.LENIENT);
-                fail("Should have failed");
-            } catch (DateTimeException ex) {
-                // expected
-            }
-        }
-    }
-
-    @Test(dataProvider = "resolve_yearOfEra")
-    public void test_resolve_yearOfEra_smart(Integer e, int yoe, Integer y, Integer expected, boolean smart, Boolean strict) {
-        Map fieldValues = new HashMap<>();
-        if (e != null) {
-            fieldValues.put(ChronoField.ERA, (long) e);
-        }
-        fieldValues.put(ChronoField.YEAR_OF_ERA, (long) yoe);
-        if (y != null) {
-            fieldValues.put(ChronoField.YEAR, (long) y);
-        }
-        if (smart) {
-            LocalDate date = IsoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
-            assertEquals(date, null);
-            assertEquals(fieldValues.get(ChronoField.YEAR), (Long) (long) expected);
-            assertEquals(fieldValues.size(), 1);
-        } else {
-            try {
-                IsoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
-                fail("Should have failed");
-            } catch (DateTimeException ex) {
-                // expected
-            }
-        }
-    }
-
-    @Test(dataProvider = "resolve_yearOfEra")
-    public void test_resolve_yearOfEra_strict(Integer e, int yoe, Integer y, Integer expected, boolean smart, Boolean strict) {
-        Map fieldValues = new HashMap<>();
-        if (e != null) {
-            fieldValues.put(ChronoField.ERA, (long) e);
-        }
-        fieldValues.put(ChronoField.YEAR_OF_ERA, (long) yoe);
-        if (y != null) {
-            fieldValues.put(ChronoField.YEAR, (long) y);
-        }
-        if (strict == null) {
-            LocalDate date = IsoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
-            assertEquals(date, null);
-            assertEquals(fieldValues.get(ChronoField.YEAR_OF_ERA), (Long) (long) yoe);
-        } else if (strict) {
-            LocalDate date = IsoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
-            assertEquals(date, null);
-            assertEquals(fieldValues.get(ChronoField.YEAR), (Long) (long) expected);
-            assertEquals(fieldValues.size(), 1);
-        } else {
-            try {
-                IsoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
+                IsoChronology.INSTANCE.resolveDate(fieldValues, style);
                 fail("Should have failed");
             } catch (DateTimeException ex) {
                 // expected
@@ -381,6 +378,11 @@ public class TCKIsoChronology {
                 {2012, 1, -30, date(2011, 12, 1), false, false},
                 {2012, 1, -12, date(2011, 12, 19), false, false},
                 {2012, 1, 1, date(2012, 1, 1), true, true},
+                {2012, 1, 27, date(2012, 1, 27), true, true},
+                {2012, 1, 28, date(2012, 1, 28), true, true},
+                {2012, 1, 29, date(2012, 1, 29), true, true},
+                {2012, 1, 30, date(2012, 1, 30), true, true},
+                {2012, 1, 31, date(2012, 1, 31), true, true},
                 {2012, 1, 59, date(2012, 2, 28), false, false},
                 {2012, 1, 60, date(2012, 2, 29), false, false},
                 {2012, 1, 61, date(2012, 3, 1), false, false},
diff --git a/jdk/test/java/time/tck/java/time/chrono/TCKJapaneseChronology.java b/jdk/test/java/time/tck/java/time/chrono/TCKJapaneseChronology.java
index 7802e5bab52..e9d963c73af 100644
--- a/jdk/test/java/time/tck/java/time/chrono/TCKJapaneseChronology.java
+++ b/jdk/test/java/time/tck/java/time/chrono/TCKJapaneseChronology.java
@@ -57,12 +57,15 @@
 package tck.java.time.chrono;
 
 import static java.time.temporal.ChronoField.DAY_OF_MONTH;
+import static java.time.temporal.ChronoField.DAY_OF_YEAR;
+import static java.time.temporal.ChronoField.EPOCH_DAY;
 import static java.time.temporal.ChronoField.ERA;
 import static java.time.temporal.ChronoField.MONTH_OF_YEAR;
 import static java.time.temporal.ChronoField.YEAR;
 import static java.time.temporal.ChronoField.YEAR_OF_ERA;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotEquals;
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
 
@@ -84,10 +87,19 @@ import java.time.chrono.JapaneseDate;
 import java.time.chrono.JapaneseEra;
 import java.time.chrono.MinguoChronology;
 import java.time.chrono.MinguoDate;
+import java.time.format.ResolverStyle;
+import java.time.temporal.ChronoField;
 import java.time.temporal.ChronoUnit;
+import java.time.temporal.Temporal;
 import java.time.temporal.TemporalAdjuster;
+import java.time.temporal.TemporalField;
+import java.time.temporal.TemporalQuery;
+import java.time.temporal.ValueRange;
+
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
@@ -155,59 +167,145 @@ public class TCKJapaneseChronology {
     }
 
     //-----------------------------------------------------------------------
-    // creation, toLocalDate()
+    // creation and cross-checks
     //-----------------------------------------------------------------------
-    @DataProvider(name="samples")
-    Object[][] data_samples() {
+    @DataProvider(name="createByEra")
+    Object[][] data_createByEra() {
         return new Object[][] {
-            {JapaneseChronology.INSTANCE.date(1, 1, 1), LocalDate.of(1, 1, 1)},
-            {JapaneseChronology.INSTANCE.date(1, 1, 2), LocalDate.of(1, 1, 2)},
-            {JapaneseChronology.INSTANCE.date(1, 1, 3), LocalDate.of(1, 1, 3)},
-
-            {JapaneseChronology.INSTANCE.date(2, 1, 1), LocalDate.of(2, 1, 1)},
-            {JapaneseChronology.INSTANCE.date(3, 1, 1), LocalDate.of(3, 1, 1)},
-            {JapaneseChronology.INSTANCE.date(3, 12, 6), LocalDate.of(3, 12, 6)},
-            {JapaneseChronology.INSTANCE.date(4, 1, 1), LocalDate.of(4, 1, 1)},
-            {JapaneseChronology.INSTANCE.date(4, 7, 3), LocalDate.of(4, 7, 3)},
-            {JapaneseChronology.INSTANCE.date(4, 7, 4), LocalDate.of(4, 7, 4)},
-            {JapaneseChronology.INSTANCE.date(5, 1, 1), LocalDate.of(5, 1, 1)},
-            {JapaneseChronology.INSTANCE.date(1662, 3, 3), LocalDate.of(1662, 3, 3)},
-            {JapaneseChronology.INSTANCE.date(1728, 10, 28), LocalDate.of(1728, 10, 28)},
-            {JapaneseChronology.INSTANCE.date(1728, 10, 29), LocalDate.of(1728, 10, 29)},
-
-            {JapaneseChronology.INSTANCE.date(JapaneseEra.HEISEI, 1996 - YDIFF_HEISEI, 2, 29), LocalDate.of(1996, 2, 29)},
-            {JapaneseChronology.INSTANCE.date(JapaneseEra.HEISEI, 2000 - YDIFF_HEISEI, 2, 29), LocalDate.of(2000, 2, 29)},
-            {JapaneseChronology.INSTANCE.date(JapaneseEra.MEIJI, 1868 - YDIFF_MEIJI, 2, 29), LocalDate.of(1868, 2, 29)},
-            {JapaneseChronology.INSTANCE.date(JapaneseEra.SHOWA, 1928 - YDIFF_SHOWA, 12, 25), LocalDate.of(1928, 12, 25)},
-            {JapaneseChronology.INSTANCE.date(JapaneseEra.TAISHO, 1912 - YDIFF_TAISHO, 7, 30), LocalDate.of(1912, 7, 30)},
-
-            {JapaneseChronology.INSTANCE.dateYearDay(1996, 60), LocalDate.of(1996, 2, 29)},
-            {JapaneseChronology.INSTANCE.dateYearDay(1868, 60), LocalDate.of(1868, 2, 29)},
-            {JapaneseChronology.INSTANCE.dateYearDay(1928, 60), LocalDate.of(1928, 2, 29)},
-            {JapaneseChronology.INSTANCE.dateYearDay(1912, 60), LocalDate.of(1912, 2, 29)},
-
-            {JapaneseDate.ofYearDay(1996, 60), LocalDate.of(1996, 2, 29)},
-            {JapaneseDate.ofYearDay(1868, 60), LocalDate.of(1868, 2, 29)},
-            {JapaneseDate.ofYearDay(1928, 60), LocalDate.of(1928, 2, 29)},
-            {JapaneseDate.ofYearDay(1912, 60), LocalDate.of(1912, 2, 29)},
-
-            {JapaneseChronology.INSTANCE.dateYearDay(JapaneseEra.HEISEI, 1996 - YDIFF_HEISEI, 60), LocalDate.of(1996, 2, 29)},
-            {JapaneseChronology.INSTANCE.dateYearDay(JapaneseEra.MEIJI, 1868 - YDIFF_MEIJI, 60), LocalDate.of(1868, 2, 29)},
-            {JapaneseChronology.INSTANCE.dateYearDay(JapaneseEra.SHOWA, 1928 - YDIFF_SHOWA, 60), LocalDate.of(1928, 2, 29)},
-//          {JapaneseChronology.INSTANCE.dateYearDay(JapaneseEra.TAISHO, 1916 - YDIFF_TAISHO, 60), LocalDate.of(1912, 2, 29)},
+                {JapaneseEra.HEISEI, 1996 - YDIFF_HEISEI, 2, 29, 60, LocalDate.of(1996, 2, 29)},
+                {JapaneseEra.HEISEI, 2000 - YDIFF_HEISEI, 2, 29, 60, LocalDate.of(2000, 2, 29)},
+                {JapaneseEra.MEIJI, 1874 - YDIFF_MEIJI, 2, 28, 59, LocalDate.of(1874, 2, 28)},
+                {JapaneseEra.SHOWA, 1928 - YDIFF_SHOWA, 12, 25, 360, LocalDate.of(1928, 12, 25)},
+                {JapaneseEra.TAISHO, 1916 - YDIFF_TAISHO, 7, 30, 212, LocalDate.of(1916, 7, 30)},
+                {JapaneseEra.MEIJI, 6, 1, 1, 1, LocalDate.of(1873, 1, 1)},
+                {JapaneseEra.MEIJI, 45, 7, 29, 211, LocalDate.of(1912, 7, 29)},
+                {JapaneseEra.TAISHO, 1, 7, 30, 1, LocalDate.of(1912, 7, 30)},
+                {JapaneseEra.TAISHO, 15, 12, 24, 358, LocalDate.of(1926, 12, 24)},
+                {JapaneseEra.SHOWA, 1, 12, 25, 1, LocalDate.of(1926, 12, 25)},
+                {JapaneseEra.SHOWA, 64, 1, 7, 7, LocalDate.of(1989, 1, 7)},
+                {JapaneseEra.HEISEI, 1, 1, 8, 1, LocalDate.of(1989, 1, 8)},
         };
     }
 
-    @Test(dataProvider="samples")
-    public void test_toLocalDate(JapaneseDate jdate, LocalDate iso) {
-        assertEquals(LocalDate.from(jdate), iso);
+    @Test(dataProvider="createByEra")
+    public void test_createEymd(JapaneseEra era, int yoe, int moy, int dom, int doy, LocalDate iso) {
+        JapaneseDate dateByChronoFactory = JapaneseChronology.INSTANCE.date(era, yoe, moy, dom);
+        JapaneseDate dateByDateFactory = JapaneseDate.of(era, yoe, moy, dom);
+        assertEquals(dateByChronoFactory, dateByDateFactory);
+        assertEquals(dateByChronoFactory.hashCode(), dateByDateFactory.hashCode());
     }
 
-    @Test(dataProvider="samples")
-    public void test_fromCalendrical(JapaneseDate jdate, LocalDate iso) {
-        assertEquals(JapaneseChronology.INSTANCE.date(iso), jdate);
+    @Test(dataProvider="createByEra")
+    public void test_createEyd(JapaneseEra era, int yoe, int moy, int dom, int doy, LocalDate iso) {
+        JapaneseDate dateByChronoFactory = JapaneseChronology.INSTANCE.dateYearDay(era, yoe, doy);
+        JapaneseDate dateByDateFactory = JapaneseDate.of(era, yoe, moy, dom);
+        assertEquals(dateByChronoFactory, dateByDateFactory);
+        assertEquals(dateByChronoFactory.hashCode(), dateByDateFactory.hashCode());
     }
 
+    @Test(dataProvider="createByEra")
+    public void test_createByEra_isEqual(JapaneseEra era, int yoe, int moy, int dom, int doy, LocalDate iso) {
+        JapaneseDate test = JapaneseDate.of(era, yoe, moy, dom);
+        assertEquals(test.isEqual(iso), true);
+        assertEquals(iso.isEqual(test), true);
+    }
+
+    @Test(dataProvider="createByEra")
+    public void test_createByEra_chronologyTemporalFactory(JapaneseEra era, int yoe, int moy, int dom, int doy, LocalDate iso) {
+        JapaneseDate test = JapaneseDate.of(era, yoe, moy, dom);
+        assertEquals(IsoChronology.INSTANCE.date(test), iso);
+        assertEquals(JapaneseChronology.INSTANCE.date(iso), test);
+    }
+
+    @Test(dataProvider="createByEra")
+    public void test_createByEra_dateFrom(JapaneseEra era, int yoe, int moy, int dom, int doy, LocalDate iso) {
+        JapaneseDate test = JapaneseDate.of(era, yoe, moy, dom);
+        assertEquals(LocalDate.from(test), iso);
+        assertEquals(JapaneseDate.from(iso), test);
+    }
+
+    @Test(dataProvider="createByEra")
+    public void test_createByEra_query(JapaneseEra era, int yoe, int moy, int dom, int doy, LocalDate iso) {
+        JapaneseDate test = JapaneseDate.of(era, yoe, moy, dom);
+        assertEquals(test.query(TemporalQuery.localDate()), iso);
+    }
+
+    @Test(dataProvider="createByEra")
+    public void test_createByEra_epochDay(JapaneseEra era, int yoe, int moy, int dom, int doy, LocalDate iso) {
+        JapaneseDate test = JapaneseDate.of(era, yoe, moy, dom);
+        assertEquals(test.getLong(EPOCH_DAY), iso.getLong(EPOCH_DAY));
+        assertEquals(test.toEpochDay(), iso.toEpochDay());
+    }
+
+    //-----------------------------------------------------------------------
+    @DataProvider(name="createByProleptic")
+    Object[][] data_createByProleptic() {
+        return new Object[][] {
+                {1928, 2, 28, 59, LocalDate.of(1928, 2, 28)},
+                {1928, 2, 29, 60, LocalDate.of(1928, 2, 29)},
+
+                {1873, 9, 7, 250, LocalDate.of(1873, 9, 7)},
+                {1873, 9, 8, 251, LocalDate.of(1873, 9, 8)},
+                {1912, 7, 29, 211, LocalDate.of(1912, 7, 29)},
+                {1912, 7, 30, 212, LocalDate.of(1912, 7, 30)},
+                {1926, 12, 24, 358, LocalDate.of(1926, 12, 24)},
+                {1926, 12, 25, 359, LocalDate.of(1926, 12, 25)},
+                {1989, 1, 7, 7, LocalDate.of(1989, 1, 7)},
+                {1989, 1, 8, 8, LocalDate.of(1989, 1, 8)},
+        };
+    }
+
+    @Test(dataProvider="createByProleptic")
+    public void test_createYmd(int y, int moy, int dom, int doy, LocalDate iso) {
+        JapaneseDate dateByChronoFactory = JapaneseChronology.INSTANCE.date(y, moy, dom);
+        JapaneseDate dateByDateFactory = JapaneseDate.of(y, moy, dom);
+        assertEquals(dateByChronoFactory, dateByDateFactory);
+        assertEquals(dateByChronoFactory.hashCode(), dateByDateFactory.hashCode());
+    }
+
+    @Test(dataProvider="createByProleptic")
+    public void test_createYd(int y, int moy, int dom, int doy, LocalDate iso) {
+        JapaneseDate dateByChronoFactory = JapaneseChronology.INSTANCE.dateYearDay(y, doy);
+        JapaneseDate dateByDateFactory = JapaneseDate.of(y, moy, dom);
+        assertEquals(dateByChronoFactory, dateByDateFactory);
+        assertEquals(dateByChronoFactory.hashCode(), dateByDateFactory.hashCode());
+    }
+
+    @Test(dataProvider="createByProleptic")
+    public void test_createByProleptic_isEqual(int y, int moy, int dom, int doy, LocalDate iso) {
+        JapaneseDate test = JapaneseDate.of(y, moy, dom);
+        assertEquals(test.isEqual(iso), true);
+        assertEquals(iso.isEqual(test), true);
+    }
+
+    @Test(dataProvider="createByProleptic")
+    public void test_createByProleptic_chronologyTemporalFactory(int y, int moy, int dom, int doy, LocalDate iso) {
+        JapaneseDate test = JapaneseDate.of(y, moy, dom);
+        assertEquals(IsoChronology.INSTANCE.date(test), iso);
+        assertEquals(JapaneseChronology.INSTANCE.date(iso), test);
+    }
+
+    @Test(dataProvider="createByProleptic")
+    public void test_createByProleptic_dateFrom(int y, int moy, int dom, int doy, LocalDate iso) {
+        JapaneseDate test = JapaneseDate.of(y, moy, dom);
+        assertEquals(LocalDate.from(test), iso);
+        assertEquals(JapaneseDate.from(iso), test);
+    }
+
+    @Test(dataProvider="createByProleptic")
+    public void test_createByProleptic_query(int y, int moy, int dom, int doy, LocalDate iso) {
+        JapaneseDate test = JapaneseDate.of(y, moy, dom);
+        assertEquals(test.query(TemporalQuery.localDate()), iso);
+    }
+
+    @Test(dataProvider="createByProleptic")
+    public void test_createByProleptic_epochDay(int y, int moy, int dom, int doy, LocalDate iso) {
+        JapaneseDate test = JapaneseDate.of(y, moy, dom);
+        assertEquals(test.getLong(EPOCH_DAY), iso.getLong(EPOCH_DAY));
+        assertEquals(test.toEpochDay(), iso.toEpochDay());
+    }
+
+    //-----------------------------------------------------------------------
     @Test
     public void test_dateNow(){
         assertEquals(JapaneseChronology.INSTANCE.dateNow(), JapaneseDate.now()) ;
@@ -228,27 +326,30 @@ public class TCKJapaneseChronology {
         assertEquals(JapaneseChronology.INSTANCE.dateNow(ZoneId.of(ZoneOffset.UTC.getId())), JapaneseChronology.INSTANCE.dateNow(Clock.systemUTC())) ;
     }
 
+    //-----------------------------------------------------------------------
     @DataProvider(name="badDates")
     Object[][] data_badDates() {
         return new Object[][] {
-            {1728, 0, 0},
+            {1928, 0, 0},
 
-            {1728, -1, 1},
-            {1728, 0, 1},
-            {1728, 14, 1},
-            {1728, 15, 1},
+            {1928, -1, 1},
+            {1928, 0, 1},
+            {1928, 14, 1},
+            {1928, 15, 1},
 
-            {1728, 1, -1},
-            {1728, 1, 0},
-            {1728, 1, 32},
+            {1928, 1, -1},
+            {1928, 1, 0},
+            {1928, 1, 32},
 
-            {1728, 12, -1},
-            {1728, 12, 0},
-            {1728, 12, 32},
+            {1928, 12, -1},
+            {1928, 12, 0},
+            {1928, 12, 32},
 
             {1725, 2, 29},
             {500, 2, 29},
             {2100, 2, 29},
+
+            {1872, 12, 31},     // Last day of MEIJI 5
         };
     }
 
@@ -266,8 +367,8 @@ public class TCKJapaneseChronology {
                 {2, JapaneseEra.HEISEI, 1, 1 + YDIFF_HEISEI, false},
                 {2, JapaneseEra.HEISEI, 100, 100 + YDIFF_HEISEI, true},
 
-                {-1, JapaneseEra.MEIJI, 1, 1 + YDIFF_MEIJI, true},
-                {-1, JapaneseEra.MEIJI, 4, 4 + YDIFF_MEIJI, false},
+                {-1, JapaneseEra.MEIJI, 9, 9 + YDIFF_MEIJI, true},
+                {-1, JapaneseEra.MEIJI, 10, 10 + YDIFF_MEIJI, false},
 
                 {1, JapaneseEra.SHOWA, 1, 1 + YDIFF_SHOWA, false},
                 {1, JapaneseEra.SHOWA, 7, 7 + YDIFF_SHOWA, true},
@@ -279,12 +380,24 @@ public class TCKJapaneseChronology {
 
     @Test(dataProvider="prolepticYear")
     public void test_prolepticYear(int eraValue, Era  era, int yearOfEra, int expectedProlepticYear, boolean isLeapYear) {
-        Era eraObj = JapaneseChronology.INSTANCE.eraOf(eraValue) ;
+        Era eraObj = JapaneseChronology.INSTANCE.eraOf(eraValue);
         assertTrue(JapaneseChronology.INSTANCE.eras().contains(eraObj));
         assertEquals(eraObj, era);
         assertEquals(JapaneseChronology.INSTANCE.prolepticYear(era, yearOfEra), expectedProlepticYear);
-        assertEquals(JapaneseChronology.INSTANCE.isLeapYear(expectedProlepticYear), isLeapYear) ;
-        assertEquals(JapaneseChronology.INSTANCE.isLeapYear(expectedProlepticYear), Year.of(expectedProlepticYear).isLeap()) ;
+    }
+
+    @Test(dataProvider="prolepticYear")
+    public void test_isLeapYear(int eraValue, Era  era, int yearOfEra, int expectedProlepticYear, boolean isLeapYear) {
+        assertEquals(JapaneseChronology.INSTANCE.isLeapYear(expectedProlepticYear), isLeapYear);
+        assertEquals(JapaneseChronology.INSTANCE.isLeapYear(expectedProlepticYear), Year.of(expectedProlepticYear).isLeap());
+
+        JapaneseDate jdate = JapaneseDate.now();
+        jdate = jdate.with(ChronoField.YEAR, expectedProlepticYear).with(ChronoField.MONTH_OF_YEAR, 2);
+        if (isLeapYear) {
+            assertEquals(jdate.lengthOfMonth(), 29);
+        } else {
+            assertEquals(jdate.lengthOfMonth(), 28);
+        }
     }
 
     @DataProvider(name="prolepticYearError")
@@ -327,15 +440,6 @@ public class TCKJapaneseChronology {
                 } catch (ClassCastException cex) {
                     ; // ignore expected exception
                 }
-
-                try {
-                    @SuppressWarnings("unused")
-                    JapaneseDate jdate = JapaneseDate.of(era, 1, 1, 1);
-                    fail("JapaneseDate.of did not throw ClassCastException for Era: " + era);
-                } catch (ClassCastException cex) {
-                    ; // ignore expected exception
-                }
-
                 try {
                     @SuppressWarnings("unused")
                     int year = JapaneseChronology.INSTANCE.prolepticYear(era, 1);
@@ -388,16 +492,16 @@ public class TCKJapaneseChronology {
     //-----------------------------------------------------------------------
     @Test
     public void test_adjust1() {
-        JapaneseDate base = JapaneseChronology.INSTANCE.date(1728, 10, 29);
+        JapaneseDate base = JapaneseChronology.INSTANCE.date(1928, 10, 29);
         JapaneseDate test = base.with(TemporalAdjuster.lastDayOfMonth());
-        assertEquals(test, JapaneseChronology.INSTANCE.date(1728, 10, 31));
+        assertEquals(test, JapaneseChronology.INSTANCE.date(1928, 10, 31));
     }
 
     @Test
     public void test_adjust2() {
-        JapaneseDate base = JapaneseChronology.INSTANCE.date(1728, 12, 2);
+        JapaneseDate base = JapaneseChronology.INSTANCE.date(1928, 12, 2);
         JapaneseDate test = base.with(TemporalAdjuster.lastDayOfMonth());
-        assertEquals(test, JapaneseChronology.INSTANCE.date(1728, 12, 31));
+        assertEquals(test, JapaneseChronology.INSTANCE.date(1928, 12, 31));
     }
 
     //-----------------------------------------------------------------------
@@ -405,14 +509,14 @@ public class TCKJapaneseChronology {
     //-----------------------------------------------------------------------
     @Test
     public void test_adjust_toLocalDate() {
-        JapaneseDate jdate = JapaneseChronology.INSTANCE.date(1726, 1, 4);
+        JapaneseDate jdate = JapaneseChronology.INSTANCE.date(1926, 1, 4);
         JapaneseDate test = jdate.with(LocalDate.of(2012, 7, 6));
         assertEquals(test, JapaneseChronology.INSTANCE.date(2012, 7, 6));
     }
 
     @Test(expectedExceptions=DateTimeException.class)
     public void test_adjust_toMonth() {
-        JapaneseDate jdate = JapaneseChronology.INSTANCE.date(1726, 1, 4);
+        JapaneseDate jdate = JapaneseChronology.INSTANCE.date(1926, 1, 4);
         jdate.with(Month.APRIL);
     }
 
@@ -421,16 +525,16 @@ public class TCKJapaneseChronology {
     //-----------------------------------------------------------------------
     @Test
     public void test_LocalDate_adjustToJapaneseDate() {
-        JapaneseDate jdate = JapaneseChronology.INSTANCE.date(1728, 10, 29);
+        JapaneseDate jdate = JapaneseChronology.INSTANCE.date(1928, 10, 29);
         LocalDate test = LocalDate.MIN.with(jdate);
-        assertEquals(test, LocalDate.of(1728, 10, 29));
+        assertEquals(test, LocalDate.of(1928, 10, 29));
     }
 
     @Test
     public void test_LocalDateTime_adjustToJapaneseDate() {
-        JapaneseDate jdate = JapaneseChronology.INSTANCE.date(1728, 10, 29);
+        JapaneseDate jdate = JapaneseChronology.INSTANCE.date(1928, 10, 29);
         LocalDateTime test = LocalDateTime.MIN.with(jdate);
-        assertEquals(test, LocalDateTime.of(1728, 10, 29, 0, 0));
+        assertEquals(test, LocalDateTime.of(1928, 10, 29, 0, 0));
     }
 
     //-----------------------------------------------------------------------
@@ -439,7 +543,6 @@ public class TCKJapaneseChronology {
     @DataProvider(name="japaneseEras")
     Object[][] data_japanseseEras() {
         return new Object[][] {
-            { JapaneseEra.SEIREKI, -999, "Seireki"},
             { JapaneseEra.MEIJI, -1, "Meiji"},
             { JapaneseEra.TAISHO, 0, "Taisho"},
             { JapaneseEra.SHOWA, 1, "Showa"},
@@ -512,7 +615,7 @@ public class TCKJapaneseChronology {
     public void test_periodUntilDate() {
         JapaneseDate mdate1 = JapaneseDate.of(1970, 1, 1);
         JapaneseDate mdate2 = JapaneseDate.of(1971, 2, 2);
-        Period period = mdate1.periodUntil(mdate2);
+        Period period = mdate1.until(mdate2);
         assertEquals(period, Period.of(1, 1, 1));
     }
 
@@ -520,7 +623,7 @@ public class TCKJapaneseChronology {
     public void test_periodUntilUnit() {
         JapaneseDate mdate1 = JapaneseDate.of(1970, 1, 1);
         JapaneseDate mdate2 = JapaneseDate.of(1971, 2, 2);
-        long months = mdate1.periodUntil(mdate2, ChronoUnit.MONTHS);
+        long months = mdate1.until(mdate2, ChronoUnit.MONTHS);
         assertEquals(months, 13);
     }
 
@@ -529,22 +632,49 @@ public class TCKJapaneseChronology {
         JapaneseDate mdate1 = JapaneseDate.of(1970, 1, 1);
         JapaneseDate mdate2 = JapaneseDate.of(1971, 2, 2);
         MinguoDate ldate2 = MinguoChronology.INSTANCE.date(mdate2);
-        Period period = mdate1.periodUntil(ldate2);
+        Period period = mdate1.until(ldate2);
         assertEquals(period, Period.of(1, 1, 1));
     }
 
+    //-----------------------------------------------------------------------
+    // JapaneseChronology.dateYearDay, getDayOfYear
+    //-----------------------------------------------------------------------
+    @Test
+    public void test_getDayOfYear() {
+        // Test all the Eras
+        for (JapaneseEra era : JapaneseEra.values()) {
+            int firstYear = (era == JapaneseEra.MEIJI) ? 6 : 1;  // Until Era supports range(YEAR_OF_ERA)
+            JapaneseDate hd1 = JapaneseChronology.INSTANCE.dateYearDay(era, firstYear, 1);
+            ValueRange range = hd1.range(DAY_OF_YEAR);
+            assertEquals(range.getMaximum(), hd1.lengthOfYear(), "lengthOfYear should match range.getMaximum()");
+
+            for (int i = 1; i <= hd1.lengthOfYear(); i++) {
+                JapaneseDate hd = JapaneseChronology.INSTANCE.dateYearDay(era, firstYear, i);
+                int doy = hd.get(DAY_OF_YEAR);
+                assertEquals(doy, i, "get(DAY_OF_YEAR) incorrect for " + i + ", of date: " + hd);
+            }
+        }
+    }
+
+    @Test
+    public void test_withDayOfYear() {
+        JapaneseDate hd = JapaneseChronology.INSTANCE.dateYearDay(1990, 1);
+        for (int i = 1; i <= hd.lengthOfYear(); i++) {
+            JapaneseDate hd2 = hd.with(DAY_OF_YEAR, i);
+            int doy = hd2.get(DAY_OF_YEAR);
+            assertEquals(doy, i, "with(DAY_OF_YEAR) incorrect for " + i + " " + hd2);
+        }
+    }
+
     //-----------------------------------------------------------------------
     // toString()
     //-----------------------------------------------------------------------
     @DataProvider(name="toString")
     Object[][] data_toString() {
         return new Object[][] {
-            {JapaneseChronology.INSTANCE.date(0001,  1,  1), "Japanese 0001-01-01"},
-            {JapaneseChronology.INSTANCE.date(1728, 10, 28), "Japanese 1728-10-28"},
-            {JapaneseChronology.INSTANCE.date(1728, 10, 29), "Japanese 1728-10-29"},
-            {JapaneseChronology.INSTANCE.date(1727, 12,  5), "Japanese 1727-12-05"},
-            {JapaneseChronology.INSTANCE.date(1727, 12,  6), "Japanese 1727-12-06"},
-            {JapaneseChronology.INSTANCE.date(1868,  9,  8), "Japanese Meiji 1-09-08"},
+            {JapaneseChronology.INSTANCE.date(1873, 12,  5), "Japanese Meiji 6-12-05"},
+            {JapaneseChronology.INSTANCE.date(1873, 12,  6), "Japanese Meiji 6-12-06"},
+            {JapaneseChronology.INSTANCE.date(1873,  9,  8), "Japanese Meiji 6-09-08"},
             {JapaneseChronology.INSTANCE.date(1912,  7, 29), "Japanese Meiji 45-07-29"},
             {JapaneseChronology.INSTANCE.date(1912,  7, 30), "Japanese Taisho 1-07-30"},
             {JapaneseChronology.INSTANCE.date(1926, 12, 24), "Japanese Taisho 15-12-24"},
@@ -573,4 +703,476 @@ public class TCKJapaneseChronology {
         assertFalse(JapaneseChronology.INSTANCE.equals(IsoChronology.INSTANCE));
     }
 
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    @DataProvider(name = "resolve_styleByEra")
+    Object[][] data_resolve_styleByEra() {
+        Object[][] result = new Object[ResolverStyle.values().length * JapaneseEra.values().length][];
+        int i = 0;
+        for (ResolverStyle style : ResolverStyle.values()) {
+            for (JapaneseEra era : JapaneseEra.values()) {
+                result[i++] = new Object[] {style, era};
+            }
+        }
+        return result;
+    }
+
+    @Test(dataProvider = "resolve_styleByEra")
+    public void test_resolve_yearOfEra_eraOnly_valid(ResolverStyle style, JapaneseEra era) {
+        Map fieldValues = new HashMap<>();
+        fieldValues.put(ChronoField.ERA, (long) era.getValue());
+        JapaneseDate date = JapaneseChronology.INSTANCE.resolveDate(fieldValues, style);
+        assertEquals(date, null);
+        assertEquals(fieldValues.get(ChronoField.ERA), (Long) (long) era.getValue());
+        assertEquals(fieldValues.size(), 1);
+    }
+
+    @Test(dataProvider = "resolve_styleByEra")
+    public void test_resolve_yearOfEra_eraAndYearOfEraOnly_valid(ResolverStyle style, JapaneseEra era) {
+        Map fieldValues = new HashMap<>();
+        fieldValues.put(ChronoField.ERA, (long) era.getValue());
+        fieldValues.put(ChronoField.YEAR_OF_ERA, 1L);
+        JapaneseDate date = JapaneseChronology.INSTANCE.resolveDate(fieldValues, style);
+        assertEquals(date, null);
+        assertEquals(fieldValues.get(ChronoField.ERA), (Long) (long) era.getValue());
+        assertEquals(fieldValues.get(ChronoField.YEAR_OF_ERA), (Long) 1L);
+        assertEquals(fieldValues.size(), 2);
+    }
+
+    @Test(dataProvider = "resolve_styleByEra")
+    public void test_resolve_yearOfEra_eraAndYearOnly_valid(ResolverStyle style, JapaneseEra era) {
+        Map fieldValues = new HashMap<>();
+        fieldValues.put(ChronoField.ERA, (long) era.getValue());
+        fieldValues.put(ChronoField.YEAR, 1L);
+        JapaneseDate date = JapaneseChronology.INSTANCE.resolveDate(fieldValues, style);
+        assertEquals(date, null);
+        assertEquals(fieldValues.get(ChronoField.ERA), (Long) (long) era.getValue());
+        assertEquals(fieldValues.get(ChronoField.YEAR), (Long) 1L);
+        assertEquals(fieldValues.size(), 2);
+    }
+
+    @DataProvider(name = "resolve_styles")
+    Object[][] data_resolve_styles() {
+        Object[][] result = new Object[ResolverStyle.values().length][];
+        int i = 0;
+        for (ResolverStyle style : ResolverStyle.values()) {
+            result[i++] = new Object[] {style};
+        }
+        return result;
+    }
+
+    @Test(dataProvider = "resolve_styles")
+    public void test_resolve_yearOfEra_yearOfEraOnly_valid(ResolverStyle style) {
+        Map fieldValues = new HashMap<>();
+        fieldValues.put(ChronoField.YEAR_OF_ERA, 1L);
+        JapaneseDate date = JapaneseChronology.INSTANCE.resolveDate(fieldValues, style);
+        assertEquals(date, null);
+        assertEquals(fieldValues.get(ChronoField.YEAR_OF_ERA), (Long) 1L);
+        assertEquals(fieldValues.size(), 1);
+    }
+
+    @Test(dataProvider = "resolve_styles")
+    public void test_resolve_yearOfEra_yearOfEraAndYearOnly_valid(ResolverStyle style) {
+        Map fieldValues = new HashMap<>();
+        fieldValues.put(ChronoField.YEAR_OF_ERA, 1L);
+        fieldValues.put(ChronoField.YEAR, 2012L);
+        JapaneseDate date = JapaneseChronology.INSTANCE.resolveDate(fieldValues, style);
+        assertEquals(date, null);
+        assertEquals(fieldValues.get(ChronoField.YEAR_OF_ERA), (Long) 1L);
+        assertEquals(fieldValues.get(ChronoField.YEAR), (Long) 2012L);
+        assertEquals(fieldValues.size(), 2);
+    }
+
+    public void test_resolve_yearOfEra_eraOnly_invalidTooSmall() {
+        for (ResolverStyle style : ResolverStyle.values()) {
+            Map fieldValues = new HashMap<>();
+            fieldValues.put(ChronoField.ERA, JapaneseEra.MEIJI.getValue() - 1L);
+            try {
+                JapaneseChronology.INSTANCE.resolveDate(fieldValues, style);
+                fail("Should have failed: " + style);
+            } catch (DateTimeException ex) {
+                // expected
+            }
+        }
+    }
+
+    public void test_resolve_yearOfEra_eraOnly_invalidTooLarge() {
+        for (ResolverStyle style : ResolverStyle.values()) {
+            Map fieldValues = new HashMap<>();
+            fieldValues.put(ChronoField.ERA, JapaneseEra.values()[JapaneseEra.values().length - 1].getValue() + 1L);
+            try {
+                JapaneseChronology.INSTANCE.resolveDate(fieldValues, style);
+                fail("Should have failed: " + style);
+            } catch (DateTimeException ex) {
+                // expected
+            }
+        }
+    }
+
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    @DataProvider(name = "resolve_ymd")
+    Object[][] data_resolve_ymd() {
+        return new Object[][] {
+                {2012, 1, -365, date(2010, 12, 31), false, false},
+                {2012, 1, -364, date(2011, 1, 1), false, false},
+                {2012, 1, -31, date(2011, 11, 30), false, false},
+                {2012, 1, -30, date(2011, 12, 1), false, false},
+                {2012, 1, -12, date(2011, 12, 19), false, false},
+                {2012, 1, 1, date(2012, 1, 1), true, true},
+                {2012, 1, 59, date(2012, 2, 28), false, false},
+                {2012, 1, 60, date(2012, 2, 29), false, false},
+                {2012, 1, 61, date(2012, 3, 1), false, false},
+                {2012, 1, 365, date(2012, 12, 30), false, false},
+                {2012, 1, 366, date(2012, 12, 31), false, false},
+                {2012, 1, 367, date(2013, 1, 1), false, false},
+                {2012, 1, 367 + 364, date(2013, 12, 31), false, false},
+                {2012, 1, 367 + 365, date(2014, 1, 1), false, false},
+
+                {2012, 2, 1, date(2012, 2, 1), true, true},
+                {2012, 2, 28, date(2012, 2, 28), true, true},
+                {2012, 2, 29, date(2012, 2, 29), true, true},
+                {2012, 2, 30, date(2012, 3, 1), date(2012, 2, 29), false},
+                {2012, 2, 31, date(2012, 3, 2), date(2012, 2, 29), false},
+                {2012, 2, 32, date(2012, 3, 3), false, false},
+
+                {2012, -12, 1, date(2010, 12, 1), false, false},
+                {2012, -11, 1, date(2011, 1, 1), false, false},
+                {2012, -1, 1, date(2011, 11, 1), false, false},
+                {2012, 0, 1, date(2011, 12, 1), false, false},
+                {2012, 1, 1, date(2012, 1, 1), true, true},
+                {2012, 12, 1, date(2012, 12, 1), true, true},
+                {2012, 13, 1, date(2013, 1, 1), false, false},
+                {2012, 24, 1, date(2013, 12, 1), false, false},
+                {2012, 25, 1, date(2014, 1, 1), false, false},
+
+                {2012, 6, -31, date(2012, 4, 30), false, false},
+                {2012, 6, -30, date(2012, 5, 1), false, false},
+                {2012, 6, -1, date(2012, 5, 30), false, false},
+                {2012, 6, 0, date(2012, 5, 31), false, false},
+                {2012, 6, 1, date(2012, 6, 1), true, true},
+                {2012, 6, 30, date(2012, 6, 30), true, true},
+                {2012, 6, 31, date(2012, 7, 1), date(2012, 6, 30), false},
+                {2012, 6, 61, date(2012, 7, 31), false, false},
+                {2012, 6, 62, date(2012, 8, 1), false, false},
+
+                {2011, 2, 1, date(2011, 2, 1), true, true},
+                {2011, 2, 28, date(2011, 2, 28), true, true},
+                {2011, 2, 29, date(2011, 3, 1), date(2011, 2, 28), false},
+                {2011, 2, 30, date(2011, 3, 2), date(2011, 2, 28), false},
+                {2011, 2, 31, date(2011, 3, 3), date(2011, 2, 28), false},
+                {2011, 2, 32, date(2011, 3, 4), false, false},
+        };
+    }
+
+    @Test(dataProvider = "resolve_ymd")
+    public void test_resolve_ymd_lenient(int y, int m, int d, JapaneseDate expected, Object smart, boolean strict) {
+        Map fieldValues = new HashMap<>();
+        fieldValues.put(ChronoField.YEAR, (long) y);
+        fieldValues.put(ChronoField.MONTH_OF_YEAR, (long) m);
+        fieldValues.put(ChronoField.DAY_OF_MONTH, (long) d);
+        JapaneseDate date = JapaneseChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.LENIENT);
+        assertEquals(date, expected);
+        assertEquals(fieldValues.size(), 0);
+    }
+
+    @Test(dataProvider = "resolve_ymd")
+    public void test_resolve_ymd_smart(int y, int m, int d, JapaneseDate expected, Object smart, boolean strict) {
+        Map fieldValues = new HashMap<>();
+        fieldValues.put(ChronoField.YEAR, (long) y);
+        fieldValues.put(ChronoField.MONTH_OF_YEAR, (long) m);
+        fieldValues.put(ChronoField.DAY_OF_MONTH, (long) d);
+        if (Boolean.TRUE.equals(smart)) {
+            JapaneseDate date = JapaneseChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
+            assertEquals(date, expected);
+            assertEquals(fieldValues.size(), 0);
+        } else if (smart instanceof JapaneseDate) {
+            JapaneseDate date = JapaneseChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
+            assertEquals(date, smart);
+        } else {
+            try {
+                JapaneseChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
+                fail("Should have failed");
+            } catch (DateTimeException ex) {
+                // expected
+            }
+        }
+    }
+
+    @Test(dataProvider = "resolve_ymd")
+    public void test_resolve_ymd_strict(int y, int m, int d, JapaneseDate expected, Object smart, boolean strict) {
+        Map fieldValues = new HashMap<>();
+        fieldValues.put(ChronoField.YEAR, (long) y);
+        fieldValues.put(ChronoField.MONTH_OF_YEAR, (long) m);
+        fieldValues.put(ChronoField.DAY_OF_MONTH, (long) d);
+        if (strict) {
+            JapaneseDate date = JapaneseChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
+            assertEquals(date, expected);
+            assertEquals(fieldValues.size(), 0);
+        } else {
+            try {
+                JapaneseChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
+                fail("Should have failed");
+            } catch (DateTimeException ex) {
+                // expected
+            }
+        }
+    }
+
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    @DataProvider(name = "resolve_yd")
+    Object[][] data_resolve_yd() {
+        return new Object[][] {
+                {2012, -365, date(2010, 12, 31), false, false},
+                {2012, -364, date(2011, 1, 1), false, false},
+                {2012, -31, date(2011, 11, 30), false, false},
+                {2012, -30, date(2011, 12, 1), false, false},
+                {2012, -12, date(2011, 12, 19), false, false},
+                {2012, -1, date(2011, 12, 30), false, false},
+                {2012, 0, date(2011, 12, 31), false, false},
+                {2012, 1, date(2012, 1, 1), true, true},
+                {2012, 2, date(2012, 1, 2), true, true},
+                {2012, 31, date(2012, 1, 31), true, true},
+                {2012, 32, date(2012, 2, 1), true, true},
+                {2012, 59, date(2012, 2, 28), true, true},
+                {2012, 60, date(2012, 2, 29), true, true},
+                {2012, 61, date(2012, 3, 1), true, true},
+                {2012, 365, date(2012, 12, 30), true, true},
+                {2012, 366, date(2012, 12, 31), true, true},
+                {2012, 367, date(2013, 1, 1), false, false},
+                {2012, 367 + 364, date(2013, 12, 31), false, false},
+                {2012, 367 + 365, date(2014, 1, 1), false, false},
+
+                {2011, 59, date(2011, 2, 28), true, true},
+                {2011, 60, date(2011, 3, 1), true, true},
+        };
+    }
+
+    @Test(dataProvider = "resolve_yd")
+    public void test_resolve_yd_lenient(int y, int d, JapaneseDate expected, boolean smart, boolean strict) {
+        Map fieldValues = new HashMap<>();
+        fieldValues.put(ChronoField.YEAR, (long) y);
+        fieldValues.put(ChronoField.DAY_OF_YEAR, (long) d);
+        JapaneseDate date = JapaneseChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.LENIENT);
+        assertEquals(date, expected);
+        assertEquals(fieldValues.size(), 0);
+    }
+
+    @Test(dataProvider = "resolve_yd")
+    public void test_resolve_yd_smart(int y, int d, JapaneseDate expected, boolean smart, boolean strict) {
+        Map fieldValues = new HashMap<>();
+        fieldValues.put(ChronoField.YEAR, (long) y);
+        fieldValues.put(ChronoField.DAY_OF_YEAR, (long) d);
+        if (smart) {
+            JapaneseDate date = JapaneseChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
+            assertEquals(date, expected);
+            assertEquals(fieldValues.size(), 0);
+        } else {
+            try {
+                JapaneseChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
+                fail("Should have failed");
+            } catch (DateTimeException ex) {
+                // expected
+            }
+        }
+    }
+
+    @Test(dataProvider = "resolve_yd")
+    public void test_resolve_yd_strict(int y, int d, JapaneseDate expected, boolean smart, boolean strict) {
+        Map fieldValues = new HashMap<>();
+        fieldValues.put(ChronoField.YEAR, (long) y);
+        fieldValues.put(ChronoField.DAY_OF_YEAR, (long) d);
+        if (strict) {
+            JapaneseDate date = JapaneseChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
+            assertEquals(date, expected);
+            assertEquals(fieldValues.size(), 0);
+        } else {
+            try {
+                JapaneseChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
+                fail("Should have failed");
+            } catch (DateTimeException ex) {
+                // expected
+            }
+        }
+    }
+
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    @DataProvider(name = "resolve_eymd")
+    Object[][] data_resolve_eymd() {
+        return new Object[][] {
+                // lenient
+                {ResolverStyle.LENIENT, JapaneseEra.HEISEI, 1, 1, 1, date(1989, 1, 1)},  // SHOWA, not HEISEI
+                {ResolverStyle.LENIENT, JapaneseEra.HEISEI, 1, 1, 7, date(1989, 1, 7)},  // SHOWA, not HEISEI
+                {ResolverStyle.LENIENT, JapaneseEra.HEISEI, 1, 1, 8, date(1989, 1, 8)},
+                {ResolverStyle.LENIENT, JapaneseEra.HEISEI, 1, 12, 31, date(1989, 12, 31)},
+                {ResolverStyle.LENIENT, JapaneseEra.HEISEI, 2, 1, 1, date(1990, 1, 1)},
+
+                {ResolverStyle.LENIENT, JapaneseEra.SHOWA, 64, 1, 1, date(1989, 1, 1)},
+                {ResolverStyle.LENIENT, JapaneseEra.SHOWA, 64, 1, 7, date(1989, 1, 7)},
+                {ResolverStyle.LENIENT, JapaneseEra.SHOWA, 64, 1, 8, date(1989, 1, 8)},  // HEISEI, not SHOWA
+                {ResolverStyle.LENIENT, JapaneseEra.SHOWA, 64, 12, 31, date(1989, 12, 31)},  // HEISEI, not SHOWA
+                {ResolverStyle.LENIENT, JapaneseEra.SHOWA, 65, 1, 1, date(1990, 1, 1)},  // HEISEI, not SHOWA
+
+                {ResolverStyle.LENIENT, JapaneseEra.SHOWA, 64, 1, -366, date(1987, 12, 31)},
+                {ResolverStyle.LENIENT, JapaneseEra.SHOWA, 64, 1, -365, date(1988, 1, 1)},
+                {ResolverStyle.LENIENT, JapaneseEra.SHOWA, 64, 1, -31, date(1988, 11, 30)},
+                {ResolverStyle.LENIENT, JapaneseEra.SHOWA, 64, 1, -30, date(1988, 12, 1)},
+                {ResolverStyle.LENIENT, JapaneseEra.SHOWA, 64, 1, 0, date(1988, 12, 31)},
+                {ResolverStyle.LENIENT, JapaneseEra.SHOWA, 64, 1, 1, date(1989, 1, 1)},
+                {ResolverStyle.LENIENT, JapaneseEra.SHOWA, 64, 1, 27, date(1989, 1, 27)},
+                {ResolverStyle.LENIENT, JapaneseEra.SHOWA, 64, 1, 28, date(1989, 1, 28)},
+                {ResolverStyle.LENIENT, JapaneseEra.SHOWA, 64, 1, 29, date(1989, 1, 29)},
+                {ResolverStyle.LENIENT, JapaneseEra.SHOWA, 64, 1, 30, date(1989, 1, 30)},
+                {ResolverStyle.LENIENT, JapaneseEra.SHOWA, 64, 1, 31, date(1989, 1, 31)},
+                {ResolverStyle.LENIENT, JapaneseEra.SHOWA, 64, 1, 32, date(1989, 2, 1)},
+                {ResolverStyle.LENIENT, JapaneseEra.SHOWA, 64, 1, 58, date(1989, 2, 27)},
+                {ResolverStyle.LENIENT, JapaneseEra.SHOWA, 64, 1, 59, date(1989, 2, 28)},
+                {ResolverStyle.LENIENT, JapaneseEra.SHOWA, 64, 1, 60, date(1989, 3, 1)},
+                {ResolverStyle.LENIENT, JapaneseEra.SHOWA, 64, 1, 365, date(1989, 12, 31)},
+                {ResolverStyle.LENIENT, JapaneseEra.SHOWA, 64, 1, 366, date(1990, 1, 1)},
+
+                {ResolverStyle.LENIENT, JapaneseEra.SHOWA, 63, 1, 1, date(1988, 1, 1)},
+                {ResolverStyle.LENIENT, JapaneseEra.SHOWA, 63, 1, 31, date(1988, 1, 31)},
+                {ResolverStyle.LENIENT, JapaneseEra.SHOWA, 63, 1, 32, date(1988, 2, 1)},
+                {ResolverStyle.LENIENT, JapaneseEra.SHOWA, 63, 1, 58, date(1988, 2, 27)},
+                {ResolverStyle.LENIENT, JapaneseEra.SHOWA, 63, 1, 59, date(1988, 2, 28)},
+                {ResolverStyle.LENIENT, JapaneseEra.SHOWA, 63, 1, 60, date(1988, 2, 29)},
+                {ResolverStyle.LENIENT, JapaneseEra.SHOWA, 63, 1, 61, date(1988, 3, 1)},
+
+                {ResolverStyle.LENIENT, JapaneseEra.SHOWA, 64, 2, 1, date(1989, 2, 1)},
+                {ResolverStyle.LENIENT, JapaneseEra.SHOWA, 64, 2, 28, date(1989, 2, 28)},
+                {ResolverStyle.LENIENT, JapaneseEra.SHOWA, 64, 2, 29, date(1989, 3, 1)},
+
+                {ResolverStyle.LENIENT, JapaneseEra.SHOWA, 63, 2, 1, date(1988, 2, 1)},
+                {ResolverStyle.LENIENT, JapaneseEra.SHOWA, 63, 2, 28, date(1988, 2, 28)},
+                {ResolverStyle.LENIENT, JapaneseEra.SHOWA, 63, 2, 29, date(1988, 2, 29)},
+                {ResolverStyle.LENIENT, JapaneseEra.SHOWA, 63, 2, 30, date(1988, 3, 1)},
+
+                {ResolverStyle.LENIENT, JapaneseEra.SHOWA, 62, -11, 1, date(1986, 1, 1)},
+                {ResolverStyle.LENIENT, JapaneseEra.SHOWA, 62, -1, 1, date(1986, 11, 1)},
+                {ResolverStyle.LENIENT, JapaneseEra.SHOWA, 62, 0, 1, date(1986, 12, 1)},
+                {ResolverStyle.LENIENT, JapaneseEra.SHOWA, 62, 13, 1, date(1988, 1, 1)},
+
+                // smart
+                {ResolverStyle.SMART, JapaneseEra.HEISEI, 0, 1, 1, null},
+                {ResolverStyle.SMART, JapaneseEra.HEISEI, 1, 1, 1, date(1989, 1, 1)},  // SHOWA, not HEISEI
+                {ResolverStyle.SMART, JapaneseEra.HEISEI, 1, 1, 7, date(1989, 1, 7)},  // SHOWA, not HEISEI
+                {ResolverStyle.SMART, JapaneseEra.HEISEI, 1, 1, 8, date(1989, 1, 8)},
+                {ResolverStyle.SMART, JapaneseEra.HEISEI, 1, 12, 31, date(1989, 12, 31)},
+                {ResolverStyle.SMART, JapaneseEra.HEISEI, 2, 1, 1, date(1990, 1, 1)},
+
+                {ResolverStyle.SMART, JapaneseEra.SHOWA, 64, 1, 1, date(1989, 1, 1)},
+                {ResolverStyle.SMART, JapaneseEra.SHOWA, 64, 1, 7, date(1989, 1, 7)},
+                {ResolverStyle.SMART, JapaneseEra.SHOWA, 64, 1, 8, date(1989, 1, 8)},  // HEISEI, not SHOWA
+                {ResolverStyle.SMART, JapaneseEra.SHOWA, 64, 12, 31, date(1989, 12, 31)},  // HEISEI, not SHOWA
+                {ResolverStyle.SMART, JapaneseEra.SHOWA, 65, 1, 1, null},  // HEISEI, not SHOWA
+
+                {ResolverStyle.SMART, JapaneseEra.SHOWA, 62, 1, 0, null},
+                {ResolverStyle.SMART, JapaneseEra.SHOWA, 62, 1, 1, date(1987, 1, 1)},
+                {ResolverStyle.SMART, JapaneseEra.SHOWA, 62, 1, 27, date(1987, 1, 27)},
+                {ResolverStyle.SMART, JapaneseEra.SHOWA, 62, 1, 28, date(1987, 1, 28)},
+                {ResolverStyle.SMART, JapaneseEra.SHOWA, 62, 1, 29, date(1987, 1, 29)},
+                {ResolverStyle.SMART, JapaneseEra.SHOWA, 62, 1, 30, date(1987, 1, 30)},
+                {ResolverStyle.SMART, JapaneseEra.SHOWA, 62, 1, 31, date(1987, 1, 31)},
+                {ResolverStyle.SMART, JapaneseEra.SHOWA, 62, 1, 32, null},
+
+                {ResolverStyle.SMART, JapaneseEra.SHOWA, 62, 2, 0, null},
+                {ResolverStyle.SMART, JapaneseEra.SHOWA, 62, 2, 1, date(1987, 2, 1)},
+                {ResolverStyle.SMART, JapaneseEra.SHOWA, 62, 2, 27, date(1987, 2, 27)},
+                {ResolverStyle.SMART, JapaneseEra.SHOWA, 62, 2, 28, date(1987, 2, 28)},
+                {ResolverStyle.SMART, JapaneseEra.SHOWA, 62, 2, 29, date(1987, 2, 28)},
+                {ResolverStyle.SMART, JapaneseEra.SHOWA, 62, 2, 30, date(1987, 2, 28)},
+                {ResolverStyle.SMART, JapaneseEra.SHOWA, 62, 2, 31, date(1987, 2, 28)},
+                {ResolverStyle.SMART, JapaneseEra.SHOWA, 62, 2, 32, null},
+
+                {ResolverStyle.SMART, JapaneseEra.SHOWA, 63, 2, 0, null},
+                {ResolverStyle.SMART, JapaneseEra.SHOWA, 63, 2, 1, date(1988, 2, 1)},
+                {ResolverStyle.SMART, JapaneseEra.SHOWA, 63, 2, 27, date(1988, 2, 27)},
+                {ResolverStyle.SMART, JapaneseEra.SHOWA, 63, 2, 28, date(1988, 2, 28)},
+                {ResolverStyle.SMART, JapaneseEra.SHOWA, 63, 2, 29, date(1988, 2, 29)},
+                {ResolverStyle.SMART, JapaneseEra.SHOWA, 63, 2, 30, date(1988, 2, 29)},
+                {ResolverStyle.SMART, JapaneseEra.SHOWA, 63, 2, 31, date(1988, 2, 29)},
+                {ResolverStyle.SMART, JapaneseEra.SHOWA, 63, 2, 32, null},
+
+                {ResolverStyle.SMART, JapaneseEra.SHOWA, 62, -12, 1, null},
+                {ResolverStyle.SMART, JapaneseEra.SHOWA, 62, -1, 1, null},
+                {ResolverStyle.SMART, JapaneseEra.SHOWA, 62, 0, 1, null},
+                {ResolverStyle.SMART, JapaneseEra.SHOWA, 62, 13, 1, null},
+
+                // strict
+                {ResolverStyle.STRICT, JapaneseEra.HEISEI, 0, 1, 1, null},
+                {ResolverStyle.STRICT, JapaneseEra.HEISEI, 1, 1, 1, null},  // SHOWA, not HEISEI
+                {ResolverStyle.STRICT, JapaneseEra.HEISEI, 1, 1, 7, null},  // SHOWA, not HEISEI
+                {ResolverStyle.STRICT, JapaneseEra.HEISEI, 1, 1, 8, date(1989, 1, 8)},
+                {ResolverStyle.STRICT, JapaneseEra.HEISEI, 1, 12, 31, date(1989, 12, 31)},
+                {ResolverStyle.STRICT, JapaneseEra.HEISEI, 2, 1, 1, date(1990, 1, 1)},
+
+                {ResolverStyle.STRICT, JapaneseEra.SHOWA, 64, 1, 1, date(1989, 1, 1)},
+                {ResolverStyle.STRICT, JapaneseEra.SHOWA, 64, 1, 7, date(1989, 1, 7)},
+                {ResolverStyle.STRICT, JapaneseEra.SHOWA, 64, 1, 8, null},  // HEISEI, not SHOWA
+                {ResolverStyle.STRICT, JapaneseEra.SHOWA, 64, 12, 31, null},  // HEISEI, not SHOWA
+                {ResolverStyle.STRICT, JapaneseEra.SHOWA, 65, 1, 1, null},  // HEISEI, not SHOWA
+
+                {ResolverStyle.STRICT, JapaneseEra.SHOWA, 62, 1, 0, null},
+                {ResolverStyle.STRICT, JapaneseEra.SHOWA, 62, 1, 1, date(1987, 1, 1)},
+                {ResolverStyle.STRICT, JapaneseEra.SHOWA, 62, 1, 27, date(1987, 1, 27)},
+                {ResolverStyle.STRICT, JapaneseEra.SHOWA, 62, 1, 28, date(1987, 1, 28)},
+                {ResolverStyle.STRICT, JapaneseEra.SHOWA, 62, 1, 29, date(1987, 1, 29)},
+                {ResolverStyle.STRICT, JapaneseEra.SHOWA, 62, 1, 30, date(1987, 1, 30)},
+                {ResolverStyle.STRICT, JapaneseEra.SHOWA, 62, 1, 31, date(1987, 1, 31)},
+                {ResolverStyle.STRICT, JapaneseEra.SHOWA, 62, 1, 32, null},
+
+                {ResolverStyle.STRICT, JapaneseEra.SHOWA, 62, 2, 0, null},
+                {ResolverStyle.STRICT, JapaneseEra.SHOWA, 62, 2, 1, date(1987, 2, 1)},
+                {ResolverStyle.STRICT, JapaneseEra.SHOWA, 62, 2, 27, date(1987, 2, 27)},
+                {ResolverStyle.STRICT, JapaneseEra.SHOWA, 62, 2, 28, date(1987, 2, 28)},
+                {ResolverStyle.STRICT, JapaneseEra.SHOWA, 62, 2, 29, null},
+                {ResolverStyle.STRICT, JapaneseEra.SHOWA, 62, 2, 30, null},
+                {ResolverStyle.STRICT, JapaneseEra.SHOWA, 62, 2, 31, null},
+                {ResolverStyle.STRICT, JapaneseEra.SHOWA, 62, 2, 32, null},
+
+                {ResolverStyle.STRICT, JapaneseEra.SHOWA, 63, 2, 0, null},
+                {ResolverStyle.STRICT, JapaneseEra.SHOWA, 63, 2, 1, date(1988, 2, 1)},
+                {ResolverStyle.STRICT, JapaneseEra.SHOWA, 63, 2, 27, date(1988, 2, 27)},
+                {ResolverStyle.STRICT, JapaneseEra.SHOWA, 63, 2, 28, date(1988, 2, 28)},
+                {ResolverStyle.STRICT, JapaneseEra.SHOWA, 63, 2, 29, date(1988, 2, 29)},
+                {ResolverStyle.STRICT, JapaneseEra.SHOWA, 63, 2, 30, null},
+                {ResolverStyle.STRICT, JapaneseEra.SHOWA, 63, 2, 31, null},
+                {ResolverStyle.STRICT, JapaneseEra.SHOWA, 63, 2, 32, null},
+
+                {ResolverStyle.STRICT, JapaneseEra.SHOWA, 62, -12, 1, null},
+                {ResolverStyle.STRICT, JapaneseEra.SHOWA, 62, -1, 1, null},
+                {ResolverStyle.STRICT, JapaneseEra.SHOWA, 62, 0, 1, null},
+                {ResolverStyle.STRICT, JapaneseEra.SHOWA, 62, 13, 1, null},
+        };
+    }
+
+    @Test(dataProvider = "resolve_eymd")
+    public void test_resolve_eymd(ResolverStyle style, JapaneseEra era, int yoe, int m, int d, JapaneseDate expected) {
+        Map fieldValues = new HashMap<>();
+        fieldValues.put(ChronoField.ERA, (long) era.getValue());
+        fieldValues.put(ChronoField.YEAR_OF_ERA, (long) yoe);
+        fieldValues.put(ChronoField.MONTH_OF_YEAR, (long) m);
+        fieldValues.put(ChronoField.DAY_OF_MONTH, (long) d);
+        if (expected != null) {
+            JapaneseDate date = JapaneseChronology.INSTANCE.resolveDate(fieldValues, style);
+            assertEquals(date, expected);
+            assertEquals(fieldValues.size(), 0);
+        } else {
+            try {
+                JapaneseChronology.INSTANCE.resolveDate(fieldValues, style);
+                fail("Should have failed");
+            } catch (DateTimeException ex) {
+                // expected
+            }
+        }
+    }
+
+    //-----------------------------------------------------------------------
+    private static JapaneseDate date(int y, int m, int d) {
+        return JapaneseDate.of(y, m, d);
+    }
+
 }
diff --git a/jdk/test/java/time/tck/java/time/chrono/TCKJapaneseEra.java b/jdk/test/java/time/tck/java/time/chrono/TCKJapaneseEra.java
index 1aa1df360f6..de83e1d3bc3 100644
--- a/jdk/test/java/time/tck/java/time/chrono/TCKJapaneseEra.java
+++ b/jdk/test/java/time/tck/java/time/chrono/TCKJapaneseEra.java
@@ -81,7 +81,6 @@ public class TCKJapaneseEra {
                     {JapaneseEra.SHOWA, "Showa", 1},
                     {JapaneseEra.TAISHO, "Taisho", 0},
                     {JapaneseEra.MEIJI, "Meiji", -1},
-                    {JapaneseEra.SEIREKI, "Seireki", -999},
         };
     }
 
@@ -112,8 +111,8 @@ public class TCKJapaneseEra {
     public void test_range() {
         // eras may be added after release
         for (JapaneseEra era : JapaneseEra.values()) {
-            assertEquals(era.range(ERA).getMinimum(), -999);
-            assertEquals(era.range(ERA).getLargestMinimum(), -999);
+            assertEquals(era.range(ERA).getMinimum(), -1);
+            assertEquals(era.range(ERA).getLargestMinimum(), -1);
             assertEquals(era.range(ERA).getSmallestMaximum(), era.range(ERA).getMaximum());
             assertEquals(era.range(ERA).getMaximum() >= 2, true);
         }
diff --git a/jdk/test/java/time/tck/java/time/chrono/TCKMinguoChronology.java b/jdk/test/java/time/tck/java/time/chrono/TCKMinguoChronology.java
index cad29d76f29..50ddf70cb3e 100644
--- a/jdk/test/java/time/tck/java/time/chrono/TCKMinguoChronology.java
+++ b/jdk/test/java/time/tck/java/time/chrono/TCKMinguoChronology.java
@@ -58,6 +58,7 @@ package tck.java.time.chrono;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotEquals;
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
 
@@ -83,12 +84,19 @@ import java.time.chrono.JapaneseDate;
 import java.time.chrono.MinguoChronology;
 import java.time.chrono.MinguoDate;
 import java.time.chrono.MinguoEra;
+import java.time.chrono.MinguoChronology;
+import java.time.chrono.MinguoDate;
 import java.time.chrono.ThaiBuddhistChronology;
 import java.time.chrono.ThaiBuddhistDate;
+import java.time.format.ResolverStyle;
+import java.time.temporal.ChronoField;
 import java.time.temporal.ChronoUnit;
 import java.time.temporal.TemporalAccessor;
 import java.time.temporal.TemporalAdjuster;
+import java.time.temporal.TemporalField;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
@@ -162,6 +170,18 @@ public class TCKMinguoChronology {
     @Test(dataProvider="samples")
     public void test_fromCalendrical(MinguoDate minguo, LocalDate iso) {
         assertEquals(MinguoChronology.INSTANCE.date(iso), minguo);
+        assertEquals(MinguoDate.from(iso), minguo);
+    }
+
+    @Test(dataProvider="samples")
+    public void test_isEqual(MinguoDate minguo, LocalDate iso) {
+        assertTrue(minguo.isEqual(iso));
+    }
+
+    @Test(dataProvider="samples")
+    public void test_date_equals(MinguoDate minguo, LocalDate iso) {
+        assertFalse(minguo.equals(iso));
+        assertNotEquals(minguo.hashCode(), iso.hashCode());
     }
 
     @Test
@@ -276,12 +296,24 @@ public class TCKMinguoChronology {
 
     @Test(dataProvider="prolepticYear")
     public void test_prolepticYear(int eraValue, Era  era, int yearOfEra, int expectedProlepticYear, boolean isLeapYear) {
-        Era eraObj = MinguoChronology.INSTANCE.eraOf(eraValue) ;
+        Era eraObj = MinguoChronology.INSTANCE.eraOf(eraValue);
         assertTrue(MinguoChronology.INSTANCE.eras().contains(eraObj));
         assertEquals(eraObj, era);
         assertEquals(MinguoChronology.INSTANCE.prolepticYear(era, yearOfEra), expectedProlepticYear);
-        assertEquals(MinguoChronology.INSTANCE.isLeapYear(expectedProlepticYear), isLeapYear) ;
-        assertEquals(MinguoChronology.INSTANCE.isLeapYear(expectedProlepticYear), Year.of(expectedProlepticYear + YDIFF).isLeap()) ;
+    }
+
+    @Test(dataProvider="prolepticYear")
+    public void test_isLeapYear(int eraValue, Era  era, int yearOfEra, int expectedProlepticYear, boolean isLeapYear) {
+        assertEquals(MinguoChronology.INSTANCE.isLeapYear(expectedProlepticYear), isLeapYear);
+        assertEquals(MinguoChronology.INSTANCE.isLeapYear(expectedProlepticYear), Year.of(expectedProlepticYear + YDIFF).isLeap());
+
+        MinguoDate minguo = MinguoDate.now();
+        minguo = minguo.with(ChronoField.YEAR, expectedProlepticYear).with(ChronoField.MONTH_OF_YEAR, 2);
+        if (isLeapYear) {
+            assertEquals(minguo.lengthOfMonth(), 29);
+        } else {
+            assertEquals(minguo.lengthOfMonth(), 28);
+        }
     }
 
     //-----------------------------------------------------------------------
@@ -467,7 +499,7 @@ public class TCKMinguoChronology {
     public void test_periodUntilDate() {
         MinguoDate mdate1 = MinguoDate.of(1970, 1, 1);
         MinguoDate mdate2 = MinguoDate.of(1971, 2, 2);
-        Period period = mdate1.periodUntil(mdate2);
+        Period period = mdate1.until(mdate2);
         assertEquals(period, Period.of(1, 1, 1));
     }
 
@@ -475,7 +507,7 @@ public class TCKMinguoChronology {
     public void test_periodUntilUnit() {
         MinguoDate mdate1 = MinguoDate.of(1970, 1, 1);
         MinguoDate mdate2 = MinguoDate.of(1971, 2, 2);
-        long months = mdate1.periodUntil(mdate2, ChronoUnit.MONTHS);
+        long months = mdate1.until(mdate2, ChronoUnit.MONTHS);
         assertEquals(months, 13);
     }
 
@@ -484,7 +516,7 @@ public class TCKMinguoChronology {
         MinguoDate mdate1 = MinguoDate.of(1970, 1, 1);
         MinguoDate mdate2 = MinguoDate.of(1971, 2, 2);
         ThaiBuddhistDate ldate2 = ThaiBuddhistChronology.INSTANCE.date(mdate2);
-        Period period = mdate1.periodUntil(ldate2);
+        Period period = mdate1.until(ldate2);
         assertEquals(period, Period.of(1, 1, 1));
     }
 
@@ -520,4 +552,409 @@ public class TCKMinguoChronology {
         assertFalse(MinguoChronology.INSTANCE.equals(IsoChronology.INSTANCE));
     }
 
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    @DataProvider(name = "resolve_yearOfEra")
+    Object[][] data_resolve_yearOfEra() {
+        return new Object[][] {
+                // era only
+                {ResolverStyle.STRICT, -1, null, null, null, null},
+                {ResolverStyle.SMART, -1, null, null, null, null},
+                {ResolverStyle.LENIENT, -1, null, null, null, null},
+
+                {ResolverStyle.STRICT, 0, null, null, ChronoField.ERA, 0},
+                {ResolverStyle.SMART, 0, null, null, ChronoField.ERA, 0},
+                {ResolverStyle.LENIENT, 0, null, null, ChronoField.ERA, 0},
+
+                {ResolverStyle.STRICT, 1, null, null, ChronoField.ERA, 1},
+                {ResolverStyle.SMART, 1, null, null, ChronoField.ERA, 1},
+                {ResolverStyle.LENIENT, 1, null, null, ChronoField.ERA, 1},
+
+                {ResolverStyle.STRICT, 2, null, null, null, null},
+                {ResolverStyle.SMART, 2, null, null, null, null},
+                {ResolverStyle.LENIENT, 2, null, null, null, null},
+
+                // era and year-of-era
+                {ResolverStyle.STRICT, -1, 2012, null, null, null},
+                {ResolverStyle.SMART, -1, 2012, null, null, null},
+                {ResolverStyle.LENIENT, -1, 2012, null, null, null},
+
+                {ResolverStyle.STRICT, 0, 2012, null, ChronoField.YEAR, -2011},
+                {ResolverStyle.SMART, 0, 2012, null, ChronoField.YEAR, -2011},
+                {ResolverStyle.LENIENT, 0, 2012, null, ChronoField.YEAR, -2011},
+
+                {ResolverStyle.STRICT, 1, 2012, null, ChronoField.YEAR, 2012},
+                {ResolverStyle.SMART, 1, 2012, null, ChronoField.YEAR, 2012},
+                {ResolverStyle.LENIENT, 1, 2012, null, ChronoField.YEAR, 2012},
+
+                {ResolverStyle.STRICT, 2, 2012, null, null, null},
+                {ResolverStyle.SMART, 2, 2012, null, null, null},
+                {ResolverStyle.LENIENT, 2, 2012, null, null, null},
+
+                // year-of-era only
+                {ResolverStyle.STRICT, null, 2012, null, ChronoField.YEAR_OF_ERA, 2012},
+                {ResolverStyle.SMART, null, 2012, null, ChronoField.YEAR, 2012},
+                {ResolverStyle.LENIENT, null, 2012, null, ChronoField.YEAR, 2012},
+
+                {ResolverStyle.STRICT, null, Integer.MAX_VALUE, null, null, null},
+                {ResolverStyle.SMART, null, Integer.MAX_VALUE, null, null, null},
+                {ResolverStyle.LENIENT, null, Integer.MAX_VALUE, null, ChronoField.YEAR, Integer.MAX_VALUE},
+
+                // year-of-era and year
+                {ResolverStyle.STRICT, null, 2012, 2012, ChronoField.YEAR, 2012},
+                {ResolverStyle.SMART, null, 2012, 2012, ChronoField.YEAR, 2012},
+                {ResolverStyle.LENIENT, null, 2012, 2012, ChronoField.YEAR, 2012},
+
+                {ResolverStyle.STRICT, null, 2012, -2011, ChronoField.YEAR, -2011},
+                {ResolverStyle.SMART, null, 2012, -2011, ChronoField.YEAR, -2011},
+                {ResolverStyle.LENIENT, null, 2012, -2011, ChronoField.YEAR, -2011},
+
+                {ResolverStyle.STRICT, null, 2012, 2013, null, null},
+                {ResolverStyle.SMART, null, 2012, 2013, null, null},
+                {ResolverStyle.LENIENT, null, 2012, 2013, null, null},
+
+                {ResolverStyle.STRICT, null, 2012, -2013, null, null},
+                {ResolverStyle.SMART, null, 2012, -2013, null, null},
+                {ResolverStyle.LENIENT, null, 2012, -2013, null, null},
+        };
+    }
+
+    @Test(dataProvider = "resolve_yearOfEra")
+    public void test_resolve_yearOfEra(ResolverStyle style, Integer e, Integer yoe, Integer y, ChronoField field, Integer expected) {
+        Map fieldValues = new HashMap<>();
+        if (e != null) {
+            fieldValues.put(ChronoField.ERA, (long) e);
+        }
+        if (yoe != null) {
+            fieldValues.put(ChronoField.YEAR_OF_ERA, (long) yoe);
+        }
+        if (y != null) {
+            fieldValues.put(ChronoField.YEAR, (long) y);
+        }
+        if (field != null) {
+            MinguoDate date = MinguoChronology.INSTANCE.resolveDate(fieldValues, style);
+            assertEquals(date, null);
+            assertEquals(fieldValues.get(field), (Long) expected.longValue());
+            assertEquals(fieldValues.size(), 1);
+        } else {
+            try {
+                MinguoChronology.INSTANCE.resolveDate(fieldValues, style);
+                fail("Should have failed");
+            } catch (DateTimeException ex) {
+                // expected
+            }
+        }
+    }
+
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    @DataProvider(name = "resolve_ymd")
+    Object[][] data_resolve_ymd() {
+        return new Object[][] {
+                {2012 - YDIFF, 1, -365, date(2010 - YDIFF, 12, 31), false, false},
+                {2012 - YDIFF, 1, -364, date(2011 - YDIFF, 1, 1), false, false},
+                {2012 - YDIFF, 1, -31, date(2011 - YDIFF, 11, 30), false, false},
+                {2012 - YDIFF, 1, -30, date(2011 - YDIFF, 12, 1), false, false},
+                {2012 - YDIFF, 1, -12, date(2011 - YDIFF, 12, 19), false, false},
+                {2012 - YDIFF, 1, 1, date(2012 - YDIFF, 1, 1), true, true},
+                {2012 - YDIFF, 1, 27, date(2012 - YDIFF, 1, 27), true, true},
+                {2012 - YDIFF, 1, 28, date(2012 - YDIFF, 1, 28), true, true},
+                {2012 - YDIFF, 1, 29, date(2012 - YDIFF, 1, 29), true, true},
+                {2012 - YDIFF, 1, 30, date(2012 - YDIFF, 1, 30), true, true},
+                {2012 - YDIFF, 1, 31, date(2012 - YDIFF, 1, 31), true, true},
+                {2012 - YDIFF, 1, 59, date(2012 - YDIFF, 2, 28), false, false},
+                {2012 - YDIFF, 1, 60, date(2012 - YDIFF, 2, 29), false, false},
+                {2012 - YDIFF, 1, 61, date(2012 - YDIFF, 3, 1), false, false},
+                {2012 - YDIFF, 1, 365, date(2012 - YDIFF, 12, 30), false, false},
+                {2012 - YDIFF, 1, 366, date(2012 - YDIFF, 12, 31), false, false},
+                {2012 - YDIFF, 1, 367, date(2013 - YDIFF, 1, 1), false, false},
+                {2012 - YDIFF, 1, 367 + 364, date(2013 - YDIFF, 12, 31), false, false},
+                {2012 - YDIFF, 1, 367 + 365, date(2014 - YDIFF, 1, 1), false, false},
+
+                {2012 - YDIFF, 2, 1, date(2012 - YDIFF, 2, 1), true, true},
+                {2012 - YDIFF, 2, 28, date(2012 - YDIFF, 2, 28), true, true},
+                {2012 - YDIFF, 2, 29, date(2012 - YDIFF, 2, 29), true, true},
+                {2012 - YDIFF, 2, 30, date(2012 - YDIFF, 3, 1), date(2012 - YDIFF, 2, 29), false},
+                {2012 - YDIFF, 2, 31, date(2012 - YDIFF, 3, 2), date(2012 - YDIFF, 2, 29), false},
+                {2012 - YDIFF, 2, 32, date(2012 - YDIFF, 3, 3), false, false},
+
+                {2012 - YDIFF, -12, 1, date(2010 - YDIFF, 12, 1), false, false},
+                {2012 - YDIFF, -11, 1, date(2011 - YDIFF, 1, 1), false, false},
+                {2012 - YDIFF, -1, 1, date(2011 - YDIFF, 11, 1), false, false},
+                {2012 - YDIFF, 0, 1, date(2011 - YDIFF, 12, 1), false, false},
+                {2012 - YDIFF, 1, 1, date(2012 - YDIFF, 1, 1), true, true},
+                {2012 - YDIFF, 12, 1, date(2012 - YDIFF, 12, 1), true, true},
+                {2012 - YDIFF, 13, 1, date(2013 - YDIFF, 1, 1), false, false},
+                {2012 - YDIFF, 24, 1, date(2013 - YDIFF, 12, 1), false, false},
+                {2012 - YDIFF, 25, 1, date(2014 - YDIFF, 1, 1), false, false},
+
+                {2012 - YDIFF, 6, -31, date(2012 - YDIFF, 4, 30), false, false},
+                {2012 - YDIFF, 6, -30, date(2012 - YDIFF, 5, 1), false, false},
+                {2012 - YDIFF, 6, -1, date(2012 - YDIFF, 5, 30), false, false},
+                {2012 - YDIFF, 6, 0, date(2012 - YDIFF, 5, 31), false, false},
+                {2012 - YDIFF, 6, 1, date(2012 - YDIFF, 6, 1), true, true},
+                {2012 - YDIFF, 6, 30, date(2012 - YDIFF, 6, 30), true, true},
+                {2012 - YDIFF, 6, 31, date(2012 - YDIFF, 7, 1), date(2012 - YDIFF, 6, 30), false},
+                {2012 - YDIFF, 6, 61, date(2012 - YDIFF, 7, 31), false, false},
+                {2012 - YDIFF, 6, 62, date(2012 - YDIFF, 8, 1), false, false},
+
+                {2011 - YDIFF, 2, 1, date(2011 - YDIFF, 2, 1), true, true},
+                {2011 - YDIFF, 2, 28, date(2011 - YDIFF, 2, 28), true, true},
+                {2011 - YDIFF, 2, 29, date(2011 - YDIFF, 3, 1), date(2011 - YDIFF, 2, 28), false},
+                {2011 - YDIFF, 2, 30, date(2011 - YDIFF, 3, 2), date(2011 - YDIFF, 2, 28), false},
+                {2011 - YDIFF, 2, 31, date(2011 - YDIFF, 3, 3), date(2011 - YDIFF, 2, 28), false},
+                {2011 - YDIFF, 2, 32, date(2011 - YDIFF, 3, 4), false, false},
+        };
+    }
+
+    @Test(dataProvider = "resolve_ymd")
+    public void test_resolve_ymd_lenient(int y, int m, int d, MinguoDate expected, Object smart, boolean strict) {
+        Map fieldValues = new HashMap<>();
+        fieldValues.put(ChronoField.YEAR, (long) y);
+        fieldValues.put(ChronoField.MONTH_OF_YEAR, (long) m);
+        fieldValues.put(ChronoField.DAY_OF_MONTH, (long) d);
+        MinguoDate date = MinguoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.LENIENT);
+        assertEquals(date, expected);
+        assertEquals(fieldValues.size(), 0);
+    }
+
+    @Test(dataProvider = "resolve_ymd")
+    public void test_resolve_ymd_smart(int y, int m, int d, MinguoDate expected, Object smart, boolean strict) {
+        Map fieldValues = new HashMap<>();
+        fieldValues.put(ChronoField.YEAR, (long) y);
+        fieldValues.put(ChronoField.MONTH_OF_YEAR, (long) m);
+        fieldValues.put(ChronoField.DAY_OF_MONTH, (long) d);
+        if (Boolean.TRUE.equals(smart)) {
+            MinguoDate date = MinguoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
+            assertEquals(date, expected);
+            assertEquals(fieldValues.size(), 0);
+        } else if (smart instanceof MinguoDate) {
+            MinguoDate date = MinguoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
+            assertEquals(date, smart);
+        } else {
+            try {
+                MinguoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
+                fail("Should have failed");
+            } catch (DateTimeException ex) {
+                // expected
+            }
+        }
+    }
+
+    @Test(dataProvider = "resolve_ymd")
+    public void test_resolve_ymd_strict(int y, int m, int d, MinguoDate expected, Object smart, boolean strict) {
+        Map fieldValues = new HashMap<>();
+        fieldValues.put(ChronoField.YEAR, (long) y);
+        fieldValues.put(ChronoField.MONTH_OF_YEAR, (long) m);
+        fieldValues.put(ChronoField.DAY_OF_MONTH, (long) d);
+        if (strict) {
+            MinguoDate date = MinguoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
+            assertEquals(date, expected);
+            assertEquals(fieldValues.size(), 0);
+        } else {
+            try {
+                MinguoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
+                fail("Should have failed");
+            } catch (DateTimeException ex) {
+                // expected
+            }
+        }
+    }
+
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    @DataProvider(name = "resolve_yd")
+    Object[][] data_resolve_yd() {
+        return new Object[][] {
+                {2012 - YDIFF, -365, date(2010 - YDIFF, 12, 31), false, false},
+                {2012 - YDIFF, -364, date(2011 - YDIFF, 1, 1), false, false},
+                {2012 - YDIFF, -31, date(2011 - YDIFF, 11, 30), false, false},
+                {2012 - YDIFF, -30, date(2011 - YDIFF, 12, 1), false, false},
+                {2012 - YDIFF, -12, date(2011 - YDIFF, 12, 19), false, false},
+                {2012 - YDIFF, -1, date(2011 - YDIFF, 12, 30), false, false},
+                {2012 - YDIFF, 0, date(2011 - YDIFF, 12, 31), false, false},
+                {2012 - YDIFF, 1, date(2012 - YDIFF, 1, 1), true, true},
+                {2012 - YDIFF, 2, date(2012 - YDIFF, 1, 2), true, true},
+                {2012 - YDIFF, 31, date(2012 - YDIFF, 1, 31), true, true},
+                {2012 - YDIFF, 32, date(2012 - YDIFF, 2, 1), true, true},
+                {2012 - YDIFF, 59, date(2012 - YDIFF, 2, 28), true, true},
+                {2012 - YDIFF, 60, date(2012 - YDIFF, 2, 29), true, true},
+                {2012 - YDIFF, 61, date(2012 - YDIFF, 3, 1), true, true},
+                {2012 - YDIFF, 365, date(2012 - YDIFF, 12, 30), true, true},
+                {2012 - YDIFF, 366, date(2012 - YDIFF, 12, 31), true, true},
+                {2012 - YDIFF, 367, date(2013 - YDIFF, 1, 1), false, false},
+                {2012 - YDIFF, 367 + 364, date(2013 - YDIFF, 12, 31), false, false},
+                {2012 - YDIFF, 367 + 365, date(2014 - YDIFF, 1, 1), false, false},
+
+                {2011 - YDIFF, 59, date(2011 - YDIFF, 2, 28), true, true},
+                {2011 - YDIFF, 60, date(2011 - YDIFF, 3, 1), true, true},
+        };
+    }
+
+    @Test(dataProvider = "resolve_yd")
+    public void test_resolve_yd_lenient(int y, int d, MinguoDate expected, boolean smart, boolean strict) {
+        Map fieldValues = new HashMap<>();
+        fieldValues.put(ChronoField.YEAR, (long) y);
+        fieldValues.put(ChronoField.DAY_OF_YEAR, (long) d);
+        MinguoDate date = MinguoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.LENIENT);
+        assertEquals(date, expected);
+        assertEquals(fieldValues.size(), 0);
+    }
+
+    @Test(dataProvider = "resolve_yd")
+    public void test_resolve_yd_smart(int y, int d, MinguoDate expected, boolean smart, boolean strict) {
+        Map fieldValues = new HashMap<>();
+        fieldValues.put(ChronoField.YEAR, (long) y);
+        fieldValues.put(ChronoField.DAY_OF_YEAR, (long) d);
+        if (smart) {
+            MinguoDate date = MinguoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
+            assertEquals(date, expected);
+            assertEquals(fieldValues.size(), 0);
+        } else {
+            try {
+                MinguoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
+                fail("Should have failed");
+            } catch (DateTimeException ex) {
+                // expected
+            }
+        }
+    }
+
+    @Test(dataProvider = "resolve_yd")
+    public void test_resolve_yd_strict(int y, int d, MinguoDate expected, boolean smart, boolean strict) {
+        Map fieldValues = new HashMap<>();
+        fieldValues.put(ChronoField.YEAR, (long) y);
+        fieldValues.put(ChronoField.DAY_OF_YEAR, (long) d);
+        if (strict) {
+            MinguoDate date = MinguoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
+            assertEquals(date, expected);
+            assertEquals(fieldValues.size(), 0);
+        } else {
+            try {
+                MinguoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
+                fail("Should have failed");
+            } catch (DateTimeException ex) {
+                // expected
+            }
+        }
+    }
+
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    @DataProvider(name = "resolve_ymaa")
+    Object[][] data_resolve_ymaa() {
+        return new Object[][] {
+                {2012 - YDIFF, 1, 1, -365, date(2010 - YDIFF, 12, 31), false, false},
+                {2012 - YDIFF, 1, 1, -364, date(2011 - YDIFF, 1, 1), false, false},
+                {2012 - YDIFF, 1, 1, -31, date(2011 - YDIFF, 11, 30), false, false},
+                {2012 - YDIFF, 1, 1, -30, date(2011 - YDIFF, 12, 1), false, false},
+                {2012 - YDIFF, 1, 1, -12, date(2011 - YDIFF, 12, 19), false, false},
+                {2012 - YDIFF, 1, 1, 1, date(2012 - YDIFF, 1, 1), true, true},
+                {2012 - YDIFF, 1, 1, 59, date(2012 - YDIFF, 2, 28), false, false},
+                {2012 - YDIFF, 1, 1, 60, date(2012 - YDIFF, 2, 29), false, false},
+                {2012 - YDIFF, 1, 1, 61, date(2012 - YDIFF, 3, 1), false, false},
+                {2012 - YDIFF, 1, 1, 365, date(2012 - YDIFF, 12, 30), false, false},
+                {2012 - YDIFF, 1, 1, 366, date(2012 - YDIFF, 12, 31), false, false},
+                {2012 - YDIFF, 1, 1, 367, date(2013 - YDIFF, 1, 1), false, false},
+                {2012 - YDIFF, 1, 1, 367 + 364, date(2013 - YDIFF, 12, 31), false, false},
+                {2012 - YDIFF, 1, 1, 367 + 365, date(2014 - YDIFF, 1, 1), false, false},
+
+                {2012 - YDIFF, 2, 0, 1, date(2012 - YDIFF, 1, 25), false, false},
+                {2012 - YDIFF, 2, 0, 7, date(2012 - YDIFF, 1, 31), false, false},
+                {2012 - YDIFF, 2, 1, 1, date(2012 - YDIFF, 2, 1), true, true},
+                {2012 - YDIFF, 2, 1, 7, date(2012 - YDIFF, 2, 7), true, true},
+                {2012 - YDIFF, 2, 2, 1, date(2012 - YDIFF, 2, 8), true, true},
+                {2012 - YDIFF, 2, 2, 7, date(2012 - YDIFF, 2, 14), true, true},
+                {2012 - YDIFF, 2, 3, 1, date(2012 - YDIFF, 2, 15), true, true},
+                {2012 - YDIFF, 2, 3, 7, date(2012 - YDIFF, 2, 21), true, true},
+                {2012 - YDIFF, 2, 4, 1, date(2012 - YDIFF, 2, 22), true, true},
+                {2012 - YDIFF, 2, 4, 7, date(2012 - YDIFF, 2, 28), true, true},
+                {2012 - YDIFF, 2, 5, 1, date(2012 - YDIFF, 2, 29), true, true},
+                {2012 - YDIFF, 2, 5, 2, date(2012 - YDIFF, 3, 1), true, false},
+                {2012 - YDIFF, 2, 5, 7, date(2012 - YDIFF, 3, 6), true, false},
+                {2012 - YDIFF, 2, 6, 1, date(2012 - YDIFF, 3, 7), false, false},
+                {2012 - YDIFF, 2, 6, 7, date(2012 - YDIFF, 3, 13), false, false},
+
+                {2012 - YDIFF, 12, 1, 1, date(2012 - YDIFF, 12, 1), true, true},
+                {2012 - YDIFF, 12, 5, 1, date(2012 - YDIFF, 12, 29), true, true},
+                {2012 - YDIFF, 12, 5, 2, date(2012 - YDIFF, 12, 30), true, true},
+                {2012 - YDIFF, 12, 5, 3, date(2012 - YDIFF, 12, 31), true, true},
+                {2012 - YDIFF, 12, 5, 4, date(2013 - YDIFF, 1, 1), true, false},
+                {2012 - YDIFF, 12, 5, 7, date(2013 - YDIFF, 1, 4), true, false},
+
+                {2012 - YDIFF, -12, 1, 1, date(2010 - YDIFF, 12, 1), false, false},
+                {2012 - YDIFF, -11, 1, 1, date(2011 - YDIFF, 1, 1), false, false},
+                {2012 - YDIFF, -1, 1, 1, date(2011 - YDIFF, 11, 1), false, false},
+                {2012 - YDIFF, 0, 1, 1, date(2011 - YDIFF, 12, 1), false, false},
+                {2012 - YDIFF, 1, 1, 1, date(2012 - YDIFF, 1, 1), true, true},
+                {2012 - YDIFF, 12, 1, 1, date(2012 - YDIFF, 12, 1), true, true},
+                {2012 - YDIFF, 13, 1, 1, date(2013 - YDIFF, 1, 1), false, false},
+                {2012 - YDIFF, 24, 1, 1, date(2013 - YDIFF, 12, 1), false, false},
+                {2012 - YDIFF, 25, 1, 1, date(2014 - YDIFF, 1, 1), false, false},
+
+                {2011 - YDIFF, 2, 1, 1, date(2011 - YDIFF, 2, 1), true, true},
+                {2011 - YDIFF, 2, 4, 7, date(2011 - YDIFF, 2, 28), true, true},
+                {2011 - YDIFF, 2, 5, 1, date(2011 - YDIFF, 3, 1), true, false},
+        };
+    }
+
+    @Test(dataProvider = "resolve_ymaa")
+    public void test_resolve_ymaa_lenient(int y, int m, int w, int d, MinguoDate expected, boolean smart, boolean strict) {
+        Map fieldValues = new HashMap<>();
+        fieldValues.put(ChronoField.YEAR, (long) y);
+        fieldValues.put(ChronoField.MONTH_OF_YEAR, (long) m);
+        fieldValues.put(ChronoField.ALIGNED_WEEK_OF_MONTH, (long) w);
+        fieldValues.put(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH, (long) d);
+        MinguoDate date = MinguoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.LENIENT);
+        assertEquals(date, expected);
+        assertEquals(fieldValues.size(), 0);
+    }
+
+    @Test(dataProvider = "resolve_ymaa")
+    public void test_resolve_ymaa_smart(int y, int m, int w, int d, MinguoDate expected, boolean smart, boolean strict) {
+        Map fieldValues = new HashMap<>();
+        fieldValues.put(ChronoField.YEAR, (long) y);
+        fieldValues.put(ChronoField.MONTH_OF_YEAR, (long) m);
+        fieldValues.put(ChronoField.ALIGNED_WEEK_OF_MONTH, (long) w);
+        fieldValues.put(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH, (long) d);
+        if (smart) {
+            MinguoDate date = MinguoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
+            assertEquals(date, expected);
+            assertEquals(fieldValues.size(), 0);
+        } else {
+            try {
+                MinguoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
+                fail("Should have failed");
+            } catch (DateTimeException ex) {
+                // expected
+            }
+        }
+    }
+
+    @Test(dataProvider = "resolve_ymaa")
+    public void test_resolve_ymaa_strict(int y, int m, int w, int d, MinguoDate expected, boolean smart, boolean strict) {
+        Map fieldValues = new HashMap<>();
+        fieldValues.put(ChronoField.YEAR, (long) y);
+        fieldValues.put(ChronoField.MONTH_OF_YEAR, (long) m);
+        fieldValues.put(ChronoField.ALIGNED_WEEK_OF_MONTH, (long) w);
+        fieldValues.put(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH, (long) d);
+        if (strict) {
+            MinguoDate date = MinguoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
+            assertEquals(date, expected);
+            assertEquals(fieldValues.size(), 0);
+        } else {
+            try {
+                MinguoChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
+                fail("Should have failed");
+            } catch (DateTimeException ex) {
+                // expected
+            }
+        }
+    }
+
+    //-----------------------------------------------------------------------
+    private static MinguoDate date(int y, int m, int d) {
+        return MinguoDate.of(y, m, d);
+    }
+
 }
diff --git a/jdk/test/java/time/tck/java/time/chrono/TCKThaiBuddhistChronology.java b/jdk/test/java/time/tck/java/time/chrono/TCKThaiBuddhistChronology.java
index f6c79449638..e57847c0619 100644
--- a/jdk/test/java/time/tck/java/time/chrono/TCKThaiBuddhistChronology.java
+++ b/jdk/test/java/time/tck/java/time/chrono/TCKThaiBuddhistChronology.java
@@ -63,6 +63,7 @@ import static java.time.temporal.ChronoField.YEAR;
 import static java.time.temporal.ChronoField.YEAR_OF_ERA;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotEquals;
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
 
@@ -84,12 +85,16 @@ import java.time.chrono.MinguoDate;
 import java.time.chrono.ThaiBuddhistChronology;
 import java.time.chrono.ThaiBuddhistDate;
 import java.time.chrono.ThaiBuddhistEra;
+import java.time.format.ResolverStyle;
 import java.time.temporal.ChronoField;
 import java.time.temporal.ChronoUnit;
 import java.time.temporal.TemporalAdjuster;
+import java.time.temporal.TemporalField;
 import java.time.temporal.ValueRange;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
@@ -200,6 +205,18 @@ public class TCKThaiBuddhistChronology {
     @Test(dataProvider="samples")
     public void test_fromCalendrical(ThaiBuddhistDate jdate, LocalDate iso) {
         assertEquals(ThaiBuddhistChronology.INSTANCE.date(iso), jdate);
+        assertEquals(ThaiBuddhistDate.from(iso), jdate);
+    }
+
+    @Test(dataProvider="samples")
+    public void test_isEqual(ThaiBuddhistDate jdate, LocalDate iso) {
+        assertTrue(jdate.isEqual(iso));
+    }
+
+    @Test(dataProvider="samples")
+    public void test_date_equals(ThaiBuddhistDate jdate, LocalDate iso) {
+        assertFalse(jdate.equals(iso));
+        assertNotEquals(jdate.hashCode(), iso.hashCode());
     }
 
     @Test
@@ -251,46 +268,58 @@ public class TCKThaiBuddhistChronology {
         ThaiBuddhistChronology.INSTANCE.date(year, month, dom);
     }
 
-  //-----------------------------------------------------------------------
-  // prolepticYear() and is LeapYear()
-  //-----------------------------------------------------------------------
-  @DataProvider(name="prolepticYear")
-  Object[][] data_prolepticYear() {
-      return new Object[][] {
-          {1, ThaiBuddhistEra.BE, 4 + YDIFF, 4 + YDIFF, true},
-          {1, ThaiBuddhistEra.BE, 7 + YDIFF, 7 + YDIFF, false},
-          {1, ThaiBuddhistEra.BE, 8 + YDIFF, 8 + YDIFF, true},
-          {1, ThaiBuddhistEra.BE, 1000 + YDIFF, 1000 + YDIFF, false},
-          {1, ThaiBuddhistEra.BE, 2000 + YDIFF, 2000 + YDIFF, true},
-          {1, ThaiBuddhistEra.BE, 0, 0, false},
-          {1, ThaiBuddhistEra.BE, -4 + YDIFF, -4 + YDIFF, true},
-          {1, ThaiBuddhistEra.BE, -7 + YDIFF, -7 + YDIFF, false},
-          {1, ThaiBuddhistEra.BE, -100 + YDIFF, -100 + YDIFF, false},
-          {1, ThaiBuddhistEra.BE, -800 + YDIFF, -800 + YDIFF, true},
+    //-----------------------------------------------------------------------
+    // prolepticYear() and is LeapYear()
+    //-----------------------------------------------------------------------
+    @DataProvider(name="prolepticYear")
+    Object[][] data_prolepticYear() {
+        return new Object[][] {
+            {1, ThaiBuddhistEra.BE, 4 + YDIFF, 4 + YDIFF, true},
+            {1, ThaiBuddhistEra.BE, 7 + YDIFF, 7 + YDIFF, false},
+            {1, ThaiBuddhistEra.BE, 8 + YDIFF, 8 + YDIFF, true},
+            {1, ThaiBuddhistEra.BE, 1000 + YDIFF, 1000 + YDIFF, false},
+            {1, ThaiBuddhistEra.BE, 2000 + YDIFF, 2000 + YDIFF, true},
+            {1, ThaiBuddhistEra.BE, 0, 0, false},
+            {1, ThaiBuddhistEra.BE, -4 + YDIFF, -4 + YDIFF, true},
+            {1, ThaiBuddhistEra.BE, -7 + YDIFF, -7 + YDIFF, false},
+            {1, ThaiBuddhistEra.BE, -100 + YDIFF, -100 + YDIFF, false},
+            {1, ThaiBuddhistEra.BE, -800 + YDIFF, -800 + YDIFF, true},
 
-          {0, ThaiBuddhistEra.BEFORE_BE, -3 - YDIFF, 4 + YDIFF, true},
-          {0, ThaiBuddhistEra.BEFORE_BE, -6 - YDIFF, 7 + YDIFF, false},
-          {0, ThaiBuddhistEra.BEFORE_BE, -7 - YDIFF, 8 + YDIFF, true},
-          {0, ThaiBuddhistEra.BEFORE_BE, -999 - YDIFF, 1000 + YDIFF, false},
-          {0, ThaiBuddhistEra.BEFORE_BE, -1999 - YDIFF, 2000 + YDIFF, true},
-          {0, ThaiBuddhistEra.BEFORE_BE, 1, 0, false},
-          {0, ThaiBuddhistEra.BEFORE_BE, 5 - YDIFF, -4 + YDIFF, true},
-          {0, ThaiBuddhistEra.BEFORE_BE, 8 - YDIFF, -7 + YDIFF, false},
-          {0, ThaiBuddhistEra.BEFORE_BE, 101 - YDIFF, -100 + YDIFF, false},
-          {0, ThaiBuddhistEra.BEFORE_BE, 801 - YDIFF, -800 + YDIFF, true},
+            {0, ThaiBuddhistEra.BEFORE_BE, -3 - YDIFF, 4 + YDIFF, true},
+            {0, ThaiBuddhistEra.BEFORE_BE, -6 - YDIFF, 7 + YDIFF, false},
+            {0, ThaiBuddhistEra.BEFORE_BE, -7 - YDIFF, 8 + YDIFF, true},
+            {0, ThaiBuddhistEra.BEFORE_BE, -999 - YDIFF, 1000 + YDIFF, false},
+            {0, ThaiBuddhistEra.BEFORE_BE, -1999 - YDIFF, 2000 + YDIFF, true},
+            {0, ThaiBuddhistEra.BEFORE_BE, 1, 0, false},
+            {0, ThaiBuddhistEra.BEFORE_BE, 5 - YDIFF, -4 + YDIFF, true},
+            {0, ThaiBuddhistEra.BEFORE_BE, 8 - YDIFF, -7 + YDIFF, false},
+            {0, ThaiBuddhistEra.BEFORE_BE, 101 - YDIFF, -100 + YDIFF, false},
+            {0, ThaiBuddhistEra.BEFORE_BE, 801 - YDIFF, -800 + YDIFF, true},
 
-      };
-  }
+        };
+    }
 
-  @Test(dataProvider="prolepticYear")
-  public void test_prolepticYear(int eraValue, Era  era, int yearOfEra, int expectedProlepticYear, boolean isLeapYear) {
-      Era eraObj = ThaiBuddhistChronology.INSTANCE.eraOf(eraValue) ;
-      assertTrue(ThaiBuddhistChronology.INSTANCE.eras().contains(eraObj));
-      assertEquals(eraObj, era);
-      assertEquals(ThaiBuddhistChronology.INSTANCE.prolepticYear(era, yearOfEra), expectedProlepticYear);
-      assertEquals(ThaiBuddhistChronology.INSTANCE.isLeapYear(expectedProlepticYear), isLeapYear) ;
-      assertEquals(ThaiBuddhistChronology.INSTANCE.isLeapYear(expectedProlepticYear), Year.of(expectedProlepticYear - YDIFF).isLeap()) ;
-  }
+    @Test(dataProvider="prolepticYear")
+    public void test_prolepticYear(int eraValue, Era  era, int yearOfEra, int expectedProlepticYear, boolean isLeapYear) {
+        Era eraObj = ThaiBuddhistChronology.INSTANCE.eraOf(eraValue);
+        assertTrue(ThaiBuddhistChronology.INSTANCE.eras().contains(eraObj));
+        assertEquals(eraObj, era);
+        assertEquals(ThaiBuddhistChronology.INSTANCE.prolepticYear(era, yearOfEra), expectedProlepticYear);
+    }
+
+    @Test(dataProvider="prolepticYear")
+    public void test_isLeapYear(int eraValue, Era  era, int yearOfEra, int expectedProlepticYear, boolean isLeapYear) {
+        assertEquals(ThaiBuddhistChronology.INSTANCE.isLeapYear(expectedProlepticYear), isLeapYear) ;
+        assertEquals(ThaiBuddhistChronology.INSTANCE.isLeapYear(expectedProlepticYear), Year.of(expectedProlepticYear - YDIFF).isLeap());
+
+        ThaiBuddhistDate jdate = ThaiBuddhistDate.now();
+        jdate = jdate.with(ChronoField.YEAR, expectedProlepticYear).with(ChronoField.MONTH_OF_YEAR, 2);
+        if (isLeapYear) {
+            assertEquals(jdate.lengthOfMonth(), 29);
+        } else {
+            assertEquals(jdate.lengthOfMonth(), 28);
+        }
+    }
 
     //-----------------------------------------------------------------------
     // Bad Era for Chronology.date(era,...) and Chronology.prolepticYear(Era,...)
@@ -429,7 +458,7 @@ public class TCKThaiBuddhistChronology {
     public void test_periodUntilDate() {
         ThaiBuddhistDate mdate1 = ThaiBuddhistDate.of(1, 1, 1);
         ThaiBuddhistDate mdate2 = ThaiBuddhistDate.of(2, 2, 2);
-        Period period = mdate1.periodUntil(mdate2);
+        Period period = mdate1.until(mdate2);
         assertEquals(period, Period.of(1, 1, 1));
     }
 
@@ -437,7 +466,7 @@ public class TCKThaiBuddhistChronology {
     public void test_periodUntilUnit() {
         ThaiBuddhistDate mdate1 = ThaiBuddhistDate.of(1, 1, 1);
         ThaiBuddhistDate mdate2 = ThaiBuddhistDate.of(2, 2, 2);
-        long months = mdate1.periodUntil(mdate2, ChronoUnit.MONTHS);
+        long months = mdate1.until(mdate2, ChronoUnit.MONTHS);
         assertEquals(months, 13);
     }
 
@@ -446,7 +475,7 @@ public class TCKThaiBuddhistChronology {
         ThaiBuddhistDate mdate1 = ThaiBuddhistDate.of(1, 1, 1);
         ThaiBuddhistDate mdate2 = ThaiBuddhistDate.of(2, 2, 2);
         MinguoDate ldate2 = MinguoChronology.INSTANCE.date(mdate2);
-        Period period = mdate1.periodUntil(ldate2);
+        Period period = mdate1.until(ldate2);
         assertEquals(period, Period.of(1, 1, 1));
     }
 
@@ -497,4 +526,409 @@ public class TCKThaiBuddhistChronology {
         assertFalse(ThaiBuddhistChronology.INSTANCE.equals(IsoChronology.INSTANCE));
     }
 
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    @DataProvider(name = "resolve_yearOfEra")
+    Object[][] data_resolve_yearOfEra() {
+        return new Object[][] {
+                // era only
+                {ResolverStyle.STRICT, -1, null, null, null, null},
+                {ResolverStyle.SMART, -1, null, null, null, null},
+                {ResolverStyle.LENIENT, -1, null, null, null, null},
+
+                {ResolverStyle.STRICT, 0, null, null, ChronoField.ERA, 0},
+                {ResolverStyle.SMART, 0, null, null, ChronoField.ERA, 0},
+                {ResolverStyle.LENIENT, 0, null, null, ChronoField.ERA, 0},
+
+                {ResolverStyle.STRICT, 1, null, null, ChronoField.ERA, 1},
+                {ResolverStyle.SMART, 1, null, null, ChronoField.ERA, 1},
+                {ResolverStyle.LENIENT, 1, null, null, ChronoField.ERA, 1},
+
+                {ResolverStyle.STRICT, 2, null, null, null, null},
+                {ResolverStyle.SMART, 2, null, null, null, null},
+                {ResolverStyle.LENIENT, 2, null, null, null, null},
+
+                // era and year-of-era
+                {ResolverStyle.STRICT, -1, 2012, null, null, null},
+                {ResolverStyle.SMART, -1, 2012, null, null, null},
+                {ResolverStyle.LENIENT, -1, 2012, null, null, null},
+
+                {ResolverStyle.STRICT, 0, 2012, null, ChronoField.YEAR, -2011},
+                {ResolverStyle.SMART, 0, 2012, null, ChronoField.YEAR, -2011},
+                {ResolverStyle.LENIENT, 0, 2012, null, ChronoField.YEAR, -2011},
+
+                {ResolverStyle.STRICT, 1, 2012, null, ChronoField.YEAR, 2012},
+                {ResolverStyle.SMART, 1, 2012, null, ChronoField.YEAR, 2012},
+                {ResolverStyle.LENIENT, 1, 2012, null, ChronoField.YEAR, 2012},
+
+                {ResolverStyle.STRICT, 2, 2012, null, null, null},
+                {ResolverStyle.SMART, 2, 2012, null, null, null},
+                {ResolverStyle.LENIENT, 2, 2012, null, null, null},
+
+                // year-of-era only
+                {ResolverStyle.STRICT, null, 2012, null, ChronoField.YEAR_OF_ERA, 2012},
+                {ResolverStyle.SMART, null, 2012, null, ChronoField.YEAR, 2012},
+                {ResolverStyle.LENIENT, null, 2012, null, ChronoField.YEAR, 2012},
+
+                {ResolverStyle.STRICT, null, Integer.MAX_VALUE, null, null, null},
+                {ResolverStyle.SMART, null, Integer.MAX_VALUE, null, null, null},
+                {ResolverStyle.LENIENT, null, Integer.MAX_VALUE, null, ChronoField.YEAR, Integer.MAX_VALUE},
+
+                // year-of-era and year
+                {ResolverStyle.STRICT, null, 2012, 2012, ChronoField.YEAR, 2012},
+                {ResolverStyle.SMART, null, 2012, 2012, ChronoField.YEAR, 2012},
+                {ResolverStyle.LENIENT, null, 2012, 2012, ChronoField.YEAR, 2012},
+
+                {ResolverStyle.STRICT, null, 2012, -2011, ChronoField.YEAR, -2011},
+                {ResolverStyle.SMART, null, 2012, -2011, ChronoField.YEAR, -2011},
+                {ResolverStyle.LENIENT, null, 2012, -2011, ChronoField.YEAR, -2011},
+
+                {ResolverStyle.STRICT, null, 2012, 2013, null, null},
+                {ResolverStyle.SMART, null, 2012, 2013, null, null},
+                {ResolverStyle.LENIENT, null, 2012, 2013, null, null},
+
+                {ResolverStyle.STRICT, null, 2012, -2013, null, null},
+                {ResolverStyle.SMART, null, 2012, -2013, null, null},
+                {ResolverStyle.LENIENT, null, 2012, -2013, null, null},
+        };
+    }
+
+    @Test(dataProvider = "resolve_yearOfEra")
+    public void test_resolve_yearOfEra(ResolverStyle style, Integer e, Integer yoe, Integer y, ChronoField field, Integer expected) {
+        Map fieldValues = new HashMap<>();
+        if (e != null) {
+            fieldValues.put(ChronoField.ERA, (long) e);
+        }
+        if (yoe != null) {
+            fieldValues.put(ChronoField.YEAR_OF_ERA, (long) yoe);
+        }
+        if (y != null) {
+            fieldValues.put(ChronoField.YEAR, (long) y);
+        }
+        if (field != null) {
+            ThaiBuddhistDate date = ThaiBuddhistChronology.INSTANCE.resolveDate(fieldValues, style);
+            assertEquals(date, null);
+            assertEquals(fieldValues.get(field), (Long) expected.longValue());
+            assertEquals(fieldValues.size(), 1);
+        } else {
+            try {
+                ThaiBuddhistChronology.INSTANCE.resolveDate(fieldValues, style);
+                fail("Should have failed");
+            } catch (DateTimeException ex) {
+                // expected
+            }
+        }
+    }
+
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    @DataProvider(name = "resolve_ymd")
+    Object[][] data_resolve_ymd() {
+        return new Object[][] {
+                {YDIFF + 2012, 1, -365, date(YDIFF + 2010, 12, 31), false, false},
+                {YDIFF + 2012, 1, -364, date(YDIFF + 2011, 1, 1), false, false},
+                {YDIFF + 2012, 1, -31, date(YDIFF + 2011, 11, 30), false, false},
+                {YDIFF + 2012, 1, -30, date(YDIFF + 2011, 12, 1), false, false},
+                {YDIFF + 2012, 1, -12, date(YDIFF + 2011, 12, 19), false, false},
+                {YDIFF + 2012, 1, 1, date(YDIFF + 2012, 1, 1), true, true},
+                {YDIFF + 2012, 1, 27, date(YDIFF + 2012, 1, 27), true, true},
+                {YDIFF + 2012, 1, 28, date(YDIFF + 2012, 1, 28), true, true},
+                {YDIFF + 2012, 1, 29, date(YDIFF + 2012, 1, 29), true, true},
+                {YDIFF + 2012, 1, 30, date(YDIFF + 2012, 1, 30), true, true},
+                {YDIFF + 2012, 1, 31, date(YDIFF + 2012, 1, 31), true, true},
+                {YDIFF + 2012, 1, 59, date(YDIFF + 2012, 2, 28), false, false},
+                {YDIFF + 2012, 1, 60, date(YDIFF + 2012, 2, 29), false, false},
+                {YDIFF + 2012, 1, 61, date(YDIFF + 2012, 3, 1), false, false},
+                {YDIFF + 2012, 1, 365, date(YDIFF + 2012, 12, 30), false, false},
+                {YDIFF + 2012, 1, 366, date(YDIFF + 2012, 12, 31), false, false},
+                {YDIFF + 2012, 1, 367, date(YDIFF + 2013, 1, 1), false, false},
+                {YDIFF + 2012, 1, 367 + 364, date(YDIFF + 2013, 12, 31), false, false},
+                {YDIFF + 2012, 1, 367 + 365, date(YDIFF + 2014, 1, 1), false, false},
+
+                {YDIFF + 2012, 2, 1, date(YDIFF + 2012, 2, 1), true, true},
+                {YDIFF + 2012, 2, 28, date(YDIFF + 2012, 2, 28), true, true},
+                {YDIFF + 2012, 2, 29, date(YDIFF + 2012, 2, 29), true, true},
+                {YDIFF + 2012, 2, 30, date(YDIFF + 2012, 3, 1), date(YDIFF + 2012, 2, 29), false},
+                {YDIFF + 2012, 2, 31, date(YDIFF + 2012, 3, 2), date(YDIFF + 2012, 2, 29), false},
+                {YDIFF + 2012, 2, 32, date(YDIFF + 2012, 3, 3), false, false},
+
+                {YDIFF + 2012, -12, 1, date(YDIFF + 2010, 12, 1), false, false},
+                {YDIFF + 2012, -11, 1, date(YDIFF + 2011, 1, 1), false, false},
+                {YDIFF + 2012, -1, 1, date(YDIFF + 2011, 11, 1), false, false},
+                {YDIFF + 2012, 0, 1, date(YDIFF + 2011, 12, 1), false, false},
+                {YDIFF + 2012, 1, 1, date(YDIFF + 2012, 1, 1), true, true},
+                {YDIFF + 2012, 12, 1, date(YDIFF + 2012, 12, 1), true, true},
+                {YDIFF + 2012, 13, 1, date(YDIFF + 2013, 1, 1), false, false},
+                {YDIFF + 2012, 24, 1, date(YDIFF + 2013, 12, 1), false, false},
+                {YDIFF + 2012, 25, 1, date(YDIFF + 2014, 1, 1), false, false},
+
+                {YDIFF + 2012, 6, -31, date(YDIFF + 2012, 4, 30), false, false},
+                {YDIFF + 2012, 6, -30, date(YDIFF + 2012, 5, 1), false, false},
+                {YDIFF + 2012, 6, -1, date(YDIFF + 2012, 5, 30), false, false},
+                {YDIFF + 2012, 6, 0, date(YDIFF + 2012, 5, 31), false, false},
+                {YDIFF + 2012, 6, 1, date(YDIFF + 2012, 6, 1), true, true},
+                {YDIFF + 2012, 6, 30, date(YDIFF + 2012, 6, 30), true, true},
+                {YDIFF + 2012, 6, 31, date(YDIFF + 2012, 7, 1), date(YDIFF + 2012, 6, 30), false},
+                {YDIFF + 2012, 6, 61, date(YDIFF + 2012, 7, 31), false, false},
+                {YDIFF + 2012, 6, 62, date(YDIFF + 2012, 8, 1), false, false},
+
+                {YDIFF + 2011, 2, 1, date(YDIFF + 2011, 2, 1), true, true},
+                {YDIFF + 2011, 2, 28, date(YDIFF + 2011, 2, 28), true, true},
+                {YDIFF + 2011, 2, 29, date(YDIFF + 2011, 3, 1), date(YDIFF + 2011, 2, 28), false},
+                {YDIFF + 2011, 2, 30, date(YDIFF + 2011, 3, 2), date(YDIFF + 2011, 2, 28), false},
+                {YDIFF + 2011, 2, 31, date(YDIFF + 2011, 3, 3), date(YDIFF + 2011, 2, 28), false},
+                {YDIFF + 2011, 2, 32, date(YDIFF + 2011, 3, 4), false, false},
+        };
+    }
+
+    @Test(dataProvider = "resolve_ymd")
+    public void test_resolve_ymd_lenient(int y, int m, int d, ThaiBuddhistDate expected, Object smart, boolean strict) {
+        Map fieldValues = new HashMap<>();
+        fieldValues.put(ChronoField.YEAR, (long) y);
+        fieldValues.put(ChronoField.MONTH_OF_YEAR, (long) m);
+        fieldValues.put(ChronoField.DAY_OF_MONTH, (long) d);
+        ThaiBuddhistDate date = ThaiBuddhistChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.LENIENT);
+        assertEquals(date, expected);
+        assertEquals(fieldValues.size(), 0);
+    }
+
+    @Test(dataProvider = "resolve_ymd")
+    public void test_resolve_ymd_smart(int y, int m, int d, ThaiBuddhistDate expected, Object smart, boolean strict) {
+        Map fieldValues = new HashMap<>();
+        fieldValues.put(ChronoField.YEAR, (long) y);
+        fieldValues.put(ChronoField.MONTH_OF_YEAR, (long) m);
+        fieldValues.put(ChronoField.DAY_OF_MONTH, (long) d);
+        if (Boolean.TRUE.equals(smart)) {
+            ThaiBuddhistDate date = ThaiBuddhistChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
+            assertEquals(date, expected);
+            assertEquals(fieldValues.size(), 0);
+        } else if (smart instanceof ThaiBuddhistDate) {
+            ThaiBuddhistDate date = ThaiBuddhistChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
+            assertEquals(date, smart);
+        } else {
+            try {
+                ThaiBuddhistChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
+                fail("Should have failed");
+            } catch (DateTimeException ex) {
+                // expected
+            }
+        }
+    }
+
+    @Test(dataProvider = "resolve_ymd")
+    public void test_resolve_ymd_strict(int y, int m, int d, ThaiBuddhistDate expected, Object smart, boolean strict) {
+        Map fieldValues = new HashMap<>();
+        fieldValues.put(ChronoField.YEAR, (long) y);
+        fieldValues.put(ChronoField.MONTH_OF_YEAR, (long) m);
+        fieldValues.put(ChronoField.DAY_OF_MONTH, (long) d);
+        if (strict) {
+            ThaiBuddhistDate date = ThaiBuddhistChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
+            assertEquals(date, expected);
+            assertEquals(fieldValues.size(), 0);
+        } else {
+            try {
+                ThaiBuddhistChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
+                fail("Should have failed");
+            } catch (DateTimeException ex) {
+                // expected
+            }
+        }
+    }
+
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    @DataProvider(name = "resolve_yd")
+    Object[][] data_resolve_yd() {
+        return new Object[][] {
+                {YDIFF + 2012, -365, date(YDIFF + 2010, 12, 31), false, false},
+                {YDIFF + 2012, -364, date(YDIFF + 2011, 1, 1), false, false},
+                {YDIFF + 2012, -31, date(YDIFF + 2011, 11, 30), false, false},
+                {YDIFF + 2012, -30, date(YDIFF + 2011, 12, 1), false, false},
+                {YDIFF + 2012, -12, date(YDIFF + 2011, 12, 19), false, false},
+                {YDIFF + 2012, -1, date(YDIFF + 2011, 12, 30), false, false},
+                {YDIFF + 2012, 0, date(YDIFF + 2011, 12, 31), false, false},
+                {YDIFF + 2012, 1, date(YDIFF + 2012, 1, 1), true, true},
+                {YDIFF + 2012, 2, date(YDIFF + 2012, 1, 2), true, true},
+                {YDIFF + 2012, 31, date(YDIFF + 2012, 1, 31), true, true},
+                {YDIFF + 2012, 32, date(YDIFF + 2012, 2, 1), true, true},
+                {YDIFF + 2012, 59, date(YDIFF + 2012, 2, 28), true, true},
+                {YDIFF + 2012, 60, date(YDIFF + 2012, 2, 29), true, true},
+                {YDIFF + 2012, 61, date(YDIFF + 2012, 3, 1), true, true},
+                {YDIFF + 2012, 365, date(YDIFF + 2012, 12, 30), true, true},
+                {YDIFF + 2012, 366, date(YDIFF + 2012, 12, 31), true, true},
+                {YDIFF + 2012, 367, date(YDIFF + 2013, 1, 1), false, false},
+                {YDIFF + 2012, 367 + 364, date(YDIFF + 2013, 12, 31), false, false},
+                {YDIFF + 2012, 367 + 365, date(YDIFF + 2014, 1, 1), false, false},
+
+                {YDIFF + 2011, 59, date(YDIFF + 2011, 2, 28), true, true},
+                {YDIFF + 2011, 60, date(YDIFF + 2011, 3, 1), true, true},
+        };
+    }
+
+    @Test(dataProvider = "resolve_yd")
+    public void test_resolve_yd_lenient(int y, int d, ThaiBuddhistDate expected, boolean smart, boolean strict) {
+        Map fieldValues = new HashMap<>();
+        fieldValues.put(ChronoField.YEAR, (long) y);
+        fieldValues.put(ChronoField.DAY_OF_YEAR, (long) d);
+        ThaiBuddhistDate date = ThaiBuddhistChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.LENIENT);
+        assertEquals(date, expected);
+        assertEquals(fieldValues.size(), 0);
+    }
+
+    @Test(dataProvider = "resolve_yd")
+    public void test_resolve_yd_smart(int y, int d, ThaiBuddhistDate expected, boolean smart, boolean strict) {
+        Map fieldValues = new HashMap<>();
+        fieldValues.put(ChronoField.YEAR, (long) y);
+        fieldValues.put(ChronoField.DAY_OF_YEAR, (long) d);
+        if (smart) {
+            ThaiBuddhistDate date = ThaiBuddhistChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
+            assertEquals(date, expected);
+            assertEquals(fieldValues.size(), 0);
+        } else {
+            try {
+                ThaiBuddhistChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
+                fail("Should have failed");
+            } catch (DateTimeException ex) {
+                // expected
+            }
+        }
+    }
+
+    @Test(dataProvider = "resolve_yd")
+    public void test_resolve_yd_strict(int y, int d, ThaiBuddhistDate expected, boolean smart, boolean strict) {
+        Map fieldValues = new HashMap<>();
+        fieldValues.put(ChronoField.YEAR, (long) y);
+        fieldValues.put(ChronoField.DAY_OF_YEAR, (long) d);
+        if (strict) {
+            ThaiBuddhistDate date = ThaiBuddhistChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
+            assertEquals(date, expected);
+            assertEquals(fieldValues.size(), 0);
+        } else {
+            try {
+                ThaiBuddhistChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
+                fail("Should have failed");
+            } catch (DateTimeException ex) {
+                // expected
+            }
+        }
+    }
+
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    @DataProvider(name = "resolve_ymaa")
+    Object[][] data_resolve_ymaa() {
+        return new Object[][] {
+                {YDIFF + 2012, 1, 1, -365, date(YDIFF + 2010, 12, 31), false, false},
+                {YDIFF + 2012, 1, 1, -364, date(YDIFF + 2011, 1, 1), false, false},
+                {YDIFF + 2012, 1, 1, -31, date(YDIFF + 2011, 11, 30), false, false},
+                {YDIFF + 2012, 1, 1, -30, date(YDIFF + 2011, 12, 1), false, false},
+                {YDIFF + 2012, 1, 1, -12, date(YDIFF + 2011, 12, 19), false, false},
+                {YDIFF + 2012, 1, 1, 1, date(YDIFF + 2012, 1, 1), true, true},
+                {YDIFF + 2012, 1, 1, 59, date(YDIFF + 2012, 2, 28), false, false},
+                {YDIFF + 2012, 1, 1, 60, date(YDIFF + 2012, 2, 29), false, false},
+                {YDIFF + 2012, 1, 1, 61, date(YDIFF + 2012, 3, 1), false, false},
+                {YDIFF + 2012, 1, 1, 365, date(YDIFF + 2012, 12, 30), false, false},
+                {YDIFF + 2012, 1, 1, 366, date(YDIFF + 2012, 12, 31), false, false},
+                {YDIFF + 2012, 1, 1, 367, date(YDIFF + 2013, 1, 1), false, false},
+                {YDIFF + 2012, 1, 1, 367 + 364, date(YDIFF + 2013, 12, 31), false, false},
+                {YDIFF + 2012, 1, 1, 367 + 365, date(YDIFF + 2014, 1, 1), false, false},
+
+                {YDIFF + 2012, 2, 0, 1, date(YDIFF + 2012, 1, 25), false, false},
+                {YDIFF + 2012, 2, 0, 7, date(YDIFF + 2012, 1, 31), false, false},
+                {YDIFF + 2012, 2, 1, 1, date(YDIFF + 2012, 2, 1), true, true},
+                {YDIFF + 2012, 2, 1, 7, date(YDIFF + 2012, 2, 7), true, true},
+                {YDIFF + 2012, 2, 2, 1, date(YDIFF + 2012, 2, 8), true, true},
+                {YDIFF + 2012, 2, 2, 7, date(YDIFF + 2012, 2, 14), true, true},
+                {YDIFF + 2012, 2, 3, 1, date(YDIFF + 2012, 2, 15), true, true},
+                {YDIFF + 2012, 2, 3, 7, date(YDIFF + 2012, 2, 21), true, true},
+                {YDIFF + 2012, 2, 4, 1, date(YDIFF + 2012, 2, 22), true, true},
+                {YDIFF + 2012, 2, 4, 7, date(YDIFF + 2012, 2, 28), true, true},
+                {YDIFF + 2012, 2, 5, 1, date(YDIFF + 2012, 2, 29), true, true},
+                {YDIFF + 2012, 2, 5, 2, date(YDIFF + 2012, 3, 1), true, false},
+                {YDIFF + 2012, 2, 5, 7, date(YDIFF + 2012, 3, 6), true, false},
+                {YDIFF + 2012, 2, 6, 1, date(YDIFF + 2012, 3, 7), false, false},
+                {YDIFF + 2012, 2, 6, 7, date(YDIFF + 2012, 3, 13), false, false},
+
+                {YDIFF + 2012, 12, 1, 1, date(YDIFF + 2012, 12, 1), true, true},
+                {YDIFF + 2012, 12, 5, 1, date(YDIFF + 2012, 12, 29), true, true},
+                {YDIFF + 2012, 12, 5, 2, date(YDIFF + 2012, 12, 30), true, true},
+                {YDIFF + 2012, 12, 5, 3, date(YDIFF + 2012, 12, 31), true, true},
+                {YDIFF + 2012, 12, 5, 4, date(YDIFF + 2013, 1, 1), true, false},
+                {YDIFF + 2012, 12, 5, 7, date(YDIFF + 2013, 1, 4), true, false},
+
+                {YDIFF + 2012, -12, 1, 1, date(YDIFF + 2010, 12, 1), false, false},
+                {YDIFF + 2012, -11, 1, 1, date(YDIFF + 2011, 1, 1), false, false},
+                {YDIFF + 2012, -1, 1, 1, date(YDIFF + 2011, 11, 1), false, false},
+                {YDIFF + 2012, 0, 1, 1, date(YDIFF + 2011, 12, 1), false, false},
+                {YDIFF + 2012, 1, 1, 1, date(YDIFF + 2012, 1, 1), true, true},
+                {YDIFF + 2012, 12, 1, 1, date(YDIFF + 2012, 12, 1), true, true},
+                {YDIFF + 2012, 13, 1, 1, date(YDIFF + 2013, 1, 1), false, false},
+                {YDIFF + 2012, 24, 1, 1, date(YDIFF + 2013, 12, 1), false, false},
+                {YDIFF + 2012, 25, 1, 1, date(YDIFF + 2014, 1, 1), false, false},
+
+                {YDIFF + 2011, 2, 1, 1, date(YDIFF + 2011, 2, 1), true, true},
+                {YDIFF + 2011, 2, 4, 7, date(YDIFF + 2011, 2, 28), true, true},
+                {YDIFF + 2011, 2, 5, 1, date(YDIFF + 2011, 3, 1), true, false},
+        };
+    }
+
+    @Test(dataProvider = "resolve_ymaa")
+    public void test_resolve_ymaa_lenient(int y, int m, int w, int d, ThaiBuddhistDate expected, boolean smart, boolean strict) {
+        Map fieldValues = new HashMap<>();
+        fieldValues.put(ChronoField.YEAR, (long) y);
+        fieldValues.put(ChronoField.MONTH_OF_YEAR, (long) m);
+        fieldValues.put(ChronoField.ALIGNED_WEEK_OF_MONTH, (long) w);
+        fieldValues.put(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH, (long) d);
+        ThaiBuddhistDate date = ThaiBuddhistChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.LENIENT);
+        assertEquals(date, expected);
+        assertEquals(fieldValues.size(), 0);
+    }
+
+    @Test(dataProvider = "resolve_ymaa")
+    public void test_resolve_ymaa_smart(int y, int m, int w, int d, ThaiBuddhistDate expected, boolean smart, boolean strict) {
+        Map fieldValues = new HashMap<>();
+        fieldValues.put(ChronoField.YEAR, (long) y);
+        fieldValues.put(ChronoField.MONTH_OF_YEAR, (long) m);
+        fieldValues.put(ChronoField.ALIGNED_WEEK_OF_MONTH, (long) w);
+        fieldValues.put(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH, (long) d);
+        if (smart) {
+            ThaiBuddhistDate date = ThaiBuddhistChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
+            assertEquals(date, expected);
+            assertEquals(fieldValues.size(), 0);
+        } else {
+            try {
+                ThaiBuddhistChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.SMART);
+                fail("Should have failed");
+            } catch (DateTimeException ex) {
+                // expected
+            }
+        }
+    }
+
+    @Test(dataProvider = "resolve_ymaa")
+    public void test_resolve_ymaa_strict(int y, int m, int w, int d, ThaiBuddhistDate expected, boolean smart, boolean strict) {
+        Map fieldValues = new HashMap<>();
+        fieldValues.put(ChronoField.YEAR, (long) y);
+        fieldValues.put(ChronoField.MONTH_OF_YEAR, (long) m);
+        fieldValues.put(ChronoField.ALIGNED_WEEK_OF_MONTH, (long) w);
+        fieldValues.put(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH, (long) d);
+        if (strict) {
+            ThaiBuddhistDate date = ThaiBuddhistChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
+            assertEquals(date, expected);
+            assertEquals(fieldValues.size(), 0);
+        } else {
+            try {
+                ThaiBuddhistChronology.INSTANCE.resolveDate(fieldValues, ResolverStyle.STRICT);
+                fail("Should have failed");
+            } catch (DateTimeException ex) {
+                // expected
+            }
+        }
+    }
+
+    //-----------------------------------------------------------------------
+    private static ThaiBuddhistDate date(int y, int m, int d) {
+        return ThaiBuddhistDate.of(y, m, d);
+    }
+
 }
diff --git a/jdk/test/java/time/tck/java/time/format/TCKFormatStyle.java b/jdk/test/java/time/tck/java/time/format/TCKFormatStyle.java
new file mode 100644
index 00000000000..280dd0999de
--- /dev/null
+++ b/jdk/test/java/time/tck/java/time/format/TCKFormatStyle.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * Copyright (c) 2008-2012, Stephen Colebourne & Michael Nascimento Santos
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *  * Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ *  * Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ *  * Neither the name of JSR-310 nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package tck.java.time.format;
+
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+import java.time.format.FormatStyle;
+import java.time.temporal.Temporal;
+
+import static org.testng.Assert.assertEquals;
+
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+/**
+ * Test.
+ */
+@Test
+public class TCKFormatStyle {
+
+    private static final ZoneId ZONEID_PARIS = ZoneId.of("Europe/Paris");
+    private static final ZoneId OFFSET_PTWO = ZoneOffset.of("+02:00");
+
+    //-----------------------------------------------------------------------
+    // valueOf()
+    //-----------------------------------------------------------------------
+    @Test
+    public void test_valueOf() {
+        for (FormatStyle style : FormatStyle.values()) {
+            assertEquals(FormatStyle.valueOf(style.name()), style);
+        }
+    }
+
+    @DataProvider(name="formatStyle")
+    Object[][] data_formatStyle() {
+        return new Object[][] {
+                {ZonedDateTime.of(LocalDateTime.of(2001, 10, 2, 1, 2, 3), ZONEID_PARIS), FormatStyle.FULL, "Tuesday, October 2, 2001 1:02:03 AM CEST Europe/Paris"},
+                {ZonedDateTime.of(LocalDateTime.of(2001, 10, 2, 1, 2, 3), ZONEID_PARIS), FormatStyle.LONG, "October 2, 2001 1:02:03 AM CEST Europe/Paris"},
+                {ZonedDateTime.of(LocalDateTime.of(2001, 10, 2, 1, 2, 3), ZONEID_PARIS), FormatStyle.MEDIUM, "Oct 2, 2001 1:02:03 AM Europe/Paris"},
+                {ZonedDateTime.of(LocalDateTime.of(2001, 10, 2, 1, 2, 3), ZONEID_PARIS), FormatStyle.SHORT, "10/2/01 1:02 AM Europe/Paris"},
+
+                {ZonedDateTime.of(LocalDateTime.of(2001, 10, 2, 1, 2, 3), OFFSET_PTWO), FormatStyle.FULL, "Tuesday, October 2, 2001 1:02:03 AM +02:00 +02:00"},
+                {ZonedDateTime.of(LocalDateTime.of(2001, 10, 2, 1, 2, 3), OFFSET_PTWO), FormatStyle.LONG, "October 2, 2001 1:02:03 AM +02:00 +02:00"},
+                {ZonedDateTime.of(LocalDateTime.of(2001, 10, 2, 1, 2, 3), OFFSET_PTWO), FormatStyle.MEDIUM, "Oct 2, 2001 1:02:03 AM +02:00"},
+                {ZonedDateTime.of(LocalDateTime.of(2001, 10, 2, 1, 2, 3), OFFSET_PTWO), FormatStyle.SHORT, "10/2/01 1:02 AM +02:00"},
+        };
+    }
+
+    @Test(dataProvider = "formatStyle")
+    public void test_formatStyle(Temporal temporal, FormatStyle style, String formattedStr) {
+        DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder();
+        DateTimeFormatter formatter = builder.appendLocalized(style, style).appendLiteral(" ").appendZoneOrOffsetId().toFormatter();
+        assertEquals(formatter.format(temporal), formattedStr);
+    }
+}
diff --git a/jdk/test/java/time/tck/java/time/format/TCKResolverStyle.java b/jdk/test/java/time/tck/java/time/format/TCKResolverStyle.java
new file mode 100644
index 00000000000..ef4bbb24b2d
--- /dev/null
+++ b/jdk/test/java/time/tck/java/time/format/TCKResolverStyle.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * Copyright (c) 2008-2012, Stephen Colebourne & Michael Nascimento Santos
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *  * Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ *  * Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ *  * Neither the name of JSR-310 nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package tck.java.time.format;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import java.time.DateTimeException;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+import java.time.format.ResolverStyle;
+import java.time.temporal.ChronoField;
+import java.time.temporal.TemporalAccessor;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+/**
+ * Test.
+ */
+@Test
+public class TCKResolverStyle {
+
+    //-----------------------------------------------------------------------
+    // valueOf()
+    //-----------------------------------------------------------------------
+    @Test
+    public void test_valueOf() {
+        for (ResolverStyle style : ResolverStyle.values()) {
+            assertEquals(ResolverStyle.valueOf(style.name()), style);
+        }
+    }
+
+    @DataProvider(name="resolverStyle")
+    Object[][] data_resolverStyle() {
+        return new Object[][] {
+                {"2000/15/30", ResolverStyle.LENIENT, null, 2001, 3, 30},
+                {"2000/02/30", ResolverStyle.SMART, null, 2000, 2, 29},
+                {"2000/02/29", ResolverStyle.STRICT, null, 2000, 2, 29},
+
+                {"2000/15/30 CE", ResolverStyle.LENIENT, null, 2001, 3, 30},
+                {"2000/02/30 CE", ResolverStyle.SMART, null, 2000, 2, 29},
+                {"5/02/29 BCE", ResolverStyle.STRICT, null, 5, 2, 29},
+
+                {"4/02/29 BCE", ResolverStyle.STRICT, DateTimeException.class, -1, -1, -1},
+                {"2000/02/30 CE", ResolverStyle.STRICT, DateTimeException.class, -1, -1, -1},
+
+        };
+    }
+
+    @Test(dataProvider = "resolverStyle")
+    public void test_resolverStyle(String str, ResolverStyle style, Class expectedEx, int year, int month, int day) {
+        DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder();
+        builder.appendValue(ChronoField.YEAR_OF_ERA);
+        builder.appendLiteral("/");
+        builder.appendValue(ChronoField.MONTH_OF_YEAR);
+        builder.appendLiteral("/");
+        builder.appendValue(ChronoField.DAY_OF_MONTH);
+
+        Map eraMap = new HashMap();
+        eraMap.put(1L, "CE");
+        eraMap.put(0L, "BCE");
+        DateTimeFormatter optionalFormatter = new DateTimeFormatterBuilder().appendLiteral(" ").appendText(ChronoField.ERA, eraMap).toFormatter();
+
+        DateTimeFormatter formatter = builder.appendOptional(optionalFormatter).toFormatter();
+        formatter = formatter.withResolverStyle(style);
+        if (expectedEx == null) {
+            TemporalAccessor accessor = formatter.parse(str);
+            assertEquals(accessor.get(ChronoField.YEAR_OF_ERA), year);
+            assertEquals(accessor.get(ChronoField.MONTH_OF_YEAR), month);
+            assertEquals(accessor.get(ChronoField.DAY_OF_MONTH), day);
+        } else {
+            try {
+                formatter.parse(str);
+                fail();
+            } catch (Exception ex) {
+                assertTrue(expectedEx.isInstance(ex));
+            }
+        }
+    }
+}
diff --git a/jdk/test/java/time/tck/java/time/format/TCKSignStyle.java b/jdk/test/java/time/tck/java/time/format/TCKSignStyle.java
new file mode 100644
index 00000000000..a6faec3fd83
--- /dev/null
+++ b/jdk/test/java/time/tck/java/time/format/TCKSignStyle.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * Copyright (c) 2008-2012, Stephen Colebourne & Michael Nascimento Santos
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *  * Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ *  * Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ *  * Neither the name of JSR-310 nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package tck.java.time.format;
+
+import java.time.DateTimeException;
+import java.time.LocalDate;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+import java.time.format.SignStyle;
+import java.time.temporal.ChronoField;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+/**
+ * Test.
+ */
+@Test
+public class TCKSignStyle {
+
+    //-----------------------------------------------------------------------
+    // valueOf()
+    //-----------------------------------------------------------------------
+    @Test
+    public void test_valueOf() {
+        for (SignStyle style : SignStyle.values()) {
+            assertEquals(SignStyle.valueOf(style.name()), style);
+        }
+    }
+
+    @DataProvider(name="signStyle")
+    Object[][] data_signStyle() {
+        return new Object[][] {
+                {LocalDate.of(0, 10, 2), SignStyle.ALWAYS, null, "+00"},
+                {LocalDate.of(2001, 10, 2), SignStyle.ALWAYS, null, "+2001"},
+                {LocalDate.of(-2001, 10, 2), SignStyle.ALWAYS, null, "-2001"},
+
+                {LocalDate.of(2001, 10, 2), SignStyle.NORMAL, null, "2001"},
+                {LocalDate.of(-2001, 10, 2), SignStyle.NORMAL, null, "-2001"},
+
+                {LocalDate.of(2001, 10, 2), SignStyle.NEVER, null, "2001"},
+                {LocalDate.of(-2001, 10, 2), SignStyle.NEVER, null, "2001"},
+
+                {LocalDate.of(2001, 10, 2), SignStyle.NOT_NEGATIVE, null, "2001"},
+                {LocalDate.of(-2001, 10, 2), SignStyle.NOT_NEGATIVE, DateTimeException.class, ""},
+
+                {LocalDate.of(0, 10, 2), SignStyle.EXCEEDS_PAD, null, "00"},
+                {LocalDate.of(1, 10, 2), SignStyle.EXCEEDS_PAD, null, "01"},
+                {LocalDate.of(-1, 10, 2), SignStyle.EXCEEDS_PAD, null, "-01"},
+
+                {LocalDate.of(20001, 10, 2), SignStyle.ALWAYS, DateTimeException.class, ""},
+                {LocalDate.of(20001, 10, 2), SignStyle.NORMAL, DateTimeException.class, ""},
+                {LocalDate.of(20001, 10, 2), SignStyle.NEVER, DateTimeException.class, ""},
+                {LocalDate.of(20001, 10, 2), SignStyle.EXCEEDS_PAD, DateTimeException.class, ""},
+                {LocalDate.of(20001, 10, 2), SignStyle.NOT_NEGATIVE, DateTimeException.class, ""},
+        };
+    }
+
+    @Test(dataProvider = "signStyle")
+    public void test_signStyle(LocalDate localDate, SignStyle style, Class expectedEx, String expectedStr) {
+        DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder();
+        DateTimeFormatter formatter = builder.appendValue(ChronoField.YEAR, 2, 4, style)
+                                             .toFormatter();
+        formatter = formatter.withZone(ZoneOffset.UTC);
+        if (expectedEx == null) {
+            String output = formatter.format(localDate);
+            assertEquals(output, expectedStr);
+        } else {
+            try {
+                formatter.format(localDate);
+                fail();
+            } catch (Exception ex) {
+                assertTrue(expectedEx.isInstance(ex));
+            }
+        }
+    }
+
+}
diff --git a/jdk/test/java/time/tck/java/time/format/TCKTextStyle.java b/jdk/test/java/time/tck/java/time/format/TCKTextStyle.java
index 344a8709ca2..68da619751a 100644
--- a/jdk/test/java/time/tck/java/time/format/TCKTextStyle.java
+++ b/jdk/test/java/time/tck/java/time/format/TCKTextStyle.java
@@ -91,4 +91,14 @@ public class TCKTextStyle {
         assertTrue(!TextStyle.NARROW.isStandalone());
     }
 
+    //-----------------------------------------------------------------------
+    // valueOf()
+    //-----------------------------------------------------------------------
+    @Test
+    public void test_valueOf() {
+        for (TextStyle style : TextStyle.values()) {
+            assertEquals(TextStyle.valueOf(style.name()), style);
+        }
+    }
+
 }
diff --git a/jdk/test/java/time/tck/java/time/format/TCKZoneIdPrinterParser.java b/jdk/test/java/time/tck/java/time/format/TCKZoneIdPrinterParser.java
index f6c4c46f2a1..414d390c610 100644
--- a/jdk/test/java/time/tck/java/time/format/TCKZoneIdPrinterParser.java
+++ b/jdk/test/java/time/tck/java/time/format/TCKZoneIdPrinterParser.java
@@ -60,16 +60,20 @@
 package tck.java.time.format;
 
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
 
 import java.text.ParsePosition;
+import java.time.DateTimeException;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatterBuilder;
 import java.time.temporal.TemporalAccessor;
 import java.time.temporal.TemporalQuery;
 import java.util.Locale;
+import java.util.Objects;
 
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.DataProvider;
@@ -148,43 +152,44 @@ public class TCKZoneIdPrinterParser {
     @DataProvider(name="parseSuccess")
     Object[][] data_parseSuccess() {
         return new Object[][] {
-                {"Z", 1, -1, ZoneOffset.UTC},
-                {"UTC", 3, -1, ZoneOffset.UTC},
-                {"UT", 2, -1, ZoneOffset.UTC},
-                {"GMT", 3, -1, ZoneOffset.UTC},
-                {"UTC0", 4, -1, ZoneOffset.UTC},
-                {"UT0", 3, -1, ZoneOffset.UTC},
-                {"GMT0", 4, -1, ZoneOffset.UTC},
+                {"Z", 1, -1, ZoneId.of("Z")},
+                {"UTC", 3, -1, ZoneId.of("UTC")},
+                {"UT", 2, -1, ZoneId.of("UT")},
+                {"GMT", 3, -1, ZoneId.of("GMT")},
 
                 {"+00:00", 6, -1, ZoneOffset.UTC},
-                {"UTC+00:00", 9, -1, ZoneOffset.UTC},
-                {"UT+00:00", 8, -1, ZoneOffset.UTC},
-                {"GMT+00:00", 9, -1, ZoneOffset.UTC},
+                {"UTC+00:00", 9, -1, ZoneId.of("UTC")},
+                {"UT+00:00", 8, -1, ZoneId.of("UT")},
+                {"GMT+00:00", 9, -1, ZoneId.of("GMT")},
                 {"-00:00", 6, -1, ZoneOffset.UTC},
-                {"UTC-00:00", 9, -1, ZoneOffset.UTC},
-                {"UT-00:00", 8, -1, ZoneOffset.UTC},
-                {"GMT-00:00", 9, -1, ZoneOffset.UTC},
+                {"UTC-00:00", 9, -1, ZoneId.of("UTC")},
+                {"UT-00:00", 8, -1, ZoneId.of("UT")},
+                {"GMT-00:00", 9, -1, ZoneId.of("GMT")},
 
                 {"+01:30", 6, -1, ZoneOffset.ofHoursMinutes(1, 30)},
-                {"UTC+01:30", 9, -1, ZoneOffset.ofHoursMinutes(1, 30)},
-                {"UT+02:30", 8, -1, ZoneOffset.ofHoursMinutes(2, 30)},
-                {"GMT+03:30", 9, -1, ZoneOffset.ofHoursMinutes(3, 30)},
+                {"UTC+01:30", 9, -1, ZoneId.of("UTC+01:30")},
+                {"UT+02:30", 8, -1, ZoneId.of("UT+02:30")},
+                {"GMT+03:30", 9, -1, ZoneId.of("GMT+03:30")},
                 {"-01:30", 6, -1, ZoneOffset.ofHoursMinutes(-1, -30)},
-                {"UTC-01:30", 9, -1, ZoneOffset.ofHoursMinutes(-1, -30)},
-                {"UT-02:30", 8, -1, ZoneOffset.ofHoursMinutes(-2, -30)},
-                {"GMT-03:30", 9, -1, ZoneOffset.ofHoursMinutes(-3, -30)},
+                {"UTC-01:30", 9, -1, ZoneId.of("UTC-01:30")},
+                {"UT-02:30", 8, -1, ZoneId.of("UT-02:30")},
+                {"GMT-03:30", 9, -1, ZoneId.of("GMT-03:30")},
 
                 // fallback to UTC
-                {"UTC-01:WW", 3, -1, ZoneOffset.UTC},
-                {"UT-02:WW", 2, -1, ZoneOffset.UTC},
-                {"GMT-03:WW", 3, -1, ZoneOffset.UTC},
+                {"UTC-01:WW", 3, -1, ZoneId.of("UTC")},
+                {"UT-02:WW", 2, -1, ZoneId.of("UT")},
+                {"GMT-03:WW", 3, -1, ZoneId.of("GMT")},
                 {"Z0", 1, -1, ZoneOffset.UTC},
-                {"UTC1", 3, -1, ZoneOffset.UTC},
+                {"UTC1", 3, -1, ZoneId.of("UTC")},
 
                 // Z not parsed as zero
-                {"UTCZ", 3, -1, ZoneOffset.UTC},
-                {"UTZ", 2, -1, ZoneOffset.UTC},
-                {"GMTZ", 3, -1, ZoneOffset.UTC},
+                {"UTCZ", 3, -1, ZoneId.of("UTC")},
+                {"UTZ", 2, -1, ZoneId.of("UT")},
+                {"GMTZ", 3, -1, ZoneId.of("GMT")},
+
+                // 0 not parsed
+                {"UTC0", 3, -1, ZoneId.of("UTC")},
+                {"UT0", 2, -1, ZoneId.of("UT")},
 
                 // fail to parse
                 {"", 0, 0, null},
@@ -206,12 +211,12 @@ public class TCKZoneIdPrinterParser {
     public void test_parseSuccess_plain(String text, int expectedIndex, int expectedErrorIndex, ZoneId expected) {
         builder.appendZoneId();
         TemporalAccessor parsed = builder.toFormatter().parseUnresolved(text, pos);
-        assertEquals(pos.getErrorIndex(), expectedErrorIndex);
-        assertEquals(pos.getIndex(), expectedIndex);
+        assertEquals(pos.getErrorIndex(), expectedErrorIndex, "Incorrect error index parsing: " + text);
+        assertEquals(pos.getIndex(), expectedIndex, "Incorrect index parsing: " + text);
         if (expected != null) {
-            assertEquals(parsed.query(TemporalQuery.zoneId()), expected);
-            assertEquals(parsed.query(TemporalQuery.offset()), null);
-            assertEquals(parsed.query(TemporalQuery.zone()), expected);
+            assertEquals(parsed.query(TemporalQuery.zoneId()), expected, "Incorrect zoneId parsing: " + text);
+            assertEquals(parsed.query(TemporalQuery.offset()), null, "Incorrect offset parsing: " + text);
+            assertEquals(parsed.query(TemporalQuery.zone()), expected, "Incorrect zone parsing: " + text);
         } else {
             assertEquals(parsed, null);
         }
@@ -221,13 +226,14 @@ public class TCKZoneIdPrinterParser {
     public void test_parseSuccess_prefix(String text, int expectedIndex, int expectedErrorIndex, ZoneId expected) {
         builder.appendZoneId();
         pos.setIndex(3);
-        TemporalAccessor parsed = builder.toFormatter().parseUnresolved("XXX" + text, pos);
-        assertEquals(pos.getErrorIndex(), expectedErrorIndex >= 0  ? expectedErrorIndex + 3 : expectedErrorIndex);
-        assertEquals(pos.getIndex(), expectedIndex + 3);
+        String prefixText = "XXX" + text;
+        TemporalAccessor parsed = builder.toFormatter().parseUnresolved(prefixText, pos);
+        assertEquals(pos.getErrorIndex(), expectedErrorIndex >= 0  ? expectedErrorIndex + 3 : expectedErrorIndex, "Incorrect error index parsing: " + prefixText);
+        assertEquals(pos.getIndex(), expectedIndex + 3, "Incorrect index parsing: " + prefixText);
         if (expected != null) {
-            assertEquals(parsed.query(TemporalQuery.zoneId()), expected);
-            assertEquals(parsed.query(TemporalQuery.offset()), null);
-            assertEquals(parsed.query(TemporalQuery.zone()), expected);
+            assertEquals(parsed.query(TemporalQuery.zoneId()), expected, "Incorrect zoneId parsing: " + prefixText);
+            assertEquals(parsed.query(TemporalQuery.offset()), null, "Incorrect offset parsing: " + prefixText);
+            assertEquals(parsed.query(TemporalQuery.zone()), expected, "Incorrect zone parsing: " + prefixText);
         } else {
             assertEquals(parsed, null);
         }
@@ -236,13 +242,14 @@ public class TCKZoneIdPrinterParser {
     @Test(dataProvider="parseSuccess")
     public void test_parseSuccess_suffix(String text, int expectedIndex, int expectedErrorIndex, ZoneId expected) {
         builder.appendZoneId();
-        TemporalAccessor parsed = builder.toFormatter().parseUnresolved(text + "XXX", pos);
-        assertEquals(pos.getErrorIndex(), expectedErrorIndex);
-        assertEquals(pos.getIndex(), expectedIndex);
+        String suffixText = text + "XXX";
+        TemporalAccessor parsed = builder.toFormatter().parseUnresolved(suffixText, pos);
+        assertEquals(pos.getErrorIndex(), expectedErrorIndex, "Incorrect error index parsing: " + suffixText);
+        assertEquals(pos.getIndex(), expectedIndex, "Incorrect index parsing: " + suffixText);
         if (expected != null) {
-            assertEquals(parsed.query(TemporalQuery.zoneId()), expected);
-            assertEquals(parsed.query(TemporalQuery.offset()), null);
-            assertEquals(parsed.query(TemporalQuery.zone()), expected);
+            assertEquals(parsed.query(TemporalQuery.zoneId()), expected, "Incorrect zoneId parsing: " + suffixText);
+            assertEquals(parsed.query(TemporalQuery.offset()), null, "Incorrect offset parsing: " + suffixText);
+            assertEquals(parsed.query(TemporalQuery.zone()), expected, "Incorrect zone parsing: " + suffixText);
         } else {
             assertEquals(parsed, null);
         }
@@ -251,15 +258,16 @@ public class TCKZoneIdPrinterParser {
     @Test(dataProvider="parseSuccess")
     public void test_parseSuccess_caseSensitive(String text, int expectedIndex, int expectedErrorIndex, ZoneId expected) {
         builder.parseCaseSensitive().appendZoneId();
-        TemporalAccessor parsed = builder.toFormatter().parseUnresolved(text.toLowerCase(Locale.ENGLISH), pos);
+        String lcText = text.toLowerCase(Locale.ENGLISH);
+        TemporalAccessor parsed = builder.toFormatter().parseUnresolved(lcText, pos);
         if (text.matches("[^A-Z]*[A-Z].*")) {  // if input has letters
             assertEquals(pos.getErrorIndex() >= 0, true);
             assertEquals(pos.getIndex(), 0);
             assertEquals(parsed, null);
         } else {
             // case sensitive made no difference
-            assertEquals(pos.getIndex(), expectedIndex);
-            assertEquals(pos.getErrorIndex(), expectedErrorIndex);
+            assertEquals(pos.getIndex(), expectedIndex, "Incorrect index parsing: " + lcText);
+            assertEquals(pos.getErrorIndex(), expectedErrorIndex, "Incorrect error index parsing: " + lcText);
             if (expected != null) {
                 assertEquals(parsed.query(TemporalQuery.zoneId()), expected);
                 assertEquals(parsed.query(TemporalQuery.offset()), null);
@@ -273,13 +281,15 @@ public class TCKZoneIdPrinterParser {
     @Test(dataProvider="parseSuccess")
     public void test_parseSuccess_caseInsensitive(String text, int expectedIndex, int expectedErrorIndex, ZoneId expected) {
         builder.parseCaseInsensitive().appendZoneId();
-        TemporalAccessor parsed = builder.toFormatter().parseUnresolved(text.toLowerCase(Locale.ENGLISH), pos);
-        assertEquals(pos.getErrorIndex(), expectedErrorIndex);
-        assertEquals(pos.getIndex(), expectedIndex);
+        String lcText = text.toLowerCase(Locale.ENGLISH);
+        TemporalAccessor parsed = builder.toFormatter().parseUnresolved(lcText, pos);
+        assertEquals(pos.getErrorIndex(), expectedErrorIndex, "Incorrect error index parsing: " + lcText);
+        assertEquals(pos.getIndex(), expectedIndex, "Incorrect index parsing: " + lcText);
         if (expected != null) {
-            assertEquals(parsed.query(TemporalQuery.zoneId()), expected);
-            assertEquals(parsed.query(TemporalQuery.offset()), null);
-            assertEquals(parsed.query(TemporalQuery.zone()), expected);
+            ZoneId zid = parsed.query(TemporalQuery.zoneId());
+            assertEquals(parsed.query(TemporalQuery.zoneId()), expected, "Incorrect zoneId parsing: " + lcText);
+            assertEquals(parsed.query(TemporalQuery.offset()), null, "Incorrect offset parsing: " + lcText);
+            assertEquals(parsed.query(TemporalQuery.zone()), expected, "Incorrect zone parsing: " + lcText);
         } else {
             assertEquals(parsed, null);
         }
diff --git a/jdk/test/java/time/tck/java/time/temporal/TCKChronoField.java b/jdk/test/java/time/tck/java/time/temporal/TCKChronoField.java
new file mode 100644
index 00000000000..1e6c9ea874b
--- /dev/null
+++ b/jdk/test/java/time/tck/java/time/temporal/TCKChronoField.java
@@ -0,0 +1,268 @@
+/*
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * Copyright (c) 2008-2012, Stephen Colebourne & Michael Nascimento Santos
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *  * Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ *  * Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ *  * Neither the name of JSR-310 nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package tck.java.time.temporal;
+
+import static java.time.temporal.ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH;
+import static java.time.temporal.ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR;
+import static java.time.temporal.ChronoField.ALIGNED_WEEK_OF_MONTH;
+import static java.time.temporal.ChronoField.ALIGNED_WEEK_OF_YEAR;
+import static java.time.temporal.ChronoField.AMPM_OF_DAY;
+import static java.time.temporal.ChronoField.CLOCK_HOUR_OF_DAY;
+import static java.time.temporal.ChronoField.CLOCK_HOUR_OF_AMPM;
+import static java.time.temporal.ChronoField.DAY_OF_MONTH;
+import static java.time.temporal.ChronoField.DAY_OF_WEEK;
+import static java.time.temporal.ChronoField.DAY_OF_YEAR;
+import static java.time.temporal.ChronoField.EPOCH_DAY;
+import static java.time.temporal.ChronoField.HOUR_OF_DAY;
+import static java.time.temporal.ChronoField.HOUR_OF_AMPM;
+import static java.time.temporal.ChronoField.MICRO_OF_DAY;
+import static java.time.temporal.ChronoField.MICRO_OF_SECOND;
+import static java.time.temporal.ChronoField.MILLI_OF_DAY;
+import static java.time.temporal.ChronoField.MILLI_OF_SECOND;
+import static java.time.temporal.ChronoField.MINUTE_OF_DAY;
+import static java.time.temporal.ChronoField.MINUTE_OF_HOUR;
+import static java.time.temporal.ChronoField.MONTH_OF_YEAR;
+import static java.time.temporal.ChronoField.NANO_OF_DAY;
+import static java.time.temporal.ChronoField.NANO_OF_SECOND;
+import static java.time.temporal.ChronoField.PROLEPTIC_MONTH;
+import static java.time.temporal.ChronoField.SECOND_OF_DAY;
+import static java.time.temporal.ChronoField.SECOND_OF_MINUTE;
+import static java.time.temporal.ChronoField.YEAR;
+import static java.time.temporal.ChronoField.YEAR_OF_ERA;
+import static java.time.temporal.ChronoField.ERA;
+import static java.time.temporal.ChronoUnit.DAYS;
+import static java.time.temporal.ChronoUnit.FOREVER;
+import static java.time.temporal.ChronoUnit.HOURS;
+import static java.time.temporal.ChronoUnit.MICROS;
+import static java.time.temporal.ChronoUnit.MILLIS;
+import static java.time.temporal.ChronoUnit.MINUTES;
+import static java.time.temporal.ChronoUnit.MONTHS;
+import static java.time.temporal.ChronoUnit.NANOS;
+import static java.time.temporal.ChronoUnit.SECONDS;
+import static java.time.temporal.ChronoUnit.WEEKS;
+import static java.time.temporal.ChronoUnit.YEARS;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.temporal.ChronoField;
+import java.time.temporal.ChronoUnit;
+import java.time.temporal.TemporalAccessor;
+import java.time.temporal.ValueRange;
+
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+/**
+ * Test.
+ */
+@Test
+public class TCKChronoField {
+
+    //-----------------------------------------------------------------------
+    // getBaseUnit() and getRangeUnit()
+    //-----------------------------------------------------------------------
+    @DataProvider(name="fieldUnit")
+    Object[][] data_fieldUnit() {
+        return new Object[][] {
+                {YEAR, YEARS, FOREVER},
+                {MONTH_OF_YEAR, MONTHS, YEARS},
+                {DAY_OF_MONTH, DAYS, MONTHS},
+                {DAY_OF_WEEK, DAYS, WEEKS},
+                {DAY_OF_YEAR, DAYS, YEARS},
+                {HOUR_OF_DAY, HOURS, DAYS},
+                {MINUTE_OF_DAY, MINUTES, DAYS},
+                {MINUTE_OF_HOUR, MINUTES, HOURS},
+                {SECOND_OF_DAY, SECONDS, DAYS},
+                {SECOND_OF_MINUTE, SECONDS, MINUTES},
+                {MILLI_OF_DAY, MILLIS, DAYS},
+                {MILLI_OF_SECOND, MILLIS, SECONDS},
+                {MICRO_OF_SECOND, MICROS, SECONDS},
+                {MICRO_OF_DAY, MICROS, DAYS},
+                {NANO_OF_SECOND, NANOS, SECONDS},
+                {NANO_OF_DAY, NANOS, DAYS},
+
+        };
+    }
+
+    @Test(dataProvider = "fieldUnit")
+    public void test_getBaseUnit(ChronoField field, ChronoUnit baseUnit, ChronoUnit rangeUnit) {
+        assertEquals(field.getBaseUnit(), baseUnit);
+        assertEquals(field.getRangeUnit(), rangeUnit);
+    }
+
+    //-----------------------------------------------------------------------
+    // isDateBased() and isTimeBased()
+    //-----------------------------------------------------------------------
+    @DataProvider(name="fieldBased")
+    Object[][] data_fieldBased() {
+        return new Object[][] {
+                {DAY_OF_WEEK, true, false},
+                {ALIGNED_DAY_OF_WEEK_IN_MONTH, true, false},
+                {ALIGNED_DAY_OF_WEEK_IN_YEAR, true, false},
+                {DAY_OF_MONTH, true, false},
+                {DAY_OF_YEAR, true, false},
+                {EPOCH_DAY, true, false},
+                {ALIGNED_WEEK_OF_MONTH, true, false},
+                {ALIGNED_WEEK_OF_YEAR, true, false},
+                {MONTH_OF_YEAR, true, false},
+                {PROLEPTIC_MONTH, true, false},
+                {YEAR_OF_ERA, true, false},
+                {YEAR, true, false},
+                {ERA, true, false},
+
+                {AMPM_OF_DAY, false, true},
+                {CLOCK_HOUR_OF_DAY, false, true},
+                {HOUR_OF_DAY, false, true},
+                {CLOCK_HOUR_OF_AMPM, false, true},
+                {HOUR_OF_AMPM, false, true},
+                {MINUTE_OF_DAY, false, true},
+                {MINUTE_OF_HOUR, false, true},
+                {SECOND_OF_DAY, false, true},
+                {SECOND_OF_MINUTE, false, true},
+                {MILLI_OF_DAY, false, true},
+                {MILLI_OF_SECOND, false, true},
+                {MICRO_OF_DAY, false, true},
+                {MICRO_OF_SECOND, false, true},
+                {NANO_OF_DAY, false, true},
+                {NANO_OF_SECOND, false, true},
+        };
+    }
+
+    @Test(dataProvider = "fieldBased")
+    public void test_isDateBased(ChronoField field, boolean isDateBased, boolean isTimeBased) {
+        assertEquals(field.isDateBased(), isDateBased);
+        assertEquals(field.isTimeBased(), isTimeBased);
+    }
+
+    //-----------------------------------------------------------------------
+    // isSupportedBy(TemporalAccessor temporal) and getFrom(TemporalAccessor temporal)
+    //-----------------------------------------------------------------------
+    @DataProvider(name="fieldAndAccessor")
+    Object[][] data_fieldAndAccessor() {
+        return new Object[][] {
+                {YEAR, LocalDate.of(2000, 2, 29), true, 2000},
+                {YEAR, LocalDateTime.of(2000, 2, 29, 5, 4, 3, 200), true, 2000},
+                {MONTH_OF_YEAR, LocalDate.of(2000, 2, 29), true, 2},
+                {MONTH_OF_YEAR, LocalDateTime.of(2000, 2, 29, 5, 4, 3, 200), true, 2},
+                {DAY_OF_MONTH, LocalDate.of(2000, 2, 29), true, 29},
+                {DAY_OF_MONTH, LocalDateTime.of(2000, 2, 29, 5, 4, 3, 200), true, 29},
+                {DAY_OF_YEAR, LocalDate.of(2000, 2, 29), true, 60},
+                {DAY_OF_YEAR, LocalDateTime.of(2000, 2, 29, 5, 4, 3, 200), true, 60},
+
+                {HOUR_OF_DAY, LocalTime.of(5, 4, 3, 200), true, 5},
+                {HOUR_OF_DAY, LocalDateTime.of(2000, 2, 29, 5, 4, 3, 200), true, 5},
+
+                {MINUTE_OF_DAY, LocalTime.of(5, 4, 3, 200), true, 5*60 + 4},
+                {MINUTE_OF_DAY, LocalDateTime.of(2000, 2, 29, 5, 4, 3, 200), true, 5*60 + 4},
+                {MINUTE_OF_HOUR, LocalTime.of(5, 4, 3, 200), true, 4},
+                {MINUTE_OF_HOUR, LocalDateTime.of(2000, 2, 29, 5, 4, 3, 200), true, 4},
+
+                {SECOND_OF_DAY, LocalTime.of(5, 4, 3, 200), true, 5*3600 + 4*60 + 3},
+                {SECOND_OF_DAY, LocalDateTime.of(2000, 2, 29, 5, 4, 3, 200), true, 5*3600 + 4*60 + 3},
+                {SECOND_OF_MINUTE, LocalTime.of(5, 4, 3, 200), true, 3},
+                {SECOND_OF_MINUTE, LocalDateTime.of(2000, 2, 29, 5, 4, 3, 200), true, 3},
+
+                {NANO_OF_SECOND, LocalTime.of(5, 4, 3, 200), true, 200},
+                {NANO_OF_SECOND, LocalDateTime.of(2000, 2, 29, 5, 4, 3, 200), true, 200},
+
+                {YEAR, LocalTime.of(5, 4, 3, 200), false, -1},
+                {MONTH_OF_YEAR, LocalTime.of(5, 4, 3, 200), false, -1},
+                {DAY_OF_MONTH, LocalTime.of(5, 4, 3, 200), false, -1},
+                {DAY_OF_YEAR, LocalTime.of(5, 4, 3, 200), false, -1},
+                {HOUR_OF_DAY, LocalDate.of(2000, 2, 29), false, -1},
+                {MINUTE_OF_DAY, LocalDate.of(2000, 2, 29), false, -1},
+                {MINUTE_OF_HOUR, LocalDate.of(2000, 2, 29), false, -1},
+                {SECOND_OF_DAY, LocalDate.of(2000, 2, 29), false, -1},
+                {SECOND_OF_MINUTE, LocalDate.of(2000, 2, 29), false, -1},
+                {NANO_OF_SECOND, LocalDate.of(2000, 2, 29), false, -1},
+        };
+    }
+
+    @Test(dataProvider = "fieldAndAccessor")
+    public void test_supportedAccessor(ChronoField field, TemporalAccessor accessor, boolean isSupported, long value) {
+        assertEquals(field.isSupportedBy(accessor), isSupported);
+        if (isSupported) {
+            assertEquals(field.getFrom(accessor), value);
+        }
+    }
+
+    //-----------------------------------------------------------------------
+    // range() and rangeRefinedBy(TemporalAccessor temporal)
+    //-----------------------------------------------------------------------
+    @Test
+    public void test_range() {
+        assertEquals(MONTH_OF_YEAR.range(), ValueRange.of(1, 12));
+        assertEquals(MONTH_OF_YEAR.rangeRefinedBy(LocalDate.of(2000, 2, 29)), ValueRange.of(1, 12));
+
+        assertEquals(DAY_OF_MONTH.range(), ValueRange.of(1, 28, 31));
+        assertEquals(DAY_OF_MONTH.rangeRefinedBy(LocalDate.of(2000, 2, 29)), ValueRange.of(1, 29));
+    }
+
+    //-----------------------------------------------------------------------
+    // valueOf()
+    //-----------------------------------------------------------------------
+    @Test
+    public void test_valueOf() {
+        for (ChronoField field : ChronoField.values()) {
+            assertEquals(ChronoField.valueOf(field.name()), field);
+        }
+    }
+}
diff --git a/jdk/test/java/time/tck/java/time/temporal/TCKChronoUnit.java b/jdk/test/java/time/tck/java/time/temporal/TCKChronoUnit.java
new file mode 100644
index 00000000000..a117030dda1
--- /dev/null
+++ b/jdk/test/java/time/tck/java/time/temporal/TCKChronoUnit.java
@@ -0,0 +1,187 @@
+/*
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * Copyright (c) 2008-2012, Stephen Colebourne & Michael Nascimento Santos
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *  * Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ *  * Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ *  * Neither the name of JSR-310 nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package tck.java.time.temporal;
+
+import static java.time.temporal.ChronoUnit.CENTURIES;
+import static java.time.temporal.ChronoUnit.DAYS;
+import static java.time.temporal.ChronoUnit.DECADES;
+import static java.time.temporal.ChronoUnit.ERAS;
+import static java.time.temporal.ChronoUnit.FOREVER;
+import static java.time.temporal.ChronoUnit.HALF_DAYS;
+import static java.time.temporal.ChronoUnit.HOURS;
+import static java.time.temporal.ChronoUnit.MICROS;
+import static java.time.temporal.ChronoUnit.MILLENNIA;
+import static java.time.temporal.ChronoUnit.MILLIS;
+import static java.time.temporal.ChronoUnit.MINUTES;
+import static java.time.temporal.ChronoUnit.MONTHS;
+import static java.time.temporal.ChronoUnit.NANOS;
+import static java.time.temporal.ChronoUnit.SECONDS;
+import static java.time.temporal.ChronoUnit.WEEKS;
+import static java.time.temporal.ChronoUnit.YEARS;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.time.temporal.ChronoField;
+import java.time.temporal.ChronoUnit;
+import java.time.temporal.Temporal;
+import java.time.temporal.TemporalAccessor;
+
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+/**
+ * Test.
+ */
+@Test
+public class TCKChronoUnit {
+
+    //-----------------------------------------------------------------------
+    // isDateBased(), isTimeBased() and isDurationEstimated()
+    //-----------------------------------------------------------------------
+    @DataProvider(name="chronoUnit")
+    Object[][] data_chronoUnit() {
+        return new Object[][] {
+                {FOREVER, false, false, true},
+                {ERAS, true, false, true},
+                {MILLENNIA, true, false, true},
+                {CENTURIES, true, false, true},
+                {DECADES, true, false, true},
+                {YEARS, true, false, true},
+                {MONTHS, true, false, true},
+                {WEEKS, true, false, true},
+                {DAYS, true, false, true},
+
+                {HALF_DAYS, false, true, false},
+                {HOURS, false, true, false},
+                {MINUTES, false, true, false},
+                {SECONDS, false, true, false},
+                {MICROS, false, true, false},
+                {MILLIS, false, true, false},
+                {NANOS, false, true, false},
+
+        };
+    }
+
+    @Test(dataProvider = "chronoUnit")
+    public void test_unitType(ChronoUnit unit, boolean isDateBased, boolean isTimeBased, boolean isDurationEstimated) {
+        assertEquals(unit.isDateBased(), isDateBased);
+        assertEquals(unit.isTimeBased(), isTimeBased);
+        assertEquals(unit.isDurationEstimated(), isDurationEstimated);
+    }
+
+    //-----------------------------------------------------------------------
+    // isSupportedBy(), addTo() and between()
+    //-----------------------------------------------------------------------
+    @DataProvider(name="unitAndTemporal")
+    Object[][] data_unitAndTemporal() {
+        return new Object[][] {
+                {CENTURIES, LocalDate.of(2000, 1, 10), true, 1, LocalDate.of(2100, 1, 10)},
+                {DECADES, LocalDate.of(2000, 1, 10), true, 1, LocalDate.of(2010, 1, 10)},
+                {YEARS, LocalDate.of(2000, 1, 10), true, 1, LocalDate.of(2001, 1, 10)},
+                {MONTHS, LocalDate.of(2000, 1, 10), true, 1, LocalDate.of(2000, 2, 10)},
+                {WEEKS, LocalDate.of(2000, 1, 10), true, 1, LocalDate.of(2000, 1, 17)},
+                {DAYS, LocalDate.of(2000, 1, 10), true, 1, LocalDate.of(2000, 1, 11)},
+
+                {HALF_DAYS, LocalTime.of(1, 2, 3, 400), true, 1, LocalTime.of(13, 2, 3, 400)},
+                {HOURS, LocalTime.of(1, 2, 3, 400), true, 1, LocalTime.of(2, 2, 3, 400)},
+                {MINUTES, LocalTime.of(1, 2, 3, 400), true, 1, LocalTime.of(1, 3, 3, 400)},
+                {SECONDS, LocalTime.of(1, 2, 3, 400), true, 1, LocalTime.of(1, 2, 4, 400)},
+                {MICROS, LocalTime.of(1, 2, 3, 400), true, 1, LocalTime.of(1, 2, 3, 1000 + 400)},
+                {MILLIS, LocalTime.of(1, 2, 3, 400), true, 1, LocalTime.of(1, 2, 3, 1000*1000 + 400)},
+                {NANOS, LocalTime.of(1, 2, 3, 400), true, 1, LocalTime.of(1, 2, 3, 1 + 400)},
+
+                {CENTURIES, LocalTime.of(1, 2, 3, 400), false, 1, null},
+                {DECADES, LocalTime.of(1, 2, 3, 400), false, 1, null},
+                {YEARS, LocalTime.of(1, 2, 3, 400), false, 1, null},
+                {MONTHS, LocalTime.of(1, 2, 3, 400), false, 1, null},
+                {WEEKS, LocalTime.of(1, 2, 3, 400), false, 1, null},
+                {DAYS, LocalTime.of(1, 2, 3, 400), false, 1, null},
+
+                {HALF_DAYS, LocalDate.of(2000, 2, 29), false, 1, null},
+                {HOURS, LocalDate.of(2000, 2, 29), false, 1, null},
+                {MINUTES, LocalDate.of(2000, 2, 29), false, 1, null},
+                {SECONDS, LocalDate.of(2000, 2, 29), false, 1, null},
+                {MICROS, LocalDate.of(2000, 2, 29), false, 1, null},
+                {MILLIS, LocalDate.of(2000, 2, 29), false, 1, null},
+                {NANOS, LocalDate.of(2000, 2, 29), false, 1, null},
+
+        };
+    }
+
+    @Test(dataProvider = "unitAndTemporal")
+    public void test_unitAndTemporal(ChronoUnit unit, Temporal base, boolean isSupportedBy, long amount,  Temporal target) {
+        assertEquals(unit.isSupportedBy(base), isSupportedBy);
+        if (isSupportedBy) {
+            Temporal result = unit.addTo(base, amount);
+            assertEquals(result, target);
+            assertEquals(unit.between(base, result), amount);
+        }
+    }
+
+    //-----------------------------------------------------------------------
+    // valueOf()
+    //-----------------------------------------------------------------------
+    @Test
+    public void test_valueOf() {
+        for (ChronoUnit unit : ChronoUnit.values()) {
+            assertEquals(ChronoUnit.valueOf(unit.name()), unit);
+        }
+    }
+}
diff --git a/jdk/test/java/time/tck/java/time/temporal/TCKWeekFields.java b/jdk/test/java/time/tck/java/time/temporal/TCKWeekFields.java
index ccb1a4ca7b9..4367ee92511 100644
--- a/jdk/test/java/time/tck/java/time/temporal/TCKWeekFields.java
+++ b/jdk/test/java/time/tck/java/time/temporal/TCKWeekFields.java
@@ -56,16 +56,22 @@
  */
 package tck.java.time.temporal;
 
+import static java.time.format.ResolverStyle.LENIENT;
+import static java.time.format.ResolverStyle.SMART;
+import static java.time.format.ResolverStyle.STRICT;
 import static java.time.temporal.ChronoField.DAY_OF_MONTH;
 import static java.time.temporal.ChronoField.DAY_OF_WEEK;
 import static java.time.temporal.ChronoField.DAY_OF_YEAR;
 import static java.time.temporal.ChronoField.MONTH_OF_YEAR;
 import static java.time.temporal.ChronoField.YEAR;
-
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotEquals;
 import static org.testng.Assert.assertSame;
+import static org.testng.Assert.assertTrue;
 
 import java.io.IOException;
+import java.time.DateTimeException;
 import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
@@ -376,14 +382,13 @@ public class TCKWeekFields extends AbstractTCKTest {
         TemporalField womField = week.weekOfMonth();
 
         for (int i = 1; i <= 60; i++) {
-            // Test that with dayOfWeek and Week of month it computes the date
             DateTimeFormatter f = new DateTimeFormatterBuilder()
-                    .appendValue(YEAR).appendLiteral('-')
-                    .appendValue(MONTH_OF_YEAR).appendLiteral('-')
-                    .appendValue(womField).appendLiteral('-')
-                    .appendValue(DAY_OF_WEEK).toFormatter();
-            String str = date.getYear() + "-" + date.getMonthValue() + "-" +
-                    date.get(womField) + "-" + date.get(DAY_OF_WEEK);
+                    .appendValue(YEAR).appendLiteral(':')
+                    .appendValue(MONTH_OF_YEAR).appendLiteral(':')
+                    .appendValue(womField).appendLiteral(':')
+                    .appendValue(DAY_OF_WEEK).toFormatter().withResolverStyle(SMART);
+            String str = date.getYear() + ":" + date.getMonthValue() + ":" +
+                    date.get(womField) + ":" + date.get(DAY_OF_WEEK);
             LocalDate parsed = LocalDate.parse(str, f);
             assertEquals(parsed, date, " ::" + str + "::" + i);
 
@@ -391,6 +396,52 @@ public class TCKWeekFields extends AbstractTCKTest {
         }
     }
 
+    @Test(dataProvider="weekFields")
+    public void test_parse_resolve_localizedWom_lenient(DayOfWeek firstDayOfWeek, int minDays) {
+        LocalDate date = LocalDate.of(2012, 12, 15);
+        WeekFields week = WeekFields.of(firstDayOfWeek, minDays);
+        TemporalField womField = week.weekOfMonth();
+
+        for (int i = 1; i <= 60; i++) {
+            DateTimeFormatter f = new DateTimeFormatterBuilder()
+                    .appendValue(YEAR).appendLiteral(':')
+                    .appendValue(MONTH_OF_YEAR).appendLiteral(':')
+                    .appendValue(womField).appendLiteral(':')
+                    .appendValue(DAY_OF_WEEK).toFormatter().withResolverStyle(LENIENT);
+            int wom = date.get(womField);
+            int dow = date.get(DAY_OF_WEEK);
+            for (int j = wom - 10; j < wom + 10; j++) {
+                String str = date.getYear() + ":" + date.getMonthValue() + ":" + j + ":" + dow;
+                LocalDate parsed = LocalDate.parse(str, f);
+                assertEquals(parsed, date.plusWeeks(j - wom), " ::" + str + ": :" + i + "::" + j);
+            }
+
+            date = date.plusDays(1);
+        }
+    }
+
+    @Test(dataProvider="weekFields")
+    public void test_parse_resolve_localizedWom_strict(DayOfWeek firstDayOfWeek, int minDays) {
+        WeekFields week = WeekFields.of(firstDayOfWeek, minDays);
+        TemporalField womField = week.weekOfMonth();
+        DateTimeFormatter f = new DateTimeFormatterBuilder()
+                .appendValue(YEAR).appendLiteral(':')
+                .appendValue(MONTH_OF_YEAR).appendLiteral(':')
+                .appendValue(womField).appendLiteral(':')
+                .appendValue(DAY_OF_WEEK).toFormatter().withResolverStyle(STRICT);
+        String str = "2012:1:0:1";
+        try {
+            LocalDate date = LocalDate.parse(str, f);
+            assertEquals(date.getYear(), 2012);
+            assertEquals(date.getMonthValue(), 1);
+            assertEquals(date.get(womField), 0);
+            assertEquals(date.get(DAY_OF_WEEK), 1);
+        } catch (DateTimeException ex) {
+            // expected
+        }
+    }
+
+    //-----------------------------------------------------------------------
     @Test(dataProvider="weekFields")
     public void test_parse_resolve_localizedWomDow(DayOfWeek firstDayOfWeek, int minDays) {
         LocalDate date = LocalDate.of(2012, 12, 15);
@@ -399,14 +450,13 @@ public class TCKWeekFields extends AbstractTCKTest {
         TemporalField womField = week.weekOfMonth();
 
         for (int i = 1; i <= 15; i++) {
-            // Test that with dayOfWeek and Week of month it computes the date
             DateTimeFormatter f = new DateTimeFormatterBuilder()
-                    .appendValue(YEAR).appendLiteral('-')
-                    .appendValue(MONTH_OF_YEAR).appendLiteral('-')
-                    .appendValue(womField).appendLiteral('-')
+                    .appendValue(YEAR).appendLiteral(':')
+                    .appendValue(MONTH_OF_YEAR).appendLiteral(':')
+                    .appendValue(womField).appendLiteral(':')
                     .appendValue(dowField).toFormatter();
-            String str = date.getYear() + "-" + date.getMonthValue() + "-" +
-                    date.get(womField) + "-" + date.get(dowField);
+            String str = date.getYear() + ":" + date.getMonthValue() + ":" +
+                    date.get(womField) + ":" + date.get(dowField);
             LocalDate parsed = LocalDate.parse(str, f);
             assertEquals(parsed, date, " :: " + str + " " + i);
 
@@ -414,6 +464,32 @@ public class TCKWeekFields extends AbstractTCKTest {
         }
     }
 
+    @Test(dataProvider="weekFields")
+    public void test_parse_resolve_localizedWomDow_lenient(DayOfWeek firstDayOfWeek, int minDays) {
+        LocalDate date = LocalDate.of(2012, 12, 15);
+        WeekFields week = WeekFields.of(firstDayOfWeek, minDays);
+        TemporalField dowField = week.dayOfWeek();
+        TemporalField womField = week.weekOfMonth();
+
+        for (int i = 1; i <= 60; i++) {
+            DateTimeFormatter f = new DateTimeFormatterBuilder()
+                    .appendValue(YEAR).appendLiteral(':')
+                    .appendValue(MONTH_OF_YEAR).appendLiteral(':')
+                    .appendValue(womField).appendLiteral(':')
+                    .appendValue(dowField).toFormatter().withResolverStyle(LENIENT);
+            int wom = date.get(womField);
+            int dow = date.get(dowField);
+            for (int j = wom - 10; j < wom + 10; j++) {
+                String str = date.getYear() + ":" + date.getMonthValue() + ":" + j + ":" + dow;
+                LocalDate parsed = LocalDate.parse(str, f);
+                assertEquals(parsed, date.plusWeeks(j - wom), " ::" + str + ": :" + i + "::" + j);
+            }
+
+            date = date.plusDays(1);
+        }
+    }
+
+    //-----------------------------------------------------------------------
     @Test(dataProvider="weekFields")
     public void test_parse_resolve_localizedWoy(DayOfWeek firstDayOfWeek, int minDays) {
         LocalDate date = LocalDate.of(2012, 12, 15);
@@ -421,14 +497,12 @@ public class TCKWeekFields extends AbstractTCKTest {
         TemporalField woyField = week.weekOfYear();
 
         for (int i = 1; i <= 60; i++) {
-            // Test that with dayOfWeek and Week of month it computes the date
             DateTimeFormatter f = new DateTimeFormatterBuilder()
-                    .appendValue(YEAR).appendLiteral('-')
-                    .appendValue(MONTH_OF_YEAR).appendLiteral('-')
-                    .appendValue(woyField).appendLiteral('-')
+                    .appendValue(YEAR).appendLiteral(':')
+                    .appendValue(woyField).appendLiteral(':')
                     .appendValue(DAY_OF_WEEK).toFormatter();
-            String str = date.getYear() + "-" + date.getMonthValue() + "-" +
-                    date.get(woyField) + "-" + date.get(DAY_OF_WEEK);
+            String str = date.getYear() + ":" +
+                    date.get(woyField) + ":" + date.get(DAY_OF_WEEK);
             LocalDate parsed = LocalDate.parse(str, f);
             assertEquals(parsed, date, " :: " + str + " " + i);
 
@@ -436,6 +510,49 @@ public class TCKWeekFields extends AbstractTCKTest {
         }
     }
 
+    @Test(dataProvider="weekFields")
+    public void test_parse_resolve_localizedWoy_lenient(DayOfWeek firstDayOfWeek, int minDays) {
+        LocalDate date = LocalDate.of(2012, 12, 15);
+        WeekFields week = WeekFields.of(firstDayOfWeek, minDays);
+        TemporalField woyField = week.weekOfYear();
+
+        for (int i = 1; i <= 60; i++) {
+            DateTimeFormatter f = new DateTimeFormatterBuilder()
+                    .appendValue(YEAR).appendLiteral(':')
+                    .appendValue(woyField).appendLiteral(':')
+                    .appendValue(DAY_OF_WEEK).toFormatter().withResolverStyle(LENIENT);
+            int woy = date.get(woyField);
+            int dow = date.get(DAY_OF_WEEK);
+            for (int j = woy - 60; j < woy + 60; j++) {
+                String str = date.getYear() + ":" + j + ":" + dow;
+                LocalDate parsed = LocalDate.parse(str, f);
+                assertEquals(parsed, date.plusWeeks(j - woy), " ::" + str + ": :" + i + "::" + j);
+            }
+
+            date = date.plusDays(1);
+        }
+    }
+
+    @Test(dataProvider="weekFields")
+    public void test_parse_resolve_localizedWoy_strict(DayOfWeek firstDayOfWeek, int minDays) {
+        WeekFields week = WeekFields.of(firstDayOfWeek, minDays);
+        TemporalField woyField = week.weekOfYear();
+        DateTimeFormatter f = new DateTimeFormatterBuilder()
+                .appendValue(YEAR).appendLiteral(':')
+                .appendValue(woyField).appendLiteral(':')
+                .appendValue(DAY_OF_WEEK).toFormatter().withResolverStyle(STRICT);
+        String str = "2012:0:1";
+        try {
+            LocalDate date = LocalDate.parse(str, f);
+            assertEquals(date.getYear(), 2012);
+            assertEquals(date.get(woyField), 0);
+            assertEquals(date.get(DAY_OF_WEEK), 1);
+        } catch (DateTimeException ex) {
+            // expected
+        }
+    }
+
+    //-----------------------------------------------------------------------
     @Test(dataProvider="weekFields")
     public void test_parse_resolve_localizedWoyDow(DayOfWeek firstDayOfWeek, int minDays) {
         LocalDate date = LocalDate.of(2012, 12, 15);
@@ -444,14 +561,13 @@ public class TCKWeekFields extends AbstractTCKTest {
         TemporalField woyField = week.weekOfYear();
 
         for (int i = 1; i <= 60; i++) {
-            // Test that with dayOfWeek and Week of month it computes the date
             DateTimeFormatter f = new DateTimeFormatterBuilder()
-                    .appendValue(YEAR).appendLiteral('-')
-                    .appendValue(MONTH_OF_YEAR).appendLiteral('-')
-                    .appendValue(woyField).appendLiteral('-')
+                    .appendValue(YEAR).appendLiteral(':')
+                    .appendValue(MONTH_OF_YEAR).appendLiteral(':')
+                    .appendValue(woyField).appendLiteral(':')
                     .appendValue(dowField).toFormatter();
-            String str = date.getYear() + "-" + date.getMonthValue() + "-" +
-                    date.get(woyField) + "-" + date.get(dowField);
+            String str = date.getYear() + ":" + date.getMonthValue() + ":" +
+                    date.get(woyField) + ":" + date.get(dowField);
             LocalDate parsed = LocalDate.parse(str, f);
             assertEquals(parsed, date, " :: " + str + " " + i);
 
@@ -459,6 +575,31 @@ public class TCKWeekFields extends AbstractTCKTest {
         }
     }
 
+    @Test(dataProvider="weekFields")
+    public void test_parse_resolve_localizedWoyDow_lenient(DayOfWeek firstDayOfWeek, int minDays) {
+        LocalDate date = LocalDate.of(2012, 12, 15);
+        WeekFields week = WeekFields.of(firstDayOfWeek, minDays);
+        TemporalField dowField = week.dayOfWeek();
+        TemporalField woyField = week.weekOfYear();
+
+        for (int i = 1; i <= 60; i++) {
+            DateTimeFormatter f = new DateTimeFormatterBuilder()
+                    .appendValue(YEAR).appendLiteral(':')
+                    .appendValue(woyField).appendLiteral(':')
+                    .appendValue(dowField).toFormatter().withResolverStyle(LENIENT);
+            int woy = date.get(woyField);
+            int dow = date.get(dowField);
+            for (int j = woy - 60; j < woy + 60; j++) {
+                String str = date.getYear() + ":" + j + ":" + dow;
+                LocalDate parsed = LocalDate.parse(str, f);
+                assertEquals(parsed, date.plusWeeks(j - woy), " ::" + str + ": :" + i + "::" + j);
+            }
+
+            date = date.plusDays(1);
+        }
+    }
+
+    //-----------------------------------------------------------------------
     @Test(dataProvider="weekFields")
     public void test_parse_resolve_localizedWoWBY(DayOfWeek firstDayOfWeek, int minDays) {
         LocalDate date = LocalDate.of(2012, 12, 31);
@@ -467,12 +608,11 @@ public class TCKWeekFields extends AbstractTCKTest {
         TemporalField yowbyField = week.weekBasedYear();
 
         for (int i = 1; i <= 60; i++) {
-            // Test that with dayOfWeek, week of year and year of week-based-year it computes the date
             DateTimeFormatter f = new DateTimeFormatterBuilder()
-                    .appendValue(yowbyField).appendLiteral('-')
-                    .appendValue(wowbyField).appendLiteral('-')
+                    .appendValue(yowbyField).appendLiteral(':')
+                    .appendValue(wowbyField).appendLiteral(':')
                     .appendValue(DAY_OF_WEEK).toFormatter();
-            String str = date.get(yowbyField) + "-" + date.get(wowbyField) + "-" +
+            String str = date.get(yowbyField) + ":" + date.get(wowbyField) + ":" +
                     date.get(DAY_OF_WEEK);
             LocalDate parsed = LocalDate.parse(str, f);
             assertEquals(parsed, date, " :: " + str + " " + i);
@@ -481,6 +621,51 @@ public class TCKWeekFields extends AbstractTCKTest {
         }
     }
 
+    @Test(dataProvider="weekFields")
+    public void test_parse_resolve_localizedWoWBY_lenient(DayOfWeek firstDayOfWeek, int minDays) {
+        LocalDate date = LocalDate.of(2012, 12, 31);
+        WeekFields week = WeekFields.of(firstDayOfWeek, minDays);
+        TemporalField wowbyField = week.weekOfWeekBasedYear();
+        TemporalField yowbyField = week.weekBasedYear();
+
+        for (int i = 1; i <= 60; i++) {
+            DateTimeFormatter f = new DateTimeFormatterBuilder()
+                    .appendValue(yowbyField).appendLiteral(':')
+                    .appendValue(wowbyField).appendLiteral(':')
+                    .appendValue(DAY_OF_WEEK).toFormatter().withResolverStyle(LENIENT);
+            int wowby = date.get(wowbyField);
+            int dow = date.get(DAY_OF_WEEK);
+            for (int j = wowby - 60; j < wowby + 60; j++) {
+                String str = date.get(yowbyField) + ":" + j + ":" + dow;
+                LocalDate parsed = LocalDate.parse(str, f);
+                assertEquals(parsed, date.plusWeeks(j - wowby), " ::" + str + ": :" + i + "::" + j);
+            }
+
+            date = date.plusDays(1);
+        }
+    }
+
+    @Test(dataProvider="weekFields")
+    public void test_parse_resolve_localizedWoWBY_strict(DayOfWeek firstDayOfWeek, int minDays) {
+        WeekFields week = WeekFields.of(firstDayOfWeek, minDays);
+        TemporalField wowbyField = week.weekOfWeekBasedYear();
+        TemporalField yowbyField = week.weekBasedYear();
+        DateTimeFormatter f = new DateTimeFormatterBuilder()
+                .appendValue(yowbyField).appendLiteral(':')
+                .appendValue(wowbyField).appendLiteral(':')
+                .appendValue(DAY_OF_WEEK).toFormatter().withResolverStyle(STRICT);
+        String str = "2012:0:1";
+        try {
+            LocalDate date = LocalDate.parse(str, f);
+            assertEquals(date.get(yowbyField), 2012);
+            assertEquals(date.get(wowbyField), 0);
+            assertEquals(date.get(DAY_OF_WEEK), 1);
+        } catch (DateTimeException ex) {
+            // expected
+        }
+    }
+
+    //-----------------------------------------------------------------------
     @Test(dataProvider="weekFields")
     public void test_parse_resolve_localizedWoWBYDow(DayOfWeek firstDayOfWeek, int minDays) {
         LocalDate date = LocalDate.of(2012, 12, 31);
@@ -490,12 +675,11 @@ public class TCKWeekFields extends AbstractTCKTest {
         TemporalField yowbyField = week.weekBasedYear();
 
         for (int i = 1; i <= 60; i++) {
-            // Test that with dayOfWeek, week of year and year of week-based-year it computes the date
             DateTimeFormatter f = new DateTimeFormatterBuilder()
-                    .appendValue(yowbyField).appendLiteral('-')
-                    .appendValue(wowbyField).appendLiteral('-')
+                    .appendValue(yowbyField).appendLiteral(':')
+                    .appendValue(wowbyField).appendLiteral(':')
                     .appendValue(dowField).toFormatter();
-            String str = date.get(yowbyField) + "-" + date.get(wowbyField) + "-" +
+            String str = date.get(yowbyField) + ":" + date.get(wowbyField) + ":" +
                     date.get(dowField);
             LocalDate parsed = LocalDate.parse(str, f);
             assertEquals(parsed, date, " :: " + str + " " + i);
@@ -504,6 +688,31 @@ public class TCKWeekFields extends AbstractTCKTest {
         }
     }
 
+    @Test(dataProvider="weekFields")
+    public void test_parse_resolve_localizedWoWBYDow_lenient(DayOfWeek firstDayOfWeek, int minDays) {
+        LocalDate date = LocalDate.of(2012, 12, 31);
+        WeekFields week = WeekFields.of(firstDayOfWeek, minDays);
+        TemporalField dowField = week.dayOfWeek();
+        TemporalField wowbyField = week.weekOfWeekBasedYear();
+        TemporalField yowbyField = week.weekBasedYear();
+
+        for (int i = 1; i <= 60; i++) {
+            DateTimeFormatter f = new DateTimeFormatterBuilder()
+                    .appendValue(yowbyField).appendLiteral(':')
+                    .appendValue(wowbyField).appendLiteral(':')
+                    .appendValue(dowField).toFormatter().withResolverStyle(LENIENT);
+            int wowby = date.get(wowbyField);
+            int dow = date.get(dowField);
+            for (int j = wowby - 60; j < wowby + 60; j++) {
+                String str = date.get(yowbyField) + ":" + j + ":" + dow;
+                LocalDate parsed = LocalDate.parse(str, f);
+                assertEquals(parsed, date.plusWeeks(j - wowby), " ::" + str + ": :" + i + "::" + j);
+            }
+
+            date = date.plusDays(1);
+        }
+    }
+
     //-----------------------------------------------------------------------
     @Test(dataProvider="weekFields")
     public void test_serializable_singleton(DayOfWeek firstDayOfWeek, int minDays) throws IOException, ClassNotFoundException {
@@ -587,4 +796,21 @@ public class TCKWeekFields extends AbstractTCKTest {
         assertEquals(date.get(yowbyField), wby);
     }
 
+    //-----------------------------------------------------------------------
+    // equals() and hashCode().
+    //-----------------------------------------------------------------------
+    @Test
+    public void test_equals() {
+        WeekFields weekDef_iso = WeekFields.ISO;
+        WeekFields weekDef_sundayStart = WeekFields.SUNDAY_START;
+
+        assertTrue(weekDef_iso.equals(WeekFields.of(DayOfWeek.MONDAY, 4)));
+        assertTrue(weekDef_sundayStart.equals(WeekFields.of(DayOfWeek.SUNDAY, 1)));
+        assertEquals(weekDef_iso.hashCode(), WeekFields.of(DayOfWeek.MONDAY, 4).hashCode());
+        assertEquals(weekDef_sundayStart.hashCode(), WeekFields.of(DayOfWeek.SUNDAY, 1).hashCode());
+
+        assertFalse(weekDef_iso.equals(weekDef_sundayStart));
+        assertNotEquals(weekDef_iso.hashCode(), weekDef_sundayStart.hashCode());
+    }
+
 }
diff --git a/jdk/test/java/time/tck/java/time/zone/TCKZoneRules.java b/jdk/test/java/time/tck/java/time/zone/TCKZoneRules.java
index 4cc630d50be..af07063ebe7 100644
--- a/jdk/test/java/time/tck/java/time/zone/TCKZoneRules.java
+++ b/jdk/test/java/time/tck/java/time/zone/TCKZoneRules.java
@@ -75,6 +75,7 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.Month;
+import java.time.OffsetDateTime;
 import java.time.Year;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
@@ -83,6 +84,7 @@ import java.time.zone.ZoneOffsetTransition;
 import java.time.zone.ZoneOffsetTransitionRule;
 import java.time.zone.ZoneOffsetTransitionRule.TimeDefinition;
 import java.time.zone.ZoneRules;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
@@ -918,6 +920,65 @@ public class TCKZoneRules {
         assertEquals(test.nextTransition(last.getInstant()), null);
     }
 
+    //-----------------------------------------------------------------------
+    // Apia
+    //-----------------------------------------------------------------------
+    private ZoneRules pacificApia() {
+        return ZoneId.of("Pacific/Apia").getRules();
+    }
+
+    public void test_Apia_nextTransition_historic() {
+        ZoneRules test = pacificApia();
+        List trans = test.getTransitions();
+
+        ZoneOffsetTransition first = trans.get(0);
+        assertEquals(test.nextTransition(first.getInstant().minusNanos(1)), first);
+
+        for (int i = 0; i < trans.size() - 1; i++) {
+            ZoneOffsetTransition cur = trans.get(i);
+            ZoneOffsetTransition next = trans.get(i + 1);
+
+            assertEquals(test.nextTransition(cur.getInstant()), next);
+            assertEquals(test.nextTransition(next.getInstant().minusNanos(1)), next);
+        }
+    }
+
+    public void test_Apia_jumpOverInternationalDateLine_M10_to_P14() {
+        // transition occurred at 2011-12-30T00:00-10:00
+        ZoneRules test = pacificApia();
+        Instant instantBefore = LocalDate.of(2011, 12, 27).atStartOfDay(ZoneOffset.UTC).toInstant();
+        ZoneOffsetTransition trans = test.nextTransition(instantBefore);
+        assertEquals(trans.getDateTimeBefore(), LocalDateTime.of(2011, 12, 30, 0, 0));
+        assertEquals(trans.getDateTimeAfter(), LocalDateTime.of(2011, 12, 31, 0, 0));
+        assertEquals(trans.isGap(), true);
+        assertEquals(trans.isOverlap(), false);
+        assertEquals(trans.isValidOffset(ZoneOffset.ofHours(-10)), false);
+        assertEquals(trans.isValidOffset(ZoneOffset.ofHours(+14)), false);
+        assertEquals(trans.getDuration(), Duration.ofHours(24));
+        assertEquals(trans.getInstant(), LocalDateTime.of(2011, 12, 31, 0, 0).toInstant(ZoneOffset.ofHours(+14)));
+
+        ZonedDateTime zdt = ZonedDateTime.of(2011, 12, 29, 23, 0, 0, 0, ZoneId.of("Pacific/Apia"));
+        assertEquals(zdt.plusHours(2).toLocalDateTime(), LocalDateTime.of(2011, 12, 31, 1, 0));
+    }
+
+    public void test_Apia_jumpForwardOverInternationalDateLine_P12_to_M12() {
+        // transition occurred at 1879-07-04T00:00+12:33:04
+        ZoneRules test = pacificApia();
+        Instant instantBefore = LocalDate.of(1879, 7, 2).atStartOfDay(ZoneOffset.UTC).toInstant();
+        ZoneOffsetTransition trans = test.nextTransition(instantBefore);
+        assertEquals(trans.getDateTimeBefore(), LocalDateTime.of(1879, 7, 5, 0, 0));
+        assertEquals(trans.getDateTimeAfter(), LocalDateTime.of(1879, 7, 4, 0, 0));
+        assertEquals(trans.isGap(), false);
+        assertEquals(trans.isOverlap(), true);
+        assertEquals(trans.isValidOffset(ZoneOffset.ofHoursMinutesSeconds(+12, 33, 4)), true);
+        assertEquals(trans.isValidOffset(ZoneOffset.ofHoursMinutesSeconds(-11, -26, -56)), true);
+        assertEquals(trans.getDuration(), Duration.ofHours(-24));
+        assertEquals(trans.getInstant(), LocalDateTime.of(1879, 7, 4, 0, 0).toInstant(ZoneOffset.ofHoursMinutesSeconds(-11, -26, -56)));
+
+        ZonedDateTime zdt = ZonedDateTime.of(1879, 7, 4, 23, 0, 0, 0, ZoneId.of("Pacific/Apia"));
+        assertEquals(zdt.plusHours(2).toLocalDateTime(), LocalDateTime.of(1879, 7, 4, 1, 0, 0));
+    }
+
     //-------------------------------------------------------------------------
     @Test(expectedExceptions=UnsupportedOperationException.class)
     public void test_getTransitions_immutable() {
@@ -931,6 +992,81 @@ public class TCKZoneRules {
         test.getTransitionRules().clear();
     }
 
+    //-----------------------------------------------------------------------
+    // of()
+    //-----------------------------------------------------------------------
+    public void test_of(){
+        //used for standard offset
+        ZoneOffset stdOffset1 = ZoneOffset.UTC;
+        ZoneOffset stdOffset2 = ZoneOffset.ofHours(1);
+        LocalDateTime time_of_stdOffsetTransition1 = LocalDateTime.of(2013, 1, 5, 1, 0);
+        ZoneOffsetTransition  stdOffsetTransition1 = ZoneOffsetTransition.of(time_of_stdOffsetTransition1, stdOffset1, stdOffset2);
+        List stdOffsetTransition_list = new ArrayList();
+        stdOffsetTransition_list.add(stdOffsetTransition1);
+
+        //used for wall offset
+        ZoneOffset wallOffset1 = ZoneOffset.ofHours(2);
+        ZoneOffset wallOffset2 = ZoneOffset.ofHours(4);
+        ZoneOffset wallOffset3 = ZoneOffset.ofHours(7);
+
+        LocalDateTime time_of_wallOffsetTransition1 = LocalDateTime.of(2013, 2, 5, 1, 0);
+        LocalDateTime time_of_wallOffsetTransition2 = LocalDateTime.of(2013, 3, 5, 1, 0);
+        LocalDateTime time_of_wallOffsetTransition3 = LocalDateTime.of(2013, 10, 5, 1, 0);
+
+        ZoneOffsetTransition  wallOffsetTransition1 = ZoneOffsetTransition.of(time_of_wallOffsetTransition1, wallOffset1, wallOffset2);
+        ZoneOffsetTransition  wallOffsetTransition2 = ZoneOffsetTransition.of(time_of_wallOffsetTransition2, wallOffset2, wallOffset3);
+        ZoneOffsetTransition  wallOffsetTransition3 = ZoneOffsetTransition.of(time_of_wallOffsetTransition3, wallOffset3, wallOffset1);
+
+        List wallOffsetTransition_list = new ArrayList();
+        wallOffsetTransition_list.add(wallOffsetTransition1);
+        wallOffsetTransition_list.add(wallOffsetTransition2);
+        wallOffsetTransition_list.add(wallOffsetTransition3);
+
+        //used for ZoneOffsetTransitionRule
+        ZoneOffset ruleOffset = ZoneOffset.ofHours(3);
+        ZoneOffsetTransitionRule.TimeDefinition timeDefinition = ZoneOffsetTransitionRule.TimeDefinition.valueOf("WALL");
+        ZoneOffsetTransitionRule rule1 = ZoneOffsetTransitionRule.of(Month.FEBRUARY,
+                                                                     2,
+                                                                     DayOfWeek.MONDAY,
+                                                                     LocalTime.of(1, 0),
+                                                                     false,
+                                                                     timeDefinition,
+                                                                     ZoneOffset.UTC,
+                                                                     ZoneOffset.UTC,
+                                                                     ruleOffset
+                                                                     );
+         List rule_list = new ArrayList();
+         rule_list.add(rule1);
+
+         //Begin verification
+         ZoneRules zoneRule = ZoneRules.of(stdOffset1,
+                                           wallOffset1,
+                                           stdOffsetTransition_list,
+                                           wallOffsetTransition_list,
+                                           rule_list
+                                           );
+
+         OffsetDateTime before_time_of_stdOffsetTransition1 = OffsetDateTime.of(time_of_stdOffsetTransition1, stdOffset1).minusSeconds(1);
+         OffsetDateTime after_time_of_stdOffsetTransition1 = OffsetDateTime.of(time_of_stdOffsetTransition1, stdOffset1).plusSeconds(1);;
+         assertEquals(zoneRule.getStandardOffset(before_time_of_stdOffsetTransition1.toInstant()), stdOffset1);
+         assertEquals(zoneRule.getStandardOffset(after_time_of_stdOffsetTransition1.toInstant()), stdOffset2);
+
+         OffsetDateTime  before_time_of_wallOffsetTransition1 = OffsetDateTime.of(time_of_wallOffsetTransition1, wallOffset1).minusSeconds(1);
+         OffsetDateTime  after_time_of_wallOffsetTransition1 = OffsetDateTime.of(time_of_wallOffsetTransition1, wallOffset1).plusSeconds(1);
+         assertEquals(zoneRule.nextTransition(before_time_of_wallOffsetTransition1.toInstant()), wallOffsetTransition1);
+         assertEquals(zoneRule.nextTransition(after_time_of_wallOffsetTransition1.toInstant()), wallOffsetTransition2);
+
+         OffsetDateTime  before_time_of_wallOffsetTransition2 = OffsetDateTime.of(time_of_wallOffsetTransition2, wallOffset2).minusSeconds(1);
+         OffsetDateTime  after_time_of_wallOffsetTransition2 = OffsetDateTime.of(time_of_wallOffsetTransition2, wallOffset2).plusSeconds(1);
+         assertEquals(zoneRule.nextTransition(before_time_of_wallOffsetTransition2.toInstant()), wallOffsetTransition2);
+         assertEquals(zoneRule.nextTransition(after_time_of_wallOffsetTransition2.toInstant()), wallOffsetTransition3);
+
+         OffsetDateTime  before_time_of_wallOffsetTransition3 = OffsetDateTime.of(time_of_wallOffsetTransition3, wallOffset3).minusSeconds(1);
+         OffsetDateTime  after_time_of_wallOffsetTransition3 = OffsetDateTime.of(time_of_wallOffsetTransition3, wallOffset3).plusSeconds(1);
+         assertEquals(zoneRule.nextTransition(before_time_of_wallOffsetTransition3.toInstant()), wallOffsetTransition3);
+         assertEquals(zoneRule.nextTransition(after_time_of_wallOffsetTransition3.toInstant()), rule1.createTransition(2014));
+    }
+
     //-----------------------------------------------------------------------
     // equals() / hashCode()
     //-----------------------------------------------------------------------
diff --git a/jdk/test/java/time/test/java/time/MockSimplePeriod.java b/jdk/test/java/time/test/java/time/MockSimplePeriod.java
index 2d8f7d5ba9c..7df760847e2 100644
--- a/jdk/test/java/time/test/java/time/MockSimplePeriod.java
+++ b/jdk/test/java/time/test/java/time/MockSimplePeriod.java
@@ -176,7 +176,7 @@ public final class MockSimplePeriod
 
     @Override
     public String toString() {
-        return amount + " " + unit.getName();
+        return amount + " " + unit;
     }
 
 }
diff --git a/jdk/test/java/time/test/java/time/chrono/TestChronoLocalDate.java b/jdk/test/java/time/test/java/time/chrono/TestChronoLocalDate.java
index 7865985998e..971b3157fe6 100644
--- a/jdk/test/java/time/test/java/time/chrono/TestChronoLocalDate.java
+++ b/jdk/test/java/time/test/java/time/chrono/TestChronoLocalDate.java
@@ -60,7 +60,9 @@ import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.chrono.ChronoLocalDate;
+import java.time.chrono.ChronoLocalDateTime;
 import java.time.chrono.Chronology;
 import java.time.chrono.ThaiBuddhistChronology;
 import java.time.chrono.ThaiBuddhistDate;
@@ -80,8 +82,8 @@ public class TestChronoLocalDate {
 
     //-----------------------------------------------------------------------
     public void test_date_comparator_checkGenerics_ISO() {
-        List> dates = new ArrayList<>();
-        ChronoLocalDate date = LocalDate.of(2013, 1, 1);
+        List dates = new ArrayList<>();
+        ChronoLocalDate date = LocalDate.of(2013, 1, 1);
 
         // Insert dates in order, no duplicates
         dates.add(date.minus(10, ChronoUnit.YEARS));
@@ -96,55 +98,7 @@ public class TestChronoLocalDate {
         dates.add(date.plus(1, ChronoUnit.YEARS));
         dates.add(date.plus(10, ChronoUnit.YEARS));
 
-        List> copy = new ArrayList<>(dates);
-        Collections.shuffle(copy);
-        Collections.sort(copy, ChronoLocalDate.timeLineOrder());
-        assertEquals(copy, dates);
-        assertTrue(ChronoLocalDate.timeLineOrder().compare(copy.get(0), copy.get(1)) < 0);
-    }
-
-    public void test_date_comparator_checkGenerics_unknown() {
-        List> dates = new ArrayList<>();
-        ChronoLocalDate date = LocalDate.of(2013, 1, 1);
-
-        // Insert dates in order, no duplicates
-        dates.add(date.minus(10, ChronoUnit.YEARS));
-        dates.add(date.minus(1, ChronoUnit.YEARS));
-        dates.add(date.minus(1, ChronoUnit.MONTHS));
-        dates.add(date.minus(1, ChronoUnit.WEEKS));
-        dates.add(date.minus(1, ChronoUnit.DAYS));
-        dates.add(date);
-        dates.add(date.plus(1, ChronoUnit.DAYS));
-        dates.add(date.plus(1, ChronoUnit.WEEKS));
-        dates.add(date.plus(1, ChronoUnit.MONTHS));
-        dates.add(date.plus(1, ChronoUnit.YEARS));
-        dates.add(date.plus(10, ChronoUnit.YEARS));
-
-        List> copy = new ArrayList<>(dates);
-        Collections.shuffle(copy);
-        Collections.sort(copy, ChronoLocalDate.timeLineOrder());
-        assertEquals(copy, dates);
-        assertTrue(ChronoLocalDate.timeLineOrder().compare(copy.get(0), copy.get(1)) < 0);
-    }
-
-    public > void test_date_comparator_checkGenerics_unknownExtends() {
-        List> dates = new ArrayList<>();
-        ChronoLocalDate date = (ChronoLocalDate) LocalDate.of(2013, 1, 1);  // TODO generics raw type
-
-        // Insert dates in order, no duplicates
-        dates.add(date.minus(10, ChronoUnit.YEARS));
-        dates.add(date.minus(1, ChronoUnit.YEARS));
-        dates.add(date.minus(1, ChronoUnit.MONTHS));
-        dates.add(date.minus(1, ChronoUnit.WEEKS));
-        dates.add(date.minus(1, ChronoUnit.DAYS));
-        dates.add(date);
-        dates.add(date.plus(1, ChronoUnit.DAYS));
-        dates.add(date.plus(1, ChronoUnit.WEEKS));
-        dates.add(date.plus(1, ChronoUnit.MONTHS));
-        dates.add(date.plus(1, ChronoUnit.YEARS));
-        dates.add(date.plus(10, ChronoUnit.YEARS));
-
-        List> copy = new ArrayList<>(dates);
+        List copy = new ArrayList<>(dates);
         Collections.shuffle(copy);
         Collections.sort(copy, ChronoLocalDate.timeLineOrder());
         assertEquals(copy, dates);
@@ -178,13 +132,12 @@ public class TestChronoLocalDate {
     //-----------------------------------------------------------------------
     public void test_date_checkGenerics_genericsMethod() {
         Chronology chrono = ThaiBuddhistChronology.INSTANCE;
-        ChronoLocalDate date = chrono.dateNow();
-        // date = processOK(date);  // does not compile
+        ChronoLocalDate date = chrono.dateNow();
+        date = processOK(date);
         date = processClassOK(ThaiBuddhistDate.class);
         date = dateSupplier();
 
-        // date = processWeird(date);  // does not compile (correct)
-        // date = processClassWeird(ThaiBuddhistDate.class);  // does not compile (correct)
+        date = processClassWeird(ThaiBuddhistDate.class);
     }
 
     public void test_date_checkGenerics_genericsMethod_concreteType() {
@@ -195,12 +148,12 @@ public class TestChronoLocalDate {
         date = processClassOK(ThaiBuddhistDate.class);
         date = dateSupplier();
 
-        // date = processWeird(date);  // does not compile (correct)
         // date = processClassWeird(ThaiBuddhistDate.class);  // does not compile (correct)
     }
 
-    public > void test_date_checkGenerics_genericsMethod_withType() {
+    public  void test_date_checkGenerics_genericsMethod_withType() {
         Chronology chrono = ThaiBuddhistChronology.INSTANCE;
+        @SuppressWarnings("unchecked")
         D date = (D) chrono.dateNow();
         date = processOK(date);
         // date = processClassOK(ThaiBuddhistDate.class);  // does not compile (correct)
@@ -210,24 +163,40 @@ public class TestChronoLocalDate {
         // date = processClassWeird(ThaiBuddhistDate.class);  // does not compile (correct)
     }
 
-    private > D dateSupplier() {
-        return (D) (ChronoLocalDate) ThaiBuddhistChronology.INSTANCE.dateNow();  // TODO raw types
+    @SuppressWarnings("unchecked")
+    private  D dateSupplier() {
+        return (D) ThaiBuddhistChronology.INSTANCE.dateNow();
     }
 
     // decent generics signatures that need to work
-    private > D processOK(D date) {
-        return date;
+    @SuppressWarnings("unchecked")
+    private  D processOK(D date) {
+        return (D) date.plus(1, ChronoUnit.DAYS);
     }
-    private > D processClassOK(Class cls) {
+    private  D processClassOK(Class cls) {
         return null;
     }
 
     // weird generics signatures that shouldn't really work
-    private > ChronoLocalDate processWeird(ChronoLocalDate date) {
-        return date;
-    }
-    private > ChronoLocalDate processClassWeird(Class cls) {
+    private  ChronoLocalDate processClassWeird(Class cls) {
         return null;
     }
 
+    public void test_date_checkGenerics_chronoLocalDateTime1() {
+        LocalDateTime now = LocalDateTime.now();
+        Chronology chrono = ThaiBuddhistChronology.INSTANCE;
+        ChronoLocalDateTime ldt = chrono.localDateTime(now);
+        ldt = processCLDT(ldt);
+    }
+
+    public void test_date_checkGenerics_chronoLocalDateTime2() {
+        LocalDateTime now = LocalDateTime.now();
+        Chronology chrono = ThaiBuddhistChronology.INSTANCE;
+        ChronoLocalDateTime ldt = chrono.localDateTime(now);
+        ldt = processCLDT(ldt);
+    }
+
+    private  ChronoLocalDateTime processCLDT(ChronoLocalDateTime dt) {
+        return dt;
+    }
 }
diff --git a/jdk/test/java/time/test/java/time/chrono/TestExampleCode.java b/jdk/test/java/time/test/java/time/chrono/TestExampleCode.java
index cfa478f488d..434e272da33 100644
--- a/jdk/test/java/time/test/java/time/chrono/TestExampleCode.java
+++ b/jdk/test/java/time/test/java/time/chrono/TestExampleCode.java
@@ -59,10 +59,14 @@ package test.java.time.chrono;
 
 import static org.testng.Assert.assertEquals;
 
+import java.time.LocalDate;
 import java.time.LocalTime;
+import java.time.ZoneId;
 import java.time.chrono.ChronoLocalDate;
 import java.time.chrono.ChronoLocalDateTime;
+import java.time.chrono.ChronoZonedDateTime;
 import java.time.chrono.Chronology;
+import java.time.chrono.HijrahChronology;
 import java.time.chrono.HijrahDate;
 import java.time.chrono.ThaiBuddhistDate;
 import java.time.temporal.ChronoField;
@@ -82,7 +86,7 @@ public class TestExampleCode {
     @Test
     public void test_chronoPackageExample() {
         // Print the Thai Buddhist date
-        ChronoLocalDate now1 = Chronology.of("ThaiBuddhist").dateNow();
+        ChronoLocalDate now1 = Chronology.of("ThaiBuddhist").dateNow();
         int day = now1.get(ChronoField.DAY_OF_MONTH);
         int dow = now1.get(ChronoField.DAY_OF_WEEK);
         int month = now1.get(ChronoField.MONTH_OF_YEAR);
@@ -93,15 +97,15 @@ public class TestExampleCode {
         // Enumerate the list of available calendars and print today for each
         Set chronos = Chronology.getAvailableChronologies();
         for (Chronology chrono : chronos) {
-            ChronoLocalDate date = chrono.dateNow();
+            ChronoLocalDate date = chrono.dateNow();
             System.out.printf("   %20s: %s%n", chrono.getId(), date.toString());
         }
 
         // Print today's date and the last day of the year for the Thai Buddhist Calendar.
-        ChronoLocalDate first = now1
+        ChronoLocalDate first = now1
                 .with(ChronoField.DAY_OF_MONTH, 1)
                 .with(ChronoField.MONTH_OF_YEAR, 1);
-        ChronoLocalDate last = first
+        ChronoLocalDate last = first
                 .plus(1, ChronoUnit.YEARS)
                 .minus(1, ChronoUnit.DAYS);
         System.out.printf("  %s: 1st of year: %s; end of year: %s%n", last.getChronology().getId(),
@@ -137,7 +141,7 @@ public class TestExampleCode {
         // Enumerate the list of available calendars and print today for each
         Set chronos = Chronology.getAvailableChronologies();
         for (Chronology chrono : chronos) {
-            ChronoLocalDate date = chrono.dateNow();
+            ChronoLocalDate date = chrono.dateNow();
             System.out.printf("   %20s: %s%n", chrono.getId(), date.toString());
         }
 
@@ -161,11 +165,31 @@ public class TestExampleCode {
                 first, last);
     }
 
+    void HijrahExample1() {
+        HijrahDate hd2 = HijrahChronology.INSTANCE.date(1200, 1, 1);
+
+        ChronoLocalDateTime hdt = hd2.atTime(LocalTime.MIDNIGHT);
+        ChronoZonedDateTime zhdt = hdt.atZone(ZoneId.of("GMT"));
+        HijrahDate hd3 = zhdt.toLocalDate();
+        ChronoLocalDateTime hdt2 = zhdt.toLocalDateTime();
+        HijrahDate hd4 = hdt2.toLocalDate();
+
+        HijrahDate hd5 = next(hd2);
+    }
+
+    void test_unknownChronologyWithDateTime() {
+        ChronoLocalDate date = LocalDate.now();
+        ChronoLocalDateTime cldt = date.atTime(LocalTime.NOON);
+        ChronoLocalDate ld = cldt.toLocalDate();
+        ChronoLocalDateTime noonTomorrow = tomorrowNoon(ld);
+    }
+
     @Test
     public void test_library() {
         HijrahDate date = HijrahDate.now();
         HijrahDate next = next(date);
         ChronoLocalDateTime noonTomorrow = tomorrowNoon(date);
+        HijrahDate hd3 = noonTomorrow.toLocalDate();
         System.out.printf("  now: %s, noon tomorrow: %s%n", date, noonTomorrow);
     }
 
@@ -175,8 +199,9 @@ public class TestExampleCode {
      * @param date a specific date extending ChronoLocalDate
      * @return a new date in the same chronology.
      */
-    private > D next(D date) {
-        return date.plus(1, ChronoUnit.DAYS);
+    @SuppressWarnings("unchecked")
+    private  D next(D date) {
+        return (D) date.plus(1, ChronoUnit.DAYS);
     }
 
     /**
@@ -186,7 +211,8 @@ public class TestExampleCode {
      * @param date a specific date extending ChronoLocalDate
      * @return a [@code ChronoLocalDateTime} using the change chronology.
      */
-    private > ChronoLocalDateTime tomorrowNoon(D date) {
-        return date.plus(1, ChronoUnit.DAYS).atTime(LocalTime.of(12, 0));
+    @SuppressWarnings("unchecked")
+    private  ChronoLocalDateTime tomorrowNoon(D date) {
+        return (ChronoLocalDateTime) date.plus(1, ChronoUnit.DAYS).atTime(LocalTime.of(12, 0));
     }
 }
diff --git a/jdk/test/java/time/test/java/time/chrono/TestJapaneseChronoImpl.java b/jdk/test/java/time/test/java/time/chrono/TestJapaneseChronoImpl.java
index 282a9f2231d..bcde051e1b9 100644
--- a/jdk/test/java/time/test/java/time/chrono/TestJapaneseChronoImpl.java
+++ b/jdk/test/java/time/test/java/time/chrono/TestJapaneseChronoImpl.java
@@ -61,12 +61,15 @@ import static org.testng.Assert.assertEquals;
 import java.time.LocalDate;
 import java.time.LocalTime;
 import java.time.OffsetDateTime;
+import java.time.ZonedDateTime;
 import java.time.ZoneOffset;
 import java.time.chrono.JapaneseChronology;
+import java.time.chrono.JapaneseEra;
 import java.time.chrono.JapaneseDate;
 import java.time.temporal.ChronoField;
 import java.time.temporal.ChronoUnit;
 import java.util.Calendar;
+import java.util.GregorianCalendar;
 import java.util.Locale;
 import java.util.TimeZone;
 
@@ -85,7 +88,7 @@ public class TestJapaneseChronoImpl {
     @DataProvider(name="RangeVersusCalendar")
     Object[][] provider_rangeVersusCalendar() {
         return new Object[][] {
-            {LocalDate.of(1868, 1, 1), LocalDate.of(2100, 1, 1)},
+            {LocalDate.of(1873, 1, 1), LocalDate.of(2100, 1, 1)},
         };
     }
 
@@ -118,4 +121,32 @@ public class TestJapaneseChronoImpl {
         }
     }
 
+    //-----------------------------------------------------------------------
+    // Verify  Japanese Calendar matches java.util.Calendar for number of days
+    // in years 1 and 2.
+    //-----------------------------------------------------------------------
+    @Test
+    public void test_dayOfYearVsCalendar() {
+        Locale locale = Locale.forLanguageTag("ja-JP-u-ca-japanese");
+        Calendar cal = java.util.Calendar.getInstance(locale);
+
+        for (JapaneseEra era : JapaneseEra.values()) {
+            for (int year : new int[] {6, 7}) {
+                JapaneseDate jd = JapaneseChronology.INSTANCE.dateYearDay(era, year, 1);
+                OffsetDateTime jodt = OffsetDateTime.of(LocalDate.from(jd), LocalTime.MIN, ZoneOffset.UTC);
+                long millis = jodt.toInstant().toEpochMilli();
+                cal.setTimeZone(TimeZone.getTimeZone("GMT+00"));
+                cal.setTimeInMillis(millis);
+
+                assertEquals(jd.get(ChronoField.DAY_OF_YEAR), cal.get(Calendar.DAY_OF_YEAR),
+                        "different DAY_OF_YEAR values in " + era + ", year: " + year);
+                assertEquals(jd.range(ChronoField.DAY_OF_YEAR).getMaximum(), cal.getActualMaximum(Calendar.DAY_OF_YEAR),
+                        "different maximum for DAY_OF_YEAR in " + era + ", year: " + year);
+                assertEquals(jd.range(ChronoField.DAY_OF_YEAR).getMinimum(), cal.getActualMinimum(Calendar.DAY_OF_YEAR),
+                        "different minimum for DAY_OF_YEAR in " + era + ",  year: " + year);
+            }
+        }
+
+    }
+
 }
diff --git a/jdk/test/java/time/test/java/time/chrono/TestJapaneseChronology.java b/jdk/test/java/time/test/java/time/chrono/TestJapaneseChronology.java
index b87555dcb51..3fbf8532318 100644
--- a/jdk/test/java/time/test/java/time/chrono/TestJapaneseChronology.java
+++ b/jdk/test/java/time/test/java/time/chrono/TestJapaneseChronology.java
@@ -47,9 +47,6 @@ public class TestJapaneseChronology {
     Object[][] transitionData() {
         return new Object[][] {
             // Japanese era, yearOfEra, month, dayOfMonth, gregorianYear
-            { JapaneseEra.SEIREKI, Year.MIN_VALUE, 1, 1, Year.MIN_VALUE },
-            { JapaneseEra.SEIREKI, 1867, 12, 31, 1867 },
-            { JapaneseEra.MEIJI,      1,  1, 25, 1868 }, // Note: the dates of Meiji 1 to 5 are incorrect
             { JapaneseEra.MEIJI,      6,  1,  1, 1873 },
             // Meiji-Taisho transition isn't accurate. 1912-07-30 is the last day of Meiji
             // and the first day of Taisho.
@@ -84,9 +81,10 @@ public class TestJapaneseChronology {
     Object[][] rangeData() {
         return new Object[][] {
             // field, minSmallest, minLargest, maxSmallest, maxLargest
-            { ChronoField.ERA,         -999, -999, 2, 2},
-            { ChronoField.YEAR_OF_ERA, -999999999, 1, 15, 999999999-1989 }, // depends on the current era
+            { ChronoField.ERA,         -1, -1, 2, 2},
+            { ChronoField.YEAR_OF_ERA, 1, 1, 15, 999999999-1989 }, // depends on the current era
             { ChronoField.DAY_OF_YEAR, 1, 1, 7, 366},
+            { ChronoField.YEAR, 1873, 1873, 999999999, 999999999},
         };
     }
 
@@ -94,9 +92,6 @@ public class TestJapaneseChronology {
     Object[][] invalidDatesData() {
         return new Object[][] {
             // Japanese era, yearOfEra, month, dayOfMonth
-            { JapaneseEra.SEIREKI, Year.MIN_VALUE - 1, 1, 1 },
-            { JapaneseEra.SEIREKI, 1855,  2, 29 },
-            { JapaneseEra.SEIREKI, 1868,  1, 25 },
             { JapaneseEra.MEIJI,      6,  2, 29 },
             { JapaneseEra.MEIJI,     45,  7, 30 },
             { JapaneseEra.MEIJI,     46,  1,  1 },
@@ -118,8 +113,6 @@ public class TestJapaneseChronology {
     Object[][] invalidEraYearData() {
         return new Object[][] {
             // Japanese era, yearOfEra
-            { JapaneseEra.SEIREKI, Year.MIN_VALUE - 1 },
-            { JapaneseEra.SEIREKI, 2012 },
             { JapaneseEra.MEIJI,     -1 },
             { JapaneseEra.MEIJI,      0 },
             { JapaneseEra.MEIJI,     46 },
diff --git a/jdk/test/java/time/test/java/time/chrono/TestUmmAlQuraChronology.java b/jdk/test/java/time/test/java/time/chrono/TestUmmAlQuraChronology.java
index 3e1b8a85803..63e433f7ac4 100644
--- a/jdk/test/java/time/test/java/time/chrono/TestUmmAlQuraChronology.java
+++ b/jdk/test/java/time/test/java/time/chrono/TestUmmAlQuraChronology.java
@@ -28,27 +28,57 @@ package test.java.time.chrono;
 import static java.time.temporal.ChronoField.DAY_OF_MONTH;
 import static java.time.temporal.ChronoField.MONTH_OF_YEAR;
 import static java.time.temporal.ChronoField.YEAR;
+import static java.time.temporal.ChronoField.DAY_OF_YEAR;
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
 
 import java.time.DateTimeException;
+import java.time.DayOfWeek;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.OffsetDateTime;
+import java.time.Period;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.chrono.ChronoLocalDate;
+import java.time.chrono.ChronoLocalDateTime;
+import java.time.chrono.ChronoZonedDateTime;
 import java.time.chrono.Chronology;
 import java.time.chrono.HijrahChronology;
 import java.time.chrono.HijrahDate;
+import java.time.chrono.JapaneseChronology;
+import java.time.chrono.JapaneseDate;
+import java.time.chrono.MinguoChronology;
+import java.time.chrono.MinguoDate;
+import java.time.chrono.ThaiBuddhistChronology;
+import java.time.chrono.ThaiBuddhistDate;
+import java.time.format.DateTimeFormatter;
+import java.time.format.FormatStyle;
 import java.time.temporal.ChronoField;
 import java.time.temporal.ChronoUnit;
+import java.time.temporal.TemporalAccessor;
+import java.time.temporal.TemporalAdjuster;
 import java.time.temporal.ValueRange;
+import java.time.temporal.WeekFields;
+import java.util.Locale;
 
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 /**
- * Tests for the Umm alQura chronology and data
+ * Tests for the Umm alQura chronology and data.
+ * Note: The dates used for testing are just a sample of calendar data.
  */
 @Test
 public class TestUmmAlQuraChronology {
 
+    private static final ZoneOffset OFFSET_PTWO = ZoneOffset.ofHours(2);
+    private static final ZoneId ZONE_RIYADH = ZoneId.of("Asia/Riyadh");
+
+    // Test for HijrahChronology Aliases
     @Test
     public void test_aliases() {
         HijrahChronology hc = (HijrahChronology) Chronology.of("Hijrah");
@@ -57,49 +87,43 @@ public class TestUmmAlQuraChronology {
         assertEquals(hc, HijrahChronology.INSTANCE, "Alias for Hijrah-umalqura");
     }
 
-    //-----------------------------------------------------------------------
+    // Test to check if the exception is thrown for an incorrect chronology id
+    @Test(expectedExceptions=DateTimeException.class)
+    public void test_badChronology() {
+        Chronology test = Chronology.of("Hijrah-ummalqura");
+    }
+
+    //--------------------------------------------------------------------------
     // regular data factory for Umm alQura dates and the corresponding ISO dates
-    //-----------------------------------------------------------------------
-    @DataProvider(name = "UmmalQuraVsISODates")
-    Object[][] data_of_ummalqura() {
-        return new Object[][]{
-
-            //{1318, 01, 01,   1900, 04, 30},
-            //{1318, 01, 02,   1900, 05, 01},
-
-            //{1318, 12, 29,   1901, 04, 18},
-            //{1319, 01, 01,   1901, 04, 19},
-
-            //{1433, 12, 29,   2012, 11, 14},
-            //{1434, 01, 01,   2012, 11, 15},
-
-            {1434, 02, 18,   2012, 12, 31},
-            {1434, 02, 19,   2013, 01, 01},
-
-            //{1502, 12, 30,   2079, 10, 25},
-            // not in Umm alQura data {1503, 01, 01,   2079, 10, 26},
-
-            // not in Umm alQura data {1503, 06, 28,   2080, 04, 18},
-            // not in Umm alQura data ~/ws/Downloads
+    //--------------------------------------------------------------------------
+    @DataProvider(name = "UmmAlQuraVsISODates")
+    Object[][] data_UmmAlQuraVsISODates() {
+        return new Object[][] {
+            {HijrahDate.of(1318, 1, 1), LocalDate.of(1900, 04, 30)},
+            {HijrahDate.of(1318, 12, 29), LocalDate.of(1901, 04, 19)},
+            {HijrahDate.of(1319, 01, 01), LocalDate.of(1901, 04, 20)},
+            {HijrahDate.of(1433, 12, 29), LocalDate.of(2012, 11, 14)},
+            {HijrahDate.of(1434, 01, 01), LocalDate.of(2012, 11, 15)},
+            {HijrahDate.of(1434, 02, 18), LocalDate.of(2012, 12, 31)},
+            {HijrahDate.of(1502, 12, 29), LocalDate.of(2079, 10, 25)},
         };
     }
 
-    @Test(dataProvider="UmmalQuraVsISODates")
-        public void Test_UmmAlQuraDatesVsISO(int h_year, int h_month, int h_day, int iso_year, int iso_month, int iso_day) {
-        HijrahDate hd = HijrahDate.of(h_year, h_month, h_day);
-        LocalDate ld = LocalDate.of(iso_year, iso_month, iso_day);
+    // Test to verify the epoch days for given Hijrah & ISO date instances
+    @Test(dataProvider="UmmAlQuraVsISODates")
+        public void Test_UmmAlQuraVsISODates(HijrahDate hd, LocalDate ld) {
         assertEquals(hd.toEpochDay(), ld.toEpochDay(), "Umm alQura date and ISO date should have same epochDay");
     }
 
-
+    // UmmAlQura chronology ranges for year, month and days for the HijrahChronology
     @Test
     public void Test_UmmAlQuraChronoRange() {
         HijrahChronology chrono = HijrahChronology.INSTANCE;
         ValueRange year = chrono.range(YEAR);
-        assertEquals(year.getMinimum(), 1432, "Minimum year");
-        assertEquals(year.getLargestMinimum(), 1432, "Largest minimum year");
-        assertEquals(year.getMaximum(), 1435, "Largest year");
-        assertEquals(year.getSmallestMaximum(), 1435, "Smallest Maximum year");
+        assertEquals(year.getMinimum(), 1300, "Minimum year");
+        assertEquals(year.getLargestMinimum(), 1300, "Largest minimum year");
+        assertEquals(year.getMaximum(), 1600, "Largest year");
+        assertEquals(year.getSmallestMaximum(), 1600, "Smallest Maximum year");
 
         ValueRange month = chrono.range(MONTH_OF_YEAR);
         assertEquals(month.getMinimum(), 1, "Minimum month");
@@ -118,13 +142,17 @@ public class TestUmmAlQuraChronology {
     // regular data factory for dates and the corresponding range values
     //-----------------------------------------------------------------------
     @DataProvider(name = "dates")
-    Object[][] data_of_calendars() {
+    Object[][] data_dates() {
         return new Object[][]{
-            {HijrahDate.of(1434, 5, 1), 1432, 1435, 1, 12, 1, 29, 30},
-            {HijrahDate.of(1434, 6, 1), 1432, 1435, 1, 12, 1, 30, 30},
+            {HijrahDate.of(1300, 5, 1), 1300, 1600, 1, 12, 1, 30, 30},
+            {HijrahDate.of(1300, 6, 1), 1300, 1600, 1, 12, 1, 29, 30},
+            {HijrahDate.of(1434, 12, 1), 1300, 1600, 1, 12, 1, 29, 30},
+            {HijrahDate.of(1500, 4, 1), 1300, 1600, 1, 12, 1, 30, 30},
+            {HijrahDate.of(1600, 6, 1), 1300, 1600, 1, 12, 1, 29, 30},
         };
     }
 
+    // Test to verify the min/max field ranges for given dates
     @Test(dataProvider="dates")
     public void Test_UmmAlQuraRanges(HijrahDate date,
                         int minYear, int maxYear,
@@ -163,6 +191,7 @@ public class TestUmmAlQuraChronology {
 
     }
 
+    // Check the date limits
     @Test
     public void test_hijrahDateLimits() {
         HijrahChronology chrono = HijrahChronology.INSTANCE;
@@ -193,33 +222,547 @@ public class TestUmmAlQuraChronology {
         }
     }
 
-    @DataProvider(name="badDates")
-    Object[][] data_badDates() {
+    // Data provider to verify the dateYearDay() method
+    @DataProvider(name="dateYearDay")
+    Object[][] data_dateYearDay() {
         return new Object[][] {
-            {1317, 12, 29},
-            {1317, 12, 30},
-
-            {1320, 1, 29 + 1},
-            {1320, 2, 30 + 1},
-            {1320, 3, 29 + 1},
-            {1320, 4, 29 + 1},
-            {1320, 5, 30 + 1},
-            {1320, 6, 29 + 1},
-            {1320, 7, 30 + 1},
-            {1320, 8, 30 + 1},
-            {1320, 9, 29 + 1},
-            {1320, 10, 30 + 1},
-            {1320, 11, 30 + 1},
-            {1320, 12, 30 + 1},
+            {HijrahChronology.INSTANCE.dateYearDay(1434, 42), HijrahChronology.INSTANCE.date(1434, 02, 13)},
+            {HijrahChronology.INSTANCE.dateYearDay(1330, 354), HijrahChronology.INSTANCE.date(1330, 12, 29)},
+            {HijrahChronology.INSTANCE.dateYearDay(1600, 1), HijrahChronology.INSTANCE.date(1600, 1, 1)},
+            {HijrahChronology.INSTANCE.dateYearDay(1400, 175), HijrahChronology.INSTANCE.date(1400, 6, 28)},
+            {HijrahChronology.INSTANCE.dateYearDay(1520, 190), HijrahChronology.INSTANCE.date(1520, 7, 13)},
+            {HijrahChronology.INSTANCE.dateYearDay(1521, 112), HijrahChronology.INSTANCE.date(1521, 4, 25)},
         };
     }
 
-    @Test(dataProvider="badDates", expectedExceptions=DateTimeException.class)
-    public void test_badDates(int year, int month, int dom) {
-        HijrahChronology.INSTANCE.date(year, month, dom);
+    // Test to verify the dateYearDay() method
+    @Test(dataProvider="dateYearDay")
+    public void test_DateYearDay(ChronoLocalDate date1,   ChronoLocalDate date2) {
+       assertEquals(date1, date2);
     }
 
-    void printRange(ValueRange range, Object obj, ChronoField field) {
-        System.err.printf(" range: min: %d, max: %d; of: %s, field: %s%n", range.getMinimum(), range.getMaximum(), obj.toString(), field.toString());
+    //-----------------------------------------------------------------------
+    // HijrahDate.with(DAY_OF_YEAR, n)
+    //-----------------------------------------------------------------------
+    @Test
+    public void test_getDayOfYear() {
+        HijrahDate hd1 = HijrahChronology.INSTANCE.dateYearDay(1434, 1);
+        for (int i = 1; i <= hd1.lengthOfYear(); i++) {
+            HijrahDate hd = HijrahChronology.INSTANCE.dateYearDay(1434, i);
+            int doy = hd.get(DAY_OF_YEAR);
+            assertEquals(doy, i, "get(DAY_OF_YEAR) incorrect for " + i);
+        }
+    }
+
+    @Test
+    public void test_withDayOfYear() {
+        HijrahDate hd = HijrahChronology.INSTANCE.dateYearDay(1434, 1);
+        for (int i = 1; i <= hd.lengthOfYear(); i++) {
+            HijrahDate hd2 = hd.with(DAY_OF_YEAR, i);
+            int doy = hd2.get(DAY_OF_YEAR);
+            assertEquals(doy, i, "with(DAY_OF_YEAR) incorrect for " + i + " " + hd2);
+        }
+    }
+
+    @Test(expectedExceptions=java.time.DateTimeException.class)
+    public void test_withDayOfYearTooSmall() {
+        HijrahDate hd = HijrahChronology.INSTANCE.dateYearDay(1435, 1);
+        HijrahDate hd2 = hd.with(DAY_OF_YEAR, 0);
+    }
+
+    @Test(expectedExceptions=java.time.DateTimeException.class)
+    public void test_withDayOfYearTooLarge() {
+        HijrahDate hd = HijrahChronology.INSTANCE.dateYearDay(1435, 1);
+        HijrahDate hd2 = hd.with(DAY_OF_YEAR, hd.lengthOfYear() + 1);
+    }
+
+    // Test to verify the with() method with ChronoField is set to DAY_OF_WEEK
+    @Test
+    public void test_adjustWithDayOfWeek() {
+        assertEquals(HijrahChronology.INSTANCE.date(1320, 1, 15).with(ChronoField.DAY_OF_WEEK, 4), HijrahDate.of(1320, 1, 15));
+        assertEquals(HijrahChronology.INSTANCE.date(1421, 11, 15).with(ChronoField.DAY_OF_WEEK, 1), HijrahDate.of(1421, 11, 11));
+        assertEquals(HijrahChronology.INSTANCE.date(1529, 7, 18).with(ChronoField.DAY_OF_WEEK, 6), HijrahDate.of(1529, 7, 20));
+        assertEquals(HijrahChronology.INSTANCE.date(1534, 2, 10).with(ChronoField.DAY_OF_WEEK, 5), HijrahDate.of(1534, 2, 12));
+        assertEquals(HijrahChronology.INSTANCE.date(1552, 4, 1).with(ChronoField.DAY_OF_WEEK, 2), HijrahDate.of(1552, 3, 26));
+    }
+
+    // Test to verify the with() method with ChronoField is set to DAY_OF_MONTH
+    @Test
+    public void test_adjustWithDayOfMonth() {
+        assertEquals(HijrahChronology.INSTANCE.date(1320, 1, 15).with(ChronoField.DAY_OF_MONTH, 2), HijrahDate.of(1320, 1, 2));
+        assertEquals(HijrahChronology.INSTANCE.date(1421, 11, 15).with(ChronoField.DAY_OF_MONTH, 9), HijrahDate.of(1421, 11, 9));
+        assertEquals(HijrahChronology.INSTANCE.date(1529, 7, 18).with(ChronoField.DAY_OF_MONTH, 13), HijrahDate.of(1529, 7, 13));
+        assertEquals(HijrahChronology.INSTANCE.date(1534, 12, 10).with(ChronoField.DAY_OF_MONTH, 29), HijrahDate.of(1534, 12, 29));
+        assertEquals(HijrahChronology.INSTANCE.date(1552, 4, 1).with(ChronoField.DAY_OF_MONTH, 6), HijrahDate.of(1552, 4, 6));
+    }
+
+    // Test to verify the with() method with ChronoField is set to DAY_OF_YEAR
+    @Test
+    public void test_adjustWithDayOfYear() {
+        assertEquals(HijrahChronology.INSTANCE.date(1320, 1, 15).with(ChronoField.DAY_OF_YEAR, 24), HijrahDate.of(1320, 1, 24));
+        assertEquals(HijrahChronology.INSTANCE.date(1421, 11, 15).with(ChronoField.DAY_OF_YEAR, 135), HijrahDate.of(1421, 5, 18));
+        assertEquals(HijrahChronology.INSTANCE.date(1529, 7, 18).with(ChronoField.DAY_OF_YEAR, 64), HijrahDate.of(1529, 3, 5));
+        assertEquals(HijrahChronology.INSTANCE.date(1534, 2, 10).with(ChronoField.DAY_OF_YEAR, 354), HijrahDate.of(1534, 12, 29));
+        assertEquals(HijrahChronology.INSTANCE.date(1552, 4, 1).with(ChronoField.DAY_OF_YEAR, 291), HijrahDate.of(1552, 10, 26));
+    }
+
+    // Data provider to get the difference between two dates in terms of days, months and years
+    @DataProvider(name="datesForDiff")
+    Object[][] data_datesForDiffs() {
+        return new Object[][] {
+            {HijrahDate.of(1350, 5, 15), HijrahDate.of(1351, 12, 29), 574, 19, 1},
+            {HijrahDate.of(1434, 5, 1), HijrahDate.of(1434,6, 12), 40, 1, 0},
+            {HijrahDate.of(1436, 1, 1), HijrahDate.of(1475, 12, 29), 14173, 479, 39},
+            {HijrahDate.of(1500, 6, 12), HijrahDate.of(1551, 7, 12), 18102, 613, 51},
+            {HijrahDate.of(1550, 3, 11), HijrahDate.of(1551, 4, 11), 384, 13, 1},
+        };
+    }
+
+    // Test to verify the difference between two given dates in terms of days, months and years
+    @Test(dataProvider="datesForDiff")
+    public void test_diffBetweenDates(ChronoLocalDate from, ChronoLocalDate to, long days, long months, long years) {
+          assertEquals(from.until(to, ChronoUnit.DAYS), days);
+          assertEquals(from.until(to, ChronoUnit.MONTHS), months);
+          assertEquals(from.until(to, ChronoUnit.YEARS), years);
+    }
+
+    // Data provider to get the difference between two dates as a period
+    @DataProvider(name="datesForPeriod")
+    Object[][] data_Period() {
+        return new Object[][] {
+            {HijrahDate.of(1350, 5, 15), HijrahDate.of(1434, 7, 20), Period.of(84, 2, 5)},
+            {HijrahDate.of(1403, 5, 28), HijrahDate.of(1434, 7, 20), Period.of(31, 1, 22)},
+            {HijrahDate.of(1434, 7, 20), HijrahDate.of(1484, 2, 15), Period.of(49, 6, 24)},
+            {HijrahDate.of(1500, 6, 12), HijrahDate.of(1450, 4, 21), Period.of(-50, -1, -20)},
+            {HijrahDate.of(1549, 3, 11), HijrahDate.of(1550, 3, 10), Period.of(0, 11, 28)},
+        };
+    }
+
+    // Test to get the Period between two given dates
+    @Test(dataProvider="datesForPeriod")
+    public void test_until(HijrahDate h1, HijrahDate h2, Period p) {
+        Period period = h1.until(h2);
+        assertEquals(period, p);
+    }
+
+    // Test to get the Period between dates in different chronologies
+    @Test(dataProvider="datesForPeriod")
+    public void test_periodUntilDiffChrono(HijrahDate h1, HijrahDate h2, Period p) {
+        MinguoDate m = MinguoChronology.INSTANCE.date(h2);
+        Period period = h1.until(m);
+        assertEquals(period, p);
+    }
+
+    // Test to get the adjusted date from a given date using TemporalAdjuster methods
+    @Test
+    public void test_temporalDayAdjustments() {
+        HijrahDate date = HijrahDate.of(1554, 7, 21);
+        assertEquals(date.with(TemporalAdjuster.firstDayOfMonth()), HijrahDate.of(1554, 7, 1));
+        assertEquals(date.with(TemporalAdjuster.lastDayOfMonth()), HijrahDate.of(1554, 7, 29));
+        assertEquals(date.with(TemporalAdjuster.firstDayOfNextMonth()), HijrahDate.of(1554, 8, 1));
+        assertEquals(date.with(TemporalAdjuster.firstDayOfNextYear()), HijrahDate.of(1555, 1, 1));
+        assertEquals(date.with(TemporalAdjuster.firstDayOfYear()), HijrahDate.of(1554, 1, 1));
+        assertEquals(date.with(TemporalAdjuster.lastDayOfYear()), HijrahDate.of(1554, 12, 30));
+    }
+
+    // Data provider for string representation of the date instances
+    @DataProvider(name="toString")
+    Object[][] data_toString() {
+        return new Object[][] {
+            {HijrahChronology.INSTANCE.date(1320, 1, 1), "Hijrah-umalqura AH 1320-01-01"},
+            {HijrahChronology.INSTANCE.date(1500, 10, 28), "Hijrah-umalqura AH 1500-10-28"},
+            {HijrahChronology.INSTANCE.date(1500, 10, 29), "Hijrah-umalqura AH 1500-10-29"},
+            {HijrahChronology.INSTANCE.date(1434, 12, 5), "Hijrah-umalqura AH 1434-12-05"},
+            {HijrahChronology.INSTANCE.date(1434, 12, 6), "Hijrah-umalqura AH 1434-12-06"},
+        };
+    }
+
+    // Test to verify the returned string value of a given date instance
+    @Test(dataProvider="toString")
+    public void test_toString(ChronoLocalDate hijrahDate, String expected) {
+        assertEquals(hijrahDate.toString(), expected);
+    }
+
+    // Data provider for maximum number of days
+    @DataProvider(name="monthDays")
+    Object[][] data_monthDays() {
+        return new Object[][] {
+            {1432, 1, 29},
+            {1432, 4, 30},
+            {1433, 12, 29},
+            {1434, 1, 29},
+            {1435, 8, 29},
+            {1435, 9, 30},
+        };
+    }
+
+    // Test to verify the maximum number of days by adding one month to a given date
+    @Test (dataProvider="monthDays")
+    public void test_valueRange_monthDays(int year, int month, int maxlength) {
+        ChronoLocalDate date = HijrahChronology.INSTANCE.date(year, month, 1);
+        ValueRange range = null;
+        for (int i=1; i<=12; i++) {
+            range = date.range(ChronoField.DAY_OF_MONTH);
+            date = date.plus(1, ChronoUnit.MONTHS);
+            assertEquals(range.getMaximum(), month, maxlength);
+        }
+    }
+
+    // Test to get the last day of the month by adjusting the date with lastDayOfMonth() method
+    @Test(dataProvider="monthDays")
+    public void test_lastDayOfMonth(int year, int month, int numDays) {
+        HijrahDate hDate = HijrahChronology.INSTANCE.date(year, month, 1);
+        hDate = hDate.with(TemporalAdjuster.lastDayOfMonth());
+        assertEquals(hDate.get(ChronoField.DAY_OF_MONTH), numDays);
+    }
+
+    // Data provider for the 12 islamic month names in a formatted date
+    @DataProvider(name="patternMonthNames")
+    Object[][] data_patternMonthNames() {
+        return new Object[][] {
+            {1434, 1, 1, "01 AH Thu Muharram 1434"},
+            {1434, 2, 1, "01 AH Fri Safar 1434"},
+            {1434, 3, 1, "01 AH Sun Rabi\u02bb I 1434"},//the actual month name is Rabi Al-Awwal, but the locale data contains short form.
+            {1434, 4, 1, "01 AH Mon Rabi\u02bb II 1434"},//the actual month name is Rabi Al-Akhar, but the locale data contains short form.
+            {1434, 5, 1, "01 AH Wed Jumada I 1434"},//the actual month name is Jumada Al-Awwal, but the locale data contains short form.
+            {1434, 6, 1, "01 AH Thu Jumada II 1434"},//the actual month name is Jumada Al-Akhar, but the locale data contains short form.
+            {1434, 7, 1, "01 AH Sat Rajab 1434"},
+            {1434, 8, 1, "01 AH Mon Sha\u02bbban 1434"},
+            {1434, 9, 1, "01 AH Tue Ramadan 1434"},
+            {1434, 10, 1, "01 AH Thu Shawwal 1434"},
+            {1434, 11, 1, "01 AH Sat Dhu\u02bbl-Qi\u02bbdah 1434"},
+            {1434, 12, 1, "01 AH Sun Dhu\u02bbl-Hijjah 1434"},
+        };
+    }
+
+    // Test to verify the formatted dates
+    @Test(dataProvider="patternMonthNames")
+    public void test_ofPattern(int year, int month, int day, String expected) {
+        DateTimeFormatter test = DateTimeFormatter.ofPattern("dd G E MMMM yyyy");
+        assertEquals(test.format(HijrahDate.of(year, month, day)), expected);
+    }
+
+    // Data provider for localized dates
+    @DataProvider(name="chronoDateTimes")
+    Object[][] data_chronodatetimes() {
+        return new Object[][] {
+            {1432, 12, 29, "Safar 1, 1434 AH"},
+            {1433, 1, 30, "Safar 30, 1434 AH"},
+            {1434, 6, 30, "Rajab 30, 1435 AH"},
+        };
+    }
+
+    // Test to verify the localized dates using ofLocalizedDate() method
+    @Test(dataProvider="chronoDateTimes")
+    public void test_formatterOfLocalizedDate(int year, int month, int day, String expected) {
+        HijrahDate hd = HijrahChronology.INSTANCE.date(year, month, day);
+        ChronoLocalDateTime hdt = hd.atTime(LocalTime.NOON);
+        hdt = hdt.plus(1, ChronoUnit.YEARS);
+        hdt = hdt.plus(1, ChronoUnit.MONTHS);
+        hdt = hdt.plus(1, ChronoUnit.DAYS);
+        hdt = hdt.plus(1, ChronoUnit.HOURS);
+        hdt = hdt.plus(1, ChronoUnit.MINUTES);
+        hdt = hdt.plus(1, ChronoUnit.SECONDS);
+        DateTimeFormatter df = DateTimeFormatter.ofLocalizedDate(FormatStyle.LONG).withChronology(Chronology.of("Hijrah-umalqura")).withLocale(Locale.forLanguageTag("en-US"));
+        assertEquals(df.format(hdt), expected);
+    }
+
+    // Data provider to get the day of the week in a given date
+    // The day of the week varies if the week starts with a saturday or sunday
+    @DataProvider(name="dayOfWeek")
+    Object[][] data_dayOfweek() {
+        return new Object[][] {
+            {HijrahDate.of(1434, 6, 24), 1, 7},
+            {HijrahDate.of(1432, 9, 3), 5, 4},
+            {HijrahDate.of(1334, 12, 29), 7, 6},
+            {HijrahDate.of(1354, 5, 24), 1, 7},
+            {HijrahDate.of(1465, 10, 2), 2, 1},
+        };
+    }
+
+    // Test to get the day of the week based on a Saturday/Sunday as the first day of the week
+    @Test(dataProvider="dayOfWeek")
+    public void test_dayOfWeek(HijrahDate date, int satStart, int sunStart) {
+        assertEquals(date.get(WeekFields.of(DayOfWeek.SATURDAY, 7).dayOfWeek()), satStart);
+        assertEquals(date.get(WeekFields.of(DayOfWeek.SUNDAY, 7).dayOfWeek()), sunStart);
+    }
+
+    // Data sample to get the epoch days of a date instance
+    @DataProvider(name="epochDays")
+    Object[][] data_epochdays() {
+        return new Object[][] {
+            {1332, -20486},
+            {1334, -19777},
+            {1336, -19068},
+            {1432, 14950},
+            {1434, 15659},
+            {1534, 51096},
+            {1535, 51450},
+        };
+    }
+
+    // Test to verify the number of epoch days of a date instance
+    @Test(dataProvider="epochDays")
+    public void test_epochDays(int y, long epoch) {
+        HijrahDate date = HijrahDate.of(y, 1, 1);
+        assertEquals(date.toEpochDay(), epoch);
+    }
+
+    // Data provider to verify whether a given hijrah year is a leap year or not
+    @DataProvider(name="leapYears")
+    Object[][] data_leapyears() {
+        return new Object[][] {
+            {1302, true},
+            {1305, false},
+            {1315, false},
+            {1534, false},
+            {1411, true},
+            {1429, false},
+            {1433, true},
+            {1443, true},
+        };
+    }
+
+    // Test to verify whether a given hijrah year is a leap year or not
+    @Test(dataProvider="leapYears")
+    public void test_leapYears(int y, boolean leapyear) {
+        HijrahDate date = HijrahDate.of(y, 1, 1);
+        assertEquals(date.isLeapYear(), leapyear);
+    }
+
+    // Date samples to convert HijrahDate to LocalDate and vice versa
+    @DataProvider(name="samples")
+    Object[][] data_samples() {
+        return new Object[][] {
+            {HijrahChronology.INSTANCE.date(1319, 12, 30), LocalDate.of(1902, 4, 9)},
+            {HijrahChronology.INSTANCE.date(1320, 1, 1), LocalDate.of(1902, 4, 10)},
+            {HijrahChronology.INSTANCE.date(1321, 12, 30), LocalDate.of(1904, 3, 18)},
+            {HijrahChronology.INSTANCE.date(1433, 7, 29), LocalDate.of(2012, 6, 19)},
+            {HijrahChronology.INSTANCE.date(1434, 10, 12), LocalDate.of(2013, 8, 19)},
+            {HijrahChronology.INSTANCE.date(1500, 3, 3), LocalDate.of(2077, 1, 28)},
+        };
+    }
+
+    // Test to get LocalDate instance from a given HijrahDate
+    @Test(dataProvider="samples")
+    public void test_toLocalDate(ChronoLocalDate hijrahDate, LocalDate iso) {
+        assertEquals(LocalDate.from(hijrahDate), iso);
+    }
+
+    // Test to adjust HijrahDate with a given LocalDate
+    @Test(dataProvider="samples")
+    public void test_adjust_toLocalDate(ChronoLocalDate hijrahDate, LocalDate iso) {
+        assertEquals(hijrahDate.with(iso), hijrahDate);
+    }
+
+    // Test to get a HijrahDate from a calendrical
+    @Test(dataProvider="samples")
+    public void test_fromCalendrical(ChronoLocalDate hijrahDate, LocalDate iso) {
+        assertEquals(HijrahChronology.INSTANCE.date(iso), hijrahDate);
+    }
+
+    // Test to verify the day of week of a given HijrahDate and LocalDate
+    @Test(dataProvider="samples")
+    public void test_dayOfWeekEqualIsoDayOfWeek(ChronoLocalDate hijrahDate, LocalDate iso) {
+        assertEquals(hijrahDate.get(ChronoField.DAY_OF_WEEK), iso.get(ChronoField.DAY_OF_WEEK), "Hijrah day of week should be same as ISO day of week");
+    }
+
+    // Test to get the local date by applying the MIN adjustment with hijrah date
+    @Test(dataProvider="samples")
+    public void test_LocalDate_adjustToHijrahDate(ChronoLocalDate hijrahDate, LocalDate localDate) {
+        LocalDate test = LocalDate.MIN.with(hijrahDate);
+        assertEquals(test, localDate);
+    }
+
+    // Test to get the local date time by applying the MIN adjustment with hijrah date
+    @Test(dataProvider="samples")
+    public void test_LocalDateTime_adjustToHijrahDate(ChronoLocalDate hijrahDate, LocalDate localDate) {
+        LocalDateTime test = LocalDateTime.MIN.with(hijrahDate);
+        assertEquals(test, LocalDateTime.of(localDate, LocalTime.MIDNIGHT));
+    }
+
+    // Sample dates for comparison
+    @DataProvider(name="datesForComparison")
+    Object[][] data_datesForComparison() {
+        return new Object[][] {
+            {HijrahChronology.INSTANCE.date(1434, 6, 26), LocalDate.of(2013, 5, 5), -1, 1},
+            {HijrahChronology.INSTANCE.date(1433, 4, 15), LocalDate.of(2012, 3, 15), 1, -1},
+            {HijrahChronology.INSTANCE.date(1432, 5, 21), LocalDate.of(2011, 4, 22), -1, 1},
+            {HijrahChronology.INSTANCE.date(1433, 7, 29), LocalDate.of(2012, 6, 2), -1, 1},
+            {HijrahChronology.INSTANCE.date(1434, 10, 12), LocalDate.of(2013, 8, 2), -1, 1},
+        };
+    }
+
+    // Test to compare dates in both forward and reverse order
+    @Test(dataProvider="datesForComparison")
+    public void test_compareDates(HijrahDate hdate, LocalDate ldate, int result1, int result2) {
+        assertEquals(ldate.compareTo(hdate), result1);
+        assertEquals(hdate.compareTo(ldate), result2);
+    }
+
+    // Test to verify the values of various chrono fields for a given hijrah date instance
+    @Test
+    public void test_chronoFields() {
+        ChronoLocalDate hdate = HijrahChronology.INSTANCE.date(1434, 6, 28);
+        assertEquals(hdate.get(ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH), 3);
+        assertEquals(hdate.get(ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR), 7);
+        assertEquals(hdate.get(ChronoField.ALIGNED_WEEK_OF_MONTH), 4);
+        assertEquals(hdate.get(ChronoField.ALIGNED_WEEK_OF_YEAR), 25);
+        assertEquals(hdate.get(ChronoField.ERA), 1);
+        assertEquals(hdate.get(ChronoField.YEAR_OF_ERA), 1434);
+        assertEquals(hdate.get(ChronoField.MONTH_OF_YEAR), 6);
+        assertEquals(hdate.get(ChronoField.DAY_OF_MONTH), 28);
+        assertEquals(hdate.get(ChronoField.DAY_OF_WEEK), 3);
+        assertEquals(hdate.get(ChronoField.DAY_OF_YEAR), 175);
+    }
+
+    // Test to verify the returned hijrah date after adjusting the day of week as Saturday
+    @Test
+    public void test_adjustInto() {
+        assertEquals(DayOfWeek.SATURDAY.adjustInto(HijrahDate.of(1434, 6, 28)), HijrahDate.of(1434, 7, 1));
+        assertEquals(DayOfWeek.SATURDAY.adjustInto(HijrahDate.of(1432, 4, 13)), HijrahDate.of(1432, 4, 14));
+        assertEquals(DayOfWeek.SATURDAY.adjustInto(HijrahDate.of(1433, 11, 29)), HijrahDate.of(1433, 12, 4));
+        assertEquals(DayOfWeek.SATURDAY.adjustInto(HijrahDate.of(1434, 5, 10)), HijrahDate.of(1434, 5, 11));
+        assertEquals(DayOfWeek.SATURDAY.adjustInto(HijrahDate.of(1434, 9, 11)), HijrahDate.of(1434, 9, 12));
+    }
+
+    //-----------------------------------------------------------------------
+    // zonedDateTime(TemporalAccessor)
+    //-----------------------------------------------------------------------
+    @DataProvider(name="zonedDateTime")
+    Object[][] data_zonedDateTime() {
+        return new Object[][] {
+            {ZonedDateTime.of(2012, 2, 29, 2, 7, 1, 1, ZONE_RIYADH), HijrahChronology.INSTANCE.date(1433, 4, 7), LocalTime.of(2, 7, 1, 1), null},
+            {OffsetDateTime.of(2012, 2, 29, 2, 7, 1, 1, OFFSET_PTWO), HijrahChronology.INSTANCE.date(1433, 4, 7), LocalTime.of(2, 7, 1, 1), null},
+            {LocalDateTime.of(2012, 2, 29, 2, 7), null, null, DateTimeException.class},
+            {JapaneseDate.of(2012, 2, 29), null, null, DateTimeException.class},
+            {ThaiBuddhistDate.of(2012 + 543, 2, 29), null, null, DateTimeException.class},
+            {LocalDate.of(2012, 2, 29), null, null, DateTimeException.class},
+            {LocalTime.of(20, 30, 29, 0), null, null, DateTimeException.class},
+        };
+    }
+
+    // Test to check the zoned date times
+    @Test(dataProvider="zonedDateTime")
+    public void test_zonedDateTime(TemporalAccessor accessor,  HijrahDate expectedDate, LocalTime expectedTime, Class expectedEx) {
+        if (expectedEx == null) {
+            ChronoZonedDateTime result = HijrahChronology.INSTANCE.zonedDateTime(accessor);
+            assertEquals(result.toLocalDate(), expectedDate);
+            assertEquals(HijrahDate.from(accessor), expectedDate);
+            assertEquals(result.toLocalTime(), expectedTime);
+
+        } else {
+            try {
+                ChronoZonedDateTime result = HijrahChronology.INSTANCE.zonedDateTime(accessor);
+                fail();
+            } catch (Exception ex) {
+                assertTrue(expectedEx.isInstance(ex));
+            }
+        }
+    }
+
+    //-----------------------------------------------------------------------
+    // zonedDateTime(Instant, ZoneId )
+    //-----------------------------------------------------------------------
+    @Test
+    public void test_Instant_zonedDateTime() {
+        OffsetDateTime offsetDateTime = OffsetDateTime.of(2012, 2, 29, 2, 7, 1, 1, OFFSET_PTWO);
+        ZonedDateTime zonedDateTime = ZonedDateTime.of(2012, 2, 29, 2, 7, 1, 1, ZONE_RIYADH);
+
+        ChronoZonedDateTime result = HijrahChronology.INSTANCE.zonedDateTime(offsetDateTime.toInstant(), offsetDateTime.getOffset());
+        assertEquals(result.toLocalDate(), HijrahChronology.INSTANCE.date(1433, 4, 7));
+        assertEquals(result.toLocalTime(), LocalTime.of(2, 7, 1, 1));
+
+        result = HijrahChronology.INSTANCE.zonedDateTime(zonedDateTime.toInstant(), zonedDateTime.getOffset());
+        assertEquals(result.toLocalDate(), HijrahChronology.INSTANCE.date(1433, 4, 7));
+        assertEquals(result.toLocalTime(), LocalTime.of(2, 7, 1, 1));
+    }
+
+    //-----------------------------------------------------------------------
+    // localDateTime()
+    //-----------------------------------------------------------------------
+    @DataProvider(name="localDateTime")
+    Object[][] data_localDateTime() {
+        return new Object[][] {
+            {LocalDateTime.of(2012, 2, 29, 2, 7), HijrahChronology.INSTANCE.date(1433, 4, 7), LocalTime.of(2, 7), null},
+            {ZonedDateTime.of(2012, 2, 29, 2, 7, 1, 1, ZONE_RIYADH), HijrahChronology.INSTANCE.date(1433, 4, 7), LocalTime.of(2, 7, 1, 1), null},
+            {OffsetDateTime.of(2012, 2, 29, 2, 7, 1, 1, OFFSET_PTWO), HijrahChronology.INSTANCE.date(1433, 4, 7), LocalTime.of(2, 7, 1, 1), null},
+            {JapaneseDate.of(2012, 2, 29), null, null, DateTimeException.class},
+            {ThaiBuddhistDate.of(2012 + 543, 2, 29), null, null, DateTimeException.class},
+            {LocalDate.of(2012, 2, 29), null, null, DateTimeException.class},
+            {LocalTime.of(20, 30, 29, 0), null, null, DateTimeException.class},
+        };
+    }
+
+    // Test to verify local date time values from various date instances defined in the localDateTime data provider
+    @Test(dataProvider="localDateTime")
+    public void test_localDateTime(TemporalAccessor accessor,  HijrahDate expectedDate, LocalTime expectedTime, Class expectedEx) {
+        if (expectedEx == null) {
+            ChronoLocalDateTime result = HijrahChronology.INSTANCE.localDateTime(accessor);
+            assertEquals(result.toLocalDate(), expectedDate);
+            assertEquals(HijrahDate.from(accessor), expectedDate);
+            assertEquals(result.toLocalTime(), expectedTime);
+        } else {
+            try {
+                ChronoLocalDateTime result = HijrahChronology.INSTANCE.localDateTime(accessor);
+                fail();
+            } catch (Exception ex) {
+                assertTrue(expectedEx.isInstance(ex));
+            }
+        }
+    }
+
+    // Sample Hijrah & Minguo Dates
+    @DataProvider(name="hijrahToMinguo")
+    Object[][] data_hijrahToMinguo() {
+        return new Object[][] {
+            {HijrahDate.of(1350,5,15), MinguoDate.of(20,9,28)},
+            {HijrahDate.of(1434,5,1), MinguoDate.of(102,3,13)},
+            {HijrahDate.of(1436,1,1), MinguoDate.of(103,10,25)},
+            {HijrahDate.of(1500,6,12), MinguoDate.of(166,5,5)},
+            {HijrahDate.of(1550,3,11), MinguoDate.of(214,8,11)},
+        };
+    }
+
+    // Test to verify the date conversion from Hijrah to Minguo chronology
+    @Test(dataProvider="hijrahToMinguo")
+    public void test_hijrahToMinguo(HijrahDate hijrah, MinguoDate minguo) {
+        assertEquals(MinguoChronology.INSTANCE.date(hijrah), minguo);
+    }
+
+    // Sample Hijrah & Thai Dates
+    @DataProvider(name="hijrahToThai")
+    Object[][] data_hijrahToThai() {
+        return new Object[][] {
+            {HijrahDate.of(1350,5,15), ThaiBuddhistDate.of(2474,9,28)},
+            {HijrahDate.of(1434,5,1), ThaiBuddhistDate.of(2556,3,13)},
+            {HijrahDate.of(1436,1,1), ThaiBuddhistDate.of(2557,10,25)},
+            {HijrahDate.of(1500,6,12), ThaiBuddhistDate.of(2620,5,5)},
+            {HijrahDate.of(1550,3,11), ThaiBuddhistDate.of(2668,8,11)},
+        };
+    }
+
+    // Test to verify the date conversion from Hijrah to Thai chronology
+    @Test(dataProvider="hijrahToThai")
+    public void test_hijrahToThai(HijrahDate hijrah, ThaiBuddhistDate thai) {
+        assertEquals(ThaiBuddhistChronology.INSTANCE.date(hijrah), thai);
+    }
+
+    // Sample Hijrah & Japanese Dates
+    @DataProvider(name="hijrahToJapanese")
+    Object[][] data_hijrahToJapanese() {
+        return new Object[][] {
+            {HijrahDate.of(1350,5,15), "Japanese Showa 6-09-28"},
+            {HijrahDate.of(1434,5,1), "Japanese Heisei 25-03-13"},
+            {HijrahDate.of(1436,1,1), "Japanese Heisei 26-10-25"},
+            {HijrahDate.of(1500,6,12), "Japanese Heisei 89-05-05"},
+            {HijrahDate.of(1550,3,11), "Japanese Heisei 137-08-11"},
+        };
+    }
+
+    // Test to verify the date conversion from Hijrah to Japanese chronology
+    @Test(dataProvider="hijrahToJapanese")
+      public void test_hijrahToJapanese(HijrahDate hijrah, String japanese) {
+          assertEquals(JapaneseChronology.INSTANCE.date(hijrah).toString(), japanese);
     }
 }
diff --git a/jdk/test/java/time/test/java/time/format/TestDateTimeTextProvider.java b/jdk/test/java/time/test/java/time/format/TestDateTimeTextProvider.java
index 056dfa22dcd..aebccfddc12 100644
--- a/jdk/test/java/time/test/java/time/format/TestDateTimeTextProvider.java
+++ b/jdk/test/java/time/test/java/time/format/TestDateTimeTextProvider.java
@@ -131,18 +131,18 @@ public class TestDateTimeTextProvider extends AbstractTestPrinterParser {
             {MONTH_OF_YEAR, 11, TextStyle.SHORT, enUS, "Nov"},
             {MONTH_OF_YEAR, 12, TextStyle.SHORT, enUS, "Dec"},
 
-            {MONTH_OF_YEAR, 1, TextStyle.SHORT, ptBR, "Jan"},
-            {MONTH_OF_YEAR, 2, TextStyle.SHORT, ptBR, "Fev"},
-            {MONTH_OF_YEAR, 3, TextStyle.SHORT, ptBR, "Mar"},
-            {MONTH_OF_YEAR, 4, TextStyle.SHORT, ptBR, "Abr"},
-            {MONTH_OF_YEAR, 5, TextStyle.SHORT, ptBR, "Mai"},
-            {MONTH_OF_YEAR, 6, TextStyle.SHORT, ptBR, "Jun"},
-            {MONTH_OF_YEAR, 7, TextStyle.SHORT, ptBR, "Jul"},
-            {MONTH_OF_YEAR, 8, TextStyle.SHORT, ptBR, "Ago"},
-            {MONTH_OF_YEAR, 9, TextStyle.SHORT, ptBR, "Set"},
-            {MONTH_OF_YEAR, 10, TextStyle.SHORT, ptBR, "Out"},
-            {MONTH_OF_YEAR, 11, TextStyle.SHORT, ptBR, "Nov"},
-            {MONTH_OF_YEAR, 12, TextStyle.SHORT, ptBR, "Dez"},
+            {MONTH_OF_YEAR, 1, TextStyle.SHORT, ptBR, "jan"},
+            {MONTH_OF_YEAR, 2, TextStyle.SHORT, ptBR, "fev"},
+            {MONTH_OF_YEAR, 3, TextStyle.SHORT, ptBR, "mar"},
+            {MONTH_OF_YEAR, 4, TextStyle.SHORT, ptBR, "abr"},
+            {MONTH_OF_YEAR, 5, TextStyle.SHORT, ptBR, "mai"},
+            {MONTH_OF_YEAR, 6, TextStyle.SHORT, ptBR, "jun"},
+            {MONTH_OF_YEAR, 7, TextStyle.SHORT, ptBR, "jul"},
+            {MONTH_OF_YEAR, 8, TextStyle.SHORT, ptBR, "ago"},
+            {MONTH_OF_YEAR, 9, TextStyle.SHORT, ptBR, "set"},
+            {MONTH_OF_YEAR, 10, TextStyle.SHORT, ptBR, "out"},
+            {MONTH_OF_YEAR, 11, TextStyle.SHORT, ptBR, "nov"},
+            {MONTH_OF_YEAR, 12, TextStyle.SHORT, ptBR, "dez"},
 
             {MONTH_OF_YEAR, 1, TextStyle.FULL, enUS, "January"},
             {MONTH_OF_YEAR, 2, TextStyle.FULL, enUS, "February"},
diff --git a/jdk/test/java/time/test/java/time/format/TestNonIsoFormatter.java b/jdk/test/java/time/test/java/time/format/TestNonIsoFormatter.java
index 49ec4d6554f..af6be84ef92 100644
--- a/jdk/test/java/time/test/java/time/format/TestNonIsoFormatter.java
+++ b/jdk/test/java/time/test/java/time/format/TestNonIsoFormatter.java
@@ -126,7 +126,7 @@ public class TestNonIsoFormatter {
 
     @Test(dataProvider="format_data")
     public void test_formatLocalizedDate(Chronology chrono, Locale formatLocale, Locale numberingLocale,
-                                         ChronoLocalDate date, String expected) {
+                                         ChronoLocalDate date, String expected) {
         DateTimeFormatter dtf = DateTimeFormatter.ofLocalizedDate(FormatStyle.FULL)
             .withChronology(chrono).withLocale(formatLocale)
             .withDecimalStyle(DecimalStyle.of(numberingLocale));
@@ -136,12 +136,12 @@ public class TestNonIsoFormatter {
 
     @Test(dataProvider="format_data")
     public void test_parseLocalizedText(Chronology chrono, Locale formatLocale, Locale numberingLocale,
-                                        ChronoLocalDate expected, String text) {
+                                        ChronoLocalDate expected, String text) {
         DateTimeFormatter dtf = DateTimeFormatter.ofLocalizedDate(FormatStyle.FULL)
             .withChronology(chrono).withLocale(formatLocale)
             .withDecimalStyle(DecimalStyle.of(numberingLocale));
         TemporalAccessor temporal = dtf.parse(text);
-        ChronoLocalDate date = chrono.date(temporal);
+        ChronoLocalDate date = chrono.date(temporal);
         assertEquals(date, expected);
     }
 
diff --git a/jdk/test/java/time/test/java/time/format/TestNumberPrinter.java b/jdk/test/java/time/test/java/time/format/TestNumberPrinter.java
index 9d686472ab6..dedcc37e2ce 100644
--- a/jdk/test/java/time/test/java/time/format/TestNumberPrinter.java
+++ b/jdk/test/java/time/test/java/time/format/TestNumberPrinter.java
@@ -191,7 +191,7 @@ public class TestNumberPrinter extends AbstractTestPrinterParser {
             assertEquals(buf.toString(), result);
         } catch (DateTimeException ex) {
             if (result == null || value < 0) {
-                assertEquals(ex.getMessage().contains(DAY_OF_MONTH.getName()), true);
+                assertEquals(ex.getMessage().contains(DAY_OF_MONTH.toString()), true);
             } else {
                 throw ex;
             }
@@ -210,7 +210,7 @@ public class TestNumberPrinter extends AbstractTestPrinterParser {
             if (result != null) {
                 throw ex;
             }
-            assertEquals(ex.getMessage().contains(DAY_OF_MONTH.getName()), true);
+            assertEquals(ex.getMessage().contains(DAY_OF_MONTH.toString()), true);
         }
     }
 
@@ -226,7 +226,7 @@ public class TestNumberPrinter extends AbstractTestPrinterParser {
             if (result != null) {
                 throw ex;
             }
-            assertEquals(ex.getMessage().contains(DAY_OF_MONTH.getName()), true);
+            assertEquals(ex.getMessage().contains(DAY_OF_MONTH.toString()), true);
         }
     }
 
@@ -242,7 +242,7 @@ public class TestNumberPrinter extends AbstractTestPrinterParser {
             if (result != null) {
                 throw ex;
             }
-            assertEquals(ex.getMessage().contains(DAY_OF_MONTH.getName()), true);
+            assertEquals(ex.getMessage().contains(DAY_OF_MONTH.toString()), true);
         }
     }
 
@@ -262,7 +262,7 @@ public class TestNumberPrinter extends AbstractTestPrinterParser {
             if (result != null) {
                 throw ex;
             }
-            assertEquals(ex.getMessage().contains(DAY_OF_MONTH.getName()), true);
+            assertEquals(ex.getMessage().contains(DAY_OF_MONTH.toString()), true);
         }
     }
 
diff --git a/jdk/test/java/time/test/java/time/format/TestReducedPrinter.java b/jdk/test/java/time/test/java/time/format/TestReducedPrinter.java
index 5ff2cd5eed8..c23cff27373 100644
--- a/jdk/test/java/time/test/java/time/format/TestReducedPrinter.java
+++ b/jdk/test/java/time/test/java/time/format/TestReducedPrinter.java
@@ -185,7 +185,7 @@ public class TestReducedPrinter extends AbstractTestPrinterParser {
             assertEquals(buf.toString(), result);
         } catch (DateTimeException ex) {
             if (result == null || value < 0) {
-                assertEquals(ex.getMessage().contains(YEAR.getName()), true);
+                assertEquals(ex.getMessage().contains(YEAR.toString()), true);
             } else {
                 throw ex;
             }
diff --git a/jdk/test/java/time/test/java/time/temporal/MockFieldNoValue.java b/jdk/test/java/time/test/java/time/temporal/MockFieldNoValue.java
index eb97313ae19..ed2f6d59b10 100644
--- a/jdk/test/java/time/test/java/time/temporal/MockFieldNoValue.java
+++ b/jdk/test/java/time/test/java/time/temporal/MockFieldNoValue.java
@@ -76,11 +76,6 @@ public enum MockFieldNoValue implements TemporalField {
 
     INSTANCE;
 
-    @Override
-    public String getName() {
-        return null;
-    }
-
     @Override
     public TemporalUnit getBaseUnit() {
         return WEEKS;
@@ -96,6 +91,16 @@ public enum MockFieldNoValue implements TemporalField {
         return ValueRange.of(1, 20);
     }
 
+    @Override
+    public boolean isDateBased() {
+        return false;
+    }
+
+    @Override
+    public boolean isTimeBased() {
+        return false;
+    }
+
     //-----------------------------------------------------------------------
     @Override
     public boolean isSupportedBy(TemporalAccessor temporal) {
@@ -117,4 +122,9 @@ public enum MockFieldNoValue implements TemporalField {
         throw new DateTimeException("Mock");
     }
 
+    @Override
+    public String toString() {
+        return null;
+    }
+
 }
diff --git a/jdk/test/java/time/test/java/time/temporal/MockFieldValue.java b/jdk/test/java/time/test/java/time/temporal/MockFieldValue.java
index 0cd79d7f1e9..7747bda7714 100644
--- a/jdk/test/java/time/test/java/time/temporal/MockFieldValue.java
+++ b/jdk/test/java/time/test/java/time/temporal/MockFieldValue.java
@@ -89,7 +89,7 @@ public final class MockFieldValue implements TemporalAccessor {
             if (isSupported(field)) {
                 return field.range();
             }
-            throw new UnsupportedTemporalTypeException("Unsupported field: " + field.getName());
+            throw new UnsupportedTemporalTypeException("Unsupported field: " + field);
         }
         return field.rangeRefinedBy(this);
     }

From 5cae1dc78f61864b694001488741c90ebf54eebf Mon Sep 17 00:00:00 2001
From: Joe Darcy 
Date: Thu, 18 Jul 2013 23:16:52 -0700
Subject: [PATCH 012/120] 8020810: Typo in javadoc for Class.toGenericString()

Reviewed-by: dholmes
---
 jdk/src/share/classes/java/lang/Class.java             | 8 ++++----
 jdk/src/share/classes/java/lang/reflect/Parameter.java | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/jdk/src/share/classes/java/lang/Class.java b/jdk/src/share/classes/java/lang/Class.java
index 2e47377996f..9df0805167b 100644
--- a/jdk/src/share/classes/java/lang/Class.java
+++ b/jdk/src/share/classes/java/lang/Class.java
@@ -157,10 +157,10 @@ public final class Class implements java.io.Serializable,
      *
      * The string is formatted as a list of type modifiers, if any,
      * followed by the kind of type (empty string for primitive types
-     * and {@code class}, {@code enum}, {@code interface}, or {@code
-     * @interface}, as appropriate), followed by the type's name,
-     * followed by an angle-bracketed comma-separated list of the
-     * type's type parameters, if any.
+     * and {@code class}, {@code enum}, {@code interface}, or
+     * @{@code interface}, as appropriate), followed
+     * by the type's name, followed by an angle-bracketed
+     * comma-separated list of the type's type parameters, if any.
      *
      * A space is used to separate modifiers from one another and to
      * separate any modifiers from the kind of type. The modifiers
diff --git a/jdk/src/share/classes/java/lang/reflect/Parameter.java b/jdk/src/share/classes/java/lang/reflect/Parameter.java
index f49c1daa436..0568d9ee2e0 100644
--- a/jdk/src/share/classes/java/lang/reflect/Parameter.java
+++ b/jdk/src/share/classes/java/lang/reflect/Parameter.java
@@ -162,7 +162,7 @@ public final class Parameter implements AnnotatedElement {
 
     /**
      * Returns the name of the parameter.  If the parameter's name is
-     * {@linkplain isNamePresent() present}, then this method returns
+     * {@linkplain #isNamePresent() present}, then this method returns
      * the name provided by the class file. Otherwise, this method
      * synthesizes a name of the form argN, where N is the index of
      * the parameter in the descriptor of the method which declares

From 72673205151c4f2013a765f67c65c3fb11c75b4f Mon Sep 17 00:00:00 2001
From: Alexey Utkin 
Date: Fri, 19 Jul 2013 12:53:36 +0400
Subject: [PATCH 013/120] 8016579: (process) IOException thrown by
 ProcessBuilder.start() method is incorrectly encoded

Reviewed-by: martin, dxu
---
 jdk/src/share/native/java/io/io_util.c        |   4 +
 jdk/src/windows/native/java/io/io_util_md.c   | 103 ++++++++++++------
 .../windows/native/java/lang/ProcessImpl_md.c |  90 +++++++++++----
 3 files changed, 143 insertions(+), 54 deletions(-)

diff --git a/jdk/src/share/native/java/io/io_util.c b/jdk/src/share/native/java/io/io_util.c
index 9a9ca7d292d..5dd822382f0 100644
--- a/jdk/src/share/native/java/io/io_util.c
+++ b/jdk/src/share/native/java/io/io_util.c
@@ -211,7 +211,11 @@ throwFileNotFoundException(JNIEnv *env, jstring path)
 
     n = getLastErrorString(buf, sizeof(buf));
     if (n > 0) {
+#ifdef WIN32
+        why = (*env)->NewStringUTF(env, buf);
+#else
         why = JNU_NewStringPlatform(env, buf);
+#endif
     }
     x = JNU_NewObjectByName(env,
                             "java/io/FileNotFoundException",
diff --git a/jdk/src/windows/native/java/io/io_util_md.c b/jdk/src/windows/native/java/io/io_util_md.c
index 3e9aef352f7..d886aea9f62 100644
--- a/jdk/src/windows/native/java/io/io_util_md.c
+++ b/jdk/src/windows/native/java/io/io_util_md.c
@@ -29,6 +29,7 @@
 #include "io_util.h"
 #include "io_util_md.h"
 #include 
+#include 
 
 #include 
 #include 
@@ -40,6 +41,7 @@
 #include 
 #include 
 
+
 static DWORD MAX_INPUT_EVENTS = 2000;
 
 /* If this returns NULL then an exception is pending */
@@ -569,42 +571,75 @@ handleLseek(FD fd, jlong offset, jint whence)
 }
 
 size_t
-getLastErrorString(char *buf, size_t len)
+getLastErrorString(char *utf8_jvmErrorMsg, size_t cbErrorMsg)
 {
-    DWORD errval;
-    if (len > 0) {
-        if ((errval = GetLastError()) != 0) {
-            // DOS error
-            size_t n = (size_t)FormatMessage(
-                FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS,
-                NULL,
-                errval,
-                0,
-                buf,
-                (DWORD)len,
-                NULL);
-            if (n > 3) {
-                // Drop final '.', CR, LF
-                if (buf[n - 1] == '\n') n--;
-                if (buf[n - 1] == '\r') n--;
-                if (buf[n - 1] == '.') n--;
-                buf[n] = '\0';
+    size_t n = 0;
+    if (cbErrorMsg > 0) {
+        BOOLEAN noError = FALSE;
+        WCHAR *utf16_osErrorMsg = (WCHAR *)malloc(cbErrorMsg*sizeof(WCHAR));
+        if (utf16_osErrorMsg == NULL) {
+            // OOM accident
+            strncpy(utf8_jvmErrorMsg, "Out of memory", cbErrorMsg);
+            // truncate if too long
+            utf8_jvmErrorMsg[cbErrorMsg - 1] = '\0';
+            n = strlen(utf8_jvmErrorMsg);
+        } else {
+            DWORD errval = GetLastError();
+            if (errval != 0) {
+                // WIN32 error
+                n = (size_t)FormatMessageW(
+                    FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS,
+                    NULL,
+                    errval,
+                    0,
+                    utf16_osErrorMsg,
+                    (DWORD)cbErrorMsg,
+                    NULL);
+                if (n > 3) {
+                    // Drop final '.', CR, LF
+                    if (utf16_osErrorMsg[n - 1] == L'\n') --n;
+                    if (utf16_osErrorMsg[n - 1] == L'\r') --n;
+                    if (utf16_osErrorMsg[n - 1] == L'.') --n;
+                    utf16_osErrorMsg[n] = L'\0';
+                }
+            } else if (errno != 0) {
+                // C runtime error that has no corresponding WIN32 error code
+                const WCHAR *rtError = _wcserror(errno);
+                if (rtError != NULL) {
+                    wcsncpy(utf16_osErrorMsg, rtError, cbErrorMsg);
+                    // truncate if too long
+                    utf16_osErrorMsg[cbErrorMsg - 1] = L'\0';
+                    n = wcslen(utf16_osErrorMsg);
+                }
+            } else
+                noError = TRUE; //OS has no error to report
+
+            if (!noError) {
+                if (n > 0) {
+                    n = WideCharToMultiByte(
+                        CP_UTF8,
+                        0,
+                        utf16_osErrorMsg,
+                        n,
+                        utf8_jvmErrorMsg,
+                        cbErrorMsg,
+                        NULL,
+                        NULL);
+
+                    // no way to die
+                    if (n > 0)
+                        utf8_jvmErrorMsg[min(cbErrorMsg - 1, n)] = '\0';
+                }
+
+                if (n <= 0) {
+                    strncpy(utf8_jvmErrorMsg, "Secondary error while OS message extraction", cbErrorMsg);
+                    // truncate if too long
+                    utf8_jvmErrorMsg[cbErrorMsg - 1] = '\0';
+                    n = strlen(utf8_jvmErrorMsg);
+                }
             }
-            return n;
-        }
-
-        if (errno != 0) {
-            // C runtime error that has no corresponding DOS error code
-            const char *err = strerror(errno);
-            size_t n = strlen(err);
-            if (n >= len)
-                n = len - 1;
-
-            strncpy(buf, err, n);
-            buf[n] = '\0';
-            return n;
+            free(utf16_osErrorMsg);
         }
     }
-
-    return 0;
+    return n;
 }
diff --git a/jdk/src/windows/native/java/lang/ProcessImpl_md.c b/jdk/src/windows/native/java/lang/ProcessImpl_md.c
index 5b45f8f24f2..c372013456c 100644
--- a/jdk/src/windows/native/java/lang/ProcessImpl_md.c
+++ b/jdk/src/windows/native/java/lang/ProcessImpl_md.c
@@ -40,20 +40,70 @@
  */
 #define PIPE_SIZE (4096+24)
 
+/* We have THREE locales in action:
+ * 1. Thread default locale - dictates UNICODE-to-8bit conversion
+ * 2. System locale that defines the message localization
+ * 3. The file name locale
+ * Each locale could be an extended locale, that means that text cannot be
+ * mapped to 8bit sequence without multibyte encoding.
+ * VM is ready for that, if text is UTF-8.
+ * Here we make the work right from the beginning.
+ */
+size_t os_error_message(int errnum, WCHAR* utf16_OSErrorMsg, size_t maxMsgLength) {
+    size_t n = (size_t)FormatMessageW(
+            FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS,
+            NULL,
+            (DWORD)errnum,
+            0,
+            utf16_OSErrorMsg,
+            (DWORD)maxMsgLength,
+            NULL);
+    if (n > 3) {
+        // Drop final '.', CR, LF
+        if (utf16_OSErrorMsg[n - 1] == L'\n') --n;
+        if (utf16_OSErrorMsg[n - 1] == L'\r') --n;
+        if (utf16_OSErrorMsg[n - 1] == L'.') --n;
+        utf16_OSErrorMsg[n] = L'\0';
+    }
+    return n;
+}
+
+#define MESSAGE_LENGTH (256 + 100)
+#define ARRAY_SIZE(x) (sizeof(x)/sizeof(*x))
+
 static void
-win32Error(JNIEnv *env, const char *functionName)
+win32Error(JNIEnv *env, const WCHAR *functionName)
 {
-    static const char * const format = "%s error=%d, %s";
-    static const char * const fallbackFormat = "%s failed, error=%d";
-    char buf[256];
-    char errmsg[sizeof(buf) + 100];
-    const int errnum = GetLastError();
-    const int n = JVM_GetLastErrorString(buf, sizeof(buf));
-    if (n > 0)
-        sprintf(errmsg, format, functionName, errnum, buf);
-    else
-        sprintf(errmsg, fallbackFormat, functionName, errnum);
-    JNU_ThrowIOException(env, errmsg);
+    WCHAR utf16_OSErrorMsg[MESSAGE_LENGTH - 100];
+    WCHAR utf16_javaMessage[MESSAGE_LENGTH];
+    /*Good suggestion about 2-bytes-per-symbol in localized error reports*/
+    char  utf8_javaMessage[MESSAGE_LENGTH*2];
+    const int errnum = (int)GetLastError();
+    int n = os_error_message(errnum, utf16_OSErrorMsg, ARRAY_SIZE(utf16_OSErrorMsg));
+    n = (n > 0)
+        ? swprintf(utf16_javaMessage, MESSAGE_LENGTH, L"%s error=%d, %s", functionName, errnum, utf16_OSErrorMsg)
+        : swprintf(utf16_javaMessage, MESSAGE_LENGTH, L"%s failed, error=%d", functionName, errnum);
+
+    if (n > 0) /*terminate '\0' is not a part of conversion procedure*/
+        n = WideCharToMultiByte(
+            CP_UTF8,
+            0,
+            utf16_javaMessage,
+            n, /*by creation n <= MESSAGE_LENGTH*/
+            utf8_javaMessage,
+            MESSAGE_LENGTH*2,
+            NULL,
+            NULL);
+
+    /*no way to die*/
+    {
+        const char *errorMessage = "Secondary error while OS message extraction";
+        if (n > 0) {
+            utf8_javaMessage[min(MESSAGE_LENGTH*2 - 1, n)] = '\0';
+            errorMessage = utf8_javaMessage;
+        }
+        JNU_ThrowIOException(env, errorMessage);
+    }
 }
 
 static void
@@ -116,7 +166,7 @@ Java_java_lang_ProcessImpl_create(JNIEnv *env, jclass ignored,
         handles[0] = (jlong) -1;
     } else {
         if (! CreatePipe(&inRead,  &inWrite,  &sa, PIPE_SIZE)) {
-            win32Error(env, "CreatePipe");
+            win32Error(env, L"CreatePipe");
             goto Catch;
         }
         si.hStdInput = inRead;
@@ -132,7 +182,7 @@ Java_java_lang_ProcessImpl_create(JNIEnv *env, jclass ignored,
         handles[1] = (jlong) -1;
     } else {
         if (! CreatePipe(&outRead, &outWrite, &sa, PIPE_SIZE)) {
-            win32Error(env, "CreatePipe");
+            win32Error(env, L"CreatePipe");
             goto Catch;
         }
         si.hStdOutput = outWrite;
@@ -151,7 +201,7 @@ Java_java_lang_ProcessImpl_create(JNIEnv *env, jclass ignored,
         handles[2] = (jlong) -1;
     } else {
         if (! CreatePipe(&errRead, &errWrite, &sa, PIPE_SIZE)) {
-            win32Error(env, "CreatePipe");
+            win32Error(env, L"CreatePipe");
             goto Catch;
         }
         si.hStdError = errWrite;
@@ -174,7 +224,7 @@ Java_java_lang_ProcessImpl_create(JNIEnv *env, jclass ignored,
                          &si,              /* (in)  startup information */
                          &pi);             /* (out) process information */
     if (!ret) {
-        win32Error(env, "CreateProcess");
+        win32Error(env, L"CreateProcess");
         goto Catch;
     }
 
@@ -210,7 +260,7 @@ Java_java_lang_ProcessImpl_getExitCodeProcess(JNIEnv *env, jclass ignored, jlong
 {
     DWORD exit_code;
     if (GetExitCodeProcess((HANDLE) handle, &exit_code) == 0)
-        win32Error(env, "GetExitCodeProcess");
+        win32Error(env, L"GetExitCodeProcess");
     return exit_code;
 }
 
@@ -231,7 +281,7 @@ Java_java_lang_ProcessImpl_waitForInterruptibly(JNIEnv *env, jclass ignored, jlo
                                FALSE,    /* Wait for ANY event */
                                INFINITE)  /* Wait forever */
         == WAIT_FAILED)
-        win32Error(env, "WaitForMultipleObjects");
+        win32Error(env, L"WaitForMultipleObjects");
 }
 
 JNIEXPORT void JNICALL
@@ -250,7 +300,7 @@ Java_java_lang_ProcessImpl_waitForTimeoutInterruptibly(JNIEnv *env,
                                     dwTimeout);  /* Wait for dwTimeout */
 
     if (result == WAIT_FAILED)
-        win32Error(env, "WaitForMultipleObjects");
+        win32Error(env, L"WaitForMultipleObjects");
 }
 
 JNIEXPORT void JNICALL
@@ -263,7 +313,7 @@ JNIEXPORT jboolean JNICALL
 Java_java_lang_ProcessImpl_isProcessAlive(JNIEnv *env, jclass ignored, jlong handle)
 {
     DWORD dwExitStatus;
-    GetExitCodeProcess(handle, &dwExitStatus);
+    GetExitCodeProcess((HANDLE) handle, &dwExitStatus);
     return dwExitStatus == STILL_ACTIVE;
 }
 

From c6c6fe7b5e0fbb10c359d7b7396144bcb2fee2d0 Mon Sep 17 00:00:00 2001
From: Kumar Srinivasan 
Date: Fri, 19 Jul 2013 07:22:53 -0700
Subject: [PATCH 014/120] 8017216: javac doesn't fill in end position for some
 errors of type not found 8019421: Javac doesn't fill in end position for some
 annotation related errors 8019422: Javac doesn't fill in end position for
 uninitialized variable errors

Reviewed-by: jjg, mcimadamore
---
 .../com/sun/tools/javac/comp/Annotate.java    |   2 +-
 .../com/sun/tools/javac/comp/Attr.java        |   2 +
 .../com/sun/tools/javac/comp/Flow.java        |  54 ++++--
 .../sun/tools/javac/parser/JavacParser.java   |  12 +-
 .../tools/javac/resources/compiler.properties |   4 +
 .../com/sun/tools/javac/tree/EndPosTable.java |  11 +-
 .../VarNotIntializedInDefaultConstructor.java |  28 +++
 .../tools/javac/positions/TreeEndPosTest.java | 163 ++++++++++++++++++
 8 files changed, 244 insertions(+), 32 deletions(-)
 create mode 100644 langtools/test/tools/javac/diags/examples/VarNotIntializedInDefaultConstructor.java
 create mode 100644 langtools/test/tools/javac/positions/TreeEndPosTest.java

diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Annotate.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Annotate.java
index ebc6fa33863..39587558a46 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Annotate.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Annotate.java
@@ -273,7 +273,7 @@ public class Annotate {
                 continue;
             }
             JCIdent left = (JCIdent)assign.lhs;
-            Symbol method = rs.resolveQualifiedMethod(left.pos(),
+            Symbol method = rs.resolveQualifiedMethod(assign.rhs.pos(),
                                                           env,
                                                           a.type,
                                                           left.name,
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java
index 20bfc25d6b2..1c33d306c47 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -1948,6 +1948,8 @@ public class Attr extends JCTree.Visitor {
             clazzid1 = make.at(clazz.pos).Select(make.Type(encltype),
                                                  ((JCIdent) clazzid).name);
 
+            EndPosTable endPosTable = this.env.toplevel.endPositions;
+            endPosTable.storeEnd(clazzid1, tree.getEndPosition(endPosTable));
             if (clazz.hasTag(ANNOTATED_TYPE)) {
                 JCAnnotatedType annoType = (JCAnnotatedType) clazz;
                 List annos = annoType.annotations;
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java
index dbab4de383b..10ff59c4f74 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Flow.java
@@ -1339,7 +1339,7 @@ public class Flow {
 
         /** A mapping from addresses to variable symbols.
          */
-        VarSymbol[] vars;
+        JCVariableDecl[] vardecls;
 
         /** The current class being defined.
          */
@@ -1417,13 +1417,14 @@ public class Flow {
          *  to the next available sequence number and entering it under that
          *  index into the vars array.
          */
-        void newVar(VarSymbol sym) {
-            vars = ArrayUtils.ensureCapacity(vars, nextadr);
+        void newVar(JCVariableDecl varDecl) {
+            VarSymbol sym = varDecl.sym;
+            vardecls = ArrayUtils.ensureCapacity(vardecls, nextadr);
             if ((sym.flags() & FINAL) == 0) {
                 sym.flags_field |= EFFECTIVELY_FINAL;
             }
             sym.adr = nextadr;
-            vars[nextadr] = sym;
+            vardecls[nextadr] = varDecl;
             inits.excl(nextadr);
             uninits.incl(nextadr);
             nextadr++;
@@ -1493,11 +1494,13 @@ public class Flow {
         /** Check that trackable variable is initialized.
          */
         void checkInit(DiagnosticPosition pos, VarSymbol sym) {
+            checkInit(pos, sym, "var.might.not.have.been.initialized");
+        }
+        void checkInit(DiagnosticPosition pos, VarSymbol sym, String errkey) {
             if ((sym.adr >= firstadr || sym.owner.kind != TYP) &&
                 trackable(sym) &&
                 !inits.isMember(sym.adr)) {
-                log.error(pos, "var.might.not.have.been.initialized",
-                          sym);
+                log.error(pos, errkey, sym);
                 inits.incl(sym.adr);
             }
         }
@@ -1599,7 +1602,7 @@ public class Flow {
                         if ((def.mods.flags & STATIC) != 0) {
                             VarSymbol sym = def.sym;
                             if (trackable(sym))
-                                newVar(sym);
+                                newVar(def);
                         }
                     }
                 }
@@ -1619,7 +1622,7 @@ public class Flow {
                         if ((def.mods.flags & STATIC) == 0) {
                             VarSymbol sym = def.sym;
                             if (trackable(sym))
-                                newVar(sym);
+                                newVar(def);
                         }
                     }
                 }
@@ -1678,9 +1681,22 @@ public class Flow {
                 scan(tree.body);
 
                 if (isInitialConstructor) {
-                    for (int i = firstadr; i < nextadr; i++)
-                        if (vars[i].owner == classDef.sym)
-                            checkInit(TreeInfo.diagEndPos(tree.body), vars[i]);
+                    boolean isSynthesized = (tree.sym.flags() &
+                                             GENERATEDCONSTR) != 0;
+                    for (int i = firstadr; i < nextadr; i++) {
+                        JCVariableDecl vardecl = vardecls[i];
+                        VarSymbol var = vardecl.sym;
+                        if (var.owner == classDef.sym) {
+                            // choose the diagnostic position based on whether
+                            // the ctor is default(synthesized) or not
+                            if (isSynthesized) {
+                                checkInit(TreeInfo.diagnosticPositionFor(var, vardecl),
+                                    var, "var.not.initialized.in.default.constructor");
+                            } else {
+                                checkInit(TreeInfo.diagEndPos(tree.body), var);
+                            }
+                        }
+                    }
                 }
                 List exits = pendingExits.toList();
                 pendingExits = new ListBuffer();
@@ -1691,7 +1707,7 @@ public class Flow {
                     if (isInitialConstructor) {
                         inits.assign(exit.exit_inits);
                         for (int i = firstadr; i < nextadr; i++)
-                            checkInit(exit.tree.pos(), vars[i]);
+                            checkInit(exit.tree.pos(), vardecls[i].sym);
                     }
                 }
             } finally {
@@ -1706,7 +1722,7 @@ public class Flow {
 
         public void visitVarDef(JCVariableDecl tree) {
             boolean track = trackable(tree.sym);
-            if (track && tree.sym.owner.kind == MTH) newVar(tree.sym);
+            if (track && tree.sym.owner.kind == MTH) newVar(tree);
             if (tree.init != null) {
                 Lint lintPrev = lint;
                 lint = lint.augment(tree.sym);
@@ -2239,11 +2255,11 @@ public class Flow {
                 Flow.this.make = make;
                 startPos = tree.pos().getStartPosition();
 
-                if (vars == null)
-                    vars = new VarSymbol[32];
+                if (vardecls == null)
+                    vardecls = new JCVariableDecl[32];
                 else
-                    for (int i=0; i();
@@ -2255,8 +2271,8 @@ public class Flow {
                 startPos = -1;
                 resetBits(inits, uninits, uninitsTry, initsWhenTrue,
                         initsWhenFalse, uninitsWhenTrue, uninitsWhenFalse);
-                if (vars != null) for (int i=0; i();
         }
 
-        protected void storeEnd(JCTree tree, int endpos) {
+        public void storeEnd(JCTree tree, int endpos) {
             endPosMap.put(tree, errorEndPos > endpos ? errorEndPos : endpos);
         }
 
@@ -4091,7 +4091,7 @@ public class JavacParser implements Parser {
             super(parser);
         }
 
-        protected void storeEnd(JCTree tree, int endpos) { /* empty */ }
+        public void storeEnd(JCTree tree, int endpos) { /* empty */ }
 
         protected  T to(T t) {
             return t;
@@ -4126,14 +4126,6 @@ public class JavacParser implements Parser {
             this.parser = parser;
         }
 
-        /**
-         * Store ending position for a tree, the value of which is the greater
-         * of last error position and the given ending position.
-         * @param tree   The tree.
-         * @param endpos The ending position to associate with the tree.
-         */
-        protected abstract void storeEnd(JCTree tree, int endpos);
-
         /**
          * Store current token's ending position for a tree, the value of which
          * will be the greater of last error position and the ending position of
diff --git a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties
index 2487b7bef92..40f94c9a5cc 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties
+++ b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties
@@ -1068,6 +1068,10 @@ compiler.err.var.might.already.be.assigned=\
 compiler.err.var.might.not.have.been.initialized=\
     variable {0} might not have been initialized
 
+# 0: symbol
+compiler.err.var.not.initialized.in.default.constructor=\
+    variable {0} not initialized in the default constructor
+
 # 0: symbol
 compiler.err.var.might.be.assigned.in.loop=\
     variable {0} might be assigned in loop
diff --git a/langtools/src/share/classes/com/sun/tools/javac/tree/EndPosTable.java b/langtools/src/share/classes/com/sun/tools/javac/tree/EndPosTable.java
index 1f9eefa58b7..d68ba838ba1 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/EndPosTable.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/EndPosTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,11 +42,18 @@ public interface EndPosTable {
      */
     public int getEndPos(JCTree tree);
 
+    /**
+     * Store ending position for a tree, the value of which is the greater of
+     * last error position and the given ending position.
+     * @param tree The tree.
+     * @param endpos The ending position to associate with the tree.
+     */
+    public abstract void storeEnd(JCTree tree, int endpos);
+
     /**
      * Give an old tree and a new tree, the old tree will be replaced with
      * the new tree, the position of the new tree will be that of the old
      * tree.
-     * not exist.
      * @param oldtree a JCTree to be replaced
      * @param newtree a JCTree to be replaced with
      * @return position of the old tree or Positions.NOPOS for non-existent mapping
diff --git a/langtools/test/tools/javac/diags/examples/VarNotIntializedInDefaultConstructor.java b/langtools/test/tools/javac/diags/examples/VarNotIntializedInDefaultConstructor.java
new file mode 100644
index 00000000000..91f44a35a9b
--- /dev/null
+++ b/langtools/test/tools/javac/diags/examples/VarNotIntializedInDefaultConstructor.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// key: compiler.err.var.not.initialized.in.default.constructor
+
+class X {
+    final int j;
+}
diff --git a/langtools/test/tools/javac/positions/TreeEndPosTest.java b/langtools/test/tools/javac/positions/TreeEndPosTest.java
new file mode 100644
index 00000000000..961803762e1
--- /dev/null
+++ b/langtools/test/tools/javac/positions/TreeEndPosTest.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8017216 8019422 8019421
+ * @summary verify start and end positions
+ * @run main TreeEndPosTest
+ */
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+import javax.tools.Diagnostic;
+import javax.tools.DiagnosticCollector;
+import javax.tools.JavaCompiler;
+import javax.tools.JavaFileManager;
+import javax.tools.JavaFileObject;
+import javax.tools.SimpleJavaFileObject;
+import javax.tools.ToolProvider;
+
+public class TreeEndPosTest {
+    private static JavaFileManager getJavaFileManager(JavaCompiler compiler,
+            DiagnosticCollector dc) {
+        return compiler.getStandardFileManager(dc, null, null);
+    }
+
+    static class JavaSource extends SimpleJavaFileObject {
+
+        final String source;
+        int startPos;
+        int endPos;
+
+        private JavaSource(String filename, String source) {
+            super(URI.create("myfo:/" + filename), JavaFileObject.Kind.SOURCE);
+            this.source = source;
+        }
+
+        @Override
+        public CharSequence getCharContent(boolean ignoreEncodingErrors) {
+            return source;
+        }
+
+        static JavaSource createJavaSource(String preamble, String body,
+                String postamble, String expected) {
+            JavaSource js = createJavaSource(preamble, body, postamble, -1, -1);
+            js.startPos = js.source.indexOf(expected);
+            js.endPos   = js.startPos + expected.length();
+            return js;
+        }
+
+        static JavaSource createJavaSource(String body, String expected) {
+            return createJavaSource(null, body, null, expected);
+        }
+
+        private static JavaSource createJavaSource(String preamble, String body,
+                String postamble, int start, int end) {
+            final String name = "Bug";
+            StringBuilder code = new StringBuilder();
+            if (preamble != null) {
+                code.append(preamble);
+            }
+            code.append("public class " + name + "{");
+            if (body != null) {
+                code.append(body);
+            }
+            code.append("}");
+            if (postamble != null) {
+                code.append(postamble);
+            }
+            JavaSource js = new JavaSource(name + ".java", code.toString());
+            js.startPos = start;
+            js.endPos = end;
+            return js;
+        }
+    }
+
+    public static void main(String... args) throws IOException {
+        testUninitializedVariable();
+        testMissingAnnotationValue();
+        testFinalVariableWithDefaultConstructor();
+        testFinalVariableWithConstructor();
+    }
+
+    static void testUninitializedVariable() throws IOException {
+        compile(JavaSource.createJavaSource("Object o = new A().new B(); class A { }",
+                "B()"));
+    }
+    static void testMissingAnnotationValue() throws IOException {
+        compile(JavaSource.createJavaSource("@Foo(\"vvvv\")",
+                null, "@interface Foo { }", "\"vvvv\""));
+    }
+
+    static void testFinalVariableWithDefaultConstructor() throws IOException {
+        compile(JavaSource.createJavaSource("private static final String Foo; public void bar() { }",
+                "private static final String Foo;"));
+    }
+
+    static void testFinalVariableWithConstructor() throws IOException {
+        compile(JavaSource.createJavaSource("public Bug (){} private static final String Foo; public void bar() { }",
+                "{}"));
+    }
+
+    static void compile(JavaSource src) throws IOException {
+        ByteArrayOutputStream ba = new ByteArrayOutputStream();
+        PrintWriter writer = new PrintWriter(ba);
+        File tempDir = new File(".");
+        JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
+        DiagnosticCollector dc = new DiagnosticCollector();
+        JavaFileManager javaFileManager = getJavaFileManager(compiler, dc);
+        List options = new ArrayList<>();
+        options.add("-cp");
+        options.add(tempDir.getPath());
+        options.add("-d");
+        options.add(tempDir.getPath());
+        options.add("-XDshouldStopPolicy=GENERATE");
+
+        List sources = new ArrayList<>();
+        sources.add(src);
+        JavaCompiler.CompilationTask task =
+                compiler.getTask(writer, javaFileManager,
+                dc, options, null,
+                sources);
+        task.call();
+        for (Diagnostic diagnostic : (List) dc.getDiagnostics()) {
+            long actualStart = diagnostic.getStartPosition();
+            long actualEnd = diagnostic.getEndPosition();
+            System.out.println("Source: " + src.source);
+            System.out.println("Diagnostic: " + diagnostic);
+            System.out.print("Start position: Expected: " + src.startPos);
+            System.out.println(", Actual: " + actualStart);
+            System.out.print("End position: Expected: " + src.endPos);
+            System.out.println(", Actual: " + actualEnd);
+            if (src.startPos != actualStart || src.endPos != actualEnd) {
+                throw new RuntimeException("error: trees don't match");
+            }
+        }
+    }
+}

From 44bf260d2dcd751ec3c6cdd2d9d43ab51121efb9 Mon Sep 17 00:00:00 2001
From: Joe Darcy 
Date: Fri, 19 Jul 2013 09:42:58 -0700
Subject: [PATCH 015/120] 8020948: Fix doclint issues in misc package-info.java
 files

Reviewed-by: dholmes, chegar
---
 .../java/nio/file/attribute/package-info.java        | 12 ++++++------
 .../classes/java/util/function/package-info.java     |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/jdk/src/share/classes/java/nio/file/attribute/package-info.java b/jdk/src/share/classes/java/nio/file/attribute/package-info.java
index 222b7251f00..b0e87b64c76 100644
--- a/jdk/src/share/classes/java/nio/file/attribute/package-info.java
+++ b/jdk/src/share/classes/java/nio/file/attribute/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
  * Interfaces and classes providing access to file and file system attributes.
  *
  *

Value

Meaning

ValueMeaning
"r" Open for reading only. Invoking any of the write * methods of the resulting object will cause an {@link From 711f7a37e0204ed4afba210605f888d7ffccc24d Mon Sep 17 00:00:00 2001 From: Stephen Colebourne Date: Thu, 18 Jul 2013 11:02:02 -0700 Subject: [PATCH 011/120] 8016025: JSR 310 DateTime API Updates IV 8020418: Cleanup of -Xlint warnings in java.time 8016623: test/java/time/format/TestDateTimeTextProvider.java failing Integration of JSR310 Date/Time API update IV Co-authored-by: Roger Riggs Co-authored-by: Masayoshi Okutsu Co-authored-by: Patrick Zhang Co-authored-by: Chand Basha Reviewed-by: sherman --- .../share/classes/java/time/DayOfWeek.java | 4 +- jdk/src/share/classes/java/time/Duration.java | 6 +- jdk/src/share/classes/java/time/Instant.java | 60 +- .../share/classes/java/time/LocalDate.java | 70 +- .../classes/java/time/LocalDateTime.java | 62 +- .../share/classes/java/time/LocalTime.java | 59 +- jdk/src/share/classes/java/time/Month.java | 4 +- jdk/src/share/classes/java/time/MonthDay.java | 2 +- .../classes/java/time/OffsetDateTime.java | 104 ++- .../share/classes/java/time/OffsetTime.java | 50 +- jdk/src/share/classes/java/time/Period.java | 66 +- jdk/src/share/classes/java/time/Year.java | 58 +- .../share/classes/java/time/YearMonth.java | 60 +- jdk/src/share/classes/java/time/ZoneId.java | 36 +- .../share/classes/java/time/ZoneOffset.java | 6 +- .../share/classes/java/time/ZoneRegion.java | 14 - .../classes/java/time/ZonedDateTime.java | 63 +- .../java/time/chrono/ChronoDateImpl.java | 87 +- .../java/time/chrono/ChronoLocalDate.java | 105 ++- .../java/time/chrono/ChronoLocalDateTime.java | 59 +- .../time/chrono/ChronoLocalDateTimeImpl.java | 55 +- .../java/time/chrono/ChronoZonedDateTime.java | 59 +- .../time/chrono/ChronoZonedDateTimeImpl.java | 37 +- .../classes/java/time/chrono/Chronology.java | 398 ++++++--- .../share/classes/java/time/chrono/Era.java | 2 +- .../java/time/chrono/HijrahChronology.java | 31 +- .../classes/java/time/chrono/HijrahDate.java | 23 +- .../java/time/chrono/IsoChronology.java | 157 +--- .../java/time/chrono/JapaneseChronology.java | 216 +++-- .../java/time/chrono/JapaneseDate.java | 210 +++-- .../classes/java/time/chrono/JapaneseEra.java | 64 +- .../java/time/chrono/MinguoChronology.java | 14 +- .../classes/java/time/chrono/MinguoDate.java | 27 +- .../time/chrono/ThaiBuddhistChronology.java | 14 +- .../java/time/chrono/ThaiBuddhistDate.java | 15 +- .../java/time/chrono/package-info.java | 8 +- .../java/time/format/DateTimeFormatter.java | 4 +- .../time/format/DateTimeFormatterBuilder.java | 115 +-- .../time/format/DateTimePrintContext.java | 2 +- .../classes/java/time/format/Parsed.java | 40 +- .../java/time/temporal/ChronoField.java | 25 +- .../java/time/temporal/ChronoUnit.java | 40 +- .../classes/java/time/temporal/IsoFields.java | 117 +-- .../java/time/temporal/JulianFields.java | 26 +- .../classes/java/time/temporal/Temporal.java | 38 +- .../java/time/temporal/TemporalAccessor.java | 25 +- .../java/time/temporal/TemporalField.java | 123 +-- .../java/time/temporal/TemporalUnit.java | 59 +- .../java/time/temporal/ValueRange.java | 2 +- .../java/time/temporal/WeekFields.java | 268 ++++-- .../lib/hijrah-config-umalqura.properties | 427 ++++++++-- .../time/tck/java/time/MockSimplePeriod.java | 2 +- .../time/tck/java/time/TCKClock_Fixed.java | 1 + .../java/time/tck/java/time/TCKDayOfWeek.java | 38 + .../java/time/tck/java/time/TCKInstant.java | 44 +- .../java/time/tck/java/time/TCKLocalDate.java | 86 +- .../time/tck/java/time/TCKLocalDateTime.java | 72 +- .../java/time/tck/java/time/TCKLocalTime.java | 106 ++- .../java/time/tck/java/time/TCKMonth.java | 38 + .../java/time/tck/java/time/TCKMonthDay.java | 38 + .../time/tck/java/time/TCKOffsetDateTime.java | 77 ++ .../time/tck/java/time/TCKOffsetTime.java | 72 +- .../java/time/tck/java/time/TCKPeriod.java | 38 +- jdk/test/java/time/tck/java/time/TCKYear.java | 74 +- .../java/time/tck/java/time/TCKYearMonth.java | 74 +- .../java/time/tck/java/time/TCKZoneId.java | 47 ++ .../time/tck/java/time/TCKZonedDateTime.java | 124 ++- .../time/tck/java/time/chrono/CopticDate.java | 18 +- .../java/time/chrono/TCKChronoLocalDate.java | 98 ++- .../time/chrono/TCKChronoLocalDateTime.java | 40 +- .../time/chrono/TCKChronoZonedDateTime.java | 43 +- .../tck/java/time/chrono/TCKChronology.java | 132 ++- .../java/time/chrono/TCKHijrahChronology.java | 487 +++++++---- .../tck/java/time/chrono/TCKHijrahEra.java | 2 + .../java/time/chrono/TCKIsoChronology.java | 140 ++-- .../time/chrono/TCKJapaneseChronology.java | 780 ++++++++++++++++-- .../tck/java/time/chrono/TCKJapaneseEra.java | 5 +- .../java/time/chrono/TCKMinguoChronology.java | 449 +++++++++- .../chrono/TCKThaiBuddhistChronology.java | 514 +++++++++++- .../tck/java/time/format/TCKFormatStyle.java | 113 +++ .../java/time/format/TCKResolverStyle.java | 139 ++++ .../tck/java/time/format/TCKSignStyle.java | 137 +++ .../tck/java/time/format/TCKTextStyle.java | 10 + .../time/format/TCKZoneIdPrinterParser.java | 114 +-- .../java/time/temporal/TCKChronoField.java | 268 ++++++ .../tck/java/time/temporal/TCKChronoUnit.java | 187 +++++ .../tck/java/time/temporal/TCKWeekFields.java | 294 ++++++- .../time/tck/java/time/zone/TCKZoneRules.java | 136 +++ .../time/test/java/time/MockSimplePeriod.java | 2 +- .../java/time/chrono/TestChronoLocalDate.java | 101 +-- .../java/time/chrono/TestExampleCode.java | 44 +- .../time/chrono/TestJapaneseChronoImpl.java | 33 +- .../time/chrono/TestJapaneseChronology.java | 13 +- .../time/chrono/TestUmmAlQuraChronology.java | 659 +++++++++++++-- .../time/format/TestDateTimeTextProvider.java | 24 +- .../java/time/format/TestNonIsoFormatter.java | 6 +- .../java/time/format/TestNumberPrinter.java | 10 +- .../java/time/format/TestReducedPrinter.java | 2 +- .../java/time/temporal/MockFieldNoValue.java | 20 +- .../java/time/temporal/MockFieldValue.java | 2 +- 100 files changed, 7693 insertions(+), 1876 deletions(-) create mode 100644 jdk/test/java/time/tck/java/time/format/TCKFormatStyle.java create mode 100644 jdk/test/java/time/tck/java/time/format/TCKResolverStyle.java create mode 100644 jdk/test/java/time/tck/java/time/format/TCKSignStyle.java create mode 100644 jdk/test/java/time/tck/java/time/temporal/TCKChronoField.java create mode 100644 jdk/test/java/time/tck/java/time/temporal/TCKChronoUnit.java diff --git a/jdk/src/share/classes/java/time/DayOfWeek.java b/jdk/src/share/classes/java/time/DayOfWeek.java index d2a6f5aa541..b48482241df 100644 --- a/jdk/src/share/classes/java/time/DayOfWeek.java +++ b/jdk/src/share/classes/java/time/DayOfWeek.java @@ -61,7 +61,6 @@ */ package java.time; -import java.time.temporal.UnsupportedTemporalTypeException; import static java.time.temporal.ChronoField.DAY_OF_WEEK; import static java.time.temporal.ChronoUnit.DAYS; @@ -73,6 +72,7 @@ import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAdjuster; import java.time.temporal.TemporalField; import java.time.temporal.TemporalQuery; +import java.time.temporal.UnsupportedTemporalTypeException; import java.time.temporal.ValueRange; import java.time.temporal.WeekFields; import java.util.Locale; @@ -339,7 +339,7 @@ public enum DayOfWeek implements TemporalAccessor, TemporalAdjuster { if (field == DAY_OF_WEEK) { return getValue(); } else if (field instanceof ChronoField) { - throw new UnsupportedTemporalTypeException("Unsupported field: " + field.getName()); + throw new UnsupportedTemporalTypeException("Unsupported field: " + field); } return field.getFrom(this); } diff --git a/jdk/src/share/classes/java/time/Duration.java b/jdk/src/share/classes/java/time/Duration.java index 52b225e6e69..ab7da66f83a 100644 --- a/jdk/src/share/classes/java/time/Duration.java +++ b/jdk/src/share/classes/java/time/Duration.java @@ -459,9 +459,9 @@ public final class Duration */ public static Duration between(Temporal startInclusive, Temporal endExclusive) { try { - return ofNanos(startInclusive.periodUntil(endExclusive, NANOS)); + return ofNanos(startInclusive.until(endExclusive, NANOS)); } catch (DateTimeException | ArithmeticException ex) { - long secs = startInclusive.periodUntil(endExclusive, SECONDS); + long secs = startInclusive.until(endExclusive, SECONDS); long nanos; try { nanos = endExclusive.getLong(NANO_OF_SECOND) - startInclusive.getLong(NANO_OF_SECOND); @@ -523,7 +523,7 @@ public final class Duration } else if (unit == NANOS) { return nanos; } else { - throw new UnsupportedTemporalTypeException("Unsupported unit: " + unit.getName()); + throw new UnsupportedTemporalTypeException("Unsupported unit: " + unit); } } diff --git a/jdk/src/share/classes/java/time/Instant.java b/jdk/src/share/classes/java/time/Instant.java index 6dc24646945..aeecdbed524 100644 --- a/jdk/src/share/classes/java/time/Instant.java +++ b/jdk/src/share/classes/java/time/Instant.java @@ -69,6 +69,7 @@ import static java.time.temporal.ChronoField.INSTANT_SECONDS; import static java.time.temporal.ChronoField.MICRO_OF_SECOND; import static java.time.temporal.ChronoField.MILLI_OF_SECOND; import static java.time.temporal.ChronoField.NANO_OF_SECOND; +import static java.time.temporal.ChronoUnit.DAYS; import static java.time.temporal.ChronoUnit.NANOS; import java.io.DataInput; @@ -418,8 +419,9 @@ public final class Instant * Checks if the specified field is supported. *

* This checks if this instant can be queried for the specified field. - * If false, then calling the {@link #range(TemporalField) range} and - * {@link #get(TemporalField) get} methods will throw an exception. + * If false, then calling the {@link #range(TemporalField) range}, + * {@link #get(TemporalField) get} and {@link #with(TemporalField, long)} + * methods will throw an exception. *

* If the field is a {@link ChronoField} then the query is implemented here. * The supported fields are: @@ -447,6 +449,44 @@ public final class Instant return field != null && field.isSupportedBy(this); } + /** + * Checks if the specified unit is supported. + *

+ * This checks if the specified unit can be added to, or subtracted from, this date-time. + * If false, then calling the {@link #plus(long, TemporalUnit)} and + * {@link #minus(long, TemporalUnit) minus} methods will throw an exception. + *

+ * If the unit is a {@link ChronoUnit} then the query is implemented here. + * The supported units are: + *

    + *
  • {@code NANOS} + *
  • {@code MICROS} + *
  • {@code MILLIS} + *
  • {@code SECONDS} + *
  • {@code MINUTES} + *
  • {@code HOURS} + *
  • {@code HALF_DAYS} + *
  • {@code DAYS} + *
+ * All other {@code ChronoUnit} instances will return false. + *

+ * If the unit is not a {@code ChronoUnit}, then the result of this method + * is obtained by invoking {@code TemporalUnit.isSupportedBy(Temporal)} + * passing {@code this} as the argument. + * Whether the unit is supported is determined by the unit. + * + * @param unit the unit to check, null returns false + * @return true if the unit can be added/subtracted, false if not + */ + @Override + public boolean isSupported(TemporalUnit unit) { + if (unit instanceof ChronoUnit) { + return unit.isTimeBased() || unit == DAYS; + } + return unit != null && unit.isSupportedBy(this); + } + + //----------------------------------------------------------------------- /** * Gets the range of valid values for the specified field. *

@@ -511,7 +551,7 @@ public final class Instant case MILLI_OF_SECOND: return nanos / 1000_000; case INSTANT_SECONDS: INSTANT_SECONDS.checkValidIntValue(seconds); } - throw new UnsupportedTemporalTypeException("Unsupported field: " + field.getName()); + throw new UnsupportedTemporalTypeException("Unsupported field: " + field); } return range(field).checkValidIntValue(field.getFrom(this), field); } @@ -548,7 +588,7 @@ public final class Instant case MILLI_OF_SECOND: return nanos / 1000_000; case INSTANT_SECONDS: return seconds; } - throw new UnsupportedTemporalTypeException("Unsupported field: " + field.getName()); + throw new UnsupportedTemporalTypeException("Unsupported field: " + field); } return field.getFrom(this); } @@ -665,7 +705,7 @@ public final class Instant case NANO_OF_SECOND: return (newValue != nanos ? create(seconds, (int) newValue) : this); case INSTANT_SECONDS: return (newValue != seconds ? create(newValue, nanos) : this); } - throw new UnsupportedTemporalTypeException("Unsupported field: " + field.getName()); + throw new UnsupportedTemporalTypeException("Unsupported field: " + field); } return field.adjustInto(this, newValue); } @@ -807,7 +847,7 @@ public final class Instant case HALF_DAYS: return plusSeconds(Math.multiplyExact(amountToAdd, SECONDS_PER_DAY / 2)); case DAYS: return plusSeconds(Math.multiplyExact(amountToAdd, SECONDS_PER_DAY)); } - throw new UnsupportedTemporalTypeException("Unsupported unit: " + unit.getName()); + throw new UnsupportedTemporalTypeException("Unsupported unit: " + unit); } return unit.addTo(this, amountToAdd); } @@ -1053,14 +1093,14 @@ public final class Instant * complete units between the two instants. * The {@code Temporal} passed to this method must be an {@code Instant}. * For example, the amount in days between two dates can be calculated - * using {@code startInstant.periodUntil(endInstant, SECONDS)}. + * using {@code startInstant.until(endInstant, SECONDS)}. *

* There are two equivalent ways of using this method. * The first is to invoke this method. * The second is to use {@link TemporalUnit#between(Temporal, Temporal)}: * 

      *   // these two lines are equivalent
-     *   amount = start.periodUntil(end, SECONDS);
+     *   amount = start.until(end, SECONDS);
      *   amount = SECONDS.between(start, end);
      *
* The choice should be made based on which makes the code more readable. @@ -1085,7 +1125,7 @@ public final class Instant * @throws ArithmeticException if numeric overflow occurs */ @Override - public long periodUntil(Temporal endInstant, TemporalUnit unit) { + public long until(Temporal endInstant, TemporalUnit unit) { if (endInstant instanceof Instant == false) { Objects.requireNonNull(endInstant, "endInstant"); throw new DateTimeException("Unable to calculate amount as objects are of two different types"); @@ -1103,7 +1143,7 @@ public final class Instant case HALF_DAYS: return secondsUntil(end) / (12 * SECONDS_PER_HOUR); case DAYS: return secondsUntil(end) / (SECONDS_PER_DAY); } - throw new UnsupportedTemporalTypeException("Unsupported unit: " + unit.getName()); + throw new UnsupportedTemporalTypeException("Unsupported unit: " + unit); } return unit.between(this, endInstant); } diff --git a/jdk/src/share/classes/java/time/LocalDate.java b/jdk/src/share/classes/java/time/LocalDate.java index ede6d8326b9..d96f5b1fd1e 100644 --- a/jdk/src/share/classes/java/time/LocalDate.java +++ b/jdk/src/share/classes/java/time/LocalDate.java @@ -127,7 +127,7 @@ import java.util.Objects; * @since 1.8 */ public final class LocalDate - implements Temporal, TemporalAdjuster, ChronoLocalDate, Serializable { + implements Temporal, TemporalAdjuster, ChronoLocalDate, Serializable { /** * The minimum supported {@code LocalDate}, '-999999999-01-01'. @@ -466,8 +466,9 @@ public final class LocalDate * Checks if the specified field is supported. *

* This checks if this date can be queried for the specified field. - * If false, then calling the {@link #range(TemporalField) range} and - * {@link #get(TemporalField) get} methods will throw an exception. + * If false, then calling the {@link #range(TemporalField) range}, + * {@link #get(TemporalField) get} and {@link #with(TemporalField, long)} + * methods will throw an exception. *

* If the field is a {@link ChronoField} then the query is implemented here. * The supported fields are: @@ -501,6 +502,41 @@ public final class LocalDate return ChronoLocalDate.super.isSupported(field); } + /** + * Checks if the specified unit is supported. + *

+ * This checks if the specified unit can be added to, or subtracted from, this date-time. + * If false, then calling the {@link #plus(long, TemporalUnit)} and + * {@link #minus(long, TemporalUnit) minus} methods will throw an exception. + *

+ * If the unit is a {@link ChronoUnit} then the query is implemented here. + * The supported units are: + *

    + *
  • {@code DAYS} + *
  • {@code WEEKS} + *
  • {@code MONTHS} + *
  • {@code YEARS} + *
  • {@code DECADES} + *
  • {@code CENTURIES} + *
  • {@code MILLENNIA} + *
  • {@code ERAS} + *
+ * All other {@code ChronoUnit} instances will return false. + *

+ * If the unit is not a {@code ChronoUnit}, then the result of this method + * is obtained by invoking {@code TemporalUnit.isSupportedBy(Temporal)} + * passing {@code this} as the argument. + * Whether the unit is supported is determined by the unit. + * + * @param unit the unit to check, null returns false + * @return true if the unit can be added/subtracted, false if not + */ + @Override // override for Javadoc + public boolean isSupported(TemporalUnit unit) { + return ChronoLocalDate.super.isSupported(unit); + } + + //----------------------------------------------------------------------- /** * Gets the range of valid values for the specified field. *

@@ -538,7 +574,7 @@ public final class LocalDate } return field.range(); } - throw new UnsupportedTemporalTypeException("Unsupported field: " + field.getName()); + throw new UnsupportedTemporalTypeException("Unsupported field: " + field); } return field.rangeRefinedBy(this); } @@ -631,7 +667,7 @@ public final class LocalDate case YEAR: return year; case ERA: return (year >= 1 ? 1 : 0); } - throw new UnsupportedTemporalTypeException("Unsupported field: " + field.getName()); + throw new UnsupportedTemporalTypeException("Unsupported field: " + field); } private long getProlepticMonth() { @@ -988,7 +1024,7 @@ public final class LocalDate case YEAR: return withYear((int) newValue); case ERA: return (getLong(ERA) == newValue ? this : withYear(1 - year)); } - throw new UnsupportedTemporalTypeException("Unsupported field: " + field.getName()); + throw new UnsupportedTemporalTypeException("Unsupported field: " + field); } return field.adjustInto(this, newValue); } @@ -1187,7 +1223,7 @@ public final class LocalDate case MILLENNIA: return plusYears(Math.multiplyExact(amountToAdd, 1000)); case ERAS: return with(ERA, Math.addExact(getLong(ERA), amountToAdd)); } - throw new UnsupportedTemporalTypeException("Unsupported unit: " + unit.getName()); + throw new UnsupportedTemporalTypeException("Unsupported unit: " + unit); } return unit.addTo(this, amountToAdd); } @@ -1497,7 +1533,7 @@ public final class LocalDate * The result will be negative if the end is before the start. * The {@code Temporal} passed to this method must be a {@code LocalDate}. * For example, the amount in days between two dates can be calculated - * using {@code startDate.periodUntil(endDate, DAYS)}. + * using {@code startDate.until(endDate, DAYS)}. *

* The calculation returns a whole number, representing the number of * complete units between the two dates. @@ -1509,7 +1545,7 @@ public final class LocalDate * The second is to use {@link TemporalUnit#between(Temporal, Temporal)}: * 

      *   // these two lines are equivalent
-     *   amount = start.periodUntil(end, MONTHS);
+     *   amount = start.until(end, MONTHS);
      *   amount = MONTHS.between(start, end);
      *
* The choice should be made based on which makes the code more readable. @@ -1534,7 +1570,7 @@ public final class LocalDate * @throws ArithmeticException if numeric overflow occurs */ @Override - public long periodUntil(Temporal endDate, TemporalUnit unit) { + public long until(Temporal endDate, TemporalUnit unit) { Objects.requireNonNull(unit, "unit"); if (endDate instanceof LocalDate == false) { Objects.requireNonNull(endDate, "endDate"); @@ -1552,7 +1588,7 @@ public final class LocalDate case MILLENNIA: return monthsUntil(end) / 12000; case ERAS: return end.getLong(ERA) - getLong(ERA); } - throw new UnsupportedTemporalTypeException("Unsupported unit: " + unit.getName()); + throw new UnsupportedTemporalTypeException("Unsupported unit: " + unit); } return unit.between(this, endDate); } @@ -1591,7 +1627,7 @@ public final class LocalDate * The second is to use {@link Period#between(LocalDate, LocalDate)}: * 
      *   // these two lines are equivalent
-     *   period = start.periodUntil(end);
+     *   period = start.until(end);
      *   period = Period.between(start, end);
      *
* The choice should be made based on which makes the code more readable. @@ -1600,7 +1636,7 @@ public final class LocalDate * @return the period between this date and the end date, not null */ @Override - public Period periodUntil(ChronoLocalDate endDate) { + public Period until(ChronoLocalDate endDate) { LocalDate end = LocalDate.from(endDate); long totalMonths = end.getProlepticMonth() - this.getProlepticMonth(); // safe int days = end.day - this.day; @@ -1803,7 +1839,7 @@ public final class LocalDate * @return the comparator value, negative if less, positive if greater */ @Override // override for Javadoc and performance - public int compareTo(ChronoLocalDate other) { + public int compareTo(ChronoLocalDate other) { if (other instanceof LocalDate) { return compareTo0((LocalDate) other); } @@ -1843,7 +1879,7 @@ public final class LocalDate * @return true if this date is after the specified date */ @Override // override for Javadoc and performance - public boolean isAfter(ChronoLocalDate other) { + public boolean isAfter(ChronoLocalDate other) { if (other instanceof LocalDate) { return compareTo0((LocalDate) other) > 0; } @@ -1872,7 +1908,7 @@ public final class LocalDate * @return true if this date is before the specified date */ @Override // override for Javadoc and performance - public boolean isBefore(ChronoLocalDate other) { + public boolean isBefore(ChronoLocalDate other) { if (other instanceof LocalDate) { return compareTo0((LocalDate) other) < 0; } @@ -1901,7 +1937,7 @@ public final class LocalDate * @return true if this date is equal to the specified date */ @Override // override for Javadoc and performance - public boolean isEqual(ChronoLocalDate other) { + public boolean isEqual(ChronoLocalDate other) { if (other instanceof LocalDate) { return compareTo0((LocalDate) other) == 0; } diff --git a/jdk/src/share/classes/java/time/LocalDateTime.java b/jdk/src/share/classes/java/time/LocalDateTime.java index 6e6c87bc2ff..d68d6f52537 100644 --- a/jdk/src/share/classes/java/time/LocalDateTime.java +++ b/jdk/src/share/classes/java/time/LocalDateTime.java @@ -515,8 +515,9 @@ public final class LocalDateTime * Checks if the specified field is supported. *

* This checks if this date-time can be queried for the specified field. - * If false, then calling the {@link #range(TemporalField) range} and - * {@link #get(TemporalField) get} methods will throw an exception. + * If false, then calling the {@link #range(TemporalField) range}, + * {@link #get(TemporalField) get} and {@link #with(TemporalField, long)} + * methods will throw an exception. *

* If the field is a {@link ChronoField} then the query is implemented here. * The supported fields are: @@ -569,6 +570,48 @@ public final class LocalDateTime return field != null && field.isSupportedBy(this); } + /** + * Checks if the specified unit is supported. + *

+ * This checks if the specified unit can be added to, or subtracted from, this date-time. + * If false, then calling the {@link #plus(long, TemporalUnit)} and + * {@link #minus(long, TemporalUnit) minus} methods will throw an exception. + *

+ * If the unit is a {@link ChronoUnit} then the query is implemented here. + * The supported units are: + *

    + *
  • {@code NANOS} + *
  • {@code MICROS} + *
  • {@code MILLIS} + *
  • {@code SECONDS} + *
  • {@code MINUTES} + *
  • {@code HOURS} + *
  • {@code HALF_DAYS} + *
  • {@code DAYS} + *
  • {@code WEEKS} + *
  • {@code MONTHS} + *
  • {@code YEARS} + *
  • {@code DECADES} + *
  • {@code CENTURIES} + *
  • {@code MILLENNIA} + *
  • {@code ERAS} + *
+ * All other {@code ChronoUnit} instances will return false. + *

+ * If the unit is not a {@code ChronoUnit}, then the result of this method + * is obtained by invoking {@code TemporalUnit.isSupportedBy(Temporal)} + * passing {@code this} as the argument. + * Whether the unit is supported is determined by the unit. + * + * @param unit the unit to check, null returns false + * @return true if the unit can be added/subtracted, false if not + */ + @Override // override for Javadoc + public boolean isSupported(TemporalUnit unit) { + return ChronoLocalDateTime.super.isSupported(unit); + } + + //----------------------------------------------------------------------- /** * Gets the range of valid values for the specified field. *

@@ -1570,7 +1613,7 @@ public final class LocalDateTime * The result will be negative if the end is before the start. * The {@code Temporal} passed to this method must be a {@code LocalDateTime}. * For example, the amount in days between two date-times can be calculated - * using {@code startDateTime.periodUntil(endDateTime, DAYS)}. + * using {@code startDateTime.until(endDateTime, DAYS)}. *

* The calculation returns a whole number, representing the number of * complete units between the two date-times. @@ -1582,7 +1625,7 @@ public final class LocalDateTime * The second is to use {@link TemporalUnit#between(Temporal, Temporal)}: * 

      *   // these two lines are equivalent
-     *   amount = start.periodUntil(end, MONTHS);
+     *   amount = start.until(end, MONTHS);
      *   amount = MONTHS.between(start, end);
      *
* The choice should be made based on which makes the code more readable. @@ -1609,18 +1652,17 @@ public final class LocalDateTime * @throws ArithmeticException if numeric overflow occurs */ @Override - public long periodUntil(Temporal endDateTime, TemporalUnit unit) { + public long until(Temporal endDateTime, TemporalUnit unit) { if (endDateTime instanceof LocalDateTime == false) { Objects.requireNonNull(endDateTime, "endDateTime"); throw new DateTimeException("Unable to calculate amount as objects are of two different types"); } LocalDateTime end = (LocalDateTime) endDateTime; if (unit instanceof ChronoUnit) { - ChronoUnit f = (ChronoUnit) unit; - if (f.isTimeUnit()) { + if (unit.isTimeBased()) { long amount = date.daysUntil(end.date); if (amount == 0) { - return time.periodUntil(end.time, unit); + return time.until(end.time, unit); } long timePart = end.time.toNanoOfDay() - time.toNanoOfDay(); if (amount > 0) { @@ -1630,7 +1672,7 @@ public final class LocalDateTime amount++; // safe timePart -= NANOS_PER_DAY; // safe } - switch (f) { + switch ((ChronoUnit) unit) { case NANOS: amount = Math.multiplyExact(amount, NANOS_PER_DAY); break; @@ -1667,7 +1709,7 @@ public final class LocalDateTime } else if (endDate.isBefore(date) && end.time.isAfter(time)) { endDate = endDate.plusDays(1); } - return date.periodUntil(endDate, unit); + return date.until(endDate, unit); } return unit.between(this, endDateTime); } diff --git a/jdk/src/share/classes/java/time/LocalTime.java b/jdk/src/share/classes/java/time/LocalTime.java index 41b1a927560..2bace6e7bc9 100644 --- a/jdk/src/share/classes/java/time/LocalTime.java +++ b/jdk/src/share/classes/java/time/LocalTime.java @@ -470,8 +470,9 @@ public final class LocalTime * Checks if the specified field is supported. *

* This checks if this time can be queried for the specified field. - * If false, then calling the {@link #range(TemporalField) range} and - * {@link #get(TemporalField) get} methods will throw an exception. + * If false, then calling the {@link #range(TemporalField) range}, + * {@link #get(TemporalField) get} and {@link #with(TemporalField, long)} + * methods will throw an exception. *

* If the field is a {@link ChronoField} then the query is implemented here. * The supported fields are: @@ -510,6 +511,43 @@ public final class LocalTime return field != null && field.isSupportedBy(this); } + /** + * Checks if the specified unit is supported. + *

+ * This checks if the specified unit can be added to, or subtracted from, this date-time. + * If false, then calling the {@link #plus(long, TemporalUnit)} and + * {@link #minus(long, TemporalUnit) minus} methods will throw an exception. + *

+ * If the unit is a {@link ChronoUnit} then the query is implemented here. + * The supported units are: + *

    + *
  • {@code NANOS} + *
  • {@code MICROS} + *
  • {@code MILLIS} + *
  • {@code SECONDS} + *
  • {@code MINUTES} + *
  • {@code HOURS} + *
  • {@code HALF_DAYS} + *
+ * All other {@code ChronoUnit} instances will return false. + *

+ * If the unit is not a {@code ChronoUnit}, then the result of this method + * is obtained by invoking {@code TemporalUnit.isSupportedBy(Temporal)} + * passing {@code this} as the argument. + * Whether the unit is supported is determined by the unit. + * + * @param unit the unit to check, null returns false + * @return true if the unit can be added/subtracted, false if not + */ + @Override // override for Javadoc + public boolean isSupported(TemporalUnit unit) { + if (unit instanceof ChronoUnit) { + return unit.isTimeBased(); + } + return unit != null && unit.isSupportedBy(this); + } + + //----------------------------------------------------------------------- /** * Gets the range of valid values for the specified field. *

@@ -628,7 +666,7 @@ public final class LocalTime case CLOCK_HOUR_OF_DAY: return (hour == 0 ? 24 : hour); case AMPM_OF_DAY: return hour / 12; } - throw new UnsupportedTemporalTypeException("Unsupported field: " + field.getName()); + throw new UnsupportedTemporalTypeException("Unsupported field: " + field); } //----------------------------------------------------------------------- @@ -803,7 +841,7 @@ public final class LocalTime case CLOCK_HOUR_OF_DAY: return withHour((int) (newValue == 24 ? 0 : newValue)); case AMPM_OF_DAY: return plusHours((newValue - (hour / 12)) * 12); } - throw new UnsupportedTemporalTypeException("Unsupported field: " + field.getName()); + throw new UnsupportedTemporalTypeException("Unsupported field: " + field); } return field.adjustInto(this, newValue); } @@ -995,8 +1033,7 @@ public final class LocalTime @Override public LocalTime plus(long amountToAdd, TemporalUnit unit) { if (unit instanceof ChronoUnit) { - ChronoUnit f = (ChronoUnit) unit; - switch (f) { + switch ((ChronoUnit) unit) { case NANOS: return plusNanos(amountToAdd); case MICROS: return plusNanos((amountToAdd % MICROS_PER_DAY) * 1000); case MILLIS: return plusNanos((amountToAdd % MILLIS_PER_DAY) * 1000_000); @@ -1005,7 +1042,7 @@ public final class LocalTime case HOURS: return plusHours(amountToAdd); case HALF_DAYS: return plusHours((amountToAdd % 2) * 12); } - throw new UnsupportedTemporalTypeException("Unsupported unit: " + unit.getName()); + throw new UnsupportedTemporalTypeException("Unsupported unit: " + unit); } return unit.addTo(this, amountToAdd); } @@ -1295,7 +1332,7 @@ public final class LocalTime * The result will be negative if the end is before the start. * The {@code Temporal} passed to this method must be a {@code LocalTime}. * For example, the amount in hours between two times can be calculated - * using {@code startTime.periodUntil(endTime, HOURS)}. + * using {@code startTime.until(endTime, HOURS)}. *

* The calculation returns a whole number, representing the number of * complete units between the two times. @@ -1307,7 +1344,7 @@ public final class LocalTime * The second is to use {@link TemporalUnit#between(Temporal, Temporal)}: * 

      *   // these two lines are equivalent
-     *   amount = start.periodUntil(end, MINUTES);
+     *   amount = start.until(end, MINUTES);
      *   amount = MINUTES.between(start, end);
      *
* The choice should be made based on which makes the code more readable. @@ -1332,7 +1369,7 @@ public final class LocalTime * @throws ArithmeticException if numeric overflow occurs */ @Override - public long periodUntil(Temporal endTime, TemporalUnit unit) { + public long until(Temporal endTime, TemporalUnit unit) { if (endTime instanceof LocalTime == false) { Objects.requireNonNull(endTime, "endTime"); throw new DateTimeException("Unable to calculate amount as objects are of two different types"); @@ -1349,7 +1386,7 @@ public final class LocalTime case HOURS: return nanosUntil / NANOS_PER_HOUR; case HALF_DAYS: return nanosUntil / (12 * NANOS_PER_HOUR); } - throw new UnsupportedTemporalTypeException("Unsupported unit: " + unit.getName()); + throw new UnsupportedTemporalTypeException("Unsupported unit: " + unit); } return unit.between(this, endTime); } diff --git a/jdk/src/share/classes/java/time/Month.java b/jdk/src/share/classes/java/time/Month.java index 272e8f96b36..85d12d8f136 100644 --- a/jdk/src/share/classes/java/time/Month.java +++ b/jdk/src/share/classes/java/time/Month.java @@ -61,7 +61,6 @@ */ package java.time; -import java.time.temporal.UnsupportedTemporalTypeException; import static java.time.temporal.ChronoField.MONTH_OF_YEAR; import static java.time.temporal.ChronoUnit.MONTHS; @@ -75,6 +74,7 @@ import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAdjuster; import java.time.temporal.TemporalField; import java.time.temporal.TemporalQuery; +import java.time.temporal.UnsupportedTemporalTypeException; import java.time.temporal.ValueRange; import java.util.Locale; @@ -370,7 +370,7 @@ public enum Month implements TemporalAccessor, TemporalAdjuster { if (field == MONTH_OF_YEAR) { return getValue(); } else if (field instanceof ChronoField) { - throw new UnsupportedTemporalTypeException("Unsupported field: " + field.getName()); + throw new UnsupportedTemporalTypeException("Unsupported field: " + field); } return field.getFrom(this); } diff --git a/jdk/src/share/classes/java/time/MonthDay.java b/jdk/src/share/classes/java/time/MonthDay.java index 4204ef74a7d..06aa0437af8 100644 --- a/jdk/src/share/classes/java/time/MonthDay.java +++ b/jdk/src/share/classes/java/time/MonthDay.java @@ -438,7 +438,7 @@ public final class MonthDay case DAY_OF_MONTH: return day; case MONTH_OF_YEAR: return month; } - throw new UnsupportedTemporalTypeException("Unsupported field: " + field.getName()); + throw new UnsupportedTemporalTypeException("Unsupported field: " + field); } return field.getFrom(this); } diff --git a/jdk/src/share/classes/java/time/OffsetDateTime.java b/jdk/src/share/classes/java/time/OffsetDateTime.java index b053085a9f5..5641154cf3e 100644 --- a/jdk/src/share/classes/java/time/OffsetDateTime.java +++ b/jdk/src/share/classes/java/time/OffsetDateTime.java @@ -65,6 +65,7 @@ import static java.time.temporal.ChronoField.EPOCH_DAY; import static java.time.temporal.ChronoField.INSTANT_SECONDS; import static java.time.temporal.ChronoField.NANO_OF_DAY; import static java.time.temporal.ChronoField.OFFSET_SECONDS; +import static java.time.temporal.ChronoUnit.FOREVER; import static java.time.temporal.ChronoUnit.NANOS; import java.io.IOException; @@ -137,25 +138,40 @@ public final class OffsetDateTime public static final OffsetDateTime MAX = LocalDateTime.MAX.atOffset(ZoneOffset.MIN); /** - * Comparator for two {@code OffsetDateTime} instances based solely on the instant. + * Gets a comparator that compares two {@code OffsetDateTime} instances + * based solely on the instant. *

* This method differs from the comparison in {@link #compareTo} in that it * only compares the underlying instant. * + * @return a comparator that compares in time-line order + * * @see #isAfter * @see #isBefore * @see #isEqual */ - public static final Comparator INSTANT_COMPARATOR = new Comparator() { - @Override - public int compare(OffsetDateTime datetime1, OffsetDateTime datetime2) { - int cmp = Long.compare(datetime1.toEpochSecond(), datetime2.toEpochSecond()); - if (cmp == 0) { - cmp = Long.compare(datetime1.toLocalTime().toNanoOfDay(), datetime2.toLocalTime().toNanoOfDay()); - } - return cmp; + public static Comparator timeLineOrder() { + return OffsetDateTime::compareInstant; + } + + /** + * Compares this {@code OffsetDateTime} to another date-time. + * The comparison is based on the instant. + * + * @param datetime1 the first date-time to compare, not null + * @param datetime2 the other date-time to compare to, not null + * @return the comparator value, negative if less, positive if greater + */ + private static int compareInstant(OffsetDateTime datetime1, OffsetDateTime datetime2) { + if (datetime1.getOffset().equals(datetime2.getOffset())) { + return datetime1.toLocalDateTime().compareTo(datetime2.toLocalDateTime()); } - }; + int cmp = Long.compare(datetime1.toEpochSecond(), datetime2.toEpochSecond()); + if (cmp == 0) { + cmp = datetime1.toLocalTime().getNano() - datetime2.toLocalTime().getNano(); + } + return cmp; + } /** * Serialization version. @@ -406,8 +422,9 @@ public final class OffsetDateTime * Checks if the specified field is supported. *

* This checks if this date-time can be queried for the specified field. - * If false, then calling the {@link #range(TemporalField) range} and - * {@link #get(TemporalField) get} methods will throw an exception. + * If false, then calling the {@link #range(TemporalField) range}, + * {@link #get(TemporalField) get} and {@link #with(TemporalField, long)} + * methods will throw an exception. *

* If the field is a {@link ChronoField} then the query is implemented here. * The supported fields are: @@ -458,6 +475,51 @@ public final class OffsetDateTime return field instanceof ChronoField || (field != null && field.isSupportedBy(this)); } + /** + * Checks if the specified unit is supported. + *

+ * This checks if the specified unit can be added to, or subtracted from, this date-time. + * If false, then calling the {@link #plus(long, TemporalUnit)} and + * {@link #minus(long, TemporalUnit) minus} methods will throw an exception. + *

+ * If the unit is a {@link ChronoUnit} then the query is implemented here. + * The supported units are: + *

    + *
  • {@code NANOS} + *
  • {@code MICROS} + *
  • {@code MILLIS} + *
  • {@code SECONDS} + *
  • {@code MINUTES} + *
  • {@code HOURS} + *
  • {@code HALF_DAYS} + *
  • {@code DAYS} + *
  • {@code WEEKS} + *
  • {@code MONTHS} + *
  • {@code YEARS} + *
  • {@code DECADES} + *
  • {@code CENTURIES} + *
  • {@code MILLENNIA} + *
  • {@code ERAS} + *
+ * All other {@code ChronoUnit} instances will return false. + *

+ * If the unit is not a {@code ChronoUnit}, then the result of this method + * is obtained by invoking {@code TemporalUnit.isSupportedBy(Temporal)} + * passing {@code this} as the argument. + * Whether the unit is supported is determined by the unit. + * + * @param unit the unit to check, null returns false + * @return true if the unit can be added/subtracted, false if not + */ + @Override // override for Javadoc + public boolean isSupported(TemporalUnit unit) { + if (unit instanceof ChronoUnit) { + return unit != FOREVER; + } + return unit != null && unit.isSupportedBy(this); + } + + //----------------------------------------------------------------------- /** * Gets the range of valid values for the specified field. *

@@ -1528,7 +1590,7 @@ public final class OffsetDateTime * The start and end points are {@code this} and the specified date-time. * The result will be negative if the end is before the start. * For example, the period in days between two date-times can be calculated - * using {@code startDateTime.periodUntil(endDateTime, DAYS)}. + * using {@code startDateTime.until(endDateTime, DAYS)}. *

* The {@code Temporal} passed to this method must be an {@code OffsetDateTime}. * If the offset differs between the two date-times, the specified @@ -1544,7 +1606,7 @@ public final class OffsetDateTime * The second is to use {@link TemporalUnit#between(Temporal, Temporal)}: * 

      *   // these two lines are equivalent
-     *   amount = start.periodUntil(end, MONTHS);
+     *   amount = start.until(end, MONTHS);
      *   amount = MONTHS.between(start, end);
      *
* The choice should be made based on which makes the code more readable. @@ -1571,7 +1633,7 @@ public final class OffsetDateTime * @throws ArithmeticException if numeric overflow occurs */ @Override - public long periodUntil(Temporal endDateTime, TemporalUnit unit) { + public long until(Temporal endDateTime, TemporalUnit unit) { if (endDateTime instanceof OffsetDateTime == false) { Objects.requireNonNull(endDateTime, "endDateTime"); throw new DateTimeException("Unable to calculate amount as objects are of two different types"); @@ -1579,7 +1641,7 @@ public final class OffsetDateTime if (unit instanceof ChronoUnit) { OffsetDateTime end = (OffsetDateTime) endDateTime; end = end.withOffsetSameInstant(offset); - return dateTime.periodUntil(end.dateTime, unit); + return dateTime.until(end.dateTime, unit); } return unit.between(this, endDateTime); } @@ -1724,15 +1786,9 @@ public final class OffsetDateTime */ @Override public int compareTo(OffsetDateTime other) { - if (getOffset().equals(other.getOffset())) { - return toLocalDateTime().compareTo(other.toLocalDateTime()); - } - int cmp = Long.compare(toEpochSecond(), other.toEpochSecond()); + int cmp = compareInstant(this, other); if (cmp == 0) { - cmp = toLocalTime().getNano() - other.toLocalTime().getNano(); - if (cmp == 0) { - cmp = toLocalDateTime().compareTo(other.toLocalDateTime()); - } + cmp = toLocalDateTime().compareTo(other.toLocalDateTime()); } return cmp; } diff --git a/jdk/src/share/classes/java/time/OffsetTime.java b/jdk/src/share/classes/java/time/OffsetTime.java index ff990696942..2872cff4b26 100644 --- a/jdk/src/share/classes/java/time/OffsetTime.java +++ b/jdk/src/share/classes/java/time/OffsetTime.java @@ -348,8 +348,9 @@ public final class OffsetTime * Checks if the specified field is supported. *

* This checks if this time can be queried for the specified field. - * If false, then calling the {@link #range(TemporalField) range} and - * {@link #get(TemporalField) get} methods will throw an exception. + * If false, then calling the {@link #range(TemporalField) range}, + * {@link #get(TemporalField) get} and {@link #with(TemporalField, long)} + * methods will throw an exception. *

* If the field is a {@link ChronoField} then the query is implemented here. * The supported fields are: @@ -389,6 +390,43 @@ public final class OffsetTime return field != null && field.isSupportedBy(this); } + /** + * Checks if the specified unit is supported. + *

+ * This checks if the specified unit can be added to, or subtracted from, this date-time. + * If false, then calling the {@link #plus(long, TemporalUnit)} and + * {@link #minus(long, TemporalUnit) minus} methods will throw an exception. + *

+ * If the unit is a {@link ChronoUnit} then the query is implemented here. + * The supported units are: + *

    + *
  • {@code NANOS} + *
  • {@code MICROS} + *
  • {@code MILLIS} + *
  • {@code SECONDS} + *
  • {@code MINUTES} + *
  • {@code HOURS} + *
  • {@code HALF_DAYS} + *
+ * All other {@code ChronoUnit} instances will return false. + *

+ * If the unit is not a {@code ChronoUnit}, then the result of this method + * is obtained by invoking {@code TemporalUnit.isSupportedBy(Temporal)} + * passing {@code this} as the argument. + * Whether the unit is supported is determined by the unit. + * + * @param unit the unit to check, null returns false + * @return true if the unit can be added/subtracted, false if not + */ + @Override // override for Javadoc + public boolean isSupported(TemporalUnit unit) { + if (unit instanceof ChronoUnit) { + return unit.isTimeBased(); + } + return unit != null && unit.isSupportedBy(this); + } + + //----------------------------------------------------------------------- /** * Gets the range of valid values for the specified field. *

@@ -1084,7 +1122,7 @@ public final class OffsetTime * The start and end points are {@code this} and the specified time. * The result will be negative if the end is before the start. * For example, the period in hours between two times can be calculated - * using {@code startTime.periodUntil(endTime, HOURS)}. + * using {@code startTime.until(endTime, HOURS)}. *

* The {@code Temporal} passed to this method must be an {@code OffsetTime}. * If the offset differs between the two times, then the specified @@ -1100,7 +1138,7 @@ public final class OffsetTime * The second is to use {@link TemporalUnit#between(Temporal, Temporal)}: * 

      *   // these two lines are equivalent
-     *   amount = start.periodUntil(end, MINUTES);
+     *   amount = start.until(end, MINUTES);
      *   amount = MINUTES.between(start, end);
      *
* The choice should be made based on which makes the code more readable. @@ -1125,7 +1163,7 @@ public final class OffsetTime * @throws ArithmeticException if numeric overflow occurs */ @Override - public long periodUntil(Temporal endTime, TemporalUnit unit) { + public long until(Temporal endTime, TemporalUnit unit) { if (endTime instanceof OffsetTime == false) { Objects.requireNonNull(endTime, "endTime"); throw new DateTimeException("Unable to calculate amount as objects are of two different types"); @@ -1142,7 +1180,7 @@ public final class OffsetTime case HOURS: return nanosUntil / NANOS_PER_HOUR; case HALF_DAYS: return nanosUntil / (12 * NANOS_PER_HOUR); } - throw new UnsupportedTemporalTypeException("Unsupported unit: " + unit.getName()); + throw new UnsupportedTemporalTypeException("Unsupported unit: " + unit); } return unit.between(this, endTime); } diff --git a/jdk/src/share/classes/java/time/Period.java b/jdk/src/share/classes/java/time/Period.java index b2748f089ce..45980d08740 100644 --- a/jdk/src/share/classes/java/time/Period.java +++ b/jdk/src/share/classes/java/time/Period.java @@ -139,7 +139,7 @@ public final class Period * The pattern for parsing. */ private final static Pattern PATTERN = - Pattern.compile("([-+]?)P(?:([-+]?[0-9]+)Y)?(?:([-+]?[0-9]+)M)?(?:([-+]?[0-9]+)D)?", Pattern.CASE_INSENSITIVE); + Pattern.compile("([-+]?)P(?:([-+]?[0-9]+)Y)?(?:([-+]?[0-9]+)M)?(?:([-+]?[0-9]+)W)?(?:([-+]?[0-9]+)D)?", Pattern.CASE_INSENSITIVE); /** * The set of supported units. */ @@ -186,6 +186,20 @@ public final class Period return create(0, months, 0); } + /** + * Obtains a {@code Period} representing a number of weeks. + *

+ * The resulting period will be day-based, with the amount of days + * equal to the number of weeks multiplied by 7. + * The years and months units will be zero. + * + * @param weeks the number of weeks, positive or negative + * @return the period, with the input weeks converted to days, not null + */ + public static Period ofWeeks(int weeks) { + return create(0, 0, Math.multiplyExact(weeks, 7)); + } + /** * Obtains a {@code Period} representing a number of days. *

@@ -257,22 +271,36 @@ public final class Period * Obtains a {@code Period} from a text string such as {@code PnYnMnD}. *

* This will parse the string produced by {@code toString()} which is - * based on the ISO-8601 period format {@code PnYnMnD}. + * based on the ISO-8601 period formats {@code PnYnMnD} and {@code PnW}. *

* The string starts with an optional sign, denoted by the ASCII negative * or positive symbol. If negative, the whole period is negated. * The ASCII letter "P" is next in upper or lower case. - * There are then three sections, each consisting of a number and a suffix. - * At least one of the three sections must be present. - * The sections have suffixes in ASCII of "Y", "M" and "D" for - * years, months and days, accepted in upper or lower case. + * There are then four sections, each consisting of a number and a suffix. + * At least one of the four sections must be present. + * The sections have suffixes in ASCII of "Y", "M", "W" and "D" for + * years, months, weeks and days, accepted in upper or lower case. * The suffixes must occur in order. * The number part of each section must consist of ASCII digits. * The number may be prefixed by the ASCII negative or positive symbol. * The number must parse to an {@code int}. *

* The leading plus/minus sign, and negative values for other units are - * not part of the ISO-8601 standard. + * not part of the ISO-8601 standard. In addition, ISO-8601 does not + * permit mixing between the {@code PnYnMnD} and {@code PnW} formats. + * Any week-based input is multiplied by 7 and treated as a number of days. + *

+ * For example, the following are valid inputs: + * 

+     *   "P2Y"             -- Period.ofYears(2)
+     *   "P3M"             -- Period.ofMonths(3)
+     *   "P4W"             -- Period.ofWeeks(4)
+     *   "P5D"             -- Period.ofDays(5)
+     *   "P1Y2M3D"         -- Period.of(1, 2, 3)
+     *   "P1Y2M3W4D"       -- Period.of(1, 2, 25)
+     *   "P-1Y2M"          -- Period.of(-1, 2, 0)
+     *   "-P1Y2M"          -- Period.of(-1, -2, 0)
+     *
* * @param text the text to parse, not null * @return the parsed period, not null @@ -285,14 +313,18 @@ public final class Period int negate = ("-".equals(matcher.group(1)) ? -1 : 1); String yearMatch = matcher.group(2); String monthMatch = matcher.group(3); - String dayMatch = matcher.group(4); - if (yearMatch != null || monthMatch != null || dayMatch != null) { + String weekMatch = matcher.group(4); + String dayMatch = matcher.group(5); + if (yearMatch != null || monthMatch != null || dayMatch != null || weekMatch != null) { try { - return create(parseNumber(text, yearMatch, negate), - parseNumber(text, monthMatch, negate), - parseNumber(text, dayMatch, negate)); + int years = parseNumber(text, yearMatch, negate); + int months = parseNumber(text, monthMatch, negate); + int weeks = parseNumber(text, weekMatch, negate); + int days = parseNumber(text, dayMatch, negate); + days = Math.addExact(days, Math.multiplyExact(weeks, 7)); + return create(years, months, days); } catch (NumberFormatException ex) { - throw (DateTimeParseException) new DateTimeParseException("Text cannot be parsed to a Period", text, 0).initCause(ex); + throw new DateTimeParseException("Text cannot be parsed to a Period", text, 0, ex); } } } @@ -307,7 +339,7 @@ public final class Period try { return Math.multiplyExact(val, negate); } catch (ArithmeticException ex) { - throw (DateTimeParseException) new DateTimeParseException("Text cannot be parsed to a Period", text, 0).initCause(ex); + throw new DateTimeParseException("Text cannot be parsed to a Period", text, 0, ex); } } @@ -329,10 +361,10 @@ public final class Period * @param startDate the start date, inclusive, not null * @param endDate the end date, exclusive, not null * @return the period between this date and the end date, not null - * @see ChronoLocalDate#periodUntil(ChronoLocalDate) + * @see ChronoLocalDate#until(ChronoLocalDate) */ public static Period between(LocalDate startDate, LocalDate endDate) { - return startDate.periodUntil(endDate); + return startDate.until(endDate); } //----------------------------------------------------------------------- @@ -386,7 +418,7 @@ public final class Period } else if (unit == ChronoUnit.DAYS) { return getDays(); } else { - throw new UnsupportedTemporalTypeException("Unsupported unit: " + unit.getName()); + throw new UnsupportedTemporalTypeException("Unsupported unit: " + unit); } } diff --git a/jdk/src/share/classes/java/time/Year.java b/jdk/src/share/classes/java/time/Year.java index c2d9974d79a..fb180d859cb 100644 --- a/jdk/src/share/classes/java/time/Year.java +++ b/jdk/src/share/classes/java/time/Year.java @@ -64,6 +64,10 @@ package java.time; import static java.time.temporal.ChronoField.ERA; import static java.time.temporal.ChronoField.YEAR; import static java.time.temporal.ChronoField.YEAR_OF_ERA; +import static java.time.temporal.ChronoUnit.CENTURIES; +import static java.time.temporal.ChronoUnit.DECADES; +import static java.time.temporal.ChronoUnit.ERAS; +import static java.time.temporal.ChronoUnit.MILLENNIA; import static java.time.temporal.ChronoUnit.YEARS; import java.io.DataInput; @@ -329,8 +333,9 @@ public final class Year * Checks if the specified field is supported. *

* This checks if this year can be queried for the specified field. - * If false, then calling the {@link #range(TemporalField) range} and - * {@link #get(TemporalField) get} methods will throw an exception. + * If false, then calling the {@link #range(TemporalField) range}, + * {@link #get(TemporalField) get} and {@link #with(TemporalField, long)} + * methods will throw an exception. *

* If the field is a {@link ChronoField} then the query is implemented here. * The supported fields are: @@ -357,6 +362,41 @@ public final class Year return field != null && field.isSupportedBy(this); } + /** + * Checks if the specified unit is supported. + *

+ * This checks if the specified unit can be added to, or subtracted from, this date-time. + * If false, then calling the {@link #plus(long, TemporalUnit)} and + * {@link #minus(long, TemporalUnit) minus} methods will throw an exception. + *

+ * If the unit is a {@link ChronoUnit} then the query is implemented here. + * The supported units are: + *

    + *
  • {@code YEARS} + *
  • {@code DECADES} + *
  • {@code CENTURIES} + *
  • {@code MILLENNIA} + *
  • {@code ERAS} + *
+ * All other {@code ChronoUnit} instances will return false. + *

+ * If the unit is not a {@code ChronoUnit}, then the result of this method + * is obtained by invoking {@code TemporalUnit.isSupportedBy(Temporal)} + * passing {@code this} as the argument. + * Whether the unit is supported is determined by the unit. + * + * @param unit the unit to check, null returns false + * @return true if the unit can be added/subtracted, false if not + */ + @Override + public boolean isSupported(TemporalUnit unit) { + if (unit instanceof ChronoUnit) { + return unit == YEARS || unit == DECADES || unit == CENTURIES || unit == MILLENNIA || unit == ERAS; + } + return unit != null && unit.isSupportedBy(this); + } + + //----------------------------------------------------------------------- /** * Gets the range of valid values for the specified field. *

@@ -450,7 +490,7 @@ public final class Year case YEAR: return year; case ERA: return (year < 1 ? 0 : 1); } - throw new UnsupportedTemporalTypeException("Unsupported field: " + field.getName()); + throw new UnsupportedTemporalTypeException("Unsupported field: " + field); } return field.getFrom(this); } @@ -575,7 +615,7 @@ public final class Year case YEAR: return Year.of((int) newValue); case ERA: return (getLong(ERA) == newValue ? this : Year.of(1 - year)); } - throw new UnsupportedTemporalTypeException("Unsupported field: " + field.getName()); + throw new UnsupportedTemporalTypeException("Unsupported field: " + field); } return field.adjustInto(this, newValue); } @@ -664,7 +704,7 @@ public final class Year case MILLENNIA: return plusYears(Math.multiplyExact(amountToAdd, 1000)); case ERAS: return with(ERA, Math.addExact(getLong(ERA), amountToAdd)); } - throw new UnsupportedTemporalTypeException("Unsupported unit: " + unit.getName()); + throw new UnsupportedTemporalTypeException("Unsupported unit: " + unit); } return unit.addTo(this, amountToAdd); } @@ -821,7 +861,7 @@ public final class Year * The result will be negative if the end is before the start. * The {@code Temporal} passed to this method must be a {@code Year}. * For example, the period in decades between two year can be calculated - * using {@code startYear.periodUntil(endYear, DECADES)}. + * using {@code startYear.until(endYear, DECADES)}. *

* The calculation returns a whole number, representing the number of * complete units between the two years. @@ -833,7 +873,7 @@ public final class Year * The second is to use {@link TemporalUnit#between(Temporal, Temporal)}: * 

      *   // these two lines are equivalent
-     *   amount = start.periodUntil(end, YEARS);
+     *   amount = start.until(end, YEARS);
      *   amount = YEARS.between(start, end);
      *
* The choice should be made based on which makes the code more readable. @@ -858,7 +898,7 @@ public final class Year * @throws ArithmeticException if numeric overflow occurs */ @Override - public long periodUntil(Temporal endYear, TemporalUnit unit) { + public long until(Temporal endYear, TemporalUnit unit) { if (endYear instanceof Year == false) { Objects.requireNonNull(endYear, "endYear"); throw new DateTimeException("Unable to calculate amount as objects are of two different types"); @@ -873,7 +913,7 @@ public final class Year case MILLENNIA: return yearsUntil / 1000; case ERAS: return end.getLong(ERA) - getLong(ERA); } - throw new UnsupportedTemporalTypeException("Unsupported unit: " + unit.getName()); + throw new UnsupportedTemporalTypeException("Unsupported unit: " + unit); } return unit.between(this, endYear); } diff --git a/jdk/src/share/classes/java/time/YearMonth.java b/jdk/src/share/classes/java/time/YearMonth.java index 855774eed1a..1d974095336 100644 --- a/jdk/src/share/classes/java/time/YearMonth.java +++ b/jdk/src/share/classes/java/time/YearMonth.java @@ -66,7 +66,12 @@ import static java.time.temporal.ChronoField.MONTH_OF_YEAR; import static java.time.temporal.ChronoField.PROLEPTIC_MONTH; import static java.time.temporal.ChronoField.YEAR; import static java.time.temporal.ChronoField.YEAR_OF_ERA; +import static java.time.temporal.ChronoUnit.CENTURIES; +import static java.time.temporal.ChronoUnit.DECADES; +import static java.time.temporal.ChronoUnit.ERAS; +import static java.time.temporal.ChronoUnit.MILLENNIA; import static java.time.temporal.ChronoUnit.MONTHS; +import static java.time.temporal.ChronoUnit.YEARS; import java.io.DataInput; import java.io.DataOutput; @@ -313,8 +318,9 @@ public final class YearMonth * Checks if the specified field is supported. *

* This checks if this year-month can be queried for the specified field. - * If false, then calling the {@link #range(TemporalField) range} and - * {@link #get(TemporalField) get} methods will throw an exception. + * If false, then calling the {@link #range(TemporalField) range}, + * {@link #get(TemporalField) get} and {@link #with(TemporalField, long)} + * methods will throw an exception. *

* If the field is a {@link ChronoField} then the query is implemented here. * The supported fields are: @@ -344,6 +350,42 @@ public final class YearMonth return field != null && field.isSupportedBy(this); } + /** + * Checks if the specified unit is supported. + *

+ * This checks if the specified unit can be added to, or subtracted from, this date-time. + * If false, then calling the {@link #plus(long, TemporalUnit)} and + * {@link #minus(long, TemporalUnit) minus} methods will throw an exception. + *

+ * If the unit is a {@link ChronoUnit} then the query is implemented here. + * The supported units are: + *

    + *
  • {@code MONTHS} + *
  • {@code YEARS} + *
  • {@code DECADES} + *
  • {@code CENTURIES} + *
  • {@code MILLENNIA} + *
  • {@code ERAS} + *
+ * All other {@code ChronoUnit} instances will return false. + *

+ * If the unit is not a {@code ChronoUnit}, then the result of this method + * is obtained by invoking {@code TemporalUnit.isSupportedBy(Temporal)} + * passing {@code this} as the argument. + * Whether the unit is supported is determined by the unit. + * + * @param unit the unit to check, null returns false + * @return true if the unit can be added/subtracted, false if not + */ + @Override + public boolean isSupported(TemporalUnit unit) { + if (unit instanceof ChronoUnit) { + return unit == MONTHS || unit == YEARS || unit == DECADES || unit == CENTURIES || unit == MILLENNIA || unit == ERAS; + } + return unit != null && unit.isSupportedBy(this); + } + + //----------------------------------------------------------------------- /** * Gets the range of valid values for the specified field. *

@@ -440,7 +482,7 @@ public final class YearMonth case YEAR: return year; case ERA: return (year < 1 ? 0 : 1); } - throw new UnsupportedTemporalTypeException("Unsupported field: " + field.getName()); + throw new UnsupportedTemporalTypeException("Unsupported field: " + field); } return field.getFrom(this); } @@ -639,7 +681,7 @@ public final class YearMonth case YEAR: return withYear((int) newValue); case ERA: return (getLong(ERA) == newValue ? this : withYear(1 - year)); } - throw new UnsupportedTemporalTypeException("Unsupported field: " + field.getName()); + throw new UnsupportedTemporalTypeException("Unsupported field: " + field); } return field.adjustInto(this, newValue); } @@ -761,7 +803,7 @@ public final class YearMonth case MILLENNIA: return plusYears(Math.multiplyExact(amountToAdd, 1000)); case ERAS: return with(ERA, Math.addExact(getLong(ERA), amountToAdd)); } - throw new UnsupportedTemporalTypeException("Unsupported unit: " + unit.getName()); + throw new UnsupportedTemporalTypeException("Unsupported unit: " + unit); } return unit.addTo(this, amountToAdd); } @@ -952,7 +994,7 @@ public final class YearMonth * The result will be negative if the end is before the start. * The {@code Temporal} passed to this method must be a {@code YearMonth}. * For example, the period in years between two year-months can be calculated - * using {@code startYearMonth.periodUntil(endYearMonth, YEARS)}. + * using {@code startYearMonth.until(endYearMonth, YEARS)}. *

* The calculation returns a whole number, representing the number of * complete units between the two year-months. @@ -964,7 +1006,7 @@ public final class YearMonth * The second is to use {@link TemporalUnit#between(Temporal, Temporal)}: * 

      *   // these two lines are equivalent
-     *   amount = start.periodUntil(end, MONTHS);
+     *   amount = start.until(end, MONTHS);
      *   amount = MONTHS.between(start, end);
      *
* The choice should be made based on which makes the code more readable. @@ -989,7 +1031,7 @@ public final class YearMonth * @throws ArithmeticException if numeric overflow occurs */ @Override - public long periodUntil(Temporal endYearMonth, TemporalUnit unit) { + public long until(Temporal endYearMonth, TemporalUnit unit) { if (endYearMonth instanceof YearMonth == false) { Objects.requireNonNull(endYearMonth, "endYearMonth"); throw new DateTimeException("Unable to calculate amount as objects are of two different types"); @@ -1005,7 +1047,7 @@ public final class YearMonth case MILLENNIA: return monthsUntil / 12000; case ERAS: return end.getLong(ERA) - getLong(ERA); } - throw new UnsupportedTemporalTypeException("Unsupported unit: " + unit.getName()); + throw new UnsupportedTemporalTypeException("Unsupported unit: " + unit); } return unit.between(this, endYearMonth); } diff --git a/jdk/src/share/classes/java/time/ZoneId.java b/jdk/src/share/classes/java/time/ZoneId.java index 026f73ef512..dcde85ae884 100644 --- a/jdk/src/share/classes/java/time/ZoneId.java +++ b/jdk/src/share/classes/java/time/ZoneId.java @@ -400,6 +400,36 @@ public abstract class ZoneId implements Serializable { return of(zoneId, true); } + /** + * Obtains an instance of {@code ZoneId} wrapping an offset. + *

+ * If the prefix is "GMT", "UTC", or "UT" a {@code ZoneId} + * with the prefix and the non-zero offset is returned. + * If the prefix is empty {@code ""} the {@code ZoneOffset} is returned. + * + * @param prefix the time-zone ID, not null + * @param offset the offset, not null + * @return the zone ID, not null + * @throws IllegalArgumentException if the prefix is not one of + * "GMT", "UTC", or "UT", or "" + */ + public static ZoneId ofOffset(String prefix, ZoneOffset offset) { + Objects.requireNonNull(prefix, "prefix"); + Objects.requireNonNull(offset, "offset"); + if (prefix.length() == 0) { + return offset; + } + + if (!prefix.equals("GMT") && !prefix.equals("UTC") && !prefix.equals("UT")) { + throw new IllegalArgumentException("prefix should be GMT, UTC or UT, is: " + prefix); + } + + if (offset.getTotalSeconds() != 0) { + prefix = prefix.concat(offset.getId()); + } + return new ZoneRegion(prefix, offset.getRules()); + } + /** * Parses the ID, taking a flag to indicate whether {@code ZoneRulesException} * should be thrown or not, used in deserialization. @@ -433,7 +463,7 @@ public abstract class ZoneId implements Serializable { private static ZoneId ofWithPrefix(String zoneId, int prefixLength, boolean checkAvailable) { String prefix = zoneId.substring(0, prefixLength); if (zoneId.length() == prefixLength) { - return ZoneRegion.ofPrefixedOffset(prefix, ZoneOffset.UTC); + return ofOffset(prefix, ZoneOffset.UTC); } if (zoneId.charAt(prefixLength) != '+' && zoneId.charAt(prefixLength) != '-') { return ZoneRegion.ofId(zoneId, checkAvailable); // drop through to ZoneRulesProvider @@ -441,9 +471,9 @@ public abstract class ZoneId implements Serializable { try { ZoneOffset offset = ZoneOffset.of(zoneId.substring(prefixLength)); if (offset == ZoneOffset.UTC) { - return ZoneRegion.ofPrefixedOffset(prefix, offset); + return ofOffset(prefix, offset); } - return ZoneRegion.ofPrefixedOffset(prefix + offset.toString(), offset); + return ofOffset(prefix, offset); } catch (DateTimeException ex) { throw new DateTimeException("Invalid ID for offset-based ZoneId: " + zoneId, ex); } diff --git a/jdk/src/share/classes/java/time/ZoneOffset.java b/jdk/src/share/classes/java/time/ZoneOffset.java index 4bbc4e4fa84..c5e4d056ee8 100644 --- a/jdk/src/share/classes/java/time/ZoneOffset.java +++ b/jdk/src/share/classes/java/time/ZoneOffset.java @@ -61,7 +61,6 @@ */ package java.time; -import java.time.temporal.UnsupportedTemporalTypeException; import static java.time.LocalTime.MINUTES_PER_HOUR; import static java.time.LocalTime.SECONDS_PER_HOUR; import static java.time.LocalTime.SECONDS_PER_MINUTE; @@ -79,6 +78,7 @@ import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAdjuster; import java.time.temporal.TemporalField; import java.time.temporal.TemporalQuery; +import java.time.temporal.UnsupportedTemporalTypeException; import java.time.temporal.ValueRange; import java.time.zone.ZoneRules; import java.util.Objects; @@ -581,7 +581,7 @@ public final class ZoneOffset if (field == OFFSET_SECONDS) { return totalSeconds; } else if (field instanceof ChronoField) { - throw new UnsupportedTemporalTypeException("Unsupported field: " + field.getName()); + throw new UnsupportedTemporalTypeException("Unsupported field: " + field); } return range(field).checkValidIntValue(getLong(field), field); } @@ -613,7 +613,7 @@ public final class ZoneOffset if (field == OFFSET_SECONDS) { return totalSeconds; } else if (field instanceof ChronoField) { - throw new UnsupportedTemporalTypeException("Unsupported field: " + field.getName()); + throw new UnsupportedTemporalTypeException("Unsupported field: " + field); } return field.getFrom(this); } diff --git a/jdk/src/share/classes/java/time/ZoneRegion.java b/jdk/src/share/classes/java/time/ZoneRegion.java index af6a5405a69..66d30709d98 100644 --- a/jdk/src/share/classes/java/time/ZoneRegion.java +++ b/jdk/src/share/classes/java/time/ZoneRegion.java @@ -66,7 +66,6 @@ import java.time.zone.ZoneRules; import java.time.zone.ZoneRulesException; import java.time.zone.ZoneRulesProvider; import java.util.Objects; -import java.util.regex.Pattern; /** * A geographical region where the same time-zone rules apply. @@ -153,19 +152,6 @@ final class ZoneRegion extends ZoneId implements Serializable { } } - /** - * Obtains an instance of {@code ZoneId} wrapping an offset. - *

- * For example, zone IDs like 'UTC', 'GMT', 'UT' and 'UTC+01:30' will be setup here. - * - * @param zoneId the time-zone ID, not null - * @param offset the offset, not null - * @return the zone ID, not null - */ - static ZoneRegion ofPrefixedOffset(String zoneId, ZoneOffset offset) { - return new ZoneRegion(zoneId, offset.getRules()); - } - //------------------------------------------------------------------------- /** * Constructor. diff --git a/jdk/src/share/classes/java/time/ZonedDateTime.java b/jdk/src/share/classes/java/time/ZonedDateTime.java index e7ed5551d33..151470ecf93 100644 --- a/jdk/src/share/classes/java/time/ZonedDateTime.java +++ b/jdk/src/share/classes/java/time/ZonedDateTime.java @@ -642,8 +642,9 @@ public final class ZonedDateTime * Checks if the specified field is supported. *

* This checks if this date-time can be queried for the specified field. - * If false, then calling the {@link #range(TemporalField) range} and - * {@link #get(TemporalField) get} methods will throw an exception. + * If false, then calling the {@link #range(TemporalField) range}, + * {@link #get(TemporalField) get} and {@link #with(TemporalField, long)} + * methods will throw an exception. *

* If the field is a {@link ChronoField} then the query is implemented here. * The supported fields are: @@ -694,6 +695,48 @@ public final class ZonedDateTime return field instanceof ChronoField || (field != null && field.isSupportedBy(this)); } + /** + * Checks if the specified unit is supported. + *

+ * This checks if the specified unit can be added to, or subtracted from, this date-time. + * If false, then calling the {@link #plus(long, TemporalUnit)} and + * {@link #minus(long, TemporalUnit) minus} methods will throw an exception. + *

+ * If the unit is a {@link ChronoUnit} then the query is implemented here. + * The supported units are: + *

    + *
  • {@code NANOS} + *
  • {@code MICROS} + *
  • {@code MILLIS} + *
  • {@code SECONDS} + *
  • {@code MINUTES} + *
  • {@code HOURS} + *
  • {@code HALF_DAYS} + *
  • {@code DAYS} + *
  • {@code WEEKS} + *
  • {@code MONTHS} + *
  • {@code YEARS} + *
  • {@code DECADES} + *
  • {@code CENTURIES} + *
  • {@code MILLENNIA} + *
  • {@code ERAS} + *
+ * All other {@code ChronoUnit} instances will return false. + *

+ * If the unit is not a {@code ChronoUnit}, then the result of this method + * is obtained by invoking {@code TemporalUnit.isSupportedBy(Temporal)} + * passing {@code this} as the argument. + * Whether the unit is supported is determined by the unit. + * + * @param unit the unit to check, null returns false + * @return true if the unit can be added/subtracted, false if not + */ + @Override // override for Javadoc + public boolean isSupported(TemporalUnit unit) { + return ChronoZonedDateTime.super.isSupported(unit); + } + + //----------------------------------------------------------------------- /** * Gets the range of valid values for the specified field. *

@@ -1540,8 +1583,7 @@ public final class ZonedDateTime @Override public ZonedDateTime plus(long amountToAdd, TemporalUnit unit) { if (unit instanceof ChronoUnit) { - ChronoUnit u = (ChronoUnit) unit; - if (u.isDateUnit()) { + if (unit.isDateBased()) { return resolveLocal(dateTime.plus(amountToAdd, unit)); } else { return resolveInstant(dateTime.plus(amountToAdd, unit)); @@ -1990,7 +2032,7 @@ public final class ZonedDateTime * The start and end points are {@code this} and the specified date-time. * The result will be negative if the end is before the start. * For example, the period in days between two date-times can be calculated - * using {@code startDateTime.periodUntil(endDateTime, DAYS)}. + * using {@code startDateTime.until(endDateTime, DAYS)}. *

* The {@code Temporal} passed to this method must be a {@code ZonedDateTime}. * If the time-zone differs between the two zoned date-times, the specified @@ -2006,7 +2048,7 @@ public final class ZonedDateTime * The second is to use {@link TemporalUnit#between(Temporal, Temporal)}: * 

      *   // these two lines are equivalent
-     *   amount = start.periodUntil(end, MONTHS);
+     *   amount = start.until(end, MONTHS);
      *   amount = MONTHS.between(start, end);
      *
* The choice should be made based on which makes the code more readable. @@ -2047,7 +2089,7 @@ public final class ZonedDateTime * @throws ArithmeticException if numeric overflow occurs */ @Override - public long periodUntil(Temporal endDateTime, TemporalUnit unit) { + public long until(Temporal endDateTime, TemporalUnit unit) { if (endDateTime instanceof ZonedDateTime == false) { Objects.requireNonNull(endDateTime, "endDateTime"); throw new DateTimeException("Unable to calculate amount as objects are of two different types"); @@ -2055,11 +2097,10 @@ public final class ZonedDateTime if (unit instanceof ChronoUnit) { ZonedDateTime end = (ZonedDateTime) endDateTime; end = end.withZoneSameInstant(zone); - ChronoUnit u = (ChronoUnit) unit; - if (u.isDateUnit()) { - return dateTime.periodUntil(end.dateTime, unit); + if (unit.isDateBased()) { + return dateTime.until(end.dateTime, unit); } else { - return toOffsetDateTime().periodUntil(end.toOffsetDateTime(), unit); + return toOffsetDateTime().until(end.toOffsetDateTime(), unit); } } return unit.between(this, endDateTime); diff --git a/jdk/src/share/classes/java/time/chrono/ChronoDateImpl.java b/jdk/src/share/classes/java/time/chrono/ChronoDateImpl.java index 14e2bf58f2a..99ba58f05b9 100644 --- a/jdk/src/share/classes/java/time/chrono/ChronoDateImpl.java +++ b/jdk/src/share/classes/java/time/chrono/ChronoDateImpl.java @@ -67,6 +67,8 @@ import java.time.DateTimeException; import java.time.temporal.ChronoUnit; import java.time.temporal.Temporal; import java.time.temporal.TemporalAdjuster; +import java.time.temporal.TemporalAmount; +import java.time.temporal.TemporalField; import java.time.temporal.TemporalUnit; import java.time.temporal.UnsupportedTemporalTypeException; import java.time.temporal.ValueRange; @@ -96,12 +98,12 @@ import java.util.Objects; * // Enumerate the list of available calendars and print today for each * Set<Chronology> chronos = Chronology.getAvailableChronologies(); * for (Chronology chrono : chronos) { - * ChronoLocalDate<?> date = chrono.dateNow(); + * ChronoLocalDate date = chrono.dateNow(); * System.out.printf(" %20s: %s%n", chrono.getID(), date.toString()); * } * * // Print the Hijrah date and calendar - * ChronoLocalDate<?> date = Chronology.of("Hijrah").dateNow(); + * ChronoLocalDate date = Chronology.of("Hijrah").dateNow(); * int day = date.get(ChronoField.DAY_OF_MONTH); * int dow = date.get(ChronoField.DAY_OF_WEEK); * int month = date.get(ChronoField.MONTH_OF_YEAR); @@ -110,10 +112,10 @@ import java.util.Objects; * dow, day, month, year); * // Print today's date and the last day of the year - * ChronoLocalDate<?> now1 = Chronology.of("Hijrah").dateNow(); - * ChronoLocalDate<?> first = now1.with(ChronoField.DAY_OF_MONTH, 1) + * ChronoLocalDate now1 = Chronology.of("Hijrah").dateNow(); + * ChronoLocalDate first = now1.with(ChronoField.DAY_OF_MONTH, 1) * .with(ChronoField.MONTH_OF_YEAR, 1); - * ChronoLocalDate<?> last = first.plus(1, ChronoUnit.YEARS) + * ChronoLocalDate last = first.plus(1, ChronoUnit.YEARS) * .minus(1, ChronoUnit.DAYS); * System.out.printf(" Today is %s: start: %s; end: %s%n", last.getChronology().getID(), * first, last); @@ -138,22 +140,61 @@ import java.util.Objects; * @param the ChronoLocalDate of this date-time * @since 1.8 */ -abstract class ChronoDateImpl> - implements ChronoLocalDate, Temporal, TemporalAdjuster, Serializable { +abstract class ChronoDateImpl + implements ChronoLocalDate, Temporal, TemporalAdjuster, Serializable { /** * Serialization version. */ private static final long serialVersionUID = 6282433883239719096L; + /** + * Casts the {@code Temporal} to {@code ChronoLocalDate} ensuring it bas the specified chronology. + * + * @param chrono the chronology to check for, not null + * @param temporal a date-time to cast, not null + * @return the date-time checked and cast to {@code ChronoLocalDate}, not null + * @throws ClassCastException if the date-time cannot be cast to ChronoLocalDate + * or the chronology is not equal this Chronology + */ + static D ensureValid(Chronology chrono, Temporal temporal) { + @SuppressWarnings("unchecked") + D other = (D) temporal; + if (chrono.equals(other.getChronology()) == false) { + throw new ClassCastException("Chronology mismatch, expected: " + chrono.getId() + ", actual: " + other.getChronology().getId()); + } + return other; + } + + //----------------------------------------------------------------------- /** * Creates an instance. */ ChronoDateImpl() { } + @Override + @SuppressWarnings("unchecked") + public D with(TemporalAdjuster adjuster) { + return (D) ChronoLocalDate.super.with(adjuster); + } + + @Override + @SuppressWarnings("unchecked") + public D with(TemporalField field, long value) { + return (D) ChronoLocalDate.super.with(field, value); + } + //----------------------------------------------------------------------- @Override + @SuppressWarnings("unchecked") + public D plus(TemporalAmount amount) { + return (D) ChronoLocalDate.super.plus(amount); + } + + //----------------------------------------------------------------------- + @Override + @SuppressWarnings("unchecked") public D plus(long amountToAdd, TemporalUnit unit) { if (unit instanceof ChronoUnit) { ChronoUnit f = (ChronoUnit) unit; @@ -167,9 +208,21 @@ abstract class ChronoDateImpl> case MILLENNIA: return plusYears(Math.multiplyExact(amountToAdd, 1000)); case ERAS: return with(ERA, Math.addExact(getLong(ERA), amountToAdd)); } - throw new UnsupportedTemporalTypeException("Unsupported unit: " + unit.getName()); + throw new UnsupportedTemporalTypeException("Unsupported unit: " + unit); } - return ChronoLocalDate.super.plus(amountToAdd, unit); + return (D) ChronoLocalDate.super.plus(amountToAdd, unit); + } + + @Override + @SuppressWarnings("unchecked") + public D minus(TemporalAmount amount) { + return (D) ChronoLocalDate.super.minus(amount); + } + + @Override + @SuppressWarnings("unchecked") + public D minus(long amountToSubtract, TemporalUnit unit) { + return (D) ChronoLocalDate.super.minus(amountToSubtract, unit); } //----------------------------------------------------------------------- @@ -254,6 +307,7 @@ abstract class ChronoDateImpl> * @return a date based on this one with the years subtracted, not null * @throws DateTimeException if the result exceeds the supported date range */ + @SuppressWarnings("unchecked") D minusYears(long yearsToSubtract) { return (yearsToSubtract == Long.MIN_VALUE ? ((ChronoDateImpl)plusYears(Long.MAX_VALUE)).plusYears(1) : plusYears(-yearsToSubtract)); } @@ -274,6 +328,7 @@ abstract class ChronoDateImpl> * @return a date based on this one with the months subtracted, not null * @throws DateTimeException if the result exceeds the supported date range */ + @SuppressWarnings("unchecked") D minusMonths(long monthsToSubtract) { return (monthsToSubtract == Long.MIN_VALUE ? ((ChronoDateImpl)plusMonths(Long.MAX_VALUE)).plusMonths(1) : plusMonths(-monthsToSubtract)); } @@ -293,6 +348,7 @@ abstract class ChronoDateImpl> * @return a date based on this one with the weeks subtracted, not null * @throws DateTimeException if the result exceeds the supported date range */ + @SuppressWarnings("unchecked") D minusWeeks(long weeksToSubtract) { return (weeksToSubtract == Long.MIN_VALUE ? ((ChronoDateImpl)plusWeeks(Long.MAX_VALUE)).plusWeeks(1) : plusWeeks(-weeksToSubtract)); } @@ -310,6 +366,7 @@ abstract class ChronoDateImpl> * @return a date based on this one with the days subtracted, not null * @throws DateTimeException if the result exceeds the supported date range */ + @SuppressWarnings("unchecked") D minusDays(long daysToSubtract) { return (daysToSubtract == Long.MIN_VALUE ? ((ChronoDateImpl)plusDays(Long.MAX_VALUE)).plusDays(1) : plusDays(-daysToSubtract)); } @@ -321,13 +378,13 @@ abstract class ChronoDateImpl> * @throws ArithmeticException {@inheritDoc} */ @Override - public long periodUntil(Temporal endDateTime, TemporalUnit unit) { + public long until(Temporal endDateTime, TemporalUnit unit) { Objects.requireNonNull(endDateTime, "endDateTime"); Objects.requireNonNull(unit, "unit"); if (endDateTime instanceof ChronoLocalDate == false) { throw new DateTimeException("Unable to calculate amount as objects are of two different types"); } - ChronoLocalDate end = (ChronoLocalDate) endDateTime; + ChronoLocalDate end = (ChronoLocalDate) endDateTime; if (getChronology().equals(end.getChronology()) == false) { throw new DateTimeException("Unable to calculate amount as objects have different chronologies"); } @@ -342,16 +399,16 @@ abstract class ChronoDateImpl> case MILLENNIA: return monthsUntil(end) / 12000; case ERAS: return end.getLong(ERA) - getLong(ERA); } - throw new UnsupportedTemporalTypeException("Unsupported unit: " + unit.getName()); + throw new UnsupportedTemporalTypeException("Unsupported unit: " + unit); } return unit.between(this, endDateTime); } - private long daysUntil(ChronoLocalDate end) { + private long daysUntil(ChronoLocalDate end) { return end.toEpochDay() - toEpochDay(); // no overflow } - private long monthsUntil(ChronoLocalDate end) { + private long monthsUntil(ChronoLocalDate end) { ValueRange range = getChronology().range(MONTH_OF_YEAR); if (range.getMaximum() != 12) { throw new IllegalStateException("ChronoDateImpl only supports Chronologies with 12 months per year"); @@ -367,7 +424,7 @@ abstract class ChronoDateImpl> return true; } if (obj instanceof ChronoLocalDate) { - return compareTo((ChronoLocalDate) obj) == 0; + return compareTo((ChronoLocalDate) obj) == 0; } return false; } diff --git a/jdk/src/share/classes/java/time/chrono/ChronoLocalDate.java b/jdk/src/share/classes/java/time/chrono/ChronoLocalDate.java index 31c08260d6e..923e8960b0f 100644 --- a/jdk/src/share/classes/java/time/chrono/ChronoLocalDate.java +++ b/jdk/src/share/classes/java/time/chrono/ChronoLocalDate.java @@ -242,11 +242,10 @@ import java.util.Objects; * Additional calendar systems may be added to the system. * See {@link Chronology} for more details. * - * @param the concrete type for the date * @since 1.8 */ -public interface ChronoLocalDate> - extends Temporal, TemporalAdjuster, Comparable> { +public interface ChronoLocalDate + extends Temporal, TemporalAdjuster, Comparable { /** * Gets a comparator that compares {@code ChronoLocalDate} in @@ -263,7 +262,7 @@ public interface ChronoLocalDate> * @see #isBefore * @see #isEqual */ - static Comparator> timeLineOrder() { + static Comparator timeLineOrder() { return Chronology.DATE_ORDER; } @@ -289,9 +288,9 @@ public interface ChronoLocalDate> * @throws DateTimeException if unable to convert to a {@code ChronoLocalDate} * @see Chronology#date(TemporalAccessor) */ - static ChronoLocalDate from(TemporalAccessor temporal) { + static ChronoLocalDate from(TemporalAccessor temporal) { if (temporal instanceof ChronoLocalDate) { - return (ChronoLocalDate) temporal; + return (ChronoLocalDate) temporal; } Chronology chrono = temporal.query(TemporalQuery.chronology()); if (chrono == null) { @@ -367,6 +366,25 @@ public interface ChronoLocalDate> return (isLeapYear() ? 366 : 365); } + /** + * Checks if the specified field is supported. + *

+ * This checks if the specified field can be queried on this date. + * If false, then calling the {@link #range(TemporalField) range}, + * {@link #get(TemporalField) get} and {@link #with(TemporalField, long)} + * methods will throw an exception. + *

+ * The set of supported fields is defined by the chronology and normally includes + * all {@code ChronoField} date fields. + *

+ * If the field is not a {@code ChronoField}, then the result of this method + * is obtained by invoking {@code TemporalField.isSupportedBy(TemporalAccessor)} + * passing {@code this} as the argument. + * Whether the field is supported is determined by the field. + * + * @param field the field to check, null returns false + * @return true if the field can be queried, false if not + */ @Override default boolean isSupported(TemporalField field) { if (field instanceof ChronoField) { @@ -375,6 +393,32 @@ public interface ChronoLocalDate> return field != null && field.isSupportedBy(this); } + /** + * Checks if the specified unit is supported. + *

+ * This checks if the specified unit can be added to or subtracted from this date. + * If false, then calling the {@link #plus(long, TemporalUnit)} and + * {@link #minus(long, TemporalUnit) minus} methods will throw an exception. + *

+ * The set of supported units is defined by the chronology and normally includes + * all {@code ChronoUnit} date units except {@code FOREVER}. + *

+ * If the unit is not a {@code ChronoUnit}, then the result of this method + * is obtained by invoking {@code TemporalUnit.isSupportedBy(Temporal)} + * passing {@code this} as the argument. + * Whether the unit is supported is determined by the unit. + * + * @param unit the unit to check, null returns false + * @return true if the unit can be added/subtracted, false if not + */ + @Override + default boolean isSupported(TemporalUnit unit) { + if (unit instanceof ChronoUnit) { + return unit.isDateBased(); + } + return unit != null && unit.isSupportedBy(this); + } + //----------------------------------------------------------------------- // override for covariant return type /** @@ -383,8 +427,8 @@ public interface ChronoLocalDate> * @throws ArithmeticException {@inheritDoc} */ @Override - default D with(TemporalAdjuster adjuster) { - return (D) getChronology().ensureChronoLocalDate(Temporal.super.with(adjuster)); + default ChronoLocalDate with(TemporalAdjuster adjuster) { + return ChronoDateImpl.ensureValid(getChronology(), Temporal.super.with(adjuster)); } /** @@ -394,11 +438,11 @@ public interface ChronoLocalDate> * @throws ArithmeticException {@inheritDoc} */ @Override - default D with(TemporalField field, long newValue) { + default ChronoLocalDate with(TemporalField field, long newValue) { if (field instanceof ChronoField) { - throw new UnsupportedTemporalTypeException("Unsupported field: " + field.getName()); + throw new UnsupportedTemporalTypeException("Unsupported field: " + field); } - return (D) getChronology().ensureChronoLocalDate(field.adjustInto(this, newValue)); + return ChronoDateImpl.ensureValid(getChronology(), field.adjustInto(this, newValue)); } /** @@ -407,8 +451,8 @@ public interface ChronoLocalDate> * @throws ArithmeticException {@inheritDoc} */ @Override - default D plus(TemporalAmount amount) { - return (D) getChronology().ensureChronoLocalDate(Temporal.super.plus(amount)); + default ChronoLocalDate plus(TemporalAmount amount) { + return ChronoDateImpl.ensureValid(getChronology(), Temporal.super.plus(amount)); } /** @@ -417,11 +461,11 @@ public interface ChronoLocalDate> * @throws ArithmeticException {@inheritDoc} */ @Override - default D plus(long amountToAdd, TemporalUnit unit) { + default ChronoLocalDate plus(long amountToAdd, TemporalUnit unit) { if (unit instanceof ChronoUnit) { - throw new UnsupportedTemporalTypeException("Unsupported unit: " + unit.getName()); + throw new UnsupportedTemporalTypeException("Unsupported unit: " + unit); } - return (D) getChronology().ensureChronoLocalDate(unit.addTo(this, amountToAdd)); + return ChronoDateImpl.ensureValid(getChronology(), unit.addTo(this, amountToAdd)); } /** @@ -430,8 +474,8 @@ public interface ChronoLocalDate> * @throws ArithmeticException {@inheritDoc} */ @Override - default D minus(TemporalAmount amount) { - return (D) getChronology().ensureChronoLocalDate(Temporal.super.minus(amount)); + default ChronoLocalDate minus(TemporalAmount amount) { + return ChronoDateImpl.ensureValid(getChronology(), Temporal.super.minus(amount)); } /** @@ -441,8 +485,8 @@ public interface ChronoLocalDate> * @throws ArithmeticException {@inheritDoc} */ @Override - default D minus(long amountToSubtract, TemporalUnit unit) { - return (D) getChronology().ensureChronoLocalDate(Temporal.super.minus(amountToSubtract, unit)); + default ChronoLocalDate minus(long amountToSubtract, TemporalUnit unit) { + return ChronoDateImpl.ensureValid(getChronology(), Temporal.super.minus(amountToSubtract, unit)); } //----------------------------------------------------------------------- @@ -522,14 +566,14 @@ public interface ChronoLocalDate> * The calculation returns a whole number, representing the number of * complete units between the two dates. * For example, the amount in days between two dates can be calculated - * using {@code startDate.periodUntil(endDate, DAYS)}. + * using {@code startDate.until(endDate, DAYS)}. *

* There are two equivalent ways of using this method. * The first is to invoke this method. * The second is to use {@link TemporalUnit#between(Temporal, Temporal)}: * 

      *   // these two lines are equivalent
-     *   amount = start.periodUntil(end, MONTHS);
+     *   amount = start.until(end, MONTHS);
      *   amount = MONTHS.between(start, end);
      *
* The choice should be made based on which makes the code more readable. @@ -555,7 +599,7 @@ public interface ChronoLocalDate> * @throws ArithmeticException if numeric overflow occurs */ @Override // override for Javadoc - long periodUntil(Temporal endDate, TemporalUnit unit); + long until(Temporal endDate, TemporalUnit unit); /** * Calculates the period between this date and another date as a {@code Period}. @@ -575,7 +619,7 @@ public interface ChronoLocalDate> * @throws DateTimeException if the period cannot be calculated * @throws ArithmeticException if numeric overflow occurs */ - Period periodUntil(ChronoLocalDate endDate); + Period until(ChronoLocalDate endDate); /** * Formats this date using the specified formatter. @@ -606,8 +650,9 @@ public interface ChronoLocalDate> * @param localTime the local time to use, not null * @return the local date-time formed from this date and the specified time, not null */ - default ChronoLocalDateTime atTime(LocalTime localTime) { - return (ChronoLocalDateTime)ChronoLocalDateTimeImpl.of(this, localTime); + @SuppressWarnings("unchecked") + default ChronoLocalDateTime atTime(LocalTime localTime) { + return ChronoLocalDateTimeImpl.of(this, localTime); } //----------------------------------------------------------------------- @@ -656,7 +701,7 @@ public interface ChronoLocalDate> * @return the comparator value, negative if less, positive if greater */ @Override - default int compareTo(ChronoLocalDate other) { + default int compareTo(ChronoLocalDate other) { int cmp = Long.compare(toEpochDay(), other.toEpochDay()); if (cmp == 0) { cmp = getChronology().compareTo(other.getChronology()); @@ -678,7 +723,7 @@ public interface ChronoLocalDate> * @param other the other date to compare to, not null * @return true if this is after the specified date */ - default boolean isAfter(ChronoLocalDate other) { + default boolean isAfter(ChronoLocalDate other) { return this.toEpochDay() > other.toEpochDay(); } @@ -696,7 +741,7 @@ public interface ChronoLocalDate> * @param other the other date to compare to, not null * @return true if this is before the specified date */ - default boolean isBefore(ChronoLocalDate other) { + default boolean isBefore(ChronoLocalDate other) { return this.toEpochDay() < other.toEpochDay(); } @@ -714,7 +759,7 @@ public interface ChronoLocalDate> * @param other the other date to compare to, not null * @return true if the underlying date is equal to the specified date */ - default boolean isEqual(ChronoLocalDate other) { + default boolean isEqual(ChronoLocalDate other) { return this.toEpochDay() == other.toEpochDay(); } diff --git a/jdk/src/share/classes/java/time/chrono/ChronoLocalDateTime.java b/jdk/src/share/classes/java/time/chrono/ChronoLocalDateTime.java index f0a893a4c95..be93f0e036a 100644 --- a/jdk/src/share/classes/java/time/chrono/ChronoLocalDateTime.java +++ b/jdk/src/share/classes/java/time/chrono/ChronoLocalDateTime.java @@ -63,6 +63,7 @@ package java.time.chrono; import static java.time.temporal.ChronoField.EPOCH_DAY; import static java.time.temporal.ChronoField.NANO_OF_DAY; +import static java.time.temporal.ChronoUnit.FOREVER; import static java.time.temporal.ChronoUnit.NANOS; import java.time.DateTimeException; @@ -73,6 +74,7 @@ import java.time.ZoneId; import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoField; +import java.time.temporal.ChronoUnit; import java.time.temporal.Temporal; import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAdjuster; @@ -114,7 +116,7 @@ import java.util.Objects; * @param the concrete type for the date of this date-time * @since 1.8 */ -public interface ChronoLocalDateTime> +public interface ChronoLocalDateTime extends Temporal, TemporalAdjuster, Comparable> { /** @@ -191,9 +193,54 @@ public interface ChronoLocalDateTime> */ LocalTime toLocalTime(); - @Override // Override to provide javadoc + /** + * Checks if the specified field is supported. + *

+ * This checks if the specified field can be queried on this date-time. + * If false, then calling the {@link #range(TemporalField) range}, + * {@link #get(TemporalField) get} and {@link #with(TemporalField, long)} + * methods will throw an exception. + *

+ * The set of supported fields is defined by the chronology and normally includes + * all {@code ChronoField} date and time fields. + *

+ * If the field is not a {@code ChronoField}, then the result of this method + * is obtained by invoking {@code TemporalField.isSupportedBy(TemporalAccessor)} + * passing {@code this} as the argument. + * Whether the field is supported is determined by the field. + * + * @param field the field to check, null returns false + * @return true if the field can be queried, false if not + */ + @Override boolean isSupported(TemporalField field); + /** + * Checks if the specified unit is supported. + *

+ * This checks if the specified unit can be added to or subtracted from this date-time. + * If false, then calling the {@link #plus(long, TemporalUnit)} and + * {@link #minus(long, TemporalUnit) minus} methods will throw an exception. + *

+ * The set of supported units is defined by the chronology and normally includes + * all {@code ChronoUnit} units except {@code FOREVER}. + *

+ * If the unit is not a {@code ChronoUnit}, then the result of this method + * is obtained by invoking {@code TemporalUnit.isSupportedBy(Temporal)} + * passing {@code this} as the argument. + * Whether the unit is supported is determined by the unit. + * + * @param unit the unit to check, null returns false + * @return true if the unit can be added/subtracted, false if not + */ + @Override + default boolean isSupported(TemporalUnit unit) { + if (unit instanceof ChronoUnit) { + return unit != FOREVER; + } + return unit != null && unit.isSupportedBy(this); + } + //----------------------------------------------------------------------- // override for covariant return type /** @@ -203,7 +250,7 @@ public interface ChronoLocalDateTime> */ @Override default ChronoLocalDateTime with(TemporalAdjuster adjuster) { - return (ChronoLocalDateTime)(toLocalDate().getChronology().ensureChronoLocalDateTime(Temporal.super.with(adjuster))); + return ChronoLocalDateTimeImpl.ensureValid(toLocalDate().getChronology(), Temporal.super.with(adjuster)); } /** @@ -221,7 +268,7 @@ public interface ChronoLocalDateTime> */ @Override default ChronoLocalDateTime plus(TemporalAmount amount) { - return (ChronoLocalDateTime)(toLocalDate().getChronology().ensureChronoLocalDateTime(Temporal.super.plus(amount))); + return ChronoLocalDateTimeImpl.ensureValid(toLocalDate().getChronology(), Temporal.super.plus(amount)); } /** @@ -239,7 +286,7 @@ public interface ChronoLocalDateTime> */ @Override default ChronoLocalDateTime minus(TemporalAmount amount) { - return (ChronoLocalDateTime)(toLocalDate().getChronology().ensureChronoLocalDateTime(Temporal.super.minus(amount))); + return ChronoLocalDateTimeImpl.ensureValid(toLocalDate().getChronology(), Temporal.super.minus(amount)); } /** @@ -249,7 +296,7 @@ public interface ChronoLocalDateTime> */ @Override default ChronoLocalDateTime minus(long amountToSubtract, TemporalUnit unit) { - return (ChronoLocalDateTime)(toLocalDate().getChronology().ensureChronoLocalDateTime(Temporal.super.minus(amountToSubtract, unit))); + return ChronoLocalDateTimeImpl.ensureValid(toLocalDate().getChronology(), Temporal.super.minus(amountToSubtract, unit)); } //----------------------------------------------------------------------- diff --git a/jdk/src/share/classes/java/time/chrono/ChronoLocalDateTimeImpl.java b/jdk/src/share/classes/java/time/chrono/ChronoLocalDateTimeImpl.java index 1f7195bc6f7..14f7bd927c2 100644 --- a/jdk/src/share/classes/java/time/chrono/ChronoLocalDateTimeImpl.java +++ b/jdk/src/share/classes/java/time/chrono/ChronoLocalDateTimeImpl.java @@ -98,7 +98,7 @@ import java.util.Objects; * @param the concrete type for the date of this date-time * @since 1.8 */ -final class ChronoLocalDateTimeImpl> +final class ChronoLocalDateTimeImpl implements ChronoLocalDateTime, Temporal, TemporalAdjuster, Serializable { /** @@ -171,9 +171,27 @@ final class ChronoLocalDateTimeImpl> * @param time the local time, not null * @return the local date-time, not null */ - @SuppressWarnings("rawtypes") - static ChronoLocalDateTimeImpl of(ChronoLocalDate date, LocalTime time) { - return new ChronoLocalDateTimeImpl(date, time); + static ChronoLocalDateTimeImpl of(R date, LocalTime time) { + return new ChronoLocalDateTimeImpl<>(date, time); + } + + /** + * Casts the {@code Temporal} to {@code ChronoLocalDateTime} ensuring it bas the specified chronology. + * + * @param chrono the chronology to check for, not null + * @param temporal a date-time to cast, not null + * @return the date-time checked and cast to {@code ChronoLocalDateTime}, not null + * @throws ClassCastException if the date-time cannot be cast to ChronoLocalDateTimeImpl + * or the chronology is not equal this Chronology + */ + static ChronoLocalDateTimeImpl ensureValid(Chronology chrono, Temporal temporal) { + @SuppressWarnings("unchecked") + ChronoLocalDateTimeImpl other = (ChronoLocalDateTimeImpl) temporal; + if (chrono.equals(other.toLocalDate().getChronology()) == false) { + throw new ClassCastException("Chronology mismatch, required: " + chrono.getId() + + ", actual: " + other.toLocalDate().getChronology().getId()); + } + return other; } /** @@ -202,7 +220,7 @@ final class ChronoLocalDateTimeImpl> return this; } // Validate that the new Temporal is a ChronoLocalDate (and not something else) - D cd = (D) date.getChronology().ensureChronoLocalDate(newDate); + D cd = ChronoDateImpl.ensureValid(date.getChronology(), newDate); return new ChronoLocalDateTimeImpl<>(cd, newTime); } @@ -260,13 +278,13 @@ final class ChronoLocalDateTimeImpl> public ChronoLocalDateTimeImpl with(TemporalAdjuster adjuster) { if (adjuster instanceof ChronoLocalDate) { // The Chronology is checked in with(date,time) - return with((ChronoLocalDate) adjuster, time); + return with((ChronoLocalDate) adjuster, time); } else if (adjuster instanceof LocalTime) { return with(date, (LocalTime) adjuster); } else if (adjuster instanceof ChronoLocalDateTimeImpl) { - return (ChronoLocalDateTimeImpl)(date.getChronology().ensureChronoLocalDateTime((ChronoLocalDateTimeImpl) adjuster)); + return ChronoLocalDateTimeImpl.ensureValid(date.getChronology(), (ChronoLocalDateTimeImpl) adjuster); } - return (ChronoLocalDateTimeImpl)(date.getChronology().ensureChronoLocalDateTime((ChronoLocalDateTimeImpl) adjuster.adjustInto(this))); + return ChronoLocalDateTimeImpl.ensureValid(date.getChronology(), (ChronoLocalDateTimeImpl) adjuster.adjustInto(this)); } @Override @@ -279,7 +297,7 @@ final class ChronoLocalDateTimeImpl> return with(date.with(field, newValue), time); } } - return (ChronoLocalDateTimeImpl)(date.getChronology().ensureChronoLocalDateTime(field.adjustInto(this, newValue))); + return ChronoLocalDateTimeImpl.ensureValid(date.getChronology(), field.adjustInto(this, newValue)); } //----------------------------------------------------------------------- @@ -298,7 +316,7 @@ final class ChronoLocalDateTimeImpl> } return with(date.plus(amountToAdd, unit), time); } - return (ChronoLocalDateTimeImpl)(date.getChronology().ensureChronoLocalDateTime(unit.addTo(this, amountToAdd))); + return ChronoLocalDateTimeImpl.ensureValid(date.getChronology(), unit.addTo(this, amountToAdd)); } private ChronoLocalDateTimeImpl plusDays(long days) { @@ -322,7 +340,7 @@ final class ChronoLocalDateTimeImpl> } //----------------------------------------------------------------------- - private ChronoLocalDateTimeImpl plusWithOverflow(ChronoLocalDate newDate, long hours, long minutes, long seconds, long nanos) { + private ChronoLocalDateTimeImpl plusWithOverflow(D newDate, long hours, long minutes, long seconds, long nanos) { // 9223372036854775808 long, 2147483648 int if ((hours | minutes | seconds | nanos) == 0) { return with(newDate, time); @@ -351,7 +369,7 @@ final class ChronoLocalDateTimeImpl> //----------------------------------------------------------------------- @Override - public long periodUntil(Temporal endDateTime, TemporalUnit unit) { + public long until(Temporal endDateTime, TemporalUnit unit) { if (endDateTime instanceof ChronoLocalDateTime == false) { throw new DateTimeException("Unable to calculate amount as objects are of two different types"); } @@ -361,10 +379,9 @@ final class ChronoLocalDateTimeImpl> throw new DateTimeException("Unable to calculate amount as objects have different chronologies"); } if (unit instanceof ChronoUnit) { - ChronoUnit f = (ChronoUnit) unit; - if (f.isTimeUnit()) { + if (unit.isTimeBased()) { long amount = end.getLong(EPOCH_DAY) - date.getLong(EPOCH_DAY); - switch (f) { + switch ((ChronoUnit) unit) { case NANOS: amount = Math.multiplyExact(amount, NANOS_PER_DAY); break; case MICROS: amount = Math.multiplyExact(amount, MICROS_PER_DAY); break; case MILLIS: amount = Math.multiplyExact(amount, MILLIS_PER_DAY); break; @@ -373,13 +390,13 @@ final class ChronoLocalDateTimeImpl> case HOURS: amount = Math.multiplyExact(amount, HOURS_PER_DAY); break; case HALF_DAYS: amount = Math.multiplyExact(amount, 2); break; } - return Math.addExact(amount, time.periodUntil(end.toLocalTime(), unit)); + return Math.addExact(amount, time.until(end.toLocalTime(), unit)); } - D endDate = end.toLocalDate(); + ChronoLocalDate endDate = end.toLocalDate(); if (end.toLocalTime().isBefore(time)) { endDate = endDate.minus(1, ChronoUnit.DAYS); } - return date.periodUntil(endDate, unit); + return date.until(endDate, unit); } return unit.between(this, endDateTime); } @@ -404,7 +421,7 @@ final class ChronoLocalDateTimeImpl> } static ChronoLocalDateTime readExternal(ObjectInput in) throws IOException, ClassNotFoundException { - ChronoLocalDate date = (ChronoLocalDate) in.readObject(); + ChronoLocalDate date = (ChronoLocalDate) in.readObject(); LocalTime time = (LocalTime) in.readObject(); return date.atTime(time); } diff --git a/jdk/src/share/classes/java/time/chrono/ChronoZonedDateTime.java b/jdk/src/share/classes/java/time/chrono/ChronoZonedDateTime.java index d838a36ec29..dd911fcd789 100644 --- a/jdk/src/share/classes/java/time/chrono/ChronoZonedDateTime.java +++ b/jdk/src/share/classes/java/time/chrono/ChronoZonedDateTime.java @@ -63,6 +63,7 @@ package java.time.chrono; import static java.time.temporal.ChronoField.INSTANT_SECONDS; import static java.time.temporal.ChronoField.OFFSET_SECONDS; +import static java.time.temporal.ChronoUnit.FOREVER; import static java.time.temporal.ChronoUnit.NANOS; import java.time.DateTimeException; @@ -73,6 +74,7 @@ import java.time.ZoneOffset; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoField; +import java.time.temporal.ChronoUnit; import java.time.temporal.Temporal; import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAdjuster; @@ -115,7 +117,7 @@ import java.util.Objects; * @param the concrete type for the date of this date-time * @since 1.8 */ -public interface ChronoZonedDateTime> +public interface ChronoZonedDateTime extends Temporal, Comparable> { /** @@ -338,9 +340,54 @@ public interface ChronoZonedDateTime> */ ChronoZonedDateTime withZoneSameInstant(ZoneId zone); - @Override // Override to provide javadoc + /** + * Checks if the specified field is supported. + *

+ * This checks if the specified field can be queried on this date-time. + * If false, then calling the {@link #range(TemporalField) range}, + * {@link #get(TemporalField) get} and {@link #with(TemporalField, long)} + * methods will throw an exception. + *

+ * The set of supported fields is defined by the chronology and normally includes + * all {@code ChronoField} fields. + *

+ * If the field is not a {@code ChronoField}, then the result of this method + * is obtained by invoking {@code TemporalField.isSupportedBy(TemporalAccessor)} + * passing {@code this} as the argument. + * Whether the field is supported is determined by the field. + * + * @param field the field to check, null returns false + * @return true if the field can be queried, false if not + */ + @Override boolean isSupported(TemporalField field); + /** + * Checks if the specified unit is supported. + *

+ * This checks if the specified unit can be added to or subtracted from this date-time. + * If false, then calling the {@link #plus(long, TemporalUnit)} and + * {@link #minus(long, TemporalUnit) minus} methods will throw an exception. + *

+ * The set of supported units is defined by the chronology and normally includes + * all {@code ChronoUnit} units except {@code FOREVER}. + *

+ * If the unit is not a {@code ChronoUnit}, then the result of this method + * is obtained by invoking {@code TemporalUnit.isSupportedBy(Temporal)} + * passing {@code this} as the argument. + * Whether the unit is supported is determined by the unit. + * + * @param unit the unit to check, null returns false + * @return true if the unit can be added/subtracted, false if not + */ + @Override + default boolean isSupported(TemporalUnit unit) { + if (unit instanceof ChronoUnit) { + return unit != FOREVER; + } + return unit != null && unit.isSupportedBy(this); + } + //----------------------------------------------------------------------- // override for covariant return type /** @@ -350,7 +397,7 @@ public interface ChronoZonedDateTime> */ @Override default ChronoZonedDateTime with(TemporalAdjuster adjuster) { - return (ChronoZonedDateTime)(toLocalDate().getChronology().ensureChronoZonedDateTime(Temporal.super.with(adjuster))); + return ChronoZonedDateTimeImpl.ensureValid(toLocalDate().getChronology(), Temporal.super.with(adjuster)); } /** @@ -368,7 +415,7 @@ public interface ChronoZonedDateTime> */ @Override default ChronoZonedDateTime plus(TemporalAmount amount) { - return (ChronoZonedDateTime)(toLocalDate().getChronology().ensureChronoZonedDateTime(Temporal.super.plus(amount))); + return ChronoZonedDateTimeImpl.ensureValid(toLocalDate().getChronology(), Temporal.super.plus(amount)); } /** @@ -386,7 +433,7 @@ public interface ChronoZonedDateTime> */ @Override default ChronoZonedDateTime minus(TemporalAmount amount) { - return (ChronoZonedDateTime)(toLocalDate().getChronology().ensureChronoZonedDateTime(Temporal.super.minus(amount))); + return ChronoZonedDateTimeImpl.ensureValid(toLocalDate().getChronology(), Temporal.super.minus(amount)); } /** @@ -396,7 +443,7 @@ public interface ChronoZonedDateTime> */ @Override default ChronoZonedDateTime minus(long amountToSubtract, TemporalUnit unit) { - return (ChronoZonedDateTime)(toLocalDate().getChronology().ensureChronoZonedDateTime(Temporal.super.minus(amountToSubtract, unit))); + return ChronoZonedDateTimeImpl.ensureValid(toLocalDate().getChronology(), Temporal.super.minus(amountToSubtract, unit)); } //----------------------------------------------------------------------- diff --git a/jdk/src/share/classes/java/time/chrono/ChronoZonedDateTimeImpl.java b/jdk/src/share/classes/java/time/chrono/ChronoZonedDateTimeImpl.java index 835ec932184..a39ed298d37 100644 --- a/jdk/src/share/classes/java/time/chrono/ChronoZonedDateTimeImpl.java +++ b/jdk/src/share/classes/java/time/chrono/ChronoZonedDateTimeImpl.java @@ -101,7 +101,7 @@ import java.util.Objects; * @param the concrete type for the date of this date-time * @since 1.8 */ -final class ChronoZonedDateTimeImpl> +final class ChronoZonedDateTimeImpl implements ChronoZonedDateTime, Serializable { /** @@ -131,7 +131,7 @@ final class ChronoZonedDateTimeImpl> * @param preferredOffset the zone offset, null if no preference * @return the zoned date-time, not null */ - static > ChronoZonedDateTime ofBest( + static ChronoZonedDateTime ofBest( ChronoLocalDateTimeImpl localDateTime, ZoneId zone, ZoneOffset preferredOffset) { Objects.requireNonNull(localDateTime, "localDateTime"); Objects.requireNonNull(zone, "zone"); @@ -167,14 +167,13 @@ final class ChronoZonedDateTimeImpl> * @param zone the zone identifier, not null * @return the zoned date-time, not null */ - @SuppressWarnings("rawtypes") static ChronoZonedDateTimeImpl ofInstant(Chronology chrono, Instant instant, ZoneId zone) { ZoneRules rules = zone.getRules(); ZoneOffset offset = rules.getOffset(instant); Objects.requireNonNull(offset, "offset"); // protect against bad ZoneRules LocalDateTime ldt = LocalDateTime.ofEpochSecond(instant.getEpochSecond(), instant.getNano(), offset); - ChronoLocalDateTimeImpl cldt = (ChronoLocalDateTimeImpl) chrono.localDateTime(ldt); - return new ChronoZonedDateTimeImpl(cldt, offset, zone); + ChronoLocalDateTimeImpl cldt = (ChronoLocalDateTimeImpl)chrono.localDateTime(ldt); + return new ChronoZonedDateTimeImpl<>(cldt, offset, zone); } /** @@ -184,10 +183,30 @@ final class ChronoZonedDateTimeImpl> * @param zone the time-zone to use, validated not null * @return the zoned date-time, validated not null */ + @SuppressWarnings("unchecked") private ChronoZonedDateTimeImpl create(Instant instant, ZoneId zone) { return (ChronoZonedDateTimeImpl)ofInstant(toLocalDate().getChronology(), instant, zone); } + /** + * Casts the {@code Temporal} to {@code ChronoZonedDateTimeImpl} ensuring it bas the specified chronology. + * + * @param chrono the chronology to check for, not null + * @param temporal a date-time to cast, not null + * @return the date-time checked and cast to {@code ChronoZonedDateTimeImpl}, not null + * @throws ClassCastException if the date-time cannot be cast to ChronoZonedDateTimeImpl + * or the chronology is not equal this Chronology + */ + static ChronoZonedDateTimeImpl ensureValid(Chronology chrono, Temporal temporal) { + @SuppressWarnings("unchecked") + ChronoZonedDateTimeImpl other = (ChronoZonedDateTimeImpl) temporal; + if (chrono.equals(other.toLocalDate().getChronology()) == false) { + throw new ClassCastException("Chronology mismatch, required: " + chrono.getId() + + ", actual: " + other.toLocalDate().getChronology().getId()); + } + return other; + } + //----------------------------------------------------------------------- /** * Constructor. @@ -271,7 +290,7 @@ final class ChronoZonedDateTimeImpl> } return ofBest(dateTime.with(field, newValue), zone, offset); } - return (ChronoZonedDateTime)(toLocalDate().getChronology().ensureChronoZonedDateTime(field.adjustInto(this, newValue))); + return ChronoZonedDateTimeImpl.ensureValid(toLocalDate().getChronology(), field.adjustInto(this, newValue)); } //----------------------------------------------------------------------- @@ -280,12 +299,12 @@ final class ChronoZonedDateTimeImpl> if (unit instanceof ChronoUnit) { return with(dateTime.plus(amountToAdd, unit)); } - return (ChronoZonedDateTime)(toLocalDate().getChronology().ensureChronoZonedDateTime(unit.addTo(this, amountToAdd))); /// TODO: Generics replacement Risk! + return ChronoZonedDateTimeImpl.ensureValid(toLocalDate().getChronology(), unit.addTo(this, amountToAdd)); /// TODO: Generics replacement Risk! } //----------------------------------------------------------------------- @Override - public long periodUntil(Temporal endDateTime, TemporalUnit unit) { + public long until(Temporal endDateTime, TemporalUnit unit) { if (endDateTime instanceof ChronoZonedDateTime == false) { throw new DateTimeException("Unable to calculate amount as objects are of two different types"); } @@ -296,7 +315,7 @@ final class ChronoZonedDateTimeImpl> } if (unit instanceof ChronoUnit) { end = end.withZoneSameInstant(offset); - return dateTime.periodUntil(end.toLocalDateTime(), unit); + return dateTime.until(end.toLocalDateTime(), unit); } return unit.between(this, endDateTime); } diff --git a/jdk/src/share/classes/java/time/chrono/Chronology.java b/jdk/src/share/classes/java/time/chrono/Chronology.java index e5daae76464..561e2f794fa 100644 --- a/jdk/src/share/classes/java/time/chrono/Chronology.java +++ b/jdk/src/share/classes/java/time/chrono/Chronology.java @@ -74,6 +74,9 @@ import static java.time.temporal.ChronoField.MONTH_OF_YEAR; import static java.time.temporal.ChronoField.PROLEPTIC_MONTH; import static java.time.temporal.ChronoField.YEAR; import static java.time.temporal.ChronoField.YEAR_OF_ERA; +import static java.time.temporal.ChronoUnit.DAYS; +import static java.time.temporal.ChronoUnit.MONTHS; +import static java.time.temporal.ChronoUnit.WEEKS; import static java.time.temporal.TemporalAdjuster.nextOrSame; import java.io.DataInput; @@ -88,14 +91,16 @@ import java.time.DayOfWeek; import java.time.Instant; import java.time.LocalDate; import java.time.LocalTime; +import java.time.Month; +import java.time.Year; import java.time.ZoneId; import java.time.format.DateTimeFormatterBuilder; import java.time.format.ResolverStyle; import java.time.format.TextStyle; import java.time.temporal.ChronoField; -import java.time.temporal.ChronoUnit; import java.time.temporal.Temporal; import java.time.temporal.TemporalAccessor; +import java.time.temporal.TemporalAdjuster; import java.time.temporal.TemporalField; import java.time.temporal.TemporalQuery; import java.time.temporal.UnsupportedTemporalTypeException; @@ -188,8 +193,8 @@ public abstract class Chronology implements Comparable { /** * ChronoLocalDate order constant. */ - static final Comparator> DATE_ORDER = - (Comparator> & Serializable) (date1, date2) -> { + static final Comparator DATE_ORDER = + (Comparator & Serializable) (date1, date2) -> { return Long.compare(date1.toEpochDay(), date2.toEpochDay()); }; /** @@ -480,60 +485,6 @@ public abstract class Chronology implements Comparable { protected Chronology() { } - //----------------------------------------------------------------------- - /** - * Casts the {@code Temporal} to {@code ChronoLocalDate} with the same chronology. - * - * @param temporal a date-time to cast, not null - * @return the date-time checked and cast to {@code ChronoLocalDate}, not null - * @throws ClassCastException if the date-time cannot be cast to ChronoLocalDate - * or the chronology is not equal this Chronology - */ - ChronoLocalDate ensureChronoLocalDate(Temporal temporal) { - @SuppressWarnings("unchecked") - ChronoLocalDate other = (ChronoLocalDate) temporal; - if (this.equals(other.getChronology()) == false) { - throw new ClassCastException("Chronology mismatch, expected: " + getId() + ", actual: " + other.getChronology().getId()); - } - return other; - } - - /** - * Casts the {@code Temporal} to {@code ChronoLocalDateTime} with the same chronology. - * - * @param temporal a date-time to cast, not null - * @return the date-time checked and cast to {@code ChronoLocalDateTime}, not null - * @throws ClassCastException if the date-time cannot be cast to ChronoLocalDateTimeImpl - * or the chronology is not equal this Chronology - */ - ChronoLocalDateTimeImpl ensureChronoLocalDateTime(Temporal temporal) { - @SuppressWarnings("unchecked") - ChronoLocalDateTimeImpl other = (ChronoLocalDateTimeImpl) temporal; - if (this.equals(other.toLocalDate().getChronology()) == false) { - throw new ClassCastException("Chronology mismatch, required: " + getId() - + ", supplied: " + other.toLocalDate().getChronology().getId()); - } - return other; - } - - /** - * Casts the {@code Temporal} to {@code ChronoZonedDateTimeImpl} with the same chronology. - * - * @param temporal a date-time to cast, not null - * @return the date-time checked and cast to {@code ChronoZonedDateTimeImpl}, not null - * @throws ClassCastException if the date-time cannot be cast to ChronoZonedDateTimeImpl - * or the chronology is not equal this Chronology - */ - ChronoZonedDateTimeImpl ensureChronoZonedDateTime(Temporal temporal) { - @SuppressWarnings("unchecked") - ChronoZonedDateTimeImpl other = (ChronoZonedDateTimeImpl) temporal; - if (this.equals(other.toLocalDate().getChronology()) == false) { - throw new ClassCastException("Chronology mismatch, required: " + getId() - + ", supplied: " + other.toLocalDate().getChronology().getId()); - } - return other; - } - //----------------------------------------------------------------------- /** * Gets the ID of the chronology. @@ -574,7 +525,7 @@ public abstract class Chronology implements Comparable { * @throws DateTimeException if unable to create the date * @throws ClassCastException if the {@code era} is not of the correct type for the chronology */ - public ChronoLocalDate date(Era era, int yearOfEra, int month, int dayOfMonth) { + public ChronoLocalDate date(Era era, int yearOfEra, int month, int dayOfMonth) { return date(prolepticYear(era, yearOfEra), month, dayOfMonth); } @@ -588,7 +539,7 @@ public abstract class Chronology implements Comparable { * @return the local date in this chronology, not null * @throws DateTimeException if unable to create the date */ - public abstract ChronoLocalDate date(int prolepticYear, int month, int dayOfMonth); + public abstract ChronoLocalDate date(int prolepticYear, int month, int dayOfMonth); /** * Obtains a local date in this chronology from the era, year-of-era and @@ -601,7 +552,7 @@ public abstract class Chronology implements Comparable { * @throws DateTimeException if unable to create the date * @throws ClassCastException if the {@code era} is not of the correct type for the chronology */ - public ChronoLocalDate dateYearDay(Era era, int yearOfEra, int dayOfYear) { + public ChronoLocalDate dateYearDay(Era era, int yearOfEra, int dayOfYear) { return dateYearDay(prolepticYear(era, yearOfEra), dayOfYear); } @@ -614,7 +565,7 @@ public abstract class Chronology implements Comparable { * @return the local date in this chronology, not null * @throws DateTimeException if unable to create the date */ - public abstract ChronoLocalDate dateYearDay(int prolepticYear, int dayOfYear); + public abstract ChronoLocalDate dateYearDay(int prolepticYear, int dayOfYear); /** * Obtains a local date in this chronology from the epoch-day. @@ -626,7 +577,7 @@ public abstract class Chronology implements Comparable { * @return the local date in this chronology, not null * @throws DateTimeException if unable to create the date */ - public abstract ChronoLocalDate dateEpochDay(long epochDay); + public abstract ChronoLocalDate dateEpochDay(long epochDay); //----------------------------------------------------------------------- /** @@ -643,7 +594,7 @@ public abstract class Chronology implements Comparable { * @return the current local date using the system clock and default time-zone, not null * @throws DateTimeException if unable to create the date */ - public ChronoLocalDate dateNow() { + public ChronoLocalDate dateNow() { return dateNow(Clock.systemDefaultZone()); } @@ -660,7 +611,7 @@ public abstract class Chronology implements Comparable { * @return the current local date using the system clock, not null * @throws DateTimeException if unable to create the date */ - public ChronoLocalDate dateNow(ZoneId zone) { + public ChronoLocalDate dateNow(ZoneId zone) { return dateNow(Clock.system(zone)); } @@ -675,7 +626,7 @@ public abstract class Chronology implements Comparable { * @return the current local date, not null * @throws DateTimeException if unable to create the date */ - public ChronoLocalDate dateNow(Clock clock) { + public ChronoLocalDate dateNow(Clock clock) { Objects.requireNonNull(clock, "clock"); return date(LocalDate.now(clock)); } @@ -699,7 +650,7 @@ public abstract class Chronology implements Comparable { * @throws DateTimeException if unable to create the date * @see ChronoLocalDate#from(TemporalAccessor) */ - public abstract ChronoLocalDate date(TemporalAccessor temporal); + public abstract ChronoLocalDate date(TemporalAccessor temporal); /** * Obtains a local date-time in this chronology from another temporal object. @@ -722,7 +673,7 @@ public abstract class Chronology implements Comparable { * @throws DateTimeException if unable to create the date-time * @see ChronoLocalDateTime#from(TemporalAccessor) */ - public ChronoLocalDateTime localDateTime(TemporalAccessor temporal) { + public ChronoLocalDateTime localDateTime(TemporalAccessor temporal) { try { return date(temporal).atTime(LocalTime.from(temporal)); } catch (DateTimeException ex) { @@ -754,7 +705,7 @@ public abstract class Chronology implements Comparable { * @throws DateTimeException if unable to create the date-time * @see ChronoZonedDateTime#from(TemporalAccessor) */ - public ChronoZonedDateTime zonedDateTime(TemporalAccessor temporal) { + public ChronoZonedDateTime zonedDateTime(TemporalAccessor temporal) { try { ZoneId zone = ZoneId.from(temporal); try { @@ -762,8 +713,7 @@ public abstract class Chronology implements Comparable { return zonedDateTime(instant, zone); } catch (DateTimeException ex1) { - @SuppressWarnings("rawtypes") - ChronoLocalDateTimeImpl cldt = ensureChronoLocalDateTime(localDateTime(temporal)); + ChronoLocalDateTimeImpl cldt = ChronoLocalDateTimeImpl.ensureValid(this, localDateTime(temporal)); return ChronoZonedDateTimeImpl.ofBest(cldt, zone, null); } } catch (DateTimeException ex) { @@ -781,7 +731,7 @@ public abstract class Chronology implements Comparable { * @return the zoned date-time, not null * @throws DateTimeException if the result exceeds the supported range */ - public ChronoZonedDateTime zonedDateTime(Instant instant, ZoneId zone) { + public ChronoZonedDateTime zonedDateTime(Instant instant, ZoneId zone) { return ChronoZonedDateTimeImpl.ofInstant(this, instant, zone); } @@ -929,11 +879,82 @@ public abstract class Chronology implements Comparable { * As such, {@code ChronoField} date fields are resolved here in the * context of a specific chronology. *

+ * {@code ChronoField} instances are resolved by this method, which may + * be overridden in subclasses. + *

    + *
  • {@code EPOCH_DAY} - If present, this is converted to a date and + * all other date fields are then cross-checked against the date. + *
  • {@code PROLEPTIC_MONTH} - If present, then it is split into the + * {@code YEAR} and {@code MONTH_OF_YEAR}. If the mode is strict or smart + * then the field is validated. + *
  • {@code YEAR_OF_ERA} and {@code ERA} - If both are present, then they + * are combined to form a {@code YEAR}. In lenient mode, the {@code YEAR_OF_ERA} + * range is not validated, in smart and strict mode it is. The {@code ERA} is + * validated for range in all three modes. If only the {@code YEAR_OF_ERA} is + * present, and the mode is smart or lenient, then the last available era + * is assumed. In strict mode, no era is assumed and the {@code YEAR_OF_ERA} is + * left untouched. If only the {@code ERA} is present, then it is left untouched. + *
  • {@code YEAR}, {@code MONTH_OF_YEAR} and {@code DAY_OF_MONTH} - + * If all three are present, then they are combined to form a date. + * In all three modes, the {@code YEAR} is validated. + * If the mode is smart or strict, then the month and day are validated. + * If the mode is lenient, then the date is combined in a manner equivalent to + * creating a date on the first day of the first month in the requested year, + * then adding the difference in months, then the difference in days. + * If the mode is smart, and the day-of-month is greater than the maximum for + * the year-month, then the day-of-month is adjusted to the last day-of-month. + * If the mode is strict, then the three fields must form a valid date. + *
  • {@code YEAR} and {@code DAY_OF_YEAR} - + * If both are present, then they are combined to form a date. + * In all three modes, the {@code YEAR} is validated. + * If the mode is lenient, then the date is combined in a manner equivalent to + * creating a date on the first day of the requested year, then adding + * the difference in days. + * If the mode is smart or strict, then the two fields must form a valid date. + *
  • {@code YEAR}, {@code MONTH_OF_YEAR}, {@code ALIGNED_WEEK_OF_MONTH} and + * {@code ALIGNED_DAY_OF_WEEK_IN_MONTH} - + * If all four are present, then they are combined to form a date. + * In all three modes, the {@code YEAR} is validated. + * If the mode is lenient, then the date is combined in a manner equivalent to + * creating a date on the first day of the first month in the requested year, then adding + * the difference in months, then the difference in weeks, then in days. + * If the mode is smart or strict, then the all four fields are validated to + * their outer ranges. The date is then combined in a manner equivalent to + * creating a date on the first day of the requested year and month, then adding + * the amount in weeks and days to reach their values. If the mode is strict, + * the date is additionally validated to check that the day and week adjustment + * did not change the month. + *
  • {@code YEAR}, {@code MONTH_OF_YEAR}, {@code ALIGNED_WEEK_OF_MONTH} and + * {@code DAY_OF_WEEK} - If all four are present, then they are combined to + * form a date. The approach is the same as described above for + * years, months and weeks in {@code ALIGNED_DAY_OF_WEEK_IN_MONTH}. + * The day-of-week is adjusted as the next or same matching day-of-week once + * the years, months and weeks have been handled. + *
  • {@code YEAR}, {@code ALIGNED_WEEK_OF_YEAR} and {@code ALIGNED_DAY_OF_WEEK_IN_YEAR} - + * If all three are present, then they are combined to form a date. + * In all three modes, the {@code YEAR} is validated. + * If the mode is lenient, then the date is combined in a manner equivalent to + * creating a date on the first day of the requested year, then adding + * the difference in weeks, then in days. + * If the mode is smart or strict, then the all three fields are validated to + * their outer ranges. The date is then combined in a manner equivalent to + * creating a date on the first day of the requested year, then adding + * the amount in weeks and days to reach their values. If the mode is strict, + * the date is additionally validated to check that the day and week adjustment + * did not change the year. + *
  • {@code YEAR}, {@code ALIGNED_WEEK_OF_YEAR} and {@code DAY_OF_WEEK} - + * If all three are present, then they are combined to form a date. + * The approach is the same as described above for years and weeks in + * {@code ALIGNED_DAY_OF_WEEK_IN_YEAR}. The day-of-week is adjusted as the + * next or same matching day-of-week once the years and weeks have been handled. + *
+ *

* The default implementation is suitable for most calendar systems. * If {@link ChronoField#YEAR_OF_ERA} is found without an {@link ChronoField#ERA} * then the last era in {@link #eras()} is used. * The implementation assumes a 7 day week, that the first day-of-month - * has the value 1, and that first day-of-year has the value 1. + * has the value 1, that first day-of-year has the value 1, and that the + * first of the month and year always exists. * * @param fieldValues the map of fields to values, which can be updated, not null * @param resolverStyle the requested type of resolve, not null @@ -941,99 +962,214 @@ public abstract class Chronology implements Comparable { * @throws DateTimeException if the date cannot be resolved, typically * because of a conflict in the input data */ - public ChronoLocalDate resolveDate(Map fieldValues, ResolverStyle resolverStyle) { + public ChronoLocalDate resolveDate(Map fieldValues, ResolverStyle resolverStyle) { // check epoch-day before inventing era if (fieldValues.containsKey(EPOCH_DAY)) { return dateEpochDay(fieldValues.remove(EPOCH_DAY)); } // fix proleptic month before inventing era - Long pMonth = fieldValues.remove(PROLEPTIC_MONTH); - if (pMonth != null) { - // first day-of-month is likely to be safest for setting proleptic-month - // cannot add to year zero, as not all chronologies have a year zero - ChronoLocalDate chronoDate = dateNow() - .with(DAY_OF_MONTH, 1).with(PROLEPTIC_MONTH, pMonth); - addFieldValue(fieldValues, MONTH_OF_YEAR, chronoDate.get(MONTH_OF_YEAR)); - addFieldValue(fieldValues, YEAR, chronoDate.get(YEAR)); - } + resolveProlepticMonth(fieldValues, resolverStyle); // invent era if necessary to resolve year-of-era - Long yoeLong = fieldValues.remove(YEAR_OF_ERA); - if (yoeLong != null) { - Long eraLong = fieldValues.remove(ERA); - int yoe = range(YEAR_OF_ERA).checkValidIntValue(yoeLong, YEAR_OF_ERA); - if (eraLong != null) { - Era eraObj = eraOf(Math.toIntExact(eraLong)); - addFieldValue(fieldValues, YEAR, prolepticYear(eraObj, yoe)); - } else if (fieldValues.containsKey(YEAR)) { - int year = range(YEAR).checkValidIntValue(fieldValues.get(YEAR), YEAR); - ChronoLocalDate chronoDate = dateYearDay(year, 1); - addFieldValue(fieldValues, YEAR, prolepticYear(chronoDate.getEra(), yoe)); - } else { - List eras = eras(); - if (eras.isEmpty()) { - addFieldValue(fieldValues, YEAR, yoe); - } else { - Era eraObj = eras.get(eras.size() - 1); - addFieldValue(fieldValues, YEAR, prolepticYear(eraObj, yoe)); - } - } + ChronoLocalDate resolved = resolveYearOfEra(fieldValues, resolverStyle); + if (resolved != null) { + return resolved; } // build date if (fieldValues.containsKey(YEAR)) { if (fieldValues.containsKey(MONTH_OF_YEAR)) { if (fieldValues.containsKey(DAY_OF_MONTH)) { - int y = range(YEAR).checkValidIntValue(fieldValues.remove(YEAR), YEAR); - int moy = range(MONTH_OF_YEAR).checkValidIntValue(fieldValues.remove(MONTH_OF_YEAR), MONTH_OF_YEAR); - int dom = range(DAY_OF_MONTH).checkValidIntValue(fieldValues.remove(DAY_OF_MONTH), DAY_OF_MONTH); - return date(y, moy, dom); + return resolveYMD(fieldValues, resolverStyle); } if (fieldValues.containsKey(ALIGNED_WEEK_OF_MONTH)) { if (fieldValues.containsKey(ALIGNED_DAY_OF_WEEK_IN_MONTH)) { - int y = range(YEAR).checkValidIntValue(fieldValues.remove(YEAR), YEAR); - int moy = range(MONTH_OF_YEAR).checkValidIntValue(fieldValues.remove(MONTH_OF_YEAR), MONTH_OF_YEAR); - int aw = range(ALIGNED_WEEK_OF_MONTH).checkValidIntValue(fieldValues.remove(ALIGNED_WEEK_OF_MONTH), ALIGNED_WEEK_OF_MONTH); - int ad = range(ALIGNED_DAY_OF_WEEK_IN_MONTH).checkValidIntValue(fieldValues.remove(ALIGNED_DAY_OF_WEEK_IN_MONTH), ALIGNED_DAY_OF_WEEK_IN_MONTH); - ChronoLocalDate chronoDate = date(y, moy, 1); - return chronoDate.plus((aw - 1) * 7 + (ad - 1), ChronoUnit.DAYS); + return resolveYMAA(fieldValues, resolverStyle); } if (fieldValues.containsKey(DAY_OF_WEEK)) { - int y = range(YEAR).checkValidIntValue(fieldValues.remove(YEAR), YEAR); - int moy = range(MONTH_OF_YEAR).checkValidIntValue(fieldValues.remove(MONTH_OF_YEAR), MONTH_OF_YEAR); - int aw = range(ALIGNED_WEEK_OF_MONTH).checkValidIntValue(fieldValues.remove(ALIGNED_WEEK_OF_MONTH), ALIGNED_WEEK_OF_MONTH); - int dow = range(DAY_OF_WEEK).checkValidIntValue(fieldValues.remove(DAY_OF_WEEK), DAY_OF_WEEK); - ChronoLocalDate chronoDate = date(y, moy, 1); - return chronoDate.plus((aw - 1) * 7, ChronoUnit.DAYS).with(nextOrSame(DayOfWeek.of(dow))); + return resolveYMAD(fieldValues, resolverStyle); } } } if (fieldValues.containsKey(DAY_OF_YEAR)) { - int y = range(YEAR).checkValidIntValue(fieldValues.remove(YEAR), YEAR); - int doy = range(DAY_OF_YEAR).checkValidIntValue(fieldValues.remove(DAY_OF_YEAR), DAY_OF_YEAR); - return dateYearDay(y, doy); + return resolveYD(fieldValues, resolverStyle); } if (fieldValues.containsKey(ALIGNED_WEEK_OF_YEAR)) { if (fieldValues.containsKey(ALIGNED_DAY_OF_WEEK_IN_YEAR)) { - int y = range(YEAR).checkValidIntValue(fieldValues.remove(YEAR), YEAR); - int aw = range(ALIGNED_WEEK_OF_YEAR).checkValidIntValue(fieldValues.remove(ALIGNED_WEEK_OF_YEAR), ALIGNED_WEEK_OF_YEAR); - int ad = range(ALIGNED_DAY_OF_WEEK_IN_YEAR).checkValidIntValue(fieldValues.remove(ALIGNED_DAY_OF_WEEK_IN_YEAR), ALIGNED_DAY_OF_WEEK_IN_YEAR); - ChronoLocalDate chronoDate = dateYearDay(y, 1); - return chronoDate.plus((aw - 1) * 7 + (ad - 1), ChronoUnit.DAYS); + return resolveYAA(fieldValues, resolverStyle); } if (fieldValues.containsKey(DAY_OF_WEEK)) { - int y = range(YEAR).checkValidIntValue(fieldValues.remove(YEAR), YEAR); - int aw = range(ALIGNED_WEEK_OF_YEAR).checkValidIntValue(fieldValues.remove(ALIGNED_WEEK_OF_YEAR), ALIGNED_WEEK_OF_YEAR); - int dow = range(DAY_OF_WEEK).checkValidIntValue(fieldValues.remove(DAY_OF_WEEK), DAY_OF_WEEK); - ChronoLocalDate chronoDate = dateYearDay(y, 1); - return chronoDate.plus((aw - 1) * 7, ChronoUnit.DAYS).with(nextOrSame(DayOfWeek.of(dow))); + return resolveYAD(fieldValues, resolverStyle); } } } return null; } + void resolveProlepticMonth(Map fieldValues, ResolverStyle resolverStyle) { + Long pMonth = fieldValues.remove(PROLEPTIC_MONTH); + if (pMonth != null) { + if (resolverStyle != ResolverStyle.LENIENT) { + PROLEPTIC_MONTH.checkValidValue(pMonth); + } + // first day-of-month is likely to be safest for setting proleptic-month + // cannot add to year zero, as not all chronologies have a year zero + ChronoLocalDate chronoDate = dateNow() + .with(DAY_OF_MONTH, 1).with(PROLEPTIC_MONTH, pMonth); + addFieldValue(fieldValues, MONTH_OF_YEAR, chronoDate.get(MONTH_OF_YEAR)); + addFieldValue(fieldValues, YEAR, chronoDate.get(YEAR)); + } + } + + ChronoLocalDate resolveYearOfEra(Map fieldValues, ResolverStyle resolverStyle) { + Long yoeLong = fieldValues.remove(YEAR_OF_ERA); + if (yoeLong != null) { + Long eraLong = fieldValues.remove(ERA); + int yoe; + if (resolverStyle != ResolverStyle.LENIENT) { + yoe = range(YEAR_OF_ERA).checkValidIntValue(yoeLong, YEAR_OF_ERA); + } else { + yoe = Math.toIntExact(yoeLong); + } + if (eraLong != null) { + Era eraObj = eraOf(range(ERA).checkValidIntValue(eraLong, ERA)); + addFieldValue(fieldValues, YEAR, prolepticYear(eraObj, yoe)); + } else { + if (fieldValues.containsKey(YEAR)) { + int year = range(YEAR).checkValidIntValue(fieldValues.get(YEAR), YEAR); + ChronoLocalDate chronoDate = dateYearDay(year, 1); + addFieldValue(fieldValues, YEAR, prolepticYear(chronoDate.getEra(), yoe)); + } else if (resolverStyle == ResolverStyle.STRICT) { + // do not invent era if strict + // reinstate the field removed earlier, no cross-check issues + fieldValues.put(YEAR_OF_ERA, yoeLong); + } else { + List eras = eras(); + if (eras.isEmpty()) { + addFieldValue(fieldValues, YEAR, yoe); + } else { + Era eraObj = eras.get(eras.size() - 1); + addFieldValue(fieldValues, YEAR, prolepticYear(eraObj, yoe)); + } + } + } + } else if (fieldValues.containsKey(ERA)) { + range(ERA).checkValidValue(fieldValues.get(ERA), ERA); // always validated + } + return null; + } + + ChronoLocalDate resolveYMD(Map fieldValues, ResolverStyle resolverStyle) { + int y = range(YEAR).checkValidIntValue(fieldValues.remove(YEAR), YEAR); + if (resolverStyle == ResolverStyle.LENIENT) { + long months = Math.subtractExact(fieldValues.remove(MONTH_OF_YEAR), 1); + long days = Math.subtractExact(fieldValues.remove(DAY_OF_MONTH), 1); + return date(y, 1, 1).plus(months, MONTHS).plus(days, DAYS); + } + int moy = range(MONTH_OF_YEAR).checkValidIntValue(fieldValues.remove(MONTH_OF_YEAR), MONTH_OF_YEAR); + ValueRange domRange = range(DAY_OF_MONTH); + int dom = domRange.checkValidIntValue(fieldValues.remove(DAY_OF_MONTH), DAY_OF_MONTH); + if (resolverStyle == ResolverStyle.SMART) { // previous valid + try { + return date(y, moy, dom); + } catch (DateTimeException ex) { + return date(y, moy, 1).with(TemporalAdjuster.lastDayOfMonth()); + } + } + return date(y, moy, dom); + } + + ChronoLocalDate resolveYD(Map fieldValues, ResolverStyle resolverStyle) { + int y = range(YEAR).checkValidIntValue(fieldValues.remove(YEAR), YEAR); + if (resolverStyle == ResolverStyle.LENIENT) { + long days = Math.subtractExact(fieldValues.remove(DAY_OF_YEAR), 1); + return dateYearDay(y, 1).plus(days, DAYS); + } + int doy = range(DAY_OF_YEAR).checkValidIntValue(fieldValues.remove(DAY_OF_YEAR), DAY_OF_YEAR); + return dateYearDay(y, doy); // smart is same as strict + } + + ChronoLocalDate resolveYMAA(Map fieldValues, ResolverStyle resolverStyle) { + int y = range(YEAR).checkValidIntValue(fieldValues.remove(YEAR), YEAR); + if (resolverStyle == ResolverStyle.LENIENT) { + long months = Math.subtractExact(fieldValues.remove(MONTH_OF_YEAR), 1); + long weeks = Math.subtractExact(fieldValues.remove(ALIGNED_WEEK_OF_MONTH), 1); + long days = Math.subtractExact(fieldValues.remove(ALIGNED_DAY_OF_WEEK_IN_MONTH), 1); + return date(y, 1, 1).plus(months, MONTHS).plus(weeks, WEEKS).plus(days, DAYS); + } + int moy = range(MONTH_OF_YEAR).checkValidIntValue(fieldValues.remove(MONTH_OF_YEAR), MONTH_OF_YEAR); + int aw = range(ALIGNED_WEEK_OF_MONTH).checkValidIntValue(fieldValues.remove(ALIGNED_WEEK_OF_MONTH), ALIGNED_WEEK_OF_MONTH); + int ad = range(ALIGNED_DAY_OF_WEEK_IN_MONTH).checkValidIntValue(fieldValues.remove(ALIGNED_DAY_OF_WEEK_IN_MONTH), ALIGNED_DAY_OF_WEEK_IN_MONTH); + ChronoLocalDate date = date(y, moy, 1).plus((aw - 1) * 7 + (ad - 1), DAYS); + if (resolverStyle == ResolverStyle.STRICT && date.get(MONTH_OF_YEAR) != moy) { + throw new DateTimeException("Strict mode rejected resolved date as it is in a different month"); + } + return date; + } + + ChronoLocalDate resolveYMAD(Map fieldValues, ResolverStyle resolverStyle) { + int y = range(YEAR).checkValidIntValue(fieldValues.remove(YEAR), YEAR); + if (resolverStyle == ResolverStyle.LENIENT) { + long months = Math.subtractExact(fieldValues.remove(MONTH_OF_YEAR), 1); + long weeks = Math.subtractExact(fieldValues.remove(ALIGNED_WEEK_OF_MONTH), 1); + long dow = Math.subtractExact(fieldValues.remove(DAY_OF_WEEK), 1); + return resolveAligned(date(y, 1, 1), months, weeks, dow); + } + int moy = range(MONTH_OF_YEAR).checkValidIntValue(fieldValues.remove(MONTH_OF_YEAR), MONTH_OF_YEAR); + int aw = range(ALIGNED_WEEK_OF_MONTH).checkValidIntValue(fieldValues.remove(ALIGNED_WEEK_OF_MONTH), ALIGNED_WEEK_OF_MONTH); + int dow = range(DAY_OF_WEEK).checkValidIntValue(fieldValues.remove(DAY_OF_WEEK), DAY_OF_WEEK); + ChronoLocalDate date = date(y, moy, 1).plus((aw - 1) * 7, DAYS).with(nextOrSame(DayOfWeek.of(dow))); + if (resolverStyle == ResolverStyle.STRICT && date.get(MONTH_OF_YEAR) != moy) { + throw new DateTimeException("Strict mode rejected resolved date as it is in a different month"); + } + return date; + } + + ChronoLocalDate resolveYAA(Map fieldValues, ResolverStyle resolverStyle) { + int y = range(YEAR).checkValidIntValue(fieldValues.remove(YEAR), YEAR); + if (resolverStyle == ResolverStyle.LENIENT) { + long weeks = Math.subtractExact(fieldValues.remove(ALIGNED_WEEK_OF_YEAR), 1); + long days = Math.subtractExact(fieldValues.remove(ALIGNED_DAY_OF_WEEK_IN_YEAR), 1); + return dateYearDay(y, 1).plus(weeks, WEEKS).plus(days, DAYS); + } + int aw = range(ALIGNED_WEEK_OF_YEAR).checkValidIntValue(fieldValues.remove(ALIGNED_WEEK_OF_YEAR), ALIGNED_WEEK_OF_YEAR); + int ad = range(ALIGNED_DAY_OF_WEEK_IN_YEAR).checkValidIntValue(fieldValues.remove(ALIGNED_DAY_OF_WEEK_IN_YEAR), ALIGNED_DAY_OF_WEEK_IN_YEAR); + ChronoLocalDate date = dateYearDay(y, 1).plus((aw - 1) * 7 + (ad - 1), DAYS); + if (resolverStyle == ResolverStyle.STRICT && date.get(YEAR) != y) { + throw new DateTimeException("Strict mode rejected resolved date as it is in a different year"); + } + return date; + } + + ChronoLocalDate resolveYAD(Map fieldValues, ResolverStyle resolverStyle) { + int y = range(YEAR).checkValidIntValue(fieldValues.remove(YEAR), YEAR); + if (resolverStyle == ResolverStyle.LENIENT) { + long weeks = Math.subtractExact(fieldValues.remove(ALIGNED_WEEK_OF_YEAR), 1); + long dow = Math.subtractExact(fieldValues.remove(DAY_OF_WEEK), 1); + return resolveAligned(dateYearDay(y, 1), 0, weeks, dow); + } + int aw = range(ALIGNED_WEEK_OF_YEAR).checkValidIntValue(fieldValues.remove(ALIGNED_WEEK_OF_YEAR), ALIGNED_WEEK_OF_YEAR); + int dow = range(DAY_OF_WEEK).checkValidIntValue(fieldValues.remove(DAY_OF_WEEK), DAY_OF_WEEK); + ChronoLocalDate date = dateYearDay(y, 1).plus((aw - 1) * 7, DAYS).with(nextOrSame(DayOfWeek.of(dow))); + if (resolverStyle == ResolverStyle.STRICT && date.get(YEAR) != y) { + throw new DateTimeException("Strict mode rejected resolved date as it is in a different year"); + } + return date; + } + + ChronoLocalDate resolveAligned(ChronoLocalDate base, long months, long weeks, long dow) { + ChronoLocalDate date = base.plus(months, MONTHS).plus(weeks, WEEKS); + if (dow > 7) { + date = date.plus((dow - 1) / 7, WEEKS); + dow = ((dow - 1) % 7) + 1; + } else if (dow < 1) { + date = date.plus(Math.subtractExact(dow, 7) / 7, WEEKS); + dow = ((dow + 6) % 7) + 1; + } + return date.with(nextOrSame(DayOfWeek.of((int) dow))); + } + /** * Adds a field-value pair to the map, checking for conflicts. *

diff --git a/jdk/src/share/classes/java/time/chrono/Era.java b/jdk/src/share/classes/java/time/chrono/Era.java index 330346dcc36..0fd31c9887d 100644 --- a/jdk/src/share/classes/java/time/chrono/Era.java +++ b/jdk/src/share/classes/java/time/chrono/Era.java @@ -238,7 +238,7 @@ public interface Era extends TemporalAccessor, TemporalAdjuster { if (field == ERA) { return getValue(); } else if (field instanceof ChronoField) { - throw new UnsupportedTemporalTypeException("Unsupported field: " + field.getName()); + throw new UnsupportedTemporalTypeException("Unsupported field: " + field); } return field.getFrom(this); } diff --git a/jdk/src/share/classes/java/time/chrono/HijrahChronology.java b/jdk/src/share/classes/java/time/chrono/HijrahChronology.java index 63dfc1c213b..c5061b05a32 100644 --- a/jdk/src/share/classes/java/time/chrono/HijrahChronology.java +++ b/jdk/src/share/classes/java/time/chrono/HijrahChronology.java @@ -71,8 +71,10 @@ import java.time.DateTimeException; import java.time.Instant; import java.time.LocalDate; import java.time.ZoneId; +import java.time.format.ResolverStyle; import java.time.temporal.ChronoField; import java.time.temporal.TemporalAccessor; +import java.time.temporal.TemporalField; import java.time.temporal.ValueRange; import java.util.Arrays; import java.util.HashMap; @@ -115,7 +117,7 @@ import sun.util.logging.PlatformLogger; *

Hijrah-umalquraislamic-umalquraca-islamic-cv-umalquraca-islamic-umalquraIslamic - Umm Al-Qura calendar of Saudi Arabia
- * + * * * * @@ -38,7 +38,7 @@ * * * - * + * * * * @@ -86,14 +86,14 @@ * *
    * - *

  • The {@link java.nio.file.attribute.UserPrincipal} and + *
  • The {@link java.nio.file.attribute.UserPrincipal} and * {@link java.nio.file.attribute.GroupPrincipal} interfaces represent an * identity or group identity.
    • * - *

  • The {@link java.nio.file.attribute.UserPrincipalLookupService} + *
  • The {@link java.nio.file.attribute.UserPrincipalLookupService} * interface defines methods to lookup user or group principals.
    • * - *

  • The {@link java.nio.file.attribute.FileAttribute} interface + *
  • The {@link java.nio.file.attribute.FileAttribute} interface * represents the value of an attribute for cases where the attribute value is * required to be set atomically when creating an object in the file system.
    • * diff --git a/jdk/src/share/classes/java/util/function/package-info.java b/jdk/src/share/classes/java/util/function/package-info.java index 36eda330d19..690b76dc3b7 100644 --- a/jdk/src/share/classes/java/util/function/package-info.java +++ b/jdk/src/share/classes/java/util/function/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -30,13 +30,13 @@ * adapted. Functional interfaces can provide a target type in multiple contexts, * such as assignment context, method invocation, or cast context: * - * 
    - *     Predicate<String> p = String::isEmpty;
+ * 
    {@code
+ *     Predicate p = String::isEmpty;
  *
  *     stream.filter(e -> e.getSize() > 10)...
  *
  *     stream.map((ToIntFunction) e -> e.getSize())...
- * 
    
+ * }
    * *

    The interfaces in this package are functional interfaces used by the JDK, * and are available to be used by user code as well. While they do not identify From da356310f4ade9ba2ed100d3d00d39e58ec57ea7 Mon Sep 17 00:00:00 2001 From: Joe Darcy Date: Sat, 20 Jul 2013 11:39:39 -0700 Subject: [PATCH 016/120] 8020971: Fix doclint issues in java.nio.* Reviewed-by: lancea --- .../java/nio/channels/package-info.java | 10 ++++---- .../classes/java/nio/charset/Charset.java | 24 ++++++++----------- .../nio/charset/MalformedInputException.java | 15 +++++++++++- .../charset/UnmappableCharacterException.java | 15 +++++++++++- .../classes/java/nio/file/package-info.java | 18 +++++++------- 5 files changed, 52 insertions(+), 30 deletions(-) diff --git a/jdk/src/share/classes/java/nio/channels/package-info.java b/jdk/src/share/classes/java/nio/channels/package-info.java index 85590dde06d..cb55f8f8da7 100644 --- a/jdk/src/share/classes/java/nio/channels/package-info.java +++ b/jdk/src/share/classes/java/nio/channels/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -31,7 +31,7 @@ * * *

Attribute views

Description

Attribute viewsDescription
{@link java.nio.file.attribute.AttributeView}Can read or update non-opaque values associated with objects in a file system
  {@link java.nio.file.attribute.FileAttributeView}Can read or update POSIX defined file attributes
      {@link java.nio.file.attribute.DosFileAttributeView}  Can read or update FAT file attributes
    {@link java.nio.file.attribute.FileOwnerAttributeView}  
    {@link java.nio.file.attribute.FileOwnerAttributeView}  Can read or update the owner of a file
     {@link java.nio.file.attribute.AclFileAttributeView}  Can read or update Access Control Lists
- * + * * * * @@ -110,7 +110,7 @@ * write them to a given writable byte channel. * *

Channels

Description

ChannelsDescription
{@link java.nio.channels.Channel}A nexus for I/O operations
  {@link java.nio.channels.ReadableByteChannel}
- * + * * * * @@ -138,7 +138,7 @@ * * *

File channels

Description

File channelsDescription
{@link java.nio.channels.FileChannel}Reads, writes, maps, and manipulates files
{@link java.nio.channels.FileLock}
- * + * * * * @@ -225,7 +225,7 @@ * * *

Multiplexed, non-blocking I/O

Description

Multiplexed, non-blocking I/O

Description

{@link java.nio.channels.SelectableChannel}A channel that can be multiplexed
  {@link java.nio.channels.DatagramChannel}
- * + * * * * diff --git a/jdk/src/share/classes/java/nio/charset/Charset.java b/jdk/src/share/classes/java/nio/charset/Charset.java index 278bacb17c5..e1a828dcb15 100644 --- a/jdk/src/share/classes/java/nio/charset/Charset.java +++ b/jdk/src/share/classes/java/nio/charset/Charset.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -65,7 +65,7 @@ import sun.security.action.GetPropertyAction; * concurrent threads. * * - * + * *

Charset names

* *

Charsets are named by strings composed of the following characters: @@ -111,21 +111,17 @@ import sun.security.action.GetPropertyAction; * The aliases of a charset are returned by the {@link #aliases() aliases} * method. * - * - * - *

Some charsets have an historical name that is defined for - * compatibility with previous versions of the Java platform. A charset's + *

Some charsets have an historical name that is defined for + * compatibility with previous versions of the Java platform. A charset's * historical name is either its canonical name or one of its aliases. The * historical name is returned by the getEncoding() methods of the * {@link java.io.InputStreamReader#getEncoding InputStreamReader} and {@link * java.io.OutputStreamWriter#getEncoding OutputStreamWriter} classes. * - * - * - *

If a charset listed in the If a charset listed in the IANA Charset * Registry is supported by an implementation of the Java platform then - * its canonical name must be the name listed in the registry. Many charsets + * its canonical name must be the name listed in the registry. Many charsets * are given more than one name in the registry, in which case the registry * identifies one of the names as MIME-preferred. If a charset has more * than one registry name then its canonical name must be the MIME-preferred @@ -142,15 +138,15 @@ import sun.security.action.GetPropertyAction; * *

Standard charsets

* - * * - *

Every implementation of the Java platform is required to support the - * following standard charsets. Consult the release documentation for your + * + *

Every implementation of the Java platform is required to support the + * following standard charsets. Consult the release documentation for your * implementation to see if any other charsets are supported. The behavior * of such optional charsets may differ between implementations. * *

Asynchronous I/O

Description

Asynchronous I/ODescription
{@link java.nio.channels.AsynchronousFileChannel}An asynchronous channel for reading, writing, and manipulating a file
{@link java.nio.channels.AsynchronousSocketChannel}
- * + * * * diff --git a/jdk/src/share/classes/java/nio/charset/MalformedInputException.java b/jdk/src/share/classes/java/nio/charset/MalformedInputException.java index ba1d1018a53..aadbadccc2a 100644 --- a/jdk/src/share/classes/java/nio/charset/MalformedInputException.java +++ b/jdk/src/share/classes/java/nio/charset/MalformedInputException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -42,14 +42,27 @@ public class MalformedInputException private int inputLength; + /** + * Constructs an {@code MalformedInputException} with the given + * length. + * @param inputLength the length of the input + */ public MalformedInputException(int inputLength) { this.inputLength = inputLength; } + /** + * Returns the length of the input. + * @return the length of the input + */ public int getInputLength() { return inputLength; } + /** + * Returns the message. + * @return the message + */ public String getMessage() { return "Input length = " + inputLength; } diff --git a/jdk/src/share/classes/java/nio/charset/UnmappableCharacterException.java b/jdk/src/share/classes/java/nio/charset/UnmappableCharacterException.java index 5fa12476d68..c33f0404b64 100644 --- a/jdk/src/share/classes/java/nio/charset/UnmappableCharacterException.java +++ b/jdk/src/share/classes/java/nio/charset/UnmappableCharacterException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -42,14 +42,27 @@ public class UnmappableCharacterException private int inputLength; + /** + * Constructs an {@code UnmappableCharacterException} with the + * given length. + * @param inputLength the length of the input + */ public UnmappableCharacterException(int inputLength) { this.inputLength = inputLength; } + /** + * Returns the length of the input. + * @return the length of the input + */ public int getInputLength() { return inputLength; } + /** + * Returns the message. + * @return the message + */ public String getMessage() { return "Input length = " + inputLength; } diff --git a/jdk/src/share/classes/java/nio/file/package-info.java b/jdk/src/share/classes/java/nio/file/package-info.java index c0cf571b555..ca3e946d567 100644 --- a/jdk/src/share/classes/java/nio/file/package-info.java +++ b/jdk/src/share/classes/java/nio/file/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -33,8 +33,8 @@ * package is used by service provider implementors wishing to extend the * platform default provider, or to construct other provider implementations.

* - *

Symbolic Links

 - * Many operating systems and file systems support for symbolic links. + *

Symbolic Links

+ *

Many operating systems and file systems support for symbolic links. * A symbolic link is a special file that serves as a reference to another file. * For the most part, symbolic links are transparent to applications and * operations on symbolic links are automatically redirected to the target @@ -45,8 +45,8 @@ * that are semantically close but support for these other types of links is * not included in this package.

* - *

Interoperability

 - * The {@link java.io.File} class defines the {@link java.io.File#toPath + *

Interoperability

+ *

The {@link java.io.File} class defines the {@link java.io.File#toPath * toPath} method to construct a {@link java.nio.file.Path} by converting * the abstract path represented by the {@code java.io.File} object. The resulting * {@code Path} can be used to operate on the same file as the {@code File} @@ -55,7 +55,7 @@ * and {@code java.io.File} objects.

* *

Visibility

- * The view of the files and file system provided by classes in this package are + *

The view of the files and file system provided by classes in this package are * guaranteed to be consistent with other views provided by other instances in the * same Java virtual machine. The view may or may not, however, be consistent with * the view of the file system as seen by other concurrently running programs due @@ -65,8 +65,8 @@ * or on some other machine. The exact nature of any such inconsistencies are * system-dependent and are therefore unspecified.

* - *

Synchronized I/O File Integrity

 - * The {@link java.nio.file.StandardOpenOption#SYNC SYNC} and {@link + *

Synchronized I/O File Integrity

+ *

The {@link java.nio.file.StandardOpenOption#SYNC SYNC} and {@link * java.nio.file.StandardOpenOption#DSYNC DSYNC} options are used when opening a file * to require that updates to the file are written synchronously to the underlying * storage device. In the case of the default provider, and the file resides on @@ -83,7 +83,7 @@ * specific.

* *

General Exceptions

- * Unless otherwise noted, passing a {@code null} argument to a constructor + *

Unless otherwise noted, passing a {@code null} argument to a constructor * or method of any class or interface in this package will cause a {@link * java.lang.NullPointerException NullPointerException} to be thrown. Additionally, * invoking a method with a collection containing a {@code null} element will From 027e8fa7c92f8b1851d7d7de8b79543b5bd6f699 Mon Sep 17 00:00:00 2001 From: Kurchi Subhra Hazra Date: Mon, 22 Jul 2013 15:24:26 +0100 Subject: [PATCH 017/120] 8020498: Crash when both libnet.so and libmawt.so are loaded Reviewed-by: chegar, dsamersoff --- jdk/src/share/native/java/net/net_util.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/jdk/src/share/native/java/net/net_util.c b/jdk/src/share/native/java/net/net_util.c index 5d15f9d9b0e..2f99a342ddd 100644 --- a/jdk/src/share/native/java/net/net_util.c +++ b/jdk/src/share/native/java/net/net_util.c @@ -75,7 +75,7 @@ JNI_OnLoad(JavaVM *vm, void *reserved) static int initialized = 0; -void init(JNIEnv *env) { +static void initInetAddrs(JNIEnv *env) { if (!initialized) { Java_java_net_InetAddress_init(env, 0); Java_java_net_Inet4Address_init(env, 0); @@ -96,42 +96,43 @@ extern jfieldID iac_familyID; void setInetAddress_addr(JNIEnv *env, jobject iaObj, int address) { jobject holder; - init(env); + initInetAddrs(env); holder = (*env)->GetObjectField(env, iaObj, ia_holderID); (*env)->SetIntField(env, holder, iac_addressID, address); } void setInetAddress_family(JNIEnv *env, jobject iaObj, int family) { jobject holder; - init(env); + initInetAddrs(env); holder = (*env)->GetObjectField(env, iaObj, ia_holderID); (*env)->SetIntField(env, holder, iac_familyID, family); } void setInetAddress_hostName(JNIEnv *env, jobject iaObj, jobject host) { jobject holder; - init(env); + initInetAddrs(env); holder = (*env)->GetObjectField(env, iaObj, ia_holderID); (*env)->SetObjectField(env, holder, iac_hostNameID, host); } int getInetAddress_addr(JNIEnv *env, jobject iaObj) { jobject holder; - init(env); + initInetAddrs(env); holder = (*env)->GetObjectField(env, iaObj, ia_holderID); return (*env)->GetIntField(env, holder, iac_addressID); } int getInetAddress_family(JNIEnv *env, jobject iaObj) { jobject holder; - init(env); + + initInetAddrs(env); holder = (*env)->GetObjectField(env, iaObj, ia_holderID); return (*env)->GetIntField(env, holder, iac_familyID); } jobject getInetAddress_hostName(JNIEnv *env, jobject iaObj) { jobject holder; - init(env); + initInetAddrs(env); holder = (*env)->GetObjectField(env, iaObj, ia_holderID); return (*env)->GetObjectField(env, holder, iac_hostNameID); } @@ -139,7 +140,7 @@ jobject getInetAddress_hostName(JNIEnv *env, jobject iaObj) { JNIEXPORT jobject JNICALL NET_SockaddrToInetAddress(JNIEnv *env, struct sockaddr *him, int *port) { jobject iaObj; - init(env); + initInetAddrs(env); #ifdef AF_INET6 if (him->sa_family == AF_INET6) { jbyteArray ipaddress; From 38008f1a2106a6c7b34dcc44b684f62b5e7a5267 Mon Sep 17 00:00:00 2001 From: Doug Lea Date: Mon, 22 Jul 2013 15:26:11 +0100 Subject: [PATCH 018/120] 8020976: Ensure consistent insertion for ConcurrentHashMap Reviewed-by: chegar --- .../util/concurrent/ConcurrentHashMap.java | 127 ++++++++++++------ 1 file changed, 87 insertions(+), 40 deletions(-) diff --git a/jdk/src/share/classes/java/util/concurrent/ConcurrentHashMap.java b/jdk/src/share/classes/java/util/concurrent/ConcurrentHashMap.java index 08e2bd38239..edd788afe25 100644 --- a/jdk/src/share/classes/java/util/concurrent/ConcurrentHashMap.java +++ b/jdk/src/share/classes/java/util/concurrent/ConcurrentHashMap.java @@ -265,7 +265,8 @@ import java.util.stream.Stream; * @param the type of keys maintained by this map * @param the type of mapped values */ -public class ConcurrentHashMap extends AbstractMap implements ConcurrentMap, Serializable { +public class ConcurrentHashMap extends AbstractMap + implements ConcurrentMap, Serializable { private static final long serialVersionUID = 7249069246763182397L; /* @@ -439,16 +440,18 @@ public class ConcurrentHashMap extends AbstractMap implements Concurre * related operations (which is the main reason we cannot use * existing collections such as TreeMaps). TreeBins contain * Comparable elements, but may contain others, as well as - * elements that are Comparable but not necessarily Comparable - * for the same T, so we cannot invoke compareTo among them. To - * handle this, the tree is ordered primarily by hash value, then - * by Comparable.compareTo order if applicable. On lookup at a - * node, if elements are not comparable or compare as 0 then both - * left and right children may need to be searched in the case of - * tied hash values. (This corresponds to the full list search - * that would be necessary if all elements were non-Comparable and - * had tied hashes.) The red-black balancing code is updated from - * pre-jdk-collections + * elements that are Comparable but not necessarily Comparable for + * the same T, so we cannot invoke compareTo among them. To handle + * this, the tree is ordered primarily by hash value, then by + * Comparable.compareTo order if applicable. On lookup at a node, + * if elements are not comparable or compare as 0 then both left + * and right children may need to be searched in the case of tied + * hash values. (This corresponds to the full list search that + * would be necessary if all elements were non-Comparable and had + * tied hashes.) On insertion, to keep a total ordering (or as + * close as is required here) across rebalancings, we compare + * classes and identityHashCodes as tie-breakers. The red-black + * balancing code is updated from pre-jdk-collections * (http://gee.cs.oswego.edu/dl/classes/collections/RBCell.java) * based in turn on Cormen, Leiserson, and Rivest "Introduction to * Algorithms" (CLR). @@ -478,6 +481,10 @@ public class ConcurrentHashMap extends AbstractMap implements Concurre * unused "Segment" class that is instantiated in minimal form * only when serializing. * + * Also, solely for compatibility with previous versions of this + * class, it extends AbstractMap, even though all of its methods + * are overridden, so it is just useless baggage. + * * This file is organized to make things a little easier to follow * while reading than they might otherwise: First the main static * declarations and utilities, then fields, then main public @@ -1352,6 +1359,7 @@ public class ConcurrentHashMap extends AbstractMap implements Concurre * Saves the state of the {@code ConcurrentHashMap} instance to a * stream (i.e., serializes it). * @param s the stream + * @throws java.io.IOException if an I/O error occurs * @serialData * the key (Object) and value (Object) * for each key-value mapping, followed by a null pair. @@ -1394,6 +1402,9 @@ public class ConcurrentHashMap extends AbstractMap implements Concurre /** * Reconstitutes the instance from a stream (that is, deserializes it). * @param s the stream + * @throws ClassNotFoundException if the class of a serialized object + * could not be found + * @throws java.io.IOException if an I/O error occurs */ private void readObject(java.io.ObjectInputStream s) throws java.io.IOException, ClassNotFoundException { @@ -2080,6 +2091,7 @@ public class ConcurrentHashMap extends AbstractMap implements Concurre * Creates a new {@link Set} backed by a ConcurrentHashMap * from the given type to {@code Boolean.TRUE}. * + * @param the element type of the returned set * @return the new set * @since 1.8 */ @@ -2094,9 +2106,10 @@ public class ConcurrentHashMap extends AbstractMap implements Concurre * * @param initialCapacity The implementation performs internal * sizing to accommodate this many elements. + * @param the element type of the returned set + * @return the new set * @throws IllegalArgumentException if the initial capacity of * elements is negative - * @return the new set * @since 1.8 */ public static KeySetView newKeySet(int initialCapacity) { @@ -2643,19 +2656,18 @@ public class ConcurrentHashMap extends AbstractMap implements Concurre p = pr; else if ((pk = p.key) == k || (pk != null && k.equals(pk))) return p; - else if (pl == null && pr == null) - break; + else if (pl == null) + p = pr; + else if (pr == null) + p = pl; else if ((kc != null || (kc = comparableClassFor(k)) != null) && (dir = compareComparables(kc, k, pk)) != 0) p = (dir < 0) ? pl : pr; - else if (pl == null) - p = pr; - else if (pr == null || - (q = pr.findTreeNode(h, k, kc)) == null) - p = pl; - else + else if ((q = pr.findTreeNode(h, k, kc)) != null) return q; + else + p = pl; } while (p != null); } return null; @@ -2681,6 +2693,23 @@ public class ConcurrentHashMap extends AbstractMap implements Concurre static final int WAITER = 2; // set when waiting for write lock static final int READER = 4; // increment value for setting read lock + /** + * Tie-breaking utility for ordering insertions when equal + * hashCodes and non-comparable. We don't require a total + * order, just a consistent insertion rule to maintain + * equivalence across rebalancings. Tie-breaking further than + * necessary simplifies testing a bit. + */ + static int tieBreakOrder(Object a, Object b) { + int d; + if (a == null || b == null || + (d = a.getClass().getName(). + compareTo(b.getClass().getName())) == 0) + d = (System.identityHashCode(a) <= System.identityHashCode(b) ? + -1 : 1); + return d; + } + /** * Creates bin with initial set of nodes headed by b. */ @@ -2697,21 +2726,21 @@ public class ConcurrentHashMap extends AbstractMap implements Concurre r = x; } else { - Object key = x.key; - int hash = x.hash; + K k = x.key; + int h = x.hash; Class kc = null; for (TreeNode p = r;;) { int dir, ph; - if ((ph = p.hash) > hash) + K pk = p.key; + if ((ph = p.hash) > h) dir = -1; - else if (ph < hash) + else if (ph < h) dir = 1; - else if ((kc != null || - (kc = comparableClassFor(key)) != null)) - dir = compareComparables(kc, key, p.key); - else - dir = 0; - TreeNode xp = p; + else if ((kc == null && + (kc = comparableClassFor(k)) == null) || + (dir = compareComparables(kc, k, pk)) == 0) + dir = tieBreakOrder(k, pk); + TreeNode xp = p; if ((p = (dir <= 0) ? p.left : p.right) == null) { x.parent = xp; if (dir <= 0) @@ -2725,6 +2754,7 @@ public class ConcurrentHashMap extends AbstractMap implements Concurre } } this.root = r; + assert checkInvariants(root); } /** @@ -2805,8 +2835,9 @@ public class ConcurrentHashMap extends AbstractMap implements Concurre */ final TreeNode putTreeVal(int h, K k, V v) { Class kc = null; + boolean searched = false; for (TreeNode p = root;;) { - int dir, ph; K pk; TreeNode q, pr; + int dir, ph; K pk; if (p == null) { first = root = new TreeNode(h, k, v, null, null); break; @@ -2820,21 +2851,25 @@ public class ConcurrentHashMap extends AbstractMap implements Concurre else if ((kc == null && (kc = comparableClassFor(k)) == null) || (dir = compareComparables(kc, k, pk)) == 0) { - if (p.left == null) - dir = 1; - else if ((pr = p.right) == null || - (q = pr.findTreeNode(h, k, kc)) == null) - dir = -1; - else - return q; + if (!searched) { + TreeNode q, ch; + searched = true; + if (((ch = p.left) != null && + (q = ch.findTreeNode(h, k, kc)) != null) || + ((ch = p.right) != null && + (q = ch.findTreeNode(h, k, kc)) != null)) + return q; + } + dir = tieBreakOrder(k, pk); } + TreeNode xp = p; - if ((p = (dir < 0) ? p.left : p.right) == null) { + if ((p = (dir <= 0) ? p.left : p.right) == null) { TreeNode x, f = first; first = x = new TreeNode(h, k, v, f, xp); if (f != null) f.prev = x; - if (dir < 0) + if (dir <= 0) xp.left = x; else xp.right = x; @@ -3546,6 +3581,7 @@ public class ConcurrentHashMap extends AbstractMap implements Concurre * for an element, or null if there is no transformation (in * which case the action is not applied) * @param action the action + * @param the return type of the transformer * @since 1.8 */ public void forEach(long parallelismThreshold, @@ -3569,6 +3605,7 @@ public class ConcurrentHashMap extends AbstractMap implements Concurre * needed for this operation to be executed in parallel * @param searchFunction a function returning a non-null * result on success, else null + * @param the return type of the search function * @return a non-null result from applying the given search * function on each (key, value), or null if none * @since 1.8 @@ -3592,6 +3629,7 @@ public class ConcurrentHashMap extends AbstractMap implements Concurre * for an element, or null if there is no transformation (in * which case it is not combined) * @param reducer a commutative associative combining function + * @param the return type of the transformer * @return the result of accumulating the given transformation * of all (key, value) pairs * @since 1.8 @@ -3710,6 +3748,7 @@ public class ConcurrentHashMap extends AbstractMap implements Concurre * for an element, or null if there is no transformation (in * which case the action is not applied) * @param action the action + * @param the return type of the transformer * @since 1.8 */ public void forEachKey(long parallelismThreshold, @@ -3733,6 +3772,7 @@ public class ConcurrentHashMap extends AbstractMap implements Concurre * needed for this operation to be executed in parallel * @param searchFunction a function returning a non-null * result on success, else null + * @param the return type of the search function * @return a non-null result from applying the given search * function on each key, or null if none * @since 1.8 @@ -3775,6 +3815,7 @@ public class ConcurrentHashMap extends AbstractMap implements Concurre * for an element, or null if there is no transformation (in * which case it is not combined) * @param reducer a commutative associative combining function + * @param the return type of the transformer * @return the result of accumulating the given transformation * of all keys * @since 1.8 @@ -3894,6 +3935,7 @@ public class ConcurrentHashMap extends AbstractMap implements Concurre * for an element, or null if there is no transformation (in * which case the action is not applied) * @param action the action + * @param the return type of the transformer * @since 1.8 */ public void forEachValue(long parallelismThreshold, @@ -3917,6 +3959,7 @@ public class ConcurrentHashMap extends AbstractMap implements Concurre * needed for this operation to be executed in parallel * @param searchFunction a function returning a non-null * result on success, else null + * @param the return type of the search function * @return a non-null result from applying the given search * function on each value, or null if none * @since 1.8 @@ -3958,6 +4001,7 @@ public class ConcurrentHashMap extends AbstractMap implements Concurre * for an element, or null if there is no transformation (in * which case it is not combined) * @param reducer a commutative associative combining function + * @param the return type of the transformer * @return the result of accumulating the given transformation * of all values * @since 1.8 @@ -4075,6 +4119,7 @@ public class ConcurrentHashMap extends AbstractMap implements Concurre * for an element, or null if there is no transformation (in * which case the action is not applied) * @param action the action + * @param the return type of the transformer * @since 1.8 */ public void forEachEntry(long parallelismThreshold, @@ -4098,6 +4143,7 @@ public class ConcurrentHashMap extends AbstractMap implements Concurre * needed for this operation to be executed in parallel * @param searchFunction a function returning a non-null * result on success, else null + * @param the return type of the search function * @return a non-null result from applying the given search * function on each entry, or null if none * @since 1.8 @@ -4139,6 +4185,7 @@ public class ConcurrentHashMap extends AbstractMap implements Concurre * for an element, or null if there is no transformation (in * which case it is not combined) * @param reducer a commutative associative combining function + * @param the return type of the transformer * @return the result of accumulating the given transformation * of all entries * @since 1.8 From e27ee62c841a8bc3f65834c83b32b4e39db47c6a Mon Sep 17 00:00:00 2001 From: Mike Duigou Date: Mon, 22 Jul 2013 12:59:09 -0700 Subject: [PATCH 019/120] 6799426: Adds constructor PriorityQueue(Comparator) Reviewed-by: lancea --- jdk/src/share/classes/java/util/PriorityQueue.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/jdk/src/share/classes/java/util/PriorityQueue.java b/jdk/src/share/classes/java/util/PriorityQueue.java index c28647b58bb..c5a961cdbe9 100644 --- a/jdk/src/share/classes/java/util/PriorityQueue.java +++ b/jdk/src/share/classes/java/util/PriorityQueue.java @@ -135,6 +135,19 @@ public class PriorityQueue extends AbstractQueue this(initialCapacity, null); } + /** + * Creates a {@code PriorityQueue} with the default initial capacity + * that orders its elements according to the specified comparator. + * + * @param comparator the comparator that will be used to order this + * priority queue. If {@code null}, the {@linkplain Comparable + * natural ordering} of the elements will be used. + * @since 1.8 + */ + public PriorityQueue(Comparator comparator) { + this(DEFAULT_INITIAL_CAPACITY, comparator); + } + /** * Creates a {@code PriorityQueue} with the specified initial capacity * that orders its elements according to the specified comparator. From 3392a6aecc03763004bdea99870b7c1b6d33db6c Mon Sep 17 00:00:00 2001 From: Joe Darcy Date: Mon, 22 Jul 2013 22:11:44 -0700 Subject: [PATCH 020/120] 8021109: Add serialVersionUID to LambdaConversionException.java Reviewed-by: jrose --- .../classes/java/lang/invoke/LambdaConversionException.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jdk/src/share/classes/java/lang/invoke/LambdaConversionException.java b/jdk/src/share/classes/java/lang/invoke/LambdaConversionException.java index 5cc3c626e36..e1123da59d8 100644 --- a/jdk/src/share/classes/java/lang/invoke/LambdaConversionException.java +++ b/jdk/src/share/classes/java/lang/invoke/LambdaConversionException.java @@ -29,6 +29,8 @@ package java.lang.invoke; * LambdaConversionException */ public class LambdaConversionException extends Exception { + private static final long serialVersionUID = 292L + 8L; + /** * Constructs a {@code LambdaConversionException}. */ From 5db8580b26ce74b8a84b4dae113d05c338d3ee29 Mon Sep 17 00:00:00 2001 From: Ivan Gerasimov Date: Tue, 23 Jul 2013 18:57:57 +0400 Subject: [PATCH 021/120] 8016838: improvement of RedefineBigClass and RetransformBigClass tests Reviewed-by: dcubed --- jdk/test/ProblemList.txt | 5 +++ .../java/lang/instrument/RedefineBigClass.sh | 4 +- .../lang/instrument/RedefineBigClassApp.java | 44 ++++++++++++++++++- .../lang/instrument/RetransformBigClass.sh | 4 +- .../instrument/RetransformBigClassApp.java | 44 ++++++++++++++++++- 5 files changed, 95 insertions(+), 6 deletions(-) diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt index 8c98dbda37a..1574a648c9c 100644 --- a/jdk/test/ProblemList.txt +++ b/jdk/test/ProblemList.txt @@ -137,6 +137,11 @@ java/lang/Class/asSubclass/BasicUnit.java generic-all # 8015780 java/lang/reflect/Method/GenericStringTest.java generic-all +# 8019845 due to memleak not related to the tested fix +java/lang/instrument/RedefineBigClass.sh linux-x64 +java/lang/instrument/RetransformBigClass.sh linux-x64 + + ############################################################################ # jdk_management diff --git a/jdk/test/java/lang/instrument/RedefineBigClass.sh b/jdk/test/java/lang/instrument/RedefineBigClass.sh index 6b71271e7b9..145be056eb2 100644 --- a/jdk/test/java/lang/instrument/RedefineBigClass.sh +++ b/jdk/test/java/lang/instrument/RedefineBigClass.sh @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2013 Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,7 @@ # # @test -# @bug 7121600 +# @bug 7121600 8016838 # @summary Redefine a big class. # @author Daniel D. Daugherty # diff --git a/jdk/test/java/lang/instrument/RedefineBigClassApp.java b/jdk/test/java/lang/instrument/RedefineBigClassApp.java index 6f2233aebde..81416303fc0 100644 --- a/jdk/test/java/lang/instrument/RedefineBigClassApp.java +++ b/jdk/test/java/lang/instrument/RedefineBigClassApp.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2013 Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -21,12 +21,21 @@ * questions. */ +import java.io.*; + public class RedefineBigClassApp { + /** + * Memory leak is assumed, if application consumes more than specified amount of memory during its execution. + * The number is given in Kb. + */ + private static final long MEM_LEAK_THRESHOLD = 32 * 1024; // 32Mb + public static void main(String[] args) throws Exception { System.out.println("Creating instance of " + RedefineBigClassAgent.clz); RedefineBigClassAgent.clz.newInstance(); + long vMemBefore = getVMemSize(); int count = 0; while (!RedefineBigClassAgent.doneRedefining) { System.out.println("App loop count: " + ++count); @@ -37,6 +46,39 @@ public class RedefineBigClassApp { } System.out.println("App looped " + count + " times."); + long vMemAfter = getVMemSize(); + if (vMemBefore == 0 || vMemAfter == 0) { + System.err.println("WARNING: Cannot perform memory leak detection on this OS"); + } else { + long vMemDelta = vMemAfter - vMemBefore; + if (vMemDelta > MEM_LEAK_THRESHOLD) { + System.err.println("FAIL: Virtual memory usage increased by " + vMemDelta + "Kb " + + "(greater than " + MEM_LEAK_THRESHOLD + "Kb)"); + System.exit(1); + } + System.err.println("PASS: Virtual memory usage increased by " + vMemDelta + "Kb " + + "(not greater than " + MEM_LEAK_THRESHOLD + "Kb)"); + } System.exit(0); } + + /** + * Return size of virtual memory allocated to the process in Kb. + * Linux specific. On other platforms and in case of any errors return 0. + */ + private static long getVMemSize() { + + // Refer to the Linux proc(5) man page for details about /proc/self/stat file + // + // In short, this file contains status information about the current process + // written in one line. The fields are separated with spaces. + // The 23rd field is defined as 'vsize %lu Virtual memory size in bytes' + + try (FileReader fileReader = new FileReader("/proc/self/stat"); + BufferedReader bufferedReader = new BufferedReader(fileReader)) { + String line = bufferedReader.readLine(); + return Long.parseLong(line.split(" ")[22]) / 1024; + } catch (Exception ex) {} + return 0; + } } diff --git a/jdk/test/java/lang/instrument/RetransformBigClass.sh b/jdk/test/java/lang/instrument/RetransformBigClass.sh index acaa5ae0d0c..dddde89c785 100644 --- a/jdk/test/java/lang/instrument/RetransformBigClass.sh +++ b/jdk/test/java/lang/instrument/RetransformBigClass.sh @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2013 Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -22,7 +22,7 @@ # # @test -# @bug 7122253 +# @bug 7122253 8016838 # @summary Retransform a big class. # @author Daniel D. Daugherty # diff --git a/jdk/test/java/lang/instrument/RetransformBigClassApp.java b/jdk/test/java/lang/instrument/RetransformBigClassApp.java index 37a40e97bd0..3f777bbb20e 100644 --- a/jdk/test/java/lang/instrument/RetransformBigClassApp.java +++ b/jdk/test/java/lang/instrument/RetransformBigClassApp.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2013 Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -21,12 +21,21 @@ * questions. */ +import java.io.*; + public class RetransformBigClassApp { + /** + * Memory leak is assumed, if application consumes more than specified amount of memory during its execution. + * The number is given in Kb. + */ + private static final long MEM_LEAK_THRESHOLD = 32 * 1024; // 32Mb + public static void main(String[] args) throws Exception { System.out.println("Creating instance of " + RetransformBigClassAgent.clz); RetransformBigClassAgent.clz.newInstance(); + long vMemBefore = getVMemSize(); int count = 0; while (!RetransformBigClassAgent.doneRetransforming) { System.out.println("App loop count: " + ++count); @@ -37,6 +46,39 @@ public class RetransformBigClassApp { } System.out.println("App looped " + count + " times."); + long vMemAfter = getVMemSize(); + if (vMemBefore == 0 || vMemAfter == 0) { + System.err.println("WARNING: Cannot perform memory leak detection on this OS"); + } else { + long vMemDelta = vMemAfter - vMemBefore; + if (vMemDelta > MEM_LEAK_THRESHOLD) { + System.err.println("FAIL: Virtual memory usage increased by " + vMemDelta + "Kb " + + "(greater than " + MEM_LEAK_THRESHOLD + "Kb)"); + System.exit(1); + } + System.err.println("PASS: Virtual memory usage increased by " + vMemDelta + "Kb " + + "(not greater than " + MEM_LEAK_THRESHOLD + "Kb)"); + } System.exit(0); } + + /** + * Return size of virtual memory allocated to the process in Kb. + * Linux specific. On other platforms and in case of any errors return 0. + */ + private static long getVMemSize() { + + // Refer to the Linux proc(5) man page for details about /proc/self/stat file + // + // In short, this file contains status information about the current process + // written in one line. The fields are separated with spaces. + // The 23rd field is defined as 'vsize %lu Virtual memory size in bytes' + + try (FileReader fileReader = new FileReader("/proc/self/stat"); + BufferedReader bufferedReader = new BufferedReader(fileReader)) { + String line = bufferedReader.readLine(); + return Long.parseLong(line.split(" ")[22]) / 1024; + } catch (Exception ex) {} + return 0; + } } From 19ac28e61dfdc8d6add488e67e7d961d955cbdc6 Mon Sep 17 00:00:00 2001 From: Brian Goetz Date: Tue, 23 Jul 2013 13:20:11 -0700 Subject: [PATCH 022/120] 8019840: Spec updates for java.util.function Reviewed-by: mduigou, chegar --- .../java/util/function/BiConsumer.java | 49 +++++---- .../java/util/function/BiFunction.java | 39 ++++---- .../java/util/function/BiPredicate.java | 79 +++++++++------ .../java/util/function/BinaryOperator.java | 28 +++--- .../java/util/function/BooleanSupplier.java | 14 ++- .../classes/java/util/function/Consumer.java | 42 ++++---- .../util/function/DoubleBinaryOperator.java | 20 ++-- .../java/util/function/DoubleConsumer.java | 41 ++++---- .../java/util/function/DoubleFunction.java | 13 ++- .../java/util/function/DoublePredicate.java | 80 ++++++++------- .../java/util/function/DoubleSupplier.java | 14 ++- .../util/function/DoubleToIntFunction.java | 16 +-- .../util/function/DoubleToLongFunction.java | 16 +-- .../util/function/DoubleUnaryOperator.java | 52 +++++----- .../classes/java/util/function/Function.java | 59 ++++++----- .../java/util/function/IntBinaryOperator.java | 20 ++-- .../java/util/function/IntConsumer.java | 43 ++++---- .../java/util/function/IntFunction.java | 15 +-- .../java/util/function/IntPredicate.java | 79 ++++++++------- .../java/util/function/IntSupplier.java | 14 ++- .../util/function/IntToDoubleFunction.java | 16 +-- .../java/util/function/IntToLongFunction.java | 16 +-- .../java/util/function/IntUnaryOperator.java | 52 +++++----- .../util/function/LongBinaryOperator.java | 20 ++-- .../java/util/function/LongConsumer.java | 43 ++++---- .../java/util/function/LongFunction.java | 13 ++- .../java/util/function/LongPredicate.java | 78 ++++++++------- .../java/util/function/LongSupplier.java | 14 ++- .../util/function/LongToDoubleFunction.java | 16 +-- .../java/util/function/LongToIntFunction.java | 16 +-- .../java/util/function/LongUnaryOperator.java | 52 +++++----- .../java/util/function/ObjDoubleConsumer.java | 20 ++-- .../java/util/function/ObjIntConsumer.java | 20 ++-- .../java/util/function/ObjLongConsumer.java | 20 ++-- .../classes/java/util/function/Predicate.java | 99 ++++++++++--------- .../classes/java/util/function/Supplier.java | 15 ++- .../util/function/ToDoubleBiFunction.java | 22 +++-- .../java/util/function/ToDoubleFunction.java | 17 ++-- .../java/util/function/ToIntBiFunction.java | 22 +++-- .../java/util/function/ToIntFunction.java | 17 ++-- .../java/util/function/ToLongBiFunction.java | 22 +++-- .../java/util/function/ToLongFunction.java | 17 ++-- .../java/util/function/UnaryOperator.java | 15 +-- .../java/util/function/package-info.java | 92 ++++++++++------- 44 files changed, 824 insertions(+), 643 deletions(-) diff --git a/jdk/src/share/classes/java/util/function/BiConsumer.java b/jdk/src/share/classes/java/util/function/BiConsumer.java index afc0ba34d1e..61690e6471a 100644 --- a/jdk/src/share/classes/java/util/function/BiConsumer.java +++ b/jdk/src/share/classes/java/util/function/BiConsumer.java @@ -27,13 +27,16 @@ package java.util.function; import java.util.Objects; /** - * An operation which accepts two input arguments and returns no result. This is - * the two-arity specialization of {@link Consumer}. Unlike most other - * functional interfaces, {@code BiConsumer} is expected to operate via - * side-effects. + * Represents an operation that accepts two input arguments and returns no + * result. This is the two-arity specialization of {@link Consumer}. + * Unlike most other functional interfaces, {@code BiConsumer} is expected + * to operate via side-effects. * - * @param the type of the first argument to the {@code accept} operation - * @param the type of the second argument to the {@code accept} operation + *

This is a functional interface + * whose functional method is {@link #accept(Object, Object)}. + * + * @param the type of the first argument to the operation + * @param the type of the second argument to the operation * * @see Consumer * @since 1.8 @@ -42,35 +45,31 @@ import java.util.Objects; public interface BiConsumer { /** - * Performs operations upon the provided objects which may modify those - * objects and/or external state. + * Performs this operation on the given arguments. * - * @param t an input object - * @param u an input object + * @param t the first input argument + * @param u the second input argument */ void accept(T t, U u); /** - * Returns a {@code BiConsumer} which performs, in sequence, the operation - * represented by this object followed by the operation represented by - * the other {@code BiConsumer}. + * Returns a composed {@code BiConsumer} that performs, in sequence, this + * operation followed by the {@code after} operation. If performing either + * operation throws an exception, it is relayed to the caller of the + * composed operation. If performing this operation throws an exception, + * the {@code after} operation will not be performed. * - *

Any exceptions thrown by either {@code accept} method are relayed - * to the caller; if performing this operation throws an exception, the - * other operation will not be performed. - * - * @param other a BiConsumer which will be chained after this BiConsumer - * @return a BiConsumer which performs in sequence the {@code accept} method - * of this BiConsumer and the {@code accept} method of the specified - * BiConsumer operation - * @throws NullPointerException if other is null + * @param after the operation to perform after this operation + * @return a composed {@code BiConsumer} that performs in sequence this + * operation followed by the {@code after} operation + * @throws NullPointerException if {@code after} is null */ - default BiConsumer chain(BiConsumer other) { - Objects.requireNonNull(other); + default BiConsumer andThen(BiConsumer after) { + Objects.requireNonNull(after); return (l, r) -> { accept(l, r); - other.accept(l, r); + after.accept(l, r); }; } } diff --git a/jdk/src/share/classes/java/util/function/BiFunction.java b/jdk/src/share/classes/java/util/function/BiFunction.java index fb66ec0e8bb..ef75901fb34 100644 --- a/jdk/src/share/classes/java/util/function/BiFunction.java +++ b/jdk/src/share/classes/java/util/function/BiFunction.java @@ -27,14 +27,15 @@ package java.util.function; import java.util.Objects; /** - * Apply a function to the input arguments, yielding an appropriate result. This - * is the two-arity specialization of {@link Function}. A function may - * variously provide a mapping between types, object instances or keys and - * values or any other form of transformation upon the input. + * Represents a function that accepts two arguments and produces a result. + * This is the two-arity specialization of {@link Function}. * - * @param the type of the first argument to the {@code apply} operation - * @param the type of the second argument to the {@code apply} operation - * @param the type of results returned by the {@code apply} operation + *

This is a functional interface + * whose functional method is {@link #apply(Object, Object)}. + * + * @param the type of the first argument to the function + * @param the type of the second argument to the function + * @param the type of the result of the function * * @see Function * @since 1.8 @@ -43,25 +44,25 @@ import java.util.Objects; public interface BiFunction { /** - * Compute the result of applying the function to the input arguments + * Applies this function to the given arguments. * - * @param t an input object - * @param u an input object + * @param t the first function argument + * @param u the second function argument * @return the function result */ R apply(T t, U u); /** - * Returns a new function which applies this function followed by the - * provided function. If either function throws an exception, it is relayed - * to the caller. + * Returns a composed function that first applies this function to + * its input, and then applies the {@code after} function to the result. + * If evaluation of either function throws an exception, it is relayed to + * the caller of the composed function. * - * @param Type of output objects to the combined function. May be the - * same type as {@code }, {@code } or {@code } - * @param after An additional function to be applied after this function is - * applied - * @return A function which performs this function followed by the provided - * function + * @param the type of output of the {@code after} function, and of the + * composed function + * @param after the function to apply after this function is applied + * @return a composed function that first applies this function and then + * applies the {@code after} function * @throws NullPointerException if after is null */ default BiFunction andThen(Function after) { diff --git a/jdk/src/share/classes/java/util/function/BiPredicate.java b/jdk/src/share/classes/java/util/function/BiPredicate.java index 29e92b875f7..a0f19b812d0 100644 --- a/jdk/src/share/classes/java/util/function/BiPredicate.java +++ b/jdk/src/share/classes/java/util/function/BiPredicate.java @@ -27,11 +27,14 @@ package java.util.function; import java.util.Objects; /** - * Determines if the input objects match some criteria. This is the two-arity - * specialization of {@link Predicate}. + * Represents a predicate (boolean-valued function) of two arguments. This is + * the two-arity specialization of {@link Predicate}. * - * @param the type of the first argument to {@code test} - * @param the type of the second argument to {@code test} + *

This is a functional interface + * whose functional method is {@link #test(Object, Object)}. + * + * @param the type of the first argument to the predicate + * @param the type of the second argument the predicate * * @see Predicate * @since 1.8 @@ -40,34 +43,41 @@ import java.util.Objects; public interface BiPredicate { /** - * Return {@code true} if the inputs match some criteria. + * Evaluates this predicate on the given arguments. * - * @param t an input object - * @param u an input object - * @return {@code true} if the inputs match some criteria + * @param t the first input argument + * @param u the second input argument + * @return {@code true} if the input arguments match the predicate, + * otherwise {@code false} */ boolean test(T t, U u); /** - * Returns a predicate which evaluates to {@code true} only if this - * predicate and the provided predicate both evaluate to {@code true}. If - * this predicate returns {@code false} then the remaining predicate is not - * evaluated. + * Returns a composed predicate that represents a short-circuiting logical + * AND of this predicate and another. When evaluating the composed + * predicate, if this predicate is {@code false}, then the {@code other} + * predicate is not evaluated. * - * @param p a predicate which will be logically-ANDed with this predicate - * @return a new predicate which returns {@code true} only if both - * predicates return {@code true} - * @throws NullPointerException if p is null + *

Any exceptions thrown during evaluation of either predicate are relayed + * to the caller; if evaluation of this predicate throws an exception, the + * {@code other} predicate will not be evaluated. + * + * @param other a predicate that will be logically-ANDed with this + * predicate + * @return a composed predicate that represents the short-circuiting logical + * AND of this predicate and the {@code other} predicate + * @throws NullPointerException if other is null */ - default BiPredicate and(BiPredicate p) { - Objects.requireNonNull(p); - return (T t, U u) -> test(t, u) && p.test(t, u); + default BiPredicate and(BiPredicate other) { + Objects.requireNonNull(other); + return (T t, U u) -> test(t, u) && other.test(t, u); } /** - * Returns a predicate which negates the result of this predicate. + * Returns a predicate that represents the logical negation of this + * predicate. * - * @return a new predicate who's result is always the opposite of this + * @return a predicate that represents the logical negation of this * predicate */ default BiPredicate negate() { @@ -75,18 +85,23 @@ public interface BiPredicate { } /** - * Returns a predicate which evaluates to {@code true} if either this - * predicate or the provided predicate evaluates to {@code true}. If this - * predicate returns {@code true} then the remaining predicate is not - * evaluated. + * Returns a composed predicate that represents a short-circuiting logical + * OR of this predicate and another. When evaluating the composed + * predicate, if this predicate is {@code true}, then the {@code other} + * predicate is not evaluated. * - * @param p a predicate which will be logically-ORed with this predicate - * @return a new predicate which returns {@code true} if either predicate - * returns {@code true} - * @throws NullPointerException if p is null + *

Any exceptions thrown during evaluation of either predicate are relayed + * to the caller; if evaluation of this predicate throws an exception, the + * {@code other} predicate will not be evaluated. + * + * @param other a predicate that will be logically-ORed with this + * predicate + * @return a composed predicate that represents the short-circuiting logical + * OR of this predicate and the {@code other} predicate + * @throws NullPointerException if other is null */ - default BiPredicate or(BiPredicate p) { - Objects.requireNonNull(p); - return (T t, U u) -> test(t, u) || p.test(t, u); + default BiPredicate or(BiPredicate other) { + Objects.requireNonNull(other); + return (T t, U u) -> test(t, u) || other.test(t, u); } } diff --git a/jdk/src/share/classes/java/util/function/BinaryOperator.java b/jdk/src/share/classes/java/util/function/BinaryOperator.java index 195eba1c3c1..a0150589c80 100644 --- a/jdk/src/share/classes/java/util/function/BinaryOperator.java +++ b/jdk/src/share/classes/java/util/function/BinaryOperator.java @@ -28,42 +28,48 @@ import java.util.Objects; import java.util.Comparator; /** - * An operation upon two operands yielding a result. This is a specialization of - * {@code BiFunction} where the operands and the result are all of the same type. + * Represents an operation upon two operands of the same type, producing a result + * of the same type as the operands. This is a specialization of + * {@link BiFunction} for the case where the operands and the result are all of + * the same type. * - * @param the type of operands to {@code apply} and of the result + *

This is a functional interface + * whose functional method is {@link #apply(Object, Object)}. + * + * @param the type of the operands and result of the operator * * @see BiFunction + * @see UnaryOperator * @since 1.8 */ @FunctionalInterface public interface BinaryOperator extends BiFunction { /** * Returns a {@link BinaryOperator} which returns the lesser of two elements - * according to the specified {@code Comparator} + * according to the specified {@code Comparator}. * - * @param the type of values to be compared and returned - * @param comparator a {@code Comparator} for comparing the two values + * @param the type of the input arguments of the comparator + * @param comparator a {@code Comparator} for comparing the two values * @return a {@code BinaryOperator} which returns the lesser of its operands, * according to the supplied {@code Comparator} * @throws NullPointerException if the argument is null */ - public static BinaryOperator minBy(Comparator comparator) { + public static BinaryOperator minBy(Comparator comparator) { Objects.requireNonNull(comparator); return (a, b) -> comparator.compare(a, b) <= 0 ? a : b; } /** * Returns a {@link BinaryOperator} which returns the greater of two elements - * according to the specified {@code Comparator} + * according to the specified {@code Comparator}. * - * @param the type of values to be compared and returned - * @param comparator a {@code Comparator} for comparing the two values + * @param the type of the input arguments of the comparator + * @param comparator a {@code Comparator} for comparing the two values * @return a {@code BinaryOperator} which returns the greater of its operands, * according to the supplied {@code Comparator} * @throws NullPointerException if the argument is null */ - public static BinaryOperator maxBy(Comparator comparator) { + public static BinaryOperator maxBy(Comparator comparator) { Objects.requireNonNull(comparator); return (a, b) -> comparator.compare(a, b) >= 0 ? a : b; } diff --git a/jdk/src/share/classes/java/util/function/BooleanSupplier.java b/jdk/src/share/classes/java/util/function/BooleanSupplier.java index 875ac748628..2faff307e63 100644 --- a/jdk/src/share/classes/java/util/function/BooleanSupplier.java +++ b/jdk/src/share/classes/java/util/function/BooleanSupplier.java @@ -26,8 +26,14 @@ package java.util.function; /** - * A supplier of {@code boolean} values. This is the {@code boolean}-providing - * primitive specialization of {@link Supplier}. + * Represents a supplier of {@code boolean}-valued results. This is the + * {@code boolean}-producing primitive specialization of {@link Supplier}. + * + *

There is no requirement that a new or distinct result be returned each + * time the supplier is invoked. + * + *

This is a functional interface + * whose functional method is {@link #getAsBoolean()}. * * @see Supplier * @since 1.8 @@ -36,9 +42,9 @@ package java.util.function; public interface BooleanSupplier { /** - * Returns a {@code boolean} value. + * Gets a result. * - * @return a {@code boolean} value + * @return a result */ boolean getAsBoolean(); } diff --git a/jdk/src/share/classes/java/util/function/Consumer.java b/jdk/src/share/classes/java/util/function/Consumer.java index 69add851dcc..a2481fe4f41 100644 --- a/jdk/src/share/classes/java/util/function/Consumer.java +++ b/jdk/src/share/classes/java/util/function/Consumer.java @@ -27,11 +27,14 @@ package java.util.function; import java.util.Objects; /** - * An operation which accepts a single input argument and returns no result. - * Unlike most other functional interfaces, {@code Consumer} is expected to - * operate via side-effects. + * Represents an operation that accepts a single input argument and returns no + * result. Unlike most other functional interfaces, {@code Consumer} is expected + * to operate via side-effects. * - * @param The type of input objects to {@code accept} + *

This is a functional interface + * whose functional method is {@link #accept(Object)}. + * + * @param the type of the input to the operation * * @since 1.8 */ @@ -39,29 +42,26 @@ import java.util.Objects; public interface Consumer { /** - * Accept an input value. + * Performs this operation on the given argument. * - * @param t the input object + * @param t the input argument */ void accept(T t); /** - * Returns a {@code Consumer} which performs, in sequence, the operation - * represented by this object followed by the operation represented by - * the other {@code Consumer}. + * Returns a composed {@code Consumer} that performs, in sequence, this + * operation followed by the {@code after} operation. If performing either + * operation throws an exception, it is relayed to the caller of the + * composed operation. If performing this operation throws an exception, + * the {@code after} operation will not be performed. * - *

Any exceptions thrown by either {@code accept} method are relayed - * to the caller; if performing this operation throws an exception, the - * other operation will not be performed. - * - * @param other a Consumer which will be chained after this Consumer - * @return a Consumer which performs in sequence the {@code accept} method - * of this Consumer and the {@code accept} method of the specified Consumer - * operation - * @throws NullPointerException if other is null + * @param after the operation to perform after this operation + * @return a composed {@code Consumer} that performs in sequence this + * operation followed by the {@code after} operation + * @throws NullPointerException if {@code after} is null */ - default Consumer chain(Consumer other) { - Objects.requireNonNull(other); - return (T t) -> { accept(t); other.accept(t); }; + default Consumer andThen(Consumer after) { + Objects.requireNonNull(after); + return (T t) -> { accept(t); after.accept(t); }; } } diff --git a/jdk/src/share/classes/java/util/function/DoubleBinaryOperator.java b/jdk/src/share/classes/java/util/function/DoubleBinaryOperator.java index 7d1e68aaced..839433da573 100644 --- a/jdk/src/share/classes/java/util/function/DoubleBinaryOperator.java +++ b/jdk/src/share/classes/java/util/function/DoubleBinaryOperator.java @@ -25,23 +25,25 @@ package java.util.function; /** - * An operation on two {@code double} operands yielding a {@code double} result. - * This is the primitive type specialization of {@link BinaryOperator} for - * {@code double}. + * Represents an operation upon two {@code double}-valued operands and producing a + * {@code double}-valued result. This is the primitive type specialization of + * {@link BinaryOperator} for {@code double}. + * + *

This is a functional interface + * whose functional method is {@link #applyAsDouble(double, double)}. * * @see BinaryOperator + * @see DoubleUnaryOperator * @since 1.8 */ @FunctionalInterface public interface DoubleBinaryOperator { /** - * Returns the {@code double} result of the operation upon the - * {@code double} operands. The parameters are named {@code left} and - * {@code right} for operations where the order of parameters matters. + * Applies this operator to the given operands. * - * @param left the left operand value - * @param right the right operand value - * @return the result of the operation + * @param left the first operand + * @param right the second operand + * @return the operator result */ double applyAsDouble(double left, double right); } diff --git a/jdk/src/share/classes/java/util/function/DoubleConsumer.java b/jdk/src/share/classes/java/util/function/DoubleConsumer.java index 665b80a3d20..046360c6da8 100644 --- a/jdk/src/share/classes/java/util/function/DoubleConsumer.java +++ b/jdk/src/share/classes/java/util/function/DoubleConsumer.java @@ -27,11 +27,14 @@ package java.util.function; import java.util.Objects; /** - * An operation which accepts a single double argument and returns no result. - * This is the primitive type specialization of {@link Consumer} for - * {@code double}. Unlike most other functional interfaces, + * Represents an operation that accepts a single {@code double}-valued argument and + * returns no result. This is the primitive type specialization of + * {@link Consumer} for {@code double}. Unlike most other functional interfaces, * {@code DoubleConsumer} is expected to operate via side-effects. * + *

This is a functional interface + * whose functional method is {@link #accept(double)}. + * * @see Consumer * @since 1.8 */ @@ -39,30 +42,26 @@ import java.util.Objects; public interface DoubleConsumer { /** - * Accept an input value. + * Performs this operation on the given argument. * - * @param value the input value + * @param value the input argument */ void accept(double value); /** - * Returns a {@code DoubleConsumer} which performs, in sequence, the operation - * represented by this object followed by the operation represented by - * another {@code DoubleConsumer}. + * Returns a composed {@code DoubleConsumer} that performs, in sequence, this + * operation followed by the {@code after} operation. If performing either + * operation throws an exception, it is relayed to the caller of the + * composed operation. If performing this operation throws an exception, + * the {@code after} operation will not be performed. * - *

Any exceptions thrown by either {@code accept} method are relayed - * to the caller; if performing this operation throws an exception, the - * other operation will not be performed. - * - * @param other a DoubleConsumer which will be chained after this - * DoubleConsumer - * @return an DoubleConsumer which performs in sequence the {@code accept} method - * of this DoubleConsumer and the {@code accept} method of the specified IntConsumer - * operation - * @throws NullPointerException if other is null + * @param after the operation to perform after this operation + * @return a composed {@code DoubleConsumer} that performs in sequence this + * operation followed by the {@code after} operation + * @throws NullPointerException if {@code after} is null */ - default DoubleConsumer chain(DoubleConsumer other) { - Objects.requireNonNull(other); - return (double t) -> { accept(t); other.accept(t); }; + default DoubleConsumer andThen(DoubleConsumer after) { + Objects.requireNonNull(after); + return (double t) -> { accept(t); after.accept(t); }; } } diff --git a/jdk/src/share/classes/java/util/function/DoubleFunction.java b/jdk/src/share/classes/java/util/function/DoubleFunction.java index d8141d0a8a2..a8bb57ddd88 100644 --- a/jdk/src/share/classes/java/util/function/DoubleFunction.java +++ b/jdk/src/share/classes/java/util/function/DoubleFunction.java @@ -25,11 +25,14 @@ package java.util.function; /** - * Apply a function to the double-valued input argument, yielding an appropriate - * result. This is the {@code double}-consuming primitive specialization for + * Represents a function that accepts a double-valued argument and produces a + * result. This is the {@code double}-consuming primitive specialization for * {@link Function}. * - * @param the type of output objects from the function + *

This is a functional interface + * whose functional method is {@link #apply(double)}. + * + * @param the type of the result of the function * * @see Function * @since 1.8 @@ -38,9 +41,9 @@ package java.util.function; public interface DoubleFunction { /** - * Compute the result of applying the function to the input argument + * Applies this function to the given argument. * - * @param value the input value + * @param value the function argument * @return the function result */ R apply(double value); diff --git a/jdk/src/share/classes/java/util/function/DoublePredicate.java b/jdk/src/share/classes/java/util/function/DoublePredicate.java index 8156b65cb93..1df17624cab 100644 --- a/jdk/src/share/classes/java/util/function/DoublePredicate.java +++ b/jdk/src/share/classes/java/util/function/DoublePredicate.java @@ -27,9 +27,12 @@ package java.util.function; import java.util.Objects; /** - * Determines if the {@code double} input value matches some criteria. This is - * the {@code double}-consuming primitive type specialization of - * {@link Predicate}. + * Represents a predicate (boolean-valued function) of one {@code double}-valued + * argument. This is the {@code double}-consuming primitive type specialization + * of {@link Predicate}. + * + *

This is a functional interface + * whose functional method is {@link #test(double)}. * * @see Predicate * @since 1.8 @@ -38,38 +41,40 @@ import java.util.Objects; public interface DoublePredicate { /** - * Returns {@code true} if the input value matches some criteria. + * Evaluates this predicate on the given argument. * - * @param value the value to be tested - * @return {@code true} if the input value matches some criteria, otherwise - * {@code false} + * @param value the input argument + * @return {@code true} if the input argument matches the predicate, + * otherwise {@code false} */ boolean test(double value); /** - * Returns a predicate which evaluates to {@code true} only if this - * predicate and the provided predicate both evaluate to {@code true}. If - * this predicate returns {@code false} then the remaining predicate is not - * evaluated. + * Returns a composed predicate that represents a short-circuiting logical + * AND of this predicate and another. When evaluating the composed + * predicate, if this predicate is {@code false}, then the {@code other} + * predicate is not evaluated. * - *

Any exceptions thrown by either {@code test} method are relayed - * to the caller; if performing first operation throws an exception, the - * second operation will not be performed. + *

Any exceptions thrown during evaluation of either predicate are relayed + * to the caller; if evaluation of this predicate throws an exception, the + * {@code other} predicate will not be evaluated. * - * @param p a predicate which will be logically-ANDed with this predicate - * @return a new predicate which returns {@code true} only if both - * predicates return {@code true} - * @throws NullPointerException if p is null + * @param other a predicate that will be logically-ANDed with this + * predicate + * @return a composed predicate that represents the short-circuiting logical + * AND of this predicate and the {@code other} predicate + * @throws NullPointerException if other is null */ - default DoublePredicate and(DoublePredicate p) { - Objects.requireNonNull(p); - return (value) -> test(value) && p.test(value); + default DoublePredicate and(DoublePredicate other) { + Objects.requireNonNull(other); + return (value) -> test(value) && other.test(value); } /** - * Returns a predicate which negates the result of this predicate. + * Returns a predicate that represents the logical negation of this + * predicate. * - * @return a new predicate who's result is always the opposite of this + * @return a predicate that represents the logical negation of this * predicate */ default DoublePredicate negate() { @@ -77,22 +82,23 @@ public interface DoublePredicate { } /** - * Returns a predicate which evaluates to {@code true} if either this - * predicate or the provided predicate evaluates to {@code true}. If this - * predicate returns {@code true} then the remaining predicate is not - * evaluated. + * Returns a composed predicate that represents a short-circuiting logical + * OR of this predicate and another. When evaluating the composed + * predicate, if this predicate is {@code true}, then the {@code other} + * predicate is not evaluated. * - *

Any exceptions thrown by either {@code test} method are relayed - * to the caller; if performing first operation throws an exception, the - * second operation will not be performed. + *

Any exceptions thrown during evaluation of either predicate are relayed + * to the caller; if evaluation of this predicate throws an exception, the + * {@code other} predicate will not be evaluated. * - * @param p a predicate which will be logically-ANDed with this predicate - * @return a new predicate which returns {@code true} if either predicate - * returns {@code true} - * @throws NullPointerException if p is null + * @param other a predicate that will be logically-ORed with this + * predicate + * @return a composed predicate that represents the short-circuiting logical + * OR of this predicate and the {@code other} predicate + * @throws NullPointerException if other is null */ - default DoublePredicate or(DoublePredicate p) { - Objects.requireNonNull(p); - return (value) -> test(value) || p.test(value); + default DoublePredicate or(DoublePredicate other) { + Objects.requireNonNull(other); + return (value) -> test(value) || other.test(value); } } diff --git a/jdk/src/share/classes/java/util/function/DoubleSupplier.java b/jdk/src/share/classes/java/util/function/DoubleSupplier.java index c661fdff927..5169011b3a5 100644 --- a/jdk/src/share/classes/java/util/function/DoubleSupplier.java +++ b/jdk/src/share/classes/java/util/function/DoubleSupplier.java @@ -25,8 +25,14 @@ package java.util.function; /** - * A supplier of {@code double} values. This is the {@code double}-providing - * primitive specialization of {@link Supplier}. + * Represents a supplier of {@code double}-valued results. This is the + * {@code double}-producing primitive specialization of {@link Supplier}. + * + *

There is no requirement that a distinct result be returned each + * time the supplier is invoked. + * + *

This is a functional interface + * whose functional method is {@link #getAsDouble()}. * * @see Supplier * @since 1.8 @@ -35,9 +41,9 @@ package java.util.function; public interface DoubleSupplier { /** - * Returns a {@code double} value. + * Gets a result. * - * @return a {@code double} value + * @return a result */ double getAsDouble(); } diff --git a/jdk/src/share/classes/java/util/function/DoubleToIntFunction.java b/jdk/src/share/classes/java/util/function/DoubleToIntFunction.java index 8eaf0b8374a..a23f033e4df 100644 --- a/jdk/src/share/classes/java/util/function/DoubleToIntFunction.java +++ b/jdk/src/share/classes/java/util/function/DoubleToIntFunction.java @@ -25,22 +25,24 @@ package java.util.function; /** - * Apply a function to the input argument, yielding an appropriate result. - * This is the {@code double}-to-{@code int} specialization for {@link Function}. + * Represents a function that accepts a double-valued argument and produces an + * int-valued result. This is the {@code double}-to-{@code int} primitive + * specialization for {@link Function}. + * + *

This is a functional interface + * whose functional method is {@link #applyAsInt(double)}. * * @see Function - * @see IntToDoubleFunction - * @see LongToIntFunction * @since 1.8 */ @FunctionalInterface public interface DoubleToIntFunction { /** - * Compute the result of applying the function to the input arguments. + * Applies this function to the given argument. * - * @param value the input value - * @return the function result value + * @param value the function argument + * @return the function result */ int applyAsInt(double value); } diff --git a/jdk/src/share/classes/java/util/function/DoubleToLongFunction.java b/jdk/src/share/classes/java/util/function/DoubleToLongFunction.java index 7568157353d..436369c6f48 100644 --- a/jdk/src/share/classes/java/util/function/DoubleToLongFunction.java +++ b/jdk/src/share/classes/java/util/function/DoubleToLongFunction.java @@ -25,22 +25,24 @@ package java.util.function; /** - * Apply a function to the input argument, yielding an appropriate result. - * This is the {@code double}-to-{@code long} specialization for {@link Function}. + * Represents a function that accepts a double-valued argument and produces a + * long-valued result. This is the {@code double}-to-{@code long} primitive + * specialization for {@link Function}. + * + *

This is a functional interface + * whose functional method is {@link #applyAsLong(double)}. * * @see Function - * @see LongToDoubleFunction - * @see IntToLongFunction * @since 1.8 */ @FunctionalInterface public interface DoubleToLongFunction { /** - * Compute the result of applying the function to the input arguments. + * Applies this function to the given argument. * - * @param value the input value - * @return the function result value + * @param value the function argument + * @return the function result */ long applyAsLong(double value); } diff --git a/jdk/src/share/classes/java/util/function/DoubleUnaryOperator.java b/jdk/src/share/classes/java/util/function/DoubleUnaryOperator.java index 39dfa6ab6a7..2f134c9994f 100644 --- a/jdk/src/share/classes/java/util/function/DoubleUnaryOperator.java +++ b/jdk/src/share/classes/java/util/function/DoubleUnaryOperator.java @@ -27,9 +27,12 @@ package java.util.function; import java.util.Objects; /** - * An operation on a {@code double} operand yielding a {@code double} - * result. This is the primitive type specialization of {@link UnaryOperator} - * for {@code double}. + * Represents an operation on a single {@code double}-valued operand that produces + * a {@code double}-valued result. This is the primitive type specialization of + * {@link UnaryOperator} for {@code double}. + * + *

This is a functional interface + * whose functional method is {@link #applyAsDouble(double)}. * * @see UnaryOperator * @since 1.8 @@ -38,24 +41,25 @@ import java.util.Objects; public interface DoubleUnaryOperator { /** - * Returns the {@code double} result of the operation upon the - * {@code double} operand. + * Applies this operator to the given operand. * - * @param operand the operand value - * @return the operation result value + * @param operand the operand + * @return the operator result */ double applyAsDouble(double operand); /** - * Compose a new function which applies the provided function followed by - * this function. If either function throws an exception, it is relayed - * to the caller. + * Returns a composed operator that first applies the {@code before} + * operator to its input, and then applies this operator to the result. + * If evaluation of either operator throws an exception, it is relayed to + * the caller of the composed operator. * - * @param before An additional function to be applied before this function - * is applied - * @return A function which performs the provided function followed by this - * function + * @param before the operator to apply before this operator is applied + * @return a composed operator that first applies the {@code before} + * operator and then applies this operator * @throws NullPointerException if before is null + * + * @see #andThen(DoubleUnaryOperator) */ default DoubleUnaryOperator compose(DoubleUnaryOperator before) { Objects.requireNonNull(before); @@ -63,15 +67,17 @@ public interface DoubleUnaryOperator { } /** - * Compose a new function which applies this function followed by the - * provided function. If either function throws an exception, it is relayed - * to the caller. + * Returns a composed operator that first applies this operator to + * its input, and then applies the {@code after} operator to the result. + * If evaluation of either operator throws an exception, it is relayed to + * the caller of the composed operator. * - * @param after An additional function to be applied after this function is - * applied - * @return A function which performs this function followed by the provided - * function followed + * @param after the operator to apply after this operator is applied + * @return a composed operator that first applies this operator and then + * applies the {@code after} operator * @throws NullPointerException if after is null + * + * @see #compose(DoubleUnaryOperator) */ default DoubleUnaryOperator andThen(DoubleUnaryOperator after) { Objects.requireNonNull(after); @@ -79,9 +85,9 @@ public interface DoubleUnaryOperator { } /** - * Returns a unary operator that provides its input value as the result. + * Returns a unary operator that always returns its input argument. * - * @return a unary operator that provides its input value as the result + * @return a unary operator that always returns its input argument */ static DoubleUnaryOperator identity() { return t -> t; diff --git a/jdk/src/share/classes/java/util/function/Function.java b/jdk/src/share/classes/java/util/function/Function.java index 084ba4cc9c7..7bcbfd06bb6 100644 --- a/jdk/src/share/classes/java/util/function/Function.java +++ b/jdk/src/share/classes/java/util/function/Function.java @@ -27,12 +27,13 @@ package java.util.function; import java.util.Objects; /** - * Apply a function to the input argument, yielding an appropriate result. A - * function may variously provide a mapping between types, object instances or - * keys and values or any other form of transformation upon the input. + * Represents a function that accepts one argument and produces a result. * - * @param the type of the input to the {@code apply} operation - * @param the type of the result of the {@code apply} operation + *

This is a functional interface + * whose functional method is {@link #apply(Object)}. + * + * @param the type of the input to the function + * @param the type of the result of the function * * @since 1.8 */ @@ -40,25 +41,27 @@ import java.util.Objects; public interface Function { /** - * Compute the result of applying the function to the input argument + * Applies this function to the given argument. * - * @param t the input object + * @param t the function argument * @return the function result */ R apply(T t); /** - * Returns a new function which applies the provided function followed by - * this function. If either function throws an exception, it is relayed - * to the caller. + * Returns a composed function that first applies the {@code before} + * function to its input, and then applies this function to the result. + * If evaluation of either function throws an exception, it is relayed to + * the caller of the composed function. * - * @param type of input objects to the combined function. May be the - * same type as {@code } or {@code } - * @param before an additional function to be applied before this function - * is applied - * @return a function which performs the provided function followed by this - * function + * @param the type of input to the {@code before} function, and to the + * composed function + * @param before the function to apply before this function is applied + * @return a composed function that first applies the {@code before} + * function and then applies this function * @throws NullPointerException if before is null + * + * @see #andThen(Function) */ default Function compose(Function before) { Objects.requireNonNull(before); @@ -66,17 +69,19 @@ public interface Function { } /** - * Returns a new function which applies this function followed by the - * provided function. If either function throws an exception, it is relayed - * to the caller. + * Returns a composed function that first applies this function to + * its input, and then applies the {@code after} function to the result. + * If evaluation of either function throws an exception, it is relayed to + * the caller of the composed function. * - * @param type of output objects to the combined function. May be the - * same type as {@code } or {@code } - * @param after an additional function to be applied after this function is - * applied - * @return a function which performs this function followed by the provided - * function + * @param the type of output of the {@code after} function, and of the + * composed function + * @param after the function to apply after this function is applied + * @return a composed function that first applies this function and then + * applies the {@code after} function * @throws NullPointerException if after is null + * + * @see #compose(Function) */ default Function andThen(Function after) { Objects.requireNonNull(after); @@ -84,10 +89,10 @@ public interface Function { } /** - * Returns a {@code Function} whose {@code apply} method returns its input. + * Returns a function that always returns its input argument. * * @param the type of the input and output objects to the function - * @return a {@code Function} whose {@code apply} method returns its input + * @return a function that always returns its input argument */ static Function identity() { return t -> t; diff --git a/jdk/src/share/classes/java/util/function/IntBinaryOperator.java b/jdk/src/share/classes/java/util/function/IntBinaryOperator.java index a0788a1d734..21bb9469ede 100644 --- a/jdk/src/share/classes/java/util/function/IntBinaryOperator.java +++ b/jdk/src/share/classes/java/util/function/IntBinaryOperator.java @@ -25,24 +25,26 @@ package java.util.function; /** - * An operation on two {@code int} operands yielding an {@code int} result. - * This is the primitive type specialization of {@link BinaryOperator} for - * {@code int}. + * Represents an operation upon two {@code int}-valued operands and producing an + * {@code int}-valued result. This is the primitive type specialization of + * {@link BinaryOperator} for {@code int}. + * + *

This is a functional interface + * whose functional method is {@link #applyAsInt(int, int)}. * * @see BinaryOperator + * @see IntUnaryOperator * @since 1.8 */ @FunctionalInterface public interface IntBinaryOperator { /** - * Returns the {@code int} result of the operation upon the {@code int} - * operands. The parameters are named {@code left} and {@code right} for - * operations where the order of parameters matters. + * Applies this operator to the given operands. * - * @param left the left operand value - * @param right the right operand value - * @return the result of the operation + * @param left the first operand + * @param right the second operand + * @return the operator result */ int applyAsInt(int left, int right); } diff --git a/jdk/src/share/classes/java/util/function/IntConsumer.java b/jdk/src/share/classes/java/util/function/IntConsumer.java index 3c2a770332f..d8daf73ca2c 100644 --- a/jdk/src/share/classes/java/util/function/IntConsumer.java +++ b/jdk/src/share/classes/java/util/function/IntConsumer.java @@ -27,10 +27,13 @@ package java.util.function; import java.util.Objects; /** - * An operation which accepts a single integer argument and returns no result. - * This is the primitive type specialization of {@link Consumer} for {@code int}. - * Unlike most other functional interfaces, {@code IntConsumer} is expected to - * operate via side-effects. + * Represents an operation that accepts a single {@code int}-valued argument and + * returns no result. This is the primitive type specialization of + * {@link Consumer} for {@code int}. Unlike most other functional interfaces, + * {@code IntConsumer} is expected to operate via side-effects. + * + *

This is a functional interface + * whose functional method is {@link #accept(int)}. * * @see Consumer * @since 1.8 @@ -39,30 +42,26 @@ import java.util.Objects; public interface IntConsumer { /** - * Accept an input value. + * Performs this operation on the given argument. * - * @param value the input value + * @param value the input argument */ void accept(int value); /** - * Returns an {@code IntConsumer} which performs, in sequence, the operation - * represented by this object followed by the operation represented by - * another {@code IntConsumer}. + * Returns a composed {@code IntConsumer} that performs, in sequence, this + * operation followed by the {@code after} operation. If performing either + * operation throws an exception, it is relayed to the caller of the + * composed operation. If performing this operation throws an exception, + * the {@code after} operation will not be performed. * - *

Any exceptions thrown by either {@code accept} method are relayed - * to the caller; if performing this operation throws an exception, the - * other operation will not be performed. - * - * @param other an IntConsumer which will be chained after this - * IntConsumer - * @return an IntConsumer which performs in sequence the {@code accept} method - * of this IntConsumer and the {@code accept} method of the specified IntConsumer - * operation - * @throws NullPointerException if other is null + * @param after the operation to perform after this operation + * @return a composed {@code IntConsumer} that performs in sequence this + * operation followed by the {@code after} operation + * @throws NullPointerException if {@code after} is null */ - default IntConsumer chain(IntConsumer other) { - Objects.requireNonNull(other); - return (int t) -> { accept(t); other.accept(t); }; + default IntConsumer andThen(IntConsumer after) { + Objects.requireNonNull(after); + return (int t) -> { accept(t); after.accept(t); }; } } diff --git a/jdk/src/share/classes/java/util/function/IntFunction.java b/jdk/src/share/classes/java/util/function/IntFunction.java index ec2ffcae249..de10df499e1 100644 --- a/jdk/src/share/classes/java/util/function/IntFunction.java +++ b/jdk/src/share/classes/java/util/function/IntFunction.java @@ -25,11 +25,14 @@ package java.util.function; /** - * Apply a function to the integer-valued input argument, yielding an - * appropriate result. This is the {@code int}-consuming primitive - * specialization for {@link Function}. + * Represents a function that accepts an int-valued argument and produces a + * result. This is the {@code int}-consuming primitive specialization for + * {@link Function}. * - * @param the type of output objects from the function + *

This is a functional interface + * whose functional method is {@link #apply(int)}. + * + * @param the type of the result of the function * * @see Function * @since 1.8 @@ -38,9 +41,9 @@ package java.util.function; public interface IntFunction { /** - * Compute the result of applying the function to the input argument + * Applies this function to the given argument. * - * @param value the input value + * @param value the function argument * @return the function result */ R apply(int value); diff --git a/jdk/src/share/classes/java/util/function/IntPredicate.java b/jdk/src/share/classes/java/util/function/IntPredicate.java index 0e7ec0737d5..5a9bd46dd70 100644 --- a/jdk/src/share/classes/java/util/function/IntPredicate.java +++ b/jdk/src/share/classes/java/util/function/IntPredicate.java @@ -27,8 +27,12 @@ package java.util.function; import java.util.Objects; /** - * Determines if the {@code int} input value matches some criteria. This is the - * {@code int}-consuming primitive type specialization of {@link Predicate}. + * Represents a predicate (boolean-valued function) of one {@code int}-valued + * argument. This is the {@code int}-consuming primitive type specialization of + * {@link Predicate}. + * + *

This is a functional interface + * whose functional method is {@link #test(int)}. * * @see Predicate * @since 1.8 @@ -37,38 +41,40 @@ import java.util.Objects; public interface IntPredicate { /** - * Returns {@code true} if the input value matches some criteria. + * Evaluates this predicate on the given argument. * - * @param value the value to be tested - * @return {@code true} if the input value matches some criteria, otherwise - * {@code false} + * @param value the input argument + * @return {@code true} if the input argument matches the predicate, + * otherwise {@code false} */ boolean test(int value); /** - * Returns a predicate which evaluates to {@code true} only if this - * predicate and the provided predicate both evaluate to {@code true}. If - * this predicate returns {@code false} then the remaining predicate is not - * evaluated. + * Returns a composed predicate that represents a short-circuiting logical + * AND of this predicate and another. When evaluating the composed + * predicate, if this predicate is {@code false}, then the {@code other} + * predicate is not evaluated. * - *

Any exceptions thrown by either {@code test} method are relayed - * to the caller; if performing first operation throws an exception, the - * second operation will not be performed. + *

Any exceptions thrown during evaluation of either predicate are relayed + * to the caller; if evaluation of this predicate throws an exception, the + * {@code other} predicate will not be evaluated. * - * @param p a predicate which will be logically-ANDed with this predicate - * @return a new predicate which returns {@code true} only if both - * predicates return {@code true} - * @throws NullPointerException if p is null + * @param other a predicate that will be logically-ANDed with this + * predicate + * @return a composed predicate that represents the short-circuiting logical + * AND of this predicate and the {@code other} predicate + * @throws NullPointerException if other is null */ - default IntPredicate and(IntPredicate p) { - Objects.requireNonNull(p); - return (value) -> test(value) && p.test(value); + default IntPredicate and(IntPredicate other) { + Objects.requireNonNull(other); + return (value) -> test(value) && other.test(value); } /** - * Returns a predicate which negates the result of this predicate. + * Returns a predicate that represents the logical negation of this + * predicate. * - * @return a new predicate who's result is always the opposite of this + * @return a predicate that represents the logical negation of this * predicate */ default IntPredicate negate() { @@ -76,22 +82,23 @@ public interface IntPredicate { } /** - * Returns a predicate which evaluates to {@code true} if either this - * predicate or the provided predicate evaluates to {@code true}. If this - * predicate returns {@code true} then the remaining predicate is not - * evaluated. + * Returns a composed predicate that represents a short-circuiting logical + * OR of this predicate and another. When evaluating the composed + * predicate, if this predicate is {@code true}, then the {@code other} + * predicate is not evaluated. * - *

Any exceptions thrown by either {@code test} method are relayed - * to the caller; if performing first operation throws an exception, the - * second operation will not be performed. + *

Any exceptions thrown during evaluation of either predicate are relayed + * to the caller; if evaluation of this predicate throws an exception, the + * {@code other} predicate will not be evaluated. * - * @param p a predicate which will be logically-ORed with this predicate - * @return a new predicate which returns {@code true} if either predicate - * returns {@code true} - * @throws NullPointerException if p is null + * @param other a predicate that will be logically-ORed with this + * predicate + * @return a composed predicate that represents the short-circuiting logical + * OR of this predicate and the {@code other} predicate + * @throws NullPointerException if other is null */ - default IntPredicate or(IntPredicate p) { - Objects.requireNonNull(p); - return (value) -> test(value) || p.test(value); + default IntPredicate or(IntPredicate other) { + Objects.requireNonNull(other); + return (value) -> test(value) || other.test(value); } } diff --git a/jdk/src/share/classes/java/util/function/IntSupplier.java b/jdk/src/share/classes/java/util/function/IntSupplier.java index 3165d3f4061..89489c59bac 100644 --- a/jdk/src/share/classes/java/util/function/IntSupplier.java +++ b/jdk/src/share/classes/java/util/function/IntSupplier.java @@ -25,8 +25,14 @@ package java.util.function; /** - * A supplier of {@code int} values. This is the {@code int}-providing - * primitive specialization of {@link Supplier}. + * Represents a supplier of {@code int}-valued results. This is the + * {@code int}-producing primitive specialization of {@link Supplier}. + * + *

There is no requirement that a distinct result be returned each + * time the supplier is invoked. + * + *

This is a functional interface + * whose functional method is {@link #getAsInt()}. * * @see Supplier * @since 1.8 @@ -35,9 +41,9 @@ package java.util.function; public interface IntSupplier { /** - * Returns an {@code int} value. + * Gets a result. * - * @return an {@code int} value + * @return a result */ int getAsInt(); } diff --git a/jdk/src/share/classes/java/util/function/IntToDoubleFunction.java b/jdk/src/share/classes/java/util/function/IntToDoubleFunction.java index 773164d4c96..5012154c2a0 100644 --- a/jdk/src/share/classes/java/util/function/IntToDoubleFunction.java +++ b/jdk/src/share/classes/java/util/function/IntToDoubleFunction.java @@ -25,22 +25,24 @@ package java.util.function; /** - * Apply a function to the input argument, yielding an appropriate result. - * This is the {@code int}-to-{@code double} specialization for {@link Function}. + * Represents a function that accepts an int-valued argument and produces a + * double-valued result. This is the {@code int}-to-{@code double} primitive + * specialization for {@link Function}. + * + *

This is a functional interface + * whose functional method is {@link #applyAsDouble(int)}. * * @see Function - * @see DoubleToIntFunction - * @see LongToDoubleFunction * @since 1.8 */ @FunctionalInterface public interface IntToDoubleFunction { /** - * Compute the result of applying the function to the input arguments. + * Applies this function to the given argument. * - * @param value the input value - * @return the function result value + * @param value the function argument + * @return the function result */ double applyAsDouble(int value); } diff --git a/jdk/src/share/classes/java/util/function/IntToLongFunction.java b/jdk/src/share/classes/java/util/function/IntToLongFunction.java index c50b20fc8c8..6c52faa7009 100644 --- a/jdk/src/share/classes/java/util/function/IntToLongFunction.java +++ b/jdk/src/share/classes/java/util/function/IntToLongFunction.java @@ -25,22 +25,24 @@ package java.util.function; /** - * Apply a function to the input argument, yielding an appropriate result. - * This is the {@code int}-to-{@code long} specialization for {@link Function}. + * Represents a function that accepts an int-valued argument and produces a + * long-valued result. This is the {@code int}-to-{@code long} primitive + * specialization for {@link Function}. + * + *

This is a functional interface + * whose functional method is {@link #applyAsLong(int)}. * * @see Function - * @see LongToIntFunction - * @see DoubleToLongFunction * @since 1.8 */ @FunctionalInterface public interface IntToLongFunction { /** - * Compute the result of applying the function to the input arguments. + * Applies this function to the given argument. * - * @param value the input value - * @return the function result value + * @param value the function argument + * @return the function result */ long applyAsLong(int value); } diff --git a/jdk/src/share/classes/java/util/function/IntUnaryOperator.java b/jdk/src/share/classes/java/util/function/IntUnaryOperator.java index 2e14c151b1f..300fc14666a 100644 --- a/jdk/src/share/classes/java/util/function/IntUnaryOperator.java +++ b/jdk/src/share/classes/java/util/function/IntUnaryOperator.java @@ -27,9 +27,12 @@ package java.util.function; import java.util.Objects; /** - * An operation on a single {@code int} operand yielding an {@code int} result. - * This is the primitive type specialization of {@link UnaryOperator} for - * {@code int}. + * Represents an operation on a single {@code int}-valued operand that produces + * an {@code int}-valued result. This is the primitive type specialization of + * {@link UnaryOperator} for {@code int}. + * + *

This is a functional interface + * whose functional method is {@link #applyAsInt(int)}. * * @see UnaryOperator * @since 1.8 @@ -38,24 +41,25 @@ import java.util.Objects; public interface IntUnaryOperator { /** - * Returns the {@code int} value result of the operation upon the - * {@code int} operand. + * Applies this operator to the given operand. * - * @param operand the operand value - * @return the operation result value + * @param operand the operand + * @return the operator result */ int applyAsInt(int operand); /** - * Compose a new function which applies the provided function followed by - * this function. If either function throws an exception, it is relayed - * to the caller. + * Returns a composed operator that first applies the {@code before} + * operator to its input, and then applies this operator to the result. + * If evaluation of either operator throws an exception, it is relayed to + * the caller of the composed operator. * - * @param before an additional function to be applied before this function - * is applied - * @return a function which performs the provided function followed by this - * function + * @param before the operator to apply before this operator is applied + * @return a composed operator that first applies the {@code before} + * operator and then applies this operator * @throws NullPointerException if before is null + * + * @see #andThen(IntUnaryOperator) */ default IntUnaryOperator compose(IntUnaryOperator before) { Objects.requireNonNull(before); @@ -63,15 +67,17 @@ public interface IntUnaryOperator { } /** - * Compose a new function which applies this function followed by the - * provided function. If either function throws an exception, it is relayed - * to the caller. + * Returns a composed operator that first applies this operator to + * its input, and then applies the {@code after} operator to the result. + * If evaluation of either operator throws an exception, it is relayed to + * the caller of the composed operator. * - * @param after an additional function to be applied after this function is - * applied - * @return a function which performs this function followed by the provided - * function followed + * @param after the operator to apply after this operator is applied + * @return a composed operator that first applies this operator and then + * applies the {@code after} operator * @throws NullPointerException if after is null + * + * @see #compose(IntUnaryOperator) */ default IntUnaryOperator andThen(IntUnaryOperator after) { Objects.requireNonNull(after); @@ -79,9 +85,9 @@ public interface IntUnaryOperator { } /** - * Returns a unary operator that provides its input value as the result. + * Returns a unary operator that always returns its input argument. * - * @return a unary operator that provides its input value as the result + * @return a unary operator that always returns its input argument */ static IntUnaryOperator identity() { return t -> t; diff --git a/jdk/src/share/classes/java/util/function/LongBinaryOperator.java b/jdk/src/share/classes/java/util/function/LongBinaryOperator.java index f35258bea60..287481e4e34 100644 --- a/jdk/src/share/classes/java/util/function/LongBinaryOperator.java +++ b/jdk/src/share/classes/java/util/function/LongBinaryOperator.java @@ -25,24 +25,26 @@ package java.util.function; /** - * An operation on two {@code long} operands yielding a {@code long} result. - * This is the primitive type specialization of {@link BinaryOperator} for - * {@code long}. + * Represents an operation upon two {@code long}-valued operands and producing a + * {@code long}-valued result. This is the primitive type specialization of + * {@link BinaryOperator} for {@code long}. + * + *

This is a functional interface + * whose functional method is {@link #applyAsLong(long, long)}. * * @see BinaryOperator + * @see LongUnaryOperator * @since 1.8 */ @FunctionalInterface public interface LongBinaryOperator { /** - * Returns the {@code long} result of the operation upon the {@code long} - * operands. The parameters are named {@code left} and {@code right} for - * operations where the order of parameters matters. + * Applies this operator to the given operands. * - * @param left the left operand value - * @param right the right operand value - * @return the result of the operation + * @param left the first operand + * @param right the second operand + * @return the operator result */ long applyAsLong(long left, long right); } diff --git a/jdk/src/share/classes/java/util/function/LongConsumer.java b/jdk/src/share/classes/java/util/function/LongConsumer.java index 754af39d918..b59d0303f91 100644 --- a/jdk/src/share/classes/java/util/function/LongConsumer.java +++ b/jdk/src/share/classes/java/util/function/LongConsumer.java @@ -27,10 +27,13 @@ package java.util.function; import java.util.Objects; /** - * An operation which accepts a single long argument and returns no result. - * This is the {@code long}-consuming primitive type specialization of - * {@link Consumer}. Unlike most other functional interfaces, {@code LongConsumer} - * is expected to operate via side-effects. + * Represents an operation that accepts a single {@code long}-valued argument and + * returns no result. This is the primitive type specialization of + * {@link Consumer} for {@code long}. Unlike most other functional interfaces, + * {@code LongConsumer} is expected to operate via side-effects. + * + *

This is a functional interface + * whose functional method is {@link #accept(long)}. * * @see Consumer * @since 1.8 @@ -39,30 +42,26 @@ import java.util.Objects; public interface LongConsumer { /** - * Accept an input value. + * Performs this operation on the given argument. * - * @param value the input value + * @param value the input argument */ void accept(long value); /** - * Returns a {@code LongConsumer} which performs, in sequence, the operation - * represented by this object followed by the operation represented by - * another {@code LongConsumer}. + * Returns a composed {@code LongConsumer} that performs, in sequence, this + * operation followed by the {@code after} operation. If performing either + * operation throws an exception, it is relayed to the caller of the + * composed operation. If performing this operation throws an exception, + * the {@code after} operation will not be performed. * - *

Any exceptions thrown by either {@code accept} method are relayed - * to the caller; if performing this operation throws an exception, the - * other operation will not be performed. - * - * @param other a LongConsumer which will be chained after this - * LongConsumer - * @return a LongConsumer which performs in sequence the {@code accept} method - * of this LongConsumer and the {@code accept} method of the specified LongConsumer - * operation - * @throws NullPointerException if other is null + * @param after the operation to perform after this operation + * @return a composed {@code LongConsumer} that performs in sequence this + * operation followed by the {@code after} operation + * @throws NullPointerException if {@code after} is null */ - default LongConsumer chain(LongConsumer other) { - Objects.requireNonNull(other); - return (long t) -> { accept(t); other.accept(t); }; + default LongConsumer andThen(LongConsumer after) { + Objects.requireNonNull(after); + return (long t) -> { accept(t); after.accept(t); }; } } diff --git a/jdk/src/share/classes/java/util/function/LongFunction.java b/jdk/src/share/classes/java/util/function/LongFunction.java index d87f22ab7e9..2030c04e422 100644 --- a/jdk/src/share/classes/java/util/function/LongFunction.java +++ b/jdk/src/share/classes/java/util/function/LongFunction.java @@ -25,11 +25,14 @@ package java.util.function; /** - * Apply a function to the long-valued input argument, yielding an appropriate - * result. This is the {@code long}-consuming primitive specialization for + * Represents a function that accepts a long-valued argument and produces a + * result. This is the {@code long}-consuming primitive specialization for * {@link Function}. * - * @param the type of output objects from the function + *

This is a functional interface + * whose functional method is {@link #apply(long)}. + * + * @param the type of the result of the function * * @see Function * @since 1.8 @@ -38,9 +41,9 @@ package java.util.function; public interface LongFunction { /** - * Compute the result of applying the function to the input argument + * Applies this function to the given argument. * - * @param value the input value + * @param value the function argument * @return the function result */ R apply(long value); diff --git a/jdk/src/share/classes/java/util/function/LongPredicate.java b/jdk/src/share/classes/java/util/function/LongPredicate.java index 1a28708ea45..5afdd41ef1d 100644 --- a/jdk/src/share/classes/java/util/function/LongPredicate.java +++ b/jdk/src/share/classes/java/util/function/LongPredicate.java @@ -27,8 +27,12 @@ package java.util.function; import java.util.Objects; /** - * Determines if the {@code long} input value matches some criteria. This is the - * {@code long}-consuming primitive type specialization of {@link Predicate}. + * Represents a predicate (boolean-valued function) of one {@code long}-valued + * argument. This is the {@code long}-consuming primitive type specialization of + * {@link Predicate}. + * + *

This is a functional interface + * whose functional method is {@link #test(long)}. * * @see Predicate * @since 1.8 @@ -37,37 +41,40 @@ import java.util.Objects; public interface LongPredicate { /** - * Returns {@code true} if the input value matches some criteria. + * Evaluates this predicate on the given argument. * - * @param value the value to be tested - * @return {@code true} if the input value matches some criteria, otherwise - * {@code false} + * @param value the input argument + * @return {@code true} if the input argument matches the predicate, + * otherwise {@code false} */ boolean test(long value); /** - * Returns a predicate which evaluates to {@code true} only if this - * predicate and the provided predicate both evaluate to {@code true}. If - * this predicate returns {@code false} then the remaining predicate is not - * evaluated. + * Returns a composed predicate that represents a short-circuiting logical + * AND of this predicate and another. When evaluating the composed + * predicate, if this predicate is {@code false}, then the {@code other} + * predicate is not evaluated. * - *

Any exceptions thrown by either {@code test} method are relayed - * to the caller; if performing first operation throws an exception, the - * second operation will not be performed. + *

Any exceptions thrown during evaluation of either predicate are relayed + * to the caller; if evaluation of this predicate throws an exception, the + * {@code other} predicate will not be evaluated. * - * @param p a predicate which will be logically-ANDed with this predicate - * @return a new predicate which returns {@code true} only if both - * predicates return {@code true} + * @param other a predicate that will be logically-ANDed with this + * predicate + * @return a composed predicate that represents the short-circuiting logical + * AND of this predicate and the {@code other} predicate + * @throws NullPointerException if other is null */ - default LongPredicate and(LongPredicate p) { - Objects.requireNonNull(p); - return (value) -> test(value) && p.test(value); + default LongPredicate and(LongPredicate other) { + Objects.requireNonNull(other); + return (value) -> test(value) && other.test(value); } /** - * Returns a predicate which negates the result of this predicate. + * Returns a predicate that represents the logical negation of this + * predicate. * - * @return a new predicate who's result is always the opposite of this + * @return a predicate that represents the logical negation of this * predicate */ default LongPredicate negate() { @@ -75,22 +82,23 @@ public interface LongPredicate { } /** - * Returns a predicate which evaluates to {@code true} if either this - * predicate or the provided predicate evaluates to {@code true}. If this - * predicate returns {@code true} then the remaining predicate is not - * evaluated. + * Returns a composed predicate that represents a short-circuiting logical + * OR of this predicate and another. When evaluating the composed + * predicate, if this predicate is {@code true}, then the {@code other} + * predicate is not evaluated. * - *

Any exceptions thrown by either {@code test} method are relayed - * to the caller; if performing first operation throws an exception, the - * second operation will not be performed. + *

Any exceptions thrown during evaluation of either predicate are relayed + * to the caller; if evaluation of this predicate throws an exception, the + * {@code other} predicate will not be evaluated. * - * @param p a predicate which will be logically-ORed with this predicate - * @return a new predicate which returns {@code true} if either predicate - * returns {@code true} - * @throws NullPointerException if p is null + * @param other a predicate that will be logically-ORed with this + * predicate + * @return a composed predicate that represents the short-circuiting logical + * OR of this predicate and the {@code other} predicate + * @throws NullPointerException if other is null */ - default LongPredicate or(LongPredicate p) { - Objects.requireNonNull(p); - return (value) -> test(value) || p.test(value); + default LongPredicate or(LongPredicate other) { + Objects.requireNonNull(other); + return (value) -> test(value) || other.test(value); } } diff --git a/jdk/src/share/classes/java/util/function/LongSupplier.java b/jdk/src/share/classes/java/util/function/LongSupplier.java index d88c399a790..513d9062e94 100644 --- a/jdk/src/share/classes/java/util/function/LongSupplier.java +++ b/jdk/src/share/classes/java/util/function/LongSupplier.java @@ -25,8 +25,14 @@ package java.util.function; /** - * A supplier of {@code long} values. This is the {@code long}-providing - * primitive specialization of {@link Supplier}. + * Represents a supplier of {@code long}-valued results. This is the + * {@code long}-producing primitive specialization of {@link Supplier}. + * + *

There is no requirement that a distinct result be returned each + * time the supplier is invoked. + * + *

This is a functional interface + * whose functional method is {@link #getAsLong()}. * * @see Supplier * @since 1.8 @@ -35,9 +41,9 @@ package java.util.function; public interface LongSupplier { /** - * Returns a {@code long} value. + * Gets a result. * - * @return a {@code long} value + * @return a result */ long getAsLong(); } diff --git a/jdk/src/share/classes/java/util/function/LongToDoubleFunction.java b/jdk/src/share/classes/java/util/function/LongToDoubleFunction.java index 718021cc9a8..9d0831f35ec 100644 --- a/jdk/src/share/classes/java/util/function/LongToDoubleFunction.java +++ b/jdk/src/share/classes/java/util/function/LongToDoubleFunction.java @@ -25,22 +25,24 @@ package java.util.function; /** - * Apply a function to the input argument, yielding an appropriate result. - * This is the {@code long}-to-{@code double} specialization for {@link Function}. + * Represents a function that accepts a long-valued argument and produces a + * double-valued result. This is the {@code long}-to-{@code double} primitive + * specialization for {@link Function}. + * + *

This is a functional interface + * whose functional method is {@link #applyAsDouble(long)}. * * @see Function - * @see DoubleToLongFunction - * @see IntToDoubleFunction * @since 1.8 */ @FunctionalInterface public interface LongToDoubleFunction { /** - * Compute the result of applying the function to the input arguments. + * Applies this function to the given argument. * - * @param value the input value - * @return the function result value + * @param value the function argument + * @return the function result */ double applyAsDouble(long value); } diff --git a/jdk/src/share/classes/java/util/function/LongToIntFunction.java b/jdk/src/share/classes/java/util/function/LongToIntFunction.java index e5dc6ba3d0d..d1d6c347054 100644 --- a/jdk/src/share/classes/java/util/function/LongToIntFunction.java +++ b/jdk/src/share/classes/java/util/function/LongToIntFunction.java @@ -25,22 +25,24 @@ package java.util.function; /** - * Apply a function to the input argument, yielding an appropriate result. - * This is the {@code long}-to-{@code int} specialization for {@link Function}. + * Represents a function that accepts a long-valued argument and produces an + * int-valued result. This is the {@code long}-to-{@code int} primitive + * specialization for {@link Function}. + * + *

This is a functional interface + * whose functional method is {@link #applyAsInt(long)}. * * @see Function - * @see IntToLongFunction - * @see DoubleToIntFunction * @since 1.8 */ @FunctionalInterface public interface LongToIntFunction { /** - * Compute the result of applying the function to the input arguments. + * Applies this function to the given argument. * - * @param value the input value - * @return the function result value + * @param value the function argument + * @return the function result */ int applyAsInt(long value); } diff --git a/jdk/src/share/classes/java/util/function/LongUnaryOperator.java b/jdk/src/share/classes/java/util/function/LongUnaryOperator.java index a32918fc56b..e2bbdddbfc9 100644 --- a/jdk/src/share/classes/java/util/function/LongUnaryOperator.java +++ b/jdk/src/share/classes/java/util/function/LongUnaryOperator.java @@ -27,9 +27,12 @@ package java.util.function; import java.util.Objects; /** - * An operation on a single {@code long} operand yielding a {@code long} result. - * This is the primitive type specialization of {@link UnaryOperator} for - * {@code long}. + * Represents an operation on a single {@code long}-valued operand that produces + * a {@code long}-valued result. This is the primitive type specialization of + * {@link UnaryOperator} for {@code long}. + * + *

This is a functional interface + * whose functional method is {@link #applyAsLong(long)}. * * @see UnaryOperator * @since 1.8 @@ -38,24 +41,25 @@ import java.util.Objects; public interface LongUnaryOperator { /** - * Returns the {@code long} result of the operation upon the {@code long} - * operand. + * Applies this operator to the given operand. * - * @param operand the operand value - * @return the operation result value + * @param operand the operand + * @return the operator result */ long applyAsLong(long operand); /** - * Compose a new function which applies the provided function followed by - * this function. If either function throws an exception, it is relayed - * to the caller. + * Returns a composed operator that first applies the {@code before} + * operator to its input, and then applies this operator to the result. + * If evaluation of either operator throws an exception, it is relayed to + * the caller of the composed operator. * - * @param before An additional function to be applied before this function - * is applied - * @return A function which performs the provided function followed by this - * function + * @param before the operator to apply before this operator is applied + * @return a composed operator that first applies the {@code before} + * operator and then applies this operator * @throws NullPointerException if before is null + * + * @see #andThen(LongUnaryOperator) */ default LongUnaryOperator compose(LongUnaryOperator before) { Objects.requireNonNull(before); @@ -63,15 +67,17 @@ public interface LongUnaryOperator { } /** - * Compose a new function which applies this function followed by the - * provided function. If either function throws an exception, it is relayed - * to the caller. + * Returns a composed operator that first applies this operator to + * its input, and then applies the {@code after} operator to the result. + * If evaluation of either operator throws an exception, it is relayed to + * the caller of the composed operator. * - * @param after An additional function to be applied after this function is - * applied - * @return A function which performs this function followed by the provided - * function followed + * @param after the operator to apply after this operator is applied + * @return a composed operator that first applies this operator and then + * applies the {@code after} operator * @throws NullPointerException if after is null + * + * @see #compose(LongUnaryOperator) */ default LongUnaryOperator andThen(LongUnaryOperator after) { Objects.requireNonNull(after); @@ -79,9 +85,9 @@ public interface LongUnaryOperator { } /** - * Returns a unary operator that provides its input value as the result. + * Returns a unary operator that always returns its input argument. * - * @return a unary operator that provides its input value as the result + * @return a unary operator that always returns its input argument */ static LongUnaryOperator identity() { return t -> t; diff --git a/jdk/src/share/classes/java/util/function/ObjDoubleConsumer.java b/jdk/src/share/classes/java/util/function/ObjDoubleConsumer.java index dd8c0c9cf99..d551fc7bf00 100644 --- a/jdk/src/share/classes/java/util/function/ObjDoubleConsumer.java +++ b/jdk/src/share/classes/java/util/function/ObjDoubleConsumer.java @@ -25,12 +25,16 @@ package java.util.function; /** - * An operation which accepts an object reference and a double, and returns no - * result. This is the {@code (reference, double)} specialization of - * {@link BiConsumer}. Unlike most other functional interfaces, - * {@code ObjDoubleConsumer} is expected to operate via side-effects. + * Represents an operation that accepts an object-valued and a + * {@code double}-valued argument, and returns no result. This is the + * {@code (reference, double)} specialization of {@link BiConsumer}. + * Unlike most other functional interfaces, {@code ObjDoubleConsumer} is + * expected to operate via side-effects. * - * @param Type of reference argument to {@code accept()}. + *

This is a functional interface + * whose functional method is {@link #accept(Object, double)}. + * + * @param the type of the object argument to the operation * * @see BiConsumer * @since 1.8 @@ -39,10 +43,10 @@ package java.util.function; public interface ObjDoubleConsumer { /** - * Accept a set of input values. + * Performs this operation on the given arguments. * - * @param t an input object - * @param value an input value + * @param t the first input argument + * @param value the second input argument */ void accept(T t, double value); } diff --git a/jdk/src/share/classes/java/util/function/ObjIntConsumer.java b/jdk/src/share/classes/java/util/function/ObjIntConsumer.java index 3ab4d5eef05..2eb32d63ec4 100644 --- a/jdk/src/share/classes/java/util/function/ObjIntConsumer.java +++ b/jdk/src/share/classes/java/util/function/ObjIntConsumer.java @@ -25,12 +25,16 @@ package java.util.function; /** - * An operation which accepts an object reference and an int, and returns no - * result. This is the {@code (reference, int)} specialization of - * {@link BiConsumer}. Unlike most other functional interfaces, - * {@code ObjIntConsumer} is expected to operate via side-effects. + * Represents an operation that accepts an object-valued and a + * {@code int}-valued argument, and returns no result. This is the + * {@code (reference, int)} specialization of {@link BiConsumer}. + * Unlike most other functional interfaces, {@code ObjIntConsumer} is + * expected to operate via side-effects. * - * @param Type of reference argument to {@code accept()} + *

This is a functional interface + * whose functional method is {@link #accept(Object, int)}. + * + * @param the type of the object argument to the operation * * @see BiConsumer * @since 1.8 @@ -39,10 +43,10 @@ package java.util.function; public interface ObjIntConsumer { /** - * Accept a set of input values. + * Performs this operation on the given arguments. * - * @param t an input object - * @param value an input value + * @param t the first input argument + * @param value the second input argument */ void accept(T t, int value); } diff --git a/jdk/src/share/classes/java/util/function/ObjLongConsumer.java b/jdk/src/share/classes/java/util/function/ObjLongConsumer.java index f90a4f84c77..f40eea2c0f8 100644 --- a/jdk/src/share/classes/java/util/function/ObjLongConsumer.java +++ b/jdk/src/share/classes/java/util/function/ObjLongConsumer.java @@ -25,12 +25,16 @@ package java.util.function; /** - * An operation which accepts an object reference and a long, and returns no - * result. This is the {@code (reference, long)} specialization of - * {@link BiConsumer}. Unlike most other functional interfaces, - * {@code ObjLongConsumer} is expected to operate via side-effects. + * Represents an operation that accepts an object-valued and a + * {@code long}-valued argument, and returns no result. This is the + * {@code (reference, long)} specialization of {@link BiConsumer}. + * Unlike most other functional interfaces, {@code ObjLongConsumer} is + * expected to operate via side-effects. * - * @param Type of reference argument to {@code accept()} + *

This is a functional interface + * whose functional method is {@link #accept(Object, long)}. + * + * @param the type of the object argument to the operation * * @see BiConsumer * @since 1.8 @@ -39,10 +43,10 @@ package java.util.function; public interface ObjLongConsumer { /** - * Accept a set of input values. + * Performs this operation on the given arguments. * - * @param t an input object - * @param value an input value + * @param t the first input argument + * @param value the second input argument */ void accept(T t, long value); } diff --git a/jdk/src/share/classes/java/util/function/Predicate.java b/jdk/src/share/classes/java/util/function/Predicate.java index ac207a3d593..e2f448b1674 100644 --- a/jdk/src/share/classes/java/util/function/Predicate.java +++ b/jdk/src/share/classes/java/util/function/Predicate.java @@ -27,9 +27,12 @@ package java.util.function; import java.util.Objects; /** - * Determines if the input object matches some criteria. + * Represents a predicate (boolean-valued function) of one argument. * - * @param the type of argument to {@code test} + *

This is a functional interface + * whose functional method is {@link #test(Object)}. + * + * @param the type of the input to the predicate * * @since 1.8 */ @@ -37,76 +40,80 @@ import java.util.Objects; public interface Predicate { /** - * Returns {@code true} if the input object matches some criteria. + * Evaluates this predicate on the given argument. * - * @param t the input object - * @return {@code true} if the input object matches some criteria, otherwise - * {@code false} + * @param t the input argument + * @return {@code true} if the input argument matches the predicate, + * otherwise {@code false} */ boolean test(T t); /** - * Returns a predicate which evaluates to {@code true} only if this - * predicate and the provided predicate both evaluate to {@code true}. If - * this predicate returns {@code false} then the remaining predicate is not - * evaluated. + * Returns a composed predicate that represents a short-circuiting logical + * AND of this predicate and another. When evaluating the composed + * predicate, if this predicate is {@code false}, then the {@code other} + * predicate is not evaluated. * - *

Any exceptions thrown by either {@code test} method are relayed - * to the caller; if performing first operation throws an exception, the - * second operation will not be performed. + *

Any exceptions thrown during evaluation of either predicate are relayed + * to the caller; if evaluation of this predicate throws an exception, the + * {@code other} predicate will not be evaluated. * - * @param p a predicate which will be logically-ANDed with this predicate - * @return a new predicate which returns {@code true} only if both - * predicates return {@code true} - * @throws NullPointerException if p is null + * @param other a predicate that will be logically-ANDed with this + * predicate + * @return a composed predicate that represents the short-circuiting logical + * AND of this predicate and the {@code other} predicate + * @throws NullPointerException if other is null */ - default Predicate and(Predicate p) { - Objects.requireNonNull(p); - return (t) -> test(t) && p.test(t); + default Predicate and(Predicate other) { + Objects.requireNonNull(other); + return (t) -> test(t) && other.test(t); } /** - * Returns a predicate which negates the result of this predicate. - * - * @return a new predicate who's result is always the opposite of this + * Returns a predicate that represents the logical negation of this * predicate. + * + * @return a predicate that represents the logical negation of this + * predicate */ default Predicate negate() { return (t) -> !test(t); } /** - * Returns a predicate which evaluates to {@code true} if either this - * predicate or the provided predicate evaluates to {@code true}. If this - * predicate returns {@code true} then the remaining predicate is not - * evaluated. + * Returns a composed predicate that represents a short-circuiting logical + * OR of this predicate and another. When evaluating the composed + * predicate, if this predicate is {@code true}, then the {@code other} + * predicate is not evaluated. * - *

Any exceptions thrown by either {@code test} method are relayed - * to the caller; if performing first operation throws an exception, the - * second operation will not be performed. + *

Any exceptions thrown during evaluation of either predicate are relayed + * to the caller; if evaluation of this predicate throws an exception, the + * {@code other} predicate will not be evaluated. * - * @param p a predicate which will be logically-ORed with this predicate - * @return a new predicate which returns {@code true} if either predicate - * returns {@code true} - * @throws NullPointerException if p is null + * @param other a predicate that will be logically-ORed with this + * predicate + * @return a composed predicate that represents the short-circuiting logical + * OR of this predicate and the {@code other} predicate + * @throws NullPointerException if other is null */ - default Predicate or(Predicate p) { - Objects.requireNonNull(p); - return (t) -> test(t) || p.test(t); + default Predicate or(Predicate other) { + Objects.requireNonNull(other); + return (t) -> test(t) || other.test(t); } /** - * Returns a predicate who's result matches - * {@code Objects.equals(target, t)}. + * Returns a predicate that tests if two arguments are equal according + * to {@link Objects#equals(Object, Object)}. * - * @param the type of values evaluated by the predicate - * @param target the target value to be compared for equality - * @return a predicate who's result matches - * {@code Objects.equals(target, t)} + * @param the type of arguments to the predicate + * @param targetRef the object reference with which to compare for equality, + * which may be {@code null} + * @return a predicate that tests if two arguments are equal according + * to {@link Objects#equals(Object, Object)} */ - static Predicate isEqual(Object target) { - return (null == target) + static Predicate isEqual(Object targetRef) { + return (null == targetRef) ? Objects::isNull - : object -> target.equals(object); + : object -> targetRef.equals(object); } } diff --git a/jdk/src/share/classes/java/util/function/Supplier.java b/jdk/src/share/classes/java/util/function/Supplier.java index 728994b17cf..b87777e882a 100644 --- a/jdk/src/share/classes/java/util/function/Supplier.java +++ b/jdk/src/share/classes/java/util/function/Supplier.java @@ -25,10 +25,15 @@ package java.util.function; /** - * A supplier of objects. The result objects are either created during the - * invocation of {@link #get} or by some prior action. + * Represents a supplier of results. * - * @param The type of objects returned by {@code get} + *

There is no requirement that a new or distinct result be returned each + * time the supplier is invoked. + * + *

This is a functional interface + * whose functional method is {@link #get()}. + * + * @param the type of results supplied by this supplier * * @since 1.8 */ @@ -36,9 +41,9 @@ package java.util.function; public interface Supplier { /** - * Returns an object. + * Gets a result. * - * @return an object + * @return a result */ T get(); } diff --git a/jdk/src/share/classes/java/util/function/ToDoubleBiFunction.java b/jdk/src/share/classes/java/util/function/ToDoubleBiFunction.java index bd82422b9ab..d0efceef54e 100644 --- a/jdk/src/share/classes/java/util/function/ToDoubleBiFunction.java +++ b/jdk/src/share/classes/java/util/function/ToDoubleBiFunction.java @@ -25,13 +25,15 @@ package java.util.function; /** - * Apply a function to the input arguments, yielding an appropriate result. - * This is the {@code double}-bearing specialization for {@link BiFunction}. + * Represents a function that accepts two arguments and produces a double-valued + * result. This is the {@code double}-producing primitive specialization for + * {@link BiFunction}. * - * @param the type of the first argument to the {@code applyAsDouble} - * operation. - * @param the type of the second argument to the {@code applyAsDouble} - * operation. + *

This is a functional interface + * whose functional method is {@link #applyAsDouble(Object, Object)}. + * + * @param the type of the first argument to the function + * @param the type of the second argument to the function * * @see BiFunction * @since 1.8 @@ -40,11 +42,11 @@ package java.util.function; public interface ToDoubleBiFunction { /** - * Compute the result of applying the function to the input arguments + * Applies this function to the given arguments. * - * @param t an input object - * @param u an input object - * @return the function result value + * @param t the first function argument + * @param u the second function argument + * @return the function result */ double applyAsDouble(T t, U u); } diff --git a/jdk/src/share/classes/java/util/function/ToDoubleFunction.java b/jdk/src/share/classes/java/util/function/ToDoubleFunction.java index c63d984a7ed..29bf9881387 100644 --- a/jdk/src/share/classes/java/util/function/ToDoubleFunction.java +++ b/jdk/src/share/classes/java/util/function/ToDoubleFunction.java @@ -25,10 +25,13 @@ package java.util.function; /** - * Apply a function to the input argument, yielding an appropriate result. - * This is the {@code double}-bearing specialization for {@link Function}. + * Represents a function that produces a double-valued result. This is the + * {@code double}-producing primitive specialization for {@link Function}. * - * @param the type of input objects to the function + *

This is a functional interface + * whose functional method is {@link #applyAsDouble(Object)}. + * + * @param the type of the input to the function * * @see Function * @since 1.8 @@ -37,10 +40,10 @@ package java.util.function; public interface ToDoubleFunction { /** - * Compute the result of applying the function to the input argument + * Applies this function to the given argument. * - * @param t the input object - * @return the function result value + * @param value the function argument + * @return the function result */ - double applyAsDouble(T t); + double applyAsDouble(T value); } diff --git a/jdk/src/share/classes/java/util/function/ToIntBiFunction.java b/jdk/src/share/classes/java/util/function/ToIntBiFunction.java index 3fc6d560030..e3109282569 100644 --- a/jdk/src/share/classes/java/util/function/ToIntBiFunction.java +++ b/jdk/src/share/classes/java/util/function/ToIntBiFunction.java @@ -25,13 +25,15 @@ package java.util.function; /** - * Apply a function to the input arguments, yielding an appropriate result. - * This is the {@code int}-bearing specialization for {@link BiFunction}. + * Represents a function that accepts two arguments and produces an int-valued + * result. This is the {@code int}-producing primitive specialization for + * {@link BiFunction}. * - * @param the type of the first argument to the {@code applyAsInt} - * operation - * @param the type of the second argument to the {@code applyAsInt} - * operation + *

This is a functional interface + * whose functional method is {@link #applyAsInt(Object, Object)}. + * + * @param the type of the first argument to the function + * @param the type of the second argument to the function * * @see BiFunction * @since 1.8 @@ -40,11 +42,11 @@ package java.util.function; public interface ToIntBiFunction { /** - * Compute the result of applying the function to the input arguments + * Applies this function to the given arguments. * - * @param t an input object - * @param u an input object - * @return the function result value + * @param t the first function argument + * @param u the second function argument + * @return the function result */ int applyAsInt(T t, U u); } diff --git a/jdk/src/share/classes/java/util/function/ToIntFunction.java b/jdk/src/share/classes/java/util/function/ToIntFunction.java index c3fd2f7004f..5768242d1b4 100644 --- a/jdk/src/share/classes/java/util/function/ToIntFunction.java +++ b/jdk/src/share/classes/java/util/function/ToIntFunction.java @@ -25,10 +25,13 @@ package java.util.function; /** - * Apply a function to the input argument, yielding an appropriate result. - * This is the {@code int}-bearing specialization for {@link Function}. + * Represents a function that produces an int-valued result. This is the + * {@code int}-producing primitive specialization for {@link Function}. * - * @param the type of input objects to the function + *

This is a functional interface + * whose functional method is {@link #applyAsInt(Object)}. + * + * @param the type of the input to the function * * @see Function * @since 1.8 @@ -37,10 +40,10 @@ package java.util.function; public interface ToIntFunction { /** - * Compute the result of applying the function to the input arguments + * Applies this function to the given argument. * - * @param t the input object - * @return the function result value + * @param value the function argument + * @return the function result */ - int applyAsInt(T t); + int applyAsInt(T value); } diff --git a/jdk/src/share/classes/java/util/function/ToLongBiFunction.java b/jdk/src/share/classes/java/util/function/ToLongBiFunction.java index abf6f7851d1..8b5ed7e533d 100644 --- a/jdk/src/share/classes/java/util/function/ToLongBiFunction.java +++ b/jdk/src/share/classes/java/util/function/ToLongBiFunction.java @@ -25,13 +25,15 @@ package java.util.function; /** - * Apply a function to the input arguments, yielding an appropriate result. - * This is the {@code long}-bearing specialization for {@link BiFunction}. + * Represents a function that accepts two arguments and produces a long-valued + * result. This is the {@code long}-producing primitive specialization for + * {@link BiFunction}. * - * @param the type of the first argument to the {@code applyAsLong} - * operation. - * @param the type of the second argument to the {@code applyAsLong} - * operation. + *

This is a functional interface + * whose functional method is {@link #applyAsLong(Object, Object)}. + * + * @param the type of the first argument to the function + * @param the type of the second argument to the function * * @see BiFunction * @since 1.8 @@ -40,11 +42,11 @@ package java.util.function; public interface ToLongBiFunction { /** - * Compute the result of applying the function to the input arguments. + * Applies this function to the given arguments. * - * @param t an input object - * @param u an input object - * @return the function result value + * @param t the first function argument + * @param u the second function argument + * @return the function result */ long applyAsLong(T t, U u); } diff --git a/jdk/src/share/classes/java/util/function/ToLongFunction.java b/jdk/src/share/classes/java/util/function/ToLongFunction.java index 4489c6fa655..eefb6178bd5 100644 --- a/jdk/src/share/classes/java/util/function/ToLongFunction.java +++ b/jdk/src/share/classes/java/util/function/ToLongFunction.java @@ -25,10 +25,13 @@ package java.util.function; /** - * Apply a function to the input argument, yielding an appropriate result. - * This is the {@code long}-bearing specialization for {@link Function}. + * Represents a function that produces a long-valued result. This is the + * {@code long}-producing primitive specialization for {@link Function}. * - * @param the type of input objects to the function + *

This is a functional interface + * whose functional method is {@link #applyAsLong(Object)}. + * + * @param the type of the input to the function * * @see Function * @since 1.8 @@ -37,10 +40,10 @@ package java.util.function; public interface ToLongFunction { /** - * Compute the result of applying the function to the input arguments. + * Applies this function to the given argument. * - * @param t the input object - * @return the function result value + * @param value the function argument + * @return the function result */ - long applyAsLong(T t); + long applyAsLong(T value); } diff --git a/jdk/src/share/classes/java/util/function/UnaryOperator.java b/jdk/src/share/classes/java/util/function/UnaryOperator.java index e7794ca19e5..c4aa749a68a 100644 --- a/jdk/src/share/classes/java/util/function/UnaryOperator.java +++ b/jdk/src/share/classes/java/util/function/UnaryOperator.java @@ -25,11 +25,14 @@ package java.util.function; /** - * An operation upon a single operand yielding a result. The operand and the - * result are of the same type. This is a specialization of {@code Function} for + * Represents an operation on a single operand that produces a result of the + * same type as its operand. This is a specialization of {@code Function} for * the case where the operand and result are of the same type. * - * @param the type of operand to {@code apply} and of the result + *

This is a functional interface + * whose functional method is {@link #apply(Object)}. + * + * @param the type of the operand and result of the operator * * @see Function * @since 1.8 @@ -38,10 +41,10 @@ package java.util.function; public interface UnaryOperator extends Function { /** - * Returns a unary operator that provides its input value as the result. + * Returns a unary operator that always returns its input argument. * - * @param the type of the input and output objects to the function - * @return a unary operator that provides its input value as the result + * @param the type of the input and output of the operator + * @return a unary operator that always returns its input argument */ static UnaryOperator identity() { return t -> t; diff --git a/jdk/src/share/classes/java/util/function/package-info.java b/jdk/src/share/classes/java/util/function/package-info.java index 690b76dc3b7..158d1f0212d 100644 --- a/jdk/src/share/classes/java/util/function/package-info.java +++ b/jdk/src/share/classes/java/util/function/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,56 +25,82 @@ /** * Functional interfaces provide target types for lambda expressions - * and method references. Each functional interface has a single abstract method + * and method references. Each functional interface has a single abstract + * method, called the functional method for that functional interface, * to which the lambda expression's parameter and return types are matched or - * adapted. Functional interfaces can provide a target type in multiple contexts, - * such as assignment context, method invocation, or cast context: + * adapted. Functional interfaces can provide a target type in multiple + * contexts, such as assignment context, method invocation, or cast context: * * 

{@code
+ *     // Assignment context
  *     Predicate p = String::isEmpty;
  *
+ *     // Method invocation context
  *     stream.filter(e -> e.getSize() > 10)...
  *
+ *     // Cast context
  *     stream.map((ToIntFunction) e -> e.getSize())...
  * }
* - *

The interfaces in this package are functional interfaces used by the JDK, - * and are available to be used by user code as well. While they do not identify - * a complete set of function shapes to which lambda expressions might be adapted, - * they provide enough to cover common requirements. + *

The interfaces in this package are general purpose functional interfaces + * used by the JDK, and are available to be used by user code as well. While + * they do not identify a complete set of function shapes to which lambda + * expressions might be adapted, they provide enough to cover common + * requirements. Other functional interfaces provided for specific purposes, + * such as {@link java.io.FileFilter}, are defined in the packages where they + * are used. * - *

The interfaces in this package are annotated with @{link FunctionalInterface}. - * This annotation is not a requirement for the compiler to recognize an interface - * as a functional interface, but merely an aid to capture design intent and enlist the - * help of the compiler in identifying accidental violations of design intent. + *

The interfaces in this package are annotated with + * {@link java.lang.FunctionalInterface}. This annotation is not a requirement + * for the compiler to recognize an interface as a functional interface, but + * merely an aid to capture design intent and enlist the help of the compiler in + * identifying accidental violations of design intent. * - *

The functional interfaces in this package follow an extensible naming convention, - * as follows: + *

Functional interfaces often represent abstract concepts like functions, + * actions, or predicates. In documenting functional interfaces, or referring + * to variables typed as functional interfaces, it is common to refer directly + * to those abstract concepts, for example using "this function" instead of + * "the function represented by this object". + * + *

The functional interfaces in this package follow an extensible naming + * convention, as follows: * *

    - *
  • There are several basic function shapes, including {@link java.util.function.Function} ({@code T -> R}), - * {@link java.util.function.Consumer} ({@code T -> void}), - * {@link java.util.function.Predicate} ({@code T -> boolean}), - * and {@link java.util.function.Supplier} ({@code () -> T}). + *
  • There are several basic function shapes, including + * {@link java.util.function.Function} (unary function from {@code T} to {@code R}), + * {@link java.util.function.Consumer} (unary function from {@code T} to {@code void}), + * {@link java.util.function.Predicate} (unary function from {@code T} to {@code boolean}), + * and {@link java.util.function.Supplier} (nilary function to {@code R}). *
    • - *
  • Function shapes have a natural arity based on how they are most commonly used. - * The basic shapes can be modified by an arity prefix to indicate a different arity, - * such as {@link java.util.function.BiFunction} ({@code (T, U) -> R}). + * + *
  • Function shapes have a natural arity based on how they are most + * commonly used. The basic shapes can be modified by an arity prefix to + * indicate a different arity, such as + * {@link java.util.function.BiFunction} (binary function from {@code T} and + * {@code U} to {@code R}). *
    • - *
  • There are additional derived function shapes which extend the basic function - * shapes, including {@link java.util.function.UnaryOperator} (extends {@code Function}) and - * {@link java.util.function.BinaryOperator} (extends {@code BiFunction}). + * + *
  • There are additional derived function shapes which extend the basic + * function shapes, including {@link java.util.function.UnaryOperator} + * (extends {@code Function}) and {@link java.util.function.BinaryOperator} + * (extends {@code BiFunction}). *
    • - *
  • Type parameters of functional interfaces can be specialized to primitives with - * additional type prefixes. To specialize the return type for a type that has both - * generic return type and generic arguments, we prefix {@code ToXxx}, as in - * {@link java.util.function.ToIntFunction}. Otherwise, type arguments are specialized left-to-right, - * as in {@link java.util.function.DoubleConsumer} or {@link java.util.function.ObjIntConsumer}. - * (The type prefix {@code Obj} is used to indicate that we don't want to specialize this parameter, - * but want to move on to the next parameter.) These schemes can be combined as in {@code IntToDoubleFunction}. + * + *
  • Type parameters of functional interfaces can be specialized to + * primitives with additional type prefixes. To specialize the return type + * for a type that has both generic return type and generic arguments, we + * prefix {@code ToXxx}, as in {@link java.util.function.ToIntFunction}. + * Otherwise, type arguments are specialized left-to-right, as in + * {@link java.util.function.DoubleConsumer} + * or {@link java.util.function.ObjIntConsumer}. + * (The type prefix {@code Obj} is used to indicate that we don't want to + * specialize this parameter, but want to move on to the next parameter, + * as in {@link java.util.function.ObjIntConsumer}.) + * These schemes can be combined, as in {@code IntToDoubleFunction}. *
    • - *
  • If there are specialization prefixes for all arguments, the arity prefix may be left - * out (as in {@link java.util.function.ObjIntConsumer}). + * + *
  • If there are specialization prefixes for all arguments, the arity + * prefix may be left out (as in {@link java.util.function.ObjIntConsumer}). *
    • *
* From 28502e7c191efdf13bc03fc96147e86b39d57c3f Mon Sep 17 00:00:00 2001 From: Shanliang Jiang Date: Wed, 24 Jul 2013 15:47:10 +0200 Subject: [PATCH 023/120] 8016221: A unit test should not use a fix port to run a jmx connector Reviewed-by: jbachorik, dfuchs --- .../DcmdMBeanDoubleInvocationTest.java | 71 +++++++++---------- .../DcmdMBeanInvocationTest.java | 61 ++++++++-------- .../DiagnosticCommandMBean/DcmdMBeanTest.java | 56 +++++++-------- 3 files changed, 88 insertions(+), 100 deletions(-) diff --git a/jdk/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanDoubleInvocationTest.java b/jdk/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanDoubleInvocationTest.java index 91f30b0376c..c2f1e23883c 100644 --- a/jdk/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanDoubleInvocationTest.java +++ b/jdk/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanDoubleInvocationTest.java @@ -25,25 +25,15 @@ * @test * @bug 7150256 * @summary Basic Test for the DiagnosticCommandMBean - * @author Frederic Parain + * @author Frederic Parain, Shanliang JIANG * - * @run main/othervm -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.port=8125 DcmdMBeanDoubleInvocationTest + * @run main/othervm DcmdMBeanDoubleInvocationTest */ -import java.io.IOException; import java.lang.management.ManagementFactory; -import java.util.logging.Level; -import java.util.logging.Logger; -import javax.management.Descriptor; -import javax.management.InstanceNotFoundException; -import javax.management.IntrospectionException; -import javax.management.MBeanInfo; -import javax.management.MBeanOperationInfo; import javax.management.MBeanServer; -import javax.management.MalformedObjectNameException; import javax.management.ObjectName; -import javax.management.ReflectionException; import javax.management.*; import javax.management.remote.*; @@ -52,39 +42,42 @@ public class DcmdMBeanDoubleInvocationTest { private static String HOTSPOT_DIAGNOSTIC_MXBEAN_NAME = "com.sun.management:type=DiagnosticCommand"; - public static void main(String[] args) { - MBeanServerConnection mbs = null; + public static void main(String[] args) throws Exception { + System.out.println("--->JRCMD MBean Test: invocation on \"help VM.version\" ..."); + + ObjectName name = new ObjectName(HOTSPOT_DIAGNOSTIC_MXBEAN_NAME); + String[] helpArgs = {"-all", "\n", "VM.version"}; + Object[] dcmdArgs = {helpArgs}; + String[] signature = {String[].class.getName()}; + + MBeanServer mbs = ManagementFactory.getPlatformMBeanServer(); + JMXServiceURL url = new JMXServiceURL("rmi", null, 0); + JMXConnectorServer cs = null; + JMXConnector cc = null; try { - JMXServiceURL url = new JMXServiceURL("service:jmx:rmi:///jndi/rmi://localhost:8125/jmxrmi"); - JMXConnector connector = JMXConnectorFactory.connect(url); - mbs = connector.getMBeanServerConnection(); - } catch(Throwable t) { - t.printStackTrace(); - } - ObjectName name; - try { - name = new ObjectName(HOTSPOT_DIAGNOSTIC_MXBEAN_NAME); - MBeanInfo info = mbs.getMBeanInfo(name); - String[] helpArgs = {"-all", "\n", "VM.version"}; - Object[] dcmdArgs = {helpArgs}; - String[] signature = {String[].class.getName()}; - String result = (String) mbs.invoke(name, "help", dcmdArgs, signature); + cs = JMXConnectorServerFactory.newJMXConnectorServer(url, null, mbs); + cs.start(); + JMXServiceURL addr = cs.getAddress(); + cc = JMXConnectorFactory.connect(addr); + MBeanServerConnection mbsc = cc.getMBeanServerConnection(); + + String result = (String) mbsc.invoke(name, "help", dcmdArgs, signature); System.out.println(result); - } catch (RuntimeMBeanException ex) { + + throw new Error("Test failed: Double commands have not been detected"); + } catch (RuntimeMBeanException ex) { if (ex.getCause() instanceof IllegalArgumentException) { - System.out.println("Test passed"); - return; + System.out.println("JTest passed: Double commands have been detected"); } else { ex.printStackTrace(); - throw new RuntimeException("TEST FAILED"); + throw new Error("TEST FAILED: got unknown exception "+ex); + } + } finally { + try { + cc.close(); + cs.stop(); + } catch (Exception e) { } - } catch (InstanceNotFoundException | IntrospectionException - | ReflectionException | MalformedObjectNameException - | MBeanException|IOException ex) { - ex.printStackTrace(); - throw new RuntimeException("TEST FAILED"); } - System.out.println("Double commands have not been detected"); - throw new RuntimeException("TEST FAILED"); } } diff --git a/jdk/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanInvocationTest.java b/jdk/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanInvocationTest.java index 02132c37e5d..343ae017948 100644 --- a/jdk/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanInvocationTest.java +++ b/jdk/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanInvocationTest.java @@ -25,25 +25,15 @@ * @test * @bug 7150256 * @summary Basic Test for the DiagnosticCommandMBean - * @author Frederic Parain + * @author Frederic Parain, Shanliang JIANG * - * @run main/othervm -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.port=8129 DcmdMBeanInvocationTest + * @run main/othervm DcmdMBeanInvocationTest */ -import java.io.IOException; import java.lang.management.ManagementFactory; -import java.util.logging.Level; -import java.util.logging.Logger; -import javax.management.Descriptor; -import javax.management.InstanceNotFoundException; -import javax.management.IntrospectionException; -import javax.management.MBeanInfo; -import javax.management.MBeanOperationInfo; import javax.management.MBeanServer; -import javax.management.MalformedObjectNameException; import javax.management.ObjectName; -import javax.management.ReflectionException; import javax.management.*; import javax.management.remote.*; @@ -52,30 +42,35 @@ public class DcmdMBeanInvocationTest { private static String HOTSPOT_DIAGNOSTIC_MXBEAN_NAME = "com.sun.management:type=DiagnosticCommand"; - public static void main(String[] args) { - MBeanServerConnection mbs = null; + public static void main(String[] args) throws Exception { + System.out.println("--->JRCMD MBean Test: invocation on \"help -all\" ..."); + + ObjectName name = new ObjectName(HOTSPOT_DIAGNOSTIC_MXBEAN_NAME); + String[] helpArgs = {"-all"}; + Object[] dcmdArgs = {helpArgs}; + String[] signature = {String[].class.getName()}; + + MBeanServer mbs = ManagementFactory.getPlatformMBeanServer(); + JMXServiceURL url = new JMXServiceURL("rmi", null, 0); + JMXConnectorServer cs = null; + JMXConnector cc = null; try { - JMXServiceURL url = new JMXServiceURL("service:jmx:rmi:///jndi/rmi://localhost:8129/jmxrmi"); - JMXConnector connector = JMXConnectorFactory.connect(url); - mbs = connector.getMBeanServerConnection(); - } catch(Throwable t) { - t.printStackTrace(); - } - ObjectName name; - try { - name = new ObjectName(HOTSPOT_DIAGNOSTIC_MXBEAN_NAME); - MBeanInfo info = mbs.getMBeanInfo(name); - String[] helpArgs = {"-all"}; - Object[] dcmdArgs = {helpArgs}; - String[] signature = {String[].class.getName()}; - String result = (String) mbs.invoke(name, "help", dcmdArgs, signature); + cs = JMXConnectorServerFactory.newJMXConnectorServer(url, null, mbs); + cs.start(); + JMXServiceURL addr = cs.getAddress(); + cc = JMXConnectorFactory.connect(addr); + MBeanServerConnection mbsc = cc.getMBeanServerConnection(); + + String result = (String) mbsc.invoke(name, "help", dcmdArgs, signature); System.out.println(result); - } catch (InstanceNotFoundException | IntrospectionException - | ReflectionException | MalformedObjectNameException - | MBeanException|IOException ex) { - ex.printStackTrace(); - throw new RuntimeException("TEST FAILED"); + } finally { + try { + cc.close(); + cs.stop(); + } catch (Exception e) { + } } + System.out.println("Test passed"); } } diff --git a/jdk/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanTest.java b/jdk/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanTest.java index 10ce4240402..9072b2c1359 100644 --- a/jdk/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanTest.java +++ b/jdk/test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanTest.java @@ -25,25 +25,18 @@ * @test * @bug 7150256 * @summary Basic Test for the DiagnosticCommandMBean - * @author Frederic Parain + * @author Frederic Parain, Shanliang JIANG * - * @run main/othervm -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.port=8127 DcmdMBeanTest + * @run main/othervm DcmdMBeanTest */ -import java.io.IOException; import java.lang.management.ManagementFactory; -import java.util.logging.Level; -import java.util.logging.Logger; import javax.management.Descriptor; -import javax.management.InstanceNotFoundException; -import javax.management.IntrospectionException; import javax.management.MBeanInfo; import javax.management.MBeanOperationInfo; import javax.management.MBeanServer; -import javax.management.MalformedObjectNameException; import javax.management.ObjectName; -import javax.management.ReflectionException; import javax.management.*; import javax.management.remote.*; @@ -52,34 +45,42 @@ public class DcmdMBeanTest { private static String HOTSPOT_DIAGNOSTIC_MXBEAN_NAME = "com.sun.management:type=DiagnosticCommand"; - public static void main(String[] args) { - MBeanServerConnection mbs = null; + public static void main(String[] args) throws Exception { + System.out.println("--->JRCMD MBean Test: invocation on \"operation info\"..."); + + MBeanServer mbs = ManagementFactory.getPlatformMBeanServer(); + JMXServiceURL url = new JMXServiceURL("rmi", null, 0); + JMXConnectorServer cs = null; + JMXConnector cc = null; try { - JMXServiceURL url = new JMXServiceURL("service:jmx:rmi:///jndi/rmi://localhost:8127/jmxrmi"); - JMXConnector connector = JMXConnectorFactory.connect(url); - mbs = connector.getMBeanServerConnection(); - } catch(Throwable t) { - t.printStackTrace(); - } - ObjectName name; - try { - name = new ObjectName(HOTSPOT_DIAGNOSTIC_MXBEAN_NAME); - MBeanInfo info = mbs.getMBeanInfo(name); + cs = JMXConnectorServerFactory.newJMXConnectorServer(url, null, mbs); + cs.start(); + JMXServiceURL addr = cs.getAddress(); + cc = JMXConnectorFactory.connect(addr); + MBeanServerConnection mbsc = cc.getMBeanServerConnection(); + ObjectName name = new ObjectName(HOTSPOT_DIAGNOSTIC_MXBEAN_NAME); + MBeanInfo info = mbsc.getMBeanInfo(name); + // the test should check that the MBean doesn't have any // Attribute, notification or constructor. Current version only // check operations - System.out.println("Class Name:"+info.getClassName()); - System.out.println("Description:"+info.getDescription()); + System.out.println("Class Name:" + info.getClassName()); + System.out.println("Description:" + info.getDescription()); MBeanOperationInfo[] opInfo = info.getOperations(); System.out.println("Operations:"); - for(int i=0; i Date: Wed, 24 Jul 2013 12:48:10 -0700 Subject: [PATCH 024/120] 8016916: UnstructuredName should support DirectoryString Reviewed-by: mullan --- .../sun/security/pkcs/PKCS9Attribute.java | 5 +- .../sun/security/tools/keytool/Main.java | 13 +++- .../security/pkcs/pkcs9/UnstructuredName.java | 62 +++++++++++++++++++ 3 files changed, 75 insertions(+), 5 deletions(-) create mode 100644 jdk/test/sun/security/pkcs/pkcs9/UnstructuredName.java diff --git a/jdk/src/share/classes/sun/security/pkcs/PKCS9Attribute.java b/jdk/src/share/classes/sun/security/pkcs/PKCS9Attribute.java index 0a9e3a5dbea..d847b104955 100644 --- a/jdk/src/share/classes/sun/security/pkcs/PKCS9Attribute.java +++ b/jdk/src/share/classes/sun/security/pkcs/PKCS9Attribute.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -310,7 +310,8 @@ public class PKCS9Attribute implements DerEncoder { private static final Byte[][] PKCS9_VALUE_TAGS = { null, {new Byte(DerValue.tag_IA5String)}, // EMailAddress - {new Byte(DerValue.tag_IA5String)}, // UnstructuredName + {new Byte(DerValue.tag_IA5String), // UnstructuredName + new Byte(DerValue.tag_PrintableString)}, {new Byte(DerValue.tag_ObjectId)}, // ContentType {new Byte(DerValue.tag_OctetString)}, // MessageDigest {new Byte(DerValue.tag_UtcTime)}, // SigningTime diff --git a/jdk/src/share/classes/sun/security/tools/keytool/Main.java b/jdk/src/share/classes/sun/security/tools/keytool/Main.java index c8e96eb6d65..02ea1d0497f 100644 --- a/jdk/src/share/classes/sun/security/tools/keytool/Main.java +++ b/jdk/src/share/classes/sun/security/tools/keytool/Main.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -2198,8 +2198,15 @@ public final class Main { printExtensions(rb.getString("Extension.Request."), exts, out); } } else { - out.println(attr.getAttributeId()); - out.println(attr.getAttributeValue()); + out.println("Attribute: " + attr.getAttributeId()); + PKCS9Attribute pkcs9Attr = + new PKCS9Attribute(attr.getAttributeId(), + attr.getAttributeValue()); + out.print(pkcs9Attr.getName() + ": "); + Object attrVal = attr.getAttributeValue(); + out.println(attrVal instanceof String[] ? + Arrays.toString((String[]) attrVal) : + attrVal); } } if (debug) { diff --git a/jdk/test/sun/security/pkcs/pkcs9/UnstructuredName.java b/jdk/test/sun/security/pkcs/pkcs9/UnstructuredName.java new file mode 100644 index 00000000000..e19e4aa597b --- /dev/null +++ b/jdk/test/sun/security/pkcs/pkcs9/UnstructuredName.java @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8016916 + * @summary UnstructuredName should support DirectoryString + */ + +import java.util.Base64; +import sun.security.pkcs10.PKCS10; + +public class UnstructuredName { + + // Certificate request with an Unstructured Name attribute + static String csrStr = + "MIIBtjCCAR8CAQAwEzERMA8GA1UEAxMIdGVzdE5hbWUwgZ8wDQYJKoZIhvcNAQEB\n" + + "BQADgY0AMIGJAoGBAMTEIVCsM8IIhvsbzn6AwQFX5C8RGAWIrL6P5XEr1z+bvHx3\n" + + "XhPD4tWLCR6CTKq0lTlo+QKKct7MUY7pdKShajpyYD+1YLgEve0nNd4r5kVUeoHe\n" + + "CyIZoImONgAlmVD7M8IJjz2Vg84WVVjkHK67H5qt7Agi1hUnFGmRbJ8rbL7jAgMB\n" + + "AAGgYzAXBgkqhkiG9w0BCQcxChMIcGFzc3dvcmQwHAYJKoZIhvcNAQkCMQ8TDW9w\n" + + "dGlvbmFsIG5hbWUwKgYJKoZIhvcNAQkOMR0wGzAMBgNVHRMBAf8EAjAAMAsGA1Ud\n" + + "DwQEAwIGQDANBgkqhkiG9w0BAQUFAAOBgQBc7ldGSmyCjMU+ssjglCimqknCVdig\n" + + "N8FsI/aNRgLqf+eXKWZOxl1v3GB9HCXWDtqOnHd6AJKFpGtK0bqRu7bIncYIiQ1a\n" + + "P1NW4Kup8d1fTPhw6xgYtxeHvUxRa2y4IXskPUYqp05HavfNZxmcJ5mZOLtgiDIC\n" + + "I3J80saqEUQKqQ=="; + + public static void main(String[] args) throws Exception { + PKCS10 req = new PKCS10(Base64.getMimeDecoder().decode(csrStr)); + + // If PKCS9Attribute did not accept the PrintableString ASN.1 tag, + // this would fail with an IOException + Object attr = req.getAttributes().getAttribute("1.2.840.113549.1.9.2"); + + // Check that the attribute exists + if (attr == null) { + throw new Exception("Attribute should not be null."); + } + + System.out.println("Test passed."); + } +} From 4adcc57838f842569b996ac9c5cd37fd14855ccd Mon Sep 17 00:00:00 2001 From: Chris Hegarty Date: Wed, 24 Jul 2013 22:52:01 +0100 Subject: [PATCH 025/120] 8021261: ProblemList.txt updates (7/2013) Reviewed-by: alanb, mcimadamore --- jdk/test/ProblemList.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt index 1574a648c9c..a2e02261a92 100644 --- a/jdk/test/ProblemList.txt +++ b/jdk/test/ProblemList.txt @@ -131,9 +131,6 @@ java/lang/management/MemoryMXBean/CollectionUsageThreshold.java generic-all # 7196801 java/lang/management/MemoryMXBean/LowMemoryTest2.sh generic-all -# 8008200 -java/lang/Class/asSubclass/BasicUnit.java generic-all - # 8015780 java/lang/reflect/Method/GenericStringTest.java generic-all @@ -170,6 +167,9 @@ demo/jvmti/compiledMethodLoad/CompiledMethodLoadTest.java generic-all # 7027502 demo/jvmti/hprof/MonitorTest.java generic-all +# 8021186 +jdk/lambda/vm/DefaultMethodsTest.java generic-all + ############################################################################ # jdk_net @@ -376,6 +376,9 @@ java/util/concurrent/ThreadPoolExecutor/CoreThreadTimeOut.java generic-all # Filed 6772009 java/util/concurrent/locks/ReentrantLock/CancelledLockLoops.java generic-all +# 8020435 +java/util/concurrent/CompletableFuture/Basic.java generic-all + # 7041639, Solaris DSA keypair generation bug java/util/TimeZone/TimeZoneDatePermissionCheck.sh solaris-all From 74a0cc9f3750f3241e07d2ccf11688d2c737c895 Mon Sep 17 00:00:00 2001 From: Sean Mullan Date: Thu, 25 Jul 2013 10:58:00 -0400 Subject: [PATCH 026/120] 8010748: Add PKIXRevocationChecker NO_FALLBACK option and improve SOFT_FAIL option Reviewed-by: vinnie --- .../security/cert/PKIXRevocationChecker.java | 87 ++++-- .../sun/security/provider/certpath/OCSP.java | 17 +- .../provider/certpath/OCSPResponse.java | 20 +- .../certpath/PKIXCertPathValidator.java | 9 +- .../provider/certpath/ReverseState.java | 16 +- .../provider/certpath/RevocationChecker.java | 273 ++++++++++-------- .../provider/certpath/SunCertPathBuilder.java | 10 +- .../cert/PKIXRevocationChecker/UnitTest.java | 57 ++-- 8 files changed, 286 insertions(+), 203 deletions(-) diff --git a/jdk/src/share/classes/java/security/cert/PKIXRevocationChecker.java b/jdk/src/share/classes/java/security/cert/PKIXRevocationChecker.java index 2446c821df6..d0e2ee02986 100644 --- a/jdk/src/share/classes/java/security/cert/PKIXRevocationChecker.java +++ b/jdk/src/share/classes/java/security/cert/PKIXRevocationChecker.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -50,21 +50,26 @@ import java.util.Set; * status of certificates with OCSP and CRLs. By default, OCSP is the * preferred mechanism for checking revocation status, with CRLs as the * fallback mechanism. However, this preference can be switched to CRLs with - * the {@link Option#PREFER_CRLS PREFER_CRLS} option. + * the {@link Option#PREFER_CRLS PREFER_CRLS} option. In addition, the fallback + * mechanism can be disabled with the {@link Option#NO_FALLBACK NO_FALLBACK} + * option. * *

A {@code PKIXRevocationChecker} is obtained by calling the * {@link CertPathValidator#getRevocationChecker getRevocationChecker} method * of a PKIX {@code CertPathValidator}. Additional parameters and options - * specific to revocation can be set (by calling {@link #setOCSPResponder} - * method for instance). The {@code PKIXRevocationChecker} is added to - * a {@code PKIXParameters} object using the - * {@link PKIXParameters#addCertPathChecker addCertPathChecker} + * specific to revocation can be set (by calling the + * {@link #setOcspResponder setOcspResponder} method for instance). The + * {@code PKIXRevocationChecker} is added to a {@code PKIXParameters} object + * using the {@link PKIXParameters#addCertPathChecker addCertPathChecker} * or {@link PKIXParameters#setCertPathCheckers setCertPathCheckers} method, * and then the {@code PKIXParameters} is passed along with the {@code CertPath} * to be validated to the {@link CertPathValidator#validate validate} method * of a PKIX {@code CertPathValidator}. When supplying a revocation checker in * this manner, it will be used to check revocation irrespective of the setting * of the {@link PKIXParameters#isRevocationEnabled RevocationEnabled} flag. + * Similarly, a {@code PKIXRevocationChecker} may be added to a + * {@code PKIXBuilderParameters} object for use with a PKIX + * {@code CertPathBuilder}. * *

Note that when a {@code PKIXRevocationChecker} is added to * {@code PKIXParameters}, it clones the {@code PKIXRevocationChecker}; @@ -83,6 +88,13 @@ import java.util.Set; * need not synchronize. * * @since 1.8 + * + * @see RFC 2560: X.509 + * Internet Public Key Infrastructure Online Certificate Status Protocol - + * OCSP,
RFC 5280: Internet X.509 + * Public Key Infrastructure Certificate and Certificate Revocation List (CRL) + * Profile */ public abstract class PKIXRevocationChecker extends PKIXCertPathChecker { private URI ocspResponder; @@ -101,7 +113,7 @@ public abstract class PKIXRevocationChecker extends PKIXCertPathChecker { * * @param uri the responder URI */ - public void setOCSPResponder(URI uri) { + public void setOcspResponder(URI uri) { this.ocspResponder = uri; } @@ -114,7 +126,7 @@ public abstract class PKIXRevocationChecker extends PKIXCertPathChecker { * * @return the responder URI, or {@code null} if not set */ - public URI getOCSPResponder() { + public URI getOcspResponder() { return ocspResponder; } @@ -126,7 +138,7 @@ public abstract class PKIXRevocationChecker extends PKIXCertPathChecker { * * @param cert the responder's certificate */ - public void setOCSPResponderCert(X509Certificate cert) { + public void setOcspResponderCert(X509Certificate cert) { this.ocspResponderCert = cert; } @@ -140,7 +152,7 @@ public abstract class PKIXRevocationChecker extends PKIXCertPathChecker { * * @return the responder's certificate, or {@code null} if not set */ - public X509Certificate getOCSPResponderCert() { + public X509Certificate getOcspResponderCert() { return ocspResponderCert; } @@ -151,7 +163,7 @@ public abstract class PKIXRevocationChecker extends PKIXCertPathChecker { * @param extensions a list of extensions. The list is copied to protect * against subsequent modification. */ - public void setOCSPExtensions(List extensions) + public void setOcspExtensions(List extensions) { this.ocspExtensions = (extensions == null) ? Collections.emptyList() @@ -161,10 +173,10 @@ public abstract class PKIXRevocationChecker extends PKIXCertPathChecker { /** * Gets the optional OCSP request extensions. * - * @return an unmodifiable list of extensions. Returns an empty list if no + * @return an unmodifiable list of extensions. The list is empty if no * extensions have been specified. */ - public List getOCSPExtensions() { + public List getOcspExtensions() { return Collections.unmodifiableList(ocspExtensions); } @@ -177,7 +189,7 @@ public abstract class PKIXRevocationChecker extends PKIXCertPathChecker { * DER-encoded OCSP response for that certificate. A deep copy of * the map is performed to protect against subsequent modification. */ - public void setOCSPResponses(Map responses) + public void setOcspResponses(Map responses) { if (responses == null) { this.ocspResponses = Collections.emptyMap(); @@ -200,7 +212,7 @@ public abstract class PKIXRevocationChecker extends PKIXCertPathChecker { * the map is returned to protect against subsequent modification. * Returns an empty map if no responses have been specified. */ - public Map getOCSPResponses() { + public Map getOcspResponses() { Map copy = new HashMap<>(ocspResponses.size()); for (Map.Entry e : ocspResponses.entrySet()) { copy.put(e.getKey(), e.getValue().clone()); @@ -223,15 +235,31 @@ public abstract class PKIXRevocationChecker extends PKIXCertPathChecker { /** * Gets the revocation options. * - * @return an unmodifiable set of revocation options, or an empty set if - * none are specified + * @return an unmodifiable set of revocation options. The set is empty if + * no options have been specified. */ public Set

+ * An implementation of {@code PKIXRevocationChecker} is responsible for + * adding the ignored exceptions to the list. + * + * @return an unmodifiable list containing the ignored exceptions. The list + * is empty if no exceptions have been ignored. + */ + public abstract List getSoftFailExceptions(); + @Override - public Object clone() { + public PKIXRevocationChecker clone() { PKIXRevocationChecker copy = (PKIXRevocationChecker)super.clone(); copy.ocspExtensions = new ArrayList<>(ocspExtensions); copy.ocspResponses = new HashMap<>(ocspResponses); @@ -262,9 +290,26 @@ public abstract class PKIXRevocationChecker extends PKIXCertPathChecker { */ PREFER_CRLS, /** - * Ignore network failures. The default behavior is to consider it a - * failure if the revocation status of a certificate cannot be obtained - * due to a network error. This option applies to both OCSP and CRLs. + * Disable the fallback mechanism. + */ + NO_FALLBACK, + /** + * Allow revocation check to succeed if the revocation status cannot be + * determined for one of the following reasons: + *

    + *
  • The CRL or OCSP response cannot be obtained because of a + * network error. + *
  • The OCSP responder returns one of the following errors + * specified in section 2.3 of RFC 2560: internalError, tryLater, + * or unauthorized. + *

+ * Note that these conditions apply to both OCSP and CRLs, and unless + * the {@code NO_FALLBACK} option is set, the revocation check is + * allowed to succeed only if both mechanisms fail under one of the + * conditions as stated above. + * Exceptions that cause the network errors are ignored but can be + * later retrieved by calling the + * {@link #getSoftFailExceptions getSoftFailExceptions} method. */ SOFT_FAIL } diff --git a/jdk/src/share/classes/sun/security/provider/certpath/OCSP.java b/jdk/src/share/classes/sun/security/provider/certpath/OCSP.java index ca82ef598a0..2c375a869b7 100644 --- a/jdk/src/share/classes/sun/security/provider/certpath/OCSP.java +++ b/jdk/src/share/classes/sun/security/provider/certpath/OCSP.java @@ -255,7 +255,9 @@ public final class OCSP { } response = Arrays.copyOf(response, total); } catch (IOException ioe) { - throw new NetworkFailureException(ioe); + throw new CertPathValidatorException( + "Unable to determine revocation status due to network error", + ioe, null, -1, BasicReason.UNDETERMINED_REVOCATION_STATUS); } finally { if (in != null) { try { @@ -355,17 +357,4 @@ public final class OCSP { */ Map getSingleExtensions(); } - - static class NetworkFailureException extends CertPathValidatorException { - private static final long serialVersionUID = 0l; - - NetworkFailureException(Throwable t) { - super(t); - } - - @Override - public CertPathValidatorException.Reason getReason() { - return BasicReason.UNDETERMINED_REVOCATION_STATUS; - } - } } diff --git a/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java b/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java index 1d84a4c1449..5580dc70b88 100644 --- a/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java +++ b/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java @@ -30,6 +30,7 @@ import java.security.*; import java.security.cert.CertificateException; import java.security.cert.CertificateParsingException; import java.security.cert.CertPathValidatorException; +import java.security.cert.CertPathValidatorException.BasicReason; import java.security.cert.CRLReason; import java.security.cert.TrustAnchor; import java.security.cert.X509Certificate; @@ -121,8 +122,8 @@ public final class OCSPResponse { public enum ResponseStatus { SUCCESSFUL, // Response has valid confirmations - MALFORMED_REQUEST, // Illegal confirmation request - INTERNAL_ERROR, // Internal error in issuer + MALFORMED_REQUEST, // Illegal request + INTERNAL_ERROR, // Internal error in responder TRY_LATER, // Try again later UNUSED, // is not used SIG_REQUIRED, // Must sign the request @@ -381,9 +382,18 @@ public final class OCSPResponse { Date date, byte[] nonce) throws CertPathValidatorException { - if (responseStatus != ResponseStatus.SUCCESSFUL) { - throw new CertPathValidatorException - ("OCSP response error: " + responseStatus); + switch (responseStatus) { + case SUCCESSFUL: + break; + case UNAUTHORIZED: + case TRY_LATER: + case INTERNAL_ERROR: + throw new CertPathValidatorException( + "OCSP response error: " + responseStatus, null, null, -1, + BasicReason.UNDETERMINED_REVOCATION_STATUS); + default: + throw new CertPathValidatorException("OCSP response error: " + + responseStatus); } // Check that the response includes a response for all of the diff --git a/jdk/src/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java b/jdk/src/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java index 057e99e4070..728bc19f5db 100644 --- a/jdk/src/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java +++ b/jdk/src/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -193,10 +193,15 @@ public final class PKIXCertPathValidator extends CertPathValidatorSpi { List checkers = params.certPathCheckers(); for (PKIXCertPathChecker checker : checkers) { if (checker instanceof PKIXRevocationChecker) { + if (revCheckerAdded) { + throw new CertPathValidatorException( + "Only one PKIXRevocationChecker can be specified"); + } revCheckerAdded = true; // if it's our own, initialize it - if (checker instanceof RevocationChecker) + if (checker instanceof RevocationChecker) { ((RevocationChecker)checker).init(anchor, params); + } } } // only add a RevocationChecker if revocation is enabled and diff --git a/jdk/src/share/classes/sun/security/provider/certpath/ReverseState.java b/jdk/src/share/classes/sun/security/provider/certpath/ReverseState.java index 1ec6147cb36..c51500308ae 100644 --- a/jdk/src/share/classes/sun/security/provider/certpath/ReverseState.java +++ b/jdk/src/share/classes/sun/security/provider/certpath/ReverseState.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -30,6 +30,7 @@ import java.security.PublicKey; import java.security.cert.CertificateException; import java.security.cert.CertPathValidatorException; import java.security.cert.PKIXCertPathChecker; +import java.security.cert.PKIXRevocationChecker; import java.security.cert.TrustAnchor; import java.security.cert.X509Certificate; import java.util.ArrayList; @@ -235,9 +236,16 @@ class ReverseState implements State { for (PKIXCertPathChecker checker : userCheckers) { if (checker instanceof AlgorithmChecker) { ((AlgorithmChecker)checker).trySetTrustAnchor(anchor); - } else if (checker instanceof RevocationChecker) { - ((RevocationChecker)checker).init(anchor, buildParams); - ((RevocationChecker)checker).init(false); + } else if (checker instanceof PKIXRevocationChecker) { + if (revCheckerAdded) { + throw new CertPathValidatorException( + "Only one PKIXRevocationChecker can be specified"); + } + // if it's our own, initialize it + if (checker instanceof RevocationChecker) { + ((RevocationChecker)checker).init(anchor, buildParams); + } + ((PKIXRevocationChecker)checker).init(false); revCheckerAdded = true; } } diff --git a/jdk/src/share/classes/sun/security/provider/certpath/RevocationChecker.java b/jdk/src/share/classes/sun/security/provider/certpath/RevocationChecker.java index 98d8a9d2272..0aad090a8b0 100644 --- a/jdk/src/share/classes/sun/security/provider/certpath/RevocationChecker.java +++ b/jdk/src/share/classes/sun/security/provider/certpath/RevocationChecker.java @@ -38,14 +38,7 @@ import java.security.Security; import java.security.cert.CertPathValidatorException.BasicReason; import java.security.cert.Extension; import java.security.cert.*; -import java.util.Arrays; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import javax.security.auth.x500.X500Principal; import static sun.security.provider.certpath.OCSP.*; @@ -70,13 +63,16 @@ class RevocationChecker extends PKIXRevocationChecker { private Map ocspResponses; private List ocspExtensions; private boolean legacy; + private LinkedList softFailExceptions = + new LinkedList<>(); // state variables private X509Certificate issuerCert; private PublicKey prevPubKey; private boolean crlSignFlag; + private int certIndex; - private enum Mode { PREFER_OCSP, PREFER_CRLS, ONLY_CRLS }; + private enum Mode { PREFER_OCSP, PREFER_CRLS, ONLY_CRLS, ONLY_OCSP }; private Mode mode = Mode.PREFER_OCSP; private static class RevocationProperties { @@ -104,9 +100,9 @@ class RevocationChecker extends PKIXRevocationChecker { throws CertPathValidatorException { RevocationProperties rp = getRevocationProperties(); - URI uri = getOCSPResponder(); + URI uri = getOcspResponder(); responderURI = (uri == null) ? toURI(rp.ocspUrl) : uri; - X509Certificate cert = getOCSPResponderCert(); + X509Certificate cert = getOcspResponderCert(); responderCert = (cert == null) ? getResponderCert(rp, params.trustAnchors(), params.certStores()) @@ -117,31 +113,38 @@ class RevocationChecker extends PKIXRevocationChecker { case ONLY_END_ENTITY: case PREFER_CRLS: case SOFT_FAIL: + case NO_FALLBACK: break; default: throw new CertPathValidatorException( "Unrecognized revocation parameter option: " + option); } } + softFail = options.contains(Option.SOFT_FAIL); // set mode, only end entity flag if (legacy) { mode = (rp.ocspEnabled) ? Mode.PREFER_OCSP : Mode.ONLY_CRLS; onlyEE = rp.onlyEE; } else { - if (options.contains(Option.PREFER_CRLS)) { + if (options.contains(Option.NO_FALLBACK)) { + if (options.contains(Option.PREFER_CRLS)) { + mode = Mode.ONLY_CRLS; + } else { + mode = Mode.ONLY_OCSP; + } + } else if (options.contains(Option.PREFER_CRLS)) { mode = Mode.PREFER_CRLS; } onlyEE = options.contains(Option.ONLY_END_ENTITY); } - softFail = options.contains(Option.SOFT_FAIL); if (legacy) { crlDP = rp.crlDPEnabled; } else { crlDP = true; } - ocspResponses = getOCSPResponses(); - ocspExtensions = getOCSPExtensions(); + ocspResponses = getOcspResponses(); + ocspExtensions = getOcspExtensions(); this.anchor = anchor; this.params = params; @@ -297,14 +300,19 @@ class RevocationChecker extends PKIXRevocationChecker { if (forward) { throw new CertPathValidatorException("forward checking not supported"); - } else { - if (anchor != null) { - issuerCert = anchor.getTrustedCert(); - prevPubKey = (issuerCert != null) ? issuerCert.getPublicKey() - : anchor.getCAPublicKey(); - } - crlSignFlag = true; } + if (anchor != null) { + issuerCert = anchor.getTrustedCert(); + prevPubKey = (issuerCert != null) ? issuerCert.getPublicKey() + : anchor.getCAPublicKey(); + } + crlSignFlag = true; + if (params.certPath() != null) { + certIndex = params.certPath().getCertificates().size() - 1; + } else { + certIndex = -1; + } + softFailExceptions.clear(); } @Override @@ -317,28 +325,35 @@ class RevocationChecker extends PKIXRevocationChecker { return null; } + @Override + public List getSoftFailExceptions() { + return Collections.unmodifiableList(softFailExceptions); + } + @Override public void check(Certificate cert, Collection unresolvedCritExts) throws CertPathValidatorException { - X509Certificate xcert = (X509Certificate)cert; - if (onlyEE && xcert.getBasicConstraints() != -1) { - if (debug != null) { - debug.println("Skipping revocation check, not end entity cert"); - } - } else { - check(xcert, unresolvedCritExts, prevPubKey, crlSignFlag); - } - updateState(xcert); + check((X509Certificate)cert, unresolvedCritExts, + prevPubKey, crlSignFlag); } - void check(X509Certificate xcert, Collection unresolvedCritExts, - PublicKey pubKey, boolean crlSignFlag) + private void check(X509Certificate xcert, + Collection unresolvedCritExts, + PublicKey pubKey, boolean crlSignFlag) throws CertPathValidatorException { try { + if (onlyEE && xcert.getBasicConstraints() != -1) { + if (debug != null) { + debug.println("Skipping revocation check, not end " + + "entity cert"); + } + return; + } switch (mode) { case PREFER_OCSP: + case ONLY_OCSP: checkOCSP(xcert, unresolvedCritExts); break; case PREFER_CRLS: @@ -351,14 +366,17 @@ class RevocationChecker extends PKIXRevocationChecker { if (e.getReason() == BasicReason.REVOKED) { throw e; } + boolean eSoftFail = isSoftFailException(e); + if (eSoftFail) { + if (mode == Mode.ONLY_OCSP || mode == Mode.ONLY_CRLS) { + return; + } + } else { + if (mode == Mode.ONLY_OCSP || mode == Mode.ONLY_CRLS) { + throw e; + } + } CertPathValidatorException cause = e; - if (softFail && e instanceof NetworkFailureException) { - if (mode == Mode.ONLY_CRLS) return; - } - // Rethrow the exception if ONLY_CRLS - if (mode == Mode.ONLY_CRLS) { - throw e; - } // Otherwise, failover if (debug != null) { debug.println("RevocationChecker.check() " + e.getMessage()); @@ -382,22 +400,35 @@ class RevocationChecker extends PKIXRevocationChecker { if (x.getReason() == BasicReason.REVOKED) { throw x; } - if (cause != null) { - if (softFail && cause instanceof NetworkFailureException) { - return; - } else { - cause.addSuppressed(x); + if (!isSoftFailException(x)) { + cause.addSuppressed(x); + throw cause; + } else { + // only pass if both exceptions were soft failures + if (!eSoftFail) { throw cause; } } - if (softFail && x instanceof NetworkFailureException) { - return; - } - throw x; } + } finally { + updateState(xcert); } } + private boolean isSoftFailException(CertPathValidatorException e) { + if (softFail && + e.getReason() == BasicReason.UNDETERMINED_REVOCATION_STATUS) + { + // recreate exception with correct index + CertPathValidatorException e2 = new CertPathValidatorException( + e.getMessage(), e.getCause(), params.certPath(), certIndex, + e.getReason()); + softFailExceptions.addFirst(e2); + return true; + } + return false; + } + private void updateState(X509Certificate cert) throws CertPathValidatorException { @@ -411,6 +442,9 @@ class RevocationChecker extends PKIXRevocationChecker { } prevPubKey = pubKey; crlSignFlag = certCanSignCrl(cert); + if (certIndex > 0) { + certIndex--; + } } // Maximum clock skew in milliseconds (15 minutes) allowed when checking @@ -446,8 +480,8 @@ class RevocationChecker extends PKIXRevocationChecker { " circular dependency"); } throw new CertPathValidatorException - ("Could not determine revocation status", null, null, -1, - BasicReason.UNDETERMINED_REVOCATION_STATUS); + ("Could not determine revocation status", null, null, -1, + BasicReason.UNDETERMINED_REVOCATION_STATUS); } Set possibleCRLs = new HashSet<>(); @@ -457,7 +491,7 @@ class RevocationChecker extends PKIXRevocationChecker { CertPathHelper.setDateAndTime(sel, params.date(), MAX_CLOCK_SKEW); // First, check user-specified CertStores - NetworkFailureException nfe = null; + CertPathValidatorException networkFailureException = null; for (CertStore store : certStores) { try { for (CRL crl : store.getCRLs(sel)) { @@ -468,10 +502,13 @@ class RevocationChecker extends PKIXRevocationChecker { debug.println("RevocationChecker.checkCRLs() " + "CertStoreException: " + e.getMessage()); } - if (softFail && nfe == null && + if (networkFailureException == null && CertStoreHelper.isCausedByNetworkIssue(store.getType(),e)) { // save this exception, we may need to throw it later - nfe = new NetworkFailureException(e); + networkFailureException = new CertPathValidatorException( + "Unable to determine revocation status due to " + + "network error", e, null, -1, + BasicReason.UNDETERMINED_REVOCATION_STATUS); } } } @@ -508,14 +545,17 @@ class RevocationChecker extends PKIXRevocationChecker { approvedCRLs.addAll(DistributionPointFetcher.getCRLs( sel, signFlag, prevKey, params.sigProvider(), certStores, - reasonsMask, anchors, params.date())); + reasonsMask, anchors, null)); } } catch (CertStoreException e) { - if (softFail && e instanceof CertStoreTypeException) { + if (e instanceof CertStoreTypeException) { CertStoreTypeException cste = (CertStoreTypeException)e; if (CertStoreHelper.isCausedByNetworkIssue(cste.getType(), e)) { - throw new NetworkFailureException(e); + throw new CertPathValidatorException( + "Unable to determine revocation status due to " + + "network error", e, null, -1, + BasicReason.UNDETERMINED_REVOCATION_STATUS); } } throw new CertPathValidatorException(e); @@ -531,26 +571,26 @@ class RevocationChecker extends PKIXRevocationChecker { stackedCerts); return; } catch (CertPathValidatorException cpve) { - if (nfe != null) { + if (networkFailureException != null) { // if a network issue previously prevented us from // retrieving a CRL from one of the user-specified - // CertStores and SOFT_FAIL is enabled, throw it now - // so it can be handled appropriately - throw nfe; + // CertStores, throw it now so it can be handled + // appropriately + throw networkFailureException; } throw cpve; } } else { - if (nfe != null) { + if (networkFailureException != null) { // if a network issue previously prevented us from // retrieving a CRL from one of the user-specified - // CertStores and SOFT_FAIL is enabled, throw it now - // so it can be handled appropriately - throw nfe; + // CertStores, throw it now so it can be handled + // appropriately + throw networkFailureException; } - throw new CertPathValidatorException - ("Could not determine revocation status", null, null, -1, - BasicReason.UNDETERMINED_REVOCATION_STATUS); + throw new CertPathValidatorException( + "Could not determine revocation status", null, null, -1, + BasicReason.UNDETERMINED_REVOCATION_STATUS); } } } @@ -595,14 +635,9 @@ class RevocationChecker extends PKIXRevocationChecker { unresCritExts.remove(ReasonCode_Id.toString()); unresCritExts.remove(CertificateIssuer_Id.toString()); if (!unresCritExts.isEmpty()) { - if (debug != null) { - debug.println("Unrecognized " - + "critical extension(s) in revoked CRL entry: " - + unresCritExts); - } - throw new CertPathValidatorException - ("Could not determine revocation status", null, null, - -1, BasicReason.UNDETERMINED_REVOCATION_STATUS); + throw new CertPathValidatorException( + "Unrecognized critical extension(s) in revoked " + + "CRL entry"); } } @@ -610,11 +645,14 @@ class RevocationChecker extends PKIXRevocationChecker { if (reasonCode == null) { reasonCode = CRLReason.UNSPECIFIED; } - Throwable t = new CertificateRevokedException - (entry.getRevocationDate(), reasonCode, - crl.getIssuerX500Principal(), entry.getExtensions()); - throw new CertPathValidatorException(t.getMessage(), t, - null, -1, BasicReason.REVOKED); + Date revocationDate = entry.getRevocationDate(); + if (revocationDate.before(params.date())) { + Throwable t = new CertificateRevokedException( + revocationDate, reasonCode, + crl.getIssuerX500Principal(), entry.getExtensions()); + throw new CertPathValidatorException( + t.getMessage(), t, null, -1, BasicReason.REVOKED); + } } } } @@ -630,9 +668,6 @@ class RevocationChecker extends PKIXRevocationChecker { throw new CertPathValidatorException(ce); } - URI responderURI = (this.responderURI != null) - ? this.responderURI : getOCSPServerURI(currCert); - X509Certificate respCert = (responderCert == null) ? issuerCert : responderCert; @@ -671,23 +706,38 @@ class RevocationChecker extends PKIXRevocationChecker { params.date(), nonce); } else { + URI responderURI = (this.responderURI != null) + ? this.responderURI + : OCSP.getResponderURI(currCert); + if (responderURI == null) { + throw new CertPathValidatorException( + "Certificate does not specify OCSP responder", null, + null, -1); + } + response = OCSP.check(Collections.singletonList(certId), - responderURI, respCert, params.date(), + responderURI, respCert, null, ocspExtensions); } } catch (IOException e) { - throw new CertPathValidatorException(e); + throw new CertPathValidatorException( + "Unable to determine revocation status due to network error", + e, null, -1, BasicReason.UNDETERMINED_REVOCATION_STATUS); } RevocationStatus rs = (RevocationStatus)response.getSingleResponse(certId); RevocationStatus.CertStatus certStatus = rs.getCertStatus(); if (certStatus == RevocationStatus.CertStatus.REVOKED) { - Throwable t = new CertificateRevokedException( - rs.getRevocationTime(), rs.getRevocationReason(), - respCert.getSubjectX500Principal(), rs.getSingleExtensions()); - throw new CertPathValidatorException(t.getMessage(), t, null, - -1, BasicReason.REVOKED); + Date revocationTime = rs.getRevocationTime(); + if (revocationTime.before(params.date())) { + Throwable t = new CertificateRevokedException( + revocationTime, rs.getRevocationReason(), + respCert.getSubjectX500Principal(), + rs.getSingleExtensions()); + throw new CertPathValidatorException(t.getMessage(), t, null, + -1, BasicReason.REVOKED); + } } else if (certStatus == RevocationStatus.CertStatus.UNKNOWN) { throw new CertPathValidatorException( "Certificate's revocation status is unknown", null, @@ -711,34 +761,6 @@ class RevocationChecker extends PKIXRevocationChecker { return hexNumber.toString(); } - private static URI getOCSPServerURI(X509CertImpl cert) - throws CertPathValidatorException - { - // Examine the certificate's AuthorityInfoAccess extension - AuthorityInfoAccessExtension aia = - cert.getAuthorityInfoAccessExtension(); - if (aia == null) { - throw new CertPathValidatorException( - "Must specify the location of an OCSP Responder"); - } - - List descriptions = aia.getAccessDescriptions(); - for (AccessDescription description : descriptions) { - if (description.getAccessMethod().equals((Object) - AccessDescription.Ad_OCSP_Id)) { - - GeneralName generalName = description.getAccessLocation(); - if (generalName.getType() == GeneralNameInterface.NAME_URI) { - URIName uri = (URIName)generalName.getName(); - return uri.getURI(); - } - } - } - - throw new CertPathValidatorException( - "Cannot find the location of the OCSP Responder"); - } - /** * Checks that a cert can be used to verify a CRL. * @@ -870,8 +892,8 @@ class RevocationChecker extends PKIXRevocationChecker { " circular dependency"); } throw new CertPathValidatorException - ("Could not determine revocation status", null, null, - -1, BasicReason.UNDETERMINED_REVOCATION_STATUS); + ("Could not determine revocation status", null, null, -1, + BasicReason.UNDETERMINED_REVOCATION_STATUS); } // Try to find another key that might be able to sign @@ -1067,6 +1089,15 @@ class RevocationChecker extends PKIXRevocationChecker { } } + @Override + public RevocationChecker clone() { + RevocationChecker copy = (RevocationChecker)super.clone(); + // we don't deep-copy the exceptions, but that is ok because they + // are never modified after they are instantiated + copy.softFailExceptions = new LinkedList<>(softFailExceptions); + return copy; + } + /* * This inner class extends the X509CertSelector to add an additional * check to make sure the subject public key isn't on a particular list. diff --git a/jdk/src/share/classes/sun/security/provider/certpath/SunCertPathBuilder.java b/jdk/src/share/classes/sun/security/provider/certpath/SunCertPathBuilder.java index 33c1d8b98aa..9c39fb6ef4d 100644 --- a/jdk/src/share/classes/sun/security/provider/certpath/SunCertPathBuilder.java +++ b/jdk/src/share/classes/sun/security/provider/certpath/SunCertPathBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -422,7 +422,6 @@ public final class SunCertPathBuilder extends CertPathBuilderSpi { buildParams.anyPolicyInhibited(), buildParams.policyQualifiersRejected(), rootNode); - checkers.add(policyChecker); // add the algorithm checker @@ -455,11 +454,16 @@ public final class SunCertPathBuilder extends CertPathBuilderSpi { List ckrs = buildParams.certPathCheckers(); for (PKIXCertPathChecker ckr : ckrs) { if (ckr instanceof PKIXRevocationChecker) { + if (revCheckerAdded) { + throw new CertPathValidatorException( + "Only one PKIXRevocationChecker can be specified"); + } revCheckerAdded = true; // if it's our own, initialize it - if (ckr instanceof RevocationChecker) + if (ckr instanceof RevocationChecker) { ((RevocationChecker)ckr).init(builder.trustAnchor, buildParams); + } } } // only add a RevocationChecker if revocation is enabled and diff --git a/jdk/test/java/security/cert/PKIXRevocationChecker/UnitTest.java b/jdk/test/java/security/cert/PKIXRevocationChecker/UnitTest.java index 27fd1629ace..5c5f5bcfcf0 100644 --- a/jdk/test/java/security/cert/PKIXRevocationChecker/UnitTest.java +++ b/jdk/test/java/security/cert/PKIXRevocationChecker/UnitTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,7 +23,7 @@ /** * @test - * @bug 6854712 7171570 + * @bug 6854712 7171570 8010748 * @summary Basic unit test for PKIXRevocationChecker */ @@ -32,19 +32,9 @@ import java.io.InputStream; import java.io.IOException; import java.io.OutputStream; import java.net.URI; -import java.security.cert.CertificateFactory; -import java.security.cert.CertPathBuilder; -import java.security.cert.CertPathChecker; -import java.security.cert.CertPathValidator; -import java.security.cert.Extension; -import java.security.cert.PKIXRevocationChecker; +import java.security.cert.*; import java.security.cert.PKIXRevocationChecker.Option; -import java.security.cert.X509Certificate; -import java.util.ArrayList; -import java.util.EnumSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; public class UnitTest { @@ -56,22 +46,23 @@ public class UnitTest { System.out.println("Testing that get methods return null or " + "empty lists/sets/maps"); - requireNull(prc.getOCSPResponder(), "getOCSPResponder()"); - requireNull(prc.getOCSPResponderCert(), "getOCSPResponderCert()"); - requireEmpty(prc.getOCSPExtensions(), "getOCSPExtensions()"); - requireEmpty(prc.getOCSPResponses(), "getOCSPResponses()"); + requireNull(prc.getOcspResponder(), "getOcspResponder()"); + requireNull(prc.getOcspResponderCert(), "getOcspResponderCert()"); + requireEmpty(prc.getOcspExtensions(), "getOcspExtensions()"); + requireEmpty(prc.getOcspResponses(), "getOcspResponses()"); requireEmpty(prc.getOptions(), "getOptions()"); + requireEmpty(prc.getSoftFailExceptions(), "getSoftFailExceptions()"); System.out.println("Testing that get methods return same parameters " + "that are passed to set methods"); URI uri = new URI("http://localhost"); - prc.setOCSPResponder(uri); - requireEquals(uri, prc.getOCSPResponder(), "getOCSPResponder()"); + prc.setOcspResponder(uri); + requireEquals(uri, prc.getOcspResponder(), "getOcspResponder()"); X509Certificate cert = getCert(); - prc.setOCSPResponderCert(cert); - requireEquals(cert, prc.getOCSPResponderCert(), - "getOCSPResponderCert()"); + prc.setOcspResponderCert(cert); + requireEquals(cert, prc.getOcspResponderCert(), + "getOcspResponderCert()"); List exts = new ArrayList<>(); for (String oid : cert.getNonCriticalExtensionOIDs()) { @@ -79,8 +70,8 @@ public class UnitTest { exts.add(new ExtensionImpl(oid, cert.getExtensionValue(oid), false)); } - prc.setOCSPExtensions(exts); - requireEquals(exts, prc.getOCSPExtensions(), "getOCSPExtensions()"); + prc.setOcspExtensions(exts); + requireEquals(exts, prc.getOcspExtensions(), "getOcspExtensions()"); Set

Charset

Description

CharsetDescription
US-ASCIISeven-bit ASCII, a.k.a. ISO646-US, * a.k.a. the Basic Latin block of the Unicode character set
- * + * * + * * + * * + * * + * * + * * * @@ -811,6 +811,8 @@ public class MessageFormat extends Format { * @param result where text is appended. * @param pos On input: an alignment field, if desired. * On output: the offsets of the alignment field. + * @return the string buffer passed in as {@code result}, with formatted + * text appended * @exception IllegalArgumentException if an argument in the * arguments array is not of the type * expected by the format element(s) that use it. @@ -828,6 +830,9 @@ public class MessageFormat extends Format { * (new {@link #MessageFormat(String) MessageFormat}(pattern)).{@link #format(java.lang.Object[], java.lang.StringBuffer, java.text.FieldPosition) format}(arguments, new StringBuffer(), null).toString() * * + * @param pattern the pattern string + * @param arguments object(s) to format + * @return the formatted string * @exception IllegalArgumentException if the pattern is invalid, * or if an argument in the arguments array * is not of the type expected by the format element(s) @@ -940,6 +945,10 @@ public class MessageFormat extends Format { * is comparing against the pattern "AAD {0} BBB", the error index is * 0. When an error occurs, the call to this method will return null. * If the source is null, return an empty array. + * + * @param source the string to parse + * @param pos the parse position + * @return an array of parsed objects */ public Object[] parse(String source, ParsePosition pos) { if (source == null) { diff --git a/jdk/src/share/classes/java/text/Normalizer.java b/jdk/src/share/classes/java/text/Normalizer.java index 01e923c1a85..88fdf2b29da 100644 --- a/jdk/src/share/classes/java/text/Normalizer.java +++ b/jdk/src/share/classes/java/text/Normalizer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -55,14 +55,12 @@ import sun.text.normalizer.NormalizerImpl; * * 

  *      U+00C1    LATIN CAPITAL LETTER A WITH ACUTE
- *

* * or as two separate characters (the "decomposed" form): * * 

  *      U+0041    LATIN CAPITAL LETTER A
  *      U+0301    COMBINING ACUTE ACCENT
- *

* * To a user of your program, however, both of these sequences should be * treated as the same "user-level" character "A with acute accent". When you @@ -78,13 +76,11 @@ import sun.text.normalizer.NormalizerImpl; * U+0066 LATIN SMALL LETTER F * U+0066 LATIN SMALL LETTER F * U+0069 LATIN SMALL LETTER I - *

* * or as the single character * * 

  *      U+FB03    LATIN SMALL LIGATURE FFI
- *

* * The ffi ligature is not a distinct semantic character, and strictly speaking * it shouldn't be in Unicode at all, but it was included for compatibility diff --git a/jdk/src/share/classes/java/text/NumberFormat.java b/jdk/src/share/classes/java/text/NumberFormat.java index c1b8310096b..2fdcad62166 100644 --- a/jdk/src/share/classes/java/text/NumberFormat.java +++ b/jdk/src/share/classes/java/text/NumberFormat.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -73,34 +73,34 @@ import sun.util.locale.provider.LocaleServiceProviderPool; * To format a number for the current Locale, use one of the factory * class methods: *
- * 
- *  myString = NumberFormat.getInstance().format(myNumber);
- *
+ * 
{@code
+ * myString = NumberFormat.getInstance().format(myNumber);
+ * }
*
* If you are formatting multiple numbers, it is * more efficient to get the format and use it multiple times so that * the system doesn't have to fetch the information about the local * language and country conventions multiple times. *
- * 
+ * 
{@code
  * NumberFormat nf = NumberFormat.getInstance();
  * for (int i = 0; i < myNumber.length; ++i) {
  *     output.println(nf.format(myNumber[i]) + "; ");
  * }
- * 

+ * }
*
* To format a number for a different Locale, specify it in the * call to getInstance. *
- * 
+ * 
{@code
  * NumberFormat nf = NumberFormat.getInstance(Locale.FRENCH);
- * 

+ * }
*
* You can also use a NumberFormat to parse numbers: *
- * 
+ * 
{@code
  * myNumber = nf.parse(myString);
- * 

+ * }
*
* Use getInstance or getNumberInstance to get the * normal number format. Use getIntegerInstance to get an @@ -125,8 +125,8 @@ import sun.util.locale.provider.LocaleServiceProviderPool; * the detailed description for each these control methods, *

* setParseIntegerOnly : only affects parsing, e.g. - * if true, "3456.78" -> 3456 (and leaves the parse position just after index 6) - * if false, "3456.78" -> 3456.78 (and leaves the parse position just after index 8) + * if true, "3456.78" → 3456 (and leaves the parse position just after index 6) + * if false, "3456.78" → 3456.78 (and leaves the parse position just after index 8) * This is independent of formatting. If you want to not show a decimal point * where there might be no digits after the decimal point, use * setDecimalSeparatorAlwaysShown. @@ -134,8 +134,8 @@ import sun.util.locale.provider.LocaleServiceProviderPool; * setDecimalSeparatorAlwaysShown : only affects formatting, and only where * there might be no digits after the decimal point, such as with a pattern * like "#,##0.##", e.g., - * if true, 3456.00 -> "3,456." - * if false, 3456.00 -> "3456" + * if true, 3456.00 → "3,456." + * if false, 3456.00 → "3456" * This is independent of parsing. If you want parsing to stop at the decimal * point, use setParseIntegerOnly. * @@ -166,7 +166,7 @@ import sun.util.locale.provider.LocaleServiceProviderPool; * numbers: "(12)" for -12. * * - *

Synchronization

+ *

Synchronization

* *

* Number formats are generally not synchronized. @@ -280,6 +280,9 @@ public abstract class NumberFormat extends Format { /** * Specialization of format. + * + * @param number the double number to format + * @return the formatted String * @exception ArithmeticException if rounding is needed with rounding * mode being set to RoundingMode.UNNECESSARY * @see java.text.Format#format @@ -302,6 +305,9 @@ public abstract class NumberFormat extends Format { /** * Specialization of format. + * + * @param number the long number to format + * @return the formatted String * @exception ArithmeticException if rounding is needed with rounding * mode being set to RoundingMode.UNNECESSARY * @see java.text.Format#format @@ -313,6 +319,12 @@ public abstract class NumberFormat extends Format { /** * Specialization of format. + * + * @param number the double number to format + * @param toAppendTo the StringBuffer to which the formatted text is to be + * appended + * @param pos the field position + * @return the formatted StringBuffer * @exception ArithmeticException if rounding is needed with rounding * mode being set to RoundingMode.UNNECESSARY * @see java.text.Format#format @@ -323,6 +335,12 @@ public abstract class NumberFormat extends Format { /** * Specialization of format. + * + * @param number the long number to format + * @param toAppendTo the StringBuffer to which the formatted text is to be + * appended + * @param pos the field position + * @return the formatted StringBuffer * @exception ArithmeticException if rounding is needed with rounding * mode being set to RoundingMode.UNNECESSARY * @see java.text.Format#format @@ -339,6 +357,10 @@ public abstract class NumberFormat extends Format { * after the 1). * Does not throw an exception; if no object can be parsed, index is * unchanged! + * + * @param source the String to parse + * @param parsePosition the parse position + * @return the parsed value * @see java.text.NumberFormat#isParseIntegerOnly * @see java.text.Format#parseObject */ @@ -373,6 +395,9 @@ public abstract class NumberFormat extends Format { * would stop at the "." character. Of course, the exact format accepted * by the parse operation is locale dependant and determined by sub-classes * of NumberFormat. + * + * @return {@code true} if numbers should be parsed as integers only; + * {@code false} otherwise */ public boolean isParseIntegerOnly() { return parseIntegerOnly; @@ -380,6 +405,9 @@ public abstract class NumberFormat extends Format { /** * Sets whether or not numbers should be parsed as integers only. + * + * @param value {@code true} if numbers should be parsed as integers only; + * {@code false} otherwise * @see #isParseIntegerOnly */ public void setParseIntegerOnly(boolean value) { @@ -393,6 +421,9 @@ public abstract class NumberFormat extends Format { * {@link java.util.Locale.Category#FORMAT FORMAT} locale. * This is the same as calling * {@link #getNumberInstance() getNumberInstance()}. + * + * @return the {@code NumberFormat} instance for general-purpose number + * formatting */ public final static NumberFormat getInstance() { return getInstance(Locale.getDefault(Locale.Category.FORMAT), NUMBERSTYLE); @@ -402,6 +433,10 @@ public abstract class NumberFormat extends Format { * Returns a general-purpose number format for the specified locale. * This is the same as calling * {@link #getNumberInstance(java.util.Locale) getNumberInstance(inLocale)}. + * + * @param inLocale the desired locale + * @return the {@code NumberFormat} instance for general-purpose number + * formatting */ public static NumberFormat getInstance(Locale inLocale) { return getInstance(inLocale, NUMBERSTYLE); @@ -413,6 +448,9 @@ public abstract class NumberFormat extends Format { *

This is equivalent to calling * {@link #getNumberInstance(Locale) * getNumberInstance(Locale.getDefault(Locale.Category.FORMAT))}. + * + * @return the {@code NumberFormat} instance for general-purpose number + * formatting * @see java.util.Locale#getDefault(java.util.Locale.Category) * @see java.util.Locale.Category#FORMAT */ @@ -422,6 +460,10 @@ public abstract class NumberFormat extends Format { /** * Returns a general-purpose number format for the specified locale. + * + * @param inLocale the desired locale + * @return the {@code NumberFormat} instance for general-purpose number + * formatting */ public static NumberFormat getNumberInstance(Locale inLocale) { return getInstance(inLocale, NUMBERSTYLE); @@ -457,6 +499,7 @@ public abstract class NumberFormat extends Format { * and to parse only the integer part of an input string (see {@link * #isParseIntegerOnly isParseIntegerOnly}). * + * @param inLocale the desired locale * @see #getRoundingMode() * @return a number format for integer values * @since 1.4 @@ -472,6 +515,7 @@ public abstract class NumberFormat extends Format { * {@link #getCurrencyInstance(Locale) * getCurrencyInstance(Locale.getDefault(Locale.Category.FORMAT))}. * + * @return the {@code NumberFormat} instance for currency formatting * @see java.util.Locale#getDefault(java.util.Locale.Category) * @see java.util.Locale.Category#FORMAT */ @@ -481,6 +525,9 @@ public abstract class NumberFormat extends Format { /** * Returns a currency format for the specified locale. + * + * @param inLocale the desired locale + * @return the {@code NumberFormat} instance for currency formatting */ public static NumberFormat getCurrencyInstance(Locale inLocale) { return getInstance(inLocale, CURRENCYSTYLE); @@ -493,6 +540,7 @@ public abstract class NumberFormat extends Format { * {@link #getPercentInstance(Locale) * getPercentInstance(Locale.getDefault(Locale.Category.FORMAT))}. * + * @return the {@code NumberFormat} instance for percentage formatting * @see java.util.Locale#getDefault(java.util.Locale.Category) * @see java.util.Locale.Category#FORMAT */ @@ -502,6 +550,9 @@ public abstract class NumberFormat extends Format { /** * Returns a percentage format for the specified locale. + * + * @param inLocale the desired locale + * @return the {@code NumberFormat} instance for percentage formatting */ public static NumberFormat getPercentInstance(Locale inLocale) { return getInstance(inLocale, PERCENTSTYLE); @@ -516,6 +567,8 @@ public abstract class NumberFormat extends Format { /** * Returns a scientific format for the specified locale. + * + * @param inLocale the desired locale */ /*public*/ static NumberFormat getScientificInstance(Locale inLocale) { return getInstance(inLocale, SCIENTIFICSTYLE); @@ -586,6 +639,9 @@ public abstract class NumberFormat extends Format { * English locale, with grouping on, the number 1234567 might be formatted * as "1,234,567". The grouping separator as well as the size of each group * is locale dependant and is determined by sub-classes of NumberFormat. + * + * @return {@code true} if grouping is used; + * {@code false} otherwise * @see #setGroupingUsed */ public boolean isGroupingUsed() { @@ -594,6 +650,9 @@ public abstract class NumberFormat extends Format { /** * Set whether or not grouping will be used in this format. + * + * @param newValue {@code true} if grouping is used; + * {@code false} otherwise * @see #isGroupingUsed */ public void setGroupingUsed(boolean newValue) { @@ -603,6 +662,8 @@ public abstract class NumberFormat extends Format { /** * Returns the maximum number of digits allowed in the integer portion of a * number. + * + * @return the maximum number of digits * @see #setMaximumIntegerDigits */ public int getMaximumIntegerDigits() { @@ -611,10 +672,11 @@ public abstract class NumberFormat extends Format { /** * Sets the maximum number of digits allowed in the integer portion of a - * number. maximumIntegerDigits must be >= minimumIntegerDigits. If the + * number. maximumIntegerDigits must be ≥ minimumIntegerDigits. If the * new value for maximumIntegerDigits is less than the current value * of minimumIntegerDigits, then minimumIntegerDigits will also be set to * the new value. + * * @param newValue the maximum number of integer digits to be shown; if * less than zero, then zero is used. The concrete subclass may enforce an * upper limit to this value appropriate to the numeric type being formatted. @@ -630,6 +692,8 @@ public abstract class NumberFormat extends Format { /** * Returns the minimum number of digits allowed in the integer portion of a * number. + * + * @return the minimum number of digits * @see #setMinimumIntegerDigits */ public int getMinimumIntegerDigits() { @@ -638,10 +702,11 @@ public abstract class NumberFormat extends Format { /** * Sets the minimum number of digits allowed in the integer portion of a - * number. minimumIntegerDigits must be <= maximumIntegerDigits. If the + * number. minimumIntegerDigits must be ≤ maximumIntegerDigits. If the * new value for minimumIntegerDigits exceeds the current value * of maximumIntegerDigits, then maximumIntegerDigits will also be set to * the new value + * * @param newValue the minimum number of integer digits to be shown; if * less than zero, then zero is used. The concrete subclass may enforce an * upper limit to this value appropriate to the numeric type being formatted. @@ -657,6 +722,8 @@ public abstract class NumberFormat extends Format { /** * Returns the maximum number of digits allowed in the fraction portion of a * number. + * + * @return the maximum number of digits. * @see #setMaximumFractionDigits */ public int getMaximumFractionDigits() { @@ -665,10 +732,11 @@ public abstract class NumberFormat extends Format { /** * Sets the maximum number of digits allowed in the fraction portion of a - * number. maximumFractionDigits must be >= minimumFractionDigits. If the + * number. maximumFractionDigits must be ≥ minimumFractionDigits. If the * new value for maximumFractionDigits is less than the current value * of minimumFractionDigits, then minimumFractionDigits will also be set to * the new value. + * * @param newValue the maximum number of fraction digits to be shown; if * less than zero, then zero is used. The concrete subclass may enforce an * upper limit to this value appropriate to the numeric type being formatted. @@ -684,6 +752,8 @@ public abstract class NumberFormat extends Format { /** * Returns the minimum number of digits allowed in the fraction portion of a * number. + * + * @return the minimum number of digits * @see #setMinimumFractionDigits */ public int getMinimumFractionDigits() { @@ -692,10 +762,11 @@ public abstract class NumberFormat extends Format { /** * Sets the minimum number of digits allowed in the fraction portion of a - * number. minimumFractionDigits must be <= maximumFractionDigits. If the + * number. minimumFractionDigits must be ≤ maximumFractionDigits. If the * new value for minimumFractionDigits exceeds the current value * of maximumFractionDigits, then maximumIntegerDigits will also be set to * the new value + * * @param newValue the minimum number of fraction digits to be shown; if * less than zero, then zero is used. The concrete subclass may enforce an * upper limit to this value appropriate to the numeric type being formatted. diff --git a/jdk/src/share/classes/java/text/ParseException.java b/jdk/src/share/classes/java/text/ParseException.java index a274e7e69fd..f9ad001fa52 100644 --- a/jdk/src/share/classes/java/text/ParseException.java +++ b/jdk/src/share/classes/java/text/ParseException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -55,6 +55,7 @@ class ParseException extends Exception { * Constructs a ParseException with the specified detail message and * offset. * A detail message is a String that describes this particular exception. + * * @param s the detail message * @param errorOffset the position where the error is found while parsing. */ @@ -65,6 +66,8 @@ class ParseException extends Exception { /** * Returns the position where the error was found. + * + * @return the position where the error was found */ public int getErrorOffset () { return errorOffset; diff --git a/jdk/src/share/classes/java/text/ParsePosition.java b/jdk/src/share/classes/java/text/ParsePosition.java index a187bb8a73a..be3ffce61eb 100644 --- a/jdk/src/share/classes/java/text/ParsePosition.java +++ b/jdk/src/share/classes/java/text/ParsePosition.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -69,6 +69,8 @@ public class ParsePosition { * Retrieve the current parse position. On input to a parse method, this * is the index of the character at which parsing will begin; on output, it * is the index of the character following the last character parsed. + * + * @return the current parse position */ public int getIndex() { return index; @@ -76,6 +78,8 @@ public class ParsePosition { /** * Set the current parse position. + * + * @param index the current parse position */ public void setIndex(int index) { this.index = index; @@ -83,6 +87,8 @@ public class ParsePosition { /** * Create a new ParsePosition with the given initial index. + * + * @param index initial index */ public ParsePosition(int index) { this.index = index; @@ -91,6 +97,8 @@ public class ParsePosition { * Set the index at which a parse error occurred. Formatters * should set this before returning an error code from their * parseObject method. The default value is -1 if this is not set. + * + * @param ei the index at which an error occurred * @since 1.2 */ public void setErrorIndex(int ei) @@ -101,12 +109,15 @@ public class ParsePosition { /** * Retrieve the index at which an error occurred, or -1 if the * error index has not been set. + * + * @return the index at which an error occurred * @since 1.2 */ public int getErrorIndex() { return errorIndex; } + /** * Overrides equals */ diff --git a/jdk/src/share/classes/java/text/RuleBasedCollator.java b/jdk/src/share/classes/java/text/RuleBasedCollator.java index ef32cc64ef2..a99c0f757eb 100644 --- a/jdk/src/share/classes/java/text/RuleBasedCollator.java +++ b/jdk/src/share/classes/java/text/RuleBasedCollator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -68,17 +68,17 @@ import java.util.Locale; * <reset> <text-argument> * * The definitions of the rule elements is as follows: - *

    + *
      *
    • Text-Argument: A text-argument is any sequence of * characters, excluding special characters (that is, common * whitespace characters [0009-000D, 0020] and rule syntax characters * [0021-002F, 003A-0040, 005B-0060, 007B-007E]). If those * characters are desired, you can put them in single quotes - * (e.g. ampersand => '&'). Note that unquoted white space characters + * (e.g. ampersand => '&'). Note that unquoted white space characters * are ignored; e.g. b c is treated as bc. *
    • Modifier: There are currently two modifiers that * turn on special collation rules. - *
        + *
          *
        • '@' : Turns on backwards sorting of accents (secondary * differences), as in French. *
        • '!' : Turns on Thai/Lao vowel-consonant swapping. If this @@ -91,7 +91,7 @@ import java.util.Locale; *
        *

        '@' : Indicates that accents are sorted backwards, as in French. *

      • Relation: The relations are the following: - *
          + *
            *
          • '<' : Greater, as a letter difference (primary) *
          • ';' : Greater, as an accent difference (secondary) *
          • ',' : Greater, as a case difference (tertiary) @@ -100,7 +100,7 @@ import java.util.Locale; *
          • Reset: There is a single reset * which is used primarily for contractions and expansions, but which * can also be used to add a modification at the end of a set of rules. - *

            '&' : Indicates that the next rule follows the position to where + *

            '&' : Indicates that the next rule follows the position to where * the reset text-argument would be sorted. *

          * @@ -166,7 +166,7 @@ import java.util.Locale; *

          Errors *

          * The following are errors: - *

            + *
              *
            • A text-argument contains unquoted punctuation symbols * (e.g. "a < b-c < d"). *
            • A relation or reset character not followed by a text-argument @@ -206,8 +206,8 @@ import java.util.Locale; * String Norwegian = "< a, A < b, B < c, C < d, D < e, E < f, F < g, G < h, H < i, I" + * "< j, J < k, K < l, L < m, M < n, N < o, O < p, P < q, Q < r, R" + * "< s, S < t, T < u, U < v, V < w, W < x, X < y, Y < z, Z" + - * "< \u00E6, \u00C6" + // Latin letter ae & AE - * "< \u00F8, \u00D8" + // Latin letter o & O with stroke + * "< \u00E6, \u00C6" + // Latin letter ae & AE + * "< \u00F8, \u00D8" + // Latin letter o & O with stroke * "< \u00E5 = a\u030A," + // Latin letter a with ring above * " \u00C5 = A\u030A;" + // Latin letter A with ring above * " aa, AA"; @@ -232,9 +232,9 @@ import java.util.Locale; * + ";\u030B;\u030C;\u030D;\u030E" // main accents * + ";\u030F;\u0310;\u0311;\u0312" // main accents * + "< a , A ; ae, AE ; \u00e6 , \u00c6" - * + "< b , B < c, C < e, E & C < d, D"; + * + "< b , B < c, C < e, E & C < d, D"; * // change the order of accent characters - * String addOn = "& \u0300 ; \u0308 ; \u0302"; + * String addOn = "& \u0300 ; \u0308 ; \u0302"; * RuleBasedCollator myCollator = new RuleBasedCollator(oldRules + addOn); * * @@ -274,7 +274,7 @@ public class RuleBasedCollator extends Collator{ * @param rules the collation rules to build the collation table from. * @exception ParseException A format exception * will be thrown if the build process of the rules fails. For - * example, build rule "a < ? < d" will cause the constructor to + * example, build rule "a < ? < d" will cause the constructor to * throw the ParseException because the '?' is not quoted. */ public RuleBasedCollator(String rules) throws ParseException { @@ -320,7 +320,10 @@ public class RuleBasedCollator extends Collator{ } /** - * Return a CollationElementIterator for the given String. + * Returns a CollationElementIterator for the given String. + * + * @param source the string to be collated + * @return a {@code CollationElementIterator} object * @see java.text.CollationElementIterator */ public CollationElementIterator getCollationElementIterator(String source) { @@ -328,7 +331,10 @@ public class RuleBasedCollator extends Collator{ } /** - * Return a CollationElementIterator for the given String. + * Returns a CollationElementIterator for the given CharacterIterator. + * + * @param source the character iterator to be collated + * @return a {@code CollationElementIterator} object * @see java.text.CollationElementIterator * @since 1.2 */ diff --git a/jdk/src/share/classes/java/text/SimpleDateFormat.java b/jdk/src/share/classes/java/text/SimpleDateFormat.java index 9c5aaa35561..5472b0a70d3 100644 --- a/jdk/src/share/classes/java/text/SimpleDateFormat.java +++ b/jdk/src/share/classes/java/text/SimpleDateFormat.java @@ -59,7 +59,7 @@ import sun.util.locale.provider.LocaleProviderAdapter; /** * SimpleDateFormat is a concrete class for formatting and * parsing dates in a locale-sensitive manner. It allows for formatting - * (date -> text), parsing (text -> date), and normalization. + * (date → text), parsing (text → date), and normalization. * *

              * SimpleDateFormat allows you to start by choosing @@ -73,7 +73,7 @@ import sun.util.locale.provider.LocaleProviderAdapter; * For more information on using these methods, see * {@link DateFormat}. * - *

              Date and Time Patterns

              + *

              Date and Time Patterns

              *

              * Date and time formats are specified by date and time pattern * strings. @@ -93,7 +93,7 @@ import sun.util.locale.provider.LocaleProviderAdapter; * 'z' are reserved): *

              *
Symbol * Location * Localized? @@ -184,7 +184,7 @@ import sun.util.locale.provider.ResourceBundleBasedAdapter; * Number * Yes * Digit - *
# * Number * Yes @@ -194,7 +194,7 @@ import sun.util.locale.provider.ResourceBundleBasedAdapter; * Number * Yes * Decimal separator or monetary decimal separator - *
- * Number * Yes @@ -204,7 +204,7 @@ import sun.util.locale.provider.ResourceBundleBasedAdapter; * Number * Yes * Grouping separator - *
E * Number * Yes @@ -215,7 +215,7 @@ import sun.util.locale.provider.ResourceBundleBasedAdapter; * Subpattern boundary * Yes * Separates positive and negative subpatterns - *
% * Prefix or suffix * Yes @@ -225,7 +225,7 @@ import sun.util.locale.provider.ResourceBundleBasedAdapter; * Prefix or suffix * Yes * Multiply by 1000 and show as per mille value - *
¤ (\u00A4) * Prefix or suffix * No @@ -248,7 +248,8 @@ import sun.util.locale.provider.ResourceBundleBasedAdapter; * *

Numbers in scientific notation are expressed as the product of a mantissa * and a power of ten, for example, 1234 can be expressed as 1.234 x 10^3. The - * mantissa is often in the range 1.0 <= x < 10.0, but it need not be. + * mantissa is often in the range 1.0 ≤ x {@literal <} 10.0, but it need not + * be. * DecimalFormat can be instructed to format and parse scientific * notation only via a pattern; there is currently no factory method * that creates a scientific notation format. In a pattern, the exponent @@ -336,13 +337,13 @@ import sun.util.locale.provider.ResourceBundleBasedAdapter; * *

Example

* - * 
+ * 
{@code
  * // Print out a number using the localized number, integer, currency,
  * // and percent format for each locale
  * Locale[] locales = NumberFormat.getAvailableLocales();
  * double myNumber = -1234.56;
  * NumberFormat form;
- * for (int j=0; j<4; ++j) {
+ * for (int j = 0; j < 4; ++j) {
  *     System.out.println("FORMAT");
  *     for (int i = 0; i < locales.length; ++i) {
  *         if (locales[i].getCountry().length() == 0) {
@@ -368,7 +369,7 @@ import sun.util.locale.provider.ResourceBundleBasedAdapter;
  *         } catch (ParseException e) {}
  *     }
  * }
- * 

+ * }
* * @see Java Tutorial * @see NumberFormat @@ -421,7 +422,7 @@ public class DecimalFormat extends NumberFormat { * return the most appropriate sub-class of NumberFormat for a given * locale. * - * @param pattern A non-localized pattern string. + * @param pattern a non-localized pattern string. * @exception NullPointerException if pattern is null * @exception IllegalArgumentException if the given pattern is invalid. * @see java.text.NumberFormat#getInstance @@ -2382,6 +2383,8 @@ public class DecimalFormat extends NumberFormat { /** * Get the positive prefix. *

Examples: +123, $123, sFr123 + * + * @return the positive prefix */ public String getPositivePrefix () { return positivePrefix; @@ -2390,6 +2393,8 @@ public class DecimalFormat extends NumberFormat { /** * Set the positive prefix. *

Examples: +123, $123, sFr123 + * + * @param newValue the new positive prefix */ public void setPositivePrefix (String newValue) { positivePrefix = newValue; @@ -2420,6 +2425,8 @@ public class DecimalFormat extends NumberFormat { /** * Get the negative prefix. *

Examples: -123, ($123) (with negative suffix), sFr-123 + * + * @return the negative prefix */ public String getNegativePrefix () { return negativePrefix; @@ -2428,6 +2435,8 @@ public class DecimalFormat extends NumberFormat { /** * Set the negative prefix. *

Examples: -123, ($123) (with negative suffix), sFr-123 + * + * @param newValue the new negative prefix */ public void setNegativePrefix (String newValue) { negativePrefix = newValue; @@ -2457,6 +2466,8 @@ public class DecimalFormat extends NumberFormat { /** * Get the positive suffix. *

Example: 123% + * + * @return the positive suffix */ public String getPositiveSuffix () { return positiveSuffix; @@ -2465,6 +2476,8 @@ public class DecimalFormat extends NumberFormat { /** * Set the positive suffix. *

Example: 123% + * + * @param newValue the new positive suffix */ public void setPositiveSuffix (String newValue) { positiveSuffix = newValue; @@ -2494,6 +2507,8 @@ public class DecimalFormat extends NumberFormat { /** * Get the negative suffix. *

Examples: -123%, ($123) (with positive suffixes) + * + * @return the negative suffix */ public String getNegativeSuffix () { return negativeSuffix; @@ -2502,6 +2517,8 @@ public class DecimalFormat extends NumberFormat { /** * Set the negative suffix. *

Examples: 123% + * + * @param newValue the new negative suffix */ public void setNegativeSuffix (String newValue) { negativeSuffix = newValue; @@ -2532,6 +2549,7 @@ public class DecimalFormat extends NumberFormat { * Gets the multiplier for use in percent, per mille, and similar * formats. * + * @return the multiplier * @see #setMultiplier(int) */ public int getMultiplier () { @@ -2549,6 +2567,7 @@ public class DecimalFormat extends NumberFormat { *

Example: with multiplier 100, 1.23 is formatted as "123", and * "123" is parsed into 1.23. * + * @param newValue the new multiplier * @see #getMultiplier */ public void setMultiplier (int newValue) { @@ -2571,6 +2590,8 @@ public class DecimalFormat extends NumberFormat { * Return the grouping size. Grouping size is the number of digits between * grouping separators in the integer portion of a number. For example, * in the number "123,456.78", the grouping size is 3. + * + * @return the grouping size * @see #setGroupingSize * @see java.text.NumberFormat#isGroupingUsed * @see java.text.DecimalFormatSymbols#getGroupingSeparator @@ -2585,6 +2606,8 @@ public class DecimalFormat extends NumberFormat { * in the number "123,456.78", the grouping size is 3. *
* The value passed in is converted to a byte, which may lose information. + * + * @param newValue the new grouping size * @see #getGroupingSize * @see java.text.NumberFormat#setGroupingUsed * @see java.text.DecimalFormatSymbols#setGroupingSeparator @@ -2597,7 +2620,10 @@ public class DecimalFormat extends NumberFormat { /** * Allows you to get the behavior of the decimal separator with integers. * (The decimal separator will always appear with decimals.) - *

Example: Decimal ON: 12345 -> 12345.; OFF: 12345 -> 12345 + *

Example: Decimal ON: 12345 → 12345.; OFF: 12345 → 12345 + * + * @return {@code true} if the decimal separator is always shown; + * {@code false} otherwise */ public boolean isDecimalSeparatorAlwaysShown() { return decimalSeparatorAlwaysShown; @@ -2606,7 +2632,10 @@ public class DecimalFormat extends NumberFormat { /** * Allows you to set the behavior of the decimal separator with integers. * (The decimal separator will always appear with decimals.) - *

Example: Decimal ON: 12345 -> 12345.; OFF: 12345 -> 12345 + *

Example: Decimal ON: 12345 → 12345.; OFF: 12345 → 12345 + * + * @param newValue {@code true} if the decimal separator is always shown; + * {@code false} otherwise */ public void setDecimalSeparatorAlwaysShown(boolean newValue) { decimalSeparatorAlwaysShown = newValue; @@ -2616,6 +2645,9 @@ public class DecimalFormat extends NumberFormat { /** * Returns whether the {@link #parse(java.lang.String, java.text.ParsePosition)} * method returns BigDecimal. The default value is false. + * + * @return {@code true} if the parse method returns BigDecimal; + * {@code false} otherwise * @see #setParseBigDecimal * @since 1.5 */ @@ -2626,6 +2658,9 @@ public class DecimalFormat extends NumberFormat { /** * Sets whether the {@link #parse(java.lang.String, java.text.ParsePosition)} * method returns BigDecimal. + * + * @param newValue {@code true} if the parse method returns BigDecimal; + * {@code false} otherwise * @see #isParseBigDecimal * @since 1.5 */ @@ -2712,6 +2747,8 @@ public class DecimalFormat extends NumberFormat { /** * Synthesizes a pattern string that represents the current state * of this Format object. + * + * @return a pattern string * @see #applyPattern */ public String toPattern() { @@ -2721,6 +2758,8 @@ public class DecimalFormat extends NumberFormat { /** * Synthesizes a localized pattern string that represents the current * state of this Format object. + * + * @return a localized pattern string * @see #applyPattern */ public String toLocalizedPattern() { @@ -3049,7 +3088,7 @@ public class DecimalFormat extends NumberFormat { * by this routine, since that is the typical end-user desire; * use setMaximumInteger if you want to set a real value. * For negative numbers, use a second pattern, separated by a semicolon - *

Example "#,#00.0#" -> 1,234.56 + *

Example "#,#00.0#" → 1,234.56 *

This means a minimum of 2 integer digits, 1 fraction digit, and * a maximum of 2 fraction digits. *

Example: "#,#00.0#;(#,#00.0#)" for negatives in @@ -3057,6 +3096,7 @@ public class DecimalFormat extends NumberFormat { *

In negative patterns, the minimum and maximum counts are ignored; * these are presumed to be set in the positive pattern. * + * @param pattern a new pattern * @exception NullPointerException if pattern is null * @exception IllegalArgumentException if the given pattern is invalid. */ @@ -3075,7 +3115,7 @@ public class DecimalFormat extends NumberFormat { * by this routine, since that is the typical end-user desire; * use setMaximumInteger if you want to set a real value. * For negative numbers, use a second pattern, separated by a semicolon - *

Example "#,#00.0#" -> 1,234.56 + *

Example "#,#00.0#" → 1,234.56 *

This means a minimum of 2 integer digits, 1 fraction digit, and * a maximum of 2 fraction digits. *

Example: "#,#00.0#;(#,#00.0#)" for negatives in @@ -3083,6 +3123,7 @@ public class DecimalFormat extends NumberFormat { *

In negative patterns, the minimum and maximum counts are ignored; * these are presumed to be set in the positive pattern. * + * @param pattern a new pattern * @exception NullPointerException if pattern is null * @exception IllegalArgumentException if the given pattern is invalid. */ diff --git a/jdk/src/share/classes/java/text/DecimalFormatSymbols.java b/jdk/src/share/classes/java/text/DecimalFormatSymbols.java index f0b2212eaf5..55a344fb0b4 100644 --- a/jdk/src/share/classes/java/text/DecimalFormatSymbols.java +++ b/jdk/src/share/classes/java/text/DecimalFormatSymbols.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -106,6 +106,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable { * This may return a {@code NumberFormat} instance with the Thai numbering system, * instead of the Latin numbering system. * + * @param locale the desired locale * @exception NullPointerException if locale is null */ public DecimalFormatSymbols( Locale locale ) { @@ -122,7 +123,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable { * implementations. It must contain at least a Locale * instance equal to {@link java.util.Locale#US Locale.US}. * - * @return An array of locales for which localized + * @return an array of locales for which localized * DecimalFormatSymbols instances are available. * @since 1.6 */ @@ -166,6 +167,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable { * * This may return a {@code NumberFormat} instance with the Thai numbering system, * instead of the Latin numbering system. + * * @param locale the desired locale. * @return a DecimalFormatSymbols instance. * @exception NullPointerException if locale is null @@ -185,6 +187,8 @@ public class DecimalFormatSymbols implements Cloneable, Serializable { /** * Gets the character used for zero. Different for Arabic, etc. + * + * @return the character used for zero */ public char getZeroDigit() { return zeroDigit; @@ -192,6 +196,8 @@ public class DecimalFormatSymbols implements Cloneable, Serializable { /** * Sets the character used for zero. Different for Arabic, etc. + * + * @param zeroDigit the character used for zero */ public void setZeroDigit(char zeroDigit) { this.zeroDigit = zeroDigit; @@ -199,6 +205,8 @@ public class DecimalFormatSymbols implements Cloneable, Serializable { /** * Gets the character used for thousands separator. Different for French, etc. + * + * @return the grouping separator */ public char getGroupingSeparator() { return groupingSeparator; @@ -206,6 +214,8 @@ public class DecimalFormatSymbols implements Cloneable, Serializable { /** * Sets the character used for thousands separator. Different for French, etc. + * + * @param groupingSeparator the grouping separator */ public void setGroupingSeparator(char groupingSeparator) { this.groupingSeparator = groupingSeparator; @@ -213,6 +223,8 @@ public class DecimalFormatSymbols implements Cloneable, Serializable { /** * Gets the character used for decimal sign. Different for French, etc. + * + * @return the character used for decimal sign */ public char getDecimalSeparator() { return decimalSeparator; @@ -220,6 +232,8 @@ public class DecimalFormatSymbols implements Cloneable, Serializable { /** * Sets the character used for decimal sign. Different for French, etc. + * + * @param decimalSeparator the character used for decimal sign */ public void setDecimalSeparator(char decimalSeparator) { this.decimalSeparator = decimalSeparator; @@ -227,6 +241,8 @@ public class DecimalFormatSymbols implements Cloneable, Serializable { /** * Gets the character used for per mille sign. Different for Arabic, etc. + * + * @return the character used for per mille sign */ public char getPerMill() { return perMill; @@ -234,6 +250,8 @@ public class DecimalFormatSymbols implements Cloneable, Serializable { /** * Sets the character used for per mille sign. Different for Arabic, etc. + * + * @param perMill the character used for per mille sign */ public void setPerMill(char perMill) { this.perMill = perMill; @@ -241,6 +259,8 @@ public class DecimalFormatSymbols implements Cloneable, Serializable { /** * Gets the character used for percent sign. Different for Arabic, etc. + * + * @return the character used for percent sign */ public char getPercent() { return percent; @@ -248,6 +268,8 @@ public class DecimalFormatSymbols implements Cloneable, Serializable { /** * Sets the character used for percent sign. Different for Arabic, etc. + * + * @param percent the character used for percent sign */ public void setPercent(char percent) { this.percent = percent; @@ -255,6 +277,8 @@ public class DecimalFormatSymbols implements Cloneable, Serializable { /** * Gets the character used for a digit in a pattern. + * + * @return the character used for a digit in a pattern */ public char getDigit() { return digit; @@ -262,6 +286,8 @@ public class DecimalFormatSymbols implements Cloneable, Serializable { /** * Sets the character used for a digit in a pattern. + * + * @param digit the character used for a digit in a pattern */ public void setDigit(char digit) { this.digit = digit; @@ -270,6 +296,8 @@ public class DecimalFormatSymbols implements Cloneable, Serializable { /** * Gets the character used to separate positive and negative subpatterns * in a pattern. + * + * @return the pattern separator */ public char getPatternSeparator() { return patternSeparator; @@ -278,6 +306,8 @@ public class DecimalFormatSymbols implements Cloneable, Serializable { /** * Sets the character used to separate positive and negative subpatterns * in a pattern. + * + * @param patternSeparator the pattern separator */ public void setPatternSeparator(char patternSeparator) { this.patternSeparator = patternSeparator; @@ -286,6 +316,8 @@ public class DecimalFormatSymbols implements Cloneable, Serializable { /** * Gets the string used to represent infinity. Almost always left * unchanged. + * + * @return the string representing infinity */ public String getInfinity() { return infinity; @@ -294,6 +326,8 @@ public class DecimalFormatSymbols implements Cloneable, Serializable { /** * Sets the string used to represent infinity. Almost always left * unchanged. + * + * @param infinity the string representing infinity */ public void setInfinity(String infinity) { this.infinity = infinity; @@ -302,6 +336,8 @@ public class DecimalFormatSymbols implements Cloneable, Serializable { /** * Gets the string used to represent "not a number". Almost always left * unchanged. + * + * @return the string representing "not a number" */ public String getNaN() { return NaN; @@ -310,6 +346,8 @@ public class DecimalFormatSymbols implements Cloneable, Serializable { /** * Sets the string used to represent "not a number". Almost always left * unchanged. + * + * @param NaN the string representing "not a number" */ public void setNaN(String NaN) { this.NaN = NaN; @@ -319,6 +357,8 @@ public class DecimalFormatSymbols implements Cloneable, Serializable { * Gets the character used to represent minus sign. If no explicit * negative format is specified, one is formed by prefixing * minusSign to the positive format. + * + * @return the character representing minus sign */ public char getMinusSign() { return minusSign; @@ -328,6 +368,8 @@ public class DecimalFormatSymbols implements Cloneable, Serializable { * Sets the character used to represent minus sign. If no explicit * negative format is specified, one is formed by prefixing * minusSign to the positive format. + * + * @param minusSign the character representing minus sign */ public void setMinusSign(char minusSign) { this.minusSign = minusSign; @@ -336,6 +378,8 @@ public class DecimalFormatSymbols implements Cloneable, Serializable { /** * Returns the currency symbol for the currency of these * DecimalFormatSymbols in their locale. + * + * @return the currency symbol * @since 1.2 */ public String getCurrencySymbol() @@ -346,6 +390,8 @@ public class DecimalFormatSymbols implements Cloneable, Serializable { /** * Sets the currency symbol for the currency of these * DecimalFormatSymbols in their locale. + * + * @param currency the currency symbol * @since 1.2 */ public void setCurrencySymbol(String currency) @@ -356,6 +402,8 @@ public class DecimalFormatSymbols implements Cloneable, Serializable { /** * Returns the ISO 4217 currency code of the currency of these * DecimalFormatSymbols. + * + * @return the currency code * @since 1.2 */ public String getInternationalCurrencySymbol() @@ -374,6 +422,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable { * then the currency attribute is set to null and the currency symbol * attribute is not modified. * + * @param currencyCode the currency code * @see #setCurrency * @see #setCurrencySymbol * @since 1.2 @@ -427,6 +476,8 @@ public class DecimalFormatSymbols implements Cloneable, Serializable { /** * Returns the monetary decimal separator. + * + * @return the monetary decimal separator * @since 1.2 */ public char getMonetaryDecimalSeparator() @@ -436,6 +487,8 @@ public class DecimalFormatSymbols implements Cloneable, Serializable { /** * Sets the monetary decimal separator. + * + * @param sep the monetary decimal separator * @since 1.2 */ public void setMonetaryDecimalSeparator(char sep) diff --git a/jdk/src/share/classes/java/text/FieldPosition.java b/jdk/src/share/classes/java/text/FieldPosition.java index 15a935378c6..300c7e89822 100644 --- a/jdk/src/share/classes/java/text/FieldPosition.java +++ b/jdk/src/share/classes/java/text/FieldPosition.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -100,6 +100,7 @@ public class FieldPosition { * identified by constants, whose names typically end with _FIELD, * in the various subclasses of Format. * + * @param field the field identifier * @see java.text.NumberFormat#INTEGER_FIELD * @see java.text.NumberFormat#FRACTION_FIELD * @see java.text.DateFormat#YEAR_FIELD @@ -157,6 +158,8 @@ public class FieldPosition { /** * Retrieves the field identifier. + * + * @return the field identifier */ public int getField() { return field; @@ -164,6 +167,8 @@ public class FieldPosition { /** * Retrieves the index of the first character in the requested field. + * + * @return the begin index */ public int getBeginIndex() { return beginIndex; @@ -172,6 +177,8 @@ public class FieldPosition { /** * Retrieves the index of the character following the last character in the * requested field. + * + * @return the end index */ public int getEndIndex() { return endIndex; @@ -179,6 +186,8 @@ public class FieldPosition { /** * Sets the begin index. For use by subclasses of Format. + * + * @param bi the begin index * @since 1.2 */ public void setBeginIndex(int bi) { @@ -187,6 +196,8 @@ public class FieldPosition { /** * Sets the end index. For use by subclasses of Format. + * + * @param ei the end index * @since 1.2 */ public void setEndIndex(int ei) { diff --git a/jdk/src/share/classes/java/text/Format.java b/jdk/src/share/classes/java/text/Format.java index eac0f47986f..7a9c2ec4ddf 100644 --- a/jdk/src/share/classes/java/text/Format.java +++ b/jdk/src/share/classes/java/text/Format.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -58,7 +58,7 @@ import java.io.Serializable; * no separator in between, and in this case the parseObject could * not tell which digits belong to which number. * - *

Subclassing

+ *

Subclassing

* *

* The Java Platform provides three specialized subclasses of Format-- diff --git a/jdk/src/share/classes/java/text/MessageFormat.java b/jdk/src/share/classes/java/text/MessageFormat.java index e5c8c811f04..402a7fa52d9 100644 --- a/jdk/src/share/classes/java/text/MessageFormat.java +++ b/jdk/src/share/classes/java/text/MessageFormat.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -68,7 +68,7 @@ import java.util.Locale; * behavior is defined by the pattern that you provide as well as the * subformats used for inserted arguments. * - *

Patterns and Their Interpretation

+ *

Patterns and Their Interpretation

* * MessageFormat uses patterns of the following form: * 
@@ -287,10 +287,10 @@ import java.util.Locale;
  * You can create the ChoiceFormat programmatically, as in the
  * above example, or by using a pattern. See {@link ChoiceFormat}
  * for more information.
- * 
+ * 
{@code
  * form.applyPattern(
- *    "There {0,choice,0#are no files|1#is one file|1<are {0,number,integer} files}.");
- * 

+ *    "There {0,choice,0#are no files|1#is one file|1

  *
  * 

  * Note: As we see above, the string produced
@@ -778,7 +778,7 @@ public class MessageFormat extends Format {
      *
instanceof ChoiceFormat * any - * subformat.format(argument).indexOf('{') >= 0 ?
+ * 		subformat.format(argument).indexOf('{') >= 0 ?
* (new MessageFormat(subformat.format(argument), getLocale())).format(argument) : * subformat.format(argument) *
- * + * * + * * + * * + * * + * * + * * + * * + * * + * * + * * + * * + * *
Letter * Date or Time Component * Presentation @@ -103,7 +103,7 @@ import sun.util.locale.provider.LocaleProviderAdapter; * Era designator * Text * AD - *
y * Year * Year @@ -113,7 +113,7 @@ import sun.util.locale.provider.LocaleProviderAdapter; * Week year * Year * 2009; 09 - *
M * Month in year (context sensitive) * Month @@ -123,7 +123,7 @@ import sun.util.locale.provider.LocaleProviderAdapter; * Month in year (standalone form) * Month * July; Jul; 07 - *
w * Week in year * Number @@ -133,7 +133,7 @@ import sun.util.locale.provider.LocaleProviderAdapter; * Week in month * Number * 2 - *
D * Day in year * Number @@ -143,7 +143,7 @@ import sun.util.locale.provider.LocaleProviderAdapter; * Day in month * Number * 10 - *
F * Day of week in month * Number @@ -153,7 +153,7 @@ import sun.util.locale.provider.LocaleProviderAdapter; * Day name in week * Text * Tuesday; Tue - *
u * Day number of week (1 = Monday, ..., 7 = Sunday) * Number @@ -163,7 +163,7 @@ import sun.util.locale.provider.LocaleProviderAdapter; * Am/pm marker * Text * PM - *
H * Hour in day (0-23) * Number @@ -173,7 +173,7 @@ import sun.util.locale.provider.LocaleProviderAdapter; * Hour in day (1-24) * Number * 24 - *
K * Hour in am/pm (0-11) * Number @@ -183,7 +183,7 @@ import sun.util.locale.provider.LocaleProviderAdapter; * Hour in am/pm (1-12) * Number * 12 - *
m * Minute in hour * Number @@ -193,7 +193,7 @@ import sun.util.locale.provider.LocaleProviderAdapter; * Second in minute * Number * 55 - *
S * Millisecond * Number @@ -203,7 +203,7 @@ import sun.util.locale.provider.LocaleProviderAdapter; * Time zone * General time zone * Pacific Standard Time; PST; GMT-08:00 - *
Z * Time zone * RFC 822 time zone @@ -365,37 +365,37 @@ import sun.util.locale.provider.LocaleProviderAdapter; * in the U.S. Pacific Time time zone. *
* - * + * * * + * * * + * * * + * * * + * * * + * * diff --git a/jdk/src/share/classes/java/text/StringCharacterIterator.java b/jdk/src/share/classes/java/text/StringCharacterIterator.java index a9254ecfc08..66b5be65157 100644 --- a/jdk/src/share/classes/java/text/StringCharacterIterator.java +++ b/jdk/src/share/classes/java/text/StringCharacterIterator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -59,6 +59,8 @@ public final class StringCharacterIterator implements CharacterIterator /** * Constructs an iterator with an initial index of 0. + * + * @param text the {@code String} to be iterated over */ public StringCharacterIterator(String text) { From 76c55303924acab3e3e24d992918c5a7cb1fa4e2 Mon Sep 17 00:00:00 2001 From: Jaroslav Bachorik Date: Fri, 26 Jul 2013 10:12:14 +0200 Subject: [PATCH 034/120] 8020875: java/lang/management/ThreadMXBean/ResetPeakThreadCount.java fails intermittently Reviewed-by: dfuchs, chegar --- .../ThreadMXBean/ResetPeakThreadCount.java | 99 +++++++++++-------- 1 file changed, 56 insertions(+), 43 deletions(-) diff --git a/jdk/test/java/lang/management/ThreadMXBean/ResetPeakThreadCount.java b/jdk/test/java/lang/management/ThreadMXBean/ResetPeakThreadCount.java index 7864202ead6..79172684060 100644 --- a/jdk/test/java/lang/management/ThreadMXBean/ResetPeakThreadCount.java +++ b/jdk/test/java/lang/management/ThreadMXBean/ResetPeakThreadCount.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,10 +23,11 @@ /* * @test - * @bug 4892507 + * @bug 4892507 8020875 8021335 * @summary Basic Test for the following reset methods: * - ThreadMXBean.resetPeakThreadCount() * @author Mandy Chung + * @author Jaroslav Bachorik * * @build ResetPeakThreadCount * @build ThreadDump @@ -53,15 +54,17 @@ public class ResetPeakThreadCount { private static final int TERMINATE_2 = 8; + private static final int TERMINATE_3 = 2; + private static final int ALL_THREADS = DAEMON_THREADS_1 + DAEMON_THREADS_2 + DAEMON_THREADS_3; // barrier for threads communication - private static Barrier barrier = new Barrier(DAEMON_THREADS_1); + private static final Barrier barrier = new Barrier(DAEMON_THREADS_1); - private static Thread allThreads[] = new Thread[ALL_THREADS]; - private static volatile boolean live[] = new boolean[ALL_THREADS]; + private static final Thread allThreads[] = new Thread[ALL_THREADS]; + private static final boolean live[] = new boolean[ALL_THREADS]; private static final ThreadMXBean mbean = ManagementFactory.getThreadMXBean(); - private static boolean testFailed = false; + private static volatile boolean testFailed = false; public static void main(String[] argv) throws Exception { // This test does not expect any threads to be created @@ -69,7 +72,10 @@ public class ResetPeakThreadCount { // The checkThreadCount() method is to produce more // diagnostic information in case any unexpected test failure occur. long previous = mbean.getThreadCount(); - long current; + long current = previous; + + // reset the peak to start from a scratch + resetPeak(current); // start DAEMON_THREADS_1 number of threads current = startThreads(0, DAEMON_THREADS_1, EXPECTED_PEAK_DELTA_1); @@ -106,6 +112,14 @@ public class ResetPeakThreadCount { current = terminateThreads(TERMINATE_1, TERMINATE_2); checkThreadCount(previous, current, TERMINATE_2 * -1); + previous = current; + + resetPeak(current); + + // terminate TERMINATE_3 number of threads and reset peak + current = terminateThreads(TERMINATE_1 + TERMINATE_2, TERMINATE_3); + + checkThreadCount(previous, current, TERMINATE_3 * -1); resetPeak(current); if (testFailed) @@ -114,7 +128,7 @@ public class ResetPeakThreadCount { System.out.println("Test passed"); } - private static long startThreads(int from, int count, int delta) { + private static long startThreads(int from, int count, int delta) throws InterruptedException { // get current peak thread count long peak1 = mbean.getPeakThreadCount(); long current = mbean.getThreadCount(); @@ -122,11 +136,13 @@ public class ResetPeakThreadCount { // Start threads and wait to be sure they all are alive System.out.println("Starting " + count + " threads...."); barrier.set(count); - for (int i = from; i < (from + count); i++) { - live[i] = true; - allThreads[i] = new MyThread(i); - allThreads[i].setDaemon(true); - allThreads[i].start(); + synchronized(live) { + for (int i = from; i < (from + count); i++) { + live[i] = true; + allThreads[i] = new MyThread(i); + allThreads[i].setDaemon(true); + allThreads[i].start(); + } } // wait until all threads have started. barrier.await(); @@ -144,29 +160,25 @@ public class ResetPeakThreadCount { } // wait until the current thread count gets incremented while (mbean.getThreadCount() < (current + count)) { - try { - Thread.sleep(100); - } catch (InterruptedException e) { - e.printStackTrace(); - System.out.println("Unexpected exception."); - testFailed = true; - } + Thread.sleep(100); } current = mbean.getThreadCount(); System.out.println(" Live thread count before returns " + current); return current; } - private static long terminateThreads(int from, int count) { + private static long terminateThreads(int from, int count) throws InterruptedException { // get current peak thread count long peak1 = mbean.getPeakThreadCount(); - long current = mbean.getThreadCount(); // Stop daemon threads and wait to be sure they all are dead System.out.println("Terminating " + count + " threads...."); barrier.set(count); - for (int i = from; i < (from+count); i++) { - live[i] = false; + synchronized(live) { + for (int i = from; i < (from+count); i++) { + live[i] = false; + } + live.notifyAll(); } // wait until daemon threads terminated. barrier.await(); @@ -179,18 +191,17 @@ public class ResetPeakThreadCount { " Expected to be = previous peak = " + peak1); } - // wait until the current thread count gets decremented - while (mbean.getThreadCount() > (current - count)) { - try { - Thread.sleep(100); - } catch (InterruptedException e) { - e.printStackTrace(); - System.out.println("Unexpected exception."); - testFailed = true; - } + for (int i = from; i < (from+count); i++) { + allThreads[i].join(); } - current = mbean.getThreadCount(); + // there is a race in the counter update logic somewhere causing + // the thread counters go ff + // we need to give the terminated threads some extra time to really die + // JDK-8021335 + Thread.sleep(500); + + long current = mbean.getThreadCount(); System.out.println(" Live thread count before returns " + current); return current; } @@ -223,11 +234,11 @@ public class ResetPeakThreadCount { private static void checkThreadCount(long previous, long current, int expectedDelta) { if (current != previous + expectedDelta) { - System.out.println("***** Unexpected thread count:" + + ThreadDump.threadDump(); + throw new RuntimeException("***** Unexpected thread count:" + " previous = " + previous + " current = " + current + " delta = " + expectedDelta + "*****"); - ThreadDump.threadDump(); } } @@ -242,13 +253,15 @@ public class ResetPeakThreadCount { public void run() { // signal started barrier.signal(); - while (live[id]) { - try { - sleep(100); - } catch (InterruptedException e) { - System.out.println("Unexpected exception is thrown."); - e.printStackTrace(System.out); - testFailed = true; + synchronized(live) { + while (live[id]) { + try { + live.wait(100); + } catch (InterruptedException e) { + System.out.println("Unexpected exception is thrown."); + e.printStackTrace(System.out); + testFailed = true; + } } } // signal about to exit From 26d9259db752acaff9533e9cd620b551b7ae737d Mon Sep 17 00:00:00 2001 From: Rajan Halade Date: Fri, 26 Jul 2013 14:16:53 -0700 Subject: [PATCH 035/120] 8019544: Need to run ProviderTest.java in othervm mode Reviewed-by: wetmore, xuelei, vinnie --- .../ssl/com/sun/net/ssl/SSLSecurity/ProviderTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/ProviderTest.java b/jdk/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/ProviderTest.java index 625af1791bd..4fceaf26adb 100644 --- a/jdk/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/ProviderTest.java +++ b/jdk/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/ProviderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,7 @@ * @compile JavaxSSLContextImpl.java ComSSLContextImpl.java * JavaxTrustManagerFactoryImpl.java ComTrustManagerFactoryImpl.java * JavaxKeyManagerFactoryImpl.java ComKeyManagerFactoryImpl.java - * @run main ProviderTest + * @run main/othervm ProviderTest * @summary brokenness in the com.sun.net.ssl.SSLSecurity wrappers */ From b9742daca70c395a2947767d163694d11c7caae7 Mon Sep 17 00:00:00 2001 From: Mike Duigou Date: Fri, 26 Jul 2013 17:23:20 -0700 Subject: [PATCH 036/120] 8021601: Add unit test for PriorityQueue(Comparator) constructor Reviewed-by: darcy, alanb --- jdk/src/share/classes/java/util/PriorityQueue.java | 4 ++-- jdk/test/java/util/PriorityQueue/RemoveContains.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/jdk/src/share/classes/java/util/PriorityQueue.java b/jdk/src/share/classes/java/util/PriorityQueue.java index c5a961cdbe9..6a31f3ee292 100644 --- a/jdk/src/share/classes/java/util/PriorityQueue.java +++ b/jdk/src/share/classes/java/util/PriorityQueue.java @@ -136,8 +136,8 @@ public class PriorityQueue extends AbstractQueue } /** - * Creates a {@code PriorityQueue} with the default initial capacity - * that orders its elements according to the specified comparator. + * Creates a {@code PriorityQueue} with the default initial capacity and + * whose elements are ordered according to the specified comparator. * * @param comparator the comparator that will be used to order this * priority queue. If {@code null}, the {@linkplain Comparable diff --git a/jdk/test/java/util/PriorityQueue/RemoveContains.java b/jdk/test/java/util/PriorityQueue/RemoveContains.java index 8ac27a48492..66ae47e7f46 100644 --- a/jdk/test/java/util/PriorityQueue/RemoveContains.java +++ b/jdk/test/java/util/PriorityQueue/RemoveContains.java @@ -64,6 +64,7 @@ public class RemoveContains { public int compare(String x, String y) { return x.charAt(0) - y.charAt(0); }}; + test(new PriorityQueue(firstChar)); test(new PriorityQueue(10, firstChar)); test(new PriorityBlockingQueue(10, firstChar)); test(new ArrayBlockingQueue(10)); From d59c1fac0074978da1cceab38ec560bd1c12a3f8 Mon Sep 17 00:00:00 2001 From: Tim Buktu Date: Fri, 26 Jul 2013 17:03:19 -0700 Subject: [PATCH 037/120] 8014319: Faster division of large integers Implement Burnickel-Ziegler division algorithm in BigInteger Reviewed-by: bpb, martin --- .../share/classes/java/math/BigInteger.java | 85 ++- .../classes/java/math/MutableBigInteger.java | 504 +++++++++++++++++- .../java/math/BigInteger/BigIntegerTest.java | 116 ++-- 3 files changed, 644 insertions(+), 61 deletions(-) diff --git a/jdk/src/share/classes/java/math/BigInteger.java b/jdk/src/share/classes/java/math/BigInteger.java index 6569fcb1796..3c902f95a18 100644 --- a/jdk/src/share/classes/java/math/BigInteger.java +++ b/jdk/src/share/classes/java/math/BigInteger.java @@ -33,7 +33,6 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.ObjectStreamField; -import java.util.ArrayList; import java.util.Arrays; import java.util.Random; import sun.misc.DoubleConsts; @@ -101,6 +100,7 @@ import sun.misc.FloatConsts; * @author Josh Bloch * @author Michael McCloskey * @author Alan Eliasen + * @author Timothy Buktu * @since JDK1.1 */ @@ -214,6 +214,14 @@ public class BigInteger extends Number implements Comparable { */ private static final int TOOM_COOK_SQUARE_THRESHOLD = 140; + /** + * The threshold value for using Burnikel-Ziegler division. If the number + * of ints in the number are larger than this value, + * Burnikel-Ziegler division will be used. This value is found + * experimentally to work well. + */ + static final int BURNIKEL_ZIEGLER_THRESHOLD = 50; + /** * The threshold value for using Schoenhage recursive base conversion. If * the number of ints in the number are larger than this value, @@ -1781,7 +1789,7 @@ public class BigInteger extends Number implements Comparable { if (len < TOOM_COOK_SQUARE_THRESHOLD) return squareKaratsuba(); else - return squareToomCook3(); + return squareToomCook3(); } /** @@ -1936,11 +1944,26 @@ public class BigInteger extends Number implements Comparable { * @throws ArithmeticException if {@code val} is zero. */ public BigInteger divide(BigInteger val) { + if (mag.length { * @throws ArithmeticException if {@code val} is zero. */ public BigInteger[] divideAndRemainder(BigInteger val) { + if (mag.length { * @throws ArithmeticException if {@code val} is zero. */ public BigInteger remainder(BigInteger val) { + if (mag.length { /** * Converts the specified BigInteger to a string and appends to - * sb. This implements the recursive Schoenhage algorithm + * {@code sb}. This implements the recursive Schoenhage algorithm * for base conversions. *

* See Knuth, Donald, _The Art of Computer Programming_, Vol. 2, @@ -3450,7 +3521,7 @@ public class BigInteger extends Number implements Comparable { * If this value doesn't already exist in the cache, it is added. *

* This could be changed to a more complicated caching method using - * Future. + * {@code Future}. */ private static BigInteger getRadixConversionCache(int radix, int exponent) { BigInteger[] cacheLine = powerCache[radix]; // volatile read diff --git a/jdk/src/share/classes/java/math/MutableBigInteger.java b/jdk/src/share/classes/java/math/MutableBigInteger.java index 363e5d46e02..ace660d695e 100644 --- a/jdk/src/share/classes/java/math/MutableBigInteger.java +++ b/jdk/src/share/classes/java/math/MutableBigInteger.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -38,13 +38,13 @@ package java.math; * * @see BigInteger * @author Michael McCloskey + * @author Timothy Buktu * @since 1.3 */ -import java.util.Arrays; - -import static java.math.BigInteger.LONG_MASK; import static java.math.BigDecimal.INFLATED; +import static java.math.BigInteger.LONG_MASK; +import java.util.Arrays; class MutableBigInteger { /** @@ -75,6 +75,24 @@ class MutableBigInteger { */ static final MutableBigInteger ONE = new MutableBigInteger(1); + /** + * The minimum {@code intLen} for cancelling powers of two before + * dividing. + * If the number of ints is less than this threshold, + * {@code divideKnuth} does not eliminate common powers of two from + * the dividend and divisor. + */ + static final int KNUTH_POW2_THRESH_LEN = 6; + + /** + * The minimum number of trailing zero ints for cancelling powers of two + * before dividing. + * If the dividend and divisor don't share at least this many zero ints + * at the end, {@code divideKnuth} does not eliminate common powers + * of two from the dividend and divisor. + */ + static final int KNUTH_POW2_THRESH_ZEROS = 3; + // Constructors /** @@ -123,6 +141,20 @@ class MutableBigInteger { value = Arrays.copyOfRange(val.value, val.offset, val.offset + intLen); } + /** + * Makes this number an {@code n}-int number all of whose bits are ones. + * Used by Burnikel-Ziegler division. + * @param n number of ints in the {@code value} array + * @return a number equal to {@code ((1<<(32*n)))-1} + */ + private void ones(int n) { + if (n > value.length) + value = new int[n]; + Arrays.fill(value, -1); + offset = 0; + intLen = n; + } + /** * Internal helper method to return the magnitude array. The caller is not * supposed to modify the returned array. @@ -154,6 +186,14 @@ class MutableBigInteger { return new BigInteger(getMagnitudeArray(), sign); } + /** + * Converts this number to a nonnegative {@code BigInteger}. + */ + BigInteger toBigInteger() { + normalize(); + return toBigInteger(isZero() ? 0 : 1); + } + /** * Convert this MutableBigInteger to BigDecimal object with the specified sign * and scale. @@ -237,6 +277,32 @@ class MutableBigInteger { return 0; } + /** + * Returns a value equal to what {@code b.leftShift(32*ints); return compare(b);} + * would return, but doesn't change the value of {@code b}. + */ + private int compareShifted(MutableBigInteger b, int ints) { + int blen = b.intLen; + int alen = intLen - ints; + if (alen < blen) + return -1; + if (alen > blen) + return 1; + + // Add Integer.MIN_VALUE to make the comparison act as unsigned integer + // comparison. + int[] bval = b.value; + for (int i = offset, j = b.offset; i < alen + offset; i++, j++) { + int b1 = value[i] + 0x80000000; + int b2 = bval[j] + 0x80000000; + if (b1 < b2) + return -1; + if (b1 > b2) + return 1; + } + return 0; + } + /** * Compare this against half of a MutableBigInteger object (Needed for * remainder tests). @@ -453,6 +519,16 @@ class MutableBigInteger { return b.toString(); } + /** + * Like {@link #rightShift(int)} but {@code n} can be greater than the length of the number. + */ + void safeRightShift(int n) { + if (n/32 >= intLen) + reset(); + else + rightShift(n); + } + /** * Right shift this MutableBigInteger n bits. The MutableBigInteger is left * in normal form. @@ -474,6 +550,14 @@ class MutableBigInteger { } } + /** + * Like {@link #leftShift(int)} but {@code n} can be zero. + */ + void safeLeftShift(int n) { + if (n > 0) + leftShift(n); + } + /** * Left shift this MutableBigInteger n bits. */ @@ -614,6 +698,35 @@ class MutableBigInteger { val[offset+intLen-1] <<= n; } + /** + * Returns a {@code BigInteger} equal to the {@code n} + * low ints of this number. + */ + private BigInteger getLower(int n) { + if (isZero()) + return BigInteger.ZERO; + else if (intLen < n) + return toBigInteger(1); + else { + // strip zeros + int len = n; + while (len>0 && value[offset+intLen-len]==0) + len--; + int sign = len>0 ? 1 : 0; + return new BigInteger(Arrays.copyOfRange(value, offset+intLen-len, offset+intLen), sign); + } + } + + /** + * Discards all ints whose index is greater than {@code n}. + */ + private void keepLower(int n) { + if (intLen >= n) { + offset += intLen - n; + intLen = n; + } + } + /** * Adds the contents of two MutableBigInteger objects.The result * is placed within this MutableBigInteger. @@ -673,6 +786,121 @@ class MutableBigInteger { offset = result.length - resultLen; } + /** + * Adds the value of {@code addend} shifted {@code n} ints to the left. + * Has the same effect as {@code addend.leftShift(32*ints); add(b);} + * but doesn't change the value of {@code b}. + */ + void addShifted(MutableBigInteger addend, int n) { + if (addend.isZero()) + return; + + int x = intLen; + int y = addend.intLen + n; + int resultLen = (intLen > y ? intLen : y); + int[] result = (value.length < resultLen ? new int[resultLen] : value); + + int rstart = result.length-1; + long sum; + long carry = 0; + + // Add common parts of both numbers + while(x>0 && y>0) { + x--; y--; + int bval = y+addend.offset>> 32; + } + + // Add remainder of the longer number + while(x>0) { + x--; + if (carry == 0 && result == value && rstart == (x + offset)) + return; + sum = (value[x+offset] & LONG_MASK) + carry; + result[rstart--] = (int)sum; + carry = sum >>> 32; + } + while(y>0) { + y--; + int bval = y+addend.offset>> 32; + } + + if (carry > 0) { // Result must grow in length + resultLen++; + if (result.length < resultLen) { + int temp[] = new int[resultLen]; + // Result one word longer from carry-out; copy low-order + // bits into new result. + System.arraycopy(result, 0, temp, 1, result.length); + temp[0] = 1; + result = temp; + } else { + result[rstart--] = 1; + } + } + + value = result; + intLen = resultLen; + offset = result.length - resultLen; + } + + /** + * Like {@link #addShifted(MutableBigInteger, int)} but {@code this.intLen} must + * not be greater than {@code n}. In other words, concatenates {@code this} + * and {@code addend}. + */ + void addDisjoint(MutableBigInteger addend, int n) { + if (addend.isZero()) + return; + + int x = intLen; + int y = addend.intLen + n; + int resultLen = (intLen > y ? intLen : y); + int[] result; + if (value.length < resultLen) + result = new int[resultLen]; + else { + result = value; + Arrays.fill(value, offset+intLen, value.length, 0); + } + + int rstart = result.length-1; + + // copy from this if needed + System.arraycopy(value, offset, result, rstart+1-x, x); + y -= x; + rstart -= x; + + int len = Math.min(y, addend.value.length-addend.offset); + System.arraycopy(addend.value, addend.offset, result, rstart+1-y, len); + + // zero the gap + for (int i=rstart+1-y+len; i= n) { + a.offset = a.offset + a.intLen - n; + a.intLen = n; + } + a.normalize(); + add(a); + } /** * Subtracts the smaller of this and b from the larger and places the @@ -906,6 +1134,29 @@ class MutableBigInteger { return rem; } + /** + * Calculates the quotient of this div b and places the quotient in the + * provided MutableBigInteger objects and the remainder object is returned. + * + */ + MutableBigInteger divide(MutableBigInteger b, MutableBigInteger quotient) { + return divide(b,quotient,true); + } + + MutableBigInteger divide(MutableBigInteger b, MutableBigInteger quotient, boolean needRemainder) { + if (intLen= KNUTH_POW2_THRESH_LEN) { + int trailingZeroBits = Math.min(getLowestSetBit(), b.getLowestSetBit()); + if (trailingZeroBits >= KNUTH_POW2_THRESH_ZEROS*32) { + MutableBigInteger a = new MutableBigInteger(this); + b = new MutableBigInteger(b); + a.rightShift(trailingZeroBits); + b.rightShift(trailingZeroBits); + MutableBigInteger r = a.divideKnuth(b, quotient); + r.leftShift(trailingZeroBits); + return r; + } + } + + return divideMagnitude(b, quotient, needRemainder); + } + + /** + * Computes {@code this/b} and {@code this%b} using the + * Burnikel-Ziegler algorithm. + * This method implements algorithm 3 from pg. 9 of the Burnikel-Ziegler paper. + * The parameter beta was chosen to b 232 so almost all shifts are + * multiples of 32 bits.
+ * {@code this} and {@code b} must be nonnegative. + * @param b the divisor + * @param quotient output parameter for {@code this/b} + * @return the remainder + */ + MutableBigInteger divideAndRemainderBurnikelZiegler(MutableBigInteger b, MutableBigInteger quotient) { + int r = intLen; + int s = b.intLen; + + if (r < s) + return this; + else { + // Unlike Knuth division, we don't check for common powers of two here because + // BZ already runs faster if both numbers contain powers of two and cancelling them has no + // additional benefit. + + // step 1: let m = min{2^k | (2^k)*BURNIKEL_ZIEGLER_THRESHOLD > s} + int m = 1 << (32-Integer.numberOfLeadingZeros(s/BigInteger.BURNIKEL_ZIEGLER_THRESHOLD)); + + int j = (s+m-1) / m; // step 2a: j = ceil(s/m) + int n = j * m; // step 2b: block length in 32-bit units + int n32 = 32 * n; // block length in bits + int sigma = Math.max(0, n32 - b.bitLength()); // step 3: sigma = max{T | (2^T)*B < beta^n} + MutableBigInteger bShifted = new MutableBigInteger(b); + bShifted.safeLeftShift(sigma); // step 4a: shift b so its length is a multiple of n + safeLeftShift(sigma); // step 4b: shift this by the same amount + + // step 5: t is the number of blocks needed to accommodate this plus one additional bit + int t = (bitLength()+n32) / n32; + if (t < 2) + t = 2; + + // step 6: conceptually split this into blocks a[t-1], ..., a[0] + MutableBigInteger a1 = getBlock(t-1, t, n); // the most significant block of this + + // step 7: z[t-2] = [a[t-1], a[t-2]] + MutableBigInteger z = getBlock(t-2, t, n); // the second to most significant block + z.addDisjoint(a1, n); // z[t-2] + + // do schoolbook division on blocks, dividing 2-block numbers by 1-block numbers + MutableBigInteger qi = new MutableBigInteger(); + MutableBigInteger ri; + quotient.offset = quotient.intLen = 0; + for (int i=t-2; i>0; i--) { + // step 8a: compute (qi,ri) such that z=b*qi+ri + ri = z.divide2n1n(bShifted, qi); + + // step 8b: z = [ri, a[i-1]] + z = getBlock(i-1, t, n); // a[i-1] + z.addDisjoint(ri, n); + quotient.addShifted(qi, i*n); // update q (part of step 9) + } + // final iteration of step 8: do the loop one more time for i=0 but leave z unchanged + ri = z.divide2n1n(bShifted, qi); + quotient.add(qi); + + ri.rightShift(sigma); // step 9: this and b were shifted, so shift back + return ri; + } + } + + /** + * This method implements algorithm 1 from pg. 4 of the Burnikel-Ziegler paper. + * It divides a 2n-digit number by a n-digit number.
+ * The parameter beta is 232 so all shifts are multiples of 32 bits. + *
+ * {@code this} must be a nonnegative number such that {@code this.bitLength() <= 2*b.bitLength()} + * @param b a positive number such that {@code b.bitLength()} is even + * @param quotient output parameter for {@code this/b} + * @return {@code this%b} + */ + private MutableBigInteger divide2n1n(MutableBigInteger b, MutableBigInteger quotient) { + int n = b.intLen; + + // step 1: base case + if (n%2!=0 || n + * The parameter beta is 232 so all shifts are multiples of 32 bits.
+ *
+ * {@code this} must be a nonnegative number such that {@code 2*this.bitLength() <= 3*b.bitLength()} + * @param quotient output parameter for {@code this/b} + * @return {@code this%b} + */ + private MutableBigInteger divide3n2n(MutableBigInteger b, MutableBigInteger quotient) { + int n = b.intLen / 2; // half the length of b in ints + + // step 1: view this as [a1,a2,a3] where each ai is n ints or less; let a12=[a1,a2] + MutableBigInteger a12 = new MutableBigInteger(this); + a12.safeRightShift(32*n); + + // step 2: view b as [b1,b2] where each bi is n ints or less + MutableBigInteger b1 = new MutableBigInteger(b); + b1.safeRightShift(n * 32); + BigInteger b2 = b.getLower(n); + + MutableBigInteger r; + MutableBigInteger d; + if (compareShifted(b, n) < 0) { + // step 3a: if a1=b1, let quotient=beta^n-1 and r=a12-b1*2^n+b1 + quotient.ones(n); + a12.add(b1); + b1.leftShift(32*n); + a12.subtract(b1); + r = a12; + + // step 4: d=quotient*b2=(b2 << 32*n) - b2 + d = new MutableBigInteger(b2); + d.leftShift(32 * n); + d.subtract(new MutableBigInteger(b2)); + } + + // step 5: r = r*beta^n + a3 - d (paper says a4) + // However, don't subtract d until after the while loop so r doesn't become negative + r.leftShift(32 * n); + r.addLower(this, n); + + // step 6: add b until r>=d + while (r.compare(d) < 0) { + r.add(b); + quotient.subtract(MutableBigInteger.ONE); + } + r.subtract(d); + + return r; + } + + /** + * Returns a {@code MutableBigInteger} containing {@code blockLength} ints from + * {@code this} number, starting at {@code index*blockLength}.
+ * Used by Burnikel-Ziegler division. + * @param index the block index + * @param numBlocks the total number of blocks in {@code this} number + * @param blockLength length of one block in units of 32 bits + * @return + */ + private MutableBigInteger getBlock(int index, int numBlocks, int blockLength) { + int blockStart = index * blockLength; + if (blockStart >= intLen) + return new MutableBigInteger(); + + int blockEnd; + if (index == numBlocks-1) + blockEnd = intLen; + else + blockEnd = (index+1) * blockLength; + if (blockEnd > intLen) + return new MutableBigInteger(); + + int[] newVal = Arrays.copyOfRange(value, offset+intLen-blockEnd, offset+intLen-blockStart); + return new MutableBigInteger(newVal); + } + + /** @see BigInteger#bitLength() */ + int bitLength() { + if (intLen == 0) + return 0; + return intLen*32 - Integer.numberOfLeadingZeros(value[offset]); } /** @@ -1006,7 +1462,7 @@ class MutableBigInteger { */ private MutableBigInteger divideMagnitude(MutableBigInteger div, MutableBigInteger quotient, - boolean needReminder ) { + boolean needRemainder ) { // assert div.intLen > 1 // D1 normalize the divisor int shift = Integer.numberOfLeadingZeros(div.value[div.offset]); @@ -1176,7 +1632,7 @@ class MutableBigInteger { // D4 Multiply and subtract int borrow; rem.value[limit - 1 + rem.offset] = 0; - if(needReminder) + if(needRemainder) borrow = mulsub(rem.value, divisor, qhat, dlen, limit - 1 + rem.offset); else borrow = mulsubBorrow(rem.value, divisor, qhat, dlen, limit - 1 + rem.offset); @@ -1184,7 +1640,7 @@ class MutableBigInteger { // D5 Test remainder if (borrow + 0x80000000 > nh2) { // D6 Add back - if(needReminder) + if(needRemainder) divadd(divisor, rem.value, limit - 1 + 1 + rem.offset); qhat--; } @@ -1194,14 +1650,14 @@ class MutableBigInteger { } - if(needReminder) { + if(needRemainder) { // D8 Unnormalize if (shift > 0) rem.rightShift(shift); rem.normalize(); } quotient.normalize(); - return needReminder ? rem : null; + return needRemainder ? rem : null; } /** @@ -1367,7 +1823,7 @@ class MutableBigInteger { * This method divides a long quantity by an int to estimate * qhat for two multi precision numbers. It is used when * the signed value of n is less than zero. - * Returns long value where high 32 bits contain reminder value and + * Returns long value where high 32 bits contain remainder value and * low 32 bits contain quotient value. */ static long divWord(long n, int d) { @@ -1582,7 +2038,7 @@ class MutableBigInteger { return result; } - /* + /** * Returns the multiplicative inverse of val mod 2^32. Assumes val is odd. */ static int inverseMod32(int val) { @@ -1595,7 +2051,7 @@ class MutableBigInteger { return t; } - /* + /** * Calculate the multiplicative inverse of 2^k mod mod, where mod is odd. */ static MutableBigInteger modInverseBP2(MutableBigInteger mod, int k) { @@ -1665,7 +2121,7 @@ class MutableBigInteger { return fixup(c, p, k); } - /* + /** * The Fixup Algorithm * Calculates X such that X = C * 2^(-k) (mod P) * Assumes C

abs(v)} and {@code a > b && b > 0}, then if + * {@code w/z = q1*z + r1} and {@code u/v = q2*v + r2}, then + * {@code q1 = q2*pow(2,a-b)} and {@code r1 = r2*pow(2,b)}. The test + * ensures that {@code v} is just under the B-Z threshold and that {@code w} + * and {@code z} are both over the threshold. This implies that {@code u/v} + * uses the standard division algorithm and {@code w/z} uses the B-Z + * algorithm. The results of the two algorithms are then compared using the + * observation described in the foregoing and if they are not equal a + * failure is logged. + */ + public static void divideLarge() { + int failCount = 0; + + BigInteger base = BigInteger.ONE.shiftLeft(BITS_BURNIKEL_ZIEGLER - 33); + for (int i=0; i Date: Fri, 26 Jul 2013 17:09:30 -0700 Subject: [PATCH 038/120] 8020641: Clean up some code style in recent BigInteger contributions Some minor cleanup to adhere better to Java coding conventions. Reviewed-by: darcy --- .../share/classes/java/math/BigInteger.java | 398 +++++++++--------- .../classes/java/math/MutableBigInteger.java | 134 +++--- .../java/math/BigInteger/BigIntegerTest.java | 4 +- 3 files changed, 281 insertions(+), 255 deletions(-) diff --git a/jdk/src/share/classes/java/math/BigInteger.java b/jdk/src/share/classes/java/math/BigInteger.java index 3c902f95a18..e8cedf8a564 100644 --- a/jdk/src/share/classes/java/math/BigInteger.java +++ b/jdk/src/share/classes/java/math/BigInteger.java @@ -298,7 +298,7 @@ public class BigInteger extends Number implements Comparable { if (signum < -1 || signum > 1) throw(new NumberFormatException("Invalid signum value")); - if (this.mag.length==0) { + if (this.mag.length == 0) { this.signum = 0; } else { if (signum == 0) @@ -319,7 +319,7 @@ public class BigInteger extends Number implements Comparable { if (signum < -1 || signum > 1) throw(new NumberFormatException("Invalid signum value")); - if (this.mag.length==0) { + if (this.mag.length == 0) { this.signum = 0; } else { if (signum == 0) @@ -372,8 +372,10 @@ public class BigInteger extends Number implements Comparable { // Skip leading zeros and compute number of digits in magnitude while (cursor < len && - Character.digit(val.charAt(cursor), radix) == 0) + Character.digit(val.charAt(cursor), radix) == 0) { cursor++; + } + if (cursor == len) { signum = 0; mag = ZERO.mag; @@ -463,7 +465,7 @@ public class BigInteger extends Number implements Comparable { if (result == -1) throw new NumberFormatException(new String(source)); - for (int index = start; index { int highBit = 1 << ((bitLength+31) & 0x1f); // High bit of high int int highMask = (highBit << 1) - 1; // Bits to keep in high int - while(true) { + while (true) { // Construct a candidate - for (int i=0; i 2) @@ -718,7 +720,7 @@ public class BigInteger extends Number implements Comparable { if (!result.testBit(0)) result = result.add(ONE); - while(true) { + while (true) { // Do cheap "pre-test" if applicable if (result.bitLength() > 6) { long r = result.remainder(SMALL_PRIME_PRODUCT).longValue(); @@ -749,7 +751,7 @@ public class BigInteger extends Number implements Comparable { // Looking for the next large prime int searchLen = (result.bitLength() / 20) * 64; - while(true) { + while (true) { BitSieve searchSieve = new BitSieve(result, searchLen); BigInteger candidate = searchSieve.retrieve(result, DEFAULT_PRIME_CERTAINTY, null); @@ -816,7 +818,7 @@ public class BigInteger extends Number implements Comparable { int d = 5; while (jacobiSymbol(d, this) != -1) { // 5, -7, 9, -11, ... - d = (d<0) ? Math.abs(d)+2 : -(d+2); + d = (d < 0) ? Math.abs(d)+2 : -(d+2); } // Step 2 @@ -889,7 +891,7 @@ public class BigInteger extends Number implements Comparable { BigInteger u = ONE; BigInteger u2; BigInteger v = ONE; BigInteger v2; - for (int i=k.bitLength()-2; i>=0; i--) { + for (int i=k.bitLength()-2; i >= 0; i--) { u2 = u.multiply(v).mod(n); v2 = v.square().add(d.multiply(u.square())).mod(n); @@ -945,7 +947,7 @@ public class BigInteger extends Number implements Comparable { if (rnd == null) { rnd = getSecureRandom(); } - for (int i=0; i { int j = 0; BigInteger z = b.modPow(m, this); - while(!((j==0 && z.equals(ONE)) || z.equals(thisMinusOne))) { - if (j>0 && z.equals(ONE) || ++j==a) + while (!((j == 0 && z.equals(ONE)) || z.equals(thisMinusOne))) { + if (j > 0 && z.equals(ONE) || ++j == a) return false; z = z.modPow(TWO, this); } @@ -969,7 +971,7 @@ public class BigInteger extends Number implements Comparable { * arguments are correct, and it doesn't copy the magnitude array. */ BigInteger(int[] magnitude, int signum) { - this.signum = (magnitude.length==0 ? 0 : signum); + this.signum = (magnitude.length == 0 ? 0 : signum); this.mag = magnitude; } @@ -978,7 +980,7 @@ public class BigInteger extends Number implements Comparable { * arguments are correct. */ private BigInteger(byte[] magnitude, int signum) { - this.signum = (magnitude.length==0 ? 0 : signum); + this.signum = (magnitude.length == 0 ? 0 : signum); this.mag = stripLeadingZeroBytes(magnitude); } @@ -1017,7 +1019,7 @@ public class BigInteger extends Number implements Comparable { } int highWord = (int)(val >>> 32); - if (highWord==0) { + if (highWord == 0) { mag = new int[1]; mag[0] = (int)val; } else { @@ -1033,7 +1035,7 @@ public class BigInteger extends Number implements Comparable { * BigInteger will reference the input array if feasible). */ private static BigInteger valueOf(int val[]) { - return (val[0]>0 ? new BigInteger(val, 1) : new BigInteger(val)); + return (val[0] > 0 ? new BigInteger(val, 1) : new BigInteger(val)); } // Constants @@ -1074,8 +1076,7 @@ public class BigInteger extends Number implements Comparable { powerCache = new BigInteger[Character.MAX_RADIX+1][]; logCache = new double[Character.MAX_RADIX+1]; - for (int i=Character.MIN_RADIX; i<=Character.MAX_RADIX; i++) - { + for (int i=Character.MIN_RADIX; i <= Character.MAX_RADIX; i++) { powerCache[i] = new BigInteger[] { BigInteger.valueOf(i) }; logCache[i] = Math.log(i); } @@ -1169,7 +1170,7 @@ public class BigInteger extends Number implements Comparable { int xIndex = x.length; int[] result; int highWord = (int)(val >>> 32); - if (highWord==0) { + if (highWord == 0) { result = new int[xIndex]; sum = (x[--xIndex] & LONG_MASK) + val; result[xIndex] = (int)sum; @@ -1222,12 +1223,12 @@ public class BigInteger extends Number implements Comparable { int yIndex = y.length; int result[] = new int[xIndex]; long sum = 0; - if(yIndex==1) { + if (yIndex == 1) { sum = (x[--xIndex] & LONG_MASK) + (y[0] & LONG_MASK) ; result[xIndex] = (int)sum; } else { // Add common parts of both numbers - while(yIndex > 0) { + while (yIndex > 0) { sum = (x[--xIndex] & LONG_MASK) + (y[--yIndex] & LONG_MASK) + (sum >>> 32); result[xIndex] = (int)sum; @@ -1254,24 +1255,24 @@ public class BigInteger extends Number implements Comparable { private static int[] subtract(long val, int[] little) { int highWord = (int)(val >>> 32); - if (highWord==0) { + if (highWord == 0) { int result[] = new int[1]; result[0] = (int)(val - (little[0] & LONG_MASK)); return result; } else { int result[] = new int[2]; - if(little.length==1) { + if (little.length == 1) { long difference = ((int)val & LONG_MASK) - (little[0] & LONG_MASK); result[1] = (int)difference; // Subtract remainder of longer number while borrow propagates boolean borrow = (difference >> 32 != 0); - if(borrow) { + if (borrow) { result[0] = highWord - 1; } else { // Copy remainder of longer number result[0] = highWord; } return result; - } else { // little.length==2 + } else { // little.length == 2 long difference = ((int)val & LONG_MASK) - (little[1] & LONG_MASK); result[1] = (int)difference; difference = (highWord & LONG_MASK) - (little[0] & LONG_MASK) + (difference >> 32); @@ -1294,7 +1295,7 @@ public class BigInteger extends Number implements Comparable { int result[] = new int[bigIndex]; long difference = 0; - if (highWord==0) { + if (highWord == 0) { difference = (big[--bigIndex] & LONG_MASK) - val; result[bigIndex] = (int)difference; } else { @@ -1304,7 +1305,6 @@ public class BigInteger extends Number implements Comparable { result[bigIndex] = (int)difference; } - // Subtract remainder of longer number while borrow propagates boolean borrow = (difference >> 32 != 0); while (bigIndex > 0 && borrow) @@ -1353,7 +1353,7 @@ public class BigInteger extends Number implements Comparable { long difference = 0; // Subtract common parts of both numbers - while(littleIndex > 0) { + while (littleIndex > 0) { difference = (big[--bigIndex] & LONG_MASK) - (little[--littleIndex] & LONG_MASK) + (difference >> 32); @@ -1385,29 +1385,29 @@ public class BigInteger extends Number implements Comparable { int xlen = mag.length; int ylen = val.mag.length; - if ((xlen < KARATSUBA_THRESHOLD) || (ylen < KARATSUBA_THRESHOLD)) - { + if ((xlen < KARATSUBA_THRESHOLD) || (ylen < KARATSUBA_THRESHOLD)) { int resultSign = signum == val.signum ? 1 : -1; if (val.mag.length == 1) { return multiplyByInt(mag,val.mag[0], resultSign); } - if(mag.length == 1) { + if (mag.length == 1) { return multiplyByInt(val.mag,mag[0], resultSign); } int[] result = multiplyToLen(mag, xlen, val.mag, ylen, null); result = trustedStripLeadingZeroInts(result); return new BigInteger(result, resultSign); - } - else - if ((xlen < TOOM_COOK_THRESHOLD) && (ylen < TOOM_COOK_THRESHOLD)) + } else { + if ((xlen < TOOM_COOK_THRESHOLD) && (ylen < TOOM_COOK_THRESHOLD)) { return multiplyKaratsuba(this, val); - else + } else { return multiplyToomCook3(this, val); + } + } } private static BigInteger multiplyByInt(int[] x, int y, int sign) { - if(Integer.bitCount(y)==1) { + if (Integer.bitCount(y) == 1) { return new BigInteger(shiftLeft(x,Integer.numberOfTrailingZeros(y)), sign); } int xlen = x.length; @@ -1482,7 +1482,7 @@ public class BigInteger extends Number implements Comparable { z = new int[xlen+ylen]; long carry = 0; - for (int j=ystart, k=ystart+1+xstart; j>=0; j--, k--) { + for (int j=ystart, k=ystart+1+xstart; j >= 0; j--, k--) { long product = (y[j] & LONG_MASK) * (x[xstart] & LONG_MASK) + carry; z[k] = (int)product; @@ -1492,7 +1492,7 @@ public class BigInteger extends Number implements Comparable { for (int i = xstart-1; i >= 0; i--) { carry = 0; - for (int j=ystart, k=ystart+1+i; j>=0; j--, k--) { + for (int j=ystart, k=ystart+1+i; j >= 0; j--, k--) { long product = (y[j] & LONG_MASK) * (x[i] & LONG_MASK) + (z[k] & LONG_MASK) + carry; @@ -1519,8 +1519,7 @@ public class BigInteger extends Number implements Comparable { * * See: http://en.wikipedia.org/wiki/Karatsuba_algorithm */ - private static BigInteger multiplyKaratsuba(BigInteger x, BigInteger y) - { + private static BigInteger multiplyKaratsuba(BigInteger x, BigInteger y) { int xlen = x.mag.length; int ylen = y.mag.length; @@ -1543,10 +1542,11 @@ public class BigInteger extends Number implements Comparable { // result = p1 * 2^(32*2*half) + (p3 - p1 - p2) * 2^(32*half) + p2 BigInteger result = p1.shiftLeft(32*half).add(p3.subtract(p1).subtract(p2)).shiftLeft(32*half).add(p2); - if (x.signum != y.signum) + if (x.signum != y.signum) { return result.negate(); - else + } else { return result; + } } /** @@ -1577,8 +1577,7 @@ public class BigInteger extends Number implements Comparable { * LNCS #4547. Springer, Madrid, Spain, June 21-22, 2007. * */ - private static BigInteger multiplyToomCook3(BigInteger a, BigInteger b) - { + private static BigInteger multiplyToomCook3(BigInteger a, BigInteger b) { int alen = a.mag.length; int blen = b.mag.length; @@ -1613,12 +1612,12 @@ public class BigInteger extends Number implements Comparable { db1.add(b2).shiftLeft(1).subtract(b0)); vinf = a2.multiply(b2); - /* The algorithm requires two divisions by 2 and one by 3. - All divisions are known to be exact, that is, they do not produce - remainders, and all results are positive. The divisions by 2 are - implemented as right shifts which are relatively efficient, leaving - only an exact division by 3, which is done by a specialized - linear-time algorithm. */ + // The algorithm requires two divisions by 2 and one by 3. + // All divisions are known to be exact, that is, they do not produce + // remainders, and all results are positive. The divisions by 2 are + // implemented as right shifts which are relatively efficient, leaving + // only an exact division by 3, which is done by a specialized + // linear-time algorithm. t2 = v2.subtract(vm1).exactDivideBy3(); tm1 = v1.subtract(vm1).shiftRight(1); t1 = v1.subtract(v0); @@ -1632,10 +1631,11 @@ public class BigInteger extends Number implements Comparable { BigInteger result = vinf.shiftLeft(ss).add(t2).shiftLeft(ss).add(t1).shiftLeft(ss).add(tm1).shiftLeft(ss).add(v0); - if (a.signum != b.signum) + if (a.signum != b.signum) { return result.negate(); - else + } else { return result; + } } @@ -1653,38 +1653,38 @@ public class BigInteger extends Number implements Comparable { * numbers. */ private BigInteger getToomSlice(int lowerSize, int upperSize, int slice, - int fullsize) - { + int fullsize) { int start, end, sliceSize, len, offset; len = mag.length; offset = fullsize - len; - if (slice == 0) - { + if (slice == 0) { start = 0 - offset; end = upperSize - 1 - offset; - } - else - { + } else { start = upperSize + (slice-1)*lowerSize - offset; end = start + lowerSize - 1; } - if (start < 0) + if (start < 0) { start = 0; - if (end < 0) + } + if (end < 0) { return ZERO; + } sliceSize = (end-start) + 1; - if (sliceSize <= 0) + if (sliceSize <= 0) { return ZERO; + } // While performing Toom-Cook, all slices are positive and // the sign is adjusted when the final number is composed. - if (start==0 && sliceSize >= len) + if (start == 0 && sliceSize >= len) { return this.abs(); + } int intSlice[] = new int[sliceSize]; System.arraycopy(mag, start, intSlice, 0, sliceSize); @@ -1700,20 +1700,19 @@ public class BigInteger extends Number implements Comparable { * undefined. Note that this is expected to be called with positive * arguments only. */ - private BigInteger exactDivideBy3() - { + private BigInteger exactDivideBy3() { int len = mag.length; int[] result = new int[len]; long x, w, q, borrow; borrow = 0L; - for (int i=len-1; i>=0; i--) - { + for (int i=len-1; i >= 0; i--) { x = (mag[i] & LONG_MASK); w = x - borrow; - if (borrow > x) // Did we make the number go negative? + if (borrow > x) { // Did we make the number go negative? borrow = 1L; - else + } else { borrow = 0L; + } // 0xAAAAAAAB is the modular inverse of 3 (mod 2^32). Thus, // the effect of this is to divide by 3 (mod 2^32). @@ -1723,8 +1722,7 @@ public class BigInteger extends Number implements Comparable { // Now check the borrow. The second check can of course be // eliminated if the first fails. - if (q >= 0x55555556L) - { + if (q >= 0x55555556L) { borrow++; if (q >= 0xAAAAAAABL) borrow++; @@ -1741,8 +1739,9 @@ public class BigInteger extends Number implements Comparable { private BigInteger getLower(int n) { int len = mag.length; - if (len <= n) + if (len <= n) { return this; + } int lowerInts[] = new int[n]; System.arraycopy(mag, len-n, lowerInts, 0, n); @@ -1758,8 +1757,9 @@ public class BigInteger extends Number implements Comparable { private BigInteger getUpper(int n) { int len = mag.length; - if (len <= n) + if (len <= n) { return ZERO; + } int upperLen = len - n; int upperInts[] = new int[upperLen]; @@ -1776,20 +1776,21 @@ public class BigInteger extends Number implements Comparable { * @return {@code this2} */ private BigInteger square() { - if (signum == 0) + if (signum == 0) { return ZERO; + } int len = mag.length; - if (len < KARATSUBA_SQUARE_THRESHOLD) - { + if (len < KARATSUBA_SQUARE_THRESHOLD) { int[] z = squareToLen(mag, len, null); return new BigInteger(trustedStripLeadingZeroInts(z), 1); - } - else - if (len < TOOM_COOK_SQUARE_THRESHOLD) + } else { + if (len < TOOM_COOK_SQUARE_THRESHOLD) { return squareKaratsuba(); - else + } else { return squareToomCook3(); + } + } } /** @@ -1837,7 +1838,7 @@ public class BigInteger extends Number implements Comparable { // Store the squares, right shifted one bit (i.e., divided by 2) int lastProductLowWord = 0; - for (int j=0, i=0; j>> 33); @@ -1846,7 +1847,7 @@ public class BigInteger extends Number implements Comparable { } // Add in off-diagonal sums - for (int i=len, offset=1; i>0; i--, offset+=2) { + for (int i=len, offset=1; i > 0; i--, offset+=2) { int t = x[i-1]; t = mulAdd(z, x, offset, i-1, t); addOne(z, offset-1, i, t); @@ -1866,8 +1867,7 @@ public class BigInteger extends Number implements Comparable { * has better asymptotic performance than the algorithm used in * squareToLen. */ - private BigInteger squareKaratsuba() - { + private BigInteger squareKaratsuba() { int half = (mag.length+1) / 2; BigInteger xl = getLower(half); @@ -1887,8 +1887,7 @@ public class BigInteger extends Number implements Comparable { * that has better asymptotic performance than the algorithm used in * squareToLen or squareKaratsuba. */ - private BigInteger squareToomCook3() - { + private BigInteger squareToomCook3() { int len = mag.length; // k is the size (in ints) of the lower-order slices. @@ -1913,13 +1912,12 @@ public class BigInteger extends Number implements Comparable { vinf = a2.square(); v2 = da1.add(a2).shiftLeft(1).subtract(a0).square(); - /* The algorithm requires two divisions by 2 and one by 3. - All divisions are known to be exact, that is, they do not produce - remainders, and all results are positive. The divisions by 2 are - implemented as right shifts which are relatively efficient, leaving - only a division by 3. - The division by 3 is done by an optimized algorithm for this case. - */ + // The algorithm requires two divisions by 2 and one by 3. + // All divisions are known to be exact, that is, they do not produce + // remainders, and all results are positive. The divisions by 2 are + // implemented as right shifts which are relatively efficient, leaving + // only a division by 3. + // The division by 3 is done by an optimized algorithm for this case. t2 = v2.subtract(vm1).exactDivideBy3(); tm1 = v1.subtract(vm1).shiftRight(1); t1 = v1.subtract(v0); @@ -1944,10 +1942,12 @@ public class BigInteger extends Number implements Comparable { * @throws ArithmeticException if {@code val} is zero. */ public BigInteger divide(BigInteger val) { - if (mag.length { * @throws ArithmeticException if {@code val} is zero. */ public BigInteger[] divideAndRemainder(BigInteger val) { - if (mag.length { * @throws ArithmeticException if {@code val} is zero. */ public BigInteger remainder(BigInteger val) { - if (mag.length { * cause the operation to yield a non-integer value.) */ public BigInteger pow(int exponent) { - if (exponent < 0) + if (exponent < 0) { throw new ArithmeticException("Negative exponent"); - if (signum==0) - return (exponent==0 ? ONE : this); + } + if (signum == 0) { + return (exponent == 0 ? ONE : this); + } BigInteger partToSquare = this.abs(); @@ -2079,24 +2085,25 @@ public class BigInteger extends Number implements Comparable { int remainingBits; // Factor the powers of two out quickly by shifting right, if needed. - if (powersOfTwo > 0) - { + if (powersOfTwo > 0) { partToSquare = partToSquare.shiftRight(powersOfTwo); remainingBits = partToSquare.bitLength(); - if (remainingBits == 1) // Nothing left but +/- 1? - if (signum<0 && (exponent&1)==1) + if (remainingBits == 1) { // Nothing left but +/- 1? + if (signum < 0 && (exponent&1) == 1) { return NEGATIVE_ONE.shiftLeft(powersOfTwo*exponent); - else + } else { return ONE.shiftLeft(powersOfTwo*exponent); - } - else - { + } + } + } else { remainingBits = partToSquare.bitLength(); - if (remainingBits == 1) // Nothing left but +/- 1? - if (signum<0 && (exponent&1)==1) + if (remainingBits == 1) { // Nothing left but +/- 1? + if (signum < 0 && (exponent&1) == 1) { return NEGATIVE_ONE; - else + } else { return ONE; + } + } } // This is a quick way to approximate the size of the result, @@ -2106,10 +2113,9 @@ public class BigInteger extends Number implements Comparable { // Use slightly different algorithms for small and large operands. // See if the result will safely fit into a long. (Largest 2^63-1) - if (partToSquare.mag.length==1 && scaleFactor <= 62) - { + if (partToSquare.mag.length == 1 && scaleFactor <= 62) { // Small number algorithm. Everything fits into a long. - int newSign = (signum<0 && (exponent&1)==1 ? -1 : 1); + int newSign = (signum <0 && (exponent&1) == 1 ? -1 : 1); long result = 1; long baseToPow2 = partToSquare.mag[0] & LONG_MASK; @@ -2117,27 +2123,28 @@ public class BigInteger extends Number implements Comparable { // Perform exponentiation using repeated squaring trick while (workingExponent != 0) { - if ((workingExponent & 1)==1) + if ((workingExponent & 1) == 1) { result = result * baseToPow2; + } - if ((workingExponent >>>= 1) != 0) + if ((workingExponent >>>= 1) != 0) { baseToPow2 = baseToPow2 * baseToPow2; + } } // Multiply back the powers of two (quickly, by shifting left) - if (powersOfTwo > 0) - { + if (powersOfTwo > 0) { int bitsToShift = powersOfTwo*exponent; - if (bitsToShift + scaleFactor <= 62) // Fits in long? + if (bitsToShift + scaleFactor <= 62) { // Fits in long? return valueOf((result << bitsToShift) * newSign); - else + } else { return valueOf(result*newSign).shiftLeft(bitsToShift); + } } - else + else { return valueOf(result*newSign); - } - else - { + } + } else { // Large number algorithm. This is basically identical to // the algorithm above, but calls multiply() and square() // which may use more efficient algorithms for large numbers. @@ -2146,28 +2153,32 @@ public class BigInteger extends Number implements Comparable { int workingExponent = exponent; // Perform exponentiation using repeated squaring trick while (workingExponent != 0) { - if ((workingExponent & 1)==1) + if ((workingExponent & 1) == 1) { answer = answer.multiply(partToSquare); + } - if ((workingExponent >>>= 1) != 0) + if ((workingExponent >>>= 1) != 0) { partToSquare = partToSquare.square(); + } } // Multiply back the (exponentiated) powers of two (quickly, // by shifting left) - if (powersOfTwo > 0) + if (powersOfTwo > 0) { answer = answer.shiftLeft(powersOfTwo*exponent); + } - if (signum<0 && (exponent&1)==1) + if (signum < 0 && (exponent&1) == 1) { return answer.negate(); - else + } else { return answer; + } } } /** * Returns a BigInteger whose value is the greatest common divisor of * {@code abs(this)} and {@code abs(val)}. Returns 0 if - * {@code this==0 && val==0}. + * {@code this == 0 && val == 0}. * * @param val value with which the GCD is to be computed. * @return {@code GCD(abs(this), abs(val))} @@ -2224,7 +2235,7 @@ public class BigInteger extends Number implements Comparable { // shifts a up to len right n bits assumes no leading zeros, 00; i--) { + for (int i=len-1, c=a[i]; i > 0; i--) { int b = c; c = a[i-1]; a[i] = (c << n2) | (b >>> n); @@ -2238,7 +2249,7 @@ public class BigInteger extends Number implements Comparable { return; int n2 = 32 - n; - for (int i=0, c=a[i], m=i+len-1; i>> n2); @@ -2449,7 +2460,7 @@ public class BigInteger extends Number implements Comparable { return this; // Special case for base of zero - if (signum==0) + if (signum == 0) return ZERO; int[] base = mag.clone(); @@ -2472,7 +2483,7 @@ public class BigInteger extends Number implements Comparable { // Allocate table for precomputed odd powers of base in Montgomery form int[][] table = new int[tblmask][]; - for (int i=0; i { if (table[0].length < modLen) { int offset = modLen - table[0].length; int[] t2 = new int[modLen]; - for (int i=0; i { int[] t = Arrays.copyOf(b, modLen); // Fill in the table with odd powers of the base - for (int i=1; i { isone = false; // The main loop - while(true) { + while (true) { ebits--; // Advance the window buf <<= 1; @@ -2622,9 +2633,9 @@ public class BigInteger extends Number implements Comparable { int carry = mulAdd(n, mod, offset, mlen, inv * nEnd); c += addOne(n, offset, mlen, carry); offset++; - } while(--len > 0); + } while (--len > 0); - while(c>0) + while (c > 0) c += subN(n, mod, mlen); while (intArrayCmpToLen(n, mod, mlen) >= 0) @@ -2639,7 +2650,7 @@ public class BigInteger extends Number implements Comparable { * equal to, or greater than arg2 up to length len. */ private static int intArrayCmpToLen(int[] arg1, int[] arg2, int len) { - for (int i=0; i { private static int subN(int[] a, int[] b, int len) { long sum = 0; - while(--len >= 0) { + while (--len >= 0) { sum = (a[len] & LONG_MASK) - (b[len] & LONG_MASK) + (sum >> 32); a[len] = (int)sum; @@ -2750,7 +2761,7 @@ public class BigInteger extends Number implements Comparable { int excessBits = (numInts << 5) - p; mag[0] &= (1L << (32-excessBits)) - 1; - return (mag[0]==0 ? new BigInteger(1, mag) : new BigInteger(mag, 1)); + return (mag[0] == 0 ? new BigInteger(1, mag) : new BigInteger(mag, 1)); } /** @@ -2801,9 +2812,9 @@ public class BigInteger extends Number implements Comparable { public BigInteger shiftLeft(int n) { if (signum == 0) return ZERO; - if (n==0) + if (n == 0) return this; - if (n<0) { + if (n < 0) { if (n == Integer.MIN_VALUE) { throw new ArithmeticException("Shift distance of Integer.MIN_VALUE not supported."); } else { @@ -2855,9 +2866,9 @@ public class BigInteger extends Number implements Comparable { * @see #shiftLeft */ public BigInteger shiftRight(int n) { - if (n==0) + if (n == 0) return this; - if (n<0) { + if (n < 0) { if (n == Integer.MIN_VALUE) { throw new ArithmeticException("Shift distance of Integer.MIN_VALUE not supported."); } else { @@ -2896,7 +2907,7 @@ public class BigInteger extends Number implements Comparable { if (signum < 0) { // Find out whether any one-bits were shifted off the end. boolean onesLost = false; - for (int i=magLen-1, j=magLen-nInts; i>=j && !onesLost; i--) + for (int i=magLen-1, j=magLen-nInts; i >= j && !onesLost; i--) onesLost = (mag[i] != 0); if (!onesLost && nBits != 0) onesLost = (mag[magLen - nInts - 1] << (32 - nBits) != 0); @@ -2931,7 +2942,7 @@ public class BigInteger extends Number implements Comparable { */ public BigInteger and(BigInteger val) { int[] result = new int[Math.max(intLength(), val.intLength())]; - for (int i=0; i { */ public BigInteger or(BigInteger val) { int[] result = new int[Math.max(intLength(), val.intLength())]; - for (int i=0; i { */ public BigInteger xor(BigInteger val) { int[] result = new int[Math.max(intLength(), val.intLength())]; - for (int i=0; i { */ public BigInteger not() { int[] result = new int[intLength()]; - for (int i=0; i { */ public BigInteger andNot(BigInteger val) { int[] result = new int[Math.max(intLength(), val.intLength())]; - for (int i=0; i { * @throws ArithmeticException {@code n} is negative. */ public boolean testBit(int n) { - if (n<0) + if (n < 0) throw new ArithmeticException("Negative bit address"); return (getInt(n >>> 5) & (1 << (n & 31))) != 0; @@ -3033,13 +3044,13 @@ public class BigInteger extends Number implements Comparable { * @throws ArithmeticException {@code n} is negative. */ public BigInteger setBit(int n) { - if (n<0) + if (n < 0) throw new ArithmeticException("Negative bit address"); int intNum = n >>> 5; int[] result = new int[Math.max(intLength(), intNum+2)]; - for (int i=0; i { * @throws ArithmeticException {@code n} is negative. */ public BigInteger clearBit(int n) { - if (n<0) + if (n < 0) throw new ArithmeticException("Negative bit address"); int intNum = n >>> 5; int[] result = new int[Math.max(intLength(), ((n + 1) >>> 5) + 1)]; - for (int i=0; i { * @throws ArithmeticException {@code n} is negative. */ public BigInteger flipBit(int n) { - if (n<0) + if (n < 0) throw new ArithmeticException("Negative bit address"); int intNum = n >>> 5; int[] result = new int[Math.max(intLength(), intNum+2)]; - for (int i=0; i { * Returns the index of the rightmost (lowest-order) one bit in this * BigInteger (the number of zero bits to the right of the rightmost * one bit). Returns -1 if this BigInteger contains no one bits. - * (Computes {@code (this==0? -1 : log2(this & -this))}.) + * (Computes {@code (this == 0? -1 : log2(this & -this))}.) * * @return index of the rightmost one bit in this BigInteger. */ @@ -3112,7 +3123,7 @@ public class BigInteger extends Number implements Comparable { } else { // Search for lowest order nonzero int int i,b; - for (i=0; (b = getInt(i))==0; i++) + for (i=0; (b = getInt(i)) == 0; i++) ; lsb += (i << 5) + Integer.numberOfTrailingZeros(b); } @@ -3173,12 +3184,12 @@ public class BigInteger extends Number implements Comparable { if (bc == -1) { // bitCount not initialized yet bc = 0; // offset by one to initialize // Count the bits in the magnitude - for (int i=0; i { assert val != Long.MIN_VALUE; int[] m1 = mag; int len = m1.length; - if(len > 2) { + if (len > 2) { return 1; } if (val < 0) { val = -val; } int highWord = (int)(val >>> 32); - if (highWord==0) { + if (highWord == 0) { if (len < 1) return -1; if (len > 1) @@ -3354,7 +3365,7 @@ public class BigInteger extends Number implements Comparable { * {@code val}. If they are equal, either may be returned. */ public BigInteger min(BigInteger val) { - return (compareTo(val)<0 ? this : val); + return (compareTo(val) < 0 ? this : val); } /** @@ -3365,7 +3376,7 @@ public class BigInteger extends Number implements Comparable { * {@code val}. If they are equal, either may be returned. */ public BigInteger max(BigInteger val) { - return (compareTo(val)>0 ? this : val); + return (compareTo(val) > 0 ? this : val); } @@ -3379,7 +3390,7 @@ public class BigInteger extends Number implements Comparable { public int hashCode() { int hashCode = 0; - for (int i=0; i { /** This method is used to perform toString when arguments are small. */ private String smallToString(int radix) { - if (signum == 0) + if (signum == 0) { return "0"; + } // Compute upper bound on number of digit groups and allocate space int maxNumDigitGroups = (4*mag.length + 6)/7; @@ -3453,16 +3465,18 @@ public class BigInteger extends Number implements Comparable { // Put sign (if any) and first digit group into result buffer StringBuilder buf = new StringBuilder(numGroups*digitsPerLong[radix]+1); - if (signum<0) + if (signum < 0) { buf.append('-'); + } buf.append(digitGroup[numGroups-1]); // Append remaining digit groups padded with leading zeros - for (int i=numGroups-2; i>=0; i--) { + for (int i=numGroups-2; i >= 0; i--) { // Prepend (any) leading zeros for this digit group int numLeadingZeros = digitsPerLong[radix]-digitGroup[i].length(); - if (numLeadingZeros != 0) + if (numLeadingZeros != 0) { buf.append(zeros[numLeadingZeros]); + } buf.append(digitGroup[i]); } return buf.toString(); @@ -3490,9 +3504,11 @@ public class BigInteger extends Number implements Comparable { // Pad with internal zeros if necessary. // Don't pad if we're at the beginning of the string. - if ((s.length() < digits) && (sb.length() > 0)) - for (int i=s.length(); i 0)) { + for (int i=s.length(); i < digits; i++) { // May be a faster way to sb.append('0'); // do this? + } + } sb.append(s); return; @@ -3549,7 +3565,7 @@ public class BigInteger extends Number implements Comparable { static { zeros[63] = "000000000000000000000000000000000000000000000000000000000000000"; - for (int i=0; i<63; i++) + for (int i=0; i < 63; i++) zeros[i] = zeros[63].substring(0, i); } @@ -3587,7 +3603,7 @@ public class BigInteger extends Number implements Comparable { int byteLen = bitLength()/8 + 1; byte[] byteArray = new byte[byteLen]; - for (int i=byteLen-1, bytesCopied=4, nextInt=0, intIndex=0; i>=0; i--) { + for (int i=byteLen-1, bytesCopied=4, nextInt=0, intIndex=0; i >= 0; i--) { if (bytesCopied == 4) { nextInt = getInt(intIndex++); bytesCopied = 1; @@ -3639,7 +3655,7 @@ public class BigInteger extends Number implements Comparable { public long longValue() { long result = 0; - for (int i=1; i>=0; i--) + for (int i=1; i >= 0; i--) result = (result << 32) + (getInt(i) & LONG_MASK); return result; } @@ -3855,7 +3871,7 @@ public class BigInteger extends Number implements Comparable { int keep; // Find first nonzero byte - for (keep = 0; keep < byteLength && a[keep]==0; keep++) + for (keep = 0; keep < byteLength && a[keep] == 0; keep++) ; // Allocate new array and copy relevant part of input array @@ -3881,16 +3897,16 @@ public class BigInteger extends Number implements Comparable { int byteLength = a.length; // Find first non-sign (0xff) byte of input - for (keep=0; keep { } // Add one to one's complement to generate two's complement - for (int i=result.length-1; i>=0; i--) { + for (int i=result.length-1; i >= 0; i--) { result[i] = (int)((result[i] & LONG_MASK) + 1); if (result[i] != 0) break; @@ -3928,23 +3944,23 @@ public class BigInteger extends Number implements Comparable { int keep, j; // Find first non-sign (0xffffffff) int of input - for (keep=0; keep { byte[] result = new byte[byteLen]; for (int i = byteLen - 1, bytesCopied = 4, intIndex = len - 1, nextInt = 0; - i>=0; i--) { + i >= 0; i--) { if (bytesCopied == 4) { nextInt = mag[intIndex--]; bytesCopied = 1; diff --git a/jdk/src/share/classes/java/math/MutableBigInteger.java b/jdk/src/share/classes/java/math/MutableBigInteger.java index ace660d695e..804d8be8e7a 100644 --- a/jdk/src/share/classes/java/math/MutableBigInteger.java +++ b/jdk/src/share/classes/java/math/MutableBigInteger.java @@ -313,7 +313,7 @@ class MutableBigInteger { int blen = b.intLen; int len = intLen; if (len <= 0) - return blen <=0 ? 0 : -1; + return blen <= 0 ? 0 : -1; if (len > blen) return 1; if (len < blen - 1) @@ -340,7 +340,7 @@ class MutableBigInteger { return v < hb ? -1 : 1; carry = (bv & 1) << 31; // carray will be either 0x80000000 or 0 } - return carry == 0? 0 : -1; + return carry == 0 ? 0 : -1; } /** @@ -351,10 +351,10 @@ class MutableBigInteger { if (intLen == 0) return -1; int j, b; - for (j=intLen-1; (j>0) && (value[j+offset]==0); j--) + for (j=intLen-1; (j > 0) && (value[j+offset] == 0); j--) ; b = value[j+offset]; - if (b==0) + if (b == 0) return -1; return ((intLen-1-j)<<5) + Integer.numberOfTrailingZeros(b); } @@ -395,11 +395,11 @@ class MutableBigInteger { int indexBound = index+intLen; do { index++; - } while(index < indexBound && value[index]==0); + } while(index < indexBound && value[index] == 0); int numZeros = index - offset; intLen -= numZeros; - offset = (intLen==0 ? 0 : offset+numZeros); + offset = (intLen == 0 ? 0 : offset+numZeros); } /** @@ -420,7 +420,7 @@ class MutableBigInteger { */ int[] toIntArray() { int[] result = new int[intLen]; - for(int i=0; i value.length) return false; - if (intLen ==0) + if (intLen == 0) return true; return (value[offset] != 0); } @@ -523,10 +523,11 @@ class MutableBigInteger { * Like {@link #rightShift(int)} but {@code n} can be greater than the length of the number. */ void safeRightShift(int n) { - if (n/32 >= intLen) + if (n/32 >= intLen) { reset(); - else + } else { rightShift(n); + } } /** @@ -554,8 +555,9 @@ class MutableBigInteger { * Like {@link #leftShift(int)} but {@code n} can be zero. */ void safeLeftShift(int n) { - if (n > 0) + if (n > 0) { leftShift(n); + } } /** @@ -586,18 +588,18 @@ class MutableBigInteger { if (value.length < newLen) { // The array must grow int[] result = new int[newLen]; - for (int i=0; i= newLen) { // Use space on right - for(int i=0; ioffset; i--) { + for (int i=offset+intLen-1, c=val[i]; i > offset; i--) { int b = c; c = val[i-1]; val[i] = (c << n2) | (b >>> n); @@ -690,7 +692,7 @@ class MutableBigInteger { private final void primitiveLeftShift(int n) { int[] val = value; int n2 = 32 - n; - for (int i=offset, c=val[i], m=i+intLen-1; i>> n2); @@ -703,16 +705,16 @@ class MutableBigInteger { * low ints of this number. */ private BigInteger getLower(int n) { - if (isZero()) + if (isZero()) { return BigInteger.ZERO; - else if (intLen < n) + } else if (intLen < n) { return toBigInteger(1); - else { + } else { // strip zeros int len = n; - while (len>0 && value[offset+intLen-len]==0) + while (len > 0 && value[offset+intLen-len] == 0) len--; - int sign = len>0 ? 1 : 0; + int sign = len > 0 ? 1 : 0; return new BigInteger(Arrays.copyOfRange(value, offset+intLen-len, offset+intLen), sign); } } @@ -743,7 +745,7 @@ class MutableBigInteger { long carry = 0; // Add common parts of both numbers - while(x>0 && y>0) { + while(x > 0 && y > 0) { x--; y--; sum = (value[x+offset] & LONG_MASK) + (addend.value[y+addend.offset] & LONG_MASK) + carry; @@ -752,7 +754,7 @@ class MutableBigInteger { } // Add remainder of the longer number - while(x>0) { + while(x > 0) { x--; if (carry == 0 && result == value && rstart == (x + offset)) return; @@ -760,7 +762,7 @@ class MutableBigInteger { result[rstart--] = (int)sum; carry = sum >>> 32; } - while(y>0) { + while(y > 0) { y--; sum = (addend.value[y+addend.offset] & LONG_MASK) + carry; result[rstart--] = (int)sum; @@ -788,12 +790,13 @@ class MutableBigInteger { /** * Adds the value of {@code addend} shifted {@code n} ints to the left. - * Has the same effect as {@code addend.leftShift(32*ints); add(b);} - * but doesn't change the value of {@code b}. + * Has the same effect as {@code addend.leftShift(32*ints); add(addend);} + * but doesn't change the value of {@code addend}. */ void addShifted(MutableBigInteger addend, int n) { - if (addend.isZero()) + if (addend.isZero()) { return; + } int x = intLen; int y = addend.intLen + n; @@ -805,9 +808,9 @@ class MutableBigInteger { long carry = 0; // Add common parts of both numbers - while(x>0 && y>0) { + while (x > 0 && y > 0) { x--; y--; - int bval = y+addend.offset0) { + while (x > 0) { x--; - if (carry == 0 && result == value && rstart == (x + offset)) + if (carry == 0 && result == value && rstart == (x + offset)) { return; + } sum = (value[x+offset] & LONG_MASK) + carry; result[rstart--] = (int)sum; carry = sum >>> 32; } - while(y>0) { + while (y > 0) { y--; - int bval = y+addend.offset>> 32; @@ -881,7 +885,7 @@ class MutableBigInteger { System.arraycopy(addend.value, addend.offset, result, rstart+1-y, len); // zero the gap - for (int i=rstart+1-y+len; i0) { + while (y > 0) { x--; y--; diff = (a.value[x+a.offset] & LONG_MASK) - @@ -940,7 +944,7 @@ class MutableBigInteger { result[rstart--] = (int)diff; } // Subtract remainder of longer number - while (x>0) { + while (x > 0) { x--; diff = (a.value[x+a.offset] & LONG_MASK) - ((int)-(diff>>32)); result[rstart--] = (int)diff; @@ -961,7 +965,7 @@ class MutableBigInteger { private int difference(MutableBigInteger b) { MutableBigInteger a = this; int sign = a.compare(b); - if (sign ==0) + if (sign == 0) return 0; if (sign < 0) { MutableBigInteger tmp = a; @@ -974,14 +978,14 @@ class MutableBigInteger { int y = b.intLen; // Subtract common parts of both numbers - while (y>0) { + while (y > 0) { x--; y--; diff = (a.value[a.offset+ x] & LONG_MASK) - (b.value[b.offset+ y] & LONG_MASK) - ((int)-(diff>>32)); a.value[a.offset+x] = (int)diff; } // Subtract remainder of longer number - while (x>0) { + while (x > 0) { x--; diff = (a.value[a.offset+ x] & LONG_MASK) - ((int)-(diff>>32)); a.value[a.offset+x] = (int)diff; @@ -1050,7 +1054,7 @@ class MutableBigInteger { // Perform the multiplication word by word long ylong = y & LONG_MASK; - int[] zval = (z.value.length= 0; i--) { @@ -1144,10 +1148,12 @@ class MutableBigInteger { } MutableBigInteger divide(MutableBigInteger b, MutableBigInteger quotient, boolean needRemainder) { - if (intLen0; i--) { + for (int i=t-2; i > 0; i--) { // step 8a: compute (qi,ri) such that z=b*qi+ri ri = z.divide2n1n(bShifted, qi); @@ -1302,8 +1309,9 @@ class MutableBigInteger { int n = b.intLen; // step 1: base case - if (n%2!=0 || n=b1, let quotient=beta^n-1 and r=a12-b1*2^n+b1 quotient.ones(n); a12.add(b1); @@ -1393,16 +1400,19 @@ class MutableBigInteger { */ private MutableBigInteger getBlock(int index, int numBlocks, int blockLength) { int blockStart = index * blockLength; - if (blockStart >= intLen) + if (blockStart >= intLen) { return new MutableBigInteger(); + } int blockEnd; - if (index == numBlocks-1) + if (index == numBlocks-1) { blockEnd = intLen; - else + } else { blockEnd = (index+1) * blockLength; - if (blockEnd > intLen) + } + if (blockEnd > intLen) { return new MutableBigInteger(); + } int[] newVal = Arrays.copyOfRange(value, offset+intLen-blockEnd, offset+intLen-blockStart); return new MutableBigInteger(newVal); @@ -1473,7 +1483,7 @@ class MutableBigInteger { if (shift > 0) { divisor = new int[dlen]; copyAndShift(div.value,div.offset,dlen,divisor,0,shift); - if(Integer.numberOfLeadingZeros(value[offset])>=shift) { + if (Integer.numberOfLeadingZeros(value[offset]) >= shift) { int[] remarr = new int[intLen + 1]; rem = new MutableBigInteger(remarr); rem.intLen = intLen; @@ -1526,7 +1536,7 @@ class MutableBigInteger { int dl = divisor[1]; // D2 Initialize j - for(int j=0; j 0) rem.rightShift(shift); @@ -1892,7 +1902,7 @@ class MutableBigInteger { } // step B2 - boolean uOdd = (k==s1); + boolean uOdd = (k == s1); MutableBigInteger t = uOdd ? v: u; int tsign = uOdd ? -1 : 1; @@ -1934,9 +1944,9 @@ class MutableBigInteger { * Calculate GCD of a and b interpreted as unsigned integers. */ static int binaryGcd(int a, int b) { - if (b==0) + if (b == 0) return a; - if (a==0) + if (a == 0) return b; // Right shift a & b till their last bits equal to 1. @@ -2087,7 +2097,7 @@ class MutableBigInteger { } // The Almost Inverse Algorithm - while(!f.isOne()) { + while (!f.isOne()) { // If gcd(f, g) != 1, number is not invertible modulo mod if (f.isZero()) throw new ArithmeticException("BigInteger not invertible."); @@ -2132,7 +2142,7 @@ class MutableBigInteger { // Set r to the multiplicative inverse of p mod 2^32 int r = -inverseMod32(p.value[p.offset+p.intLen-1]); - for(int i=0, numWords = k >> 5; i> 5; i < numWords; i++) { // V = R * c (mod 2^j) int v = r * c.value[c.offset + c.intLen-1]; // c = c + (v * p) diff --git a/jdk/test/java/math/BigInteger/BigIntegerTest.java b/jdk/test/java/math/BigInteger/BigIntegerTest.java index e02c3e52ddc..47f6af56c2e 100644 --- a/jdk/test/java/math/BigInteger/BigIntegerTest.java +++ b/jdk/test/java/math/BigInteger/BigIntegerTest.java @@ -48,7 +48,7 @@ import java.util.Random; * * The tests are performed on arrays of random numbers which are * generated by a Random class as well as special cases which - * throw in boundary numbers such as 0, 1, maximum SIZEd, etc. + * throw in boundary numbers such as 0, 1, maximum sized, etc. * */ public class BigIntegerTest { @@ -1008,7 +1008,7 @@ public class BigIntegerTest { /* * Get a random or boundary-case number. This is designed to provide - * a lot of numbers that will find failure points, such as max SIZEd + * a lot of numbers that will find failure points, such as max sized * numbers, empty BigIntegers, etc. * * If order is less than 2, order is changed to 2. From 7e692e2b86bd24de6edb2301a7ce8cb2362c0f61 Mon Sep 17 00:00:00 2001 From: Joe Darcy Date: Sat, 27 Jul 2013 10:27:04 -0700 Subject: [PATCH 039/120] 8021609: Fix doclint issues in java.nio.charset Reviewed-by: alanb --- .../nio/charset/Charset-X-Coder.java.template | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/jdk/src/share/classes/java/nio/charset/Charset-X-Coder.java.template b/jdk/src/share/classes/java/nio/charset/Charset-X-Coder.java.template index 335194eef52..106f7b23b87 100644 --- a/jdk/src/share/classes/java/nio/charset/Charset-X-Coder.java.template +++ b/jdk/src/share/classes/java/nio/charset/Charset-X-Coder.java.template @@ -41,7 +41,7 @@ import java.util.Arrays; * An engine that can transform a sequence of $itypesPhrase$ into a sequence of * $otypesPhrase$. * - * + * * *

The input $itype$ sequence is provided in a $itype$ buffer or a series * of such buffers. The output $otype$ sequence is written to a $otype$ buffer @@ -76,22 +76,22 @@ import java.util.Arrays; * examine this object and fill the input buffer, flush the output buffer, or * attempt to recover from $a$ $coding$ error, as appropriate, and try again. * - * + * * *

There are two general types of $coding$ errors. If the input $itype$ * sequence is $notLegal$ then the input is considered malformed. If * the input $itype$ sequence is legal but cannot be mapped to a valid * $outSequence$ then an unmappable character has been encountered. * - * + * * *

How $a$ $coding$ error is handled depends upon the action requested for * that type of error, which is described by an instance of the {@link - * CodingErrorAction} class. The possible error actions are to {@link - * CodingErrorAction#IGNORE ignore} the erroneous input, {@link - * CodingErrorAction#REPORT report} the error to the invoker via - * the returned {@link CoderResult} object, or {@link CodingErrorAction#REPLACE - * replace} the erroneous input with the current value of the + * CodingErrorAction} class. The possible error actions are to {@linkplain + * CodingErrorAction#IGNORE ignore} the erroneous input, {@linkplain + * CodingErrorAction#REPORT report} the error to the invoker via + * the returned {@link CoderResult} object, or {@linkplain CodingErrorAction#REPLACE + * replace} the erroneous input with the current value of the * replacement $replTypeName$. The replacement * #if[encoder] @@ -106,7 +106,7 @@ import java.util.Arrays; * replaceWith} method. * *

The default action for malformed-input and unmappable-character errors - * is to {@link CodingErrorAction#REPORT report} them. The + * is to {@linkplain CodingErrorAction#REPORT report} them. The * malformed-input error action may be changed via the {@link * #onMalformedInput(CodingErrorAction) onMalformedInput} method; the * unmappable-character action may be changed via the {@link @@ -177,7 +177,7 @@ public abstract class Charset$Coder$ { * @param replacement * The initial replacement; must not be null, must have * non-zero length, must not be longer than max$ItypesPerOtype$, - * and must be {@link #isLegalReplacement legal} + * and must be {@linkplain #isLegalReplacement legal} * * @throws IllegalArgumentException * If the preconditions on the parameters do not hold @@ -276,7 +276,7 @@ public abstract class Charset$Coder$ { * The new replacement; must not be null, must have * non-zero length, must not be longer than the value returned by * the {@link #max$ItypesPerOtype$() max$ItypesPerOtype$} method, and - * must be {@link #isLegalReplacement legal} + * must be {@link #isLegalReplacement legal} #end[encoder] * * @return This $coder$ @@ -495,24 +495,24 @@ public abstract class Charset$Coder$ { * typically done by draining any $code$d $otype$s from the output * buffer.

* - *

  • A {@link CoderResult#malformedForLength - * malformed-input} result indicates that a malformed-input + *

  • A {@linkplain CoderResult#malformedForLength + * malformed-input} result indicates that a malformed-input * error has been detected. The malformed $itype$s begin at the input * buffer's (possibly incremented) position; the number of malformed * $itype$s may be determined by invoking the result object's {@link * CoderResult#length() length} method. This case applies only if the - * {@link #onMalformedInput malformed action} of this $coder$ + * {@linkplain #onMalformedInput malformed action} of this $coder$ * is {@link CodingErrorAction#REPORT}; otherwise the malformed input * will be ignored or replaced, as requested.

    • * - *

  • An {@link CoderResult#unmappableForLength - * unmappable-character} result indicates that an + *

  • An {@linkplain CoderResult#unmappableForLength + * unmappable-character} result indicates that an * unmappable-character error has been detected. The $itype$s that * $code$ the unmappable character begin at the input buffer's (possibly * incremented) position; the number of such $itype$s may be determined * by invoking the result object's {@link CoderResult#length() length} - * method. This case applies only if the {@link #onUnmappableCharacter - * unmappable action} of this $coder$ is {@link + * method. This case applies only if the {@linkplain #onUnmappableCharacter + * unmappable action} of this $coder$ is {@link * CodingErrorAction#REPORT}; otherwise the unmappable character will be * ignored or replaced, as requested.

    • * From 164f41212a9040f1f10f2f2ab91f6f54a6605209 Mon Sep 17 00:00:00 2001 From: Mike Duigou Date: Sat, 27 Jul 2013 12:26:01 -0700 Subject: [PATCH 040/120] 8021588: Remove explicit othervm execution from jdk/test/Makefile Reviewed-by: alanb --- jdk/test/Makefile | 126 +++++++++++++++------------------------------- 1 file changed, 41 insertions(+), 85 deletions(-) diff --git a/jdk/test/Makefile b/jdk/test/Makefile index de6b4a783ff..7a099641633 100644 --- a/jdk/test/Makefile +++ b/jdk/test/Makefile @@ -362,23 +362,6 @@ ifndef TESTDIRS TESTDIRS = demo endif -# Agentvm settings (default is false) -ifndef USE_JTREG_AGENTVM - USE_JTREG_AGENTVM=false -endif -# With agentvm, you cannot use -javaoptions? -ifeq ($(USE_JTREG_AGENTVM),true) - JTREG_AGENTVM_OPTION = -agentvm - EXTRA_JTREG_OPTIONS += $(JTREG_AGENTVM_OPTION) $(JAVA_ARGS) $(JAVA_ARGS:%=-vmoption:%) - JTREG_TEST_OPTIONS = $(JAVA_VM_ARGS:%=-vmoption:%) -else - JTREG_TEST_OPTIONS = $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_VM_ARGS:%=-vmoption:%) -endif - -ifdef CONCURRENCY - EXTRA_JTREG_OPTIONS += -concurrency:$(CONCURRENCY) -endif - # Some tests annoy me and fail frequently PROBLEM_LIST=ProblemList.txt PROBLEM_LISTS=$(PROBLEM_LIST) $(wildcard closed/$(PROBLEM_LIST)) @@ -414,13 +397,9 @@ define TestDirs $(foreach i,$1,$(wildcard ${i})) $(foreach i,$1,$(wildcard closed/${i})) endef # Running batches of tests with or without agentvm -define RunAgentvmBatch -$(ECHO) "Running tests in agentvm mode: $?" -$(MAKE) TEST_DEPENDENCIES="$?" TESTDIRS="$?" USE_JTREG_AGENTVM=true UNIQUE_DIR=$@ jtreg_tests -endef -define RunOthervmBatch -$(ECHO) "Running tests in othervm mode: $?" -$(MAKE) TEST_DEPENDENCIES="$?" TESTDIRS="$?" USE_JTREG_AGENTVM=false UNIQUE_DIR=$@ jtreg_tests +define RunBatch +$(ECHO) "Running tests: $?" +$(MAKE) TEST_DEPENDENCIES="$?" TESTDIRS="$?" UNIQUE_DIR=$@ jtreg_tests endef define SummaryInfo $(ECHO) "########################################################" @@ -435,76 +414,60 @@ endef JDK_DEFAULT_TARGETS = JDK_ALL_TARGETS = -# Stable othervm testruns (minus items from PROBLEM_LIST) -# Using agentvm has problems, and doesn't help performance as much as others. JDK_ALL_TARGETS += jdk_awt jdk_awt: $(call TestDirs, com/sun/awt java/awt sun/awt \ javax/imageio javax/print sun/pisces) - $(call RunOthervmBatch) + $(call RunBatch) -# Stable othervm testruns (minus items from PROBLEM_LIST) JDK_ALL_TARGETS += jdk_beans1 JDK_DEFAULT_TARGETS += jdk_beans1 jdk_beans1: $(call TestDirs, \ java/beans/beancontext java/beans/PropertyChangeSupport \ java/beans/Introspector java/beans/Performance \ java/beans/VetoableChangeSupport java/beans/Statement) - $(call RunOthervmBatch) + $(call RunBatch) -# Stable othervm testruns (minus items from PROBLEM_LIST) -# Using agentvm has serious problems with these tests JDK_ALL_TARGETS += jdk_beans2 jdk_beans2: $(call TestDirs, \ java/beans/Beans java/beans/EventHandler java/beans/XMLDecoder \ java/beans/PropertyEditor) - $(call RunOthervmBatch) + $(call RunBatch) -# Stable othervm testruns (minus items from PROBLEM_LIST) -# Using agentvm has serious problems with these tests JDK_ALL_TARGETS += jdk_beans3 jdk_beans3: $(call TestDirs, java/beans/XMLEncoder) - $(call RunOthervmBatch) + $(call RunBatch) # All beans tests jdk_beans: jdk_beans1 jdk_beans2 jdk_beans3 @$(SummaryInfo) -# Stable agentvm testruns (minus items from PROBLEM_LIST) JDK_ALL_TARGETS += jdk_io JDK_DEFAULT_TARGETS += jdk_io jdk_io: $(call TestDirs, java/io) - $(call RunAgentvmBatch) + $(call RunBatch) -# Stable agentvm testruns (minus items from PROBLEM_LIST) JDK_ALL_TARGETS += jdk_lang JDK_DEFAULT_TARGETS += jdk_lang jdk_lang: $(call TestDirs, java/lang sun/invoke sun/misc sun/reflect vm) - $(call RunAgentvmBatch) + $(call RunBatch) -# Stable othervm testruns (minus items from PROBLEM_LIST) -# Using agentvm has serious problems with these tests JDK_ALL_TARGETS += jdk_jmx jdk_jmx: $(call TestDirs, javax/management com/sun/jmx) - $(call RunOthervmBatch) + $(call RunBatch) -# Stable othervm testruns (minus items from PROBLEM_LIST) -# Using agentvm has serious problems with these tests JDK_ALL_TARGETS += jdk_management jdk_management: $(call TestDirs, com/sun/management sun/management) - $(call RunOthervmBatch) + $(call RunBatch) -# Stable agentvm testruns (minus items from PROBLEM_LIST) JDK_ALL_TARGETS += jdk_math JDK_DEFAULT_TARGETS += jdk_math jdk_math: $(call TestDirs, java/math) - $(call RunAgentvmBatch) + $(call RunBatch) -# Stable agentvm testruns (TestNG) JDK_DEFAULT_TARGETS += jdk_time jdk_time: $(call TestDirs, java/time) - $(call RunAgentvmBatch) + $(call RunBatch) -# Stable agentvm testruns (minus items from PROBLEM_LIST) JDK_ALL_TARGETS += jdk_other JDK_DEFAULT_TARGETS += jdk_other jdk_other: $(call TestDirs, \ @@ -522,97 +485,79 @@ jdk_other: $(call TestDirs, \ com/sun/corba \ com/sun/tracing \ sun/usagetracker) - $(call RunAgentvmBatch) + $(call RunBatch) -# Stable agentvm testruns (minus items from PROBLEM_LIST) JDK_ALL_TARGETS += jdk_net JDK_DEFAULT_TARGETS += jdk_net jdk_net: $(call TestDirs, com/sun/net java/net sun/net com/oracle/net) - $(call RunAgentvmBatch) + $(call RunBatch) -# Stable agentvm testruns (minus items from PROBLEM_LIST) jdk_nio: $(call TestDirs, java/nio sun/nio com/oracle/nio) $(call SharedLibraryPermissions,java/nio/channels) - $(call RunAgentvmBatch) + $(call RunBatch) -# Stable agentvm testruns (minus items from PROBLEM_LIST) jdk_sctp: $(call TestDirs, com/sun/nio/sctp) - $(call RunAgentvmBatch) + $(call RunBatch) -# Stable othervm testruns (minus items from PROBLEM_LIST) -# Using agentvm has serious problems with these tests JDK_ALL_TARGETS += jdk_rmi jdk_rmi: $(call TestDirs, java/rmi sun/rmi javax/rmi/ssl) - $(call RunOthervmBatch) + $(call RunBatch) -# Stable agentvm testruns (minus items from PROBLEM_LIST) JDK_ALL_TARGETS += jdk_security1 JDK_DEFAULT_TARGETS += jdk_security1 jdk_security1: $(call TestDirs, java/security) - $(call RunAgentvmBatch) + $(call RunBatch) -# Stable agentvm testruns (minus items from PROBLEM_LIST) JDK_ALL_TARGETS += jdk_security2 jdk_security2: $(call TestDirs, javax/crypto javax/xml/crypto com/sun/crypto) - $(call RunAgentvmBatch) + $(call RunBatch) -# Stable agentvm testruns (minus items from PROBLEM_LIST) JDK_ALL_TARGETS += jdk_security3 jdk_security3: $(call TestDirs, com/sun/security lib/security javax/security \ sun/security com/sun/org/apache/xml/internal/security \ com/oracle/security) $(call SharedLibraryPermissions,sun/security) - $(call RunAgentvmBatch) + $(call RunBatch) # All security tests jdk_security: jdk_security1 jdk_security2 jdk_security3 @$(SummaryInfo) -# Stable agentvm testruns (minus items from PROBLEM_LIST) JDK_ALL_TARGETS += jdk_sound jdk_sound: $(call TestDirs, javax/sound) - $(call RunAgentvmBatch) + $(call RunBatch) -# Stable othervm testruns (minus items from PROBLEM_LIST) -# Using agentvm has problems, and doesn't help performance as much as others. JDK_ALL_TARGETS += jdk_swing jdk_swing: $(call TestDirs, javax/swing sun/java2d \ demo/jfc com/sun/java/swing) - $(call RunOthervmBatch) + $(call RunBatch) -# Stable agentvm testruns (minus items from PROBLEM_LIST) JDK_ALL_TARGETS += jdk_text JDK_DEFAULT_TARGETS += jdk_text jdk_text: $(call TestDirs, java/text sun/text) - $(call RunAgentvmBatch) + $(call RunBatch) -# Stable agentvm testruns (minus items from PROBLEM_LIST) JDK_ALL_TARGETS += jdk_jdi jdk_jdi: $(call TestDirs, com/sun/jdi) - $(call RunAgentvmBatch) + $(call RunBatch) -# Stable othervm testruns (minus items from PROBLEM_LIST) -# Using agentvm has serious problems with these tests JDK_ALL_TARGETS += jdk_tools jdk_tools: $(call TestDirs, com/sun/tools sun/jvmstat sun/tools tools) $(call SharedLibraryPermissions,tools/launcher) - $(call RunAgentvmBatch) + $(call RunBatch) -# Stable othervm testruns (minus items from PROBLEM_LIST) -# Using agentvm has serious problems with these tests ifdef OPENJDK jdk_jfr: else JDK_ALL_TARGETS += jdk_jfr jdk_jfr: $(call TestDirs, com/oracle/jfr) - $(call RunOthervmBatch) + $(call RunBatch) endif -# Stable agentvm testruns (minus items from PROBLEM_LIST) JDK_ALL_TARGETS += jdk_util JDK_DEFAULT_TARGETS += jdk_util jdk_util: $(call TestDirs, java/util sun/util) - $(call RunAgentvmBatch) + $(call RunBatch) # ------------------------------------------------------------------ @@ -638,10 +583,14 @@ PHONY_LIST += $(JDK_ALL_TARGETS) jdk_default jdk_core jdk_all # ------------------------------------------------------------------ +ifdef CONCURRENCY + EXTRA_JTREG_OPTIONS += -concurrency:$(CONCURRENCY) +endif + # Default JTREG to run (win32 script works for everybody) JTREG = $(JT_HOME)/win32/bin/jtreg -# Add any extra options (agentvm etc.) -JTREG_BASIC_OPTIONS += $(EXTRA_JTREG_OPTIONS) +# run in agentvm mode +JTREG_BASIC_OPTIONS += -agentvm # Only run automatic tests JTREG_BASIC_OPTIONS += -a # Always turn on assertions @@ -660,6 +609,13 @@ JTREG_BASIC_OPTIONS += $(JTREG_TIMEOUT_OPTION) # Set the max memory for jtreg control vm JTREG_MEMORY_OPTION = -J-Xmx512m JTREG_BASIC_OPTIONS += $(JTREG_MEMORY_OPTION) +# Add any extra options +JTREG_BASIC_OPTIONS += $(EXTRA_JTREG_OPTIONS) +# Set other vm and test options +JTREG_TEST_OPTIONS = $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_VM_ARGS:%=-vmoption:%) +# Set the GC options for test vms +#JTREG_GC_OPTION = -vmoption:-XX:+UseSerialGC +#JTREG_TEST_OPTIONS += $(JTREG_GC_OPTION) # Set the max memory for jtreg target test vms JTREG_TESTVM_MEMORY_OPTION = -vmoption:-Xmx512m JTREG_TEST_OPTIONS += $(JTREG_TESTVM_MEMORY_OPTION) From 9bfff4cae354a812b637f1feacfd9a45eeef6ef7 Mon Sep 17 00:00:00 2001 From: Athijegannathan Sundararajan Date: Mon, 29 Jul 2013 21:39:21 +0530 Subject: [PATCH 041/120] 8021773: print function as defined by jrunscript's init.js script is incompatible with nashorn's definition Reviewed-by: hannesw, lagergren --- .../com/sun/tools/script/shell/init.js | 32 ++++--------------- 1 file changed, 7 insertions(+), 25 deletions(-) diff --git a/jdk/src/share/classes/com/sun/tools/script/shell/init.js b/jdk/src/share/classes/com/sun/tools/script/shell/init.js index 5f294b4684f..ae2cdc42d95 100644 --- a/jdk/src/share/classes/com/sun/tools/script/shell/init.js +++ b/jdk/src/share/classes/com/sun/tools/script/shell/init.js @@ -332,7 +332,7 @@ function streamClose(stream) { * @param str input from which script is loaded and evaluated */ if (typeof(load) == 'undefined') { - var load = function(str) { + this.load = function(str) { var stream = inStream(str); var bstream = new BufferedInputStream(stream); var reader = new BufferedReader(new InputStreamReader(bstream)); @@ -712,7 +712,7 @@ if (typeof(exit) == 'undefined') { * @param exitCode integer code returned to OS shell. * optional, defaults to 0 */ - var exit = function (code) { + this.exit = function (code) { if (code) { java.lang.System.exit(code + 0); } else { @@ -725,7 +725,7 @@ if (typeof(quit) == 'undefined') { /** * synonym for exit */ - var quit = function (code) { + this.quit = function (code) { exit(code); } } @@ -881,7 +881,7 @@ if (typeof(printf) == 'undefined') { * @param format string to format the rest of the print items * @param args variadic argument list */ - var printf = function (format, args/*, more args*/) { + this.printf = function (format, args/*, more args*/) { var array = java.lang.reflect.Array.newInstance(java.lang.Object, arguments.length - 1); for (var i = 0; i < array.length; i++) { @@ -921,25 +921,7 @@ function read(prompt, multiline) { } if (typeof(println) == 'undefined') { - var print = function(str, newline) { - if (typeof(str) == 'undefined') { - str = 'undefined'; - } else if (str == null) { - str = 'null'; - } - - if (!(out instanceof java.io.PrintWriter)) { - out = new java.io.PrintWriter(out); - } - - out.print(String(str)); - if (newline) { - out.print('\n'); - } - out.flush(); - } - - var println = function(str) { - print(str, true); - }; + // just synonym to print + this.println = print; } + From ea8bc257637c7e9f71297acdd638d656f7c5a3a3 Mon Sep 17 00:00:00 2001 From: Paul Sandoz Date: Mon, 29 Jul 2013 19:41:02 +0100 Subject: [PATCH 042/120] 8020156: TreeMap.values().spliterator() does not report ORDERED 8020009: TreeMap.entrySet().spliterator() reports SORTED + null comparator but the elements are not Comparable Reviewed-by: mduigou --- jdk/src/share/classes/java/util/TreeMap.java | 23 ++- .../SpliteratorCharacteristics.java | 147 ++++++++++++++++++ 2 files changed, 166 insertions(+), 4 deletions(-) create mode 100644 jdk/test/java/util/Spliterator/SpliteratorCharacteristics.java diff --git a/jdk/src/share/classes/java/util/TreeMap.java b/jdk/src/share/classes/java/util/TreeMap.java index 44d7449e07a..352ac237ee8 100644 --- a/jdk/src/share/classes/java/util/TreeMap.java +++ b/jdk/src/share/classes/java/util/TreeMap.java @@ -25,6 +25,7 @@ package java.util; +import java.io.Serializable; import java.util.function.BiConsumer; import java.util.function.BiFunction; import java.util.function.Consumer; @@ -2865,7 +2866,7 @@ public class TreeMap } public int characteristics() { - return (side == 0 ? Spliterator.SIZED : 0); + return (side == 0 ? Spliterator.SIZED : 0) | Spliterator.ORDERED; } } @@ -2942,9 +2943,23 @@ public class TreeMap } @Override - public Comparator> getComparator() { - return tree.comparator != null ? - Map.Entry.comparingByKey(tree.comparator) : null; + public Comparator> getComparator() { + // Since SORTED is reported and Map.Entry elements are not comparable + // then a non-null comparator needs to be returned + if (tree.comparator != null) { + // Adapt the existing non-null comparator to compare entries + // by key + return Map.Entry.comparingByKey(tree.comparator); + } + else { + // Return a comparator of entries by key, with K assumed to be + // of Comparable + return (Comparator> & Serializable) (e1, e2) -> { + @SuppressWarnings("unchecked") + Comparable k1 = (Comparable) e1.getKey(); + return k1.compareTo(e2.getKey()); + }; + } } } } diff --git a/jdk/test/java/util/Spliterator/SpliteratorCharacteristics.java b/jdk/test/java/util/Spliterator/SpliteratorCharacteristics.java new file mode 100644 index 00000000000..d37a2ac9036 --- /dev/null +++ b/jdk/test/java/util/Spliterator/SpliteratorCharacteristics.java @@ -0,0 +1,147 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * @test + * @bug 8020156 8020009 + * @run testng SpliteratorCharacteristics + */ + +import org.testng.annotations.Test; + +import java.util.Arrays; +import java.util.Collection; +import java.util.Comparator; +import java.util.Spliterator; +import java.util.TreeMap; +import java.util.TreeSet; + +import static org.testng.Assert.*; + +@Test +public class SpliteratorCharacteristics { + + public void testTreeMap() { + TreeMap tm = new TreeMap<>(); + tm.put(1, "4"); + tm.put(2, "3"); + tm.put(3, "2"); + tm.put(4, "1"); + + assertCharacteristics(tm.keySet(), + Spliterator.SIZED | Spliterator.DISTINCT | + Spliterator.SORTED | Spliterator.ORDERED); + assertNullComparator(tm.keySet()); + + assertCharacteristics(tm.values(), + Spliterator.SIZED | Spliterator.ORDERED); + assertISEComparator(tm.values()); + + assertCharacteristics(tm.entrySet(), + Spliterator.SIZED | Spliterator.DISTINCT | + Spliterator.SORTED | Spliterator.ORDERED); + assertNotNullComparator(tm.entrySet()); + } + + public void testTreeMapWithComparator() { + TreeMap tm = new TreeMap<>(Comparator.reverseOrder()); + tm.put(1, "4"); + tm.put(2, "3"); + tm.put(3, "2"); + tm.put(4, "1"); + + assertCharacteristics(tm.keySet(), + Spliterator.SIZED | Spliterator.DISTINCT | + Spliterator.SORTED | Spliterator.ORDERED); + assertNotNullComparator(tm.keySet()); + + assertCharacteristics(tm.values(), + Spliterator.SIZED | Spliterator.ORDERED); + assertISEComparator(tm.values()); + + assertCharacteristics(tm.entrySet(), + Spliterator.SIZED | Spliterator.DISTINCT | + Spliterator.SORTED | Spliterator.ORDERED); + assertNotNullComparator(tm.entrySet()); + } + + public void testTreeSet() { + TreeSet ts = new TreeSet<>(); + ts.addAll(Arrays.asList(1, 2, 3, 4)); + + assertCharacteristics(ts, + Spliterator.SIZED | Spliterator.DISTINCT | + Spliterator.SORTED | Spliterator.ORDERED); + assertNullComparator(ts); + } + + public void testTreeSetWithComparator() { + TreeSet ts = new TreeSet<>(Comparator.reverseOrder()); + ts.addAll(Arrays.asList(1, 2, 3, 4)); + + assertCharacteristics(ts, + Spliterator.SIZED | Spliterator.DISTINCT | + Spliterator.SORTED | Spliterator.ORDERED); + assertNotNullComparator(ts); + } + + + void assertCharacteristics(Collection c, int expectedCharacteristics) { + assertCharacteristics(c.spliterator(), expectedCharacteristics); + } + + void assertCharacteristics(Spliterator s, int expectedCharacteristics) { + assertTrue(s.hasCharacteristics(expectedCharacteristics)); + } + + void assertNullComparator(Collection c) { + assertNullComparator(c.spliterator()); + } + + void assertNullComparator(Spliterator s) { + assertNull(s.getComparator()); + } + + void assertNotNullComparator(Collection c) { + assertNotNullComparator(c.spliterator()); + } + + void assertNotNullComparator(Spliterator s) { + assertNotNull(s.getComparator()); + } + + void assertISEComparator(Collection c) { + assertISEComparator(c.spliterator()); + } + + void assertISEComparator(Spliterator s) { + boolean caught = false; + try { + s.getComparator(); + } + catch (IllegalStateException e) { + caught = true; + } + assertTrue(caught); + } +} From a7dbbbddcd57ef9efe793bb279927ca40755145f Mon Sep 17 00:00:00 2001 From: Anthony Scarpino Date: Fri, 19 Jul 2013 11:34:33 -0700 Subject: [PATCH 043/120] 8012971: PKCS11Test hiding exception failures Reviewed-by: vinnie, valeriep --- jdk/test/ProblemList.txt | 17 +++++++++ jdk/test/sun/security/pkcs11/PKCS11Test.java | 38 ++++++++++++++------ jdk/test/sun/security/pkcs11/SecmodTest.java | 1 + 3 files changed, 45 insertions(+), 11 deletions(-) diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt index a2e02261a92..2fb32245adf 100644 --- a/jdk/test/ProblemList.txt +++ b/jdk/test/ProblemList.txt @@ -255,6 +255,23 @@ sun/rmi/transport/proxy/EagerHttpFallback.java generic-all # jdk_security +# 8012971 PKCS11Test hiding exception failures +sun/security/pkcs11/KeyStore/SecretKeysBasic.java solaris-all +sun/security/pkcs11/KeyStore/SecretKeysBasic.java linux-all +sun/security/pkcs11/ec/TestCurves.java solaris-all +sun/security/pkcs11/ec/TestCurves.java linux-all +sun/security/pkcs11/ec/TestECDH.java solaris-all +sun/security/pkcs11/ec/TestECDH2.java solaris-all +sun/security/pkcs11/ec/TestECDH2.java linux-all +sun/security/pkcs11/ec/TestECDSA.java solaris-all +sun/security/pkcs11/ec/TestECDSA.java linux-all +sun/security/pkcs11/ec/TestECDSA2.java solaris-all +sun/security/pkcs11/ec/TestECDSA2.java linux-all +sun/security/pkcs11/ec/TestECGenSpec.java solaris-all +sun/security/pkcs11/ec/TestECGenSpec.java linux-all +sun/security/pkcs11/ec/TestKeyFactory.java solaris-all +sun/security/pkcs11/ec/TestKeyFactory.java linux-all + # 7164518: no PortUnreachableException on Mac sun/security/krb5/auto/Unreachable.java macosx-all diff --git a/jdk/test/sun/security/pkcs11/PKCS11Test.java b/jdk/test/sun/security/pkcs11/PKCS11Test.java index deb7302a2da..eff8a44b6fa 100644 --- a/jdk/test/sun/security/pkcs11/PKCS11Test.java +++ b/jdk/test/sun/security/pkcs11/PKCS11Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -54,6 +54,11 @@ public abstract class PKCS11Test { static String NSPR_PREFIX = ""; + // The NSS library we need to search for in getNSSLibDir() + // Default is "libsoftokn3.so", listed as "softokn3" + // The other is "libnss3.so", listed as "nss3". + static String nss_library = "softokn3"; + static Provider getSunPKCS11(String config) throws Exception { Class clazz = Class.forName("sun.security.pkcs11.SunPKCS11"); Constructor cons = clazz.getConstructor(new Class[] {String.class}); @@ -79,24 +84,28 @@ public abstract class PKCS11Test { testNSS(test); testDeimos(test); } finally { + // NOTE: Do not place a 'return' in any finally block + // as it will suppress exceptions and hide test failures. Provider[] newProviders = Security.getProviders(); + boolean found = true; // Do not restore providers if nothing changed. This is especailly // useful for ./Provider/Login.sh, where a SecurityManager exists. if (oldProviders.length == newProviders.length) { - boolean found = false; + found = false; for (int i = 0; i Date: Fri, 19 Jul 2013 14:43:45 -0700 Subject: [PATCH 044/120] 8012263: ciReplay: gracefully exit & report meaningful error when replay data parsing fails Find_method could return NULL so need explicitly check if there is error after parse_method, exit on error to avoid crash. Reviewed-by: kvn, twisti --- hotspot/src/share/vm/ci/ciReplay.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hotspot/src/share/vm/ci/ciReplay.cpp b/hotspot/src/share/vm/ci/ciReplay.cpp index 71813b8f338..837d529ca13 100644 --- a/hotspot/src/share/vm/ci/ciReplay.cpp +++ b/hotspot/src/share/vm/ci/ciReplay.cpp @@ -299,7 +299,7 @@ class CompileReplay : public StackObj { Symbol* method_signature = parse_symbol(CHECK_NULL); Method* m = k->find_method(method_name, method_signature); if (m == NULL) { - report_error("can't find method"); + report_error("Can't find method"); } return m; } @@ -398,8 +398,8 @@ class CompileReplay : public StackObj { // compile void process_compile(TRAPS) { - // methodHandle method; Method* method = parse_method(CHECK); + if (had_error()) return; int entry_bci = parse_int("entry_bci"); const char* comp_level_label = "comp_level"; int comp_level = parse_int(comp_level_label); @@ -440,6 +440,7 @@ class CompileReplay : public StackObj { // void process_ciMethod(TRAPS) { Method* method = parse_method(CHECK); + if (had_error()) return; ciMethodRecord* rec = new_ciMethod(method); rec->invocation_counter = parse_int("invocation_counter"); rec->backedge_counter = parse_int("backedge_counter"); @@ -451,6 +452,7 @@ class CompileReplay : public StackObj { // ciMethodData orig # # ... data # # ... oops void process_ciMethodData(TRAPS) { Method* method = parse_method(CHECK); + if (had_error()) return; /* jsut copied from Method, to build interpret data*/ if (InstanceRefKlass::owns_pending_list_lock((JavaThread*)THREAD)) { return; From bbd8917a4f42af419b3f30d90816991d6222d9ab Mon Sep 17 00:00:00 2001 From: Sergey Malenkov Date: Mon, 22 Jul 2013 15:36:30 +0400 Subject: [PATCH 045/120] 8019975: closed/javax/swing/JFileChooser/4966171/bug4966171.java throws java.io.NotSerializableException: javax.swing.plaf.basic.BasicFileChooserUI$AcceptAllFileFilter Reviewed-by: alexsch --- jdk/src/share/classes/javax/swing/JFileChooser.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jdk/src/share/classes/javax/swing/JFileChooser.java b/jdk/src/share/classes/javax/swing/JFileChooser.java index d30c69675ae..e053b7af081 100644 --- a/jdk/src/share/classes/javax/swing/JFileChooser.java +++ b/jdk/src/share/classes/javax/swing/JFileChooser.java @@ -1149,9 +1149,10 @@ public class JFileChooser extends JComponent implements Accessible { int index = filters.indexOf(f); if (index >= 0) { if(getFileFilter() == f) { - if (isAcceptAllFileFilterUsed()) { + FileFilter aaff = getAcceptAllFileFilter(); + if (isAcceptAllFileFilterUsed() && (aaff != f)) { // choose default filter if it is used - setFileFilter(getAcceptAllFileFilter()); + setFileFilter(aaff); } else if (index > 0) { // choose the first filter, because it is not removed From 54198bc15ed22eb4c7a323547a504974f052ac9b Mon Sep 17 00:00:00 2001 From: Sergey Malenkov Date: Mon, 22 Jul 2013 20:33:35 +0400 Subject: [PATCH 046/120] 8015926: NPE when using SynthTreeUI's expandPath() Reviewed-by: alexsch --- .../javax/swing/plaf/synth/SynthTreeUI.java | 8 +- .../javax/swing/plaf/synth/Test8015926.java | 98 +++++++++++++++++++ 2 files changed, 102 insertions(+), 4 deletions(-) create mode 100644 jdk/test/javax/swing/plaf/synth/Test8015926.java diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java b/jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java index f1a9b15f862..e1af32f73ef 100644 --- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java +++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java @@ -344,7 +344,8 @@ public class SynthTreeUI extends BasicTreeUI configureRenderer(cellContext); while (!done && paintingEnumerator.hasMoreElements()) { path = (TreePath)paintingEnumerator.nextElement(); - if (path != null) { + bounds = getPathBounds(tree, path); + if ((path != null) && (bounds != null)) { isLeaf = treeModel.isLeaf(path.getLastPathComponent()); if (isLeaf) { isExpanded = hasBeenExpanded = false; @@ -353,7 +354,6 @@ public class SynthTreeUI extends BasicTreeUI isExpanded = treeState.getExpandedState(path); hasBeenExpanded = tree.hasBeenExpanded(path); } - bounds = getPathBounds(tree, path); rowBounds.y = bounds.y; rowBounds.height = bounds.height; paintRow(renderer, dtcr, context, cellContext, g, @@ -383,7 +383,8 @@ public class SynthTreeUI extends BasicTreeUI paintingEnumerator = treeState.getVisiblePathsFrom(initialPath); while (!done && paintingEnumerator.hasMoreElements()) { path = (TreePath)paintingEnumerator.nextElement(); - if (path != null) { + bounds = getPathBounds(tree, path); + if ((path != null) && (bounds != null)) { isLeaf = treeModel.isLeaf(path.getLastPathComponent()); if (isLeaf) { isExpanded = hasBeenExpanded = false; @@ -392,7 +393,6 @@ public class SynthTreeUI extends BasicTreeUI isExpanded = treeState.getExpandedState(path); hasBeenExpanded = tree.hasBeenExpanded(path); } - bounds = getPathBounds(tree, path); // See if the vertical line to the parent has been drawn. parentPath = path.getParentPath(); if (parentPath != null) { diff --git a/jdk/test/javax/swing/plaf/synth/Test8015926.java b/jdk/test/javax/swing/plaf/synth/Test8015926.java new file mode 100644 index 00000000000..01751fee499 --- /dev/null +++ b/jdk/test/javax/swing/plaf/synth/Test8015926.java @@ -0,0 +1,98 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8015926 + * @summary Tests that there are no NPE during painting + * @author Sergey Malenkov + */ + +import javax.swing.JFrame; +import javax.swing.JTree; +import javax.swing.SwingUtilities; +import javax.swing.UIManager; +import javax.swing.event.TreeModelEvent; +import javax.swing.event.TreeModelListener; +import javax.swing.tree.DefaultMutableTreeNode; +import javax.swing.tree.DefaultTreeModel; + +import static javax.swing.WindowConstants.DISPOSE_ON_CLOSE; + +public class Test8015926 implements TreeModelListener, Runnable, Thread.UncaughtExceptionHandler { + + public static void main(String[] args) throws Exception { + UIManager.setLookAndFeel("javax.swing.plaf.nimbus.NimbusLookAndFeel"); + SwingUtilities.invokeAndWait(new Test8015926()); + Thread.sleep(1000L); + } + + private JTree tree; + + @Override + public void treeStructureChanged(TreeModelEvent event) { + } + + @Override + public void treeNodesRemoved(TreeModelEvent event) { + } + + @Override + public void treeNodesInserted(TreeModelEvent event) { + this.tree.expandPath(event.getTreePath()); + } + + @Override + public void treeNodesChanged(TreeModelEvent event) { + } + + @Override + public void run() { + Thread.currentThread().setUncaughtExceptionHandler(this); + + DefaultMutableTreeNode root = new DefaultMutableTreeNode(); + DefaultMutableTreeNode child = new DefaultMutableTreeNode("Child"); + DefaultTreeModel model = new DefaultTreeModel(root); + + this.tree = new JTree(); + this.tree.setModel(model); + + JFrame frame = new JFrame(getClass().getSimpleName()); + frame.add(this.tree); + + model.addTreeModelListener(this); // frame is not visible yet + model.insertNodeInto(child, root, root.getChildCount()); + model.removeNodeFromParent(child); + + frame.setSize(640, 480); + frame.setLocationRelativeTo(null); + frame.setDefaultCloseOperation(DISPOSE_ON_CLOSE); + frame.setVisible(true); + } + + @Override + public void uncaughtException(Thread thread, Throwable exception) { + exception.printStackTrace(); + System.exit(1); + } +} From 19aa94ea707acb49c48b5489ac855be96e3ad552 Mon Sep 17 00:00:00 2001 From: Phil Race Date: Mon, 22 Jul 2013 12:52:15 -0700 Subject: [PATCH 047/120] 7196866: CTW fails on all Solaris platforms Reviewed-by: prr, jrose, twisti, kvn --- jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c | 5 +++++ .../native/sun/java2d/x11/XRBackendNative.c | 14 ++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c b/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c index cb0b7274bd9..4b6e2c685df 100644 --- a/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c +++ b/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c @@ -926,6 +926,11 @@ void TryInitMITShm(JNIEnv *env, jint *shmExt, jint *shmPixmaps) { *shmExt = canUseShmExt = CANT_USE_MITSHM; *shmPixmaps = canUseShmExtPixmaps = CANT_USE_MITSHM; + if (awt_display == (Display *)NULL) { + AWT_NOFLUSH_UNLOCK(); + return; + } + /** * XShmQueryExtension returns False in remote server case. * Unfortunately it also returns True in ssh case, so diff --git a/jdk/src/solaris/native/sun/java2d/x11/XRBackendNative.c b/jdk/src/solaris/native/sun/java2d/x11/XRBackendNative.c index 3b38bba94bf..a46efacfd9d 100644 --- a/jdk/src/solaris/native/sun/java2d/x11/XRBackendNative.c +++ b/jdk/src/solaris/native/sun/java2d/x11/XRBackendNative.c @@ -267,13 +267,19 @@ Java_sun_java2d_xr_XRBackendNative_initIDs(JNIEnv *env, jclass cls) { char *maskData; XImage* defaultImg; jfieldID maskImgID; - jlong fmt8 = - ptr_to_jlong(XRenderFindStandardFormat(awt_display, PictStandardA8)); - jlong fmt32 = - ptr_to_jlong(XRenderFindStandardFormat(awt_display, PictStandardARGB32)); + jlong fmt8; + jlong fmt32; + jfieldID a8ID = (*env)->GetStaticFieldID(env, cls, "FMTPTR_A8", "J"); jfieldID argb32ID = (*env)->GetStaticFieldID(env, cls, "FMTPTR_ARGB32", "J"); + if (awt_display == (Display *)NULL) { + return; + } + + fmt8 = ptr_to_jlong(XRenderFindStandardFormat(awt_display, PictStandardA8)); + fmt32 = ptr_to_jlong(XRenderFindStandardFormat(awt_display, PictStandardARGB32)); + (*env)->SetStaticLongField(env, cls, a8ID, fmt8); (*env)->SetStaticLongField(env, cls, argb32ID, fmt32); From a98d595162f42f45f716e10d1ea14eb88ab4fbea Mon Sep 17 00:00:00 2001 From: Petr Pchelko Date: Tue, 23 Jul 2013 13:09:44 +0400 Subject: [PATCH 048/120] 7184951: [macosx] Exception at java.awt.datatransfer on headless mode (only in GUI session) Reviewed-by: art, anthony --- .../macosx/classes/sun/lwawt/macosx/CDataTransferer.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CDataTransferer.java b/jdk/src/macosx/classes/sun/lwawt/macosx/CDataTransferer.java index 35c6ef6d54d..b4f0f97823a 100644 --- a/jdk/src/macosx/classes/sun/lwawt/macosx/CDataTransferer.java +++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CDataTransferer.java @@ -182,7 +182,11 @@ public class CDataTransferer extends DataTransferer { Long format = predefinedClipboardNameMap.get(str); if (format == null) { - format = new Long(registerFormatWithPasteboard(str)); + if (java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment().isHeadlessInstance()) { + // Do not try to access native system for the unknown format + return -1L; + } + format = registerFormatWithPasteboard(str); predefinedClipboardNameMap.put(str, format); predefinedClipboardFormatMap.put(format, str); } From e2975f94c6255d40ade91dda43680d24860c4352 Mon Sep 17 00:00:00 2001 From: Athijegannathan Sundararajan Date: Tue, 23 Jul 2013 18:17:25 +0530 Subject: [PATCH 049/120] 8021122: Not all callables are handled for toString and other function valued properties Reviewed-by: attila, hannesw, jlaskey --- .../nashorn/internal/ir/debug/ASTWriter.java | 4 +- .../jdk/nashorn/internal/objects/Global.java | 10 +- .../nashorn/internal/objects/NativeArray.java | 4 +- .../nashorn/internal/objects/NativeDate.java | 3 +- .../nashorn/internal/objects/NativeJSON.java | 2 +- .../internal/objects/NativeObject.java | 2 +- .../jdk/nashorn/internal/runtime/Context.java | 27 ++++++ .../nashorn/internal/runtime/ListAdapter.java | 3 +- .../internal/runtime/ScriptRuntime.java | 4 +- .../runtime/arrays/IteratorAction.java | 3 + .../internal/runtime/linker/Bootstrap.java | 38 ++++++++ .../linker/JavaAdapterBytecodeGenerator.java | 2 +- .../runtime/linker/NashornBottomLinker.java | 50 +++++++++- nashorn/test/script/basic/JDK-8021122.js | 93 +++++++++++++++++++ .../test/script/basic/JDK-8021122.js.EXPECTED | 6 ++ 15 files changed, 234 insertions(+), 17 deletions(-) create mode 100644 nashorn/test/script/basic/JDK-8021122.js create mode 100644 nashorn/test/script/basic/JDK-8021122.js.EXPECTED diff --git a/nashorn/src/jdk/nashorn/internal/ir/debug/ASTWriter.java b/nashorn/src/jdk/nashorn/internal/ir/debug/ASTWriter.java index 2f75e09b8b1..19e4d04f7ca 100644 --- a/nashorn/src/jdk/nashorn/internal/ir/debug/ASTWriter.java +++ b/nashorn/src/jdk/nashorn/internal/ir/debug/ASTWriter.java @@ -102,7 +102,7 @@ public final class ASTWriter { preorder.add(node); } - final boolean isReference = field != null && field.getAnnotation(Reference.class) != null; + final boolean isReference = field != null && field.isAnnotationPresent(Reference.class); Class clazz = node.getClass(); String type = clazz.getName(); @@ -183,7 +183,7 @@ public final class ASTWriter { append('\n'); for (final Field child : children) { - if (child.getAnnotation(Ignore.class) != null) { + if (child.isAnnotationPresent(Ignore.class)) { continue; } diff --git a/nashorn/src/jdk/nashorn/internal/objects/Global.java b/nashorn/src/jdk/nashorn/internal/objects/Global.java index 9483475ac0a..62288414f6f 100644 --- a/nashorn/src/jdk/nashorn/internal/objects/Global.java +++ b/nashorn/src/jdk/nashorn/internal/objects/Global.java @@ -63,6 +63,7 @@ import jdk.nashorn.internal.runtime.ScriptObject; import jdk.nashorn.internal.runtime.ScriptRuntime; import jdk.nashorn.internal.runtime.ScriptingFunctions; import jdk.nashorn.internal.runtime.Source; +import jdk.nashorn.internal.runtime.linker.Bootstrap; import jdk.nashorn.internal.runtime.linker.InvokeByName; import jdk.nashorn.internal.scripts.JO; @@ -548,7 +549,8 @@ public final class Global extends ScriptObject implements GlobalObject, Scope { if (hint == String.class) { final Object toString = TO_STRING.getGetter().invokeExact(sobj); - if (toString instanceof ScriptFunction) { + + if (Bootstrap.isCallable(toString)) { final Object value = TO_STRING.getInvoker().invokeExact(toString, sobj); if (JSType.isPrimitive(value)) { return value; @@ -556,7 +558,7 @@ public final class Global extends ScriptObject implements GlobalObject, Scope { } final Object valueOf = VALUE_OF.getGetter().invokeExact(sobj); - if (valueOf instanceof ScriptFunction) { + if (Bootstrap.isCallable(valueOf)) { final Object value = VALUE_OF.getInvoker().invokeExact(valueOf, sobj); if (JSType.isPrimitive(value)) { return value; @@ -567,7 +569,7 @@ public final class Global extends ScriptObject implements GlobalObject, Scope { if (hint == Number.class) { final Object valueOf = VALUE_OF.getGetter().invokeExact(sobj); - if (valueOf instanceof ScriptFunction) { + if (Bootstrap.isCallable(valueOf)) { final Object value = VALUE_OF.getInvoker().invokeExact(valueOf, sobj); if (JSType.isPrimitive(value)) { return value; @@ -575,7 +577,7 @@ public final class Global extends ScriptObject implements GlobalObject, Scope { } final Object toString = TO_STRING.getGetter().invokeExact(sobj); - if (toString instanceof ScriptFunction) { + if (Bootstrap.isCallable(toString)) { final Object value = TO_STRING.getInvoker().invokeExact(toString, sobj); if (JSType.isPrimitive(value)) { return value; diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeArray.java b/nashorn/src/jdk/nashorn/internal/objects/NativeArray.java index c1b64c781f3..5572cb14522 100644 --- a/nashorn/src/jdk/nashorn/internal/objects/NativeArray.java +++ b/nashorn/src/jdk/nashorn/internal/objects/NativeArray.java @@ -360,7 +360,7 @@ public final class NativeArray extends ScriptObject { final ScriptObject sobj = (ScriptObject)obj; try { final Object join = JOIN.getGetter().invokeExact(sobj); - if (join instanceof ScriptFunction) { + if (Bootstrap.isCallable(join)) { return JOIN.getInvoker().invokeExact(join, sobj); } } catch (final RuntimeException | Error e) { @@ -396,7 +396,7 @@ public final class NativeArray extends ScriptObject { final ScriptObject sobj = (ScriptObject)val; final Object toLocaleString = TO_LOCALE_STRING.getGetter().invokeExact(sobj); - if (toLocaleString instanceof ScriptFunction) { + if (Bootstrap.isCallable(toLocaleString)) { sb.append((String)TO_LOCALE_STRING.getInvoker().invokeExact(toLocaleString, sobj)); } else { throw typeError("not.a.function", "toLocaleString"); diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeDate.java b/nashorn/src/jdk/nashorn/internal/objects/NativeDate.java index 11ab886e467..b942e2b5e35 100644 --- a/nashorn/src/jdk/nashorn/internal/objects/NativeDate.java +++ b/nashorn/src/jdk/nashorn/internal/objects/NativeDate.java @@ -47,6 +47,7 @@ import jdk.nashorn.internal.runtime.ScriptEnvironment; import jdk.nashorn.internal.runtime.ScriptFunction; import jdk.nashorn.internal.runtime.ScriptObject; import jdk.nashorn.internal.runtime.ScriptRuntime; +import jdk.nashorn.internal.runtime.linker.Bootstrap; import jdk.nashorn.internal.runtime.linker.InvokeByName; /** @@ -862,7 +863,7 @@ public final class NativeDate extends ScriptObject { try { final Object func = TO_ISO_STRING.getGetter().invokeExact(sobj); - if (func instanceof ScriptFunction) { + if (Bootstrap.isCallable(func)) { return TO_ISO_STRING.getInvoker().invokeExact(func, sobj, key); } throw typeError("not.a.function", ScriptRuntime.safeToString(func)); diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeJSON.java b/nashorn/src/jdk/nashorn/internal/objects/NativeJSON.java index 863d531bda9..c7e9f1c0fcc 100644 --- a/nashorn/src/jdk/nashorn/internal/objects/NativeJSON.java +++ b/nashorn/src/jdk/nashorn/internal/objects/NativeJSON.java @@ -189,7 +189,7 @@ public final class NativeJSON extends ScriptObject { if (value instanceof ScriptObject) { final ScriptObject svalue = (ScriptObject)value; final Object toJSON = TO_JSON.getGetter().invokeExact(svalue); - if (toJSON instanceof ScriptFunction) { + if (Bootstrap.isCallable(toJSON)) { value = TO_JSON.getInvoker().invokeExact(toJSON, svalue, key); } } diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeObject.java b/nashorn/src/jdk/nashorn/internal/objects/NativeObject.java index b392c662e70..5f702467f53 100644 --- a/nashorn/src/jdk/nashorn/internal/objects/NativeObject.java +++ b/nashorn/src/jdk/nashorn/internal/objects/NativeObject.java @@ -407,7 +407,7 @@ public final class NativeObject { try { final Object toString = TO_STRING.getGetter().invokeExact(sobj); - if (toString instanceof ScriptFunction) { + if (Bootstrap.isCallable(toString)) { return TO_STRING.getInvoker().invokeExact(toString, sobj); } } catch (final RuntimeException | Error e) { diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Context.java b/nashorn/src/jdk/nashorn/internal/runtime/Context.java index f9e86741884..3869104208d 100644 --- a/nashorn/src/jdk/nashorn/internal/runtime/Context.java +++ b/nashorn/src/jdk/nashorn/internal/runtime/Context.java @@ -36,6 +36,7 @@ import java.io.IOException; import java.io.PrintWriter; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; +import java.lang.reflect.Modifier; import java.util.concurrent.atomic.AtomicLong; import java.net.MalformedURLException; import java.net.URL; @@ -555,6 +556,7 @@ public final class Context { * Checks that the given package can be accessed from current call stack. * * @param fullName fully qualified package name + * @throw SecurityException if not accessible */ public static void checkPackageAccess(final String fullName) { final int index = fullName.lastIndexOf('.'); @@ -566,6 +568,31 @@ public final class Context { } } + /** + * Checks that the given package can be accessed from current call stack. + * + * @param fullName fully qualified package name + * @return true if package is accessible, false otherwise + */ + public static boolean isAccessiblePackage(final String fullName) { + try { + checkPackageAccess(fullName); + return true; + } catch (final SecurityException se) { + return false; + } + } + + /** + * Checks that the given Class can be accessed from current call stack and is public. + * + * @param clazz Class object to check + * @return true if Class is accessible, false otherwise + */ + public static boolean isAccessibleClass(final Class clazz) { + return Modifier.isPublic(clazz.getModifiers()) && Context.isAccessiblePackage(clazz.getName()); + } + /** * Lookup a Java class. This is used for JSR-223 stuff linking in from * {@code jdk.nashorn.internal.objects.NativeJava} and {@code jdk.nashorn.internal.runtime.NativeJavaPackage} diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ListAdapter.java b/nashorn/src/jdk/nashorn/internal/runtime/ListAdapter.java index 194bd132000..60cf76bb2e5 100644 --- a/nashorn/src/jdk/nashorn/internal/runtime/ListAdapter.java +++ b/nashorn/src/jdk/nashorn/internal/runtime/ListAdapter.java @@ -31,6 +31,7 @@ import java.util.Iterator; import java.util.ListIterator; import java.util.NoSuchElementException; import java.util.RandomAccess; +import jdk.nashorn.internal.runtime.linker.Bootstrap; import jdk.nashorn.internal.runtime.linker.InvokeByName; /** @@ -157,7 +158,7 @@ public class ListAdapter extends AbstractList implements RandomAccess, D } } private static void checkFunction(Object fn, InvokeByName invoke) { - if(!(fn instanceof ScriptFunction)) { + if(!(Bootstrap.isCallable(fn))) { throw new UnsupportedOperationException("The script object doesn't have a function named " + invoke.getName()); } } diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java index 1cf370e1032..bbf870c86c5 100644 --- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java +++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java @@ -381,9 +381,7 @@ public final class ScriptRuntime { */ public static Object checkAndConstruct(final ScriptFunction target, final Object... args) { final ScriptObject global = Context.getGlobalTrusted(); - if (! (global instanceof GlobalObject)) { - throw new IllegalStateException("No current global set"); - } + assert (global instanceof GlobalObject): "No current global set"; if (target.getContext() != global.getContext()) { throw new IllegalArgumentException("'target' function is not from current Context"); diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/IteratorAction.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/IteratorAction.java index 91b20e5d222..9b6cbb447fe 100644 --- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/IteratorAction.java +++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/IteratorAction.java @@ -31,6 +31,7 @@ import jdk.nashorn.api.scripting.ScriptObjectMirror; import jdk.nashorn.internal.runtime.Context; import jdk.nashorn.internal.runtime.ScriptFunction; import jdk.nashorn.internal.runtime.ScriptRuntime; +import jdk.nashorn.internal.runtime.linker.Bootstrap; /** * Helper class for the various map/apply functions in {@link jdk.nashorn.internal.objects.NativeArray}. @@ -103,6 +104,8 @@ public abstract class IteratorAction { } else if (callbackfn instanceof ScriptObjectMirror && ((ScriptObjectMirror)callbackfn).isFunction()) { strict = ((ScriptObjectMirror)callbackfn).isStrictFunction(); + } else if (Bootstrap.isDynamicMethod(callbackfn) || Bootstrap.isFunctionalInterfaceObject(callbackfn)) { + strict = false; } else { throw typeError("not.a.function", ScriptRuntime.safeToString(callbackfn)); } diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/Bootstrap.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/Bootstrap.java index 4007393bef9..ff680b1f793 100644 --- a/nashorn/src/jdk/nashorn/internal/runtime/linker/Bootstrap.java +++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/Bootstrap.java @@ -38,8 +38,11 @@ import jdk.internal.dynalink.DynamicLinkerFactory; import jdk.internal.dynalink.beans.BeansLinker; import jdk.internal.dynalink.linker.GuardedInvocation; import jdk.internal.dynalink.linker.LinkerServices; +import jdk.nashorn.api.scripting.ScriptObjectMirror; import jdk.nashorn.internal.codegen.CompilerConstants.Call; import jdk.nashorn.internal.codegen.RuntimeCallSite; +import jdk.nashorn.internal.runtime.ScriptFunction; +import jdk.nashorn.internal.runtime.ScriptRuntime; import jdk.nashorn.internal.runtime.options.Options; /** @@ -67,6 +70,41 @@ public final class Bootstrap { dynamicLinker = factory.createLinker(); } + /** + * Returns if the given object is a "callable" + * @param obj object to be checked for callability + * @return true if the obj is callable + */ + public static boolean isCallable(final Object obj) { + if (obj == ScriptRuntime.UNDEFINED || obj == null) { + return false; + } + + return obj instanceof ScriptFunction || + ((obj instanceof ScriptObjectMirror) && ((ScriptObjectMirror)obj).isFunction()) || + isDynamicMethod(obj) || + isFunctionalInterfaceObject(obj); + } + + /** + * Returns if the given object is a dynalink Dynamic method + * @param obj object to be checked + * @return true if the obj is a dynamic method + */ + public static boolean isDynamicMethod(final Object obj) { + return obj instanceof BoundDynamicMethod || BeansLinker.isDynamicMethod(obj); + } + + /** + * Returns if the given object is an instance of an interface annotated with + * java.lang.FunctionalInterface + * @param obj object to be checked + * @return true if the obj is an instance of @FunctionalInterface interface + */ + public static boolean isFunctionalInterfaceObject(final Object obj) { + return obj != null && (NashornBottomLinker.getFunctionalInterfaceMethod(obj.getClass()) != null); + } + /** * Create a call site and link it for Nashorn. This version of the method conforms to the invokedynamic bootstrap * method expected signature and is referenced from Nashorn generated bytecode as the bootstrap method for all diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java index 77373ff1c63..3bc16a283c3 100644 --- a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java +++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterBytecodeGenerator.java @@ -924,6 +924,6 @@ final class JavaAdapterBytecodeGenerator { } private static boolean isCallerSensitive(final AccessibleObject e) { - return e.getAnnotation(CallerSensitive.class) != null; + return e.isAnnotationPresent(CallerSensitive.class); } } diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java index 3e73ff11cea..5b510a9eea5 100644 --- a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java +++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java @@ -30,6 +30,9 @@ import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED; import static jdk.nashorn.internal.lookup.Lookup.MH; import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodType; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; import jdk.internal.dynalink.CallSiteDescriptor; import jdk.internal.dynalink.beans.BeansLinker; import jdk.internal.dynalink.linker.GuardedInvocation; @@ -37,6 +40,7 @@ import jdk.internal.dynalink.linker.GuardingDynamicLinker; import jdk.internal.dynalink.linker.LinkRequest; import jdk.internal.dynalink.linker.LinkerServices; import jdk.internal.dynalink.support.Guards; +import jdk.nashorn.internal.runtime.Context; import jdk.nashorn.internal.runtime.ScriptRuntime; /** @@ -73,7 +77,7 @@ final class NashornBottomLinker implements GuardingDynamicLinker { private static final MethodHandle EMPTY_ELEM_SETTER = MH.dropArguments(EMPTY_PROP_SETTER, 0, Object.class); - private static GuardedInvocation linkBean(final LinkRequest linkRequest, final LinkerServices linkerServices) { + private static GuardedInvocation linkBean(final LinkRequest linkRequest, final LinkerServices linkerServices) throws Exception { final NashornCallSiteDescriptor desc = (NashornCallSiteDescriptor)linkRequest.getCallSiteDescriptor(); final Object self = linkRequest.getReceiver(); final String operator = desc.getFirstOperator(); @@ -84,6 +88,22 @@ final class NashornBottomLinker implements GuardingDynamicLinker { } throw typeError("not.a.function", ScriptRuntime.safeToString(self)); case "call": + // Support dyn:call on any object that supports some @FunctionalInterface + // annotated interface. This way Java method, constructor references or + // implementations of java.util.function.* interfaces can be called as though + // those are script functions. + final Method m = getFunctionalInterfaceMethod(self.getClass()); + if (m != null) { + final MethodType callType = desc.getMethodType(); + // 'callee' and 'thiz' passed from script + actual arguments + if (callType.parameterCount() != m.getParameterCount() + 2) { + throw typeError("no.method.matches.args", ScriptRuntime.safeToString(self)); + } + return new GuardedInvocation( + // drop 'thiz' passed from the script. + MH.dropArguments(desc.getLookup().unreflect(m), 1, callType.parameterType(1)), + Guards.getInstanceOfGuard(m.getDeclaringClass())).asType(callType); + } if(BeansLinker.isDynamicMethod(self)) { throw typeError("no.method.matches.args", ScriptRuntime.safeToString(self)); } @@ -148,4 +168,32 @@ final class NashornBottomLinker implements GuardingDynamicLinker { } return ScriptRuntime.safeToString(linkRequest.getArguments()[1]); } + + // Returns @FunctionalInterface annotated interface's single abstract method. + // If not found, returns null + static Method getFunctionalInterfaceMethod(final Class clazz) { + if (clazz == null) { + return null; + } + + for (Class iface : clazz.getInterfaces()) { + // check accessiblity up-front + if (! Context.isAccessibleClass(iface)) { + continue; + } + + // check for @FunctionalInterface + if (iface.isAnnotationPresent(FunctionalInterface.class)) { + // return the first abstract method + for (final Method m : iface.getMethods()) { + if (Modifier.isAbstract(m.getModifiers())) { + return m; + } + } + } + } + + // did not find here, try super class + return getFunctionalInterfaceMethod(clazz.getSuperclass()); + } } diff --git a/nashorn/test/script/basic/JDK-8021122.js b/nashorn/test/script/basic/JDK-8021122.js new file mode 100644 index 00000000000..769164f57c8 --- /dev/null +++ b/nashorn/test/script/basic/JDK-8021122.js @@ -0,0 +1,93 @@ +/* + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * JDK-8021122: Not all callables are handled for toString and other function valued properties + * + * @test + * @run + */ + +var a = {} +var obj = new java.util.HashMap(); +Object.bindProperties(a, obj); +try { + print(a); +} catch (e) { + print(e); +} + +var a = {} +var global = loadWithNewGlobal({ name:"xx", script: "this" }); +var obj = global.eval("({ toString: function() { return 'hello'; } })"); +Object.bindProperties(a, obj); +try { + print(a); +} catch (e) { + print(e); +} + +function runLambdaTests() { + var r = new java.lang.Runnable() { + run: function() { print("I am runnable"); } + }; + + // call any @FunctionalInterface object as though it is a function + r(); + + var twice = new java.util.function.Function() { + apply: function(x) 2*x + }; + + print(twice(34)); + + var sum = new java.util.function.BiFunction() { + apply: function(x, y) x + y + }; + + print(sum(32, 12)) + + // make toString to be a @FunctionalInterface object + var a = {}; + a.toString = new java.util.function.Supplier() { + get: function() { return "MyString"; } + }; + + try { + print(a); + } catch (e) { + print(e); + } +} + +try { + // check for java.util.function.Function class + Java.type("java.util.function.Function"); + runLambdaTests(); +} catch (e) { + // fake output to match .EXPECTED values + print("I am runnable"); + print("68"); + print("44"); + print("MyString"); +} diff --git a/nashorn/test/script/basic/JDK-8021122.js.EXPECTED b/nashorn/test/script/basic/JDK-8021122.js.EXPECTED new file mode 100644 index 00000000000..ef4aebe7b0b --- /dev/null +++ b/nashorn/test/script/basic/JDK-8021122.js.EXPECTED @@ -0,0 +1,6 @@ +{} +hello +I am runnable +68 +44 +MyString From 6983b4e9e377fc56e2cad94e44fb8a4c1fbc0c79 Mon Sep 17 00:00:00 2001 From: James Laskey Date: Tue, 23 Jul 2013 12:00:29 -0300 Subject: [PATCH 050/120] 8021130: Comments need to be tokens Reviewed-by: lagergren, attila --- .../internal/parser/AbstractParser.java | 20 ++++++++++++++++--- .../jdk/nashorn/internal/parser/Lexer.java | 19 ++++++++++-------- .../nashorn/internal/parser/TokenType.java | 1 + 3 files changed, 29 insertions(+), 11 deletions(-) diff --git a/nashorn/src/jdk/nashorn/internal/parser/AbstractParser.java b/nashorn/src/jdk/nashorn/internal/parser/AbstractParser.java index 25b500cef07..80f7ce0745d 100644 --- a/nashorn/src/jdk/nashorn/internal/parser/AbstractParser.java +++ b/nashorn/src/jdk/nashorn/internal/parser/AbstractParser.java @@ -25,6 +25,7 @@ package jdk.nashorn.internal.parser; +import static jdk.nashorn.internal.parser.TokenType.COMMENT; import static jdk.nashorn.internal.parser.TokenType.EOF; import static jdk.nashorn.internal.parser.TokenType.EOL; import static jdk.nashorn.internal.parser.TokenType.IDENT; @@ -135,14 +136,27 @@ public abstract class AbstractParser { } /** - * Seek next token that is not an EOL. + * Seek next token that is not an EOL or comment. * * @return tokenType of next token. */ protected final TokenType next() { do { nextOrEOL(); - } while (type == EOL); + } while (type == EOL || type == COMMENT); + + return type; + } + + /** + * Seek next token or EOL (skipping comments.) + * + * @return tokenType of next token. + */ + protected final TokenType nextOrEOL() { + do { + nextToken(); + } while (type == COMMENT); return type; } @@ -152,7 +166,7 @@ public abstract class AbstractParser { * * @return tokenType of next token. */ - protected final TokenType nextOrEOL() { + private final TokenType nextToken() { // Capture last token tokenType. last = type; if (type != EOF) { diff --git a/nashorn/src/jdk/nashorn/internal/parser/Lexer.java b/nashorn/src/jdk/nashorn/internal/parser/Lexer.java index ca4734a2542..09269c6ccd7 100644 --- a/nashorn/src/jdk/nashorn/internal/parser/Lexer.java +++ b/nashorn/src/jdk/nashorn/internal/parser/Lexer.java @@ -26,6 +26,7 @@ package jdk.nashorn.internal.parser; import static jdk.nashorn.internal.parser.TokenType.ADD; +import static jdk.nashorn.internal.parser.TokenType.COMMENT; import static jdk.nashorn.internal.parser.TokenType.DECIMAL; import static jdk.nashorn.internal.parser.TokenType.EOF; import static jdk.nashorn.internal.parser.TokenType.EOL; @@ -426,6 +427,9 @@ public class Lexer extends Scanner { * @return True if a comment. */ protected boolean skipComments() { + // Save the current position. + final int start = position; + if (ch0 == '/') { // Is it a // comment. if (ch1 == '/') { @@ -436,10 +440,9 @@ public class Lexer extends Scanner { skip(1); } // Did detect a comment. + add(COMMENT, start); return true; } else if (ch1 == '*') { - // Record beginning of comment. - final int start = position; // Skip over /*. skip(2); // Scan for */. @@ -461,11 +464,11 @@ public class Lexer extends Scanner { } // Did detect a comment. + add(COMMENT, start); return true; } - } - - if (scripting && ch0 == '#') { + } else if (ch0 == '#') { + assert scripting; // shell style comment // Skip over #. skip(1); @@ -474,6 +477,7 @@ public class Lexer extends Scanner { skip(1); } // Did detect a comment. + add(COMMENT, start); return true; } @@ -562,7 +566,7 @@ public class Lexer extends Scanner { * * @param token the token. * @param startTokenType the token type. - * @parasm lir LineInfoReceiver that receives line info for multi-line string literals. + * @param lir LineInfoReceiver that receives line info for multi-line string literals. * @return True if a literal beginning with startToken was found and scanned. */ protected boolean scanLiteral(final long token, final TokenType startTokenType, final LineInfoReceiver lir) { @@ -1460,11 +1464,10 @@ public class Lexer extends Scanner { final State restState = saveState(); // keep line number updated int lastLine = line; - int lastLinePosition = linePosition; skipLine(false); lastLine++; - lastLinePosition = position; + int lastLinePosition = position; restState.setLimit(position); // Record beginning of string. diff --git a/nashorn/src/jdk/nashorn/internal/parser/TokenType.java b/nashorn/src/jdk/nashorn/internal/parser/TokenType.java index c92b9e98284..6a0f564486b 100644 --- a/nashorn/src/jdk/nashorn/internal/parser/TokenType.java +++ b/nashorn/src/jdk/nashorn/internal/parser/TokenType.java @@ -44,6 +44,7 @@ public enum TokenType { ERROR (SPECIAL, null), EOF (SPECIAL, null), EOL (SPECIAL, null), + COMMENT (SPECIAL, null), NOT (UNARY, "!", 14, false), NE (BINARY, "!=", 9, true), From 34d2bae0b0ca61611b88da56397b2541c4a738b6 Mon Sep 17 00:00:00 2001 From: Athijegannathan Sundararajan Date: Tue, 23 Jul 2013 21:45:27 +0530 Subject: [PATCH 051/120] 8021164: REGRESSION: test262 failures after JDK-8021122 Reviewed-by: jlaskey, hannesw --- nashorn/src/jdk/nashorn/internal/runtime/linker/Bootstrap.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/Bootstrap.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/Bootstrap.java index ff680b1f793..421e5f62490 100644 --- a/nashorn/src/jdk/nashorn/internal/runtime/linker/Bootstrap.java +++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/Bootstrap.java @@ -41,6 +41,7 @@ import jdk.internal.dynalink.linker.LinkerServices; import jdk.nashorn.api.scripting.ScriptObjectMirror; import jdk.nashorn.internal.codegen.CompilerConstants.Call; import jdk.nashorn.internal.codegen.RuntimeCallSite; +import jdk.nashorn.internal.runtime.JSType; import jdk.nashorn.internal.runtime.ScriptFunction; import jdk.nashorn.internal.runtime.ScriptRuntime; import jdk.nashorn.internal.runtime.options.Options; @@ -102,7 +103,7 @@ public final class Bootstrap { * @return true if the obj is an instance of @FunctionalInterface interface */ public static boolean isFunctionalInterfaceObject(final Object obj) { - return obj != null && (NashornBottomLinker.getFunctionalInterfaceMethod(obj.getClass()) != null); + return !JSType.isPrimitive(obj) && (NashornBottomLinker.getFunctionalInterfaceMethod(obj.getClass()) != null); } /** From 947610257d8211f975e10b1d6e583b9578770e73 Mon Sep 17 00:00:00 2001 From: Attila Szegedi Date: Tue, 23 Jul 2013 18:28:58 +0200 Subject: [PATCH 052/120] 8021129: Use public lookup again Reviewed-by: lagergren, sundar --- .../dynalink/beans/AbstractJavaLinker.java | 7 +- .../dynalink/beans/FacetIntrospector.java | 8 +- .../dynalink/beans/SafeUnreflector.java | 156 ------------ .../dynalink/beans/SafeUnreflectorImpl.java | 146 ----------- .../dynalink/beans/SandboxClassLoader.java | 228 ------------------ .../dynalink/beans/sandbox/Unreflector.java | 132 ---------- nashorn/test/script/trusted/JDK-8021129.js | 43 ++++ .../script/trusted/JDK-8021129.js.EXPECTED | 9 + .../test/models/InternalRunnable.java | 71 ++++++ .../test/models/RestrictedRunnable.java | 34 +++ .../models/InternalRunnableSuperclass.java | 35 +++ 11 files changed, 202 insertions(+), 667 deletions(-) delete mode 100644 nashorn/src/jdk/internal/dynalink/beans/SafeUnreflector.java delete mode 100644 nashorn/src/jdk/internal/dynalink/beans/SafeUnreflectorImpl.java delete mode 100644 nashorn/src/jdk/internal/dynalink/beans/SandboxClassLoader.java delete mode 100644 nashorn/src/jdk/internal/dynalink/beans/sandbox/Unreflector.java create mode 100644 nashorn/test/script/trusted/JDK-8021129.js create mode 100644 nashorn/test/script/trusted/JDK-8021129.js.EXPECTED create mode 100644 nashorn/test/src/jdk/nashorn/internal/test/models/InternalRunnable.java create mode 100644 nashorn/test/src/jdk/nashorn/internal/test/models/RestrictedRunnable.java create mode 100644 nashorn/test/src/jdk/nashorn/test/models/InternalRunnableSuperclass.java diff --git a/nashorn/src/jdk/internal/dynalink/beans/AbstractJavaLinker.java b/nashorn/src/jdk/internal/dynalink/beans/AbstractJavaLinker.java index 0c8d3efde7f..57d2ca012d9 100644 --- a/nashorn/src/jdk/internal/dynalink/beans/AbstractJavaLinker.java +++ b/nashorn/src/jdk/internal/dynalink/beans/AbstractJavaLinker.java @@ -292,6 +292,8 @@ abstract class AbstractJavaLinker implements GuardingDynamicLinker { return new SimpleDynamicMethod(unreflectSafely(m), member.getDeclaringClass(), member.getName()); } + private static final Lookup publicLookup = new Lookup(MethodHandles.publicLookup()); + /** * Unreflects a method handle from a Method or a Constructor using safe (zero-privilege) unreflection. Should be * only used for methods and constructors that are not caller sensitive. If a caller sensitive method were @@ -303,14 +305,13 @@ abstract class AbstractJavaLinker implements GuardingDynamicLinker { private static MethodHandle unreflectSafely(AccessibleObject m) { if(m instanceof Method) { final Method reflMethod = (Method)m; - final MethodHandle handle = SafeUnreflector.unreflect(reflMethod); + final MethodHandle handle = publicLookup.unreflect(reflMethod); if(Modifier.isStatic(reflMethod.getModifiers())) { return StaticClassIntrospector.editStaticMethodHandle(handle); } return handle; } - return StaticClassIntrospector.editConstructorMethodHandle(SafeUnreflector.unreflectConstructor( - (Constructor)m)); + return StaticClassIntrospector.editConstructorMethodHandle(publicLookup.unreflectConstructor((Constructor)m)); } private static DynamicMethod mergeMethods(SingleDynamicMethod method, DynamicMethod existing, Class clazz, String name) { diff --git a/nashorn/src/jdk/internal/dynalink/beans/FacetIntrospector.java b/nashorn/src/jdk/internal/dynalink/beans/FacetIntrospector.java index 97e431ca24b..6fcd72f32d5 100644 --- a/nashorn/src/jdk/internal/dynalink/beans/FacetIntrospector.java +++ b/nashorn/src/jdk/internal/dynalink/beans/FacetIntrospector.java @@ -84,6 +84,7 @@ package jdk.internal.dynalink.beans; import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; import java.lang.reflect.Field; import java.lang.reflect.Member; import java.lang.reflect.Method; @@ -92,6 +93,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.Map; +import jdk.internal.dynalink.support.Lookup; /** * Base for classes that expose class field and method information to an {@link AbstractJavaLinker}. There are @@ -99,6 +101,8 @@ import java.util.Map; * @author Attila Szegedi */ abstract class FacetIntrospector { + private static final Lookup publicLookup = new Lookup(MethodHandles.publicLookup()); + private final Class clazz; private final boolean instance; private final boolean isRestricted; @@ -160,11 +164,11 @@ abstract class FacetIntrospector { MethodHandle unreflectGetter(Field field) { - return editMethodHandle(SafeUnreflector.unreflectGetter(field)); + return editMethodHandle(publicLookup.unreflectGetter(field)); } MethodHandle unreflectSetter(Field field) { - return editMethodHandle(SafeUnreflector.unreflectSetter(field)); + return editMethodHandle(publicLookup.unreflectSetter(field)); } /** diff --git a/nashorn/src/jdk/internal/dynalink/beans/SafeUnreflector.java b/nashorn/src/jdk/internal/dynalink/beans/SafeUnreflector.java deleted file mode 100644 index e82870128ce..00000000000 --- a/nashorn/src/jdk/internal/dynalink/beans/SafeUnreflector.java +++ /dev/null @@ -1,156 +0,0 @@ -/* - * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -/* - * This file is available under and governed by the GNU General Public - * License version 2 only, as published by the Free Software Foundation. - * However, the following notice accompanied the original version of this - * file, and Oracle licenses the original version of this file under the BSD - * license: - */ -/* - Copyright 2009-2013 Attila Szegedi - - Licensed under both the Apache License, Version 2.0 (the "Apache License") - and the BSD License (the "BSD License"), with licensee being free to - choose either of the two at their discretion. - - You may not use this file except in compliance with either the Apache - License or the BSD License. - - If you choose to use this file in compliance with the Apache License, the - following notice applies to you: - - You may obtain a copy of the Apache License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied. See the License for the specific language governing - permissions and limitations under the License. - - If you choose to use this file in compliance with the BSD License, the - following notice applies to you: - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the copyright holder nor the names of - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER - BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -package jdk.internal.dynalink.beans; - -import java.lang.invoke.MethodHandle; -import java.lang.reflect.Constructor; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.security.AccessController; -import java.security.PrivilegedAction; -import jdk.internal.dynalink.beans.sandbox.Unreflector; - -/** - * Provides lookup of unreflected method handles through delegation to an instance of {@link SafeUnreflectorImpl}. If - * Dynalink is run as trusted code, the delegate class is loaded into an isolated zero-permissions protection domain, - * serving as a firebreak against an accidental privilege escalation downstream. - */ -final class SafeUnreflector { - private static final String UNREFLECTOR_IMPL_CLASS_NAME = "jdk.internal.dynalink.beans.SafeUnreflectorImpl"; - private static final Unreflector impl = createImpl(); - - private SafeUnreflector() { - } - - /** - * Performs a {@link java.lang.invoke.MethodHandles.Lookup#unreflect(Method)}, converting any encountered - * {@link IllegalAccessException} into an {@link IllegalAccessError}. - * - * @param m the method to unreflect - * @return the unreflected method handle. - */ - static MethodHandle unreflect(Method m) { - return impl.unreflect(m); - } - - /** - * Performs a {@link java.lang.invoke.MethodHandles.Lookup#unreflectGetter(Field)}, converting any encountered - * {@link IllegalAccessException} into an {@link IllegalAccessError}. - * - * @param f the field for which a getter is unreflected - * @return the unreflected field getter handle. - */ - static MethodHandle unreflectGetter(Field f) { - return impl.unreflectGetter(f); - } - - /** - * Performs a {@link java.lang.invoke.MethodHandles.Lookup#unreflectSetter(Field)}, converting any encountered - * {@link IllegalAccessException} into an {@link IllegalAccessError}. - * - * @param f the field for which a setter is unreflected - * @return the unreflected field setter handle. - */ - static MethodHandle unreflectSetter(Field f) { - return impl.unreflectSetter(f); - } - - static MethodHandle unreflectConstructor(Constructor c) { - return impl.unreflectConstructor(c); - } - - private static Unreflector createImpl() { - final Class unreflectorImplClass = AccessController.doPrivileged(new PrivilegedAction>() { - @Override - public Class run() { - return SandboxClassLoader.loadClass(UNREFLECTOR_IMPL_CLASS_NAME); - } - }); - try { - return (Unreflector)unreflectorImplClass.newInstance(); - } catch(InstantiationException | IllegalAccessException e) { - throw new RuntimeException(e.getMessage(), e); - } - } -} diff --git a/nashorn/src/jdk/internal/dynalink/beans/SafeUnreflectorImpl.java b/nashorn/src/jdk/internal/dynalink/beans/SafeUnreflectorImpl.java deleted file mode 100644 index 5ae843041bd..00000000000 --- a/nashorn/src/jdk/internal/dynalink/beans/SafeUnreflectorImpl.java +++ /dev/null @@ -1,146 +0,0 @@ -/* - * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -/* - * This file is available under and governed by the GNU General Public - * License version 2 only, as published by the Free Software Foundation. - * However, the following notice accompanied the original version of this - * file, and Oracle licenses the original version of this file under the BSD - * license: - */ -/* - Copyright 2009-2013 Attila Szegedi - - Licensed under both the Apache License, Version 2.0 (the "Apache License") - and the BSD License (the "BSD License"), with licensee being free to - choose either of the two at their discretion. - - You may not use this file except in compliance with either the Apache - License or the BSD License. - - If you choose to use this file in compliance with the Apache License, the - following notice applies to you: - - You may obtain a copy of the Apache License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied. See the License for the specific language governing - permissions and limitations under the License. - - If you choose to use this file in compliance with the BSD License, the - following notice applies to you: - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the copyright holder nor the names of - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER - BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -package jdk.internal.dynalink.beans; - -import java.lang.invoke.MethodHandle; -import java.lang.invoke.MethodHandles; -import java.lang.reflect.Constructor; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import jdk.internal.dynalink.beans.sandbox.Unreflector; - -/** - * Performs lookup of unreflected method handles by delegating to {@link MethodHandles#lookup()} using itself as the - * lookup class. When Dynalink runs as trusted code, this class is loaded into an isolated zero-permissions protection - * domain to stop any accidental privilege escalation. - */ -final class SafeUnreflectorImpl implements Unreflector { - - SafeUnreflectorImpl() { - } - - @Override - public MethodHandle unreflect(Method m) { - try { - return MethodHandles.lookup().unreflect(m); - } catch(IllegalAccessException e) { - final IllegalAccessError ee = new IllegalAccessError("Failed to unreflect method " + m); - ee.initCause(e); - throw ee; - } - } - - @Override - public MethodHandle unreflectGetter(Field f) { - try { - return MethodHandles.lookup().unreflectGetter(f); - } catch(IllegalAccessException e) { - final IllegalAccessError ee = new IllegalAccessError("Failed to unreflect getter for field " + f); - ee.initCause(e); - throw ee; - } - } - - @Override - public MethodHandle unreflectSetter(Field f) { - try { - return MethodHandles.lookup().unreflectSetter(f); - } catch(IllegalAccessException e) { - final IllegalAccessError ee = new IllegalAccessError("Failed to unreflect setter for field " + f); - ee.initCause(e); - throw ee; - } - } - - @Override - public MethodHandle unreflectConstructor(Constructor c) { - try { - return MethodHandles.lookup().unreflectConstructor(c); - } catch(IllegalAccessException e) { - final IllegalAccessError ee = new IllegalAccessError("Failed to unreflect constructor " + c); - ee.initCause(e); - throw ee; - } - } -} diff --git a/nashorn/src/jdk/internal/dynalink/beans/SandboxClassLoader.java b/nashorn/src/jdk/internal/dynalink/beans/SandboxClassLoader.java deleted file mode 100644 index 00f1e7ac794..00000000000 --- a/nashorn/src/jdk/internal/dynalink/beans/SandboxClassLoader.java +++ /dev/null @@ -1,228 +0,0 @@ -/* - * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -/* - * This file is available under and governed by the GNU General Public - * License version 2 only, as published by the Free Software Foundation. - * However, the following notice accompanied the original version of this - * file, and Oracle licenses the original version of this file under the BSD - * license: - */ -/* - Copyright 2009-2013 Attila Szegedi - - Licensed under both the Apache License, Version 2.0 (the "Apache License") - and the BSD License (the "BSD License"), with licensee being free to - choose either of the two at their discretion. - - You may not use this file except in compliance with either the Apache - License or the BSD License. - - If you choose to use this file in compliance with the Apache License, the - following notice applies to you: - - You may obtain a copy of the Apache License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied. See the License for the specific language governing - permissions and limitations under the License. - - If you choose to use this file in compliance with the BSD License, the - following notice applies to you: - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the copyright holder nor the names of - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER - BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -package jdk.internal.dynalink.beans; - -import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PUBLIC; -import static jdk.internal.org.objectweb.asm.Opcodes.ASM4; - -import java.io.IOException; -import java.io.InputStream; -import java.security.Permissions; -import java.security.ProtectionDomain; -import java.security.SecureClassLoader; -import java.security.SecureRandom; -import jdk.internal.org.objectweb.asm.ClassReader; -import jdk.internal.org.objectweb.asm.ClassVisitor; -import jdk.internal.org.objectweb.asm.ClassWriter; -import jdk.internal.org.objectweb.asm.MethodVisitor; - -/** - * A utility class that can load a class with specified name into an isolated zero-permissions protection domain. It can - * be used to load classes that perform security-sensitive operations with no privileges at all, therefore ensuring such - * operations will only succeed if they would require no permissions, as well as to make sure that if these operations - * bind some part of the security execution context to their results, the bound security context is completely - * unprivileged. Such measures serve as firebreaks against accidental privilege escalation. - */ -final class SandboxClassLoader { - private final String className; - private final String randomizedClassName; - - private SandboxClassLoader(String className) { - this.className = className; - final String simpleClassName = className.substring(className.lastIndexOf('.') + 1); - this.randomizedClassName = "randomPackage" + Long.toHexString(new SecureRandom().nextLong()) + "." + simpleClassName; - } - - /** - * Load the named class into a zero-permissions protection domain. Even if the class is already loaded into the - * Dynalink's class loader, an independent class is created from the same bytecode, thus the returned class will - * never be identical with the one that might already be loaded. The class to be loaded is supposed to be package - * private and have no public constructors. This is not a functional requirement, but it is enforced to ensure that - * the original class was made adequately inaccessible. The returned class will be public and its constructors will - * be changed to public. The only permission given to the returned class will be - * {@code accessClassInPackage.jdk.internal.dynalink.beans.sandbox}. That package should be used solely to define - * SPI interfaces implemented by the loaded class. - * @param className the fully qualified name of the class to load - * @return the loaded class, renamed to a random package, made public, its constructors made public, and lacking any - * permissions except access to the sandbox package. - * @throws SecurityException if the calling code lacks the {@code createClassLoader} runtime permission. This - * normally means that Dynalink itself is running as untrusted code, and whatever functionality was meant to be - * isolated into an unprivileged class is likely okay to be used directly too. - */ - static Class loadClass(String className) throws SecurityException { - return new SandboxClassLoader(className).loadClass(); - } - - private Class loadClass() throws SecurityException { - final ClassLoader loader = createClassLoader(); - try { - final Class clazz = Class.forName(randomizedClassName, true, loader); - // Sanity check to ensure we didn't accidentally pick up the class from elsewhere - if(clazz.getClassLoader() != loader) { - throw new AssertionError(randomizedClassName + " was loaded from a different class loader"); - } - return clazz; - } catch(ClassNotFoundException e) { - throw new AssertionError(e); - } - } - - private ClassLoader createClassLoader() throws SecurityException { - final String lclassName = this.randomizedClassName; - // We deliberately override loadClass instead of findClass so that we don't give a chance to finding this - // class already loaded anywhere else. We use this class' loader as the parent class loader as the loaded class - // needs to be able to access implemented interfaces from the sandbox package. - return new SecureClassLoader(getClass().getClassLoader()) { - @Override - protected Class loadClass(String name, boolean resolve) throws ClassNotFoundException { - if(name.equals(lclassName)) { - final byte[] bytes = getClassBytes(); - // Define the class with a protection domain that grants (almost) no permissions. - Class clazz = defineClass(name, bytes, 0, bytes.length, createMinimalPermissionsDomain()); - if(resolve) { - resolveClass(clazz); - } - return clazz; - } - - final int i = name.lastIndexOf('.'); - if (i != -1) { - final SecurityManager sm = System.getSecurityManager(); - if (sm != null) { - sm.checkPackageAccess(name.substring(0, i)); - } - } - return super.loadClass(name, resolve); - } - }; - } - - /** - * Create a no-permissions protection domain. Except, it's not really a no-permissions protection domain, since we - * need to give the protection domain the permission to access the sandbox package where the interop interfaces are - * defined. - * @return a new (almost) no-permission protection domain. - */ - private static ProtectionDomain createMinimalPermissionsDomain() { - final Permissions p = new Permissions(); - p.add(new RuntimePermission("accessClassInPackage.jdk.internal.dynalink.beans.sandbox")); - return new ProtectionDomain(null, p); - } - - private byte[] getClassBytes() { - try(final InputStream in = getClass().getResourceAsStream("/" + className.replace('.', '/') + ".class")) { - final ClassReader cr = new ClassReader(in); - final ClassWriter cw = new ClassWriter(cr, 0); - cr.accept(new ClassVisitor(ASM4, cw) { - @Override - public void visit(int version, int access, String name, String signature, String superName, - String[] interfaces) { - // Rename the class to its random name, and make it public (otherwise we won't be able to - // instantiate it). The privileged template class is package-private. - if((access & ACC_PUBLIC) != 0) { - throw new IllegalArgumentException("Class " + className + " must be package-private"); - } - super.visit(version, access | ACC_PUBLIC, randomizedClassName.replace('.', '/'), - signature, superName, interfaces); - } - - @Override - public MethodVisitor visitMethod(int access, String name, String desc, String signature, - String[] exceptions) { - // Make the constructor(s) public (otherwise we won't be able to instantiate the class). The - // privileged template's constructor(s) should not be public. - final boolean isCtor = "".equals(name); - if(isCtor && ((access & ACC_PUBLIC) != 0)) { - throw new IllegalArgumentException("Class " + className + " must have no public constructors"); - } - return super.visitMethod(isCtor ? (access | ACC_PUBLIC) : access, name, desc, signature, - exceptions); - } - }, 0); - return cw.toByteArray(); - } catch(IOException e) { - throw new RuntimeException(e); - } - } -} diff --git a/nashorn/src/jdk/internal/dynalink/beans/sandbox/Unreflector.java b/nashorn/src/jdk/internal/dynalink/beans/sandbox/Unreflector.java deleted file mode 100644 index b5174cd3633..00000000000 --- a/nashorn/src/jdk/internal/dynalink/beans/sandbox/Unreflector.java +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -/* - * This file is available under and governed by the GNU General Public - * License version 2 only, as published by the Free Software Foundation. - * However, the following notice accompanied the original version of this - * file, and Oracle licenses the original version of this file under the BSD - * license: - */ -/* - Copyright 2009-2013 Attila Szegedi - - Licensed under both the Apache License, Version 2.0 (the "Apache License") - and the BSD License (the "BSD License"), with licensee being free to - choose either of the two at their discretion. - - You may not use this file except in compliance with either the Apache - License or the BSD License. - - If you choose to use this file in compliance with the Apache License, the - following notice applies to you: - - You may obtain a copy of the Apache License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied. See the License for the specific language governing - permissions and limitations under the License. - - If you choose to use this file in compliance with the BSD License, the - following notice applies to you: - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the copyright holder nor the names of - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER - BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -package jdk.internal.dynalink.beans.sandbox; - -import java.lang.invoke.MethodHandle; -import java.lang.reflect.Constructor; -import java.lang.reflect.Field; -import java.lang.reflect.Method; - -/** - * Interface for creating unreflected method handles. This class is public for implementation purposes and is not part - * of any supported API. - */ -public interface Unreflector { - /** - * Performs similarly to {@link java.lang.invoke.MethodHandles.Lookup#unreflect(Method)} for some lookup object, - * also converting any encountered {@link IllegalAccessException} into an {@link IllegalAccessError}. - * - * @param m the method to unreflect - * @return the unreflected method handle. - */ - public MethodHandle unreflect(Method m); - - /** - * Performs similarly to {@link java.lang.invoke.MethodHandles.Lookup#unreflectGetter(Field)} for some lookup - * object, also converting any encountered {@link IllegalAccessException} into an {@link IllegalAccessError}. - * - * @param f the field for which a getter is unreflected - * @return the unreflected field getter handle. - */ - public MethodHandle unreflectGetter(Field f); - - /** - * Performs similarly to {@link java.lang.invoke.MethodHandles.Lookup#unreflectSetter(Field)} for some lookup - * object, also converting any encountered {@link IllegalAccessException} into an {@link IllegalAccessError}. - * - * @param f the field for which a setter is unreflected - * @return the unreflected field setter handle. - */ - public MethodHandle unreflectSetter(Field f); - - /** - * Performs similarly to {@link java.lang.invoke.MethodHandles.Lookup#unreflectConstructor(Constructor)} for some - * lookup object, also converting any encountered {@link IllegalAccessException} into an {@link IllegalAccessError}. - * - * @param c the constructor to unreflect - * @return the unreflected constructor handle. - */ - public MethodHandle unreflectConstructor(Constructor c); - -} diff --git a/nashorn/test/script/trusted/JDK-8021129.js b/nashorn/test/script/trusted/JDK-8021129.js new file mode 100644 index 00000000000..4c2a875cf7b --- /dev/null +++ b/nashorn/test/script/trusted/JDK-8021129.js @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * JDK-8021129: Test prevention of access to members of restricted classes. + * Note that even though the script runs as trusted, we still don't allow + * access to non-public portions of restricted classes. + * + * @test + * @run + */ +var r1 = new (Java.type("jdk.nashorn.internal.test.models.InternalRunnable")) +r1.run() // Can execute method from an implemented non-restricted interface +print(r1.toString()) // Can execute public method from a superclass + +print(r1.restrictedRun === undefined) // Can't see method from a restricted interface +print(r1.canNotInvokeThis === undefined) // Can't see any other public methods +print(r1.invisibleProperty === undefined) // Can't see any other properties +print(r1.canSeeThisField === undefined) // Can't see fields from superclasses +print(r1.canNotSeeThisField === undefined) // Can't see its own fields + +var r2 = new (Java.type("jdk.nashorn.test.models.InternalRunnableSuperclass")) +print(r2.canSeeThisField) // Superclass field works fine on its own \ No newline at end of file diff --git a/nashorn/test/script/trusted/JDK-8021129.js.EXPECTED b/nashorn/test/script/trusted/JDK-8021129.js.EXPECTED new file mode 100644 index 00000000000..df7879339e5 --- /dev/null +++ b/nashorn/test/script/trusted/JDK-8021129.js.EXPECTED @@ -0,0 +1,9 @@ +InternalRunnable.run() executed! +InternalRunnable.toString() executed! + +true +true +true +true +true +19 diff --git a/nashorn/test/src/jdk/nashorn/internal/test/models/InternalRunnable.java b/nashorn/test/src/jdk/nashorn/internal/test/models/InternalRunnable.java new file mode 100644 index 00000000000..ed45139dbec --- /dev/null +++ b/nashorn/test/src/jdk/nashorn/internal/test/models/InternalRunnable.java @@ -0,0 +1,71 @@ +/* + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package jdk.nashorn.internal.test.models; + +import java.io.PrintWriter; +import java.io.StringWriter; + +public class InternalRunnable implements Runnable, RestrictedRunnable { + + // This is a public field in a restricted class; scripts should not see it. + public final int canNotSeeThisField = 42; + + private boolean runExecuted = false; + + @Override + public void run() { + runExecuted = true; + } + + @Override + public void restrictedRun() { + // This is a public method on a restricted interface; scripts should not see it. + throw new AssertionError(); + } + + @Override + public String toString() { + final StringWriter sw = new StringWriter(); + final PrintWriter pw = new PrintWriter(sw); + if(runExecuted) { + pw.println("InternalRunnable.run() executed!"); + } + pw.println("InternalRunnable.toString() executed!"); + pw.flush(); + return sw.toString(); + } + + public void canNotInvokeThis() { + // This is a public method in a restricted class; scripts should not see it. + throw new AssertionError(); + } + + public void getInvisibleProperty() { + // This is a public method in a restricted class; scripts should not see it. + throw new AssertionError(); + } +} + diff --git a/nashorn/test/src/jdk/nashorn/internal/test/models/RestrictedRunnable.java b/nashorn/test/src/jdk/nashorn/internal/test/models/RestrictedRunnable.java new file mode 100644 index 00000000000..05fd52c0a52 --- /dev/null +++ b/nashorn/test/src/jdk/nashorn/internal/test/models/RestrictedRunnable.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package jdk.nashorn.internal.test.models; + +/** + * Acts as a restricted interface implemented by a restricted class. + * + */ +public interface RestrictedRunnable { + public void restrictedRun(); +} diff --git a/nashorn/test/src/jdk/nashorn/test/models/InternalRunnableSuperclass.java b/nashorn/test/src/jdk/nashorn/test/models/InternalRunnableSuperclass.java new file mode 100644 index 00000000000..57b6a87224e --- /dev/null +++ b/nashorn/test/src/jdk/nashorn/test/models/InternalRunnableSuperclass.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package jdk.nashorn.test.models; + +/** + * Acts as a non-restricted superclass for a restricted class. + * + */ +public class InternalRunnableSuperclass { + public final int canSeeThisField = 19; + +} From 5c9dbad612ca28033324585380ee94ac9387d262 Mon Sep 17 00:00:00 2001 From: Hiroshi Yamauchi Date: Tue, 23 Jul 2013 09:49:11 -0700 Subject: [PATCH 053/120] 6990419: CMS Remaining work for 6572569: consistently skewed work distribution in (long) re-mark pauses Reviewed-by: rasbold, tschatzl, jmasa --- .../concurrentMarkSweepGeneration.cpp | 77 ++++++++++++++++++- .../concurrentMarkSweepGeneration.hpp | 8 ++ .../src/share/vm/memory/defNewGeneration.cpp | 11 ++- hotspot/src/share/vm/memory/generation.hpp | 1 + hotspot/src/share/vm/runtime/globals.hpp | 8 ++ 5 files changed, 101 insertions(+), 4 deletions(-) diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp index ced79cbcf69..6ff88af286a 100644 --- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp +++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp @@ -569,6 +569,7 @@ CMSCollector::CMSCollector(ConcurrentMarkSweepGeneration* cmsGen, _restart_addr(NULL), _overflow_list(NULL), _stats(cmsGen), + _eden_chunk_lock(new Mutex(Mutex::leaf + 1, "CMS_eden_chunk_lock", true)), _eden_chunk_array(NULL), // may be set in ctor body _eden_chunk_capacity(0), // -- ditto -- _eden_chunk_index(0), // -- ditto -- @@ -2137,6 +2138,39 @@ void CMSCollector::do_mark_sweep_work(bool clear_all_soft_refs, } +void CMSCollector::print_eden_and_survivor_chunk_arrays() { + DefNewGeneration* dng = _young_gen->as_DefNewGeneration(); + EdenSpace* eden_space = dng->eden(); + ContiguousSpace* from_space = dng->from(); + ContiguousSpace* to_space = dng->to(); + // Eden + if (_eden_chunk_array != NULL) { + gclog_or_tty->print_cr("eden " PTR_FORMAT "-" PTR_FORMAT "-" PTR_FORMAT "(" SIZE_FORMAT ")", + eden_space->bottom(), eden_space->top(), + eden_space->end(), eden_space->capacity()); + gclog_or_tty->print_cr("_eden_chunk_index=" SIZE_FORMAT ", " + "_eden_chunk_capacity=" SIZE_FORMAT, + _eden_chunk_index, _eden_chunk_capacity); + for (size_t i = 0; i < _eden_chunk_index; i++) { + gclog_or_tty->print_cr("_eden_chunk_array[" SIZE_FORMAT "]=" PTR_FORMAT, + i, _eden_chunk_array[i]); + } + } + // Survivor + if (_survivor_chunk_array != NULL) { + gclog_or_tty->print_cr("survivor " PTR_FORMAT "-" PTR_FORMAT "-" PTR_FORMAT "(" SIZE_FORMAT ")", + from_space->bottom(), from_space->top(), + from_space->end(), from_space->capacity()); + gclog_or_tty->print_cr("_survivor_chunk_index=" SIZE_FORMAT ", " + "_survivor_chunk_capacity=" SIZE_FORMAT, + _survivor_chunk_index, _survivor_chunk_capacity); + for (size_t i = 0; i < _survivor_chunk_index; i++) { + gclog_or_tty->print_cr("_survivor_chunk_array[" SIZE_FORMAT "]=" PTR_FORMAT, + i, _survivor_chunk_array[i]); + } + } +} + void CMSCollector::getFreelistLocks() const { // Get locks for all free lists in all generations that this // collector is responsible for @@ -3646,6 +3680,10 @@ void CMSCollector::checkpointRootsInitialWork(bool asynch) { // the klasses. The claimed marks need to be cleared before marking starts. ClassLoaderDataGraph::clear_claimed_marks(); + if (CMSPrintEdenSurvivorChunks) { + print_eden_and_survivor_chunk_arrays(); + } + CMKlassClosure klass_closure(¬Older); { COMPILER2_PRESENT(DerivedPointerTableDeactivate dpt_deact;) @@ -4417,7 +4455,9 @@ void CMSCollector::preclean() { verify_overflow_empty(); _abort_preclean = false; if (CMSPrecleaningEnabled) { - _eden_chunk_index = 0; + if (!CMSEdenChunksRecordAlways) { + _eden_chunk_index = 0; + } size_t used = get_eden_used(); size_t capacity = get_eden_capacity(); // Don't start sampling unless we will get sufficiently @@ -4526,7 +4566,9 @@ void CMSCollector::sample_eden() { if (!_start_sampling) { return; } - if (_eden_chunk_array) { + // When CMSEdenChunksRecordAlways is true, the eden chunk array + // is populated by the young generation. + if (_eden_chunk_array != NULL && !CMSEdenChunksRecordAlways) { if (_eden_chunk_index < _eden_chunk_capacity) { _eden_chunk_array[_eden_chunk_index] = *_top_addr; // take sample assert(_eden_chunk_array[_eden_chunk_index] <= *_end_addr, @@ -5010,6 +5052,10 @@ void CMSCollector::checkpointRootsFinalWork(bool asynch, // Update the saved marks which may affect the root scans. gch->save_marks(); + if (CMSPrintEdenSurvivorChunks) { + print_eden_and_survivor_chunk_arrays(); + } + { COMPILER2_PRESENT(DerivedPointerTableDeactivate dpt_deact;) @@ -5530,6 +5576,32 @@ CMSParRemarkTask::do_work_steal(int i, Par_MarkRefsIntoAndScanClosure* cl, "Else our work is not yet done"); } +// Record object boundaries in _eden_chunk_array by sampling the eden +// top in the slow-path eden object allocation code path and record +// the boundaries, if CMSEdenChunksRecordAlways is true. If +// CMSEdenChunksRecordAlways is false, we use the other asynchronous +// sampling in sample_eden() that activates during the part of the +// preclean phase. +void CMSCollector::sample_eden_chunk() { + if (CMSEdenChunksRecordAlways && _eden_chunk_array != NULL) { + if (_eden_chunk_lock->try_lock()) { + // Record a sample. This is the critical section. The contents + // of the _eden_chunk_array have to be non-decreasing in the + // address order. + _eden_chunk_array[_eden_chunk_index] = *_top_addr; + assert(_eden_chunk_array[_eden_chunk_index] <= *_end_addr, + "Unexpected state of Eden"); + if (_eden_chunk_index == 0 || + ((_eden_chunk_array[_eden_chunk_index] > _eden_chunk_array[_eden_chunk_index-1]) && + (pointer_delta(_eden_chunk_array[_eden_chunk_index], + _eden_chunk_array[_eden_chunk_index-1]) >= CMSSamplingGrain))) { + _eden_chunk_index++; // commit sample + } + _eden_chunk_lock->unlock(); + } + } +} + // Return a thread-local PLAB recording array, as appropriate. void* CMSCollector::get_data_recorder(int thr_num) { if (_survivor_plab_array != NULL && @@ -9377,4 +9449,3 @@ TraceCMSMemoryManagerStats::TraceCMSMemoryManagerStats(CMSCollector::CollectorSt ShouldNotReachHere(); } } - diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp index 3806b896d26..29ac2cb80eb 100644 --- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp +++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp @@ -749,6 +749,7 @@ class CMSCollector: public CHeapObj { Generation* _young_gen; // the younger gen HeapWord** _top_addr; // ... Top of Eden HeapWord** _end_addr; // ... End of Eden + Mutex* _eden_chunk_lock; HeapWord** _eden_chunk_array; // ... Eden partitioning array size_t _eden_chunk_index; // ... top (exclusive) of array size_t _eden_chunk_capacity; // ... max entries in array @@ -950,6 +951,7 @@ class CMSCollector: public CHeapObj { // Support for parallel remark of survivor space void* get_data_recorder(int thr_num); + void sample_eden_chunk(); CMSBitMap* markBitMap() { return &_markBitMap; } void directAllocated(HeapWord* start, size_t size); @@ -1027,6 +1029,8 @@ class CMSCollector: public CHeapObj { // Initialization errors bool completed_initialization() { return _completed_initialization; } + + void print_eden_and_survivor_chunk_arrays(); }; class CMSExpansionCause : public AllStatic { @@ -1317,6 +1321,10 @@ class ConcurrentMarkSweepGeneration: public CardGeneration { //Delegate to collector return collector()->get_data_recorder(thr_num); } + void sample_eden_chunk() { + //Delegate to collector + return collector()->sample_eden_chunk(); + } // Printing const char* name() const; diff --git a/hotspot/src/share/vm/memory/defNewGeneration.cpp b/hotspot/src/share/vm/memory/defNewGeneration.cpp index 177569294af..c61fa0127bc 100644 --- a/hotspot/src/share/vm/memory/defNewGeneration.cpp +++ b/hotspot/src/share/vm/memory/defNewGeneration.cpp @@ -1033,6 +1033,9 @@ HeapWord* DefNewGeneration::allocate(size_t word_size, // have to use it here, as well. HeapWord* result = eden()->par_allocate(word_size); if (result != NULL) { + if (CMSEdenChunksRecordAlways && _next_gen != NULL) { + _next_gen->sample_eden_chunk(); + } return result; } do { @@ -1063,13 +1066,19 @@ HeapWord* DefNewGeneration::allocate(size_t word_size, // circular dependency at compile time. if (result == NULL) { result = allocate_from_space(word_size); + } else if (CMSEdenChunksRecordAlways && _next_gen != NULL) { + _next_gen->sample_eden_chunk(); } return result; } HeapWord* DefNewGeneration::par_allocate(size_t word_size, bool is_tlab) { - return eden()->par_allocate(word_size); + HeapWord* res = eden()->par_allocate(word_size); + if (CMSEdenChunksRecordAlways && _next_gen != NULL) { + _next_gen->sample_eden_chunk(); + } + return res; } void DefNewGeneration::gc_prologue(bool full) { diff --git a/hotspot/src/share/vm/memory/generation.hpp b/hotspot/src/share/vm/memory/generation.hpp index 44d641feedd..290cce583a0 100644 --- a/hotspot/src/share/vm/memory/generation.hpp +++ b/hotspot/src/share/vm/memory/generation.hpp @@ -455,6 +455,7 @@ class Generation: public CHeapObj { // expected to be GC worker thread-local, with the worker index // indicated by "thr_num". virtual void* get_data_recorder(int thr_num) { return NULL; } + virtual void sample_eden_chunk() {} // Some generations may require some cleanup actions before allowing // a verification. diff --git a/hotspot/src/share/vm/runtime/globals.hpp b/hotspot/src/share/vm/runtime/globals.hpp index ebac6b5fe3b..27fcbf0081b 100644 --- a/hotspot/src/share/vm/runtime/globals.hpp +++ b/hotspot/src/share/vm/runtime/globals.hpp @@ -1700,6 +1700,14 @@ class CommandLineFlags { "Whether to always record survivor space PLAB bdries" \ " (effective only if CMSParallelSurvivorRemarkEnabled)") \ \ + product(bool, CMSEdenChunksRecordAlways, true, \ + "Whether to always record eden chunks used for " \ + "the parallel initial mark or remark of eden" ) \ + \ + product(bool, CMSPrintEdenSurvivorChunks, false, \ + "Print the eden and the survivor chunks used for the parallel " \ + "initial mark or remark of the eden/survivor spaces") \ + \ product(bool, CMSConcurrentMTEnabled, true, \ "Whether multi-threaded concurrent work enabled (if ParNewGC)") \ \ From 2a95b6ac747e2970f6ba8b8d6f44e5ed4df28c1d Mon Sep 17 00:00:00 2001 From: Jonathan Gibbons Date: Tue, 23 Jul 2013 16:06:11 -0700 Subject: [PATCH 054/120] 8021215: javac gives incorrect doclint warnings on normal package statements Reviewed-by: darcy --- .../com/sun/tools/doclint/Checker.java | 29 ++++++++++++++++--- .../com/sun/tools/doclint/DocLint.java | 14 --------- .../tools/doclint/packageTests/bad/Test.java | 4 ++- .../doclint/packageTests/bad/Test.javac.out | 4 +++ .../tools/doclint/packageTests/bad/Test.out | 2 +- .../packageTests/bad/package-info.java | 3 +- .../packageTests/bad/package-info.javac.out | 4 +++ .../doclint/packageTests/bad/package-info.out | 2 +- .../tools/doclint/packageTests/good/Test.java | 4 ++- .../packageTests/good/package-info.java | 3 +- 10 files changed, 45 insertions(+), 24 deletions(-) create mode 100644 langtools/test/tools/doclint/packageTests/bad/Test.javac.out create mode 100644 langtools/test/tools/doclint/packageTests/bad/package-info.javac.out diff --git a/langtools/src/share/classes/com/sun/tools/doclint/Checker.java b/langtools/src/share/classes/com/sun/tools/doclint/Checker.java index ece896cc6b4..9b75c83abf1 100644 --- a/langtools/src/share/classes/com/sun/tools/doclint/Checker.java +++ b/langtools/src/share/classes/com/sun/tools/doclint/Checker.java @@ -141,10 +141,27 @@ public class Checker extends DocTreePathScanner { boolean isOverridingMethod = !env.currOverriddenMethods.isEmpty(); - if (tree == null) { - if (!isSynthetic() && !isOverridingMethod) - reportMissing("dc.missing.comment"); - return null; + if (p.getLeaf() == p.getCompilationUnit()) { + // If p points to a compilation unit, the implied declaration is the + // package declaration (if any) for the compilation unit. + // Handle this case specially, because doc comments are only + // expected in package-info files. + JavaFileObject fo = p.getCompilationUnit().getSourceFile(); + boolean isPkgInfo = fo.isNameCompatible("package-info", JavaFileObject.Kind.SOURCE); + if (tree == null) { + if (isPkgInfo) + reportMissing("dc.missing.comment"); + return null; + } else { + if (!isPkgInfo) + reportReference("dc.unexpected.comment"); + } + } else { + if (tree == null) { + if (!isSynthetic() && !isOverridingMethod) + reportMissing("dc.missing.comment"); + return null; + } } tagStack.clear(); @@ -187,6 +204,10 @@ public class Checker extends DocTreePathScanner { env.messages.report(MISSING, Kind.WARNING, env.currPath.getLeaf(), code, args); } + private void reportReference(String code, Object... args) { + env.messages.report(REFERENCE, Kind.WARNING, env.currPath.getLeaf(), code, args); + } + @Override public Void visitDocComment(DocCommentTree tree, Void ignore) { super.visitDocComment(tree, ignore); diff --git a/langtools/src/share/classes/com/sun/tools/doclint/DocLint.java b/langtools/src/share/classes/com/sun/tools/doclint/DocLint.java index ca448ebe2a8..20151d1f360 100644 --- a/langtools/src/share/classes/com/sun/tools/doclint/DocLint.java +++ b/langtools/src/share/classes/com/sun/tools/doclint/DocLint.java @@ -32,8 +32,6 @@ import java.util.ArrayList; import java.util.List; import javax.lang.model.element.Name; -import javax.tools.Diagnostic; -import javax.tools.JavaFileObject; import javax.tools.StandardLocation; import com.sun.source.doctree.DocCommentTree; @@ -152,18 +150,6 @@ public class DocLint implements Plugin { TreePath p = getCurrentPath(); DocCommentTree dc = env.trees.getDocCommentTree(p); - if (p.getLeaf() == p.getCompilationUnit()) { - JavaFileObject fo = p.getCompilationUnit().getSourceFile(); - boolean pkgInfo = fo.isNameCompatible("package-info", JavaFileObject.Kind.SOURCE); - if (!pkgInfo) { - if (dc == null) - return; - env.setCurrent(p, dc); - env.messages.report(Messages.Group.REFERENCE, Diagnostic.Kind.WARNING, p.getLeaf(), - "dc.unexpected.comment"); - } - } - checker.scan(dc, p); } }; diff --git a/langtools/test/tools/doclint/packageTests/bad/Test.java b/langtools/test/tools/doclint/packageTests/bad/Test.java index 25ce3621acb..83706d30fd5 100644 --- a/langtools/test/tools/doclint/packageTests/bad/Test.java +++ b/langtools/test/tools/doclint/packageTests/bad/Test.java @@ -1,14 +1,16 @@ /* * @test /nodynamiccopyright/ - * @bug 8020664 + * @bug 8020664 8021215 * @summary doclint gives incorrect warnings on normal package statements * @library ../.. * @build DocLintTester * @run main DocLintTester -ref Test.out Test.java + * @compile/fail/ref=Test.javac.out -XDrawDiagnostics -Werror -Xdoclint:all Test.java */ /** Unexpected comment */ package bad; +/** */ class Test { } diff --git a/langtools/test/tools/doclint/packageTests/bad/Test.javac.out b/langtools/test/tools/doclint/packageTests/bad/Test.javac.out new file mode 100644 index 00000000000..0967f4de35a --- /dev/null +++ b/langtools/test/tools/doclint/packageTests/bad/Test.javac.out @@ -0,0 +1,4 @@ +Test.java:12:1: compiler.warn.proc.messager: documentation comment not expected here +- compiler.err.warnings.and.werror +1 error +1 warning diff --git a/langtools/test/tools/doclint/packageTests/bad/Test.out b/langtools/test/tools/doclint/packageTests/bad/Test.out index de980ea0028..76a55121956 100644 --- a/langtools/test/tools/doclint/packageTests/bad/Test.out +++ b/langtools/test/tools/doclint/packageTests/bad/Test.out @@ -1,4 +1,4 @@ -Test.java:11: warning: documentation comment not expected here +Test.java:12: warning: documentation comment not expected here package bad; ^ 1 warning diff --git a/langtools/test/tools/doclint/packageTests/bad/package-info.java b/langtools/test/tools/doclint/packageTests/bad/package-info.java index 9ebdbbc990f..2653c89b8b5 100644 --- a/langtools/test/tools/doclint/packageTests/bad/package-info.java +++ b/langtools/test/tools/doclint/packageTests/bad/package-info.java @@ -1,10 +1,11 @@ /* * @test /nodynamiccopyright/ - * @bug 8020664 + * @bug 8020664 8021215 * @summary doclint gives incorrect warnings on normal package statements * @library ../.. * @build DocLintTester * @run main DocLintTester -ref package-info.out package-info.java + * @compile/fail/ref=package-info.javac.out -XDrawDiagnostics -Werror -Xdoclint:all package-info.java */ // missing comment diff --git a/langtools/test/tools/doclint/packageTests/bad/package-info.javac.out b/langtools/test/tools/doclint/packageTests/bad/package-info.javac.out new file mode 100644 index 00000000000..184eb41d017 --- /dev/null +++ b/langtools/test/tools/doclint/packageTests/bad/package-info.javac.out @@ -0,0 +1,4 @@ +package-info.java:12:1: compiler.warn.proc.messager: no comment +- compiler.err.warnings.and.werror +1 error +1 warning diff --git a/langtools/test/tools/doclint/packageTests/bad/package-info.out b/langtools/test/tools/doclint/packageTests/bad/package-info.out index fd4377caadb..1d07cd65ba0 100644 --- a/langtools/test/tools/doclint/packageTests/bad/package-info.out +++ b/langtools/test/tools/doclint/packageTests/bad/package-info.out @@ -1,4 +1,4 @@ -package-info.java:11: warning: no comment +package-info.java:12: warning: no comment package bad; ^ 1 warning diff --git a/langtools/test/tools/doclint/packageTests/good/Test.java b/langtools/test/tools/doclint/packageTests/good/Test.java index 84db8d5ee8e..223d89a3bf3 100644 --- a/langtools/test/tools/doclint/packageTests/good/Test.java +++ b/langtools/test/tools/doclint/packageTests/good/Test.java @@ -23,15 +23,17 @@ /* * @test /nodynamiccopyright/ - * @bug 8020664 + * @bug 8020664 8021215 * @summary doclint gives incorrect warnings on normal package statements * @library ../.. * @build DocLintTester * @run main DocLintTester Test.java + * @compile -Xdoclint:all Test.java */ // no doc comment package good; +/** */ class Test { } diff --git a/langtools/test/tools/doclint/packageTests/good/package-info.java b/langtools/test/tools/doclint/packageTests/good/package-info.java index 598feaed23c..d60412d91ee 100644 --- a/langtools/test/tools/doclint/packageTests/good/package-info.java +++ b/langtools/test/tools/doclint/packageTests/good/package-info.java @@ -23,11 +23,12 @@ /* * @test /nodynamiccopyright/ - * @bug 8020664 + * @bug 8020664 8021215 * @summary doclint gives incorrect warnings on normal package statements * @library ../.. * @build DocLintTester * @run main DocLintTester package-info.java + * @compile -Xdoclint:all package-info.java */ /** Description. */ From be2ea6f949bca40b288d4e97511872e2dc2b2ece Mon Sep 17 00:00:00 2001 From: Eric McCorkle Date: Tue, 23 Jul 2013 20:42:54 -0400 Subject: [PATCH 055/120] 8016880: 42 tests in annot102* fail with compile-time errors Fixes error in type equality when bounds of type variables have annotations. Reviewed-by: jjg, mcimadamore --- .../com/sun/tools/javac/code/Types.java | 6 +-- .../typeAnnotations/ErasureTest.java | 51 +++++++++++++++++++ 2 files changed, 54 insertions(+), 3 deletions(-) create mode 100644 langtools/test/tools/javac/annotations/typeAnnotations/ErasureTest.java diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Types.java b/langtools/src/share/classes/com/sun/tools/javac/code/Types.java index 6b7e2752b69..e4cf5830206 100644 --- a/langtools/src/share/classes/com/sun/tools/javac/code/Types.java +++ b/langtools/src/share/classes/com/sun/tools/javac/code/Types.java @@ -134,7 +134,7 @@ public class Types { * @return the upper bound of the given type */ public Type upperBound(Type t) { - return upperBound.visit(t); + return upperBound.visit(t).unannotatedType(); } // where private final MapVisitor upperBound = new MapVisitor() { @@ -1130,9 +1130,9 @@ public class Types { HashSet set = new HashSet(); for (Type x : interfaces(t)) - set.add(new UniqueType(x, Types.this)); + set.add(new UniqueType(x.unannotatedType(), Types.this)); for (Type x : interfaces(s)) { - if (!set.remove(new UniqueType(x, Types.this))) + if (!set.remove(new UniqueType(x.unannotatedType(), Types.this))) return false; } return (set.isEmpty()); diff --git a/langtools/test/tools/javac/annotations/typeAnnotations/ErasureTest.java b/langtools/test/tools/javac/annotations/typeAnnotations/ErasureTest.java new file mode 100644 index 00000000000..d4131a9b912 --- /dev/null +++ b/langtools/test/tools/javac/annotations/typeAnnotations/ErasureTest.java @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8016013 + * @summary Compiler incorrectly treats annotated and unannotated type variable bounds as different types + * @compile -doe ErasureTest.java + */ + +import java.lang.annotation.ElementType; +import java.lang.annotation.Target; + +@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER }) +@interface Advanced {} + +class U {} +interface I {} + +class ErasureTest { + void TestMethod(T arg1) { } + public static void main(String argv[]) { + ErasureTest t1 = new ErasureTest(){ + public void TestMethod(T arg1) { } + }; + + ErasureTest t2 = new ErasureTest(){ + public void TestMethod(T arg1) { } + }; + } +} From 93e5db70331dc3074a11afd20e1414ab0b78a333 Mon Sep 17 00:00:00 2001 From: Thomas Schatzl Date: Wed, 24 Jul 2013 10:07:37 +0200 Subject: [PATCH 056/120] 8020123: Test gc/g1/TestPrintRegionRememberedSetInfo.java fails with "test result: Error. No action after @build" Remove the @build tag and replace it by a @run tag so that the test gets executed Reviewed-by: brutisso, mgerdin --- hotspot/test/gc/g1/TestPrintRegionRememberedSetInfo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hotspot/test/gc/g1/TestPrintRegionRememberedSetInfo.java b/hotspot/test/gc/g1/TestPrintRegionRememberedSetInfo.java index 417b2cc1a39..6bf41391b4f 100644 --- a/hotspot/test/gc/g1/TestPrintRegionRememberedSetInfo.java +++ b/hotspot/test/gc/g1/TestPrintRegionRememberedSetInfo.java @@ -27,7 +27,7 @@ * @bug 8014240 * @summary Test output of G1PrintRegionRememberedSetInfo * @library /testlibrary - * @build TestPrintRegionRememberedSetInfo + * @run main TestPrintRegionRememberedSetInfo * @author thomas.schatzl@oracle.com */ From eae349e914476bfba60a03c50387579e11ed485e Mon Sep 17 00:00:00 2001 From: Anthony Scarpino Date: Mon, 29 Jul 2013 13:43:24 -0700 Subject: [PATCH 057/120] 8020424: The NSS version should be detected before running crypto tests Reviewed-by: valeriep --- jdk/test/ProblemList.txt | 27 +---- .../pkcs11/KeyStore/SecretKeysBasic.java | 23 ++-- jdk/test/sun/security/pkcs11/PKCS11Test.java | 103 ++++++++++++++++++ jdk/test/sun/security/pkcs11/README | 22 ++++ .../security/pkcs11/ec/ReadCertificates.java | 16 ++- .../sun/security/pkcs11/ec/TestCurves.java | 38 ++++++- jdk/test/sun/security/pkcs11/ec/TestECDH.java | 7 +- .../sun/security/pkcs11/ec/TestECDH2.java | 9 +- .../sun/security/pkcs11/ec/TestECDSA.java | 21 +++- .../sun/security/pkcs11/ec/TestECDSA2.java | 9 +- .../sun/security/pkcs11/ec/TestECGenSpec.java | 19 +++- .../security/pkcs11/ec/TestKeyFactory.java | 14 ++- 12 files changed, 251 insertions(+), 57 deletions(-) create mode 100644 jdk/test/sun/security/pkcs11/README diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt index 2fb32245adf..e3ceec1d466 100644 --- a/jdk/test/ProblemList.txt +++ b/jdk/test/ProblemList.txt @@ -255,32 +255,12 @@ sun/rmi/transport/proxy/EagerHttpFallback.java generic-all # jdk_security -# 8012971 PKCS11Test hiding exception failures -sun/security/pkcs11/KeyStore/SecretKeysBasic.java solaris-all -sun/security/pkcs11/KeyStore/SecretKeysBasic.java linux-all -sun/security/pkcs11/ec/TestCurves.java solaris-all -sun/security/pkcs11/ec/TestCurves.java linux-all -sun/security/pkcs11/ec/TestECDH.java solaris-all -sun/security/pkcs11/ec/TestECDH2.java solaris-all -sun/security/pkcs11/ec/TestECDH2.java linux-all -sun/security/pkcs11/ec/TestECDSA.java solaris-all -sun/security/pkcs11/ec/TestECDSA.java linux-all -sun/security/pkcs11/ec/TestECDSA2.java solaris-all -sun/security/pkcs11/ec/TestECDSA2.java linux-all -sun/security/pkcs11/ec/TestECGenSpec.java solaris-all -sun/security/pkcs11/ec/TestECGenSpec.java linux-all -sun/security/pkcs11/ec/TestKeyFactory.java solaris-all -sun/security/pkcs11/ec/TestKeyFactory.java linux-all +# 7157786 +sun/security/pkcs11/ec/TestKeyFactory.java generic-all # 7164518: no PortUnreachableException on Mac sun/security/krb5/auto/Unreachable.java macosx-all -# 7193793 -sun/security/pkcs11/ec/TestECDH.java linux-all - -# 7198198: the test also fails on SuSE Linux -sun/security/pkcs11/ec/ReadCertificates.java linux-all - # 7147060 com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java generic-all @@ -290,9 +270,6 @@ sun/security/pkcs11/ec/ReadCertificates.java solaris-all sun/security/pkcs11/ec/ReadPKCS12.java solaris-all sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java solaris-all -# 8005247 -sun/security/pkcs11/ec/TestECDSA.java solaris-all - # 8009438 sun/security/pkcs11/Secmod/AddPrivateKey.java linux-all sun/security/pkcs11/Secmod/TrustAnchors.java linux-all diff --git a/jdk/test/sun/security/pkcs11/KeyStore/SecretKeysBasic.java b/jdk/test/sun/security/pkcs11/KeyStore/SecretKeysBasic.java index d95ff95ef6f..9d5bfe1b54a 100644 --- a/jdk/test/sun/security/pkcs11/KeyStore/SecretKeysBasic.java +++ b/jdk/test/sun/security/pkcs11/KeyStore/SecretKeysBasic.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2013 Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,16 +23,10 @@ import java.io.*; import java.util.*; -import java.lang.reflect.*; - import java.security.*; -import java.security.cert.*; -import java.security.spec.*; -import java.security.interfaces.*; -import java.math.BigInteger; - import javax.crypto.*; import javax.crypto.spec.*; +import javax.xml.bind.DatatypeConverter; public class SecretKeysBasic extends PKCS11Test { @@ -94,6 +88,17 @@ public class SecretKeysBasic extends PKCS11Test { SecretKey expected, boolean saveBeforeCheck) throws Exception { + + // A bug in NSS 3.12 (Mozilla bug 471665) causes AES key lengths + // to be read incorrectly. Checking for improper 16 byte length + // in key string. + if (isNSS(provider) && expected.getAlgorithm().equals("AES") && + (getNSSVersion() >= 3.12 && getNSSVersion() <= 3.122)) { + System.out.println("NSS 3.12 bug returns incorrect AES key "+ + "length breaking key storage. Aborting..."); + return true; + } + if (saveBeforeCheck) { ks.setKeyEntry(alias, expected, null, null); } @@ -127,7 +132,7 @@ public class SecretKeysBasic extends PKCS11Test { System.out.println("\tALGO=" + key.getAlgorithm()); if (key.getFormat() != null) { System.out.println("\t[" + key.getFormat() + "] VALUE=" + - new BigInteger(key.getEncoded())); + DatatypeConverter.printHexBinary(key.getEncoded())); } else { System.out.println("\tVALUE=n/a"); } diff --git a/jdk/test/sun/security/pkcs11/PKCS11Test.java b/jdk/test/sun/security/pkcs11/PKCS11Test.java index eff8a44b6fa..1382524750b 100644 --- a/jdk/test/sun/security/pkcs11/PKCS11Test.java +++ b/jdk/test/sun/security/pkcs11/PKCS11Test.java @@ -54,6 +54,11 @@ public abstract class PKCS11Test { static String NSPR_PREFIX = ""; + // NSS version info + public static enum ECCState { None, Basic, Extended }; + static double nss_version = -1; + static ECCState nss_ecc_status = ECCState.Extended; + // The NSS library we need to search for in getNSSLibDir() // Default is "libsoftokn3.so", listed as "softokn3" // The other is "libnss3.so", listed as "nss3". @@ -217,6 +222,104 @@ public abstract class PKCS11Test { return true; } + // Check the provider being used is NSS + public static boolean isNSS(Provider p) { + return p.getName().toUpperCase().equals("SUNPKCS11-NSS"); + } + + static double getNSSVersion() { + if (nss_version == -1) + getNSSInfo(); + return nss_version; + } + + static ECCState getNSSECC() { + if (nss_version == -1) + getNSSInfo(); + return nss_ecc_status; + } + + /* Read the library to find out the verison */ + static void getNSSInfo() { + String nssHeader = "$Header: NSS"; + boolean found = false; + String s = null; + int i = 0; + String libfile = ""; + + try { + libfile = getNSSLibDir() + System.mapLibraryName(nss_library); + FileInputStream is = new FileInputStream(libfile); + byte[] data = new byte[1000]; + int read = 0; + + while (is.available() > 0) { + if (read == 0) { + read = is.read(data, 0, 1000); + } else { + // Prepend last 100 bytes in case the header was split + // between the reads. + System.arraycopy(data, 900, data, 0, 100); + read = 100 + is.read(data, 100, 900); + } + + s = new String(data, 0, read); + if ((i = s.indexOf(nssHeader)) > 0) { + found = true; + // If the nssHeader is before 920 we can break, otherwise + // we may not have the whole header so do another read. If + // no bytes are in the stream, that is ok, found is true. + if (i < 920) { + break; + } + } + } + + is.close(); + + } catch (Exception e) { + e.printStackTrace(); + } + + if (!found) { + System.out.println("NSS version not found, set to 0.0: "+libfile); + nss_version = 0.0; + return; + } + + // the index after whitespace after nssHeader + int afterheader = s.indexOf("NSS", i) + 4; + String version = s.substring(afterheader, s.indexOf(' ', afterheader)); + + // If a "dot dot" release, strip the extra dots for double parsing + String[] dot = version.split("\\."); + if (dot.length > 2) { + version = dot[0]+"."+dot[1]; + for (int j = 2; dot.length > j; j++) { + version += dot[j]; + } + } + + // Convert to double for easier version value checking + try { + nss_version = Double.parseDouble(version); + } catch (NumberFormatException e) { + System.out.println("Failed to parse NSS version. Set to 0.0"); + e.printStackTrace(); + } + + System.out.print("NSS version = "+version+". "); + + // Check for ECC + if (s.indexOf("Basic") > 0) { + nss_ecc_status = ECCState.Basic; + System.out.println("ECC Basic."); + } else if (s.indexOf("Extended") > 0) { + nss_ecc_status = ECCState.Extended; + System.out.println("ECC Extended."); + } + } + // Used to set the nss_library file to search for libsoftokn3.so public static void useNSS() { nss_library = "nss3"; diff --git a/jdk/test/sun/security/pkcs11/README b/jdk/test/sun/security/pkcs11/README new file mode 100644 index 00000000000..9ea16b61dc1 --- /dev/null +++ b/jdk/test/sun/security/pkcs11/README @@ -0,0 +1,22 @@ +This README is to keep a list facts and known workaround for the pkcs11 java tests +perform as a result of bugs or features in NSS or other pkcs11 libraries. + +- NSS ECC None/Basic/Extended +The tests detect the NSS library support for Elliptic Curves as to not +report incorrect failures. PKCS11 reports back CKR_DOMAIN_PARAMS_INVALID +when the curve is not supported. + +- Default libsoftokn3.so +By default PKCS11Test.java will look for libsoftokn3.so. There are a number of +tests, particularly in Secmod, that need libnss3.so. The method useNSS() in +PKCS11test.java is to change the search and version checking to libnss3. + +ECC Basic supports is secp256r1, secp384r1, and secp521r1. + +- A bug in NSS 3.12 (Mozilla bug 471665) causes AES key lengths to be +read incorrectly. KeyStore/SecretKeysBasic.java tiggers this bug and +knows to avoid it. + +- A number of EC tests fail because of a DER bug in NSS 3.11. The best guess +is Mozilla bug 480280. Those tests that abort execution with a PASS result +are: TestECDH2, TestECDSA, TestECDSA2 and TestECGenSpec. diff --git a/jdk/test/sun/security/pkcs11/ec/ReadCertificates.java b/jdk/test/sun/security/pkcs11/ec/ReadCertificates.java index 35662d6c624..ff0a62ba221 100644 --- a/jdk/test/sun/security/pkcs11/ec/ReadCertificates.java +++ b/jdk/test/sun/security/pkcs11/ec/ReadCertificates.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -113,6 +113,20 @@ public class ReadCertificates extends PKCS11Test { System.out.println("Warning: " + e.getMessage() + ". Trying another provider..."); cert.verify(key); + } catch (InvalidKeyException e) { + // The root cause of the exception might be NSS not having + // "ECC Extended" support curves. If so, we can ignore it. + Throwable t = e; + while (t.getCause() != null) { + t = t.getCause(); + } + if (t instanceof sun.security.pkcs11.wrapper.PKCS11Exception && + t.getMessage().equals("CKR_DOMAIN_PARAMS_INVALID") && + isNSS(p) && getNSSECC() == ECCState.Basic) { + System.out.println("Failed as expected. NSS Basic ECC."); + continue; + } + throw e; } } diff --git a/jdk/test/sun/security/pkcs11/ec/TestCurves.java b/jdk/test/sun/security/pkcs11/ec/TestCurves.java index 69a37436683..511bbaf7568 100644 --- a/jdk/test/sun/security/pkcs11/ec/TestCurves.java +++ b/jdk/test/sun/security/pkcs11/ec/TestCurves.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -50,6 +50,12 @@ public class TestCurves extends PKCS11Test { return; } + if (isNSS(p) && getNSSVersion() >= 3.11 && getNSSVersion() < 3.12) { + System.out.println("NSS 3.11 has a DER issue that recent " + + "version do not."); + return; + } + Random random = new Random(); byte[] data = new byte[2048]; random.nextBytes(data); @@ -61,8 +67,29 @@ public class TestCurves extends PKCS11Test { KeyPairGenerator kpg = KeyPairGenerator.getInstance("EC", p); kpg.initialize(params); KeyPair kp1, kp2; - kp1 = kpg.generateKeyPair(); - kp2 = kpg.generateKeyPair(); + + try { + kp1 = kpg.generateKeyPair(); + kp2 = kpg.generateKeyPair(); + } catch (Exception e) { + // The root cause of the exception might be NSS not having + // "ECC Extended" support curves. If so, we can ignore it. + if (e instanceof java.security.ProviderException) { + Throwable t = e.getCause(); + if (t instanceof + sun.security.pkcs11.wrapper.PKCS11Exception && + t.getMessage().equals("CKR_DOMAIN_PARAMS_INVALID") && + isNSS(p) && (getNSSECC() == ECCState.Basic) && + (!params.toString().startsWith("secp256r1") && + !params.toString().startsWith("secp384r1") && + !params.toString().startsWith("secp521r1"))) { + System.out.println("NSS Basic ECC. Failure expected"); + continue; + } + } + + throw e; + } testSigning(p, "SHA1withECDSA", data, kp1, kp2); testSigning(p, "SHA224withECDSA", data, kp1, kp2); @@ -97,8 +124,9 @@ public class TestCurves extends PKCS11Test { int end; String curve; Vector results = new Vector(); - String kcProp = - p.getProperty("AlgorithmParameters.EC SupportedCurves"); + // Get Curves to test from SunEC. + String kcProp = Security.getProvider("SunEC"). + getProperty("AlgorithmParameters.EC SupportedCurves"); if (kcProp == null) { throw new RuntimeException( diff --git a/jdk/test/sun/security/pkcs11/ec/TestECDH.java b/jdk/test/sun/security/pkcs11/ec/TestECDH.java index 1d70befc89c..8d950818560 100644 --- a/jdk/test/sun/security/pkcs11/ec/TestECDH.java +++ b/jdk/test/sun/security/pkcs11/ec/TestECDH.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -61,6 +61,11 @@ public class TestECDH extends PKCS11Test { return; } + if (isNSS(p) && getNSSECC() == ECCState.Basic) { + System.out.println("NSS only supports Basic ECC. Skipping.."); + return; + } + /* * PKCS11Test.main will remove this provider if needed */ diff --git a/jdk/test/sun/security/pkcs11/ec/TestECDH2.java b/jdk/test/sun/security/pkcs11/ec/TestECDH2.java index c30cb5a0c96..02ffd38ee0c 100644 --- a/jdk/test/sun/security/pkcs11/ec/TestECDH2.java +++ b/jdk/test/sun/security/pkcs11/ec/TestECDH2.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -106,6 +106,13 @@ public class TestECDH2 extends PKCS11Test { return; } + if (isNSS(provider) && getNSSVersion() >= 3.11 && + getNSSVersion() < 3.12) { + System.out.println("NSS 3.11 has a DER issue that recent " + + "version do not."); + return; + } + kf = KeyFactory.getInstance("EC", provider); kpg = KeyPairGenerator.getInstance("EC", provider); diff --git a/jdk/test/sun/security/pkcs11/ec/TestECDSA.java b/jdk/test/sun/security/pkcs11/ec/TestECDSA.java index 92dac4c34b6..ad30accadeb 100644 --- a/jdk/test/sun/security/pkcs11/ec/TestECDSA.java +++ b/jdk/test/sun/security/pkcs11/ec/TestECDSA.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -30,9 +30,7 @@ * @library ../../../../java/security/testlibrary */ -import java.io.*; import java.util.*; -import java.math.BigInteger; import java.security.*; import java.security.spec.*; @@ -117,6 +115,13 @@ public class TestECDSA extends PKCS11Test { return; } + if (isNSS(provider) && getNSSVersion() >= 3.11 && + getNSSVersion() < 3.12) { + System.out.println("NSS 3.11 has a DER issue that recent " + + "version do not."); + return; + } + /* * PKCS11Test.main will remove this provider if needed */ @@ -136,10 +141,14 @@ public class TestECDSA extends PKCS11Test { return; } - test(provider, pub192, priv192, sig192); - test(provider, pub163, priv163, sig163); + if (getNSSECC() != ECCState.Basic) { + test(provider, pub192, priv192, sig192); + test(provider, pub163, priv163, sig163); + test(provider, pub571, priv571, sig571); + } else { + System.out.println("ECC Basic only, skipping 192, 163 and 571."); + } test(provider, pub521, priv521, sig521); - test(provider, pub571, priv571, sig571); long stop = System.currentTimeMillis(); System.out.println("All tests passed (" + (stop - start) + " ms)."); diff --git a/jdk/test/sun/security/pkcs11/ec/TestECDSA2.java b/jdk/test/sun/security/pkcs11/ec/TestECDSA2.java index 886f7f22390..054402590c2 100644 --- a/jdk/test/sun/security/pkcs11/ec/TestECDSA2.java +++ b/jdk/test/sun/security/pkcs11/ec/TestECDSA2.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -104,6 +104,13 @@ public class TestECDSA2 extends PKCS11Test { return; } + if (isNSS(provider) && getNSSVersion() >= 3.11 && + getNSSVersion() < 3.12) { + System.out.println("NSS 3.11 has a DER issue that recent " + + "version do not."); + return; + } + kf = KeyFactory.getInstance("EC", provider); long start = System.currentTimeMillis(); diff --git a/jdk/test/sun/security/pkcs11/ec/TestECGenSpec.java b/jdk/test/sun/security/pkcs11/ec/TestECGenSpec.java index 548b59cf762..8b5e6aa866c 100644 --- a/jdk/test/sun/security/pkcs11/ec/TestECGenSpec.java +++ b/jdk/test/sun/security/pkcs11/ec/TestECGenSpec.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2013 Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -47,9 +47,20 @@ public class TestECGenSpec extends PKCS11Test { return; } - String[] names = { "NIST P-192", "sect163k1", "1.3.132.0.26", "X9.62 c2tnb239v1"}; - int[] lengths = {192, 163, 233, 239}; - for (int i = 0; i < names.length; i++) { + if (isNSS(p) && getNSSVersion() >= 3.11 && getNSSVersion() < 3.12) { + System.out.println("NSS 3.11 has a DER issue that recent " + + "version do not."); + return; + } + + String[] names = { "secp256r1", "NIST P-192", "sect163k1", "1.3.132.0.26", + "X9.62 c2tnb239v1"}; + int curves = 1; + if (getNSSECC() == ECCState.Extended) { + curves = names.length; + } + int[] lengths = {256, 192, 163, 233, 239}; + for (int i = 0; i < curves; i++) { String name = names[i]; int len = lengths[i]; System.out.println("Testing " + name + "..."); diff --git a/jdk/test/sun/security/pkcs11/ec/TestKeyFactory.java b/jdk/test/sun/security/pkcs11/ec/TestKeyFactory.java index 997afa9b65f..767322059a1 100644 --- a/jdk/test/sun/security/pkcs11/ec/TestKeyFactory.java +++ b/jdk/test/sun/security/pkcs11/ec/TestKeyFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2013 Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -119,11 +119,17 @@ public class TestKeyFactory extends PKCS11Test { System.out.println("Provider does not support EC, skipping"); return; } - int[] keyLengths = {192, 163, 521, 409}; + int[] keyLengths = {192, 163, 409, 521}; + int len = 0; + if (getNSSECC() == ECCState.Basic) { + System.out.println("NSS Basic ECC only. Skipping 192, 163, & 409"); + len = 3; + } KeyFactory kf = KeyFactory.getInstance("EC", p); - for (int len : keyLengths) { + for (; keyLengths.length > len ; len++) { + System.out.println("Length "+keyLengths[len]); KeyPairGenerator kpg = KeyPairGenerator.getInstance("EC", p); - kpg.initialize(len); + kpg.initialize(keyLengths[len]); KeyPair kp = kpg.generateKeyPair(); test(kf, kp.getPrivate()); test(kf, kp.getPublic()); From 1cf74954ed1c9e1597d56cf73446ca277769a742 Mon Sep 17 00:00:00 2001 From: Xue-Lei Andrew Fan Date: Mon, 29 Jul 2013 19:36:54 -0700 Subject: [PATCH 058/120] 8021841: Remove SSLEngineDeadlock.java from problem list Reviewed-by: wetmore --- jdk/test/ProblemList.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt index e3ceec1d466..0da9ac03f82 100644 --- a/jdk/test/ProblemList.txt +++ b/jdk/test/ProblemList.txt @@ -296,9 +296,6 @@ sun/security/krb5/auto/BadKdc4.java solaris-sparcv9 # 7194428 sun/security/mscapi/ShortRSAKey1024.sh windows-all -# 7144048, performance issue -sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/SSLEngineDeadlock.java generic-all - ############################################################################ # jdk_sound From 3e4d534e16bbdb5d308732c1c0b0cb01e1895809 Mon Sep 17 00:00:00 2001 From: Jason Uh Date: Tue, 30 Jul 2013 11:04:19 -0700 Subject: [PATCH 059/120] 8021833: javadoc cleanup in java.net and converted to {@code }; package.html to package-info.java Reviewed-by: darcy, chegar --- .../share/classes/java/net/Authenticator.java | 38 +- .../classes/java/net/ContentHandler.java | 28 +- .../java/net/ContentHandlerFactory.java | 16 +- .../share/classes/java/net/CookieHandler.java | 12 +- .../share/classes/java/net/CookieManager.java | 16 +- .../share/classes/java/net/CookiePolicy.java | 6 +- .../share/classes/java/net/CookieStore.java | 20 +- .../classes/java/net/DatagramPacket.java | 54 +-- .../classes/java/net/DatagramSocket.java | 152 ++++---- .../classes/java/net/DatagramSocketImpl.java | 14 +- .../java/net/DatagramSocketImplFactory.java | 8 +- .../share/classes/java/net/FileNameMap.java | 4 +- .../share/classes/java/net/HttpCookie.java | 4 +- .../classes/java/net/HttpRetryException.java | 6 +- .../classes/java/net/HttpURLConnection.java | 62 ++-- jdk/src/share/classes/java/net/IDN.java | 18 +- .../share/classes/java/net/Inet4Address.java | 44 +-- .../share/classes/java/net/Inet6Address.java | 22 +- .../share/classes/java/net/InetAddress.java | 110 +++--- .../classes/java/net/InetSocketAddress.java | 46 +-- .../classes/java/net/InterfaceAddress.java | 28 +- .../classes/java/net/JarURLConnection.java | 22 +- .../java/net/MalformedURLException.java | 6 +- .../classes/java/net/MulticastSocket.java | 72 ++-- .../share/classes/java/net/NetPermission.java | 10 +- .../classes/java/net/NetworkInterface.java | 54 +-- .../java/net/PasswordAuthentication.java | 6 +- .../java/net/PortUnreachableException.java | 6 +- .../classes/java/net/ProtocolException.java | 6 +- jdk/src/share/classes/java/net/Proxy.java | 32 +- .../share/classes/java/net/ProxySelector.java | 12 +- .../share/classes/java/net/ResponseCache.java | 20 +- .../share/classes/java/net/ServerSocket.java | 130 +++---- jdk/src/share/classes/java/net/Socket.java | 224 ++++++------ .../classes/java/net/SocketException.java | 6 +- .../share/classes/java/net/SocketImpl.java | 36 +- .../classes/java/net/SocketImplFactory.java | 10 +- .../classes/java/net/SocketInputStream.java | 6 +- .../share/classes/java/net/SocketOptions.java | 4 +- .../classes/java/net/SocketOutputStream.java | 6 +- .../classes/java/net/SocketPermission.java | 10 +- .../classes/java/net/SocksSocketImpl.java | 12 +- jdk/src/share/classes/java/net/URI.java | 341 +++++++++-------- .../classes/java/net/URISyntaxException.java | 18 +- jdk/src/share/classes/java/net/URL.java | 178 ++++----- .../classes/java/net/URLClassLoader.java | 30 +- .../share/classes/java/net/URLConnection.java | 346 +++++++++--------- .../share/classes/java/net/URLDecoder.java | 52 +-- .../share/classes/java/net/URLEncoder.java | 34 +- .../classes/java/net/URLStreamHandler.java | 56 +-- .../java/net/URLStreamHandlerFactory.java | 16 +- .../java/net/UnknownHostException.java | 6 +- .../java/net/UnknownServiceException.java | 6 +- .../share/classes/java/net/package-info.java | 161 ++++++++ jdk/src/share/classes/java/net/package.html | 112 ------ 55 files changed, 1398 insertions(+), 1356 deletions(-) create mode 100644 jdk/src/share/classes/java/net/package-info.java delete mode 100644 jdk/src/share/classes/java/net/package.html diff --git a/jdk/src/share/classes/java/net/Authenticator.java b/jdk/src/share/classes/java/net/Authenticator.java index bc9945c5ddb..28df05ca0d3 100644 --- a/jdk/src/share/classes/java/net/Authenticator.java +++ b/jdk/src/share/classes/java/net/Authenticator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -103,17 +103,17 @@ class Authenticator { * Sets the authenticator that will be used by the networking code * when a proxy or an HTTP server asks for authentication. *

    - * First, if there is a security manager, its checkPermission + * First, if there is a security manager, its {@code checkPermission} * method is called with a - * NetPermission("setDefaultAuthenticator") permission. + * {@code NetPermission("setDefaultAuthenticator")} permission. * This may result in a java.lang.SecurityException. * - * @param a The authenticator to be set. If a is null then + * @param a The authenticator to be set. If a is {@code null} then * any previously set authenticator is removed. * * @throws SecurityException * if a security manager exists and its - * checkPermission method doesn't allow + * {@code checkPermission} method doesn't allow * setting the default authenticator. * * @see SecurityManager#checkPermission @@ -134,9 +134,9 @@ class Authenticator { * Ask the authenticator that has been registered with the system * for a password. *

    - * First, if there is a security manager, its checkPermission + * First, if there is a security manager, its {@code checkPermission} * method is called with a - * NetPermission("requestPasswordAuthentication") permission. + * {@code NetPermission("requestPasswordAuthentication")} permission. * This may result in a java.lang.SecurityException. * * @param addr The InetAddress of the site requesting authorization, @@ -151,7 +151,7 @@ class Authenticator { * * @throws SecurityException * if a security manager exists and its - * checkPermission method doesn't allow + * {@code checkPermission} method doesn't allow * the password authentication request. * * @see SecurityManager#checkPermission @@ -193,9 +193,9 @@ class Authenticator { * because the hostname can be provided in cases where the InetAddress * is not available. *

    - * First, if there is a security manager, its checkPermission + * First, if there is a security manager, its {@code checkPermission} * method is called with a - * NetPermission("requestPasswordAuthentication") permission. + * {@code NetPermission("requestPasswordAuthentication")} permission. * This may result in a java.lang.SecurityException. * * @param host The hostname of the site requesting authentication. @@ -211,7 +211,7 @@ class Authenticator { * * @throws SecurityException * if a security manager exists and its - * checkPermission method doesn't allow + * {@code checkPermission} method doesn't allow * the password authentication request. * * @see SecurityManager#checkPermission @@ -254,9 +254,9 @@ class Authenticator { * Ask the authenticator that has been registered with the system * for a password. *

    - * First, if there is a security manager, its checkPermission + * First, if there is a security manager, its {@code checkPermission} * method is called with a - * NetPermission("requestPasswordAuthentication") permission. + * {@code NetPermission("requestPasswordAuthentication")} permission. * This may result in a java.lang.SecurityException. * * @param host The hostname of the site requesting authentication. @@ -275,7 +275,7 @@ class Authenticator { * * @throws SecurityException * if a security manager exists and its - * checkPermission method doesn't allow + * {@code checkPermission} method doesn't allow * the password authentication request. * * @see SecurityManager#checkPermission @@ -320,8 +320,8 @@ class Authenticator { } /** - * Gets the hostname of the - * site or proxy requesting authentication, or null + * Gets the {@code hostname} of the + * site or proxy requesting authentication, or {@code null} * if not available. * * @return the hostname of the connection requiring authentication, or null @@ -333,8 +333,8 @@ class Authenticator { } /** - * Gets the InetAddress of the - * site requesting authorization, or null + * Gets the {@code InetAddress} of the + * site requesting authorization, or {@code null} * if not available. * * @return the InetAddress of the site requesting authorization, or null @@ -346,7 +346,7 @@ class Authenticator { /** * Gets the port number for the requested connection. - * @return an int indicating the + * @return an {@code int} indicating the * port for the requested connection. */ protected final int getRequestingPort() { diff --git a/jdk/src/share/classes/java/net/ContentHandler.java b/jdk/src/share/classes/java/net/ContentHandler.java index 79bcb0a30ca..8c585cbf354 100644 --- a/jdk/src/share/classes/java/net/ContentHandler.java +++ b/jdk/src/share/classes/java/net/ContentHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -28,21 +28,21 @@ package java.net; import java.io.IOException; /** - * The abstract class ContentHandler is the superclass - * of all classes that read an Object from a - * URLConnection. + * The abstract class {@code ContentHandler} is the superclass + * of all classes that read an {@code Object} from a + * {@code URLConnection}. *

    * An application does not generally call the - * getContent method in this class directly. Instead, an - * application calls the getContent method in class - * URL or in URLConnection. + * {@code getContent} method in this class directly. Instead, an + * application calls the {@code getContent} method in class + * {@code URL} or in {@code URLConnection}. * The application's content handler factory (an instance of a class that - * implements the interface ContentHandlerFactory set - * up by a call to setContentHandler) is - * called with a String giving the MIME type of the + * implements the interface {@code ContentHandlerFactory} set + * up by a call to {@code setContentHandler}) is + * called with a {@code String} giving the MIME type of the * object being received on the socket. The factory returns an - * instance of a subclass of ContentHandler, and its - * getContent method is called to create the object. + * instance of a subclass of {@code ContentHandler}, and its + * {@code getContent} method is called to create the object. *

    * If no content handler could be found, URLConnection will * look for a content handler in a user-defineable set of places. @@ -75,7 +75,7 @@ abstract public class ContentHandler { * creates an object from it. * * @param urlc a URL connection. - * @return the object read by the ContentHandler. + * @return the object read by the {@code ContentHandler}. * @exception IOException if an I/O error occurs while reading the object. */ abstract public Object getContent(URLConnection urlc) throws IOException; @@ -90,7 +90,7 @@ abstract public class ContentHandler { * * @param urlc a URL connection. * @param classes an array of types requested - * @return the object read by the ContentHandler that is + * @return the object read by the {@code ContentHandler} that is * the first match of the suggested types. * null if none of the requested are supported. * @exception IOException if an I/O error occurs while reading the object. diff --git a/jdk/src/share/classes/java/net/ContentHandlerFactory.java b/jdk/src/share/classes/java/net/ContentHandlerFactory.java index 69a909c5795..64112e3a806 100644 --- a/jdk/src/share/classes/java/net/ContentHandlerFactory.java +++ b/jdk/src/share/classes/java/net/ContentHandlerFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1997, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -28,10 +28,10 @@ package java.net; /** * This interface defines a factory for content handlers. An * implementation of this interface should map a MIME type into an - * instance of ContentHandler. + * instance of {@code ContentHandler}. *

    - * This interface is used by the URLStreamHandler class - * to create a ContentHandler for a MIME type. + * This interface is used by the {@code URLStreamHandler} class + * to create a {@code ContentHandler} for a MIME type. * * @author James Gosling * @see java.net.ContentHandler @@ -40,13 +40,13 @@ package java.net; */ public interface ContentHandlerFactory { /** - * Creates a new ContentHandler to read an object from - * a URLStreamHandler. + * Creates a new {@code ContentHandler} to read an object from + * a {@code URLStreamHandler}. * * @param mimetype the MIME type for which a content handler is desired. - * @return a new ContentHandler to read an object from a - * URLStreamHandler. + * @return a new {@code ContentHandler} to read an object from a + * {@code URLStreamHandler}. * @see java.net.ContentHandler * @see java.net.URLStreamHandler */ diff --git a/jdk/src/share/classes/java/net/CookieHandler.java b/jdk/src/share/classes/java/net/CookieHandler.java index 3fbc5bc1ce1..ef91d009feb 100644 --- a/jdk/src/share/classes/java/net/CookieHandler.java +++ b/jdk/src/share/classes/java/net/CookieHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -66,7 +66,7 @@ public abstract class CookieHandler { * there is no system-wide cookie handler currently set. * @throws SecurityException * If a security manager has been installed and it denies - * {@link NetPermission}("getCookieHandler") + * {@link NetPermission}{@code ("getCookieHandler")} * @see #setDefault(CookieHandler) */ public synchronized static CookieHandler getDefault() { @@ -83,10 +83,10 @@ public abstract class CookieHandler { * Note: non-standard http protocol handlers may ignore this setting. * * @param cHandler The HTTP cookie handler, or - * null to unset. + * {@code null} to unset. * @throws SecurityException * If a security manager has been installed and it denies - * {@link NetPermission}("setCookieHandler") + * {@link NetPermission}{@code ("setCookieHandler")} * @see #getDefault() */ public synchronized static void setDefault(CookieHandler cHandler) { @@ -114,7 +114,7 @@ public abstract class CookieHandler { * called after all request headers related to choosing cookies * are added, and before the request is sent.

    * - * @param uri a URI representing the intended use for the + * @param uri a {@code URI} representing the intended use for the * cookies * @param requestHeaders - a Map from request header * field names to lists of field values representing @@ -136,7 +136,7 @@ public abstract class CookieHandler { * fields that are named Set-Cookie2, present in the response * headers into a cookie cache. * - * @param uri a URI where the cookies come from + * @param uri a {@code URI} where the cookies come from * @param responseHeaders an immutable map from field names to * lists of field values representing the response * header fields returned diff --git a/jdk/src/share/classes/java/net/CookieManager.java b/jdk/src/share/classes/java/net/CookieManager.java index b8cae55342b..bb80f0a7f25 100644 --- a/jdk/src/share/classes/java/net/CookieManager.java +++ b/jdk/src/share/classes/java/net/CookieManager.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -131,7 +131,7 @@ public class CookieManager extends CookieHandler * *

    This constructor will create new cookie manager with default * cookie store and accept policy. The effect is same as - * CookieManager(null, null). + * {@code CookieManager(null, null)}. */ public CookieManager() { this(null, null); @@ -141,12 +141,12 @@ public class CookieManager extends CookieHandler /** * Create a new cookie manager with specified cookie store and cookie policy. * - * @param store a CookieStore to be used by cookie manager. - * if null, cookie manager will use a default one, + * @param store a {@code CookieStore} to be used by cookie manager. + * if {@code null}, cookie manager will use a default one, * which is an in-memory CookieStore implmentation. - * @param cookiePolicy a CookiePolicy instance + * @param cookiePolicy a {@code CookiePolicy} instance * to be used by cookie manager as policy callback. - * if null, ACCEPT_ORIGINAL_SERVER will + * if {@code null}, ACCEPT_ORIGINAL_SERVER will * be used. */ public CookieManager(CookieStore store, @@ -170,11 +170,11 @@ public class CookieManager extends CookieHandler /** * To set the cookie policy of this cookie manager. * - *

    A instance of CookieManager will have + *

    A instance of {@code CookieManager} will have * cookie policy ACCEPT_ORIGINAL_SERVER by default. Users always * can call this method to set another cookie policy. * - * @param cookiePolicy the cookie policy. Can be null, which + * @param cookiePolicy the cookie policy. Can be {@code null}, which * has no effects on current cookie policy. */ public void setCookiePolicy(CookiePolicy cookiePolicy) { diff --git a/jdk/src/share/classes/java/net/CookiePolicy.java b/jdk/src/share/classes/java/net/CookiePolicy.java index 3de98f904da..80948359153 100644 --- a/jdk/src/share/classes/java/net/CookiePolicy.java +++ b/jdk/src/share/classes/java/net/CookiePolicy.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -71,8 +71,8 @@ public interface CookiePolicy { * * @param uri the URI to consult accept policy with * @param cookie the HttpCookie object in question - * @return true if this cookie should be accepted; - * otherwise, false + * @return {@code true} if this cookie should be accepted; + * otherwise, {@code false} */ public boolean shouldAccept(URI uri, HttpCookie cookie); } diff --git a/jdk/src/share/classes/java/net/CookieStore.java b/jdk/src/share/classes/java/net/CookieStore.java index 89b9c41dd01..648817e4b52 100644 --- a/jdk/src/share/classes/java/net/CookieStore.java +++ b/jdk/src/share/classes/java/net/CookieStore.java @@ -32,8 +32,8 @@ import java.util.Map; * A CookieStore object represents a storage for cookie. Can store and retrieve * cookies. * - *

    {@link CookieManager} will call CookieStore.add to save cookies - * for every incoming HTTP response, and call CookieStore.get to + *

    {@link CookieManager} will call {@code CookieStore.add} to save cookies + * for every incoming HTTP response, and call {@code CookieStore.get} to * retrieve cookie for every outgoing HTTP request. A CookieStore * is responsible for removing HttpCookie instances which have expired. * @@ -55,11 +55,11 @@ public interface CookieStore { * then it is replaced with the new one. * * @param uri the uri this cookie associated with. - * if null, this cookie will not be associated + * if {@code null}, this cookie will not be associated * with an URI * @param cookie the cookie to store * - * @throws NullPointerException if cookie is null + * @throws NullPointerException if {@code cookie} is {@code null} * * @see #get * @@ -77,7 +77,7 @@ public interface CookieStore { * * @param uri the uri associated with the cookies to be returned * - * @throws NullPointerException if uri is null + * @throws NullPointerException if {@code uri} is {@code null} * * @see #add * @@ -108,14 +108,14 @@ public interface CookieStore { * Remove a cookie from store. * * @param uri the uri this cookie associated with. - * if null, the cookie to be removed is not associated - * with an URI when added; if not null, the cookie + * if {@code null}, the cookie to be removed is not associated + * with an URI when added; if not {@code null}, the cookie * to be removed is associated with the given URI when added. * @param cookie the cookie to remove * - * @return true if this store contained the specified cookie + * @return {@code true} if this store contained the specified cookie * - * @throws NullPointerException if cookie is null + * @throws NullPointerException if {@code cookie} is {@code null} */ public boolean remove(URI uri, HttpCookie cookie); @@ -123,7 +123,7 @@ public interface CookieStore { /** * Remove all cookies in this cookie store. * - * @return true if this store changed as a result of the call + * @return {@code true} if this store changed as a result of the call */ public boolean removeAll(); } diff --git a/jdk/src/share/classes/java/net/DatagramPacket.java b/jdk/src/share/classes/java/net/DatagramPacket.java index 1f6af9eb939..b0728f01cd0 100644 --- a/jdk/src/share/classes/java/net/DatagramPacket.java +++ b/jdk/src/share/classes/java/net/DatagramPacket.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -68,11 +68,11 @@ class DatagramPacket { int port; /** - * Constructs a DatagramPacket for receiving packets of - * length length, specifying an offset into the buffer. + * Constructs a {@code DatagramPacket} for receiving packets of + * length {@code length}, specifying an offset into the buffer. *

    - * The length argument must be less than or equal to - * buf.length. + * The {@code length} argument must be less than or equal to + * {@code buf.length}. * * @param buf buffer for holding the incoming datagram. * @param offset the offset for the buffer @@ -87,11 +87,11 @@ class DatagramPacket { } /** - * Constructs a DatagramPacket for receiving packets of - * length length. + * Constructs a {@code DatagramPacket} for receiving packets of + * length {@code length}. *

    - * The length argument must be less than or equal to - * buf.length. + * The {@code length} argument must be less than or equal to + * {@code buf.length}. * * @param buf buffer for holding the incoming datagram. * @param length the number of bytes to read. @@ -102,10 +102,10 @@ class DatagramPacket { /** * Constructs a datagram packet for sending packets of length - * length with offset ioffsetto the + * {@code length} with offset {@code ioffset}to the * specified port number on the specified host. The - * length argument must be less than or equal to - * buf.length. + * {@code length} argument must be less than or equal to + * {@code buf.length}. * * @param buf the packet data. * @param offset the packet data offset. @@ -125,10 +125,10 @@ class DatagramPacket { /** * Constructs a datagram packet for sending packets of length - * length with offset ioffsetto the + * {@code length} with offset {@code ioffset}to the * specified port number on the specified host. The - * length argument must be less than or equal to - * buf.length. + * {@code length} argument must be less than or equal to + * {@code buf.length}. * * @param buf the packet data. * @param offset the packet data offset. @@ -147,9 +147,9 @@ class DatagramPacket { /** * Constructs a datagram packet for sending packets of length - * length to the specified port number on the specified - * host. The length argument must be less than or equal - * to buf.length. + * {@code length} to the specified port number on the specified + * host. The {@code length} argument must be less than or equal + * to {@code buf.length}. * * @param buf the packet data. * @param length the packet length. @@ -164,9 +164,9 @@ class DatagramPacket { /** * Constructs a datagram packet for sending packets of length - * length to the specified port number on the specified - * host. The length argument must be less than or equal - * to buf.length. + * {@code length} to the specified port number on the specified + * host. The {@code length} argument must be less than or equal + * to {@code buf.length}. * * @param buf the packet data. * @param length the packet length. @@ -207,8 +207,8 @@ class DatagramPacket { /** * Returns the data buffer. The data received or the data to be sent - * starts from the offset in the buffer, - * and runs for length long. + * starts from the {@code offset} in the buffer, + * and runs for {@code length} long. * * @return the buffer used to receive or send data * @see #setData(byte[], int, int) @@ -277,7 +277,7 @@ class DatagramPacket { /** * Sets the IP address of the machine to which this datagram * is being sent. - * @param iaddr the InetAddress + * @param iaddr the {@code InetAddress} * @since JDK1.1 * @see #getAddress() */ @@ -303,7 +303,7 @@ class DatagramPacket { * Sets the SocketAddress (usually IP address + port number) of the remote * host to which this datagram is being sent. * - * @param address the SocketAddress + * @param address the {@code SocketAddress} * @throws IllegalArgumentException if address is null or is a * SocketAddress subclass not supported by this socket * @@ -324,7 +324,7 @@ class DatagramPacket { * Gets the SocketAddress (usually IP address + port number) of the remote * host that this packet is being sent to or is coming from. * - * @return the SocketAddress + * @return the {@code SocketAddress} * @since 1.4 * @see #setSocketAddress */ @@ -335,7 +335,7 @@ class DatagramPacket { /** * Set the data buffer for this packet. With the offset of * this DatagramPacket set to 0, and the length set to - * the length of buf. + * the length of {@code buf}. * * @param buf the buffer to set for this packet. * diff --git a/jdk/src/share/classes/java/net/DatagramSocket.java b/jdk/src/share/classes/java/net/DatagramSocket.java index d6ffca23755..ab60a263ac7 100644 --- a/jdk/src/share/classes/java/net/DatagramSocket.java +++ b/jdk/src/share/classes/java/net/DatagramSocket.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -47,14 +47,14 @@ import java.security.PrivilegedExceptionAction; * a DatagramSocket is bound to a more specific address. *

    * Example: - * + * {@code * DatagramSocket s = new DatagramSocket(null); * s.bind(new InetSocketAddress(8888)); - * + * } * Which is equivalent to: - * + * {@code * DatagramSocket s = new DatagramSocket(8888); - * + * } * Both cases will create a DatagramSocket able to receive broadcasts on * UDP port 8888. * @@ -161,14 +161,14 @@ class DatagramSocket implements java.io.Closeable { * an IP address chosen by the kernel. * *

    If there is a security manager, - * its checkListen method is first called + * its {@code checkListen} method is first called * with 0 as its argument to ensure the operation is allowed. * This could result in a SecurityException. * * @exception SocketException if the socket could not be opened, * or the socket could not bind to the specified local port. * @exception SecurityException if a security manager exists and its - * checkListen method doesn't allow the operation. + * {@code checkListen} method doesn't allow the operation. * * @see SecurityManager#checkListen */ @@ -195,21 +195,21 @@ class DatagramSocket implements java.io.Closeable { * Creates a datagram socket, bound to the specified local * socket address. *

    - * If, if the address is null, creates an unbound socket. + * If, if the address is {@code null}, creates an unbound socket. *

    *

    If there is a security manager, - * its checkListen method is first called + * its {@code checkListen} method is first called * with the port from the socket address * as its argument to ensure the operation is allowed. * This could result in a SecurityException. * - * @param bindaddr local socket address to bind, or null + * @param bindaddr local socket address to bind, or {@code null} * for an unbound socket. * * @exception SocketException if the socket could not be opened, * or the socket could not bind to the specified local port. * @exception SecurityException if a security manager exists and its - * checkListen method doesn't allow the operation. + * {@code checkListen} method doesn't allow the operation. * * @see SecurityManager#checkListen * @since 1.4 @@ -234,8 +234,8 @@ class DatagramSocket implements java.io.Closeable { * an IP address chosen by the kernel. * *

    If there is a security manager, - * its checkListen method is first called - * with the port argument + * its {@code checkListen} method is first called + * with the {@code port} argument * as its argument to ensure the operation is allowed. * This could result in a SecurityException. * @@ -243,7 +243,7 @@ class DatagramSocket implements java.io.Closeable { * @exception SocketException if the socket could not be opened, * or the socket could not bind to the specified local port. * @exception SecurityException if a security manager exists and its - * checkListen method doesn't allow the operation. + * {@code checkListen} method doesn't allow the operation. * * @see SecurityManager#checkListen */ @@ -259,8 +259,8 @@ class DatagramSocket implements java.io.Closeable { * an IP address chosen by the kernel. * *

    If there is a security manager, - * its checkListen method is first called - * with the port argument + * its {@code checkListen} method is first called + * with the {@code port} argument * as its argument to ensure the operation is allowed. * This could result in a SecurityException. * @@ -270,7 +270,7 @@ class DatagramSocket implements java.io.Closeable { * @exception SocketException if the socket could not be opened, * or the socket could not bind to the specified local port. * @exception SecurityException if a security manager exists and its - * checkListen method doesn't allow the operation. + * {@code checkListen} method doesn't allow the operation. * * @see SecurityManager#checkListen * @since JDK1.1 @@ -319,10 +319,10 @@ class DatagramSocket implements java.io.Closeable { } /** - * Get the DatagramSocketImpl attached to this socket, + * Get the {@code DatagramSocketImpl} attached to this socket, * creating it if necessary. * - * @return the DatagramSocketImpl attached to that + * @return the {@code DatagramSocketImpl} attached to that * DatagramSocket * @throws SocketException if creation fails. * @since 1.4 @@ -336,14 +336,14 @@ class DatagramSocket implements java.io.Closeable { /** * Binds this DatagramSocket to a specific address and port. *

    - * If the address is null, then the system will pick up + * If the address is {@code null}, then the system will pick up * an ephemeral port and a valid local address to bind the socket. *

    * @param addr The address and port to bind to. * @throws SocketException if any error happens during the bind, or if the * socket is already bound. * @throws SecurityException if a security manager exists and its - * checkListen method doesn't allow the operation. + * {@code checkListen} method doesn't allow the operation. * @throws IllegalArgumentException if addr is a SocketAddress subclass * not supported by this socket. * @since 1.4 @@ -496,7 +496,7 @@ class DatagramSocket implements java.io.Closeable { * Returns the binding state of the socket. *

    * If the socket was bound prior to being {@link #close closed}, - * then this method will continue to return true + * then this method will continue to return {@code true} * after the socket is closed. * * @return true if the socket successfully bound to an address @@ -510,7 +510,7 @@ class DatagramSocket implements java.io.Closeable { * Returns the connection state of the socket. *

    * If the socket was connected prior to being {@link #close closed}, - * then this method will continue to return true + * then this method will continue to return {@code true} * after the socket is closed. * * @return true if the socket successfully connected to a server @@ -522,7 +522,7 @@ class DatagramSocket implements java.io.Closeable { /** * Returns the address to which this socket is connected. Returns - * null if the socket is not connected. + * {@code null} if the socket is not connected. *

    * If the socket was connected prior to being {@link #close closed}, * then this method will continue to return the connected address @@ -536,7 +536,7 @@ class DatagramSocket implements java.io.Closeable { /** * Returns the port number to which this socket is connected. - * Returns -1 if the socket is not connected. + * Returns {@code -1} if the socket is not connected. *

    * If the socket was connected prior to being {@link #close closed}, * then this method will continue to return the connected port number @@ -550,14 +550,14 @@ class DatagramSocket implements java.io.Closeable { /** * Returns the address of the endpoint this socket is connected to, or - * null if it is unconnected. + * {@code null} if it is unconnected. *

    * If the socket was connected prior to being {@link #close closed}, * then this method will continue to return the connected address * after the socket is closed. * - * @return a SocketAddress representing the remote - * endpoint of this socket, or null if it is + * @return a {@code SocketAddress} representing the remote + * endpoint of this socket, or {@code null} if it is * not connected yet. * @see #getInetAddress() * @see #getPort() @@ -573,8 +573,8 @@ class DatagramSocket implements java.io.Closeable { /** * Returns the address of the endpoint this socket is bound to. * - * @return a SocketAddress representing the local endpoint of this - * socket, or null if it is closed or not bound yet. + * @return a {@code SocketAddress} representing the local endpoint of this + * socket, or {@code null} if it is closed or not bound yet. * @see #getLocalAddress() * @see #getLocalPort() * @see #bind(SocketAddress) @@ -591,28 +591,28 @@ class DatagramSocket implements java.io.Closeable { /** * Sends a datagram packet from this socket. The - * DatagramPacket includes information indicating the + * {@code DatagramPacket} includes information indicating the * data to be sent, its length, the IP address of the remote host, * and the port number on the remote host. * *

    If there is a security manager, and the socket is not currently * connected to a remote address, this method first performs some - * security checks. First, if p.getAddress().isMulticastAddress() + * security checks. First, if {@code p.getAddress().isMulticastAddress()} * is true, this method calls the - * security manager's checkMulticast method - * with p.getAddress() as its argument. + * security manager's {@code checkMulticast} method + * with {@code p.getAddress()} as its argument. * If the evaluation of that expression is false, * this method instead calls the security manager's - * checkConnect method with arguments - * p.getAddress().getHostAddress() and - * p.getPort(). Each call to a security manager method + * {@code checkConnect} method with arguments + * {@code p.getAddress().getHostAddress()} and + * {@code p.getPort()}. Each call to a security manager method * could result in a SecurityException if the operation is not allowed. * - * @param p the DatagramPacket to be sent. + * @param p the {@code DatagramPacket} to be sent. * * @exception IOException if an I/O error occurs. * @exception SecurityException if a security manager exists and its - * checkMulticast or checkConnect + * {@code checkMulticast} or {@code checkConnect} * method doesn't allow the send. * @exception PortUnreachableException may be thrown if the socket is connected * to a currently unreachable destination. Note, there is no @@ -674,20 +674,20 @@ class DatagramSocket implements java.io.Closeable { /** * Receives a datagram packet from this socket. When this method - * returns, the DatagramPacket's buffer is filled with + * returns, the {@code DatagramPacket}'s buffer is filled with * the data received. The datagram packet also contains the sender's * IP address, and the port number on the sender's machine. *

    * This method blocks until a datagram is received. The - * length field of the datagram packet object contains + * {@code length} field of the datagram packet object contains * the length of the received message. If the message is longer than * the packet's length, the message is truncated. *

    * If there is a security manager, a packet cannot be received if the - * security manager's checkAccept method + * security manager's {@code checkAccept} method * does not allow it. * - * @param p the DatagramPacket into which to place + * @param p the {@code DatagramPacket} into which to place * the incoming data. * @exception IOException if an I/O error occurs. * @exception SocketTimeoutException if setSoTimeout was previously called @@ -786,17 +786,17 @@ class DatagramSocket implements java.io.Closeable { * Gets the local address to which the socket is bound. * *

    If there is a security manager, its - * checkConnect method is first called - * with the host address and -1 + * {@code checkConnect} method is first called + * with the host address and {@code -1} * as its arguments to see if the operation is allowed. * * @see SecurityManager#checkConnect * @return the local address to which the socket is bound, - * null if the socket is closed, or - * an InetAddress representing + * {@code null} if the socket is closed, or + * an {@code InetAddress} representing * {@link InetAddress#isAnyLocalAddress wildcard} * address if either the socket is not bound, or - * the security manager checkConnect + * the security manager {@code checkConnect} * method does not allow the operation * @since 1.1 */ @@ -824,8 +824,8 @@ class DatagramSocket implements java.io.Closeable { * is bound. * * @return the port number on the local host to which this socket is bound, - -1 if the socket is closed, or - 0 if it is not bound yet. + {@code -1} if the socket is closed, or + {@code 0} if it is not bound yet. */ public int getLocalPort() { if (isClosed()) @@ -883,7 +883,7 @@ class DatagramSocket implements java.io.Closeable { /** * Sets the SO_SNDBUF option to the specified value for this - * DatagramSocket. The SO_SNDBUF option is used by the + * {@code DatagramSocket}. The SO_SNDBUF option is used by the * network implementation as a hint to size the underlying * network I/O buffers. The SO_SNDBUF setting may also be used * by the network implementation to determine the maximum size @@ -897,7 +897,7 @@ class DatagramSocket implements java.io.Closeable { * is high. *

    * Note: If {@link #send(DatagramPacket)} is used to send a - * DatagramPacket that is larger than the setting + * {@code DatagramPacket} that is larger than the setting * of SO_SNDBUF then it is implementation specific if the * packet is sent or discarded. * @@ -921,10 +921,10 @@ class DatagramSocket implements java.io.Closeable { } /** - * Get value of the SO_SNDBUF option for this DatagramSocket, that is the - * buffer size used by the platform for output on this DatagramSocket. + * Get value of the SO_SNDBUF option for this {@code DatagramSocket}, that is the + * buffer size used by the platform for output on this {@code DatagramSocket}. * - * @return the value of the SO_SNDBUF option for this DatagramSocket + * @return the value of the SO_SNDBUF option for this {@code DatagramSocket} * @exception SocketException if there is an error in * the underlying protocol, such as an UDP error. * @see #setSendBufferSize @@ -942,7 +942,7 @@ class DatagramSocket implements java.io.Closeable { /** * Sets the SO_RCVBUF option to the specified value for this - * DatagramSocket. The SO_RCVBUF option is used by the + * {@code DatagramSocket}. The SO_RCVBUF option is used by the * the network implementation as a hint to size the underlying * network I/O buffers. The SO_RCVBUF setting may also be used * by the network implementation to determine the maximum size @@ -979,10 +979,10 @@ class DatagramSocket implements java.io.Closeable { } /** - * Get value of the SO_RCVBUF option for this DatagramSocket, that is the - * buffer size used by the platform for input on this DatagramSocket. + * Get value of the SO_RCVBUF option for this {@code DatagramSocket}, that is the + * buffer size used by the platform for input on this {@code DatagramSocket}. * - * @return the value of the SO_RCVBUF option for this DatagramSocket + * @return the value of the SO_RCVBUF option for this {@code DatagramSocket} * @exception SocketException if there is an error in the underlying protocol, such as an UDP error. * @see #setReceiveBufferSize(int) */ @@ -1005,26 +1005,26 @@ class DatagramSocket implements java.io.Closeable { * socket to the same socket address. This is typically for the * purpose of receiving multicast packets * (See {@link java.net.MulticastSocket}). The - * SO_REUSEADDR socket option allows multiple + * {@code SO_REUSEADDR} socket option allows multiple * sockets to be bound to the same socket address if the - * SO_REUSEADDR socket option is enabled prior + * {@code SO_REUSEADDR} socket option is enabled prior * to binding the socket using {@link #bind(SocketAddress)}. *

    * Note: This functionality is not supported by all existing platforms, * so it is implementation specific whether this option will be ignored * or not. However, if it is not supported then - * {@link #getReuseAddress()} will always return false. + * {@link #getReuseAddress()} will always return {@code false}. *

    - * When a DatagramSocket is created the initial setting - * of SO_REUSEADDR is disabled. + * When a {@code DatagramSocket} is created the initial setting + * of {@code SO_REUSEADDR} is disabled. *

    - * The behaviour when SO_REUSEADDR is enabled or + * The behaviour when {@code SO_REUSEADDR} is enabled or * disabled after a socket is bound (See {@link #isBound()}) * is not defined. * * @param on whether to enable or disable the * @exception SocketException if an error occurs enabling or - * disabling the SO_RESUEADDR socket option, + * disabling the {@code SO_RESUEADDR} socket option, * or the socket is closed. * @since 1.4 * @see #getReuseAddress() @@ -1045,7 +1045,7 @@ class DatagramSocket implements java.io.Closeable { /** * Tests if SO_REUSEADDR is enabled. * - * @return a boolean indicating whether or not SO_REUSEADDR is enabled. + * @return a {@code boolean} indicating whether or not SO_REUSEADDR is enabled. * @exception SocketException if there is an error * in the underlying protocol, such as an UDP error. * @since 1.4 @@ -1083,7 +1083,7 @@ class DatagramSocket implements java.io.Closeable { /** * Tests if SO_BROADCAST is enabled. - * @return a boolean indicating whether or not SO_BROADCAST is enabled. + * @return a {@code boolean} indicating whether or not SO_BROADCAST is enabled. * @exception SocketException if there is an error * in the underlying protocol, such as an UDP error. * @since 1.4 @@ -1105,7 +1105,7 @@ class DatagramSocket implements java.io.Closeable { * 255} or an IllegalArgumentException will be thrown. *

    Notes: *

    For Internet Protocol v4 the value consists of an - * integer, the least significant 8 bits of which + * {@code integer}, the least significant 8 bits of which * represent the value of the TOS octet in IP packets sent by * the socket. * RFC 1349 defines the TOS values as follows: @@ -1123,10 +1123,10 @@ class DatagramSocket implements java.io.Closeable { * SocketException indicating that the operation is not * permitted. *

    - * for Internet Protocol v6 tc is the value that + * for Internet Protocol v6 {@code tc} is the value that * would be placed into the sin6_flowinfo field of the IP header. * - * @param tc an int value for the bitset. + * @param tc an {@code int} value for the bitset. * @throws SocketException if there is an error setting the * traffic class or type-of-service * @since 1.4 @@ -1205,7 +1205,7 @@ class DatagramSocket implements java.io.Closeable { * DatagramChannel.open} method. * * @return the datagram channel associated with this datagram socket, - * or null if this socket was not created for a channel + * or {@code null} if this socket was not created for a channel * * @since 1.4 * @spec JSR-51 @@ -1224,14 +1224,14 @@ class DatagramSocket implements java.io.Closeable { * application. The factory can be specified only once. *

    * When an application creates a new datagram socket, the socket - * implementation factory's createDatagramSocketImpl method is + * implementation factory's {@code createDatagramSocketImpl} method is * called to create the actual datagram socket implementation. *

    - * Passing null to the method is a no-op unless the factory + * Passing {@code null} to the method is a no-op unless the factory * was already set. * *

    If there is a security manager, this method first calls - * the security manager's checkSetFactory method + * the security manager's {@code checkSetFactory} method * to ensure the operation is allowed. * This could result in a SecurityException. * @@ -1240,7 +1240,7 @@ class DatagramSocket implements java.io.Closeable { * datagram socket factory. * @exception SocketException if the factory is already defined. * @exception SecurityException if a security manager exists and its - * checkSetFactory method doesn't allow the + * {@code checkSetFactory} method doesn't allow the operation. * @see java.net.DatagramSocketImplFactory#createDatagramSocketImpl() diff --git a/jdk/src/share/classes/java/net/DatagramSocketImpl.java b/jdk/src/share/classes/java/net/DatagramSocketImpl.java index 3ed11e4b9d2..524f06b83ca 100644 --- a/jdk/src/share/classes/java/net/DatagramSocketImpl.java +++ b/jdk/src/share/classes/java/net/DatagramSocketImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -101,7 +101,7 @@ public abstract class DatagramSocketImpl implements SocketOptions { protected void disconnect() {} /** - * Peek at the packet to see who it is from. Updates the specified InetAddress + * Peek at the packet to see who it is from. Updates the specified {@code InetAddress} * to the address which the packet came from. * @param i an InetAddress object * @return the port number which the packet came from. @@ -114,7 +114,7 @@ public abstract class DatagramSocketImpl implements SocketOptions { /** * Peek at the packet to see who it is from. The data is copied into the specified - * DatagramPacket. The data is returned, + * {@code DatagramPacket}. The data is returned, * but not consumed, so that a subsequent peekData/receive operation * will see the same data. * @param p the Packet Received. @@ -163,7 +163,7 @@ public abstract class DatagramSocketImpl implements SocketOptions { /** * Set the TTL (time-to-live) option. - * @param ttl an int specifying the time-to-live value + * @param ttl an {@code int} specifying the time-to-live value * @exception IOException if an I/O exception occurs * while setting the time-to-live option. * @see #getTimeToLive() @@ -174,7 +174,7 @@ public abstract class DatagramSocketImpl implements SocketOptions { * Retrieve the TTL (time-to-live) option. * @exception IOException if an I/O exception occurs * while retrieving the time-to-live option - * @return an int representing the time-to-live value + * @return an {@code int} representing the time-to-live value * @see #setTimeToLive(int) */ protected abstract int getTimeToLive() throws IOException; @@ -227,7 +227,7 @@ public abstract class DatagramSocketImpl implements SocketOptions { /** * Gets the local port. - * @return an int representing the local port value + * @return an {@code int} representing the local port value */ protected int getLocalPort() { return localPort; @@ -235,7 +235,7 @@ public abstract class DatagramSocketImpl implements SocketOptions { /** * Gets the datagram socket file descriptor. - * @return a FileDescriptor object representing the datagram socket + * @return a {@code FileDescriptor} object representing the datagram socket * file descriptor */ protected FileDescriptor getFileDescriptor() { diff --git a/jdk/src/share/classes/java/net/DatagramSocketImplFactory.java b/jdk/src/share/classes/java/net/DatagramSocketImplFactory.java index e89aeb30a6c..4d891962ae2 100644 --- a/jdk/src/share/classes/java/net/DatagramSocketImplFactory.java +++ b/jdk/src/share/classes/java/net/DatagramSocketImplFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,7 @@ package java.net; /** * This interface defines a factory for datagram socket implementations. It - * is used by the classes DatagramSocket to create actual socket + * is used by the classes {@code DatagramSocket} to create actual socket * implementations. * * @author Yingxian Wang @@ -37,9 +37,9 @@ package java.net; public interface DatagramSocketImplFactory { /** - * Creates a new DatagramSocketImpl instance. + * Creates a new {@code DatagramSocketImpl} instance. * - * @return a new instance of DatagramSocketImpl. + * @return a new instance of {@code DatagramSocketImpl}. * @see java.net.DatagramSocketImpl */ DatagramSocketImpl createDatagramSocketImpl(); diff --git a/jdk/src/share/classes/java/net/FileNameMap.java b/jdk/src/share/classes/java/net/FileNameMap.java index b9bdb6e53e0..393b5aa6d9e 100644 --- a/jdk/src/share/classes/java/net/FileNameMap.java +++ b/jdk/src/share/classes/java/net/FileNameMap.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 1999, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -37,7 +37,7 @@ public interface FileNameMap { /** * Gets the MIME type for the specified file name. * @param fileName the specified file name - * @return a String indicating the MIME + * @return a {@code String} indicating the MIME * type for the specified file name. */ public String getContentTypeFor(String fileName); diff --git a/jdk/src/share/classes/java/net/HttpCookie.java b/jdk/src/share/classes/java/net/HttpCookie.java index d265e284c26..fb02ae3e03d 100644 --- a/jdk/src/share/classes/java/net/HttpCookie.java +++ b/jdk/src/share/classes/java/net/HttpCookie.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -470,7 +470,7 @@ public final class HttpCookie implements Cloneable { * protocol. * * @return {@code false} if the cookie can be sent over any standard - * protocol; otherwise, true + * protocol; otherwise, {@code true} * * @see #setSecure */ diff --git a/jdk/src/share/classes/java/net/HttpRetryException.java b/jdk/src/share/classes/java/net/HttpRetryException.java index 8829c1e90dd..d498a653f1c 100644 --- a/jdk/src/share/classes/java/net/HttpRetryException.java +++ b/jdk/src/share/classes/java/net/HttpRetryException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -43,7 +43,7 @@ class HttpRetryException extends IOException { private String location; /** - * Constructs a new HttpRetryException from the + * Constructs a new {@code HttpRetryException} from the * specified response code and exception detail message * * @param detail the detail message. @@ -55,7 +55,7 @@ class HttpRetryException extends IOException { } /** - * Constructs a new HttpRetryException with detail message + * Constructs a new {@code HttpRetryException} with detail message * responseCode and the contents of the Location response header field. * * @param detail the detail message. diff --git a/jdk/src/share/classes/java/net/HttpURLConnection.java b/jdk/src/share/classes/java/net/HttpURLConnection.java index b93f1e731bd..be23241e5a6 100644 --- a/jdk/src/share/classes/java/net/HttpURLConnection.java +++ b/jdk/src/share/classes/java/net/HttpURLConnection.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -76,14 +76,14 @@ abstract public class HttpURLConnection extends URLConnection { /** * The chunk-length when using chunked encoding streaming mode for output. - * A value of -1 means chunked encoding is disabled for output. + * A value of {@code -1} means chunked encoding is disabled for output. * @since 1.5 */ protected int chunkLength = -1; /** * The fixed content-length when using fixed-length streaming mode. - * A value of -1 means fixed-length streaming mode is disabled + * A value of {@code -1} means fixed-length streaming mode is disabled * for output. * *

    NOTE: {@link #fixedContentLengthLong} is recommended instead @@ -103,15 +103,15 @@ abstract public class HttpURLConnection extends URLConnection { protected long fixedContentLengthLong = -1; /** - * Returns the key for the nth header field. - * Some implementations may treat the 0th + * Returns the key for the {@code n}th header field. + * Some implementations may treat the {@code 0}th * header field as special, i.e. as the status line returned by the HTTP * server. In this case, {@link #getHeaderField(int) getHeaderField(0)} returns the status - * line, but getHeaderFieldKey(0) returns null. + * line, but {@code getHeaderFieldKey(0)} returns null. * * @param n an index, where {@code n >=0}. - * @return the key for the nth header field, - * or null if the key does not exist. + * @return the key for the {@code n}th header field, + * or {@code null} if the key does not exist. */ public String getHeaderFieldKey (int n) { return null; @@ -251,8 +251,8 @@ abstract public class HttpURLConnection extends URLConnection { } /** - * Returns the value for the nth header field. - * Some implementations may treat the 0th + * Returns the value for the {@code n}th header field. + * Some implementations may treat the {@code 0}th * header field as special, i.e. as the status line returned by the HTTP * server. *

    @@ -261,8 +261,8 @@ abstract public class HttpURLConnection extends URLConnection { * the headers in the message. * * @param n an index, where {@code n>=0}. - * @return the value of the nth header field, - * or null if the value does not exist. + * @return the value of the {@code n}th header field, + * or {@code null} if the value does not exist. * @see java.net.HttpURLConnection#getHeaderFieldKey(int) */ public String getHeaderField(int n) { @@ -270,7 +270,7 @@ abstract public class HttpURLConnection extends URLConnection { } /** - * An int representing the three digit HTTP Status-Code. + * An {@code int} representing the three digit HTTP Status-Code. *

      *
    • 1xx: Informational *
    • 2xx: Success @@ -292,12 +292,12 @@ abstract public class HttpURLConnection extends URLConnection { private static boolean followRedirects = true; /** - * If true, the protocol will automatically follow redirects. - * If false, the protocol will not automatically follow + * If {@code true}, the protocol will automatically follow redirects. + * If {@code false}, the protocol will not automatically follow * redirects. *

      - * This field is set by the setInstanceFollowRedirects - * method. Its value is returned by the getInstanceFollowRedirects + * This field is set by the {@code setInstanceFollowRedirects} + * method. Its value is returned by the {@code getInstanceFollowRedirects} * method. *

      * Its default value is based on the value of the static followRedirects @@ -328,14 +328,14 @@ abstract public class HttpURLConnection extends URLConnection { * cannot change this variable. *

      * If there is a security manager, this method first calls - * the security manager's checkSetFactory method + * the security manager's {@code checkSetFactory} method * to ensure the operation is allowed. * This could result in a SecurityException. * - * @param set a boolean indicating whether or not + * @param set a {@code boolean} indicating whether or not * to follow HTTP redirects. * @exception SecurityException if a security manager exists and its - * checkSetFactory method doesn't + * {@code checkSetFactory} method doesn't * allow the operation. * @see SecurityManager#checkSetFactory * @see #getFollowRedirects() @@ -350,12 +350,12 @@ abstract public class HttpURLConnection extends URLConnection { } /** - * Returns a boolean indicating + * Returns a {@code boolean} indicating * whether or not HTTP redirects (3xx) should * be automatically followed. * - * @return true if HTTP redirects should - * be automatically followed, false if not. + * @return {@code true} if HTTP redirects should + * be automatically followed, {@code false} if not. * @see #setFollowRedirects(boolean) */ public static boolean getFollowRedirects() { @@ -364,13 +364,13 @@ abstract public class HttpURLConnection extends URLConnection { /** * Sets whether HTTP redirects (requests with response code 3xx) should - * be automatically followed by this HttpURLConnection + * be automatically followed by this {@code HttpURLConnection} * instance. *

      * The default value comes from followRedirects, which defaults to * true. * - * @param followRedirects a boolean indicating + * @param followRedirects a {@code boolean} indicating * whether or not to follow HTTP redirects. * * @see java.net.HttpURLConnection#instanceFollowRedirects @@ -382,11 +382,11 @@ abstract public class HttpURLConnection extends URLConnection { } /** - * Returns the value of this HttpURLConnection's - * instanceFollowRedirects field. + * Returns the value of this {@code HttpURLConnection}'s + * {@code instanceFollowRedirects} field. * - * @return the value of this HttpURLConnection's - * instanceFollowRedirects field. + * @return the value of this {@code HttpURLConnection}'s + * {@code instanceFollowRedirects} field. * @see java.net.HttpURLConnection#instanceFollowRedirects * @see #setInstanceFollowRedirects(boolean) * @since 1.3 @@ -540,7 +540,7 @@ abstract public class HttpURLConnection extends URLConnection { * Returns null if none could be discerned from the responses * (the result was not valid HTTP). * @throws IOException if an error occurred connecting to the server. - * @return the HTTP response message, or null + * @return the HTTP response message, or {@code null} */ public String getResponseMessage() throws IOException { getResponseCode(); @@ -583,7 +583,7 @@ abstract public class HttpURLConnection extends URLConnection { * @exception IOException if an error occurs while computing * the permission. * - * @return a SocketPermission object representing the + * @return a {@code SocketPermission} object representing the * permission necessary to connect to the destination * host and port. */ diff --git a/jdk/src/share/classes/java/net/IDN.java b/jdk/src/share/classes/java/net/IDN.java index 563d356804f..0e481558956 100644 --- a/jdk/src/share/classes/java/net/IDN.java +++ b/jdk/src/share/classes/java/net/IDN.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -104,7 +104,7 @@ public final class IDN { * @param input the string to be processed * @param flag process flag; can be 0 or any logical OR of possible flags * - * @return the translated String + * @return the translated {@code String} * * @throws IllegalArgumentException if the input string doesn't conform to RFC 3490 specification */ @@ -130,13 +130,13 @@ public final class IDN { * *

      This convenience method works as if by invoking the * two-argument counterpart as follows: - *

      + *
      * {@link #toASCII(String, int) toASCII}(input, 0); - *
      + *
      * * @param input the string to be processed * - * @return the translated String + * @return the translated {@code String} * * @throws IllegalArgumentException if the input string doesn't conform to RFC 3490 specification */ @@ -161,7 +161,7 @@ public final class IDN { * @param input the string to be processed * @param flag process flag; can be 0 or any logical OR of possible flags * - * @return the translated String + * @return the translated {@code String} */ public static String toUnicode(String input, int flag) { int p = 0, q = 0; @@ -184,13 +184,13 @@ public final class IDN { * *

      This convenience method works as if by invoking the * two-argument counterpart as follows: - *

      + *
      * {@link #toUnicode(String, int) toUnicode}(input, 0); - *
      + *
      * * @param input the string to be processed * - * @return the translated String + * @return the translated {@code String} */ public static String toUnicode(String input) { return toUnicode(input, 0); diff --git a/jdk/src/share/classes/java/net/Inet4Address.java b/jdk/src/share/classes/java/net/Inet4Address.java index 6c59a692f82..528b2767465 100644 --- a/jdk/src/share/classes/java/net/Inet4Address.java +++ b/jdk/src/share/classes/java/net/Inet4Address.java @@ -42,10 +42,10 @@ import java.io.ObjectStreamException; * takes one of the following forms: * *
    Date and Time Pattern * Result *
    "yyyy.MM.dd G 'at' HH:mm:ss z" * 2001.07.04 AD at 12:08:56 PDT - *
    "EEE, MMM d, ''yy" * Wed, Jul 4, '01 *
    "h:mm a" * 12:08 PM - *
    "hh 'o''clock' a, zzzz" * 12 o'clock PM, Pacific Daylight Time *
    "K:mm a, z" * 0:08 PM, PDT - *
    "yyyyy.MMMMM.dd GGG hh:mm aaa" * 02001.July.04 AD 12:08 PM *
    "EEE, d MMM yyyy HH:mm:ss Z" * Wed, 4 Jul 2001 12:08:56 -0700 - *
    "yyMMddHHmmssZ" * 010704120856-0700 *
    "yyyy-MM-dd'T'HH:mm:ss.SSSZ" * 2001-07-04T12:08:56.235-0700 - *
    "yyyy-MM-dd'T'HH:mm:ss.SSSXXX" * 2001-07-04T12:08:56.235-07:00 *
    - * - * - * - * + * + * + * + * *
    d.d.d.d
    d.d.d
    d.d
    d
    {@code d.d.d.d}
    {@code d.d.d}
    {@code d.d}
    {@code d}
    * *

    When four parts are specified, each is interpreted as a byte of @@ -153,7 +153,7 @@ class Inet4Address extends InetAddress { * Utility routine to check if the InetAddress is an * IP multicast address. IP multicast address is a Class D * address i.e first four bits of the address are 1110. - * @return a boolean indicating if the InetAddress is + * @return a {@code boolean} indicating if the InetAddress is * an IP multicast address * @since JDK1.1 */ @@ -163,7 +163,7 @@ class Inet4Address extends InetAddress { /** * Utility routine to check if the InetAddress in a wildcard address. - * @return a boolean indicating if the Inetaddress is + * @return a {@code boolean} indicating if the Inetaddress is * a wildcard address. * @since 1.4 */ @@ -174,7 +174,7 @@ class Inet4Address extends InetAddress { /** * Utility routine to check if the InetAddress is a loopback address. * - * @return a boolean indicating if the InetAddress is + * @return a {@code boolean} indicating if the InetAddress is * a loopback address; or false otherwise. * @since 1.4 */ @@ -187,7 +187,7 @@ class Inet4Address extends InetAddress { /** * Utility routine to check if the InetAddress is an link local address. * - * @return a boolean indicating if the InetAddress is + * @return a {@code boolean} indicating if the InetAddress is * a link local address; or false if address is not a link local unicast address. * @since 1.4 */ @@ -204,7 +204,7 @@ class Inet4Address extends InetAddress { /** * Utility routine to check if the InetAddress is a site local address. * - * @return a boolean indicating if the InetAddress is + * @return a {@code boolean} indicating if the InetAddress is * a site local address; or false if address is not a site local unicast address. * @since 1.4 */ @@ -224,7 +224,7 @@ class Inet4Address extends InetAddress { /** * Utility routine to check if the multicast address has global scope. * - * @return a boolean indicating if the address has + * @return a {@code boolean} indicating if the address has * is a multicast address of global scope, false if it is not * of global scope or it is not a multicast address * @since 1.4 @@ -240,7 +240,7 @@ class Inet4Address extends InetAddress { /** * Utility routine to check if the multicast address has node scope. * - * @return a boolean indicating if the address has + * @return a {@code boolean} indicating if the address has * is a multicast address of node-local scope, false if it is not * of node-local scope or it is not a multicast address * @since 1.4 @@ -253,7 +253,7 @@ class Inet4Address extends InetAddress { /** * Utility routine to check if the multicast address has link scope. * - * @return a boolean indicating if the address has + * @return a {@code boolean} indicating if the address has * is a multicast address of link-local scope, false if it is not * of link-local scope or it is not a multicast address * @since 1.4 @@ -269,7 +269,7 @@ class Inet4Address extends InetAddress { /** * Utility routine to check if the multicast address has site scope. * - * @return a boolean indicating if the address has + * @return a {@code boolean} indicating if the address has * is a multicast address of site-local scope, false if it is not * of site-local scope or it is not a multicast address * @since 1.4 @@ -284,7 +284,7 @@ class Inet4Address extends InetAddress { /** * Utility routine to check if the multicast address has organization scope. * - * @return a boolean indicating if the address has + * @return a {@code boolean} indicating if the address has * is a multicast address of organization-local scope, * false if it is not of organization-local scope * or it is not a multicast address @@ -299,9 +299,9 @@ class Inet4Address extends InetAddress { } /** - * Returns the raw IP address of this InetAddress + * Returns the raw IP address of this {@code InetAddress} * object. The result is in network byte order: the highest order - * byte of the address is in getAddress()[0]. + * byte of the address is in {@code getAddress()[0]}. * * @return the raw IP address of this object. */ @@ -337,18 +337,18 @@ class Inet4Address extends InetAddress { /** * Compares this object against the specified object. - * The result is true if and only if the argument is - * not null and it represents the same IP address as + * The result is {@code true} if and only if the argument is + * not {@code null} and it represents the same IP address as * this object. *

    - * Two instances of InetAddress represent the same IP + * Two instances of {@code InetAddress} represent the same IP * address if the length of the byte arrays returned by - * getAddress is the same for both, and each of the + * {@code getAddress} is the same for both, and each of the * array components is the same for the byte arrays. * * @param obj the object to compare against. - * @return true if the objects are the same; - * false otherwise. + * @return {@code true} if the objects are the same; + * {@code false} otherwise. * @see java.net.InetAddress#getAddress() */ public boolean equals(Object obj) { diff --git a/jdk/src/share/classes/java/net/Inet6Address.java b/jdk/src/share/classes/java/net/Inet6Address.java index 169a180de11..7b10db96c08 100644 --- a/jdk/src/share/classes/java/net/Inet6Address.java +++ b/jdk/src/share/classes/java/net/Inet6Address.java @@ -47,7 +47,7 @@ import java.util.Enumeration; * address. This is the full form. For example, * *

    - * + * *
    1080:0:0:0:8:800:200C:417A
    {@code 1080:0:0:0:8:800:200C:417A}
    * *

    Note that it is not necessary to write the leading zeros in @@ -64,7 +64,7 @@ import java.util.Enumeration; * zeros in an address. For example, * *

    - * + * *
    1080::8:800:200C:417A
    {@code 1080::8:800:200C:417A}
    * *

  • An alternative form that is sometimes more convenient @@ -75,8 +75,8 @@ import java.util.Enumeration; * standard IPv4 representation address, for example, * *

    - * - * + * + * *
    ::FFFF:129.144.52.38
    ::129.144.52.38
    {@code ::FFFF:129.144.52.38}
    {@code ::129.144.52.38}
    * *

    where "::FFFF:d.d.d.d" and "::d.d.d.d" are, respectively, the @@ -85,23 +85,23 @@ import java.util.Enumeration; * in the "d.d.d.d" form. The following forms are invalid: * *

    - * - * - * - * + * + * + * + * *
    ::FFFF:d.d.d
    ::FFFF:d.d
    ::d.d.d
    ::d.d
    {@code ::FFFF:d.d.d}
    {@code ::FFFF:d.d}
    {@code ::d.d.d}
    {@code ::d.d}
    * *

    The following form: * *

    - * + * *
    ::FFFF:d
    {@code ::FFFF:d}
    * *

    is valid, however it is an unconventional representation of * the IPv4-compatible IPv6 address, * *

    - * + * *
    ::255.255.0.d
    {@code ::255.255.0.d}
    * *

    while "::d" corresponds to the general IPv6 address @@ -258,7 +258,7 @@ class Inet6Address extends InetAddress { * Create an Inet6Address in the exact manner of {@link * InetAddress#getByAddress(String,byte[])} except that the IPv6 scope_id is * set to the value corresponding to the given interface for the address - * type specified in addr. The call will fail with an + * type specified in {@code addr}. The call will fail with an * UnknownHostException if the given interface does not have a numeric * scope_id assigned for the given address type (eg. link-local or site-local). * See here for a description of IPv6 diff --git a/jdk/src/share/classes/java/net/InetAddress.java b/jdk/src/share/classes/java/net/InetAddress.java index aa5ef16705d..0232cfc4198 100644 --- a/jdk/src/share/classes/java/net/InetAddress.java +++ b/jdk/src/share/classes/java/net/InetAddress.java @@ -296,7 +296,7 @@ class InetAddress implements java.io.Serializable { /** * Utility routine to check if the InetAddress is an * IP multicast address. - * @return a boolean indicating if the InetAddress is + * @return a {@code boolean} indicating if the InetAddress is * an IP multicast address * @since JDK1.1 */ @@ -306,7 +306,7 @@ class InetAddress implements java.io.Serializable { /** * Utility routine to check if the InetAddress in a wildcard address. - * @return a boolean indicating if the Inetaddress is + * @return a {@code boolean} indicating if the Inetaddress is * a wildcard address. * @since 1.4 */ @@ -317,7 +317,7 @@ class InetAddress implements java.io.Serializable { /** * Utility routine to check if the InetAddress is a loopback address. * - * @return a boolean indicating if the InetAddress is + * @return a {@code boolean} indicating if the InetAddress is * a loopback address; or false otherwise. * @since 1.4 */ @@ -328,7 +328,7 @@ class InetAddress implements java.io.Serializable { /** * Utility routine to check if the InetAddress is an link local address. * - * @return a boolean indicating if the InetAddress is + * @return a {@code boolean} indicating if the InetAddress is * a link local address; or false if address is not a link local unicast address. * @since 1.4 */ @@ -339,7 +339,7 @@ class InetAddress implements java.io.Serializable { /** * Utility routine to check if the InetAddress is a site local address. * - * @return a boolean indicating if the InetAddress is + * @return a {@code boolean} indicating if the InetAddress is * a site local address; or false if address is not a site local unicast address. * @since 1.4 */ @@ -350,7 +350,7 @@ class InetAddress implements java.io.Serializable { /** * Utility routine to check if the multicast address has global scope. * - * @return a boolean indicating if the address has + * @return a {@code boolean} indicating if the address has * is a multicast address of global scope, false if it is not * of global scope or it is not a multicast address * @since 1.4 @@ -362,7 +362,7 @@ class InetAddress implements java.io.Serializable { /** * Utility routine to check if the multicast address has node scope. * - * @return a boolean indicating if the address has + * @return a {@code boolean} indicating if the address has * is a multicast address of node-local scope, false if it is not * of node-local scope or it is not a multicast address * @since 1.4 @@ -374,7 +374,7 @@ class InetAddress implements java.io.Serializable { /** * Utility routine to check if the multicast address has link scope. * - * @return a boolean indicating if the address has + * @return a {@code boolean} indicating if the address has * is a multicast address of link-local scope, false if it is not * of link-local scope or it is not a multicast address * @since 1.4 @@ -386,7 +386,7 @@ class InetAddress implements java.io.Serializable { /** * Utility routine to check if the multicast address has site scope. * - * @return a boolean indicating if the address has + * @return a {@code boolean} indicating if the address has * is a multicast address of site-local scope, false if it is not * of site-local scope or it is not a multicast address * @since 1.4 @@ -398,7 +398,7 @@ class InetAddress implements java.io.Serializable { /** * Utility routine to check if the multicast address has organization scope. * - * @return a boolean indicating if the address has + * @return a {@code boolean} indicating if the address has * is a multicast address of organization-local scope, * false if it is not of organization-local scope * or it is not a multicast address @@ -424,9 +424,9 @@ class InetAddress implements java.io.Serializable { * in an IllegalArgumentException being thrown. * * @param timeout the time, in milliseconds, before the call aborts - * @return a boolean indicating if the address is reachable. + * @return a {@code boolean} indicating if the address is reachable. * @throws IOException if a network error occurs - * @throws IllegalArgumentException if timeout is negative. + * @throws IllegalArgumentException if {@code timeout} is negative. * @since 1.5 */ public boolean isReachable(int timeout) throws IOException { @@ -442,10 +442,10 @@ class InetAddress implements java.io.Serializable { * privilege can be obtained, otherwise it will try to establish * a TCP connection on port 7 (Echo) of the destination host. *

    - * The network interface and ttl parameters + * The {@code network interface} and {@code ttl} parameters * let the caller specify which network interface the test will go through * and the maximum number of hops the packets should go through. - * A negative value for the ttl will result in an + * A negative value for the {@code ttl} will result in an * IllegalArgumentException being thrown. *

    * The timeout value, in milliseconds, indicates the maximum amount of time @@ -458,9 +458,9 @@ class InetAddress implements java.io.Serializable { * @param ttl the maximum numbers of hops to try or 0 for the * default * @param timeout the time, in milliseconds, before the call aborts - * @throws IllegalArgumentException if either timeout - * or ttl are negative. - * @return a booleanindicating if the address is reachable. + * @throws IllegalArgumentException if either {@code timeout} + * or {@code ttl} are negative. + * @return a {@code boolean}indicating if the address is reachable. * @throws IOException if a network error occurs * @since 1.5 */ @@ -486,8 +486,8 @@ class InetAddress implements java.io.Serializable { * {@link #getCanonicalHostName() getCanonicalHostName}. * *

    If there is a security manager, its - * checkConnect method is first called - * with the hostname and -1 + * {@code checkConnect} method is first called + * with the hostname and {@code -1} * as its arguments to see if the operation is allowed. * If the operation is not allowed, it will return * the textual representation of the IP address. @@ -511,8 +511,8 @@ class InetAddress implements java.io.Serializable { * here without a security check. * *

    If there is a security manager, this method first - * calls its checkConnect method - * with the hostname and -1 + * calls its {@code checkConnect} method + * with the hostname and {@code -1} * as its arguments to see if the calling code is allowed to know * the hostname for this IP address, i.e., to connect to the host. * If the operation is not allowed, it will return @@ -539,8 +539,8 @@ class InetAddress implements java.io.Serializable { * the FQDN depending on the underlying system configuration. * *

    If there is a security manager, this method first - * calls its checkConnect method - * with the hostname and -1 + * calls its {@code checkConnect} method + * with the hostname and {@code -1} * as its arguments to see if the calling code is allowed to know * the hostname for this IP address, i.e., to connect to the host. * If the operation is not allowed, it will return @@ -566,8 +566,8 @@ class InetAddress implements java.io.Serializable { * Returns the hostname for this address. * *

    If there is a security manager, this method first - * calls its checkConnect method - * with the hostname and -1 + * calls its {@code checkConnect} method + * with the hostname and {@code -1} * as its arguments to see if the calling code is allowed to know * the hostname for this IP address, i.e., to connect to the host. * If the operation is not allowed, it will return @@ -633,9 +633,9 @@ class InetAddress implements java.io.Serializable { } /** - * Returns the raw IP address of this InetAddress + * Returns the raw IP address of this {@code InetAddress} * object. The result is in network byte order: the highest order - * byte of the address is in getAddress()[0]. + * byte of the address is in {@code getAddress()[0]}. * * @return the raw IP address of this object. */ @@ -664,18 +664,18 @@ class InetAddress implements java.io.Serializable { /** * Compares this object against the specified object. - * The result is true if and only if the argument is - * not null and it represents the same IP address as + * The result is {@code true} if and only if the argument is + * not {@code null} and it represents the same IP address as * this object. *

    - * Two instances of InetAddress represent the same IP + * Two instances of {@code InetAddress} represent the same IP * address if the length of the byte arrays returned by - * getAddress is the same for both, and each of the + * {@code getAddress} is the same for both, and each of the * array components is the same for the byte arrays. * * @param obj the object to compare against. - * @return true if the objects are the same; - * false otherwise. + * @return {@code true} if the objects are the same; + * {@code false} otherwise. * @see java.net.InetAddress#getAddress() */ public boolean equals(Object obj) { @@ -683,7 +683,7 @@ class InetAddress implements java.io.Serializable { } /** - * Converts this IP address to a String. The + * Converts this IP address to a {@code String}. The * string returned is of the form: hostname / literal IP * address. * @@ -974,7 +974,7 @@ class InetAddress implements java.io.Serializable { * No name service is checked for the validity of the address. * *

    The host name can either be a machine name, such as - * "java.sun.com", or a textual representation of its IP + * "{@code java.sun.com}", or a textual representation of its IP * address. *

    No validity checking is done on the host name either. * @@ -1019,26 +1019,26 @@ class InetAddress implements java.io.Serializable { * Determines the IP address of a host, given the host's name. * *

    The host name can either be a machine name, such as - * "java.sun.com", or a textual representation of its + * "{@code java.sun.com}", or a textual representation of its * IP address. If a literal IP address is supplied, only the * validity of the address format is checked. * - *

    For host specified in literal IPv6 address, + *

    For {@code host} specified in literal IPv6 address, * either the form defined in RFC 2732 or the literal IPv6 address * format defined in RFC 2373 is accepted. IPv6 scoped addresses are also * supported. See here for a description of IPv6 * scoped addresses. * - *

    If the host is null then an InetAddress + *

    If the host is {@code null} then an {@code InetAddress} * representing an address of the loopback interface is returned. * See RFC 3330 * section 2 and RFC 2373 * section 2.5.3.

    * - * @param host the specified host, or null. + * @param host the specified host, or {@code null}. * @return an IP address for the given host name. * @exception UnknownHostException if no IP address for the - * host could be found, or if a scope_id was specified + * {@code host} could be found, or if a scope_id was specified * for a global IPv6 address. * @exception SecurityException if a security manager exists * and its checkConnect method doesn't allow the operation @@ -1059,37 +1059,37 @@ class InetAddress implements java.io.Serializable { * based on the configured name service on the system. * *

    The host name can either be a machine name, such as - * "java.sun.com", or a textual representation of its IP + * "{@code java.sun.com}", or a textual representation of its IP * address. If a literal IP address is supplied, only the * validity of the address format is checked. * - *

    For host specified in literal IPv6 address, + *

    For {@code host} specified in literal IPv6 address, * either the form defined in RFC 2732 or the literal IPv6 address * format defined in RFC 2373 is accepted. A literal IPv6 address may * also be qualified by appending a scoped zone identifier or scope_id. * The syntax and usage of scope_ids is described * here. - *

    If the host is null then an InetAddress + *

    If the host is {@code null} then an {@code InetAddress} * representing an address of the loopback interface is returned. * See RFC 3330 * section 2 and RFC 2373 * section 2.5.3.

    * - *

    If there is a security manager and host is not - * null and host.length() is not equal to zero, the + *

    If there is a security manager and {@code host} is not + * null and {@code host.length() } is not equal to zero, the * security manager's - * checkConnect method is called - * with the hostname and -1 + * {@code checkConnect} method is called + * with the hostname and {@code -1} * as its arguments to see if the operation is allowed. * - * @param host the name of the host, or null. + * @param host the name of the host, or {@code null}. * @return an array of all the IP addresses for a given host name. * * @exception UnknownHostException if no IP address for the - * host could be found, or if a scope_id was specified + * {@code host} could be found, or if a scope_id was specified * for a global IPv6 address. * @exception SecurityException if a security manager exists and its - * checkConnect method doesn't allow the operation. + * {@code checkConnect} method doesn't allow the operation. * * @see SecurityManager#checkConnect */ @@ -1389,9 +1389,9 @@ class InetAddress implements java.io.Serializable { } /** - * Returns an InetAddress object given the raw IP address . + * Returns an {@code InetAddress} object given the raw IP address . * The argument is in network byte order: the highest order - * byte of the address is in getAddress()[0]. + * byte of the address is in {@code getAddress()[0]}. * *

    This method doesn't block, i.e. no reverse name service lookup * is performed. @@ -1417,14 +1417,14 @@ class InetAddress implements java.io.Serializable { /** * Returns the address of the local host. This is achieved by retrieving * the name of the host from the system, then resolving that name into - * an InetAddress. + * an {@code InetAddress}. * *

    Note: The resolved address may be cached for a short period of time. *

    * *

    If there is a security manager, its - * checkConnect method is called - * with the local host name and -1 + * {@code checkConnect} method is called + * with the local host name and {@code -1} * as its arguments to see if the operation is allowed. * If the operation is not allowed, an InetAddress representing * the loopback address is returned. diff --git a/jdk/src/share/classes/java/net/InetSocketAddress.java b/jdk/src/share/classes/java/net/InetSocketAddress.java index 44604c664aa..6792979312b 100644 --- a/jdk/src/share/classes/java/net/InetSocketAddress.java +++ b/jdk/src/share/classes/java/net/InetSocketAddress.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -43,7 +43,7 @@ import java.io.ObjectStreamField; * as returned values. *

    * The wildcard is a special local IP address. It usually means "any" - * and can only be used for bind operations. + * and can only be used for {@code bind} operations. * * @see java.net.Socket * @see java.net.ServerSocket @@ -155,8 +155,8 @@ public class InetSocketAddress * and the port number a specified value. *

    * A valid port value is between 0 and 65535. - * A port number of zero will let the system pick up an - * ephemeral port in a bind operation. + * A port number of {@code zero} will let the system pick up an + * ephemeral port in a {@code bind} operation. *

    * @param port The port number * @throws IllegalArgumentException if the port parameter is outside the specified @@ -171,10 +171,10 @@ public class InetSocketAddress * Creates a socket address from an IP address and a port number. *

    * A valid port value is between 0 and 65535. - * A port number of zero will let the system pick up an - * ephemeral port in a bind operation. + * A port number of {@code zero} will let the system pick up an + * ephemeral port in a {@code bind} operation. *

    - * A null address will assign the wildcard address. + * A {@code null} address will assign the wildcard address. *

    * @param addr The IP address * @param port The port number @@ -195,13 +195,13 @@ public class InetSocketAddress * An attempt will be made to resolve the hostname into an InetAddress. * If that attempt fails, the address will be flagged as unresolved. *

    - * If there is a security manager, its checkConnect method + * If there is a security manager, its {@code checkConnect} method * is called with the host name as its argument to check the permissiom * to resolve it. This could result in a SecurityException. *

    * A valid port value is between 0 and 65535. - * A port number of zero will let the system pick up an - * ephemeral port in a bind operation. + * A port number of {@code zero} will let the system pick up an + * ephemeral port in a {@code bind} operation. *

    * @param hostname the Host name * @param port The port number @@ -237,8 +237,8 @@ public class InetSocketAddress * The address will be flagged as unresolved. *

    * A valid port value is between 0 and 65535. - * A port number of zero will let the system pick up an - * ephemeral port in a bind operation. + * A port number of {@code zero} will let the system pick up an + * ephemeral port in a {@code bind} operation. *

    * @param host the Host name * @param port The port number @@ -246,7 +246,7 @@ public class InetSocketAddress * the range of valid port values, or if the hostname * parameter is null. * @see #isUnresolved() - * @return a InetSocketAddress representing the unresolved + * @return a {@code InetSocketAddress} representing the unresolved * socket address * @since 1.5 */ @@ -326,16 +326,16 @@ public class InetSocketAddress /** * - * Gets the InetAddress. + * Gets the {@code InetAddress}. * - * @return the InetAdress or null if it is unresolved. + * @return the InetAdress or {@code null} if it is unresolved. */ public final InetAddress getAddress() { return holder.getAddress(); } /** - * Gets the hostname. + * Gets the {@code hostname}. * Note: This method may trigger a name service reverse lookup if the * address was created with a literal IP address. * @@ -360,8 +360,8 @@ public class InetSocketAddress /** * Checks whether the address has been resolved or not. * - * @return true if the hostname couldn't be resolved into - * an InetAddress. + * @return {@code true} if the hostname couldn't be resolved into + * an {@code InetAddress}. */ public final boolean isUnresolved() { return holder.isUnresolved(); @@ -382,11 +382,11 @@ public class InetSocketAddress /** * Compares this object against the specified object. - * The result is true if and only if the argument is - * not null and it represents the same address as + * The result is {@code true} if and only if the argument is + * not {@code null} and it represents the same address as * this object. *

    - * Two instances of InetSocketAddress represent the same + * Two instances of {@code InetSocketAddress} represent the same * address if both the InetAddresses (or hostnames if it is unresolved) and port * numbers are equal. * If both addresses are unresolved, then the hostname and the port number @@ -396,8 +396,8 @@ public class InetSocketAddress * considered equal. * * @param obj the object to compare against. - * @return true if the objects are the same; - * false otherwise. + * @return {@code true} if the objects are the same; + * {@code false} otherwise. * @see java.net.InetAddress#equals(java.lang.Object) */ @Override diff --git a/jdk/src/share/classes/java/net/InterfaceAddress.java b/jdk/src/share/classes/java/net/InterfaceAddress.java index 1fb18ae0f6c..704e1fae9d5 100644 --- a/jdk/src/share/classes/java/net/InterfaceAddress.java +++ b/jdk/src/share/classes/java/net/InterfaceAddress.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -47,23 +47,23 @@ public class InterfaceAddress { } /** - * Returns an InetAddress for this address. + * Returns an {@code InetAddress} for this address. * - * @return the InetAddress for this address. + * @return the {@code InetAddress} for this address. */ public InetAddress getAddress() { return address; } /** - * Returns an InetAddress for the brodcast address + * Returns an {@code InetAddress} for the brodcast address * for this InterfaceAddress. *

    * Only IPv4 networks have broadcast address therefore, in the case - * of an IPv6 network, null will be returned. + * of an IPv6 network, {@code null} will be returned. * - * @return the InetAddress representing the broadcast - * address or null if there is no broadcast address. + * @return the {@code InetAddress} representing the broadcast + * address or {@code null} if there is no broadcast address. */ public InetAddress getBroadcast() { return broadcast; @@ -76,7 +76,7 @@ public class InterfaceAddress { * or 24 (255.255.255.0).

    * Typical IPv6 values would be 128 (::1/128) or 10 (fe80::203:baff:fe27:1243/10) * - * @return a short representing the prefix length for the + * @return a {@code short} representing the prefix length for the * subnet of that address. */ public short getNetworkPrefixLength() { @@ -85,17 +85,17 @@ public class InterfaceAddress { /** * Compares this object against the specified object. - * The result is true if and only if the argument is - * not null and it represents the same interface address as + * The result is {@code true} if and only if the argument is + * not {@code null} and it represents the same interface address as * this object. *

    - * Two instances of InterfaceAddress represent the same + * Two instances of {@code InterfaceAddress} represent the same * address if the InetAddress, the prefix length and the broadcast are * the same for both. * * @param obj the object to compare against. - * @return true if the objects are the same; - * false otherwise. + * @return {@code true} if the objects are the same; + * {@code false} otherwise. * @see java.net.InterfaceAddress#hashCode() */ public boolean equals(Object obj) { @@ -122,7 +122,7 @@ public class InterfaceAddress { } /** - * Converts this Interface address to a String. The + * Converts this Interface address to a {@code String}. The * string returned is of the form: InetAddress / prefix length [ broadcast address ]. * * @return a string representation of this Interface address. diff --git a/jdk/src/share/classes/java/net/JarURLConnection.java b/jdk/src/share/classes/java/net/JarURLConnection.java index 433be8cfdb9..c6fd8cf94f7 100644 --- a/jdk/src/share/classes/java/net/JarURLConnection.java +++ b/jdk/src/share/classes/java/net/JarURLConnection.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -45,18 +45,14 @@ import sun.net.www.ParseUtil; * *

    for example: * - *

    - * jar:http://www.foo.com/bar/baz.jar!/COM/foo/Quux.class
    - *     + *

    {@code jar:http://www.foo.com/bar/baz.jar!/COM/foo/Quux.class} * *

    Jar URLs should be used to refer to a JAR file or entries in * a JAR file. The example above is a JAR URL which refers to a JAR * entry. If the entry name is omitted, the URL refers to the whole * JAR file: * - * - * jar:http://www.foo.com/bar/baz.jar!/ - * + * {@code jar:http://www.foo.com/bar/baz.jar!/} * *

    Users should cast the generic URLConnection to a * JarURLConnection when they know that the URL they created is a JAR @@ -76,19 +72,19 @@ import sun.net.www.ParseUtil; *

    * *
    A Jar entry - *
    jar:http://www.foo.com/bar/baz.jar!/COM/foo/Quux.class + *
    {@code jar:http://www.foo.com/bar/baz.jar!/COM/foo/Quux.class} * *
    A Jar file - *
    jar:http://www.foo.com/bar/baz.jar!/ + *
    {@code jar:http://www.foo.com/bar/baz.jar!/} * *
    A Jar directory - *
    jar:http://www.foo.com/bar/baz.jar!/COM/foo/ + *
    {@code jar:http://www.foo.com/bar/baz.jar!/COM/foo/} * *
    * - *

    !/ is refered to as the separator. + *

    {@code !/} is refered to as the separator. * - *

    When constructing a JAR url via new URL(context, spec), + *

    When constructing a JAR url via {@code new URL(context, spec)}, * the following rules apply: * *

      @@ -294,7 +290,7 @@ public abstract class JarURLConnection extends URLConnection { * can only be called once * the connection has been completely verified by reading * from the input stream until the end of the stream has been - * reached. Otherwise, this method will return null + * reached. Otherwise, this method will return {@code null} * * @return the Certificate object for this connection if the URL * for it points to a JAR file entry, null otherwise. diff --git a/jdk/src/share/classes/java/net/MalformedURLException.java b/jdk/src/share/classes/java/net/MalformedURLException.java index f6ed89219fa..7aef75c7821 100644 --- a/jdk/src/share/classes/java/net/MalformedURLException.java +++ b/jdk/src/share/classes/java/net/MalformedURLException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -39,13 +39,13 @@ public class MalformedURLException extends IOException { private static final long serialVersionUID = -182787522200415866L; /** - * Constructs a MalformedURLException with no detail message. + * Constructs a {@code MalformedURLException} with no detail message. */ public MalformedURLException() { } /** - * Constructs a MalformedURLException with the + * Constructs a {@code MalformedURLException} with the * specified detail message. * * @param msg the detail message. diff --git a/jdk/src/share/classes/java/net/MulticastSocket.java b/jdk/src/share/classes/java/net/MulticastSocket.java index 0a4d7c1023d..9c5cb05acbb 100644 --- a/jdk/src/share/classes/java/net/MulticastSocket.java +++ b/jdk/src/share/classes/java/net/MulticastSocket.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -92,7 +92,7 @@ class MulticastSocket extends DatagramSocket { * Create a multicast socket. * *

      If there is a security manager, - * its checkListen method is first called + * its {@code checkListen} method is first called * with 0 as its argument to ensure the operation is allowed. * This could result in a SecurityException. *

      @@ -103,7 +103,7 @@ class MulticastSocket extends DatagramSocket { * @exception IOException if an I/O exception occurs * while creating the MulticastSocket * @exception SecurityException if a security manager exists and its - * checkListen method doesn't allow the operation. + * {@code checkListen} method doesn't allow the operation. * @see SecurityManager#checkListen * @see java.net.DatagramSocket#setReuseAddress(boolean) */ @@ -115,8 +115,8 @@ class MulticastSocket extends DatagramSocket { * Create a multicast socket and bind it to a specific port. * *

      If there is a security manager, - * its checkListen method is first called - * with the port argument + * its {@code checkListen} method is first called + * with the {@code port} argument * as its argument to ensure the operation is allowed. * This could result in a SecurityException. *

      @@ -128,7 +128,7 @@ class MulticastSocket extends DatagramSocket { * @exception IOException if an I/O exception occurs * while creating the MulticastSocket * @exception SecurityException if a security manager exists and its - * checkListen method doesn't allow the operation. + * {@code checkListen} method doesn't allow the operation. * @see SecurityManager#checkListen * @see java.net.DatagramSocket#setReuseAddress(boolean) */ @@ -139,10 +139,10 @@ class MulticastSocket extends DatagramSocket { /** * Create a MulticastSocket bound to the specified socket address. *

      - * Or, if the address is null, create an unbound socket. + * Or, if the address is {@code null}, create an unbound socket. *

      *

      If there is a security manager, - * its checkListen method is first called + * its {@code checkListen} method is first called * with the SocketAddress port as its argument to ensure the operation is allowed. * This could result in a SecurityException. *

      @@ -150,12 +150,12 @@ class MulticastSocket extends DatagramSocket { * {@link DatagramSocket#setReuseAddress(boolean)} method is * called to enable the SO_REUSEADDR socket option. * - * @param bindaddr Socket address to bind to, or null for + * @param bindaddr Socket address to bind to, or {@code null} for * an unbound socket. * @exception IOException if an I/O exception occurs * while creating the MulticastSocket * @exception SecurityException if a security manager exists and its - * checkListen method doesn't allow the operation. + * {@code checkListen} method doesn't allow the operation. * @see SecurityManager#checkListen * @see java.net.DatagramSocket#setReuseAddress(boolean) * @@ -197,7 +197,7 @@ class MulticastSocket extends DatagramSocket { /** * Set the default time-to-live for multicast packets sent out - * on this MulticastSocket in order to control the + * on this {@code MulticastSocket} in order to control the * scope of the multicasts. * *

      The ttl is an unsigned 8-bit quantity, and so must be @@ -279,11 +279,11 @@ class MulticastSocket extends DatagramSocket { /** * Joins a multicast group. Its behavior may be affected by - * setInterface or setNetworkInterface. + * {@code setInterface} or {@code setNetworkInterface}. * *

      If there is a security manager, this method first - * calls its checkMulticast method - * with the mcastaddr argument + * calls its {@code checkMulticast} method + * with the {@code mcastaddr} argument * as its argument. * * @param mcastaddr is the multicast address to join @@ -291,7 +291,7 @@ class MulticastSocket extends DatagramSocket { * @exception IOException if there is an error joining * or when the address is not a multicast address. * @exception SecurityException if a security manager exists and its - * checkMulticast method doesn't allow the join. + * {@code checkMulticast} method doesn't allow the join. * * @see SecurityManager#checkMulticast(InetAddress) */ @@ -325,18 +325,18 @@ class MulticastSocket extends DatagramSocket { /** * Leave a multicast group. Its behavior may be affected by - * setInterface or setNetworkInterface. + * {@code setInterface} or {@code setNetworkInterface}. * *

      If there is a security manager, this method first - * calls its checkMulticast method - * with the mcastaddr argument + * calls its {@code checkMulticast} method + * with the {@code mcastaddr} argument * as its argument. * * @param mcastaddr is the multicast address to leave * @exception IOException if there is an error leaving * or when the address is not a multicast address. * @exception SecurityException if a security manager exists and its - * checkMulticast method doesn't allow the operation. + * {@code checkMulticast} method doesn't allow the operation. * * @see SecurityManager#checkMulticast(InetAddress) */ @@ -362,8 +362,8 @@ class MulticastSocket extends DatagramSocket { * Joins the specified multicast group at the specified interface. * *

      If there is a security manager, this method first - * calls its checkMulticast method - * with the mcastaddr argument + * calls its {@code checkMulticast} method + * with the {@code mcastaddr} argument * as its argument. * * @param mcastaddr is the multicast address to join @@ -375,7 +375,7 @@ class MulticastSocket extends DatagramSocket { * @exception IOException if there is an error joining * or when the address is not a multicast address. * @exception SecurityException if a security manager exists and its - * checkMulticast method doesn't allow the join. + * {@code checkMulticast} method doesn't allow the join. * @throws IllegalArgumentException if mcastaddr is null or is a * SocketAddress subclass not supported by this socket * @@ -410,8 +410,8 @@ class MulticastSocket extends DatagramSocket { * Leave a multicast group on a specified local interface. * *

      If there is a security manager, this method first - * calls its checkMulticast method - * with the mcastaddr argument + * calls its {@code checkMulticast} method + * with the {@code mcastaddr} argument * as its argument. * * @param mcastaddr is the multicast address to leave @@ -422,7 +422,7 @@ class MulticastSocket extends DatagramSocket { * @exception IOException if there is an error leaving * or when the address is not a multicast address. * @exception SecurityException if a security manager exists and its - * checkMulticast method doesn't allow the operation. + * {@code checkMulticast} method doesn't allow the operation. * @throws IllegalArgumentException if mcastaddr is null or is a * SocketAddress subclass not supported by this socket * @@ -478,7 +478,7 @@ class MulticastSocket extends DatagramSocket { * Retrieve the address of the network interface used for * multicast packets. * - * @return An InetAddress representing + * @return An {@code InetAddress} representing * the address of the network interface used for * multicast packets. * @@ -562,7 +562,7 @@ class MulticastSocket extends DatagramSocket { * * @exception SocketException if there is an error in * the underlying protocol, such as a TCP error. - * @return the multicast NetworkInterface currently set + * @return the multicast {@code NetworkInterface} currently set * @see #setNetworkInterface(NetworkInterface) * @since 1.4 */ @@ -587,7 +587,7 @@ class MulticastSocket extends DatagramSocket { *

      Because this option is a hint, applications that want to * verify what loopback mode is set to should call * {@link #getLoopbackMode()} - * @param disable true to disable the LoopbackMode + * @param disable {@code true} to disable the LoopbackMode * @throws SocketException if an error occurs while setting the value * @since 1.4 * @see #getLoopbackMode @@ -615,18 +615,18 @@ class MulticastSocket extends DatagramSocket { * otherwise it is preferable to set a TTL once on the socket, and * use that default TTL for all packets. This method does not * alter the default TTL for the socket. Its behavior may be - * affected by setInterface. + * affected by {@code setInterface}. * *

      If there is a security manager, this method first performs some - * security checks. First, if p.getAddress().isMulticastAddress() + * security checks. First, if {@code p.getAddress().isMulticastAddress()} * is true, this method calls the - * security manager's checkMulticast method - * with p.getAddress() and ttl as its arguments. + * security manager's {@code checkMulticast} method + * with {@code p.getAddress()} and {@code ttl} as its arguments. * If the evaluation of that expression is false, * this method instead calls the security manager's - * checkConnect method with arguments - * p.getAddress().getHostAddress() and - * p.getPort(). Each call to a security manager method + * {@code checkConnect} method with arguments + * {@code p.getAddress().getHostAddress()} and + * {@code p.getPort()}. Each call to a security manager method * could result in a SecurityException if the operation is not allowed. * * @param p is the packet to be sent. The packet should contain @@ -639,7 +639,7 @@ class MulticastSocket extends DatagramSocket { * @exception IOException is raised if an error occurs i.e * error while setting ttl. * @exception SecurityException if a security manager exists and its - * checkMulticast or checkConnect + * {@code checkMulticast} or {@code checkConnect} * method doesn't allow the send. * * @deprecated Use the following code or its equivalent instead: diff --git a/jdk/src/share/classes/java/net/NetPermission.java b/jdk/src/share/classes/java/net/NetPermission.java index f11337e5b9e..cf7cbd2af67 100644 --- a/jdk/src/share/classes/java/net/NetPermission.java +++ b/jdk/src/share/classes/java/net/NetPermission.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -177,8 +177,8 @@ public final class NetPermission extends BasicPermission { * * @param name the name of the NetPermission. * - * @throws NullPointerException if name is null. - * @throws IllegalArgumentException if name is empty. + * @throws NullPointerException if {@code name} is {@code null}. + * @throws IllegalArgumentException if {@code name} is empty. */ public NetPermission(String name) @@ -194,8 +194,8 @@ public final class NetPermission extends BasicPermission { * @param name the name of the NetPermission. * @param actions should be null. * - * @throws NullPointerException if name is null. - * @throws IllegalArgumentException if name is empty. + * @throws NullPointerException if {@code name} is {@code null}. + * @throws IllegalArgumentException if {@code name} is empty. */ public NetPermission(String name, String actions) diff --git a/jdk/src/share/classes/java/net/NetworkInterface.java b/jdk/src/share/classes/java/net/NetworkInterface.java index c1644dea2bc..411d8df14b9 100644 --- a/jdk/src/share/classes/java/net/NetworkInterface.java +++ b/jdk/src/share/classes/java/net/NetworkInterface.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -98,9 +98,9 @@ public final class NetworkInterface { * Convenience method to return an Enumeration with all or a * subset of the InetAddresses bound to this network interface. *

      - * If there is a security manager, its checkConnect + * If there is a security manager, its {@code checkConnect} * method is called for each InetAddress. Only InetAddresses where - * the checkConnect doesn't throw a SecurityException + * the {@code checkConnect} doesn't throw a SecurityException * will be returned in the Enumeration. However, if the caller has the * {@link NetPermission}("getNetworkInformation") permission, then all * InetAddresses are returned. @@ -154,15 +154,15 @@ public final class NetworkInterface { } /** - * Get a List of all or a subset of the InterfaceAddresses + * Get a List of all or a subset of the {@code InterfaceAddresses} * of this network interface. *

      - * If there is a security manager, its checkConnect + * If there is a security manager, its {@code checkConnect} * method is called with the InetAddress for each InterfaceAddress. - * Only InterfaceAddresses where the checkConnect doesn't throw + * Only InterfaceAddresses where the {@code checkConnect} doesn't throw * a SecurityException will be returned in the List. * - * @return a List object with all or a subset of the + * @return a {@code List} object with all or a subset of the * InterfaceAddresss of this network interface * @since 1.6 */ @@ -216,10 +216,10 @@ public final class NetworkInterface { /** * Returns the parent NetworkInterface of this interface if this is - * a subinterface, or null if it is a physical + * a subinterface, or {@code null} if it is a physical * (non virtual) interface or has no parent. * - * @return The NetworkInterface this interface is attached to. + * @return The {@code NetworkInterface} this interface is attached to. * @since 1.6 */ public NetworkInterface getParent() { @@ -260,15 +260,15 @@ public final class NetworkInterface { * @param name * The name of the network interface. * - * @return A NetworkInterface with the specified name, - * or null if there is no network interface + * @return A {@code NetworkInterface} with the specified name, + * or {@code null} if there is no network interface * with the specified name. * * @throws SocketException * If an I/O error occurs. * * @throws NullPointerException - * If the specified name is null. + * If the specified name is {@code null}. */ public static NetworkInterface getByName(String name) throws SocketException { if (name == null) @@ -303,17 +303,17 @@ public final class NetworkInterface { * returned. * * @param addr - * The InetAddress to search with. + * The {@code InetAddress} to search with. * - * @return A NetworkInterface - * or null if there is no network interface + * @return A {@code NetworkInterface} + * or {@code null} if there is no network interface * with the specified IP address. * * @throws SocketException * If an I/O error occurs. * * @throws NullPointerException - * If the specified address is null. + * If the specified address is {@code null}. */ public static NetworkInterface getByInetAddress(InetAddress addr) throws SocketException { if (addr == null) { @@ -378,7 +378,7 @@ public final class NetworkInterface { /** * Returns whether a network interface is up and running. * - * @return true if the interface is up and running. + * @return {@code true} if the interface is up and running. * @exception SocketException if an I/O error occurs. * @since 1.6 */ @@ -390,7 +390,7 @@ public final class NetworkInterface { /** * Returns whether a network interface is a loopback interface. * - * @return true if the interface is a loopback interface. + * @return {@code true} if the interface is a loopback interface. * @exception SocketException if an I/O error occurs. * @since 1.6 */ @@ -404,7 +404,7 @@ public final class NetworkInterface { * A typical point to point interface would be a PPP connection through * a modem. * - * @return true if the interface is a point to point + * @return {@code true} if the interface is a point to point * interface. * @exception SocketException if an I/O error occurs. * @since 1.6 @@ -417,7 +417,7 @@ public final class NetworkInterface { /** * Returns whether a network interface supports multicasting or not. * - * @return true if the interface supports Multicasting. + * @return {@code true} if the interface supports Multicasting. * @exception SocketException if an I/O error occurs. * @since 1.6 */ @@ -432,7 +432,7 @@ public final class NetworkInterface { * If a security manager is set, then the caller must have * the permission {@link NetPermission}("getNetworkInformation"). * - * @return a byte array containing the address, or null if + * @return a byte array containing the address, or {@code null} if * the address doesn't exist, is not accessible or a security * manager is set and the caller does not have the permission * NetPermission("getNetworkInformation") @@ -481,7 +481,7 @@ public final class NetworkInterface { * can be several virtual interfaces attached to a single physical * interface. * - * @return true if this interface is a virtual interface. + * @return {@code true} if this interface is a virtual interface. * @since 1.6 */ public boolean isVirtual() { @@ -497,16 +497,16 @@ public final class NetworkInterface { /** * Compares this object against the specified object. - * The result is true if and only if the argument is - * not null and it represents the same NetworkInterface + * The result is {@code true} if and only if the argument is + * not {@code null} and it represents the same NetworkInterface * as this object. *

      - * Two instances of NetworkInterface represent the same + * Two instances of {@code NetworkInterface} represent the same * NetworkInterface if both name and addrs are the same for both. * * @param obj the object to compare against. - * @return true if the objects are the same; - * false otherwise. + * @return {@code true} if the objects are the same; + * {@code false} otherwise. * @see java.net.InetAddress#getAddress() */ public boolean equals(Object obj) { diff --git a/jdk/src/share/classes/java/net/PasswordAuthentication.java b/jdk/src/share/classes/java/net/PasswordAuthentication.java index ee2280fc730..5529568f3a3 100644 --- a/jdk/src/share/classes/java/net/PasswordAuthentication.java +++ b/jdk/src/share/classes/java/net/PasswordAuthentication.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2001, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -43,11 +43,11 @@ public final class PasswordAuthentication { private char[] password; /** - * Creates a new PasswordAuthentication object from the given + * Creates a new {@code PasswordAuthentication} object from the given * user name and password. * *

      Note that the given user password is cloned before it is stored in - * the new PasswordAuthentication object. + * the new {@code PasswordAuthentication} object. * * @param userName the user name * @param password the user's password diff --git a/jdk/src/share/classes/java/net/PortUnreachableException.java b/jdk/src/share/classes/java/net/PortUnreachableException.java index c21345fb7d9..8d1f21b0e87 100644 --- a/jdk/src/share/classes/java/net/PortUnreachableException.java +++ b/jdk/src/share/classes/java/net/PortUnreachableException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -36,7 +36,7 @@ public class PortUnreachableException extends SocketException { private static final long serialVersionUID = 8462541992376507323L; /** - * Constructs a new PortUnreachableException with a + * Constructs a new {@code PortUnreachableException} with a * detail message. * @param msg the detail message */ @@ -45,7 +45,7 @@ public class PortUnreachableException extends SocketException { } /** - * Construct a new PortUnreachableException with no + * Construct a new {@code PortUnreachableException} with no * detailed message. */ public PortUnreachableException() {} diff --git a/jdk/src/share/classes/java/net/ProtocolException.java b/jdk/src/share/classes/java/net/ProtocolException.java index 74ff4f1322e..ebb94eb16ca 100644 --- a/jdk/src/share/classes/java/net/ProtocolException.java +++ b/jdk/src/share/classes/java/net/ProtocolException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -39,7 +39,7 @@ class ProtocolException extends IOException { private static final long serialVersionUID = -6098449442062388080L; /** - * Constructs a new ProtocolException with the + * Constructs a new {@code ProtocolException} with the * specified detail message. * * @param host the detail message. @@ -49,7 +49,7 @@ class ProtocolException extends IOException { } /** - * Constructs a new ProtocolException with no detail message. + * Constructs a new {@code ProtocolException} with no detail message. */ public ProtocolException() { } diff --git a/jdk/src/share/classes/java/net/Proxy.java b/jdk/src/share/classes/java/net/Proxy.java index 4b8b6f148d5..fe481fadfa2 100644 --- a/jdk/src/share/classes/java/net/Proxy.java +++ b/jdk/src/share/classes/java/net/Proxy.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -28,7 +28,7 @@ package java.net; /** * This class represents a proxy setting, typically a type (http, socks) and * a socket address. - * A Proxy is an immutable object. + * A {@code Proxy} is an immutable object. * * @see java.net.ProxySelector * @author Yingxian Wang @@ -61,17 +61,17 @@ public class Proxy { private SocketAddress sa; /** - * A proxy setting that represents a DIRECT connection, + * A proxy setting that represents a {@code DIRECT} connection, * basically telling the protocol handler not to use any proxying. * Used, for instance, to create sockets bypassing any other global * proxy settings (like SOCKS): *

      - * Socket s = new Socket(Proxy.NO_PROXY);
      + * {@code Socket s = new Socket(Proxy.NO_PROXY);}
      *

      */ public final static Proxy NO_PROXY = new Proxy(); - // Creates the proxy that represents a DIRECT connection. + // Creates the proxy that represents a {@code DIRECT} connection. private Proxy() { type = Type.DIRECT; sa = null; @@ -82,11 +82,11 @@ public class Proxy { * Certain combinations are illegal. For instance, for types Http, and * Socks, a SocketAddress must be provided. *

      - * Use the Proxy.NO_PROXY constant + * Use the {@code Proxy.NO_PROXY} constant * for representing a direct connection. * - * @param type the Type of the proxy - * @param sa the SocketAddress for that proxy + * @param type the {@code Type} of the proxy + * @param sa the {@code SocketAddress} for that proxy * @throws IllegalArgumentException when the type and the address are * incompatible */ @@ -108,9 +108,9 @@ public class Proxy { /** * Returns the socket address of the proxy, or - * null if its a direct connection. + * {@code null} if its a direct connection. * - * @return a SocketAddress representing the socket end + * @return a {@code SocketAddress} representing the socket end * point of the proxy */ public SocketAddress address() { @@ -121,7 +121,7 @@ public class Proxy { * Constructs a string representation of this Proxy. * This String is constructed by calling toString() on its type * and concatenating " @ " and the toString() result from its address - * if its type is not DIRECT. + * if its type is not {@code DIRECT}. * * @return a string representation of this object. */ @@ -133,16 +133,16 @@ public class Proxy { /** * Compares this object against the specified object. - * The result is true if and only if the argument is - * not null and it represents the same proxy as + * The result is {@code true} if and only if the argument is + * not {@code null} and it represents the same proxy as * this object. *

      - * Two instances of Proxy represent the same + * Two instances of {@code Proxy} represent the same * address if both the SocketAddresses and type are equal. * * @param obj the object to compare against. - * @return true if the objects are the same; - * false otherwise. + * @return {@code true} if the objects are the same; + * {@code false} otherwise. * @see java.net.InetSocketAddress#equals(java.lang.Object) */ public final boolean equals(Object obj) { diff --git a/jdk/src/share/classes/java/net/ProxySelector.java b/jdk/src/share/classes/java/net/ProxySelector.java index 6aa01ffd2e3..d6bb53656fd 100644 --- a/jdk/src/share/classes/java/net/ProxySelector.java +++ b/jdk/src/share/classes/java/net/ProxySelector.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -83,9 +83,9 @@ public abstract class ProxySelector { * * @throws SecurityException * If a security manager has been installed and it denies - * {@link NetPermission}("getProxySelector") + * {@link NetPermission}{@code ("getProxySelector")} * @see #setDefault(ProxySelector) - * @return the system-wide ProxySelector + * @return the system-wide {@code ProxySelector} * @since 1.5 */ public static ProxySelector getDefault() { @@ -102,11 +102,11 @@ public abstract class ProxySelector { * Note: non-standard protocol handlers may ignore this setting. * * @param ps The HTTP proxy selector, or - * null to unset the proxy selector. + * {@code null} to unset the proxy selector. * * @throws SecurityException * If a security manager has been installed and it denies - * {@link NetPermission}("setProxySelector") + * {@link NetPermission}{@code ("setProxySelector")} * * @see #getDefault() * @since 1.5 @@ -127,7 +127,7 @@ public abstract class ProxySelector { *

        *
      • http URI for http connections
        • *
      • https URI for https connections - *
      • socket://host:port
        + *
      • {@code socket://host:port}
        * for tcp client sockets connections
        • *
      * diff --git a/jdk/src/share/classes/java/net/ResponseCache.java b/jdk/src/share/classes/java/net/ResponseCache.java index 6a67bf655b3..2dfaf4aa9f9 100644 --- a/jdk/src/share/classes/java/net/ResponseCache.java +++ b/jdk/src/share/classes/java/net/ResponseCache.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -74,10 +74,10 @@ public abstract class ResponseCache { * * @throws SecurityException * If a security manager has been installed and it denies - * {@link NetPermission}("getResponseCache") + * {@link NetPermission}{@code ("getResponseCache")} * * @see #setDefault(ResponseCache) - * @return the system-wide ResponseCache + * @return the system-wide {@code ResponseCache} * @since 1.5 */ public synchronized static ResponseCache getDefault() { @@ -94,11 +94,11 @@ public abstract class ResponseCache { * Note: non-standard procotol handlers may ignore this setting. * * @param responseCache The response cache, or - * null to unset the cache. + * {@code null} to unset the cache. * * @throws SecurityException * If a security manager has been installed and it denies - * {@link NetPermission}("setResponseCache") + * {@link NetPermission}{@code ("setResponseCache")} * * @see #getDefault() * @since 1.5 @@ -118,14 +118,14 @@ public abstract class ResponseCache { * to get the network resource. If a cached response is returned, * that resource is used instead. * - * @param uri a URI used to reference the requested + * @param uri a {@code URI} used to reference the requested * network resource - * @param rqstMethod a String representing the request + * @param rqstMethod a {@code String} representing the request * method * @param rqstHeaders - a Map from request header * field names to lists of field values representing * the current request headers - * @return a CacheResponse instance if available + * @return a {@code CacheResponse} instance if available * from cache, or null otherwise * @throws IOException if an I/O error occurs * @throws IllegalArgumentException if any one of the arguments is null @@ -148,11 +148,11 @@ public abstract class ResponseCache { * use to write the resource into the cache. If the resource is * not to be cached, then put must return null. * - * @param uri a URI used to reference the requested + * @param uri a {@code URI} used to reference the requested * network resource * @param conn - a URLConnection instance that is used to fetch * the response to be cached - * @return a CacheRequest for recording the + * @return a {@code CacheRequest} for recording the * response to be cached. Null return indicates that * the caller does not intend to cache the response. * @throws IOException if an I/O error occurs diff --git a/jdk/src/share/classes/java/net/ServerSocket.java b/jdk/src/share/classes/java/net/ServerSocket.java index 0b69ad6a266..bcc77ae42f3 100644 --- a/jdk/src/share/classes/java/net/ServerSocket.java +++ b/jdk/src/share/classes/java/net/ServerSocket.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -37,7 +37,7 @@ import java.security.PrivilegedExceptionAction; * based on that request, and then possibly returns a result to the requester. *

      * The actual work of the server socket is performed by an instance - * of the SocketImpl class. An application can + * of the {@code SocketImpl} class. An application can * change the socket factory that creates the socket * implementation to configure itself to create sockets * appropriate to the local firewall. @@ -89,31 +89,31 @@ class ServerSocket implements java.io.Closeable { /** * Creates a server socket, bound to the specified port. A port number - * of 0 means that the port number is automatically + * of {@code 0} means that the port number is automatically * allocated, typically from an ephemeral port range. This port * number can then be retrieved by calling {@link #getLocalPort getLocalPort}. *

      * The maximum queue length for incoming connection indications (a - * request to connect) is set to 50. If a connection + * request to connect) is set to {@code 50}. If a connection * indication arrives when the queue is full, the connection is refused. *

      * If the application has specified a server socket factory, that - * factory's createSocketImpl method is called to create + * factory's {@code createSocketImpl} method is called to create * the actual socket implementation. Otherwise a "plain" socket is created. *

      * If there is a security manager, - * its checkListen method is called - * with the port argument + * its {@code checkListen} method is called + * with the {@code port} argument * as its argument to ensure the operation is allowed. * This could result in a SecurityException. * * - * @param port the port number, or 0 to use a port + * @param port the port number, or {@code 0} to use a port * number that is automatically allocated. * * @exception IOException if an I/O error occurs when opening the socket. * @exception SecurityException - * if a security manager exists and its checkListen + * if a security manager exists and its {@code checkListen} * method doesn't allow the operation. * @exception IllegalArgumentException if the port parameter is outside * the specified range of valid port values, which is between @@ -131,42 +131,42 @@ class ServerSocket implements java.io.Closeable { /** * Creates a server socket and binds it to the specified local port * number, with the specified backlog. - * A port number of 0 means that the port number is + * A port number of {@code 0} means that the port number is * automatically allocated, typically from an ephemeral port range. * This port number can then be retrieved by calling * {@link #getLocalPort getLocalPort}. *

      * The maximum queue length for incoming connection indications (a - * request to connect) is set to the backlog parameter. If + * request to connect) is set to the {@code backlog} parameter. If * a connection indication arrives when the queue is full, the * connection is refused. *

      * If the application has specified a server socket factory, that - * factory's createSocketImpl method is called to create + * factory's {@code createSocketImpl} method is called to create * the actual socket implementation. Otherwise a "plain" socket is created. *

      * If there is a security manager, - * its checkListen method is called - * with the port argument + * its {@code checkListen} method is called + * with the {@code port} argument * as its argument to ensure the operation is allowed. * This could result in a SecurityException. * - * The backlog argument is the requested maximum number of + * The {@code backlog} argument is the requested maximum number of * pending connections on the socket. Its exact semantics are implementation * specific. In particular, an implementation may impose a maximum length * or may choose to ignore the parameter altogther. The value provided - * should be greater than 0. If it is less than or equal to - * 0, then an implementation specific default will be used. + * should be greater than {@code 0}. If it is less than or equal to + * {@code 0}, then an implementation specific default will be used. *

      * - * @param port the port number, or 0 to use a port + * @param port the port number, or {@code 0} to use a port * number that is automatically allocated. * @param backlog requested maximum length of the queue of incoming * connections. * * @exception IOException if an I/O error occurs when opening the socket. * @exception SecurityException - * if a security manager exists and its checkListen + * if a security manager exists and its {@code checkListen} * method doesn't allow the operation. * @exception IllegalArgumentException if the port parameter is outside * the specified range of valid port values, which is between @@ -189,32 +189,32 @@ class ServerSocket implements java.io.Closeable { * If bindAddr is null, it will default accepting * connections on any/all local addresses. * The port must be between 0 and 65535, inclusive. - * A port number of 0 means that the port number is + * A port number of {@code 0} means that the port number is * automatically allocated, typically from an ephemeral port range. * This port number can then be retrieved by calling * {@link #getLocalPort getLocalPort}. * *

      If there is a security manager, this method - * calls its checkListen method - * with the port argument + * calls its {@code checkListen} method + * with the {@code port} argument * as its argument to ensure the operation is allowed. * This could result in a SecurityException. * - * The backlog argument is the requested maximum number of + * The {@code backlog} argument is the requested maximum number of * pending connections on the socket. Its exact semantics are implementation * specific. In particular, an implementation may impose a maximum length * or may choose to ignore the parameter altogther. The value provided - * should be greater than 0. If it is less than or equal to - * 0, then an implementation specific default will be used. + * should be greater than {@code 0}. If it is less than or equal to + * {@code 0}, then an implementation specific default will be used. *

      - * @param port the port number, or 0 to use a port + * @param port the port number, or {@code 0} to use a port * number that is automatically allocated. * @param backlog requested maximum length of the queue of incoming * connections. * @param bindAddr the local InetAddress the server will bind to * * @throws SecurityException if a security manager exists and - * its checkListen method doesn't allow the operation. + * its {@code checkListen} method doesn't allow the operation. * * @throws IOException if an I/O error occurs when opening the socket. * @exception IllegalArgumentException if the port parameter is outside @@ -245,10 +245,10 @@ class ServerSocket implements java.io.Closeable { } /** - * Get the SocketImpl attached to this socket, creating + * Get the {@code SocketImpl} attached to this socket, creating * it if necessary. * - * @return the SocketImpl attached to that ServerSocket. + * @return the {@code SocketImpl} attached to that ServerSocket. * @throws SocketException if creation fails. * @since 1.4 */ @@ -310,17 +310,17 @@ class ServerSocket implements java.io.Closeable { /** * - * Binds the ServerSocket to a specific address + * Binds the {@code ServerSocket} to a specific address * (IP address and port number). *

      - * If the address is null, then the system will pick up + * If the address is {@code null}, then the system will pick up * an ephemeral port and a valid local address to bind the socket. *

      * @param endpoint The IP address and port number to bind to. * @throws IOException if the bind operation fails, or if the socket * is already bound. - * @throws SecurityException if a SecurityManager is present and - * its checkListen method doesn't allow the operation. + * @throws SecurityException if a {@code SecurityManager} is present and + * its {@code checkListen} method doesn't allow the operation. * @throws IllegalArgumentException if endpoint is a * SocketAddress subclass not supported by this socket * @since 1.4 @@ -331,25 +331,25 @@ class ServerSocket implements java.io.Closeable { /** * - * Binds the ServerSocket to a specific address + * Binds the {@code ServerSocket} to a specific address * (IP address and port number). *

      - * If the address is null, then the system will pick up + * If the address is {@code null}, then the system will pick up * an ephemeral port and a valid local address to bind the socket. *

      - * The backlog argument is the requested maximum number of + * The {@code backlog} argument is the requested maximum number of * pending connections on the socket. Its exact semantics are implementation * specific. In particular, an implementation may impose a maximum length * or may choose to ignore the parameter altogther. The value provided - * should be greater than 0. If it is less than or equal to - * 0, then an implementation specific default will be used. + * should be greater than {@code 0}. If it is less than or equal to + * {@code 0}, then an implementation specific default will be used. * @param endpoint The IP address and port number to bind to. * @param backlog requested maximum length of the queue of * incoming connections. * @throws IOException if the bind operation fails, or if the socket * is already bound. - * @throws SecurityException if a SecurityManager is present and - * its checkListen method doesn't allow the operation. + * @throws SecurityException if a {@code SecurityManager} is present and + * its {@code checkListen} method doesn't allow the operation. * @throws IllegalArgumentException if endpoint is a * SocketAddress subclass not supported by this socket * @since 1.4 @@ -480,18 +480,18 @@ class ServerSocket implements java.io.Closeable { * Listens for a connection to be made to this socket and accepts * it. The method blocks until a connection is made. * - *

      A new Socket s is created and, if there + *

      A new Socket {@code s} is created and, if there * is a security manager, - * the security manager's checkAccept method is called - * with s.getInetAddress().getHostAddress() and - * s.getPort() + * the security manager's {@code checkAccept} method is called + * with {@code s.getInetAddress().getHostAddress()} and + * {@code s.getPort()} * as its arguments to ensure the operation is allowed. * This could result in a SecurityException. * * @exception IOException if an I/O error occurs when waiting for a * connection. * @exception SecurityException if a security manager exists and its - * checkAccept method doesn't allow the operation. + * {@code checkAccept} method doesn't allow the operation. * @exception SocketTimeoutException if a timeout was previously set with setSoTimeout and * the timeout has been reached. * @exception java.nio.channels.IllegalBlockingModeException @@ -597,7 +597,7 @@ class ServerSocket implements java.io.Closeable { * method. * * @return the server-socket channel associated with this socket, - * or null if this socket was not created + * or {@code null} if this socket was not created * for a channel * * @since 1.4 @@ -678,18 +678,18 @@ class ServerSocket implements java.io.Closeable { *

      * When a TCP connection is closed the connection may remain * in a timeout state for a period of time after the connection - * is closed (typically known as the TIME_WAIT state - * or 2MSL wait state). + * is closed (typically known as the {@code TIME_WAIT} state + * or {@code 2MSL} wait state). * For applications using a well known socket address or port * it may not be possible to bind a socket to the required - * SocketAddress if there is a connection in the + * {@code SocketAddress} if there is a connection in the * timeout state involving the socket address or port. *

      * Enabling {@link SocketOptions#SO_REUSEADDR SO_REUSEADDR} prior to * binding the socket using {@link #bind(SocketAddress)} allows the socket * to be bound even though a previous connection is in a timeout state. *

      - * When a ServerSocket is created the initial setting + * When a {@code ServerSocket} is created the initial setting * of {@link SocketOptions#SO_REUSEADDR SO_REUSEADDR} is not defined. * Applications can use {@link #getReuseAddress()} to determine the initial * setting of {@link SocketOptions#SO_REUSEADDR SO_REUSEADDR}. @@ -717,7 +717,7 @@ class ServerSocket implements java.io.Closeable { /** * Tests if {@link SocketOptions#SO_REUSEADDR SO_REUSEADDR} is enabled. * - * @return a boolean indicating whether or not + * @return a {@code boolean} indicating whether or not * {@link SocketOptions#SO_REUSEADDR SO_REUSEADDR} is enabled. * @exception SocketException if there is an error * in the underlying protocol, such as a TCP error. @@ -732,7 +732,7 @@ class ServerSocket implements java.io.Closeable { /** * Returns the implementation address and implementation port of - * this socket as a String. + * this socket as a {@code String}. *

      * If there is a security manager set, its {@code checkConnect} method is * called with the local address and {@code -1} as its arguments to see @@ -773,14 +773,14 @@ class ServerSocket implements java.io.Closeable { * application. The factory can be specified only once. *

      * When an application creates a new server socket, the socket - * implementation factory's createSocketImpl method is + * implementation factory's {@code createSocketImpl} method is * called to create the actual socket implementation. *

      - * Passing null to the method is a no-op unless the factory + * Passing {@code null} to the method is a no-op unless the factory * was already set. *

      * If there is a security manager, this method first calls - * the security manager's checkSetFactory method + * the security manager's {@code checkSetFactory} method * to ensure the operation is allowed. * This could result in a SecurityException. * @@ -789,7 +789,7 @@ class ServerSocket implements java.io.Closeable { * socket factory. * @exception SocketException if the factory has already been defined. * @exception SecurityException if a security manager exists and its - * checkSetFactory method doesn't allow the operation. + * {@code checkSetFactory} method doesn't allow the operation. * @see java.net.SocketImplFactory#createSocketImpl() * @see SecurityManager#checkSetFactory */ @@ -807,7 +807,7 @@ class ServerSocket implements java.io.Closeable { /** * Sets a default proposed value for the * {@link SocketOptions#SO_RCVBUF SO_RCVBUF} option for sockets - * accepted from this ServerSocket. The value actually set + * accepted from this {@code ServerSocket}. The value actually set * in the accepted socket must be determined by calling * {@link Socket#getReceiveBufferSize()} after the socket * is returned by {@link #accept()}. @@ -851,13 +851,13 @@ class ServerSocket implements java.io.Closeable { /** * Gets the value of the {@link SocketOptions#SO_RCVBUF SO_RCVBUF} option - * for this ServerSocket, that is the proposed buffer size that - * will be used for Sockets accepted from this ServerSocket. + * for this {@code ServerSocket}, that is the proposed buffer size that + * will be used for Sockets accepted from this {@code ServerSocket}. * *

      Note, the value actually set in the accepted socket is determined by * calling {@link Socket#getReceiveBufferSize()}. * @return the value of the {@link SocketOptions#SO_RCVBUF SO_RCVBUF} - * option for this Socket. + * option for this {@code Socket}. * @exception SocketException if there is an error * in the underlying protocol, such as a TCP error. * @see #setReceiveBufferSize(int) @@ -891,24 +891,24 @@ class ServerSocket implements java.io.Closeable { * compared, with larger values indicating stronger preferences. If the * application prefers short connection time over both low latency and high * bandwidth, for example, then it could invoke this method with the values - * (1, 0, 0). If the application prefers high bandwidth above low + * {@code (1, 0, 0)}. If the application prefers high bandwidth above low * latency, and low latency above short connection time, then it could - * invoke this method with the values (0, 1, 2). + * invoke this method with the values {@code (0, 1, 2)}. * *

      Invoking this method after this socket has been bound * will have no effect. This implies that in order to use this capability * requires the socket to be created with the no-argument constructor. * * @param connectionTime - * An int expressing the relative importance of a short + * An {@code int} expressing the relative importance of a short * connection time * * @param latency - * An int expressing the relative importance of low + * An {@code int} expressing the relative importance of low * latency * * @param bandwidth - * An int expressing the relative importance of high + * An {@code int} expressing the relative importance of high * bandwidth * * @since 1.5 diff --git a/jdk/src/share/classes/java/net/Socket.java b/jdk/src/share/classes/java/net/Socket.java index 8ab5e866ee2..361260351f5 100644 --- a/jdk/src/share/classes/java/net/Socket.java +++ b/jdk/src/share/classes/java/net/Socket.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -39,7 +39,7 @@ import java.security.PrivilegedAction; * between two machines. *

      * The actual work of the socket is performed by an instance of the - * SocketImpl class. An application, by changing + * {@code SocketImpl} class. An application, by changing * the socket factory that creates the socket implementation, * can configure itself to create sockets appropriate to the local * firewall. @@ -88,14 +88,14 @@ class Socket implements java.io.Closeable { * Creates an unconnected socket, specifying the type of proxy, if any, * that should be used regardless of any other settings. *

      - * If there is a security manager, its checkConnect method + * If there is a security manager, its {@code checkConnect} method * is called with the proxy host address and port number * as its arguments. This could result in a SecurityException. *

      * Examples: - *

      • Socket s = new Socket(Proxy.NO_PROXY); will create + *
        • {@code Socket s = new Socket(Proxy.NO_PROXY);} will create * a plain socket ignoring any other proxy configuration.
          • - *
        • Socket s = new Socket(new Proxy(Proxy.Type.SOCKS, new InetSocketAddress("socks.mydom.com", 1080))); + *
        • {@code Socket s = new Socket(new Proxy(Proxy.Type.SOCKS, new InetSocketAddress("socks.mydom.com", 1080)));} * will create a socket connecting through the specified SOCKS proxy * server.
          • *
        @@ -103,7 +103,7 @@ class Socket implements java.io.Closeable { * @param proxy a {@link java.net.Proxy Proxy} object specifying what kind * of proxying should be used. * @throws IllegalArgumentException if the proxy is of an invalid type - * or null. + * or {@code null}. * @throws SecurityException if a security manager is present and * permission to connect to the proxy is * denied. @@ -173,21 +173,22 @@ class Socket implements java.io.Closeable { * Creates a stream socket and connects it to the specified port * number on the named host. *

        - * If the specified host is null it is the equivalent of - * specifying the address as {@link java.net.InetAddress#getByName InetAddress.getByName}(null). + * If the specified host is {@code null} it is the equivalent of + * specifying the address as + * {@link java.net.InetAddress#getByName InetAddress.getByName}{@code (null)}. * In other words, it is equivalent to specifying an address of the * loopback interface.

        *

        * If the application has specified a server socket factory, that - * factory's createSocketImpl method is called to create + * factory's {@code createSocketImpl} method is called to create * the actual socket implementation. Otherwise a "plain" socket is created. *

        * If there is a security manager, its - * checkConnect method is called - * with the host address and port + * {@code checkConnect} method is called + * with the host address and {@code port} * as its arguments. This could result in a SecurityException. * - * @param host the host name, or null for the loopback address. + * @param host the host name, or {@code null} for the loopback address. * @param port the port number. * * @exception UnknownHostException if the IP address of @@ -195,7 +196,7 @@ class Socket implements java.io.Closeable { * * @exception IOException if an I/O error occurs when creating the socket. * @exception SecurityException if a security manager exists and its - * checkConnect method doesn't allow the operation. + * {@code checkConnect} method doesn't allow the operation. * @exception IllegalArgumentException if the port parameter is outside * the specified range of valid port values, which is between * 0 and 65535, inclusive. @@ -217,23 +218,23 @@ class Socket implements java.io.Closeable { * number at the specified IP address. *

        * If the application has specified a socket factory, that factory's - * createSocketImpl method is called to create the + * {@code createSocketImpl} method is called to create the * actual socket implementation. Otherwise a "plain" socket is created. *

        * If there is a security manager, its - * checkConnect method is called - * with the host address and port + * {@code checkConnect} method is called + * with the host address and {@code port} * as its arguments. This could result in a SecurityException. * * @param address the IP address. * @param port the port number. * @exception IOException if an I/O error occurs when creating the socket. * @exception SecurityException if a security manager exists and its - * checkConnect method doesn't allow the operation. + * {@code checkConnect} method doesn't allow the operation. * @exception IllegalArgumentException if the port parameter is outside * the specified range of valid port values, which is between * 0 and 65535, inclusive. - * @exception NullPointerException if address is null. + * @exception NullPointerException if {@code address} is null. * @see java.net.Socket#setSocketImplFactory(java.net.SocketImplFactory) * @see java.net.SocketImpl * @see java.net.SocketImplFactory#createSocketImpl() @@ -249,28 +250,29 @@ class Socket implements java.io.Closeable { * the specified remote port. The Socket will also bind() to the local * address and port supplied. *

        - * If the specified host is null it is the equivalent of - * specifying the address as {@link java.net.InetAddress#getByName InetAddress.getByName}(null). + * If the specified host is {@code null} it is the equivalent of + * specifying the address as + * {@link java.net.InetAddress#getByName InetAddress.getByName}{@code (null)}. * In other words, it is equivalent to specifying an address of the * loopback interface.

        *

        - * A local port number of zero will let the system pick up a - * free port in the bind operation.

        + * A local port number of {@code zero} will let the system pick up a + * free port in the {@code bind} operation.

        *

        * If there is a security manager, its - * checkConnect method is called - * with the host address and port + * {@code checkConnect} method is called + * with the host address and {@code port} * as its arguments. This could result in a SecurityException. * - * @param host the name of the remote host, or null for the loopback address. + * @param host the name of the remote host, or {@code null} for the loopback address. * @param port the remote port * @param localAddr the local address the socket is bound to, or - * null for the anyLocal address. + * {@code null} for the {@code anyLocal} address. * @param localPort the local port the socket is bound to, or - * zero for a system selected free port. + * {@code zero} for a system selected free port. * @exception IOException if an I/O error occurs when creating the socket. * @exception SecurityException if a security manager exists and its - * checkConnect method doesn't allow the operation. + * {@code checkConnect} method doesn't allow the operation. * @exception IllegalArgumentException if the port parameter or localPort * parameter is outside the specified range of valid port values, * which is between 0 and 65535, inclusive. @@ -289,30 +291,31 @@ class Socket implements java.io.Closeable { * the specified remote port. The Socket will also bind() to the local * address and port supplied. *

        - * If the specified local address is null it is the equivalent of - * specifying the address as the AnyLocal address (see {@link java.net.InetAddress#isAnyLocalAddress InetAddress.isAnyLocalAddress}()). + * If the specified local address is {@code null} it is the equivalent of + * specifying the address as the AnyLocal address + * (see {@link java.net.InetAddress#isAnyLocalAddress InetAddress.isAnyLocalAddress}{@code ()}). *

        - * A local port number of zero will let the system pick up a - * free port in the bind operation.

        + * A local port number of {@code zero} will let the system pick up a + * free port in the {@code bind} operation.

        *

        * If there is a security manager, its - * checkConnect method is called - * with the host address and port + * {@code checkConnect} method is called + * with the host address and {@code port} * as its arguments. This could result in a SecurityException. * * @param address the remote address * @param port the remote port * @param localAddr the local address the socket is bound to, or - * null for the anyLocal address. + * {@code null} for the {@code anyLocal} address. * @param localPort the local port the socket is bound to or - * zero for a system selected free port. + * {@code zero} for a system selected free port. * @exception IOException if an I/O error occurs when creating the socket. * @exception SecurityException if a security manager exists and its - * checkConnect method doesn't allow the operation. + * {@code checkConnect} method doesn't allow the operation. * @exception IllegalArgumentException if the port parameter or localPort * parameter is outside the specified range of valid port values, * which is between 0 and 65535, inclusive. - * @exception NullPointerException if address is null. + * @exception NullPointerException if {@code address} is null. * @see SecurityManager#checkConnect * @since JDK1.1 */ @@ -326,33 +329,34 @@ class Socket implements java.io.Closeable { * Creates a stream socket and connects it to the specified port * number on the named host. *

        - * If the specified host is null it is the equivalent of - * specifying the address as {@link java.net.InetAddress#getByName InetAddress.getByName}(null). + * If the specified host is {@code null} it is the equivalent of + * specifying the address as + * {@link java.net.InetAddress#getByName InetAddress.getByName}{@code (null)}. * In other words, it is equivalent to specifying an address of the * loopback interface.

        *

        - * If the stream argument is true, this creates a - * stream socket. If the stream argument is false, it + * If the stream argument is {@code true}, this creates a + * stream socket. If the stream argument is {@code false}, it * creates a datagram socket. *

        * If the application has specified a server socket factory, that - * factory's createSocketImpl method is called to create + * factory's {@code createSocketImpl} method is called to create * the actual socket implementation. Otherwise a "plain" socket is created. *

        * If there is a security manager, its - * checkConnect method is called - * with the host address and port + * {@code checkConnect} method is called + * with the host address and {@code port} * as its arguments. This could result in a SecurityException. *

        * If a UDP socket is used, TCP/IP related socket options will not apply. * - * @param host the host name, or null for the loopback address. + * @param host the host name, or {@code null} for the loopback address. * @param port the port number. - * @param stream a boolean indicating whether this is + * @param stream a {@code boolean} indicating whether this is * a stream socket or a datagram socket. * @exception IOException if an I/O error occurs when creating the socket. * @exception SecurityException if a security manager exists and its - * checkConnect method doesn't allow the operation. + * {@code checkConnect} method doesn't allow the operation. * @exception IllegalArgumentException if the port parameter is outside * the specified range of valid port values, which is between * 0 and 65535, inclusive. @@ -373,32 +377,32 @@ class Socket implements java.io.Closeable { * Creates a socket and connects it to the specified port number at * the specified IP address. *

        - * If the stream argument is true, this creates a - * stream socket. If the stream argument is false, it + * If the stream argument is {@code true}, this creates a + * stream socket. If the stream argument is {@code false}, it * creates a datagram socket. *

        * If the application has specified a server socket factory, that - * factory's createSocketImpl method is called to create + * factory's {@code createSocketImpl} method is called to create * the actual socket implementation. Otherwise a "plain" socket is created. * *

        If there is a security manager, its - * checkConnect method is called - * with host.getHostAddress() and port + * {@code checkConnect} method is called + * with {@code host.getHostAddress()} and {@code port} * as its arguments. This could result in a SecurityException. *

        * If UDP socket is used, TCP/IP related socket options will not apply. * * @param host the IP address. * @param port the port number. - * @param stream if true, create a stream socket; + * @param stream if {@code true}, create a stream socket; * otherwise, create a datagram socket. * @exception IOException if an I/O error occurs when creating the socket. * @exception SecurityException if a security manager exists and its - * checkConnect method doesn't allow the operation. + * {@code checkConnect} method doesn't allow the operation. * @exception IllegalArgumentException if the port parameter is outside * the specified range of valid port values, which is between * 0 and 65535, inclusive. - * @exception NullPointerException if host is null. + * @exception NullPointerException if {@code host} is null. * @see java.net.Socket#setSocketImplFactory(java.net.SocketImplFactory) * @see java.net.SocketImpl * @see java.net.SocketImplFactory#createSocketImpl() @@ -437,8 +441,8 @@ class Socket implements java.io.Closeable { /** * Creates the socket implementation. * - * @param stream a boolean value : true for a TCP socket, - * false for UDP. + * @param stream a {@code boolean} value : {@code true} for a TCP socket, + * {@code false} for UDP. * @throws IOException if creation fails * @since 1.4 */ @@ -500,10 +504,10 @@ class Socket implements java.io.Closeable { /** - * Get the SocketImpl attached to this socket, creating + * Get the {@code SocketImpl} attached to this socket, creating * it if necessary. * - * @return the SocketImpl attached to that ServerSocket. + * @return the {@code SocketImpl} attached to that ServerSocket. * @throws SocketException if creation fails * @since 1.4 */ @@ -516,7 +520,7 @@ class Socket implements java.io.Closeable { /** * Connects this socket to the server. * - * @param endpoint the SocketAddress + * @param endpoint the {@code SocketAddress} * @throws IOException if an error occurs during the connection * @throws java.nio.channels.IllegalBlockingModeException * if this socket has an associated channel, @@ -535,7 +539,7 @@ class Socket implements java.io.Closeable { * A timeout of zero is interpreted as an infinite timeout. The connection * will then block until established or an error occurs. * - * @param endpoint the SocketAddress + * @param endpoint the {@code SocketAddress} * @param timeout the timeout value to be used in milliseconds. * @throws IOException if an error occurs during the connection * @throws SocketTimeoutException if timeout expires before connecting @@ -597,10 +601,10 @@ class Socket implements java.io.Closeable { /** * Binds the socket to a local address. *

        - * If the address is null, then the system will pick up + * If the address is {@code null}, then the system will pick up * an ephemeral port and a valid local address to bind the socket. * - * @param bindpoint the SocketAddress to bind to + * @param bindpoint the {@code SocketAddress} to bind to * @throws IOException if the bind operation fails, or if the socket * is already bound. * @throws IllegalArgumentException if bindpoint is a @@ -668,7 +672,7 @@ class Socket implements java.io.Closeable { * after the socket is closed. * * @return the remote IP address to which this socket is connected, - * or null if the socket is not connected. + * or {@code null} if the socket is not connected. */ public InetAddress getInetAddress() { if (!isConnected()) @@ -760,15 +764,15 @@ class Socket implements java.io.Closeable { /** * Returns the address of the endpoint this socket is connected to, or - * null if it is unconnected. + * {@code null} if it is unconnected. *

        * If the socket was connected prior to being {@link #close closed}, * then this method will continue to return the connected address * after the socket is closed. * - * @return a SocketAddress representing the remote endpoint of this - * socket, or null if it is not connected yet. + * @return a {@code SocketAddress} representing the remote endpoint of this + * socket, or {@code null} if it is not connected yet. * @see #getInetAddress() * @see #getPort() * @see #connect(SocketAddress, int) @@ -785,10 +789,10 @@ class Socket implements java.io.Closeable { * Returns the address of the endpoint this socket is bound to. *

        * If a socket bound to an endpoint represented by an - * InetSocketAddress is {@link #close closed}, - * then this method will continue to return an InetSocketAddress + * {@code InetSocketAddress } is {@link #close closed}, + * then this method will continue to return an {@code InetSocketAddress} * after the socket is closed. In that case the returned - * InetSocketAddress's address is the + * {@code InetSocketAddress}'s address is the * {@link InetAddress#isAnyLocalAddress wildcard} address * and its port is the local port that it was bound to. *

        @@ -828,7 +832,7 @@ class Socket implements java.io.Closeable { * methods. * * @return the socket channel associated with this socket, - * or null if this socket was not created + * or {@code null} if this socket was not created * for a channel * * @since 1.4 @@ -843,7 +847,7 @@ class Socket implements java.io.Closeable { * *

        If this socket has an associated channel then the resulting input * stream delegates all of its operations to the channel. If the channel - * is in non-blocking mode then the input stream's read operations + * is in non-blocking mode then the input stream's {@code read} operations * will throw an {@link java.nio.channels.IllegalBlockingModeException}. * *

        Under abnormal conditions the underlying connection may be @@ -867,7 +871,7 @@ class Socket implements java.io.Closeable { *

      • If there are no bytes buffered on the socket, and the * socket has not been closed using {@link #close close}, then * {@link java.io.InputStream#available available} will - * return 0. + * return {@code 0}. * *

      * @@ -910,7 +914,7 @@ class Socket implements java.io.Closeable { * *

      If this socket has an associated channel then the resulting output * stream delegates all of its operations to the channel. If the channel - * is in non-blocking mode then the output stream's write + * is in non-blocking mode then the output stream's {@code write} * operations will throw an {@link * java.nio.channels.IllegalBlockingModeException}. * @@ -949,8 +953,8 @@ class Socket implements java.io.Closeable { * Enable/disable {@link SocketOptions#TCP_NODELAY TCP_NODELAY} * (disable/enable Nagle's algorithm). * - * @param on true to enable TCP_NODELAY, - * false to disable. + * @param on {@code true} to enable TCP_NODELAY, + * {@code false} to disable. * * @exception SocketException if there is an error * in the underlying protocol, such as a TCP error. @@ -968,7 +972,7 @@ class Socket implements java.io.Closeable { /** * Tests if {@link SocketOptions#TCP_NODELAY TCP_NODELAY} is enabled. * - * @return a boolean indicating whether or not + * @return a {@code boolean} indicating whether or not * {@link SocketOptions#TCP_NODELAY TCP_NODELAY} is enabled. * @exception SocketException if there is an error * in the underlying protocol, such as a TCP error. @@ -1066,9 +1070,9 @@ class Socket implements java.io.Closeable { * and there is no capability to distinguish between normal data and urgent * data unless provided by a higher level protocol. * - * @param on true to enable + * @param on {@code true} to enable * {@link SocketOptions#SO_OOBINLINE SO_OOBINLINE}, - * false to disable. + * {@code false} to disable. * * @exception SocketException if there is an error * in the underlying protocol, such as a TCP error. @@ -1086,7 +1090,7 @@ class Socket implements java.io.Closeable { /** * Tests if {@link SocketOptions#SO_OOBINLINE SO_OOBINLINE} is enabled. * - * @return a boolean indicating whether or not + * @return a {@code boolean} indicating whether or not * {@link SocketOptions#SO_OOBINLINE SO_OOBINLINE}is enabled. * * @exception SocketException if there is an error @@ -1151,7 +1155,7 @@ class Socket implements java.io.Closeable { /** * Sets the {@link SocketOptions#SO_SNDBUF SO_SNDBUF} option to the - * specified value for this Socket. + * specified value for this {@code Socket}. * The {@link SocketOptions#SO_SNDBUF SO_SNDBUF} option is used by the * platform's networking code as a hint for the size to set the underlying * network I/O buffers. @@ -1184,10 +1188,10 @@ class Socket implements java.io.Closeable { /** * Get value of the {@link SocketOptions#SO_SNDBUF SO_SNDBUF} option - * for this Socket, that is the buffer size used by the platform - * for output on this Socket. + * for this {@code Socket}, that is the buffer size used by the platform + * for output on this {@code Socket}. * @return the value of the {@link SocketOptions#SO_SNDBUF SO_SNDBUF} - * option for this Socket. + * option for this {@code Socket}. * * @exception SocketException if there is an error * in the underlying protocol, such as a TCP error. @@ -1208,7 +1212,7 @@ class Socket implements java.io.Closeable { /** * Sets the {@link SocketOptions#SO_RCVBUF SO_RCVBUF} option to the - * specified value for this Socket. The + * specified value for this {@code Socket}. The * {@link SocketOptions#SO_RCVBUF SO_RCVBUF} option is * used by the platform's networking code as a hint for the size to set * the underlying network I/O buffers. @@ -1258,11 +1262,11 @@ class Socket implements java.io.Closeable { /** * Gets the value of the {@link SocketOptions#SO_RCVBUF SO_RCVBUF} option - * for this Socket, that is the buffer size used by the platform - * for input on this Socket. + * for this {@code Socket}, that is the buffer size used by the platform + * for input on this {@code Socket}. * * @return the value of the {@link SocketOptions#SO_RCVBUF SO_RCVBUF} - * option for this Socket. + * option for this {@code Socket}. * @exception SocketException if there is an error * in the underlying protocol, such as a TCP error. * @see #setReceiveBufferSize(int) @@ -1298,7 +1302,7 @@ class Socket implements java.io.Closeable { /** * Tests if {@link SocketOptions#SO_KEEPALIVE SO_KEEPALIVE} is enabled. * - * @return a boolean indicating whether or not + * @return a {@code boolean} indicating whether or not * {@link SocketOptions#SO_KEEPALIVE SO_KEEPALIVE} is enabled. * @exception SocketException if there is an error * in the underlying protocol, such as a TCP error. @@ -1321,7 +1325,7 @@ class Socket implements java.io.Closeable { * 255} or an IllegalArgumentException will be thrown. *

      Notes: *

      For Internet Protocol v4 the value consists of an - * integer, the least significant 8 bits of which + * {@code integer}, the least significant 8 bits of which * represent the value of the TOS octet in IP packets sent by * the socket. * RFC 1349 defines the TOS values as follows: @@ -1347,10 +1351,10 @@ class Socket implements java.io.Closeable { * in the underlying platform. Applications should not assume that * they can change the TOS field after the connection. *

      - * For Internet Protocol v6 tc is the value that + * For Internet Protocol v6 {@code tc} is the value that * would be placed into the sin6_flowinfo field of the IP header. * - * @param tc an int value for the bitset. + * @param tc an {@code int} value for the bitset. * @throws SocketException if there is an error setting the * traffic class or type-of-service * @since 1.4 @@ -1392,11 +1396,11 @@ class Socket implements java.io.Closeable { *

      * When a TCP connection is closed the connection may remain * in a timeout state for a period of time after the connection - * is closed (typically known as the TIME_WAIT state - * or 2MSL wait state). + * is closed (typically known as the {@code TIME_WAIT} state + * or {@code 2MSL} wait state). * For applications using a well known socket address or port * it may not be possible to bind a socket to the required - * SocketAddress if there is a connection in the + * {@code SocketAddress} if there is a connection in the * timeout state involving the socket address or port. *

      * Enabling {@link SocketOptions#SO_REUSEADDR SO_REUSEADDR} @@ -1404,7 +1408,7 @@ class Socket implements java.io.Closeable { * the socket to be bound even though a previous connection is in a timeout * state. *

      - * When a Socket is created the initial setting + * When a {@code Socket} is created the initial setting * of {@link SocketOptions#SO_REUSEADDR SO_REUSEADDR} is disabled. *

      * The behaviour when {@link SocketOptions#SO_REUSEADDR SO_REUSEADDR} is @@ -1430,7 +1434,7 @@ class Socket implements java.io.Closeable { /** * Tests if {@link SocketOptions#SO_REUSEADDR SO_REUSEADDR} is enabled. * - * @return a boolean indicating whether or not + * @return a {@code boolean} indicating whether or not * {@link SocketOptions#SO_REUSEADDR SO_REUSEADDR} is enabled. * @exception SocketException if there is an error * in the underlying protocol, such as a TCP error. @@ -1536,7 +1540,7 @@ class Socket implements java.io.Closeable { } /** - * Converts this socket to a String. + * Converts this socket to a {@code String}. * * @return a string representation of this socket. */ @@ -1555,7 +1559,7 @@ class Socket implements java.io.Closeable { * Returns the connection state of the socket. *

      * Note: Closing a socket doesn't clear its connection state, which means - * this method will return true for a closed socket + * this method will return {@code true} for a closed socket * (see {@link #isClosed()}) if it was successfuly connected prior * to being closed. * @@ -1571,7 +1575,7 @@ class Socket implements java.io.Closeable { * Returns the binding state of the socket. *

      * Note: Closing a socket doesn't clear its binding state, which means - * this method will return true for a closed socket + * this method will return {@code true} for a closed socket * (see {@link #isClosed()}) if it was successfuly bound prior * to being closed. * @@ -1629,13 +1633,13 @@ class Socket implements java.io.Closeable { * application. The factory can be specified only once. *

      * When an application creates a new client socket, the socket - * implementation factory's createSocketImpl method is + * implementation factory's {@code createSocketImpl} method is * called to create the actual socket implementation. *

      - * Passing null to the method is a no-op unless the factory + * Passing {@code null} to the method is a no-op unless the factory * was already set. *

      If there is a security manager, this method first calls - * the security manager's checkSetFactory method + * the security manager's {@code checkSetFactory} method * to ensure the operation is allowed. * This could result in a SecurityException. * @@ -1644,7 +1648,7 @@ class Socket implements java.io.Closeable { * socket factory. * @exception SocketException if the factory is already defined. * @exception SecurityException if a security manager exists and its - * checkSetFactory method doesn't allow the operation. + * {@code checkSetFactory} method doesn't allow the operation. * @see java.net.SocketImplFactory#createSocketImpl() * @see SecurityManager#checkSetFactory */ @@ -1678,23 +1682,23 @@ class Socket implements java.io.Closeable { * values represent a lower priority than positive values. If the * application prefers short connection time over both low latency and high * bandwidth, for example, then it could invoke this method with the values - * (1, 0, 0). If the application prefers high bandwidth above low + * {@code (1, 0, 0)}. If the application prefers high bandwidth above low * latency, and low latency above short connection time, then it could - * invoke this method with the values (0, 1, 2). + * invoke this method with the values {@code (0, 1, 2)}. * *

      Invoking this method after this socket has been connected * will have no effect. * * @param connectionTime - * An int expressing the relative importance of a short + * An {@code int} expressing the relative importance of a short * connection time * * @param latency - * An int expressing the relative importance of low + * An {@code int} expressing the relative importance of low * latency * * @param bandwidth - * An int expressing the relative importance of high + * An {@code int} expressing the relative importance of high * bandwidth * * @since 1.5 diff --git a/jdk/src/share/classes/java/net/SocketException.java b/jdk/src/share/classes/java/net/SocketException.java index eae84d92bab..690fc4f55bd 100644 --- a/jdk/src/share/classes/java/net/SocketException.java +++ b/jdk/src/share/classes/java/net/SocketException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -38,7 +38,7 @@ class SocketException extends IOException { private static final long serialVersionUID = -5935874303556886934L; /** - * Constructs a new SocketException with the + * Constructs a new {@code SocketException} with the * specified detail message. * * @param msg the detail message. @@ -48,7 +48,7 @@ class SocketException extends IOException { } /** - * Constructs a new SocketException with no detail message. + * Constructs a new {@code SocketException} with no detail message. */ public SocketException() { } diff --git a/jdk/src/share/classes/java/net/SocketImpl.java b/jdk/src/share/classes/java/net/SocketImpl.java index 3dbb7b355ed..67286a1cd60 100644 --- a/jdk/src/share/classes/java/net/SocketImpl.java +++ b/jdk/src/share/classes/java/net/SocketImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -31,7 +31,7 @@ import java.io.OutputStream; import java.io.FileDescriptor; /** - * The abstract class SocketImpl is a common superclass + * The abstract class {@code SocketImpl} is a common superclass * of all classes that actually implement sockets. It is used to * create both client and server sockets. *

      @@ -71,7 +71,7 @@ public abstract class SocketImpl implements SocketOptions { /** * Creates either a stream or a datagram socket. * - * @param stream if true, create a stream socket; + * @param stream if {@code true}, create a stream socket; * otherwise, create a datagram socket. * @exception IOException if an I/O error occurs while creating the * socket. @@ -122,7 +122,7 @@ public abstract class SocketImpl implements SocketOptions { /** * Sets the maximum queue length for incoming connection indications - * (a request to connect) to the count argument. If a + * (a request to connect) to the {@code count} argument. If a * connection indication arrives when the queue is full, the * connection is refused. * @@ -217,9 +217,9 @@ public abstract class SocketImpl implements SocketOptions { } /** - * Returns the value of this socket's fd field. + * Returns the value of this socket's {@code fd} field. * - * @return the value of this socket's fd field. + * @return the value of this socket's {@code fd} field. * @see java.net.SocketImpl#fd */ protected FileDescriptor getFileDescriptor() { @@ -227,9 +227,9 @@ public abstract class SocketImpl implements SocketOptions { } /** - * Returns the value of this socket's address field. + * Returns the value of this socket's {@code address} field. * - * @return the value of this socket's address field. + * @return the value of this socket's {@code address} field. * @see java.net.SocketImpl#address */ protected InetAddress getInetAddress() { @@ -237,9 +237,9 @@ public abstract class SocketImpl implements SocketOptions { } /** - * Returns the value of this socket's port field. + * Returns the value of this socket's {@code port} field. * - * @return the value of this socket's port field. + * @return the value of this socket's {@code port} field. * @see java.net.SocketImpl#port */ protected int getPort() { @@ -270,9 +270,9 @@ public abstract class SocketImpl implements SocketOptions { protected abstract void sendUrgentData (int data) throws IOException; /** - * Returns the value of this socket's localport field. + * Returns the value of this socket's {@code localport} field. * - * @return the value of this socket's localport field. + * @return the value of this socket's {@code localport} field. * @see java.net.SocketImpl#localport */ protected int getLocalPort() { @@ -296,7 +296,7 @@ public abstract class SocketImpl implements SocketOptions { } /** - * Returns the address and port of this socket as a String. + * Returns the address and port of this socket as a {@code String}. * * @return a string representation of this socket. */ @@ -328,23 +328,23 @@ public abstract class SocketImpl implements SocketOptions { * values represent a lower priority than positive values. If the * application prefers short connection time over both low latency and high * bandwidth, for example, then it could invoke this method with the values - * (1, 0, 0). If the application prefers high bandwidth above low + * {@code (1, 0, 0)}. If the application prefers high bandwidth above low * latency, and low latency above short connection time, then it could - * invoke this method with the values (0, 1, 2). + * invoke this method with the values {@code (0, 1, 2)}. * * By default, this method does nothing, unless it is overridden in a * a sub-class. * * @param connectionTime - * An int expressing the relative importance of a short + * An {@code int} expressing the relative importance of a short * connection time * * @param latency - * An int expressing the relative importance of low + * An {@code int} expressing the relative importance of low * latency * * @param bandwidth - * An int expressing the relative importance of high + * An {@code int} expressing the relative importance of high * bandwidth * * @since 1.5 diff --git a/jdk/src/share/classes/java/net/SocketImplFactory.java b/jdk/src/share/classes/java/net/SocketImplFactory.java index 52ab3277aac..7aa6363b4fd 100644 --- a/jdk/src/share/classes/java/net/SocketImplFactory.java +++ b/jdk/src/share/classes/java/net/SocketImplFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1999, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,8 +27,8 @@ package java.net; /** * This interface defines a factory for socket implementations. It - * is used by the classes Socket and - * ServerSocket to create actual socket + * is used by the classes {@code Socket} and + * {@code ServerSocket} to create actual socket * implementations. * * @author Arthur van Hoff @@ -39,9 +39,9 @@ package java.net; public interface SocketImplFactory { /** - * Creates a new SocketImpl instance. + * Creates a new {@code SocketImpl} instance. * - * @return a new instance of SocketImpl. + * @return a new instance of {@code SocketImpl}. * @see java.net.SocketImpl */ SocketImpl createSocketImpl(); diff --git a/jdk/src/share/classes/java/net/SocketInputStream.java b/jdk/src/share/classes/java/net/SocketInputStream.java index b708436a783..224051ff608 100644 --- a/jdk/src/share/classes/java/net/SocketInputStream.java +++ b/jdk/src/share/classes/java/net/SocketInputStream.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -67,8 +67,8 @@ class SocketInputStream extends FileInputStream * Returns the unique {@link java.nio.channels.FileChannel FileChannel} * object associated with this file input stream.

      * - * The getChannel method of SocketInputStream - * returns null since it is a socket based stream.

      + * The {@code getChannel} method of {@code SocketInputStream} + * returns {@code null} since it is a socket based stream.

      * * @return the file channel associated with this file input stream * diff --git a/jdk/src/share/classes/java/net/SocketOptions.java b/jdk/src/share/classes/java/net/SocketOptions.java index 44dd1b9b40d..b9508dbb266 100644 --- a/jdk/src/share/classes/java/net/SocketOptions.java +++ b/jdk/src/share/classes/java/net/SocketOptions.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -115,7 +115,7 @@ public interface SocketOptions { * } * * - * @param optID an int identifying the option to fetch + * @param optID an {@code int} identifying the option to fetch * @return the value of the option * @throws SocketException if the socket is closed * @throws SocketException if optID is unknown along the diff --git a/jdk/src/share/classes/java/net/SocketOutputStream.java b/jdk/src/share/classes/java/net/SocketOutputStream.java index 06e234efc4a..2404e9583f4 100644 --- a/jdk/src/share/classes/java/net/SocketOutputStream.java +++ b/jdk/src/share/classes/java/net/SocketOutputStream.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -64,8 +64,8 @@ class SocketOutputStream extends FileOutputStream * Returns the unique {@link java.nio.channels.FileChannel FileChannel} * object associated with this file output stream.

      * - * The getChannel method of SocketOutputStream - * returns null since it is a socket based stream.

      + * The {@code getChannel} method of {@code SocketOutputStream} + * returns {@code null} since it is a socket based stream.

      * * @return the file channel associated with this file output stream * diff --git a/jdk/src/share/classes/java/net/SocketPermission.java b/jdk/src/share/classes/java/net/SocketPermission.java index 43650068ae2..e90856eac8e 100644 --- a/jdk/src/share/classes/java/net/SocketPermission.java +++ b/jdk/src/share/classes/java/net/SocketPermission.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -110,7 +110,7 @@ import sun.security.util.Debug; * * * is granted to some code, it allows that code to connect to port 7777 on - * puffin.eng.sun.com, and to accept connections on that port. + * {@code puffin.eng.sun.com}, and to accept connections on that port. * *

      Similarly, if the following permission: * @@ -788,7 +788,7 @@ public final class SocketPermission extends Permission * port range is ignored when p only contains the action, 'resolve'.

      *

    * - * Then implies checks each of the following, in order, + * Then {@code implies} checks each of the following, in order, * and for each returns true if the stated condition is true:

    *

      *
    • If this object was initialized with a single IP address and one of p's @@ -802,7 +802,7 @@ public final class SocketPermission extends Permission *
    • If this canonical name equals p's canonical name.

      *

    * - * If none of the above are true, implies returns false. + * If none of the above are true, {@code implies} returns false. * @param p the permission to check against. * * @return true if the specified permission is implied by this object, @@ -1131,7 +1131,7 @@ public final class SocketPermission extends Permission *

    * SocketPermission objects must be stored in a manner that allows them * to be inserted into the collection in any order, but that also enables the - * PermissionCollection implies + * PermissionCollection {@code implies} * method to be implemented in an efficient (and consistent) manner. * * @return a new PermissionCollection object suitable for storing SocketPermissions. diff --git a/jdk/src/share/classes/java/net/SocksSocketImpl.java b/jdk/src/share/classes/java/net/SocksSocketImpl.java index 16155d2f115..3e4fb5fe74a 100644 --- a/jdk/src/share/classes/java/net/SocksSocketImpl.java +++ b/jdk/src/share/classes/java/net/SocksSocketImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -315,7 +315,7 @@ class SocksSocketImpl extends PlainSocketImpl implements SocksConsts { * grants the connections, then the connect is successful and all * further traffic will go to the "real" endpoint. * - * @param endpoint the SocketAddress to connect to. + * @param endpoint the {@code SocketAddress} to connect to. * @param timeout the timeout value in milliseconds * @throws IOException if the connection can't be established. * @throws SecurityException if there is a security manager and it @@ -1032,9 +1032,9 @@ class SocksSocketImpl extends PlainSocketImpl implements SocksConsts { /** - * Returns the value of this socket's address field. + * Returns the value of this socket's {@code address} field. * - * @return the value of this socket's address field. + * @return the value of this socket's {@code address} field. * @see java.net.SocketImpl#address */ @Override @@ -1046,9 +1046,9 @@ class SocksSocketImpl extends PlainSocketImpl implements SocksConsts { } /** - * Returns the value of this socket's port field. + * Returns the value of this socket's {@code port} field. * - * @return the value of this socket's port field. + * @return the value of this socket's {@code port} field. * @see java.net.SocketImpl#port */ @Override diff --git a/jdk/src/share/classes/java/net/URI.java b/jdk/src/share/classes/java/net/URI.java index 24e1a979f6e..77c2f7a178f 100644 --- a/jdk/src/share/classes/java/net/URI.java +++ b/jdk/src/share/classes/java/net/URI.java @@ -67,24 +67,24 @@ import java.lang.NullPointerException; // for javadoc * form has the syntax * *

    - * [scheme:]scheme-specific-part[#fragment] + * [scheme{@code :}]scheme-specific-part[{@code #}fragment] *
    * * where square brackets [...] delineate optional components and the characters - * : and # stand for themselves. + * {@code :} and {@code #} stand for themselves. * *

    An absolute URI specifies a scheme; a URI that is not absolute is * said to be relative. URIs are also classified according to whether * they are opaque or hierarchical. * *

    An opaque URI is an absolute URI whose scheme-specific part does - * not begin with a slash character ('/'). Opaque URIs are not + * not begin with a slash character ({@code '/'}). Opaque URIs are not * subject to further parsing. Some examples of opaque URIs are: * *

    - * - * - * + * + * + * *
    mailto:java-net@java.sun.com
    news:comp.lang.java
    urn:isbn:096139210x
    {@code mailto:java-net@java.sun.com}
    {@code news:comp.lang.java}
    {@code urn:isbn:096139210x}
    * *

    A hierarchical URI is either an absolute URI whose @@ -93,20 +93,20 @@ import java.lang.NullPointerException; // for javadoc * URIs are: * *

    - * http://java.sun.com/j2se/1.3/
    - * docs/guide/collections/designfaq.html#28
    - * ../../../demo/jfc/SwingSet2/src/SwingSet2.java
    - * file:///~/calendar + * {@code http://java.sun.com/j2se/1.3/}
    + * {@code docs/guide/collections/designfaq.html#28}
    + * {@code ../../../demo/jfc/SwingSet2/src/SwingSet2.java}
    + * {@code file:///~/calendar} *
    * *

    A hierarchical URI is subject to further parsing according to the syntax * *

    - * [scheme:][//authority][path][?query][#fragment] + * [scheme{@code :}][{@code //}authority][path][{@code ?}query][{@code #}fragment] *
    * - * where the characters :, /, - * ?, and # stand for themselves. The + * where the characters {@code :}, {@code /}, + * {@code ?}, and {@code #} stand for themselves. The * scheme-specific part of a hierarchical URI consists of the characters * between the scheme and fragment components. * @@ -115,16 +115,16 @@ import java.lang.NullPointerException; // for javadoc * parses according to the familiar syntax * *
    - * [user-info@]host[:port] + * [user-info{@code @}]host[{@code :}port] *
    * - * where the characters @ and : stand for + * where the characters {@code @} and {@code :} stand for * themselves. Nearly all URI schemes currently in use are server-based. An * authority component that does not parse in this way is considered to be * registry-based. * *

    The path component of a hierarchical URI is itself said to be absolute - * if it begins with a slash character ('/'); otherwise it is + * if it begins with a slash character ({@code '/'}); otherwise it is * relative. The path of a hierarchical URI that is either absolute or * specifies an authority is always absolute. * @@ -132,21 +132,21 @@ import java.lang.NullPointerException; // for javadoc * *

    * - * - * - * - * - * - * - * - * - * + * + * + * + * + * + * + * + * + * *
    ComponentType
    schemeString
    scheme-specific-part    String
    authorityString
    user-infoString
    hostString
    portint
    pathString
    queryString
    fragmentString
    scheme{@code String}
    scheme-specific-part    {@code String}
    authority{@code String}
    user-info{@code String}
    host{@code String}
    port{@code int}
    path{@code String}
    query{@code String}
    fragment{@code String}
    * * In a given instance any particular component is either undefined or * defined with a distinct value. Undefined string components are - * represented by null, while undefined integer components are - * represented by -1. A string component may be defined to have the + * represented by {@code null}, while undefined integer components are + * represented by {@code -1}. A string component may be defined to have the * empty string as its value; this is not equivalent to that component being * undefined. * @@ -165,10 +165,10 @@ import java.lang.NullPointerException; // for javadoc * The key operations supported by this class are those of * normalization, resolution, and relativization. * - *

    Normalization is the process of removing unnecessary "." - * and ".." segments from the path component of a hierarchical URI. - * Each "." segment is simply removed. A ".." segment is - * removed only if it is preceded by a non-".." segment. + *

    Normalization is the process of removing unnecessary {@code "."} + * and {@code ".."} segments from the path component of a hierarchical URI. + * Each {@code "."} segment is simply removed. A {@code ".."} segment is + * removed only if it is preceded by a non-{@code ".."} segment. * Normalization has no effect upon opaque URIs. * *

    Resolution is the process of resolving one URI against another, @@ -179,45 +179,47 @@ import java.lang.NullPointerException; // for javadoc * normalized. The result, for example, of resolving * *

    - * docs/guide/collections/designfaq.html#28          (1) + * {@code docs/guide/collections/designfaq.html#28} + *              + *     (1) *
    * - * against the base URI http://java.sun.com/j2se/1.3/ is the result + * against the base URI {@code http://java.sun.com/j2se/1.3/} is the result * URI * *
    - * http://java.sun.com/j2se/1.3/docs/guide/collections/designfaq.html#28 + * {@code http://java.sun.com/j2se/1.3/docs/guide/collections/designfaq.html#28} *
    * * Resolving the relative URI * *
    - * ../../../demo/jfc/SwingSet2/src/SwingSet2.java    (2) + * {@code ../../../demo/jfc/SwingSet2/src/SwingSet2.java}    (2) *
    * * against this result yields, in turn, * *
    - * http://java.sun.com/j2se/1.3/demo/jfc/SwingSet2/src/SwingSet2.java + * {@code http://java.sun.com/j2se/1.3/demo/jfc/SwingSet2/src/SwingSet2.java} *
    * * Resolution of both absolute and relative URIs, and of both absolute and * relative paths in the case of hierarchical URIs, is supported. Resolving - * the URI file:///~calendar against any other URI simply yields the + * the URI {@code file:///~calendar} against any other URI simply yields the * original URI, since it is absolute. Resolving the relative URI (2) above * against the relative base URI (1) yields the normalized, but still relative, * URI * *
    - * demo/jfc/SwingSet2/src/SwingSet2.java + * {@code demo/jfc/SwingSet2/src/SwingSet2.java} *
    * *

    Relativization, finally, is the inverse of resolution: For any * two normalized URIs u and v, * *

    - * u.relativize(u.resolve(v)).equals(v)  and
    - * u.resolve(u.relativize(v)).equals(v)  .
    + * u{@code .relativize(}u{@code .resolve(}v{@code )).equals(}v{@code )}  and
    + * u{@code .resolve(}u{@code .relativize(}v{@code )).equals(}v{@code )}  .
    *
    * * This operation is often useful when constructing a document containing URIs @@ -225,16 +227,16 @@ import java.lang.NullPointerException; // for javadoc * possible. For example, relativizing the URI * *
    - * http://java.sun.com/j2se/1.3/docs/guide/index.html + * {@code http://java.sun.com/j2se/1.3/docs/guide/index.html} *
    * * against the base URI * *
    - * http://java.sun.com/j2se/1.3 + * {@code http://java.sun.com/j2se/1.3} *
    * - * yields the relative URI docs/guide/index.html. + * yields the relative URI {@code docs/guide/index.html}. * * *

    Character categories

    @@ -247,26 +249,26 @@ import java.lang.NullPointerException; // for javadoc *
    * * + * {@code 'A'} through {@code 'Z'} + * and {@code 'a'} through {@code 'z'} * * + * {@code '0'} through {@code '9'} * * * * + * {@code "_-!.~'()*"} * - * + * * * + * {@code "?/[]@"} * * + * character ({@code '%'}) followed by two hexadecimal digits + * ({@code '0'}-{@code '9'}, {@code 'A'}-{@code 'F'}, and + * {@code 'a'}-{@code 'f'}) * *
    alphaThe US-ASCII alphabetic characters, - * 'A' through 'Z' - * and 'a' through 'z'
    digitThe US-ASCII decimal digit characters, - * '0' through '9'
    alphanumAll alpha and digit characters
    unreserved    All alphanum characters together with those in the string - * "_-!.~'()*"
    punctThe characters in the string ",;:$&+="
    The characters in the string {@code ",;:$&+="}
    reservedAll punct characters together with those in the string - * "?/[]@"
    escapedEscaped octets, that is, triplets consisting of the percent - * character ('%') followed by two hexadecimal digits - * ('0'-'9', 'A'-'F', and - * 'a'-'f')
    otherThe Unicode characters that are not in the US-ASCII character set, * are not control characters (according to the {@link @@ -306,14 +308,14 @@ import java.lang.NullPointerException; // for javadoc * *

  • A character is encoded by replacing it * with the sequence of escaped octets that represent that character in the - * UTF-8 character set. The Euro currency symbol ('\u20AC'), - * for example, is encoded as "%E2%82%AC". (Deviation from + * UTF-8 character set. The Euro currency symbol ({@code '\u005Cu20AC'}), + * for example, is encoded as {@code "%E2%82%AC"}. (Deviation from * RFC 2396, which does not specify any particular character * set.)

    • * *

  • An illegal character is quoted simply by * encoding it. The space character, for example, is quoted by replacing it - * with "%20". UTF-8 contains US-ASCII, hence for US-ASCII + * with {@code "%20"}. UTF-8 contains US-ASCII, hence for US-ASCII * characters this transformation has exactly the effect required by * RFC 2396.

    • * @@ -325,7 +327,7 @@ import java.lang.NullPointerException; // for javadoc * decoding any encoded non-US-ASCII characters. If a decoding error occurs * when decoding the escaped octets then the erroneous octets are replaced by - * '\uFFFD', the Unicode replacement character.

    + * {@code '\u005CuFFFD'}, the Unicode replacement character.

    * * * @@ -343,7 +345,7 @@ import java.lang.NullPointerException; // for javadoc * #URI(java.lang.String,java.lang.String,java.lang.String,int,java.lang.String,java.lang.String,java.lang.String) * multi-argument constructors} quote illegal characters as * required by the components in which they appear. The percent character - * ('%') is always quoted by these constructors. Any other + * ({@code '%'}) is always quoted by these constructors. Any other * characters are preserved.

    * *

  • The {@link #getRawUserInfo() getRawUserInfo}, {@link #getRawPath() @@ -379,42 +381,33 @@ import java.lang.NullPointerException; // for javadoc * For any URI u, it is always the case that * *

    - * new URI(u.toString()).equals(u) . + * {@code new URI(}u{@code .toString()).equals(}u{@code )} . *
    * * For any URI u that does not contain redundant syntax such as two - * slashes before an empty authority (as in file:///tmp/ ) or a + * slashes before an empty authority (as in {@code file:///tmp/} ) or a * colon following a host name but no port (as in - * http://java.sun.com: ), and that does not encode characters + * {@code http://java.sun.com:} ), and that does not encode characters * except those that must be quoted, the following identities also hold: - * - *
    - * new URI(u.getScheme(),
    - *             u.getSchemeSpecificPart(),
    - *             u.getFragment())
    - * .equals(    u) - *
    - * + * 

    + *     new URI(u.getScheme(),
+ *             u.getSchemeSpecificPart(),
+ *             u.getFragment())
+ *     .equals(u)
    * in all cases, - * - *
    - * new URI(u.getScheme(),
    - *             u.getUserInfo(), u.getAuthority(),
    - *             u.getPath(), u.getQuery(),
    - *             u.getFragment())
    - * .equals(    u) - *
    - * + * 

    + *     new URI(u.getScheme(),
+ *             u.getUserInfo(), u.getAuthority(),
+ *             u.getPath(), u.getQuery(),
+ *             u.getFragment())
+ *     .equals(u)
    * if u is hierarchical, and - * - *
    - * new URI(u.getScheme(),
    - *             u.getUserInfo(), u.getHost(), u.getPort(),
    - *             u.getPath(), u.getQuery(),
    - *             u.getFragment())
    - * .equals(    u) - *
    - * + * 

    + *     new URI(u.getScheme(),
+ *             u.getUserInfo(), u.getHost(), u.getPort(),
+ *             u.getPath(), u.getQuery(),
+ *             u.getFragment())
+ *     .equals(u)
    * if u is hierarchical and has either no authority or a server-based * authority. * @@ -425,8 +418,8 @@ import java.lang.NullPointerException; // for javadoc * resource locator. Hence every URL is a URI, abstractly speaking, but * not every URI is a URL. This is because there is another subcategory of * URIs, uniform resource names (URNs), which name resources but do not - * specify how to locate them. The mailto, news, and - * isbn URIs shown above are examples of URNs. + * specify how to locate them. The {@code mailto}, {@code news}, and + * {@code isbn} URIs shown above are examples of URNs. * *

    The conceptual distinction between URIs and URLs is reflected in the * differences between this class and the {@link URL} class. @@ -535,7 +528,7 @@ public final class URI *

  • An empty authority component is permitted as long as it is * followed by a non-empty path, a query component, or a fragment * component. This allows the parsing of URIs such as - * "file:///foo/bar", which seems to be the intent of + * {@code "file:///foo/bar"}, which seems to be the intent of * RFC 2396 although the grammar does not permit it. If the * authority component is empty then the user-information, host, and port * components are undefined.

    • @@ -543,7 +536,7 @@ public final class URI *

  • Empty relative paths are permitted; this seems to be the * intent of RFC 2396 although the grammar does not permit it. The * primary consequence of this deviation is that a standalone fragment - * such as "#foo" parses as a relative URI with an empty path + * such as {@code "#foo"} parses as a relative URI with an empty path * and the given fragment, and can be usefully resolved against a base URI. * @@ -560,12 +553,12 @@ public final class URI * href="http://www.ietf.org/rfc/rfc2396.txt">RFC 2396 * section 3.2.2 although the grammar does not permit it. The * consequence of this deviation is that the authority component of a - * hierarchical URI such as s://123, will parse as a server-based + * hierarchical URI such as {@code s://123}, will parse as a server-based * authority.

    • * *

  • IPv6 addresses are permitted for the host component. An IPv6 - * address must be enclosed in square brackets ('[' and - * ']') as specified by RFC 2732. The * IPv6 address itself must parse according to RFC 2373. IPv6 @@ -585,7 +578,7 @@ public final class URI * @param str The string to be parsed into a URI * * @throws NullPointerException - * If str is null + * If {@code str} is {@code null} * * @throws URISyntaxException * If the given string violates RFC 2396, as augmented @@ -599,10 +592,10 @@ public final class URI * Constructs a hierarchical URI from the given components. * *

    If a scheme is given then the path, if also given, must either be - * empty or begin with a slash character ('/'). Otherwise a - * component of the new URI may be left undefined by passing null - * for the corresponding parameter or, in the case of the port - * parameter, by passing -1. + * empty or begin with a slash character ({@code '/'}). Otherwise a + * component of the new URI may be left undefined by passing {@code null} + * for the corresponding parameter or, in the case of the {@code port} + * parameter, by passing {@code -1}. * *

    This constructor first builds a URI string from the given components * according to the rules specified in

    Initially, the result string is empty.

    • * *

  • If a scheme is given then it is appended to the result, - * followed by a colon character (':').

    • + * followed by a colon character ({@code ':'}).

    * *

  • If user information, a host, or a port are given then the - * string "//" is appended.

    • + * string {@code "//"} is appended.

    * *

  • If user information is given then it is appended, followed by - * a commercial-at character ('@'). Any character not in the + * a commercial-at character ({@code '@'}). Any character not in the * unreserved, punct, escaped, or other * categories is quoted.

    • * *

  • If a host is given then it is appended. If the host is a * literal IPv6 address but is not enclosed in square brackets - * ('[' and ']') then the square brackets are added. + * ({@code '['} and {@code ']'}) then the square brackets are added. *

    • * *

  • If a port number is given then a colon character - * (':') is appended, followed by the port number in decimal. + * ({@code ':'}) is appended, followed by the port number in decimal. *

    • * *

  • If a path is given then it is appended. Any character not in * the unreserved, punct, escaped, or other - * categories, and not equal to the slash character ('/') or the - * commercial-at character ('@'), is quoted.

    • + * categories, and not equal to the slash character ({@code '/'}) or the + * commercial-at character ({@code '@'}), is quoted.

    * *

  • If a query is given then a question-mark character - * ('?') is appended, followed by the query. Any character that + * ({@code '?'}) is appended, followed by the query. Any character that * is not a legal URI character is quoted. *

    • * *

  • Finally, if a fragment is given then a hash character - * ('#') is appended, followed by the fragment. Any character + * ({@code '#'}) is appended, followed by the fragment. Any character * that is not a legal URI character is quoted.

    • * * @@ -684,8 +677,8 @@ public final class URI * Constructs a hierarchical URI from the given components. * *

    If a scheme is given then the path, if also given, must either be - * empty or begin with a slash character ('/'). Otherwise a - * component of the new URI may be left undefined by passing null + * empty or begin with a slash character ({@code '/'}). Otherwise a + * component of the new URI may be left undefined by passing {@code null} * for the corresponding parameter. * *

    This constructor first builds a URI string from the given components @@ -698,28 +691,28 @@ public final class URI *

  • Initially, the result string is empty.

    • * *

  • If a scheme is given then it is appended to the result, - * followed by a colon character (':').

    • + * followed by a colon character ({@code ':'}).

    * - *

  • If an authority is given then the string "//" is + *

  • If an authority is given then the string {@code "//"} is * appended, followed by the authority. If the authority contains a * literal IPv6 address then the address must be enclosed in square - * brackets ('[' and ']'). Any character not in the + * brackets ({@code '['} and {@code ']'}). Any character not in the * unreserved, punct, escaped, or other * categories, and not equal to the commercial-at character - * ('@'), is quoted.

    • + * ({@code '@'}), is quoted.

    * *

  • If a path is given then it is appended. Any character not in * the unreserved, punct, escaped, or other - * categories, and not equal to the slash character ('/') or the - * commercial-at character ('@'), is quoted.

    • + * categories, and not equal to the slash character ({@code '/'}) or the + * commercial-at character ({@code '@'}), is quoted.

    * *

  • If a query is given then a question-mark character - * ('?') is appended, followed by the query. Any character that + * ({@code '?'}) is appended, followed by the query. Any character that * is not a legal URI character is quoted. *

    • * *

  • Finally, if a fragment is given then a hash character - * ('#') is appended, followed by the fragment. Any character + * ({@code '#'}) is appended, followed by the fragment. Any character * that is not a legal URI character is quoted.

    • * * @@ -756,15 +749,15 @@ public final class URI /** * Constructs a hierarchical URI from the given components. * - *

    A component may be left undefined by passing null. + *

    A component may be left undefined by passing {@code null}. * *

    This convenience constructor works as if by invoking the * seven-argument constructor as follows: * - *

    - * new {@link #URI(String, String, String, int, String, String, String) - * URI}(scheme, null, host, -1, path, null, fragment); - *
    + *
    + * {@code new} {@link #URI(String, String, String, int, String, String, String) + * URI}{@code (scheme, null, host, -1, path, null, fragment);} + *
    * * @param scheme Scheme name * @param host Host name @@ -784,7 +777,7 @@ public final class URI /** * Constructs a URI from the given components. * - *

    A component may be left undefined by passing null. + *

    A component may be left undefined by passing {@code null}. * *

    This constructor first builds a URI in string form using the given * components as follows:

    @@ -794,14 +787,14 @@ public final class URI *

  • Initially, the result string is empty.

    • * *

  • If a scheme is given then it is appended to the result, - * followed by a colon character (':').

    • + * followed by a colon character ({@code ':'}).

    * *

  • If a scheme-specific part is given then it is appended. Any * character that is not a legal URI character * is quoted.

    • * *

  • Finally, if a fragment is given then a hash character - * ('#') is appended to the string, followed by the fragment. + * ({@code '#'}) is appended to the string, followed by the fragment. * Any character that is not a legal URI character is quoted.

    • * * @@ -847,7 +840,7 @@ public final class URI * @return The new URI * * @throws NullPointerException - * If str is null + * If {@code str} is {@code null} * * @throws IllegalArgumentException * If the given string violates RFC 2396 @@ -882,7 +875,7 @@ public final class URI * cannot always distinguish a malformed server-based authority from a * legitimate registry-based authority. It must therefore treat some * instances of the former as instances of the latter. The authority - * component in the URI string "//foo:bar", for example, is not a + * component in the URI string {@code "//foo:bar"}, for example, is not a * legal server-based authority but it is legal as a registry-based * authority. * @@ -892,7 +885,7 @@ public final class URI * treated as an error. In these cases a statement such as * *
    - * URI u = new URI(str).parseServerAuthority(); + * {@code URI }u{@code = new URI(str).parseServerAuthority();} *
    * *

    can be used to ensure that u always refers to a URI that, if @@ -936,26 +929,26 @@ public final class URI * *

      * - *

    1. All "." segments are removed.

      2. + *

    2. All {@code "."} segments are removed.

      3. * - *

    3. If a ".." segment is preceded by a non-".." + *

    4. If a {@code ".."} segment is preceded by a non-{@code ".."} * segment then both of these segments are removed. This step is * repeated until it is no longer applicable.

      5. * *

    5. If the path is relative, and if its first segment contains a - * colon character (':'), then a "." segment is + * colon character ({@code ':'}), then a {@code "."} segment is * prepended. This prevents a relative URI with a path such as - * "a:b/c/d" from later being re-parsed as an opaque URI with a - * scheme of "a" and a scheme-specific part of "b/c/d". + * {@code "a:b/c/d"} from later being re-parsed as an opaque URI with a + * scheme of {@code "a"} and a scheme-specific part of {@code "b/c/d"}. * (Deviation from RFC 2396)

      6. * *
    * - *

    A normalized path will begin with one or more ".." segments - * if there were insufficient non-".." segments preceding them to - * allow their removal. A normalized path will begin with a "." + *

    A normalized path will begin with one or more {@code ".."} segments + * if there were insufficient non-{@code ".."} segments preceding them to + * allow their removal. A normalized path will begin with a {@code "."} * segment if one was inserted by step 3 above. Otherwise, a normalized - * path will not contain any "." or ".." segments.

    + * path will not contain any {@code "."} or {@code ".."} segments.

    * * @return A URI equivalent to this URI, * but whose path is in normal form @@ -975,7 +968,7 @@ public final class URI * query components are undefined, then a URI with the given fragment but * with all other components equal to those of this URI is returned. This * allows a URI representing a standalone fragment reference, such as - * "#foo", to be usefully resolved against a base URI. + * {@code "#foo"}, to be usefully resolved against a base URI. * *

    Otherwise this method constructs a new hierarchical URI in a manner * consistent with uri is null + * If {@code uri} is {@code null} */ public URI resolve(URI uri) { return resolve(this, uri); @@ -1027,14 +1020,14 @@ public final class URI * against this URI. * *

    This convenience method works as if invoking it were equivalent to - * evaluating the expression {@link #resolve(java.net.URI) - * resolve}(URI.{@link #create(String) create}(str)).

    + * evaluating the expression {@link #resolve(java.net.URI) + * resolve}{@code (URI.}{@link #create(String) create}{@code (str))}.

    * * @param str The string to be parsed into a URI * @return The resulting URI * * @throws NullPointerException - * If str is null + * If {@code str} is {@code null} * * @throws IllegalArgumentException * If the given string violates RFC 2396 @@ -1067,7 +1060,7 @@ public final class URI * @return The resulting URI * * @throws NullPointerException - * If uri is null + * If {@code uri} is {@code null} */ public URI relativize(URI uri) { return relativize(this, uri); @@ -1077,7 +1070,7 @@ public final class URI * Constructs a URL from this URI. * *

    This convenience method works as if invoking it were equivalent to - * evaluating the expression new URL(this.toString()) after + * evaluating the expression {@code new URL(this.toString())} after * first checking that this URI is absolute.

    * * @return A URL constructed from this URI @@ -1102,14 +1095,14 @@ public final class URI * Returns the scheme component of this URI. * *

    The scheme component of a URI, if defined, only contains characters - * in the alphanum category and in the string "-.+". A + * in the alphanum category and in the string {@code "-.+"}. A * scheme always starts with an alpha character.

    * * The scheme component of a URI cannot contain escaped octets, hence this * method does not perform any decoding. * * @return The scheme component of this URI, - * or null if the scheme is undefined + * or {@code null} if the scheme is undefined */ public String getScheme() { return scheme; @@ -1120,7 +1113,7 @@ public final class URI * *

    A URI is absolute if, and only if, it has a scheme component.

    * - * @return true if, and only if, this URI is absolute + * @return {@code true} if, and only if, this URI is absolute */ public boolean isAbsolute() { return scheme != null; @@ -1134,7 +1127,7 @@ public final class URI * An opaque URI has a scheme, a scheme-specific part, and possibly * a fragment; all other components are undefined.

    * - * @return true if, and only if, this URI is opaque + * @return {@code true} if, and only if, this URI is opaque */ public boolean isOpaque() { return path == null; @@ -1148,7 +1141,7 @@ public final class URI * characters.

    * * @return The raw scheme-specific part of this URI - * (never null) + * (never {@code null}) */ public String getRawSchemeSpecificPart() { defineSchemeSpecificPart(); @@ -1164,7 +1157,7 @@ public final class URI * href="#decode">decoded    .

    * * @return The decoded scheme-specific part of this URI - * (never null) + * (never {@code null}) */ public String getSchemeSpecificPart() { if (decodedSchemeSpecificPart == null) @@ -1176,14 +1169,14 @@ public final class URI * Returns the raw authority component of this URI. * *

    The authority component of a URI, if defined, only contains the - * commercial-at character ('@') and characters in the + * commercial-at character ({@code '@'}) and characters in the * unreserved, punct, escaped, and other * categories. If the authority is server-based then it is further * constrained to have valid user-information, host, and port * components.

    * * @return The raw authority component of this URI, - * or null if the authority is undefined + * or {@code null} if the authority is undefined */ public String getRawAuthority() { return authority; @@ -1197,7 +1190,7 @@ public final class URI * sequences of escaped octets are decoded.

    * * @return The decoded authority component of this URI, - * or null if the authority is undefined + * or {@code null} if the authority is undefined */ public String getAuthority() { if (decodedAuthority == null) @@ -1213,7 +1206,7 @@ public final class URI * other categories.

    * * @return The raw user-information component of this URI, - * or null if the user information is undefined + * or {@code null} if the user information is undefined */ public String getRawUserInfo() { return userInfo; @@ -1227,7 +1220,7 @@ public final class URI * sequences of escaped octets are decoded.

    * * @return The decoded user-information component of this URI, - * or null if the user information is undefined + * or {@code null} if the user information is undefined */ public String getUserInfo() { if ((decodedUserInfo == null) && (userInfo != null)) @@ -1244,21 +1237,21 @@ public final class URI *