From 8339b30ae2d56ed27c8d4f220230977d09fca2f1 Mon Sep 17 00:00:00 2001 From: Jaroslav Bachorik Date: Tue, 3 Mar 2015 18:19:41 +0100 Subject: [PATCH 01/94] 8043937: Drop support for the IIOP transport from the JMX RMIConnector Reviewed-by: alanb, erikj --- jdk/make/netbeans/jmx/build.xml | 42 +- jdk/make/rmic/Rmic-java.management.gmk | 43 +- .../sun/jmx/remote/internal/IIOPHelper.java | 190 -------- .../sun/jmx/remote/internal/IIOPProxy.java | 110 ----- .../remote/protocol/iiop/ClientProvider.java | 48 -- .../remote/protocol/iiop/IIOPProxyImpl.java | 157 ------- .../protocol/iiop/ProxyInputStream.java | 241 ---------- .../remote/protocol/iiop/ServerProvider.java | 51 --- .../remote/JMXConnectorFactory.java | 6 +- .../remote/JMXConnectorServerFactory.java | 6 +- .../remote/rmi/NoCallStackClassLoader.java | 13 +- .../remote/rmi/RMIConnectionImpl.java | 7 +- .../management/remote/rmi/RMIConnector.java | 414 +----------------- .../remote/rmi/RMIConnectorServer.java | 92 +--- .../remote/rmi/RMIIIOPServerImpl.java | 104 +---- .../management/remote/rmi/RMIServerImpl.java | 7 +- .../javax/management/remote/rmi/package.html | 99 +---- .../mandatory/connection/CloseableTest.java | 2 - .../remote/mandatory/connection/NoIIOP.java | 142 ------ 19 files changed, 105 insertions(+), 1669 deletions(-) delete mode 100644 jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/IIOPHelper.java delete mode 100644 jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/IIOPProxy.java delete mode 100644 jdk/src/java.management/share/classes/com/sun/jmx/remote/protocol/iiop/ClientProvider.java delete mode 100644 jdk/src/java.management/share/classes/com/sun/jmx/remote/protocol/iiop/IIOPProxyImpl.java delete mode 100644 jdk/src/java.management/share/classes/com/sun/jmx/remote/protocol/iiop/ProxyInputStream.java delete mode 100644 jdk/src/java.management/share/classes/com/sun/jmx/remote/protocol/iiop/ServerProvider.java delete mode 100644 jdk/test/javax/management/remote/mandatory/connection/NoIIOP.java diff --git a/jdk/make/netbeans/jmx/build.xml b/jdk/make/netbeans/jmx/build.xml index 09c2cb25fb6..34e200f7190 100644 --- a/jdk/make/netbeans/jmx/build.xml +++ b/jdk/make/netbeans/jmx/build.xml @@ -63,8 +63,8 @@ - @@ -90,44 +90,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jdk/make/rmic/Rmic-java.management.gmk b/jdk/make/rmic/Rmic-java.management.gmk index 57b1d221ad8..9eca430ed63 100644 --- a/jdk/make/rmic/Rmic-java.management.gmk +++ b/jdk/make/rmic/Rmic-java.management.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, 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 @@ -32,38 +32,31 @@ include RmicCommon.gmk # Generate RMI stubs # -# For RMI/IIOP call rmic a second time with -standardPackage option -# so that *_tie classes are generated in package without the prefix -# org.omg.stub (6375696) JMX_RMI_CLASSES := javax.management.remote.rmi.RMIConnectionImpl \ javax.management.remote.rmi.RMIServerImpl -GENRMIIIOPCLASSES := -ifneq ($(RMICONNECTOR_IIOP), false) - GENRMIIIOPCLASSES := $(RMICONNECTOR_IIOP) -endif -$(eval $(call SetupRMICompilation,RMI_IIOP, \ - CLASSES := $(JMX_RMI_CLASSES), \ - CLASSES_DIR := $(CLASSES_DIR)/java.management, \ - STUB_CLASSES_DIR := $(STUB_CLASSES_DIR)/java.management, \ - RUN_V12 := true, \ - RUN_IIOP := $(GENRMIIIOPCLASSES), \ - RUN_IIOP_STDPKG := $(GENRMIIIOPCLASSES))) -# Keep generated RMI/JRMP Stub source files and copy them to RMIC_GENSRC_DIR -# so that javadoc can include them in the API (4997471) -$(eval $(call SetupRMICompilation,RMI_SRC, \ +# Generate into gensrc dir where sources get picked up for javadoc, then move the classes +# into the stub classes dir. +$(eval $(call SetupRMICompilation,RMI_GEN, \ CLASSES := $(JMX_RMI_CLASSES), \ CLASSES_DIR := $(CLASSES_DIR)/java.management, \ - STUB_CLASSES_DIR := $(RMIC_GENSRC_DIR)/java.management, \ + STUB_CLASSES_DIR := $(RMIC_GENSRC_DIR), \ RUN_V12 := true, \ - KEEP_GENERATED := true)) + KEEP_GENERATED := true, \ +)) + +# Find all classes generated and move them from the gensrc dir to the stub classes dir +$(RMIC_GENSRC_DIR)/_classes.moved: $(RMI_GEN) + $(eval classfiles := $(shell $(FIND) $(RMIC_GENSRC_DIR) -name "*.class")) + $(foreach src, $(classfiles), \ + $(eval target := $(patsubst $(RMIC_GENSRC_DIR)/%, \ + $(STUB_CLASSES_DIR)/java.management/%, $(src))) \ + $(MKDIR) -p $(dir $(target)) ; \ + $(MV) $(src) $(target) $(NEWLINE)) + $(TOUCH) $@ ########################################################################################## -$(RMIC_GENSRC_DIR)/_the.classes.removed: $(RMI_IIOP) $(RMI_SRC) - $(FIND) $(RMIC_GENSRC_DIR) -name "*.class" $(FIND_DELETE) - $(TOUCH) $@ - -all: $(RMIC_GENSRC_DIR)/_the.classes.removed $(RMI_IIOP) $(RMI_SRC) +all: $(RMIC_GENSRC_DIR)/_classes.moved $(RMI_GEN) .PHONY: all diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/IIOPHelper.java b/jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/IIOPHelper.java deleted file mode 100644 index eabe73962c2..00000000000 --- a/jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/IIOPHelper.java +++ /dev/null @@ -1,190 +0,0 @@ -/* - * Copyright (c) 2009, 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 - * 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 com.sun.jmx.remote.internal; - -import java.util.Properties; -import java.io.IOException; -import java.rmi.Remote; -import java.rmi.NoSuchObjectException; - -import java.security.AccessController; -import java.security.PrivilegedAction; - -/** - * A helper class for RMI-IIOP and CORBA APIs. - */ - -public final class IIOPHelper { - private IIOPHelper() { } - - // loads IIOPProxy implementation class if available - private static final String IMPL_CLASS = - "com.sun.jmx.remote.protocol.iiop.IIOPProxyImpl"; - private static final IIOPProxy proxy = - AccessController.doPrivileged(new PrivilegedAction() { - public IIOPProxy run() { - try { - Class c = Class.forName(IMPL_CLASS, true, - IIOPHelper.class.getClassLoader()); - return (IIOPProxy)c.newInstance(); - } catch (ClassNotFoundException cnf) { - return null; - } catch (InstantiationException e) { - throw new AssertionError(e); - } catch (IllegalAccessException e) { - throw new AssertionError(e); - } - }}); - - /** - * Returns true if RMI-IIOP and CORBA is available. - */ - public static boolean isAvailable() { - return proxy != null; - } - - private static void ensureAvailable() { - if (proxy == null) - throw new AssertionError("Should not here"); - } - - /** - * Returns true if the given object is a Stub. - */ - public static boolean isStub(Object obj) { - return (proxy == null) ? false : proxy.isStub(obj); - } - - /** - * Returns the Delegate to which the given Stub delegates. - */ - public static Object getDelegate(Object stub) { - ensureAvailable(); - return proxy.getDelegate(stub); - } - - /** - * Sets the Delegate for a given Stub. - */ - public static void setDelegate(Object stub, Object delegate) { - ensureAvailable(); - proxy.setDelegate(stub, delegate); - } - - /** - * Returns the ORB associated with the given stub - * - * @throws UnsupportedOperationException - * if the object does not support the operation that - * was invoked - */ - public static Object getOrb(Object stub) { - ensureAvailable(); - return proxy.getOrb(stub); - } - - /** - * Connects the Stub to the given ORB. - */ - public static void connect(Object stub, Object orb) - throws IOException - { - if (proxy == null) - throw new IOException("Connection to ORB failed, RMI/IIOP not available"); - proxy.connect(stub, orb); - } - - /** - * Returns true if the given object is an ORB. - */ - public static boolean isOrb(Object obj) { - return (proxy == null) ? false : proxy.isOrb(obj); - } - - /** - * Creates, and returns, a new ORB instance. - */ - public static Object createOrb(String[] args, Properties props) - throws IOException - { - if (proxy == null) - throw new IOException("ORB initialization failed, RMI/IIOP not available"); - return proxy.createOrb(args, props); - } - - /** - * Converts a string, produced by the object_to_string method, back - * to a CORBA object reference. - */ - public static Object stringToObject(Object orb, String str) { - ensureAvailable(); - return proxy.stringToObject(orb, str); - } - - /** - * Converts the given CORBA object reference to a string. - */ - public static String objectToString(Object orb, Object obj) { - ensureAvailable(); - return proxy.objectToString(orb, obj); - } - - /** - * Checks to ensure that an object of a remote or abstract interface - * type can be cast to a desired type. - */ - public static T narrow(Object narrowFrom, Class narrowTo) { - ensureAvailable(); - return proxy.narrow(narrowFrom, narrowTo); - } - - /** - * Makes a server object ready to receive remote calls - */ - public static void exportObject(Remote obj) throws IOException { - if (proxy == null) - throw new IOException("RMI object cannot be exported, RMI/IIOP not available"); - proxy.exportObject(obj); - } - - /** - * Deregisters a server object from the runtime. - */ - public static void unexportObject(Remote obj) throws IOException { - if (proxy == null) - throw new NoSuchObjectException("Object not exported"); - proxy.unexportObject(obj); - } - - /** - * Returns a stub for the given server object. - */ - public static Remote toStub(Remote obj) throws IOException { - if (proxy == null) - throw new NoSuchObjectException("Object not exported"); - return proxy.toStub(obj); - } -} diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/IIOPProxy.java b/jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/IIOPProxy.java deleted file mode 100644 index b7e2ef6fe4c..00000000000 --- a/jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/IIOPProxy.java +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Copyright (c) 2009, 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 com.sun.jmx.remote.internal; - -import java.util.Properties; -import java.rmi.Remote; -import java.rmi.RemoteException; -import java.rmi.NoSuchObjectException; - -/** - * An interface to a subset of the RMI-IIOP and CORBA APIs to avoid a - * static dependencies on the types defined by these APIs. - */ - -public interface IIOPProxy { - - /** - * Returns true if the given object is a Stub. - */ - boolean isStub(Object obj); - - /** - * Returns the Delegate to which the given Stub delegates. - */ - Object getDelegate(Object stub); - - /** - * Sets the Delegate for a given Stub. - */ - void setDelegate(Object stub, Object delegate); - - /** - * Returns the ORB associated with the given stub - * - * @throws UnsupportedOperationException - * if the object does not support the operation that - * was invoked - */ - Object getOrb(Object stub); - - /** - * Connects the Stub to the given ORB. - */ - void connect(Object stub, Object orb) throws RemoteException; - - /** - * Returns true if the given object is an ORB. - */ - boolean isOrb(Object obj); - - /** - * Creates, and returns, a new ORB instance. - */ - Object createOrb(String[] args, Properties props); - - /** - * Converts a string, produced by the object_to_string method, back - * to a CORBA object reference. - */ - Object stringToObject(Object orb, String str); - - /** - * Converts the given CORBA object reference to a string. - */ - String objectToString(Object orb, Object obj); - - /** - * Checks to ensure that an object of a remote or abstract interface - * type can be cast to a desired type. - */ - T narrow(Object narrowFrom, Class narrowTo); - - /** - * Makes a server object ready to receive remote calls - */ - void exportObject(Remote obj) throws RemoteException; - - /** - * Deregisters a server object from the runtime. - */ - void unexportObject(Remote obj) throws NoSuchObjectException; - - /** - * Returns a stub for the given server object. - */ - Remote toStub(Remote obj) throws NoSuchObjectException; -} diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/remote/protocol/iiop/ClientProvider.java b/jdk/src/java.management/share/classes/com/sun/jmx/remote/protocol/iiop/ClientProvider.java deleted file mode 100644 index eeeb6715982..00000000000 --- a/jdk/src/java.management/share/classes/com/sun/jmx/remote/protocol/iiop/ClientProvider.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2003, 2004, 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 com.sun.jmx.remote.protocol.iiop; - -import java.io.IOException; -import java.net.MalformedURLException; -import java.util.Map; - -import javax.management.remote.JMXConnectorProvider; -import javax.management.remote.JMXConnector; -import javax.management.remote.JMXServiceURL; -import javax.management.remote.rmi.RMIConnector; - -public class ClientProvider implements JMXConnectorProvider { - - public JMXConnector newJMXConnector(JMXServiceURL serviceURL, - Map environment) - throws IOException { - if (!serviceURL.getProtocol().equals("iiop")) { - throw new MalformedURLException("Protocol not iiop: " + - serviceURL.getProtocol()); - } - return new RMIConnector(serviceURL, environment); - } -} diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/remote/protocol/iiop/IIOPProxyImpl.java b/jdk/src/java.management/share/classes/com/sun/jmx/remote/protocol/iiop/IIOPProxyImpl.java deleted file mode 100644 index b0fe91bf728..00000000000 --- a/jdk/src/java.management/share/classes/com/sun/jmx/remote/protocol/iiop/IIOPProxyImpl.java +++ /dev/null @@ -1,157 +0,0 @@ -/* - * Copyright (c) 2009,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 com.sun.jmx.remote.protocol.iiop; - -import org.omg.CORBA.ORB; -import org.omg.CORBA.portable.Delegate; -import javax.rmi.PortableRemoteObject; -import javax.rmi.CORBA.Stub; - -import java.util.Properties; -import java.rmi.Remote; -import java.rmi.RemoteException; -import java.rmi.NoSuchObjectException; - -import com.sun.jmx.remote.internal.IIOPProxy; -import java.io.SerializablePermission; -import java.security.AccessControlContext; -import java.security.AccessController; -import java.security.Permissions; -import java.security.PrivilegedActionException; -import java.security.PrivilegedExceptionAction; -import java.security.ProtectionDomain; - -/** - * An implementation of IIOPProxy that simply delegates to the appropriate - * RMI-IIOP and CORBA APIs. - */ - -public class IIOPProxyImpl implements IIOPProxy { - // special ACC used to initialize the IIOP stub - // the only allowed privilege is SerializablePermission("enableSubclassImplementation") - private static final AccessControlContext STUB_ACC; - - static { - Permissions p = new Permissions(); - p.add(new SerializablePermission("enableSubclassImplementation")); - STUB_ACC = new AccessControlContext( - new ProtectionDomain[]{ - new ProtectionDomain(null, p) - } - ); - } - - public IIOPProxyImpl() { } - - @Override - public boolean isStub(Object obj) { - return (obj instanceof Stub); - } - - @Override - public Object getDelegate(Object stub) { - return ((Stub)stub)._get_delegate(); - } - - @Override - public void setDelegate(Object stub, Object delegate) { - ((Stub)stub)._set_delegate((Delegate)delegate); - } - - @Override - public Object getOrb(Object stub) { - try { - return ((Stub)stub)._orb(); - } catch (org.omg.CORBA.BAD_OPERATION x) { - throw new UnsupportedOperationException(x); - } - } - - @Override - public void connect(Object stub, Object orb) - throws RemoteException - { - ((Stub)stub).connect((ORB)orb); - } - - @Override - public boolean isOrb(Object obj) { - return (obj instanceof ORB); - } - - @Override - public Object createOrb(String[] args, Properties props) { - return ORB.init(args, props); - } - - @Override - public Object stringToObject(Object orb, String str) { - return ((ORB)orb).string_to_object(str); - } - - @Override - public String objectToString(Object orb, Object obj) { - return ((ORB)orb).object_to_string((org.omg.CORBA.Object)obj); - } - - @Override - @SuppressWarnings("unchecked") - public T narrow(Object narrowFrom, Class narrowTo) { - return (T)PortableRemoteObject.narrow(narrowFrom, narrowTo); - } - - @Override - public void exportObject(Remote obj) throws RemoteException { - PortableRemoteObject.exportObject(obj); - } - - @Override - public void unexportObject(Remote obj) throws NoSuchObjectException { - PortableRemoteObject.unexportObject(obj); - } - - @Override - public Remote toStub(final Remote obj) throws NoSuchObjectException { - if (System.getSecurityManager() == null) { - return PortableRemoteObject.toStub(obj); - } else { - try { - return AccessController.doPrivileged(new PrivilegedExceptionAction() { - - @Override - public Remote run() throws Exception { - return PortableRemoteObject.toStub(obj); - } - }, STUB_ACC); - } catch (PrivilegedActionException e) { - if (e.getException() instanceof NoSuchObjectException) { - throw (NoSuchObjectException)e.getException(); - } - throw new RuntimeException("Unexpected exception type", e.getException()); - } - } - } -} diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/remote/protocol/iiop/ProxyInputStream.java b/jdk/src/java.management/share/classes/com/sun/jmx/remote/protocol/iiop/ProxyInputStream.java deleted file mode 100644 index e7fda6098eb..00000000000 --- a/jdk/src/java.management/share/classes/com/sun/jmx/remote/protocol/iiop/ProxyInputStream.java +++ /dev/null @@ -1,241 +0,0 @@ -/* - * Copyright (c) 2003, 2008, 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 com.sun.jmx.remote.protocol.iiop; - -import java.io.IOException; -import java.io.Serializable; -import java.math.BigDecimal; - -import org.omg.CORBA.Any; -import org.omg.CORBA.Context; -import org.omg.CORBA.NO_IMPLEMENT; -import org.omg.CORBA.ORB; -import org.omg.CORBA.TypeCode; -import org.omg.CORBA.portable.BoxedValueHelper; - -@SuppressWarnings({"deprecation", "rawtypes"}) -public class ProxyInputStream extends org.omg.CORBA_2_3.portable.InputStream { - public ProxyInputStream(org.omg.CORBA.portable.InputStream in) { - this.in = in; - } - - public boolean read_boolean() { - return in.read_boolean(); - } - - public char read_char() { - return in.read_char(); - } - - public char read_wchar() { - return in.read_wchar(); - } - - public byte read_octet() { - return in.read_octet(); - } - - public short read_short() { - return in.read_short(); - } - - public short read_ushort() { - return in.read_ushort(); - } - - public int read_long() { - return in.read_long(); - } - - public int read_ulong() { - return in.read_ulong(); - } - - public long read_longlong() { - return in.read_longlong(); - } - - public long read_ulonglong() { - return in.read_ulonglong(); - } - - public float read_float() { - return in.read_float(); - } - - public double read_double() { - return in.read_double(); - } - - public String read_string() { - return in.read_string(); - } - - public String read_wstring() { - return in.read_wstring(); - } - - public void read_boolean_array(boolean[] value, int offset, int length) { - in.read_boolean_array(value, offset, length); - } - - public void read_char_array(char[] value, int offset, int length) { - in.read_char_array(value, offset, length); - } - - public void read_wchar_array(char[] value, int offset, int length) { - in.read_wchar_array(value, offset, length); - } - - public void read_octet_array(byte[] value, int offset, int length) { - in.read_octet_array(value, offset, length); - } - - public void read_short_array(short[] value, int offset, int length) { - in.read_short_array(value, offset, length); - } - - public void read_ushort_array(short[] value, int offset, int length) { - in.read_ushort_array(value, offset, length); - } - - public void read_long_array(int[] value, int offset, int length) { - in.read_long_array(value, offset, length); - } - - public void read_ulong_array(int[] value, int offset, int length) { - in.read_ulong_array(value, offset, length); - } - - public void read_longlong_array(long[] value, int offset, int length) { - in.read_longlong_array(value, offset, length); - } - - public void read_ulonglong_array(long[] value, int offset, int length) { - in.read_ulonglong_array(value, offset, length); - } - - public void read_float_array(float[] value, int offset, int length) { - in.read_float_array(value, offset, length); - } - - public void read_double_array(double[] value, int offset, int length) { - in.read_double_array(value, offset, length); - } - - public org.omg.CORBA.Object read_Object() { - return in.read_Object(); - } - - public TypeCode read_TypeCode() { - return in.read_TypeCode(); - } - - public Any read_any() { - return in.read_any(); - } - - /** - * @deprecated - */ - @Override - @Deprecated - public org.omg.CORBA.Principal read_Principal() { - return in.read_Principal(); - } - - @Override - public int read() throws IOException { - return in.read(); - } - - @Override - public BigDecimal read_fixed() { - return in.read_fixed(); - } - - @Override - public Context read_Context() { - return in.read_Context(); - } - - @Override - public org.omg.CORBA.Object read_Object(java.lang.Class clz) { - return in.read_Object(clz); - } - - @Override - public ORB orb() { - return in.orb(); - } - - @Override - public Serializable read_value() { - return narrow().read_value(); - } - - @Override - public Serializable read_value(Class clz) { - return narrow().read_value(clz); - } - - @Override - public Serializable read_value(BoxedValueHelper factory) { - return narrow().read_value(factory); - } - - @Override - public Serializable read_value(String rep_id) { - return narrow().read_value(rep_id); - } - - @Override - public Serializable read_value(Serializable value) { - return narrow().read_value(value); - } - - @Override - public Object read_abstract_interface() { - return narrow().read_abstract_interface(); - } - - @Override - public Object read_abstract_interface(Class clz) { - return narrow().read_abstract_interface(clz); - } - - protected org.omg.CORBA_2_3.portable.InputStream narrow() { - if (in instanceof org.omg.CORBA_2_3.portable.InputStream) - return (org.omg.CORBA_2_3.portable.InputStream) in; - throw new NO_IMPLEMENT(); - } - - public org.omg.CORBA.portable.InputStream getProxiedInputStream() { - return in; - } - - protected final org.omg.CORBA.portable.InputStream in; -} diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/remote/protocol/iiop/ServerProvider.java b/jdk/src/java.management/share/classes/com/sun/jmx/remote/protocol/iiop/ServerProvider.java deleted file mode 100644 index 2f248f52a0e..00000000000 --- a/jdk/src/java.management/share/classes/com/sun/jmx/remote/protocol/iiop/ServerProvider.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2003, 2004, 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 com.sun.jmx.remote.protocol.iiop; - -import java.io.IOException; -import java.net.MalformedURLException; -import java.util.Map; - -import javax.management.MBeanServer; -import javax.management.remote.JMXConnectorServer; -import javax.management.remote.JMXConnectorServerProvider; -import javax.management.remote.JMXServiceURL; -import javax.management.remote.rmi.RMIConnectorServer; - -public class ServerProvider implements JMXConnectorServerProvider { - - public JMXConnectorServer newJMXConnectorServer(JMXServiceURL serviceURL, - Map environment, - MBeanServer mbeanServer) - throws IOException { - if (!serviceURL.getProtocol().equals("iiop")) { - throw new MalformedURLException("Protocol not iiop: " + - serviceURL.getProtocol()); - } - return new RMIConnectorServer(serviceURL, environment, mbeanServer); - } - -} diff --git a/jdk/src/java.management/share/classes/javax/management/remote/JMXConnectorFactory.java b/jdk/src/java.management/share/classes/javax/management/remote/JMXConnectorFactory.java index 2eb99d2b870..1458aca4c3b 100644 --- a/jdk/src/java.management/share/classes/javax/management/remote/JMXConnectorFactory.java +++ b/jdk/src/java.management/share/classes/javax/management/remote/JMXConnectorFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015, 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 @@ -140,9 +140,7 @@ import sun.reflect.misc.ReflectUtil; * *

Every implementation must support the RMI connector protocol with * the default RMI transport, specified with string rmi. - * An implementation may optionally support the RMI connector protocol - * with the RMI/IIOP transport, specified with the string - * iiop.

+ *

* *

Once a provider is found, the result of the * newJMXConnector method is the result of calling {@link diff --git a/jdk/src/java.management/share/classes/javax/management/remote/JMXConnectorServerFactory.java b/jdk/src/java.management/share/classes/javax/management/remote/JMXConnectorServerFactory.java index bdaa4e7f1fd..2bfae84c688 100644 --- a/jdk/src/java.management/share/classes/javax/management/remote/JMXConnectorServerFactory.java +++ b/jdk/src/java.management/share/classes/javax/management/remote/JMXConnectorServerFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2015, 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,9 +131,7 @@ import javax.management.MBeanServer; * *

Every implementation must support the RMI connector protocol with * the default RMI transport, specified with string rmi. - * An implementation may optionally support the RMI connector protocol - * with the RMI/IIOP transport, specified with the string - * iiop.

+ *

* *

Once a provider is found, the result of the * newJMXConnectorServer method is the result of calling diff --git a/jdk/src/java.management/share/classes/javax/management/remote/rmi/NoCallStackClassLoader.java b/jdk/src/java.management/share/classes/javax/management/remote/rmi/NoCallStackClassLoader.java index e8addac66fe..8a0882f5369 100644 --- a/jdk/src/java.management/share/classes/javax/management/remote/rmi/NoCallStackClassLoader.java +++ b/jdk/src/java.management/share/classes/javax/management/remote/rmi/NoCallStackClassLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2015, 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,12 +31,11 @@ import java.security.ProtectionDomain;

A class loader that only knows how to define a limited number of classes, and load a limited number of other classes through delegation to another loader. It is used to get around a problem - with Serialization, in particular as used by RMI (including - RMI/IIOP). The JMX Remote API defines exactly what class loader - must be used to deserialize arguments on the server, and return - values on the client. We communicate this class loader to RMI by - setting it as the context class loader. RMI uses the context - class loader to load classes as it deserializes, which is what we + with Serialization, in particular as used by RMI. The JMX Remote API + defines exactly what class loader must be used to deserialize arguments on + the server, and return values on the client. We communicate this class + loader to RMI by setting it as the context class loader. RMI uses the + context class loader to load classes as it deserializes, which is what we want. However, before consulting the context class loader, it looks up the call stack for a class with a non-null class loader, and uses that if it finds one. So, in the standalone version of diff --git a/jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java b/jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java index 5fb3c9d0508..dd050e4ef9c 100644 --- a/jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java +++ b/jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015, 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,11 +76,10 @@ public class RMIConnectionImpl implements RMIConnection, Unreferenced { /** * Constructs a new {@link RMIConnection}. This connection can be - * used with either the JRMP or IIOP transport. This object does + * used with the JRMP transport. This object does * not export itself: it is the responsibility of the caller to * export it appropriately (see {@link - * RMIJRMPServerImpl#makeClient(String,Subject)} and {@link - * RMIIIOPServerImpl#makeClient(String,Subject)}. + * RMIJRMPServerImpl#makeClient(String,Subject)}). * * @param rmiServer The RMIServerImpl object for which this * connection is created. The behavior is unspecified if this diff --git a/jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIConnector.java b/jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIConnector.java index 9f256481711..4bd796e3e7a 100644 --- a/jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIConnector.java +++ b/jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIConnector.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015, 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,25 +30,21 @@ import com.sun.jmx.remote.internal.ClientCommunicatorAdmin; import com.sun.jmx.remote.internal.ClientListenerInfo; import com.sun.jmx.remote.internal.ClientNotifForwarder; import com.sun.jmx.remote.internal.ProxyRef; -import com.sun.jmx.remote.internal.IIOPHelper; import com.sun.jmx.remote.util.ClassLogger; import com.sun.jmx.remote.util.EnvHelp; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.io.InvalidObjectException; -import java.io.NotSerializableException; import java.io.ObjectInputStream; import java.io.ObjectStreamClass; import java.io.Serializable; -import java.io.WriteAbortedException; import java.lang.ref.WeakReference; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Proxy; import java.net.MalformedURLException; -import java.rmi.MarshalException; import java.rmi.MarshalledObject; import java.rmi.NoSuchObjectException; import java.rmi.Remote; @@ -61,13 +57,12 @@ import java.rmi.server.RemoteRef; import java.security.AccessController; import java.security.PrivilegedAction; import java.security.PrivilegedExceptionAction; -import java.security.PrivilegedActionException; import java.security.ProtectionDomain; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; +import java.util.Hashtable; import java.util.Map; -import java.util.Properties; import java.util.Set; import java.util.WeakHashMap; import javax.management.Attribute; @@ -146,22 +141,20 @@ public class RMIConnector implements JMXConnector, Serializable, JMXAddressable * the RMI connector server with the given address.

* *

The address can refer directly to the connector server, - * using one of the following syntaxes:

+ * using the following syntax:

* * 
      * service:jmx:rmi://[host[:port]]/stub/encoded-stub
-     * service:jmx:iiop://[host[:port]]/ior/encoded-IOR
      *
* *

(Here, the square brackets {@code []} are not part of the * address but indicate that the host and port are optional.)

* *

The address can instead indicate where to find an RMI stub - * through JNDI, using one of the following syntaxes:

+ * through JNDI, using the following syntax:

* * 
      * service:jmx:rmi://[host[:port]]/jndi/jndi-name
-     * service:jmx:iiop://[host[:port]]/jndi/jndi-name
      *
* *

An implementation may also recognize additional address @@ -242,8 +235,7 @@ public class RMIConnector implements JMXConnector, Serializable, JMXAddressable /** * @throws IOException if the connection could not be made because of a - * communication problem, or in the case of the {@code iiop} protocol, - * that RMI/IIOP is not supported + * communication problem */ public void connect() throws IOException { connect(null); @@ -251,8 +243,7 @@ public class RMIConnector implements JMXConnector, Serializable, JMXAddressable /** * @throws IOException if the connection could not be made because of a - * communication problem, or in the case of the {@code iiop} protocol, - * that RMI/IIOP is not supported + * communication problem */ public synchronized void connect(Map environment) throws IOException { @@ -294,9 +285,7 @@ public class RMIConnector implements JMXConnector, Serializable, JMXAddressable if (checkStub) checkStub(stub, rmiServerImplStubClass); - // Connect IIOP Stub if needed. if (tracing) logger.trace("connect",idstr + " connecting stub..."); - stub = connectStub(stub,usemap); idstr = (tracing?"["+this.toString()+"]":null); // Calling newClient on the RMIServer stub. @@ -307,18 +296,6 @@ public class RMIConnector implements JMXConnector, Serializable, JMXAddressable try { connection = getConnection(stub, credentials, checkStub); } catch (java.rmi.RemoteException re) { - if (jmxServiceURL != null) { - final String pro = jmxServiceURL.getProtocol(); - final String path = jmxServiceURL.getURLPath(); - - if ("rmi".equals(pro) && - path.startsWith("/jndi/iiop:")) { - MalformedURLException mfe = new MalformedURLException( - "Protocol is rmi but JNDI scheme is iiop: " + jmxServiceURL); - mfe.initCause(re); - throw mfe; - } - } throw re; } @@ -1413,13 +1390,6 @@ public class RMIConnector implements JMXConnector, Serializable, JMXAddressable if (ioe instanceof UnmarshalException) { throw ioe; // the fix of 6937053 made ClientNotifForwarder.fetchNotifs // fetch one by one with UnmarshalException - } else if (ioe instanceof MarshalException) { - // IIOP will throw MarshalException wrapping a NotSerializableException - // when a server fails to serialize a response. - MarshalException me = (MarshalException)ioe; - if (me.detail instanceof NotSerializableException) { - throw (NotSerializableException)me.detail; - } } // Not serialization problem, return. @@ -1654,9 +1624,6 @@ public class RMIConnector implements JMXConnector, Serializable, JMXAddressable throw new IOException("Failed to get a RMI stub: "+ne); } - // Connect IIOP Stub if needed. - stub = connectStub(stub,env); - // Calling newClient on the RMIServer stub. Object credentials = env.get(CREDENTIALS); connection = stub.newClient(credentials); @@ -1693,103 +1660,6 @@ public class RMIConnector implements JMXConnector, Serializable, JMXAddressable //-------------------------------------------------------------------- // Private stuff - Serialization //-------------------------------------------------------------------- - /** - *

In order to be usable, an IIOP stub must be connected to an ORB. - * The stub is automatically connected to the ORB if: - *

    - *
  • It was returned by the COS naming
    • - *
  • Its server counterpart has been registered in COS naming - * through JNDI.
    • - *
- * Otherwise, it is not connected. A stub which is deserialized - * from Jini is not connected. A stub which is obtained from a - * non registered RMIIIOPServerImpl is not a connected.
- * A stub which is not connected can't be serialized, and thus - * can't be registered in Jini. A stub which is not connected can't - * be used to invoke methods on the server. - *

- * In order to palliate this, this method will connect the - * given stub if it is not yet connected. If the given - * RMIServer is not an instance of - * {@link javax.rmi.CORBA.Stub javax.rmi.CORBA.Stub}, then the - * method do nothing and simply returns that stub. Otherwise, - * this method will attempt to connect the stub to an ORB as - * follows: - *

    - *
  • This method looks in the provided environment for - * the "java.naming.corba.orb" property. If it is found, the - * referenced object (an {@link org.omg.CORBA.ORB ORB}) is used to - * connect the stub. Otherwise, a new org.omg.CORBA.ORB is created - * by calling {@link - * org.omg.CORBA.ORB#init(String[], Properties) - * org.omg.CORBA.ORB.init((String[])null,(Properties)null)}
    • - *
  • The new created ORB is kept in a static - * {@link WeakReference} and can be reused for connecting other - * stubs. However, no reference is ever kept on the ORB provided - * in the environment map, if any.
    • - *
- * @param rmiServer A RMI Server Stub. - * @param environment An environment map, possibly containing an ORB. - * @return the given stub. - * @exception IllegalArgumentException if the - * {@code java.naming.corba.orb} property is specified and - * does not point to an {@link org.omg.CORBA.ORB ORB}. - * @exception IOException if the connection to the ORB failed. - **/ - static RMIServer connectStub(RMIServer rmiServer, - Map environment) - throws IOException { - if (IIOPHelper.isStub(rmiServer)) { - try { - IIOPHelper.getOrb(rmiServer); - } catch (UnsupportedOperationException x) { - // BAD_OPERATION - IIOPHelper.connect(rmiServer, resolveOrb(environment)); - } - } - return rmiServer; - } - - /** - * Get the ORB specified by environment, or create a - * new one. - *

This method looks in the provided environment for - * the "java.naming.corba.orb" property. If it is found, the - * referenced object (an {@link org.omg.CORBA.ORB ORB}) is - * returned. Otherwise, a new org.omg.CORBA.ORB is created - * by calling {@link - * org.omg.CORBA.ORB#init(String[], java.util.Properties) - * org.omg.CORBA.ORB.init((String[])null,(Properties)null)} - *

The new created ORB is kept in a static - * {@link WeakReference} and can be reused for connecting other - * stubs. However, no reference is ever kept on the ORB provided - * in the environment map, if any. - * @param environment An environment map, possibly containing an ORB. - * @return An ORB. - * @exception IllegalArgumentException if the - * {@code java.naming.corba.orb} property is specified and - * does not point to an {@link org.omg.CORBA.ORB ORB}. - * @exception IOException if the ORB initialization failed. - **/ - static Object resolveOrb(Map environment) - throws IOException { - if (environment != null) { - final Object orb = environment.get(EnvHelp.DEFAULT_ORB); - if (orb != null && !(IIOPHelper.isOrb(orb))) - throw new IllegalArgumentException(EnvHelp.DEFAULT_ORB + - " must be an instance of org.omg.CORBA.ORB."); - if (orb != null) return orb; - } - final Object orb = - (RMIConnector.orb==null)?null:RMIConnector.orb.get(); - if (orb != null) return orb; - - final Object newOrb = - IIOPHelper.createOrb((String[])null, (Properties)null); - RMIConnector.orb = new WeakReference(newOrb); - return newOrb; - } - /** * Read RMIConnector fields from an {@link java.io.ObjectInputStream * ObjectInputStream}. @@ -1846,7 +1716,6 @@ public class RMIConnector implements JMXConnector, Serializable, JMXAddressable throws IOException { if (rmiServer == null && jmxServiceURL == null) throw new InvalidObjectException("rmiServer and jmxServiceURL both null."); - connectStub(this.rmiServer,env); s.defaultWriteObject(); } @@ -1911,24 +1780,15 @@ public class RMIConnector implements JMXConnector, Serializable, JMXAddressable private RMIServer findRMIServer(JMXServiceURL directoryURL, Map environment) throws NamingException, IOException { - final boolean isIiop = RMIConnectorServer.isIiopURL(directoryURL,true); - if (isIiop) { - // Make sure java.naming.corba.orb is in the Map. - environment.put(EnvHelp.DEFAULT_ORB,resolveOrb(environment)); - } String path = directoryURL.getURLPath(); int end = path.indexOf(';'); if (end < 0) end = path.length(); if (path.startsWith("/jndi/")) - return findRMIServerJNDI(path.substring(6,end), environment, isIiop); + return findRMIServerJNDI(path.substring(6,end), environment); else if (path.startsWith("/stub/")) - return findRMIServerJRMP(path.substring(6,end), environment, isIiop); - else if (path.startsWith("/ior/")) { - if (!IIOPHelper.isAvailable()) - throw new IOException("iiop protocol not available"); - return findRMIServerIIOP(path.substring(5,end), environment, isIiop); - } else { + return findRMIServerJRMP(path.substring(6,end), environment); + else { final String msg = "URL path must begin with /jndi/ or /stub/ " + "or /ior/: " + path; throw new MalformedURLException(msg); @@ -1940,16 +1800,13 @@ public class RMIConnector implements JMXConnector, Serializable, JMXAddressable * @param jndiURL A JNDI URL indicating the location of the Stub * (see {@link javax.management.remote.rmi}), e.g.: *
  • {@code rmi://registry-host:port/rmi-stub-name}
    • - *
  • or {@code iiop://cosnaming-host:port/iiop-stub-name}
    • *
  • or {@code ldap://ldap-host:port/java-container-dn}
    • *
* @param env the environment Map passed to the connector. - * @param isIiop true if the stub is expected to be an IIOP stub. * @return The retrieved RMIServer stub. * @exception NamingException if the stub couldn't be found. **/ - private RMIServer findRMIServerJNDI(String jndiURL, Map env, - boolean isIiop) + private RMIServer findRMIServerJNDI(String jndiURL, Map env) throws NamingException { InitialContext ctx = new InitialContext(EnvHelp.mapToHashtable(env)); @@ -1957,10 +1814,7 @@ public class RMIConnector implements JMXConnector, Serializable, JMXAddressable Object objref = ctx.lookup(jndiURL); ctx.close(); - if (isIiop) - return narrowIIOPServer(objref); - else - return narrowJRMPServer(objref); + return narrowJRMPServer(objref); } private static RMIServer narrowJRMPServer(Object objref) { @@ -1968,28 +1822,8 @@ public class RMIConnector implements JMXConnector, Serializable, JMXAddressable return (RMIServer) objref; } - private static RMIServer narrowIIOPServer(Object objref) { - try { - return IIOPHelper.narrow(objref, RMIServer.class); - } catch (ClassCastException e) { - if (logger.traceOn()) - logger.trace("narrowIIOPServer","Failed to narrow objref=" + - objref + ": " + e); - if (logger.debugOn()) logger.debug("narrowIIOPServer",e); - return null; - } - } - - private RMIServer findRMIServerIIOP(String ior, Map env, boolean isIiop) { - // could forbid "rmi:" URL here -- but do we need to? - final Object orb = env.get(EnvHelp.DEFAULT_ORB); - final Object stub = IIOPHelper.stringToObject(orb, ior); - return IIOPHelper.narrow(stub, RMIServer.class); - } - - private RMIServer findRMIServerJRMP(String base64, Map env, boolean isIiop) + private RMIServer findRMIServerJRMP(String base64, Map env) throws IOException { - // could forbid "iiop:" URL here -- but do we need to? final byte[] serialized; try { serialized = base64ToByteArray(base64); @@ -2203,228 +2037,6 @@ public class RMIConnector implements JMXConnector, Serializable, JMXAddressable return proxyStub; } - /* - The following code performs a similar trick for RMI/IIOP to the - one described above for RMI/JRMP. Unlike JRMP, though, we - can't easily insert an object between the RMIConnection stub - and the RMI/IIOP deserialization code, as explained below. - - A method in an RMI/IIOP stub does the following. It makes an - org.omg.CORBA_2_3.portable.OutputStream for each request, and - writes the parameters to it. Then it calls - _invoke(OutputStream) which it inherits from CORBA's - ObjectImpl. That returns an - org.omg.CORBA_2_3.portable.InputStream. The return value is - read from this InputStream. So the stack during - deserialization looks like this: - - MBeanServerConnection.getAttribute (or whatever) - -> _RMIConnection_Stub.getAttribute - -> Util.readAny (a CORBA method) - -> InputStream.read_any - -> internal CORBA stuff - - What we would have *liked* to have done would be the same thing - as for RMI/JRMP. We create a "ProxyDelegate" that is an - org.omg.CORBA.portable.Delegate that simply forwards every - operation to the real original Delegate from the RMIConnection - stub, except that the InputStream returned by _invoke is - wrapped by a "ProxyInputStream" that is loaded by our - NoCallStackClassLoader. - - Unfortunately, this doesn't work, at least with Sun's J2SE - 1.4.2, because the CORBA code is not designed to allow you to - change Delegates arbitrarily. You get a ClassCastException - from code that expects the Delegate to implement an internal - interface. - - So instead we do the following. We create a subclass of the - stub that overrides the _invoke method so as to wrap the - returned InputStream in a ProxyInputStream. We create a - subclass of ProxyInputStream using the NoCallStackClassLoader - and override its read_any and read_value(Class) methods. - (These are the only methods called during deserialization of - MBeanServerConnection return values.) We extract the Delegate - from the original stub and insert it into our subclass stub, - and away we go. The state of a stub consists solely of its - Delegate. - - We also need to catch ApplicationException, which will encode - any exceptions declared in the throws clause of the called - method. Its InputStream needs to be wrapped in a - ProxyInputSteam too. - - We override _releaseReply in the stub subclass so that it - replaces a ProxyInputStream argument with the original - InputStream. This avoids problems if the implementation of - _releaseReply ends up casting this InputStream to an - implementation-specific interface (which in Sun's J2SE 5 it - does). - - It is not strictly necessary for the stub subclass to be loaded - by a NoCallStackClassLoader, since the call-stack search stops - at the ProxyInputStream subclass. However, it is convenient - for two reasons. One is that it means that the - ProxyInputStream subclass can be accessed directly, without - using reflection. The other is that it avoids build problems, - since usually stubs are created after other classes are - compiled, so we can't access them from this class without, - again, using reflection. - - The strings below encode the following two Java classes, - compiled using javac -g:none. - - package com.sun.jmx.remote.protocol.iiop; - - import org.omg.stub.javax.management.remote.rmi._RMIConnection_Stub; - - import org.omg.CORBA.portable.ApplicationException; - import org.omg.CORBA.portable.InputStream; - import org.omg.CORBA.portable.OutputStream; - import org.omg.CORBA.portable.RemarshalException; - - public class ProxyStub extends _RMIConnection_Stub { - public InputStream _invoke(OutputStream out) - throws ApplicationException, RemarshalException { - try { - return new PInputStream(super._invoke(out)); - } catch (ApplicationException e) { - InputStream pis = new PInputStream(e.getInputStream()); - throw new ApplicationException(e.getId(), pis); - } - } - - public void _releaseReply(InputStream in) { - if (in != null) - in = ((PInputStream)in).getProxiedInputStream(); - super._releaseReply(in); - } - } - - package com.sun.jmx.remote.protocol.iiop; - - public class PInputStream extends ProxyInputStream { - public PInputStream(org.omg.CORBA.portable.InputStream in) { - super(in); - } - - public org.omg.CORBA.Any read_any() { - return in.read_any(); - } - - public java.io.Serializable read_value(Class clz) { - return narrow().read_value(clz); - } - } - - - */ - private static final String iiopConnectionStubClassName = - "org.omg.stub.javax.management.remote.rmi._RMIConnection_Stub"; - private static final String proxyStubClassName = - "com.sun.jmx.remote.protocol.iiop.ProxyStub"; - private static final String ProxyInputStreamClassName = - "com.sun.jmx.remote.protocol.iiop.ProxyInputStream"; - private static final String pInputStreamClassName = - "com.sun.jmx.remote.protocol.iiop.PInputStream"; - private static final Class proxyStubClass; - static { - final String proxyStubByteCodeString = - "\312\376\272\276\0\0\0\63\0+\12\0\14\0\30\7\0\31\12\0\14\0\32\12"+ - "\0\2\0\33\7\0\34\12\0\5\0\35\12\0\5\0\36\12\0\5\0\37\12\0\2\0 "+ - "\12\0\14\0!\7\0\"\7\0#\1\0\6\1\0\3()V\1\0\4Code\1\0\7_in"+ - "voke\1\0K(Lorg/omg/CORBA/portable/OutputStream;)Lorg/omg/CORBA"+ - "/portable/InputStream;\1\0\15StackMapTable\7\0\34\1\0\12Except"+ - "ions\7\0$\1\0\15_releaseReply\1\0'(Lorg/omg/CORBA/portable/Inp"+ - "utStream;)V\14\0\15\0\16\1\0-com/sun/jmx/remote/protocol/iiop/"+ - "PInputStream\14\0\20\0\21\14\0\15\0\27\1\0+org/omg/CORBA/porta"+ - "ble/ApplicationException\14\0%\0&\14\0'\0(\14\0\15\0)\14\0*\0&"+ - "\14\0\26\0\27\1\0*com/sun/jmx/remote/protocol/iiop/ProxyStub\1"+ - "\0\1\0'("+ - "Lorg/omg/CORBA/portable/InputStream;)V\1\0\4Code\1\0\10read_an"+ - "y\1\0\25()Lorg/omg/CORBA/Any;\1\0\12read_value\1\0)(Ljava/lang"+ - "/Class;)Ljava/io/Serializable;\14\0\10\0\11\14\0\30\0\31\7\0\32"+ - "\14\0\13\0\14\14\0\33\0\34\7\0\35\14\0\15\0\16\1\0-com/sun/jmx"+ - "/remote/protocol/iiop/PInputStream\1\0\61com/sun/jmx/remote/pr"+ - "otocol/iiop/ProxyInputStream\1\0\2in\1\0$Lorg/omg/CORBA/portab"+ - "le/InputStream;\1\0\"org/omg/CORBA/portable/InputStream\1\0\6n"+ - "arrow\1\0*()Lorg/omg/CORBA_2_3/portable/InputStream;\1\0&org/o"+ - "mg/CORBA_2_3/portable/InputStream\0!\0\6\0\7\0\0\0\0\0\3\0\1\0"+ - "\10\0\11\0\1\0\12\0\0\0\22\0\2\0\2\0\0\0\6*+\267\0\1\261\0\0\0"+ - "\0\0\1\0\13\0\14\0\1\0\12\0\0\0\24\0\1\0\1\0\0\0\10*\264\0\2\266"+ - "\0\3\260\0\0\0\0\0\1\0\15\0\16\0\1\0\12\0\0\0\25\0\2\0\2\0\0\0"+ - "\11*\266\0\4+\266\0\5\260\0\0\0\0\0\0"; - final byte[] proxyStubByteCode = - NoCallStackClassLoader.stringToBytes(proxyStubByteCodeString); - final byte[] pInputStreamByteCode = - NoCallStackClassLoader.stringToBytes(pInputStreamByteCodeString); - final String[] classNames={proxyStubClassName, pInputStreamClassName}; - final byte[][] byteCodes = {proxyStubByteCode, pInputStreamByteCode}; - final String[] otherClassNames = { - iiopConnectionStubClassName, - ProxyInputStreamClassName, - }; - if (IIOPHelper.isAvailable()) { - PrivilegedExceptionAction> action = - new PrivilegedExceptionAction>() { - public Class run() throws Exception { - Class thisClass = RMIConnector.class; - ClassLoader thisLoader = thisClass.getClassLoader(); - ProtectionDomain thisProtectionDomain = - thisClass.getProtectionDomain(); - ClassLoader cl = - new NoCallStackClassLoader(classNames, - byteCodes, - otherClassNames, - thisLoader, - thisProtectionDomain); - return cl.loadClass(proxyStubClassName); - } - }; - Class stubClass; - try { - stubClass = AccessController.doPrivileged(action); - } catch (Exception e) { - logger.error("", - "Unexpected exception making shadow IIOP stub class: "+e); - logger.debug("",e); - stubClass = null; - } - proxyStubClass = stubClass; - } else { - proxyStubClass = null; - } - } - - private static RMIConnection shadowIiopStub(Object stub) - throws InstantiationException, IllegalAccessException { - Object proxyStub = null; - try { - proxyStub = AccessController.doPrivileged(new PrivilegedExceptionAction() { - public Object run() throws Exception { - return proxyStubClass.newInstance(); - } - }); - } catch (PrivilegedActionException e) { - throw new InternalError(); - } - IIOPHelper.setDelegate(proxyStub, IIOPHelper.getDelegate(stub)); - return (RMIConnection) proxyStub; - } private static RMIConnection getConnection(RMIServer server, Object credentials, boolean checkStub) @@ -2434,8 +2046,6 @@ public class RMIConnector implements JMXConnector, Serializable, JMXAddressable try { if (c.getClass() == rmiConnectionImplStubClass) return shadowJrmpStub((RemoteObject) c); - if (c.getClass().getName().equals(iiopConnectionStubClassName)) - return shadowIiopStub(c); logger.trace("getConnection", "Did not wrap " + c.getClass() + " to foil " + "stack search for classes: class loading semantics " + diff --git a/jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIConnectorServer.java b/jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIConnectorServer.java index 4cdb092c6d2..fe90422c193 100644 --- a/jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIConnectorServer.java +++ b/jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIConnectorServer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015, 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,6 @@ package javax.management.remote.rmi; import com.sun.jmx.remote.security.MBeanServerFileAccessController; -import com.sun.jmx.remote.internal.IIOPHelper; import com.sun.jmx.remote.util.ClassLogger; import com.sun.jmx.remote.util.EnvHelp; @@ -117,8 +116,8 @@ public class RMIConnectorServer extends JMXConnectorServer { * * @exception MalformedURLException if url does not * conform to the syntax for an RMI connector, or if its protocol - * is not recognized by this implementation. Only "rmi" and "iiop" - * are valid when this constructor is used. + * is not recognized by this implementation. Only "rmi" is valid when + * this constructor is used. * * @exception IOException if the connector server cannot be created * for some reason or if it is inevitable that its {@link #start() @@ -151,8 +150,8 @@ public class RMIConnectorServer extends JMXConnectorServer { * * @exception MalformedURLException if url does not * conform to the syntax for an RMI connector, or if its protocol - * is not recognized by this implementation. Only "rmi" and "iiop" - * are valid when this constructor is used. + * is not recognized by this implementation. Only "rmi" is valid + * when this constructor is used. * * @exception IOException if the connector server cannot be created * for some reason or if it is inevitable that its {@link #start() @@ -179,7 +178,7 @@ public class RMIConnectorServer extends JMXConnectorServer { * consistent with the protocol type specified in url. * If this parameter is non null, the protocol type specified by * url is not constrained, and is assumed to be valid. - * Otherwise, only "rmi" and "iiop" will be recognized. + * Otherwise, only "rmi" will be recognized. * * @param mbeanServer the MBean server to which the new connector * server is attached, or null if it will be attached by being @@ -189,8 +188,8 @@ public class RMIConnectorServer extends JMXConnectorServer { * * @exception MalformedURLException if url does not * conform to the syntax for an RMI connector, or if its protocol - * is not recognized by this implementation. Only "rmi" and "iiop" - * are recognized when rmiServerImpl is null. + * is not recognized by this implementation. Only "rmi" is recognized + * when rmiServerImpl is null. * * @exception IOException if the connector server cannot be created * for some reason or if it is inevitable that its {@link #start() @@ -208,7 +207,7 @@ public class RMIConnectorServer extends JMXConnectorServer { IllegalArgumentException("Null JMXServiceURL"); if (rmiServerImpl == null) { final String prt = url.getProtocol(); - if (prt == null || !(prt.equals("rmi") || prt.equals("iiop"))) { + if (prt == null || !(prt.equals("rmi"))) { final String msg = "Invalid protocol type: " + prt; throw new MalformedURLException(msg); } @@ -298,11 +297,6 @@ public class RMIConnectorServer extends JMXConnectorServer { *
  • If an RMIServerImpl was supplied to the * constructor, it is used. * - *
  • Otherwise, if the protocol part of the - * JMXServiceURL supplied to the constructor was - * iiop, an object of type {@link RMIIIOPServerImpl} - * is created. - * *
  • Otherwise, if the JMXServiceURL * was null, or its protocol part was rmi, an object * of type {@link RMIJRMPServerImpl} is created. @@ -324,21 +318,19 @@ public class RMIConnectorServer extends JMXConnectorServer { * will not be bound to a directory. Instead, a reference to it * will be encoded in the URL path of the RMIConnectorServer * address (returned by {@link #getAddress()}). The encodings for - * rmi and iiop are described in the - * package documentation for {@link - * javax.management.remote.rmi}.

    + * rmi are described in the package documentation for + * {@link javax.management.remote.rmi}.

    * *

    The behavior when the URL path is neither empty nor a JNDI - * directory URL, or when the protocol is neither rmi - * nor iiop, is implementation defined, and may - * include throwing {@link MalformedURLException} when the - * connector server is created or when it is started.

    + * directory URL, or when the protocol is not rmi, + * is implementation defined, and may include throwing + * {@link MalformedURLException} when the connector server is created + * or when it is started.

    * * @exception IllegalStateException if the connector server has * not been attached to an MBean server. * @exception IOException if the connector server cannot be - * started, or in the case of the {@code iiop} protocol, that - * RMI/IIOP is not supported. + * started. */ public synchronized void start() throws IOException { final boolean tracing = logger.traceOn(); @@ -649,16 +641,13 @@ public class RMIConnectorServer extends JMXConnectorServer { * Creates a new RMIServerImpl. **/ RMIServerImpl newServer() throws IOException { - final boolean iiop = isIiopURL(address,true); final int port; if (address == null) port = 0; else port = address.getPort(); - if (iiop) - return newIIOPServer(attributes); - else - return newJRMPServer(attributes, port); + + return newJRMPServer(attributes, port); } /** @@ -675,10 +664,7 @@ public class RMIConnectorServer extends JMXConnectorServer { final int port; if (address == null) { - if (IIOPHelper.isStub(rmiServer)) - protocol = "iiop"; - else - protocol = "rmi"; + protocol = "rmi"; host = null; // will default to local host name port = 0; } else { @@ -692,31 +678,12 @@ public class RMIConnectorServer extends JMXConnectorServer { address = new JMXServiceURL(protocol, host, port, urlPath); } - static boolean isIiopURL(JMXServiceURL directoryURL, boolean strict) - throws MalformedURLException { - String protocol = directoryURL.getProtocol(); - if (protocol.equals("rmi")) - return false; - else if (protocol.equals("iiop")) - return true; - else if (strict) { - - throw new MalformedURLException("URL must have protocol " + - "\"rmi\" or \"iiop\": \"" + - protocol + "\""); - } - return false; - } - /** * Returns the IOR of the given rmiServer. **/ static String encodeStub( RMIServer rmiServer, Map env) throws IOException { - if (IIOPHelper.isStub(rmiServer)) - return "/ior/" + encodeIIOPStub(rmiServer, env); - else - return "/stub/" + encodeJRMPStub(rmiServer, env); + return "/stub/" + encodeJRMPStub(rmiServer, env); } static String encodeJRMPStub( @@ -730,17 +697,6 @@ public class RMIConnectorServer extends JMXConnectorServer { return byteArrayToBase64(bytes); } - static String encodeIIOPStub( - RMIServer rmiServer, Map env) - throws IOException { - try { - Object orb = IIOPHelper.getOrb(rmiServer); - return IIOPHelper.objectToString(orb, rmiServer); - } catch (RuntimeException x) { - throw newIOException(x.getMessage(), x); - } - } - /** * Object that we will bind to the registry. * This object is a stub connected to our RMIServerImpl. @@ -748,8 +704,7 @@ public class RMIConnectorServer extends JMXConnectorServer { private static RMIServer objectToBind( RMIServerImpl rmiServer, Map env) throws IOException { - return RMIConnector. - connectStub((RMIServer)rmiServer.toStub(),env); + return (RMIServer)rmiServer.toStub(); } private static RMIServerImpl newJRMPServer(Map env, int port) @@ -761,11 +716,6 @@ public class RMIConnectorServer extends JMXConnectorServer { return new RMIJRMPServerImpl(port, csf, ssf, env); } - private static RMIServerImpl newIIOPServer(Map env) - throws IOException { - return new RMIIIOPServerImpl(env); - } - private static String byteArrayToBase64(byte[] a) { int aLen = a.length; int numFullGroups = aLen/3; diff --git a/jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIIIOPServerImpl.java b/jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIIIOPServerImpl.java index 45be553e1f7..00b25b71d9e 100644 --- a/jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIIIOPServerImpl.java +++ b/jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIIIOPServerImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2015, 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,16 +27,9 @@ package javax.management.remote.rmi; import java.io.IOException; import java.rmi.Remote; -import java.security.AccessControlContext; -import java.security.AccessController; -import java.security.PrivilegedActionException; -import java.security.PrivilegedExceptionAction; import java.util.Map; -import java.util.Collections; import javax.security.auth.Subject; -import com.sun.jmx.remote.internal.IIOPHelper; - /** *

    An {@link RMIServerImpl} that is exported through IIOP and that * creates client connections as RMI objects exported through IIOP. @@ -45,120 +38,59 @@ import com.sun.jmx.remote.internal.IIOPHelper; * @see RMIServerImpl * * @since 1.5 + * @deprecated This transport is no longer supported. */ +@Deprecated public class RMIIIOPServerImpl extends RMIServerImpl { /** - *

    Creates a new {@link RMIServerImpl}.

    + * Throws {@linkplain UnsupportedOperationException} * * @param env the environment containing attributes for the new * RMIServerImpl. Can be null, which is equivalent * to an empty Map. * - * @exception IOException if the RMI object cannot be created. + * @throws IOException if the RMI object cannot be created. */ public RMIIIOPServerImpl(Map env) throws IOException { super(env); - this.env = (env == null) ? Collections.emptyMap() : env; - - callerACC = AccessController.getContext(); + throw new UnsupportedOperationException(); } + @Override protected void export() throws IOException { - IIOPHelper.exportObject(this); + throw new UnsupportedOperationException("Method not supported. JMX RMI-IIOP is deprecated"); } + @Override protected String getProtocol() { return "iiop"; } - /** - *

    Returns an IIOP stub.

    - * The stub might not yet be connected to the ORB. The stub will - * be serializable only if it is connected to the ORB. - * @return an IIOP stub. - * @exception IOException if the stub cannot be created - e.g the - * RMIIIOPServerImpl has not been exported yet. - **/ + @Override public Remote toStub() throws IOException { - // javax.rmi.CORBA.Stub stub = - // (javax.rmi.CORBA.Stub) PortableRemoteObject.toStub(this); - final Remote stub = IIOPHelper.toStub(this); - // java.lang.System.out.println("NON CONNECTED STUB " + stub); - // org.omg.CORBA.ORB orb = - // org.omg.CORBA.ORB.init((String[])null, (Properties)null); - // stub.connect(orb); - // java.lang.System.out.println("CONNECTED STUB " + stub); - return stub; + throw new UnsupportedOperationException(); } - /** - *

    Creates a new client connection as an RMI object exported - * through IIOP. - * - * @param connectionId the ID of the new connection. Every - * connection opened by this connector server will have a - * different ID. The behavior is unspecified if this parameter is - * null. - * - * @param subject the authenticated subject. Can be null. - * - * @return the newly-created RMIConnection. - * - * @exception IOException if the new client object cannot be - * created or exported. - */ + @Override protected RMIConnection makeClient(String connectionId, Subject subject) throws IOException { - - if (connectionId == null) - throw new NullPointerException("Null connectionId"); - - RMIConnection client = - new RMIConnectionImpl(this, connectionId, getDefaultClassLoader(), - subject, env); - IIOPHelper.exportObject(client); - return client; + throw new UnsupportedOperationException(); } + @Override protected void closeClient(RMIConnection client) throws IOException { - IIOPHelper.unexportObject(client); + throw new UnsupportedOperationException(); } - /** - *

    Called by {@link #close()} to close the connector server by - * unexporting this object. After returning from this method, the - * connector server must not accept any new connections.

    - * - * @exception IOException if the attempt to close the connector - * server failed. - */ + @Override protected void closeServer() throws IOException { - IIOPHelper.unexportObject(this); + throw new UnsupportedOperationException(); } @Override RMIConnection doNewClient(final Object credentials) throws IOException { - if (callerACC == null) { - throw new SecurityException("AccessControlContext cannot be null"); - } - try { - return AccessController.doPrivileged( - new PrivilegedExceptionAction() { - public RMIConnection run() throws IOException { - return superDoNewClient(credentials); - } - }, callerACC); - } catch (PrivilegedActionException pae) { - throw (IOException) pae.getCause(); - } + throw new UnsupportedOperationException(); } - - RMIConnection superDoNewClient(Object credentials) throws IOException { - return super.doNewClient(credentials); - } - - private final Map env; - private final AccessControlContext callerACC; } diff --git a/jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIServerImpl.java b/jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIServerImpl.java index 323f6bb2c2b..957a08e2535 100644 --- a/jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIServerImpl.java +++ b/jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIServerImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2015, 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,8 +61,7 @@ import javax.security.auth.Subject; * or by instantiating {@link RMIConnector}.

    * *

    This is an abstract class. Concrete subclasses define the - * details of the client connection objects, such as whether they use - * JRMP or IIOP.

    + * details of the client connection objects.

    * * @since 1.5 */ @@ -307,7 +306,7 @@ public abstract class RMIServerImpl implements Closeable, RMIServer { /** *

    Returns the protocol string for this object. The string is - * rmi for RMI/JRMP and iiop for RMI/IIOP. + * rmi for RMI/JRMP. * * @return the protocol string for this object. */ diff --git a/jdk/src/java.management/share/classes/javax/management/remote/rmi/package.html b/jdk/src/java.management/share/classes/javax/management/remote/rmi/package.html index 09b09a3021e..9669be24397 100644 --- a/jdk/src/java.management/share/classes/javax/management/remote/rmi/package.html +++ b/jdk/src/java.management/share/classes/javax/management/remote/rmi/package.html @@ -2,7 +2,7 @@ RMI connector + + + + + InvisibleParentTest + + + +

    InvisibleParentTest
    Bug ID: 6401700, 6412803

    + +

    See the dialog box (usually in upper left corner) for instructions

    + + + + diff --git a/jdk/test/java/awt/Modal/InvisibleParentTest/InvisibleParentTest.java b/jdk/test/java/awt/Modal/InvisibleParentTest/InvisibleParentTest.java new file mode 100644 index 00000000000..494369cd91a --- /dev/null +++ b/jdk/test/java/awt/Modal/InvisibleParentTest/InvisibleParentTest.java @@ -0,0 +1,235 @@ +/* + * Copyright (c) 2013, 2015, 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 6401700 6412803 + @summary Tests that modal dialog is shown on the screen and +iconified/restored correctly if some of its blocked windows are invisible + @author artem.ananiev: area=awt.modal + @run applet/manual=yesno InvisibleParentTest.html +*/ + +import java.applet.Applet; +import java.awt.BorderLayout; +import java.awt.Button; +import java.awt.Component; +import java.awt.Dialog; +import java.awt.Frame; +import java.awt.TextArea; +import java.awt.Window; + +public class InvisibleParentTest extends Applet +{ + public void init() + { + setLayout(new BorderLayout()); + + String[] instructions = + { + "If your system is Windows, press PASS button.", + "When the test starts two windows should appear: frame G1 and", + " dialog D1. Another one frame F1 should be minimized.", + " If the dialog is not shown (minimizied), press FAIL button.", + "Then minimize frame G1 and restore F1. If the dialog D1 is not", + " restored together with F1, press FAIL, else PASS" + }; + Sysout.createDialogWithInstructions( instructions ); + } + + public void start () + { + Button b; + + setSize (200,200); + setVisible(true); + validate(); + + Component c = this; + while ((c != null) && !(c instanceof Window)) + { + c = c.getParent(); + } + if (c != null) + { + ((Window)c).setModalExclusionType(Dialog.ModalExclusionType.APPLICATION_EXCLUDE); + } + + Frame f1 = new Frame("F1"); + f1.setBounds(100, 300, 100, 100); + f1.setVisible(true); + f1.setExtendedState(Frame.ICONIFIED); + + Frame g1 = new Frame("G1"); + g1.setBounds(150, 350, 100, 100); + g1.setVisible(true); + + final Dialog d1 = new Dialog((Frame)null, "D1", Dialog.ModalityType.APPLICATION_MODAL); + d1.setBounds(200, 400, 100, 100); + new Thread(new Runnable() + { + public void run() + { + d1.setVisible(true); + } + }).start(); + } +} + +/**************************************************** + Standard Test Machinery + DO NOT modify anything below -- it's a standard + chunk of code whose purpose is to make user + interaction uniform, and thereby make it simpler + to read and understand someone else's test. + ****************************************************/ + +/** + This is part of the standard test machinery. + It creates a dialog (with the instructions), and is the interface + for sending text messages to the user. + To print the instructions, send an array of strings to Sysout.createDialog + WithInstructions method. Put one line of instructions per array entry. + To display a message for the tester to see, simply call Sysout.println + with the string to be displayed. + This mimics System.out.println but works within the test harness as well + as standalone. + */ + +class Sysout +{ + private static TestDialog dialog; + + public static void createDialogWithInstructions( String[] instructions ) + { + dialog = new TestDialog( new Frame(), "Instructions" ); + dialog.printInstructions( instructions ); + dialog.setVisible(true); + println( "Any messages for the tester will display here." ); + } + + public static void createDialog( ) + { + dialog = new TestDialog( new Frame(), "Instructions" ); + String[] defInstr = { "Instructions will appear here. ", "" } ; + dialog.printInstructions( defInstr ); + dialog.setVisible(true); + println( "Any messages for the tester will display here." ); + } + + + public static void printInstructions( String[] instructions ) + { + dialog.printInstructions( instructions ); + } + + + public static void println( String messageIn ) + { + dialog.displayMessage( messageIn ); + } + +}// Sysout class + +/** + This is part of the standard test machinery. It provides a place for the + test instructions to be displayed, and a place for interactive messages + to the user to be displayed. + To have the test instructions displayed, see Sysout. + To have a message to the user be displayed, see Sysout. + Do not call anything in this dialog directly. + */ +class TestDialog extends Dialog +{ + + TextArea instructionsText; + TextArea messageText; + int maxStringLength = 80; + + //DO NOT call this directly, go through Sysout + public TestDialog( Frame frame, String name ) + { + super( frame, name ); + setModalExclusionType(Dialog.ModalExclusionType.APPLICATION_EXCLUDE); + int scrollBoth = TextArea.SCROLLBARS_BOTH; + instructionsText = new TextArea( "", 15, maxStringLength, scrollBoth ); + add( "North", instructionsText ); + + messageText = new TextArea( "", 5, maxStringLength, scrollBoth ); + add("Center", messageText); + + pack(); + + setVisible(true); + }// TestDialog() + + //DO NOT call this directly, go through Sysout + public void printInstructions( String[] instructions ) + { + //Clear out any current instructions + instructionsText.setText( "" ); + + //Go down array of instruction strings + + String printStr, remainingStr; + for( int i=0; i < instructions.length; i++ ) + { + //chop up each into pieces maxSringLength long + remainingStr = instructions[ i ]; + while( remainingStr.length() > 0 ) + { + //if longer than max then chop off first max chars to print + if( remainingStr.length() >= maxStringLength ) + { + //Try to chop on a word boundary + int posOfSpace = remainingStr. + lastIndexOf( ' ', maxStringLength - 1 ); + + if( posOfSpace <= 0 ) posOfSpace = maxStringLength - 1; + + printStr = remainingStr.substring( 0, posOfSpace + 1 ); + remainingStr = remainingStr.substring( posOfSpace + 1 ); + } + //else just print + else + { + printStr = remainingStr; + remainingStr = ""; + } + + instructionsText.append( printStr + "\n" ); + + }// while + + }// for + + }//printInstructions() + + //DO NOT call this directly, go through Sysout + public void displayMessage( String messageIn ) + { + messageText.append( messageIn + "\n" ); + System.out.println(messageIn); + } + +}// TestDialog class diff --git a/jdk/test/java/awt/PrintJob/Text/StringWidth.java b/jdk/test/java/awt/PrintJob/Text/StringWidth.java index 6773b7f6f96..2990672613f 100644 --- a/jdk/test/java/awt/PrintJob/Text/StringWidth.java +++ b/jdk/test/java/awt/PrintJob/Text/StringWidth.java @@ -23,7 +23,6 @@ import java.awt.*; import java.util.Properties; -import sun.awt.*; public class StringWidth extends Frame { From 61cfd94c6c9502a3cdb04f4c6aae0e04a93246ab Mon Sep 17 00:00:00 2001 From: Shilpi Rastogi Date: Tue, 8 Sep 2015 16:01:29 +0400 Subject: [PATCH 59/94] 8135176: Moving test from javax/swing/plaf/basic/BasicHTML/4960629 to test/javax/swing/plaf/basic/BasicHTML/4960629 Reviewed-by: azvegint, alexsch --- .../javax/swing/plaf/basic/BasicHTML/4960629/bug4960629.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename jdk/{ => test}/javax/swing/plaf/basic/BasicHTML/4960629/bug4960629.java (100%) diff --git a/jdk/javax/swing/plaf/basic/BasicHTML/4960629/bug4960629.java b/jdk/test/javax/swing/plaf/basic/BasicHTML/4960629/bug4960629.java similarity index 100% rename from jdk/javax/swing/plaf/basic/BasicHTML/4960629/bug4960629.java rename to jdk/test/javax/swing/plaf/basic/BasicHTML/4960629/bug4960629.java From 5ecb0a7e9edf1c54afb0badc4212def8bc2398e4 Mon Sep 17 00:00:00 2001 From: Shilpi Rastogi Date: Wed, 9 Sep 2015 10:31:59 +0300 Subject: [PATCH 60/94] 8005914: [TEST_BUG] The last column header does not contain "..." Reviewed-by: alexsch, serb --- .../JTableHeader/6442918/bug6442918a.java | 87 +++++++++++++++++++ jdk/test/javax/swing/regtesthelpers/Util.java | 39 +++++++++ 2 files changed, 126 insertions(+) create mode 100644 jdk/test/javax/swing/JTableHeader/6442918/bug6442918a.java diff --git a/jdk/test/javax/swing/JTableHeader/6442918/bug6442918a.java b/jdk/test/javax/swing/JTableHeader/6442918/bug6442918a.java new file mode 100644 index 00000000000..476ae0ec43e --- /dev/null +++ b/jdk/test/javax/swing/JTableHeader/6442918/bug6442918a.java @@ -0,0 +1,87 @@ +/* + * Copyright (c) 2015, 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 6442918 8005914 + @summary Ensures that empty table headers do not show "..." + @author Shannon Hickey + @library ../../regtesthelpers + @build Util + @run main/manual bug6442918a + @requires os.family == "windows" +*/ + +import java.awt.BorderLayout; +import java.awt.Dimension; +import javax.swing.JDialog; +import javax.swing.JFrame; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JTable; +import javax.swing.JTextArea; +import javax.swing.SwingUtilities; +import javax.swing.UIManager; +import javax.swing.table.DefaultTableCellRenderer; + + +public class bug6442918a { + + public static void main(String[] args) throws Throwable, Exception { + SwingUtilities.invokeAndWait(new Runnable() { + public void run() { + try { + UIManager.setLookAndFeel("com.sun.java.swing.plaf" + + ".windows.WindowsLookAndFeel"); + } catch (Exception e) { + // test is for Windows look and feel + throw new RuntimeException("Test is only for WLaF." + + e.getMessage()); + } + runTest(); + } + }); + } + + private static void runTest() { + JDialog dialog = Util + .createModalDialogWithPassFailButtons("Empty header showing \"...\""); + String[] columnNames = {"", "", "", "", "Testing"}; + String[][] data = {{"1", "2", "3", "4", "5"}}; + JTable table = new JTable(data, columnNames); + DefaultTableCellRenderer renderer = new DefaultTableCellRenderer(); + int tableCellWidth = renderer.getFontMetrics(renderer.getFont()) + .stringWidth("test"); + table.setPreferredScrollableViewportSize(new Dimension( + 5 * tableCellWidth, 50)); + JPanel p = new JPanel(); + p.add(new JScrollPane(table)); + dialog.add(p, BorderLayout.NORTH); + JTextArea area = new JTextArea(); + String txt = "\nInstructions:\n\n"; + txt += "Only the last column header should show \"...\"."; + area.setText(txt); + dialog.add(new JScrollPane(area), BorderLayout.CENTER); + dialog.pack(); + dialog.setVisible(true); + } +} diff --git a/jdk/test/javax/swing/regtesthelpers/Util.java b/jdk/test/javax/swing/regtesthelpers/Util.java index 52fbf60a10d..534d99796ed 100644 --- a/jdk/test/javax/swing/regtesthelpers/Util.java +++ b/jdk/test/javax/swing/regtesthelpers/Util.java @@ -41,6 +41,7 @@ import java.util.concurrent.Callable; */ public class Util { + /** * Convert a rectangle from coordinate system of Component c to * screen coordinate system. @@ -266,4 +267,42 @@ public class Util { result.add(KeyEvent.VK_ALT); return result; } + + /** + * Creates and returns a JDialog with two button, one that says pass, + * another that says fail. The fail button is wired to call + * uiTestFailed with failString and the pass + * button is wired to invoked uiTestPassed. + *

    The content pane of the JDialog uses a BorderLayout with the + * buttons inside a horizontal box with filler between them and the + * pass button on the left. + *

    The returned Dialog has not been packed, or made visible, it is + * up to the caller to do that (after putting in some useful components). + */ + public static JDialog createModalDialogWithPassFailButtons(final String failString) { + JDialog retDialog = new JDialog(); + Box buttonBox = Box.createHorizontalBox(); + JButton passButton = new JButton("Pass"); + JButton failButton = new JButton("Fail"); + + passButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent ae) { + retDialog.dispose(); + } + }); + failButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent ae) { + retDialog.dispose(); + throw new RuntimeException("Test failed. " + failString); + } + }); + retDialog.setTitle("Test"); + retDialog.setModalityType(Dialog.ModalityType.APPLICATION_MODAL); + buttonBox.add(passButton); + buttonBox.add(Box.createGlue()); + buttonBox.add(failButton); + retDialog.getContentPane().add(buttonBox, BorderLayout.SOUTH); + retDialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); + return retDialog; + } } From cb34d07ae1c0cdccad13447abe8f9bcb09843aa5 Mon Sep 17 00:00:00 2001 From: Anton Nashatyrev Date: Wed, 9 Sep 2015 19:10:38 +0300 Subject: [PATCH 61/94] 8081485: EDT auto shutdown is broken in case of new event queue usage Reviewed-by: serb, alexp --- .../share/classes/java/awt/EventQueue.java | 12 +- .../EventQueuePushAutoshutdown.java | 75 +++++++++ .../EventQueuePushAutoshutdown.sh | 159 ++++++++++++++++++ 3 files changed, 241 insertions(+), 5 deletions(-) create mode 100644 jdk/test/java/awt/Toolkit/AutoShutdown/EventQueuePush/EventQueuePushAutoshutdown.java create mode 100644 jdk/test/java/awt/Toolkit/AutoShutdown/EventQueuePush/EventQueuePushAutoshutdown.sh diff --git a/jdk/src/java.desktop/share/classes/java/awt/EventQueue.java b/jdk/src/java.desktop/share/classes/java/awt/EventQueue.java index 620c3c4ece8..ae728fe295f 100644 --- a/jdk/src/java.desktop/share/classes/java/awt/EventQueue.java +++ b/jdk/src/java.desktop/share/classes/java/awt/EventQueue.java @@ -899,11 +899,13 @@ public class EventQueue { } } - // Wake up EDT waiting in getNextEvent(), so it can - // pick up a new EventQueue. Post the waking event before - // topQueue.nextQueue is assigned, otherwise the event would - // go newEventQueue - topQueue.postEventPrivate(new InvocationEvent(topQueue, dummyRunnable)); + if (topQueue.dispatchThread != null) { + // Wake up EDT waiting in getNextEvent(), so it can + // pick up a new EventQueue. Post the waking event before + // topQueue.nextQueue is assigned, otherwise the event would + // go newEventQueue + topQueue.postEventPrivate(new InvocationEvent(topQueue, dummyRunnable)); + } newEventQueue.previousQueue = topQueue; topQueue.nextQueue = newEventQueue; diff --git a/jdk/test/java/awt/Toolkit/AutoShutdown/EventQueuePush/EventQueuePushAutoshutdown.java b/jdk/test/java/awt/Toolkit/AutoShutdown/EventQueuePush/EventQueuePushAutoshutdown.java new file mode 100644 index 00000000000..b1c0237c4bf --- /dev/null +++ b/jdk/test/java/awt/Toolkit/AutoShutdown/EventQueuePush/EventQueuePushAutoshutdown.java @@ -0,0 +1,75 @@ +/* + * Copyright (c) 2015, 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 8081485 + @summary tests that a program terminates automatically after EventQueue.push() + @author Anton Nashatyrev : area=toolkit +*/ + +import java.awt.*; + +public class EventQueuePushAutoshutdown implements Runnable { + private volatile int status = 2; + + public EventQueuePushAutoshutdown() throws Exception { + Runtime.getRuntime().addShutdownHook(new Thread(this)); + Thread thread = new Thread() { + @Override + public void run() { + status = 0; + try { + Thread.sleep(10000); + } catch (InterruptedException e) { + e.printStackTrace(); + } finally { + status = 1; + System.exit(status); + } + } + }; + thread.setDaemon(true); + thread.start(); + + System.setProperty("java.awt.headless", "true"); + final EventQueue systemQueue = Toolkit.getDefaultToolkit().getSystemEventQueue(); + systemQueue.push(new EventQueue()); + EventQueue.invokeAndWait(new Runnable() { + @Override + public void run() { + System.out.println("Activated EDT"); + } + }); + System.out.println("After EDT activation"); + } + + public static void main(String[] args) throws Exception { + new EventQueuePushAutoshutdown(); + } + + @Override + public void run() { + Runtime.getRuntime().halt(status); + } +} diff --git a/jdk/test/java/awt/Toolkit/AutoShutdown/EventQueuePush/EventQueuePushAutoshutdown.sh b/jdk/test/java/awt/Toolkit/AutoShutdown/EventQueuePush/EventQueuePushAutoshutdown.sh new file mode 100644 index 00000000000..b88becb681c --- /dev/null +++ b/jdk/test/java/awt/Toolkit/AutoShutdown/EventQueuePush/EventQueuePushAutoshutdown.sh @@ -0,0 +1,159 @@ +#!/bin/ksh -p + +# +# Copyright (c) 20015, 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 EventQueuePushAutoshutdown.sh +# @bug 8081485 +# @summary tests that a program terminates automatically +# after EventQueue.push() +# @author Anton Nashatyrev : area=toolkit +# +# @compile EventQueuePushAutoshutdown.java +# @run shell EventQueuePushAutoshutdown.sh + + +# Beginning of subroutines: +status=1 + +#Call this from anywhere to fail the test with an error message +# usage: fail "reason why the test failed" +fail() + { echo "The test failed :-(" + echo "$*" 1>&2 + echo "exit status was $status" + exit $status + } #end of fail() + +#Call this from anywhere to pass the test with a message +# usage: pass "reason why the test passed if applicable" +pass() + { echo "The test passed!!!" + echo "$*" 1>&2 + exit 0 + } #end of pass() + +# end of subroutines + + +# The beginning of the script proper +OS=`uname -s` +case "$OS" in + SunOS | Linux | Darwin | CYGWIN* ) + FILESEP="/" + ;; + + Windows_95 | Windows_98 | Windows_NT | Windows_ME ) + FILESEP="\\" + ;; + + # catch all other OSs + * ) + echo "Unrecognized system! $OS" + fail "Unrecognized system! $OS" + ;; +esac + + +# Want this test to run standalone as well as in the harness, so do the +# following to copy the test's directory into the harness's scratch directory +# and set all appropriate variables: + +if [ -z "${TESTJAVA}" ] ; then + # TESTJAVA is not set, so the test is running stand-alone. + # TESTJAVA holds the path to the root directory of the build of the JDK + # to be tested. That is, any java files run explicitly in this shell + # should use TESTJAVA in the path to the java interpreter. + # So, we'll set this to the JDK spec'd on the command line. If none + # is given on the command line, tell the user that and use a cheesy + # default. + # THIS IS THE JDK BEING TESTED. + if [ -n "$1" ] ; + then TESTJAVA=$1 + else fail "no JDK specified on command line!" + fi + TESTSRC=. + TESTCLASSES=. + STANDALONE=1; +fi +echo "JDK under test is: $TESTJAVA" + +#Deal with .class files: +if [ -n "${STANDALONE}" ] ; + then + #if standalone, remind user to cd to dir. containing test before running it + echo "Just a reminder: cd to the dir containing this test when running it" + # then compile all .java files (if there are any) into .class files + if [ -a *.java ] ; + then echo "Reminder, this test should be in its own directory with all" + echo "supporting files it needs in the directory with it." + ${TESTJAVA}/bin/javac ./*.java ; + fi + # else in harness so copy all the class files from where jtreg put them + # over to the scratch directory this test is running in. + else cp ${TESTCLASSES}/*.class . ; +fi + +#if in test harness, then copy the entire directory that the test is in over +# to the scratch directory. This catches any support files needed by the test. +if [ -z "${STANDALONE}" ] ; + then cp ${TESTSRC}/* . +fi + +#Just before executing anything, make sure it has executable permission! +chmod 777 ./* + +############### YOUR TEST CODE HERE!!!!!!! ############# + +#All files required for the test should be in the same directory with +# this file. If converting a standalone test to run with the harness, +# as long as all files are in the same directory and it returns 0 for +# pass, you should be able to cut and paste it into here and it will +# run with the test harness. + +${TESTJAVA}/bin/java EventQueuePushAutoshutdown + +############### END YOUR TEST CODE !!!!! ############ +#Be sure the last command executed above this line returns 0 for success, +# something non-zero for failure. +status=$? + +# pass or fail the test based on status of the command +case "$status" in + 0 ) + pass "" + ;; + + 1 ) + fail "The program didn't automatically shut down" + ;; + + * ) + fail "The program terminated unexpectedly!" + ;; +esac + +#For additional examples of how to write platform independent KSH scripts, +# see the jtreg file itself. It is a KSH script for both Solaris and Win32 + From 08da3be647ff911b81ec1359908b52e769bb06b5 Mon Sep 17 00:00:00 2001 From: Rajeev Chamyal Date: Thu, 10 Sep 2015 17:02:30 +0400 Subject: [PATCH 62/94] 8032568: Test javax/swing/JInternalFrame/8020708/bug8020708.java fails on Windows virtual hosts Reviewed-by: serb, alexsch --- .../swing/JInternalFrame/8020708/bug8020708.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/jdk/test/javax/swing/JInternalFrame/8020708/bug8020708.java b/jdk/test/javax/swing/JInternalFrame/8020708/bug8020708.java index 9aaa5afe2e0..3a3f82b0fe8 100644 --- a/jdk/test/javax/swing/JInternalFrame/8020708/bug8020708.java +++ b/jdk/test/javax/swing/JInternalFrame/8020708/bug8020708.java @@ -35,7 +35,7 @@ import javax.swing.UIManager; /** * @test - * @bug 8020708 + * @bug 8020708 8032568 * @author Alexander Scherbatiy * @summary NLS: mnemonics missing in SwingSet2/JInternalFrame demo * @library ../../regtesthelpers @@ -111,8 +111,14 @@ public class bug8020708 { Util.hitKeys(robot, KeyEvent.VK_CONTROL, KeyEvent.VK_SPACE); robot.waitForIdle(); - - Util.hitKeys(robot, KeyEvent.VK_C); + int keyCode = KeyEvent.VK_C; + String mnemonic = UIManager + .getString("InternalFrameTitlePane.closeButton.mnemonic"); + try { + keyCode = Integer.parseInt(mnemonic); + } catch (NumberFormatException e) { + } + Util.hitKeys(robot, keyCode); robot.waitForIdle(); robot.delay(500); From cedeb8472535f0dc76f334e26f48ae869dbd3959 Mon Sep 17 00:00:00 2001 From: Sergey Bylokhov Date: Fri, 11 Sep 2015 15:03:53 +0300 Subject: [PATCH 63/94] 7131835: [TEST_BUG] Test does not consider that the rounded edges of the window in Mac OS 10.7 Reviewed-by: azvegint, yan --- jdk/test/sun/java2d/OpenGL/CopyAreaOOB.java | 146 ++++++++++++++++++++ 1 file changed, 146 insertions(+) create mode 100644 jdk/test/sun/java2d/OpenGL/CopyAreaOOB.java diff --git a/jdk/test/sun/java2d/OpenGL/CopyAreaOOB.java b/jdk/test/sun/java2d/OpenGL/CopyAreaOOB.java new file mode 100644 index 00000000000..9129bb1d05d --- /dev/null +++ b/jdk/test/sun/java2d/OpenGL/CopyAreaOOB.java @@ -0,0 +1,146 @@ +/* + * Copyright (c) 2015, 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 6430601 + * @summary Verifies that copyArea() works properly when the + * destination parameters are outside the destination bounds. + * @run main/othervm CopyAreaOOB + * @run main/othervm -Dsun.java2d.opengl=True CopyAreaOOB + * @author campbelc + */ + +import java.awt.*; +import java.awt.image.*; + +public class CopyAreaOOB extends Canvas { + + private static boolean done; + + public void paint(Graphics g) { + synchronized (this) { + if (done) { + return; + } + } + + int w = getWidth(); + int h = getHeight(); + + Graphics2D g2d = (Graphics2D)g; + g2d.setColor(Color.black); + g2d.fillRect(0, 0, w, h); + + g2d.setColor(Color.green); + g2d.fillRect(0, 0, w, 10); + + g2d.setColor(Color.red); + g2d.fillRect(0, 10, 50, h-10); + + // copy the region such that part of it goes below the bottom of the + // destination surface + g2d.copyArea(0, 10, 50, h-10, 60, 10); + + Toolkit.getDefaultToolkit().sync(); + + synchronized (this) { + done = true; + notifyAll(); + } + } + + public Dimension getPreferredSize() { + return new Dimension(400, 400); + } + + private static void testRegion(BufferedImage bi, String name, + int x1, int y1, int x2, int y2, + int expected) + { + for (int y = y1; y < y2; y++) { + for (int x = x1; x < x2; x++) { + int actual = bi.getRGB(x, y); + if (actual != expected) { + throw new RuntimeException("Test failed for " + name + + " region at x="+x+" y="+y+ + " (expected="+ + Integer.toHexString(expected) + + " actual="+ + Integer.toHexString(actual) + + ")"); + } + } + } + } + + public static void main(String[] args) { + boolean show = (args.length == 1) && ("-show".equals(args[0])); + + CopyAreaOOB test = new CopyAreaOOB(); + Frame frame = new Frame(); + frame.setUndecorated(true); + frame.add(test); + frame.pack(); + frame.setLocationRelativeTo(null); + frame.setVisible(true); + + // Wait until the component's been painted + synchronized (test) { + while (!done) { + try { + test.wait(); + } catch (InterruptedException e) { + throw new RuntimeException("Failed: Interrupted"); + } + } + } + + try { + Thread.sleep(2000); + } catch (InterruptedException ex) {} + + // Grab the screen region + BufferedImage capture = null; + try { + Robot robot = new Robot(); + Point pt1 = test.getLocationOnScreen(); + Rectangle rect = new Rectangle(pt1.x, pt1.y, 400, 400); + capture = robot.createScreenCapture(rect); + } catch (Exception e) { + throw new RuntimeException("Problems creating Robot"); + } finally { + if (!show) { + frame.dispose(); + } + } + + // Test pixels + testRegion(capture, "green", 0, 0, 400, 10, 0xff00ff00); + testRegion(capture, "original red", 0, 10, 50, 400, 0xffff0000); + testRegion(capture, "background", 50, 10, 60, 400, 0xff000000); + testRegion(capture, "in-between", 60, 10, 110, 20, 0xff000000); + testRegion(capture, "copied red", 60, 20, 110, 400, 0xffff0000); + testRegion(capture, "background", 110, 10, 400, 400, 0xff000000); + } +} From 9c7443b15a03dff5857f478ade4d58887e5b1dc6 Mon Sep 17 00:00:00 2001 From: Rajeev Chamyal Date: Fri, 11 Sep 2015 17:12:16 +0400 Subject: [PATCH 64/94] 8025082: The behaviour of the highlight will be lost after clicking the set button Reviewed-by: serb, alexsch --- .../javax/swing/text/DefaultCaret.java | 13 +++ .../javax/swing/JTextPane/bug8025082.java | 108 ++++++++++++++++++ 2 files changed, 121 insertions(+) create mode 100644 jdk/test/javax/swing/JTextPane/bug8025082.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/DefaultCaret.java b/jdk/src/java.desktop/share/classes/javax/swing/text/DefaultCaret.java index 729c62a964c..f474ac79add 100644 --- a/jdk/src/java.desktop/share/classes/javax/swing/text/DefaultCaret.java +++ b/jdk/src/java.desktop/share/classes/javax/swing/text/DefaultCaret.java @@ -860,6 +860,7 @@ public class DefaultCaret extends Rectangle implements Caret, FocusListener, Mou Highlighter.HighlightPainter p = getSelectionPainter(); try { selectionTag = h.addHighlight(p0, p1, p); + updateOwnsSelection(); } catch (BadLocationException bl) { selectionTag = null; } @@ -870,6 +871,7 @@ public class DefaultCaret extends Rectangle implements Caret, FocusListener, Mou Highlighter h = component.getHighlighter(); h.removeHighlight(selectionTag); selectionTag = null; + updateOwnsSelection(); } } } @@ -1110,6 +1112,7 @@ public class DefaultCaret extends Rectangle implements Caret, FocusListener, Mou if (selectionTag != null) { h.removeHighlight(selectionTag); selectionTag = null; + updateOwnsSelection(); } // otherwise, change or add the highlight } else { @@ -1120,6 +1123,7 @@ public class DefaultCaret extends Rectangle implements Caret, FocusListener, Mou Highlighter.HighlightPainter p = getSelectionPainter(); selectionTag = h.addHighlight(p0, p1, p); } + updateOwnsSelection(); } catch (BadLocationException e) { throw new StateInvariantError("Bad caret position"); } @@ -1170,6 +1174,7 @@ public class DefaultCaret extends Rectangle implements Caret, FocusListener, Mou if (this.dot != dot || this.dotBias != dotBias || selectionTag != null || forceCaretPositionChange) { changeCaretPosition(dot, dotBias); + updateOwnsSelection(); } this.markBias = this.dotBias; this.markLTR = dotLTR; @@ -1177,6 +1182,7 @@ public class DefaultCaret extends Rectangle implements Caret, FocusListener, Mou if ((h != null) && (selectionTag != null)) { h.removeHighlight(selectionTag); selectionTag = null; + updateOwnsSelection(); } } @@ -1925,6 +1931,13 @@ public class DefaultCaret extends Rectangle implements Caret, FocusListener, Mou } } + /** + * Updates ownsSelection based on text selection in the caret. + */ + private void updateOwnsSelection() { + ownsSelection = (selectionTag != null) + && SwingUtilities2.canAccessSystemClipboard(); + } private class DefaultFilterBypass extends NavigationFilter.FilterBypass { public Caret getCaret() { diff --git a/jdk/test/javax/swing/JTextPane/bug8025082.java b/jdk/test/javax/swing/JTextPane/bug8025082.java new file mode 100644 index 00000000000..1c92f763837 --- /dev/null +++ b/jdk/test/javax/swing/JTextPane/bug8025082.java @@ -0,0 +1,108 @@ +/* + * Copyright (c) 2015, 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 8025082 + * @summary The behaviour of the highlight will be lost after clicking the set + * button. + * @run main bug8025082 + */ +import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.InputEvent; +import javax.swing.*; + +public class bug8025082 { + + private static JButton button; + private static JFrame frame; + + public static void main(String[] args) throws Exception { + Robot robo = new Robot(); + robo.delay(500); + + SwingUtilities.invokeAndWait(new Runnable() { + public void run() { + createUI(); + } + }); + + robo.waitForIdle(); + Point point = getButtonLocationOnScreen(); + robo.mouseMove(point.x, point.y); + robo.mousePress(InputEvent.BUTTON1_MASK); + robo.mouseRelease(InputEvent.BUTTON1_MASK); + robo.waitForIdle(); + + SwingUtilities.invokeAndWait(new Runnable() { + public void run() { + frame.dispose(); + } + }); + } + + private static void createUI() { + frame = new JFrame(); + frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + frame.setSize(500, 500); + JTextPane textpane = new JTextPane(); + textpane.setText("Select Me"); + textpane.selectAll(); + + JPanel panel = new JPanel(new BorderLayout()); + panel.add(textpane, BorderLayout.CENTER); + button = new JButton("Press Me"); + panel.add(button, BorderLayout.SOUTH); + + button.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + if (!textpane.getCaret().isSelectionVisible()) { + throw new RuntimeException("Highlight removed after " + + "button click"); + } + } + }); + + frame.getContentPane().add(panel); + frame.setLocationRelativeTo(null); + frame.setVisible(true); + } + + private static Point getButtonLocationOnScreen() throws Exception { + final Point[] result = new Point[1]; + + SwingUtilities.invokeAndWait(new Runnable() { + @Override + public void run() { + Point point = button.getLocationOnScreen(); + point.x += button.getWidth() / 2; + point.y += button.getHeight() / 2; + result[0] = point; + } + }); + return result[0]; + } +} From da688f57c3822e0327ad717290bed88baa73bd17 Mon Sep 17 00:00:00 2001 From: Pooja Chopra Date: Fri, 11 Sep 2015 17:58:31 +0300 Subject: [PATCH 65/94] 8136354: [TEST_BUG] Test java/awt/image/RescaleOp/RescaleAlphaTest.java with Bad action for script Reviewed-by: azvegint, serb --- jdk/test/java/awt/image/RescaleOp/RescaleAlphaTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jdk/test/java/awt/image/RescaleOp/RescaleAlphaTest.java b/jdk/test/java/awt/image/RescaleOp/RescaleAlphaTest.java index b6b16eea158..39c6b8eeb2f 100644 --- a/jdk/test/java/awt/image/RescaleOp/RescaleAlphaTest.java +++ b/jdk/test/java/awt/image/RescaleOp/RescaleAlphaTest.java @@ -22,8 +22,8 @@ */ /** * @test - * @bug 8080287 - * @run RescaleAlphaTest + * @bug 8080287 8136354 + * @run main RescaleAlphaTest * @summary RescaleOp with scaleFactor/alpha should copy alpha to destination * channel */ From 20b057fc29bf0dbe275be018f5c5a7fece7e1d9a Mon Sep 17 00:00:00 2001 From: Weijun Wang Date: Sun, 13 Sep 2015 10:55:58 +0800 Subject: [PATCH 66/94] 8136425: KeystoreImpl.m using wrong type for cert format Reviewed-by: vinnie --- jdk/src/java.base/macosx/native/libosxsecurity/KeystoreImpl.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jdk/src/java.base/macosx/native/libosxsecurity/KeystoreImpl.m b/jdk/src/java.base/macosx/native/libosxsecurity/KeystoreImpl.m index 179151440da..cdc39aa7923 100644 --- a/jdk/src/java.base/macosx/native/libosxsecurity/KeystoreImpl.m +++ b/jdk/src/java.base/macosx/native/libosxsecurity/KeystoreImpl.m @@ -508,7 +508,7 @@ JNF_COCOA_ENTER(env); SecKeychainRef defaultKeychain = NULL; SecKeychainCopyDefault(&defaultKeychain); - SecExternalItemType dataType = (isCertificate == JNI_TRUE ? kSecFormatX509Cert : kSecFormatWrappedPKCS8); + SecExternalFormat dataFormat = (isCertificate == JNI_TRUE ? kSecFormatX509Cert : kSecFormatWrappedPKCS8); // Convert the password obj into a CFStringRef that the keychain importer can use for encryption. SecKeyImportExportParameters paramBlock; @@ -533,7 +533,7 @@ JNF_COCOA_ENTER(env); paramBlock.keyUsage = CSSM_KEYUSE_ANY; paramBlock.keyAttributes = CSSM_KEYATTR_RETURN_DEFAULT; - err = SecKeychainItemImport(cfDataToImport, NULL, &dataType, NULL, + err = SecKeychainItemImport(cfDataToImport, NULL, &dataFormat, NULL, 0, ¶mBlock, defaultKeychain, &createdItems); if (err == noErr) { From b6f5a1c457ee81e0243000fd2b8adcdbaf568a21 Mon Sep 17 00:00:00 2001 From: Ambarish Rapte Date: Mon, 14 Sep 2015 18:54:04 +0400 Subject: [PATCH 67/94] 8039467: [TEST_BUG] Test java/awt/Choice/UnfocusableToplevel/UnfocusableToplevel.java lefts keystrokes in a keyboard buffer on Windows Reviewed-by: serb, alexsch --- .../UnfocusableToplevel.java | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/jdk/test/java/awt/Choice/UnfocusableToplevel/UnfocusableToplevel.java b/jdk/test/java/awt/Choice/UnfocusableToplevel/UnfocusableToplevel.java index 9c3a56af5c4..bdde570b252 100644 --- a/jdk/test/java/awt/Choice/UnfocusableToplevel/UnfocusableToplevel.java +++ b/jdk/test/java/awt/Choice/UnfocusableToplevel/UnfocusableToplevel.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2015 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 6566434 + @bug 6566434 8039467 @library ../../regtesthelpers @build Util Sysout AbstractTest @summary Choice in unfocusable window responds to keyboard @@ -63,6 +63,18 @@ public class UnfocusableToplevel { w.setLayout(new FlowLayout()); w.setSize(200, 200); + // Note that Window w is non focusable. Key press events will not be + // consumed by w, but by any previously focused window & this can + // disturb the environment. So creating tempFrameToHoldFocus frame, + // to consume key press events. + Frame tempFrameToHoldFocus = new Frame(); + tempFrameToHoldFocus.setVisible(true); + Util.waitForIdle(robot); + + tempFrameToHoldFocus.requestFocus(); + Util.clickOnComp(tempFrameToHoldFocus, robot); + Util.waitForIdle(robot); + ch.addKeyListener(new KeyAdapter(){ public void keyTyped(KeyEvent e){ traceEvent("keytyped", e); @@ -94,6 +106,10 @@ public class UnfocusableToplevel { testKeys(); Util.waitForIdle(robot); + + tempFrameToHoldFocus.dispose(); + w.dispose(); + f.dispose(); } private static void testKeys(){ From f1f48ab0d390c3660639efcc43f4e6237cd4271b Mon Sep 17 00:00:00 2001 From: Artem Smotrakov Date: Mon, 14 Sep 2015 19:49:28 +0300 Subject: [PATCH 68/94] 8134232: KeyStore.load() throws an IOException with a wrong cause in case of wrong password Reviewed-by: vinnie --- .../com/sun/crypto/provider/JceKeyStore.java | 6 +- .../sun/security/pkcs12/PKCS12KeyStore.java | 4 +- .../sun/security/pkcs11/P11KeyStore.java | 19 +- .../security/KeyStore/TestKeyStoreBasic.java | 183 +++++++++++++----- .../security/provider/KeyStore/DKSTest.java | 43 +++- 5 files changed, 203 insertions(+), 52 deletions(-) diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/JceKeyStore.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/JceKeyStore.java index 0e3f1ed0566..ccf49b7a802 100644 --- a/jdk/src/java.base/share/classes/com/sun/crypto/provider/JceKeyStore.java +++ b/jdk/src/java.base/share/classes/com/sun/crypto/provider/JceKeyStore.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2015, 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 @@ -864,7 +864,9 @@ public final class JceKeyStore extends KeyStoreSpi { if (computed[i] != actual[i]) { throw new IOException( "Keystore was tampered with, or " - + "password was incorrect"); + + "password was incorrect", + new UnrecoverableKeyException( + "Password verification failed")); } } } diff --git a/jdk/src/java.base/share/classes/sun/security/pkcs12/PKCS12KeyStore.java b/jdk/src/java.base/share/classes/sun/security/pkcs12/PKCS12KeyStore.java index 162191ec850..a0fa9c781ed 100644 --- a/jdk/src/java.base/share/classes/sun/security/pkcs12/PKCS12KeyStore.java +++ b/jdk/src/java.base/share/classes/sun/security/pkcs12/PKCS12KeyStore.java @@ -51,6 +51,8 @@ import java.security.spec.PKCS8EncodedKeySpec; import java.util.*; import java.security.AlgorithmParameters; +import java.security.InvalidAlgorithmParameterException; +import java.security.InvalidKeyException; import javax.crypto.spec.PBEParameterSpec; import javax.crypto.spec.PBEKeySpec; import javax.crypto.spec.SecretKeySpec; @@ -2060,7 +2062,7 @@ public final class PKCS12KeyStore extends KeyStoreSpi { } if (!MessageDigest.isEqual(macData.getDigest(), macResult)) { - throw new SecurityException("Failed PKCS12" + + throw new UnrecoverableKeyException("Failed PKCS12" + " integrity checking"); } } catch (Exception e) { diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11KeyStore.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11KeyStore.java index 1fba98270e9..c630598f199 100644 --- a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11KeyStore.java +++ b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11KeyStore.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2015, 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 @@ -750,6 +750,21 @@ final class P11KeyStore extends KeyStoreSpi { } else { login(new PasswordCallbackHandler(password)); } + } catch(LoginException e) { + Throwable cause = e.getCause(); + if (cause instanceof PKCS11Exception) { + PKCS11Exception pe = (PKCS11Exception) cause; + if (pe.getErrorCode() == CKR_PIN_INCORRECT) { + // if password is wrong, the cause of the IOException + // should be an UnrecoverableKeyException + throw new IOException("load failed", + new UnrecoverableKeyException().initCause(e)); + } + } + throw new IOException("load failed", e); + } + + try { if (mapLabels() == true) { // CKA_LABELs are shared by multiple certs writeDisabled = true; @@ -757,7 +772,7 @@ final class P11KeyStore extends KeyStoreSpi { if (debug != null) { dumpTokenMap(); } - } catch (LoginException | KeyStoreException | PKCS11Exception e) { + } catch (KeyStoreException | PKCS11Exception e) { throw new IOException("load failed", e); } } diff --git a/jdk/test/java/security/KeyStore/TestKeyStoreBasic.java b/jdk/test/java/security/KeyStore/TestKeyStoreBasic.java index 00b46baf6a5..fe18a8943a5 100644 --- a/jdk/test/java/security/KeyStore/TestKeyStoreBasic.java +++ b/jdk/test/java/security/KeyStore/TestKeyStoreBasic.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2015, 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,36 +21,97 @@ * questions. */ -import static java.lang.System.out; - +import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.io.InputStream; +import java.security.KeyFactory; import java.security.KeyStore; import java.security.KeyStoreException; -import java.security.Provider; -import java.security.Security; -import javax.crypto.SecretKey; -import javax.crypto.spec.SecretKeySpec; +import java.security.NoSuchProviderException; +import java.security.PrivateKey; +import java.security.UnrecoverableKeyException; +import java.security.cert.Certificate; +import java.security.cert.CertificateFactory; +import java.security.spec.KeySpec; +import java.security.spec.PKCS8EncodedKeySpec; +import java.util.Base64; /* * @test - * @bug 8048621 - * @summary Test the basic operations of KeyStore, provided by SunJCE (jceks), - * and SunPKCS11-Solaris(PKCS11KeyStore) + * @bug 8048621 8133090 + * @summary Test basic operations with keystores (jks, jceks, pkcs12) * @author Yu-Ching Valerie PENG */ - public class TestKeyStoreBasic { + + private static final String PRIVATE_KEY_PKCS8_BASE64 = "" + + "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCpyz97liuWPDYcLH9TX8BiT78o" + + "lCmAfmevvch6ncXUVuCzbdaKuKXwn4EVbDszsVJLoK5zdtP+X3iDhutj+IgKmLhuczF3M9VIcWr+" + + "JJUyTH4+3h/RT8cjCDZOmk9iXkb5ifruVsLqzb9g+Vp140Oz7leikne7KmclHvTfvFd0WDI7Gb9v" + + "o4f5rT717BXJ/n+M6pNk8DLpLiEu6eziYvXRv5x+t5Go3x0eCXdaxEQUf2j876Wfr2qHRJK7lDfF" + + "e1DDsMg/KpKGiILYZ+g2qtVMZSxtp5BZEtfB5qV/IE5kWO+mCIAGpXSZIdbERR6pZUq8GLEe1T9e" + + "+sO6H24w2F19AgMBAAECggEBAId/12187dO6wUPCjumuJA1QrrBnbKdKONyai36uoc1Od4s5QFj7" + + "+hEIeS7rbGNYQuBvnkgusAbzkW0FIpxpHce3EJez/emux6pEOKoP77BwMt9gy+txyu0+BHi91FQg" + + "AGvrnQDO5EYVY4Cz/WjOsJzKu8zVLg+DS0Toa2qRFwmUe9mVAXPNOCZ3Oae/Q6tCDsaINNw0fmjj" + + "jn6uohPbS+n6xENG3FkQXB36getXy310xTGED2J27cmAQH6gLR6Kl2iROzNPbbpBqbuemI9kbcld" + + "EwBS1jRfZWeaPstYA1niVrE9UgUBzemnoh4TDkG076sYthHMr5QFGjPswnwtJ4ECgYEA0sURQ5+v" + + "baH4tdaemI3qpnknXTlzSpuZZmAoyvY0Id0mlduwKwmZ3Y5989wHfnnhFfyNO4IkTKjI2Wp97qP5" + + "4eqUNpA7FtNU7KUzMcFDTtwtNZuRYMrKlqo2lLbA+gVrAYpYZFL4b7tcwtX4DnYorDsmude6W8sG" + + "4Mx2VdFJC9UCgYEAzjsdXCYH5doWUHb0dvn9ID7IikffEMRM720MRjrnnnVbpzx6ACntkPDNZg7p" + + "TRE/mx7iBz81ZaUWE+V0wd0JvCHEdpAz3mksyvDFhU4Bgs6xzf2pSul5muhsx3hHcvvPezz5Bnxs" + + "faJlzkxfwotyGmvWN15GA/pyfsZjsbbTpwkCgYAO6NnbysQCIV8SnegCKqfatt9N/O5m7LLhRxQb" + + "p2bwrlA4cZ34rWkw/w9x3LK7A6wkfgUPnJkswxPSLXJTG05l6M4rPfCwIKr1Qopojp9QSMr569NQ" + + "4YeLOOc7heIIzbFQHpU6I5Rncv2Q2sn9W+ZsqJKIuvX34FjQNiZ406EzMQKBgHSxOGS61D84DuZK" + + "2Ps1awhC3kB4eHzJRms3vflDPWoJJ+pSKwpKrzUTPHXiPBqyhtYkPGszVeiE6CAr9sv3YZnFVaBs" + + "6hyQUJsob+uE/w/gGvXe8VsFDx0bJOodYfhrCbTHBHWqE81nBcocpxayxsayfAzqWB3KKd0YLrMR" + + "K2PZAoGAcZa8915R2m0KZ6HVJUt/JDR85jCbN71kcVDFY2XSFkOJvOdFoHNfRckfLzjq9Y2MSSTV" + + "+QDWbDo2doUQCejJUTaN8nP79tfyir24X5uVPvQaeVoGTKYb+LfUqK0F60lStmjuddIGSZH55y3v" + + "+9XjmxbVERtd1lqgQg3VlmKlEXY="; + + /* + * Certificate: + * Data: + * Version: 3 (0x2) + * Serial Number: 7 (0x7) + * Signature Algorithm: sha512WithRSAEncryption + * Issuer: CN=Root + * Validity + * Not Before: Sep 1 18:03:59 2015 GMT + * Not After : Jan 17 18:03:59 2043 GMT + * Subject: CN=EE + */ + private static final String CERTIFICATE = "" + + "-----BEGIN CERTIFICATE-----\n" + + "MIIDHTCCAgWgAwIBAgIBBzANBgkqhkiG9w0BAQ0FADAPMQ0wCwYDVQQDDARSb290\n" + + "MB4XDTE1MDkwMTE4MDM1OVoXDTQzMDExNzE4MDM1OVowDTELMAkGA1UEAwwCRUUw\n" + + "ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpyz97liuWPDYcLH9TX8Bi\n" + + "T78olCmAfmevvch6ncXUVuCzbdaKuKXwn4EVbDszsVJLoK5zdtP+X3iDhutj+IgK\n" + + "mLhuczF3M9VIcWr+JJUyTH4+3h/RT8cjCDZOmk9iXkb5ifruVsLqzb9g+Vp140Oz\n" + + "7leikne7KmclHvTfvFd0WDI7Gb9vo4f5rT717BXJ/n+M6pNk8DLpLiEu6eziYvXR\n" + + "v5x+t5Go3x0eCXdaxEQUf2j876Wfr2qHRJK7lDfFe1DDsMg/KpKGiILYZ+g2qtVM\n" + + "ZSxtp5BZEtfB5qV/IE5kWO+mCIAGpXSZIdbERR6pZUq8GLEe1T9e+sO6H24w2F19\n" + + "AgMBAAGjgYUwgYIwNAYDVR0fBC0wKzApoCegJYYjbGRhcDovL2xkYXAuaG9zdC5m\n" + + "b3IuY3JsZHAvbWFpbi5jcmwwSgYIKwYBBQUHAQEEPjA8MDoGCCsGAQUFBzAChi5s\n" + + "ZGFwOi8vbGRhcC5ob3N0LmZvci5haWEvZGM9Um9vdD9jQUNlcnRpZmljYXRlMA0G\n" + + "CSqGSIb3DQEBDQUAA4IBAQBWDfZHpuUx0yn5d3+BuztFqoks1MkGdk+USlH0TB1/\n" + + "gWWBd+4S4PCKlpSur0gj2rMW4fP5HQfNlHci8JV8/bG4KuKRAXW56dg1818Hl3pc\n" + + "iIrUSRn8uUjH3p9qb+Rb/u3mmVQRyJjN2t/zceNsO8/+Dd808OB9aEwGs8lMT0nn\n" + + "ZYaaAqYz1GIY/Ecyx1vfEZEQ1ljo6i/r70C3igbypBUShxSiGsleiVTLOGNA+MN1\n" + + "/a/Qh0bkaQyTGqK3bwvzzMeQVqWu2EWTBD/PmND5ExkpRICdv8LBVXfLnpoBr4lL\n" + + "hnxn9+e0Ah+t8dS5EKfn44w5bI5PCu2bqxs6RCTxNjcY\n" + + "-----END CERTIFICATE-----\n"; + private static final char[] PASSWD2 = new char[] { 'b', 'o', 'r', 'e', 'd' }; - private static final char[] PASSWDK = new String("cannot be null") + private static final char[] PASSWDK = "cannot be null" .toCharArray(); private static final String[] KS_Type = { "jks", "jceks", "pkcs12", "PKCS11KeyStore" }; - private static final String[] PRO_TYPE = { + private static final String[] PROVIDERS = { "SUN", "SunJCE", "SunJSSE", "SunPKCS11-Solaris" }; private static final String ALIAS_HEAD = "test"; @@ -61,41 +122,58 @@ public class TestKeyStoreBasic { } public void run() throws Exception { - Provider[] providers = Security.getProviders(); - for (Provider p: providers) { - String prvName = p.getName(); - if (prvName.startsWith("SunJCE") - || prvName.startsWith("SunPKCS11-Solaris")) { - try { - runTest(p); - out.println("Test with provider " + p.getName() + "" - + " passed"); - } catch (java.security.KeyStoreException e) { - if (prvName.startsWith("SunPKCS11-Solaris")) { - out.println("KeyStoreException is expected " - + "PKCS11KeyStore is invalid keystore type."); - e.printStackTrace(); - } else { - throw e; - } + for (String provider : PROVIDERS) { + try { + runTest(provider); + System.out.println("Test with provider " + provider + "passed"); + } catch (java.security.KeyStoreException e) { + if (provider.equals("SunPKCS11-Solaris")) { + System.out.println("KeyStoreException is expected: " + + "PKCS11KeyStore is invalid keystore type: " + e); + } else { + throw e; + } + } catch (NoSuchProviderException e) { + String osName = System.getProperty("os.name"); + if (provider.equals("SunPKCS11-Solaris") + && !osName.equals("SunOS")) { + System.out.println("Skip SunPKCS11-Solaris provider on " + + osName); + } else { + throw e; } } } } - public void runTest(Provider p) throws Exception { - SecretKey key = new SecretKeySpec( - new String("No one knows").getBytes(), "PBE"); + public void runTest(String provider) throws Exception { + + // load private key + // all keystore types should support private keys + KeySpec spec = new PKCS8EncodedKeySpec( + Base64.getMimeDecoder().decode(PRIVATE_KEY_PKCS8_BASE64)); + PrivateKey privateKey = KeyFactory.getInstance("RSA") + .generatePrivate(spec); + + // load x509 certificate + Certificate cert; + try (InputStream is = new BufferedInputStream( + new ByteArrayInputStream(CERTIFICATE.getBytes()))) { + cert = CertificateFactory.getInstance("X.509") + .generateCertificate(is); + } + int numEntries = 5; - String proName = p.getName(); String type = null; - for (int i = 0; i < PRO_TYPE.length; i++) { - if (proName.compareTo(PRO_TYPE[i]) == 0) { + for (int i = 0; i < PROVIDERS.length; i++) { + if (provider.compareTo(PROVIDERS[i]) == 0) { type = KS_Type[i]; break; } } - KeyStore ks = KeyStore.getInstance(type, p); + + System.out.printf("Test %s provider and %s keystore%n", provider, type); + KeyStore ks = KeyStore.getInstance(type, provider); KeyStore ks2 = KeyStore.getInstance(type, ks.getProvider().getName()); // create an empty key store @@ -103,7 +181,8 @@ public class TestKeyStoreBasic { // store the secret keys for (int j = 0; j < numEntries; j++) { - ks.setKeyEntry(ALIAS_HEAD + j, key, PASSWDK, null); + ks.setKeyEntry(ALIAS_HEAD + j, privateKey, PASSWDK, + new Certificate[] { cert }); } // initialize the 2nd key store object with the 1st one @@ -134,13 +213,18 @@ public class TestKeyStoreBasic { throw new RuntimeException( "ERROR: passed the loading with incorrect password"); } catch (IOException ex) { + System.out.println("Expected exception: " + ex); + if (!causedBy(ex, UnrecoverableKeyException.class)) { + ex.printStackTrace(System.out); + throw new RuntimeException("Unexpected cause"); + } + System.out.println("Expected cause: " + + UnrecoverableKeyException.class.getName()); + bais.reset(); ks.load(bais, PASSWD2); bais.reset(); ks.load(bais, null); - } finally { - bais.close(); - baos.close(); } // check key store type @@ -158,7 +242,6 @@ public class TestKeyStoreBasic { private void checkType(KeyStore obj, String type) { if (!obj.getType().equals(type)) { throw new RuntimeException("ERROR: wrong key store type"); - } } @@ -168,7 +251,6 @@ public class TestKeyStoreBasic { if (!obj.containsAlias(ALIAS_HEAD + k)) { throw new RuntimeException("ERROR: alias (" + k + ") should exist"); - } } } @@ -176,16 +258,25 @@ public class TestKeyStoreBasic { // compare the creation dates - true if all the same private void compareCreationDate(KeyStore o1, KeyStore o2, int range) throws KeyStoreException { - boolean result = true; - String alias = null; + String alias; for (int k = 0; k < range; k++) { alias = ALIAS_HEAD + k; if (!o1.getCreationDate(alias).equals(o2.getCreationDate(alias))) { throw new RuntimeException("ERROR: entry creation time (" + k + ") differs"); - } } } + // checks if an exception was caused by specified exception class + private static boolean causedBy(Exception e, Class klass) { + Throwable cause = e; + while ((cause = cause.getCause()) != null) { + if (cause.getClass().equals(klass)) { + return true; + } + } + return false; + } + } diff --git a/jdk/test/sun/security/provider/KeyStore/DKSTest.java b/jdk/test/sun/security/provider/KeyStore/DKSTest.java index a11210e7d47..dc63e82ecbd 100644 --- a/jdk/test/sun/security/provider/KeyStore/DKSTest.java +++ b/jdk/test/sun/security/provider/KeyStore/DKSTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2015, 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 @@ -60,7 +60,37 @@ public class DKSTest { new KeyStore.PasswordProtection("passphrase".toCharArray())); }}; + private static final Map + WRONG_PASSWORDS = new HashMap() {{ + put("policy_keystore", + new KeyStore.PasswordProtection( + "wrong".toCharArray())); + put("pw_keystore", + new KeyStore.PasswordProtection("wrong".toCharArray())); + put("eckeystore1", + new KeyStore.PasswordProtection("wrong".toCharArray())); + put("eckeystore2", + new KeyStore.PasswordProtection("wrong".toCharArray())); + }}; + public static void main(String[] args) throws Exception { + /* + * domain keystore: keystores with wrong passwords + */ + try { + URI config = new URI(CONFIG + "#keystores"); + KeyStore ks = KeyStore.getInstance("DKS"); + ks.load(new DomainLoadStoreParameter(config, WRONG_PASSWORDS)); + throw new RuntimeException("Expected exception not thrown"); + } catch (IOException e) { + System.out.println("Expected exception: " + e); + if (!causedBy(e, UnrecoverableKeyException.class)) { + e.printStackTrace(System.out); + throw new RuntimeException("Unexpected cause"); + } + System.out.println("Expected cause: " + e); + } + /* * domain keystore: system */ @@ -182,4 +212,15 @@ public class DKSTest { return factory.generateCertificate(certStream); } } + + // checks if an exception was caused by specified exception class + private static boolean causedBy(Exception e, Class klass) { + Throwable cause = e; + while ((cause = cause.getCause()) != null) { + if (cause.getClass().equals(klass)) { + return true; + } + } + return false; + } } From b8e4ae847655ded044c87c43022b8b3909fd9a60 Mon Sep 17 00:00:00 2001 From: Artem Smotrakov Date: Mon, 14 Sep 2015 19:54:58 +0300 Subject: [PATCH 69/94] 8048622: Enhance tests for PKCS11 keystores with NSS Reviewed-by: vinnie --- jdk/test/sun/security/pkcs11/PKCS11Test.java | 10 ++ .../security/pkcs11/Secmod/AddPrivateKey.java | 102 +++++++++--------- .../pkcs11/Secmod/AddTrustedCert.java | 46 +++++--- .../sun/security/pkcs11/Secmod/Crypto.java | 9 +- .../security/pkcs11/Secmod/GetPrivateKey.java | 18 ++-- .../security/pkcs11/Secmod/LoadKeystore.java | 94 ++++++++++++++++ 6 files changed, 200 insertions(+), 79 deletions(-) create mode 100644 jdk/test/sun/security/pkcs11/Secmod/LoadKeystore.java diff --git a/jdk/test/sun/security/pkcs11/PKCS11Test.java b/jdk/test/sun/security/pkcs11/PKCS11Test.java index 1b4c281048a..6ee011a294d 100644 --- a/jdk/test/sun/security/pkcs11/PKCS11Test.java +++ b/jdk/test/sun/security/pkcs11/PKCS11Test.java @@ -33,6 +33,8 @@ import java.security.spec.ECParameterSpec; public abstract class PKCS11Test { + static final String PKCS11 = "PKCS11"; + // directory of the test source static final String BASE = System.getProperty("test.src", "."); @@ -644,4 +646,12 @@ public abstract class PKCS11Test { return ""; } } + + static byte[] generateData(int length) { + byte data[] = new byte[length]; + for (int i=0; i entries = new ArrayList(); - for (String alias : Collections.list(jks.aliases())) { - if (jks.entryInstanceOf(alias, PrivateKeyEntry.class)) { - PrivateKeyEntry entry = (PrivateKeyEntry)jks.getEntry(alias, new PasswordProtection(jkspass)); - String algorithm = entry.getPrivateKey().getAlgorithm(); - System.out.println("-Entry " + alias + " (" + algorithm + ")"); - if ((supportsEC == false) && algorithm.equals("EC")) { - System.out.println("EC not supported by provider, skipping"); - continue; - } - if ((supportsEC == false) && algorithm.equals("DSA")) { - System.out.println("Provider does not appear to have CKA_NETSCAPE_DB fix, skipping"); - continue; - } - test(p, entry); - } // else ignore + try (InputStream in = new FileInputStream(BASE + SEP + "keystore.jks")) { + char[] jkspass = "passphrase".toCharArray(); + jks.load(in, jkspass); + for (String alias : Collections.list(jks.aliases())) { + if (jks.entryInstanceOf(alias, PrivateKeyEntry.class)) { + PrivateKeyEntry entry = (PrivateKeyEntry)jks.getEntry(alias, + new PasswordProtection(jkspass)); + String algorithm = entry.getPrivateKey().getAlgorithm(); + System.out.printf("-Entry %s (%s)%n", alias, algorithm); + if ((supportsEC == false) && algorithm.equals("EC")) { + System.out.println("EC not supported by provider, " + + "skipping"); + continue; + } + if ((supportsEC == false) && algorithm.equals("DSA")) { + System.out.println("Provider does not appear to have " + + "CKA_NETSCAPE_DB fix, skipping"); + continue; + } + test(p, entry); + } // else ignore + } } System.out.println("OK"); } @@ -92,10 +101,6 @@ public class AddPrivateKey extends SecmodTest { return Collections.list(ks.aliases()); } - private final static String ALIAS1 = "entry1"; - private final static String ALIAS2 = "entry2"; - private final static String ALIAS3 = "entry3"; - private static void test(Provider p, PrivateKeyEntry entry) throws Exception { PrivateKey key = entry.getPrivateKey(); X509Certificate[] chain = (X509Certificate[])entry.getCertificateChain(); @@ -122,11 +127,8 @@ public class AddPrivateKey extends SecmodTest { PrivateKey key2 = (PrivateKey)ks.getKey(ALIAS1, null); System.out.println(toString(key2)); - X509Certificate[] chain2 = (X509Certificate[])ks.getCertificateChain(ALIAS1); - // NSS makes token keys always sensitive, skip this check -// if (key.equals(key2) == false) { -// throw new Exception("key mismatch"); -// } + X509Certificate[] chain2 = + (X509Certificate[]) ks.getCertificateChain(ALIAS1); if (Arrays.equals(chain, chain2) == false) { throw new Exception("chain mismatch"); } @@ -154,7 +156,8 @@ public class AddPrivateKey extends SecmodTest { PrivateKey key4 = (PrivateKey)ks.getKey(ALIAS2, null); System.out.println(toString(key4)); - X509Certificate[] chain4 = (X509Certificate[])ks.getCertificateChain(ALIAS2); + X509Certificate[] chain4 = (X509Certificate[]) + ks.getCertificateChain(ALIAS2); if (Arrays.equals(chain, chain4) == false) { throw new Exception("chain mismatch"); } @@ -172,7 +175,8 @@ public class AddPrivateKey extends SecmodTest { PrivateKey key5 = (PrivateKey)ks.getKey(ALIAS3, null); System.out.println(toString(key5)); - X509Certificate[] chain5 = (X509Certificate[])ks.getCertificateChain(ALIAS3); + X509Certificate[] chain5 = (X509Certificate[]) + ks.getCertificateChain(ALIAS3); if (Arrays.equals(chain, chain5) == false) { throw new Exception("chain mismatch"); } @@ -186,24 +190,22 @@ public class AddPrivateKey extends SecmodTest { System.out.println("OK"); } - private final static byte[] DATA = new byte[4096]; - - static { - Random random = new Random(); - random.nextBytes(DATA); - } - - private static void sign(Provider p, PrivateKey privateKey, PublicKey publicKey) throws Exception { + private static void sign(Provider p, PrivateKey privateKey, + PublicKey publicKey) throws Exception { String keyAlg = privateKey.getAlgorithm(); String alg; - if (keyAlg.equals("RSA")) { - alg = "SHA1withRSA"; - } else if (keyAlg.equals("DSA")) { - alg = "SHA1withDSA"; - } else if (keyAlg.equals("EC")) { - alg = "SHA1withECDSA"; - } else { - throw new Exception("Unknown algorithm " + keyAlg); + switch (keyAlg) { + case "RSA": + alg = "SHA1withRSA"; + break; + case "DSA": + alg = "SHA1withDSA"; + break; + case "EC": + alg = "SHA1withECDSA"; + break; + default: + throw new Exception("Unknown algorithm " + keyAlg); } Signature s = Signature.getInstance(alg, p); s.initSign(privateKey); @@ -217,8 +219,6 @@ public class AddPrivateKey extends SecmodTest { } } - private final static int MAX_LINE = 85; - private static String toString(Object o) { String s = String.valueOf(o).split("\n")[0]; return (s.length() <= MAX_LINE) ? s : s.substring(0, MAX_LINE); diff --git a/jdk/test/sun/security/pkcs11/Secmod/AddTrustedCert.java b/jdk/test/sun/security/pkcs11/Secmod/AddTrustedCert.java index 1b3ff8194e7..6b2b545611a 100644 --- a/jdk/test/sun/security/pkcs11/Secmod/AddTrustedCert.java +++ b/jdk/test/sun/security/pkcs11/Secmod/AddTrustedCert.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2015, 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 @@ -44,29 +44,47 @@ public class AddTrustedCert extends SecmodTest { return; } - InputStream in = new FileInputStream(BASE + SEP + "anchor.cer"); - CertificateFactory factory = CertificateFactory.getInstance("X.509"); - X509Certificate cert = (X509Certificate)factory.generateCertificate(in); - in.close(); -// System.out.println(cert); + X509Certificate cert; + try (InputStream in = new FileInputStream(BASE + SEP + "anchor.cer")) { + CertificateFactory factory = + CertificateFactory.getInstance("X.509"); + cert = (X509Certificate)factory.generateCertificate(in); + } String configName = BASE + SEP + "nss.cfg"; Provider p = getSunPKCS11(configName); System.out.println(p); Security.addProvider(p); - KeyStore ks = KeyStore.getInstance("PKCS11", p); + KeyStore ks = KeyStore.getInstance(PKCS11, p); ks.load(null, password); - Collection aliases = new TreeSet(Collections.list(ks.aliases())); + Collection aliases = new TreeSet<>(Collections.list( + ks.aliases())); System.out.println("entries: " + aliases.size()); System.out.println(aliases); int size1 = aliases.size(); String alias = "anchor"; - ks.setCertificateEntry(alias, cert); - ks.setCertificateEntry(alias, cert); + if (ks.containsAlias(alias)) { + throw new Exception("Alias exists: " + alias); + } - aliases = new TreeSet(Collections.list(ks.aliases())); + ks.setCertificateEntry(alias, cert); + KeyStore.Entry first = ks.getEntry(alias, null); + System.out.println("first entry = " + first); + if (!ks.entryInstanceOf(alias, TrustedCertificateEntry.class)) { + throw new Exception("Unexpected first entry type: " + first); + } + + ks.setCertificateEntry(alias, cert); + KeyStore.Entry second = ks.getEntry(alias, null); + System.out.println("second entry = " + second); + if (!ks.entryInstanceOf(alias, TrustedCertificateEntry.class)) { + throw new Exception("Unexpected second entry type: " + + second); + } + + aliases = new TreeSet<>(Collections.list(ks.aliases())); System.out.println("entries: " + aliases.size()); System.out.println(aliases); int size2 = aliases.size(); @@ -79,8 +97,12 @@ public class AddTrustedCert extends SecmodTest { throw new Exception("KeyStore returned incorrect certificate"); } - System.out.println("OK"); + ks.deleteEntry(alias); + if (ks.containsAlias(alias)) { + throw new Exception("Alias still exists: " + alias); + } + System.out.println("OK"); } } diff --git a/jdk/test/sun/security/pkcs11/Secmod/Crypto.java b/jdk/test/sun/security/pkcs11/Secmod/Crypto.java index 39465f794d1..735149f1c84 100644 --- a/jdk/test/sun/security/pkcs11/Secmod/Crypto.java +++ b/jdk/test/sun/security/pkcs11/Secmod/Crypto.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2015, 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,11 +28,8 @@ * @author Andreas Sterbenz * @library .. * @run main/othervm Crypto - * @key randomness */ -import java.util.*; - import java.security.*; public class Crypto extends SecmodTest { @@ -51,9 +48,7 @@ public class Crypto extends SecmodTest { System.out.println(kp.getPublic()); System.out.println(kp.getPrivate()); - SecureRandom random = new SecureRandom(); - byte[] data = new byte[2048]; - random.nextBytes(data); + byte[] data = generateData(2048); Signature sig = Signature.getInstance("SHA1withRSA", p); sig.initSign(kp.getPrivate()); diff --git a/jdk/test/sun/security/pkcs11/Secmod/GetPrivateKey.java b/jdk/test/sun/security/pkcs11/Secmod/GetPrivateKey.java index 2dd1ce69056..a2547652348 100644 --- a/jdk/test/sun/security/pkcs11/Secmod/GetPrivateKey.java +++ b/jdk/test/sun/security/pkcs11/Secmod/GetPrivateKey.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2015, 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 @@ -24,11 +24,11 @@ /** * @test * @bug 6273877 6322208 6275523 - * @summary make sure we can access the NSS softtoken KeyStore and use a private key + * @summary make sure we can access the NSS softtoken KeyStore + * and use a private key * @author Andreas Sterbenz * @library .. * @run main/othervm GetPrivateKey - * @key randomness */ import java.util.*; @@ -49,18 +49,17 @@ public class GetPrivateKey extends SecmodTest { System.out.println(p); Security.addProvider(p); - KeyStore ks = KeyStore.getInstance("PKCS11", p); + KeyStore ks = KeyStore.getInstance(PKCS11, p); ks.load(null, password); - Collection aliases = new TreeSet(Collections.list(ks.aliases())); + Collection aliases = new TreeSet<>( + Collections.list(ks.aliases())); System.out.println("entries: " + aliases.size()); System.out.println(aliases); PrivateKey privateKey = (PrivateKey)ks.getKey(keyAlias, password); System.out.println(privateKey); - byte[] data = new byte[1024]; - Random random = new Random(); - random.nextBytes(data); + byte[] data = generateData(1024); System.out.println("Signing..."); Signature signature = Signature.getInstance("MD5withRSA"); @@ -68,7 +67,8 @@ public class GetPrivateKey extends SecmodTest { signature.update(data); byte[] sig = signature.sign(); - X509Certificate[] chain = (X509Certificate[])ks.getCertificateChain(keyAlias); + X509Certificate[] chain = + (X509Certificate[]) ks.getCertificateChain(keyAlias); signature.initVerify(chain[0].getPublicKey()); signature.update(data); boolean ok = signature.verify(sig); diff --git a/jdk/test/sun/security/pkcs11/Secmod/LoadKeystore.java b/jdk/test/sun/security/pkcs11/Secmod/LoadKeystore.java new file mode 100644 index 00000000000..fd1aa694ddf --- /dev/null +++ b/jdk/test/sun/security/pkcs11/Secmod/LoadKeystore.java @@ -0,0 +1,94 @@ +/* + * Copyright (c) 2015, 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. + */ + +import java.io.IOException; +import java.security.KeyStore; +import java.security.KeyStoreException; +import java.security.Provider; +import java.security.Security; +import java.security.UnrecoverableKeyException; +import java.util.Collections; + +/* + * @test + * @bug 8048622 8134232 + * @summary Checks that PKCS#11 keystore can't be loaded with wrong password + * @library ../ + * @run main/othervm LoadKeystore + */ +public class LoadKeystore extends SecmodTest { + + public static void main(String[] args) throws Exception { + if (!initSecmod()) { + return; + } + + String configName = BASE + SEP + "nss.cfg"; + Provider p = getSunPKCS11(configName); + + System.out.println("Add provider " + p); + System.out.println(); + Security.addProvider(p); + + try { + System.out.println("Load keystore with wrong type"); + KeyStore.getInstance("unknown", p); + throw new RuntimeException("Expected exception not thrown"); + } catch(KeyStoreException e) { + System.out.println("Expected exception: " + e); + } + + KeyStore ks = KeyStore.getInstance("PKCS11", p); + if (!"PKCS11".equals(ks.getType())) { + throw new RuntimeException("Unexpected keystore type: " + + ks.getType()); + } + if (!p.equals(ks.getProvider())) { + throw new RuntimeException("Unexpected keystore provider: " + + ks.getProvider()); + } + + try { + System.out.println("Load keystore with wrong password"); + ks.load(null, "wrong".toCharArray()); + throw new RuntimeException("Expected exception not thrown"); + } catch(IOException e) { + System.out.println("Expected exception: " + e); + Throwable cause = e.getCause(); + if (!(cause instanceof UnrecoverableKeyException)) { + e.printStackTrace(System.out); + throw new RuntimeException("Unexpected cause: " + cause); + } + System.out.println("Expected cause: " + cause); + } + + System.out.println("Load keystore with correct password"); + ks.load(null, password); + for (String alias : Collections.list(ks.aliases())) { + System.out.println("Alias: " + alias); + } + + System.out.println("Test passed"); + } + +} From 9baa352891d052a46412e68c84fc2966099b73ed Mon Sep 17 00:00:00 2001 From: Phil Race Date: Mon, 14 Sep 2015 10:56:55 -0700 Subject: [PATCH 70/94] 8136397: Build should recognise .cc file extension Reviewed-by: ihse --- make/common/NativeCompilation.gmk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk index bc9802263ad..adba62283a1 100644 --- a/make/common/NativeCompilation.gmk +++ b/make/common/NativeCompilation.gmk @@ -102,7 +102,7 @@ $(eval $(call DefineNativeToolchain, TOOLCHAIN_BUILD, \ ################################################################################ # Extensions of files handled by this macro. -NATIVE_SOURCE_EXTENSIONS := %.s %.c %.cpp %.m %.mm +NATIVE_SOURCE_EXTENSIONS := %.s %.c %.cpp %.cc %.m %.mm # Replaces native source extensions with the object file extension in a string. # Param 1: the string containing source file names with extensions @@ -167,7 +167,7 @@ define add_native_source $1_$2_FLAGS=$8 -DTHIS_FILE='"$$( Date: Tue, 15 Sep 2015 12:43:12 +0300 Subject: [PATCH 71/94] 8074931: Additional tests for CertPath API Reviewed-by: mullan --- .../security/cert/CertPathEncodingTest.java | 253 ++++++++ .../security/cert/X509CertSelectorTest.java | 538 ++++++++++++++++++ 2 files changed, 791 insertions(+) create mode 100644 jdk/test/java/security/cert/CertPathEncodingTest.java create mode 100644 jdk/test/java/security/cert/X509CertSelectorTest.java diff --git a/jdk/test/java/security/cert/CertPathEncodingTest.java b/jdk/test/java/security/cert/CertPathEncodingTest.java new file mode 100644 index 00000000000..2bcfcc76824 --- /dev/null +++ b/jdk/test/java/security/cert/CertPathEncodingTest.java @@ -0,0 +1,253 @@ +/* + * Copyright (c) 1998, 2015, 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. + */ +import java.io.ByteArrayInputStream; +import java.security.cert.CertPath; +import java.security.cert.Certificate; +import java.security.cert.CertificateFactory; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Base64; +import java.util.List; + +/* + * @test + * @bug 8074931 + * @summary CertPathEncodingTest tests the ability of the CertPath and + * CertificateFactory to encode and decode CertPaths. + */ +public final class CertPathEncodingTest { + /* + Certificate: + Data: + Version: 3 (0x2) + Serial Number: 935438132 (0x37c1a734) + Signature Algorithm: dsaWithSHA1 + Issuer: C=us, O=sun, OU=east, OU=bcn, CN=yassir + Validity + Not Before: Aug 23 19:55:32 1999 GMT + Not After : Aug 22 19:55:32 2000 GMT + Subject: C=us, O=sun, OU=east, OU=bcn + Subject Public Key Info: + Public Key Algorithm: dsaEncryption + pub: + 63:47:4f:f6:29:e5:98:a2:21:fd:da:97:9e:3f:ca: + b0:17:49:8d:8a:a7:06:0d:a6:78:97:39:59:33:72: + a2:a5:74:d5:3a:ef:e6:7c:07:d7:8e:8e:d1:66:73: + 99:14:04:96:f5:31:d6:72:ee:d2:53:f8:90:b5:f3: + c3:f1:64:ba:1a:9e:c0:0a:da:92:48:c5:d3:84:7e: + 48:09:66:d9:51:ba:74:56:5a:77:8a:8c:9a:9c:f6: + 84:12:61:12:51:dc:c6:4f:84:94:ec:cb:78:51:83: + 8c:20:8a:53:7b:d2:b6:36:df:50:35:95:1f:cb:50: + 55:8b:3f:fb:e2:77:cb + P: + 00:fd:7f:53:81:1d:75:12:29:52:df:4a:9c:2e:ec: + e4:e7:f6:11:b7:52:3c:ef:44:00:c3:1e:3f:80:b6: + 51:26:69:45:5d:40:22:51:fb:59:3d:8d:58:fa:bf: + c5:f5:ba:30:f6:cb:9b:55:6c:d7:81:3b:80:1d:34: + 6f:f2:66:60:b7:6b:99:50:a5:a4:9f:9f:e8:04:7b: + 10:22:c2:4f:bb:a9:d7:fe:b7:c6:1b:f8:3b:57:e7: + c6:a8:a6:15:0f:04:fb:83:f6:d3:c5:1e:c3:02:35: + 54:13:5a:16:91:32:f6:75:f3:ae:2b:61:d7:2a:ef: + f2:22:03:19:9d:d1:48:01:c7 + Q: + 00:97:60:50:8f:15:23:0b:cc:b2:92:b9:82:a2:eb: + 84:0b:f0:58:1c:f5 + G: + 00:f7:e1:a0:85:d6:9b:3d:de:cb:bc:ab:5c:36:b8: + 57:b9:79:94:af:bb:fa:3a:ea:82:f9:57:4c:0b:3d: + 07:82:67:51:59:57:8e:ba:d4:59:4f:e6:71:07:10: + 81:80:b4:49:16:71:23:e8:4c:28:16:13:b7:cf:09: + 32:8c:c8:a6:e1:3c:16:7a:8b:54:7c:8d:28:e0:a3: + ae:1e:2b:b3:a6:75:91:6e:a3:7f:0b:fa:21:35:62: + f1:fb:62:7a:01:24:3b:cc:a4:f1:be:a8:51:90:89: + a8:83:df:e1:5a:e5:9f:06:92:8b:66:5e:80:7b:55: + 25:64:01:4c:3b:fe:cf:49:2a + X509v3 extensions: + X509v3 Key Usage: critical + Digital Signature, Key Encipherment, Certificate Sign + Signature Algorithm: dsaWithSHA1 + r: + 52:80:52:2b:2c:3d:02:66:58:b4:dc:ef:52:26:70: + 1b:53:ca:b3:7d + s: + 62:03:b2:ab:3e:18:2a:66:09:b6:ce:d4:05:a5:8e: + a5:7a:0d:55:67 + */ + private static final String cert1 = + "-----BEGIN CERTIFICATE-----\n" + + "MIICzTCCAougAwIBAgIEN8GnNDALBgcqhkjOOAQDBQAwSTELMAkGA1UEBhMCdXMx\n" + + "DDAKBgNVBAoTA3N1bjENMAsGA1UECxMEZWFzdDEMMAoGA1UECxMDYmNuMQ8wDQYD\n" + + "VQQDEwZ5YXNzaXIwHhcNOTkwODIzMTk1NTMyWhcNMDAwODIyMTk1NTMyWjA4MQsw\n" + + "CQYDVQQGEwJ1czEMMAoGA1UEChMDc3VuMQ0wCwYDVQQLEwRlYXN0MQwwCgYDVQQL\n" + + "EwNiY24wggG1MIIBLAYHKoZIzjgEATCCAR8CgYEA/X9TgR11EilS30qcLuzk5/YR\n" + + "t1I870QAwx4/gLZRJmlFXUAiUftZPY1Y+r/F9bow9subVWzXgTuAHTRv8mZgt2uZ\n" + + "UKWkn5/oBHsQIsJPu6nX/rfGG/g7V+fGqKYVDwT7g/bTxR7DAjVUE1oWkTL2dfOu\n" + + "K2HXKu/yIgMZndFIAccCFQCXYFCPFSMLzLKSuYKi64QL8Fgc9QKBgQD34aCF1ps9\n" + + "3su8q1w2uFe5eZSvu/o66oL5V0wLPQeCZ1FZV4661FlP5nEHEIGAtEkWcSPoTCgW\n" + + "E7fPCTKMyKbhPBZ6i1R8jSjgo64eK7OmdZFuo38L+iE1YvH7YnoBJDvMpPG+qFGQ\n" + + "iaiD3+Fa5Z8GkotmXoB7VSVkAUw7/s9JKgOBggACf2NHT/Yp5ZiiIf3al54/yrAX\n" + + "SY2KpwYNpniXOVkzcqKldNU67+Z8B9eOjtFmc5kUBJb1MdZy7tJT+JC188PxZLoa\n" + + "nsAK2pJIxdOEfkgJZtlRunRWWneKjJqc9oQSYRJR3MZPhJTsy3hRg4wgilN70rY2\n" + + "31A1lR/LUFWLP/vid8ujEzARMA8GA1UdDwEB/wQFAwMHpAAwCwYHKoZIzjgEAwUA\n" + + "Ay8AMCwCFFKAUissPQJmWLTc71ImcBtTyrN9AhRiA7KrPhgqZgm2ztQFpY6leg1V\n" + + "Zw==\n" + + "-----END CERTIFICATE-----\n" + + ""; + + /* + Certificate: + Data: + Version: 3 (0x2) + Serial Number: 935095671 (0x37bc6d77) + Signature Algorithm: dsaWithSHA1 + Issuer: C=us, O=sun, OU=east, OU=bcn, CN=yassir + Validity + Not Before: Aug 19 20:47:51 1999 GMT + Not After : Aug 18 20:47:51 2000 GMT + Subject: C=us, O=sun, OU=east, OU=bcn, CN=yassir + Subject Public Key Info: + Public Key Algorithm: dsaEncryption + pub: + 0a:cc:a4:ec:d6:88:45:c2:24:6b:0d:78:f1:82:f3: + 5e:3e:31:5d:fb:64:d5:06:5e:39:16:f1:0a:85:d1: + ff:d1:a4:74:c5:e6:b0:ba:93:1c:ee:69:51:be:3b: + a6:66:44:50:b4:f0:5e:0e:dd:9f:08:71:fe:a1:91: + 2e:d4:9e:6b:b2:c0:82:3c:91:6c:18:b0:d9:bc:a3: + 48:91:3f:8b:59:01:61:00:02:ab:22:31:bc:7c:6c: + 0d:9f:ed:be:33:e6:5c:44:9e:62:30:95:f8:6d:22: + d7:e5:85:4c:b0:98:6e:ad:cc:ca:3b:ad:cb:fa:f7: + 9f:37:13:f7:ca:e2:22:ba + P: + 00:fd:7f:53:81:1d:75:12:29:52:df:4a:9c:2e:ec: + e4:e7:f6:11:b7:52:3c:ef:44:00:c3:1e:3f:80:b6: + 51:26:69:45:5d:40:22:51:fb:59:3d:8d:58:fa:bf: + c5:f5:ba:30:f6:cb:9b:55:6c:d7:81:3b:80:1d:34: + 6f:f2:66:60:b7:6b:99:50:a5:a4:9f:9f:e8:04:7b: + 10:22:c2:4f:bb:a9:d7:fe:b7:c6:1b:f8:3b:57:e7: + c6:a8:a6:15:0f:04:fb:83:f6:d3:c5:1e:c3:02:35: + 54:13:5a:16:91:32:f6:75:f3:ae:2b:61:d7:2a:ef: + f2:22:03:19:9d:d1:48:01:c7 + Q: + 00:97:60:50:8f:15:23:0b:cc:b2:92:b9:82:a2:eb: + 84:0b:f0:58:1c:f5 + G: + 00:f7:e1:a0:85:d6:9b:3d:de:cb:bc:ab:5c:36:b8: + 57:b9:79:94:af:bb:fa:3a:ea:82:f9:57:4c:0b:3d: + 07:82:67:51:59:57:8e:ba:d4:59:4f:e6:71:07:10: + 81:80:b4:49:16:71:23:e8:4c:28:16:13:b7:cf:09: + 32:8c:c8:a6:e1:3c:16:7a:8b:54:7c:8d:28:e0:a3: + ae:1e:2b:b3:a6:75:91:6e:a3:7f:0b:fa:21:35:62: + f1:fb:62:7a:01:24:3b:cc:a4:f1:be:a8:51:90:89: + a8:83:df:e1:5a:e5:9f:06:92:8b:66:5e:80:7b:55: + 25:64:01:4c:3b:fe:cf:49:2a + X509v3 extensions: + X509v3 Key Usage: critical + Digital Signature, Key Encipherment, Certificate Sign + X509v3 Basic Constraints: critical + CA:TRUE, pathlen:5 + Signature Algorithm: dsaWithSHA1 + r: + 2f:88:46:37:94:92:b2:02:07:5b:8d:76:e5:81:23: + 85:7f:bc:8d:b9 + s: + 00:8b:d7:41:fa:11:c7:ab:27:92:5d:0a:03:98:56: + 36:42:5f:f5:1f:9d + */ + private static final String cert2 = + "-----BEGIN CERTIFICATE-----\n" + + "MIIC9TCCArKgAwIBAgIEN7xtdzALBgcqhkjOOAQDBQAwSTELMAkGA1UEBhMCdXMx\n" + + "DDAKBgNVBAoTA3N1bjENMAsGA1UECxMEZWFzdDEMMAoGA1UECxMDYmNuMQ8wDQYD\n" + + "VQQDEwZ5YXNzaXIwHhcNOTkwODE5MjA0NzUxWhcNMDAwODE4MjA0NzUxWjBJMQsw\n" + + "CQYDVQQGEwJ1czEMMAoGA1UEChMDc3VuMQ0wCwYDVQQLEwRlYXN0MQwwCgYDVQQL\n" + + "EwNiY24xDzANBgNVBAMTBnlhc3NpcjCCAbcwggEsBgcqhkjOOAQBMIIBHwKBgQD9\n" + + "f1OBHXUSKVLfSpwu7OTn9hG3UjzvRADDHj+AtlEmaUVdQCJR+1k9jVj6v8X1ujD2\n" + + "y5tVbNeBO4AdNG/yZmC3a5lQpaSfn+gEexAiwk+7qdf+t8Yb+DtX58aophUPBPuD\n" + + "9tPFHsMCNVQTWhaRMvZ1864rYdcq7/IiAxmd0UgBxwIVAJdgUI8VIwvMspK5gqLr\n" + + "hAvwWBz1AoGBAPfhoIXWmz3ey7yrXDa4V7l5lK+7+jrqgvlXTAs9B4JnUVlXjrrU\n" + + "WU/mcQcQgYC0SRZxI+hMKBYTt88JMozIpuE8FnqLVHyNKOCjrh4rs6Z1kW6jfwv6\n" + + "ITVi8ftiegEkO8yk8b6oUZCJqIPf4VrlnwaSi2ZegHtVJWQBTDv+z0kqA4GEAAKB\n" + + "gArMpOzWiEXCJGsNePGC814+MV37ZNUGXjkW8QqF0f/RpHTF5rC6kxzuaVG+O6Zm\n" + + "RFC08F4O3Z8Icf6hkS7UnmuywII8kWwYsNm8o0iRP4tZAWEAAqsiMbx8bA2f7b4z\n" + + "5lxEnmIwlfhtItflhUywmG6tzMo7rcv69583E/fK4iK6oycwJTAPBgNVHQ8BAf8E\n" + + "BQMDB6QAMBIGA1UdEwEB/wQIMAYBAf8CAQUwCwYHKoZIzjgEAwUAAzAAMC0CFC+I\n" + + "RjeUkrICB1uNduWBI4V/vI25AhUAi9dB+hHHqyeSXQoDmFY2Ql/1H50=\n" + + "-----END CERTIFICATE-----\n" + + ""; + + private static final String pkcs7path = + "MIIF9QYJKoZIhvcNAQcCoIIF5jCCBeICAQExADALBgkqhkiG9w0BBwGgggXKMIICzTCCAougAwIB\n" + + "AgIEN8GnNDALBgcqhkjOOAQDBQAwSTELMAkGA1UEBhMCdXMxDDAKBgNVBAoTA3N1bjENMAsGA1UE\n" + + "CxMEZWFzdDEMMAoGA1UECxMDYmNuMQ8wDQYDVQQDEwZ5YXNzaXIwHhcNOTkwODIzMTk1NTMyWhcN\n" + + "MDAwODIyMTk1NTMyWjA4MQswCQYDVQQGEwJ1czEMMAoGA1UEChMDc3VuMQ0wCwYDVQQLEwRlYXN0\n" + + "MQwwCgYDVQQLEwNiY24wggG1MIIBLAYHKoZIzjgEATCCAR8CgYEA/X9TgR11EilS30qcLuzk5/YR\n" + + "t1I870QAwx4/gLZRJmlFXUAiUftZPY1Y+r/F9bow9subVWzXgTuAHTRv8mZgt2uZUKWkn5/oBHsQ\n" + + "IsJPu6nX/rfGG/g7V+fGqKYVDwT7g/bTxR7DAjVUE1oWkTL2dfOuK2HXKu/yIgMZndFIAccCFQCX\n" + + "YFCPFSMLzLKSuYKi64QL8Fgc9QKBgQD34aCF1ps93su8q1w2uFe5eZSvu/o66oL5V0wLPQeCZ1FZ\n" + + "V4661FlP5nEHEIGAtEkWcSPoTCgWE7fPCTKMyKbhPBZ6i1R8jSjgo64eK7OmdZFuo38L+iE1YvH7\n" + + "YnoBJDvMpPG+qFGQiaiD3+Fa5Z8GkotmXoB7VSVkAUw7/s9JKgOBggACf2NHT/Yp5ZiiIf3al54/\n" + + "yrAXSY2KpwYNpniXOVkzcqKldNU67+Z8B9eOjtFmc5kUBJb1MdZy7tJT+JC188PxZLoansAK2pJI\n" + + "xdOEfkgJZtlRunRWWneKjJqc9oQSYRJR3MZPhJTsy3hRg4wgilN70rY231A1lR/LUFWLP/vid8uj\n" + + "EzARMA8GA1UdDwEB/wQFAwMHpAAwCwYHKoZIzjgEAwUAAy8AMCwCFFKAUissPQJmWLTc71ImcBtT\n" + + "yrN9AhRiA7KrPhgqZgm2ztQFpY6leg1VZzCCAvUwggKyoAMCAQICBDe8bXcwCwYHKoZIzjgEAwUA\n" + + "MEkxCzAJBgNVBAYTAnVzMQwwCgYDVQQKEwNzdW4xDTALBgNVBAsTBGVhc3QxDDAKBgNVBAsTA2Jj\n" + + "bjEPMA0GA1UEAxMGeWFzc2lyMB4XDTk5MDgxOTIwNDc1MVoXDTAwMDgxODIwNDc1MVowSTELMAkG\n" + + "A1UEBhMCdXMxDDAKBgNVBAoTA3N1bjENMAsGA1UECxMEZWFzdDEMMAoGA1UECxMDYmNuMQ8wDQYD\n" + + "VQQDEwZ5YXNzaXIwggG3MIIBLAYHKoZIzjgEATCCAR8CgYEA/X9TgR11EilS30qcLuzk5/YRt1I8\n" + + "70QAwx4/gLZRJmlFXUAiUftZPY1Y+r/F9bow9subVWzXgTuAHTRv8mZgt2uZUKWkn5/oBHsQIsJP\n" + + "u6nX/rfGG/g7V+fGqKYVDwT7g/bTxR7DAjVUE1oWkTL2dfOuK2HXKu/yIgMZndFIAccCFQCXYFCP\n" + + "FSMLzLKSuYKi64QL8Fgc9QKBgQD34aCF1ps93su8q1w2uFe5eZSvu/o66oL5V0wLPQeCZ1FZV466\n" + + "1FlP5nEHEIGAtEkWcSPoTCgWE7fPCTKMyKbhPBZ6i1R8jSjgo64eK7OmdZFuo38L+iE1YvH7YnoB\n" + + "JDvMpPG+qFGQiaiD3+Fa5Z8GkotmXoB7VSVkAUw7/s9JKgOBhAACgYAKzKTs1ohFwiRrDXjxgvNe\n" + + "PjFd+2TVBl45FvEKhdH/0aR0xeawupMc7mlRvjumZkRQtPBeDt2fCHH+oZEu1J5rssCCPJFsGLDZ\n" + + "vKNIkT+LWQFhAAKrIjG8fGwNn+2+M+ZcRJ5iMJX4bSLX5YVMsJhurczKO63L+vefNxP3yuIiuqMn\n" + + "MCUwDwYDVR0PAQH/BAUDAwekADASBgNVHRMBAf8ECDAGAQH/AgEFMAsGByqGSM44BAMFAAMwADAt\n" + + "AhQviEY3lJKyAgdbjXblgSOFf7yNuQIVAIvXQfoRx6snkl0KA5hWNkJf9R+dMQA=\n" + + ""; + + // Runs test of CertPath encoding and decoding. + public static void main(String[] args) throws Exception { + // Make the CertPath whose encoded form has already been stored + CertificateFactory certFac = CertificateFactory.getInstance("X509"); + + final List certs = new ArrayList<>(); + certs.add(certFac.generateCertificate(new ByteArrayInputStream(cert1.getBytes()))); + certs.add(certFac.generateCertificate(new ByteArrayInputStream(cert2.getBytes()))); + + CertPath cp = certFac.generateCertPath(certs); + + // Get the encoded form of the CertPath we made + byte[] encoded = cp.getEncoded("PKCS7"); + + // check if it matches the encoded value + if (!Arrays.equals(encoded, Base64.getMimeDecoder().decode(pkcs7path.getBytes()))) { + throw new RuntimeException("PKCS#7 encoding doesn't match stored value"); + } + + // Generate a CertPath from the encoded value and check if it equals + // the CertPath generated from the certificates + CertPath decodedCP = certFac.generateCertPath(new ByteArrayInputStream(encoded), "PKCS7"); + if (!decodedCP.equals(cp)) { + throw new RuntimeException("CertPath decoded from PKCS#7 isn't equal to original"); + } + } +} diff --git a/jdk/test/java/security/cert/X509CertSelectorTest.java b/jdk/test/java/security/cert/X509CertSelectorTest.java new file mode 100644 index 00000000000..3ff5b65350a --- /dev/null +++ b/jdk/test/java/security/cert/X509CertSelectorTest.java @@ -0,0 +1,538 @@ +/* + * Copyright (c) 2000, 2015, 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. + */ +import static sun.security.x509.GeneralNameInterface.NAME_DIRECTORY; +import static sun.security.x509.NameConstraintsExtension.EXCLUDED_SUBTREES; +import static sun.security.x509.NameConstraintsExtension.PERMITTED_SUBTREES; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.math.BigInteger; +import java.security.GeneralSecurityException; +import java.security.KeyFactory; +import java.security.PublicKey; +import java.security.cert.CertificateException; +import java.security.cert.CertificateFactory; +import java.security.cert.X509CertSelector; +import java.security.cert.X509Certificate; +import java.security.spec.X509EncodedKeySpec; +import java.util.Base64; +import java.util.Calendar; +import java.util.Date; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; + +import sun.security.util.DerInputStream; +import sun.security.util.DerOutputStream; +import sun.security.util.DerValue; +import sun.security.util.ObjectIdentifier; +import sun.security.x509.AlgorithmId; +import sun.security.x509.AuthorityKeyIdentifierExtension; +import sun.security.x509.CertificatePoliciesExtension; +import sun.security.x509.DNSName; +import sun.security.x509.GeneralName; +import sun.security.x509.GeneralNameInterface; +import sun.security.x509.GeneralNames; +import sun.security.x509.GeneralSubtree; +import sun.security.x509.GeneralSubtrees; +import sun.security.x509.KeyIdentifier; +import sun.security.x509.NameConstraintsExtension; +import sun.security.x509.PolicyInformation; +import sun.security.x509.PrivateKeyUsageExtension; +import sun.security.x509.SubjectAlternativeNameExtension; +import sun.security.x509.X500Name; + +/* + * @test + * @bug 8074931 + * @summary This class tests the X509CertSelector. The tests check particular criteria + * by setting them to a value that should match our test certificate and + * ensuring that they do match, then setting them to a value that should not + * match our test certificate and ensuring that they do not match. + * @modules java.base/sun.security.x509 + * java.base/sun.security.util + */ +public class X509CertSelectorTest { + /* + Certificate: + Data: + Version: 3 (0x2) + Serial Number: 954172088 (0x38df82b8) + Signature Algorithm: dsaWithSHA1 + Issuer: C=us, O=sun, OU=testing + Validity + Not Before: Mar 27 15:48:08 2000 GMT + Not After : Jun 25 14:48:08 2000 GMT + Subject: C=us, O=sun, OU=testing, CN=mullan + Subject Public Key Info: + Public Key Algorithm: dsaEncryption + pub: 0 + P: 0 + Q: 0 + G: 0 + X509v3 extensions: + X509v3 Name Constraints: critical + 0D.B0@.>1.0...U....us1.0 + ..U. + ..sun1.0...U....testing1.0 + ..U....mullan + X509v3 Subject Key Identifier: + 56:E8:88:AE:9D:B5:3F:2B:CB:A0:4C:4B:E2:87:53:07:33:77:1B:DF + X509v3 Authority Key Identifier: + keyid:8E:DD:AF:6F:EE:02:12:F4:61:E9:2F:E3:64:1A:6F:71:32:25:20:C0 + + X509v3 Subject Alternative Name: + email:mullan@east.sun.com + X509v3 Private Key Usage Period: + Not Before: Jan 1 05:00:00 2000 GMT, Not After: Jan 1 05:00:00 2001 GMT + X509v3 Key Usage: critical + Digital Signature + X509v3 Certificate Policies: + 0$0\..*...0.0...+.......0.. + Testing... + Signature Algorithm: dsaWithSHA1 + r: + 44:c7:35:40:5d:6c:28:75:7f:73:b2:f8:0d:72:6c: + 09:65:b8:81:14 + s: + 76:79:f5:c7:37:3b:0d:9b:db:70:2f:20:80:36:e3: + 80:e8:a6:c6:71 + */ + private static final String testCert = + "-----BEGIN CERTIFICATE-----\n" + + "MIICLjCCAeygAwIBAgIEON+CuDALBgcqhkjOOAQDBQAwLTELMAkGA1UEBhMCdXMx\n" + + "DDAKBgNVBAoTA3N1bjEQMA4GA1UECxMHdGVzdGluZzAeFw0wMDAzMjcxNTQ4MDha\n" + + "Fw0wMDA2MjUxNDQ4MDhaMD4xCzAJBgNVBAYTAnVzMQwwCgYDVQQKEwNzdW4xEDAO\n" + + "BgNVBAsTB3Rlc3RpbmcxDzANBgNVBAMTBm11bGxhbjAcMBQGByqGSM44BAEwCQIB\n" + + "AAIBAAIBAAMEAAIBAKOCASMwggEfMFAGA1UdHgEB/wRGMESgQjBApD4xCzAJBgNV\n" + + "BAYTAnVzMQwwCgYDVQQKEwNzdW4xEDAOBgNVBAsTB3Rlc3RpbmcxDzANBgNVBAMT\n" + + "Bm11bGxhbjAdBgNVHQ4EFgQUVuiIrp21PyvLoExL4odTBzN3G98wHwYDVR0jBBgw\n" + + "FoAUjt2vb+4CEvRh6S/jZBpvcTIlIMAwHgYDVR0RBBcwFYETbXVsbGFuQGVhc3Qu\n" + + "c3VuLmNvbTArBgNVHRAEJDAigA8yMDAwMDEwMTA1MDAwMFqBDzIwMDEwMTAxMDUw\n" + + "MDAwWjAPBgNVHQ8BAf8EBQMDB4AAMC0GA1UdIAQmMCQwIgYEKoSAADAaMBgGCCsG\n" + + "AQUFBwICMAwSClRlc3RpbmcuLi4wCwYHKoZIzjgEAwUAAy8AMCwCFETHNUBdbCh1\n" + + "f3Oy+A1ybAlluIEUAhR2efXHNzsNm9twLyCANuOA6KbGcQ==\n" + + "-----END CERTIFICATE-----\n" + + ""; + + private static final String testKey = + "MIIBtjCCASsGByqGSM44BAEwggEeAoGBAIVWPEkcxbxhQRCqVzg55tNqbP5j0K4kdu4bkmXvfqC5\n" + + "+qA75DvnfzsOJseb+9AuKXWk/DvCzFDmrY1YaU3scZC3OQEO9lEO3F4VDKOaudY6OT1SI22pAIwz\n" + + "j5pvq+i7zOp4xUqkQUeh/4iQSfxOT5UrFGjkcbnbpVkCXD/GxAz7AhUAjtnm3dVIddUUHl6wxpZ7\n" + + "GcA6gSsCgYAf/PXzQtemgIDjpFrNNSgTEKkLposBXKatAM+gUKlMUjf8SQvquqPxDtRrscGjXkoL\n" + + "oTkaR7/akULYFpBvUcFkeIFiCnJg8M9XhCWdLvn9MPt+jR2oxookvCb9xLtD6WvIM/wd/nZ1iK4u\n" + + "iY1+q85xvns/Awbtwl7oZDAwE2TUKAOBhAACgYBDc9UZ+3xsZubUZvRG5cpyJceYpJp2exOPVJXn\n" + + "jR4CcR+cT9bAJpFSxqE/8KtNHXxHdu4f3DU67IMOVDpugzihyzXJvNm3w2H9x+6xczHG2wjvAJeh\n" + + "X62EWbUatxPXFAoVKZWuUbaYaZzdWBDtNRrCuKKsLo0GFy8g2BZISuD3jw==\n" + + ""; + + // Certificate to run tests on + private final X509Certificate cert; + + public static void main(String[] args) throws Exception { + X509CertSelectorTest test = new X509CertSelectorTest(); + test.doTest(); + } + + public X509CertSelectorTest() throws CertificateException, IOException { + cert = (X509Certificate) CertificateFactory.getInstance("X.509") + .generateCertificate(new ByteArrayInputStream(testCert.getBytes())); + } + + // Runs the test. + private void doTest() throws Exception { + System.out.println("START OF TESTS FOR " + "X509CertSelector"); + + testSerialNumber(); + testIssuer(); + testSubjectKeyIdentifier(); + testAuthorityKeyIdentifier(); + testCertificateValid(); + testPrivateKeyValid(); + testSubjectPublicKeyAlgID(); + testKeyUsage(); + testSubjectAltName(); + testPolicy(); + testPathToName(); + testSubject(); + testSubjectPublicKey(); + testNameConstraints(); + testBasicConstraints(); + testCertificate(); + } + + // Tests matching on the serial number contained in the certificate. + private void testSerialNumber() { + System.out.println("X.509 Certificate Match on serialNumber"); + // bad match + X509CertSelector selector = new X509CertSelector(); + selector.setSerialNumber(new BigInteger("999999999")); + checkMatch(selector, cert, false); + + // good match + selector.setSerialNumber(cert.getSerialNumber()); + checkMatch(selector, cert, true); + } + + // Tests matching on the issuer name contained in the certificate. + private void testIssuer() throws IOException { + System.out.println("X.509 Certificate Match on issuer"); + // bad match + X509CertSelector selector = new X509CertSelector(); + selector.setIssuer("ou=bogus,ou=east,o=sun,c=us"); + checkMatch(selector, cert, false); + + // good match + selector.setIssuer((cert.getIssuerX500Principal()).getName("RFC2253")); + checkMatch(selector, cert, true); + } + + /* + * Tests matching on the subject key identifier contained in the + * certificate. + */ + private void testSubjectKeyIdentifier() throws IOException { + System.out.println("X.509 Certificate Match on subjectKeyIdentifier"); + // bad match + X509CertSelector selector = new X509CertSelector(); + byte[] b = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; + selector.setSubjectKeyIdentifier(b); + checkMatch(selector, cert, false); + + // good match + DerInputStream in = new DerInputStream(cert.getExtensionValue("2.5.29.14")); + byte[] encoded = in.getOctetString(); + selector.setSubjectKeyIdentifier(encoded); + checkMatch(selector, cert, true); + } + + /* + * Tests matching on the authority key identifier contained in the + * certificate. + */ + private void testAuthorityKeyIdentifier() throws IOException { + System.out.println("X.509 Certificate Match on authorityKeyIdentifier"); + // bad match + X509CertSelector selector = new X509CertSelector(); + byte[] b = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; + AuthorityKeyIdentifierExtension a = new AuthorityKeyIdentifierExtension(new KeyIdentifier(b), null, null); + selector.setAuthorityKeyIdentifier(a.getExtensionValue()); + checkMatch(selector, cert, false); + + // good match + DerInputStream in = new DerInputStream(cert.getExtensionValue("2.5.29.35")); + byte[] encoded = in.getOctetString(); + selector.setAuthorityKeyIdentifier(encoded); + checkMatch(selector, cert, true); + } + + /* + * Tests matching on the certificate validity component contained in the + * certificate. + */ + private void testCertificateValid() { + System.out.println("X.509 Certificate Match on certificateValid"); + // bad match + X509CertSelector selector = new X509CertSelector(); + Calendar cal = Calendar.getInstance(); + cal.set(1968, 12, 31); + selector.setCertificateValid(cal.getTime()); + checkMatch(selector, cert, false); + + // good match + selector.setCertificateValid(cert.getNotBefore()); + checkMatch(selector, cert, true); + } + + /* + * Tests matching on the private key validity component contained in the + * certificate. + */ + private void testPrivateKeyValid() throws IOException, CertificateException { + System.out.println("X.509 Certificate Match on privateKeyValid"); + // bad match + X509CertSelector selector = new X509CertSelector(); + Calendar cal = Calendar.getInstance(); + cal.set(1968, 12, 31); + selector.setPrivateKeyValid(cal.getTime()); + checkMatch(selector, cert, false); + + // good match + DerInputStream in = new DerInputStream(cert.getExtensionValue("2.5.29.16")); + byte[] encoded = in.getOctetString(); + PrivateKeyUsageExtension ext = new PrivateKeyUsageExtension(false, encoded); + Date validDate = (Date) ext.get(PrivateKeyUsageExtension.NOT_BEFORE); + selector.setPrivateKeyValid(validDate); + checkMatch(selector, cert, true); + + } + + private ObjectIdentifier getCertPubKeyAlgOID(X509Certificate xcert) throws IOException { + byte[] encodedKey = xcert.getPublicKey().getEncoded(); + DerValue val = new DerValue(encodedKey); + if (val.tag != DerValue.tag_Sequence) { + throw new RuntimeException("invalid key format"); + } + + return AlgorithmId.parse(val.data.getDerValue()).getOID(); + } + + /* + * Tests matching on the subject public key algorithm ID component contained + * in the certificate. + */ + private void testSubjectPublicKeyAlgID() throws IOException { + System.out.println("X.509 Certificate Match on subjectPublicKeyAlgID"); + // bad match + X509CertSelector selector = new X509CertSelector(); + selector.setSubjectPublicKeyAlgID("2.5.29.14"); + checkMatch(selector, cert, false); + + // good match + selector.setSubjectPublicKeyAlgID(getCertPubKeyAlgOID(cert).toString()); + checkMatch(selector, cert, true); + + } + + // Tests matching on the key usage extension contained in the certificate. + private void testKeyUsage() { + System.out.println("X.509 Certificate Match on keyUsage"); + // bad match + X509CertSelector selector = new X509CertSelector(); + boolean[] keyUsage = { true, false, true, false, true, false, true, false }; + selector.setKeyUsage(keyUsage); + System.out.println("Selector = " + selector.toString()); + checkMatch(selector, cert, false); + + // good match + selector.setKeyUsage(cert.getKeyUsage()); + System.out.println("Selector = " + selector.toString()); + checkMatch(selector, cert, true); + } + + /* + * Tests matching on the subject alternative name extension contained in the + * certificate. + */ + private void testSubjectAltName() throws IOException { + System.out.println("X.509 Certificate Match on subjectAltName"); + // bad match + X509CertSelector selector = new X509CertSelector(); + GeneralNameInterface dnsName = new DNSName("foo.com"); + DerOutputStream tmp = new DerOutputStream(); + dnsName.encode(tmp); + selector.addSubjectAlternativeName(2, tmp.toByteArray()); + checkMatch(selector, cert, false); + + // good match + DerInputStream in = new DerInputStream(cert.getExtensionValue("2.5.29.17")); + byte[] encoded = in.getOctetString(); + SubjectAlternativeNameExtension ext = new SubjectAlternativeNameExtension(false, encoded); + GeneralNames names = (GeneralNames) ext.get(SubjectAlternativeNameExtension.SUBJECT_NAME); + GeneralName name = (GeneralName) names.get(0); + selector.setSubjectAlternativeNames(null); + DerOutputStream tmp2 = new DerOutputStream(); + name.getName().encode(tmp2); + selector.addSubjectAlternativeName(name.getType(), tmp2.toByteArray()); + checkMatch(selector, cert, true); + + // good match 2 (matches at least one) + selector.setMatchAllSubjectAltNames(false); + selector.addSubjectAlternativeName(2, "foo.com"); + checkMatch(selector, cert, true); + } + + /* + * Tests matching on the policy constraints extension contained in the + * certificate. + */ + private void testPolicy() throws IOException { + System.out.println("X.509 Certificate Match on certificatePolicies"); + // test encoding of CertificatePoliciesExtension because we wrote the + // code + // bad match + X509CertSelector selector = new X509CertSelector(); + Set s = new HashSet<>(); + s.add(new String("1.2.5.7.68")); + selector.setPolicy(s); + checkMatch(selector, cert, false); + + // good match + DerInputStream in = new DerInputStream(cert.getExtensionValue("2.5.29.32")); + CertificatePoliciesExtension ext = new CertificatePoliciesExtension(false, in.getOctetString()); + List policies = ext.get(CertificatePoliciesExtension.POLICIES); + // match on the first policy id + PolicyInformation policyInfo = (PolicyInformation) policies.get(0); + s.clear(); + s.add(policyInfo.getPolicyIdentifier().getIdentifier().toString()); + selector.setPolicy(s); + checkMatch(selector, cert, true); + } + + /* + * Tests matching on the name constraints extension contained in the + * certificate. + */ + private void testPathToName() throws IOException { + System.out.println("X.509 Certificate Match on pathToName"); + + X509CertSelector selector = null; + DerInputStream in = new DerInputStream(cert.getExtensionValue("2.5.29.30")); + byte[] encoded = in.getOctetString(); + NameConstraintsExtension ext = new NameConstraintsExtension(false, encoded); + GeneralSubtrees permitted = (GeneralSubtrees) ext.get(PERMITTED_SUBTREES); + GeneralSubtrees excluded = (GeneralSubtrees) ext.get(EXCLUDED_SUBTREES); + + // bad matches on pathToName within excluded subtrees + if (excluded != null) { + Iterator e = excluded.iterator(); + while (e.hasNext()) { + GeneralSubtree tree = e.next(); + if (tree.getName().getType() == NAME_DIRECTORY) { + X500Name excludedDN1 = new X500Name(tree.getName().toString()); + X500Name excludedDN2 = new X500Name("CN=Bogus, " + tree.getName().toString()); + DerOutputStream derDN1 = new DerOutputStream(); + DerOutputStream derDN2 = new DerOutputStream(); + excludedDN1.encode(derDN1); + excludedDN2.encode(derDN2); + selector = new X509CertSelector(); + selector.addPathToName(NAME_DIRECTORY, derDN1.toByteArray()); + checkMatch(selector, cert, false); + selector.setPathToNames(null); + selector.addPathToName(NAME_DIRECTORY, derDN2.toByteArray()); + checkMatch(selector, cert, false); + } + } + } + + // good matches on pathToName within permitted subtrees + if (permitted != null) { + Iterator e = permitted.iterator(); + while (e.hasNext()) { + GeneralSubtree tree = e.next(); + if (tree.getName().getType() == NAME_DIRECTORY) { + X500Name permittedDN1 = new X500Name(tree.getName().toString()); + X500Name permittedDN2 = new X500Name("CN=good, " + tree.getName().toString()); + DerOutputStream derDN1 = new DerOutputStream(); + DerOutputStream derDN2 = new DerOutputStream(); + permittedDN1.encode(derDN1); + permittedDN2.encode(derDN2); + selector = new X509CertSelector(); + selector.addPathToName(NAME_DIRECTORY, derDN1.toByteArray()); + checkMatch(selector, cert, true); + selector.setPathToNames(null); + selector.addPathToName(NAME_DIRECTORY, derDN2.toByteArray()); + checkMatch(selector, cert, true); + } + } + } + } + + // Tests matching on the subject name contained in the certificate. + private void testSubject() throws IOException { + System.out.println("X.509 Certificate Match on subject"); + // bad match + X509CertSelector selector = new X509CertSelector(); + selector.setSubject("ou=bogus,ou=east,o=sun,c=us"); + checkMatch(selector, cert, false); + + // good match + selector.setSubject(cert.getSubjectX500Principal().getName("RFC2253")); + checkMatch(selector, cert, true); + } + + // Tests matching on the subject public key contained in the certificate. + private void testSubjectPublicKey() throws IOException, GeneralSecurityException { + System.out.println("X.509 Certificate Match on subject public key"); + // bad match + X509CertSelector selector = new X509CertSelector(); + X509EncodedKeySpec keySpec = new X509EncodedKeySpec( + Base64.getMimeDecoder().decode(testKey.getBytes())); + KeyFactory keyFactory = KeyFactory.getInstance("DSA"); + PublicKey pubKey = keyFactory.generatePublic(keySpec); + selector.setSubjectPublicKey(pubKey); + checkMatch(selector, cert, false); + + // good match + selector.setSubjectPublicKey(cert.getPublicKey()); + checkMatch(selector, cert, true); + } + + // Tests matching on the name constraints contained in the certificate. + private void testNameConstraints() throws IOException { + System.out.println("X.509 Certificate Match on name constraints"); + // bad match + GeneralSubtrees subjectTree = new GeneralSubtrees(); + subjectTree.add(getGeneralSubtree((X500Name) cert.getSubjectDN())); + NameConstraintsExtension ext = new NameConstraintsExtension((GeneralSubtrees) null, subjectTree); + X509CertSelector selector = new X509CertSelector(); + selector.setNameConstraints(ext.getExtensionValue()); + checkMatch(selector, cert, false); + + // good match + ext = new NameConstraintsExtension(subjectTree, null); + selector.setNameConstraints(ext.getExtensionValue()); + checkMatch(selector, cert, true); + } + + // Tests matching on basic constraints. + private void testBasicConstraints() { + System.out.println("X.509 Certificate Match on basic constraints"); + // bad match + X509CertSelector selector = new X509CertSelector(); + int mpl = cert.getBasicConstraints(); + selector.setBasicConstraints(0); + checkMatch(selector, cert, false); + + // good match + selector.setBasicConstraints(mpl); + checkMatch(selector, cert, true); + } + + // Tests certificateEquals criterion + private void testCertificate() { + System.out.println("X.509 Certificate Match on certificateEquals criterion"); + + X509CertSelector selector = new X509CertSelector(); + // good match + selector.setCertificate(cert); + checkMatch(selector, cert, true); + } + + private void checkMatch(X509CertSelector selector, X509Certificate cert, boolean match) { + boolean result = selector.match(cert); + if (match != result) + throw new RuntimeException(selector + " match " + cert + " is " + result + ", but expect " + match); + } + + private static GeneralSubtree getGeneralSubtree(GeneralNameInterface gni) { + // Create a new GeneralSubtree with the specified name, 0 base, and + // unlimited length + GeneralName gn = new GeneralName(gni); + GeneralSubtree subTree = new GeneralSubtree(gn, 0, -1); + return subTree; + } +} From e643aeb178d7dc384201ab65ebae793684e2b340 Mon Sep 17 00:00:00 2001 From: Alexander Scherbatiy Date: Tue, 15 Sep 2015 15:31:34 +0400 Subject: [PATCH 72/94] 8029339: Custom MultiResolution image support on HiDPI displays Reviewed-by: flar, serb --- .../com/apple/laf/AquaImageFactory.java | 2 +- .../classes/sun/lwawt/macosx/CImage.java | 2 +- .../classes/java/awt/RenderingHints.java | 58 +++++ .../image/AbstractMultiResolutionImage.java | 69 ++---- .../awt/image/BaseMultiResolutionImage.java | 150 ++++++++++++ .../java/awt/image/MultiResolutionImage.java | 84 +++++++ .../share/classes/sun/awt/SunHints.java | 26 ++- .../share/classes/sun/awt/SunToolkit.java | 2 +- .../awt/image/MultiResolutionCachedImage.java | 22 +- .../sun/awt/image/MultiResolutionImage.java | 83 ------- .../image/MultiResolutionToolkitImage.java | 18 +- .../classes/sun/java2d/SunGraphics2D.java | 54 +++-- .../MultiResolutionCursorTest.java | 69 ++---- .../NSImageToMultiResolutionImageTest.java | 10 +- .../image/MultiResolutionImageCommonTest.java | 12 +- .../awt/image/MultiResolutionImageTest.java | 7 +- .../BaseMultiResolutionImageTest.java | 204 ++++++++++++++++ .../MultiResolutionCachedImageTest.java | 2 +- .../MultiResolutionRenderingHintsTest.java | 218 ++++++++++++++++++ 19 files changed, 863 insertions(+), 229 deletions(-) rename jdk/src/java.desktop/share/classes/{sun => java}/awt/image/AbstractMultiResolutionImage.java (60%) create mode 100644 jdk/src/java.desktop/share/classes/java/awt/image/BaseMultiResolutionImage.java create mode 100644 jdk/src/java.desktop/share/classes/java/awt/image/MultiResolutionImage.java delete mode 100644 jdk/src/java.desktop/share/classes/sun/awt/image/MultiResolutionImage.java create mode 100644 jdk/test/java/awt/image/multiresolution/BaseMultiResolutionImageTest.java create mode 100644 jdk/test/java/awt/image/multiresolution/MultiResolutionRenderingHintsTest.java diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaImageFactory.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaImageFactory.java index 041bec057ae..c26bcae3d06 100644 --- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaImageFactory.java +++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaImageFactory.java @@ -46,7 +46,7 @@ import com.apple.laf.AquaIcon.JRSUIControlSpec; import com.apple.laf.AquaIcon.SystemIcon; import com.apple.laf.AquaUtils.RecyclableObject; import com.apple.laf.AquaUtils.RecyclableSingleton; -import sun.awt.image.MultiResolutionImage; +import java.awt.image.MultiResolutionImage; import sun.awt.image.MultiResolutionCachedImage; public class AquaImageFactory { diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CImage.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CImage.java index 3eaa3930dd9..a5504cbee25 100644 --- a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CImage.java +++ b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CImage.java @@ -31,7 +31,7 @@ import java.awt.image.*; import java.util.Arrays; import java.util.List; -import sun.awt.image.MultiResolutionImage; +import java.awt.image.MultiResolutionImage; import sun.awt.image.MultiResolutionCachedImage; import sun.awt.image.SunWritableRaster; diff --git a/jdk/src/java.desktop/share/classes/java/awt/RenderingHints.java b/jdk/src/java.desktop/share/classes/java/awt/RenderingHints.java index 6a1fa915b05..353a49c52cf 100644 --- a/jdk/src/java.desktop/share/classes/java/awt/RenderingHints.java +++ b/jdk/src/java.desktop/share/classes/java/awt/RenderingHints.java @@ -954,6 +954,64 @@ public class RenderingHints public static final Object VALUE_STROKE_PURE = SunHints.VALUE_STROKE_PURE; + /** + * Image resolution variant hint key. + * The {@code RESOLUTION_VARIANT} hint controls which image resolution + * variant should be chosen for image drawing. + * + *

      + *
    • {@link #VALUE_RESOLUTION_VARIANT_DEFAULT} + *
    • {@link #VALUE_RESOLUTION_VARIANT_BASE} + *
    • {@link #VALUE_RESOLUTION_VARIANT_SIZE_FIT} + *
    • {@link #VALUE_RESOLUTION_VARIANT_DPI_FIT} + *
    + * @since 1.9 + */ + public static final Key KEY_RESOLUTION_VARIANT = + SunHints.KEY_RESOLUTION_VARIANT; + + /** + * Image resolution variant hint value -- an image resolution variant is + * chosen based on a default heuristic which may depend on the policies + * of the platform + * + * @see #KEY_RESOLUTION_VARIANT + * @since 1.9 + */ + public static final Object VALUE_RESOLUTION_VARIANT_DEFAULT = + SunHints.VALUE_RESOLUTION_VARIANT_DEFAULT; + + /** + * Image resolution variant hint value -- the standard resolution of an image + * is always used. + * + * @see #KEY_RESOLUTION_VARIANT + * @since 1.9 + */ + public static final Object VALUE_RESOLUTION_VARIANT_BASE = + SunHints.VALUE_RESOLUTION_VARIANT_BASE; + + /** + * Image resolution variant hint value -- an image resolution variant is + * chosen based on the DPI of the screen and the transform in the Graphics2D + * context. + * + * @see #KEY_RESOLUTION_VARIANT + * @since 1.9 + */ + public static final Object VALUE_RESOLUTION_VARIANT_SIZE_FIT = + SunHints.VALUE_RESOLUTION_VARIANT_SIZE_FIT; + + /** + * Image resolution variant hint value -- an image resolution variant is + * chosen based only on the DPI of the screen. + * + * @see #KEY_RESOLUTION_VARIANT + * @since 1.9 + */ + public static final Object VALUE_RESOLUTION_VARIANT_DPI_FIT = + SunHints.VALUE_RESOLUTION_VARIANT_DPI_FIT; + /** * Constructs a new object with keys and values initialized * from the specified Map object which may be null. diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/AbstractMultiResolutionImage.java b/jdk/src/java.desktop/share/classes/java/awt/image/AbstractMultiResolutionImage.java similarity index 60% rename from jdk/src/java.desktop/share/classes/sun/awt/image/AbstractMultiResolutionImage.java rename to jdk/src/java.desktop/share/classes/java/awt/image/AbstractMultiResolutionImage.java index 5116f517ff0..606661b3e69 100644 --- a/jdk/src/java.desktop/share/classes/sun/awt/image/AbstractMultiResolutionImage.java +++ b/jdk/src/java.desktop/share/classes/java/awt/image/AbstractMultiResolutionImage.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 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,50 +22,39 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package sun.awt.image; +package java.awt.image; import java.awt.Graphics; import java.awt.Image; -import java.awt.image.*; /** - * This class provides default implementations for the - * MultiResolutionImage interface. The developer needs only - * to subclass this abstract class and define the getResolutionVariant, - * getResolutionVariants, and getBaseImage methods. - * + * This class provides default implementations of several {@code Image} methods + * for classes that want to implement the {@MultiResolutionImage} interface. * * For example, - * {@code + * 
     {@code
  * public class CustomMultiResolutionImage extends AbstractMultiResolutionImage {
  *
- *     int baseImageIndex;
- *     Image[] resolutionVariants;
+ *     final Image[] resolutionVariants;
  *
- *     public CustomMultiResolutionImage(int baseImageIndex,
- *             Image... resolutionVariants) {
- *          this.baseImageIndex = baseImageIndex;
+ *     public CustomMultiResolutionImage(Image... resolutionVariants) {
  *          this.resolutionVariants = resolutionVariants;
  *     }
  *
- *     @Override
- *     public Image getResolutionVariant(float logicalDPIX, float logicalDPIY,
- *             float baseImageWidth, float baseImageHeight,
- *             float destImageWidth, float destImageHeight) {
- *         // return a resolution variant based on the given logical DPI,
- *         // base image size, or destination image size
+ *     public Image getResolutionVariant(
+ *             double destImageWidth, double destImageHeight) {
+ *         // return a resolution variant based on the given destination image size
  *     }
  *
- *     @Override
  *     public List getResolutionVariants() {
- *         return Arrays.asList(resolutionVariants);
+ *         return Collections.unmodifiableList(Arrays.asList(resolutionVariants));
  *     }
  *
  *     protected Image getBaseImage() {
- *         return resolutionVariants[baseImageIndex];
+ *         return resolutionVariants[0];
  *     }
  * }
- * }
+ * }
    * * @see java.awt.Image * @see java.awt.image.MultiResolutionImage @@ -75,49 +64,39 @@ import java.awt.image.*; public abstract class AbstractMultiResolutionImage extends java.awt.Image implements MultiResolutionImage { - /** - * @inheritDoc - */ @Override public int getWidth(ImageObserver observer) { - return getBaseImage().getWidth(null); + return getBaseImage().getWidth(observer); } - /** - * @inheritDoc - */ @Override public int getHeight(ImageObserver observer) { - return getBaseImage().getHeight(null); + return getBaseImage().getHeight(observer); } - /** - * @inheritDoc - */ @Override public ImageProducer getSource() { return getBaseImage().getSource(); } - /** - * @inheritDoc - */ @Override public Graphics getGraphics() { - return getBaseImage().getGraphics(); - + throw new UnsupportedOperationException("getGraphics() not supported" + + " on Multi-Resolution Images"); } - /** - * @inheritDoc - */ @Override public Object getProperty(String name, ImageObserver observer) { return getBaseImage().getProperty(name, observer); } /** - * @return base image + * Return the base image representing the best version of the image for + * rendering at the default width and height. + * + * @return the base image of the set of multi-resolution images + * + * @since 1.9 */ protected abstract Image getBaseImage(); -} +} \ No newline at end of file diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/BaseMultiResolutionImage.java b/jdk/src/java.desktop/share/classes/java/awt/image/BaseMultiResolutionImage.java new file mode 100644 index 00000000000..653057632a5 --- /dev/null +++ b/jdk/src/java.desktop/share/classes/java/awt/image/BaseMultiResolutionImage.java @@ -0,0 +1,150 @@ +/* + * Copyright (c) 2015, 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 java.awt.image; + +import java.awt.Image; +import java.util.List; +import java.util.Arrays; +import java.util.Collections; +import java.util.Objects; + +/** + * This class is an array-based implementation of + * the {@code AbstractMultiResolutionImage} class. + * + * This class will implement the + * {@code getResolutionVariant(double destImageWidth, double destImageHeight)} + * method using a simple algorithm which will return the first image variant + * in the array that is large enough to satisfy the rendering request. The + * last image in the array will be returned if no suitable image is found + * that is as large as the rendering request. + *

    + * For best effect the array of images should be sorted with each image being + * both wider and taller than the previous image. The base image need not be + * the first image in the array. No exception will be thrown if the images + * are not sorted as suggested. + * + * @see java.awt.Image + * @see java.awt.image.MultiResolutionImage + * @see java.awt.image.AbstractMultiResolutionImage + * + * @since 1.9 + */ +public class BaseMultiResolutionImage extends AbstractMultiResolutionImage { + + private final int baseImageIndex; + private final Image[] resolutionVariants; + + /** + * Creates a multi-resolution image with the given resolution variants. + * The first resolution variant is used as the base image. + * + * @param resolutionVariants array of resolution variants sorted by image size + * @throws IllegalArgumentException if null or zero-length array is passed + * @throws NullPointerException if the specified {@code resolutionVariants} + * contains one or more null elements + * + * @since 1.9 + */ + public BaseMultiResolutionImage(Image... resolutionVariants) { + this(0, resolutionVariants); + } + + /** + * Creates a multi-resolution image with the given base image index and + * resolution variants. + * + * @param baseImageIndex the index of base image in the resolution variants + * array + * @param resolutionVariants array of resolution variants sorted by image size + * @throws IllegalArgumentException if null or zero-length array is passed + * @throws NullPointerException if the specified {@code resolutionVariants} + * contains one or more null elements + * @throws IndexOutOfBoundsException if {@code baseImageIndex} is + * negative or greater than or equal to {@code resolutionVariants} + * length. + * + * @since 1.9 + */ + public BaseMultiResolutionImage(int baseImageIndex, + Image... resolutionVariants) { + + if (resolutionVariants == null || resolutionVariants.length == 0) { + throw new IllegalArgumentException( + "Null or zero-length array is passed"); + } + + if (baseImageIndex < 0 || baseImageIndex >= resolutionVariants.length) { + throw new IndexOutOfBoundsException("Invalid base image index: " + + baseImageIndex); + } + + this.baseImageIndex = baseImageIndex; + this.resolutionVariants = Arrays.copyOf(resolutionVariants, + resolutionVariants.length); + + for (Image resolutionVariant : this.resolutionVariants) { + Objects.requireNonNull(resolutionVariant, + "Resolution variant can't be null"); + } + } + + @Override + public Image getResolutionVariant(double destImageWidth, + double destImageHeight) { + + checkSize(destImageWidth, destImageHeight); + + for (Image rvImage : resolutionVariants) { + if (destImageWidth <= rvImage.getWidth(null) + && destImageHeight <= rvImage.getHeight(null)) { + return rvImage; + } + } + return resolutionVariants[resolutionVariants.length - 1]; + } + + private static void checkSize(double width, double height) { + if (width <= 0 || height <= 0) { + throw new IllegalArgumentException(String.format( + "Width (%s) or height (%s) cannot be <= 0", width, height)); + } + + if (!Double.isFinite(width) || !Double.isFinite(height)) { + throw new IllegalArgumentException(String.format( + "Width (%s) or height (%s) is not finite", width, height)); + } + } + + @Override + public List getResolutionVariants() { + return Collections.unmodifiableList(Arrays.asList(resolutionVariants)); + } + + @Override + protected Image getBaseImage() { + return resolutionVariants[baseImageIndex]; + } +} \ No newline at end of file diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/MultiResolutionImage.java b/jdk/src/java.desktop/share/classes/java/awt/image/MultiResolutionImage.java new file mode 100644 index 00000000000..26b4b534d81 --- /dev/null +++ b/jdk/src/java.desktop/share/classes/java/awt/image/MultiResolutionImage.java @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2015, 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 java.awt.image; + +import java.awt.Image; +import java.util.List; + +/** + * This interface is designed to be an optional additional API supported by + * some implementations of {@link java.awt.Image} to allow them to provide + * alternate images for various rendering resolutions. The various + * {@code Graphics.drawImage(...)} variant methods will consult the methods + * of this interface if it is implemented on the argument {@code Image} object + * in order to choose the best representation to use for each rendering operation. + *

    + * The {@code MultiResolutionImage} interface should be implemented by any + * subclass of {@code java.awt.Image} whose instances are intended to provide + * image resolution variants according to the given image width and height. + * For convenience, toolkit images obtained from + * {@code Toolkit.getImage(String name)} and {@code Toolkit.getImage(URL url)} + * will implement this interface on platforms that support naming conventions + * for resolution variants of stored image media and the + * {@code AbstractMultiResolutionImage} and {@code BaseMultiResolutionImage} + * classes are provided to facilitate easy construction of custom multi-resolution + * images from a list of related images. + * + * @see java.awt.Image + * @see java.awt.image.AbstractMultiResolutionImage + * @see java.awt.image.BaseMultiResolutionImage + * @see java.awt.Toolkit#getImage(java.lang.String filename) + * @see java.awt.Toolkit#getImage(java.net.URL url) + * + * @since 1.9 + */ +public interface MultiResolutionImage { + + /** + * Gets a specific image that is the best variant to represent + * this logical image at the indicated size. + * + * @param destImageWidth the width of the destination image, in pixels. + * @param destImageHeight the height of the destination image, in pixels. + * @return image resolution variant. + * @throws IllegalArgumentException if {@code destImageWidth} or + * {@code destImageHeight} is less than or equal to zero, infinity, + * or NaN. + * + * @since 1.9 + */ + Image getResolutionVariant(double destImageWidth, double destImageHeight); + + /** + * Gets a readable list of all resolution variants. + * The list must be nonempty and contain at least one resolution variant. + *

    + * Note that many implementations might return an unmodifiable list. + *

    + * @return list of resolution variants. + * @since 1.9 + */ + public List getResolutionVariants(); +} \ No newline at end of file diff --git a/jdk/src/java.desktop/share/classes/sun/awt/SunHints.java b/jdk/src/java.desktop/share/classes/sun/awt/SunHints.java index 15c7e544901..b82e0564457 100644 --- a/jdk/src/java.desktop/share/classes/sun/awt/SunHints.java +++ b/jdk/src/java.desktop/share/classes/sun/awt/SunHints.java @@ -257,8 +257,10 @@ public class SunHints { */ @Native public static final int INTKEY_RESOLUTION_VARIANT = 9; @Native public static final int INTVAL_RESOLUTION_VARIANT_DEFAULT = 0; - @Native public static final int INTVAL_RESOLUTION_VARIANT_OFF = 1; - @Native public static final int INTVAL_RESOLUTION_VARIANT_ON = 2; + @Native public static final int INTVAL_RESOLUTION_VARIANT_BASE = 1; + @Native public static final int INTVAL_RESOLUTION_VARIANT_SIZE_FIT = 2; + @Native public static final int INTVAL_RESOLUTION_VARIANT_DPI_FIT = 3; + /** * LCD text contrast control hint key. * Value is "100" to make discontiguous with the others which @@ -466,15 +468,23 @@ public class SunHints { public static final Object VALUE_RESOLUTION_VARIANT_DEFAULT = new SunHints.Value(KEY_RESOLUTION_VARIANT, SunHints.INTVAL_RESOLUTION_VARIANT_DEFAULT, - "Choose image resolutions based on a default heuristic"); - public static final Object VALUE_RESOLUTION_VARIANT_OFF = + "Choose image resolutions based on a default" + + "heuristic"); + public static final Object VALUE_RESOLUTION_VARIANT_BASE = new SunHints.Value(KEY_RESOLUTION_VARIANT, - SunHints.INTVAL_RESOLUTION_VARIANT_OFF, + SunHints.INTVAL_RESOLUTION_VARIANT_BASE, "Use only the standard resolution of an image"); - public static final Object VALUE_RESOLUTION_VARIANT_ON = + public static final Object VALUE_RESOLUTION_VARIANT_SIZE_FIT = new SunHints.Value(KEY_RESOLUTION_VARIANT, - SunHints.INTVAL_RESOLUTION_VARIANT_ON, - "Always use resolution-specific variants of images"); + SunHints.INTVAL_RESOLUTION_VARIANT_SIZE_FIT, + "Choose image resolutions based on the DPI" + + "of the screen and transform" + + "in the Graphics2D context"); + public static final Object VALUE_RESOLUTION_VARIANT_DPI_FIT = + new SunHints.Value(KEY_RESOLUTION_VARIANT, + SunHints.INTVAL_RESOLUTION_VARIANT_DPI_FIT, + "Choose image resolutions based only on the DPI" + + " of the screen"); public static class LCDContrastKey extends Key { diff --git a/jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java b/jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java index c3b53acf7f0..61df2fa0909 100644 --- a/jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java +++ b/jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java @@ -60,7 +60,7 @@ import sun.awt.im.InputContext; import sun.awt.image.ByteArrayImageSource; import sun.awt.image.FileImageSource; import sun.awt.image.ImageRepresentation; -import sun.awt.image.MultiResolutionImage; +import java.awt.image.MultiResolutionImage; import sun.awt.image.MultiResolutionToolkitImage; import sun.awt.image.ToolkitImage; import sun.awt.image.URLImageSource; diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/MultiResolutionCachedImage.java b/jdk/src/java.desktop/share/classes/sun/awt/image/MultiResolutionCachedImage.java index acab1587c82..8d8acdcf0a3 100644 --- a/jdk/src/java.desktop/share/classes/sun/awt/image/MultiResolutionCachedImage.java +++ b/jdk/src/java.desktop/share/classes/sun/awt/image/MultiResolutionCachedImage.java @@ -33,6 +33,7 @@ import java.util.List; import java.util.function.Function; import java.util.function.BiFunction; import java.util.stream.Collectors; +import java.awt.image.AbstractMultiResolutionImage; public class MultiResolutionCachedImage extends AbstractMultiResolutionImage { @@ -58,7 +59,10 @@ public class MultiResolutionCachedImage extends AbstractMultiResolutionImage { } @Override - public Image getResolutionVariant(int width, int height) { + public Image getResolutionVariant(double destWidth, double destHeight) { + checkSize(destWidth, destHeight); + int width = (int) Math.ceil(destWidth); + int height = (int) Math.ceil(destHeight); ImageCache cache = ImageCache.getInstance(); ImageCacheKey key = new ImageCacheKey(this, width, height); Image resolutionVariant = cache.getImage(key); @@ -70,11 +74,23 @@ public class MultiResolutionCachedImage extends AbstractMultiResolutionImage { return resolutionVariant; } + private static void checkSize(double width, double height) { + if (width <= 0 || height <= 0) { + throw new IllegalArgumentException(String.format( + "Width (%s) or height (%s) cannot be <= 0", width, height)); + } + + if (!Double.isFinite(width) || !Double.isFinite(height)) { + throw new IllegalArgumentException(String.format( + "Width (%s) or height (%s) is not finite", width, height)); + } + } + @Override public List getResolutionVariants() { return Arrays.stream(sizes).map((Function) size - -> getResolutionVariant((int) size.getWidth(), - (int) size.getHeight())).collect(Collectors.toList()); + -> getResolutionVariant(size.getWidth(), size.getHeight())) + .collect(Collectors.toList()); } public MultiResolutionCachedImage map(Function mapper) { diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/MultiResolutionImage.java b/jdk/src/java.desktop/share/classes/sun/awt/image/MultiResolutionImage.java deleted file mode 100644 index 525267d1530..00000000000 --- a/jdk/src/java.desktop/share/classes/sun/awt/image/MultiResolutionImage.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * 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. - */ -package sun.awt.image; - -import java.awt.Image; -import java.util.List; - -/** - * This interface is designed to provide a set of images at various resolutions. - * - * The MultiResolutionImage interface should be implemented by any - * class whose instances are intended to provide image resolution variants - * according to the given image width and height. - * - * For example, - * 

    - * {@code
- *  public class ScaledImage extends BufferedImage
- *         implements MultiResolutionImage {
- *
- *    @Override
- *    public Image getResolutionVariant(int width, int height) {
- *      return ((width <= getWidth() && height <= getHeight()))
- *             ? this : highResolutionImage;
- *    }
- *
- *    @Override
- *    public List getResolutionVariants() {
- *        return Arrays.asList(this, highResolutionImage);
- *    }
- *  }
- * }
    - * - * It is recommended to cache image variants for performance reasons. - * - * WARNING: This class is an implementation detail. This API may change - * between update release, and it may even be removed or be moved in some other - * package(s)/class(es). - */ -public interface MultiResolutionImage { - - /** - * Provides an image with necessary resolution which best fits to the given - * image width and height. - * - * @param width the desired image resolution width. - * @param height the desired image resolution height. - * @return image resolution variant. - * - * @since 1.8 - */ - public Image getResolutionVariant(int width, int height); - - /** - * Gets list of all resolution variants including the base image - * - * @return list of resolution variants. - * @since 1.8 - */ - public List getResolutionVariants(); -} diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/MultiResolutionToolkitImage.java b/jdk/src/java.desktop/share/classes/sun/awt/image/MultiResolutionToolkitImage.java index 526bb0ca146..a8e67f767ca 100644 --- a/jdk/src/java.desktop/share/classes/sun/awt/image/MultiResolutionToolkitImage.java +++ b/jdk/src/java.desktop/share/classes/sun/awt/image/MultiResolutionToolkitImage.java @@ -26,6 +26,7 @@ package sun.awt.image; import java.awt.Image; import java.awt.image.ImageObserver; +import java.awt.image.MultiResolutionImage; import java.util.Arrays; import java.util.List; import sun.misc.SoftCache; @@ -40,11 +41,24 @@ public class MultiResolutionToolkitImage extends ToolkitImage implements MultiRe } @Override - public Image getResolutionVariant(int width, int height) { - return ((width <= getWidth() && height <= getHeight())) + public Image getResolutionVariant(double destWidth, double destHeight) { + checkSize(destWidth, destHeight); + return ((destWidth <= getWidth() && destHeight <= getHeight())) ? this : resolutionVariant; } + private static void checkSize(double width, double height) { + if (width <= 0 || height <= 0) { + throw new IllegalArgumentException(String.format( + "Width (%s) or height (%s) cannot be <= 0", width, height)); + } + + if (!Double.isFinite(width) || !Double.isFinite(height)) { + throw new IllegalArgumentException(String.format( + "Width (%s) or height (%s) is not finite", width, height)); + } + } + public Image getResolutionVariant() { return resolutionVariant; } diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java b/jdk/src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java index f3c08ac332c..36955e280e5 100644 --- a/jdk/src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java +++ b/jdk/src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java @@ -94,7 +94,7 @@ import java.util.Iterator; import sun.misc.PerformanceLogger; import java.lang.annotation.Native; -import sun.awt.image.MultiResolutionImage; +import java.awt.image.MultiResolutionImage; import static java.awt.geom.AffineTransform.TYPE_FLIP; import static java.awt.geom.AffineTransform.TYPE_MASK_SCALE; @@ -3087,9 +3087,8 @@ public final class SunGraphics2D // end of text rendering methods private boolean isHiDPIImage(final Image img) { - return (SurfaceManager.getImageScale(img) != 1) || - (resolutionVariantHint != SunHints.INTVAL_RESOLUTION_VARIANT_OFF - && img instanceof MultiResolutionImage); + return (SurfaceManager.getImageScale(img) != 1) + || img instanceof MultiResolutionImage; } private boolean drawHiDPIImage(Image img, int dx1, int dy1, int dx2, @@ -3175,24 +3174,41 @@ public final class SunGraphics2D int type = transform.getType(); int dw = dx2 - dx1; int dh = dy2 - dy1; - double destRegionWidth; - double destRegionHeight; - if ((type & ~(TYPE_TRANSLATION | TYPE_FLIP)) == 0) { - destRegionWidth = dw; - destRegionHeight = dh; - } else if ((type & ~(TYPE_TRANSLATION | TYPE_FLIP | TYPE_MASK_SCALE)) == 0) { - destRegionWidth = dw * transform.getScaleX(); - destRegionHeight = dh * transform.getScaleY(); + double destImageWidth; + double destImageHeight; + + if (resolutionVariantHint == SunHints.INTVAL_RESOLUTION_VARIANT_BASE) { + destImageWidth = srcWidth; + destImageHeight = srcHeight; + } else if (resolutionVariantHint == SunHints.INTVAL_RESOLUTION_VARIANT_DPI_FIT) { + AffineTransform configTransform = getDefaultTransform(); + if (configTransform.isIdentity()) { + destImageWidth = srcWidth; + destImageHeight = srcHeight; + } else { + destImageWidth = srcWidth * configTransform.getScaleX(); + destImageHeight = srcHeight * configTransform.getScaleY(); + } } else { - destRegionWidth = dw * Math.hypot( - transform.getScaleX(), transform.getShearY()); - destRegionHeight = dh * Math.hypot( - transform.getShearX(), transform.getScaleY()); - } + double destRegionWidth; + double destRegionHeight; - int destImageWidth = (int) Math.abs(srcWidth * destRegionWidth / sw); - int destImageHeight = (int) Math.abs(srcHeight * destRegionHeight / sh); + if ((type & ~(TYPE_TRANSLATION | TYPE_FLIP)) == 0) { + destRegionWidth = dw; + destRegionHeight = dh; + } else if ((type & ~(TYPE_TRANSLATION | TYPE_FLIP | TYPE_MASK_SCALE)) == 0) { + destRegionWidth = dw * transform.getScaleX(); + destRegionHeight = dh * transform.getScaleY(); + } else { + destRegionWidth = dw * Math.hypot( + transform.getScaleX(), transform.getShearY()); + destRegionHeight = dh * Math.hypot( + transform.getShearX(), transform.getScaleY()); + } + destImageWidth = Math.abs(srcWidth * destRegionWidth / sw); + destImageHeight = Math.abs(srcHeight * destRegionHeight / sh); + } Image resolutionVariant = img.getResolutionVariant(destImageWidth, destImageHeight); diff --git a/jdk/test/java/awt/Cursor/MultiResolutionCursorTest/MultiResolutionCursorTest.java b/jdk/test/java/awt/Cursor/MultiResolutionCursorTest/MultiResolutionCursorTest.java index 9eb0dbc93e1..adf4c4d8b5e 100644 --- a/jdk/test/java/awt/Cursor/MultiResolutionCursorTest/MultiResolutionCursorTest.java +++ b/jdk/test/java/awt/Cursor/MultiResolutionCursorTest/MultiResolutionCursorTest.java @@ -25,19 +25,16 @@ import java.awt.Color; import java.awt.Cursor; import java.awt.Dialog; import java.awt.Frame; -import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.Image; import java.awt.Label; import java.awt.Point; import java.awt.TextArea; import java.awt.Toolkit; +import java.awt.image.BaseMultiResolutionImage; import java.awt.image.BufferedImage; -import java.util.LinkedList; -import java.util.List; import javax.swing.JApplet; import jdk.testlibrary.OSInfo; -import sun.awt.image.MultiResolutionImage; /** * @test @@ -52,7 +49,7 @@ import sun.awt.image.MultiResolutionImage; public class MultiResolutionCursorTest extends JApplet { //Declare things used in the test, like buttons and labels here - static final int sizes[] = {16, 32, 128}; + static final int sizes[] = {8, 16, 32, 128}; static final Color colors[] = {Color.WHITE, Color.RED, Color.GREEN, Color.BLUE}; public void init() { @@ -87,7 +84,12 @@ public class MultiResolutionCursorTest extends JApplet { setVisible(true); validate(); - final Image image = new MultiResolutionCursor(); + final Image image = new BaseMultiResolutionImage( + createResolutionVariant(0), + createResolutionVariant(1), + createResolutionVariant(2), + createResolutionVariant(3) + ); int center = sizes[0] / 2; Cursor cursor = Toolkit.getDefaultToolkit().createCustomCursor( @@ -101,53 +103,14 @@ public class MultiResolutionCursorTest extends JApplet { frame.setVisible(true); }// start() - - static class MultiResolutionCursor extends BufferedImage implements MultiResolutionImage { - - List highResolutionImages; - - public MultiResolutionCursor() { - super(sizes[0], sizes[0], BufferedImage.TYPE_INT_RGB); - - draw(getGraphics(), 0); - highResolutionImages = new LinkedList<>(); - highResolutionImages.add(this); - - for (int i = 1; i < sizes.length; i++) { - BufferedImage highResolutionImage = - new BufferedImage(sizes[i], sizes[i], BufferedImage.TYPE_INT_RGB); - draw(highResolutionImage.getGraphics(), i); - highResolutionImages.add(highResolutionImage); - } - } - - @Override - public Image getResolutionVariant(int width, int height) { - - for (int i = 0; i < sizes.length; i++) { - Image image = highResolutionImages.get(i); - int w = image.getWidth(null); - int h = image.getHeight(null); - - if (width <= w && height <= h) { - return image; - } - } - - return highResolutionImages.get(highResolutionImages.size() - 1); - } - - void draw(Graphics graphics, int index) { - Graphics2D g2 = (Graphics2D) graphics; - Color color = colors[index]; - g2.setColor(color); - g2.fillRect(0, 0, sizes[index], sizes[index]); - } - - @Override - public List getResolutionVariants() { - return highResolutionImages; - } + static BufferedImage createResolutionVariant(int i) { + BufferedImage resolutionVariant = new BufferedImage(sizes[i], sizes[i], + BufferedImage.TYPE_INT_RGB); + Graphics2D g2 = resolutionVariant.createGraphics(); + g2.setColor(colors[i]); + g2.fillRect(0, 0, sizes[i], sizes[i]); + g2.dispose(); + return resolutionVariant; } }// class BlockedWindowTest diff --git a/jdk/test/java/awt/image/MultiResolutionImage/NSImageToMultiResolutionImageTest.java b/jdk/test/java/awt/image/MultiResolutionImage/NSImageToMultiResolutionImageTest.java index b7d557cca2d..33d8ab731a8 100644 --- a/jdk/test/java/awt/image/MultiResolutionImage/NSImageToMultiResolutionImageTest.java +++ b/jdk/test/java/awt/image/MultiResolutionImage/NSImageToMultiResolutionImageTest.java @@ -23,15 +23,17 @@ import java.awt.Image; import java.awt.Toolkit; -import sun.awt.OSInfo; -import sun.awt.image.MultiResolutionImage; +import java.awt.image.MultiResolutionImage; +import jdk.testlibrary.OSInfo; + /* * @test * @bug 8033534 8035069 * @summary [macosx] Get MultiResolution image from native system * @author Alexander Scherbatiy - * @modules java.desktop/sun.awt - * java.desktop/sun.awt.image + * @modules java.desktop/sun.awt.image + * @library /lib/testlibrary + * @build jdk.testlibrary.OSInfo * @run main NSImageToMultiResolutionImageTest */ diff --git a/jdk/test/java/awt/image/MultiResolutionImageCommonTest.java b/jdk/test/java/awt/image/MultiResolutionImageCommonTest.java index db4f72b837c..44f91c9bf44 100644 --- a/jdk/test/java/awt/image/MultiResolutionImageCommonTest.java +++ b/jdk/test/java/awt/image/MultiResolutionImageCommonTest.java @@ -25,12 +25,13 @@ import java.awt.Color; import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.Image; +import java.awt.RenderingHints; import java.awt.image.BufferedImage; import sun.awt.SunHints; import java.awt.geom.AffineTransform; import java.util.Arrays; import java.util.List; -import sun.awt.image.MultiResolutionImage; +import java.awt.image.MultiResolutionImage; /** * @test @bug 8011059 @@ -173,8 +174,9 @@ public class MultiResolutionImageCommonTest { } @Override - public Image getResolutionVariant(int width, int height) { - return ((width <= getWidth() && height <= getHeight())) + public Image getResolutionVariant( + double destImageWidth, double destImageHeight) { + return ((destImageWidth <= getWidth() && destImageHeight <= getHeight())) ? this : highResolutionImage; } @@ -187,8 +189,8 @@ public class MultiResolutionImageCommonTest { static void setImageScalingHint( Graphics2D g2d, boolean enableImageScaling) { g2d.setRenderingHint(SunHints.KEY_RESOLUTION_VARIANT, enableImageScaling - ? SunHints.VALUE_RESOLUTION_VARIANT_ON - : SunHints.VALUE_RESOLUTION_VARIANT_OFF); + ? RenderingHints.VALUE_RESOLUTION_VARIANT_DEFAULT + : RenderingHints.VALUE_RESOLUTION_VARIANT_BASE); } static void checkColor(int rgb, boolean isImageScaled) { diff --git a/jdk/test/java/awt/image/MultiResolutionImageTest.java b/jdk/test/java/awt/image/MultiResolutionImageTest.java index 1c2e8e17798..a1f70e52b91 100644 --- a/jdk/test/java/awt/image/MultiResolutionImageTest.java +++ b/jdk/test/java/awt/image/MultiResolutionImageTest.java @@ -33,10 +33,11 @@ import java.net.URL; import javax.imageio.ImageIO; import sun.awt.SunHints; import java.awt.MediaTracker; +import java.awt.RenderingHints; import java.awt.image.ImageObserver; import javax.swing.JPanel; import jdk.testlibrary.Platform; -import sun.awt.image.MultiResolutionImage; +import java.awt.image.MultiResolutionImage; /** * @test @bug 8011059 @@ -339,8 +340,8 @@ public class MultiResolutionImageTest { static void setImageScalingHint(Graphics2D g2d, boolean enableImageScaling) { g2d.setRenderingHint(SunHints.KEY_RESOLUTION_VARIANT, enableImageScaling - ? SunHints.VALUE_RESOLUTION_VARIANT_ON - : SunHints.VALUE_RESOLUTION_VARIANT_OFF); + ? RenderingHints.VALUE_RESOLUTION_VARIANT_DEFAULT + : RenderingHints.VALUE_RESOLUTION_VARIANT_BASE); } static void checkColor(int rgb, boolean isImageScaled) { diff --git a/jdk/test/java/awt/image/multiresolution/BaseMultiResolutionImageTest.java b/jdk/test/java/awt/image/multiresolution/BaseMultiResolutionImageTest.java new file mode 100644 index 00000000000..1ce7b7faf82 --- /dev/null +++ b/jdk/test/java/awt/image/multiresolution/BaseMultiResolutionImageTest.java @@ -0,0 +1,204 @@ +/* + * Copyright (c) 2015, 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. + */ +import java.awt.Dimension; +import java.awt.Image; +import java.awt.image.BufferedImage; +import java.awt.image.BaseMultiResolutionImage; +import java.awt.image.MultiResolutionImage; +import java.util.List; + +/** + * @test + * @bug 8029339 + * @author Alexander Scherbatiy + * @summary Custom MultiResolution image support on HiDPI displays + * @run main BaseMultiResolutionImageTest + */ +public class BaseMultiResolutionImageTest { + + public static void main(String[] args) { + testZeroRVIMages(); + testNullRVIMages(); + testNullRVIMage(); + testIOOBException(); + testRVSizes(); + testBaseMRImage(); + } + + static void testZeroRVIMages() { + try { + new BaseMultiResolutionImage(); + } catch (IllegalArgumentException ignored) { + return; + } + throw new RuntimeException("IllegalArgumentException is not thrown!"); + } + + static void testNullRVIMages() { + try { + new BaseMultiResolutionImage(null); + } catch (IllegalArgumentException ignored) { + return; + } + throw new RuntimeException("IllegalArgumentException is not thrown!"); + } + + static void testNullRVIMage() { + + Image baseImage = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB); + + try { + new BaseMultiResolutionImage(baseImage, null); + } catch (NullPointerException ignored) { + return; + } + throw new RuntimeException("NullPointerException is not thrown!"); + } + + static void testIOOBException() { + + for (int baseImageIndex : new int[]{-3, 2, 4}) { + try { + new BaseMultiResolutionImage(baseImageIndex, + createRVImage(0), createRVImage(1)); + } catch (IndexOutOfBoundsException ignored) { + continue; + } + + throw new RuntimeException("IndexOutOfBoundsException is not thrown!"); + } + } + + static void testRVSizes() { + + int imageSize = getSize(1); + + double[][] sizeArray = { + {-imageSize, imageSize}, + {2 * imageSize, -2 * imageSize}, + {Double.POSITIVE_INFINITY, imageSize}, + {Double.POSITIVE_INFINITY, -imageSize}, + {imageSize, Double.NEGATIVE_INFINITY}, + {-imageSize, Double.NEGATIVE_INFINITY}, + {Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY}, + {Double.NaN, imageSize}, + {imageSize, Double.NaN}, + {Double.NaN, Double.NaN}, + {Double.POSITIVE_INFINITY, Double.NaN} + }; + + for (double[] sizes : sizeArray) { + try { + MultiResolutionImage mrImage = new BaseMultiResolutionImage( + 0, createRVImage(0), createRVImage(1)); + mrImage.getResolutionVariant(sizes[0], sizes[1]); + } catch (IllegalArgumentException ignored) { + continue; + } + + throw new RuntimeException("IllegalArgumentException is not thrown!"); + } + } + + static void testBaseMRImage() { + int baseIndex = 1; + int length = 3; + BufferedImage[] resolutionVariants = new BufferedImage[length]; + for (int i = 0; i < length; i++) { + resolutionVariants[i] = createRVImage(i); + } + + BaseMultiResolutionImage mrImage = new BaseMultiResolutionImage(baseIndex, + resolutionVariants); + + List rvImageList = mrImage.getResolutionVariants(); + if (rvImageList.size() != length) { + throw new RuntimeException("Wrong size of resolution variants list!"); + } + + for (int i = 0; i < length; i++) { + int imageSize = getSize(i); + Image testRVImage = mrImage.getResolutionVariant(imageSize, imageSize); + + if (testRVImage != resolutionVariants[i]) { + throw new RuntimeException("Wrong resolution variant!"); + } + + if (rvImageList.get(i) != resolutionVariants[i]) { + throw new RuntimeException("Wrong resolution variant!"); + } + } + + BufferedImage baseImage = resolutionVariants[baseIndex]; + + if (baseImage.getWidth() != mrImage.getWidth(null) + || baseImage.getHeight() != mrImage.getHeight(null)) { + throw new RuntimeException("Base image is wrong!"); + } + + boolean passed = false; + + try { + rvImageList.set(0, createRVImage(10)); + } catch (Exception e) { + passed = true; + } + + if (!passed) { + throw new RuntimeException("Resolution variants list is modifiable!"); + } + + passed = false; + + try { + rvImageList.remove(0); + } catch (Exception e) { + passed = true; + } + + if (!passed) { + throw new RuntimeException("Resolution variants list is modifiable!"); + } + + passed = false; + + try { + rvImageList.add(0, createRVImage(10)); + } catch (Exception e) { + passed = true; + } + + if (!passed) { + throw new RuntimeException("Resolution variants list is modifiable!"); + } + } + + private static int getSize(int i) { + return 8 * (i + 1); + } + + private static BufferedImage createRVImage(int i) { + return new BufferedImage(getSize(i), getSize(i), + BufferedImage.TYPE_INT_RGB); + } +} diff --git a/jdk/test/java/awt/image/multiresolution/MultiResolutionCachedImageTest.java b/jdk/test/java/awt/image/multiresolution/MultiResolutionCachedImageTest.java index 9b4a52ed739..c5d622dd77c 100644 --- a/jdk/test/java/awt/image/multiresolution/MultiResolutionCachedImageTest.java +++ b/jdk/test/java/awt/image/multiresolution/MultiResolutionCachedImageTest.java @@ -98,7 +98,7 @@ public class MultiResolutionCachedImageTest { } @Override - public Image getResolutionVariant(int width, int height) { + public Image getResolutionVariant(double width, double height) { if (width == size || height == size) { throw new RuntimeException("Base image is requested!"); } diff --git a/jdk/test/java/awt/image/multiresolution/MultiResolutionRenderingHintsTest.java b/jdk/test/java/awt/image/multiresolution/MultiResolutionRenderingHintsTest.java new file mode 100644 index 00000000000..063088ca5c9 --- /dev/null +++ b/jdk/test/java/awt/image/multiresolution/MultiResolutionRenderingHintsTest.java @@ -0,0 +1,218 @@ +/* + * Copyright (c) 2015, 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. + */ +import java.awt.Color; +import java.awt.Graphics; +import java.awt.GraphicsConfiguration; +import java.awt.GraphicsDevice; +import java.awt.Image; +import java.awt.Rectangle; +import java.awt.image.BufferedImage; +import java.awt.image.BaseMultiResolutionImage; +import static java.awt.RenderingHints.KEY_RESOLUTION_VARIANT; +import static java.awt.RenderingHints.VALUE_RESOLUTION_VARIANT_BASE; +import static java.awt.RenderingHints.VALUE_RESOLUTION_VARIANT_DPI_FIT; +import static java.awt.RenderingHints.VALUE_RESOLUTION_VARIANT_SIZE_FIT; +import static java.awt.RenderingHints.VALUE_RESOLUTION_VARIANT_DEFAULT; +import java.awt.geom.AffineTransform; +import java.awt.image.ColorModel; +import java.awt.image.Raster; +import sun.java2d.StateTrackable; +import sun.java2d.SunGraphics2D; +import sun.java2d.SurfaceData; +import sun.java2d.loops.SurfaceType; + +/** + * @test + * @bug 8029339 + * @author Alexander Scherbatiy + * @summary Custom MultiResolution image support on HiDPI displays + * @modules java.desktop/sun.java2d + * @run main MultiResolutionRenderingHintsTest + */ +public class MultiResolutionRenderingHintsTest { + + private static final int BASE_SIZE = 200; + private static final Color[] COLORS = { + Color.CYAN, Color.GREEN, Color.BLUE, Color.ORANGE, Color.RED, Color.PINK + }; + + public static void main(String[] args) throws Exception { + + int length = COLORS.length; + BufferedImage[] resolutionVariants = new BufferedImage[length]; + for (int i = 0; i < length; i++) { + resolutionVariants[i] = createRVImage(getSize(i), COLORS[i]); + } + + BaseMultiResolutionImage mrImage = new BaseMultiResolutionImage( + resolutionVariants); + + // base + Color color = getImageColor(VALUE_RESOLUTION_VARIANT_BASE, mrImage, 2, 3); + if (!getColorForScale(1).equals(color)) { + throw new RuntimeException("Wrong base resolution variant!"); + } + + // dpi fit + color = getImageColor(VALUE_RESOLUTION_VARIANT_DPI_FIT, mrImage, 2, 3); + if (!getColorForScale(2).equals(color)) { + throw new RuntimeException("Resolution variant is not based on dpi!"); + } + + // size fit + color = getImageColor(VALUE_RESOLUTION_VARIANT_SIZE_FIT, mrImage, 2, 3); + if (!getColorForScale(6).equals(color)) { + throw new RuntimeException("Resolution variant is not based on" + + " rendered size!"); + } + + // default + // depends on the policies of the platform + // just check that exception is not thrown + getImageColor(VALUE_RESOLUTION_VARIANT_DEFAULT, mrImage, 2, 3); + } + + private static Color getColorForScale(int scale) { + return COLORS[scale - 1]; + } + + private static Color getImageColor(final Object renderingHint, Image image, + double configScale, double graphicsScale) { + + int width = image.getWidth(null); + int height = image.getHeight(null); + + TestSurfaceData surface = new TestSurfaceData(width, height, configScale); + SunGraphics2D g2d = new SunGraphics2D(surface, + Color.BLACK, Color.BLACK, null); + g2d.setRenderingHint(KEY_RESOLUTION_VARIANT, renderingHint); + g2d.scale(graphicsScale, graphicsScale); + g2d.drawImage(image, 0, 0, null); + g2d.dispose(); + return surface.getColor(width / 2, height / 2); + } + + private static int getSize(int i) { + return (i + 1) * BASE_SIZE; + } + + private static BufferedImage createRVImage(int size, Color color) { + BufferedImage image = new BufferedImage(size, size, BufferedImage.TYPE_INT_RGB); + Graphics g = image.createGraphics(); + g.setColor(Color.BLACK); + g.fillRect(0, 0, size, size); + g.setColor(color); + g.fillOval(0, 0, size, size); + g.dispose(); + return image; + } + + static class TestGraphicsConfig extends GraphicsConfiguration { + + private final double scale; + + TestGraphicsConfig(double scale) { + this.scale = scale; + } + + @Override + public GraphicsDevice getDevice() { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public ColorModel getColorModel() { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public ColorModel getColorModel(int transparency) { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public AffineTransform getDefaultTransform() { + return AffineTransform.getScaleInstance(scale, scale); + } + + @Override + public AffineTransform getNormalizingTransform() { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public Rectangle getBounds() { + throw new UnsupportedOperationException("Not supported yet."); + } + } + + static class TestSurfaceData extends SurfaceData { + + private final int width; + private final int height; + private final GraphicsConfiguration gc; + private final BufferedImage buffImage; + private final double scale; + + public TestSurfaceData(int width, int height, double scale) { + super(StateTrackable.State.DYNAMIC, SurfaceType.Custom, ColorModel.getRGBdefault()); + this.scale = scale; + gc = new TestGraphicsConfig(scale); + this.width = (int) Math.ceil(scale * width); + this.height = (int) Math.ceil(scale * height); + buffImage = new BufferedImage(this.width, this.height, + BufferedImage.TYPE_INT_RGB); + } + + Color getColor(int x, int y) { + int sx = (int) Math.ceil(x * scale); + int sy = (int) Math.ceil(y * scale); + return new Color(buffImage.getRGB(sx, sy)); + } + + @Override + public SurfaceData getReplacement() { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public GraphicsConfiguration getDeviceConfiguration() { + return gc; + } + + @Override + public Raster getRaster(int x, int y, int w, int h) { + return buffImage.getRaster(); + } + + @Override + public Rectangle getBounds() { + return new Rectangle(0, 0, width, height); + } + + @Override + public Object getDestination() { + throw new UnsupportedOperationException("Not supported yet."); + } + } +} From 8feb75af0b786d8a7fa3e9200415d343ecccd975 Mon Sep 17 00:00:00 2001 From: Erik Joelsson Date: Tue, 15 Sep 2015 18:00:21 +0200 Subject: [PATCH 73/94] 8136383: Improve make utilities containing and not-containing Reviewed-by: ihse --- make/common/MakeBase.gmk | 18 ++++++++++++------ test/make/TestMakeBase.gmk | 31 +++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 6 deletions(-) diff --git a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk index bd8c03e2b0f..ea975f0e4fd 100644 --- a/make/common/MakeBase.gmk +++ b/make/common/MakeBase.gmk @@ -567,16 +567,22 @@ else endif ################################################################################ -# Convenience functions for working around make's limitations with $(filter ). -containing = \ - $(strip $(foreach v,$(strip $2),$(if $(findstring $(strip $1),$v),$v))) -not-containing = \ - $(strip $(foreach v,$(strip $2),$(if $(findstring $(strip $1),$v),,$v))) - # Filter out duplicate sub strings while preserving order. Keeps the first occurance. uniq = \ $(if $1,$(firstword $1) $(call uniq,$(filter-out $(firstword $1),$1))) +# Returns all whitespace-separated words in $2 where at least one of the +# whitespace-separated words in $1 is a substring. +containing = \ + $(strip \ + $(foreach v,$(strip $2),\ + $(call uniq,$(foreach p,$(strip $1),$(if $(findstring $p,$v),$v))))) + +# Returns all whitespace-separated words in $2 where none of the +# whitespace-separated words in $1 is a substring. +not-containing = \ + $(strip $(filter-out $(call containing,$1,$2),$2)) + # Return a list of all string elements that are duplicated in $1. dups = \ $(strip $(foreach v, $(sort $1), $(if $(filter-out 1, \ diff --git a/test/make/TestMakeBase.gmk b/test/make/TestMakeBase.gmk index 98a8e7ba07c..443f364841b 100644 --- a/test/make/TestMakeBase.gmk +++ b/test/make/TestMakeBase.gmk @@ -72,6 +72,37 @@ $(ESCAPE_DOLLAR_DIR)/_escape_dollar: $(DEPS) TEST_TARGETS += $(ESCAPE_DOLLAR_DIR)/_escape_dollar +################################################################################ +# Test containing and not-containing + +CONT_LIST := foo bar baz foobar foobaz + +# Param 1 - string to look for +# Param 2 - expected result +define TestContaining + value := $$(call containing, $1, $(CONT_LIST)) + ifneq ($$(value), $2) + $$(info (call containing, $1, $(CONT_LIST))) + $$(error result >$$(value)<, expected >$2<) + endif +endef + +$(eval $(call TestContaining,bar,bar foobar)) +$(eval $(call TestContaining,foo bar,foo bar foobar foobaz)) + +# Param 1 - string to look for +# Param 2 - expected result +define TestNotContaining + value := $$(call not-containing, $1, $(CONT_LIST)) + ifneq ($$(value), $2) + $$(info (call not-containing, $1, $(CONT_LIST))) + $$(error result >$$(value)<, expected >$2<) + endif +endef + +$(eval $(call TestNotContaining,bar,foo baz foobaz)) +$(eval $(call TestNotContaining,foo bar,baz)) + ################################################################################ # Test Equals From a48c66ffbf4b310e6d33a6ad873458e580aeacd9 Mon Sep 17 00:00:00 2001 From: Joe Darcy Date: Tue, 15 Sep 2015 15:10:49 -0700 Subject: [PATCH 74/94] 8136506: Include sun.arch.data.model as a property that can be queried by jtreg Reviewed-by: alanb --- jdk/test/TEST.ROOT | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jdk/test/TEST.ROOT b/jdk/test/TEST.ROOT index 40887fed35f..987dce55075 100644 --- a/jdk/test/TEST.ROOT +++ b/jdk/test/TEST.ROOT @@ -23,5 +23,8 @@ exclusiveAccess.dirs=java/rmi/Naming java/util/prefs sun/management/jmxremote su # Group definitions groups=TEST.groups [closed/TEST.groups] +# Allow querying of sun.arch.data.model in @requires clauses +requires.properties=sun.arch.data.model + # Tests using jtreg 4.1 b11 features requiredVersion=4.1 b11 From 1b8b6a46559c419f028623717a05aa4834766641 Mon Sep 17 00:00:00 2001 From: Roger Riggs Date: Tue, 15 Sep 2015 22:11:00 -0400 Subject: [PATCH 75/94] 8133528: java/lang/ProcessHandle/OnExitTest.java fails intermittently Remove checks for processes not spawned by the test Reviewed-by: joehw --- jdk/test/java/lang/ProcessHandle/OnExitTest.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/jdk/test/java/lang/ProcessHandle/OnExitTest.java b/jdk/test/java/lang/ProcessHandle/OnExitTest.java index b86df47ea67..ea9dfc65e0d 100644 --- a/jdk/test/java/lang/ProcessHandle/OnExitTest.java +++ b/jdk/test/java/lang/ProcessHandle/OnExitTest.java @@ -96,8 +96,6 @@ public class OnExitTest extends ProcessUtil { ConcurrentHashMap processes = new ConcurrentHashMap<>(); List children = getChildren(ProcessHandle.current()); children.forEach(ProcessUtil::printProcess); - Assert.assertEquals(children.size(), 0, - "Expected to start with zero children; " + children); JavaChild proc = JavaChild.spawnJavaChild("stdin"); procHandle = proc.toHandle(); @@ -186,10 +184,6 @@ public class OnExitTest extends ProcessUtil { children.forEach(p -> printProcess(p, "after onExit:")); Assert.assertEquals(proc.isAlive(), false, "destroyed process is alive:: %s%n" + proc); - - List children2 = getAllChildren(procHandle); - printf(" children2: %s%n", children2.toString()); - Assert.assertEquals(children2.size(), 0, "After onExit, expected no children"); } catch (IOException | InterruptedException ex) { Assert.fail(ex.getMessage()); } finally { From 6eb997e90cf54190eeee2d299a3ac44d61006b5e Mon Sep 17 00:00:00 2001 From: Sean Coffey Date: Wed, 16 Sep 2015 12:23:25 +0100 Subject: [PATCH 76/94] 8133535: Better exception messaging in Ucrypto code Reviewed-by: igerasim --- .../security/ucrypto/GCMParameters.java | 9 ++++--- .../oracle/security/ucrypto/NativeCipher.java | 10 +++++--- .../ucrypto/NativeCipherWithJavaPadding.java | 7 +++--- .../oracle/security/ucrypto/NativeDigest.java | 11 +++++--- .../security/ucrypto/NativeGCMCipher.java | 16 ++++++------ .../oracle/security/ucrypto/NativeKey.java | 9 ++++--- .../security/ucrypto/NativeRSACipher.java | 25 +++++++++++++------ .../security/ucrypto/NativeRSAKeyFactory.java | 3 ++- .../security/ucrypto/NativeRSASignature.java | 18 ++++++++----- .../ucrypto/CipherSignNotSupported.java | 8 +++--- 10 files changed, 72 insertions(+), 44 deletions(-) diff --git a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/GCMParameters.java b/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/GCMParameters.java index ed598d6d6b5..fc7ada58e6a 100644 --- a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/GCMParameters.java +++ b/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/GCMParameters.java @@ -90,7 +90,8 @@ public final class GCMParameters extends AlgorithmParametersSpi { return paramSpec.cast(new GCMParameterSpec(tLen*8, iv.clone())); } else { throw new InvalidParameterSpecException - ("Inappropriate parameter specification"); + ("Inappropriate parameter specification. Received " + + paramSpec.getClass().getName()); } } @@ -98,7 +99,8 @@ public final class GCMParameters extends AlgorithmParametersSpi { throws InvalidParameterSpecException { if (!(paramSpec instanceof GCMParameterSpec)) { throw new InvalidParameterSpecException - ("Inappropriate parameter specification"); + ("Inappropriate parameter specification. Received " + + paramSpec.getClass().getName()); } GCMParameterSpec gcmSpec = (GCMParameterSpec) paramSpec; try { @@ -114,7 +116,8 @@ public final class GCMParameters extends AlgorithmParametersSpi { val.data.reset(); setValues(val.data.getOctetString(), val.data.getInteger()); } else { - throw new IOException("GCM parameter parsing error: SEQ tag expected"); + throw new IOException("GCM parameter parsing error: SEQ tag expected." + + " Received: " + val.tag); } } diff --git a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeCipher.java b/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeCipher.java index e8dd4210df4..392ade324d3 100644 --- a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeCipher.java +++ b/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeCipher.java @@ -274,13 +274,14 @@ class NativeCipher extends CipherSpi { if (params != null) { if (!(params instanceof IvParameterSpec)) { throw new InvalidAlgorithmParameterException - ("IvParameterSpec required"); + ("IvParameterSpec required. Received: " + + params.getClass().getName()); } else { ivBytes = ((IvParameterSpec) params).getIV(); if (ivBytes.length != blockSize) { throw new InvalidAlgorithmParameterException ("Wrong IV length: must be " + blockSize + - " bytes long"); + " bytes long. Received length:" + ivBytes.length); } } } else { @@ -442,12 +443,13 @@ class NativeCipher extends CipherSpi { if (fixedKeySize == -1) { // all 3 AES key lengths are allowed if (keyLen != 16 && keyLen != 24 && keyLen != 32) { - throw new InvalidKeyException("Key size is not valid"); + throw new InvalidKeyException("Key size is not valid." + + " Got key length of: " + keyLen); } } else { if (keyLen != fixedKeySize) { throw new InvalidKeyException("Only " + fixedKeySize + - "-byte keys are accepted"); + "-byte keys are accepted. Got: " + keyLen); } } // return the validated key length in bytes diff --git a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeCipherWithJavaPadding.java b/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeCipherWithJavaPadding.java index f2d097bf8b4..0bea2d08eb8 100644 --- a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeCipherWithJavaPadding.java +++ b/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeCipherWithJavaPadding.java @@ -184,7 +184,7 @@ public class NativeCipherWithJavaPadding extends CipherSpi { if (padValue < 1 || padValue > blockSize) { UcryptoProvider.debug("PKCS5Padding: unpad, lastData: " + Arrays.toString(lastData)); UcryptoProvider.debug("PKCS5Padding: unpad, padValue=" + padValue); - throw new BadPaddingException("Invalid pad value!"); + throw new BadPaddingException("Invalid pad value: " + padValue); } // sanity check padding bytes @@ -388,7 +388,7 @@ public class NativeCipherWithJavaPadding extends CipherSpi { out = Arrays.copyOf(out, actualOut); } } catch (ShortBufferException sbe) { - throw new UcryptoException("Internal Error"); + throw new UcryptoException("Internal Error", sbe); } finally { reset(); } @@ -404,7 +404,8 @@ public class NativeCipherWithJavaPadding extends CipherSpi { int estimatedOutLen = engineGetOutputSize(inLen); if (out.length - outOfs < estimatedOutLen) { - throw new ShortBufferException(); + throw new ShortBufferException("Actual: " + (out.length - outOfs) + + ". Estimated Out Length: " + estimatedOutLen); } try { if (nc.encrypt) { diff --git a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeDigest.java b/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeDigest.java index 9121be3d8cb..80397ca222f 100644 --- a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeDigest.java +++ b/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeDigest.java @@ -131,7 +131,8 @@ public abstract class NativeDigest extends MessageDigestSpi try { int len = engineDigest(digest, 0, digestLen); if (len != digestLen) { - throw new UcryptoException("Digest length mismatch"); + throw new UcryptoException("Digest length mismatch." + + " Len: " + len + ". digestLen: " + digestLen); } return digest; } catch (DigestException de) { @@ -144,10 +145,11 @@ public abstract class NativeDigest extends MessageDigestSpi throws DigestException { if (len < digestLen) { throw new DigestException("Output buffer must be at least " + - digestLen + " bytes long"); + digestLen + " bytes long. Got: " + len); } if ((ofs < 0) || (len < 0) || (ofs > out.length - len)) { - throw new DigestException("Buffer too short to store digest"); + throw new DigestException("Buffer too short to store digest. " + + "ofs: " + ofs + ". len: " + len + ". out.length: " + out.length); } if (pCtxt == null) { @@ -177,7 +179,8 @@ public abstract class NativeDigest extends MessageDigestSpi return; } if ((ofs < 0) || (len < 0) || (ofs > in.length - len)) { - throw new ArrayIndexOutOfBoundsException(); + throw new ArrayIndexOutOfBoundsException("ofs: " + ofs + ". len: " + + len + ". in.length: " + in.length); } if (pCtxt == null) { pCtxt = new DigestContextRef(this, nativeInit(mech), mech); diff --git a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeGCMCipher.java b/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeGCMCipher.java index ff12ef73c1f..2f9880cd792 100644 --- a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeGCMCipher.java +++ b/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeGCMCipher.java @@ -188,7 +188,8 @@ class NativeGCMCipher extends NativeCipher { byte[] ivBytes = null; if (params != null) { if (!(params instanceof GCMParameterSpec)) { - throw new InvalidAlgorithmParameterException("GCMParameterSpec required"); + throw new InvalidAlgorithmParameterException("GCMParameterSpec required." + + " Received: " + params.getClass().getName()); } else { tagLen = ((GCMParameterSpec) params).getTLen(); ivBytes = ((GCMParameterSpec) params).getIV(); @@ -264,9 +265,9 @@ class NativeGCMCipher extends NativeCipher { int outOfs) throws ShortBufferException { int len = getOutputSizeByOperation(inLen, false); if (out.length - outOfs < len) { - throw new ShortBufferException("Output buffer must be " - + "(at least) " + len - + " bytes long"); + throw new ShortBufferException("Output buffer must be " + + "(at least) " + len + " bytes long. Got: " + + (out.length - outOfs)); } if (aadBuffer != null && aadBuffer.size() > 0) { // init again with AAD data @@ -365,8 +366,8 @@ class NativeGCMCipher extends NativeCipher { int len = getOutputSizeByOperation(inLen, true); if (out.length - outOfs < len) { throw new ShortBufferException("Output buffer must be " - + "(at least) " + len - + " bytes long"); + + "(at least) " + len + " bytes long. Got: " + + (out.length - outOfs)); } if (aadBuffer != null && aadBuffer.size() > 0) { // init again with AAD data @@ -385,7 +386,8 @@ class NativeGCMCipher extends NativeCipher { if (inLen < tagLen/8) { // Otherwise, Solaris lib will error out w/ CRYPTO_BUFFER_TOO_SMALL // when ucrypto_decrypt_final() is called - throw new AEADBadTagException("Input too short - need tag"); + throw new AEADBadTagException("Input too short - need tag." + + " inLen: " + inLen + ". tagLen: " + tagLen); } // refresh 'in' to all buffered-up bytes in = ibuffer.toByteArray(); diff --git a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeKey.java b/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeKey.java index 6e0f15bbe8a..69409809860 100644 --- a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeKey.java +++ b/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeKey.java @@ -94,7 +94,8 @@ abstract class NativeKey implements Key { pKey = nativeInit(NativeKey.getMagnitude(mod), NativeKey.getMagnitude(privateExp)); } else { - throw new InvalidKeySpecException("Only supports RSAPrivateKeySpec"); + throw new InvalidKeySpecException("Only supports RSAPrivateKeySpec." + + " Received: " + keySpec.getClass().getName()); } if (pKey == 0L) { throw new UcryptoException("Error constructing RSA PrivateKey"); @@ -141,7 +142,8 @@ abstract class NativeKey implements Key { NativeKey.getMagnitude(primeExpQ), NativeKey.getMagnitude(crtCoeff)); } else { - throw new InvalidKeySpecException("Only supports RSAPrivateCrtKeySpec"); + throw new InvalidKeySpecException("Only supports RSAPrivateCrtKeySpec." + + " Received: " + keySpec.getClass().getName()); } if (pKey == 0L) { throw new UcryptoException("Error constructing RSA PrivateCrtKey"); @@ -184,7 +186,8 @@ abstract class NativeKey implements Key { pKey = nativeInit(NativeKey.getMagnitude(mod), NativeKey.getMagnitude(publicExp)); } else { - throw new InvalidKeySpecException("Only supports RSAPublicKeySpec"); + throw new InvalidKeySpecException("Only supports RSAPublicKeySpec." + + " Received: " + keySpec.getClass().getName()); } if (pKey == 0L) { throw new UcryptoException("Error constructing RSA PublicKey"); diff --git a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeRSACipher.java b/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeRSACipher.java index 9169106b602..183c4d0a17a 100644 --- a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeRSACipher.java +++ b/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeRSACipher.java @@ -159,7 +159,8 @@ public class NativeRSACipher extends CipherSpi { @Override protected int engineGetKeySize(Key key) throws InvalidKeyException { if (!(key instanceof RSAKey)) { - throw new InvalidKeyException("RSAKey required"); + throw new InvalidKeyException("RSAKey required. Got: " + + key.getClass().getName()); } int n = ((RSAKey)key).getModulus().bitLength(); // strip off the leading extra 0x00 byte prefix @@ -206,9 +207,11 @@ public class NativeRSACipher extends CipherSpi { // Make sure the proper opmode uses the proper key if (doEncrypt && (!(newKey instanceof RSAPublicKey))) { - throw new InvalidKeyException("RSAPublicKey required for encryption"); + throw new InvalidKeyException("RSAPublicKey required for encryption." + + " Received: " + newKey.getClass().getName()); } else if (!doEncrypt && (!(newKey instanceof RSAPrivateKey))) { - throw new InvalidKeyException("RSAPrivateKey required for decryption"); + throw new InvalidKeyException("RSAPrivateKey required for decryption." + + " Received: " + newKey.getClass().getName()); } NativeKey nativeKey = null; @@ -237,13 +240,14 @@ public class NativeRSACipher extends CipherSpi { privateKey.getPrimeExponentP(), privateKey.getPrimeExponentQ(), privateKey.getCrtCoefficient())); - } else if (newKey instanceof RSAPrivateKey) { + } else if (newKey instanceof RSAPrivateKey) { RSAPrivateKey privateKey = (RSAPrivateKey) newKey; nativeKey = (NativeKey) keyFactory.engineGeneratePrivate (new RSAPrivateKeySpec(privateKey.getModulus(), privateKey.getPrivateExponent())); } else { - throw new InvalidKeyException("Unsupported type of RSAPrivateKey"); + throw new InvalidKeyException("Unsupported type of RSAPrivateKey." + + " Received: " + newKey.getClass().getName()); } } catch (InvalidKeySpecException ikse) { throw new InvalidKeyException(ikse); @@ -282,7 +286,8 @@ public class NativeRSACipher extends CipherSpi { protected synchronized int engineUpdate(byte[] in, int inOfs, int inLen, byte[] out, int outOfs) throws ShortBufferException { if (out.length - outOfs < outputSize) { - throw new ShortBufferException("Output buffer too small"); + throw new ShortBufferException("Output buffer too small. outputSize: " + + outputSize + ". out.length: " + out.length + ". outOfs: " + outOfs); } if (inLen > 0) { update(in, inOfs, inLen); @@ -332,7 +337,9 @@ public class NativeRSACipher extends CipherSpi { "the key to be wrapped"); } if (encodedKey.length > buffer.length) { - throw new InvalidKeyException("Key is too long for wrapping"); + throw new InvalidKeyException("Key is too long for wrapping. " + + "encodedKey.length: " + encodedKey.length + + ". buffer.length: " + buffer.length); } return engineDoFinal(encodedKey, 0, encodedKey.length); } catch (BadPaddingException e) { @@ -349,7 +356,9 @@ public class NativeRSACipher extends CipherSpi { throws InvalidKeyException, NoSuchAlgorithmException { if (wrappedKey.length > buffer.length) { - throw new InvalidKeyException("Key is too long for unwrapping"); + throw new InvalidKeyException("Key is too long for unwrapping." + + " wrappedKey.length: " + wrappedKey.length + + ". buffer.length: " + buffer.length); } boolean isTlsRsaPremasterSecret = diff --git a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeRSAKeyFactory.java b/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeRSAKeyFactory.java index 591cdee62ea..750cc41bc08 100644 --- a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeRSAKeyFactory.java +++ b/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeRSAKeyFactory.java @@ -56,7 +56,8 @@ public final class NativeRSAKeyFactory extends KeyFactorySpi { } else if (keySpec instanceof RSAPrivateKeySpec) { return new NativeKey.RSAPrivate(keySpec); } else { - throw new InvalidKeySpecException("Unsupported key spec"); + throw new InvalidKeySpecException("Unsupported key spec." + + " Received: " + keySpec.getClass().getName()); } } diff --git a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeRSASignature.java b/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeRSASignature.java index ea7930c429b..f1fe8e58c1b 100644 --- a/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeRSASignature.java +++ b/jdk/src/jdk.crypto.ucrypto/solaris/classes/com/oracle/security/ucrypto/NativeRSASignature.java @@ -192,7 +192,8 @@ class NativeRSASignature extends SignatureSpi { // Need to check RSA key length whenever a new private key is set if (privateKey != key) { if (!(privateKey instanceof RSAPrivateKey)) { - throw new InvalidKeyException("RSAPrivateKey required"); + throw new InvalidKeyException("RSAPrivateKey required. " + + "Received: " + privateKey.getClass().getName()); } RSAPrivateKey rsaPrivKey = (RSAPrivateKey) privateKey; BigInteger mod = rsaPrivKey.getModulus(); @@ -242,7 +243,8 @@ class NativeRSASignature extends SignatureSpi { throw new InvalidKeyException(ikse); } } else { - throw new InvalidKeyException("RSAPublicKey required"); + throw new InvalidKeyException("RSAPublicKey required. " + + "Received: " + publicKey.getClass().getName()); } } init(false, newKey, newSigLength); @@ -269,7 +271,8 @@ class NativeRSASignature extends SignatureSpi { throws SignatureException { if (outbuf == null || (offset < 0) || (outbuf.length < (offset + sigLength)) || (len < sigLength)) { - throw new SignatureException("Invalid output buffer"); + throw new SignatureException("Invalid output buffer. offset: " + + offset + ". len: " + len + ". sigLength: " + sigLength); } int rv = doFinal(outbuf, offset, sigLength); if (rv < 0) { @@ -328,7 +331,8 @@ class NativeRSASignature extends SignatureSpi { throws SignatureException { if (sigBytes == null || (sigOfs < 0) || (sigBytes.length < (sigOfs + this.sigLength)) || (sigLen < this.sigLength)) { - throw new SignatureException("Invalid signature buffer"); + throw new SignatureException("Invalid signature buffer. sigOfs: " + + sigOfs + ". sigLen: " + sigLen + ". this.sigLength: " + this.sigLength); } int rv = doFinal(sigBytes, sigOfs, sigLen); @@ -405,7 +409,8 @@ class NativeRSASignature extends SignatureSpi { // returns 0 (success) or negative (ucrypto error occurred) private int update(byte[] in, int inOfs, int inLen) { if (inOfs < 0 || inOfs + inLen > in.length) { - throw new ArrayIndexOutOfBoundsException(); + throw new ArrayIndexOutOfBoundsException("inOfs :" + inOfs + + ". inLen: " + inLen + ". in.length: " + in.length); } ensureInitialized(); int k = nativeUpdate(pCtxt.id, sign, in, inOfs, inLen); @@ -442,7 +447,8 @@ class NativeRSASignature extends SignatureSpi { int maxDataSize = keySize - PKCS1PADDING_LEN; if (maxDataSize < encodedLen) { throw new InvalidKeyException - ("Key is too short for this signature algorithm"); + ("Key is too short for this signature algorithm. maxDataSize: " + + maxDataSize + ". encodedLen: " + encodedLen); } return keySize; } diff --git a/jdk/test/com/oracle/security/ucrypto/CipherSignNotSupported.java b/jdk/test/com/oracle/security/ucrypto/CipherSignNotSupported.java index 47ef8b8e380..8b57b48ce6f 100644 --- a/jdk/test/com/oracle/security/ucrypto/CipherSignNotSupported.java +++ b/jdk/test/com/oracle/security/ucrypto/CipherSignNotSupported.java @@ -23,7 +23,7 @@ /** * @test - * @bug 8029849 8132082 + * @bug 8029849 8132082 8133535 * @summary Make sure signing via encrypt and verifying via decrypt are not * supported by OracleUcrypto provider. * @author Anthony Scarpino @@ -89,8 +89,7 @@ public class CipherSignNotSupported extends UcryptoTest { ct = c.doFinal(pt); throw new RuntimeException("Encrypt operation should have failed."); } catch (InvalidKeyException e) { - if (e.getMessage().compareTo("RSAPublicKey required for " + - "encryption") != 0) { + if (!e.getMessage().contains("RSAPublicKey required for encryption")) { System.out.println("Wrong exception thrown."); throw e; } @@ -103,8 +102,7 @@ public class CipherSignNotSupported extends UcryptoTest { c.doFinal(ct); throw new RuntimeException("Decrypt operation should have failed."); } catch (InvalidKeyException e) { - if (e.getMessage().compareTo("RSAPrivateKey required for " + - "decryption") != 0) { + if (!e.getMessage().contains("RSAPrivateKey required for decryption")) { System.out.println("Wrong exception thrown."); throw e; } From d323a041059a04c8b41ee093fdc74c27e646a373 Mon Sep 17 00:00:00 2001 From: Sean Mullan Date: Wed, 16 Sep 2015 08:23:37 -0400 Subject: [PATCH 77/94] 8015388: Required algorithms for JDK 9 Reviewed-by: jnimeh, wetmore, xuelei --- .../security/AlgorithmParameterGenerator.java | 6 +++--- .../classes/java/security/KeyPairGenerator.java | 8 ++++---- .../share/classes/java/security/Signature.java | 1 + .../share/classes/javax/crypto/Cipher.java | 2 +- .../share/classes/javax/net/ssl/SSLContext.java | 6 ++++-- .../javax/net/ssl/TrustManagerFactory.java | 16 ++++++++++++++-- 6 files changed, 27 insertions(+), 12 deletions(-) diff --git a/jdk/src/java.base/share/classes/java/security/AlgorithmParameterGenerator.java b/jdk/src/java.base/share/classes/java/security/AlgorithmParameterGenerator.java index 7f9c7cbf4ab..5c03453d8fd 100644 --- a/jdk/src/java.base/share/classes/java/security/AlgorithmParameterGenerator.java +++ b/jdk/src/java.base/share/classes/java/security/AlgorithmParameterGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015, 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 @@ -70,8 +70,8 @@ import java.security.spec.AlgorithmParameterSpec; * following standard {@code AlgorithmParameterGenerator} algorithms and * keysizes in parentheses: *
      - *
    • {@code DiffieHellman} (1024)
      • - *
    • {@code DSA} (1024)
      • + *
    • {@code DiffieHellman} (1024, 2048, 4096)
      • + *
    • {@code DSA} (1024, 2048)
      • *
    * These algorithms are described in the diff --git a/jdk/src/java.base/share/classes/java/security/KeyPairGenerator.java b/jdk/src/java.base/share/classes/java/security/KeyPairGenerator.java index 20567688939..71efde75ecd 100644 --- a/jdk/src/java.base/share/classes/java/security/KeyPairGenerator.java +++ b/jdk/src/java.base/share/classes/java/security/KeyPairGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015, 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 @@ -109,9 +109,9 @@ import sun.security.util.Debug; * following standard {@code KeyPairGenerator} algorithms and keysizes in * parentheses: *
      - *
    • {@code DiffieHellman} (1024)
      • - *
    • {@code DSA} (1024)
      • - *
    • {@code RSA} (1024, 2048)
      • + *
    • {@code DiffieHellman} (1024, 2048, 4096)
      • + *
    • {@code DSA} (1024, 2048)
      • + *
    • {@code RSA} (1024, 2048, 4096)
      • *
    * These algorithms are described in the     diff --git a/jdk/src/java.base/share/classes/java/security/Signature.java b/jdk/src/java.base/share/classes/java/security/Signature.java index 4e26a8f9a58..3028a10b5e3 100644 --- a/jdk/src/java.base/share/classes/java/security/Signature.java +++ b/jdk/src/java.base/share/classes/java/security/Signature.java @@ -102,6 +102,7 @@ import sun.security.jca.GetInstance.Instance; * following standard {@code Signature} algorithms: *
      *
    • {@code SHA1withDSA}
      • + *
    • {@code SHA256withDSA}
      • *
    • {@code SHA1withRSA}
      • *
    • {@code SHA256withRSA}
      • *
    diff --git a/jdk/src/java.base/share/classes/javax/crypto/Cipher.java b/jdk/src/java.base/share/classes/javax/crypto/Cipher.java index 74943845b1b..a5913089a6f 100644 --- a/jdk/src/java.base/share/classes/javax/crypto/Cipher.java +++ b/jdk/src/java.base/share/classes/javax/crypto/Cipher.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2015, 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 diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/SSLContext.java b/jdk/src/java.base/share/classes/javax/net/ssl/SSLContext.java index e5bd2b78259..df3af8b4602 100644 --- a/jdk/src/java.base/share/classes/javax/net/ssl/SSLContext.java +++ b/jdk/src/java.base/share/classes/javax/net/ssl/SSLContext.java @@ -37,11 +37,13 @@ import sun.security.jca.GetInstance; * secure random bytes. * *

    Every implementation of the Java platform is required to support the - * following standard {@code SSLContext} protocol: + * following standard {@code SSLContext} protocols: *

      *
    • {@code TLSv1}
      • + *
    • {@code TLSv1.1}
      • + *
    • {@code TLSv1.2}
      • *
    - * This protocol is described in the     * SSLContext section of the * Java Cryptography Architecture Standard Algorithm Name Documentation. diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/TrustManagerFactory.java b/jdk/src/java.base/share/classes/javax/net/ssl/TrustManagerFactory.java index 36803cd5578..333f845dec8 100644 --- a/jdk/src/java.base/share/classes/javax/net/ssl/TrustManagerFactory.java +++ b/jdk/src/java.base/share/classes/javax/net/ssl/TrustManagerFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2015, 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 @@ -34,7 +34,19 @@ import sun.security.jca.GetInstance; * This class acts as a factory for trust managers based on a * source of trust material. Each trust manager manages a specific * type of trust material for use by secure sockets. The trust - * material is based on a KeyStore and/or provider specific sources. + * material is based on a KeyStore and/or provider-specific sources. + * + *

    Every implementation of the Java platform is required to support the + * following standard {@code TrustManagerFactory} algorithm: + *

      + *
    • PKIX
      • + *
    + * This algorithm is described in the + * TrustManagerFactory section of the + * Java Cryptography Architecture Standard Algorithm Name Documentation. + * Consult the release documentation for your implementation to see if any + * other algorithms are supported. * * @since 1.4 * @see TrustManager From a2f0fe3c946b5704c7d550e55742e8714930b3df Mon Sep 17 00:00:00 2001 From: Martin Buchholz Date: Tue, 15 Sep 2015 21:56:04 -0700 Subject: [PATCH 78/94] 8136583: Core libraries should use blessed modifier order Run blessed-modifier-order script (see bug) Reviewed-by: psandoz, chegar, alanb, plevart --- .../classes/java/net/DefaultInterface.java | 2 +- .../HostLocaleProviderAdapterImpl.java | 2 +- .../com/sun/crypto/provider/RC2Crypt.java | 2 +- .../sun/crypto/provider/RC2Parameters.java | 2 +- .../com/sun/crypto/provider/RSACipher.java | 16 +- .../provider/TlsKeyMaterialGenerator.java | 2 +- .../provider/TlsMasterSecretGenerator.java | 2 +- .../sun/crypto/provider/TlsPrfGenerator.java | 20 +- .../TlsRsaPremasterSecretGenerator.java | 2 +- .../com/sun/java/util/jar/pack/Attribute.java | 20 +- .../sun/java/util/jar/pack/BandStructure.java | 38 ++-- .../com/sun/java/util/jar/pack/Code.java | 2 +- .../com/sun/java/util/jar/pack/Coding.java | 2 +- .../sun/java/util/jar/pack/CodingChooser.java | 2 +- .../sun/java/util/jar/pack/ConstantPool.java | 6 +- .../com/sun/java/util/jar/pack/Constants.java | 190 +++++++++--------- .../com/sun/java/util/jar/pack/Driver.java | 6 +- .../com/sun/java/util/jar/pack/Histogram.java | 2 +- .../sun/java/util/jar/pack/Instruction.java | 16 +- .../sun/java/util/jar/pack/NativeUnpack.java | 2 +- .../com/sun/java/util/jar/pack/Package.java | 2 +- .../sun/java/util/jar/pack/PackageReader.java | 2 +- .../com/sun/java/util/jar/pack/Utils.java | 2 +- .../com/sun/net/ssl/HttpsURLConnection.java | 2 +- .../com/sun/net/ssl/KeyManagerFactory.java | 2 +- .../com/sun/net/ssl/TrustManagerFactory.java | 2 +- .../cert/internal/x509/X509V1CertImpl.java | 2 +- .../classes/com/sun/security/ntlm/Client.java | 4 +- .../com/sun/security/ntlm/NTLMException.java | 12 +- .../classes/com/sun/security/ntlm/Server.java | 4 +- .../share/classes/java/io/Console.java | 2 +- .../classes/java/io/DataInputStream.java | 2 +- .../java.base/share/classes/java/io/File.java | 2 +- .../share/classes/java/io/FilePermission.java | 14 +- .../classes/java/io/ObjectInputStream.java | 2 +- .../classes/java/io/ObjectOutputStream.java | 2 +- .../classes/java/io/ObjectStreamClass.java | 2 +- .../java/io/ObjectStreamConstants.java | 58 +++--- .../share/classes/java/io/Reader.java | 4 +- .../share/classes/java/io/Writer.java | 6 +- .../share/classes/java/lang/Class.java | 20 +- .../share/classes/java/lang/ClassLoader.java | 2 +- .../java/lang/ConditionalSpecialCasing.java | 12 +- .../share/classes/java/lang/Integer.java | 8 +- .../share/classes/java/lang/Package.java | 2 +- .../classes/java/lang/ProcessBuilder.java | 2 +- .../share/classes/java/lang/StringCoding.java | 4 +- .../share/classes/java/lang/System.java | 6 +- .../share/classes/java/lang/Thread.java | 10 +- .../java/lang/VirtualMachineError.java | 2 +- .../lang/invoke/DelegatingMethodHandle.java | 2 +- .../java/lang/invoke/DirectMethodHandle.java | 6 +- .../lang/invoke/InvokerBytecodeGenerator.java | 6 +- .../java/lang/invoke/MethodHandleNatives.java | 2 +- .../java/lang/invoke/MethodHandles.java | 10 +- .../java/lang/invoke/MethodTypeForm.java | 4 +- .../classes/java/lang/ref/Reference.java | 4 +- .../classes/java/lang/ref/ReferenceQueue.java | 2 +- .../classes/java/lang/ref/SoftReference.java | 2 +- .../java/lang/reflect/AccessibleObject.java | 2 +- .../share/classes/java/math/BigDecimal.java | 20 +- .../share/classes/java/math/BigInteger.java | 4 +- .../net/AbstractPlainDatagramSocketImpl.java | 2 +- .../java/net/AbstractPlainSocketImpl.java | 4 +- .../share/classes/java/net/Authenticator.java | 2 +- .../classes/java/net/ContentHandler.java | 4 +- .../share/classes/java/net/CookieHandler.java | 4 +- .../share/classes/java/net/CookieManager.java | 2 +- .../classes/java/net/DatagramPacket.java | 2 +- .../share/classes/java/net/HostPortrange.java | 6 +- .../share/classes/java/net/HttpCookie.java | 8 +- .../classes/java/net/HttpURLConnection.java | 2 +- .../share/classes/java/net/Inet4Address.java | 2 +- .../share/classes/java/net/Inet6Address.java | 4 +- .../classes/java/net/NetworkInterface.java | 20 +- .../share/classes/java/net/Proxy.java | 2 +- .../share/classes/java/net/ResponseCache.java | 4 +- .../classes/java/net/SocketInputStream.java | 2 +- .../share/classes/java/net/SocketOptions.java | 28 +-- .../classes/java/net/SocketOutputStream.java | 2 +- .../classes/java/net/SocketPermission.java | 12 +- .../java.base/share/classes/java/net/URI.java | 24 +-- .../share/classes/java/net/URLConnection.java | 10 +- .../classes/java/net/URLStreamHandler.java | 2 +- .../share/classes/java/nio/Bits.java | 8 +- .../share/classes/java/nio/channels/Pipe.java | 4 +- .../classes/java/nio/charset/CoderResult.java | 2 +- .../java/security/KeyPairGenerator.java | 6 +- .../share/classes/java/security/KeyStore.java | 4 +- .../share/classes/java/security/Provider.java | 6 +- .../classes/java/security/SecureRandom.java | 6 +- .../classes/java/security/Signature.java | 20 +- .../java/security/cert/CertPathBuilder.java | 2 +- .../security/cert/CertPathHelperImpl.java | 2 +- .../java/security/cert/CertPathValidator.java | 2 +- .../classes/java/security/cert/CertStore.java | 2 +- .../java/security/cert/X509CertSelector.java | 2 +- .../classes/java/text/AttributedString.java | 6 +- .../java/text/CollationElementIterator.java | 20 +- .../share/classes/java/text/CollationKey.java | 6 +- .../share/classes/java/text/Collator.java | 22 +- .../share/classes/java/text/DateFormat.java | 92 ++++----- .../classes/java/text/MessageFormat.java | 2 +- .../share/classes/java/text/NumberFormat.java | 10 +- .../classes/java/text/RBCollationTables.java | 22 +- .../classes/java/text/RBTableBuilder.java | 14 +- .../classes/java/text/RuleBasedCollator.java | 10 +- .../classes/java/text/SimpleDateFormat.java | 20 +- .../share/classes/java/util/AbstractList.java | 2 +- .../share/classes/java/util/BitSet.java | 6 +- .../share/classes/java/util/Calendar.java | 134 ++++++------ .../share/classes/java/util/Comparators.java | 2 +- .../share/classes/java/util/Currency.java | 4 +- .../share/classes/java/util/Date.java | 6 +- .../share/classes/java/util/Dictionary.java | 14 +- .../classes/java/util/GregorianCalendar.java | 2 +- .../java/util/JapaneseImperialCalendar.java | 2 +- .../classes/java/util/ListResourceBundle.java | 2 +- .../share/classes/java/util/Locale.java | 56 +++--- .../classes/java/util/PropertyPermission.java | 8 +- .../share/classes/java/util/Random.java | 6 +- .../classes/java/util/SimpleTimeZone.java | 6 +- .../share/classes/java/util/Spliterators.java | 10 +- .../share/classes/java/util/TimeZone.java | 6 +- .../share/classes/java/util/Timer.java | 2 +- .../share/classes/java/util/jar/Pack200.java | 4 +- .../classes/java/util/regex/Pattern.java | 8 +- .../classes/java/util/regex/UnicodeProp.java | 4 +- .../classes/java/util/stream/FindOps.java | 2 +- .../classes/java/util/stream/ForEachOps.java | 2 +- .../classes/java/util/stream/MatchOps.java | 2 +- .../share/classes/java/util/stream/Nodes.java | 12 +- .../classes/java/util/stream/ReduceOps.java | 6 +- .../share/classes/java/util/stream/Sink.java | 8 +- .../classes/java/util/stream/SortedOps.java | 8 +- .../java/util/stream/StreamSpliterators.java | 16 +- .../classes/java/util/stream/Streams.java | 4 +- .../classes/java/util/stream/WhileOps.java | 10 +- .../share/classes/java/util/zip/Adler32.java | 6 +- .../share/classes/java/util/zip/CRC32.java | 6 +- .../share/classes/java/util/zip/Deflater.java | 10 +- .../java/util/zip/GZIPInputStream.java | 12 +- .../java/util/zip/GZIPOutputStream.java | 4 +- .../share/classes/java/util/zip/Inflater.java | 12 +- .../share/classes/javax/crypto/Cipher.java | 20 +- .../classes/javax/crypto/JceSecurity.java | 6 +- .../classes/javax/crypto/KeyAgreement.java | 4 +- .../classes/javax/crypto/KeyGenerator.java | 8 +- .../javax/net/ssl/HttpsURLConnection.java | 2 +- .../javax/net/ssl/KeyManagerFactory.java | 2 +- .../classes/javax/net/ssl/SNIHostName.java | 2 +- .../javax/net/ssl/SSLEngineResult.java | 10 +- .../javax/net/ssl/TrustManagerFactory.java | 2 +- .../classes/javax/security/auth/Policy.java | 2 +- .../jdk/internal/jimage/BasicImageWriter.java | 2 +- .../internal/jimage/ImageLocationBase.java | 18 +- .../jdk/internal/jimage/ImageModuleData.java | 26 +-- .../internal/jimage/ImageNativeSubstrate.java | 32 +-- .../jdk/internal/jimage/ImageReader.java | 2 +- .../internal/jimage/PerfectHashBuilder.java | 2 +- .../internal/org/objectweb/asm/TypePath.java | 8 +- .../org/objectweb/asm/TypeReference.java | 44 ++-- .../asm/commons/InstructionAdapter.java | 2 +- .../asm/signature/SignatureVisitor.java | 6 +- .../util/xml/PropertiesDefaultHandler.java | 4 +- .../internal/util/xml/XMLStreamWriter.java | 4 +- .../jdk/internal/util/xml/impl/Parser.java | 52 ++--- .../jdk/internal/util/xml/impl/ParserSAX.java | 4 +- .../share/classes/jdk/net/Sockets.java | 2 +- .../sun/invoke/anon/AnonymousClassLoader.java | 2 +- .../sun/invoke/anon/ConstantPoolPatch.java | 2 +- .../sun/invoke/util/BytecodeDescriptor.java | 6 +- .../sun/invoke/util/ValueConversions.java | 2 +- .../classes/sun/invoke/util/Wrapper.java | 2 +- .../classes/sun/launcher/LauncherHelper.java | 2 +- .../share/classes/sun/misc/BASE64Decoder.java | 4 +- .../share/classes/sun/misc/BASE64Encoder.java | 2 +- .../classes/sun/misc/CharacterDecoder.java | 4 +- .../classes/sun/misc/CharacterEncoder.java | 6 +- .../share/classes/sun/misc/Cleaner.java | 2 +- .../share/classes/sun/misc/FDBigInteger.java | 2 +- .../classes/sun/misc/FloatingDecimal.java | 6 +- .../share/classes/sun/misc/LRUCache.java | 4 +- .../share/classes/sun/misc/PerfCounter.java | 8 +- .../classes/sun/misc/ProxyGenerator.java | 8 +- .../share/classes/sun/misc/Request.java | 4 +- .../share/classes/sun/misc/SoftCache.java | 6 +- .../share/classes/sun/misc/UCDecoder.java | 2 +- .../share/classes/sun/misc/UCEncoder.java | 2 +- .../java.base/share/classes/sun/misc/VM.java | 14 +- .../share/classes/sun/net/NetProperties.java | 10 +- .../share/classes/sun/net/NetworkServer.java | 4 +- .../sun/net/dns/ResolverConfiguration.java | 2 +- .../sun/net/spi/DefaultProxySelector.java | 4 +- .../classes/sun/net/util/IPAddressUtil.java | 6 +- .../share/classes/sun/net/www/ParseUtil.java | 2 +- .../classes/sun/net/www/URLConnection.java | 6 +- .../sun/net/www/http/ChunkedInputStream.java | 2 +- .../classes/sun/net/www/http/HttpClient.java | 4 +- .../net/www/protocol/http/AuthCacheValue.java | 2 +- .../www/protocol/http/AuthenticationInfo.java | 8 +- .../protocol/http/DigestAuthentication.java | 6 +- .../net/www/protocol/http/HttpCallerInfo.java | 12 +- .../www/protocol/http/HttpURLConnection.java | 10 +- .../http/NegotiateAuthentication.java | 2 +- .../https/DefaultHostnameVerifier.java | 2 +- .../share/classes/sun/nio/ch/Net.java | 6 +- .../classes/sun/nio/ch/SelectorImpl.java | 2 +- .../share/classes/sun/nio/ch/ThreadPool.java | 2 +- .../classes/sun/nio/cs/CharsetMapping.java | 18 +- .../share/classes/sun/nio/cs/DoubleByte.java | 2 +- .../share/classes/sun/nio/cs/SingleByte.java | 4 +- .../classes/sun/nio/cs/ThreadLocalCoders.java | 2 +- ...nsafeQualifiedStaticFieldAccessorImpl.java | 2 +- .../TlsRsaPremasterSecretParameterSpec.java | 4 +- .../classes/sun/security/jca/JCAUtil.java | 2 +- .../sun/security/jca/ProviderConfig.java | 4 +- .../sun/security/jca/ProviderList.java | 6 +- .../sun/security/pkcs/PKCS9Attribute.java | 2 +- .../security/provider/ByteArrayAccess.java | 2 +- .../sun/security/provider/ConfigFile.java | 2 +- .../classes/sun/security/provider/MD2.java | 4 +- .../classes/sun/security/provider/MD4.java | 2 +- .../sun/security/provider/ParameterCache.java | 4 +- .../classes/sun/security/provider/SHA.java | 8 +- .../sun/security/provider/SecureRandom.java | 2 +- .../sun/security/provider/SeedGenerator.java | 6 +- .../sun/security/provider/SunEntries.java | 8 +- .../provider/certpath/AlgorithmChecker.java | 6 +- .../security/provider/certpath/Builder.java | 2 +- .../provider/certpath/ForwardBuilder.java | 2 +- .../provider/certpath/OCSPResponse.java | 2 +- .../provider/certpath/URICertStore.java | 4 +- .../provider/certpath/UntrustedChecker.java | 2 +- .../certpath/ssl/SSLServerCertStore.java | 6 +- .../classes/sun/security/rsa/RSACore.java | 10 +- .../sun/security/rsa/RSAKeyFactory.java | 20 +- .../classes/sun/security/rsa/RSAPadding.java | 8 +- .../security/rsa/RSAPrivateCrtKeyImpl.java | 2 +- .../sun/security/ssl/AppOutputStream.java | 4 +- .../sun/security/ssl/Authenticator.java | 2 +- .../sun/security/ssl/BaseSSLSocketImpl.java | 8 +- .../classes/sun/security/ssl/CipherBox.java | 2 +- .../classes/sun/security/ssl/CipherSuite.java | 20 +- .../classes/sun/security/ssl/Ciphertext.java | 2 +- .../sun/security/ssl/ClientHandshaker.java | 10 +- .../sun/security/ssl/ClientKeyExchange.java | 12 +- .../sun/security/ssl/DTLSInputRecord.java | 2 +- .../sun/security/ssl/EphemeralKeyManager.java | 8 +- .../sun/security/ssl/ExtensionType.java | 28 +-- .../sun/security/ssl/HandshakeMessage.java | 28 +-- .../security/ssl/HandshakeStateManager.java | 4 +- .../classes/sun/security/ssl/Handshaker.java | 2 +- .../classes/sun/security/ssl/InputRecord.java | 2 +- .../classes/sun/security/ssl/JsseJce.java | 32 +-- .../share/classes/sun/security/ssl/MAC.java | 2 +- .../sun/security/ssl/OutputRecord.java | 2 +- .../classes/sun/security/ssl/Plaintext.java | 2 +- .../sun/security/ssl/ProtocolVersion.java | 32 +-- .../security/ssl/SSLAlgorithmConstraints.java | 14 +- .../sun/security/ssl/SSLContextImpl.java | 8 +- .../sun/security/ssl/SSLEngineImpl.java | 48 ++--- .../security/ssl/SSLEngineOutputRecord.java | 2 +- .../sun/security/ssl/SSLServerSocketImpl.java | 12 +- .../sun/security/ssl/SSLSessionImpl.java | 2 +- .../security/ssl/SSLSocketFactoryImpl.java | 2 +- .../sun/security/ssl/SSLSocketImpl.java | 48 ++--- .../sun/security/ssl/ServerHandshaker.java | 2 +- .../sun/security/ssl/ServerNameExtension.java | 2 +- .../ssl/SignatureAndHashAlgorithm.java | 8 +- .../sun/security/ssl/StatusRequestType.java | 4 +- .../ssl/SupportedEllipticCurvesExtension.java | 8 +- ...upportedEllipticPointFormatsExtension.java | 6 +- .../sun/security/ssl/X509KeyManagerImpl.java | 2 +- .../sun/security/timestamp/TSResponse.java | 2 +- .../classes/sun/security/util/Cache.java | 6 +- .../classes/sun/security/util/CurveDB.java | 8 +- .../classes/sun/security/util/Debug.java | 2 +- .../classes/sun/security/util/DerValue.java | 40 ++-- .../util/DisabledAlgorithmConstraints.java | 14 +- .../sun/security/util/HostnameChecker.java | 12 +- .../util/LegacyAlgorithmConstraints.java | 10 +- .../sun/security/util/ObjectIdentifier.java | 4 +- .../security/validator/EndEntityChecker.java | 36 ++-- .../sun/security/validator/KeyStores.java | 6 +- .../sun/security/validator/PKIXValidator.java | 2 +- .../security/validator/SimpleValidator.java | 16 +- .../sun/security/validator/Validator.java | 20 +- .../validator/ValidatorException.java | 16 +- .../share/classes/sun/security/x509/AVA.java | 6 +- .../sun/security/x509/DistributionPoint.java | 16 +- .../sun/security/x509/IPAddressName.java | 2 +- .../classes/sun/security/x509/OIDMap.java | 4 +- .../sun/security/x509/ReasonFlags.java | 2 +- .../sun/security/x509/X509CRLEntryImpl.java | 2 +- .../sun/security/x509/X509CRLImpl.java | 4 +- .../classes/sun/text/CompactByteArray.java | 2 +- .../sun/text/normalizer/Norm2AllModes.java | 2 +- .../sun/text/normalizer/NormalizerBase.java | 2 +- .../classes/sun/text/normalizer/Trie2.java | 4 +- .../sun/text/normalizer/UBiDiProps.java | 2 +- .../classes/sun/text/normalizer/Utility.java | 4 +- .../sun/util/calendar/CalendarSystem.java | 4 +- .../classes/sun/util/calendar/ZoneInfo.java | 2 +- .../sun/util/calendar/ZoneInfoFile.java | 2 +- .../locale/provider/CalendarDataUtility.java | 4 +- .../util/locale/provider/CollationRules.java | 2 +- .../sun/util/logging/PlatformLogger.java | 2 +- .../resources/OpenListResourceBundle.java | 2 +- .../classes/java/lang/ProcessEnvironment.java | 2 +- .../java/net/PlainDatagramSocketImpl.java | 2 +- .../unix/classes/sun/net/NetHooks.java | 2 +- .../unix/classes/sun/net/PortConfig.java | 2 +- ...ixAsynchronousServerSocketChannelImpl.java | 2 +- .../ch/UnixAsynchronousSocketChannelImpl.java | 2 +- .../unix/classes/sun/nio/fs/UnixUriUtils.java | 2 +- .../sun/security/provider/NativePRNG.java | 4 +- .../net/DefaultDatagramSocketImplFactory.java | 6 +- .../net/TwoStacksPlainDatagramSocketImpl.java | 2 +- .../windows/classes/sun/net/PortConfig.java | 2 +- .../protocol/http/ntlm/NTLMAuthSequence.java | 2 +- .../sun/nio/ch/WindowsSelectorImpl.java | 6 +- .../classes/sun/nio/fs/WindowsConstants.java | 10 +- .../sun/nio/fs/WindowsWatchService.java | 4 +- .../HostLocaleProviderAdapterImpl.java | 2 +- jdk/test/java/io/File/MaxPathLength.java | 2 +- jdk/test/java/io/File/SymLinks.java | 20 +- jdk/test/java/io/FileDescriptor/Sharing.java | 4 +- .../java/io/IOException/LastErrorString.java | 12 +- jdk/test/java/io/InputStreamReader/One.java | 2 +- .../io/PrintStream/OversynchronizedTest.java | 2 +- .../io/PrintWriter/OversynchronizedTest.java | 2 +- .../Serializable/defaulted/GetFieldRead.java | 2 +- .../Serializable/defaulted/GetFieldWrite.java | 2 +- .../extension/ExtendedObjectInputStream.java | 4 +- .../oldTests/CheckingEquality.java | 2 +- .../subclass/AbstractObjectInputStream.java | 52 ++--- .../subclass/AbstractObjectOutputStream.java | 44 ++-- .../java/io/Serializable/subclass/Test.java | 6 +- .../subclass/XObjectInputStream.java | 8 +- .../subclass/XObjectOutputStream.java | 6 +- .../typeSafeEnum/TypeSafeEnum.java | 6 +- .../java/io/StreamTokenizer/ReadAhead.java | 8 +- .../ClassDeclaredFieldsTest.java | 2 +- .../FieldSetAccessibleTest.java | 2 +- jdk/test/java/lang/Enum/ValueOf.java | 2 +- jdk/test/java/lang/ProcessBuilder/Basic.java | 2 +- .../java/lang/Runtime/exec/ExitValue.java | 2 +- .../SecurityManager/CheckPackageMatching.java | 2 +- .../lang/String/StringContentEqualsBug.java | 2 +- jdk/test/java/lang/String/StringJoinTest.java | 22 +- .../lang/StringBuffer/BufferForwarding.java | 8 +- .../lang/StringBuilder/BuilderForwarding.java | 8 +- .../lang/System/finalization/FinThreads.java | 2 +- .../java/lang/Thread/GenerifyStackTraces.java | 4 +- .../java/lang/ThreadLocal/ImmutableLocal.java | 4 +- .../GetAnnotatedInterfaces.java | 2 +- .../GetAnnotatedSuperclass.java | 2 +- .../lang/instrument/ATestCaseScaffold.java | 2 +- .../java/lang/invoke/6998541/Test6998541.java | 162 +++++++-------- .../java/lang/invoke/7157574/Test7157574.java | 4 +- .../lang/invoke/7196190/ClassForNameTest.java | 2 +- .../lang/invoke/7196190/GetUnsafeTest.java | 2 +- .../java/lang/invoke/AccessControlTest.java | 18 +- .../Acquaintance_remote.java | 20 +- jdk/test/java/lang/invoke/CallSiteTest.java | 8 +- .../java/lang/invoke/JavaDocExamplesTest.java | 4 +- .../invoke/LFCaching/LambdaFormTestCase.java | 6 +- .../MethodHandles/TestCatchException.java | 8 +- .../java/lang/invoke/MethodHandlesTest.java | 2 +- jdk/test/java/lang/invoke/indify/Indify.java | 4 +- .../management/MemoryMXBean/GetMBeanInfo.java | 2 +- .../lang/management/MemoryMXBean/Pending.java | 6 +- .../lang/management/RuntimeMXBean/UpTime.java | 6 +- .../management/ThreadMXBean/AllThreadIds.java | 6 +- .../ThreadMXBean/ThreadBlockedCount.java | 4 +- .../management/ThreadMXBean/ThreadCounts.java | 10 +- .../lang/ref/ReferenceEnqueuePending.java | 6 +- .../java/lang/ref/SoftReference/Bash.java | 4 +- jdk/test/java/lang/ref/SoftReference/Pin.java | 4 +- .../lang/reflect/Field/GenericStringTest.java | 2 +- .../DefaultMethodModeling.java | 2 +- .../nonPublicProxy/NonPublicProxyClass.java | 2 +- jdk/test/java/util/Arrays/ParallelPrefix.java | 10 +- jdk/test/java/util/Calendar/Bug8007038.java | 6 +- .../java/util/Collection/BiggernYours.java | 8 +- .../java/util/Collection/HotPotatoes.java | 2 +- jdk/test/java/util/Collections/AddAll.java | 2 +- jdk/test/java/util/Collections/Disjoint.java | 2 +- jdk/test/java/util/Collections/Frequency.java | 2 +- .../util/Collections/RacingCollections.java | 10 +- .../java/util/Collections/ReverseOrder2.java | 6 +- jdk/test/java/util/Deque/ChorusLine.java | 2 +- jdk/test/java/util/LinkedHashMap/Basic.java | 4 +- .../util/Locale/tools/EquivMapsGenerator.java | 4 +- jdk/test/java/util/Map/Collisions.java | 2 +- jdk/test/java/util/Map/FunctionalCMEs.java | 2 +- .../java/util/Map/InPlaceOpsCollisions.java | 2 +- .../java/util/Map/MapBinToFromTreeTest.java | 2 +- jdk/test/java/util/NavigableMap/LockStep.java | 4 +- .../java/util/ResourceBundle/Bug6190861.java | 2 +- .../java/util/ResourceBundle/Bug6204853.java | 2 +- .../java/util/ResourceBundle/Bug6355009.java | 2 +- .../java/util/ResourceBundle/Bug6356571.java | 2 +- .../ResourceBundle/Control/StressTest.java | 2 +- .../java/util/ResourceBundle/Test4300693.java | 4 +- .../TestGetBaseBundleName.java | 4 +- jdk/test/java/util/ServiceLoader/Basic.java | 2 +- jdk/test/java/util/ServiceLoader/NPE.java | 2 +- .../Spliterator/SpliteratorCollisions.java | 2 +- .../java/util/StringJoiner/MergeTest.java | 4 +- jdk/test/java/util/TreeMap/ContainsValue.java | 2 +- .../BlockingQueue/OfferDrainToLoops.java | 2 +- .../ConcurrentQueues/OfferRemoveLoops.java | 2 +- .../FutureTask/DoneTimedGetLoops.java | 4 +- .../java/util/concurrent/Phaser/Basic.java | 4 +- .../concurrent/locks/StampedLock/Basic.java | 6 +- .../jar/JarEntry/GetMethodsReturnClones.java | 2 +- jdk/test/java/util/jar/TestExtra.java | 8 +- .../AnonymousLogger/TestAnonymousLogger.java | 6 +- .../util/logging/DrainFindDeadlockTest.java | 4 +- .../util/logging/FileHandlerLongLimit.java | 2 +- .../java/util/logging/FileHandlerPath.java | 10 +- .../logging/FileHandlerPatternExceptions.java | 2 +- .../SerializeLogRecord.java | 2 +- .../XmlFormatterNanos.java | 2 +- .../ParentLoggerWithHandlerGC.java | 2 +- .../Configuration/TestConfigurationLock.java | 8 +- .../logging/LogManagerAppContextDeadlock.java | 6 +- .../entering/LoggerEnteringWithParams.java | 2 +- .../Logger/getGlobal/TestGetGlobal.java | 2 +- .../Logger/getGlobal/TestGetGlobalByName.java | 2 +- .../getGlobal/TestGetGlobalConcurrent.java | 10 +- .../getGlobal/testgetglobal/HandlerImpl.java | 2 +- .../Logger/logrb/TestLogrbResourceBundle.java | 4 +- .../TestSetResourceBundle.java | 4 +- .../logging/LoggerResourceBundleRace.java | 20 +- .../RootLogger/RootLevelInConfigFile.java | 2 +- .../util/logging/TestAppletLoggerContext.java | 2 +- .../logging/TestConfigurationListeners.java | 2 +- .../logging/TestLogConfigurationDeadLock.java | 6 +- .../TestLogConfigurationDeadLockWithConf.java | 6 +- .../util/logging/TestLoggerBundleSync.java | 16 +- .../bundlesearch/IndirectlyLoadABundle.java | 2 +- .../util/logging/bundlesearch/LoadItUp2.java | 2 +- .../ResourceBundleSearchTest.java | 8 +- .../TwiceIndirectlyLoadABundle.java | 2 +- jdk/test/java/util/regex/POSIX_Unicode.java | 2 +- .../java/util/stream/CollectorsTest.java | 2 +- jdk/test/java/util/zip/ChecksumBase.java | 2 +- .../java/util/zip/FlaterCriticalArray.java | 6 +- jdk/test/java/util/zip/FlaterTest.java | 2 +- .../util/zip/ZipFile/FinalizeZipFile.java | 2 +- 453 files changed, 1775 insertions(+), 1775 deletions(-) diff --git a/jdk/src/java.base/macosx/classes/java/net/DefaultInterface.java b/jdk/src/java.base/macosx/classes/java/net/DefaultInterface.java index 93381a62e39..573de6986f8 100644 --- a/jdk/src/java.base/macosx/classes/java/net/DefaultInterface.java +++ b/jdk/src/java.base/macosx/classes/java/net/DefaultInterface.java @@ -42,7 +42,7 @@ import java.io.IOException; class DefaultInterface { - private final static NetworkInterface defaultInterface = + private static final NetworkInterface defaultInterface = chooseDefaultInterface(); static NetworkInterface getDefault() { diff --git a/jdk/src/java.base/macosx/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java b/jdk/src/java.base/macosx/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java index 713df8e5dc5..e4eb8da63cd 100644 --- a/jdk/src/java.base/macosx/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java +++ b/jdk/src/java.base/macosx/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java @@ -106,7 +106,7 @@ public class HostLocaleProviderAdapterImpl { tmpSet.addAll(Control.getNoFallbackControl(Control.FORMAT_DEFAULT).getCandidateLocales("", l)); supportedLocaleSet = Collections.unmodifiableSet(tmpSet); } - private final static Locale[] supportedLocale = supportedLocaleSet.toArray(new Locale[0]); + private static final Locale[] supportedLocale = supportedLocaleSet.toArray(new Locale[0]); @SuppressWarnings("fallthrough") private static Locale convertMacOSXLocaleToJavaLocale(String macosxloc) { diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/RC2Crypt.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/RC2Crypt.java index abaeae0251e..aa3100c1b7d 100644 --- a/jdk/src/java.base/share/classes/com/sun/crypto/provider/RC2Crypt.java +++ b/jdk/src/java.base/share/classes/com/sun/crypto/provider/RC2Crypt.java @@ -45,7 +45,7 @@ import java.security.InvalidKeyException; final class RC2Crypt extends SymmetricCipher { // PITABLE from the RFC, used in key setup - private final static int[] PI_TABLE = new int[] { + private static final int[] PI_TABLE = new int[] { 0xd9, 0x78, 0xf9, 0xc4, 0x19, 0xdd, 0xb5, 0xed, 0x28, 0xe9, 0xfd, 0x79, 0x4a, 0xa0, 0xd8, 0x9d, 0xc6, 0x7e, 0x37, 0x83, 0x2b, 0x76, 0x53, 0x8e, diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/RC2Parameters.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/RC2Parameters.java index 617865855c4..d1a3c2edfaa 100644 --- a/jdk/src/java.base/share/classes/com/sun/crypto/provider/RC2Parameters.java +++ b/jdk/src/java.base/share/classes/com/sun/crypto/provider/RC2Parameters.java @@ -59,7 +59,7 @@ public final class RC2Parameters extends AlgorithmParametersSpi { // TABLE[EKB] from section 6 of RFC 2268, used to convert effective key // size to/from encoded version number - private final static int[] EKB_TABLE = new int[] { + private static final int[] EKB_TABLE = new int[] { 0xbd, 0x56, 0xea, 0xf2, 0xa2, 0xf1, 0xac, 0x2a, 0xb0, 0x93, 0xd1, 0x9c, 0x1b, 0x33, 0xfd, 0xd0, 0x30, 0x04, 0xb6, 0xdc, 0x7d, 0xdf, 0x32, 0x4b, diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/RSACipher.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/RSACipher.java index c912a3f04f0..6faa5b218df 100644 --- a/jdk/src/java.base/share/classes/com/sun/crypto/provider/RSACipher.java +++ b/jdk/src/java.base/share/classes/com/sun/crypto/provider/RSACipher.java @@ -66,23 +66,23 @@ import sun.security.util.KeyUtil; public final class RSACipher extends CipherSpi { // constant for an empty byte array - private final static byte[] B0 = new byte[0]; + private static final byte[] B0 = new byte[0]; // mode constant for public key encryption - private final static int MODE_ENCRYPT = 1; + private static final int MODE_ENCRYPT = 1; // mode constant for private key decryption - private final static int MODE_DECRYPT = 2; + private static final int MODE_DECRYPT = 2; // mode constant for private key encryption (signing) - private final static int MODE_SIGN = 3; + private static final int MODE_SIGN = 3; // mode constant for public key decryption (verifying) - private final static int MODE_VERIFY = 4; + private static final int MODE_VERIFY = 4; // constant for raw RSA - private final static String PAD_NONE = "NoPadding"; + private static final String PAD_NONE = "NoPadding"; // constant for PKCS#1 v1.5 RSA - private final static String PAD_PKCS1 = "PKCS1Padding"; + private static final String PAD_PKCS1 = "PKCS1Padding"; // constant for PKCS#2 v2.0 OAEP with MGF1 - private final static String PAD_OAEP_MGF1 = "OAEP"; + private static final String PAD_OAEP_MGF1 = "OAEP"; // current mode, one of MODE_* above. Set when init() is called private int mode; diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsKeyMaterialGenerator.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsKeyMaterialGenerator.java index bd08e710bee..46933860c71 100644 --- a/jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsKeyMaterialGenerator.java +++ b/jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsKeyMaterialGenerator.java @@ -43,7 +43,7 @@ import static com.sun.crypto.provider.TlsPrfGenerator.*; */ public final class TlsKeyMaterialGenerator extends KeyGeneratorSpi { - private final static String MSG = "TlsKeyMaterialGenerator must be " + private static final String MSG = "TlsKeyMaterialGenerator must be " + "initialized using a TlsKeyMaterialParameterSpec"; @SuppressWarnings("deprecation") diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsMasterSecretGenerator.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsMasterSecretGenerator.java index b0527026757..c772396e990 100644 --- a/jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsMasterSecretGenerator.java +++ b/jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsMasterSecretGenerator.java @@ -43,7 +43,7 @@ import static com.sun.crypto.provider.TlsPrfGenerator.*; */ public final class TlsMasterSecretGenerator extends KeyGeneratorSpi { - private final static String MSG = "TlsMasterSecretGenerator must be " + private static final String MSG = "TlsMasterSecretGenerator must be " + "initialized using a TlsMasterSecretParameterSpec"; @SuppressWarnings("deprecation") diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsPrfGenerator.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsPrfGenerator.java index 0461523dec3..90cde7c6bfb 100644 --- a/jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsPrfGenerator.java +++ b/jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsPrfGenerator.java @@ -50,23 +50,23 @@ abstract class TlsPrfGenerator extends KeyGeneratorSpi { // magic constants and utility functions, also used by other files // in this package - private final static byte[] B0 = new byte[0]; + private static final byte[] B0 = new byte[0]; - final static byte[] LABEL_MASTER_SECRET = // "master secret" + static final byte[] LABEL_MASTER_SECRET = // "master secret" { 109, 97, 115, 116, 101, 114, 32, 115, 101, 99, 114, 101, 116 }; - final static byte[] LABEL_KEY_EXPANSION = // "key expansion" + static final byte[] LABEL_KEY_EXPANSION = // "key expansion" { 107, 101, 121, 32, 101, 120, 112, 97, 110, 115, 105, 111, 110 }; - final static byte[] LABEL_CLIENT_WRITE_KEY = // "client write key" + static final byte[] LABEL_CLIENT_WRITE_KEY = // "client write key" { 99, 108, 105, 101, 110, 116, 32, 119, 114, 105, 116, 101, 32, 107, 101, 121 }; - final static byte[] LABEL_SERVER_WRITE_KEY = // "server write key" + static final byte[] LABEL_SERVER_WRITE_KEY = // "server write key" { 115, 101, 114, 118, 101, 114, 32, 119, 114, 105, 116, 101, 32, 107, 101, 121 }; - final static byte[] LABEL_IV_BLOCK = // "IV block" + static final byte[] LABEL_IV_BLOCK = // "IV block" { 73, 86, 32, 98, 108, 111, 99, 107 }; /* @@ -79,7 +79,7 @@ abstract class TlsPrfGenerator extends KeyGeneratorSpi { private static final byte[] HMAC_opad128 = genPad((byte)0x5c, 128); // SSL3 magic mix constants ("A", "BB", "CCC", ...) - final static byte[][] SSL3_CONST = genConst(); + static final byte[][] SSL3_CONST = genConst(); static byte[] genPad(byte b, int count) { byte[] padding = new byte[count]; @@ -109,7 +109,7 @@ abstract class TlsPrfGenerator extends KeyGeneratorSpi { // PRF implementation - private final static String MSG = "TlsPrfGenerator must be " + private static final String MSG = "TlsPrfGenerator must be " + "initialized using a TlsPrfParameterSpec"; @SuppressWarnings("deprecation") @@ -368,7 +368,7 @@ abstract class TlsPrfGenerator extends KeyGeneratorSpi { * appropriate supportsParamters() checks into KeyGenerators (not * currently there). */ - static public class V12 extends TlsPrfGenerator { + public static class V12 extends TlsPrfGenerator { protected SecretKey engineGenerateKey() { return engineGenerateKey0(true); } @@ -377,7 +377,7 @@ abstract class TlsPrfGenerator extends KeyGeneratorSpi { /** * A KeyGenerator implementation that supports TLS 1.0/1.1. */ - static public class V10 extends TlsPrfGenerator { + public static class V10 extends TlsPrfGenerator { protected SecretKey engineGenerateKey() { return engineGenerateKey0(false); } diff --git a/jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java b/jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java index c4fc8364584..ef2d6351dde 100644 --- a/jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java +++ b/jdk/src/java.base/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java @@ -41,7 +41,7 @@ import sun.security.internal.spec.TlsRsaPremasterSecretParameterSpec; */ public final class TlsRsaPremasterSecretGenerator extends KeyGeneratorSpi { - private final static String MSG = "TlsRsaPremasterSecretGenerator must be " + private static final String MSG = "TlsRsaPremasterSecretGenerator must be " + "initialized using a TlsRsaPremasterSecretParameterSpec"; @SuppressWarnings("deprecation") diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Attribute.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Attribute.java index 2a4854a5649..e8ff8951716 100644 --- a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Attribute.java +++ b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Attribute.java @@ -342,7 +342,7 @@ class Attribute implements Comparable { * presence of attributes. That is, flags are a mix of modifier * bits and attribute indicators. */ - public static abstract + public abstract static class Holder { // We need this abstract method to interpret embedded CP refs. @@ -461,7 +461,7 @@ class Attribute implements Comparable { // Lightweight interface to hide details of band structure. // Also used for testing. - public static abstract + public abstract static class ValueStream { public int getInt(int bandIndex) { throw undef(); } public void putInt(int bandIndex, int value) { throw undef(); } @@ -667,7 +667,7 @@ class Attribute implements Comparable { public boolean hasCallables() { return (elems.length > 0 && elems[0].kind == EK_CBLE); } - static private final Element[] noElems = {}; + private static final Element[] noElems = {}; public Element[] getCallables() { if (hasCallables()) { Element[] nelems = Arrays.copyOf(elems, elems.length); @@ -783,7 +783,7 @@ class Attribute implements Comparable { * Replaces '\c' by the decimal code of the character c. * Replaces '0xNNN' by the decimal code of the hex number NNN. */ - static public + public static String normalizeLayoutString(String layout) { StringBuilder buf = new StringBuilder(); for (int i = 0, len = layout.length(); i < len; ) { @@ -1139,7 +1139,7 @@ class Attribute implements Comparable { bodies.toArray(res); return res; } - static private + private static int skipBody(String layout, int i) { assert(layout.charAt(i-1) == '['); if (layout.charAt(i) == ']') @@ -1156,7 +1156,7 @@ class Attribute implements Comparable { assert(layout.charAt(i) == ']'); return i; // return closing bracket } - static private + private static int tokenizeUInt(Layout.Element e, String layout, int i) { switch (layout.charAt(i++)) { case 'V': e.len = 0; break; @@ -1167,7 +1167,7 @@ class Attribute implements Comparable { } return i; } - static private + private static int tokenizeSInt(Layout.Element e, String layout, int i) { if (layout.charAt(i) == 'S') { e.flags |= EF_SIGN; @@ -1176,7 +1176,7 @@ class Attribute implements Comparable { return tokenizeUInt(e, layout, i); } - static private + private static boolean isDigit(char c) { return c >= '0' && c <= '9'; } @@ -1383,7 +1383,7 @@ class Attribute implements Comparable { return e.body[lastj]; } - static private + private static int parseInt(Layout.Element e, byte[] bytes, int pos, int[] buf) { int value = 0; int loBits = e.len * 8; @@ -1483,7 +1483,7 @@ class Attribute implements Comparable { } } - static private + private static void unparseInt(Layout.Element e, int value, ByteArrayOutputStream out) { int loBits = e.len * 8; if (loBits == 0) { diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/BandStructure.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/BandStructure.java index a7db9784946..3816dd77bb3 100644 --- a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/BandStructure.java +++ b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/BandStructure.java @@ -73,7 +73,7 @@ class BandStructure { boolean optVaryCodings = !p200.getBoolean(Utils.COM_PREFIX+"no.vary.codings"); boolean optBigStrings = !p200.getBoolean(Utils.COM_PREFIX+"no.big.strings"); - abstract protected Index getCPIndex(byte tag); + protected abstract Index getCPIndex(byte tag); // Local copy of highest class version. private Package.Version highestClassVersion = null; @@ -97,27 +97,27 @@ class BandStructure { protected BandStructure() {} - final static Coding BYTE1 = Coding.of(1,256); + static final Coding BYTE1 = Coding.of(1,256); - final static Coding CHAR3 = Coding.of(3,128); + static final Coding CHAR3 = Coding.of(3,128); // Note: Tried sharper (3,16) with no post-zip benefit. // This is best used with BCI values: - final static Coding BCI5 = Coding.of(5,4); // mostly 1-byte offsets - final static Coding BRANCH5 = Coding.of(5,4,2); // mostly forward branches + static final Coding BCI5 = Coding.of(5,4); // mostly 1-byte offsets + static final Coding BRANCH5 = Coding.of(5,4,2); // mostly forward branches - final static Coding UNSIGNED5 = Coding.of(5,64); - final static Coding UDELTA5 = UNSIGNED5.getDeltaCoding(); + static final Coding UNSIGNED5 = Coding.of(5,64); + static final Coding UDELTA5 = UNSIGNED5.getDeltaCoding(); // "sharp" (5,64) zips 0.4% better than "medium" (5,128) // It zips 1.1% better than "flat" (5,192) - final static Coding SIGNED5 = Coding.of(5,64,1); //sharp - final static Coding DELTA5 = SIGNED5.getDeltaCoding(); + static final Coding SIGNED5 = Coding.of(5,64,1); //sharp + static final Coding DELTA5 = SIGNED5.getDeltaCoding(); // Note: Tried (5,128,2) and (5,192,2) with no benefit. - final static Coding MDELTA5 = Coding.of(5,64,2).getDeltaCoding(); + static final Coding MDELTA5 = Coding.of(5,64,2).getDeltaCoding(); - final private static Coding[] basicCodings = { + private static final Coding[] basicCodings = { // Table of "Canonical BHSD Codings" from Pack200 spec. null, // _meta_default @@ -250,7 +250,7 @@ class BandStructure { null }; - final private static Map basicCodingIndexes; + private static final Map basicCodingIndexes; static { assert(basicCodings[_meta_default] == null); assert(basicCodings[_meta_canon_min] != null); @@ -362,9 +362,9 @@ class BandStructure { protected long outputSize = -1; // cache - final public Coding regularCoding; + public final Coding regularCoding; - final public int seqForDebug; + public final int seqForDebug; public int elementCountForDebug; @@ -430,7 +430,7 @@ class BandStructure { protected abstract long computeOutputSize(); - abstract protected void writeDataTo(OutputStream out) throws IOException; + protected abstract void writeDataTo(OutputStream out) throws IOException; /** Expect a certain number of values. */ void expectLength(int l) { @@ -468,7 +468,7 @@ class BandStructure { readDataFrom(in); readyToDisburse(); } - abstract protected void readDataFrom(InputStream in) throws IOException; + protected abstract void readDataFrom(InputStream in) throws IOException; protected void readyToDisburse() { if (verbose > 1) Utils.log.fine("readyToDisburse "+this); setPhase(DISBURSE_PHASE); @@ -1447,7 +1447,7 @@ class BandStructure { return b; } - static private final boolean NULL_IS_OK = true; + private static final boolean NULL_IS_OK = true; MultiBand all_bands = (MultiBand) new MultiBand("(package)", UNSIGNED5).init(); @@ -2539,7 +2539,7 @@ class BandStructure { return false; } - static private boolean assertDoneDisbursing(Band b) { + private static boolean assertDoneDisbursing(Band b) { if (b.phase != DISBURSE_PHASE) { Utils.log.warning("assertDoneDisbursing: still in phase "+b.phase+": "+b); if (verbose() <= 1) return false; // fail now @@ -2562,7 +2562,7 @@ class BandStructure { return true; } - static private void printCDecl(Band b) { + private static void printCDecl(Band b) { if (b instanceof MultiBand) { MultiBand mb = (MultiBand) b; for (int i = 0; i < mb.bandCount; i++) { diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Code.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Code.java index 856a83ceeb1..c69578af775 100644 --- a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Code.java +++ b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Code.java @@ -56,7 +56,7 @@ class Code extends Attribute.Holder { return m.getCPMap(); } - static private final ConstantPool.Entry[] noRefs = ConstantPool.noRefs; + private static final ConstantPool.Entry[] noRefs = ConstantPool.noRefs; // The following fields are used directly by the ClassReader, etc. int max_stack; diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Coding.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Coding.java index d334af4bd67..9dd884b7ff6 100644 --- a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Coding.java +++ b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Coding.java @@ -662,7 +662,7 @@ class Coding implements Comparable, CodingMethod, Histogram.BitMetric { return lg; } - static private final byte[] byteBitWidths = new byte[0x100]; + private static final byte[] byteBitWidths = new byte[0x100]; static { for (int b = 0; b < byteBitWidths.length; b++) { byteBitWidths[b] = (byte) ceil_lg2(b + 1); diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/CodingChooser.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/CodingChooser.java index f173cf8059a..4cc1d0898ed 100644 --- a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/CodingChooser.java +++ b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/CodingChooser.java @@ -1139,7 +1139,7 @@ class CodingChooser { } } - static private + private static String pct(double num, double den) { return (Math.round((num / den)*10000)/100.0)+"%"; } diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/ConstantPool.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/ConstantPool.java index e4c7d7d931d..c4875bf27e6 100644 --- a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/ConstantPool.java +++ b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/ConstantPool.java @@ -194,7 +194,7 @@ class ConstantPool { /** Entries in the constant pool. */ - public static abstract + public abstract static class Entry implements Comparable { protected final byte tag; // a CONSTANT_foo code protected int valueHash; // cached hashCode @@ -338,7 +338,7 @@ class ConstantPool { return (REF_getField <= refKind && refKind <= REF_invokeInterface); } - public static abstract + public abstract static class LiteralEntry extends Entry { protected LiteralEntry(byte tag) { super(tag); @@ -785,7 +785,7 @@ class ConstantPool { return new String(sig); } - static private int skipTo(char semi, String sig, int i) { + private static int skipTo(char semi, String sig, int i) { i = sig.indexOf(semi, i); return (i >= 0) ? i : sig.length(); } diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Constants.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Constants.java index 15991700f25..fee0b800f2d 100644 --- a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Constants.java +++ b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Constants.java @@ -36,7 +36,7 @@ class Constants { private Constants(){} - public final static int JAVA_MAGIC = 0xCAFEBABE; + public static final int JAVA_MAGIC = 0xCAFEBABE; /* Java Class Version numbers history @@ -48,93 +48,93 @@ class Constants { 1.8 to 1.7.x 52,0 */ - public final static Package.Version JAVA_MIN_CLASS_VERSION = + public static final Package.Version JAVA_MIN_CLASS_VERSION = Package.Version.of(45, 03); - public final static Package.Version JAVA5_MAX_CLASS_VERSION = + public static final Package.Version JAVA5_MAX_CLASS_VERSION = Package.Version.of(49, 00); - public final static Package.Version JAVA6_MAX_CLASS_VERSION = + public static final Package.Version JAVA6_MAX_CLASS_VERSION = Package.Version.of(50, 00); - public final static Package.Version JAVA7_MAX_CLASS_VERSION = + public static final Package.Version JAVA7_MAX_CLASS_VERSION = Package.Version.of(51, 00); - public final static Package.Version JAVA8_MAX_CLASS_VERSION = + public static final Package.Version JAVA8_MAX_CLASS_VERSION = Package.Version.of(52, 00); - public final static int JAVA_PACKAGE_MAGIC = 0xCAFED00D; + public static final int JAVA_PACKAGE_MAGIC = 0xCAFED00D; - public final static Package.Version JAVA5_PACKAGE_VERSION = + public static final Package.Version JAVA5_PACKAGE_VERSION = Package.Version.of(150, 7); - public final static Package.Version JAVA6_PACKAGE_VERSION = + public static final Package.Version JAVA6_PACKAGE_VERSION = Package.Version.of(160, 1); - public final static Package.Version JAVA7_PACKAGE_VERSION = + public static final Package.Version JAVA7_PACKAGE_VERSION = Package.Version.of(170, 1); - public final static Package.Version JAVA8_PACKAGE_VERSION = + public static final Package.Version JAVA8_PACKAGE_VERSION = Package.Version.of(171, 0); // upper limit, should point to the latest class version - public final static Package.Version JAVA_MAX_CLASS_VERSION = + public static final Package.Version JAVA_MAX_CLASS_VERSION = JAVA8_MAX_CLASS_VERSION; // upper limit should point to the latest package version, for version info!. - public final static Package.Version MAX_PACKAGE_VERSION = + public static final Package.Version MAX_PACKAGE_VERSION = JAVA7_PACKAGE_VERSION; - public final static int CONSTANT_POOL_INDEX_LIMIT = 0x10000; - public final static int CONSTANT_POOL_NARROW_LIMIT = 0x00100; + public static final int CONSTANT_POOL_INDEX_LIMIT = 0x10000; + public static final int CONSTANT_POOL_NARROW_LIMIT = 0x00100; - public final static String JAVA_SIGNATURE_CHARS = "BSCIJFDZLV(["; + public static final String JAVA_SIGNATURE_CHARS = "BSCIJFDZLV(["; - public final static byte CONSTANT_Utf8 = 1; - public final static byte CONSTANT_unused2 = 2; // unused, was Unicode - public final static byte CONSTANT_Integer = 3; - public final static byte CONSTANT_Float = 4; - public final static byte CONSTANT_Long = 5; - public final static byte CONSTANT_Double = 6; - public final static byte CONSTANT_Class = 7; - public final static byte CONSTANT_String = 8; - public final static byte CONSTANT_Fieldref = 9; - public final static byte CONSTANT_Methodref = 10; - public final static byte CONSTANT_InterfaceMethodref = 11; - public final static byte CONSTANT_NameandType = 12; - public final static byte CONSTANT_unused13 = 13; - public final static byte CONSTANT_unused14 = 14; - public final static byte CONSTANT_MethodHandle = 15; - public final static byte CONSTANT_MethodType = 16; - public final static byte CONSTANT_unused17 = 17; // unused - public final static byte CONSTANT_InvokeDynamic = 18; + public static final byte CONSTANT_Utf8 = 1; + public static final byte CONSTANT_unused2 = 2; // unused, was Unicode + public static final byte CONSTANT_Integer = 3; + public static final byte CONSTANT_Float = 4; + public static final byte CONSTANT_Long = 5; + public static final byte CONSTANT_Double = 6; + public static final byte CONSTANT_Class = 7; + public static final byte CONSTANT_String = 8; + public static final byte CONSTANT_Fieldref = 9; + public static final byte CONSTANT_Methodref = 10; + public static final byte CONSTANT_InterfaceMethodref = 11; + public static final byte CONSTANT_NameandType = 12; + public static final byte CONSTANT_unused13 = 13; + public static final byte CONSTANT_unused14 = 14; + public static final byte CONSTANT_MethodHandle = 15; + public static final byte CONSTANT_MethodType = 16; + public static final byte CONSTANT_unused17 = 17; // unused + public static final byte CONSTANT_InvokeDynamic = 18; // pseudo-constants: - public final static byte CONSTANT_None = 0; - public final static byte CONSTANT_Signature = CONSTANT_unused13; - public final static byte CONSTANT_BootstrapMethod = CONSTANT_unused17; // used only in InvokeDynamic constants - public final static byte CONSTANT_Limit = 19; + public static final byte CONSTANT_None = 0; + public static final byte CONSTANT_Signature = CONSTANT_unused13; + public static final byte CONSTANT_BootstrapMethod = CONSTANT_unused17; // used only in InvokeDynamic constants + public static final byte CONSTANT_Limit = 19; - public final static byte CONSTANT_All = 50; // combined global map - public final static byte CONSTANT_LoadableValue = 51; // used for 'KL' and qldc operands - public final static byte CONSTANT_AnyMember = 52; // union of refs to field or (interface) method - public final static byte CONSTANT_FieldSpecific = 53; // used only for 'KQ' ConstantValue attrs - public final static byte CONSTANT_GroupFirst = CONSTANT_All; - public final static byte CONSTANT_GroupLimit = CONSTANT_FieldSpecific+1; + public static final byte CONSTANT_All = 50; // combined global map + public static final byte CONSTANT_LoadableValue = 51; // used for 'KL' and qldc operands + public static final byte CONSTANT_AnyMember = 52; // union of refs to field or (interface) method + public static final byte CONSTANT_FieldSpecific = 53; // used only for 'KQ' ConstantValue attrs + public static final byte CONSTANT_GroupFirst = CONSTANT_All; + public static final byte CONSTANT_GroupLimit = CONSTANT_FieldSpecific+1; // CONSTANT_MethodHandle reference kinds - public final static byte REF_getField = 1; - public final static byte REF_getStatic = 2; - public final static byte REF_putField = 3; - public final static byte REF_putStatic = 4; - public final static byte REF_invokeVirtual = 5; - public final static byte REF_invokeStatic = 6; - public final static byte REF_invokeSpecial = 7; - public final static byte REF_newInvokeSpecial = 8; - public final static byte REF_invokeInterface = 9; + public static final byte REF_getField = 1; + public static final byte REF_getStatic = 2; + public static final byte REF_putField = 3; + public static final byte REF_putStatic = 4; + public static final byte REF_invokeVirtual = 5; + public static final byte REF_invokeStatic = 6; + public static final byte REF_invokeSpecial = 7; + public static final byte REF_newInvokeSpecial = 8; + public static final byte REF_invokeInterface = 9; // pseudo-access bits - public final static int ACC_IC_LONG_FORM = (1<<16); //for ic_flags + public static final int ACC_IC_LONG_FORM = (1<<16); //for ic_flags // attribute "context types" public static final int ATTR_CONTEXT_CLASS = 0; @@ -199,14 +199,14 @@ class Constants { public static final int NO_MODTIME = 0; // null modtime value // some comstantly empty containers - public final static int[] noInts = {}; - public final static byte[] noBytes = {}; - public final static Object[] noValues = {}; - public final static String[] noStrings = {}; - public final static List emptyList = Arrays.asList(noValues); + public static final int[] noInts = {}; + public static final byte[] noBytes = {}; + public static final Object[] noValues = {}; + public static final String[] noStrings = {}; + public static final List emptyList = Arrays.asList(noValues); // meta-coding - public final static int + public static final int _meta_default = 0, _meta_canon_min = 1, _meta_canon_max = 115, @@ -216,7 +216,7 @@ class Constants { _meta_limit = 189; // bytecodes - public final static int + public static final int _nop = 0, // 0x00 _aconst_null = 1, // 0x01 _iconst_m1 = 2, // 0x02 @@ -422,10 +422,10 @@ class Constants { _bytecode_limit = 202; // 0xca // End marker, used to terminate bytecode sequences: - public final static int _end_marker = 255; + public static final int _end_marker = 255; // Escapes: - public final static int _byte_escape = 254; - public final static int _ref_escape = 253; + public static final int _byte_escape = 254; + public static final int _ref_escape = 253; // Self-relative pseudo-opcodes for better compression. // A "linker op" is a bytecode which links to a class member. @@ -440,26 +440,26 @@ class Constants { // For simplicity, we define the full symmetric set of variants. // However, some of them are relatively useless. // Self linker ops are enabled by Pack.selfCallVariants (true). - public final static int _first_linker_op = _getstatic; - public final static int _last_linker_op = _invokestatic; - public final static int _num_linker_ops = (_last_linker_op - _first_linker_op) + 1; - public final static int _self_linker_op = _bytecode_limit; - public final static int _self_linker_aload_flag = 1*_num_linker_ops; - public final static int _self_linker_super_flag = 2*_num_linker_ops; - public final static int _self_linker_limit = _self_linker_op + 4*_num_linker_ops; + public static final int _first_linker_op = _getstatic; + public static final int _last_linker_op = _invokestatic; + public static final int _num_linker_ops = (_last_linker_op - _first_linker_op) + 1; + public static final int _self_linker_op = _bytecode_limit; + public static final int _self_linker_aload_flag = 1*_num_linker_ops; + public static final int _self_linker_super_flag = 2*_num_linker_ops; + public static final int _self_linker_limit = _self_linker_op + 4*_num_linker_ops; // An "invoke init" op is a variant of invokespecial which works // only with the method name "". There are variants which // link to the current class, the super class, or the class of the // immediately previous "newinstance" op. There are 3 of these ops. // They all take method signature references as operands. // Invoke init ops are enabled by Pack.initCallVariants (true). - public final static int _invokeinit_op = _self_linker_limit; - public final static int _invokeinit_self_option = 0; - public final static int _invokeinit_super_option = 1; - public final static int _invokeinit_new_option = 2; - public final static int _invokeinit_limit = _invokeinit_op+3; + public static final int _invokeinit_op = _self_linker_limit; + public static final int _invokeinit_self_option = 0; + public static final int _invokeinit_super_option = 1; + public static final int _invokeinit_new_option = 2; + public static final int _invokeinit_limit = _invokeinit_op+3; - public final static int _pseudo_instruction_limit = _invokeinit_limit; + public static final int _pseudo_instruction_limit = _invokeinit_limit; // linker variant limit == 202+(7*4)+3 == 233 // Ldc variants support strongly typed references to constants. @@ -467,25 +467,25 @@ class Constants { // which is a great simplification. // Ldc variants gain us only 0.007% improvement in compression ratio, // but they simplify the file format greatly. - public final static int _xldc_op = _invokeinit_limit; - public final static int _sldc = _ldc; // previously named _aldc - public final static int _cldc = _xldc_op+0; - public final static int _ildc = _xldc_op+1; - public final static int _fldc = _xldc_op+2; - public final static int _sldc_w = _ldc_w; // previously named _aldc_w - public final static int _cldc_w = _xldc_op+3; - public final static int _ildc_w = _xldc_op+4; - public final static int _fldc_w = _xldc_op+5; - public final static int _lldc2_w = _ldc2_w; - public final static int _dldc2_w = _xldc_op+6; + public static final int _xldc_op = _invokeinit_limit; + public static final int _sldc = _ldc; // previously named _aldc + public static final int _cldc = _xldc_op+0; + public static final int _ildc = _xldc_op+1; + public static final int _fldc = _xldc_op+2; + public static final int _sldc_w = _ldc_w; // previously named _aldc_w + public static final int _cldc_w = _xldc_op+3; + public static final int _ildc_w = _xldc_op+4; + public static final int _fldc_w = _xldc_op+5; + public static final int _lldc2_w = _ldc2_w; + public static final int _dldc2_w = _xldc_op+6; // anything other than primitive, string, or class must be handled with qldc: - public final static int _qldc = _xldc_op+7; - public final static int _qldc_w = _xldc_op+8; - public final static int _xldc_limit = _xldc_op+9; + public static final int _qldc = _xldc_op+7; + public static final int _qldc_w = _xldc_op+8; + public static final int _xldc_limit = _xldc_op+9; // handling of InterfaceMethodRef - public final static int _invoke_int_op = _xldc_limit; - public final static int _invokespecial_int = _invoke_int_op+0; - public final static int _invokestatic_int = _invoke_int_op+1; - public final static int _invoke_int_limit = _invoke_int_op+2; + public static final int _invoke_int_op = _xldc_limit; + public static final int _invokespecial_int = _invoke_int_op+0; + public static final int _invokestatic_int = _invoke_int_op+1; + public static final int _invoke_int_limit = _invoke_int_op+2; } diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Driver.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Driver.java index c0393d3de4a..13ccac8b46d 100644 --- a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Driver.java +++ b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Driver.java @@ -376,7 +376,7 @@ class Driver { } } - static private + private static File createTempFile(String basefile, String suffix) throws IOException { File base = new File(basefile); String prefix = base.getName(); @@ -393,7 +393,7 @@ class Driver { return tmpfile.toFile(); } - static private + private static void printUsage(boolean doPack, boolean full, PrintStream out) { String prog = doPack ? "pack200" : "unpack200"; String[] packUsage = (String[])RESOURCE.getObject(DriverResource.PACK_HELP); @@ -408,7 +408,7 @@ class Driver { } } - static private + private static String getZipComment(String jarfile) throws IOException { byte[] tail = new byte[1000]; long filelen = new File(jarfile).length(); diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Histogram.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Histogram.java index 2616405893e..e6ea5b4c077 100644 --- a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Histogram.java +++ b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Histogram.java @@ -218,7 +218,7 @@ final class Histogram { return sum; } - static private + private static double round(double x, double scale) { return Math.round(x * scale) / scale; } diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Instruction.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Instruction.java index 93175fe8ecf..cfbe8638b24 100644 --- a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Instruction.java +++ b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Instruction.java @@ -471,14 +471,14 @@ class Instruction { /// Format definitions. - static private final byte[][] BC_LENGTH = new byte[2][0x100]; - static private final byte[][] BC_INDEX = new byte[2][0x100]; - static private final byte[][] BC_TAG = new byte[2][0x100]; - static private final byte[][] BC_BRANCH = new byte[2][0x100]; - static private final byte[][] BC_SLOT = new byte[2][0x100]; - static private final byte[][] BC_CON = new byte[2][0x100]; - static private final String[] BC_NAME = new String[0x100]; // debug only - static private final String[][] BC_FORMAT = new String[2][_bytecode_limit]; // debug only + private static final byte[][] BC_LENGTH = new byte[2][0x100]; + private static final byte[][] BC_INDEX = new byte[2][0x100]; + private static final byte[][] BC_TAG = new byte[2][0x100]; + private static final byte[][] BC_BRANCH = new byte[2][0x100]; + private static final byte[][] BC_SLOT = new byte[2][0x100]; + private static final byte[][] BC_CON = new byte[2][0x100]; + private static final String[] BC_NAME = new String[0x100]; // debug only + private static final String[][] BC_FORMAT = new String[2][_bytecode_limit]; // debug only static { for (int i = 0; i < _bytecode_limit; i++) { BC_LENGTH[0][i] = -1; diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java index d254cb8d5d2..2e6a4a4e11f 100644 --- a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java +++ b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java @@ -104,7 +104,7 @@ class NativeUnpack { } // for JNI callbacks - static private Object currentInstance() { + private static Object currentInstance() { UnpackerImpl p200 = (UnpackerImpl) Utils.getTLGlobals(); return (p200 == null)? null: p200._nunp; } diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Package.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Package.java index 002d88197cb..12baf44fe58 100644 --- a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Package.java +++ b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Package.java @@ -990,7 +990,7 @@ class Package { } // Helper for building InnerClasses attributes. - static private + private static void visitInnerClassRefs(Collection innerClasses, int mode, Collection refs) { if (innerClasses == null) { return; // no attribute; nothing to do diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/PackageReader.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/PackageReader.java index 018c33f6fd0..1a60f9e1047 100644 --- a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/PackageReader.java +++ b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/PackageReader.java @@ -218,7 +218,7 @@ class PackageReader extends BandStructure { return res; } - final static int MAGIC_BYTES = 4; + static final int MAGIC_BYTES = 4; void readArchiveMagic() throws IOException { // Read a minimum of bytes in the first gulp. diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Utils.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Utils.java index ebe0960dba0..0c9109542bd 100644 --- a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Utils.java +++ b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Utils.java @@ -265,7 +265,7 @@ class Utils { } } // Wrapper to prevent closing of client-supplied stream. - static private + private static class NonCloser extends FilterOutputStream { NonCloser(OutputStream out) { super(out); } public void close() throws IOException { flush(); } diff --git a/jdk/src/java.base/share/classes/com/sun/net/ssl/HttpsURLConnection.java b/jdk/src/java.base/share/classes/com/sun/net/ssl/HttpsURLConnection.java index 6ce3b16ff0b..0ddaa794efc 100644 --- a/jdk/src/java.base/share/classes/com/sun/net/ssl/HttpsURLConnection.java +++ b/jdk/src/java.base/share/classes/com/sun/net/ssl/HttpsURLConnection.java @@ -46,7 +46,7 @@ import javax.net.ssl.SSLPeerUnverifiedException; * replaced by {@link javax.net.ssl.HttpsURLConnection}. */ @Deprecated -abstract public +public abstract class HttpsURLConnection extends HttpURLConnection { /* diff --git a/jdk/src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactory.java b/jdk/src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactory.java index 6ddf6bf6917..620de110be2 100644 --- a/jdk/src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactory.java +++ b/jdk/src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactory.java @@ -61,7 +61,7 @@ public class KeyManagerFactory { * * @see java.security.Security security properties */ - public final static String getDefaultAlgorithm() { + public static final String getDefaultAlgorithm() { String type; type = AccessController.doPrivileged(new PrivilegedAction<>() { public String run() { diff --git a/jdk/src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactory.java b/jdk/src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactory.java index 8b0701c0a29..14c54d29a8b 100644 --- a/jdk/src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactory.java +++ b/jdk/src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactory.java @@ -61,7 +61,7 @@ public class TrustManagerFactory { * * @see java.security.Security security properties */ - public final static String getDefaultAlgorithm() { + public static final String getDefaultAlgorithm() { String type; type = AccessController.doPrivileged(new PrivilegedAction<>() { public String run() { diff --git a/jdk/src/java.base/share/classes/com/sun/security/cert/internal/x509/X509V1CertImpl.java b/jdk/src/java.base/share/classes/com/sun/security/cert/internal/x509/X509V1CertImpl.java index b9ffb200a81..0fb1a6c1e88 100644 --- a/jdk/src/java.base/share/classes/com/sun/security/cert/internal/x509/X509V1CertImpl.java +++ b/jdk/src/java.base/share/classes/com/sun/security/cert/internal/x509/X509V1CertImpl.java @@ -56,7 +56,7 @@ public class X509V1CertImpl extends X509Certificate implements Serializable { static final long serialVersionUID = -2048442350420423405L; private java.security.cert.X509Certificate wrappedCert; - synchronized private static java.security.cert.CertificateFactory + private static synchronized java.security.cert.CertificateFactory getFactory() throws java.security.cert.CertificateException { diff --git a/jdk/src/java.base/share/classes/com/sun/security/ntlm/Client.java b/jdk/src/java.base/share/classes/com/sun/security/ntlm/Client.java index 9aacd433793..fe33ee89bde 100644 --- a/jdk/src/java.base/share/classes/com/sun/security/ntlm/Client.java +++ b/jdk/src/java.base/share/classes/com/sun/security/ntlm/Client.java @@ -43,8 +43,8 @@ import java.util.Locale; * */ public final class Client extends NTLM { - final private String hostname; - final private String username; + private final String hostname; + private final String username; private String domain; private byte[] pw1, pw2; diff --git a/jdk/src/java.base/share/classes/com/sun/security/ntlm/NTLMException.java b/jdk/src/java.base/share/classes/com/sun/security/ntlm/NTLMException.java index 7275b4ae6d9..736db459cf3 100644 --- a/jdk/src/java.base/share/classes/com/sun/security/ntlm/NTLMException.java +++ b/jdk/src/java.base/share/classes/com/sun/security/ntlm/NTLMException.java @@ -36,13 +36,13 @@ public final class NTLMException extends GeneralSecurityException { /** * If the incoming packet is invalid. */ - public final static int PACKET_READ_ERROR = 1; + public static final int PACKET_READ_ERROR = 1; /** * If the client cannot get a domain value from the server and the * caller has not provided one. */ - public final static int NO_DOMAIN_INFO = 2; + public static final int NO_DOMAIN_INFO = 2; /** * If the domain provided by the client does not match the one received @@ -53,22 +53,22 @@ public final class NTLMException extends GeneralSecurityException { /** * If the client name is not found on server's user database. */ - public final static int USER_UNKNOWN = 3; + public static final int USER_UNKNOWN = 3; /** * If authentication fails. */ - public final static int AUTH_FAILED = 4; + public static final int AUTH_FAILED = 4; /** * If an illegal version string is provided. */ - public final static int BAD_VERSION = 5; + public static final int BAD_VERSION = 5; /** * Protocol errors. */ - public final static int PROTOCOL = 6; + public static final int PROTOCOL = 6; private int errorCode; diff --git a/jdk/src/java.base/share/classes/com/sun/security/ntlm/Server.java b/jdk/src/java.base/share/classes/com/sun/security/ntlm/Server.java index adec1a3fa29..2e97579e669 100644 --- a/jdk/src/java.base/share/classes/com/sun/security/ntlm/Server.java +++ b/jdk/src/java.base/share/classes/com/sun/security/ntlm/Server.java @@ -49,8 +49,8 @@ import java.util.Locale; * */ public abstract class Server extends NTLM { - final private String domain; - final private boolean allVersion; + private final String domain; + private final boolean allVersion; /** * Creates a Server instance. * @param version the NTLM version to use, which can be: diff --git a/jdk/src/java.base/share/classes/java/io/Console.java b/jdk/src/java.base/share/classes/java/io/Console.java index df47870e14d..abf8559dd5c 100644 --- a/jdk/src/java.base/share/classes/java/io/Console.java +++ b/jdk/src/java.base/share/classes/java/io/Console.java @@ -554,7 +554,7 @@ public final class Console implements Flushable }); } private static Console cons; - private native static boolean istty(); + private static native boolean istty(); private Console() { readLock = new Object(); writeLock = new Object(); diff --git a/jdk/src/java.base/share/classes/java/io/DataInputStream.java b/jdk/src/java.base/share/classes/java/io/DataInputStream.java index 0ef3c356e2b..6ce6b233ee6 100644 --- a/jdk/src/java.base/share/classes/java/io/DataInputStream.java +++ b/jdk/src/java.base/share/classes/java/io/DataInputStream.java @@ -585,7 +585,7 @@ loop: while (true) { * valid modified UTF-8 encoding of a Unicode string. * @see java.io.DataInputStream#readUnsignedShort() */ - public final static String readUTF(DataInput in) throws IOException { + public static final String readUTF(DataInput in) throws IOException { int utflen = in.readUnsignedShort(); byte[] bytearr = null; char[] chararr = null; diff --git a/jdk/src/java.base/share/classes/java/io/File.java b/jdk/src/java.base/share/classes/java/io/File.java index e2ec80a92d1..63e6d571ed2 100644 --- a/jdk/src/java.base/share/classes/java/io/File.java +++ b/jdk/src/java.base/share/classes/java/io/File.java @@ -2204,7 +2204,7 @@ public class File // -- Integration with java.nio.file -- - private volatile transient Path filePath; + private transient volatile Path filePath; /** * Returns a {@link Path java.nio.file.Path} object constructed from the diff --git a/jdk/src/java.base/share/classes/java/io/FilePermission.java b/jdk/src/java.base/share/classes/java/io/FilePermission.java index e3dc11f4eb5..3e948f58aae 100644 --- a/jdk/src/java.base/share/classes/java/io/FilePermission.java +++ b/jdk/src/java.base/share/classes/java/io/FilePermission.java @@ -101,32 +101,32 @@ public final class FilePermission extends Permission implements Serializable { /** * Execute action. */ - private final static int EXECUTE = 0x1; + private static final int EXECUTE = 0x1; /** * Write action. */ - private final static int WRITE = 0x2; + private static final int WRITE = 0x2; /** * Read action. */ - private final static int READ = 0x4; + private static final int READ = 0x4; /** * Delete action. */ - private final static int DELETE = 0x8; + private static final int DELETE = 0x8; /** * Read link action. */ - private final static int READLINK = 0x10; + private static final int READLINK = 0x10; /** * All actions (read,write,execute,delete,readlink) */ - private final static int ALL = READ|WRITE|EXECUTE|DELETE|READLINK; + private static final int ALL = READ|WRITE|EXECUTE|DELETE|READLINK; /** * No actions. */ - private final static int NONE = 0x0; + private static final int NONE = 0x0; // the actions mask private transient int mask; diff --git a/jdk/src/java.base/share/classes/java/io/ObjectInputStream.java b/jdk/src/java.base/share/classes/java/io/ObjectInputStream.java index 389a70be1d3..133fc545def 100644 --- a/jdk/src/java.base/share/classes/java/io/ObjectInputStream.java +++ b/jdk/src/java.base/share/classes/java/io/ObjectInputStream.java @@ -1079,7 +1079,7 @@ public class ObjectInputStream /** * Provide access to the persistent fields read from the input stream. */ - public static abstract class GetField { + public abstract static class GetField { /** * Get the ObjectStreamClass that describes the fields in the stream. diff --git a/jdk/src/java.base/share/classes/java/io/ObjectOutputStream.java b/jdk/src/java.base/share/classes/java/io/ObjectOutputStream.java index 861b201aae8..2fc905e2dd3 100644 --- a/jdk/src/java.base/share/classes/java/io/ObjectOutputStream.java +++ b/jdk/src/java.base/share/classes/java/io/ObjectOutputStream.java @@ -875,7 +875,7 @@ public class ObjectOutputStream * * @since 1.2 */ - public static abstract class PutField { + public abstract static class PutField { /** * Put the value of the named boolean field into the persistent field. diff --git a/jdk/src/java.base/share/classes/java/io/ObjectStreamClass.java b/jdk/src/java.base/share/classes/java/io/ObjectStreamClass.java index cd5cda45170..5c3c707768b 100644 --- a/jdk/src/java.base/share/classes/java/io/ObjectStreamClass.java +++ b/jdk/src/java.base/share/classes/java/io/ObjectStreamClass.java @@ -1839,7 +1839,7 @@ public class ObjectStreamClass implements Serializable { * Returns true if the given class defines a static initializer method, * false otherwise. */ - private native static boolean hasStaticInitializer(Class cl); + private static native boolean hasStaticInitializer(Class cl); /** * Class for computing and caching field/constructor/method signatures diff --git a/jdk/src/java.base/share/classes/java/io/ObjectStreamConstants.java b/jdk/src/java.base/share/classes/java/io/ObjectStreamConstants.java index fd7e7666e74..7c6f4d84c96 100644 --- a/jdk/src/java.base/share/classes/java/io/ObjectStreamConstants.java +++ b/jdk/src/java.base/share/classes/java/io/ObjectStreamConstants.java @@ -36,12 +36,12 @@ public interface ObjectStreamConstants { /** * Magic number that is written to the stream header. */ - final static short STREAM_MAGIC = (short)0xaced; + static final short STREAM_MAGIC = (short)0xaced; /** * Version number that is written to the stream header. */ - final static short STREAM_VERSION = 5; + static final short STREAM_VERSION = 5; /* Each item in the stream is preceded by a tag */ @@ -49,95 +49,95 @@ public interface ObjectStreamConstants { /** * First tag value. */ - final static byte TC_BASE = 0x70; + static final byte TC_BASE = 0x70; /** * Null object reference. */ - final static byte TC_NULL = (byte)0x70; + static final byte TC_NULL = (byte)0x70; /** * Reference to an object already written into the stream. */ - final static byte TC_REFERENCE = (byte)0x71; + static final byte TC_REFERENCE = (byte)0x71; /** * new Class Descriptor. */ - final static byte TC_CLASSDESC = (byte)0x72; + static final byte TC_CLASSDESC = (byte)0x72; /** * new Object. */ - final static byte TC_OBJECT = (byte)0x73; + static final byte TC_OBJECT = (byte)0x73; /** * new String. */ - final static byte TC_STRING = (byte)0x74; + static final byte TC_STRING = (byte)0x74; /** * new Array. */ - final static byte TC_ARRAY = (byte)0x75; + static final byte TC_ARRAY = (byte)0x75; /** * Reference to Class. */ - final static byte TC_CLASS = (byte)0x76; + static final byte TC_CLASS = (byte)0x76; /** * Block of optional data. Byte following tag indicates number * of bytes in this block data. */ - final static byte TC_BLOCKDATA = (byte)0x77; + static final byte TC_BLOCKDATA = (byte)0x77; /** * End of optional block data blocks for an object. */ - final static byte TC_ENDBLOCKDATA = (byte)0x78; + static final byte TC_ENDBLOCKDATA = (byte)0x78; /** * Reset stream context. All handles written into stream are reset. */ - final static byte TC_RESET = (byte)0x79; + static final byte TC_RESET = (byte)0x79; /** * long Block data. The long following the tag indicates the * number of bytes in this block data. */ - final static byte TC_BLOCKDATALONG= (byte)0x7A; + static final byte TC_BLOCKDATALONG= (byte)0x7A; /** * Exception during write. */ - final static byte TC_EXCEPTION = (byte)0x7B; + static final byte TC_EXCEPTION = (byte)0x7B; /** * Long string. */ - final static byte TC_LONGSTRING = (byte)0x7C; + static final byte TC_LONGSTRING = (byte)0x7C; /** * new Proxy Class Descriptor. */ - final static byte TC_PROXYCLASSDESC = (byte)0x7D; + static final byte TC_PROXYCLASSDESC = (byte)0x7D; /** * new Enum constant. * @since 1.5 */ - final static byte TC_ENUM = (byte)0x7E; + static final byte TC_ENUM = (byte)0x7E; /** * Last tag value. */ - final static byte TC_MAX = (byte)0x7E; + static final byte TC_MAX = (byte)0x7E; /** * First wire handle to be assigned. */ - final static int baseWireHandle = 0x7e0000; + static final int baseWireHandle = 0x7e0000; /******************************************************/ @@ -147,7 +147,7 @@ public interface ObjectStreamConstants { * Bit mask for ObjectStreamClass flag. Indicates a Serializable class * defines its own writeObject method. */ - final static byte SC_WRITE_METHOD = 0x01; + static final byte SC_WRITE_METHOD = 0x01; /** * Bit mask for ObjectStreamClass flag. Indicates Externalizable data @@ -157,23 +157,23 @@ public interface ObjectStreamConstants { * @see #PROTOCOL_VERSION_2 * @since 1.2 */ - final static byte SC_BLOCK_DATA = 0x08; + static final byte SC_BLOCK_DATA = 0x08; /** * Bit mask for ObjectStreamClass flag. Indicates class is Serializable. */ - final static byte SC_SERIALIZABLE = 0x02; + static final byte SC_SERIALIZABLE = 0x02; /** * Bit mask for ObjectStreamClass flag. Indicates class is Externalizable. */ - final static byte SC_EXTERNALIZABLE = 0x04; + static final byte SC_EXTERNALIZABLE = 0x04; /** * Bit mask for ObjectStreamClass flag. Indicates class is an enum type. * @since 1.5 */ - final static byte SC_ENUM = 0x10; + static final byte SC_ENUM = 0x10; /* *******************************************************************/ @@ -187,7 +187,7 @@ public interface ObjectStreamConstants { * @see java.io.ObjectInputStream#enableResolveObject(boolean) * @since 1.2 */ - final static SerializablePermission SUBSTITUTION_PERMISSION = + static final SerializablePermission SUBSTITUTION_PERMISSION = new SerializablePermission("enableSubstitution"); /** @@ -197,7 +197,7 @@ public interface ObjectStreamConstants { * @see java.io.ObjectInputStream#readObjectOverride() * @since 1.2 */ - final static SerializablePermission SUBCLASS_IMPLEMENTATION_PERMISSION = + static final SerializablePermission SUBCLASS_IMPLEMENTATION_PERMISSION = new SerializablePermission("enableSubclassImplementation"); /** * A Stream Protocol Version.

    @@ -210,7 +210,7 @@ public interface ObjectStreamConstants { * @see java.io.ObjectOutputStream#useProtocolVersion(int) * @since 1.2 */ - public final static int PROTOCOL_VERSION_1 = 1; + public static final int PROTOCOL_VERSION_1 = 1; /** @@ -231,5 +231,5 @@ public interface ObjectStreamConstants { * @see #SC_BLOCK_DATA * @since 1.2 */ - public final static int PROTOCOL_VERSION_2 = 2; + public static final int PROTOCOL_VERSION_2 = 2; } diff --git a/jdk/src/java.base/share/classes/java/io/Reader.java b/jdk/src/java.base/share/classes/java/io/Reader.java index 0045f00b6fd..13e90d76ea6 100644 --- a/jdk/src/java.base/share/classes/java/io/Reader.java +++ b/jdk/src/java.base/share/classes/java/io/Reader.java @@ -157,7 +157,7 @@ public abstract class Reader implements Readable, Closeable { * If {@code off} is negative, or {@code len} is negative, * or {@code len} is greater than {@code cbuf.length - off} */ - abstract public int read(char cbuf[], int off, int len) throws IOException; + public abstract int read(char cbuf[], int off, int len) throws IOException; /** Maximum skip-buffer size */ private static final int maxSkipBufferSize = 8192; @@ -260,6 +260,6 @@ public abstract class Reader implements Readable, Closeable { * * @exception IOException If an I/O error occurs */ - abstract public void close() throws IOException; + public abstract void close() throws IOException; } diff --git a/jdk/src/java.base/share/classes/java/io/Writer.java b/jdk/src/java.base/share/classes/java/io/Writer.java index 85d9290c2e1..5ad5e554fb3 100644 --- a/jdk/src/java.base/share/classes/java/io/Writer.java +++ b/jdk/src/java.base/share/classes/java/io/Writer.java @@ -142,7 +142,7 @@ public abstract class Writer implements Appendable, Closeable, Flushable { * @throws IOException * If an I/O error occurs */ - abstract public void write(char cbuf[], int off, int len) throws IOException; + public abstract void write(char cbuf[], int off, int len) throws IOException; /** * Writes a string. @@ -312,7 +312,7 @@ public abstract class Writer implements Appendable, Closeable, Flushable { * @throws IOException * If an I/O error occurs */ - abstract public void flush() throws IOException; + public abstract void flush() throws IOException; /** * Closes the stream, flushing it first. Once the stream has been closed, @@ -322,6 +322,6 @@ public abstract class Writer implements Appendable, Closeable, Flushable { * @throws IOException * If an I/O error occurs */ - abstract public void close() throws IOException; + public abstract void close() throws IOException; } diff --git a/jdk/src/java.base/share/classes/java/lang/Class.java b/jdk/src/java.base/share/classes/java/lang/Class.java index 2e8a469e9ba..fc1e6b9f0f3 100644 --- a/jdk/src/java.base/share/classes/java/lang/Class.java +++ b/jdk/src/java.base/share/classes/java/lang/Class.java @@ -469,8 +469,8 @@ public final class Class implements java.io.Serializable, return null; } } - private volatile transient Constructor cachedConstructor; - private volatile transient Class newInstanceCallerCache; + private transient volatile Constructor cachedConstructor; + private transient volatile Class newInstanceCallerCache; /** @@ -1123,7 +1123,7 @@ public final class Class implements java.io.Serializable, } } - private final static class EnclosingMethodInfo { + private static final class EnclosingMethodInfo { private Class enclosingClass; private String name; private String descriptor; @@ -2514,11 +2514,11 @@ public final class Class implements java.io.Serializable, } } - private volatile transient SoftReference> reflectionData; + private transient volatile SoftReference> reflectionData; // Incremented by the VM on each call to JVM TI RedefineClasses() // that redefines this class or a superclass. - private volatile transient int classRedefinedCount = 0; + private transient volatile int classRedefinedCount = 0; // Lazily create and cache ReflectionData private ReflectionData reflectionData() { @@ -2561,7 +2561,7 @@ public final class Class implements java.io.Serializable, private native String getGenericSignature0(); // Generic info repository; lazily initialized - private volatile transient ClassRepository genericInfo; + private transient volatile ClassRepository genericInfo; // accessor for factory private GenericsFactory getFactory() { @@ -3353,7 +3353,7 @@ public final class Class implements java.io.Serializable, } return enumConstants; } - private volatile transient T[] enumConstants = null; + private transient volatile T[] enumConstants = null; /** * Returns a map from simple name to enum constant. This package-private @@ -3375,7 +3375,7 @@ public final class Class implements java.io.Serializable, } return enumConstantDirectory; } - private volatile transient Map enumConstantDirectory = null; + private transient volatile Map enumConstantDirectory = null; /** * Casts an object to the class or interface represented @@ -3523,7 +3523,7 @@ public final class Class implements java.io.Serializable, // Annotations cache @SuppressWarnings("UnusedDeclaration") - private volatile transient AnnotationData annotationData; + private transient volatile AnnotationData annotationData; private AnnotationData annotationData() { while (true) { // retry loop @@ -3578,7 +3578,7 @@ public final class Class implements java.io.Serializable, // Annotation types cache their internal (AnnotationType) form @SuppressWarnings("UnusedDeclaration") - private volatile transient AnnotationType annotationType; + private transient volatile AnnotationType annotationType; boolean casAnnotationType(AnnotationType oldType, AnnotationType newType) { return Atomic.casAnnotationType(this, oldType, newType); diff --git a/jdk/src/java.base/share/classes/java/lang/ClassLoader.java b/jdk/src/java.base/share/classes/java/lang/ClassLoader.java index 2ba6f5d4f0d..a3009062c2d 100644 --- a/jdk/src/java.base/share/classes/java/lang/ClassLoader.java +++ b/jdk/src/java.base/share/classes/java/lang/ClassLoader.java @@ -1030,7 +1030,7 @@ public abstract class ClassLoader { return findLoadedClass0(name); } - private native final Class findLoadedClass0(String name); + private final native Class findLoadedClass0(String name); /** * Sets the signers of a class. This should be invoked after defining a diff --git a/jdk/src/java.base/share/classes/java/lang/ConditionalSpecialCasing.java b/jdk/src/java.base/share/classes/java/lang/ConditionalSpecialCasing.java index 10986ea82bc..6266733b5a3 100644 --- a/jdk/src/java.base/share/classes/java/lang/ConditionalSpecialCasing.java +++ b/jdk/src/java.base/share/classes/java/lang/ConditionalSpecialCasing.java @@ -47,14 +47,14 @@ import sun.text.Normalizer; final class ConditionalSpecialCasing { // context conditions. - final static int FINAL_CASED = 1; - final static int AFTER_SOFT_DOTTED = 2; - final static int MORE_ABOVE = 3; - final static int AFTER_I = 4; - final static int NOT_BEFORE_DOT = 5; + static final int FINAL_CASED = 1; + static final int AFTER_SOFT_DOTTED = 2; + static final int MORE_ABOVE = 3; + static final int AFTER_I = 4; + static final int NOT_BEFORE_DOT = 5; // combining class definitions - final static int COMBINING_CLASS_ABOVE = 230; + static final int COMBINING_CLASS_ABOVE = 230; // Special case mapping entries static Entry[] entry = { diff --git a/jdk/src/java.base/share/classes/java/lang/Integer.java b/jdk/src/java.base/share/classes/java/lang/Integer.java index b3cfe9315ba..ed401dba13f 100644 --- a/jdk/src/java.base/share/classes/java/lang/Integer.java +++ b/jdk/src/java.base/share/classes/java/lang/Integer.java @@ -76,7 +76,7 @@ public final class Integer extends Number implements Comparable { /** * All possible chars for representing a number as a String */ - final static char[] digits = { + static final char[] digits = { '0' , '1' , '2' , '3' , '4' , '5' , '6' , '7' , '8' , '9' , 'a' , 'b' , 'c' , 'd' , 'e' , 'f' , 'g' , 'h' , @@ -344,7 +344,7 @@ public final class Integer extends Number implements Comparable { } while (charPos > offset); } - final static char [] DigitTens = { + static final char [] DigitTens = { '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '1', '1', '1', '1', '1', '1', '1', '1', '1', '2', '2', '2', '2', '2', '2', '2', '2', '2', '2', @@ -357,7 +357,7 @@ public final class Integer extends Number implements Comparable { '9', '9', '9', '9', '9', '9', '9', '9', '9', '9', } ; - final static char [] DigitOnes = { + static final char [] DigitOnes = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', @@ -467,7 +467,7 @@ public final class Integer extends Number implements Comparable { } } - final static int [] sizeTable = { 9, 99, 999, 9999, 99999, 999999, 9999999, + static final int [] sizeTable = { 9, 99, 999, 9999, 99999, 999999, 9999999, 99999999, 999999999, Integer.MAX_VALUE }; // Requires positive x diff --git a/jdk/src/java.base/share/classes/java/lang/Package.java b/jdk/src/java.base/share/classes/java/lang/Package.java index 9cd63274b65..2ab9fe3c4bf 100644 --- a/jdk/src/java.base/share/classes/java/lang/Package.java +++ b/jdk/src/java.base/share/classes/java/lang/Package.java @@ -656,6 +656,6 @@ public class Package implements java.lang.reflect.AnnotatedElement { private final String implVersion; private final String implVendor; private final URL sealBase; - private transient final ClassLoader loader; + private final transient ClassLoader loader; private transient Class packageInfo; } diff --git a/jdk/src/java.base/share/classes/java/lang/ProcessBuilder.java b/jdk/src/java.base/share/classes/java/lang/ProcessBuilder.java index f49b6a9cb9b..eac4aa2be65 100644 --- a/jdk/src/java.base/share/classes/java/lang/ProcessBuilder.java +++ b/jdk/src/java.base/share/classes/java/lang/ProcessBuilder.java @@ -458,7 +458,7 @@ public final class ProcessBuilder * * @since 1.7 */ - public static abstract class Redirect { + public abstract static class Redirect { /** * The type of a {@link Redirect}. */ diff --git a/jdk/src/java.base/share/classes/java/lang/StringCoding.java b/jdk/src/java.base/share/classes/java/lang/StringCoding.java index a4c71b4cf21..d770156da2c 100644 --- a/jdk/src/java.base/share/classes/java/lang/StringCoding.java +++ b/jdk/src/java.base/share/classes/java/lang/StringCoding.java @@ -52,9 +52,9 @@ class StringCoding { private StringCoding() { } /** The cached coders for each thread */ - private final static ThreadLocal> decoder = + private static final ThreadLocal> decoder = new ThreadLocal<>(); - private final static ThreadLocal> encoder = + private static final ThreadLocal> encoder = new ThreadLocal<>(); private static boolean warnUnsupportedCharset = true; diff --git a/jdk/src/java.base/share/classes/java/lang/System.java b/jdk/src/java.base/share/classes/java/lang/System.java index 87b6816940f..0f7e18df1ee 100644 --- a/jdk/src/java.base/share/classes/java/lang/System.java +++ b/jdk/src/java.base/share/classes/java/lang/System.java @@ -81,7 +81,7 @@ public final class System { * corresponds to keyboard input or another input source specified by * the host environment or user. */ - public final static InputStream in = null; + public static final InputStream in = null; /** * The "standard" output stream. This stream is already @@ -108,7 +108,7 @@ public final class System { * @see java.io.PrintStream#println(java.lang.Object) * @see java.io.PrintStream#println(java.lang.String) */ - public final static PrintStream out = null; + public static final PrintStream out = null; /** * The "standard" error output stream. This stream is already @@ -122,7 +122,7 @@ public final class System { * variable out, has been redirected to a file or other * destination that is typically not continuously monitored. */ - public final static PrintStream err = null; + public static final PrintStream err = null; /* The security manager for the system. */ diff --git a/jdk/src/java.base/share/classes/java/lang/Thread.java b/jdk/src/java.base/share/classes/java/lang/Thread.java index 3fca1bd8091..a3ca2fd52fc 100644 --- a/jdk/src/java.base/share/classes/java/lang/Thread.java +++ b/jdk/src/java.base/share/classes/java/lang/Thread.java @@ -244,17 +244,17 @@ class Thread implements Runnable { /** * The minimum priority that a thread can have. */ - public final static int MIN_PRIORITY = 1; + public static final int MIN_PRIORITY = 1; /** * The default priority that is assigned to a thread. */ - public final static int NORM_PRIORITY = 5; + public static final int NORM_PRIORITY = 5; /** * The maximum priority that a thread can have. */ - public final static int MAX_PRIORITY = 10; + public static final int MAX_PRIORITY = 10; /** * Returns a reference to the currently executing thread object. @@ -1688,8 +1688,8 @@ class Thread implements Runnable { return result.booleanValue(); } - private native static StackTraceElement[][] dumpThreads(Thread[] threads); - private native static Thread[] getThreads(); + private static native StackTraceElement[][] dumpThreads(Thread[] threads); + private static native Thread[] getThreads(); /** * Returns the identifier of this Thread. The thread ID is a positive diff --git a/jdk/src/java.base/share/classes/java/lang/VirtualMachineError.java b/jdk/src/java.base/share/classes/java/lang/VirtualMachineError.java index a8b5807c3c7..04e21fa1dc0 100644 --- a/jdk/src/java.base/share/classes/java/lang/VirtualMachineError.java +++ b/jdk/src/java.base/share/classes/java/lang/VirtualMachineError.java @@ -33,7 +33,7 @@ package java.lang; * @author Frank Yellin * @since 1.0 */ -abstract public class VirtualMachineError extends Error { +public abstract class VirtualMachineError extends Error { private static final long serialVersionUID = 4161983926571568670L; /** diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/DelegatingMethodHandle.java b/jdk/src/java.base/share/classes/java/lang/invoke/DelegatingMethodHandle.java index 5c874f49741..2e4baec0857 100644 --- a/jdk/src/java.base/share/classes/java/lang/invoke/DelegatingMethodHandle.java +++ b/jdk/src/java.base/share/classes/java/lang/invoke/DelegatingMethodHandle.java @@ -49,7 +49,7 @@ abstract class DelegatingMethodHandle extends MethodHandle { } /** Define this to extract the delegated target which supplies the invocation behavior. */ - abstract protected MethodHandle getTarget(); + protected abstract MethodHandle getTarget(); @Override abstract MethodHandle asTypeUncached(MethodType newType); diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java b/jdk/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java index f02ed74aae5..c70b9db3097 100644 --- a/jdk/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java +++ b/jdk/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java @@ -445,9 +445,9 @@ class DirectMethodHandle extends MethodHandle { /** This subclass handles static field references. */ static class StaticAccessor extends DirectMethodHandle { - final private Class fieldType; - final private Object staticBase; - final private long staticOffset; + private final Class fieldType; + private final Object staticBase; + private final long staticOffset; private StaticAccessor(MethodType mtype, LambdaForm form, MemberName member, Object staticBase, long staticOffset) { diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java b/jdk/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java index 2c94e081568..bcfa877fbf1 100644 --- a/jdk/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java +++ b/jdk/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java @@ -140,9 +140,9 @@ class InvokerBytecodeGenerator { /** instance counters for dumped classes */ - private final static HashMap DUMP_CLASS_FILES_COUNTERS; + private static final HashMap DUMP_CLASS_FILES_COUNTERS; /** debugging flag for saving generated class files */ - private final static File DUMP_CLASS_FILES_DIR; + private static final File DUMP_CLASS_FILES_DIR; static { if (DUMP_CLASS_FILES) { @@ -771,7 +771,7 @@ class InvokerBytecodeGenerator { mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, MH, "invokeBasic", type.basicType().toMethodDescriptorString(), false); } - static private Class[] STATICALLY_INVOCABLE_PACKAGES = { + private static Class[] STATICALLY_INVOCABLE_PACKAGES = { // Sample classes from each package we are willing to bind to statically: java.lang.Object.class, java.util.Arrays.class, diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java index b53b44b99b1..4b98a2cf1a1 100644 --- a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java +++ b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java @@ -440,7 +440,7 @@ class MethodHandleNatives { * Use best possible cause for err.initCause(), substituting the * cause for err itself if the cause has the same (or better) type. */ - static private Error initCauseFrom(Error err, Exception ex) { + private static Error initCauseFrom(Error err, Exception ex) { Throwable th = ex.getCause(); if (err.getClass().isInstance(th)) return (Error) th; diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java index 41a0054db7a..13520e45f1c 100644 --- a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java +++ b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java @@ -147,7 +147,7 @@ public class MethodHandles { return lookup.revealDirect(target).reflectAs(expected, lookup); } // Copied from AccessibleObject, as used by Method.setAccessible, etc.: - static final private java.security.Permission ACCESS_PERMISSION = + private static final java.security.Permission ACCESS_PERMISSION = new ReflectPermission("suppressAccessChecks"); /** @@ -1884,7 +1884,7 @@ return invoker; * or if the resulting method handle's type would have * too many parameters */ - static public + public static MethodHandle spreadInvoker(MethodType type, int leadingArgCount) { if (leadingArgCount < 0 || leadingArgCount > type.parameterCount()) throw newIllegalArgumentException("bad argument count", leadingArgCount); @@ -1927,7 +1927,7 @@ return invoker; * @throws IllegalArgumentException if the resulting method handle's type would have * too many parameters */ - static public + public static MethodHandle exactInvoker(MethodType type) { return type.invokers().exactInvoker(); } @@ -1966,7 +1966,7 @@ return invoker; * @throws IllegalArgumentException if the resulting method handle's type would have * too many parameters */ - static public + public static MethodHandle invoker(MethodType type) { return type.invokers().genericInvoker(); } @@ -2322,7 +2322,7 @@ assert((int)twice.invokeExact(21) == 42); return MethodHandleImpl.makeIntrinsic(mtype, lform, Intrinsic.ZERO); } - synchronized private static MethodHandle setCachedMethodHandle(MethodHandle[] cache, int pos, MethodHandle value) { + private static synchronized MethodHandle setCachedMethodHandle(MethodHandle[] cache, int pos, MethodHandle value) { // Simulate a CAS, to avoid racy duplication of results. MethodHandle prev = cache[pos]; if (prev != null) return prev; diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/MethodTypeForm.java b/jdk/src/java.base/share/classes/java/lang/invoke/MethodTypeForm.java index bcf16dba9db..0c4cf9bd4e1 100644 --- a/jdk/src/java.base/share/classes/java/lang/invoke/MethodTypeForm.java +++ b/jdk/src/java.base/share/classes/java/lang/invoke/MethodTypeForm.java @@ -111,7 +111,7 @@ final class MethodTypeForm { return (entry != null) ? entry.get() : null; } - synchronized public MethodHandle setCachedMethodHandle(int which, MethodHandle mh) { + public synchronized MethodHandle setCachedMethodHandle(int which, MethodHandle mh) { // Simulate a CAS, to avoid racy duplication of results. SoftReference entry = methodHandles[which]; if (entry != null) { @@ -130,7 +130,7 @@ final class MethodTypeForm { return (entry != null) ? entry.get() : null; } - synchronized public LambdaForm setCachedLambdaForm(int which, LambdaForm form) { + public synchronized LambdaForm setCachedLambdaForm(int which, LambdaForm form) { // Simulate a CAS, to avoid racy duplication of results. SoftReference entry = lambdaForms[which]; if (entry != null) { diff --git a/jdk/src/java.base/share/classes/java/lang/ref/Reference.java b/jdk/src/java.base/share/classes/java/lang/ref/Reference.java index 854cdd6cb9d..c2dd47c78e5 100644 --- a/jdk/src/java.base/share/classes/java/lang/ref/Reference.java +++ b/jdk/src/java.base/share/classes/java/lang/ref/Reference.java @@ -107,7 +107,7 @@ public abstract class Reference { * pending: next element in the pending list (or null if last) * otherwise: NULL */ - transient private Reference discovered; /* used by VM */ + private transient Reference discovered; /* used by VM */ /* Object used to synchronize with the garbage collector. The collector @@ -115,7 +115,7 @@ public abstract class Reference { * therefore critical that any code holding this lock complete as quickly * as possible, allocate no new objects, and avoid calling user code. */ - static private class Lock { } + private static class Lock { } private static Lock lock = new Lock(); diff --git a/jdk/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java b/jdk/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java index bf68b61b36f..d23491906c1 100644 --- a/jdk/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java +++ b/jdk/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java @@ -51,7 +51,7 @@ public class ReferenceQueue { static ReferenceQueue NULL = new Null<>(); static ReferenceQueue ENQUEUED = new Null<>(); - static private class Lock { }; + private static class Lock { }; private Lock lock = new Lock(); private volatile Reference head = null; private long queueLength = 0; diff --git a/jdk/src/java.base/share/classes/java/lang/ref/SoftReference.java b/jdk/src/java.base/share/classes/java/lang/ref/SoftReference.java index 5da95e789e8..8ce74a67d0a 100644 --- a/jdk/src/java.base/share/classes/java/lang/ref/SoftReference.java +++ b/jdk/src/java.base/share/classes/java/lang/ref/SoftReference.java @@ -66,7 +66,7 @@ public class SoftReference extends Reference { /** * Timestamp clock, updated by the garbage collector */ - static private long clock; + private static long clock; /** * Timestamp updated by each invocation of the get method. The VM may use diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java b/jdk/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java index 65755f09826..506e27d760e 100644 --- a/jdk/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java +++ b/jdk/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java @@ -61,7 +61,7 @@ public class AccessibleObject implements AnnotatedElement { * has sufficient privilege to defeat Java language access * control checks. */ - static final private java.security.Permission ACCESS_PERMISSION = + private static final java.security.Permission ACCESS_PERMISSION = new ReflectPermission("suppressAccessChecks"); /** diff --git a/jdk/src/java.base/share/classes/java/math/BigDecimal.java b/jdk/src/java.base/share/classes/java/math/BigDecimal.java index bb04b589dcb..7214950c489 100644 --- a/jdk/src/java.base/share/classes/java/math/BigDecimal.java +++ b/jdk/src/java.base/share/classes/java/math/BigDecimal.java @@ -2268,14 +2268,14 @@ public class BigDecimal extends Number implements Comparable { * digit prior to a nonzero discarded fraction. Note that this rounding * mode never decreases the magnitude of the calculated value. */ - public final static int ROUND_UP = 0; + public static final int ROUND_UP = 0; /** * Rounding mode to round towards zero. Never increments the digit * prior to a discarded fraction (i.e., truncates). Note that this * rounding mode never increases the magnitude of the calculated value. */ - public final static int ROUND_DOWN = 1; + public static final int ROUND_DOWN = 1; /** * Rounding mode to round towards positive infinity. If the @@ -2284,7 +2284,7 @@ public class BigDecimal extends Number implements Comparable { * {@code ROUND_DOWN}. Note that this rounding mode never * decreases the calculated value. */ - public final static int ROUND_CEILING = 2; + public static final int ROUND_CEILING = 2; /** * Rounding mode to round towards negative infinity. If the @@ -2293,7 +2293,7 @@ public class BigDecimal extends Number implements Comparable { * {@code ROUND_UP}. Note that this rounding mode never * increases the calculated value. */ - public final static int ROUND_FLOOR = 3; + public static final int ROUND_FLOOR = 3; /** * Rounding mode to round towards {@literal "nearest neighbor"} @@ -2303,7 +2303,7 @@ public class BigDecimal extends Number implements Comparable { * that this is the rounding mode that most of us were taught in * grade school. */ - public final static int ROUND_HALF_UP = 4; + public static final int ROUND_HALF_UP = 4; /** * Rounding mode to round towards {@literal "nearest neighbor"} @@ -2312,7 +2312,7 @@ public class BigDecimal extends Number implements Comparable { * fraction is {@literal >} 0.5; otherwise, behaves as for * {@code ROUND_DOWN}. */ - public final static int ROUND_HALF_DOWN = 5; + public static final int ROUND_HALF_DOWN = 5; /** * Rounding mode to round towards the {@literal "nearest neighbor"} @@ -2324,7 +2324,7 @@ public class BigDecimal extends Number implements Comparable { * rounding mode that minimizes cumulative error when applied * repeatedly over a sequence of calculations. */ - public final static int ROUND_HALF_EVEN = 6; + public static final int ROUND_HALF_EVEN = 6; /** * Rounding mode to assert that the requested operation has an exact @@ -2332,7 +2332,7 @@ public class BigDecimal extends Number implements Comparable { * specified on an operation that yields an inexact result, an * {@code ArithmeticException} is thrown. */ - public final static int ROUND_UNNECESSARY = 7; + public static final int ROUND_UNNECESSARY = 7; // Scaling/Rounding Operations @@ -3398,7 +3398,7 @@ public class BigDecimal extends Number implements Comparable { return charPos; } - final static char[] DIGIT_TENS = { + static final char[] DIGIT_TENS = { '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '1', '1', '1', '1', '1', '1', '1', '1', '1', '2', '2', '2', '2', '2', '2', '2', '2', '2', '2', @@ -3411,7 +3411,7 @@ public class BigDecimal extends Number implements Comparable { '9', '9', '9', '9', '9', '9', '9', '9', '9', '9', }; - final static char[] DIGIT_ONES = { + static final char[] DIGIT_ONES = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', diff --git a/jdk/src/java.base/share/classes/java/math/BigInteger.java b/jdk/src/java.base/share/classes/java/math/BigInteger.java index 7232724d84c..80330c8c4e4 100644 --- a/jdk/src/java.base/share/classes/java/math/BigInteger.java +++ b/jdk/src/java.base/share/classes/java/math/BigInteger.java @@ -184,7 +184,7 @@ public class BigInteger extends Number implements Comparable { /** * This mask is used to obtain the value of an int as if it were unsigned. */ - final static long LONG_MASK = 0xffffffffL; + static final long LONG_MASK = 0xffffffffL; /** * This constant limits {@code mag.length} of BigIntegers to the supported @@ -1212,7 +1212,7 @@ public class BigInteger extends Number implements Comparable { /** * Initialize static constant array when class is loaded. */ - private final static int MAX_CONSTANT = 16; + private static final int MAX_CONSTANT = 16; private static BigInteger posConst[] = new BigInteger[MAX_CONSTANT+1]; private static BigInteger negConst[] = new BigInteger[MAX_CONSTANT+1]; diff --git a/jdk/src/java.base/share/classes/java/net/AbstractPlainDatagramSocketImpl.java b/jdk/src/java.base/share/classes/java/net/AbstractPlainDatagramSocketImpl.java index 25677980d66..1f9eba1300e 100644 --- a/jdk/src/java.base/share/classes/java/net/AbstractPlainDatagramSocketImpl.java +++ b/jdk/src/java.base/share/classes/java/net/AbstractPlainDatagramSocketImpl.java @@ -55,7 +55,7 @@ abstract class AbstractPlainDatagramSocketImpl extends DatagramSocketImpl /** * flag set if the native connect() call not to be used */ - private final static boolean connectDisabled = os.contains("OS X"); + private static final boolean connectDisabled = os.contains("OS X"); /** * Load net library into runtime. diff --git a/jdk/src/java.base/share/classes/java/net/AbstractPlainSocketImpl.java b/jdk/src/java.base/share/classes/java/net/AbstractPlainSocketImpl.java index 59b4042562f..8841e4fe724 100644 --- a/jdk/src/java.base/share/classes/java/net/AbstractPlainSocketImpl.java +++ b/jdk/src/java.base/share/classes/java/net/AbstractPlainSocketImpl.java @@ -721,6 +721,6 @@ abstract class AbstractPlainSocketImpl extends SocketImpl abstract void socketSendUrgentData(int data) throws IOException; - public final static int SHUT_RD = 0; - public final static int SHUT_WR = 1; + public static final int SHUT_RD = 0; + public static final int SHUT_WR = 1; } diff --git a/jdk/src/java.base/share/classes/java/net/Authenticator.java b/jdk/src/java.base/share/classes/java/net/Authenticator.java index a83f40791d2..e62e169099c 100644 --- a/jdk/src/java.base/share/classes/java/net/Authenticator.java +++ b/jdk/src/java.base/share/classes/java/net/Authenticator.java @@ -119,7 +119,7 @@ class Authenticator { * @see SecurityManager#checkPermission * @see java.net.NetPermission */ - public synchronized static void setDefault(Authenticator a) { + public static synchronized void setDefault(Authenticator a) { SecurityManager sm = System.getSecurityManager(); if (sm != null) { NetPermission setDefaultPermission diff --git a/jdk/src/java.base/share/classes/java/net/ContentHandler.java b/jdk/src/java.base/share/classes/java/net/ContentHandler.java index 690cbd9b2bd..bea0391b1ea 100644 --- a/jdk/src/java.base/share/classes/java/net/ContentHandler.java +++ b/jdk/src/java.base/share/classes/java/net/ContentHandler.java @@ -81,7 +81,7 @@ import java.io.IOException; * @see java.net.URLConnection#setContentHandlerFactory(java.net.ContentHandlerFactory) * @since 1.0 */ -abstract public class ContentHandler { +public abstract class ContentHandler { /** * Given a URL connect stream positioned at the beginning of the @@ -92,7 +92,7 @@ abstract public class 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; + public abstract Object getContent(URLConnection urlc) throws IOException; /** * Given a URL connect stream positioned at the beginning of the diff --git a/jdk/src/java.base/share/classes/java/net/CookieHandler.java b/jdk/src/java.base/share/classes/java/net/CookieHandler.java index ef91d009feb..af4c813926b 100644 --- a/jdk/src/java.base/share/classes/java/net/CookieHandler.java +++ b/jdk/src/java.base/share/classes/java/net/CookieHandler.java @@ -69,7 +69,7 @@ public abstract class CookieHandler { * {@link NetPermission}{@code ("getCookieHandler")} * @see #setDefault(CookieHandler) */ - public synchronized static CookieHandler getDefault() { + public static synchronized CookieHandler getDefault() { SecurityManager sm = System.getSecurityManager(); if (sm != null) { sm.checkPermission(SecurityConstants.GET_COOKIEHANDLER_PERMISSION); @@ -89,7 +89,7 @@ public abstract class CookieHandler { * {@link NetPermission}{@code ("setCookieHandler")} * @see #getDefault() */ - public synchronized static void setDefault(CookieHandler cHandler) { + public static synchronized void setDefault(CookieHandler cHandler) { SecurityManager sm = System.getSecurityManager(); if (sm != null) { sm.checkPermission(SecurityConstants.SET_COOKIEHANDLER_PERMISSION); diff --git a/jdk/src/java.base/share/classes/java/net/CookieManager.java b/jdk/src/java.base/share/classes/java/net/CookieManager.java index 74216eb4de0..fb3fa356e99 100644 --- a/jdk/src/java.base/share/classes/java/net/CookieManager.java +++ b/jdk/src/java.base/share/classes/java/net/CookieManager.java @@ -362,7 +362,7 @@ public class CookieManager extends CookieHandler } - static private boolean isInPortList(String lst, int port) { + private static boolean isInPortList(String lst, int port) { int i = lst.indexOf(','); int val = -1; while (i > 0) { diff --git a/jdk/src/java.base/share/classes/java/net/DatagramPacket.java b/jdk/src/java.base/share/classes/java/net/DatagramPacket.java index 2fb419db282..13fac5d46c2 100644 --- a/jdk/src/java.base/share/classes/java/net/DatagramPacket.java +++ b/jdk/src/java.base/share/classes/java/net/DatagramPacket.java @@ -384,5 +384,5 @@ class DatagramPacket { /** * Perform class load-time initializations. */ - private native static void init(); + private static native void init(); } diff --git a/jdk/src/java.base/share/classes/java/net/HostPortrange.java b/jdk/src/java.base/share/classes/java/net/HostPortrange.java index 3c924d8bfc0..09f20d43cbe 100644 --- a/jdk/src/java.base/share/classes/java/net/HostPortrange.java +++ b/jdk/src/java.base/share/classes/java/net/HostPortrange.java @@ -225,9 +225,9 @@ class HostPortrange { } // these shouldn't leak outside the implementation - final static int[] HTTP_PORT = {80, 80}; - final static int[] HTTPS_PORT = {443, 443}; - final static int[] NO_PORT = {-1, -1}; + static final int[] HTTP_PORT = {80, 80}; + static final int[] HTTPS_PORT = {443, 443}; + static final int[] NO_PORT = {-1, -1}; int[] defaultPort() { if (scheme.equals("http")) { diff --git a/jdk/src/java.base/share/classes/java/net/HttpCookie.java b/jdk/src/java.base/share/classes/java/net/HttpCookie.java index 92dcd68c0b5..4b1ba5200d0 100644 --- a/jdk/src/java.base/share/classes/java/net/HttpCookie.java +++ b/jdk/src/java.base/share/classes/java/net/HttpCookie.java @@ -84,11 +84,11 @@ public final class HttpCookie implements Cloneable { // Since the positive and zero max-age have their meanings, // this value serves as a hint as 'not specify max-age' - private final static long MAX_AGE_UNSPECIFIED = -1; + private static final long MAX_AGE_UNSPECIFIED = -1; // date formats used by Netscape's cookie draft // as well as formats seen on various sites - private final static String[] COOKIE_DATE_FORMATS = { + private static final String[] COOKIE_DATE_FORMATS = { "EEE',' dd-MMM-yyyy HH:mm:ss 'GMT'", "EEE',' dd MMM yyyy HH:mm:ss 'GMT'", "EEE MMM dd yyyy HH:mm:ss 'GMT'Z", @@ -98,8 +98,8 @@ public final class HttpCookie implements Cloneable { }; // constant strings represent set-cookie header token - private final static String SET_COOKIE = "set-cookie:"; - private final static String SET_COOKIE2 = "set-cookie2:"; + private static final String SET_COOKIE = "set-cookie:"; + private static final String SET_COOKIE2 = "set-cookie2:"; // ---------------- Ctors -------------- diff --git a/jdk/src/java.base/share/classes/java/net/HttpURLConnection.java b/jdk/src/java.base/share/classes/java/net/HttpURLConnection.java index de9ac337f06..94b537d2658 100644 --- a/jdk/src/java.base/share/classes/java/net/HttpURLConnection.java +++ b/jdk/src/java.base/share/classes/java/net/HttpURLConnection.java @@ -66,7 +66,7 @@ import java.util.Date; * @see java.net.HttpURLConnection#disconnect() * @since 1.1 */ -abstract public class HttpURLConnection extends URLConnection { +public abstract class HttpURLConnection extends URLConnection { /* instance variables */ /** diff --git a/jdk/src/java.base/share/classes/java/net/Inet4Address.java b/jdk/src/java.base/share/classes/java/net/Inet4Address.java index 08559f35829..6b0f765cd0e 100644 --- a/jdk/src/java.base/share/classes/java/net/Inet4Address.java +++ b/jdk/src/java.base/share/classes/java/net/Inet4Address.java @@ -84,7 +84,7 @@ import java.io.ObjectStreamException; public final class Inet4Address extends InetAddress { - final static int INADDRSZ = 4; + static final int INADDRSZ = 4; /** use serialVersionUID from InetAddress, but Inet4Address instance * is always replaced by an InetAddress instance before being diff --git a/jdk/src/java.base/share/classes/java/net/Inet6Address.java b/jdk/src/java.base/share/classes/java/net/Inet6Address.java index bbe2263e1c0..e51064fbd31 100644 --- a/jdk/src/java.base/share/classes/java/net/Inet6Address.java +++ b/jdk/src/java.base/share/classes/java/net/Inet6Address.java @@ -173,7 +173,7 @@ import java.util.Arrays; public final class Inet6Address extends InetAddress { - final static int INADDRSZ = 16; + static final int INADDRSZ = 16; /* * cached scope_id - for link-local address use only. @@ -922,7 +922,7 @@ class Inet6Address extends InetAddress { } // Utilities - private final static int INT16SZ = 2; + private static final int INT16SZ = 2; /* * Convert IPv6 binary address into presentation (printable) format. diff --git a/jdk/src/java.base/share/classes/java/net/NetworkInterface.java b/jdk/src/java.base/share/classes/java/net/NetworkInterface.java index 81da1c0cf8f..8e5ec293646 100644 --- a/jdk/src/java.base/share/classes/java/net/NetworkInterface.java +++ b/jdk/src/java.base/share/classes/java/net/NetworkInterface.java @@ -400,16 +400,16 @@ public final class NetworkInterface { false); } - private native static NetworkInterface[] getAll() + private static native NetworkInterface[] getAll() throws SocketException; - private native static NetworkInterface getByName0(String name) + private static native NetworkInterface getByName0(String name) throws SocketException; - private native static NetworkInterface getByIndex0(int index) + private static native NetworkInterface getByIndex0(int index) throws SocketException; - private native static NetworkInterface getByInetAddress0(InetAddress addr) + private static native NetworkInterface getByInetAddress0(InetAddress addr) throws SocketException; /** @@ -525,12 +525,12 @@ public final class NetworkInterface { return virtual; } - private native static boolean isUp0(String name, int ind) throws SocketException; - private native static boolean isLoopback0(String name, int ind) throws SocketException; - private native static boolean supportsMulticast0(String name, int ind) throws SocketException; - private native static boolean isP2P0(String name, int ind) throws SocketException; - private native static byte[] getMacAddr0(byte[] inAddr, String name, int ind) throws SocketException; - private native static int getMTU0(String name, int ind) throws SocketException; + private static native boolean isUp0(String name, int ind) throws SocketException; + private static native boolean isLoopback0(String name, int ind) throws SocketException; + private static native boolean supportsMulticast0(String name, int ind) throws SocketException; + private static native boolean isP2P0(String name, int ind) throws SocketException; + private static native byte[] getMacAddr0(byte[] inAddr, String name, int ind) throws SocketException; + private static native int getMTU0(String name, int ind) throws SocketException; /** * Compares this object against the specified object. diff --git a/jdk/src/java.base/share/classes/java/net/Proxy.java b/jdk/src/java.base/share/classes/java/net/Proxy.java index 8ba020ef484..672235b527f 100644 --- a/jdk/src/java.base/share/classes/java/net/Proxy.java +++ b/jdk/src/java.base/share/classes/java/net/Proxy.java @@ -69,7 +69,7 @@ public class Proxy { * {@code Socket s = new Socket(Proxy.NO_PROXY);} * */ - public final static Proxy NO_PROXY = new Proxy(); + public static final Proxy NO_PROXY = new Proxy(); // Creates the proxy that represents a {@code DIRECT} connection. private Proxy() { diff --git a/jdk/src/java.base/share/classes/java/net/ResponseCache.java b/jdk/src/java.base/share/classes/java/net/ResponseCache.java index 2dfaf4aa9f9..e023735ddc0 100644 --- a/jdk/src/java.base/share/classes/java/net/ResponseCache.java +++ b/jdk/src/java.base/share/classes/java/net/ResponseCache.java @@ -80,7 +80,7 @@ public abstract class ResponseCache { * @return the system-wide {@code ResponseCache} * @since 1.5 */ - public synchronized static ResponseCache getDefault() { + public static synchronized ResponseCache getDefault() { SecurityManager sm = System.getSecurityManager(); if (sm != null) { sm.checkPermission(SecurityConstants.GET_RESPONSECACHE_PERMISSION); @@ -103,7 +103,7 @@ public abstract class ResponseCache { * @see #getDefault() * @since 1.5 */ - public synchronized static void setDefault(ResponseCache responseCache) { + public static synchronized void setDefault(ResponseCache responseCache) { SecurityManager sm = System.getSecurityManager(); if (sm != null) { sm.checkPermission(SecurityConstants.SET_RESPONSECACHE_PERMISSION); diff --git a/jdk/src/java.base/share/classes/java/net/SocketInputStream.java b/jdk/src/java.base/share/classes/java/net/SocketInputStream.java index 41b18bdc7e0..2fb035ef7d8 100644 --- a/jdk/src/java.base/share/classes/java/net/SocketInputStream.java +++ b/jdk/src/java.base/share/classes/java/net/SocketInputStream.java @@ -287,5 +287,5 @@ class SocketInputStream extends FileInputStream /** * Perform class load-time initializations. */ - private native static void init(); + private static native void init(); } diff --git a/jdk/src/java.base/share/classes/java/net/SocketOptions.java b/jdk/src/java.base/share/classes/java/net/SocketOptions.java index cd1539c3530..82e98e99064 100644 --- a/jdk/src/java.base/share/classes/java/net/SocketOptions.java +++ b/jdk/src/java.base/share/classes/java/net/SocketOptions.java @@ -139,7 +139,7 @@ public interface SocketOptions { * @see Socket#getTcpNoDelay */ - @Native public final static int TCP_NODELAY = 0x0001; + @Native public static final int TCP_NODELAY = 0x0001; /** * Fetch the local address binding of a socket (this option cannot @@ -160,7 +160,7 @@ public interface SocketOptions { * @see DatagramSocket#getLocalAddress */ - @Native public final static int SO_BINDADDR = 0x000F; + @Native public static final int SO_BINDADDR = 0x000F; /** Sets SO_REUSEADDR for a socket. This is used only for MulticastSockets * in java, and it is set by default for MulticastSockets. @@ -168,7 +168,7 @@ public interface SocketOptions { * Valid for: DatagramSocketImpl */ - @Native public final static int SO_REUSEADDR = 0x04; + @Native public static final int SO_REUSEADDR = 0x04; /** * Sets SO_BROADCAST for a socket. This option enables and disables @@ -179,7 +179,7 @@ public interface SocketOptions { * @since 1.4 */ - @Native public final static int SO_BROADCAST = 0x0020; + @Native public static final int SO_BROADCAST = 0x0020; /** Set which outgoing interface on which to send multicast packets. * Useful on hosts with multiple network interfaces, where applications @@ -191,7 +191,7 @@ public interface SocketOptions { * @see MulticastSocket#getInterface() */ - @Native public final static int IP_MULTICAST_IF = 0x10; + @Native public static final int IP_MULTICAST_IF = 0x10; /** Same as above. This option is introduced so that the behaviour * with IP_MULTICAST_IF will be kept the same as before, while @@ -203,7 +203,7 @@ public interface SocketOptions { * @see MulticastSocket#getNetworkInterface() * @since 1.4 */ - @Native public final static int IP_MULTICAST_IF2 = 0x1f; + @Native public static final int IP_MULTICAST_IF2 = 0x1f; /** * This option enables or disables local loopback of multicast datagrams. @@ -211,7 +211,7 @@ public interface SocketOptions { * @since 1.4 */ - @Native public final static int IP_MULTICAST_LOOP = 0x12; + @Native public static final int IP_MULTICAST_LOOP = 0x12; /** * This option sets the type-of-service or traffic class field @@ -219,7 +219,7 @@ public interface SocketOptions { * @since 1.4 */ - @Native public final static int IP_TOS = 0x3; + @Native public static final int IP_TOS = 0x3; /** * Specify a linger-on-close timeout. This option disables/enables @@ -237,7 +237,7 @@ public interface SocketOptions { * @see Socket#setSoLinger * @see Socket#getSoLinger */ - @Native public final static int SO_LINGER = 0x0080; + @Native public static final int SO_LINGER = 0x0080; /** Set a timeout on blocking Socket operations: * 
    @@ -258,7 +258,7 @@ public interface SocketOptions {
      * @see ServerSocket#setSoTimeout
      * @see DatagramSocket#setSoTimeout
      */
-    @Native public final static int SO_TIMEOUT = 0x1006;
+    @Native public static final int SO_TIMEOUT = 0x1006;
 
     /**
      * Set a hint the size of the underlying buffers used by the
@@ -275,7 +275,7 @@ public interface SocketOptions {
      * @see DatagramSocket#setSendBufferSize
      * @see DatagramSocket#getSendBufferSize
      */
-    @Native public final static int SO_SNDBUF = 0x1001;
+    @Native public static final int SO_SNDBUF = 0x1001;
 
     /**
      * Set a hint the size of the underlying buffers used by the
@@ -293,7 +293,7 @@ public interface SocketOptions {
      * @see DatagramSocket#setReceiveBufferSize
      * @see DatagramSocket#getReceiveBufferSize
      */
-    @Native public final static int SO_RCVBUF = 0x1002;
+    @Native public static final int SO_RCVBUF = 0x1002;
 
     /**
      * When the keepalive option is set for a TCP socket and no data
@@ -316,7 +316,7 @@ public interface SocketOptions {
      * @see Socket#setKeepAlive
      * @see Socket#getKeepAlive
      */
-    @Native public final static int SO_KEEPALIVE = 0x0008;
+    @Native public static final int SO_KEEPALIVE = 0x0008;
 
     /**
      * When the OOBINLINE option is set, any TCP urgent data received on
@@ -327,5 +327,5 @@ public interface SocketOptions {
      * @see Socket#setOOBInline
      * @see Socket#getOOBInline
      */
-    @Native public final static int SO_OOBINLINE = 0x1003;
+    @Native public static final int SO_OOBINLINE = 0x1003;
 }
diff --git a/jdk/src/java.base/share/classes/java/net/SocketOutputStream.java b/jdk/src/java.base/share/classes/java/net/SocketOutputStream.java
index 2404e9583f4..4aa1e53761b 100644
--- a/jdk/src/java.base/share/classes/java/net/SocketOutputStream.java
+++ b/jdk/src/java.base/share/classes/java/net/SocketOutputStream.java
@@ -178,6 +178,6 @@ class SocketOutputStream extends FileOutputStream
     /**
      * Perform class load-time initializations.
      */
-    private native static void init();
+    private static native void init();
 
 }
diff --git a/jdk/src/java.base/share/classes/java/net/SocketPermission.java b/jdk/src/java.base/share/classes/java/net/SocketPermission.java
index eb046b7122a..b1a94154af0 100644
--- a/jdk/src/java.base/share/classes/java/net/SocketPermission.java
+++ b/jdk/src/java.base/share/classes/java/net/SocketPermission.java
@@ -154,32 +154,32 @@ public final class SocketPermission extends Permission
     /**
      * Connect to host:port
      */
-    private final static int CONNECT    = 0x1;
+    private static final int CONNECT    = 0x1;
 
     /**
      * Listen on host:port
      */
-    private final static int LISTEN     = 0x2;
+    private static final int LISTEN     = 0x2;
 
     /**
      * Accept a connection from host:port
      */
-    private final static int ACCEPT     = 0x4;
+    private static final int ACCEPT     = 0x4;
 
     /**
      * Resolve DNS queries
      */
-    private final static int RESOLVE    = 0x8;
+    private static final int RESOLVE    = 0x8;
 
     /**
      * No actions
      */
-    private final static int NONE               = 0x0;
+    private static final int NONE               = 0x0;
 
     /**
      * All actions
      */
-    private final static int ALL        = CONNECT|LISTEN|ACCEPT|RESOLVE;
+    private static final int ALL        = CONNECT|LISTEN|ACCEPT|RESOLVE;
 
     // various port constants
     private static final int PORT_MIN = 0;
diff --git a/jdk/src/java.base/share/classes/java/net/URI.java b/jdk/src/java.base/share/classes/java/net/URI.java
index 2896cf222e6..134a8b4380f 100644
--- a/jdk/src/java.base/share/classes/java/net/URI.java
+++ b/jdk/src/java.base/share/classes/java/net/URI.java
@@ -492,15 +492,15 @@ public final class URI
 
     // The remaining fields may be computed on demand
 
-    private volatile transient String schemeSpecificPart;
-    private volatile transient int hash;        // Zero ==> undefined
+    private transient volatile String schemeSpecificPart;
+    private transient volatile int hash;        // Zero ==> undefined
 
-    private volatile transient String decodedUserInfo = null;
-    private volatile transient String decodedAuthority = null;
-    private volatile transient String decodedPath = null;
-    private volatile transient String decodedQuery = null;
-    private volatile transient String decodedFragment = null;
-    private volatile transient String decodedSchemeSpecificPart = null;
+    private transient volatile String decodedUserInfo = null;
+    private transient volatile String decodedAuthority = null;
+    private transient volatile String decodedPath = null;
+    private transient volatile String decodedQuery = null;
+    private transient volatile String decodedFragment = null;
+    private transient volatile String decodedSchemeSpecificPart = null;
 
     /**
      * The string form of this URI.
@@ -2175,7 +2175,7 @@ public final class URI
     // This method takes a string argument rather than a char array so that
     // this test can be performed without invoking path.toCharArray().
     //
-    static private int needsNormalization(String path) {
+    private static int needsNormalization(String path) {
         boolean normal = true;
         int ns = 0;                     // Number of segments
         int end = path.length() - 1;    // Index of last char in path
@@ -2232,7 +2232,7 @@ public final class URI
     //   All slashes in path replaced by '\0'
     //   segs[i] == Index of first char in segment i (0 <= i < segs.length)
     //
-    static private void split(char[] path, int[] segs) {
+    private static void split(char[] path, int[] segs) {
         int end = path.length - 1;      // Index of last char in path
         int p = 0;                      // Index of next char in path
         int i = 0;                      // Index of current segment
@@ -2281,7 +2281,7 @@ public final class URI
     // Postconditions:
     //   path[0] .. path[return value] == Resulting path
     //
-    static private int join(char[] path, int[] segs) {
+    private static int join(char[] path, int[] segs) {
         int ns = segs.length;           // Number of segments
         int end = path.length - 1;      // Index of last char in path
         int p = 0;                      // Index of next path char to write
@@ -2645,7 +2645,7 @@ public final class URI
 
     // -- Escaping and encoding --
 
-    private final static char[] hexDigits = {
+    private static final char[] hexDigits = {
         '0', '1', '2', '3', '4', '5', '6', '7',
         '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
     };
diff --git a/jdk/src/java.base/share/classes/java/net/URLConnection.java b/jdk/src/java.base/share/classes/java/net/URLConnection.java
index 26928a554a6..bdc37963d6c 100644
--- a/jdk/src/java.base/share/classes/java/net/URLConnection.java
+++ b/jdk/src/java.base/share/classes/java/net/URLConnection.java
@@ -365,7 +365,7 @@ public abstract class URLConnection {
      * @see #getConnectTimeout()
      * @see #setConnectTimeout(int)
      */
-    abstract public void connect() throws IOException;
+    public abstract void connect() throws IOException;
 
     /**
      * Sets a specified timeout value, in milliseconds, to be used
@@ -1440,7 +1440,7 @@ public abstract class URLConnection {
      * @see        java.io.InputStream#markSupported()
      * @see        java.net.URLConnection#getContentType()
      */
-    static public String guessContentTypeFromStream(InputStream is)
+    public static String guessContentTypeFromStream(InputStream is)
                         throws IOException {
         // If we can't read ahead safely, just give up on guessing
         if (!is.markSupported())
@@ -1605,7 +1605,7 @@ public abstract class URLConnection {
      * method, the stream should have already been checked to be sure it
      * contains Microsoft Structured Storage data.
      */
-    static private boolean checkfpx(InputStream is) throws IOException {
+    private static boolean checkfpx(InputStream is) throws IOException {
 
         /* Test for FlashPix image data in Microsoft Structured Storage format.
          * In general, should do this with calls to an SS implementation.
@@ -1766,7 +1766,7 @@ public abstract class URLConnection {
      * Returns -1, If EOF is reached before len bytes are read, returns 0
      * otherwise
      */
-    static private int readBytes(int c[], int len, InputStream is)
+    private static int readBytes(int c[], int len, InputStream is)
                 throws IOException {
 
         byte buf[] = new byte[len];
@@ -1787,7 +1787,7 @@ public abstract class URLConnection {
      * until either EOF is reached, or the specified
      * number of bytes have been skipped
      */
-    static private long skipForward(InputStream is, long toSkip)
+    private static long skipForward(InputStream is, long toSkip)
                 throws IOException {
 
         long eachSkip = 0;
diff --git a/jdk/src/java.base/share/classes/java/net/URLStreamHandler.java b/jdk/src/java.base/share/classes/java/net/URLStreamHandler.java
index 56506ba33bb..30c9791cd95 100644
--- a/jdk/src/java.base/share/classes/java/net/URLStreamHandler.java
+++ b/jdk/src/java.base/share/classes/java/net/URLStreamHandler.java
@@ -68,7 +68,7 @@ public abstract class URLStreamHandler {
      * @exception  IOException  if an I/O error occurs while opening the
      *               connection.
      */
-    abstract protected URLConnection openConnection(URL u) throws IOException;
+    protected abstract URLConnection openConnection(URL u) throws IOException;
 
     /**
      * Same as openConnection(URL), except that the connection will be
diff --git a/jdk/src/java.base/share/classes/java/nio/Bits.java b/jdk/src/java.base/share/classes/java/nio/Bits.java
index d23e35e82aa..8d3f31533eb 100644
--- a/jdk/src/java.base/share/classes/java/nio/Bits.java
+++ b/jdk/src/java.base/share/classes/java/nio/Bits.java
@@ -64,7 +64,7 @@ class Bits {                            // package-private
 
     // -- get/put char --
 
-    static private char makeChar(byte b1, byte b0) {
+    private static char makeChar(byte b1, byte b0) {
         return (char)((b1 << 8) | (b0 & 0xff));
     }
 
@@ -136,7 +136,7 @@ class Bits {                            // package-private
 
     // -- get/put short --
 
-    static private short makeShort(byte b1, byte b0) {
+    private static short makeShort(byte b1, byte b0) {
         return (short)((b1 << 8) | (b0 & 0xff));
     }
 
@@ -208,7 +208,7 @@ class Bits {                            // package-private
 
     // -- get/put int --
 
-    static private int makeInt(byte b3, byte b2, byte b1, byte b0) {
+    private static int makeInt(byte b3, byte b2, byte b1, byte b0) {
         return (((b3       ) << 24) |
                 ((b2 & 0xff) << 16) |
                 ((b1 & 0xff) <<  8) |
@@ -301,7 +301,7 @@ class Bits {                            // package-private
 
     // -- get/put long --
 
-    static private long makeLong(byte b7, byte b6, byte b5, byte b4,
+    private static long makeLong(byte b7, byte b6, byte b5, byte b4,
                                  byte b3, byte b2, byte b1, byte b0)
     {
         return ((((long)b7       ) << 56) |
diff --git a/jdk/src/java.base/share/classes/java/nio/channels/Pipe.java b/jdk/src/java.base/share/classes/java/nio/channels/Pipe.java
index f707de5d79f..b9a9b2512ae 100644
--- a/jdk/src/java.base/share/classes/java/nio/channels/Pipe.java
+++ b/jdk/src/java.base/share/classes/java/nio/channels/Pipe.java
@@ -56,7 +56,7 @@ public abstract class Pipe {
      *
      * @since 1.4
      */
-    public static abstract class SourceChannel
+    public abstract static class SourceChannel
         extends AbstractSelectableChannel
         implements ReadableByteChannel, ScatteringByteChannel
     {
@@ -90,7 +90,7 @@ public abstract class Pipe {
      *
      * @since 1.4
      */
-    public static abstract class SinkChannel
+    public abstract static class SinkChannel
         extends AbstractSelectableChannel
         implements WritableByteChannel, GatheringByteChannel
     {
diff --git a/jdk/src/java.base/share/classes/java/nio/charset/CoderResult.java b/jdk/src/java.base/share/classes/java/nio/charset/CoderResult.java
index 3d5e1c43a65..d8828c8fdb6 100644
--- a/jdk/src/java.base/share/classes/java/nio/charset/CoderResult.java
+++ b/jdk/src/java.base/share/classes/java/nio/charset/CoderResult.java
@@ -191,7 +191,7 @@ public class CoderResult {
     public static final CoderResult OVERFLOW
         = new CoderResult(CR_OVERFLOW, 0);
 
-    private static abstract class Cache {
+    private abstract static class Cache {
 
         private Map> cache = null;
 
diff --git a/jdk/src/java.base/share/classes/java/security/KeyPairGenerator.java b/jdk/src/java.base/share/classes/java/security/KeyPairGenerator.java
index 71efde75ecd..277231b568d 100644
--- a/jdk/src/java.base/share/classes/java/security/KeyPairGenerator.java
+++ b/jdk/src/java.base/share/classes/java/security/KeyPairGenerator.java
@@ -547,9 +547,9 @@ public abstract class KeyPairGenerator extends KeyPairGeneratorSpi {
 
         private Iterator serviceIterator;
 
-        private final static int I_NONE   = 1;
-        private final static int I_SIZE   = 2;
-        private final static int I_PARAMS = 3;
+        private static final int I_NONE   = 1;
+        private static final int I_SIZE   = 2;
+        private static final int I_PARAMS = 3;
 
         private int initType;
         private int initKeySize;
diff --git a/jdk/src/java.base/share/classes/java/security/KeyStore.java b/jdk/src/java.base/share/classes/java/security/KeyStore.java
index 34e0bf95120..6ab121ea629 100644
--- a/jdk/src/java.base/share/classes/java/security/KeyStore.java
+++ b/jdk/src/java.base/share/classes/java/security/KeyStore.java
@@ -974,7 +974,7 @@ public class KeyStore {
      * if no such property exists.
      * @see java.security.Security security properties
      */
-    public final static String getDefaultType() {
+    public static final String getDefaultType() {
         String kstype;
         kstype = AccessController.doPrivileged(new PrivilegedAction<>() {
             public String run() {
@@ -1811,7 +1811,7 @@ public class KeyStore {
      * @see javax.net.ssl.KeyStoreBuilderParameters
      * @since 1.5
      */
-    public static abstract class Builder {
+    public abstract static class Builder {
 
         // maximum times to try the callbackhandler if the password is wrong
         static final int MAX_CALLBACK_TRIES = 3;
diff --git a/jdk/src/java.base/share/classes/java/security/Provider.java b/jdk/src/java.base/share/classes/java/security/Provider.java
index 864cede9b59..a38fbdcfaf0 100644
--- a/jdk/src/java.base/share/classes/java/security/Provider.java
+++ b/jdk/src/java.base/share/classes/java/security/Provider.java
@@ -998,9 +998,9 @@ public abstract class Provider extends Properties {
         return new String[] {type, alg};
     }
 
-    private final static String ALIAS_PREFIX = "Alg.Alias.";
-    private final static String ALIAS_PREFIX_LOWER = "alg.alias.";
-    private final static int ALIAS_LENGTH = ALIAS_PREFIX.length();
+    private static final String ALIAS_PREFIX = "Alg.Alias.";
+    private static final String ALIAS_PREFIX_LOWER = "alg.alias.";
+    private static final int ALIAS_LENGTH = ALIAS_PREFIX.length();
 
     private void parseLegacyPut(String name, String value) {
         if (name.toLowerCase(ENGLISH).startsWith(ALIAS_PREFIX_LOWER)) {
diff --git a/jdk/src/java.base/share/classes/java/security/SecureRandom.java b/jdk/src/java.base/share/classes/java/security/SecureRandom.java
index 09b5a008f9c..feae08b90c9 100644
--- a/jdk/src/java.base/share/classes/java/security/SecureRandom.java
+++ b/jdk/src/java.base/share/classes/java/security/SecureRandom.java
@@ -424,7 +424,7 @@ public class SecureRandom extends java.util.Random {
      *
      * @see #getSeed
      */
-    synchronized public void setSeed(byte[] seed) {
+    public synchronized void setSeed(byte[] seed) {
         secureRandomSpi.engineSetSeed(seed);
     }
 
@@ -465,7 +465,7 @@ public class SecureRandom extends java.util.Random {
      * @param bytes the array to be filled in with random bytes.
      */
     @Override
-    synchronized public void nextBytes(byte[] bytes) {
+    public synchronized void nextBytes(byte[] bytes) {
         secureRandomSpi.engineNextBytes(bytes);
     }
 
@@ -484,7 +484,7 @@ public class SecureRandom extends java.util.Random {
      * of pseudo-random bits (right justified, with leading zeros).
      */
     @Override
-    final protected int next(int numBits) {
+    protected final int next(int numBits) {
         int numBytes = (numBits+7)/8;
         byte[] b = new byte[numBytes];
         int next = 0;
diff --git a/jdk/src/java.base/share/classes/java/security/Signature.java b/jdk/src/java.base/share/classes/java/security/Signature.java
index 3028a10b5e3..75e318c8b94 100644
--- a/jdk/src/java.base/share/classes/java/security/Signature.java
+++ b/jdk/src/java.base/share/classes/java/security/Signature.java
@@ -141,19 +141,19 @@ public abstract class Signature extends SignatureSpi {
      * Possible {@link #state} value, signifying that
      * this signature object has not yet been initialized.
      */
-    protected final static int UNINITIALIZED = 0;
+    protected static final int UNINITIALIZED = 0;
 
     /**
      * Possible {@link #state} value, signifying that
      * this signature object has been initialized for signing.
      */
-    protected final static int SIGN = 2;
+    protected static final int SIGN = 2;
 
     /**
      * Possible {@link #state} value, signifying that
      * this signature object has been initialized for verification.
      */
-    protected final static int VERIFY = 3;
+    protected static final int VERIFY = 3;
 
     /**
      * Current state of this signature object.
@@ -174,13 +174,13 @@ public abstract class Signature extends SignatureSpi {
     }
 
     // name of the special signature alg
-    private final static String RSA_SIGNATURE = "NONEwithRSA";
+    private static final String RSA_SIGNATURE = "NONEwithRSA";
 
     // name of the equivalent cipher alg
-    private final static String RSA_CIPHER = "RSA/ECB/PKCS1Padding";
+    private static final String RSA_CIPHER = "RSA/ECB/PKCS1Padding";
 
     // all the services we need to lookup for compatibility with Cipher
-    private final static List rsaIds = Arrays.asList(
+    private static final List rsaIds = Arrays.asList(
         new ServiceId[] {
             new ServiceId("Signature", "NONEwithRSA"),
             new ServiceId("Cipher", "RSA/ECB/PKCS1Padding"),
@@ -263,7 +263,7 @@ public abstract class Signature extends SignatureSpi {
         return sig;
     }
 
-    private final static Map signatureInfo;
+    private static final Map signatureInfo;
 
     static {
         signatureInfo = new ConcurrentHashMap<>();
@@ -1147,9 +1147,9 @@ public abstract class Signature extends SignatureSpi {
             }
         }
 
-        private final static int I_PUB     = 1;
-        private final static int I_PRIV    = 2;
-        private final static int I_PRIV_SR = 3;
+        private static final int I_PUB     = 1;
+        private static final int I_PRIV    = 2;
+        private static final int I_PRIV_SR = 3;
 
         private void init(SignatureSpi spi, int type, Key  key,
                 SecureRandom random) throws InvalidKeyException {
diff --git a/jdk/src/java.base/share/classes/java/security/cert/CertPathBuilder.java b/jdk/src/java.base/share/classes/java/security/cert/CertPathBuilder.java
index 06c0d04fefa..307cbec4924 100644
--- a/jdk/src/java.base/share/classes/java/security/cert/CertPathBuilder.java
+++ b/jdk/src/java.base/share/classes/java/security/cert/CertPathBuilder.java
@@ -299,7 +299,7 @@ public class CertPathBuilder {
      * by the {@code certpathbuilder.type} security property, or the string
      * {@literal "PKIX"} if no such property exists.
      */
-    public final static String getDefaultType() {
+    public static final String getDefaultType() {
         String cpbtype =
             AccessController.doPrivileged(new PrivilegedAction<>() {
                 public String run() {
diff --git a/jdk/src/java.base/share/classes/java/security/cert/CertPathHelperImpl.java b/jdk/src/java.base/share/classes/java/security/cert/CertPathHelperImpl.java
index fd9e11198d4..24507e2bbd3 100644
--- a/jdk/src/java.base/share/classes/java/security/cert/CertPathHelperImpl.java
+++ b/jdk/src/java.base/share/classes/java/security/cert/CertPathHelperImpl.java
@@ -49,7 +49,7 @@ class CertPathHelperImpl extends CertPathHelper {
      * the methods in this class. This ensures that the helper is initialized
      * prior to a tunneled call from the Sun provider.
      */
-    synchronized static void initialize() {
+    static synchronized void initialize() {
         if (CertPathHelper.instance == null) {
             CertPathHelper.instance = new CertPathHelperImpl();
         }
diff --git a/jdk/src/java.base/share/classes/java/security/cert/CertPathValidator.java b/jdk/src/java.base/share/classes/java/security/cert/CertPathValidator.java
index ce9d38d1800..857fa2faa8c 100644
--- a/jdk/src/java.base/share/classes/java/security/cert/CertPathValidator.java
+++ b/jdk/src/java.base/share/classes/java/security/cert/CertPathValidator.java
@@ -311,7 +311,7 @@ public class CertPathValidator {
      * by the {@code certpathvalidator.type} security property, or the string
      * {@literal "PKIX"} if no such property exists.
      */
-    public final static String getDefaultType() {
+    public static final String getDefaultType() {
         String cpvtype =
             AccessController.doPrivileged(new PrivilegedAction<>() {
                 public String run() {
diff --git a/jdk/src/java.base/share/classes/java/security/cert/CertStore.java b/jdk/src/java.base/share/classes/java/security/cert/CertStore.java
index d39d6703b9a..79835d8ba3b 100644
--- a/jdk/src/java.base/share/classes/java/security/cert/CertStore.java
+++ b/jdk/src/java.base/share/classes/java/security/cert/CertStore.java
@@ -407,7 +407,7 @@ public class CertStore {
      * {@code certstore.type} security property, or the string
      * {@literal "LDAP"} if no such property exists.
      */
-    public final static String getDefaultType() {
+    public static final String getDefaultType() {
         String cstype;
         cstype = AccessController.doPrivileged(new PrivilegedAction<>() {
             public String run() {
diff --git a/jdk/src/java.base/share/classes/java/security/cert/X509CertSelector.java b/jdk/src/java.base/share/classes/java/security/cert/X509CertSelector.java
index ba13f3cdb2a..c9e132766d8 100644
--- a/jdk/src/java.base/share/classes/java/security/cert/X509CertSelector.java
+++ b/jdk/src/java.base/share/classes/java/security/cert/X509CertSelector.java
@@ -87,7 +87,7 @@ public class X509CertSelector implements CertSelector {
 
     private static final Debug debug = Debug.getInstance("certpath");
 
-    private final static ObjectIdentifier ANY_EXTENDED_KEY_USAGE =
+    private static final ObjectIdentifier ANY_EXTENDED_KEY_USAGE =
         ObjectIdentifier.newInternal(new int[] {2, 5, 29, 37, 0});
 
     static {
diff --git a/jdk/src/java.base/share/classes/java/text/AttributedString.java b/jdk/src/java.base/share/classes/java/text/AttributedString.java
index 6e89fdec599..fc62f5c71fd 100644
--- a/jdk/src/java.base/share/classes/java/text/AttributedString.java
+++ b/jdk/src/java.base/share/classes/java/text/AttributedString.java
@@ -667,7 +667,7 @@ public class AttributedString {
     }
 
     // returns whether the two objects are either both null or equal
-    private final static boolean valuesMatch(Object value1, Object value2) {
+    private static final boolean valuesMatch(Object value1, Object value2) {
         if (value1 == null) {
             return value2 == null;
         } else {
@@ -732,7 +732,7 @@ public class AttributedString {
 
     // the iterator class associated with this string class
 
-    final private class AttributedStringIterator implements AttributedCharacterIterator {
+    private final class AttributedStringIterator implements AttributedCharacterIterator {
 
         // note on synchronization:
         // we don't synchronize on the iterator, assuming that an iterator is only used in one thread.
@@ -1045,7 +1045,7 @@ public class AttributedString {
 
     // the map class associated with this string class, giving access to the attributes of one run
 
-    final private class AttributeMap extends AbstractMap {
+    private final class AttributeMap extends AbstractMap {
 
         int runIndex;
         int beginIndex;
diff --git a/jdk/src/java.base/share/classes/java/text/CollationElementIterator.java b/jdk/src/java.base/share/classes/java/text/CollationElementIterator.java
index 7468cb5232d..7060ac0c8b6 100644
--- a/jdk/src/java.base/share/classes/java/text/CollationElementIterator.java
+++ b/jdk/src/java.base/share/classes/java/text/CollationElementIterator.java
@@ -111,7 +111,7 @@ public final class CollationElementIterator
      * Null order which indicates the end of string is reached by the
      * cursor.
      */
-    public final static int NULLORDER = 0xffffffff;
+    public static final int NULLORDER = 0xffffffff;
 
     /**
      * CollationElementIterator constructor.  This takes the source string and
@@ -358,7 +358,7 @@ public final class CollationElementIterator
      * @param order the collation element
      * @return the element's primary component
      */
-    public final static int primaryOrder(int order)
+    public static final int primaryOrder(int order)
     {
         order &= RBCollationTables.PRIMARYORDERMASK;
         return (order >>> RBCollationTables.PRIMARYORDERSHIFT);
@@ -368,7 +368,7 @@ public final class CollationElementIterator
      * @param order the collation element
      * @return the element's secondary component
      */
-    public final static short secondaryOrder(int order)
+    public static final short secondaryOrder(int order)
     {
         order = order & RBCollationTables.SECONDARYORDERMASK;
         return ((short)(order >> RBCollationTables.SECONDARYORDERSHIFT));
@@ -378,7 +378,7 @@ public final class CollationElementIterator
      * @param order the collation element
      * @return the element's tertiary component
      */
-    public final static short tertiaryOrder(int order)
+    public static final short tertiaryOrder(int order)
     {
         return ((short)(order &= RBCollationTables.TERTIARYORDERMASK));
     }
@@ -540,14 +540,14 @@ public final class CollationElementIterator
      * Determine if a character is a Thai vowel (which sorts after
      * its base consonant).
      */
-    private final static boolean isThaiPreVowel(int ch) {
+    private static final boolean isThaiPreVowel(int ch) {
         return (ch >= 0x0e40) && (ch <= 0x0e44);
     }
 
     /**
      * Determine if a character is a Thai base consonant
      */
-    private final static boolean isThaiBaseConsonant(int ch) {
+    private static final boolean isThaiBaseConsonant(int ch) {
         return (ch >= 0x0e01) && (ch <= 0x0e2e);
     }
 
@@ -555,14 +555,14 @@ public final class CollationElementIterator
      * Determine if a character is a Lao vowel (which sorts after
      * its base consonant).
      */
-    private final static boolean isLaoPreVowel(int ch) {
+    private static final boolean isLaoPreVowel(int ch) {
         return (ch >= 0x0ec0) && (ch <= 0x0ec4);
     }
 
     /**
      * Determine if a character is a Lao base consonant
      */
-    private final static boolean isLaoBaseConsonant(int ch) {
+    private static final boolean isLaoBaseConsonant(int ch) {
         return (ch >= 0x0e81) && (ch <= 0x0eae);
     }
 
@@ -634,7 +634,7 @@ public final class CollationElementIterator
      *  Check if a comparison order is ignorable.
      *  @return true if a character is ignorable, false otherwise.
      */
-    final static boolean isIgnorable(int order)
+    static final boolean isIgnorable(int order)
     {
         return ((primaryOrder(order) == 0) ? true : false);
     }
@@ -770,7 +770,7 @@ public final class CollationElementIterator
         return order;
     }
 
-    final static int UNMAPPEDCHARVALUE = 0x7FFF0000;
+    static final int UNMAPPEDCHARVALUE = 0x7FFF0000;
 
     private NormalizerBase text = null;
     private int[] buffer = null;
diff --git a/jdk/src/java.base/share/classes/java/text/CollationKey.java b/jdk/src/java.base/share/classes/java/text/CollationKey.java
index d4c7751a913..4f9c3c6ac49 100644
--- a/jdk/src/java.base/share/classes/java/text/CollationKey.java
+++ b/jdk/src/java.base/share/classes/java/text/CollationKey.java
@@ -108,7 +108,7 @@ public abstract class CollationKey implements Comparable {
      * zero if this is greater than target.
      * @see java.text.Collator#compare
      */
-    abstract public int compareTo(CollationKey target);
+    public abstract int compareTo(CollationKey target);
 
     /**
      * Returns the String that this CollationKey represents.
@@ -128,7 +128,7 @@ public abstract class CollationKey implements Comparable {
      *
      * @return a byte array representation of the CollationKey
      */
-    abstract public byte[] toByteArray();
+    public abstract byte[] toByteArray();
 
 
   /**
@@ -145,5 +145,5 @@ public abstract class CollationKey implements Comparable {
         this.source = source;
     }
 
-    final private String source;
+    private final String source;
 }
diff --git a/jdk/src/java.base/share/classes/java/text/Collator.java b/jdk/src/java.base/share/classes/java/text/Collator.java
index 228e8cf40b5..ce2f8945856 100644
--- a/jdk/src/java.base/share/classes/java/text/Collator.java
+++ b/jdk/src/java.base/share/classes/java/text/Collator.java
@@ -136,7 +136,7 @@ public abstract class Collator
      * @see java.text.Collator#setStrength
      * @see java.text.Collator#getStrength
      */
-    public final static int PRIMARY = 0;
+    public static final int PRIMARY = 0;
     /**
      * Collator strength value.  When set, only SECONDARY and above differences are
      * considered significant during comparison. The assignment of strengths
@@ -146,7 +146,7 @@ public abstract class Collator
      * @see java.text.Collator#setStrength
      * @see java.text.Collator#getStrength
      */
-    public final static int SECONDARY = 1;
+    public static final int SECONDARY = 1;
     /**
      * Collator strength value.  When set, only TERTIARY and above differences are
      * considered significant during comparison. The assignment of strengths
@@ -155,7 +155,7 @@ public abstract class Collator
      * @see java.text.Collator#setStrength
      * @see java.text.Collator#getStrength
      */
-    public final static int TERTIARY = 2;
+    public static final int TERTIARY = 2;
 
     /**
      * Collator strength value.  When set, all differences are
@@ -168,7 +168,7 @@ public abstract class Collator
      * (A, combining-grave) will be considered significant at the IDENTICAL
      * level if decomposition is set to NO_DECOMPOSITION.
      */
-    public final static int IDENTICAL = 3;
+    public static final int IDENTICAL = 3;
 
     /**
      * Decomposition mode value. With NO_DECOMPOSITION
@@ -178,7 +178,7 @@ public abstract class Collator
      * @see java.text.Collator#getDecomposition
      * @see java.text.Collator#setDecomposition
      */
-    public final static int NO_DECOMPOSITION = 0;
+    public static final int NO_DECOMPOSITION = 0;
 
     /**
      * Decomposition mode value. With CANONICAL_DECOMPOSITION
@@ -193,7 +193,7 @@ public abstract class Collator
      * @see java.text.Collator#getDecomposition
      * @see java.text.Collator#setDecomposition
      */
-    public final static int CANONICAL_DECOMPOSITION = 1;
+    public static final int CANONICAL_DECOMPOSITION = 1;
 
     /**
      * Decomposition mode value. With FULL_DECOMPOSITION
@@ -212,7 +212,7 @@ public abstract class Collator
      * @see java.text.Collator#getDecomposition
      * @see java.text.Collator#setDecomposition
      */
-    public final static int FULL_DECOMPOSITION = 2;
+    public static final int FULL_DECOMPOSITION = 2;
 
     /**
      * Gets the Collator for the current default locale.
@@ -472,7 +472,7 @@ public abstract class Collator
      * Generates the hash code for this Collator.
      */
     @Override
-    abstract public int hashCode();
+    public abstract int hashCode();
 
     /**
      * Default constructor.  This constructor is
@@ -499,17 +499,17 @@ public abstract class Collator
      * string in the compare() method.
      * @see java.text.Collator#compare
      */
-    final static int LESS = -1;
+    static final int LESS = -1;
     /**
      * EQUAL is returned if source string is compared to be equal to target
      * string in the compare() method.
      * @see java.text.Collator#compare
      */
-    final static int EQUAL = 0;
+    static final int EQUAL = 0;
     /**
      * GREATER is returned if source string is compared to be greater than
      * target string in the compare() method.
      * @see java.text.Collator#compare
      */
-    final static int GREATER = 1;
+    static final int GREATER = 1;
  }
diff --git a/jdk/src/java.base/share/classes/java/text/DateFormat.java b/jdk/src/java.base/share/classes/java/text/DateFormat.java
index 5e70d674db9..710e9dd9007 100644
--- a/jdk/src/java.base/share/classes/java/text/DateFormat.java
+++ b/jdk/src/java.base/share/classes/java/text/DateFormat.java
@@ -175,100 +175,100 @@ public abstract class DateFormat extends Format {
      * Useful constant for ERA field alignment.
      * Used in FieldPosition of date/time formatting.
      */
-    public final static int ERA_FIELD = 0;
+    public static final int ERA_FIELD = 0;
     /**
      * Useful constant for YEAR field alignment.
      * Used in FieldPosition of date/time formatting.
      */
-    public final static int YEAR_FIELD = 1;
+    public static final int YEAR_FIELD = 1;
     /**
      * Useful constant for MONTH field alignment.
      * Used in FieldPosition of date/time formatting.
      */
-    public final static int MONTH_FIELD = 2;
+    public static final int MONTH_FIELD = 2;
     /**
      * Useful constant for DATE field alignment.
      * Used in FieldPosition of date/time formatting.
      */
-    public final static int DATE_FIELD = 3;
+    public static final int DATE_FIELD = 3;
     /**
      * Useful constant for one-based HOUR_OF_DAY field alignment.
      * Used in FieldPosition of date/time formatting.
      * HOUR_OF_DAY1_FIELD is used for the one-based 24-hour clock.
      * For example, 23:59 + 01:00 results in 24:59.
      */
-    public final static int HOUR_OF_DAY1_FIELD = 4;
+    public static final int HOUR_OF_DAY1_FIELD = 4;
     /**
      * Useful constant for zero-based HOUR_OF_DAY field alignment.
      * Used in FieldPosition of date/time formatting.
      * HOUR_OF_DAY0_FIELD is used for the zero-based 24-hour clock.
      * For example, 23:59 + 01:00 results in 00:59.
      */
-    public final static int HOUR_OF_DAY0_FIELD = 5;
+    public static final int HOUR_OF_DAY0_FIELD = 5;
     /**
      * Useful constant for MINUTE field alignment.
      * Used in FieldPosition of date/time formatting.
      */
-    public final static int MINUTE_FIELD = 6;
+    public static final int MINUTE_FIELD = 6;
     /**
      * Useful constant for SECOND field alignment.
      * Used in FieldPosition of date/time formatting.
      */
-    public final static int SECOND_FIELD = 7;
+    public static final int SECOND_FIELD = 7;
     /**
      * Useful constant for MILLISECOND field alignment.
      * Used in FieldPosition of date/time formatting.
      */
-    public final static int MILLISECOND_FIELD = 8;
+    public static final int MILLISECOND_FIELD = 8;
     /**
      * Useful constant for DAY_OF_WEEK field alignment.
      * Used in FieldPosition of date/time formatting.
      */
-    public final static int DAY_OF_WEEK_FIELD = 9;
+    public static final int DAY_OF_WEEK_FIELD = 9;
     /**
      * Useful constant for DAY_OF_YEAR field alignment.
      * Used in FieldPosition of date/time formatting.
      */
-    public final static int DAY_OF_YEAR_FIELD = 10;
+    public static final int DAY_OF_YEAR_FIELD = 10;
     /**
      * Useful constant for DAY_OF_WEEK_IN_MONTH field alignment.
      * Used in FieldPosition of date/time formatting.
      */
-    public final static int DAY_OF_WEEK_IN_MONTH_FIELD = 11;
+    public static final int DAY_OF_WEEK_IN_MONTH_FIELD = 11;
     /**
      * Useful constant for WEEK_OF_YEAR field alignment.
      * Used in FieldPosition of date/time formatting.
      */
-    public final static int WEEK_OF_YEAR_FIELD = 12;
+    public static final int WEEK_OF_YEAR_FIELD = 12;
     /**
      * Useful constant for WEEK_OF_MONTH field alignment.
      * Used in FieldPosition of date/time formatting.
      */
-    public final static int WEEK_OF_MONTH_FIELD = 13;
+    public static final int WEEK_OF_MONTH_FIELD = 13;
     /**
      * Useful constant for AM_PM field alignment.
      * Used in FieldPosition of date/time formatting.
      */
-    public final static int AM_PM_FIELD = 14;
+    public static final int AM_PM_FIELD = 14;
     /**
      * Useful constant for one-based HOUR field alignment.
      * Used in FieldPosition of date/time formatting.
      * HOUR1_FIELD is used for the one-based 12-hour clock.
      * For example, 11:30 PM + 1 hour results in 12:30 AM.
      */
-    public final static int HOUR1_FIELD = 15;
+    public static final int HOUR1_FIELD = 15;
     /**
      * Useful constant for zero-based HOUR field alignment.
      * Used in FieldPosition of date/time formatting.
      * HOUR0_FIELD is used for the zero-based 12-hour clock.
      * For example, 11:30 PM + 1 hour results in 00:30 AM.
      */
-    public final static int HOUR0_FIELD = 16;
+    public static final int HOUR0_FIELD = 16;
     /**
      * Useful constant for TIMEZONE field alignment.
      * Used in FieldPosition of date/time formatting.
      */
-    public final static int TIMEZONE_FIELD = 17;
+    public static final int TIMEZONE_FIELD = 17;
 
     // Proclaim serial compatibility with 1.1 FCS
     private static final long serialVersionUID = 7218322306649953788L;
@@ -455,7 +455,7 @@ public abstract class DateFormat extends Format {
      * @see java.util.Locale.Category#FORMAT
      * @return a time formatter.
      */
-    public final static DateFormat getTimeInstance()
+    public static final DateFormat getTimeInstance()
     {
         return get(DEFAULT, 0, 1, Locale.getDefault(Locale.Category.FORMAT));
     }
@@ -472,7 +472,7 @@ public abstract class DateFormat extends Format {
      * SHORT for "h:mm a" in the US locale.
      * @return a time formatter.
      */
-    public final static DateFormat getTimeInstance(int style)
+    public static final DateFormat getTimeInstance(int style)
     {
         return get(style, 0, 1, Locale.getDefault(Locale.Category.FORMAT));
     }
@@ -485,7 +485,7 @@ public abstract class DateFormat extends Format {
      * @param aLocale the given locale.
      * @return a time formatter.
      */
-    public final static DateFormat getTimeInstance(int style,
+    public static final DateFormat getTimeInstance(int style,
                                                  Locale aLocale)
     {
         return get(style, 0, 1, aLocale);
@@ -501,7 +501,7 @@ public abstract class DateFormat extends Format {
      * @see java.util.Locale.Category#FORMAT
      * @return a date formatter.
      */
-    public final static DateFormat getDateInstance()
+    public static final DateFormat getDateInstance()
     {
         return get(0, DEFAULT, 2, Locale.getDefault(Locale.Category.FORMAT));
     }
@@ -518,7 +518,7 @@ public abstract class DateFormat extends Format {
      * SHORT for "M/d/yy" in the US locale.
      * @return a date formatter.
      */
-    public final static DateFormat getDateInstance(int style)
+    public static final DateFormat getDateInstance(int style)
     {
         return get(0, style, 2, Locale.getDefault(Locale.Category.FORMAT));
     }
@@ -531,7 +531,7 @@ public abstract class DateFormat extends Format {
      * @param aLocale the given locale.
      * @return a date formatter.
      */
-    public final static DateFormat getDateInstance(int style,
+    public static final DateFormat getDateInstance(int style,
                                                  Locale aLocale)
     {
         return get(0, style, 2, aLocale);
@@ -547,7 +547,7 @@ public abstract class DateFormat extends Format {
      * @see java.util.Locale.Category#FORMAT
      * @return a date/time formatter.
      */
-    public final static DateFormat getDateTimeInstance()
+    public static final DateFormat getDateTimeInstance()
     {
         return get(DEFAULT, DEFAULT, 3, Locale.getDefault(Locale.Category.FORMAT));
     }
@@ -566,7 +566,7 @@ public abstract class DateFormat extends Format {
      * SHORT for "h:mm a" in the US locale.
      * @return a date/time formatter.
      */
-    public final static DateFormat getDateTimeInstance(int dateStyle,
+    public static final DateFormat getDateTimeInstance(int dateStyle,
                                                        int timeStyle)
     {
         return get(timeStyle, dateStyle, 3, Locale.getDefault(Locale.Category.FORMAT));
@@ -580,7 +580,7 @@ public abstract class DateFormat extends Format {
      * @param aLocale the given locale.
      * @return a date/time formatter.
      */
-    public final static DateFormat
+    public static final DateFormat
         getDateTimeInstance(int dateStyle, int timeStyle, Locale aLocale)
     {
         return get(timeStyle, dateStyle, 3, aLocale);
@@ -592,7 +592,7 @@ public abstract class DateFormat extends Format {
      *
      * @return a date/time formatter
      */
-    public final static DateFormat getInstance() {
+    public static final DateFormat getInstance() {
         return getDateTimeInstance(SHORT, SHORT);
     }
 
@@ -934,107 +934,107 @@ public abstract class DateFormat extends Format {
         /**
          * Constant identifying the era field.
          */
-        public final static Field ERA = new Field("era", Calendar.ERA);
+        public static final Field ERA = new Field("era", Calendar.ERA);
 
         /**
          * Constant identifying the year field.
          */
-        public final static Field YEAR = new Field("year", Calendar.YEAR);
+        public static final Field YEAR = new Field("year", Calendar.YEAR);
 
         /**
          * Constant identifying the month field.
          */
-        public final static Field MONTH = new Field("month", Calendar.MONTH);
+        public static final Field MONTH = new Field("month", Calendar.MONTH);
 
         /**
          * Constant identifying the day of month field.
          */
-        public final static Field DAY_OF_MONTH = new
+        public static final Field DAY_OF_MONTH = new
                             Field("day of month", Calendar.DAY_OF_MONTH);
 
         /**
          * Constant identifying the hour of day field, where the legal values
          * are 1 to 24.
          */
-        public final static Field HOUR_OF_DAY1 = new Field("hour of day 1",-1);
+        public static final Field HOUR_OF_DAY1 = new Field("hour of day 1",-1);
 
         /**
          * Constant identifying the hour of day field, where the legal values
          * are 0 to 23.
          */
-        public final static Field HOUR_OF_DAY0 = new
+        public static final Field HOUR_OF_DAY0 = new
                Field("hour of day", Calendar.HOUR_OF_DAY);
 
         /**
          * Constant identifying the minute field.
          */
-        public final static Field MINUTE =new Field("minute", Calendar.MINUTE);
+        public static final Field MINUTE =new Field("minute", Calendar.MINUTE);
 
         /**
          * Constant identifying the second field.
          */
-        public final static Field SECOND =new Field("second", Calendar.SECOND);
+        public static final Field SECOND =new Field("second", Calendar.SECOND);
 
         /**
          * Constant identifying the millisecond field.
          */
-        public final static Field MILLISECOND = new
+        public static final Field MILLISECOND = new
                 Field("millisecond", Calendar.MILLISECOND);
 
         /**
          * Constant identifying the day of week field.
          */
-        public final static Field DAY_OF_WEEK = new
+        public static final Field DAY_OF_WEEK = new
                 Field("day of week", Calendar.DAY_OF_WEEK);
 
         /**
          * Constant identifying the day of year field.
          */
-        public final static Field DAY_OF_YEAR = new
+        public static final Field DAY_OF_YEAR = new
                 Field("day of year", Calendar.DAY_OF_YEAR);
 
         /**
          * Constant identifying the day of week field.
          */
-        public final static Field DAY_OF_WEEK_IN_MONTH =
+        public static final Field DAY_OF_WEEK_IN_MONTH =
                      new Field("day of week in month",
                                             Calendar.DAY_OF_WEEK_IN_MONTH);
 
         /**
          * Constant identifying the week of year field.
          */
-        public final static Field WEEK_OF_YEAR = new
+        public static final Field WEEK_OF_YEAR = new
               Field("week of year", Calendar.WEEK_OF_YEAR);
 
         /**
          * Constant identifying the week of month field.
          */
-        public final static Field WEEK_OF_MONTH = new
+        public static final Field WEEK_OF_MONTH = new
             Field("week of month", Calendar.WEEK_OF_MONTH);
 
         /**
          * Constant identifying the time of day indicator
          * (e.g. "a.m." or "p.m.") field.
          */
-        public final static Field AM_PM = new
+        public static final Field AM_PM = new
                             Field("am pm", Calendar.AM_PM);
 
         /**
          * Constant identifying the hour field, where the legal values are
          * 1 to 12.
          */
-        public final static Field HOUR1 = new Field("hour 1", -1);
+        public static final Field HOUR1 = new Field("hour 1", -1);
 
         /**
          * Constant identifying the hour field, where the legal values are
          * 0 to 11.
          */
-        public final static Field HOUR0 = new
+        public static final Field HOUR0 = new
                             Field("hour", Calendar.HOUR);
 
         /**
          * Constant identifying the time zone field.
          */
-        public final static Field TIME_ZONE = new Field("time zone", -1);
+        public static final Field TIME_ZONE = new Field("time zone", -1);
     }
 }
diff --git a/jdk/src/java.base/share/classes/java/text/MessageFormat.java b/jdk/src/java.base/share/classes/java/text/MessageFormat.java
index 5239db0c119..dc5da063722 100644
--- a/jdk/src/java.base/share/classes/java/text/MessageFormat.java
+++ b/jdk/src/java.base/share/classes/java/text/MessageFormat.java
@@ -1168,7 +1168,7 @@ public class MessageFormat extends Format {
          * indicating the index in the arguments array of the
          * argument from which the text was generated.
          */
-        public final static Field ARGUMENT =
+        public static final Field ARGUMENT =
                            new Field("message argument field");
     }
 
diff --git a/jdk/src/java.base/share/classes/java/text/NumberFormat.java b/jdk/src/java.base/share/classes/java/text/NumberFormat.java
index 2fdcad62166..1431187e530 100644
--- a/jdk/src/java.base/share/classes/java/text/NumberFormat.java
+++ b/jdk/src/java.base/share/classes/java/text/NumberFormat.java
@@ -425,7 +425,7 @@ public abstract class NumberFormat extends Format  {
      * @return the {@code NumberFormat} instance for general-purpose number
      * formatting
      */
-    public final static NumberFormat getInstance() {
+    public static final NumberFormat getInstance() {
         return getInstance(Locale.getDefault(Locale.Category.FORMAT), NUMBERSTYLE);
     }
 
@@ -454,7 +454,7 @@ public abstract class NumberFormat extends Format  {
      * @see java.util.Locale#getDefault(java.util.Locale.Category)
      * @see java.util.Locale.Category#FORMAT
      */
-    public final static NumberFormat getNumberInstance() {
+    public static final NumberFormat getNumberInstance() {
         return getInstance(Locale.getDefault(Locale.Category.FORMAT), NUMBERSTYLE);
     }
 
@@ -487,7 +487,7 @@ public abstract class NumberFormat extends Format  {
      * @return a number format for integer values
      * @since 1.4
      */
-    public final static NumberFormat getIntegerInstance() {
+    public static final NumberFormat getIntegerInstance() {
         return getInstance(Locale.getDefault(Locale.Category.FORMAT), INTEGERSTYLE);
     }
 
@@ -519,7 +519,7 @@ public abstract class NumberFormat extends Format  {
      * @see java.util.Locale#getDefault(java.util.Locale.Category)
      * @see java.util.Locale.Category#FORMAT
      */
-    public final static NumberFormat getCurrencyInstance() {
+    public static final NumberFormat getCurrencyInstance() {
         return getInstance(Locale.getDefault(Locale.Category.FORMAT), CURRENCYSTYLE);
     }
 
@@ -544,7 +544,7 @@ public abstract class NumberFormat extends Format  {
      * @see java.util.Locale#getDefault(java.util.Locale.Category)
      * @see java.util.Locale.Category#FORMAT
      */
-    public final static NumberFormat getPercentInstance() {
+    public static final NumberFormat getPercentInstance() {
         return getInstance(Locale.getDefault(Locale.Category.FORMAT), PERCENTSTYLE);
     }
 
diff --git a/jdk/src/java.base/share/classes/java/text/RBCollationTables.java b/jdk/src/java.base/share/classes/java/text/RBCollationTables.java
index 3423c2b24b1..7ec317bf565 100644
--- a/jdk/src/java.base/share/classes/java/text/RBCollationTables.java
+++ b/jdk/src/java.base/share/classes/java/text/RBCollationTables.java
@@ -258,7 +258,7 @@ final class RBCollationTables {
         }
     }
 
-    final static int getEntry(Vector list, String name, boolean fwd) {
+    static final int getEntry(Vector list, String name, boolean fwd) {
         for (int i = 0; i < list.size(); i++) {
             EntryPair pair = list.elementAt(i);
             if (pair.fwd == fwd && pair.entryName.equals(name)) {
@@ -272,17 +272,17 @@ final class RBCollationTables {
     // constants
     // ==============================================================
     //sherman/Todo: is the value big enough?????
-    final static int EXPANDCHARINDEX = 0x7E000000; // Expand index follows
-    final static int CONTRACTCHARINDEX = 0x7F000000;  // contract indexes follow
-    final static int UNMAPPED = 0xFFFFFFFF;
+    static final int EXPANDCHARINDEX = 0x7E000000; // Expand index follows
+    static final int CONTRACTCHARINDEX = 0x7F000000;  // contract indexes follow
+    static final int UNMAPPED = 0xFFFFFFFF;
 
-    final static int PRIMARYORDERMASK = 0xffff0000;
-    final static int SECONDARYORDERMASK = 0x0000ff00;
-    final static int TERTIARYORDERMASK = 0x000000ff;
-    final static int PRIMARYDIFFERENCEONLY = 0xffff0000;
-    final static int SECONDARYDIFFERENCEONLY = 0xffffff00;
-    final static int PRIMARYORDERSHIFT = 16;
-    final static int SECONDARYORDERSHIFT = 8;
+    static final int PRIMARYORDERMASK = 0xffff0000;
+    static final int SECONDARYORDERMASK = 0x0000ff00;
+    static final int TERTIARYORDERMASK = 0x000000ff;
+    static final int PRIMARYDIFFERENCEONLY = 0xffff0000;
+    static final int SECONDARYDIFFERENCEONLY = 0xffffff00;
+    static final int PRIMARYORDERSHIFT = 16;
+    static final int SECONDARYORDERSHIFT = 8;
 
     // ==============================================================
     // instance variables
diff --git a/jdk/src/java.base/share/classes/java/text/RBTableBuilder.java b/jdk/src/java.base/share/classes/java/text/RBTableBuilder.java
index f7dcbe1e858..99ac56ef56d 100644
--- a/jdk/src/java.base/share/classes/java/text/RBTableBuilder.java
+++ b/jdk/src/java.base/share/classes/java/text/RBTableBuilder.java
@@ -583,14 +583,14 @@ final class RBTableBuilder {
     // ==============================================================
     // constants
     // ==============================================================
-    final static int CHARINDEX = 0x70000000;  // need look up in .commit()
+    static final int CHARINDEX = 0x70000000;  // need look up in .commit()
 
-    private final static int IGNORABLEMASK = 0x0000ffff;
-    private final static int PRIMARYORDERINCREMENT = 0x00010000;
-    private final static int SECONDARYORDERINCREMENT = 0x00000100;
-    private final static int TERTIARYORDERINCREMENT = 0x00000001;
-    private final static int INITIALTABLESIZE = 20;
-    private final static int MAXKEYSIZE = 5;
+    private static final int IGNORABLEMASK = 0x0000ffff;
+    private static final int PRIMARYORDERINCREMENT = 0x00010000;
+    private static final int SECONDARYORDERINCREMENT = 0x00000100;
+    private static final int TERTIARYORDERINCREMENT = 0x00000001;
+    private static final int INITIALTABLESIZE = 20;
+    private static final int MAXKEYSIZE = 5;
 
     // ==============================================================
     // instance variables
diff --git a/jdk/src/java.base/share/classes/java/text/RuleBasedCollator.java b/jdk/src/java.base/share/classes/java/text/RuleBasedCollator.java
index 53ebc7e7ef5..e3c2c8c309e 100644
--- a/jdk/src/java.base/share/classes/java/text/RuleBasedCollator.java
+++ b/jdk/src/java.base/share/classes/java/text/RuleBasedCollator.java
@@ -750,12 +750,12 @@ public class RuleBasedCollator extends Collator{
     // private
     // ==============================================================
 
-    final static int CHARINDEX = 0x70000000;  // need look up in .commit()
-    final static int EXPANDCHARINDEX = 0x7E000000; // Expand index follows
-    final static int CONTRACTCHARINDEX = 0x7F000000;  // contract indexes follow
-    final static int UNMAPPED = 0xFFFFFFFF;
+    static final int CHARINDEX = 0x70000000;  // need look up in .commit()
+    static final int EXPANDCHARINDEX = 0x7E000000; // Expand index follows
+    static final int CONTRACTCHARINDEX = 0x7F000000;  // contract indexes follow
+    static final int UNMAPPED = 0xFFFFFFFF;
 
-    private final static int COLLATIONKEYOFFSET = 1;
+    private static final int COLLATIONKEYOFFSET = 1;
 
     private RBCollationTables tables = null;
 
diff --git a/jdk/src/java.base/share/classes/java/text/SimpleDateFormat.java b/jdk/src/java.base/share/classes/java/text/SimpleDateFormat.java
index 84c472f0709..3c0f9a33edc 100644
--- a/jdk/src/java.base/share/classes/java/text/SimpleDateFormat.java
+++ b/jdk/src/java.base/share/classes/java/text/SimpleDateFormat.java
@@ -456,42 +456,42 @@ public class SimpleDateFormat extends DateFormat {
      * Saved numberFormat and pattern.
      * @see SimpleDateFormat#checkNegativeNumberExpression
      */
-    transient private NumberFormat originalNumberFormat;
-    transient private String originalNumberPattern;
+    private transient NumberFormat originalNumberFormat;
+    private transient String originalNumberPattern;
 
     /**
      * The minus sign to be used with format and parse.
      */
-    transient private char minusSign = '-';
+    private transient char minusSign = '-';
 
     /**
      * True when a negative sign follows a number.
      * (True as default in Arabic.)
      */
-    transient private boolean hasFollowingMinusSign = false;
+    private transient boolean hasFollowingMinusSign = false;
 
     /**
      * True if standalone form needs to be used.
      */
-    transient private boolean forceStandaloneForm = false;
+    private transient boolean forceStandaloneForm = false;
 
     /**
      * The compiled pattern.
      */
-    transient private char[] compiledPattern;
+    private transient char[] compiledPattern;
 
     /**
      * Tags for the compiled pattern.
      */
-    private final static int TAG_QUOTE_ASCII_CHAR       = 100;
-    private final static int TAG_QUOTE_CHARS            = 101;
+    private static final int TAG_QUOTE_ASCII_CHAR       = 100;
+    private static final int TAG_QUOTE_CHARS            = 101;
 
     /**
      * Locale dependent digit zero.
      * @see #zeroPaddingNumber
      * @see java.text.DecimalFormatSymbols#getZeroDigit
      */
-    transient private char zeroDigit;
+    private transient char zeroDigit;
 
     /**
      * The symbols used by this formatter for week names, month names,
@@ -510,7 +510,7 @@ public class SimpleDateFormat extends DateFormat {
      */
     private Date defaultCenturyStart;
 
-    transient private int defaultCenturyStartYear;
+    private transient int defaultCenturyStartYear;
 
     private static final int MILLIS_PER_MINUTE = 60 * 1000;
 
diff --git a/jdk/src/java.base/share/classes/java/util/AbstractList.java b/jdk/src/java.base/share/classes/java/util/AbstractList.java
index 391f8b577d4..9e53ab475b3 100644
--- a/jdk/src/java.base/share/classes/java/util/AbstractList.java
+++ b/jdk/src/java.base/share/classes/java/util/AbstractList.java
@@ -115,7 +115,7 @@ public abstract class AbstractList extends AbstractCollection implements L
      *
      * @throws IndexOutOfBoundsException {@inheritDoc}
      */
-    abstract public E get(int index);
+    public abstract E get(int index);
 
     /**
      * {@inheritDoc}
diff --git a/jdk/src/java.base/share/classes/java/util/BitSet.java b/jdk/src/java.base/share/classes/java/util/BitSet.java
index f444072a185..f65035f0601 100644
--- a/jdk/src/java.base/share/classes/java/util/BitSet.java
+++ b/jdk/src/java.base/share/classes/java/util/BitSet.java
@@ -68,9 +68,9 @@ public class BitSet implements Cloneable, java.io.Serializable {
      * a long, which consists of 64 bits, requiring 6 address bits.
      * The choice of word size is determined purely by performance concerns.
      */
-    private final static int ADDRESS_BITS_PER_WORD = 6;
-    private final static int BITS_PER_WORD = 1 << ADDRESS_BITS_PER_WORD;
-    private final static int BIT_INDEX_MASK = BITS_PER_WORD - 1;
+    private static final int ADDRESS_BITS_PER_WORD = 6;
+    private static final int BITS_PER_WORD = 1 << ADDRESS_BITS_PER_WORD;
+    private static final int BIT_INDEX_MASK = BITS_PER_WORD - 1;
 
     /* Used to shift left or right for a partial word mask */
     private static final long WORD_MASK = 0xffffffffffffffffL;
diff --git a/jdk/src/java.base/share/classes/java/util/Calendar.java b/jdk/src/java.base/share/classes/java/util/Calendar.java
index 6d696aaee87..306362b203a 100644
--- a/jdk/src/java.base/share/classes/java/util/Calendar.java
+++ b/jdk/src/java.base/share/classes/java/util/Calendar.java
@@ -370,13 +370,13 @@ public abstract class Calendar implements Serializable, Cloneable, Comparableget and set indicating the
      * year. This is a calendar-specific value; see subclass documentation.
      */
-    public final static int YEAR = 1;
+    public static final int YEAR = 1;
 
     /**
      * Field number for get and set indicating the
@@ -399,7 +399,7 @@ public abstract class Calendar implements Serializable, Cloneable, Comparableget and set indicating the
@@ -412,7 +412,7 @@ public abstract class Calendar implements Serializable, Cloneable, Comparableget and set indicating the
@@ -425,7 +425,7 @@ public abstract class Calendar implements Serializable, Cloneable, Comparableget and set indicating the
@@ -434,7 +434,7 @@ public abstract class Calendar implements Serializable, Cloneable, Comparableget and set indicating the
@@ -443,13 +443,13 @@ public abstract class Calendar implements Serializable, Cloneable, Comparableget and set indicating the day
      * number within the current year.  The first day of the year has value 1.
      */
-    public final static int DAY_OF_YEAR = 6;
+    public static final int DAY_OF_YEAR = 6;
 
     /**
      * Field number for get and set indicating the day
@@ -465,7 +465,7 @@ public abstract class Calendar implements Serializable, Cloneable, Comparableget and set indicating the
@@ -490,7 +490,7 @@ public abstract class Calendar implements Serializable, Cloneable, Comparableget and set indicating
@@ -501,7 +501,7 @@ public abstract class Calendar implements Serializable, Cloneable, Comparableget and set indicating the
@@ -512,7 +512,7 @@ public abstract class Calendar implements Serializable, Cloneable, Comparableget and set indicating the
@@ -521,28 +521,28 @@ public abstract class Calendar implements Serializable, Cloneable, Comparableget and set indicating the
      * minute within the hour.
      * E.g., at 10:04:15.250 PM the MINUTE is 4.
      */
-    public final static int MINUTE = 12;
+    public static final int MINUTE = 12;
 
     /**
      * Field number for get and set indicating the
      * second within the minute.
      * E.g., at 10:04:15.250 PM the SECOND is 15.
      */
-    public final static int SECOND = 13;
+    public static final int SECOND = 13;
 
     /**
      * Field number for get and set indicating the
      * millisecond within the second.
      * E.g., at 10:04:15.250 PM the MILLISECOND is 250.
      */
-    public final static int MILLISECOND = 14;
+    public static final int MILLISECOND = 14;
 
     /**
      * Field number for get and set
@@ -553,7 +553,7 @@ public abstract class Calendar implements Serializable, Cloneable, ComparableTimeZone implementation subclass supports
      * historical GMT offset changes.
      */
-    public final static int ZONE_OFFSET = 15;
+    public static final int ZONE_OFFSET = 15;
 
     /**
      * Field number for get and set indicating the
@@ -564,146 +564,146 @@ public abstract class Calendar implements Serializable, Cloneable, ComparableTimeZone implementation subclass supports
      * historical Daylight Saving Time schedule changes.
      */
-    public final static int DST_OFFSET = 16;
+    public static final int DST_OFFSET = 16;
 
     /**
      * The number of distinct fields recognized by get and set.
      * Field numbers range from 0..FIELD_COUNT-1.
      */
-    public final static int FIELD_COUNT = 17;
+    public static final int FIELD_COUNT = 17;
 
     /**
      * Value of the {@link #DAY_OF_WEEK} field indicating
      * Sunday.
      */
-    public final static int SUNDAY = 1;
+    public static final int SUNDAY = 1;
 
     /**
      * Value of the {@link #DAY_OF_WEEK} field indicating
      * Monday.
      */
-    public final static int MONDAY = 2;
+    public static final int MONDAY = 2;
 
     /**
      * Value of the {@link #DAY_OF_WEEK} field indicating
      * Tuesday.
      */
-    public final static int TUESDAY = 3;
+    public static final int TUESDAY = 3;
 
     /**
      * Value of the {@link #DAY_OF_WEEK} field indicating
      * Wednesday.
      */
-    public final static int WEDNESDAY = 4;
+    public static final int WEDNESDAY = 4;
 
     /**
      * Value of the {@link #DAY_OF_WEEK} field indicating
      * Thursday.
      */
-    public final static int THURSDAY = 5;
+    public static final int THURSDAY = 5;
 
     /**
      * Value of the {@link #DAY_OF_WEEK} field indicating
      * Friday.
      */
-    public final static int FRIDAY = 6;
+    public static final int FRIDAY = 6;
 
     /**
      * Value of the {@link #DAY_OF_WEEK} field indicating
      * Saturday.
      */
-    public final static int SATURDAY = 7;
+    public static final int SATURDAY = 7;
 
     /**
      * Value of the {@link #MONTH} field indicating the
      * first month of the year in the Gregorian and Julian calendars.
      */
-    public final static int JANUARY = 0;
+    public static final int JANUARY = 0;
 
     /**
      * Value of the {@link #MONTH} field indicating the
      * second month of the year in the Gregorian and Julian calendars.
      */
-    public final static int FEBRUARY = 1;
+    public static final int FEBRUARY = 1;
 
     /**
      * Value of the {@link #MONTH} field indicating the
      * third month of the year in the Gregorian and Julian calendars.
      */
-    public final static int MARCH = 2;
+    public static final int MARCH = 2;
 
     /**
      * Value of the {@link #MONTH} field indicating the
      * fourth month of the year in the Gregorian and Julian calendars.
      */
-    public final static int APRIL = 3;
+    public static final int APRIL = 3;
 
     /**
      * Value of the {@link #MONTH} field indicating the
      * fifth month of the year in the Gregorian and Julian calendars.
      */
-    public final static int MAY = 4;
+    public static final int MAY = 4;
 
     /**
      * Value of the {@link #MONTH} field indicating the
      * sixth month of the year in the Gregorian and Julian calendars.
      */
-    public final static int JUNE = 5;
+    public static final int JUNE = 5;
 
     /**
      * Value of the {@link #MONTH} field indicating the
      * seventh month of the year in the Gregorian and Julian calendars.
      */
-    public final static int JULY = 6;
+    public static final int JULY = 6;
 
     /**
      * Value of the {@link #MONTH} field indicating the
      * eighth month of the year in the Gregorian and Julian calendars.
      */
-    public final static int AUGUST = 7;
+    public static final int AUGUST = 7;
 
     /**
      * Value of the {@link #MONTH} field indicating the
      * ninth month of the year in the Gregorian and Julian calendars.
      */
-    public final static int SEPTEMBER = 8;
+    public static final int SEPTEMBER = 8;
 
     /**
      * Value of the {@link #MONTH} field indicating the
      * tenth month of the year in the Gregorian and Julian calendars.
      */
-    public final static int OCTOBER = 9;
+    public static final int OCTOBER = 9;
 
     /**
      * Value of the {@link #MONTH} field indicating the
      * eleventh month of the year in the Gregorian and Julian calendars.
      */
-    public final static int NOVEMBER = 10;
+    public static final int NOVEMBER = 10;
 
     /**
      * Value of the {@link #MONTH} field indicating the
      * twelfth month of the year in the Gregorian and Julian calendars.
      */
-    public final static int DECEMBER = 11;
+    public static final int DECEMBER = 11;
 
     /**
      * Value of the {@link #MONTH} field indicating the
      * thirteenth month of the year. Although GregorianCalendar
      * does not use this value, lunar calendars do.
      */
-    public final static int UNDECIMBER = 12;
+    public static final int UNDECIMBER = 12;
 
     /**
      * Value of the {@link #AM_PM} field indicating the
      * period of the day from midnight to just before noon.
      */
-    public final static int AM = 0;
+    public static final int AM = 0;
 
     /**
      * Value of the {@link #AM_PM} field indicating the
      * period of the day from noon to just before midnight.
      */
-    public final static int PM = 1;
+    public static final int PM = 1;
 
     /**
      * A style specifier for {@link #getDisplayNames(int, int, Locale)
@@ -856,7 +856,7 @@ public abstract class Calendar implements Serializable, Cloneable, ComparableTrue if zone references to a shared TimeZone object.
      */
-    transient private boolean sharedZone = false;
+    private transient boolean sharedZone = false;
 
     /**
      * The first day of the week, with possible values SUNDAY,
@@ -1003,24 +1003,24 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable implements Comparator, Serializable {
+    static final class NullComparator implements Comparator, Serializable {
         private static final long serialVersionUID = -7569533591570686392L;
         private final boolean nullFirst;
         // if null, non-null Ts are considered equal
diff --git a/jdk/src/java.base/share/classes/java/util/Currency.java b/jdk/src/java.base/share/classes/java/util/Currency.java
index c244bb73d8d..e85b9f6ee38 100644
--- a/jdk/src/java.base/share/classes/java/util/Currency.java
+++ b/jdk/src/java.base/share/classes/java/util/Currency.java
@@ -110,13 +110,13 @@ public final class Currency implements Serializable {
      * Default fraction digits for this currency.
      * Set from currency data tables.
      */
-    transient private final int defaultFractionDigits;
+    private final transient int defaultFractionDigits;
 
     /**
      * ISO 4217 numeric code for this currency.
      * Set from currency data tables.
      */
-    transient private final int numericCode;
+    private final transient int numericCode;
 
 
     // class data: instance map
diff --git a/jdk/src/java.base/share/classes/java/util/Date.java b/jdk/src/java.base/share/classes/java/util/Date.java
index 253b67a792a..fe2cbc2cf0c 100644
--- a/jdk/src/java.base/share/classes/java/util/Date.java
+++ b/jdk/src/java.base/share/classes/java/util/Date.java
@@ -613,7 +613,7 @@ public class Date
         // syntax error
         throw new IllegalArgumentException();
     }
-    private final static String wtb[] = {
+    private static final String wtb[] = {
         "am", "pm",
         "monday", "tuesday", "wednesday", "thursday", "friday",
         "saturday", "sunday",
@@ -622,7 +622,7 @@ public class Date
         "gmt", "ut", "utc", "est", "edt", "cst", "cdt",
         "mst", "mdt", "pst", "pdt"
     };
-    private final static int ttb[] = {
+    private static final int ttb[] = {
         14, 1, 0, 0, 0, 0, 0, 0, 0,
         2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
         10000 + 0, 10000 + 0, 10000 + 0,    // GMT/UT/UTC
@@ -1300,7 +1300,7 @@ public class Date
         return gcal;
     }
 
-    synchronized private static final BaseCalendar getJulianCalendar() {
+    private static final synchronized BaseCalendar getJulianCalendar() {
         if (jcal == null) {
             jcal = (BaseCalendar) CalendarSystem.forName("julian");
         }
diff --git a/jdk/src/java.base/share/classes/java/util/Dictionary.java b/jdk/src/java.base/share/classes/java/util/Dictionary.java
index 4d89ec2dff5..c9825b4cc6b 100644
--- a/jdk/src/java.base/share/classes/java/util/Dictionary.java
+++ b/jdk/src/java.base/share/classes/java/util/Dictionary.java
@@ -60,7 +60,7 @@ class Dictionary {
      *
      * @return  the number of keys in this dictionary.
      */
-    abstract public int size();
+    public abstract int size();
 
     /**
      * Tests if this dictionary maps no keys to value. The general contract
@@ -70,7 +70,7 @@ class Dictionary {
      * @return  {@code true} if this dictionary maps no keys to values;
      *          {@code false} otherwise.
      */
-    abstract public boolean isEmpty();
+    public abstract boolean isEmpty();
 
     /**
      * Returns an enumeration of the keys in this dictionary. The general
@@ -82,7 +82,7 @@ class Dictionary {
      * @see     java.util.Dictionary#elements()
      * @see     java.util.Enumeration
      */
-    abstract public Enumeration keys();
+    public abstract Enumeration keys();
 
     /**
      * Returns an enumeration of the values in this dictionary. The general
@@ -94,7 +94,7 @@ class Dictionary {
      * @see     java.util.Dictionary#keys()
      * @see     java.util.Enumeration
      */
-    abstract public Enumeration elements();
+    public abstract Enumeration elements();
 
     /**
      * Returns the value to which the key is mapped in this dictionary.
@@ -109,7 +109,7 @@ class Dictionary {
      * @exception NullPointerException if the {@code key} is {@code null}.
      * @see     java.util.Dictionary#put(java.lang.Object, java.lang.Object)
      */
-    abstract public V get(Object key);
+    public abstract V get(Object key);
 
     /**
      * Maps the specified {@code key} to the specified
@@ -138,7 +138,7 @@ class Dictionary {
      * @see        java.lang.Object#equals(java.lang.Object)
      * @see        java.util.Dictionary#get(java.lang.Object)
      */
-    abstract public V put(K key, V value);
+    public abstract V put(K key, V value);
 
     /**
      * Removes the {@code key} (and its corresponding
@@ -151,5 +151,5 @@ class Dictionary {
      *          mapping.
      * @exception NullPointerException if {@code key} is {@code null}.
      */
-    abstract public V remove(Object key);
+    public abstract V remove(Object key);
 }
diff --git a/jdk/src/java.base/share/classes/java/util/GregorianCalendar.java b/jdk/src/java.base/share/classes/java/util/GregorianCalendar.java
index 692b23891e2..b731b142843 100644
--- a/jdk/src/java.base/share/classes/java/util/GregorianCalendar.java
+++ b/jdk/src/java.base/share/classes/java/util/GregorianCalendar.java
@@ -2282,7 +2282,7 @@ public class GregorianCalendar extends Calendar {
      * Long.MIN_VALUE, the fixed date value is unknown. Currently,
      * Julian calendar dates are not cached.
      */
-    transient private long cachedFixedDate = Long.MIN_VALUE;
+    private transient long cachedFixedDate = Long.MIN_VALUE;
 
     /**
      * Converts the time value (millisecond offset from the Object array representing a
      * key-value pair.
      */
-    abstract protected Object[][] getContents();
+    protected abstract Object[][] getContents();
 
     // ==================privates====================
 
diff --git a/jdk/src/java.base/share/classes/java/util/Locale.java b/jdk/src/java.base/share/classes/java/util/Locale.java
index e785677b3fc..36a81fd8713 100644
--- a/jdk/src/java.base/share/classes/java/util/Locale.java
+++ b/jdk/src/java.base/share/classes/java/util/Locale.java
@@ -483,91 +483,91 @@ import sun.util.locale.provider.ResourceBundleBasedAdapter;
  */
 public final class Locale implements Cloneable, Serializable {
 
-    static private final  Cache LOCALECACHE = new Cache();
+    private static final  Cache LOCALECACHE = new Cache();
 
     /** Useful constant for language.
      */
-    static public final Locale ENGLISH = createConstant("en", "");
+    public static final Locale ENGLISH = createConstant("en", "");
 
     /** Useful constant for language.
      */
-    static public final Locale FRENCH = createConstant("fr", "");
+    public static final Locale FRENCH = createConstant("fr", "");
 
     /** Useful constant for language.
      */
-    static public final Locale GERMAN = createConstant("de", "");
+    public static final Locale GERMAN = createConstant("de", "");
 
     /** Useful constant for language.
      */
-    static public final Locale ITALIAN = createConstant("it", "");
+    public static final Locale ITALIAN = createConstant("it", "");
 
     /** Useful constant for language.
      */
-    static public final Locale JAPANESE = createConstant("ja", "");
+    public static final Locale JAPANESE = createConstant("ja", "");
 
     /** Useful constant for language.
      */
-    static public final Locale KOREAN = createConstant("ko", "");
+    public static final Locale KOREAN = createConstant("ko", "");
 
     /** Useful constant for language.
      */
-    static public final Locale CHINESE = createConstant("zh", "");
+    public static final Locale CHINESE = createConstant("zh", "");
 
     /** Useful constant for language.
      */
-    static public final Locale SIMPLIFIED_CHINESE = createConstant("zh", "CN");
+    public static final Locale SIMPLIFIED_CHINESE = createConstant("zh", "CN");
 
     /** Useful constant for language.
      */
-    static public final Locale TRADITIONAL_CHINESE = createConstant("zh", "TW");
+    public static final Locale TRADITIONAL_CHINESE = createConstant("zh", "TW");
 
     /** Useful constant for country.
      */
-    static public final Locale FRANCE = createConstant("fr", "FR");
+    public static final Locale FRANCE = createConstant("fr", "FR");
 
     /** Useful constant for country.
      */
-    static public final Locale GERMANY = createConstant("de", "DE");
+    public static final Locale GERMANY = createConstant("de", "DE");
 
     /** Useful constant for country.
      */
-    static public final Locale ITALY = createConstant("it", "IT");
+    public static final Locale ITALY = createConstant("it", "IT");
 
     /** Useful constant for country.
      */
-    static public final Locale JAPAN = createConstant("ja", "JP");
+    public static final Locale JAPAN = createConstant("ja", "JP");
 
     /** Useful constant for country.
      */
-    static public final Locale KOREA = createConstant("ko", "KR");
+    public static final Locale KOREA = createConstant("ko", "KR");
 
     /** Useful constant for country.
      */
-    static public final Locale CHINA = SIMPLIFIED_CHINESE;
+    public static final Locale CHINA = SIMPLIFIED_CHINESE;
 
     /** Useful constant for country.
      */
-    static public final Locale PRC = SIMPLIFIED_CHINESE;
+    public static final Locale PRC = SIMPLIFIED_CHINESE;
 
     /** Useful constant for country.
      */
-    static public final Locale TAIWAN = TRADITIONAL_CHINESE;
+    public static final Locale TAIWAN = TRADITIONAL_CHINESE;
 
     /** Useful constant for country.
      */
-    static public final Locale UK = createConstant("en", "GB");
+    public static final Locale UK = createConstant("en", "GB");
 
     /** Useful constant for country.
      */
-    static public final Locale US = createConstant("en", "US");
+    public static final Locale US = createConstant("en", "US");
 
     /** Useful constant for country.
      */
-    static public final Locale CANADA = createConstant("en", "CA");
+    public static final Locale CANADA = createConstant("en", "CA");
 
     /** Useful constant for country.
      */
-    static public final Locale CANADA_FRENCH = createConstant("fr", "CA");
+    public static final Locale CANADA_FRENCH = createConstant("fr", "CA");
 
     /**
      * Useful constant for the root locale.  The root locale is the locale whose
@@ -577,7 +577,7 @@ public final class Locale implements Cloneable, Serializable {
      *
      * @since 1.6
      */
-    static public final Locale ROOT = createConstant("", "");
+    public static final Locale ROOT = createConstant("", "");
 
     /**
      * The key for the private use extension ('x').
@@ -586,7 +586,7 @@ public final class Locale implements Cloneable, Serializable {
      * @see Builder#setExtension(char, String)
      * @since 1.7
      */
-    static public final char PRIVATE_USE_EXTENSION = 'x';
+    public static final char PRIVATE_USE_EXTENSION = 'x';
 
     /**
      * The key for Unicode locale extension ('u').
@@ -595,7 +595,7 @@ public final class Locale implements Cloneable, Serializable {
      * @see Builder#setExtension(char, String)
      * @since 1.7
      */
-    static public final char UNICODE_LOCALE_EXTENSION = 'u';
+    public static final char UNICODE_LOCALE_EXTENSION = 'u';
 
     /** serialization ID
      */
@@ -2018,9 +2018,9 @@ public final class Locale implements Cloneable, Serializable {
      */
     private transient volatile int hashCodeValue = 0;
 
-    private volatile static Locale defaultLocale = initDefault();
-    private volatile static Locale defaultDisplayLocale = null;
-    private volatile static Locale defaultFormatLocale = null;
+    private static volatile Locale defaultLocale = initDefault();
+    private static volatile Locale defaultDisplayLocale = null;
+    private static volatile Locale defaultFormatLocale = null;
 
     private transient volatile String languageTag;
 
diff --git a/jdk/src/java.base/share/classes/java/util/PropertyPermission.java b/jdk/src/java.base/share/classes/java/util/PropertyPermission.java
index 329e0f94232..9e44333ad39 100644
--- a/jdk/src/java.base/share/classes/java/util/PropertyPermission.java
+++ b/jdk/src/java.base/share/classes/java/util/PropertyPermission.java
@@ -90,20 +90,20 @@ public final class PropertyPermission extends BasicPermission {
     /**
      * Read action.
      */
-    private final static int READ    = 0x1;
+    private static final int READ    = 0x1;
 
     /**
      * Write action.
      */
-    private final static int WRITE   = 0x2;
+    private static final int WRITE   = 0x2;
     /**
      * All actions (read,write);
      */
-    private final static int ALL     = READ|WRITE;
+    private static final int ALL     = READ|WRITE;
     /**
      * No actions.
      */
-    private final static int NONE    = 0x0;
+    private static final int NONE    = 0x0;
 
     /**
      * The actions mask.
diff --git a/jdk/src/java.base/share/classes/java/util/Random.java b/jdk/src/java.base/share/classes/java/util/Random.java
index 1061b59361e..f22dca758f7 100644
--- a/jdk/src/java.base/share/classes/java/util/Random.java
+++ b/jdk/src/java.base/share/classes/java/util/Random.java
@@ -165,7 +165,7 @@ class Random implements java.io.Serializable {
      *
      * @param seed the initial seed
      */
-    synchronized public void setSeed(long seed) {
+    public synchronized void setSeed(long seed) {
         this.seed.set(initialScramble(seed));
         haveNextNextGaussian = false;
     }
@@ -580,7 +580,7 @@ class Random implements java.io.Serializable {
      *         standard deviation {@code 1.0} from this random number
      *         generator's sequence
      */
-    synchronized public double nextGaussian() {
+    public synchronized double nextGaussian() {
         // See Knuth, ACP, Section 3.4.1 Algorithm C.
         if (haveNextNextGaussian) {
             haveNextNextGaussian = false;
@@ -1197,7 +1197,7 @@ class Random implements java.io.Serializable {
     /**
      * Save the {@code Random} instance to a stream.
      */
-    synchronized private void writeObject(ObjectOutputStream s)
+    private synchronized void writeObject(ObjectOutputStream s)
         throws IOException {
 
         // set the values of the Serializable fields
diff --git a/jdk/src/java.base/share/classes/java/util/SimpleTimeZone.java b/jdk/src/java.base/share/classes/java/util/SimpleTimeZone.java
index ef70b960ee0..d7555a0db0c 100644
--- a/jdk/src/java.base/share/classes/java/util/SimpleTimeZone.java
+++ b/jdk/src/java.base/share/classes/java/util/SimpleTimeZone.java
@@ -1125,8 +1125,8 @@ public class SimpleTimeZone extends TimeZone {
      * be streamed out for compatibility with JDK 1.1.
      */
     private final byte monthLength[] = staticMonthLength;
-    private final static byte staticMonthLength[] = {31,28,31,30,31,30,31,31,30,31,30,31};
-    private final static byte staticLeapMonthLength[] = {31,29,31,30,31,30,31,31,30,31,30,31};
+    private static final byte staticMonthLength[] = {31,28,31,30,31,30,31,31,30,31,30,31};
+    private static final byte staticLeapMonthLength[] = {31,29,31,30,31,30,31,31,30,31,30,31};
 
     /**
      * Variables specifying the mode of the start rule.  Takes the following
@@ -1278,7 +1278,7 @@ public class SimpleTimeZone extends TimeZone {
      */
     private int serialVersionOnStream = currentSerialVersion;
 
-    synchronized private void invalidateCache() {
+    private synchronized void invalidateCache() {
         cacheYear = startYear - 1;
         cacheStart = cacheEnd = 0;
     }
diff --git a/jdk/src/java.base/share/classes/java/util/Spliterators.java b/jdk/src/java.base/share/classes/java/util/Spliterators.java
index 2f4a84242ef..3b5fe860535 100644
--- a/jdk/src/java.base/share/classes/java/util/Spliterators.java
+++ b/jdk/src/java.base/share/classes/java/util/Spliterators.java
@@ -833,7 +833,7 @@ public final class Spliterators {
 
     // Implementations
 
-    private static abstract class EmptySpliterator, C> {
+    private abstract static class EmptySpliterator, C> {
 
         EmptySpliterator() { }
 
@@ -1253,7 +1253,7 @@ public final class Spliterators {
      * @see #spliterator(Iterator, long, int)
      * @since 1.8
      */
-    public static abstract class AbstractSpliterator implements Spliterator {
+    public abstract static class AbstractSpliterator implements Spliterator {
         static final int BATCH_UNIT = 1 << 10;  // batch array size increment
         static final int MAX_BATCH = 1 << 25;  // max batch array size;
         private final int characteristics;
@@ -1376,7 +1376,7 @@ public final class Spliterators {
      * @see #spliterator(java.util.PrimitiveIterator.OfInt, long, int)
      * @since 1.8
      */
-    public static abstract class AbstractIntSpliterator implements Spliterator.OfInt {
+    public abstract static class AbstractIntSpliterator implements Spliterator.OfInt {
         static final int MAX_BATCH = AbstractSpliterator.MAX_BATCH;
         static final int BATCH_UNIT = AbstractSpliterator.BATCH_UNIT;
         private final int characteristics;
@@ -1486,7 +1486,7 @@ public final class Spliterators {
      * @see #spliterator(java.util.PrimitiveIterator.OfLong, long, int)
      * @since 1.8
      */
-    public static abstract class AbstractLongSpliterator implements Spliterator.OfLong {
+    public abstract static class AbstractLongSpliterator implements Spliterator.OfLong {
         static final int MAX_BATCH = AbstractSpliterator.MAX_BATCH;
         static final int BATCH_UNIT = AbstractSpliterator.BATCH_UNIT;
         private final int characteristics;
@@ -1596,7 +1596,7 @@ public final class Spliterators {
      * @see #spliterator(java.util.PrimitiveIterator.OfDouble, long, int)
      * @since 1.8
      */
-    public static abstract class AbstractDoubleSpliterator implements Spliterator.OfDouble {
+    public abstract static class AbstractDoubleSpliterator implements Spliterator.OfDouble {
         static final int MAX_BATCH = AbstractSpliterator.MAX_BATCH;
         static final int BATCH_UNIT = AbstractSpliterator.BATCH_UNIT;
         private final int characteristics;
diff --git a/jdk/src/java.base/share/classes/java/util/TimeZone.java b/jdk/src/java.base/share/classes/java/util/TimeZone.java
index f28919f36db..3bf886b2721 100644
--- a/jdk/src/java.base/share/classes/java/util/TimeZone.java
+++ b/jdk/src/java.base/share/classes/java/util/TimeZone.java
@@ -130,7 +130,7 @@ import sun.util.locale.provider.TimeZoneNameUtility;
  * @author       Mark Davis, David Goldsmith, Chen-Lieh Huang, Alan Liu
  * @since        1.1
  */
-abstract public class TimeZone implements Serializable, Cloneable {
+public abstract class TimeZone implements Serializable, Cloneable {
     /**
      * Sole constructor.  (For invocation by subclass constructors, typically
      * implicit.)
@@ -253,7 +253,7 @@ abstract public class TimeZone implements Serializable, Cloneable {
      *
      * @param offsetMillis the given base time zone offset to GMT.
      */
-    abstract public void setRawOffset(int offsetMillis);
+    public abstract void setRawOffset(int offsetMillis);
 
     /**
      * Returns the amount of time in milliseconds to add to UTC to get
@@ -500,7 +500,7 @@ abstract public class TimeZone implements Serializable, Cloneable {
      * @return {@code true} if the given date is in Daylight Saving Time,
      *         {@code false}, otherwise.
      */
-    abstract public boolean inDaylightTime(Date date);
+    public abstract boolean inDaylightTime(Date date);
 
     /**
      * Gets the TimeZone for the given ID.
diff --git a/jdk/src/java.base/share/classes/java/util/Timer.java b/jdk/src/java.base/share/classes/java/util/Timer.java
index 9310b0825e1..49ca6ed0d64 100644
--- a/jdk/src/java.base/share/classes/java/util/Timer.java
+++ b/jdk/src/java.base/share/classes/java/util/Timer.java
@@ -119,7 +119,7 @@ public class Timer {
     /**
      * This ID is used to generate thread names.
      */
-    private final static AtomicInteger nextSerialNumber = new AtomicInteger(0);
+    private static final AtomicInteger nextSerialNumber = new AtomicInteger(0);
     private static int serialNumber() {
         return nextSerialNumber.getAndIncrement();
     }
diff --git a/jdk/src/java.base/share/classes/java/util/jar/Pack200.java b/jdk/src/java.base/share/classes/java/util/jar/Pack200.java
index a4467536576..44f1cccd080 100644
--- a/jdk/src/java.base/share/classes/java/util/jar/Pack200.java
+++ b/jdk/src/java.base/share/classes/java/util/jar/Pack200.java
@@ -127,7 +127,7 @@ public abstract class Pack200 {
      *
      * @return  A newly allocated Packer engine.
      */
-    public synchronized static Packer newPacker() {
+    public static synchronized Packer newPacker() {
         return (Packer) newInstance(PACK_PROVIDER);
     }
 
@@ -688,7 +688,7 @@ public abstract class Pack200 {
     private static Class packerImpl;
     private static Class unpackerImpl;
 
-    private synchronized static Object newInstance(String prop) {
+    private static synchronized Object newInstance(String prop) {
         String implName = "(unknown)";
         try {
             Class impl = (PACK_PROVIDER.equals(prop))? packerImpl: unpackerImpl;
diff --git a/jdk/src/java.base/share/classes/java/util/regex/Pattern.java b/jdk/src/java.base/share/classes/java/util/regex/Pattern.java
index 756567d0ff8..e4f64db438a 100644
--- a/jdk/src/java.base/share/classes/java/util/regex/Pattern.java
+++ b/jdk/src/java.base/share/classes/java/util/regex/Pattern.java
@@ -3787,7 +3787,7 @@ loop:   for(int x=0, offset=0; x posix = new HashMap<>();
-    private final static HashMap aliases = new HashMap<>();
+    private static final HashMap posix = new HashMap<>();
+    private static final HashMap aliases = new HashMap<>();
     static {
         posix.put("ALPHA", "ALPHABETIC");
         posix.put("LOWER", "LOWERCASE");
diff --git a/jdk/src/java.base/share/classes/java/util/stream/FindOps.java b/jdk/src/java.base/share/classes/java/util/stream/FindOps.java
index 197d99c0890..5926e79dd4d 100644
--- a/jdk/src/java.base/share/classes/java/util/stream/FindOps.java
+++ b/jdk/src/java.base/share/classes/java/util/stream/FindOps.java
@@ -167,7 +167,7 @@ final class FindOps {
      * @param  The type of input element
      * @param  The result type, typically an optional type
      */
-    private static abstract class FindSink implements TerminalSink {
+    private abstract static class FindSink implements TerminalSink {
         boolean hasValue;
         T value;
 
diff --git a/jdk/src/java.base/share/classes/java/util/stream/ForEachOps.java b/jdk/src/java.base/share/classes/java/util/stream/ForEachOps.java
index b527f054f4d..df2cb1e4508 100644
--- a/jdk/src/java.base/share/classes/java/util/stream/ForEachOps.java
+++ b/jdk/src/java.base/share/classes/java/util/stream/ForEachOps.java
@@ -130,7 +130,7 @@ final class ForEachOps {
      *
      * @param  the output type of the stream pipeline
      */
-    static abstract class ForEachOp
+    abstract static class ForEachOp
             implements TerminalOp, TerminalSink {
         private final boolean ordered;
 
diff --git a/jdk/src/java.base/share/classes/java/util/stream/MatchOps.java b/jdk/src/java.base/share/classes/java/util/stream/MatchOps.java
index cc809e4acea..dbaab0ab6b8 100644
--- a/jdk/src/java.base/share/classes/java/util/stream/MatchOps.java
+++ b/jdk/src/java.base/share/classes/java/util/stream/MatchOps.java
@@ -249,7 +249,7 @@ final class MatchOps {
      *
      * @param  The output type of the stream pipeline
      */
-    private static abstract class BooleanTerminalSink implements Sink {
+    private abstract static class BooleanTerminalSink implements Sink {
         boolean stop;
         boolean value;
 
diff --git a/jdk/src/java.base/share/classes/java/util/stream/Nodes.java b/jdk/src/java.base/share/classes/java/util/stream/Nodes.java
index 8a517b0f263..7922624476e 100644
--- a/jdk/src/java.base/share/classes/java/util/stream/Nodes.java
+++ b/jdk/src/java.base/share/classes/java/util/stream/Nodes.java
@@ -562,7 +562,7 @@ final class Nodes {
 
     // Implementations
 
-    private static abstract class EmptyNode implements Node {
+    private abstract static class EmptyNode implements Node {
         EmptyNode() { }
 
         @Override
@@ -750,7 +750,7 @@ final class Nodes {
     /**
      * Node class for an internal node with two or more children
      */
-    private static abstract class AbstractConcNode> implements Node {
+    private abstract static class AbstractConcNode> implements Node {
         protected final T_NODE left;
         protected final T_NODE right;
         private final long size;
@@ -932,7 +932,7 @@ final class Nodes {
     }
 
     /** Abstract class for spliterator for all internal node classes */
-    private static abstract class InternalNodeSpliterator,
                                                           N extends Node>
             implements Spliterator {
@@ -1114,7 +1114,7 @@ final class Nodes {
             }
         }
 
-        private static abstract class OfPrimitive,
                                                   N extends Node.OfPrimitive>
                 extends InternalNodeSpliterator
@@ -1827,7 +1827,7 @@ final class Nodes {
      * This and subclasses are not intended to be serializable
      */
     @SuppressWarnings("serial")
-    private static abstract class SizedCollectorTask,
+    private abstract static class SizedCollectorTask,
                                                      K extends SizedCollectorTask>
             extends CountedCompleter
             implements Sink {
@@ -2030,7 +2030,7 @@ final class Nodes {
     }
 
     @SuppressWarnings("serial")
-    private static abstract class ToArrayTask,
+    private abstract static class ToArrayTask,
                                               K extends ToArrayTask>
             extends CountedCompleter {
         protected final T_NODE node;
diff --git a/jdk/src/java.base/share/classes/java/util/stream/ReduceOps.java b/jdk/src/java.base/share/classes/java/util/stream/ReduceOps.java
index 6928409760b..e1778225b3a 100644
--- a/jdk/src/java.base/share/classes/java/util/stream/ReduceOps.java
+++ b/jdk/src/java.base/share/classes/java/util/stream/ReduceOps.java
@@ -797,7 +797,7 @@ final class ReduceOps {
     /**
      * A sink that counts elements
      */
-    static abstract class CountingSink
+    abstract static class CountingSink
             extends Box
             implements AccumulatingSink> {
         long count;
@@ -866,7 +866,7 @@ final class ReduceOps {
      *
      * @param  The type of the state element
      */
-    private static abstract class Box {
+    private abstract static class Box {
         U state;
 
         Box() {} // Avoid creation of special accessor
@@ -886,7 +886,7 @@ final class ReduceOps {
      * @param  the result type of the reducing operation
      * @param  the type of the {@code AccumulatingSink}
      */
-    private static abstract class ReduceOp>
+    private abstract static class ReduceOp>
             implements TerminalOp {
         private final StreamShape inputShape;
 
diff --git a/jdk/src/java.base/share/classes/java/util/stream/Sink.java b/jdk/src/java.base/share/classes/java/util/stream/Sink.java
index d2a366df16e..a0fe5b31721 100644
--- a/jdk/src/java.base/share/classes/java/util/stream/Sink.java
+++ b/jdk/src/java.base/share/classes/java/util/stream/Sink.java
@@ -241,7 +241,7 @@ interface Sink extends Consumer {
      * implementation of the {@code accept()} method must call the correct
      * {@code accept()} method on the downstream {@code Sink}.
      */
-    static abstract class ChainedReference implements Sink {
+    abstract static class ChainedReference implements Sink {
         protected final Sink downstream;
 
         public ChainedReference(Sink downstream) {
@@ -273,7 +273,7 @@ interface Sink extends Consumer {
      * The implementation of the {@code accept()} method must call the correct
      * {@code accept()} method on the downstream {@code Sink}.
      */
-    static abstract class ChainedInt implements Sink.OfInt {
+    abstract static class ChainedInt implements Sink.OfInt {
         protected final Sink downstream;
 
         public ChainedInt(Sink downstream) {
@@ -305,7 +305,7 @@ interface Sink extends Consumer {
      * The implementation of the {@code accept()} method must call the correct
      * {@code accept()} method on the downstream {@code Sink}.
      */
-    static abstract class ChainedLong implements Sink.OfLong {
+    abstract static class ChainedLong implements Sink.OfLong {
         protected final Sink downstream;
 
         public ChainedLong(Sink downstream) {
@@ -337,7 +337,7 @@ interface Sink extends Consumer {
      * The implementation of the {@code accept()} method must call the correct
      * {@code accept()} method on the downstream {@code Sink}.
      */
-    static abstract class ChainedDouble implements Sink.OfDouble {
+    abstract static class ChainedDouble implements Sink.OfDouble {
         protected final Sink downstream;
 
         public ChainedDouble(Sink downstream) {
diff --git a/jdk/src/java.base/share/classes/java/util/stream/SortedOps.java b/jdk/src/java.base/share/classes/java/util/stream/SortedOps.java
index 7dff81f1f21..61a936c4372 100644
--- a/jdk/src/java.base/share/classes/java/util/stream/SortedOps.java
+++ b/jdk/src/java.base/share/classes/java/util/stream/SortedOps.java
@@ -301,7 +301,7 @@ final class SortedOps {
      * occur, in general (not restricted to just sorting), for short-circuiting
      * parallel pipelines.
      */
-    private static abstract class AbstractRefSortingSink extends Sink.ChainedReference {
+    private abstract static class AbstractRefSortingSink extends Sink.ChainedReference {
         protected final Comparator comparator;
         // @@@ could be a lazy final value, if/when support is added
         protected boolean cancellationWasRequested;
@@ -408,7 +408,7 @@ final class SortedOps {
     /**
      * Abstract {@link Sink} for implementing sort on int streams.
      */
-    private static abstract class AbstractIntSortingSink extends Sink.ChainedInt {
+    private abstract static class AbstractIntSortingSink extends Sink.ChainedInt {
         protected boolean cancellationWasRequested;
 
         AbstractIntSortingSink(Sink downstream) {
@@ -506,7 +506,7 @@ final class SortedOps {
     /**
      * Abstract {@link Sink} for implementing sort on long streams.
      */
-    private static abstract class AbstractLongSortingSink extends Sink.ChainedLong {
+    private abstract static class AbstractLongSortingSink extends Sink.ChainedLong {
         protected boolean cancellationWasRequested;
 
         AbstractLongSortingSink(Sink downstream) {
@@ -604,7 +604,7 @@ final class SortedOps {
     /**
      * Abstract {@link Sink} for implementing sort on long streams.
      */
-    private static abstract class AbstractDoubleSortingSink extends Sink.ChainedDouble {
+    private abstract static class AbstractDoubleSortingSink extends Sink.ChainedDouble {
         protected boolean cancellationWasRequested;
 
         AbstractDoubleSortingSink(Sink downstream) {
diff --git a/jdk/src/java.base/share/classes/java/util/stream/StreamSpliterators.java b/jdk/src/java.base/share/classes/java/util/stream/StreamSpliterators.java
index 67683425bfc..20d112d44f3 100644
--- a/jdk/src/java.base/share/classes/java/util/stream/StreamSpliterators.java
+++ b/jdk/src/java.base/share/classes/java/util/stream/StreamSpliterators.java
@@ -57,7 +57,7 @@ class StreamSpliterators {
      * 
    A wrapping spliterator produced from a sequential stream
      * cannot be split if there are stateful operations present.
      */
-    private static abstract class AbstractWrappingSpliterator
             implements Spliterator {
 
@@ -607,7 +607,7 @@ class StreamSpliterators {
      * {@code SUBSIZED}.
      *
      */
-    static abstract class SliceSpliterator> {
+    abstract static class SliceSpliterator> {
         // The start index of the slice
         final long sliceOrigin;
         // One past the last index of the slice
@@ -753,7 +753,7 @@ class StreamSpliterators {
             }
         }
 
-        static abstract class OfPrimitive,
                 T_CONS>
                 extends SliceSpliterator
@@ -899,7 +899,7 @@ class StreamSpliterators {
      * collected to a {@code Node}. It is the order of the pipeline stage
      * that governs whether the this slice spliterator is to be used or not.
      */
-    static abstract class UnorderedSliceSpliterator> {
+    abstract static class UnorderedSliceSpliterator> {
         static final int CHUNK_SIZE = 1 << 7;
 
         // The spliterator to slice
@@ -1060,7 +1060,7 @@ class StreamSpliterators {
          * @param  the type of the spined buffer. Must also be a type of
          *        {@code T_CONS}.
          */
-        static abstract class OfPrimitive<
+        abstract static class OfPrimitive<
                 T,
                 T_CONS,
                 T_BUFF extends ArrayBuffer.OfPrimitive,
@@ -1324,7 +1324,7 @@ class StreamSpliterators {
      * The {@code tryAdvance} method always returns true.
      *
      */
-    static abstract class InfiniteSupplyingSpliterator implements Spliterator {
+    abstract static class InfiniteSupplyingSpliterator implements Spliterator {
         long estimate;
 
         protected InfiniteSupplyingSpliterator(long estimate) {
@@ -1442,7 +1442,7 @@ class StreamSpliterators {
     }
 
     // @@@ Consolidate with Node.Builder
-    static abstract class ArrayBuffer {
+    abstract static class ArrayBuffer {
         int index;
 
         void reset() {
@@ -1470,7 +1470,7 @@ class StreamSpliterators {
             }
         }
 
-        static abstract class OfPrimitive extends ArrayBuffer {
+        abstract static class OfPrimitive extends ArrayBuffer {
             int index;
 
             @Override
diff --git a/jdk/src/java.base/share/classes/java/util/stream/Streams.java b/jdk/src/java.base/share/classes/java/util/stream/Streams.java
index daccaaa5477..4023a3ea0cc 100644
--- a/jdk/src/java.base/share/classes/java/util/stream/Streams.java
+++ b/jdk/src/java.base/share/classes/java/util/stream/Streams.java
@@ -298,7 +298,7 @@ final class Streams {
         }
     }
 
-    private static abstract class AbstractStreamBuilderImpl> implements Spliterator {
+    private abstract static class AbstractStreamBuilderImpl> implements Spliterator {
         // >= 0 when building, < 0 when built
         // -1 == no elements
         // -2 == one element, held by first
@@ -782,7 +782,7 @@ final class Streams {
             }
         }
 
-        private static abstract class OfPrimitive>
+        private abstract static class OfPrimitive>
                 extends ConcatSpliterator
                 implements Spliterator.OfPrimitive {
             private OfPrimitive(T_SPLITR aSpliterator, T_SPLITR bSpliterator) {
diff --git a/jdk/src/java.base/share/classes/java/util/stream/WhileOps.java b/jdk/src/java.base/share/classes/java/util/stream/WhileOps.java
index 94705ec571b..cabe6883528 100644
--- a/jdk/src/java.base/share/classes/java/util/stream/WhileOps.java
+++ b/jdk/src/java.base/share/classes/java/util/stream/WhileOps.java
@@ -649,7 +649,7 @@ final class WhileOps {
      * @param  the type of elements returned by this spliterator
      * @param  the type of the spliterator
      */
-    static abstract class UnorderedWhileSpliterator> implements Spliterator {
+    abstract static class UnorderedWhileSpliterator> implements Spliterator {
         // Power of two constant minus one used for modulus of count
         static final int CANCEL_CHECK_COUNT = (1 << 6) - 1;
 
@@ -715,7 +715,7 @@ final class WhileOps {
 
         abstract T_SPLITR makeSpliterator(T_SPLITR s);
 
-        static abstract class OfRef extends UnorderedWhileSpliterator> implements Consumer {
+        abstract static class OfRef extends UnorderedWhileSpliterator> implements Consumer {
             final Predicate p;
             T t;
 
@@ -820,7 +820,7 @@ final class WhileOps {
             }
         }
 
-        static abstract class OfInt extends UnorderedWhileSpliterator implements IntConsumer, Spliterator.OfInt {
+        abstract static class OfInt extends UnorderedWhileSpliterator implements IntConsumer, Spliterator.OfInt {
             final IntPredicate p;
             int t;
 
@@ -925,7 +925,7 @@ final class WhileOps {
             }
         }
 
-        static abstract class OfLong extends UnorderedWhileSpliterator implements LongConsumer, Spliterator.OfLong {
+        abstract static class OfLong extends UnorderedWhileSpliterator implements LongConsumer, Spliterator.OfLong {
             final LongPredicate p;
             long t;
 
@@ -1030,7 +1030,7 @@ final class WhileOps {
             }
         }
 
-        static abstract class OfDouble extends UnorderedWhileSpliterator implements DoubleConsumer, Spliterator.OfDouble {
+        abstract static class OfDouble extends UnorderedWhileSpliterator implements DoubleConsumer, Spliterator.OfDouble {
             final DoublePredicate p;
             double t;
 
diff --git a/jdk/src/java.base/share/classes/java/util/zip/Adler32.java b/jdk/src/java.base/share/classes/java/util/zip/Adler32.java
index db81ab6f389..425c35d1bf4 100644
--- a/jdk/src/java.base/share/classes/java/util/zip/Adler32.java
+++ b/jdk/src/java.base/share/classes/java/util/zip/Adler32.java
@@ -127,12 +127,12 @@ class Adler32 implements Checksum {
         return (long)adler & 0xffffffffL;
     }
 
-    private native static int update(int adler, int b);
+    private static native int update(int adler, int b);
 
     @HotSpotIntrinsicCandidate
-    private native static int updateBytes(int adler, byte[] b, int off,
+    private static native int updateBytes(int adler, byte[] b, int off,
                                           int len);
     @HotSpotIntrinsicCandidate
-    private native static int updateByteBuffer(int adler, long addr,
+    private static native int updateByteBuffer(int adler, long addr,
                                                int off, int len);
 }
diff --git a/jdk/src/java.base/share/classes/java/util/zip/CRC32.java b/jdk/src/java.base/share/classes/java/util/zip/CRC32.java
index a259ccfc7e5..4b04ab20238 100644
--- a/jdk/src/java.base/share/classes/java/util/zip/CRC32.java
+++ b/jdk/src/java.base/share/classes/java/util/zip/CRC32.java
@@ -127,7 +127,7 @@ class CRC32 implements Checksum {
     }
 
     @HotSpotIntrinsicCandidate
-    private native static int update(int crc, int b);
+    private static native int update(int crc, int b);
 
     private static int updateBytes(int crc, byte[] b, int off, int len) {
         updateBytesCheck(b, off, len);
@@ -135,7 +135,7 @@ class CRC32 implements Checksum {
     }
 
     @HotSpotIntrinsicCandidate
-    private native static int updateBytes0(int crc, byte[] b, int off, int len);
+    private static native int updateBytes0(int crc, byte[] b, int off, int len);
 
     private static void updateBytesCheck(byte[] b, int off, int len) {
         if (len <= 0) {
@@ -161,7 +161,7 @@ class CRC32 implements Checksum {
     }
 
     @HotSpotIntrinsicCandidate
-    private native static int updateByteBuffer0(int alder, long addr,
+    private static native int updateByteBuffer0(int alder, long addr,
                                                 int off, int len);
 
     private static void updateByteBufferCheck(long addr) {
diff --git a/jdk/src/java.base/share/classes/java/util/zip/Deflater.java b/jdk/src/java.base/share/classes/java/util/zip/Deflater.java
index 6e32d3eee3b..5bb0fe537d3 100644
--- a/jdk/src/java.base/share/classes/java/util/zip/Deflater.java
+++ b/jdk/src/java.base/share/classes/java/util/zip/Deflater.java
@@ -558,11 +558,11 @@ class Deflater {
     }
 
     private static native void initIDs();
-    private native static long init(int level, int strategy, boolean nowrap);
-    private native static void setDictionary(long addr, byte[] b, int off, int len);
+    private static native long init(int level, int strategy, boolean nowrap);
+    private static native void setDictionary(long addr, byte[] b, int off, int len);
     private native int deflateBytes(long addr, byte[] b, int off, int len,
                                     int flush);
-    private native static int getAdler(long addr);
-    private native static void reset(long addr);
-    private native static void end(long addr);
+    private static native int getAdler(long addr);
+    private static native void reset(long addr);
+    private static native void end(long addr);
 }
diff --git a/jdk/src/java.base/share/classes/java/util/zip/GZIPInputStream.java b/jdk/src/java.base/share/classes/java/util/zip/GZIPInputStream.java
index b3d9240ba01..d5a2f4544df 100644
--- a/jdk/src/java.base/share/classes/java/util/zip/GZIPInputStream.java
+++ b/jdk/src/java.base/share/classes/java/util/zip/GZIPInputStream.java
@@ -142,16 +142,16 @@ class GZIPInputStream extends InflaterInputStream {
     /**
      * GZIP header magic number.
      */
-    public final static int GZIP_MAGIC = 0x8b1f;
+    public static final int GZIP_MAGIC = 0x8b1f;
 
     /*
      * File header flags.
      */
-    private final static int FTEXT      = 1;    // Extra text
-    private final static int FHCRC      = 2;    // Header CRC
-    private final static int FEXTRA     = 4;    // Extra field
-    private final static int FNAME      = 8;    // File name
-    private final static int FCOMMENT   = 16;   // File comment
+    private static final int FTEXT      = 1;    // Extra text
+    private static final int FHCRC      = 2;    // Header CRC
+    private static final int FEXTRA     = 4;    // Extra field
+    private static final int FNAME      = 8;    // File name
+    private static final int FCOMMENT   = 16;   // File comment
 
     /*
      * Reads GZIP member header and returns the total byte number
diff --git a/jdk/src/java.base/share/classes/java/util/zip/GZIPOutputStream.java b/jdk/src/java.base/share/classes/java/util/zip/GZIPOutputStream.java
index 2c1cd409b85..67a20a1c291 100644
--- a/jdk/src/java.base/share/classes/java/util/zip/GZIPOutputStream.java
+++ b/jdk/src/java.base/share/classes/java/util/zip/GZIPOutputStream.java
@@ -44,13 +44,13 @@ class GZIPOutputStream extends DeflaterOutputStream {
     /*
      * GZIP header magic number.
      */
-    private final static int GZIP_MAGIC = 0x8b1f;
+    private static final int GZIP_MAGIC = 0x8b1f;
 
     /*
      * Trailer size in bytes.
      *
      */
-    private final static int TRAILER_SIZE = 8;
+    private static final int TRAILER_SIZE = 8;
 
     /**
      * Creates a new output stream with the specified buffer size.
diff --git a/jdk/src/java.base/share/classes/java/util/zip/Inflater.java b/jdk/src/java.base/share/classes/java/util/zip/Inflater.java
index fc2b669d2c2..94c05e1d315 100644
--- a/jdk/src/java.base/share/classes/java/util/zip/Inflater.java
+++ b/jdk/src/java.base/share/classes/java/util/zip/Inflater.java
@@ -395,13 +395,13 @@ class Inflater {
         }
     }
 
-    private native static void initIDs();
-    private native static long init(boolean nowrap);
-    private native static void setDictionary(long addr, byte[] b, int off,
+    private static native void initIDs();
+    private static native long init(boolean nowrap);
+    private static native void setDictionary(long addr, byte[] b, int off,
                                              int len);
     private native int inflateBytes(long addr, byte[] b, int off, int len)
             throws DataFormatException;
-    private native static int getAdler(long addr);
-    private native static void reset(long addr);
-    private native static void end(long addr);
+    private static native int getAdler(long addr);
+    private static native void reset(long addr);
+    private static native void end(long addr);
 }
diff --git a/jdk/src/java.base/share/classes/javax/crypto/Cipher.java b/jdk/src/java.base/share/classes/javax/crypto/Cipher.java
index a5913089a6f..ed6f4e392bd 100644
--- a/jdk/src/java.base/share/classes/javax/crypto/Cipher.java
+++ b/jdk/src/java.base/share/classes/javax/crypto/Cipher.java
@@ -336,15 +336,15 @@ public class Cipher {
     }
 
     // Provider attribute name for supported chaining mode
-    private final static String ATTR_MODE = "SupportedModes";
+    private static final String ATTR_MODE = "SupportedModes";
     // Provider attribute name for supported padding names
-    private final static String ATTR_PAD  = "SupportedPaddings";
+    private static final String ATTR_PAD  = "SupportedPaddings";
 
     // constants indicating whether the provider supports
     // a given mode or padding
-    private final static int S_NO    = 0;       // does not support
-    private final static int S_MAYBE = 1;       // unable to determine
-    private final static int S_YES   = 2;       // does support
+    private static final int S_NO    = 0;       // does not support
+    private static final int S_MAYBE = 1;       // unable to determine
+    private static final int S_YES   = 2;       // does support
 
     /**
      * Nested class to deal with modes and paddings.
@@ -410,7 +410,7 @@ public class Cipher {
         }
 
         // ConcurrentMap for previously compiled patterns
-        private final static ConcurrentMap patternCache =
+        private static final ConcurrentMap patternCache =
             new ConcurrentHashMap();
 
         private static boolean matches(String regexp, String str) {
@@ -787,10 +787,10 @@ public class Cipher {
         }
     }
 
-    private final static int I_KEY       = 1;
-    private final static int I_PARAMSPEC = 2;
-    private final static int I_PARAMS    = 3;
-    private final static int I_CERT      = 4;
+    private static final int I_KEY       = 1;
+    private static final int I_PARAMSPEC = 2;
+    private static final int I_PARAMS    = 3;
+    private static final int I_CERT      = 4;
 
     private void implInit(CipherSpi thisSpi, int type, int opmode, Key key,
             AlgorithmParameterSpec paramSpec, AlgorithmParameters params,
diff --git a/jdk/src/java.base/share/classes/javax/crypto/JceSecurity.java b/jdk/src/java.base/share/classes/javax/crypto/JceSecurity.java
index 65fce38f6ca..fa674888824 100644
--- a/jdk/src/java.base/share/classes/javax/crypto/JceSecurity.java
+++ b/jdk/src/java.base/share/classes/javax/crypto/JceSecurity.java
@@ -57,11 +57,11 @@ final class JceSecurity {
     // Map of the providers we already have verified
     // value == PROVIDER_VERIFIED is successfully verified
     // value is failure cause Exception in error case
-    private final static Map verificationResults =
+    private static final Map verificationResults =
             new IdentityHashMap<>();
 
     // Map of the providers currently being verified
-    private final static Map verifyingProviders =
+    private static final Map verifyingProviders =
             new IdentityHashMap<>();
 
     // Set the default value. May be changed in the static initializer.
@@ -162,7 +162,7 @@ final class JceSecurity {
         pv.verify();
     }
 
-    private final static Object PROVIDER_VERIFIED = Boolean.TRUE;
+    private static final Object PROVIDER_VERIFIED = Boolean.TRUE;
 
     /*
      * Verify that the provider JAR files are signed properly, which
diff --git a/jdk/src/java.base/share/classes/javax/crypto/KeyAgreement.java b/jdk/src/java.base/share/classes/javax/crypto/KeyAgreement.java
index 9ce6a46c8cd..98cfcdabc74 100644
--- a/jdk/src/java.base/share/classes/javax/crypto/KeyAgreement.java
+++ b/jdk/src/java.base/share/classes/javax/crypto/KeyAgreement.java
@@ -336,8 +336,8 @@ public class KeyAgreement {
         }
     }
 
-    private final static int I_NO_PARAMS = 1;
-    private final static int I_PARAMS    = 2;
+    private static final int I_NO_PARAMS = 1;
+    private static final int I_PARAMS    = 2;
 
     private void implInit(KeyAgreementSpi spi, int type, Key key,
             AlgorithmParameterSpec params, SecureRandom random)
diff --git a/jdk/src/java.base/share/classes/javax/crypto/KeyGenerator.java b/jdk/src/java.base/share/classes/javax/crypto/KeyGenerator.java
index 8f07bccae78..1a345b6aafe 100644
--- a/jdk/src/java.base/share/classes/javax/crypto/KeyGenerator.java
+++ b/jdk/src/java.base/share/classes/javax/crypto/KeyGenerator.java
@@ -116,10 +116,10 @@ public class KeyGenerator {
 
     // see java.security.KeyPairGenerator for failover notes
 
-    private final static int I_NONE   = 1;
-    private final static int I_RANDOM = 2;
-    private final static int I_PARAMS = 3;
-    private final static int I_SIZE   = 4;
+    private static final int I_NONE   = 1;
+    private static final int I_RANDOM = 2;
+    private static final int I_PARAMS = 3;
+    private static final int I_SIZE   = 4;
 
     // The provider
     private Provider provider;
diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/HttpsURLConnection.java b/jdk/src/java.base/share/classes/javax/net/ssl/HttpsURLConnection.java
index c1eb5528327..7c775321640 100644
--- a/jdk/src/java.base/share/classes/javax/net/ssl/HttpsURLConnection.java
+++ b/jdk/src/java.base/share/classes/javax/net/ssl/HttpsURLConnection.java
@@ -52,7 +52,7 @@ import java.security.cert.X509Certificate;
  *
  * @since 1.4
  */
-abstract public
+public abstract
 class HttpsURLConnection extends HttpURLConnection
 {
     /**
diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/KeyManagerFactory.java b/jdk/src/java.base/share/classes/javax/net/ssl/KeyManagerFactory.java
index cff1b133cc2..e103a71761d 100644
--- a/jdk/src/java.base/share/classes/javax/net/ssl/KeyManagerFactory.java
+++ b/jdk/src/java.base/share/classes/javax/net/ssl/KeyManagerFactory.java
@@ -61,7 +61,7 @@ public class KeyManagerFactory {
      *          {@code ssl.KeyManagerFactory.algorithm} security property, or an
      *          implementation-specific default if no such property exists.
      */
-    public final static String getDefaultAlgorithm() {
+    public static final String getDefaultAlgorithm() {
         String type;
         type = AccessController.doPrivileged(new PrivilegedAction<>() {
             @Override
diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/SNIHostName.java b/jdk/src/java.base/share/classes/javax/net/ssl/SNIHostName.java
index d5e71414497..d20f25b5a06 100644
--- a/jdk/src/java.base/share/classes/javax/net/ssl/SNIHostName.java
+++ b/jdk/src/java.base/share/classes/javax/net/ssl/SNIHostName.java
@@ -321,7 +321,7 @@ public final class SNIHostName extends SNIServerName {
         }
     }
 
-    private final static class SNIHostNameMatcher extends SNIMatcher {
+    private static final class SNIHostNameMatcher extends SNIMatcher {
 
         // the compiled representation of a regular expression.
         private final Pattern pattern;
diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/SSLEngineResult.java b/jdk/src/java.base/share/classes/javax/net/ssl/SSLEngineResult.java
index e0ec97349df..94c6f80b008 100644
--- a/jdk/src/java.base/share/classes/javax/net/ssl/SSLEngineResult.java
+++ b/jdk/src/java.base/share/classes/javax/net/ssl/SSLEngineResult.java
@@ -243,7 +243,7 @@ public class SSLEngineResult {
      *
      * @return  the return value
      */
-    final public Status getStatus() {
+    public final Status getStatus() {
         return status;
     }
 
@@ -253,7 +253,7 @@ public class SSLEngineResult {
      *
      * @return  the handshake status
      */
-    final public HandshakeStatus getHandshakeStatus() {
+    public final HandshakeStatus getHandshakeStatus() {
         return handshakeStatus;
     }
 
@@ -262,7 +262,7 @@ public class SSLEngineResult {
      *
      * @return  the number of bytes consumed.
      */
-    final public int bytesConsumed() {
+    public final int bytesConsumed() {
         return bytesConsumed;
     }
 
@@ -271,7 +271,7 @@ public class SSLEngineResult {
      *
      * @return  the number of bytes produced
      */
-    final public int bytesProduced() {
+    public final int bytesProduced() {
         return bytesProduced;
     }
 
@@ -306,7 +306,7 @@ public class SSLEngineResult {
      *
      * @since   9
      */
-    final public long sequenceNumber() {
+    public final long sequenceNumber() {
         return sequenceNumber;
     }
 
diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/TrustManagerFactory.java b/jdk/src/java.base/share/classes/javax/net/ssl/TrustManagerFactory.java
index 333f845dec8..0567d99e9c3 100644
--- a/jdk/src/java.base/share/classes/javax/net/ssl/TrustManagerFactory.java
+++ b/jdk/src/java.base/share/classes/javax/net/ssl/TrustManagerFactory.java
@@ -73,7 +73,7 @@ public class TrustManagerFactory {
      * {@code ssl.TrustManagerFactory.algorithm} security property, or an
      * implementation-specific default if no such property exists.
      */
-    public final static String getDefaultAlgorithm() {
+    public static final String getDefaultAlgorithm() {
         String type;
         type = AccessController.doPrivileged(new PrivilegedAction<>() {
             @Override
diff --git a/jdk/src/java.base/share/classes/javax/security/auth/Policy.java b/jdk/src/java.base/share/classes/javax/security/auth/Policy.java
index 6ed9a4e3f2c..30db6987c9e 100644
--- a/jdk/src/java.base/share/classes/javax/security/auth/Policy.java
+++ b/jdk/src/java.base/share/classes/javax/security/auth/Policy.java
@@ -159,7 +159,7 @@ import sun.security.util.Debug;
 public abstract class Policy {
 
     private static Policy policy;
-    private final static String AUTH_POLICY =
+    private static final String AUTH_POLICY =
         "sun.security.provider.AuthPolicyFile";
 
     private final java.security.AccessControlContext acc =
diff --git a/jdk/src/java.base/share/classes/jdk/internal/jimage/BasicImageWriter.java b/jdk/src/java.base/share/classes/jdk/internal/jimage/BasicImageWriter.java
index b2d1b682fbf..60a5cd15e88 100644
--- a/jdk/src/java.base/share/classes/jdk/internal/jimage/BasicImageWriter.java
+++ b/jdk/src/java.base/share/classes/jdk/internal/jimage/BasicImageWriter.java
@@ -35,7 +35,7 @@ public final class BasicImageWriter {
     public static final String BOOT_NAME = "bootmodules";
     public static final String BOOT_IMAGE_NAME = BOOT_NAME + IMAGE_EXT;
 
-    private final static int RETRY_LIMIT = 1000;
+    private static final int RETRY_LIMIT = 1000;
 
     private ByteOrder byteOrder;
     private ImageStringsWriter strings;
diff --git a/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageLocationBase.java b/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageLocationBase.java
index 65c77315f98..461db371d90 100644
--- a/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageLocationBase.java
+++ b/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageLocationBase.java
@@ -26,15 +26,15 @@
 package jdk.internal.jimage;
 
 public class ImageLocationBase {
-    final static int ATTRIBUTE_END = 0;
-    final static int ATTRIBUTE_MODULE = 1;
-    final static int ATTRIBUTE_PARENT = 2;
-    final static int ATTRIBUTE_BASE = 3;
-    final static int ATTRIBUTE_EXTENSION = 4;
-    final static int ATTRIBUTE_OFFSET = 5;
-    final static int ATTRIBUTE_COMPRESSED = 6;
-    final static int ATTRIBUTE_UNCOMPRESSED = 7;
-    final static int ATTRIBUTE_COUNT = 8;
+    static final int ATTRIBUTE_END = 0;
+    static final int ATTRIBUTE_MODULE = 1;
+    static final int ATTRIBUTE_PARENT = 2;
+    static final int ATTRIBUTE_BASE = 3;
+    static final int ATTRIBUTE_EXTENSION = 4;
+    static final int ATTRIBUTE_OFFSET = 5;
+    static final int ATTRIBUTE_COMPRESSED = 6;
+    static final int ATTRIBUTE_UNCOMPRESSED = 7;
+    static final int ATTRIBUTE_COUNT = 8;
 
     protected final long[] attributes;
 
diff --git a/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageModuleData.java b/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageModuleData.java
index e48375415ab..c15ce732c4b 100644
--- a/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageModuleData.java
+++ b/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageModuleData.java
@@ -63,19 +63,19 @@ import java.util.Set;
  *        Offset to package name in string table
  */
 
-final public class ImageModuleData {
-    public final static String META_DATA_EXTENSION = ".jdata";
-    public final static String SEPARATOR = "\t";
-    public final static int NOT_FOUND = -1;
-    private final static int ptmCountOffset = 0;
-    private final static int mtpCountOffset = 1;
-    private final static int ptmRedirectOffset = 2;
-    private final static int dataNameOffset = 0;
-    private final static int ptmDataWidth = 2;
-    private final static int ptmDataModuleOffset = 1;
-    private final static int mtpDataWidth = 3;
-    private final static int mtpDataCountOffset = 1;
-    private final static int mtpDataOffsetOffset = 2;
+public final class ImageModuleData {
+    public static final String META_DATA_EXTENSION = ".jdata";
+    public static final String SEPARATOR = "\t";
+    public static final int NOT_FOUND = -1;
+    private static final int ptmCountOffset = 0;
+    private static final int mtpCountOffset = 1;
+    private static final int ptmRedirectOffset = 2;
+    private static final int dataNameOffset = 0;
+    private static final int ptmDataWidth = 2;
+    private static final int ptmDataModuleOffset = 1;
+    private static final int mtpDataWidth = 3;
+    private static final int mtpDataCountOffset = 1;
+    private static final int mtpDataOffsetOffset = 2;
 
     private final BasicImageReader reader;
     private final IntBuffer intBuffer;
diff --git a/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageNativeSubstrate.java b/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageNativeSubstrate.java
index efc873501c2..f3a0e742036 100644
--- a/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageNativeSubstrate.java
+++ b/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageNativeSubstrate.java
@@ -49,32 +49,32 @@ public final class ImageNativeSubstrate implements ImageSubstrate {
     private final long indexAddress;
     private final long dataAddress;
 
-    native static long openImage(String imagePath, boolean bigEndian);
-    native static void closeImage(long id);
-    native static long getIndexAddress(long id);
-    native static long getDataAddress(long id);
-    native static boolean readCompressed(long id, long offset,
+    static native long openImage(String imagePath, boolean bigEndian);
+    static native void closeImage(long id);
+    static native long getIndexAddress(long id);
+    static native long getDataAddress(long id);
+    static native boolean readCompressed(long id, long offset,
             ByteBuffer compressedBuffer, long compressedSize,
             ByteBuffer uncompressedBuffer, long uncompressedSize);
-    native static boolean read(long id, long offset,
+    static native boolean read(long id, long offset,
             ByteBuffer uncompressedBuffer, long uncompressedSize);
-    native static byte[] getStringBytes(long id, int offset);
-    native static long[] getAttributes(long id, int offset);
-    native static long[] findAttributes(long id, byte[] path);
-    native static int[] attributeOffsets(long id);
+    static native byte[] getStringBytes(long id, int offset);
+    static native long[] getAttributes(long id, int offset);
+    static native long[] findAttributes(long id, byte[] path);
+    static native int[] attributeOffsets(long id);
 
-    public native static long JIMAGE_Open(String path) throws IOException;
-    public native static void JIMAGE_Close(long jimageHandle);
-    public native static long JIMAGE_FindResource(long jimageHandle,
+    public static native long JIMAGE_Open(String path) throws IOException;
+    public static native void JIMAGE_Close(long jimageHandle);
+    public static native long JIMAGE_FindResource(long jimageHandle,
                     String moduleName, String Version, String path,
                     long[] size);
-    public native static long JIMAGE_GetResource(long jimageHandle,
+    public static native long JIMAGE_GetResource(long jimageHandle,
                     long locationHandle, byte[] buffer, long size);
     // Get an array of names that match; return the count found upto array size
-    public native static int JIMAGE_Resources(long jimageHandle,
+    public static native int JIMAGE_Resources(long jimageHandle,
                     String[] outputNames);
     // Return the module name for the package
-    public native static String JIMAGE_PackageToModule(long imageHandle,
+    public static native String JIMAGE_PackageToModule(long imageHandle,
                     String packageName);
 
     static ByteBuffer newDirectByteBuffer(long address, long capacity) {
diff --git a/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageReader.java b/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageReader.java
index 2798d732f63..d66621f04e0 100644
--- a/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageReader.java
+++ b/jdk/src/java.base/share/classes/jdk/internal/jimage/ImageReader.java
@@ -129,7 +129,7 @@ public class ImageReader extends BasicImageReader {
     // jimage file does not store directory structure. We build nodes
     // using the "path" strings found in the jimage file.
     // Node can be a directory or a resource
-    public static abstract class Node {
+    public abstract static class Node {
         private static final int ROOT_DIR = 0b0000_0000_0000_0001;
         private static final int PACKAGES_DIR = 0b0000_0000_0000_0010;
         private static final int MODULES_DIR = 0b0000_0000_0000_0100;
diff --git a/jdk/src/java.base/share/classes/jdk/internal/jimage/PerfectHashBuilder.java b/jdk/src/java.base/share/classes/jdk/internal/jimage/PerfectHashBuilder.java
index 005a58c76d9..c3ff39cb2e1 100644
--- a/jdk/src/java.base/share/classes/jdk/internal/jimage/PerfectHashBuilder.java
+++ b/jdk/src/java.base/share/classes/jdk/internal/jimage/PerfectHashBuilder.java
@@ -33,7 +33,7 @@ import java.util.List;
 import java.util.Map;
 
 public class PerfectHashBuilder {
-    private final static int RETRY_LIMIT = 1000;
+    private static final int RETRY_LIMIT = 1000;
 
     private Class entryComponent;
     private Class bucketComponent;
diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypePath.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypePath.java
index 31fe2bc6826..a48a39d8b46 100644
--- a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypePath.java
+++ b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypePath.java
@@ -71,25 +71,25 @@ public class TypePath {
      * A type path step that steps into the element type of an array type. See
      * {@link #getStep getStep}.
      */
-    public final static int ARRAY_ELEMENT = 0;
+    public static final int ARRAY_ELEMENT = 0;
 
     /**
      * A type path step that steps into the nested type of a class type. See
      * {@link #getStep getStep}.
      */
-    public final static int INNER_TYPE = 1;
+    public static final int INNER_TYPE = 1;
 
     /**
      * A type path step that steps into the bound of a wildcard type. See
      * {@link #getStep getStep}.
      */
-    public final static int WILDCARD_BOUND = 2;
+    public static final int WILDCARD_BOUND = 2;
 
     /**
      * A type path step that steps into a type argument of a generic type. See
      * {@link #getStep getStep}.
      */
-    public final static int TYPE_ARGUMENT = 3;
+    public static final int TYPE_ARGUMENT = 3;
 
     /**
      * The byte array where the path is stored, in Java class file format.
diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypeReference.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypeReference.java
index 4caf8f10db0..b366df0afb7 100644
--- a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypeReference.java
+++ b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/TypeReference.java
@@ -74,133 +74,133 @@ public class TypeReference {
      * The sort of type references that target a type parameter of a generic
      * class. See {@link #getSort getSort}.
      */
-    public final static int CLASS_TYPE_PARAMETER = 0x00;
+    public static final int CLASS_TYPE_PARAMETER = 0x00;
 
     /**
      * The sort of type references that target a type parameter of a generic
      * method. See {@link #getSort getSort}.
      */
-    public final static int METHOD_TYPE_PARAMETER = 0x01;
+    public static final int METHOD_TYPE_PARAMETER = 0x01;
 
     /**
      * The sort of type references that target the super class of a class or one
      * of the interfaces it implements. See {@link #getSort getSort}.
      */
-    public final static int CLASS_EXTENDS = 0x10;
+    public static final int CLASS_EXTENDS = 0x10;
 
     /**
      * The sort of type references that target a bound of a type parameter of a
      * generic class. See {@link #getSort getSort}.
      */
-    public final static int CLASS_TYPE_PARAMETER_BOUND = 0x11;
+    public static final int CLASS_TYPE_PARAMETER_BOUND = 0x11;
 
     /**
      * The sort of type references that target a bound of a type parameter of a
      * generic method. See {@link #getSort getSort}.
      */
-    public final static int METHOD_TYPE_PARAMETER_BOUND = 0x12;
+    public static final int METHOD_TYPE_PARAMETER_BOUND = 0x12;
 
     /**
      * The sort of type references that target the type of a field. See
      * {@link #getSort getSort}.
      */
-    public final static int FIELD = 0x13;
+    public static final int FIELD = 0x13;
 
     /**
      * The sort of type references that target the return type of a method. See
      * {@link #getSort getSort}.
      */
-    public final static int METHOD_RETURN = 0x14;
+    public static final int METHOD_RETURN = 0x14;
 
     /**
      * The sort of type references that target the receiver type of a method.
      * See {@link #getSort getSort}.
      */
-    public final static int METHOD_RECEIVER = 0x15;
+    public static final int METHOD_RECEIVER = 0x15;
 
     /**
      * The sort of type references that target the type of a formal parameter of
      * a method. See {@link #getSort getSort}.
      */
-    public final static int METHOD_FORMAL_PARAMETER = 0x16;
+    public static final int METHOD_FORMAL_PARAMETER = 0x16;
 
     /**
      * The sort of type references that target the type of an exception declared
      * in the throws clause of a method. See {@link #getSort getSort}.
      */
-    public final static int THROWS = 0x17;
+    public static final int THROWS = 0x17;
 
     /**
      * The sort of type references that target the type of a local variable in a
      * method. See {@link #getSort getSort}.
      */
-    public final static int LOCAL_VARIABLE = 0x40;
+    public static final int LOCAL_VARIABLE = 0x40;
 
     /**
      * The sort of type references that target the type of a resource variable
      * in a method. See {@link #getSort getSort}.
      */
-    public final static int RESOURCE_VARIABLE = 0x41;
+    public static final int RESOURCE_VARIABLE = 0x41;
 
     /**
      * The sort of type references that target the type of the exception of a
      * 'catch' clause in a method. See {@link #getSort getSort}.
      */
-    public final static int EXCEPTION_PARAMETER = 0x42;
+    public static final int EXCEPTION_PARAMETER = 0x42;
 
     /**
      * The sort of type references that target the type declared in an
      * 'instanceof' instruction. See {@link #getSort getSort}.
      */
-    public final static int INSTANCEOF = 0x43;
+    public static final int INSTANCEOF = 0x43;
 
     /**
      * The sort of type references that target the type of the object created by
      * a 'new' instruction. See {@link #getSort getSort}.
      */
-    public final static int NEW = 0x44;
+    public static final int NEW = 0x44;
 
     /**
      * The sort of type references that target the receiver type of a
      * constructor reference. See {@link #getSort getSort}.
      */
-    public final static int CONSTRUCTOR_REFERENCE = 0x45;
+    public static final int CONSTRUCTOR_REFERENCE = 0x45;
 
     /**
      * The sort of type references that target the receiver type of a method
      * reference. See {@link #getSort getSort}.
      */
-    public final static int METHOD_REFERENCE = 0x46;
+    public static final int METHOD_REFERENCE = 0x46;
 
     /**
      * The sort of type references that target the type declared in an explicit
      * or implicit cast instruction. See {@link #getSort getSort}.
      */
-    public final static int CAST = 0x47;
+    public static final int CAST = 0x47;
 
     /**
      * The sort of type references that target a type parameter of a generic
      * constructor in a constructor call. See {@link #getSort getSort}.
      */
-    public final static int CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT = 0x48;
+    public static final int CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT = 0x48;
 
     /**
      * The sort of type references that target a type parameter of a generic
      * method in a method call. See {@link #getSort getSort}.
      */
-    public final static int METHOD_INVOCATION_TYPE_ARGUMENT = 0x49;
+    public static final int METHOD_INVOCATION_TYPE_ARGUMENT = 0x49;
 
     /**
      * The sort of type references that target a type parameter of a generic
      * constructor in a constructor reference. See {@link #getSort getSort}.
      */
-    public final static int CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT = 0x4A;
+    public static final int CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT = 0x4A;
 
     /**
      * The sort of type references that target a type parameter of a generic
      * method in a method reference. See {@link #getSort getSort}.
      */
-    public final static int METHOD_REFERENCE_TYPE_ARGUMENT = 0x4B;
+    public static final int METHOD_REFERENCE_TYPE_ARGUMENT = 0x4B;
 
     /**
      * The type reference value in Java class file format.
diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/InstructionAdapter.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/InstructionAdapter.java
index 2df144ef70c..8ecb1c9c4b1 100644
--- a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/InstructionAdapter.java
+++ b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/InstructionAdapter.java
@@ -73,7 +73,7 @@ import jdk.internal.org.objectweb.asm.Type;
  */
 public class InstructionAdapter extends MethodVisitor {
 
-    public final static Type OBJECT_TYPE = Type.getType("Ljava/lang/Object;");
+    public static final Type OBJECT_TYPE = Type.getType("Ljava/lang/Object;");
 
     /**
      * Creates a new {@link InstructionAdapter}. Subclasses must not use this
diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureVisitor.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureVisitor.java
index 5b9cb702abb..9114bcd348e 100644
--- a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureVisitor.java
+++ b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/signature/SignatureVisitor.java
@@ -88,17 +88,17 @@ public abstract class SignatureVisitor {
     /**
      * Wildcard for an "extends" type argument.
      */
-    public final static char EXTENDS = '+';
+    public static final char EXTENDS = '+';
 
     /**
      * Wildcard for a "super" type argument.
      */
-    public final static char SUPER = '-';
+    public static final char SUPER = '-';
 
     /**
      * Wildcard for a normal type argument.
      */
-    public final static char INSTANCEOF = '=';
+    public static final char INSTANCEOF = '=';
 
     /**
      * The ASM API version implemented by this visitor. The value of this field
diff --git a/jdk/src/java.base/share/classes/jdk/internal/util/xml/PropertiesDefaultHandler.java b/jdk/src/java.base/share/classes/jdk/internal/util/xml/PropertiesDefaultHandler.java
index 41608cb2130..932223819ac 100644
--- a/jdk/src/java.base/share/classes/jdk/internal/util/xml/PropertiesDefaultHandler.java
+++ b/jdk/src/java.base/share/classes/jdk/internal/util/xml/PropertiesDefaultHandler.java
@@ -135,8 +135,8 @@ public class PropertiesDefaultHandler extends DefaultHandler {
     ////////////////////////////////////////////////////////////////////
     // Validate while parsing
     ////////////////////////////////////////////////////////////////////
-    final static String ALLOWED_ELEMENTS = "properties, comment, entry";
-    final static String ALLOWED_COMMENT = "comment";
+    static final String ALLOWED_ELEMENTS = "properties, comment, entry";
+    static final String ALLOWED_COMMENT = "comment";
     ////////////////////////////////////////////////////////////////////
     // Handler methods
     ////////////////////////////////////////////////////////////////////
diff --git a/jdk/src/java.base/share/classes/jdk/internal/util/xml/XMLStreamWriter.java b/jdk/src/java.base/share/classes/jdk/internal/util/xml/XMLStreamWriter.java
index 0478420c9fa..494c071d73e 100644
--- a/jdk/src/java.base/share/classes/jdk/internal/util/xml/XMLStreamWriter.java
+++ b/jdk/src/java.base/share/classes/jdk/internal/util/xml/XMLStreamWriter.java
@@ -36,8 +36,8 @@ package jdk.internal.util.xml;
 public  interface XMLStreamWriter {
 
     //Defaults the XML version to 1.0, and the encoding to utf-8
-    public final static String DEFAULT_XML_VERSION = "1.0";
-    public final static String DEFAULT_ENCODING = "UTF-8";
+    public static final String DEFAULT_XML_VERSION = "1.0";
+    public static final String DEFAULT_ENCODING = "UTF-8";
 
     /**
      * Writes a start tag to the output.  All writeStartElement methods
diff --git a/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java b/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java
index eb2c5f7028e..4d31aafe720 100644
--- a/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java
+++ b/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java
@@ -40,13 +40,13 @@ import jdk.internal.org.xml.sax.SAXException;
  */
 public abstract class Parser {
 
-    public final static String FAULT = "";
-    protected final static int BUFFSIZE_READER = 512;
-    protected final static int BUFFSIZE_PARSER = 128;
+    public static final String FAULT = "";
+    protected static final int BUFFSIZE_READER = 512;
+    protected static final int BUFFSIZE_PARSER = 128;
     /**
      * The end of stream character.
      */
-    public final static char EOS = 0xffff;
+    public static final char EOS = 0xffff;
     private Pair mNoNS; // there is no namespace
     private Pair mXml;  // the xml namespace
     private Map mEnt;  // the entities look up table
@@ -55,26 +55,26 @@ public abstract class Parser {
     protected boolean mIsSAloneSet;  // standalone is explicitely set
     protected boolean mIsNSAware;    // if true - namespace aware mode
     protected int mPh;  // current phase of document processing
-    protected final static int PH_BEFORE_DOC = -1;  // before parsing
-    protected final static int PH_DOC_START = 0;   // document start
-    protected final static int PH_MISC_DTD = 1;   // misc before DTD
-    protected final static int PH_DTD = 2;   // DTD
-    protected final static int PH_DTD_MISC = 3;   // misc after DTD
-    protected final static int PH_DOCELM = 4;   // document's element
-    protected final static int PH_DOCELM_MISC = 5;   // misc after element
-    protected final static int PH_AFTER_DOC = 6;   // after parsing
+    protected static final int PH_BEFORE_DOC = -1;  // before parsing
+    protected static final int PH_DOC_START = 0;   // document start
+    protected static final int PH_MISC_DTD = 1;   // misc before DTD
+    protected static final int PH_DTD = 2;   // DTD
+    protected static final int PH_DTD_MISC = 3;   // misc after DTD
+    protected static final int PH_DOCELM = 4;   // document's element
+    protected static final int PH_DOCELM_MISC = 5;   // misc after element
+    protected static final int PH_AFTER_DOC = 6;   // after parsing
     protected int mEvt;  // current event type
-    protected final static int EV_NULL = 0;   // unknown
-    protected final static int EV_ELM = 1;   // empty element
-    protected final static int EV_ELMS = 2;   // start element
-    protected final static int EV_ELME = 3;   // end element
-    protected final static int EV_TEXT = 4;   // textual content
-    protected final static int EV_WSPC = 5;   // white space content
-    protected final static int EV_PI = 6;   // processing instruction
-    protected final static int EV_CDAT = 7;   // character data
-    protected final static int EV_COMM = 8;   // comment
-    protected final static int EV_DTD = 9;   // document type definition
-    protected final static int EV_ENT = 10;  // skipped entity
+    protected static final int EV_NULL = 0;   // unknown
+    protected static final int EV_ELM = 1;   // empty element
+    protected static final int EV_ELMS = 2;   // start element
+    protected static final int EV_ELME = 3;   // end element
+    protected static final int EV_TEXT = 4;   // textual content
+    protected static final int EV_WSPC = 5;   // white space content
+    protected static final int EV_PI = 6;   // processing instruction
+    protected static final int EV_CDAT = 7;   // character data
+    protected static final int EV_COMM = 8;   // comment
+    protected static final int EV_DTD = 9;   // document type definition
+    protected static final int EV_ENT = 10;  // skipped entity
     private char mESt; // built-in entity recognizer state
     // mESt values:
     //   0x100   : the initial state
@@ -120,9 +120,9 @@ public abstract class Parser {
     /**
      * Default prefixes
      */
-    private final static char NONS[];
-    private final static char XML[];
-    private final static char XMLNS[];
+    private static final char NONS[];
+    private static final char XML[];
+    private static final char XMLNS[];
 
     static {
         NONS = new char[1];
diff --git a/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/ParserSAX.java b/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/ParserSAX.java
index 733f2665972..412a686129c 100644
--- a/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/ParserSAX.java
+++ b/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/ParserSAX.java
@@ -56,9 +56,9 @@ import jdk.internal.org.xml.sax.helpers.DefaultHandler;
 final class ParserSAX
     extends Parser implements XMLReader, Locator
 {
-    public final static String FEATURE_NS =
+    public static final String FEATURE_NS =
             "http://xml.org/sax/features/namespaces";
-    public final static String FEATURE_PREF =
+    public static final String FEATURE_PREF =
             "http://xml.org/sax/features/namespace-prefixes";
     //          SAX feature flags
     private boolean mFNamespaces;
diff --git a/jdk/src/java.base/share/classes/jdk/net/Sockets.java b/jdk/src/java.base/share/classes/jdk/net/Sockets.java
index 6b4e0d0c82d..bf096c01bf4 100644
--- a/jdk/src/java.base/share/classes/jdk/net/Sockets.java
+++ b/jdk/src/java.base/share/classes/jdk/net/Sockets.java
@@ -58,7 +58,7 @@ import sun.net.ExtendedOptionsImpl;
 @jdk.Exported
 public class Sockets {
 
-    private final static HashMap,Set>>
+    private static final HashMap,Set>>
         options = new HashMap<>();
 
     static {
diff --git a/jdk/src/java.base/share/classes/sun/invoke/anon/AnonymousClassLoader.java b/jdk/src/java.base/share/classes/sun/invoke/anon/AnonymousClassLoader.java
index 32624b40f97..6e2c8bfe2ad 100644
--- a/jdk/src/java.base/share/classes/sun/invoke/anon/AnonymousClassLoader.java
+++ b/jdk/src/java.base/share/classes/sun/invoke/anon/AnonymousClassLoader.java
@@ -192,7 +192,7 @@ public class AnonymousClassLoader {
     private static sun.misc.Unsafe unsafe = sun.misc.Unsafe.getUnsafe();
     // preceding line requires that this class be on the boot class path
 
-    static private final Method defineAnonymousClass;
+    private static final Method defineAnonymousClass;
     static {
         Method dac = null;
         Class unsafeClass = unsafe.getClass();
diff --git a/jdk/src/java.base/share/classes/sun/invoke/anon/ConstantPoolPatch.java b/jdk/src/java.base/share/classes/sun/invoke/anon/ConstantPoolPatch.java
index eb4c9b32975..416a918ba8d 100644
--- a/jdk/src/java.base/share/classes/sun/invoke/anon/ConstantPoolPatch.java
+++ b/jdk/src/java.base/share/classes/sun/invoke/anon/ConstantPoolPatch.java
@@ -411,7 +411,7 @@ public class ConstantPoolPatch {
         patchArray[index] = addSemis(className, memberName, signature);
     }
 
-    static private final int CONSTANT_MemberRef_MASK =
+    private static final int CONSTANT_MemberRef_MASK =
               CONSTANT_Fieldref
             | CONSTANT_Methodref
             | CONSTANT_InterfaceMethodref;
diff --git a/jdk/src/java.base/share/classes/sun/invoke/util/BytecodeDescriptor.java b/jdk/src/java.base/share/classes/sun/invoke/util/BytecodeDescriptor.java
index ccc313cd41b..797c7720ad8 100644
--- a/jdk/src/java.base/share/classes/sun/invoke/util/BytecodeDescriptor.java
+++ b/jdk/src/java.base/share/classes/sun/invoke/util/BytecodeDescriptor.java
@@ -67,11 +67,11 @@ public class BytecodeDescriptor {
         return ptypes;
     }
 
-    static private void parseError(String str, String msg) {
+    private static void parseError(String str, String msg) {
         throw new IllegalArgumentException("bad signature: "+str+": "+msg);
     }
 
-    static private Class parseSig(String str, int[] i, int end, ClassLoader loader) {
+    private static Class parseSig(String str, int[] i, int end, ClassLoader loader) {
         if (i[0] == end)  return null;
         char c = str.charAt(i[0]++);
         if (c == 'L') {
@@ -122,7 +122,7 @@ public class BytecodeDescriptor {
         return sb.toString();
     }
 
-    static private void unparseSig(Class t, StringBuilder sb) {
+    private static void unparseSig(Class t, StringBuilder sb) {
         char c = Wrapper.forBasicType(t).basicTypeChar();
         if (c != 'L') {
             sb.append(c);
diff --git a/jdk/src/java.base/share/classes/sun/invoke/util/ValueConversions.java b/jdk/src/java.base/share/classes/sun/invoke/util/ValueConversions.java
index 64b52f4569a..52ca7026c05 100644
--- a/jdk/src/java.base/share/classes/sun/invoke/util/ValueConversions.java
+++ b/jdk/src/java.base/share/classes/sun/invoke/util/ValueConversions.java
@@ -215,7 +215,7 @@ public class ValueConversions {
         return unbox(type, 3);
     }
 
-    static private final Integer ZERO_INT = 0, ONE_INT = 1;
+    private static final Integer ZERO_INT = 0, ONE_INT = 1;
 
     /// Primitive conversions
     /**
diff --git a/jdk/src/java.base/share/classes/sun/invoke/util/Wrapper.java b/jdk/src/java.base/share/classes/sun/invoke/util/Wrapper.java
index 0a0d04b3c74..e69330b6846 100644
--- a/jdk/src/java.base/share/classes/sun/invoke/util/Wrapper.java
+++ b/jdk/src/java.base/share/classes/sun/invoke/util/Wrapper.java
@@ -69,7 +69,7 @@ public enum Wrapper {
                 "0x"+Integer.toHexString(format));
     }
 
-    private static abstract class Format {
+    private abstract static class Format {
         static final int SLOT_SHIFT = 0, SIZE_SHIFT = 2, KIND_SHIFT = 12;
         static final int
                 SIGNED   = (-1) << KIND_SHIFT,
diff --git a/jdk/src/java.base/share/classes/sun/launcher/LauncherHelper.java b/jdk/src/java.base/share/classes/sun/launcher/LauncherHelper.java
index 456c8120b71..5845979b1a5 100644
--- a/jdk/src/java.base/share/classes/sun/launcher/LauncherHelper.java
+++ b/jdk/src/java.base/share/classes/sun/launcher/LauncherHelper.java
@@ -88,7 +88,7 @@ public enum LauncherHelper {
 
     // sync with java.c and sun.misc.VM
     private static final String diagprop = "sun.java.launcher.diag";
-    final static boolean trace = sun.misc.VM.getSavedProperty(diagprop) != null;
+    static final boolean trace = sun.misc.VM.getSavedProperty(diagprop) != null;
 
     private static final String defaultBundleName =
             "sun.launcher.resources.launcher";
diff --git a/jdk/src/java.base/share/classes/sun/misc/BASE64Decoder.java b/jdk/src/java.base/share/classes/sun/misc/BASE64Decoder.java
index e65a1d2bfd9..097d0a5f33d 100644
--- a/jdk/src/java.base/share/classes/sun/misc/BASE64Decoder.java
+++ b/jdk/src/java.base/share/classes/sun/misc/BASE64Decoder.java
@@ -74,7 +74,7 @@ public class BASE64Decoder extends CharacterDecoder {
      * This character array provides the character to value map
      * based on RFC1521.
      */
-    private final static char pem_array[] = {
+    private static final char pem_array[] = {
         //       0   1   2   3   4   5   6   7
                 'A','B','C','D','E','F','G','H', // 0
                 'I','J','K','L','M','N','O','P', // 1
@@ -86,7 +86,7 @@ public class BASE64Decoder extends CharacterDecoder {
                 '4','5','6','7','8','9','+','/'  // 7
         };
 
-    private final static byte pem_convert_array[] = new byte[256];
+    private static final byte pem_convert_array[] = new byte[256];
 
     static {
         for (int i = 0; i < 255; i++) {
diff --git a/jdk/src/java.base/share/classes/sun/misc/BASE64Encoder.java b/jdk/src/java.base/share/classes/sun/misc/BASE64Encoder.java
index 6d3e4004373..f0cd74aedec 100644
--- a/jdk/src/java.base/share/classes/sun/misc/BASE64Encoder.java
+++ b/jdk/src/java.base/share/classes/sun/misc/BASE64Encoder.java
@@ -61,7 +61,7 @@ public class BASE64Encoder extends CharacterEncoder {
     }
 
     /** This array maps the characters to their 6 bit values */
-    private final static char pem_array[] = {
+    private static final char pem_array[] = {
         //       0   1   2   3   4   5   6   7
                 'A','B','C','D','E','F','G','H', // 0
                 'I','J','K','L','M','N','O','P', // 1
diff --git a/jdk/src/java.base/share/classes/sun/misc/CharacterDecoder.java b/jdk/src/java.base/share/classes/sun/misc/CharacterDecoder.java
index 07cbd413594..ae6703c8c86 100644
--- a/jdk/src/java.base/share/classes/sun/misc/CharacterDecoder.java
+++ b/jdk/src/java.base/share/classes/sun/misc/CharacterDecoder.java
@@ -88,10 +88,10 @@ import java.nio.ByteBuffer;
 public abstract class CharacterDecoder {
 
     /** Return the number of bytes per atom of decoding */
-    abstract protected int bytesPerAtom();
+    protected abstract int bytesPerAtom();
 
     /** Return the maximum number of bytes that can be encoded per line */
-    abstract protected int bytesPerLine();
+    protected abstract int bytesPerLine();
 
     /** decode the beginning of the buffer, by default this is a NOP. */
     protected void decodeBufferPrefix(PushbackInputStream aStream, OutputStream bStream) throws IOException { }
diff --git a/jdk/src/java.base/share/classes/sun/misc/CharacterEncoder.java b/jdk/src/java.base/share/classes/sun/misc/CharacterEncoder.java
index 4042cb2c6e7..d39a9f912df 100644
--- a/jdk/src/java.base/share/classes/sun/misc/CharacterEncoder.java
+++ b/jdk/src/java.base/share/classes/sun/misc/CharacterEncoder.java
@@ -79,10 +79,10 @@ public abstract class CharacterEncoder {
     protected PrintStream pStream;
 
     /** Return the number of bytes per atom of encoding */
-    abstract protected int bytesPerAtom();
+    protected abstract int bytesPerAtom();
 
     /** Return the number of bytes that can be encoded per line */
-    abstract protected int bytesPerLine();
+    protected abstract int bytesPerLine();
 
     /**
      * Encode the prefix for the entire buffer. By default is simply
@@ -114,7 +114,7 @@ public abstract class CharacterEncoder {
     }
 
     /** Encode one "atom" of information into characters. */
-    abstract protected void encodeAtom(OutputStream aStream, byte someBytes[],
+    protected abstract void encodeAtom(OutputStream aStream, byte someBytes[],
                 int anOffset, int aLength) throws IOException;
 
     /**
diff --git a/jdk/src/java.base/share/classes/sun/misc/Cleaner.java b/jdk/src/java.base/share/classes/sun/misc/Cleaner.java
index 6cc90a74760..ea473a17712 100644
--- a/jdk/src/java.base/share/classes/sun/misc/Cleaner.java
+++ b/jdk/src/java.base/share/classes/sun/misc/Cleaner.java
@@ -69,7 +69,7 @@ public class Cleaner
     // Doubly-linked list of live cleaners, which prevents the cleaners
     // themselves from being GC'd before their referents
     //
-    static private Cleaner first = null;
+    private static Cleaner first = null;
 
     private Cleaner
         next = null,
diff --git a/jdk/src/java.base/share/classes/sun/misc/FDBigInteger.java b/jdk/src/java.base/share/classes/sun/misc/FDBigInteger.java
index 972ccd1ef5f..d25f2017f6a 100644
--- a/jdk/src/java.base/share/classes/sun/misc/FDBigInteger.java
+++ b/jdk/src/java.base/share/classes/sun/misc/FDBigInteger.java
@@ -144,7 +144,7 @@ public /*@ spec_bigint_math @*/ class FDBigInteger {
     }
 
     // Constant for casting an int to a long via bitwise AND.
-    private final static long LONG_MASK = 0xffffffffL;
+    private static final long LONG_MASK = 0xffffffffL;
 
     //@ spec_public non_null;
     private int data[];  // value: data[0] is least significant
diff --git a/jdk/src/java.base/share/classes/sun/misc/FloatingDecimal.java b/jdk/src/java.base/share/classes/sun/misc/FloatingDecimal.java
index b3a4a2a7575..0c07520f13e 100644
--- a/jdk/src/java.base/share/classes/sun/misc/FloatingDecimal.java
+++ b/jdk/src/java.base/share/classes/sun/misc/FloatingDecimal.java
@@ -187,7 +187,7 @@ public class FloatingDecimal{
      * and infinite values.
      */
     private static class ExceptionalBinaryToASCIIBuffer implements BinaryToASCIIConverter {
-        final private String image;
+        private final String image;
         private boolean isNegative;
 
         public ExceptionalBinaryToASCIIBuffer(String image, boolean isNegative) {
@@ -1003,8 +1003,8 @@ public class FloatingDecimal{
      * A ASCIIToBinaryConverter container for a double.
      */
     static class PreparedASCIIToBinaryBuffer implements ASCIIToBinaryConverter {
-        final private double doubleVal;
-        final private float floatVal;
+        private final double doubleVal;
+        private final float floatVal;
 
         public PreparedASCIIToBinaryBuffer(double doubleVal, float floatVal) {
             this.doubleVal = doubleVal;
diff --git a/jdk/src/java.base/share/classes/sun/misc/LRUCache.java b/jdk/src/java.base/share/classes/sun/misc/LRUCache.java
index 8c14c174feb..0910a593ee0 100644
--- a/jdk/src/java.base/share/classes/sun/misc/LRUCache.java
+++ b/jdk/src/java.base/share/classes/sun/misc/LRUCache.java
@@ -39,9 +39,9 @@ public abstract class LRUCache {
         this.size = size;
     }
 
-    abstract protected V create(N name);
+    protected abstract V create(N name);
 
-    abstract protected boolean hasName(V ob, N name);
+    protected abstract boolean hasName(V ob, N name);
 
     public static void moveToFront(Object[] oa, int i) {
         Object ob = oa[i];
diff --git a/jdk/src/java.base/share/classes/sun/misc/PerfCounter.java b/jdk/src/java.base/share/classes/sun/misc/PerfCounter.java
index 21a36a8cf8d..aa054707937 100644
--- a/jdk/src/java.base/share/classes/sun/misc/PerfCounter.java
+++ b/jdk/src/java.base/share/classes/sun/misc/PerfCounter.java
@@ -52,10 +52,10 @@ public class PerfCounter {
         AccessController.doPrivileged(new Perf.GetPerfAction());
 
     // Must match values defined in hotspot/src/share/vm/runtime/perfdata.hpp
-    private final static int V_Constant  = 1;
-    private final static int V_Monotonic = 2;
-    private final static int V_Variable  = 3;
-    private final static int U_None      = 1;
+    private static final int V_Constant  = 1;
+    private static final int V_Monotonic = 2;
+    private static final int V_Variable  = 3;
+    private static final int U_None      = 1;
 
     private final String name;
     private final LongBuffer lb;
diff --git a/jdk/src/java.base/share/classes/sun/misc/ProxyGenerator.java b/jdk/src/java.base/share/classes/sun/misc/ProxyGenerator.java
index 344a8a713b9..a8d9c55e894 100644
--- a/jdk/src/java.base/share/classes/sun/misc/ProxyGenerator.java
+++ b/jdk/src/java.base/share/classes/sun/misc/ProxyGenerator.java
@@ -305,13 +305,13 @@ public class ProxyGenerator {
     // end of constants copied from sun.tools.java.RuntimeConstants
 
     /** name of the superclass of proxy classes */
-    private final static String superclassName = "java/lang/reflect/Proxy";
+    private static final String superclassName = "java/lang/reflect/Proxy";
 
     /** name of field for storing a proxy instance's invocation handler */
-    private final static String handlerFieldName = "h";
+    private static final String handlerFieldName = "h";
 
     /** debugging flag for saving generated class files */
-    private final static boolean saveGeneratedFiles =
+    private static final boolean saveGeneratedFiles =
         java.security.AccessController.doPrivileged(
             new GetBooleanAction(
                 "sun.misc.ProxyGenerator.saveGeneratedFiles")).booleanValue();
@@ -1913,7 +1913,7 @@ public class ProxyGenerator {
          * that can be stored in the "pool" list; its purpose is to define a
          * common method for writing constant pool entries to a class file.
          */
-        private static abstract class Entry {
+        private abstract static class Entry {
             public abstract void write(DataOutputStream out)
                 throws IOException;
         }
diff --git a/jdk/src/java.base/share/classes/sun/misc/Request.java b/jdk/src/java.base/share/classes/sun/misc/Request.java
index 5301e4cc57b..70de7158290 100644
--- a/jdk/src/java.base/share/classes/sun/misc/Request.java
+++ b/jdk/src/java.base/share/classes/sun/misc/Request.java
@@ -32,10 +32,10 @@ package sun.misc;
  * @author      Steven B. Byrne
  */
 
-abstract public class Request {
+public abstract class Request {
     /**
      * The main task of the Request object is to be exectuted from a request
      * queue.
      */
-    abstract public void execute();
+    public abstract void execute();
 }
diff --git a/jdk/src/java.base/share/classes/sun/misc/SoftCache.java b/jdk/src/java.base/share/classes/sun/misc/SoftCache.java
index d1866853b3f..30bc2ec6068 100644
--- a/jdk/src/java.base/share/classes/sun/misc/SoftCache.java
+++ b/jdk/src/java.base/share/classes/sun/misc/SoftCache.java
@@ -117,9 +117,9 @@ public class SoftCache extends AbstractMap implements Map {
-        static private Object INVALID_KEY = new Object();
-        static private int dropped = 0;
+    private static class ValueCell extends SoftReference {
+        private static Object INVALID_KEY = new Object();
+        private static int dropped = 0;
         private Object key;
 
         private ValueCell(Object key, Object value, ReferenceQueue queue) {
diff --git a/jdk/src/java.base/share/classes/sun/misc/UCDecoder.java b/jdk/src/java.base/share/classes/sun/misc/UCDecoder.java
index 81793a3ccd0..6248c400ebe 100644
--- a/jdk/src/java.base/share/classes/sun/misc/UCDecoder.java
+++ b/jdk/src/java.base/share/classes/sun/misc/UCDecoder.java
@@ -95,7 +95,7 @@ public class UCDecoder extends CharacterDecoder {
     }
 
     /* this is the UCE mapping of 0-63 to characters .. */
-    private final static byte map_array[] = {
+    private static final byte map_array[] = {
         //     0         1         2         3         4         5         6         7
         (byte)'0',(byte)'1',(byte)'2',(byte)'3',(byte)'4',(byte)'5',(byte)'6',(byte)'7', // 0
         (byte)'8',(byte)'9',(byte)'A',(byte)'B',(byte)'C',(byte)'D',(byte)'E',(byte)'F', // 1
diff --git a/jdk/src/java.base/share/classes/sun/misc/UCEncoder.java b/jdk/src/java.base/share/classes/sun/misc/UCEncoder.java
index 159da288a74..e635288ff47 100644
--- a/jdk/src/java.base/share/classes/sun/misc/UCEncoder.java
+++ b/jdk/src/java.base/share/classes/sun/misc/UCEncoder.java
@@ -86,7 +86,7 @@ public class UCEncoder extends CharacterEncoder {
     }
 
     /* this is the UCE mapping of 0-63 to characters .. */
-    private final static byte map_array[] = {
+    private static final byte map_array[] = {
         //     0         1         2         3         4         5         6         7
         (byte)'0',(byte)'1',(byte)'2',(byte)'3',(byte)'4',(byte)'5',(byte)'6',(byte)'7', // 0
         (byte)'8',(byte)'9',(byte)'A',(byte)'B',(byte)'C',(byte)'D',(byte)'E',(byte)'F', // 1
diff --git a/jdk/src/java.base/share/classes/sun/misc/VM.java b/jdk/src/java.base/share/classes/sun/misc/VM.java
index 8cb765758b4..0c75f10c657 100644
--- a/jdk/src/java.base/share/classes/sun/misc/VM.java
+++ b/jdk/src/java.base/share/classes/sun/misc/VM.java
@@ -354,12 +354,12 @@ public class VM {
      * in the hotspot implementation. Its value is set according to
      * the JVM TI specification GetThreadState function.
      */
-    private final static int JVMTI_THREAD_STATE_ALIVE = 0x0001;
-    private final static int JVMTI_THREAD_STATE_TERMINATED = 0x0002;
-    private final static int JVMTI_THREAD_STATE_RUNNABLE = 0x0004;
-    private final static int JVMTI_THREAD_STATE_BLOCKED_ON_MONITOR_ENTER = 0x0400;
-    private final static int JVMTI_THREAD_STATE_WAITING_INDEFINITELY = 0x0010;
-    private final static int JVMTI_THREAD_STATE_WAITING_WITH_TIMEOUT = 0x0020;
+    private static final int JVMTI_THREAD_STATE_ALIVE = 0x0001;
+    private static final int JVMTI_THREAD_STATE_TERMINATED = 0x0002;
+    private static final int JVMTI_THREAD_STATE_RUNNABLE = 0x0004;
+    private static final int JVMTI_THREAD_STATE_BLOCKED_ON_MONITOR_ENTER = 0x0400;
+    private static final int JVMTI_THREAD_STATE_WAITING_INDEFINITELY = 0x0010;
+    private static final int JVMTI_THREAD_STATE_WAITING_WITH_TIMEOUT = 0x0020;
 
     /*
      * Returns the first non-null class loader up the execution stack,
@@ -435,5 +435,5 @@ public class VM {
     static {
         initialize();
     }
-    private native static void initialize();
+    private static native void initialize();
 }
diff --git a/jdk/src/java.base/share/classes/sun/net/NetProperties.java b/jdk/src/java.base/share/classes/sun/net/NetProperties.java
index 10075e45e3f..9148a6dd0cf 100644
--- a/jdk/src/java.base/share/classes/sun/net/NetProperties.java
+++ b/jdk/src/java.base/share/classes/sun/net/NetProperties.java
@@ -39,7 +39,7 @@ import java.util.Properties;
  */
 
 public class NetProperties {
-    static private Properties props = new Properties();
+    private static Properties props = new Properties();
     static {
         AccessController.doPrivileged(
             new PrivilegedAction() {
@@ -56,7 +56,7 @@ public class NetProperties {
      * Loads the default networking system properties
      * the file is in jre/lib/net.properties
      */
-    static private void loadDefaultProperties() {
+    private static void loadDefaultProperties() {
         String fname = System.getProperty("java.home");
         if (fname == null) {
             throw new Error("Can't find java.home ??");
@@ -86,7 +86,7 @@ public class NetProperties {
      * @return the String value for the property,
      *         or null
      */
-    static public String get(String key) {
+    public static String get(String key) {
         String def = props.getProperty(key);
         try {
             return System.getProperty(key, def);
@@ -108,7 +108,7 @@ public class NetProperties {
      * @return the Integer value for the property,
      *         or null
      */
-    static public Integer getInteger(String key, int defval) {
+    public static Integer getInteger(String key, int defval) {
         String val = null;
 
         try {
@@ -137,7 +137,7 @@ public class NetProperties {
      * @return the Boolean value for the property,
      *         or null
      */
-    static public Boolean getBoolean(String key) {
+    public static Boolean getBoolean(String key) {
         String val = null;
 
         try {
diff --git a/jdk/src/java.base/share/classes/sun/net/NetworkServer.java b/jdk/src/java.base/share/classes/sun/net/NetworkServer.java
index 6937775d40e..f0cd8349c25 100644
--- a/jdk/src/java.base/share/classes/sun/net/NetworkServer.java
+++ b/jdk/src/java.base/share/classes/sun/net/NetworkServer.java
@@ -62,7 +62,7 @@ public class NetworkServer implements Runnable, Cloneable {
         return clientSocket != null;
     }
 
-    final public void run() {
+    public final void run() {
         if (serverSocket != null) {
             Thread.currentThread().setPriority(Thread.MAX_PRIORITY);
             // System.out.print("Server starts " + serverSocket + "\n");
@@ -106,7 +106,7 @@ public class NetworkServer implements Runnable, Cloneable {
 
     /** Start a server on port port.  It will call serviceRequest()
         for each new connection. */
-    final public void startServer(int port) throws IOException {
+    public final void startServer(int port) throws IOException {
         serverSocket = new ServerSocket(port, 50);
         serverInstance = new ManagedLocalsThread(this);
         serverInstance.start();
diff --git a/jdk/src/java.base/share/classes/sun/net/dns/ResolverConfiguration.java b/jdk/src/java.base/share/classes/sun/net/dns/ResolverConfiguration.java
index 4ab30b2935d..e0048d80d3e 100644
--- a/jdk/src/java.base/share/classes/sun/net/dns/ResolverConfiguration.java
+++ b/jdk/src/java.base/share/classes/sun/net/dns/ResolverConfiguration.java
@@ -84,7 +84,7 @@ public abstract class ResolverConfiguration {
      * Options representing certain resolver variables of
      * a {@link ResolverConfiguration}.
      */
-    public static abstract class Options {
+    public abstract static class Options {
 
         /**
          * Returns the maximum number of attempts the resolver
diff --git a/jdk/src/java.base/share/classes/sun/net/spi/DefaultProxySelector.java b/jdk/src/java.base/share/classes/sun/net/spi/DefaultProxySelector.java
index c753f6888ab..3443cf5a633 100644
--- a/jdk/src/java.base/share/classes/sun/net/spi/DefaultProxySelector.java
+++ b/jdk/src/java.base/share/classes/sun/net/spi/DefaultProxySelector.java
@@ -72,7 +72,7 @@ public class DefaultProxySelector extends ProxySelector {
      *
      * Note that the socksProxy should *always* be the last on the list
      */
-    final static String[][] props = {
+    static final String[][] props = {
         /*
          * protocol, Property prefix 1, Property prefix 2, ...
          */
@@ -353,7 +353,7 @@ public class DefaultProxySelector extends ProxySelector {
         }
     }
 
-    private native static boolean init();
+    private static native boolean init();
     private synchronized native Proxy getSystemProxy(String protocol, String host);
 
     /**
diff --git a/jdk/src/java.base/share/classes/sun/net/util/IPAddressUtil.java b/jdk/src/java.base/share/classes/sun/net/util/IPAddressUtil.java
index 688c39824ff..334e93f7bdb 100644
--- a/jdk/src/java.base/share/classes/sun/net/util/IPAddressUtil.java
+++ b/jdk/src/java.base/share/classes/sun/net/util/IPAddressUtil.java
@@ -26,9 +26,9 @@
 package sun.net.util;
 
 public class IPAddressUtil {
-    private final static int INADDR4SZ = 4;
-    private final static int INADDR16SZ = 16;
-    private final static int INT16SZ = 2;
+    private static final int INADDR4SZ = 4;
+    private static final int INADDR16SZ = 16;
+    private static final int INT16SZ = 2;
 
     /*
      * Converts IPv4 address in its textual presentation form
diff --git a/jdk/src/java.base/share/classes/sun/net/www/ParseUtil.java b/jdk/src/java.base/share/classes/sun/net/www/ParseUtil.java
index 52af2cb6510..f94600e59cc 100644
--- a/jdk/src/java.base/share/classes/sun/net/www/ParseUtil.java
+++ b/jdk/src/java.base/share/classes/sun/net/www/ParseUtil.java
@@ -504,7 +504,7 @@ public class ParseUtil {
         }
     }
 
-    private final static char[] hexDigits = {
+    private static final char[] hexDigits = {
         '0', '1', '2', '3', '4', '5', '6', '7',
         '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
     };
diff --git a/jdk/src/java.base/share/classes/sun/net/www/URLConnection.java b/jdk/src/java.base/share/classes/sun/net/www/URLConnection.java
index c4959285d60..ff03852a5ef 100644
--- a/jdk/src/java.base/share/classes/sun/net/www/URLConnection.java
+++ b/jdk/src/java.base/share/classes/sun/net/www/URLConnection.java
@@ -34,7 +34,7 @@ import java.util.*;
  * @author  James Gosling
  */
 
-abstract public class URLConnection extends java.net.URLConnection {
+public abstract class URLConnection extends java.net.URLConnection {
 
     /** The URL that it is connected to */
 
@@ -236,11 +236,11 @@ abstract public class URLConnection extends java.net.URLConnection {
 
     private static HashMap proxiedHosts = new HashMap<>();
 
-    public synchronized static void setProxiedHost(String host) {
+    public static synchronized void setProxiedHost(String host) {
         proxiedHosts.put(host.toLowerCase(), null);
     }
 
-    public synchronized static boolean isProxiedHost(String host) {
+    public static synchronized boolean isProxiedHost(String host) {
         return proxiedHosts.containsKey(host.toLowerCase());
     }
 }
diff --git a/jdk/src/java.base/share/classes/sun/net/www/http/ChunkedInputStream.java b/jdk/src/java.base/share/classes/sun/net/www/http/ChunkedInputStream.java
index 3f36aa11653..8f1eb192fb1 100644
--- a/jdk/src/java.base/share/classes/sun/net/www/http/ChunkedInputStream.java
+++ b/jdk/src/java.base/share/classes/sun/net/www/http/ChunkedInputStream.java
@@ -128,7 +128,7 @@ class ChunkedInputStream extends InputStream implements Hurryable {
     /*
      * Maximum chunk header size of 2KB + 2 bytes for CRLF
      */
-    private final static int MAX_CHUNK_HEADER_SIZE = 2050;
+    private static final int MAX_CHUNK_HEADER_SIZE = 2050;
 
     /**
      * State to indicate that next field should be :-
diff --git a/jdk/src/java.base/share/classes/sun/net/www/http/HttpClient.java b/jdk/src/java.base/share/classes/sun/net/www/http/HttpClient.java
index ddf8eddff01..c0b0d629d42 100644
--- a/jdk/src/java.base/share/classes/sun/net/www/http/HttpClient.java
+++ b/jdk/src/java.base/share/classes/sun/net/www/http/HttpClient.java
@@ -70,7 +70,7 @@ public class HttpClient extends NetworkClient {
     /** return default port number (subclasses may override) */
     protected int getDefaultPort () { return httpPortNumber; }
 
-    static private int getDefaultPort(String proto) {
+    private static int getDefaultPort(String proto) {
         if ("http".equalsIgnoreCase(proto))
             return 80;
         if ("https".equalsIgnoreCase(proto))
@@ -211,7 +211,7 @@ public class HttpClient extends NetworkClient {
         openServer();
     }
 
-    static protected Proxy newHttpProxy(String proxyHost, int proxyPort,
+    protected static Proxy newHttpProxy(String proxyHost, int proxyPort,
                                       String proto) {
         if (proxyHost == null || proto == null)
             return Proxy.NO_PROXY;
diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/http/AuthCacheValue.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/http/AuthCacheValue.java
index a8f66fd184b..d0b3a9487b9 100644
--- a/jdk/src/java.base/share/classes/sun/net/www/protocol/http/AuthCacheValue.java
+++ b/jdk/src/java.base/share/classes/sun/net/www/protocol/http/AuthCacheValue.java
@@ -47,7 +47,7 @@ public abstract class AuthCacheValue implements Serializable {
     /**
      * Caches authentication info entered by user.  See cacheKey()
      */
-    static protected AuthCache cache = new AuthCacheImpl();
+    protected static AuthCache cache = new AuthCacheImpl();
 
     public static void setAuthCache (AuthCache map) {
         cache = map;
diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java
index a9bedacc88f..487e17ecd37 100644
--- a/jdk/src/java.base/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java
+++ b/jdk/src/java.base/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java
@@ -74,7 +74,7 @@ public abstract class AuthenticationInfo extends AuthCacheValue implements Clone
 
     /* AuthCacheValue: */
 
-    transient protected PasswordAuthentication pw;
+    protected transient PasswordAuthentication pw;
 
     public PasswordAuthentication credentials() {
         return pw;
@@ -113,13 +113,13 @@ public abstract class AuthenticationInfo extends AuthCacheValue implements Clone
      * at the same time, then all but the first will block until
      * the first completes its authentication.
      */
-    static private HashMap requests = new HashMap<>();
+    private static HashMap requests = new HashMap<>();
 
     /* check if a request for this destination is in progress
      * return false immediately if not. Otherwise block until
      * request is finished and return true
      */
-    static private boolean requestIsInProgress (String key) {
+    private static boolean requestIsInProgress (String key) {
         if (!serializeAuth) {
             /* behavior is disabled. Revert to concurrent requests */
             return false;
@@ -147,7 +147,7 @@ public abstract class AuthenticationInfo extends AuthCacheValue implements Clone
     /* signal completion of an authentication (whether it succeeded or not)
      * so that other threads can continue.
      */
-    static private void requestCompleted (String key) {
+    private static void requestCompleted (String key) {
         synchronized (requests) {
             Thread thread = requests.get(key);
             if (thread != null && thread == Thread.currentThread()) {
diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/http/DigestAuthentication.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/http/DigestAuthentication.java
index 5ad27159253..51268080884 100644
--- a/jdk/src/java.base/share/classes/sun/net/www/protocol/http/DigestAuthentication.java
+++ b/jdk/src/java.base/share/classes/sun/net/www/protocol/http/DigestAuthentication.java
@@ -54,7 +54,7 @@ class DigestAuthentication extends AuthenticationInfo {
 
     private String authMethod;
 
-    private final static String compatPropName = "http.auth.digest." +
+    private static final String compatPropName = "http.auth.digest." +
         "quoteParameters";
 
     // true if http.auth.digest.quoteParameters Net property is true
@@ -507,12 +507,12 @@ class DigestAuthentication extends AuthenticationInfo {
         return finalHash;
     }
 
-    private final static char charArray[] = {
+    private static final char charArray[] = {
         '0', '1', '2', '3', '4', '5', '6', '7',
         '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
     };
 
-    private final static String zeroPad[] = {
+    private static final String zeroPad[] = {
         // 0         1          2         3        4       5      6     7
         "00000000", "0000000", "000000", "00000", "0000", "000", "00", "0"
     };
diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/http/HttpCallerInfo.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/http/HttpCallerInfo.java
index fcb3ac821f0..9537275ee37 100644
--- a/jdk/src/java.base/share/classes/sun/net/www/protocol/http/HttpCallerInfo.java
+++ b/jdk/src/java.base/share/classes/sun/net/www/protocol/http/HttpCallerInfo.java
@@ -42,13 +42,13 @@ import java.net.URL;
  *
  * 2. Schemed: With the scheme field filled, can be used in JGSS-API calls.
  */
-final public class HttpCallerInfo {
+public final class HttpCallerInfo {
     // All info that an Authenticator needs.
-    final public URL url;
-    final public String host, protocol, prompt, scheme;
-    final public int port;
-    final public InetAddress addr;
-    final public RequestorType authType;
+    public final URL url;
+    public final String host, protocol, prompt, scheme;
+    public final int port;
+    public final InetAddress addr;
+    public final RequestorType authType;
 
     /**
      * Create a schemed object based on an un-schemed one.
diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
index 84decd8fcff..12f40820016 100644
--- a/jdk/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
+++ b/jdk/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
@@ -106,11 +106,11 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
     static final boolean validateServer;
 
     private StreamingOutputStream strOutputStream;
-    private final static String RETRY_MSG1 =
+    private static final String RETRY_MSG1 =
         "cannot retry due to proxy authentication, in streaming mode";
-    private final static String RETRY_MSG2 =
+    private static final String RETRY_MSG2 =
         "cannot retry due to server authentication, in streaming mode";
-    private final static String RETRY_MSG3 =
+    private static final String RETRY_MSG3 =
         "cannot retry due to redirection, in streaming mode";
 
     /*
@@ -2857,8 +2857,8 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
     }
 
     // constant strings represent set-cookie header names
-    private final static String SET_COOKIE = "set-cookie";
-    private final static String SET_COOKIE2 = "set-cookie2";
+    private static final String SET_COOKIE = "set-cookie";
+    private static final String SET_COOKIE2 = "set-cookie2";
 
     /**
      * Returns a filtered version of the given headers value.
diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/http/NegotiateAuthentication.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/http/NegotiateAuthentication.java
index 74326af85e0..820f3eda8a0 100644
--- a/jdk/src/java.base/share/classes/sun/net/www/protocol/http/NegotiateAuthentication.java
+++ b/jdk/src/java.base/share/classes/sun/net/www/protocol/http/NegotiateAuthentication.java
@@ -47,7 +47,7 @@ class NegotiateAuthentication extends AuthenticationInfo {
     private static final long serialVersionUID = 100L;
     private static final PlatformLogger logger = HttpURLConnection.getHttpLogger();
 
-    final private HttpCallerInfo hci;
+    private final HttpCallerInfo hci;
 
     // These maps are used to manage the GSS availability for diffrent
     // hosts. The key for both maps is the host name.
diff --git a/jdk/src/java.base/share/classes/sun/net/www/protocol/https/DefaultHostnameVerifier.java b/jdk/src/java.base/share/classes/sun/net/www/protocol/https/DefaultHostnameVerifier.java
index e199858365a..0690dbf82d2 100644
--- a/jdk/src/java.base/share/classes/sun/net/www/protocol/https/DefaultHostnameVerifier.java
+++ b/jdk/src/java.base/share/classes/sun/net/www/protocol/https/DefaultHostnameVerifier.java
@@ -38,7 +38,7 @@ import javax.net.ssl.SSLSession;
  *
  * @author Xuelei Fan
  */
-final public class DefaultHostnameVerifier implements HostnameVerifier {
+public final class DefaultHostnameVerifier implements HostnameVerifier {
     public boolean verify(String hostname, SSLSession session) {
         return false;
     }
diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/Net.java b/jdk/src/java.base/share/classes/sun/nio/ch/Net.java
index 846fcf9f2ea..525d3a1224c 100644
--- a/jdk/src/java.base/share/classes/sun/nio/ch/Net.java
+++ b/jdk/src/java.base/share/classes/sun/nio/ch/Net.java
@@ -460,9 +460,9 @@ public class Net {
         throws IOException;
 
 
-    public final static int SHUT_RD = 0;
-    public final static int SHUT_WR = 1;
-    public final static int SHUT_RDWR = 2;
+    public static final int SHUT_RD = 0;
+    public static final int SHUT_WR = 1;
+    public static final int SHUT_RDWR = 2;
 
     static native void shutdown(FileDescriptor fd, int how) throws IOException;
 
diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/SelectorImpl.java b/jdk/src/java.base/share/classes/sun/nio/ch/SelectorImpl.java
index 1693c0cdec6..c4c85e425ec 100644
--- a/jdk/src/java.base/share/classes/sun/nio/ch/SelectorImpl.java
+++ b/jdk/src/java.base/share/classes/sun/nio/ch/SelectorImpl.java
@@ -159,6 +159,6 @@ public abstract class SelectorImpl
 
     protected abstract void implDereg(SelectionKeyImpl ski) throws IOException;
 
-    abstract public Selector wakeup();
+    public abstract Selector wakeup();
 
 }
diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/ThreadPool.java b/jdk/src/java.base/share/classes/sun/nio/ch/ThreadPool.java
index 0624e8a6788..151f3dbc498 100644
--- a/jdk/src/java.base/share/classes/sun/nio/ch/ThreadPool.java
+++ b/jdk/src/java.base/share/classes/sun/nio/ch/ThreadPool.java
@@ -91,7 +91,7 @@ public class ThreadPool {
     }
 
     private static class DefaultThreadPoolHolder {
-        final static ThreadPool defaultThreadPool = createDefault();
+        static final ThreadPool defaultThreadPool = createDefault();
     }
 
     // return the default (system-wide) thread pool
diff --git a/jdk/src/java.base/share/classes/sun/nio/cs/CharsetMapping.java b/jdk/src/java.base/share/classes/sun/nio/cs/CharsetMapping.java
index 2d1358c92c7..6715bd09692 100644
--- a/jdk/src/java.base/share/classes/sun/nio/cs/CharsetMapping.java
+++ b/jdk/src/java.base/share/classes/sun/nio/cs/CharsetMapping.java
@@ -36,8 +36,8 @@ import java.util.*;
 import java.security.*;
 
 public class CharsetMapping {
-    public final static char UNMAPPABLE_DECODING = '\uFFFD';
-    public final static int  UNMAPPABLE_ENCODING = 0xFFFD;
+    public static final char UNMAPPABLE_DECODING = '\uFFFD';
+    public static final int  UNMAPPABLE_ENCODING = 0xFFFD;
 
     char[] b2cSB;                //singlebyte b->c
     char[] b2cDB1;               //dobulebyte b->c /db1
@@ -195,13 +195,13 @@ public class CharsetMapping {
 
     /*****************************************************************************/
     // tags of different charset mapping tables
-    private final static int MAP_SINGLEBYTE      = 0x1; // 0..256  : c
-    private final static int MAP_DOUBLEBYTE1     = 0x2; // min..max: c
-    private final static int MAP_DOUBLEBYTE2     = 0x3; // min..max: c [DB2]
-    private final static int MAP_SUPPLEMENT      = 0x5; //           db,c
-    private final static int MAP_SUPPLEMENT_C2B  = 0x6; //           c,db
-    private final static int MAP_COMPOSITE       = 0x7; //           db,base,cc
-    private final static int MAP_INDEXC2B        = 0x8; // index table of c->bb
+    private static final int MAP_SINGLEBYTE      = 0x1; // 0..256  : c
+    private static final int MAP_DOUBLEBYTE1     = 0x2; // min..max: c
+    private static final int MAP_DOUBLEBYTE2     = 0x3; // min..max: c [DB2]
+    private static final int MAP_SUPPLEMENT      = 0x5; //           db,c
+    private static final int MAP_SUPPLEMENT_C2B  = 0x6; //           c,db
+    private static final int MAP_COMPOSITE       = 0x7; //           db,base,cc
+    private static final int MAP_INDEXC2B        = 0x8; // index table of c->bb
 
     private static final boolean readNBytes(InputStream in, byte[] bb, int N)
         throws IOException
diff --git a/jdk/src/java.base/share/classes/sun/nio/cs/DoubleByte.java b/jdk/src/java.base/share/classes/sun/nio/cs/DoubleByte.java
index 7b55339cab1..6121ab282d8 100644
--- a/jdk/src/java.base/share/classes/sun/nio/cs/DoubleByte.java
+++ b/jdk/src/java.base/share/classes/sun/nio/cs/DoubleByte.java
@@ -102,7 +102,7 @@ import static sun.nio.cs.CharsetMapping.*;
 
 public class DoubleByte {
 
-    public final static char[] B2C_UNMAPPABLE;
+    public static final char[] B2C_UNMAPPABLE;
     static {
         B2C_UNMAPPABLE = new char[0x100];
         Arrays.fill(B2C_UNMAPPABLE, UNMAPPABLE_DECODING);
diff --git a/jdk/src/java.base/share/classes/sun/nio/cs/SingleByte.java b/jdk/src/java.base/share/classes/sun/nio/cs/SingleByte.java
index 093d1aaea3a..6fd6faf331f 100644
--- a/jdk/src/java.base/share/classes/sun/nio/cs/SingleByte.java
+++ b/jdk/src/java.base/share/classes/sun/nio/cs/SingleByte.java
@@ -46,7 +46,7 @@ public class SingleByte
         return cr;
     }
 
-    final public static class Decoder extends CharsetDecoder
+    public static final class Decoder extends CharsetDecoder
                                       implements ArrayDecoder {
         private final char[] b2c;
 
@@ -131,7 +131,7 @@ public class SingleByte
         }
     }
 
-    final public static class Encoder extends CharsetEncoder
+    public static final class Encoder extends CharsetEncoder
                                       implements ArrayEncoder {
         private Surrogate.Parser sgp;
         private final char[] c2b;
diff --git a/jdk/src/java.base/share/classes/sun/nio/cs/ThreadLocalCoders.java b/jdk/src/java.base/share/classes/sun/nio/cs/ThreadLocalCoders.java
index ca7aac0100c..6287eb8c47a 100644
--- a/jdk/src/java.base/share/classes/sun/nio/cs/ThreadLocalCoders.java
+++ b/jdk/src/java.base/share/classes/sun/nio/cs/ThreadLocalCoders.java
@@ -37,7 +37,7 @@ public class ThreadLocalCoders {
 
     private static final int CACHE_SIZE = 3;
 
-    private static abstract class Cache {
+    private abstract static class Cache {
 
         // Thread-local reference to array of cached objects, in LRU order
         private ThreadLocal cache = new ThreadLocal<>();
diff --git a/jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticFieldAccessorImpl.java b/jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticFieldAccessorImpl.java
index f5837e6b445..04219f1f49c 100644
--- a/jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticFieldAccessorImpl.java
+++ b/jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticFieldAccessorImpl.java
@@ -31,7 +31,7 @@ import java.security.AccessController;
 import sun.misc.Unsafe;
 
 /** Base class for sun.misc.Unsafe-based FieldAccessors for final or
-    volatile static fields.  */
+    static volatile fields.  */
 
 abstract class UnsafeQualifiedStaticFieldAccessorImpl
     extends UnsafeStaticFieldAccessorImpl
diff --git a/jdk/src/java.base/share/classes/sun/security/internal/spec/TlsRsaPremasterSecretParameterSpec.java b/jdk/src/java.base/share/classes/sun/security/internal/spec/TlsRsaPremasterSecretParameterSpec.java
index 0741499b9a7..ad44d4a5452 100644
--- a/jdk/src/java.base/share/classes/sun/security/internal/spec/TlsRsaPremasterSecretParameterSpec.java
+++ b/jdk/src/java.base/share/classes/sun/security/internal/spec/TlsRsaPremasterSecretParameterSpec.java
@@ -50,14 +50,14 @@ public class TlsRsaPremasterSecretParameterSpec
      * implementations) used to send the active negotiated version. The
      * system property below allows to toggle the behavior.
      */
-    private final static String PROP_NAME =
+    private static final String PROP_NAME =
                                 "com.sun.net.ssl.rsaPreMasterSecretFix";
 
     /*
      * Default is "false" (old behavior) for compatibility reasons in
      * SSLv3/TLSv1.  Later protocols (TLSv1.1+) do not use this property.
      */
-    private final static boolean rsaPreMasterSecretFix =
+    private static final boolean rsaPreMasterSecretFix =
             AccessController.doPrivileged(new PrivilegedAction() {
                 public Boolean run() {
                     String value = System.getProperty(PROP_NAME);
diff --git a/jdk/src/java.base/share/classes/sun/security/jca/JCAUtil.java b/jdk/src/java.base/share/classes/sun/security/jca/JCAUtil.java
index b7bae41ea56..7515a22b40e 100644
--- a/jdk/src/java.base/share/classes/sun/security/jca/JCAUtil.java
+++ b/jdk/src/java.base/share/classes/sun/security/jca/JCAUtil.java
@@ -49,7 +49,7 @@ public final class JCAUtil {
 
     // size of the temporary arrays we use. Should fit into the CPU's 1st
     // level cache and could be adjusted based on the platform
-    private final static int ARRAY_SIZE = 4096;
+    private static final int ARRAY_SIZE = 4096;
 
     /**
      * Get the size of a temporary buffer array to use in order to be
diff --git a/jdk/src/java.base/share/classes/sun/security/jca/ProviderConfig.java b/jdk/src/java.base/share/classes/sun/security/jca/ProviderConfig.java
index ea542fe213c..4ab324914bd 100644
--- a/jdk/src/java.base/share/classes/sun/security/jca/ProviderConfig.java
+++ b/jdk/src/java.base/share/classes/sun/security/jca/ProviderConfig.java
@@ -43,7 +43,7 @@ import sun.security.util.PropertyExpander;
  */
 final class ProviderConfig {
 
-    private final static sun.security.util.Debug debug =
+    private static final sun.security.util.Debug debug =
         sun.security.util.Debug.getInstance("jca", "ProviderConfig");
 
     // suffix for identifying the SunPKCS11-Solaris provider
@@ -54,7 +54,7 @@ final class ProviderConfig {
         "${java.home}/conf/security/sunpkcs11-solaris.cfg";
 
     // maximum number of times to try loading a provider before giving up
-    private final static int MAX_LOAD_TRIES = 30;
+    private static final int MAX_LOAD_TRIES = 30;
 
     // could be provider name (module) or provider class name (legacy)
     private final String provName;
diff --git a/jdk/src/java.base/share/classes/sun/security/jca/ProviderList.java b/jdk/src/java.base/share/classes/sun/security/jca/ProviderList.java
index 0f8182863e2..f8dfed64e6f 100644
--- a/jdk/src/java.base/share/classes/sun/security/jca/ProviderList.java
+++ b/jdk/src/java.base/share/classes/sun/security/jca/ProviderList.java
@@ -55,12 +55,12 @@ import java.security.Provider.Service;
  */
 public final class ProviderList {
 
-    final static sun.security.util.Debug debug =
+    static final sun.security.util.Debug debug =
         sun.security.util.Debug.getInstance("jca", "ProviderList");
 
-    private final static ProviderConfig[] PC0 = new ProviderConfig[0];
+    private static final ProviderConfig[] PC0 = new ProviderConfig[0];
 
-    private final static Provider[] P0 = new Provider[0];
+    private static final Provider[] P0 = new Provider[0];
 
     // constant for an ProviderList with no elements
     static final ProviderList EMPTY = new ProviderList(PC0, true);
diff --git a/jdk/src/java.base/share/classes/sun/security/pkcs/PKCS9Attribute.java b/jdk/src/java.base/share/classes/sun/security/pkcs/PKCS9Attribute.java
index 378504c101f..59dc3d0b68d 100644
--- a/jdk/src/java.base/share/classes/sun/security/pkcs/PKCS9Attribute.java
+++ b/jdk/src/java.base/share/classes/sun/security/pkcs/PKCS9Attribute.java
@@ -186,7 +186,7 @@ public class PKCS9Attribute implements DerEncoder {
      */
     static final ObjectIdentifier[] PKCS9_OIDS = new ObjectIdentifier[18];
 
-    private final static Class BYTE_ARRAY_CLASS;
+    private static final Class BYTE_ARRAY_CLASS;
 
     static {   // static initializer for PKCS9_OIDS
         for (int i = 1; i < PKCS9_OIDS.length - 2; i++) {
diff --git a/jdk/src/java.base/share/classes/sun/security/provider/ByteArrayAccess.java b/jdk/src/java.base/share/classes/sun/security/provider/ByteArrayAccess.java
index 1669429a4fa..e9e0b8f74ac 100644
--- a/jdk/src/java.base/share/classes/sun/security/provider/ByteArrayAccess.java
+++ b/jdk/src/java.base/share/classes/sun/security/provider/ByteArrayAccess.java
@@ -71,7 +71,7 @@ final class ByteArrayAccess {
     // implemented using a software trap and therefore very slow)
     private static final boolean bigEndian;
 
-    private final static int byteArrayOfs = unsafe.arrayBaseOffset(byte[].class);
+    private static final int byteArrayOfs = unsafe.arrayBaseOffset(byte[].class);
 
     static {
         boolean scaleOK = ((unsafe.arrayIndexScale(byte[].class) == 1)
diff --git a/jdk/src/java.base/share/classes/sun/security/provider/ConfigFile.java b/jdk/src/java.base/share/classes/sun/security/provider/ConfigFile.java
index f0b748c191e..25a975504d6 100644
--- a/jdk/src/java.base/share/classes/sun/security/provider/ConfigFile.java
+++ b/jdk/src/java.base/share/classes/sun/security/provider/ConfigFile.java
@@ -112,7 +112,7 @@ public final class ConfigFile extends Configuration {
         spi.engineRefresh();
     }
 
-    public final static class Spi extends ConfigurationSpi {
+    public static final class Spi extends ConfigurationSpi {
 
         private URL url;
         private boolean expandProp = true;
diff --git a/jdk/src/java.base/share/classes/sun/security/provider/MD2.java b/jdk/src/java.base/share/classes/sun/security/provider/MD2.java
index b14c1127c0c..1d89328ef73 100644
--- a/jdk/src/java.base/share/classes/sun/security/provider/MD2.java
+++ b/jdk/src/java.base/share/classes/sun/security/provider/MD2.java
@@ -109,7 +109,7 @@ public final class MD2 extends DigestBase {
     }
 
     // substitution table derived from Pi. Copied from the RFC.
-    private final static int[] S = new int[] {
+    private static final int[] S = new int[] {
         41, 46, 67, 201, 162, 216, 124, 1, 61, 54, 84, 161, 236, 240, 6,
         19, 98, 167, 5, 243, 192, 199, 115, 140, 152, 147, 43, 217, 188,
         76, 130, 202, 30, 155, 87, 60, 253, 212, 224, 22, 103, 66, 111, 24,
@@ -133,7 +133,7 @@ public final class MD2 extends DigestBase {
     // digest padding. 17 element array.
     // padding[0] is null
     // padding[i] is an array of i time the byte value i (i = 1..16)
-    private final static byte[][] PADDING;
+    private static final byte[][] PADDING;
 
     static {
         PADDING = new byte[17][];
diff --git a/jdk/src/java.base/share/classes/sun/security/provider/MD4.java b/jdk/src/java.base/share/classes/sun/security/provider/MD4.java
index f6ac91bc744..89016f40eba 100644
--- a/jdk/src/java.base/share/classes/sun/security/provider/MD4.java
+++ b/jdk/src/java.base/share/classes/sun/security/provider/MD4.java
@@ -62,7 +62,7 @@ public final class MD4 extends DigestBase {
     private static final int S33 = 11;
     private static final int S34 = 15;
 
-    private final static Provider md4Provider;
+    private static final Provider md4Provider;
 
     static {
         md4Provider = new Provider("MD4Provider", 1.9d, "MD4 MessageDigest") {
diff --git a/jdk/src/java.base/share/classes/sun/security/provider/ParameterCache.java b/jdk/src/java.base/share/classes/sun/security/provider/ParameterCache.java
index 0edff492d5c..e688572e16e 100644
--- a/jdk/src/java.base/share/classes/sun/security/provider/ParameterCache.java
+++ b/jdk/src/java.base/share/classes/sun/security/provider/ParameterCache.java
@@ -50,10 +50,10 @@ public final class ParameterCache {
     }
 
     // cache of DSA parameters
-    private final static Map dsaCache;
+    private static final Map dsaCache;
 
     // cache of DH parameters
-    private final static Map dhCache;
+    private static final Map dhCache;
 
     /**
      * Return cached DSA parameters for the given length combination of
diff --git a/jdk/src/java.base/share/classes/sun/security/provider/SHA.java b/jdk/src/java.base/share/classes/sun/security/provider/SHA.java
index 0fd334d8a22..e34ff517537 100644
--- a/jdk/src/java.base/share/classes/sun/security/provider/SHA.java
+++ b/jdk/src/java.base/share/classes/sun/security/provider/SHA.java
@@ -104,10 +104,10 @@ public final class SHA extends DigestBase {
     }
 
     // Constants for each round
-    private final static int round1_kt = 0x5a827999;
-    private final static int round2_kt = 0x6ed9eba1;
-    private final static int round3_kt = 0x8f1bbcdc;
-    private final static int round4_kt = 0xca62c1d6;
+    private static final int round1_kt = 0x5a827999;
+    private static final int round2_kt = 0x6ed9eba1;
+    private static final int round3_kt = 0x8f1bbcdc;
+    private static final int round4_kt = 0xca62c1d6;
 
     /**
      * Compute a the hash for the current block.
diff --git a/jdk/src/java.base/share/classes/sun/security/provider/SecureRandom.java b/jdk/src/java.base/share/classes/sun/security/provider/SecureRandom.java
index 167558bd8f8..e9be3e11365 100644
--- a/jdk/src/java.base/share/classes/sun/security/provider/SecureRandom.java
+++ b/jdk/src/java.base/share/classes/sun/security/provider/SecureRandom.java
@@ -148,7 +148,7 @@ implements java.io.Serializable {
      * @param seed the seed.
      */
     @Override
-    synchronized public void engineSetSeed(byte[] seed) {
+    public synchronized void engineSetSeed(byte[] seed) {
         if (state != null) {
             digest.update(state);
             for (int i = 0; i < state.length; i++) {
diff --git a/jdk/src/java.base/share/classes/sun/security/provider/SeedGenerator.java b/jdk/src/java.base/share/classes/sun/security/provider/SeedGenerator.java
index acf8b645b62..87604b5637f 100644
--- a/jdk/src/java.base/share/classes/sun/security/provider/SeedGenerator.java
+++ b/jdk/src/java.base/share/classes/sun/security/provider/SeedGenerator.java
@@ -141,7 +141,7 @@ abstract class SeedGenerator {
     /**
      * Fill result with bytes from the queue. Wait for it if it isn't ready.
      */
-    static public void generateSeed(byte[] result) {
+    public static void generateSeed(byte[] result) {
         instance.getSeedBytes(result);
     }
 
@@ -322,7 +322,7 @@ abstract class SeedGenerator {
          * pushes them into the queue.
          */
         @Override
-        final public void run() {
+        public final void run() {
             try {
                 while (true) {
                     // Queue full? Wait till there's room.
@@ -466,7 +466,7 @@ abstract class SeedGenerator {
          */
         private static class BogusThread implements Runnable {
             @Override
-            final public void run() {
+            public final void run() {
                 try {
                     for (int i = 0; i < 5; i++) {
                         Thread.sleep(50);
diff --git a/jdk/src/java.base/share/classes/sun/security/provider/SunEntries.java b/jdk/src/java.base/share/classes/sun/security/provider/SunEntries.java
index 65e76f80be0..3cd946a76ec 100644
--- a/jdk/src/java.base/share/classes/sun/security/provider/SunEntries.java
+++ b/jdk/src/java.base/share/classes/sun/security/provider/SunEntries.java
@@ -310,12 +310,12 @@ final class SunEntries {
     }
 
     // name of the *System* property, takes precedence over PROP_RNDSOURCE
-    private final static String PROP_EGD = "java.security.egd";
+    private static final String PROP_EGD = "java.security.egd";
     // name of the *Security* property
-    private final static String PROP_RNDSOURCE = "securerandom.source";
+    private static final String PROP_RNDSOURCE = "securerandom.source";
 
-    final static String URL_DEV_RANDOM = "file:/dev/random";
-    final static String URL_DEV_URANDOM = "file:/dev/urandom";
+    static final String URL_DEV_RANDOM = "file:/dev/random";
+    static final String URL_DEV_URANDOM = "file:/dev/urandom";
 
     private static final String seedSource;
 
diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/AlgorithmChecker.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/AlgorithmChecker.java
index 4b6ff56cf40..10ef0760873 100644
--- a/jdk/src/java.base/share/classes/sun/security/provider/certpath/AlgorithmChecker.java
+++ b/jdk/src/java.base/share/classes/sun/security/provider/certpath/AlgorithmChecker.java
@@ -68,16 +68,16 @@ import sun.security.x509.AlgorithmId;
  * @see PKIXCertPathChecker
  * @see PKIXParameters
  */
-final public class AlgorithmChecker extends PKIXCertPathChecker {
+public final class AlgorithmChecker extends PKIXCertPathChecker {
 
     private final AlgorithmConstraints constraints;
     private final PublicKey trustedPubKey;
     private PublicKey prevPubKey;
 
-    private final static Set SIGNATURE_PRIMITIVE_SET =
+    private static final Set SIGNATURE_PRIMITIVE_SET =
         Collections.unmodifiableSet(EnumSet.of(CryptoPrimitive.SIGNATURE));
 
-    private final static DisabledAlgorithmConstraints
+    private static final DisabledAlgorithmConstraints
         certPathDefaultConstraints = new DisabledAlgorithmConstraints(
             DisabledAlgorithmConstraints.PROPERTY_CERTPATH_DISABLED_ALGS);
 
diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/Builder.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/Builder.java
index e6b5fc05582..36e7accbe12 100644
--- a/jdk/src/java.base/share/classes/sun/security/provider/certpath/Builder.java
+++ b/jdk/src/java.base/share/classes/sun/security/provider/certpath/Builder.java
@@ -63,7 +63,7 @@ public abstract class Builder {
      * Authority Information Access extension shall be enabled. Currently
      * disabled by default for compatibility reasons.
      */
-    final static boolean USE_AIA = AccessController.doPrivileged
+    static final boolean USE_AIA = AccessController.doPrivileged
         (new GetBooleanAction("com.sun.security.enableAIAcaIssuers"));
 
     /**
diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/ForwardBuilder.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/ForwardBuilder.java
index 7f30d3b0ceb..12c32cae1bc 100644
--- a/jdk/src/java.base/share/classes/sun/security/provider/certpath/ForwardBuilder.java
+++ b/jdk/src/java.base/share/classes/sun/security/provider/certpath/ForwardBuilder.java
@@ -433,7 +433,7 @@ class ForwardBuilder extends Builder {
      */
     static class PKIXCertComparator implements Comparator {
 
-        final static String METHOD_NME = "PKIXCertComparator.compare()";
+        static final String METHOD_NME = "PKIXCertComparator.compare()";
 
         private final Set trustedSubjectDNs;
 
diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/OCSPResponse.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/OCSPResponse.java
index 65e37c4949e..d36db868c45 100644
--- a/jdk/src/java.base/share/classes/sun/security/provider/certpath/OCSPResponse.java
+++ b/jdk/src/java.base/share/classes/sun/security/provider/certpath/OCSPResponse.java
@@ -760,7 +760,7 @@ public final class OCSPResponse {
     /*
      * A class representing a single OCSP response.
      */
-    public final static class SingleResponse implements OCSP.RevocationStatus {
+    public static final class SingleResponse implements OCSP.RevocationStatus {
         private final CertId certId;
         private final CertStatus certStatus;
         private final Date thisUpdate;
diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/URICertStore.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/URICertStore.java
index 71767b85c00..cf4fb2bcc20 100644
--- a/jdk/src/java.base/share/classes/sun/security/provider/certpath/URICertStore.java
+++ b/jdk/src/java.base/share/classes/sun/security/provider/certpath/URICertStore.java
@@ -91,10 +91,10 @@ class URICertStore extends CertStoreSpi {
 
     // interval between checks for update of cached Certificates/CRLs
     // (30 seconds)
-    private final static int CHECK_INTERVAL = 30 * 1000;
+    private static final int CHECK_INTERVAL = 30 * 1000;
 
     // size of the cache (see Cache class for sizing recommendations)
-    private final static int CACHE_SIZE = 185;
+    private static final int CACHE_SIZE = 185;
 
     // X.509 certificate factory instance
     private final CertificateFactory factory;
diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/UntrustedChecker.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/UntrustedChecker.java
index f52252cdfa8..406da009472 100644
--- a/jdk/src/java.base/share/classes/sun/security/provider/certpath/UntrustedChecker.java
+++ b/jdk/src/java.base/share/classes/sun/security/provider/certpath/UntrustedChecker.java
@@ -41,7 +41,7 @@ import sun.security.util.UntrustedCertificates;
  * @see PKIXCertPathChecker
  * @see PKIXParameters
  */
-final public class UntrustedChecker extends PKIXCertPathChecker {
+public final class UntrustedChecker extends PKIXCertPathChecker {
 
     private static final Debug debug = Debug.getInstance("certpath");
 
diff --git a/jdk/src/java.base/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStore.java b/jdk/src/java.base/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStore.java
index f0dfc9225e9..07935d0f2f7 100644
--- a/jdk/src/java.base/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStore.java
+++ b/jdk/src/java.base/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStore.java
@@ -61,9 +61,9 @@ import javax.net.ssl.X509ExtendedTrustManager;
 public final class SSLServerCertStore extends CertStoreSpi {
 
     private final URI uri;
-    private final static GetChainTrustManager trustManager;
-    private final static SSLSocketFactory socketFactory;
-    private final static HostnameVerifier hostnameVerifier;
+    private static final GetChainTrustManager trustManager;
+    private static final SSLSocketFactory socketFactory;
+    private static final HostnameVerifier hostnameVerifier;
 
     static {
         trustManager = new GetChainTrustManager();
diff --git a/jdk/src/java.base/share/classes/sun/security/rsa/RSACore.java b/jdk/src/java.base/share/classes/sun/security/rsa/RSACore.java
index 7e933e5b758..abf717fc8c2 100644
--- a/jdk/src/java.base/share/classes/sun/security/rsa/RSACore.java
+++ b/jdk/src/java.base/share/classes/sun/security/rsa/RSACore.java
@@ -51,12 +51,12 @@ import sun.security.jca.JCAUtil;
 public final class RSACore {
 
     // globally enable/disable use of blinding
-    private final static boolean ENABLE_BLINDING = true;
+    private static final boolean ENABLE_BLINDING = true;
 
     // cache for blinding parameters. Map
     // use a weak hashmap so that cached values are automatically cleared
     // when the modulus is GC'ed
-    private final static Map
+    private static final Map
                 blindingCache = new WeakHashMap<>();
 
     private RSACore() {
@@ -311,7 +311,7 @@ public final class RSACore {
      *
      * The total performance cost is small.
      */
-    private final static class BlindingRandomPair {
+    private static final class BlindingRandomPair {
         final BigInteger u;
         final BigInteger v;
 
@@ -332,8 +332,8 @@ public final class RSACore {
      * since sharing moduli is fundamentally broken and insecure, this
      * does not matter.
      */
-    private final static class BlindingParameters {
-        private final static BigInteger BIG_TWO = BigInteger.valueOf(2L);
+    private static final class BlindingParameters {
+        private static final BigInteger BIG_TWO = BigInteger.valueOf(2L);
 
         // RSA public exponent
         private final BigInteger e;
diff --git a/jdk/src/java.base/share/classes/sun/security/rsa/RSAKeyFactory.java b/jdk/src/java.base/share/classes/sun/security/rsa/RSAKeyFactory.java
index fcca14bad2a..d869a8aaca4 100644
--- a/jdk/src/java.base/share/classes/sun/security/rsa/RSAKeyFactory.java
+++ b/jdk/src/java.base/share/classes/sun/security/rsa/RSAKeyFactory.java
@@ -60,18 +60,18 @@ import sun.security.action.GetPropertyAction;
  */
 public final class RSAKeyFactory extends KeyFactorySpi {
 
-    private final static Class rsaPublicKeySpecClass =
+    private static final Class rsaPublicKeySpecClass =
                                                 RSAPublicKeySpec.class;
-    private final static Class rsaPrivateKeySpecClass =
+    private static final Class rsaPrivateKeySpecClass =
                                                 RSAPrivateKeySpec.class;
-    private final static Class rsaPrivateCrtKeySpecClass =
+    private static final Class rsaPrivateCrtKeySpecClass =
                                                 RSAPrivateCrtKeySpec.class;
 
-    private final static Class x509KeySpecClass  = X509EncodedKeySpec.class;
-    private final static Class pkcs8KeySpecClass = PKCS8EncodedKeySpec.class;
+    private static final Class x509KeySpecClass  = X509EncodedKeySpec.class;
+    private static final Class pkcs8KeySpecClass = PKCS8EncodedKeySpec.class;
 
-    public final static int MIN_MODLEN = 512;
-    public final static int MAX_MODLEN = 16384;
+    public static final int MIN_MODLEN = 512;
+    public static final int MAX_MODLEN = 16384;
 
     /*
      * If the modulus length is above this value, restrict the size of
@@ -80,8 +80,8 @@ public final class RSAKeyFactory extends KeyFactorySpi {
      * this approach allows flexibility in case impls would like to use
      * larger module and exponent values.
      */
-    public final static int MAX_MODLEN_RESTRICT_EXP = 3072;
-    public final static int MAX_RESTRICTED_EXPLEN = 64;
+    public static final int MAX_MODLEN_RESTRICT_EXP = 3072;
+    public static final int MAX_RESTRICTED_EXPLEN = 64;
 
     private static final boolean restrictExpLen =
         "true".equalsIgnoreCase(AccessController.doPrivileged(
@@ -89,7 +89,7 @@ public final class RSAKeyFactory extends KeyFactorySpi {
                 "sun.security.rsa.restrictRSAExponent", "true")));
 
     // instance used for static translateKey();
-    private final static RSAKeyFactory INSTANCE = new RSAKeyFactory();
+    private static final RSAKeyFactory INSTANCE = new RSAKeyFactory();
 
     public RSAKeyFactory() {
         // empty
diff --git a/jdk/src/java.base/share/classes/sun/security/rsa/RSAPadding.java b/jdk/src/java.base/share/classes/sun/security/rsa/RSAPadding.java
index 8bc31826c67..d236c346d87 100644
--- a/jdk/src/java.base/share/classes/sun/security/rsa/RSAPadding.java
+++ b/jdk/src/java.base/share/classes/sun/security/rsa/RSAPadding.java
@@ -85,13 +85,13 @@ public final class RSAPadding {
     // file. Do not change without coordinating the update
 
     // PKCS#1 v1.5 padding, blocktype 1 (signing)
-    public final static int PAD_BLOCKTYPE_1    = 1;
+    public static final int PAD_BLOCKTYPE_1    = 1;
     // PKCS#1 v1.5 padding, blocktype 2 (encryption)
-    public final static int PAD_BLOCKTYPE_2    = 2;
+    public static final int PAD_BLOCKTYPE_2    = 2;
     // nopadding. Does not do anything, but allows simpler RSACipher code
-    public final static int PAD_NONE           = 3;
+    public static final int PAD_NONE           = 3;
     // PKCS#1 v2.1 OAEP padding
-    public final static int PAD_OAEP_MGF1 = 4;
+    public static final int PAD_OAEP_MGF1 = 4;
 
     // type, one of PAD_*
     private final int type;
diff --git a/jdk/src/java.base/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java b/jdk/src/java.base/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java
index 7e68c427e52..7b1fcce7eba 100644
--- a/jdk/src/java.base/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java
+++ b/jdk/src/java.base/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java
@@ -63,7 +63,7 @@ public final class RSAPrivateCrtKeyImpl
     private BigInteger coeff;   // CRT coeffcient
 
     // algorithmId used to identify RSA keys
-    final static AlgorithmId rsaId =
+    static final AlgorithmId rsaId =
         new AlgorithmId(AlgorithmId.RSAEncryption_oid);
 
     /**
diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/AppOutputStream.java b/jdk/src/java.base/share/classes/sun/security/ssl/AppOutputStream.java
index d11a38f845e..1e8e8e37c78 100644
--- a/jdk/src/java.base/share/classes/sun/security/ssl/AppOutputStream.java
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/AppOutputStream.java
@@ -49,7 +49,7 @@ class AppOutputStream extends OutputStream {
      * Write the data out, NOW.
      */
     @Override
-    synchronized public void write(byte[] b, int off, int len)
+    public synchronized void write(byte[] b, int off, int len)
             throws IOException {
         if (b == null) {
             throw new NullPointerException();
@@ -76,7 +76,7 @@ class AppOutputStream extends OutputStream {
      * Write one byte now.
      */
     @Override
-    synchronized public void write(int i) throws IOException {
+    public synchronized void write(int i) throws IOException {
         oneByte[0] = (byte)i;
         write(oneByte, 0, 1);
     }
diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/Authenticator.java b/jdk/src/java.base/share/classes/sun/security/ssl/Authenticator.java
index ee39e08a795..82a9b02d790 100644
--- a/jdk/src/java.base/share/classes/sun/security/ssl/Authenticator.java
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/Authenticator.java
@@ -244,7 +244,7 @@ class Authenticator {
         return copy;
     }
 
-    final static long toLong(byte[] recordEnS) {
+    static final long toLong(byte[] recordEnS) {
         if (recordEnS != null && recordEnS.length == 8) {
             return ((recordEnS[0] & 0xFFL) << 56) |
                    ((recordEnS[1] & 0xFFL) << 48) |
diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/BaseSSLSocketImpl.java b/jdk/src/java.base/share/classes/sun/security/ssl/BaseSSLSocketImpl.java
index 56333ebde6b..a09932d94e5 100644
--- a/jdk/src/java.base/share/classes/sun/security/ssl/BaseSSLSocketImpl.java
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/BaseSSLSocketImpl.java
@@ -55,8 +55,8 @@ abstract class BaseSSLSocketImpl extends SSLSocket {
      * recurse infinitely ... e.g. close() calling itself, or doing
      * I/O in terms of our own streams.
      */
-    final private Socket self;
-    final private InputStream consumedInput;
+    private final Socket self;
+    private final InputStream consumedInput;
 
     BaseSSLSocketImpl() {
         super();
@@ -88,10 +88,10 @@ abstract class BaseSSLSocketImpl extends SSLSocket {
      *
      * The default is "false", i.e. tolerate the broken behavior.
      */
-    private final static String PROP_NAME =
+    private static final String PROP_NAME =
                                 "com.sun.net.ssl.requireCloseNotify";
 
-    final static boolean requireCloseNotify =
+    static final boolean requireCloseNotify =
                                 Debug.getBooleanProperty(PROP_NAME, false);
 
     //
diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/CipherBox.java b/jdk/src/java.base/share/classes/sun/security/ssl/CipherBox.java
index 97253768e3c..33a7cde9b64 100644
--- a/jdk/src/java.base/share/classes/sun/security/ssl/CipherBox.java
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/CipherBox.java
@@ -93,7 +93,7 @@ import sun.misc.HexDumpEncoder;
 final class CipherBox {
 
     // A CipherBox that implements the identity operation
-    final static CipherBox NULL = new CipherBox();
+    static final CipherBox NULL = new CipherBox();
 
     /* Class and subclass dynamic debugging support */
     private static final Debug debug = Debug.getInstance("ssl");
diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/CipherSuite.java b/jdk/src/java.base/share/classes/sun/security/ssl/CipherSuite.java
index 2907d40e23d..96cb6f0be48 100644
--- a/jdk/src/java.base/share/classes/sun/security/ssl/CipherSuite.java
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/CipherSuite.java
@@ -72,27 +72,27 @@ import static sun.security.ssl.JsseJce.*;
 final class CipherSuite implements Comparable {
 
     // minimum priority for supported CipherSuites
-    final static int SUPPORTED_SUITES_PRIORITY = 1;
+    static final int SUPPORTED_SUITES_PRIORITY = 1;
 
     // minimum priority for default enabled CipherSuites
-    final static int DEFAULT_SUITES_PRIORITY = 300;
+    static final int DEFAULT_SUITES_PRIORITY = 300;
 
     // Flag indicating if CipherSuite availability can change dynamically.
     // This is the case when we rely on a JCE cipher implementation that
     // may not be available in the installed JCE providers.
     // It is true because we might not have an ECC implementation.
-    final static boolean DYNAMIC_AVAILABILITY = true;
+    static final boolean DYNAMIC_AVAILABILITY = true;
 
-    private final static boolean ALLOW_ECC = Debug.getBooleanProperty
+    private static final boolean ALLOW_ECC = Debug.getBooleanProperty
         ("com.sun.net.ssl.enableECC", true);
 
     // Map Integer(id) -> CipherSuite
     // contains all known CipherSuites
-    private final static Map idMap;
+    private static final Map idMap;
 
     // Map String(name) -> CipherSuite
     // contains only supported CipherSuites (i.e. allowed == true)
-    private final static Map nameMap;
+    private static final Map nameMap;
 
     // Protocol defined CipherSuite name, e.g. SSL_RSA_WITH_RC4_128_MD5
     // we use TLS_* only for new CipherSuites, still SSL_* for old ones
@@ -474,7 +474,7 @@ final class CipherSuite implements Comparable {
         B_AES_256_GCM(CIPHER_AES_GCM, AEAD_CIPHER, 32, 12, 4, true);
 
         // Map BulkCipher -> Boolean(available)
-        private final static Map availableCache =
+        private static final Map availableCache =
                                             new HashMap<>(8);
 
         // descriptive name including key size, e.g. AES/128
@@ -518,7 +518,7 @@ final class CipherSuite implements Comparable {
         final int tagSize = 16;
 
         // The secure random used to detect the cipher availability.
-        private final static SecureRandom secureRandom;
+        private static final SecureRandom secureRandom;
 
         static {
             try {
@@ -1437,8 +1437,8 @@ final class CipherSuite implements Comparable {
     }
 
     // ciphersuite SSL_NULL_WITH_NULL_NULL
-    final static CipherSuite C_NULL = CipherSuite.valueOf(0, 0);
+    static final CipherSuite C_NULL = CipherSuite.valueOf(0, 0);
 
     // ciphersuite TLS_EMPTY_RENEGOTIATION_INFO_SCSV
-    final static CipherSuite C_SCSV = CipherSuite.valueOf(0x00, 0xff);
+    static final CipherSuite C_SCSV = CipherSuite.valueOf(0x00, 0xff);
 }
diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/Ciphertext.java b/jdk/src/java.base/share/classes/sun/security/ssl/Ciphertext.java
index 8f0004bc0a7..b68085f5145 100644
--- a/jdk/src/java.base/share/classes/sun/security/ssl/Ciphertext.java
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/Ciphertext.java
@@ -32,7 +32,7 @@ import static sun.security.ssl.HandshakeMessage.*;
  * enumeration of record type
  */
 final class Ciphertext {
-    final static Ciphertext CIPHERTEXT_NULL = new Ciphertext();
+    static final Ciphertext CIPHERTEXT_NULL = new Ciphertext();
 
     RecordType recordType;
     long recordSN;
diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/ClientHandshaker.java b/jdk/src/java.base/share/classes/sun/security/ssl/ClientHandshaker.java
index d0b806be511..a6878bd9652 100644
--- a/jdk/src/java.base/share/classes/sun/security/ssl/ClientHandshaker.java
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/ClientHandshaker.java
@@ -60,8 +60,8 @@ import static sun.security.ssl.CipherSuite.KeyExchange.*;
 final class ClientHandshaker extends Handshaker {
 
     // constants for subject alt names of type DNS and IP
-    private final static int ALTNAME_DNS = 2;
-    private final static int ALTNAME_IP  = 7;
+    private static final int ALTNAME_DNS = 2;
+    private static final int ALTNAME_IP  = 7;
 
     // the server's public key from its certificate.
     private PublicKey serverKey;
@@ -98,7 +98,7 @@ final class ClientHandshaker extends Handshaker {
     private ProtocolVersion maxProtocolVersion;
 
     // To switch off the SNI extension.
-    private final static boolean enableSNIExtension =
+    private static final boolean enableSNIExtension =
             Debug.getBooleanProperty("jsse.enableSNIExtension", true);
 
     /*
@@ -144,11 +144,11 @@ final class ClientHandshaker extends Handshaker {
      * If the system property is set to "true" explicitly, the restriction on
      * server certificate change in renegotiation is disabled.
      */
-    private final static boolean allowUnsafeServerCertChange =
+    private static final boolean allowUnsafeServerCertChange =
         Debug.getBooleanProperty("jdk.tls.allowUnsafeServerCertChange", false);
 
     // To switch off the max_fragment_length extension.
-    private final static boolean enableMFLExtension =
+    private static final boolean enableMFLExtension =
             Debug.getBooleanProperty("jsse.enableMFLExtension", false);
 
     private List requestedServerNames =
diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/ClientKeyExchange.java b/jdk/src/java.base/share/classes/sun/security/ssl/ClientKeyExchange.java
index 8b066938c89..c3bcec61307 100644
--- a/jdk/src/java.base/share/classes/sun/security/ssl/ClientKeyExchange.java
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/ClientKeyExchange.java
@@ -44,17 +44,17 @@ public abstract class ClientKeyExchange extends HandshakeMessage {
     }
 
     @Override
-    abstract public int messageLength();
+    public abstract int messageLength();
 
     @Override
-    abstract public void send(HandshakeOutStream s) throws IOException;
+    public abstract void send(HandshakeOutStream s) throws IOException;
 
     @Override
-    abstract public void print(PrintStream s) throws IOException;
+    public abstract void print(PrintStream s) throws IOException;
 
-    abstract public SecretKey clientKeyExchange();
+    public abstract SecretKey clientKeyExchange();
 
-    abstract public Principal getPeerPrincipal();
+    public abstract Principal getPeerPrincipal();
 
-    abstract public Principal getLocalPrincipal();
+    public abstract Principal getLocalPrincipal();
 }
diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/DTLSInputRecord.java b/jdk/src/java.base/share/classes/sun/security/ssl/DTLSInputRecord.java
index fcc5fe634ef..375c9ea003d 100644
--- a/jdk/src/java.base/share/classes/sun/security/ssl/DTLSInputRecord.java
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/DTLSInputRecord.java
@@ -77,7 +77,7 @@ final class DTLSInputRecord extends InputRecord implements DTLSRecord {
     }
 
     @Override
-    synchronized public void close() throws IOException {
+    public synchronized void close() throws IOException {
         if (!isClosed) {
             prevReadCipher.dispose();
             super.close();
diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/EphemeralKeyManager.java b/jdk/src/java.base/share/classes/sun/security/ssl/EphemeralKeyManager.java
index 25fd4754a91..097f8244146 100644
--- a/jdk/src/java.base/share/classes/sun/security/ssl/EphemeralKeyManager.java
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/EphemeralKeyManager.java
@@ -36,8 +36,8 @@ import java.security.*;
 final class EphemeralKeyManager {
 
     // indices for the keys array below
-    private final static int INDEX_RSA512 = 0;
-    private final static int INDEX_RSA1024 = 1;
+    private static final int INDEX_RSA512 = 0;
+    private static final int INDEX_RSA1024 = 1;
 
     /*
      * Current cached RSA KeyPairs. Elements are never null.
@@ -87,10 +87,10 @@ final class EphemeralKeyManager {
     private static class EphemeralKeyPair {
 
         // maximum number of times a KeyPair is used
-        private final static int MAX_USE = 200;
+        private static final int MAX_USE = 200;
 
         // maximum time interval in which the keypair is used (1 hour in ms)
-        private final static long USE_INTERVAL = 3600*1000;
+        private static final long USE_INTERVAL = 3600*1000;
 
         private KeyPair keyPair;
         private int uses;
diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/ExtensionType.java b/jdk/src/java.base/share/classes/sun/security/ssl/ExtensionType.java
index 645a13553a2..f4cab9b6cc4 100644
--- a/jdk/src/java.base/share/classes/sun/security/ssl/ExtensionType.java
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/ExtensionType.java
@@ -62,46 +62,46 @@ final class ExtensionType {
     }
 
     // extensions defined in RFC 3546
-    final static ExtensionType EXT_SERVER_NAME =
+    static final ExtensionType EXT_SERVER_NAME =
             e(0x0000, "server_name");            // IANA registry value: 0
-    final static ExtensionType EXT_MAX_FRAGMENT_LENGTH =
+    static final ExtensionType EXT_MAX_FRAGMENT_LENGTH =
             e(0x0001, "max_fragment_length");    // IANA registry value: 1
-    final static ExtensionType EXT_CLIENT_CERTIFICATE_URL =
+    static final ExtensionType EXT_CLIENT_CERTIFICATE_URL =
             e(0x0002, "client_certificate_url"); // IANA registry value: 2
-    final static ExtensionType EXT_TRUSTED_CA_KEYS =
+    static final ExtensionType EXT_TRUSTED_CA_KEYS =
             e(0x0003, "trusted_ca_keys");        // IANA registry value: 3
-    final static ExtensionType EXT_TRUNCATED_HMAC =
+    static final ExtensionType EXT_TRUNCATED_HMAC =
             e(0x0004, "truncated_hmac");         // IANA registry value: 4
-    final static ExtensionType EXT_STATUS_REQUEST =
+    static final ExtensionType EXT_STATUS_REQUEST =
             e(0x0005, "status_request");         // IANA registry value: 5
 
     // extensions defined in RFC 4681
-    final static ExtensionType EXT_USER_MAPPING =
+    static final ExtensionType EXT_USER_MAPPING =
             e(0x0006, "user_mapping");           // IANA registry value: 6
 
     // extensions defined in RFC 5081
-    final static ExtensionType EXT_CERT_TYPE =
+    static final ExtensionType EXT_CERT_TYPE =
             e(0x0009, "cert_type");              // IANA registry value: 9
 
     // extensions defined in RFC 4492 (ECC)
-    final static ExtensionType EXT_ELLIPTIC_CURVES =
+    static final ExtensionType EXT_ELLIPTIC_CURVES =
             e(0x000A, "elliptic_curves");        // IANA registry value: 10
-    final static ExtensionType EXT_EC_POINT_FORMATS =
+    static final ExtensionType EXT_EC_POINT_FORMATS =
             e(0x000B, "ec_point_formats");       // IANA registry value: 11
 
     // extensions defined in RFC 5054
-    final static ExtensionType EXT_SRP =
+    static final ExtensionType EXT_SRP =
             e(0x000C, "srp");                    // IANA registry value: 12
 
     // extensions defined in RFC 5246
-    final static ExtensionType EXT_SIGNATURE_ALGORITHMS =
+    static final ExtensionType EXT_SIGNATURE_ALGORITHMS =
             e(0x000D, "signature_algorithms");   // IANA registry value: 13
 
     // extensions defined in RFC 6961
-    final static ExtensionType EXT_STATUS_REQUEST_V2 =
+    static final ExtensionType EXT_STATUS_REQUEST_V2 =
             e(0x0011, "status_request_v2");      // IANA registry value: 17
 
     // extensions defined in RFC 5746
-    final static ExtensionType EXT_RENEGOTIATION_INFO =
+    static final ExtensionType EXT_RENEGOTIATION_INFO =
             e(0xff01, "renegotiation_info");     // IANA registry value: 65281
 }
diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/HandshakeMessage.java b/jdk/src/java.base/share/classes/sun/security/ssl/HandshakeMessage.java
index dcb519b896b..a6d9a2fc384 100644
--- a/jdk/src/java.base/share/classes/sun/security/ssl/HandshakeMessage.java
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/HandshakeMessage.java
@@ -297,7 +297,7 @@ static final class ClientHello extends HandshakeMessage {
 
     HelloExtensions extensions = new HelloExtensions();
 
-    private final static byte[]  NULL_COMPRESSION = new byte[] {0};
+    private static final byte[]  NULL_COMPRESSION = new byte[] {0};
 
     ClientHello(SecureRandom generator, ProtocolVersion protocolVersion,
             SessionId sessionId, CipherSuiteList cipherSuites,
@@ -924,7 +924,7 @@ static final class CertificateStatus extends HandshakeMessage
  * exchange the premaster secret.  That's how RSA_EXPORT often works,
  * as well as how the DHE_* flavors work.
  */
-static abstract class ServerKeyExchange extends HandshakeMessage
+abstract static class ServerKeyExchange extends HandshakeMessage
 {
     @Override
     int messageType() { return ht_server_key_exchange; }
@@ -1077,7 +1077,7 @@ static final
 class DH_ServerKeyExchange extends ServerKeyExchange
 {
     // Fix message encoding, see 4348279
-    private final static boolean dhKeyExchangeFix =
+    private static final boolean dhKeyExchangeFix =
         Debug.getBooleanProperty("com.sun.net.ssl.dhKeyExchangeFix", true);
 
     private byte[]                dh_p;        // 1 to 2^16 - 1 bytes
@@ -1362,9 +1362,9 @@ static final
 class ECDH_ServerKeyExchange extends ServerKeyExchange {
 
     // constants for ECCurveType
-    private final static int CURVE_EXPLICIT_PRIME = 1;
-    private final static int CURVE_EXPLICIT_CHAR2 = 2;
-    private final static int CURVE_NAMED_CURVE    = 3;
+    private static final int CURVE_EXPLICIT_PRIME = 1;
+    private static final int CURVE_EXPLICIT_CHAR2 = 2;
+    private static final int CURVE_NAMED_CURVE    = 3;
 
     // id of the curve we are using
     private int curveId;
@@ -1660,8 +1660,8 @@ class CertificateRequest extends HandshakeMessage
     static final int    cct_rsa_fixed_ecdh   = 65;
     static final int    cct_ecdsa_fixed_ecdh = 66;
 
-    private final static byte[] TYPES_NO_ECC = { cct_rsa_sign, cct_dss_sign };
-    private final static byte[] TYPES_ECC =
+    private static final byte[] TYPES_NO_ECC = { cct_rsa_sign, cct_dss_sign };
+    private static final byte[] TYPES_ECC =
         { cct_rsa_sign, cct_dss_sign, cct_ecdsa_sign };
 
     byte[]                types;               // 1 to 255 types
@@ -2119,8 +2119,8 @@ static final class CertificateVerify extends HandshakeMessage {
         md.update(temp);
     }
 
-    private final static Class delegate;
-    private final static Field spiField;
+    private static final Class delegate;
+    private static final Field spiField;
 
     static {
         try {
@@ -2143,12 +2143,12 @@ static final class CertificateVerify extends HandshakeMessage {
     }
 
     // ConcurrentHashMap does not allow null values, use this marker object
-    private final static Object NULL_OBJECT = new Object();
+    private static final Object NULL_OBJECT = new Object();
 
     // cache Method objects per Spi class
     // Note that this will prevent the Spi classes from being GC'd. We assume
     // that is not a problem.
-    private final static Map,Object> methodCache =
+    private static final Map,Object> methodCache =
                                         new ConcurrentHashMap<>();
 
     private static void digestKey(MessageDigest md, SecretKey key) {
@@ -2241,10 +2241,10 @@ static final class CertificateVerify extends HandshakeMessage {
 static final class Finished extends HandshakeMessage {
 
     // constant for a Finished message sent by the client
-    final static int CLIENT = 1;
+    static final int CLIENT = 1;
 
     // constant for a Finished message sent by the server
-    final static int SERVER = 2;
+    static final int SERVER = 2;
 
     // enum Sender:  "CLNT" and "SRVR"
     private static final byte[] SSL_CLIENT = { 0x43, 0x4C, 0x4E, 0x54 };
diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/HandshakeStateManager.java b/jdk/src/java.base/share/classes/sun/security/ssl/HandshakeStateManager.java
index 1eed210039a..b4b2ce6b194 100644
--- a/jdk/src/java.base/share/classes/sun/security/ssl/HandshakeStateManager.java
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/HandshakeStateManager.java
@@ -218,9 +218,9 @@ final class HandshakeStateManager {
 
     private boolean isDTLS;
 
-    private final static boolean debugIsOn;
+    private static final boolean debugIsOn;
 
-    private final static HashMap handshakeTypes;
+    private static final HashMap handshakeTypes;
 
     static {
         debugIsOn = (Handshaker.debug != null) &&
diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/Handshaker.java b/jdk/src/java.base/share/classes/sun/security/ssl/Handshaker.java
index 24fec1bf52b..f8c6fa887bc 100644
--- a/jdk/src/java.base/share/classes/sun/security/ssl/Handshaker.java
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/Handshaker.java
@@ -585,7 +585,7 @@ abstract class Handshaker {
      *
      * Does not check if the required server certificates are available.
      */
-    final static boolean isNegotiable(CipherSuiteList proposed, CipherSuite s) {
+    static final boolean isNegotiable(CipherSuiteList proposed, CipherSuite s) {
         return proposed.contains(s) && s.isNegotiable();
     }
 
diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/InputRecord.java b/jdk/src/java.base/share/classes/sun/security/ssl/InputRecord.java
index 3fcfaf441b7..db2a72fca65 100644
--- a/jdk/src/java.base/share/classes/sun/security/ssl/InputRecord.java
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/InputRecord.java
@@ -123,7 +123,7 @@ class InputRecord implements Record, Closeable {
      * and flag the record as holding no data.
      */
     @Override
-    synchronized public void close() throws IOException {
+    public synchronized void close() throws IOException {
         if (!isClosed) {
             isClosed = true;
             readCipher.dispose();
diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/JsseJce.java b/jdk/src/java.base/share/classes/sun/security/ssl/JsseJce.java
index d8c5c2699cf..07edcc8544b 100644
--- a/jdk/src/java.base/share/classes/sun/security/ssl/JsseJce.java
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/JsseJce.java
@@ -53,7 +53,7 @@ import static sun.security.ssl.SunJSSE.cryptoProvider;
  */
 final class JsseJce {
 
-    private final static ProviderList fipsProviderList;
+    private static final ProviderList fipsProviderList;
 
     // Flag indicating whether EC crypto is available.
     // If null, then we have not checked yet.
@@ -62,7 +62,7 @@ final class JsseJce {
 
     // Flag indicating whether Kerberos crypto is available.
     // If true, then all the Kerberos-based crypto we need is available.
-    private final static boolean kerberosAvailable;
+    private static final boolean kerberosAvailable;
     static {
         ClientKeyExchangeService p =
                 ClientKeyExchangeService.find("KRB5");
@@ -119,68 +119,68 @@ final class JsseJce {
      * JCE transformation string for RSA with PKCS#1 v1.5 padding.
      * Can be used for encryption, decryption, signing, verifying.
      */
-    final static String CIPHER_RSA_PKCS1 = "RSA/ECB/PKCS1Padding";
+    static final String CIPHER_RSA_PKCS1 = "RSA/ECB/PKCS1Padding";
     /**
      * JCE transformation string for the stream cipher RC4.
      */
-    final static String CIPHER_RC4 = "RC4";
+    static final String CIPHER_RC4 = "RC4";
     /**
      * JCE transformation string for DES in CBC mode without padding.
      */
-    final static String CIPHER_DES = "DES/CBC/NoPadding";
+    static final String CIPHER_DES = "DES/CBC/NoPadding";
     /**
      * JCE transformation string for (3-key) Triple DES in CBC mode
      * without padding.
      */
-    final static String CIPHER_3DES = "DESede/CBC/NoPadding";
+    static final String CIPHER_3DES = "DESede/CBC/NoPadding";
     /**
      * JCE transformation string for AES in CBC mode
      * without padding.
      */
-    final static String CIPHER_AES = "AES/CBC/NoPadding";
+    static final String CIPHER_AES = "AES/CBC/NoPadding";
     /**
      * JCE transformation string for AES in GCM mode
      * without padding.
      */
-    final static String CIPHER_AES_GCM = "AES/GCM/NoPadding";
+    static final String CIPHER_AES_GCM = "AES/GCM/NoPadding";
     /**
      * JCA identifier string for DSA, i.e. a DSA with SHA-1.
      */
-    final static String SIGNATURE_DSA = "DSA";
+    static final String SIGNATURE_DSA = "DSA";
     /**
      * JCA identifier string for ECDSA, i.e. a ECDSA with SHA-1.
      */
-    final static String SIGNATURE_ECDSA = "SHA1withECDSA";
+    static final String SIGNATURE_ECDSA = "SHA1withECDSA";
     /**
      * JCA identifier string for Raw DSA, i.e. a DSA signature without
      * hashing where the application provides the SHA-1 hash of the data.
      * Note that the standard name is "NONEwithDSA" but we use "RawDSA"
      * for compatibility.
      */
-    final static String SIGNATURE_RAWDSA = "RawDSA";
+    static final String SIGNATURE_RAWDSA = "RawDSA";
     /**
      * JCA identifier string for Raw ECDSA, i.e. a DSA signature without
      * hashing where the application provides the SHA-1 hash of the data.
      */
-    final static String SIGNATURE_RAWECDSA = "NONEwithECDSA";
+    static final String SIGNATURE_RAWECDSA = "NONEwithECDSA";
     /**
      * JCA identifier string for Raw RSA, i.e. a RSA PKCS#1 v1.5 signature
      * without hashing where the application provides the hash of the data.
      * Used for RSA client authentication with a 36 byte hash.
      */
-    final static String SIGNATURE_RAWRSA = "NONEwithRSA";
+    static final String SIGNATURE_RAWRSA = "NONEwithRSA";
     /**
      * JCA identifier string for the SSL/TLS style RSA Signature. I.e.
      * an signature using RSA with PKCS#1 v1.5 padding signing a
      * concatenation of an MD5 and SHA-1 digest.
      */
-    final static String SIGNATURE_SSLRSA = "MD5andSHA1withRSA";
+    static final String SIGNATURE_SSLRSA = "MD5andSHA1withRSA";
 
     private JsseJce() {
         // no instantiation of this class
     }
 
-    synchronized static boolean isEcAvailable() {
+    static synchronized boolean isEcAvailable() {
         if (ecAvailable == null) {
             try {
                 JsseJce.getSignature(SIGNATURE_ECDSA);
@@ -196,7 +196,7 @@ final class JsseJce {
         return ecAvailable;
     }
 
-    synchronized static void clearEcAvailable() {
+    static synchronized void clearEcAvailable() {
         ecAvailable = null;
     }
 
diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/MAC.java b/jdk/src/java.base/share/classes/sun/security/ssl/MAC.java
index c41b1bb8962..20c73db6b01 100644
--- a/jdk/src/java.base/share/classes/sun/security/ssl/MAC.java
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/MAC.java
@@ -49,7 +49,7 @@ import static sun.security.ssl.CipherSuite.MacAlg.*;
  */
 final class MAC extends Authenticator {
 
-    final static MAC TLS_NULL = new MAC(false);
+    static final MAC TLS_NULL = new MAC(false);
 
     // Value of the null MAC is fixed
     private static final byte[] nullMAC = new byte[0];
diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/OutputRecord.java b/jdk/src/java.base/share/classes/sun/security/ssl/OutputRecord.java
index c5355ca3cc4..00d85bef53b 100644
--- a/jdk/src/java.base/share/classes/sun/security/ssl/OutputRecord.java
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/OutputRecord.java
@@ -195,7 +195,7 @@ abstract class OutputRecord extends ByteArrayOutputStream
     }
 
     @Override
-    synchronized public void close() throws IOException {
+    public synchronized void close() throws IOException {
         if (!isClosed) {
             isClosed = true;
             writeCipher.dispose();
diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/Plaintext.java b/jdk/src/java.base/share/classes/sun/security/ssl/Plaintext.java
index 8790acae958..ab80abe8738 100644
--- a/jdk/src/java.base/share/classes/sun/security/ssl/Plaintext.java
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/Plaintext.java
@@ -32,7 +32,7 @@ import javax.net.ssl.SSLEngineResult.HandshakeStatus;
  * Plaintext
  */
 final class Plaintext {
-    final static Plaintext PLAINTEXT_NULL = new Plaintext();
+    static final Plaintext PLAINTEXT_NULL = new Plaintext();
 
     byte            contentType;
     byte            majorVersion;
diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/ProtocolVersion.java b/jdk/src/java.base/share/classes/sun/security/ssl/ProtocolVersion.java
index b98431abcbe..b6b5cc48ec5 100644
--- a/jdk/src/java.base/share/classes/sun/security/ssl/ProtocolVersion.java
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/ProtocolVersion.java
@@ -54,33 +54,33 @@ import sun.security.ssl.CipherSuite.*;
 public final class ProtocolVersion implements Comparable {
 
     // The limit of maximum protocol version
-    final static int LIMIT_MAX_VALUE = 0xFFFF;
+    static final int LIMIT_MAX_VALUE = 0xFFFF;
 
     // The limit of minimum protocol version
-    final static int LIMIT_MIN_VALUE = 0x0000;
+    static final int LIMIT_MIN_VALUE = 0x0000;
 
     // Dummy protocol version value for invalid SSLSession
-    final static ProtocolVersion NONE = new ProtocolVersion(-1, "NONE");
+    static final ProtocolVersion NONE = new ProtocolVersion(-1, "NONE");
 
     // If enabled, send/accept SSLv2 hello messages
-    final static ProtocolVersion SSL20Hello =
+    static final ProtocolVersion SSL20Hello =
                                 new ProtocolVersion(0x0002, "SSLv2Hello");
 
     // SSL 3.0
-    final static ProtocolVersion SSL30 = new ProtocolVersion(0x0300, "SSLv3");
+    static final ProtocolVersion SSL30 = new ProtocolVersion(0x0300, "SSLv3");
 
     // TLS 1.0
-    final static ProtocolVersion TLS10 = new ProtocolVersion(0x0301, "TLSv1");
+    static final ProtocolVersion TLS10 = new ProtocolVersion(0x0301, "TLSv1");
 
     // TLS 1.1
-    final static ProtocolVersion TLS11 = new ProtocolVersion(0x0302, "TLSv1.1");
+    static final ProtocolVersion TLS11 = new ProtocolVersion(0x0302, "TLSv1.1");
 
     // TLS 1.2
-    final static ProtocolVersion TLS12 = new ProtocolVersion(0x0303, "TLSv1.2");
+    static final ProtocolVersion TLS12 = new ProtocolVersion(0x0303, "TLSv1.2");
 
     // DTLS 1.0
     // {254, 255}, the version value of DTLS 1.0.
-    final static ProtocolVersion DTLS10 =
+    static final ProtocolVersion DTLS10 =
                                 new ProtocolVersion(0xFEFF, "DTLSv1.0");
 
     // No DTLS 1.1, that version number was skipped in order to harmonize
@@ -88,30 +88,30 @@ public final class ProtocolVersion implements Comparable {
 
     // DTLS 1.2
     // {254, 253}, the version value of DTLS 1.2.
-    final static ProtocolVersion DTLS12 =
+    static final ProtocolVersion DTLS12 =
                                 new ProtocolVersion(0xFEFD, "DTLSv1.2");
 
     private static final boolean FIPS = SunJSSE.isFIPS();
 
     // minimum version we implement (SSL 3.0)
-    final static ProtocolVersion MIN = FIPS ? TLS10 : SSL30;
+    static final ProtocolVersion MIN = FIPS ? TLS10 : SSL30;
 
     // maximum version we implement (TLS 1.2)
-    final static ProtocolVersion MAX = TLS12;
+    static final ProtocolVersion MAX = TLS12;
 
     // SSL/TLS ProtocolVersion to use by default (TLS 1.2)
-    final static ProtocolVersion DEFAULT_TLS = TLS12;
+    static final ProtocolVersion DEFAULT_TLS = TLS12;
 
     // DTLS ProtocolVersion to use by default (TLS 1.2)
-    final static ProtocolVersion DEFAULT_DTLS = DTLS12;
+    static final ProtocolVersion DEFAULT_DTLS = DTLS12;
 
     // Default version for hello messages (SSLv2Hello)
-    final static ProtocolVersion DEFAULT_HELLO = FIPS ? TLS10 : SSL30;
+    static final ProtocolVersion DEFAULT_HELLO = FIPS ? TLS10 : SSL30;
 
     // Available protocols
     //
     // Including all supported protocols except the disabled ones.
-    final static Set availableProtocols;
+    static final Set availableProtocols;
 
     // version in 16 bit MSB format as it appears in records and
     // messages, i.e. 0x0301 for TLS 1.0
diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java b/jdk/src/java.base/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java
index 877c5ecd732..d7e3c1cca5d 100644
--- a/jdk/src/java.base/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java
@@ -47,11 +47,11 @@ import sun.security.ssl.CipherSuite.*;
  */
 final class SSLAlgorithmConstraints implements AlgorithmConstraints {
 
-    private final static AlgorithmConstraints tlsDisabledAlgConstraints =
+    private static final AlgorithmConstraints tlsDisabledAlgConstraints =
             new DisabledAlgorithmConstraints(PROPERTY_TLS_DISABLED_ALGS,
                     new SSLAlgorithmDecomposer());
 
-    private final static AlgorithmConstraints x509DisabledAlgConstraints =
+    private static final AlgorithmConstraints x509DisabledAlgConstraints =
             new DisabledAlgorithmConstraints(PROPERTY_CERTPATH_DISABLED_ALGS,
                     new SSLAlgorithmDecomposer(true));
 
@@ -61,11 +61,11 @@ final class SSLAlgorithmConstraints implements AlgorithmConstraints {
     private boolean enabledX509DisabledAlgConstraints = true;
 
     // the default algorithm constraints
-    final static AlgorithmConstraints DEFAULT =
+    static final AlgorithmConstraints DEFAULT =
                         new SSLAlgorithmConstraints(null);
 
     // the default SSL only algorithm constraints
-    final static AlgorithmConstraints DEFAULT_SSL_ONLY =
+    static final AlgorithmConstraints DEFAULT_SSL_ONLY =
                         new SSLAlgorithmConstraints((SSLSocket)null, false);
 
     SSLAlgorithmConstraints(AlgorithmConstraints algorithmConstraints) {
@@ -207,7 +207,7 @@ final class SSLAlgorithmConstraints implements AlgorithmConstraints {
     }
 
 
-    static private class SupportedSignatureAlgorithmConstraints
+    private static class SupportedSignatureAlgorithmConstraints
                                     implements AlgorithmConstraints {
         // supported signature algorithms
         private String[] supportedAlgorithms;
@@ -255,12 +255,12 @@ final class SSLAlgorithmConstraints implements AlgorithmConstraints {
         }
 
         @Override
-        final public boolean permits(Set primitives, Key key) {
+        public final boolean permits(Set primitives, Key key) {
             return true;
         }
 
         @Override
-        final public boolean permits(Set primitives,
+        public final boolean permits(Set primitives,
                 String algorithm, Key key, AlgorithmParameters parameters) {
 
             if (algorithm == null || algorithm.length() == 0) {
diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/SSLContextImpl.java b/jdk/src/java.base/share/classes/sun/security/ssl/SSLContextImpl.java
index 620b034d2d0..cac13df0184 100644
--- a/jdk/src/java.base/share/classes/sun/security/ssl/SSLContextImpl.java
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/SSLContextImpl.java
@@ -657,7 +657,7 @@ public abstract class SSLContextImpl extends SSLContextSpi {
      * @see SSLContext
      */
     private static class CustomizedSSLProtocols {
-        private final static String PROPERTY_NAME = "jdk.tls.client.protocols";
+        private static final String PROPERTY_NAME = "jdk.tls.client.protocols";
         static IllegalArgumentException reservedException = null;
         static ArrayList
                                 customizedProtocols = new ArrayList<>();
@@ -1028,7 +1028,7 @@ public abstract class SSLContextImpl extends SSLContextSpi {
      * @see SSLContext
      */
     public static final class DTLS10Context extends AbstractDTLSContext {
-        private final static SSLParameters defaultClientSSLParams;
+        private static final SSLParameters defaultClientSSLParams;
 
         static {
             // candidates for available protocols
@@ -1053,7 +1053,7 @@ public abstract class SSLContextImpl extends SSLContextSpi {
      * @see SSLContext
      */
     public static final class DTLS12Context extends AbstractDTLSContext {
-        private final static SSLParameters defaultClientSSLParams;
+        private static final SSLParameters defaultClientSSLParams;
 
         static {
             // candidates for available protocols
@@ -1079,7 +1079,7 @@ public abstract class SSLContextImpl extends SSLContextSpi {
      * @see SSLContext
      */
     private static class CustomizedDTLSContext extends AbstractDTLSContext {
-        private final static SSLParameters defaultClientSSLParams;
+        private static final SSLParameters defaultClientSSLParams;
         private static IllegalArgumentException reservedException = null;
 
         // Don't want a java.lang.LinkageError for illegal system property.
diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java b/jdk/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java
index 8f3ebf90872..4764c9d7248 100644
--- a/jdk/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java
@@ -56,7 +56,7 @@ import javax.net.ssl.SSLEngineResult.*;
  *
  * @author Brad Wetmore
  */
-final public class SSLEngineImpl extends SSLEngine {
+public final class SSLEngineImpl extends SSLEngine {
 
     //
     // Fields and global comments
@@ -475,7 +475,7 @@ final public class SSLEngineImpl extends SSLEngine {
         }
     }
 
-    synchronized private void checkTaskThrown() throws SSLException {
+    private synchronized void checkTaskThrown() throws SSLException {
         if (handshaker != null) {
             handshaker.checkThrown();
         }
@@ -489,11 +489,11 @@ final public class SSLEngineImpl extends SSLEngine {
      * Provides "this" synchronization for connection state.
      * Otherwise, you can access it directly.
      */
-    synchronized private int getConnectionState() {
+    private synchronized int getConnectionState() {
         return connectionState;
     }
 
-    synchronized private void setConnectionState(int state) {
+    private synchronized void setConnectionState(int state) {
         connectionState = state;
     }
 
@@ -1513,7 +1513,7 @@ final public class SSLEngineImpl extends SSLEngine {
     }
 
     @Override
-    synchronized public void closeOutbound() {
+    public synchronized void closeOutbound() {
         /*
          * Dump out a close_notify to the remote side
          */
@@ -1569,7 +1569,7 @@ final public class SSLEngineImpl extends SSLEngine {
      * We do check for truncation attacks.
      */
     @Override
-    synchronized public void closeInbound() throws SSLException {
+    public synchronized void closeInbound() throws SSLException {
         /*
          * Currently closes the outbound side as well.  The IETF TLS
          * working group has expressed the opinion that 1/2 open
@@ -1602,7 +1602,7 @@ final public class SSLEngineImpl extends SSLEngine {
      * Returns the network inbound data closure state
      */
     @Override
-    synchronized public boolean isInboundDone() {
+    public synchronized boolean isInboundDone() {
         return inboundDone;
     }
 
@@ -1620,12 +1620,12 @@ final public class SSLEngineImpl extends SSLEngine {
      * entire login session for some user.
      */
     @Override
-    synchronized public SSLSession getSession() {
+    public synchronized SSLSession getSession() {
         return sess;
     }
 
     @Override
-    synchronized public SSLSession getHandshakeSession() {
+    public synchronized SSLSession getHandshakeSession() {
         return handshakeSession;
     }
 
@@ -1642,7 +1642,7 @@ final public class SSLEngineImpl extends SSLEngine {
      * this SSLEngine.
      */
     @Override
-    synchronized public Runnable getDelegatedTask() {
+    public synchronized Runnable getDelegatedTask() {
         if (handshaker != null) {
             return handshaker.getTask();
         }
@@ -1882,7 +1882,7 @@ final public class SSLEngineImpl extends SSLEngine {
      * we will need to wait for the next handshake.
      */
     @Override
-    synchronized public void setEnableSessionCreation(boolean flag) {
+    public synchronized void setEnableSessionCreation(boolean flag) {
         enableSessionCreation = flag;
 
         if ((handshaker != null) && !handshaker.activated()) {
@@ -1895,7 +1895,7 @@ final public class SSLEngineImpl extends SSLEngine {
      * sessions.
      */
     @Override
-    synchronized public boolean getEnableSessionCreation() {
+    public synchronized boolean getEnableSessionCreation() {
         return enableSessionCreation;
     }
 
@@ -1909,7 +1909,7 @@ final public class SSLEngineImpl extends SSLEngine {
      * we will need to wait for the next handshake.
      */
     @Override
-    synchronized public void setNeedClientAuth(boolean flag) {
+    public synchronized void setNeedClientAuth(boolean flag) {
         doClientAuth = (flag ?
                 ClientAuthType.CLIENT_AUTH_REQUIRED :
                 ClientAuthType.CLIENT_AUTH_NONE);
@@ -1922,7 +1922,7 @@ final public class SSLEngineImpl extends SSLEngine {
     }
 
     @Override
-    synchronized public boolean getNeedClientAuth() {
+    public synchronized boolean getNeedClientAuth() {
         return (doClientAuth == ClientAuthType.CLIENT_AUTH_REQUIRED);
     }
 
@@ -1935,7 +1935,7 @@ final public class SSLEngineImpl extends SSLEngine {
      * we will need to wait for the next handshake.
      */
     @Override
-    synchronized public void setWantClientAuth(boolean flag) {
+    public synchronized void setWantClientAuth(boolean flag) {
         doClientAuth = (flag ?
                 ClientAuthType.CLIENT_AUTH_REQUESTED :
                 ClientAuthType.CLIENT_AUTH_NONE);
@@ -1948,7 +1948,7 @@ final public class SSLEngineImpl extends SSLEngine {
     }
 
     @Override
-    synchronized public boolean getWantClientAuth() {
+    public synchronized boolean getWantClientAuth() {
         return (doClientAuth == ClientAuthType.CLIENT_AUTH_REQUESTED);
     }
 
@@ -1960,7 +1960,7 @@ final public class SSLEngineImpl extends SSLEngine {
      */
     @Override
     @SuppressWarnings("fallthrough")
-    synchronized public void setUseClientMode(boolean flag) {
+    public synchronized void setUseClientMode(boolean flag) {
         switch (connectionState) {
 
         case cs_START:
@@ -2040,7 +2040,7 @@ final public class SSLEngineImpl extends SSLEngine {
     }
 
     @Override
-    synchronized public boolean getUseClientMode() {
+    public synchronized boolean getUseClientMode() {
         return !roleIsServer;
     }
 
@@ -2070,7 +2070,7 @@ final public class SSLEngineImpl extends SSLEngine {
      * @param suites Names of all the cipher suites to enable.
      */
     @Override
-    synchronized public void setEnabledCipherSuites(String[] suites) {
+    public synchronized void setEnabledCipherSuites(String[] suites) {
         enabledCipherSuites = new CipherSuiteList(suites);
         if ((handshaker != null) && !handshaker.activated()) {
             handshaker.setEnabledCipherSuites(enabledCipherSuites);
@@ -2088,7 +2088,7 @@ final public class SSLEngineImpl extends SSLEngine {
      * @return an array of cipher suite names
      */
     @Override
-    synchronized public String[] getEnabledCipherSuites() {
+    public synchronized String[] getEnabledCipherSuites() {
         return enabledCipherSuites.toStringArray();
     }
 
@@ -2113,7 +2113,7 @@ final public class SSLEngineImpl extends SSLEngine {
      *  named by the parameter is not supported.
      */
     @Override
-    synchronized public void setEnabledProtocols(String[] protocols) {
+    public synchronized void setEnabledProtocols(String[] protocols) {
         enabledProtocols = new ProtocolList(protocols);
         if ((handshaker != null) && !handshaker.activated()) {
             handshaker.setEnabledProtocols(enabledProtocols);
@@ -2121,7 +2121,7 @@ final public class SSLEngineImpl extends SSLEngine {
     }
 
     @Override
-    synchronized public String[] getEnabledProtocols() {
+    public synchronized String[] getEnabledProtocols() {
         return enabledProtocols.toStringArray();
     }
 
@@ -2129,7 +2129,7 @@ final public class SSLEngineImpl extends SSLEngine {
      * Returns the SSLParameters in effect for this SSLEngine.
      */
     @Override
-    synchronized public SSLParameters getSSLParameters() {
+    public synchronized SSLParameters getSSLParameters() {
         SSLParameters params = super.getSSLParameters();
 
         // the super implementation does not handle the following parameters
@@ -2148,7 +2148,7 @@ final public class SSLEngineImpl extends SSLEngine {
      * Applies SSLParameters to this engine.
      */
     @Override
-    synchronized public void setSSLParameters(SSLParameters params) {
+    public synchronized void setSSLParameters(SSLParameters params) {
         super.setSSLParameters(params);
 
         // the super implementation does not handle the following parameters
diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/SSLEngineOutputRecord.java b/jdk/src/java.base/share/classes/sun/security/ssl/SSLEngineOutputRecord.java
index a079e2928ee..9a868c460bb 100644
--- a/jdk/src/java.base/share/classes/sun/security/ssl/SSLEngineOutputRecord.java
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/SSLEngineOutputRecord.java
@@ -54,7 +54,7 @@ final class SSLEngineOutputRecord extends OutputRecord implements SSLRecord {
     }
 
     @Override
-    synchronized public void close() throws IOException {
+    public synchronized void close() throws IOException {
         if (!isClosed) {
             if (alertMemos != null && !alertMemos.isEmpty()) {
                 isCloseWaiting = true;
diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/SSLServerSocketImpl.java b/jdk/src/java.base/share/classes/sun/security/ssl/SSLServerSocketImpl.java
index cd02abb8020..11deff2ecf5 100644
--- a/jdk/src/java.base/share/classes/sun/security/ssl/SSLServerSocketImpl.java
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/SSLServerSocketImpl.java
@@ -184,7 +184,7 @@ class SSLServerSocketImpl extends SSLServerSocket
      * that the system defaults are in effect.
      */
     @Override
-    synchronized public String[] getEnabledCipherSuites() {
+    public synchronized String[] getEnabledCipherSuites() {
         return enabledCipherSuites.toStringArray();
     }
 
@@ -196,7 +196,7 @@ class SSLServerSocketImpl extends SSLServerSocket
      *  means to accept system defaults.
      */
     @Override
-    synchronized public void setEnabledCipherSuites(String[] suites) {
+    public synchronized void setEnabledCipherSuites(String[] suites) {
         enabledCipherSuites = new CipherSuiteList(suites);
     }
 
@@ -215,12 +215,12 @@ class SSLServerSocketImpl extends SSLServerSocket
      *  named by the parameter is not supported.
      */
     @Override
-    synchronized public void setEnabledProtocols(String[] protocols) {
+    public synchronized void setEnabledProtocols(String[] protocols) {
         enabledProtocols = new ProtocolList(protocols);
     }
 
     @Override
-    synchronized public String[] getEnabledProtocols() {
+    public synchronized String[] getEnabledProtocols() {
         return enabledProtocols.toStringArray();
     }
 
@@ -303,7 +303,7 @@ class SSLServerSocketImpl extends SSLServerSocket
      * Returns the SSLParameters in effect for newly accepted connections.
      */
     @Override
-    synchronized public SSLParameters getSSLParameters() {
+    public synchronized SSLParameters getSSLParameters() {
         SSLParameters params = super.getSSLParameters();
 
         // the super implementation does not handle the following parameters
@@ -320,7 +320,7 @@ class SSLServerSocketImpl extends SSLServerSocket
      * Applies SSLParameters to newly accepted connections.
      */
     @Override
-    synchronized public void setSSLParameters(SSLParameters params) {
+    public synchronized void setSSLParameters(SSLParameters params) {
         super.setSSLParameters(params);
 
         // the super implementation does not handle the following parameters
diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java b/jdk/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java
index 6c0f60e7729..d021ec17ef4 100644
--- a/jdk/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java
@@ -677,7 +677,7 @@ final class SSLSessionImpl extends ExtendedSSLSession {
      * no connections will be able to rejoin this session.
      */
     @Override
-    synchronized public void invalidate() {
+    public synchronized void invalidate() {
         //
         // Can't invalidate the NULL session -- this would be
         // attempted when we get a handshaking error on a brand
diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/SSLSocketFactoryImpl.java b/jdk/src/java.base/share/classes/sun/security/ssl/SSLSocketFactoryImpl.java
index bb66647bdf4..02d2fac31c5 100644
--- a/jdk/src/java.base/share/classes/sun/security/ssl/SSLSocketFactoryImpl.java
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/SSLSocketFactoryImpl.java
@@ -41,7 +41,7 @@ import javax.net.ssl.SSLSocketFactory;
  *
  * @author David Brownell
  */
-final public class SSLSocketFactoryImpl extends SSLSocketFactory {
+public final class SSLSocketFactoryImpl extends SSLSocketFactory {
 
     private SSLContextImpl context;
 
diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java b/jdk/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java
index fe367801f06..9892ceecc44 100644
--- a/jdk/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java
@@ -64,7 +64,7 @@ import sun.misc.SharedSecrets;
  *
  * @author David Brownell
  */
-final public class SSLSocketImpl extends BaseSSLSocketImpl {
+public final class SSLSocketImpl extends BaseSSLSocketImpl {
 
     /*
      * ERROR HANDLING GUIDELINES
@@ -281,9 +281,9 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
      * This is necessary so that processing of close_notify alerts
      * from the peer are handled properly.
      */
-    final private Object        handshakeLock = new Object();
+    private final Object        handshakeLock = new Object();
     final ReentrantLock         writeLock = new ReentrantLock();
-    final private Object        readLock = new Object();
+    private final Object        readLock = new Object();
 
     InputRecord                 inputRecord;
     OutputRecord                outputRecord;
@@ -673,11 +673,11 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
         initHandshaker();
     }
 
-    synchronized private int getConnectionState() {
+    private synchronized int getConnectionState() {
         return connectionState;
     }
 
-    synchronized private void setConnectionState(int state) {
+    private synchronized void setConnectionState(int state) {
         connectionState = state;
     }
 
@@ -1802,7 +1802,7 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
      *          reserved for exceptions like timeout; otherwise, the socket
      *          will be closed, no further communications could be done.
      */
-    synchronized private void handleException(Exception e, boolean resumable)
+    private synchronized void handleException(Exception e, boolean resumable)
         throws IOException {
         if ((debug != null) && Debug.isOn("ssl")) {
             System.out.println(Thread.currentThread().getName() +
@@ -2114,7 +2114,7 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
     // Please NOTE that this method MUST be called before calling to
     // SSLSocket.setSSLParameters(). Otherwise, the {@code host} parameter
     // may override SNIHostName in the customized server name indication.
-    synchronized public void setHost(String host) {
+    public synchronized void setHost(String host) {
         this.host = host;
         this.serverNames =
             Utilities.addToSNIServerNameList(this.serverNames, this.host);
@@ -2126,7 +2126,7 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
      * transit, and will usually have been confidentiality protected.
      */
     @Override
-    synchronized public InputStream getInputStream() throws IOException {
+    public synchronized InputStream getInputStream() throws IOException {
         if (isClosed()) {
             throw new SocketException("Socket is closed");
         }
@@ -2148,7 +2148,7 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
      * will usually be confidentiality protected.
      */
     @Override
-    synchronized public OutputStream getOutputStream() throws IOException {
+    public synchronized OutputStream getOutputStream() throws IOException {
         if (isClosed()) {
             throw new SocketException("Socket is closed");
         }
@@ -2192,7 +2192,7 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
     }
 
     @Override
-    synchronized public SSLSession getHandshakeSession() {
+    public synchronized SSLSession getHandshakeSession() {
         return handshakeSession;
     }
 
@@ -2213,7 +2213,7 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
      * we will need to wait for the next handshake.
      */
     @Override
-    synchronized public void setEnableSessionCreation(boolean flag) {
+    public synchronized void setEnableSessionCreation(boolean flag) {
         enableSessionCreation = flag;
 
         if ((handshaker != null) && !handshaker.activated()) {
@@ -2226,7 +2226,7 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
      * sessions.
      */
     @Override
-    synchronized public boolean getEnableSessionCreation() {
+    public synchronized boolean getEnableSessionCreation() {
         return enableSessionCreation;
     }
 
@@ -2240,7 +2240,7 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
      * we will need to wait for the next handshake.
      */
     @Override
-    synchronized public void setNeedClientAuth(boolean flag) {
+    public synchronized void setNeedClientAuth(boolean flag) {
         doClientAuth = (flag ? ClientAuthType.CLIENT_AUTH_REQUIRED :
                 ClientAuthType.CLIENT_AUTH_NONE);
 
@@ -2252,7 +2252,7 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
     }
 
     @Override
-    synchronized public boolean getNeedClientAuth() {
+    public synchronized boolean getNeedClientAuth() {
         return (doClientAuth == ClientAuthType.CLIENT_AUTH_REQUIRED);
     }
 
@@ -2265,7 +2265,7 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
      * we will need to wait for the next handshake.
      */
     @Override
-    synchronized public void setWantClientAuth(boolean flag) {
+    public synchronized void setWantClientAuth(boolean flag) {
         doClientAuth = (flag ? ClientAuthType.CLIENT_AUTH_REQUESTED :
                 ClientAuthType.CLIENT_AUTH_NONE);
 
@@ -2277,7 +2277,7 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
     }
 
     @Override
-    synchronized public boolean getWantClientAuth() {
+    public synchronized boolean getWantClientAuth() {
         return (doClientAuth == ClientAuthType.CLIENT_AUTH_REQUESTED);
     }
 
@@ -2289,7 +2289,7 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
      */
     @Override
     @SuppressWarnings("fallthrough")
-    synchronized public void setUseClientMode(boolean flag) {
+    public synchronized void setUseClientMode(boolean flag) {
         switch (connectionState) {
 
         case cs_START:
@@ -2363,7 +2363,7 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
     }
 
     @Override
-    synchronized public boolean getUseClientMode() {
+    public synchronized boolean getUseClientMode() {
         return !roleIsServer;
     }
 
@@ -2393,7 +2393,7 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
      * @param suites Names of all the cipher suites to enable.
      */
     @Override
-    synchronized public void setEnabledCipherSuites(String[] suites) {
+    public synchronized void setEnabledCipherSuites(String[] suites) {
         enabledCipherSuites = new CipherSuiteList(suites);
         if ((handshaker != null) && !handshaker.activated()) {
             handshaker.setEnabledCipherSuites(enabledCipherSuites);
@@ -2411,7 +2411,7 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
      * @return an array of cipher suite names
      */
     @Override
-    synchronized public String[] getEnabledCipherSuites() {
+    public synchronized String[] getEnabledCipherSuites() {
         return enabledCipherSuites.toStringArray();
     }
 
@@ -2436,7 +2436,7 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
      *  named by the parameter is not supported.
      */
     @Override
-    synchronized public void setEnabledProtocols(String[] protocols) {
+    public synchronized void setEnabledProtocols(String[] protocols) {
         enabledProtocols = new ProtocolList(protocols);
         if ((handshaker != null) && !handshaker.activated()) {
             handshaker.setEnabledProtocols(enabledProtocols);
@@ -2444,7 +2444,7 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
     }
 
     @Override
-    synchronized public String[] getEnabledProtocols() {
+    public synchronized String[] getEnabledProtocols() {
         return enabledProtocols.toStringArray();
     }
 
@@ -2501,7 +2501,7 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
      * Returns the SSLParameters in effect for this SSLSocket.
      */
     @Override
-    synchronized public SSLParameters getSSLParameters() {
+    public synchronized SSLParameters getSSLParameters() {
         SSLParameters params = super.getSSLParameters();
 
         // the super implementation does not handle the following parameters
@@ -2521,7 +2521,7 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
      * Applies SSLParameters to this socket.
      */
     @Override
-    synchronized public void setSSLParameters(SSLParameters params) {
+    public synchronized void setSSLParameters(SSLParameters params) {
         super.setSSLParameters(params);
 
         // the super implementation does not handle the following parameters
diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/ServerHandshaker.java b/jdk/src/java.base/share/classes/sun/security/ssl/ServerHandshaker.java
index 6cf683772b7..0329c61b308 100644
--- a/jdk/src/java.base/share/classes/sun/security/ssl/ServerHandshaker.java
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/ServerHandshaker.java
@@ -119,7 +119,7 @@ final class ServerHandshaker extends Handshaker {
                     new SSLAlgorithmDecomposer());
 
     // To switch off the status_request[_v2] extensions
-    private final static boolean enableStatusRequestExtension =
+    private static final boolean enableStatusRequestExtension =
             Debug.getBooleanProperty(
                     "jdk.tls.server.enableStatusRequestExtension", false);
     private boolean staplingActive = false;
diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/ServerNameExtension.java b/jdk/src/java.base/share/classes/sun/security/ssl/ServerNameExtension.java
index 60f521a209f..61acca22a5b 100644
--- a/jdk/src/java.base/share/classes/sun/security/ssl/ServerNameExtension.java
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/ServerNameExtension.java
@@ -68,7 +68,7 @@ final class ServerNameExtension extends HelloExtension {
 
     // For backward compatibility, all future data structures associated with
     // new NameTypes MUST begin with a 16-bit length field.
-    final static int NAME_HEADER_LENGTH = 3;    // NameType: 1 byte
+    static final int NAME_HEADER_LENGTH = 3;    // NameType: 1 byte
                                                 // Name length: 2 bytes
     private Map sniMap;
     private int listLength;     // ServerNameList length
diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java b/jdk/src/java.base/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java
index 453f6752ed0..4366027f0cb 100644
--- a/jdk/src/java.base/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java
@@ -65,15 +65,15 @@ import sun.security.util.KeyUtil;
 final class SignatureAndHashAlgorithm {
 
     // minimum priority for default enabled algorithms
-    final static int SUPPORTED_ALG_PRIORITY_MAX_NUM = 0x00F0;
+    static final int SUPPORTED_ALG_PRIORITY_MAX_NUM = 0x00F0;
 
     // performance optimization
-    private final static Set SIGNATURE_PRIMITIVE_SET =
+    private static final Set SIGNATURE_PRIMITIVE_SET =
         Collections.unmodifiableSet(EnumSet.of(CryptoPrimitive.SIGNATURE));
 
     // supported pairs of signature and hash algorithm
-    private final static Map supportedMap;
-    private final static Map priorityMap;
+    private static final Map supportedMap;
+    private static final Map priorityMap;
 
     // the hash algorithm
     private HashAlgorithm hash;
diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/StatusRequestType.java b/jdk/src/java.base/share/classes/sun/security/ssl/StatusRequestType.java
index dafef0259bb..cb0f2014af9 100644
--- a/jdk/src/java.base/share/classes/sun/security/ssl/StatusRequestType.java
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/StatusRequestType.java
@@ -61,6 +61,6 @@ final class StatusRequestType {
     }
 
     // Status request types defined in RFC 6066 and 6961
-    final static StatusRequestType OCSP = e(0x01, "ocsp");
-    final static StatusRequestType OCSP_MULTI = e(0x02, "ocsp_multi");
+    static final StatusRequestType OCSP = e(0x01, "ocsp");
+    static final StatusRequestType OCSP_MULTI = e(0x02, "ocsp_multi");
 }
diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java b/jdk/src/java.base/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java
index 6278769586d..264ae90ac93 100644
--- a/jdk/src/java.base/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/SupportedEllipticCurvesExtension.java
@@ -173,11 +173,11 @@ final class SupportedEllipticCurvesExtension extends HelloExtension {
         return null;
     }
 
-    private final static int ARBITRARY_PRIME = 0xff01;
-    private final static int ARBITRARY_CHAR2 = 0xff02;
+    private static final int ARBITRARY_PRIME = 0xff01;
+    private static final int ARBITRARY_CHAR2 = 0xff02;
 
     // See sun.security.util.NamedCurve for the OIDs
-    private final static String[] NAMED_CURVE_OID_TABLE = new String[] {
+    private static final String[] NAMED_CURVE_OID_TABLE = new String[] {
         null,                   //  (0) unused
         "1.3.132.0.1",          //  (1) sect163k1, NIST K-163
         "1.3.132.0.2",          //  (2) sect163r1
@@ -206,7 +206,7 @@ final class SupportedEllipticCurvesExtension extends HelloExtension {
         "1.3.132.0.35",         // (25) secp521r1, NIST P-521
     };
 
-    private final static Map curveIndices;
+    private static final Map curveIndices;
 
     static {
         curveIndices = new HashMap();
diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/SupportedEllipticPointFormatsExtension.java b/jdk/src/java.base/share/classes/sun/security/ssl/SupportedEllipticPointFormatsExtension.java
index 14b8468962a..776f4494847 100644
--- a/jdk/src/java.base/share/classes/sun/security/ssl/SupportedEllipticPointFormatsExtension.java
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/SupportedEllipticPointFormatsExtension.java
@@ -33,9 +33,9 @@ import javax.net.ssl.SSLProtocolException;
 
 final class SupportedEllipticPointFormatsExtension extends HelloExtension {
 
-    final static int FMT_UNCOMPRESSED = 0;
-    final static int FMT_ANSIX962_COMPRESSED_PRIME = 1;
-    final static int FMT_ANSIX962_COMPRESSED_CHAR2 = 2;
+    static final int FMT_UNCOMPRESSED = 0;
+    static final int FMT_ANSIX962_COMPRESSED_PRIME = 1;
+    static final int FMT_ANSIX962_COMPRESSED_CHAR2 = 2;
 
     static final HelloExtension DEFAULT =
         new SupportedEllipticPointFormatsExtension(
diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/X509KeyManagerImpl.java b/jdk/src/java.base/share/classes/sun/security/ssl/X509KeyManagerImpl.java
index 7faffcb9e90..256720a7b93 100644
--- a/jdk/src/java.base/share/classes/sun/security/ssl/X509KeyManagerImpl.java
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/X509KeyManagerImpl.java
@@ -62,7 +62,7 @@ final class X509KeyManagerImpl extends X509ExtendedKeyManager
 
     private static final Debug debug = Debug.getInstance("ssl");
 
-    private final static boolean useDebug =
+    private static final boolean useDebug =
                             (debug != null) && Debug.isOn("keymanager");
 
     // for unit testing only, set via privileged reflection
diff --git a/jdk/src/java.base/share/classes/sun/security/timestamp/TSResponse.java b/jdk/src/java.base/share/classes/sun/security/timestamp/TSResponse.java
index 0cf223d492a..38b6aa72c8f 100644
--- a/jdk/src/java.base/share/classes/sun/security/timestamp/TSResponse.java
+++ b/jdk/src/java.base/share/classes/sun/security/timestamp/TSResponse.java
@@ -374,7 +374,7 @@ public class TSResponse {
         }
     }
 
-    final static class TimestampException extends IOException {
+    static final class TimestampException extends IOException {
         private static final long serialVersionUID = -1631631794891940953L;
 
         TimestampException(String message) {
diff --git a/jdk/src/java.base/share/classes/sun/security/util/Cache.java b/jdk/src/java.base/share/classes/sun/security/util/Cache.java
index 8037324928a..1bc8848625b 100644
--- a/jdk/src/java.base/share/classes/sun/security/util/Cache.java
+++ b/jdk/src/java.base/share/classes/sun/security/util/Cache.java
@@ -202,7 +202,7 @@ public abstract class Cache {
 
 class NullCache extends Cache {
 
-    final static Cache INSTANCE = new NullCache<>();
+    static final Cache INSTANCE = new NullCache<>();
 
     private NullCache() {
         // empty
@@ -244,10 +244,10 @@ class NullCache extends Cache {
 
 class MemoryCache extends Cache {
 
-    private final static float LOAD_FACTOR = 0.75f;
+    private static final float LOAD_FACTOR = 0.75f;
 
     // XXXX
-    private final static boolean DEBUG = false;
+    private static final boolean DEBUG = false;
 
     private final Map> cacheMap;
     private int maxSize;
diff --git a/jdk/src/java.base/share/classes/sun/security/util/CurveDB.java b/jdk/src/java.base/share/classes/sun/security/util/CurveDB.java
index d10d6442837..197d5a618db 100644
--- a/jdk/src/java.base/share/classes/sun/security/util/CurveDB.java
+++ b/jdk/src/java.base/share/classes/sun/security/util/CurveDB.java
@@ -40,10 +40,10 @@ import java.util.regex.Pattern;
  * @author  Andreas Sterbenz
  */
 public class CurveDB {
-    private final static int P  = 1; // prime curve
-    private final static int B  = 2; // binary curve
-    private final static int PD = 5; // prime curve, mark as default
-    private final static int BD = 6; // binary curve, mark as default
+    private static final int P  = 1; // prime curve
+    private static final int B  = 2; // binary curve
+    private static final int PD = 5; // prime curve, mark as default
+    private static final int BD = 6; // binary curve, mark as default
 
     private static final Map oidMap =
         new LinkedHashMap();
diff --git a/jdk/src/java.base/share/classes/sun/security/util/Debug.java b/jdk/src/java.base/share/classes/sun/security/util/Debug.java
index 8174438c455..35ce8d66348 100644
--- a/jdk/src/java.base/share/classes/sun/security/util/Debug.java
+++ b/jdk/src/java.base/share/classes/sun/security/util/Debug.java
@@ -293,7 +293,7 @@ public class Debug {
         return null;
     }
 
-    private final static char[] hexDigits = "0123456789abcdef".toCharArray();
+    private static final char[] hexDigits = "0123456789abcdef".toCharArray();
 
     public static String toString(byte[] b) {
         if (b == null) {
diff --git a/jdk/src/java.base/share/classes/sun/security/util/DerValue.java b/jdk/src/java.base/share/classes/sun/security/util/DerValue.java
index 3ab10839661..219c8be3466 100644
--- a/jdk/src/java.base/share/classes/sun/security/util/DerValue.java
+++ b/jdk/src/java.base/share/classes/sun/security/util/DerValue.java
@@ -84,52 +84,52 @@ public class DerValue {
      */
 
     /** Tag value indicating an ASN.1 "BOOLEAN" value. */
-    public final static byte    tag_Boolean = 0x01;
+    public static final byte    tag_Boolean = 0x01;
 
     /** Tag value indicating an ASN.1 "INTEGER" value. */
-    public final static byte    tag_Integer = 0x02;
+    public static final byte    tag_Integer = 0x02;
 
     /** Tag value indicating an ASN.1 "BIT STRING" value. */
-    public final static byte    tag_BitString = 0x03;
+    public static final byte    tag_BitString = 0x03;
 
     /** Tag value indicating an ASN.1 "OCTET STRING" value. */
-    public final static byte    tag_OctetString = 0x04;
+    public static final byte    tag_OctetString = 0x04;
 
     /** Tag value indicating an ASN.1 "NULL" value. */
-    public final static byte    tag_Null = 0x05;
+    public static final byte    tag_Null = 0x05;
 
     /** Tag value indicating an ASN.1 "OBJECT IDENTIFIER" value. */
-    public final static byte    tag_ObjectId = 0x06;
+    public static final byte    tag_ObjectId = 0x06;
 
     /** Tag value including an ASN.1 "ENUMERATED" value */
-    public final static byte    tag_Enumerated = 0x0A;
+    public static final byte    tag_Enumerated = 0x0A;
 
     /** Tag value indicating an ASN.1 "UTF8String" value. */
-    public final static byte    tag_UTF8String = 0x0C;
+    public static final byte    tag_UTF8String = 0x0C;
 
     /** Tag value including a "printable" string */
-    public final static byte    tag_PrintableString = 0x13;
+    public static final byte    tag_PrintableString = 0x13;
 
     /** Tag value including a "teletype" string */
-    public final static byte    tag_T61String = 0x14;
+    public static final byte    tag_T61String = 0x14;
 
     /** Tag value including an ASCII string */
-    public final static byte    tag_IA5String = 0x16;
+    public static final byte    tag_IA5String = 0x16;
 
     /** Tag value indicating an ASN.1 "UTCTime" value. */
-    public final static byte    tag_UtcTime = 0x17;
+    public static final byte    tag_UtcTime = 0x17;
 
     /** Tag value indicating an ASN.1 "GeneralizedTime" value. */
-    public final static byte    tag_GeneralizedTime = 0x18;
+    public static final byte    tag_GeneralizedTime = 0x18;
 
     /** Tag value indicating an ASN.1 "GenerallString" value. */
-    public final static byte    tag_GeneralString = 0x1B;
+    public static final byte    tag_GeneralString = 0x1B;
 
     /** Tag value indicating an ASN.1 "UniversalString" value. */
-    public final static byte    tag_UniversalString = 0x1C;
+    public static final byte    tag_UniversalString = 0x1C;
 
     /** Tag value indicating an ASN.1 "BMPString" value. */
-    public final static byte    tag_BMPString = 0x1E;
+    public static final byte    tag_BMPString = 0x1E;
 
     // CONSTRUCTED seq/set
 
@@ -137,25 +137,25 @@ public class DerValue {
      * Tag value indicating an ASN.1
      * "SEQUENCE" (zero to N elements, order is significant).
      */
-    public final static byte    tag_Sequence = 0x30;
+    public static final byte    tag_Sequence = 0x30;
 
     /**
      * Tag value indicating an ASN.1
      * "SEQUENCE OF" (one to N elements, order is significant).
      */
-    public final static byte    tag_SequenceOf = 0x30;
+    public static final byte    tag_SequenceOf = 0x30;
 
     /**
      * Tag value indicating an ASN.1
      * "SET" (zero to N members, order does not matter).
      */
-    public final static byte    tag_Set = 0x31;
+    public static final byte    tag_Set = 0x31;
 
     /**
      * Tag value indicating an ASN.1
      * "SET OF" (one to N members, order does not matter).
      */
-    public final static byte    tag_SetOf = 0x31;
+    public static final byte    tag_SetOf = 0x31;
 
     /*
      * These values are the high order bits for the other kinds of tags.
diff --git a/jdk/src/java.base/share/classes/sun/security/util/DisabledAlgorithmConstraints.java b/jdk/src/java.base/share/classes/sun/security/util/DisabledAlgorithmConstraints.java
index 28eeef0f77c..fd4b198ce11 100644
--- a/jdk/src/java.base/share/classes/sun/security/util/DisabledAlgorithmConstraints.java
+++ b/jdk/src/java.base/share/classes/sun/security/util/DisabledAlgorithmConstraints.java
@@ -46,16 +46,16 @@ import java.util.regex.Matcher;
 public class DisabledAlgorithmConstraints extends AbstractAlgorithmConstraints {
 
     // the known security property, jdk.certpath.disabledAlgorithms
-    public final static String PROPERTY_CERTPATH_DISABLED_ALGS =
+    public static final String PROPERTY_CERTPATH_DISABLED_ALGS =
             "jdk.certpath.disabledAlgorithms";
 
     // the known security property, jdk.tls.disabledAlgorithms
-    public final static String PROPERTY_TLS_DISABLED_ALGS =
+    public static final String PROPERTY_TLS_DISABLED_ALGS =
             "jdk.tls.disabledAlgorithms";
 
-    private final static Map disabledAlgorithmsMap =
+    private static final Map disabledAlgorithmsMap =
                                                             new HashMap<>();
-    private final static Map keySizeConstraintsMap =
+    private static final Map keySizeConstraintsMap =
                                                             new HashMap<>();
 
     private final String[] disabledAlgorithms;
@@ -80,7 +80,7 @@ public class DisabledAlgorithmConstraints extends AbstractAlgorithmConstraints {
     }
 
     @Override
-    final public boolean permits(Set primitives,
+    public final boolean permits(Set primitives,
             String algorithm, AlgorithmParameters parameters) {
 
         if (primitives == null || primitives.isEmpty()) {
@@ -92,12 +92,12 @@ public class DisabledAlgorithmConstraints extends AbstractAlgorithmConstraints {
     }
 
     @Override
-    final public boolean permits(Set primitives, Key key) {
+    public final boolean permits(Set primitives, Key key) {
         return checkConstraints(primitives, "", key, null);
     }
 
     @Override
-    final public boolean permits(Set primitives,
+    public final boolean permits(Set primitives,
             String algorithm, Key key, AlgorithmParameters parameters) {
 
         if (algorithm == null || algorithm.length() == 0) {
diff --git a/jdk/src/java.base/share/classes/sun/security/util/HostnameChecker.java b/jdk/src/java.base/share/classes/sun/security/util/HostnameChecker.java
index 02d65d1deda..afa0fe0bbcf 100644
--- a/jdk/src/java.base/share/classes/sun/security/util/HostnameChecker.java
+++ b/jdk/src/java.base/share/classes/sun/security/util/HostnameChecker.java
@@ -48,18 +48,18 @@ import sun.net.util.IPAddressUtil;
 public class HostnameChecker {
 
     // Constant for a HostnameChecker for TLS
-    public final static byte TYPE_TLS = 1;
-    private final static HostnameChecker INSTANCE_TLS =
+    public static final byte TYPE_TLS = 1;
+    private static final HostnameChecker INSTANCE_TLS =
                                         new HostnameChecker(TYPE_TLS);
 
     // Constant for a HostnameChecker for LDAP
-    public final static byte TYPE_LDAP = 2;
-    private final static HostnameChecker INSTANCE_LDAP =
+    public static final byte TYPE_LDAP = 2;
+    private static final HostnameChecker INSTANCE_LDAP =
                                         new HostnameChecker(TYPE_LDAP);
 
     // constants for subject alt names of type DNS and IP
-    private final static int ALTNAME_DNS = 2;
-    private final static int ALTNAME_IP  = 7;
+    private static final int ALTNAME_DNS = 2;
+    private static final int ALTNAME_IP  = 7;
 
     // the algorithm to follow to perform the check. Currently unused.
     private final byte checkType;
diff --git a/jdk/src/java.base/share/classes/sun/security/util/LegacyAlgorithmConstraints.java b/jdk/src/java.base/share/classes/sun/security/util/LegacyAlgorithmConstraints.java
index 106ec78918a..d8803348a5d 100644
--- a/jdk/src/java.base/share/classes/sun/security/util/LegacyAlgorithmConstraints.java
+++ b/jdk/src/java.base/share/classes/sun/security/util/LegacyAlgorithmConstraints.java
@@ -39,10 +39,10 @@ import static sun.security.util.AbstractAlgorithmConstraints.getAlgorithms;
 public class LegacyAlgorithmConstraints extends AbstractAlgorithmConstraints {
 
     // the known security property, jdk.tls.legacyAlgorithms
-    public final static String PROPERTY_TLS_LEGACY_ALGS =
+    public static final String PROPERTY_TLS_LEGACY_ALGS =
             "jdk.tls.legacyAlgorithms";
 
-    private final static Map legacyAlgorithmsMap =
+    private static final Map legacyAlgorithmsMap =
                                                           new HashMap<>();
 
     private final String[] legacyAlgorithms;
@@ -54,18 +54,18 @@ public class LegacyAlgorithmConstraints extends AbstractAlgorithmConstraints {
     }
 
     @Override
-    final public boolean permits(Set primitives,
+    public final boolean permits(Set primitives,
             String algorithm, AlgorithmParameters parameters) {
         return checkAlgorithm(legacyAlgorithms, algorithm, decomposer);
     }
 
     @Override
-    final public boolean permits(Set primitives, Key key) {
+    public final boolean permits(Set primitives, Key key) {
         return true;
     }
 
     @Override
-    final public boolean permits(Set primitives,
+    public final boolean permits(Set primitives,
             String algorithm, Key key, AlgorithmParameters parameters) {
         return checkAlgorithm(legacyAlgorithms, algorithm, decomposer);
     }
diff --git a/jdk/src/java.base/share/classes/sun/security/util/ObjectIdentifier.java b/jdk/src/java.base/share/classes/sun/security/util/ObjectIdentifier.java
index ab92d1cdc40..989ec564bf1 100644
--- a/jdk/src/java.base/share/classes/sun/security/util/ObjectIdentifier.java
+++ b/jdk/src/java.base/share/classes/sun/security/util/ObjectIdentifier.java
@@ -50,7 +50,7 @@ import java.util.Arrays;
  * @author Hemma Prafullchandra
  */
 
-final public
+public final
 class ObjectIdentifier implements Serializable
 {
     /**
@@ -104,7 +104,7 @@ class ObjectIdentifier implements Serializable
     private int         componentLen = -1;            // how much is used.
 
     // Is the components field calculated?
-    transient private boolean   componentsCalculated = false;
+    private transient boolean   componentsCalculated = false;
 
     private void readObject(ObjectInputStream is)
             throws IOException, ClassNotFoundException {
diff --git a/jdk/src/java.base/share/classes/sun/security/validator/EndEntityChecker.java b/jdk/src/java.base/share/classes/sun/security/validator/EndEntityChecker.java
index 0ecdaa18b54..2e1081056f0 100644
--- a/jdk/src/java.base/share/classes/sun/security/validator/EndEntityChecker.java
+++ b/jdk/src/java.base/share/classes/sun/security/validator/EndEntityChecker.java
@@ -68,53 +68,53 @@ class EndEntityChecker {
     // extended key usage OIDs for TLS server, TLS client, code signing
     // and any usage
 
-    private final static String OID_EXTENDED_KEY_USAGE =
+    private static final String OID_EXTENDED_KEY_USAGE =
                                 SimpleValidator.OID_EXTENDED_KEY_USAGE;
 
-    private final static String OID_EKU_TLS_SERVER = "1.3.6.1.5.5.7.3.1";
+    private static final String OID_EKU_TLS_SERVER = "1.3.6.1.5.5.7.3.1";
 
-    private final static String OID_EKU_TLS_CLIENT = "1.3.6.1.5.5.7.3.2";
+    private static final String OID_EKU_TLS_CLIENT = "1.3.6.1.5.5.7.3.2";
 
-    private final static String OID_EKU_CODE_SIGNING = "1.3.6.1.5.5.7.3.3";
+    private static final String OID_EKU_CODE_SIGNING = "1.3.6.1.5.5.7.3.3";
 
-    private final static String OID_EKU_TIME_STAMPING = "1.3.6.1.5.5.7.3.8";
+    private static final String OID_EKU_TIME_STAMPING = "1.3.6.1.5.5.7.3.8";
 
-    private final static String OID_EKU_ANY_USAGE = "2.5.29.37.0";
+    private static final String OID_EKU_ANY_USAGE = "2.5.29.37.0";
 
     // the Netscape Server-Gated-Cryptography EKU extension OID
-    private final static String OID_EKU_NS_SGC = "2.16.840.1.113730.4.1";
+    private static final String OID_EKU_NS_SGC = "2.16.840.1.113730.4.1";
 
     // the Microsoft Server-Gated-Cryptography EKU extension OID
-    private final static String OID_EKU_MS_SGC = "1.3.6.1.4.1.311.10.3.3";
+    private static final String OID_EKU_MS_SGC = "1.3.6.1.4.1.311.10.3.3";
 
     // the recognized extension OIDs
-    private final static String OID_SUBJECT_ALT_NAME = "2.5.29.17";
+    private static final String OID_SUBJECT_ALT_NAME = "2.5.29.17";
 
-    private final static String NSCT_SSL_CLIENT =
+    private static final String NSCT_SSL_CLIENT =
                                 NetscapeCertTypeExtension.SSL_CLIENT;
 
-    private final static String NSCT_SSL_SERVER =
+    private static final String NSCT_SSL_SERVER =
                                 NetscapeCertTypeExtension.SSL_SERVER;
 
-    private final static String NSCT_CODE_SIGNING =
+    private static final String NSCT_CODE_SIGNING =
                                 NetscapeCertTypeExtension.OBJECT_SIGNING;
 
     // bit numbers in the key usage extension
-    private final static int KU_SIGNATURE = 0;
-    private final static int KU_KEY_ENCIPHERMENT = 2;
-    private final static int KU_KEY_AGREEMENT = 4;
+    private static final int KU_SIGNATURE = 0;
+    private static final int KU_KEY_ENCIPHERMENT = 2;
+    private static final int KU_KEY_AGREEMENT = 4;
 
     // TLS key exchange algorithms requiring digitalSignature key usage
-    private final static Collection KU_SERVER_SIGNATURE =
+    private static final Collection KU_SERVER_SIGNATURE =
         Arrays.asList("DHE_DSS", "DHE_RSA", "ECDHE_ECDSA", "ECDHE_RSA",
             "RSA_EXPORT", "UNKNOWN");
 
     // TLS key exchange algorithms requiring keyEncipherment key usage
-    private final static Collection KU_SERVER_ENCRYPTION =
+    private static final Collection KU_SERVER_ENCRYPTION =
         Arrays.asList("RSA");
 
     // TLS key exchange algorithms requiring keyAgreement key usage
-    private final static Collection KU_SERVER_KEY_AGREEMENT =
+    private static final Collection KU_SERVER_KEY_AGREEMENT =
         Arrays.asList("DH_DSS", "DH_RSA", "ECDH_ECDSA", "ECDH_RSA");
 
     // variant of this end entity cert checker
diff --git a/jdk/src/java.base/share/classes/sun/security/validator/KeyStores.java b/jdk/src/java.base/share/classes/sun/security/validator/KeyStores.java
index 8a33cd315ac..236f5dddc2e 100644
--- a/jdk/src/java.base/share/classes/sun/security/validator/KeyStores.java
+++ b/jdk/src/java.base/share/classes/sun/security/validator/KeyStores.java
@@ -48,10 +48,10 @@ public class KeyStores {
     // in the future, all accesses to the system cacerts keystore should
     // go through this class. but not right now.
 /*
-    private final static String javaHome =
+    private static final String javaHome =
         (String)AccessController.doPrivileged(new GetPropertyAction("java.home"));
 
-    private final static char SEP = File.separatorChar;
+    private static final char SEP = File.separatorChar;
 
     private static KeyStore caCerts;
 
@@ -79,7 +79,7 @@ public class KeyStores {
      * The file is only opened once per JVM invocation and the contents
      * cached subsequently.
      *
-    public synchronized static KeyStore getCaCerts() throws IOException {
+    public static synchronized KeyStore getCaCerts() throws IOException {
         if (caCerts != null) {
             return caCerts;
         }
diff --git a/jdk/src/java.base/share/classes/sun/security/validator/PKIXValidator.java b/jdk/src/java.base/share/classes/sun/security/validator/PKIXValidator.java
index 514c1748cac..2846b2234d0 100644
--- a/jdk/src/java.base/share/classes/sun/security/validator/PKIXValidator.java
+++ b/jdk/src/java.base/share/classes/sun/security/validator/PKIXValidator.java
@@ -56,7 +56,7 @@ public final class PKIXValidator extends Validator {
      * manager. Typically, this will only work if the PKIX implementation
      * supports CRL distribution points as we do not manually setup CertStores.
      */
-    private final static boolean checkTLSRevocation =
+    private static final boolean checkTLSRevocation =
         AccessController.doPrivileged
             (new GetBooleanAction("com.sun.net.ssl.checkRevocation"));
 
diff --git a/jdk/src/java.base/share/classes/sun/security/validator/SimpleValidator.java b/jdk/src/java.base/share/classes/sun/security/validator/SimpleValidator.java
index d9fffa47b9c..23535be5128 100644
--- a/jdk/src/java.base/share/classes/sun/security/validator/SimpleValidator.java
+++ b/jdk/src/java.base/share/classes/sun/security/validator/SimpleValidator.java
@@ -59,23 +59,23 @@ public final class SimpleValidator extends Validator {
 
     // Constants for the OIDs we need
 
-    final static String OID_BASIC_CONSTRAINTS = "2.5.29.19";
+    static final String OID_BASIC_CONSTRAINTS = "2.5.29.19";
 
-    final static String OID_NETSCAPE_CERT_TYPE = "2.16.840.1.113730.1.1";
+    static final String OID_NETSCAPE_CERT_TYPE = "2.16.840.1.113730.1.1";
 
-    final static String OID_KEY_USAGE = "2.5.29.15";
+    static final String OID_KEY_USAGE = "2.5.29.15";
 
-    final static String OID_EXTENDED_KEY_USAGE = "2.5.29.37";
+    static final String OID_EXTENDED_KEY_USAGE = "2.5.29.37";
 
-    final static String OID_EKU_ANY_USAGE = "2.5.29.37.0";
+    static final String OID_EKU_ANY_USAGE = "2.5.29.37.0";
 
-    final static ObjectIdentifier OBJID_NETSCAPE_CERT_TYPE =
+    static final ObjectIdentifier OBJID_NETSCAPE_CERT_TYPE =
         NetscapeCertTypeExtension.NetscapeCertType_Id;
 
-    private final static String NSCT_SSL_CA =
+    private static final String NSCT_SSL_CA =
                                 NetscapeCertTypeExtension.SSL_CA;
 
-    private final static String NSCT_CODE_SIGNING_CA =
+    private static final String NSCT_CODE_SIGNING_CA =
                                 NetscapeCertTypeExtension.OBJECT_SIGNING_CA;
 
     /**
diff --git a/jdk/src/java.base/share/classes/sun/security/validator/Validator.java b/jdk/src/java.base/share/classes/sun/security/validator/Validator.java
index d89991f63eb..c6b43aba837 100644
--- a/jdk/src/java.base/share/classes/sun/security/validator/Validator.java
+++ b/jdk/src/java.base/share/classes/sun/security/validator/Validator.java
@@ -86,62 +86,62 @@ import java.security.cert.*;
  */
 public abstract class Validator {
 
-    final static X509Certificate[] CHAIN0 = {};
+    static final X509Certificate[] CHAIN0 = {};
 
     /**
      * Constant for a validator of type Simple.
      * @see #getInstance
      */
-    public final static String TYPE_SIMPLE = "Simple";
+    public static final String TYPE_SIMPLE = "Simple";
 
     /**
      * Constant for a validator of type PKIX.
      * @see #getInstance
      */
-    public final static String TYPE_PKIX = "PKIX";
+    public static final String TYPE_PKIX = "PKIX";
 
     /**
      * Constant for a Generic variant of a validator.
      * @see #getInstance
      */
-    public final static String VAR_GENERIC = "generic";
+    public static final String VAR_GENERIC = "generic";
 
     /**
      * Constant for a Code Signing variant of a validator.
      * @see #getInstance
      */
-    public final static String VAR_CODE_SIGNING = "code signing";
+    public static final String VAR_CODE_SIGNING = "code signing";
 
     /**
      * Constant for a JCE Code Signing variant of a validator.
      * @see #getInstance
      */
-    public final static String VAR_JCE_SIGNING = "jce signing";
+    public static final String VAR_JCE_SIGNING = "jce signing";
 
     /**
      * Constant for a TLS Client variant of a validator.
      * @see #getInstance
      */
-    public final static String VAR_TLS_CLIENT = "tls client";
+    public static final String VAR_TLS_CLIENT = "tls client";
 
     /**
      * Constant for a TLS Server variant of a validator.
      * @see #getInstance
      */
-    public final static String VAR_TLS_SERVER = "tls server";
+    public static final String VAR_TLS_SERVER = "tls server";
 
     /**
      * Constant for a TSA Server variant of a validator.
      * @see #getInstance
      */
-    public final static String VAR_TSA_SERVER = "tsa server";
+    public static final String VAR_TSA_SERVER = "tsa server";
 
     /**
      * Constant for a Code Signing variant of a validator for use by
      * the J2SE Plugin/WebStart code.
      * @see #getInstance
      */
-    public final static String VAR_PLUGIN_CODE_SIGNING = "plugin code signing";
+    public static final String VAR_PLUGIN_CODE_SIGNING = "plugin code signing";
 
     private final String type;
     final EndEntityChecker endEntityChecker;
diff --git a/jdk/src/java.base/share/classes/sun/security/validator/ValidatorException.java b/jdk/src/java.base/share/classes/sun/security/validator/ValidatorException.java
index db4b056c1f5..e5b313696fe 100644
--- a/jdk/src/java.base/share/classes/sun/security/validator/ValidatorException.java
+++ b/jdk/src/java.base/share/classes/sun/security/validator/ValidatorException.java
@@ -37,28 +37,28 @@ public class ValidatorException extends CertificateException {
 
     private static final long serialVersionUID = -2836879718282292155L;
 
-    public final static Object T_NO_TRUST_ANCHOR =
+    public static final Object T_NO_TRUST_ANCHOR =
         "No trusted certificate found";
 
-    public final static Object T_EE_EXTENSIONS =
+    public static final Object T_EE_EXTENSIONS =
         "End entity certificate extension check failed";
 
-    public final static Object T_CA_EXTENSIONS =
+    public static final Object T_CA_EXTENSIONS =
         "CA certificate extension check failed";
 
-    public final static Object T_CERT_EXPIRED =
+    public static final Object T_CERT_EXPIRED =
         "Certificate expired";
 
-    public final static Object T_SIGNATURE_ERROR =
+    public static final Object T_SIGNATURE_ERROR =
         "Certificate signature validation failed";
 
-    public final static Object T_NAME_CHAINING =
+    public static final Object T_NAME_CHAINING =
         "Certificate chaining error";
 
-    public final static Object T_ALGORITHM_DISABLED =
+    public static final Object T_ALGORITHM_DISABLED =
         "Certificate signature algorithm disabled";
 
-    public final static Object T_UNTRUSTED_CERT =
+    public static final Object T_UNTRUSTED_CERT =
         "Untrusted certificate";
 
     private Object type;
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/AVA.java b/jdk/src/java.base/share/classes/sun/security/x509/AVA.java
index 1b7d297b233..6ff24c9264d 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/AVA.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/AVA.java
@@ -72,15 +72,15 @@ public class AVA implements DerEncoder {
      * DEFAULT format allows both RFC1779 and RFC2253 syntax and
      * additional keywords.
      */
-    final static int DEFAULT = 1;
+    static final int DEFAULT = 1;
     /**
      * RFC1779 specifies format according to RFC1779.
      */
-    final static int RFC1779 = 2;
+    static final int RFC1779 = 2;
     /**
      * RFC2253 specifies format according to RFC2253.
      */
-    final static int RFC2253 = 3;
+    static final int RFC2253 = 3;
 
     // currently not private, accessed directly from RDN
     final ObjectIdentifier oid;
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/DistributionPoint.java b/jdk/src/java.base/share/classes/sun/security/x509/DistributionPoint.java
index e2d4971dd1a..66edbba5083 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/DistributionPoint.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/DistributionPoint.java
@@ -97,14 +97,14 @@ public class DistributionPoint {
 
     // reason flag bits
     // NOTE that these are NOT quite the same as the CRL reason code extension
-    public final static int KEY_COMPROMISE         = 1;
-    public final static int CA_COMPROMISE          = 2;
-    public final static int AFFILIATION_CHANGED    = 3;
-    public final static int SUPERSEDED             = 4;
-    public final static int CESSATION_OF_OPERATION = 5;
-    public final static int CERTIFICATE_HOLD       = 6;
-    public final static int PRIVILEGE_WITHDRAWN    = 7;
-    public final static int AA_COMPROMISE          = 8;
+    public static final int KEY_COMPROMISE         = 1;
+    public static final int CA_COMPROMISE          = 2;
+    public static final int AFFILIATION_CHANGED    = 3;
+    public static final int SUPERSEDED             = 4;
+    public static final int CESSATION_OF_OPERATION = 5;
+    public static final int CERTIFICATE_HOLD       = 6;
+    public static final int PRIVILEGE_WITHDRAWN    = 7;
+    public static final int AA_COMPROMISE          = 8;
 
     private static final String[] REASON_STRINGS = {
         null,
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/IPAddressName.java b/jdk/src/java.base/share/classes/sun/security/x509/IPAddressName.java
index 6d2e78305d5..76a09715fef 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/IPAddressName.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/IPAddressName.java
@@ -183,7 +183,7 @@ public class IPAddressName implements GeneralNameInterface {
      *             be 32 bytes long, otherwise 16.
      * @throws IOException on error
      */
-    private final static int MASKSIZE = 16;
+    private static final int MASKSIZE = 16;
     private void parseIPv6(String name) throws IOException {
 
         int slashNdx = name.indexOf('/');
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/OIDMap.java b/jdk/src/java.base/share/classes/sun/security/x509/OIDMap.java
index b6d1b25e51d..a39493e279a 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/OIDMap.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/OIDMap.java
@@ -106,10 +106,10 @@ public class OIDMap {
         { 2, 16, 840, 1, 113730, 1, 1 };
 
     /** Map ObjectIdentifier(oid) -> OIDInfo(info) */
-    private final static Map oidMap;
+    private static final Map oidMap;
 
     /** Map String(friendly name) -> OIDInfo(info) */
-    private final static Map nameMap;
+    private static final Map nameMap;
 
     static {
         oidMap = new HashMap();
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/ReasonFlags.java b/jdk/src/java.base/share/classes/sun/security/x509/ReasonFlags.java
index 6a42046205c..f25042240a3 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/ReasonFlags.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/ReasonFlags.java
@@ -69,7 +69,7 @@ public class ReasonFlags {
     public static final String PRIVILEGE_WITHDRAWN = "privilege_withdrawn";
     public static final String AA_COMPROMISE = "aa_compromise";
 
-    private final static String[] NAMES = {
+    private static final String[] NAMES = {
         UNUSED,
         KEY_COMPROMISE,
         CA_COMPROMISE,
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/X509CRLEntryImpl.java b/jdk/src/java.base/share/classes/sun/security/x509/X509CRLEntryImpl.java
index d92da97e1db..e2535d9fec6 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/X509CRLEntryImpl.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/X509CRLEntryImpl.java
@@ -76,7 +76,7 @@ public class X509CRLEntryImpl extends X509CRLEntry
     private byte[] revokedCert = null;
     private X500Principal certIssuer;
 
-    private final static boolean isExplicit = false;
+    private static final boolean isExplicit = false;
     private static final long YR_2050 = 2524636800000L;
 
     /**
diff --git a/jdk/src/java.base/share/classes/sun/security/x509/X509CRLImpl.java b/jdk/src/java.base/share/classes/sun/security/x509/X509CRLImpl.java
index d248121fd97..2baad6229e3 100644
--- a/jdk/src/java.base/share/classes/sun/security/x509/X509CRLImpl.java
+++ b/jdk/src/java.base/share/classes/sun/security/x509/X509CRLImpl.java
@@ -107,7 +107,7 @@ public class X509CRLImpl extends X509CRL implements DerEncoder {
     private Map revokedMap = new TreeMap<>();
     private List revokedList = new LinkedList<>();
     private CRLExtensions    extensions = null;
-    private final static boolean isExplicit = true;
+    private static final boolean isExplicit = true;
     private static final long YR_2050 = 2524636800000L;
 
     private boolean readOnly = false;
@@ -1286,7 +1286,7 @@ public class X509CRLImpl extends X509CRL implements DerEncoder {
     /**
      * Immutable X.509 Certificate Issuer DN and serial number pair
      */
-    private final static class X509IssuerSerial
+    private static final class X509IssuerSerial
             implements Comparable {
         final X500Principal issuer;
         final BigInteger serial;
diff --git a/jdk/src/java.base/share/classes/sun/text/CompactByteArray.java b/jdk/src/java.base/share/classes/sun/text/CompactByteArray.java
index d9fa1da513f..06c2106d2f7 100644
--- a/jdk/src/java.base/share/classes/sun/text/CompactByteArray.java
+++ b/jdk/src/java.base/share/classes/sun/text/CompactByteArray.java
@@ -212,7 +212,7 @@ public final class CompactByteArray implements Cloneable {
      * @param len the length to compare.
      * The start indices and start+len must be valid.
      */
-    final static boolean arrayRegionMatches(byte[] source, int sourceStart,
+    static final boolean arrayRegionMatches(byte[] source, int sourceStart,
                                             byte[] target, int targetStart,
                                             int len)
     {
diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/Norm2AllModes.java b/jdk/src/java.base/share/classes/sun/text/normalizer/Norm2AllModes.java
index ecf98bf5691..5f64fb2c8f3 100644
--- a/jdk/src/java.base/share/classes/sun/text/normalizer/Norm2AllModes.java
+++ b/jdk/src/java.base/share/classes/sun/text/normalizer/Norm2AllModes.java
@@ -98,7 +98,7 @@ final class Norm2AllModes {
 
     // Intermediate class:
     // Has NormalizerImpl and does boilerplate argument checking and setup.
-    public static abstract class Normalizer2WithImpl extends Normalizer2 {
+    public abstract static class Normalizer2WithImpl extends Normalizer2 {
         public Normalizer2WithImpl(NormalizerImpl ni) {
             impl=ni;
         }
diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/NormalizerBase.java b/jdk/src/java.base/share/classes/sun/text/normalizer/NormalizerBase.java
index 23a66dcaa05..3bcd509b92c 100644
--- a/jdk/src/java.base/share/classes/sun/text/normalizer/NormalizerBase.java
+++ b/jdk/src/java.base/share/classes/sun/text/normalizer/NormalizerBase.java
@@ -249,7 +249,7 @@ public final class NormalizerBase implements Cloneable {
      * and any fields or methods should not be called or overridden by users.
      * @stable ICU 2.8
      */
-    public static abstract class Mode {
+    public abstract static class Mode {
 
         /**
          * Sole constructor
diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/Trie2.java b/jdk/src/java.base/share/classes/sun/text/normalizer/Trie2.java
index 1e8343e8b24..32e237bb8f3 100644
--- a/jdk/src/java.base/share/classes/sun/text/normalizer/Trie2.java
+++ b/jdk/src/java.base/share/classes/sun/text/normalizer/Trie2.java
@@ -193,7 +193,7 @@ abstract class Trie2 implements Iterable {
      * @param codePoint the code point
      * @return the value
      */
-    abstract public int get(int codePoint);
+    public abstract int get(int codePoint);
 
     /**
      * Get the trie value for a UTF-16 code unit.
@@ -230,7 +230,7 @@ abstract class Trie2 implements Iterable {
      * @param c the code point or lead surrogate value.
      * @return the value
      */
-    abstract public int getFromU16SingleLead(char c);
+    public abstract int getFromU16SingleLead(char c);
 
     /**
      * When iterating over the contents of a Trie2, Elements of this type are produced.
diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/UBiDiProps.java b/jdk/src/java.base/share/classes/sun/text/normalizer/UBiDiProps.java
index 453cc0c5f38..e23941d57a4 100644
--- a/jdk/src/java.base/share/classes/sun/text/normalizer/UBiDiProps.java
+++ b/jdk/src/java.base/share/classes/sun/text/normalizer/UBiDiProps.java
@@ -108,7 +108,7 @@ public final class UBiDiProps {
     }
 
     // implement ICUBinary.Authenticate
-    private final static class IsAcceptable implements ICUBinary.Authenticate {
+    private static final class IsAcceptable implements ICUBinary.Authenticate {
         public boolean isDataVersionAcceptable(byte version[]) {
             return version[0]==2;
         }
diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/Utility.java b/jdk/src/java.base/share/classes/sun/text/normalizer/Utility.java
index 37a22ec1ea0..c4df09993e3 100644
--- a/jdk/src/java.base/share/classes/sun/text/normalizer/Utility.java
+++ b/jdk/src/java.base/share/classes/sun/text/normalizer/Utility.java
@@ -61,7 +61,7 @@ final class Utility {
     }
 
     /* This map must be in ASCENDING ORDER OF THE ESCAPE CODE */
-    static private final char[] UNESCAPE_MAP = {
+    private static final char[] UNESCAPE_MAP = {
         /*"   0x22, 0x22 */
         /*'   0x27, 0x27 */
         /*?   0x3F, 0x3F */
@@ -207,7 +207,7 @@ final class Utility {
     /**
      * Supplies a zero-padded hex representation of an integer (without 0x)
      */
-    static public String hex(long i, int places) {
+    public static String hex(long i, int places) {
         if (i == Long.MIN_VALUE) return "-8000000000000000";
         boolean negative = i < 0;
         if (negative) {
diff --git a/jdk/src/java.base/share/classes/sun/util/calendar/CalendarSystem.java b/jdk/src/java.base/share/classes/sun/util/calendar/CalendarSystem.java
index 811eae7b441..535f9159293 100644
--- a/jdk/src/java.base/share/classes/sun/util/calendar/CalendarSystem.java
+++ b/jdk/src/java.base/share/classes/sun/util/calendar/CalendarSystem.java
@@ -76,7 +76,7 @@ public abstract class CalendarSystem {
 
     /////////////////////// Calendar Factory Methods /////////////////////////
 
-    private volatile static boolean initialized = false;
+    private static volatile boolean initialized = false;
 
     // Map of calendar names and calendar class names
     private static ConcurrentMap names;
@@ -118,7 +118,7 @@ public abstract class CalendarSystem {
         }
     }
 
-    private final static Gregorian GREGORIAN_INSTANCE = new Gregorian();
+    private static final Gregorian GREGORIAN_INSTANCE = new Gregorian();
 
     /**
      * Returns the singleton instance of the Gregorian
diff --git a/jdk/src/java.base/share/classes/sun/util/calendar/ZoneInfo.java b/jdk/src/java.base/share/classes/sun/util/calendar/ZoneInfo.java
index c65f942556b..98c9442be36 100644
--- a/jdk/src/java.base/share/classes/sun/util/calendar/ZoneInfo.java
+++ b/jdk/src/java.base/share/classes/sun/util/calendar/ZoneInfo.java
@@ -170,7 +170,7 @@ public class ZoneInfo extends TimeZone {
     /**
      * True if the object has been modified after its instantiation.
      */
-    transient private boolean dirty = false;
+    private transient boolean dirty = false;
 
     private static final long serialVersionUID = 2653134537216586139L;
 
diff --git a/jdk/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java b/jdk/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java
index 61efb543d51..365e0e7967c 100644
--- a/jdk/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java
+++ b/jdk/src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java
@@ -206,7 +206,7 @@ public final class ZoneInfoFile {
     }
 
     private static String versionId;
-    private final static Map zones = new ConcurrentHashMap<>();
+    private static final Map zones = new ConcurrentHashMap<>();
     private static Map aliases = new HashMap<>();
 
     private static byte[][] ruleArray;
diff --git a/jdk/src/java.base/share/classes/sun/util/locale/provider/CalendarDataUtility.java b/jdk/src/java.base/share/classes/sun/util/locale/provider/CalendarDataUtility.java
index 09d77cee0c1..312b9e1145b 100644
--- a/jdk/src/java.base/share/classes/sun/util/locale/provider/CalendarDataUtility.java
+++ b/jdk/src/java.base/share/classes/sun/util/locale/provider/CalendarDataUtility.java
@@ -39,8 +39,8 @@ import java.util.spi.CalendarNameProvider;
  * @author Naoto Sato
  */
 public class CalendarDataUtility {
-    public final static String FIRST_DAY_OF_WEEK = "firstDayOfWeek";
-    public final static String MINIMAL_DAYS_IN_FIRST_WEEK = "minimalDaysInFirstWeek";
+    public static final String FIRST_DAY_OF_WEEK = "firstDayOfWeek";
+    public static final String MINIMAL_DAYS_IN_FIRST_WEEK = "minimalDaysInFirstWeek";
 
     // No instantiation
     private CalendarDataUtility() {
diff --git a/jdk/src/java.base/share/classes/sun/util/locale/provider/CollationRules.java b/jdk/src/java.base/share/classes/sun/util/locale/provider/CollationRules.java
index b2e72691533..9ea917f4841 100644
--- a/jdk/src/java.base/share/classes/sun/util/locale/provider/CollationRules.java
+++ b/jdk/src/java.base/share/classes/sun/util/locale/provider/CollationRules.java
@@ -47,7 +47,7 @@ package sun.util.locale.provider;
  * @author             Helena Shih, Mark Davis
  */
 final class CollationRules {
-    final static String DEFAULTRULES =
+    static final String DEFAULTRULES =
         "" // no FRENCH accent order by default, add in French Delta
         // IGNORABLES (up to first < character)
         // COMPLETELY IGNORE format characters
diff --git a/jdk/src/java.base/share/classes/sun/util/logging/PlatformLogger.java b/jdk/src/java.base/share/classes/sun/util/logging/PlatformLogger.java
index a55f1425830..bd5c47e63ef 100644
--- a/jdk/src/java.base/share/classes/sun/util/logging/PlatformLogger.java
+++ b/jdk/src/java.base/share/classes/sun/util/logging/PlatformLogger.java
@@ -408,7 +408,7 @@ public class PlatformLogger {
     /**
      * Abstract base class for logging support, defining the API and common field.
      */
-    private static abstract class LoggerProxy {
+    private abstract static class LoggerProxy {
         final String name;
 
         protected LoggerProxy(String name) {
diff --git a/jdk/src/java.base/share/classes/sun/util/resources/OpenListResourceBundle.java b/jdk/src/java.base/share/classes/sun/util/resources/OpenListResourceBundle.java
index 462b0a73411..ae1dce93f6b 100644
--- a/jdk/src/java.base/share/classes/sun/util/resources/OpenListResourceBundle.java
+++ b/jdk/src/java.base/share/classes/sun/util/resources/OpenListResourceBundle.java
@@ -118,7 +118,7 @@ public abstract class OpenListResourceBundle extends ResourceBundle {
     /**
      * See ListResourceBundle class description.
      */
-    abstract protected Object[][] getContents();
+    protected abstract Object[][] getContents();
 
     /**
      * Load lookup tables if they haven't been loaded already.
diff --git a/jdk/src/java.base/unix/classes/java/lang/ProcessEnvironment.java b/jdk/src/java.base/unix/classes/java/lang/ProcessEnvironment.java
index 08e0ce4e053..e4341e5322c 100644
--- a/jdk/src/java.base/unix/classes/java/lang/ProcessEnvironment.java
+++ b/jdk/src/java.base/unix/classes/java/lang/ProcessEnvironment.java
@@ -124,7 +124,7 @@ final class ProcessEnvironment
 
     // A class hiding the byteArray-String duality of
     // text data on Unixoid operating systems.
-    private static abstract class ExternalData {
+    private abstract static class ExternalData {
         protected final String str;
         protected final byte[] bytes;
 
diff --git a/jdk/src/java.base/unix/classes/java/net/PlainDatagramSocketImpl.java b/jdk/src/java.base/unix/classes/java/net/PlainDatagramSocketImpl.java
index 30b41d03caa..c8885841ada 100644
--- a/jdk/src/java.base/unix/classes/java/net/PlainDatagramSocketImpl.java
+++ b/jdk/src/java.base/unix/classes/java/net/PlainDatagramSocketImpl.java
@@ -135,5 +135,5 @@ class PlainDatagramSocketImpl extends AbstractPlainDatagramSocketImpl
     /**
      * Perform class load-time initializations.
      */
-    private native static void init();
+    private static native void init();
 }
diff --git a/jdk/src/java.base/unix/classes/sun/net/NetHooks.java b/jdk/src/java.base/unix/classes/sun/net/NetHooks.java
index cd0de5e72fd..92cb4eaf4d1 100644
--- a/jdk/src/java.base/unix/classes/sun/net/NetHooks.java
+++ b/jdk/src/java.base/unix/classes/sun/net/NetHooks.java
@@ -45,7 +45,7 @@ public final class NetHooks {
      * 
     Concrete implementations of this class should define a zero-argument
      * constructor and implement the abstract methods specified below.
      */
-    public static abstract class Provider {
+    public abstract static class Provider {
         /**
          * Initializes a new instance of this class.
          */
diff --git a/jdk/src/java.base/unix/classes/sun/net/PortConfig.java b/jdk/src/java.base/unix/classes/sun/net/PortConfig.java
index eb2e4d57865..9ef9237615e 100644
--- a/jdk/src/java.base/unix/classes/sun/net/PortConfig.java
+++ b/jdk/src/java.base/unix/classes/sun/net/PortConfig.java
@@ -36,7 +36,7 @@ import java.security.AccessController;
 public final class PortConfig {
 
     private static int defaultUpper, defaultLower;
-    private final static int upper, lower;
+    private static final int upper, lower;
 
     private PortConfig() {}
 
diff --git a/jdk/src/java.base/unix/classes/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java b/jdk/src/java.base/unix/classes/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java
index 8dec1a3553d..74003b197cd 100644
--- a/jdk/src/java.base/unix/classes/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java
+++ b/jdk/src/java.base/unix/classes/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java
@@ -43,7 +43,7 @@ class UnixAsynchronousServerSocketChannelImpl
     extends AsynchronousServerSocketChannelImpl
     implements Port.PollableChannel
 {
-    private final static NativeDispatcher nd = new SocketDispatcher();
+    private static final NativeDispatcher nd = new SocketDispatcher();
 
     private final Port port;
     private final int fdVal;
diff --git a/jdk/src/java.base/unix/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java b/jdk/src/java.base/unix/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java
index 428f05cf6ea..3307c40d8c5 100644
--- a/jdk/src/java.base/unix/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java
+++ b/jdk/src/java.base/unix/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java
@@ -42,7 +42,7 @@ import sun.security.action.GetPropertyAction;
 class UnixAsynchronousSocketChannelImpl
     extends AsynchronousSocketChannelImpl implements Port.PollableChannel
 {
-    private final static NativeDispatcher nd = new SocketDispatcher();
+    private static final NativeDispatcher nd = new SocketDispatcher();
     private static enum OpType { CONNECT, READ, WRITE };
 
     private static final boolean disableSynchronousRead;
diff --git a/jdk/src/java.base/unix/classes/sun/nio/fs/UnixUriUtils.java b/jdk/src/java.base/unix/classes/sun/nio/fs/UnixUriUtils.java
index 4d6f302acf6..b59ab4275ce 100644
--- a/jdk/src/java.base/unix/classes/sun/nio/fs/UnixUriUtils.java
+++ b/jdk/src/java.base/unix/classes/sun/nio/fs/UnixUriUtils.java
@@ -242,7 +242,7 @@ class UnixUriUtils {
    private static final long L_PATH = L_PCHAR | lowMask(";/");
    private static final long H_PATH = H_PCHAR | highMask(";/");
 
-   private final static char[] hexDigits = {
+   private static final char[] hexDigits = {
         '0', '1', '2', '3', '4', '5', '6', '7',
         '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
     };
diff --git a/jdk/src/java.base/unix/classes/sun/security/provider/NativePRNG.java b/jdk/src/java.base/unix/classes/sun/security/provider/NativePRNG.java
index 200ca9a56b6..c591fe806c6 100644
--- a/jdk/src/java.base/unix/classes/sun/security/provider/NativePRNG.java
+++ b/jdk/src/java.base/unix/classes/sun/security/provider/NativePRNG.java
@@ -331,10 +331,10 @@ public final class NativePRNG extends SecureRandomSpi {
         // we buffer data we read from the "next" file for efficiency,
         // but we limit the lifetime to avoid using stale bits
         // lifetime in ms, currently 100 ms (0.1 s)
-        private final static long MAX_BUFFER_TIME = 100;
+        private static final long MAX_BUFFER_TIME = 100;
 
         // size of the "next" buffer
-        private final static int BUFFER_SIZE = 32;
+        private static final int BUFFER_SIZE = 32;
 
         // Holder for the seedFile.  Used if we ever add seed material.
         File seedFile;
diff --git a/jdk/src/java.base/windows/classes/java/net/DefaultDatagramSocketImplFactory.java b/jdk/src/java.base/windows/classes/java/net/DefaultDatagramSocketImplFactory.java
index 84cdf5bc52d..1cd26bcb33c 100644
--- a/jdk/src/java.base/windows/classes/java/net/DefaultDatagramSocketImplFactory.java
+++ b/jdk/src/java.base/windows/classes/java/net/DefaultDatagramSocketImplFactory.java
@@ -45,7 +45,7 @@ import java.security.PrivilegedAction;
 
 class DefaultDatagramSocketImplFactory
 {
-    private final static Class prefixImplClass;
+    private static final Class prefixImplClass;
 
     /* the windows version. */
     private static float version;
@@ -54,13 +54,13 @@ class DefaultDatagramSocketImplFactory
     private static boolean preferIPv4Stack = false;
 
     /* If the version supports a dual stack TCP implementation */
-    private final static boolean useDualStackImpl;
+    private static final boolean useDualStackImpl;
 
     /* sun.net.useExclusiveBind */
     private static String exclBindProp;
 
     /* True if exclusive binding is on for Windows */
-    private final static boolean exclusiveBind;
+    private static final boolean exclusiveBind;
 
     static {
         Class prefixImplClassLocal = null;
diff --git a/jdk/src/java.base/windows/classes/java/net/TwoStacksPlainDatagramSocketImpl.java b/jdk/src/java.base/windows/classes/java/net/TwoStacksPlainDatagramSocketImpl.java
index 750abbf6f8c..9bdb8d5c6e1 100644
--- a/jdk/src/java.base/windows/classes/java/net/TwoStacksPlainDatagramSocketImpl.java
+++ b/jdk/src/java.base/windows/classes/java/net/TwoStacksPlainDatagramSocketImpl.java
@@ -212,5 +212,5 @@ class TwoStacksPlainDatagramSocketImpl extends AbstractPlainDatagramSocketImpl
     /**
      * Perform class load-time initializations.
      */
-    private native static void init();
+    private static native void init();
 }
diff --git a/jdk/src/java.base/windows/classes/sun/net/PortConfig.java b/jdk/src/java.base/windows/classes/sun/net/PortConfig.java
index e2ba12fee85..9749b7e418d 100644
--- a/jdk/src/java.base/windows/classes/sun/net/PortConfig.java
+++ b/jdk/src/java.base/windows/classes/sun/net/PortConfig.java
@@ -36,7 +36,7 @@ import java.security.AccessController;
 public final class PortConfig {
 
     private static int defaultUpper, defaultLower;
-    private final static int upper, lower;
+    private static final int upper, lower;
 
     static {
         AccessController.doPrivileged(
diff --git a/jdk/src/java.base/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthSequence.java b/jdk/src/java.base/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthSequence.java
index e63331dac3d..8005f41c5bf 100644
--- a/jdk/src/java.base/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthSequence.java
+++ b/jdk/src/java.base/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthSequence.java
@@ -87,7 +87,7 @@ public class NTLMAuthSequence {
         return status.sequenceComplete;
     }
 
-    private native static void initFirst (Class clazz);
+    private static native void initFirst (Class clazz);
 
     private native long getCredentialsHandle (String user, String domain, String password);
 
diff --git a/jdk/src/java.base/windows/classes/sun/nio/ch/WindowsSelectorImpl.java b/jdk/src/java.base/windows/classes/sun/nio/ch/WindowsSelectorImpl.java
index 28fc83a0b31..efeba7f9ec9 100644
--- a/jdk/src/java.base/windows/classes/sun/nio/ch/WindowsSelectorImpl.java
+++ b/jdk/src/java.base/windows/classes/sun/nio/ch/WindowsSelectorImpl.java
@@ -54,7 +54,7 @@ final class WindowsSelectorImpl extends SelectorImpl {
     private final int INIT_CAP = 8;
     // Maximum number of sockets for select().
     // Should be INIT_CAP times a power of 2
-    private final static int MAX_SELECTABLE_FDS = 1024;
+    private static final int MAX_SELECTABLE_FDS = 1024;
 
     // The list of SelectableChannels serviced by this Selector. Every mod
     // MAX_SELECTABLE_FDS entry is bogus, to align this array with the poll
@@ -85,7 +85,7 @@ final class WindowsSelectorImpl extends SelectorImpl {
     private Object closeLock = new Object();
 
     // Maps file descriptors to their indices in  pollArray
-    private final static class FdMap extends HashMap {
+    private static final class FdMap extends HashMap {
         static final long serialVersionUID = 0L;
         private MapEntry get(int desc) {
             return get(new Integer(desc));
@@ -103,7 +103,7 @@ final class WindowsSelectorImpl extends SelectorImpl {
     }
 
     // class for fdMap entries
-    private final static class MapEntry {
+    private static final class MapEntry {
         SelectionKeyImpl ski;
         long updateCount = 0;
         long clearedCount = 0;
diff --git a/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsConstants.java b/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsConstants.java
index 994c0a42b44..94870ad75ba 100644
--- a/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsConstants.java
+++ b/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsConstants.java
@@ -119,11 +119,11 @@ class WindowsConstants {
     public static final int FILE_NOTIFY_CHANGE_SECURITY    = 0x00000100;
 
     // notify actions
-    public final static int FILE_ACTION_ADDED              = 0x00000001;
-    public final static int FILE_ACTION_REMOVED            = 0x00000002;
-    public final static int FILE_ACTION_MODIFIED           = 0x00000003;
-    public final static int FILE_ACTION_RENAMED_OLD_NAME   = 0x00000004;
-    public final static int FILE_ACTION_RENAMED_NEW_NAME   = 0x00000005;
+    public static final int FILE_ACTION_ADDED              = 0x00000001;
+    public static final int FILE_ACTION_REMOVED            = 0x00000002;
+    public static final int FILE_ACTION_MODIFIED           = 0x00000003;
+    public static final int FILE_ACTION_RENAMED_OLD_NAME   = 0x00000004;
+    public static final int FILE_ACTION_RENAMED_NEW_NAME   = 0x00000005;
 
     // copy flags
     public static final int COPY_FILE_FAIL_IF_EXISTS       = 0x00000001;
diff --git a/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsWatchService.java b/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsWatchService.java
index 737c485698f..0ea288e1ecb 100644
--- a/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsWatchService.java
+++ b/jdk/src/java.base/windows/classes/sun/nio/fs/WindowsWatchService.java
@@ -48,7 +48,7 @@ import static sun.nio.fs.WindowsConstants.*;
 class WindowsWatchService
     extends AbstractWatchService
 {
-    private final static int WAKEUP_COMPLETION_KEY = 0;
+    private static final int WAKEUP_COMPLETION_KEY = 0;
 
     // background thread to service I/O completion port
     private final Poller poller;
@@ -242,7 +242,7 @@ class WindowsWatchService
      * Background thread to service I/O completion port.
      */
     private static class Poller extends AbstractPoller {
-        private final static Unsafe UNSAFE = Unsafe.getUnsafe();
+        private static final Unsafe UNSAFE = Unsafe.getUnsafe();
 
         /*
          * typedef struct _OVERLAPPED {
diff --git a/jdk/src/java.base/windows/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java b/jdk/src/java.base/windows/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java
index 16910379b28..2d53cde8324 100644
--- a/jdk/src/java.base/windows/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java
+++ b/jdk/src/java.base/windows/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java
@@ -128,7 +128,7 @@ public class HostLocaleProviderAdapterImpl {
         }
         supportedLocaleSet = Collections.unmodifiableSet(tmpSet);
     }
-    private final static Locale[] supportedLocale = supportedLocaleSet.toArray(new Locale[0]);
+    private static final Locale[] supportedLocale = supportedLocaleSet.toArray(new Locale[0]);
 
     public static DateFormatProvider getDateFormatProvider() {
         return new DateFormatProvider() {
diff --git a/jdk/test/java/io/File/MaxPathLength.java b/jdk/test/java/io/File/MaxPathLength.java
index cdda0471446..0e0b099afd9 100644
--- a/jdk/test/java/io/File/MaxPathLength.java
+++ b/jdk/test/java/io/File/MaxPathLength.java
@@ -39,7 +39,7 @@ public class MaxPathLength {
                  "areallylongfilenamethatsforsur";
     private static boolean isWindows = false;
 
-    private final static int MAX_LENGTH = 256;
+    private static final int MAX_LENGTH = 256;
 
     private static int counter = 0;
 
diff --git a/jdk/test/java/io/File/SymLinks.java b/jdk/test/java/io/File/SymLinks.java
index 04ac95eaed9..967250c8430 100644
--- a/jdk/test/java/io/File/SymLinks.java
+++ b/jdk/test/java/io/File/SymLinks.java
@@ -34,22 +34,22 @@ import java.nio.file.attribute.*;
 import static java.nio.file.LinkOption.*;
 
 public class SymLinks {
-    final static PrintStream out = System.out;
+    static final PrintStream out = System.out;
 
-    final static File top = new File(System.getProperty("test.dir", "."));
+    static final File top = new File(System.getProperty("test.dir", "."));
 
     // files used by the test
 
-    final static File file              = new File(top, "foofile");
-    final static File link2file         = new File(top, "link2file");
-    final static File link2link2file    = new File(top, "link2link2file");
+    static final File file              = new File(top, "foofile");
+    static final File link2file         = new File(top, "link2file");
+    static final File link2link2file    = new File(top, "link2link2file");
 
-    final static File dir               = new File(top, "foodir");
-    final static File link2dir          = new File(top, "link2dir");
-    final static File link2link2dir     = new File(top, "link2link2dir");
+    static final File dir               = new File(top, "foodir");
+    static final File link2dir          = new File(top, "link2dir");
+    static final File link2link2dir     = new File(top, "link2link2dir");
 
-    final static File link2nobody       = new File(top, "link2nobody");
-    final static File link2link2nobody  = new File(top, "link2link2nobody");
+    static final File link2nobody       = new File(top, "link2nobody");
+    static final File link2link2nobody  = new File(top, "link2link2nobody");
 
     /**
      * Setup files, directories, and sym links used by test.
diff --git a/jdk/test/java/io/FileDescriptor/Sharing.java b/jdk/test/java/io/FileDescriptor/Sharing.java
index c340a983ebe..24f4fb70b02 100644
--- a/jdk/test/java/io/FileDescriptor/Sharing.java
+++ b/jdk/test/java/io/FileDescriptor/Sharing.java
@@ -35,8 +35,8 @@ import java.util.concurrent.CountDownLatch;
 
 public class Sharing {
 
-    final static int numFiles = 10;
-    volatile static boolean fail;
+    static final int numFiles = 10;
+    static volatile boolean fail;
 
     public static void main(String[] args) throws Exception {
         TestFinalizer();
diff --git a/jdk/test/java/io/IOException/LastErrorString.java b/jdk/test/java/io/IOException/LastErrorString.java
index 3c769cd8063..7d1213c046a 100644
--- a/jdk/test/java/io/IOException/LastErrorString.java
+++ b/jdk/test/java/io/IOException/LastErrorString.java
@@ -65,7 +65,7 @@ public class LastErrorString {
     }
 
 
-    static abstract class Test {
+    abstract static class Test {
 
         String name;
 
@@ -73,7 +73,7 @@ public class LastErrorString {
             this.name = name;
         }
 
-        abstract public void run() throws IOException;
+        public abstract void run() throws IOException;
 
         public void go() throws IOException {
             try {
@@ -88,7 +88,7 @@ public class LastErrorString {
 
     }
 
-    static abstract class ClosedFISTest extends Test {
+    abstract static class ClosedFISTest extends Test {
 
         FileInputStream in;
 
@@ -104,7 +104,7 @@ public class LastErrorString {
 
     }
 
-    static abstract class ClosedFOSTest extends Test {
+    abstract static class ClosedFOSTest extends Test {
 
         FileOutputStream out;
 
@@ -120,7 +120,7 @@ public class LastErrorString {
 
     }
 
-    static abstract class ClosedRAFTest extends Test {
+    abstract static class ClosedRAFTest extends Test {
 
         RandomAccessFile raf;
 
@@ -136,7 +136,7 @@ public class LastErrorString {
 
     }
 
-    static abstract class ReadOnlyRAFTest extends Test {
+    abstract static class ReadOnlyRAFTest extends Test {
 
         RandomAccessFile raf;
 
diff --git a/jdk/test/java/io/InputStreamReader/One.java b/jdk/test/java/io/InputStreamReader/One.java
index c07335c05b9..9218c72b583 100644
--- a/jdk/test/java/io/InputStreamReader/One.java
+++ b/jdk/test/java/io/InputStreamReader/One.java
@@ -32,7 +32,7 @@ import java.io.*;
 
 public class One {
 
-    private static abstract class Test {
+    private abstract static class Test {
 
         InputStreamReader isr;
         StringBuffer sb;
diff --git a/jdk/test/java/io/PrintStream/OversynchronizedTest.java b/jdk/test/java/io/PrintStream/OversynchronizedTest.java
index c5ac2bb2b80..632d8dd0c0f 100644
--- a/jdk/test/java/io/PrintStream/OversynchronizedTest.java
+++ b/jdk/test/java/io/PrintStream/OversynchronizedTest.java
@@ -87,7 +87,7 @@ class TestObj {
         System.out.println("In test().");
     }
 
-    synchronized public String toString() {
+    public synchronized String toString() {
         System.out.println("Calling toString\n");
         return mStr;
     }
diff --git a/jdk/test/java/io/PrintWriter/OversynchronizedTest.java b/jdk/test/java/io/PrintWriter/OversynchronizedTest.java
index 23d06c293f6..7bb362b5ef1 100644
--- a/jdk/test/java/io/PrintWriter/OversynchronizedTest.java
+++ b/jdk/test/java/io/PrintWriter/OversynchronizedTest.java
@@ -87,7 +87,7 @@ class TestObj {
         writer.println("In test().");
     }
 
-    synchronized public String toString() {
+    public synchronized String toString() {
         writer.println("Calling toString\n");
         return mStr;
     }
diff --git a/jdk/test/java/io/Serializable/defaulted/GetFieldRead.java b/jdk/test/java/io/Serializable/defaulted/GetFieldRead.java
index 962535281ee..3e3ab29fcad 100644
--- a/jdk/test/java/io/Serializable/defaulted/GetFieldRead.java
+++ b/jdk/test/java/io/Serializable/defaulted/GetFieldRead.java
@@ -35,7 +35,7 @@ class TestClass implements Serializable {
     private static final long serialVersionUID=5748652654655279289L;
 
     // Fields to be serialized.
-    private final static ObjectStreamField[] serialPersistentFields = {
+    private static final ObjectStreamField[] serialPersistentFields = {
         new ObjectStreamField("objectI", Integer.class),
         new ObjectStreamField("primitiveI", Integer.TYPE),
         new ObjectStreamField("foo", Foo.class)
diff --git a/jdk/test/java/io/Serializable/defaulted/GetFieldWrite.java b/jdk/test/java/io/Serializable/defaulted/GetFieldWrite.java
index 25a5a01b98b..6fe3740cd4f 100644
--- a/jdk/test/java/io/Serializable/defaulted/GetFieldWrite.java
+++ b/jdk/test/java/io/Serializable/defaulted/GetFieldWrite.java
@@ -42,7 +42,7 @@ class TestClass implements Serializable {
     private static final long serialVersionUID = 5748652654655279289L;
 
     // Fields to be serialized.
-    private final static ObjectStreamField[] serialPersistentFields = {
+    private static final ObjectStreamField[] serialPersistentFields = {
         new ObjectStreamField("objectI", Integer.class)};
 
     Integer objectI;
diff --git a/jdk/test/java/io/Serializable/evolution/RenamePackage/extension/ExtendedObjectInputStream.java b/jdk/test/java/io/Serializable/evolution/RenamePackage/extension/ExtendedObjectInputStream.java
index 411a33efc77..897e4dcf99d 100644
--- a/jdk/test/java/io/Serializable/evolution/RenamePackage/extension/ExtendedObjectInputStream.java
+++ b/jdk/test/java/io/Serializable/evolution/RenamePackage/extension/ExtendedObjectInputStream.java
@@ -28,7 +28,7 @@ import java.io.*;
 
 public class ExtendedObjectInputStream extends ObjectInputStream {
 
-    static private Hashtable renamedClassMap;
+    private static Hashtable renamedClassMap;
 
     public ExtendedObjectInputStream(InputStream si)
         throws IOException, StreamCorruptedException
@@ -49,7 +49,7 @@ public class ExtendedObjectInputStream extends ObjectInputStream {
         return super.resolveClass(v);
     }
 
-    static public void addRenamedClassName(String oldName, String newName)
+    public static void addRenamedClassName(String oldName, String newName)
         throws ClassNotFoundException
     {
         Class cl = null;
diff --git a/jdk/test/java/io/Serializable/oldTests/CheckingEquality.java b/jdk/test/java/io/Serializable/oldTests/CheckingEquality.java
index 4bc20895c68..d77a39cb825 100644
--- a/jdk/test/java/io/Serializable/oldTests/CheckingEquality.java
+++ b/jdk/test/java/io/Serializable/oldTests/CheckingEquality.java
@@ -181,7 +181,7 @@ class Thirdpsio extends Secondpsio {
 
     private static int seven[];
     protected byte eight = (byte)9;
-    final static byte dcare = (byte) 128;
+    static final byte dcare = (byte) 128;
     private short nine = 8888;
     long ten;
     java.util.Enumeration zero;
diff --git a/jdk/test/java/io/Serializable/subclass/AbstractObjectInputStream.java b/jdk/test/java/io/Serializable/subclass/AbstractObjectInputStream.java
index e1088dfaedb..29150f3bcfb 100644
--- a/jdk/test/java/io/Serializable/subclass/AbstractObjectInputStream.java
+++ b/jdk/test/java/io/Serializable/subclass/AbstractObjectInputStream.java
@@ -143,7 +143,7 @@ import java.lang.reflect.Modifier;
  * @see java.io.ext.AbstractObjectOutputStream
  * @since   JDK1.2
  */
-abstract public class AbstractObjectInputStream extends ObjectInputStream
+public abstract class AbstractObjectInputStream extends ObjectInputStream
 {
     protected InputStream in;
     /**
@@ -167,7 +167,7 @@ abstract public class AbstractObjectInputStream extends ObjectInputStream
             this.in = in;
         }
 
-    abstract public void close() throws IOException;
+    public abstract void close() throws IOException;
 
     /***************************************************************/
     /* Read an object from the stream. */
@@ -230,7 +230,7 @@ abstract public class AbstractObjectInputStream extends ObjectInputStream
      * @exception ClassNotFoundException if no corresponding local class can be
      *                                   found in the local JVM.
      */
-    abstract public void defaultReadObject()
+    public abstract void defaultReadObject()
         throws IOException, ClassNotFoundException, NotActiveException;
 
     /**
@@ -252,7 +252,7 @@ abstract public class AbstractObjectInputStream extends ObjectInputStream
      *            ofClass.
      * @exception InstantiationException  TBD.
      */
-    final protected native Object
+    protected final native Object
         allocateNewObject(Class ofClass, Class ctorClass)
         throws InstantiationException, IllegalAccessException;
 
@@ -270,7 +270,7 @@ abstract public class AbstractObjectInputStream extends ObjectInputStream
      * @exception IllegalAccessException  TBD.
      * @exception InstantiationException  TBD.
      */
-    final protected native Object
+    protected final native Object
         allocateNewArray(Class componentClass, int length)
         throws InstantiationException, IllegalAccessException;
 
@@ -283,12 +283,12 @@ abstract public class AbstractObjectInputStream extends ObjectInputStream
      * @exception IOException        if an I/O error occurs.
      * @exception NotActiveException if readObject() is not currently active.
      */
-    abstract public ObjectInputStream.GetField readFields()
+    public abstract ObjectInputStream.GetField readFields()
         throws IOException, ClassNotFoundException, NotActiveException;
 
-    abstract protected boolean enableResolveObject(boolean enable) throws SecurityException;
+    protected abstract boolean enableResolveObject(boolean enable) throws SecurityException;
 
-    abstract public void registerValidation(ObjectInputValidation obj,
+    public abstract void registerValidation(ObjectInputValidation obj,
                                             int prio)
         throws NotActiveException, InvalidObjectException;
 
@@ -297,25 +297,25 @@ abstract public class AbstractObjectInputStream extends ObjectInputStream
 
     /* Use DataInput methods to read primitive data from the stream. */
 
-    abstract public int read() throws IOException;
-    abstract public int read(byte[] data, int offset, int length)
+    public abstract int read() throws IOException;
+    public abstract int read(byte[] data, int offset, int length)
         throws IOException;
-    abstract public boolean readBoolean() throws IOException;
-    abstract public byte readByte() throws IOException;
-    abstract public int readUnsignedByte()  throws IOException;
-    abstract public short readShort()  throws IOException;
-    abstract public int readUnsignedShort() throws IOException;
-    abstract public char readChar()  throws IOException;
-    abstract public int readInt()  throws IOException;
-    abstract public long readLong()  throws IOException;
-    abstract public float readFloat() throws IOException;
-    abstract public double readDouble() throws IOException;
-    abstract public void readFully(byte[] data) throws IOException;
-    abstract public void readFully(byte[] data, int offset, int size) throws IOException;
-    abstract public String readUTF() throws IOException;
-    abstract public int available() throws IOException;
-    abstract public int skipBytes(int len) throws IOException;
+    public abstract boolean readBoolean() throws IOException;
+    public abstract byte readByte() throws IOException;
+    public abstract int readUnsignedByte()  throws IOException;
+    public abstract short readShort()  throws IOException;
+    public abstract int readUnsignedShort() throws IOException;
+    public abstract char readChar()  throws IOException;
+    public abstract int readInt()  throws IOException;
+    public abstract long readLong()  throws IOException;
+    public abstract float readFloat() throws IOException;
+    public abstract double readDouble() throws IOException;
+    public abstract void readFully(byte[] data) throws IOException;
+    public abstract void readFully(byte[] data, int offset, int size) throws IOException;
+    public abstract String readUTF() throws IOException;
+    public abstract int available() throws IOException;
+    public abstract int skipBytes(int len) throws IOException;
 
     /* @deprecated */
-    abstract public String readLine() throws IOException;
+    public abstract String readLine() throws IOException;
 };
diff --git a/jdk/test/java/io/Serializable/subclass/AbstractObjectOutputStream.java b/jdk/test/java/io/Serializable/subclass/AbstractObjectOutputStream.java
index 85fbe78eb4e..2c9bed34594 100644
--- a/jdk/test/java/io/Serializable/subclass/AbstractObjectOutputStream.java
+++ b/jdk/test/java/io/Serializable/subclass/AbstractObjectOutputStream.java
@@ -134,7 +134,7 @@ import java.io.ObjectOutputStream;
  *
  * @since       JDK1.2
  */
-abstract public class AbstractObjectOutputStream extends ObjectOutputStream
+public abstract class AbstractObjectOutputStream extends ObjectOutputStream
 {
     protected OutputStream out;
     /* Stream Management Methods. */
@@ -156,9 +156,9 @@ abstract public class AbstractObjectOutputStream extends ObjectOutputStream
         this.out = out;
     }
 
-    abstract public void reset() throws IOException;
-    abstract protected void drain() throws IOException;
-    abstract public void close() throws IOException;
+    public abstract void reset() throws IOException;
+    protected abstract void drain() throws IOException;
+    public abstract void close() throws IOException;
 
     /*******************************************************************/
 
@@ -214,14 +214,14 @@ abstract public class AbstractObjectOutputStream extends ObjectOutputStream
      * @exception NotActiveException  Thrown if a writeObject method is not
      *                                active.
      */
-    abstract public void defaultWriteObject() throws IOException;
+    public abstract void defaultWriteObject() throws IOException;
 
     /*************************************************************/
     /* Use the methods of PutField to map between Serializable fields
      * and actual fields of a Serializable class.
      */
 
-    abstract public ObjectOutputStream.PutField putFields() throws IOException;
+    public abstract ObjectOutputStream.PutField putFields() throws IOException;
 
     /**
      * Note: The PutField being serialized is not passed to this method.
@@ -229,25 +229,25 @@ abstract public class AbstractObjectOutputStream extends ObjectOutputStream
      *       the state of the last putFields call and
      *       only allowed this method to be invoked for that PutFields object.
      */
-    abstract public void writeFields() throws IOException;
+    public abstract void writeFields() throws IOException;
 
-    abstract protected boolean enableReplaceObject(boolean enable) throws SecurityException;
+    protected abstract boolean enableReplaceObject(boolean enable) throws SecurityException;
 
     /*******************************************************************/
     /* Write Primitive Data to stream.  DataOutput methods. */
 
-    abstract public void write(int data) throws IOException;
-    abstract public void write(byte b[]) throws IOException;
-    abstract public void write(byte b[], int off, int len) throws IOException;
-    abstract public void writeBoolean(boolean data) throws IOException;
-    abstract public void writeByte(int data) throws IOException;
-    abstract public void writeShort(int data)  throws IOException;
-    abstract public void writeChar(int data)  throws IOException;
-    abstract public void writeInt(int data)  throws IOException;
-    abstract public void writeLong(long data)  throws IOException;
-    abstract public void writeFloat(float data) throws IOException;
-    abstract public void writeDouble(double data) throws IOException;
-    abstract public void writeBytes(String data) throws IOException;
-    abstract public void writeChars(String data) throws IOException;
-    abstract public void writeUTF(String data) throws IOException;
+    public abstract void write(int data) throws IOException;
+    public abstract void write(byte b[]) throws IOException;
+    public abstract void write(byte b[], int off, int len) throws IOException;
+    public abstract void writeBoolean(boolean data) throws IOException;
+    public abstract void writeByte(int data) throws IOException;
+    public abstract void writeShort(int data)  throws IOException;
+    public abstract void writeChar(int data)  throws IOException;
+    public abstract void writeInt(int data)  throws IOException;
+    public abstract void writeLong(long data)  throws IOException;
+    public abstract void writeFloat(float data) throws IOException;
+    public abstract void writeDouble(double data) throws IOException;
+    public abstract void writeBytes(String data) throws IOException;
+    public abstract void writeChars(String data) throws IOException;
+    public abstract void writeUTF(String data) throws IOException;
 };
diff --git a/jdk/test/java/io/Serializable/subclass/Test.java b/jdk/test/java/io/Serializable/subclass/Test.java
index d80cab182ef..bc72741cba1 100644
--- a/jdk/test/java/io/Serializable/subclass/Test.java
+++ b/jdk/test/java/io/Serializable/subclass/Test.java
@@ -49,7 +49,7 @@ import java.io.*;
  */
 class B implements Serializable {
     public int publicIntField;
-    static public int numWriteObjectCalled = 0;
+    public static int numWriteObjectCalled = 0;
     B(int v) {
         publicIntField = v;
     }
@@ -73,7 +73,7 @@ class B implements Serializable {
 class C implements Serializable {
     public int xx1;
     public int xx2;
-    final static ObjectStreamField[] serialPersistentFields = {
+    static final ObjectStreamField[] serialPersistentFields = {
         new ObjectStreamField("x1", Integer.TYPE),
         new ObjectStreamField("x2", Integer.TYPE),
         new ObjectStreamField("x3", Integer.TYPE),
@@ -112,7 +112,7 @@ class A implements Serializable {
 };
 
 public class Test {
-    static public void main(String argv[])
+    public static void main(String argv[])
         throws IOException, ClassNotFoundException
     {
         boolean expectSecurityException = false;
diff --git a/jdk/test/java/io/Serializable/subclass/XObjectInputStream.java b/jdk/test/java/io/Serializable/subclass/XObjectInputStream.java
index fdb96bd9844..a333dea560b 100644
--- a/jdk/test/java/io/Serializable/subclass/XObjectInputStream.java
+++ b/jdk/test/java/io/Serializable/subclass/XObjectInputStream.java
@@ -37,12 +37,12 @@ class XObjectInputStream extends AbstractObjectInputStream {
             dis = new DataInputStream(in);
         }
 
-    final public void defaultReadObject()
+    public final void defaultReadObject()
         throws IOException, ClassNotFoundException, NotActiveException
     {
     }
 
-    final protected Object readObjectOverride()
+    protected final Object readObjectOverride()
         throws OptionalDataException, ClassNotFoundException, IOException {
 
         Object readResult = null;
@@ -256,7 +256,7 @@ class XObjectInputStream extends AbstractObjectInputStream {
      * Set the accessible flag on it here. ObjectOutputStream
      * will call it as necessary.
      */
-    static public Method getReadObjectMethod(final Class cl) {
+    public static Method getReadObjectMethod(final Class cl) {
 
         Method readObjectMethod = (Method)
             java.security.AccessController.doPrivileged
@@ -286,7 +286,7 @@ class XObjectInputStream extends AbstractObjectInputStream {
     /*************************************************************/
 
     /* taken verbatim from ObjectInputStream. */
-    static private void invokeMethod(final Object obj, final Method m,
+    private static void invokeMethod(final Object obj, final Method m,
                                         final Object[] argList)
         throws IOException
     {
diff --git a/jdk/test/java/io/Serializable/subclass/XObjectOutputStream.java b/jdk/test/java/io/Serializable/subclass/XObjectOutputStream.java
index 87909478040..583f1d04bdc 100644
--- a/jdk/test/java/io/Serializable/subclass/XObjectOutputStream.java
+++ b/jdk/test/java/io/Serializable/subclass/XObjectOutputStream.java
@@ -53,7 +53,7 @@ public class XObjectOutputStream extends AbstractObjectOutputStream {
         super.writeStreamHeader();
     }
 
-    final protected void writeObjectOverride(Object obj) throws IOException {
+    protected final void writeObjectOverride(Object obj) throws IOException {
         Object prevCurrentObject = currentObject;
         currentObject = obj;
         System.out.println("writeObjectOverride(" + obj.toString() + ")");
@@ -300,7 +300,7 @@ public class XObjectOutputStream extends AbstractObjectOutputStream {
      * Set the accessible flag on it here.
      * Subclass of AbstractObjectOutputStream will call it as necessary.
      */
-    static public Method getWriteObjectMethod(final Class cl) {
+    public static Method getWriteObjectMethod(final Class cl) {
 
         Method writeObjectMethod = (Method)
             java.security.AccessController.doPrivileged
@@ -330,7 +330,7 @@ public class XObjectOutputStream extends AbstractObjectOutputStream {
     /*************************************************************/
 
     /* CODE LIFTED FROM ObjectOutputStream. */
-    static private void invokeMethod(final Object obj, final Method m,
+    private static void invokeMethod(final Object obj, final Method m,
                                         final Object[] argList)
         throws IOException
     {
diff --git a/jdk/test/java/io/Serializable/typeSafeEnum/TypeSafeEnum.java b/jdk/test/java/io/Serializable/typeSafeEnum/TypeSafeEnum.java
index bba0076335e..512fdd2da1f 100644
--- a/jdk/test/java/io/Serializable/typeSafeEnum/TypeSafeEnum.java
+++ b/jdk/test/java/io/Serializable/typeSafeEnum/TypeSafeEnum.java
@@ -39,9 +39,9 @@ public class TypeSafeEnum implements Serializable, ObjectInputValidation {
         this.value = value;
     }
 
-    final public static TypeSafeEnum FIRST = new TypeSafeEnum("First");
-    final public static TypeSafeEnum SECOND = new TypeSafeEnum("Second");
-    final public static TypeSafeEnum THIRD = new TypeSafeEnum("Third");
+    public static final TypeSafeEnum FIRST = new TypeSafeEnum("First");
+    public static final TypeSafeEnum SECOND = new TypeSafeEnum("Second");
+    public static final TypeSafeEnum THIRD = new TypeSafeEnum("Third");
     static int numReadResolve = 0;
     static int numWriteReplace = 0;
     static boolean verbose = false;
diff --git a/jdk/test/java/io/StreamTokenizer/ReadAhead.java b/jdk/test/java/io/StreamTokenizer/ReadAhead.java
index 09ee60ae336..58ae4adfa2e 100644
--- a/jdk/test/java/io/StreamTokenizer/ReadAhead.java
+++ b/jdk/test/java/io/StreamTokenizer/ReadAhead.java
@@ -39,7 +39,7 @@ public class ReadAhead {
 
 
     /* An InputStream subclass that cannot read past a given limit */
-    static private class LimitedInputStream extends InputStream {
+    private static class LimitedInputStream extends InputStream {
 
         private String input;
         private int limit;      /* Do not allow input[limit] to be read */
@@ -60,7 +60,7 @@ public class ReadAhead {
 
 
     /* A Reader subclass that cannot read past a given limit */
-    static private class LimitedReader extends Reader {
+    private static class LimitedReader extends Reader {
 
         private String input;
         private int limit;      /* Do not allow input[limit] to be read */
@@ -95,11 +95,11 @@ public class ReadAhead {
 
     /* Interface for objects that can create new StreamTokenizers
        with a given limited input */
-    static private interface StreamTokenizerMaker {
+    private static interface StreamTokenizerMaker {
         public StreamTokenizer create(String input, int limit);
     }
 
-    static private void fail(String why) throws Exception {
+    private static void fail(String why) throws Exception {
         throw new Exception(why);
     }
 
diff --git a/jdk/test/java/lang/Class/getDeclaredField/ClassDeclaredFieldsTest.java b/jdk/test/java/lang/Class/getDeclaredField/ClassDeclaredFieldsTest.java
index c05e1790d59..2441a17ad00 100644
--- a/jdk/test/java/lang/Class/getDeclaredField/ClassDeclaredFieldsTest.java
+++ b/jdk/test/java/lang/Class/getDeclaredField/ClassDeclaredFieldsTest.java
@@ -135,7 +135,7 @@ public class ClassDeclaredFieldsTest {
     }
 
     // A Helper class to build a set of permissions.
-    final static class PermissionsBuilder {
+    static final class PermissionsBuilder {
         final Permissions perms;
         public PermissionsBuilder() {
             this(new Permissions());
diff --git a/jdk/test/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java b/jdk/test/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java
index 58d5097beca..71ee0df8779 100644
--- a/jdk/test/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java
+++ b/jdk/test/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java
@@ -301,7 +301,7 @@ public class FieldSetAccessibleTest {
     }
 
     // A Helper class to build a set of permissions.
-    final static class PermissionsBuilder {
+    static final class PermissionsBuilder {
         final Permissions perms;
         public PermissionsBuilder() {
             this(new Permissions());
diff --git a/jdk/test/java/lang/Enum/ValueOf.java b/jdk/test/java/lang/Enum/ValueOf.java
index 711819653df..3f5f9abe632 100644
--- a/jdk/test/java/lang/Enum/ValueOf.java
+++ b/jdk/test/java/lang/Enum/ValueOf.java
@@ -219,7 +219,7 @@ public class ValueOf {
         FOO {
             public void foo() {}
         };
-        abstract public void foo();
+        public abstract void foo();
     };
 
 }
diff --git a/jdk/test/java/lang/ProcessBuilder/Basic.java b/jdk/test/java/lang/ProcessBuilder/Basic.java
index 8e7f061e4a5..1e4277b6a31 100644
--- a/jdk/test/java/lang/ProcessBuilder/Basic.java
+++ b/jdk/test/java/lang/ProcessBuilder/Basic.java
@@ -653,7 +653,7 @@ public class Basic {
     }
 
     static class EnglishUnix {
-        private final static Boolean is =
+        private static final Boolean is =
             (! Windows.is() && isEnglish("LANG") && isEnglish("LC_ALL"));
 
         private static boolean isEnglish(String envvar) {
diff --git a/jdk/test/java/lang/Runtime/exec/ExitValue.java b/jdk/test/java/lang/Runtime/exec/ExitValue.java
index 3ac42339100..981c1744cc2 100644
--- a/jdk/test/java/lang/Runtime/exec/ExitValue.java
+++ b/jdk/test/java/lang/Runtime/exec/ExitValue.java
@@ -72,7 +72,7 @@ public class ExitValue
                        expectedExitValue);
     }
 
-    final static int EXIT_CODE = 5;
+    static final int EXIT_CODE = 5;
 
     public static void main(String[] args) throws Exception {
         if (! UnixCommands.isUnix) {
diff --git a/jdk/test/java/lang/SecurityManager/CheckPackageMatching.java b/jdk/test/java/lang/SecurityManager/CheckPackageMatching.java
index 32a5e77d54f..915ea7995ab 100644
--- a/jdk/test/java/lang/SecurityManager/CheckPackageMatching.java
+++ b/jdk/test/java/lang/SecurityManager/CheckPackageMatching.java
@@ -55,7 +55,7 @@ public class CheckPackageMatching {
      * PackageMatcher implements a state machine that matches package
      * names against packages parsed from the package access list.
      */
-    private static abstract class PackageMatcher {
+    private abstract static class PackageMatcher {
         // For each state, chars[state] contains the chars that matches.
         private final char[][] chars;
         // For each state, states[state][i] contains the next state to go
diff --git a/jdk/test/java/lang/String/StringContentEqualsBug.java b/jdk/test/java/lang/String/StringContentEqualsBug.java
index 660d8d7eea3..182171af042 100644
--- a/jdk/test/java/lang/String/StringContentEqualsBug.java
+++ b/jdk/test/java/lang/String/StringContentEqualsBug.java
@@ -28,7 +28,7 @@
  */
 public class StringContentEqualsBug {
 
-    static abstract class Task extends Thread {
+    abstract static class Task extends Thread {
         volatile StringBuffer sb;
         volatile Exception exception;
 
diff --git a/jdk/test/java/lang/String/StringJoinTest.java b/jdk/test/java/lang/String/StringJoinTest.java
index 4d44532a1ea..6e901324a1a 100644
--- a/jdk/test/java/lang/String/StringJoinTest.java
+++ b/jdk/test/java/lang/String/StringJoinTest.java
@@ -34,17 +34,17 @@ import static org.testng.Assert.*;
 
 @Test(groups = {"unit","string","lang","libs"})
 public class StringJoinTest {
-    private final static String DASH = "-";
-    private final static String BEGIN = "Hi there";
-    private final static String JIM = "Jim";
-    private final static String JOHN = "John";
-    private final static String AND_JOE = "and Joe";
-    private final static String BILL = "Bill";
-    private final static String BOB = "Bob";
-    private final static String AND_BO = "and Bo";
-    private final static String ZEKE = "Zeke";
-    private final static String ZACK = "Zack";
-    private final static String AND_ZOE = "and Zoe";
+    private static final String DASH = "-";
+    private static final String BEGIN = "Hi there";
+    private static final String JIM = "Jim";
+    private static final String JOHN = "John";
+    private static final String AND_JOE = "and Joe";
+    private static final String BILL = "Bill";
+    private static final String BOB = "Bob";
+    private static final String AND_BO = "and Bo";
+    private static final String ZEKE = "Zeke";
+    private static final String ZACK = "Zack";
+    private static final String AND_ZOE = "and Zoe";
 
     /**
      * Tests the join() methods on String
diff --git a/jdk/test/java/lang/StringBuffer/BufferForwarding.java b/jdk/test/java/lang/StringBuffer/BufferForwarding.java
index 220db41b391..71c4e7db92c 100644
--- a/jdk/test/java/lang/StringBuffer/BufferForwarding.java
+++ b/jdk/test/java/lang/StringBuffer/BufferForwarding.java
@@ -32,10 +32,10 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class BufferForwarding {
-    private final static String A_STRING_BUFFER_VAL = "aStringBuffer";
-    private final static String A_STRING_BUILDER_VAL = "aStringBuilder";
-    private final static String A_STRING_VAL = "aString";
-    private final static String NON_EMPTY_VAL = "NonEmpty";
+    private static final String A_STRING_BUFFER_VAL = "aStringBuffer";
+    private static final String A_STRING_BUILDER_VAL = "aStringBuilder";
+    private static final String A_STRING_VAL = "aString";
+    private static final String NON_EMPTY_VAL = "NonEmpty";
 
     public BufferForwarding() {
         System.out.println( "Starting BufferForwarding");
diff --git a/jdk/test/java/lang/StringBuilder/BuilderForwarding.java b/jdk/test/java/lang/StringBuilder/BuilderForwarding.java
index 97120747824..a78c3232b17 100644
--- a/jdk/test/java/lang/StringBuilder/BuilderForwarding.java
+++ b/jdk/test/java/lang/StringBuilder/BuilderForwarding.java
@@ -32,10 +32,10 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class BuilderForwarding {
-    private final static String A_STRING_BUFFER_VAL = "aStringBuffer";
-    private final static String A_STRING_BUILDER_VAL = "aStringBuilder";
-    private final static String A_STRING_VAL = "aString";
-    private final static String NON_EMPTY_VAL = "NonEmpty";
+    private static final String A_STRING_BUFFER_VAL = "aStringBuffer";
+    private static final String A_STRING_BUILDER_VAL = "aStringBuilder";
+    private static final String A_STRING_VAL = "aString";
+    private static final String NON_EMPTY_VAL = "NonEmpty";
 
     public BuilderForwarding() {
         System.out.println( "Starting BuilderForwarding");
diff --git a/jdk/test/java/lang/System/finalization/FinThreads.java b/jdk/test/java/lang/System/finalization/FinThreads.java
index 62c0e51d7fe..f8a2974ab46 100644
--- a/jdk/test/java/lang/System/finalization/FinThreads.java
+++ b/jdk/test/java/lang/System/finalization/FinThreads.java
@@ -44,7 +44,7 @@ public class FinThreads {
         /* Instances are only created in an auxiliary thread, in order to
            guard against stray references from the current thread's stack
          */
-        static public void create(final boolean catchFinalizer)
+        public static void create(final boolean catchFinalizer)
             throws InterruptedException
         {
             Thread t = new Thread(new Runnable() {
diff --git a/jdk/test/java/lang/Thread/GenerifyStackTraces.java b/jdk/test/java/lang/Thread/GenerifyStackTraces.java
index d0a695d4f54..7f72f87cb1f 100644
--- a/jdk/test/java/lang/Thread/GenerifyStackTraces.java
+++ b/jdk/test/java/lang/Thread/GenerifyStackTraces.java
@@ -120,7 +120,7 @@ public class GenerifyStackTraces {
     }
 
 
-    static private void waitForDump() {
+    private static void waitForDump() {
         synchronized(go) {
             try {
                go.wait();
@@ -130,7 +130,7 @@ public class GenerifyStackTraces {
         }
     }
 
-    static private void finishDump() {
+    private static void finishDump() {
         synchronized(go) {
             try {
                go.notifyAll();
diff --git a/jdk/test/java/lang/ThreadLocal/ImmutableLocal.java b/jdk/test/java/lang/ThreadLocal/ImmutableLocal.java
index 695ad2ed4d5..81c72cdba34 100644
--- a/jdk/test/java/lang/ThreadLocal/ImmutableLocal.java
+++ b/jdk/test/java/lang/ThreadLocal/ImmutableLocal.java
@@ -32,13 +32,13 @@ public class ImmutableLocal
     /**
      * {@link ThreadLocal} guaranteed to always return the same reference.
      */
-    abstract public static class ImmutableThreadLocal extends ThreadLocal {
+    public abstract static class ImmutableThreadLocal extends ThreadLocal {
         public void set(final Object value) {
             throw new RuntimeException("ImmutableThreadLocal set called");
         }
 
         // force override
-        abstract protected Object initialValue();
+        protected abstract Object initialValue();
     }
 
     private static final ThreadLocal cache = new ImmutableThreadLocal() {
diff --git a/jdk/test/java/lang/annotation/typeAnnotations/GetAnnotatedInterfaces.java b/jdk/test/java/lang/annotation/typeAnnotations/GetAnnotatedInterfaces.java
index 6a6d256e551..7be7f3de65d 100644
--- a/jdk/test/java/lang/annotation/typeAnnotations/GetAnnotatedInterfaces.java
+++ b/jdk/test/java/lang/annotation/typeAnnotations/GetAnnotatedInterfaces.java
@@ -76,5 +76,5 @@ public class GetAnnotatedInterfaces {
 
     interface If {}
 
-    static abstract class Clz {}
+    abstract static class Clz {}
 }
diff --git a/jdk/test/java/lang/annotation/typeAnnotations/GetAnnotatedSuperclass.java b/jdk/test/java/lang/annotation/typeAnnotations/GetAnnotatedSuperclass.java
index 34b95a0a518..bf0cb43677f 100644
--- a/jdk/test/java/lang/annotation/typeAnnotations/GetAnnotatedSuperclass.java
+++ b/jdk/test/java/lang/annotation/typeAnnotations/GetAnnotatedSuperclass.java
@@ -94,5 +94,5 @@ public class GetAnnotatedSuperclass {
 
     interface If {}
 
-    static abstract class Clz {}
+    abstract static class Clz {}
 }
diff --git a/jdk/test/java/lang/instrument/ATestCaseScaffold.java b/jdk/test/java/lang/instrument/ATestCaseScaffold.java
index b2e884b8999..fecbad9f00a 100644
--- a/jdk/test/java/lang/instrument/ATestCaseScaffold.java
+++ b/jdk/test/java/lang/instrument/ATestCaseScaffold.java
@@ -169,7 +169,7 @@ public abstract class ATestCaseScaffold {
         assertEquals("Expected equality", expected, actual);
     }
 
-    public final static class
+    public static final class
     TestCaseScaffoldException extends RuntimeException {
         public
         TestCaseScaffoldException() {
diff --git a/jdk/test/java/lang/invoke/6998541/Test6998541.java b/jdk/test/java/lang/invoke/6998541/Test6998541.java
index 59d9d45bffb..1edf14f9dc6 100644
--- a/jdk/test/java/lang/invoke/6998541/Test6998541.java
+++ b/jdk/test/java/lang/invoke/6998541/Test6998541.java
@@ -136,7 +136,7 @@ public class Test6998541 {
         throw new AssertionError();
     }
 
-    private final static MethodHandles.Lookup lookup = MethodHandles.lookup();
+    private static final MethodHandles.Lookup lookup = MethodHandles.lookup();
 
     private static MethodHandle mh(Class ret, Class... args) {
         try {
@@ -191,14 +191,14 @@ public class Test6998541 {
 
     private static MethodHandle mh_z(Class ret) { return mh(ret, boolean.class); }
 
-    private final static MethodHandle mh_zz = mh_z(boolean.class);
-    private final static MethodHandle mh_bz = mh_z(byte.class   );
-    private final static MethodHandle mh_cz = mh_z(char.class   );
-    private final static MethodHandle mh_sz = mh_z(short.class  );
-    private final static MethodHandle mh_iz = mh_z(int.class    );
-    private final static MethodHandle mh_jz = mh_z(long.class   );
-    private final static MethodHandle mh_fz = mh_z(float.class  );
-    private final static MethodHandle mh_dz = mh_z(double.class );
+    private static final MethodHandle mh_zz = mh_z(boolean.class);
+    private static final MethodHandle mh_bz = mh_z(byte.class   );
+    private static final MethodHandle mh_cz = mh_z(char.class   );
+    private static final MethodHandle mh_sz = mh_z(short.class  );
+    private static final MethodHandle mh_iz = mh_z(int.class    );
+    private static final MethodHandle mh_jz = mh_z(long.class   );
+    private static final MethodHandle mh_fz = mh_z(float.class  );
+    private static final MethodHandle mh_dz = mh_z(double.class );
 
     private static void boolean2prim(boolean x) throws Throwable {
         int i = x ? 1 : 0;
@@ -225,14 +225,14 @@ public class Test6998541 {
 
     private static MethodHandle mh_b(Class ret) { return mh(ret, byte.class); }
 
-    private final static MethodHandle mh_zb = mh_b(boolean.class);
-    private final static MethodHandle mh_bb = mh_b(byte.class   );
-    private final static MethodHandle mh_cb = mh_b(char.class   );
-    private final static MethodHandle mh_sb = mh_b(short.class  );
-    private final static MethodHandle mh_ib = mh_b(int.class    );
-    private final static MethodHandle mh_jb = mh_b(long.class   );
-    private final static MethodHandle mh_fb = mh_b(float.class  );
-    private final static MethodHandle mh_db = mh_b(double.class );
+    private static final MethodHandle mh_zb = mh_b(boolean.class);
+    private static final MethodHandle mh_bb = mh_b(byte.class   );
+    private static final MethodHandle mh_cb = mh_b(char.class   );
+    private static final MethodHandle mh_sb = mh_b(short.class  );
+    private static final MethodHandle mh_ib = mh_b(int.class    );
+    private static final MethodHandle mh_jb = mh_b(long.class   );
+    private static final MethodHandle mh_fb = mh_b(float.class  );
+    private static final MethodHandle mh_db = mh_b(double.class );
 
     private static void byte2prim(byte x) throws Throwable {
         assertEquals((byte)    x, (byte)    mh_bb.invokeExact(x));  // byte -> byte
@@ -254,14 +254,14 @@ public class Test6998541 {
 
     private static MethodHandle mh_c(Class ret) { return mh(ret, char.class); }
 
-    private final static MethodHandle mh_zc = mh_c(boolean.class);
-    private final static MethodHandle mh_bc = mh_c(byte.class   );
-    private final static MethodHandle mh_cc = mh_c(char.class   );
-    private final static MethodHandle mh_sc = mh_c(short.class  );
-    private final static MethodHandle mh_ic = mh_c(int.class    );
-    private final static MethodHandle mh_jc = mh_c(long.class   );
-    private final static MethodHandle mh_fc = mh_c(float.class  );
-    private final static MethodHandle mh_dc = mh_c(double.class );
+    private static final MethodHandle mh_zc = mh_c(boolean.class);
+    private static final MethodHandle mh_bc = mh_c(byte.class   );
+    private static final MethodHandle mh_cc = mh_c(char.class   );
+    private static final MethodHandle mh_sc = mh_c(short.class  );
+    private static final MethodHandle mh_ic = mh_c(int.class    );
+    private static final MethodHandle mh_jc = mh_c(long.class   );
+    private static final MethodHandle mh_fc = mh_c(float.class  );
+    private static final MethodHandle mh_dc = mh_c(double.class );
 
     private static void char2prim(char x) throws Throwable {
         assertEquals((char)    x, (char)    mh_cc.invokeExact(x));  // char -> char
@@ -284,14 +284,14 @@ public class Test6998541 {
 
     private static MethodHandle mh_s(Class ret) { return mh(ret, short.class); }
 
-    private final static MethodHandle mh_zs = mh_s(boolean.class);
-    private final static MethodHandle mh_bs = mh_s(byte.class   );
-    private final static MethodHandle mh_cs = mh_s(char.class   );
-    private final static MethodHandle mh_ss = mh_s(short.class  );
-    private final static MethodHandle mh_is = mh_s(int.class    );
-    private final static MethodHandle mh_js = mh_s(long.class   );
-    private final static MethodHandle mh_fs = mh_s(float.class  );
-    private final static MethodHandle mh_ds = mh_s(double.class );
+    private static final MethodHandle mh_zs = mh_s(boolean.class);
+    private static final MethodHandle mh_bs = mh_s(byte.class   );
+    private static final MethodHandle mh_cs = mh_s(char.class   );
+    private static final MethodHandle mh_ss = mh_s(short.class  );
+    private static final MethodHandle mh_is = mh_s(int.class    );
+    private static final MethodHandle mh_js = mh_s(long.class   );
+    private static final MethodHandle mh_fs = mh_s(float.class  );
+    private static final MethodHandle mh_ds = mh_s(double.class );
 
     private static void short2prim(short x) throws Throwable {
         assertEquals((short)   x, (short)   mh_ss.invokeExact(x));  // short -> short
@@ -314,14 +314,14 @@ public class Test6998541 {
 
     private static MethodHandle mh_i(Class ret) { return mh(ret, int.class); }
 
-    private final static MethodHandle mh_zi = mh_i(boolean.class);
-    private final static MethodHandle mh_bi = mh_i(byte.class   );
-    private final static MethodHandle mh_ci = mh_i(char.class   );
-    private final static MethodHandle mh_si = mh_i(short.class  );
-    private final static MethodHandle mh_ii = mh_i(int.class    );
-    private final static MethodHandle mh_ji = mh_i(long.class   );
-    private final static MethodHandle mh_fi = mh_i(float.class  );
-    private final static MethodHandle mh_di = mh_i(double.class );
+    private static final MethodHandle mh_zi = mh_i(boolean.class);
+    private static final MethodHandle mh_bi = mh_i(byte.class   );
+    private static final MethodHandle mh_ci = mh_i(char.class   );
+    private static final MethodHandle mh_si = mh_i(short.class  );
+    private static final MethodHandle mh_ii = mh_i(int.class    );
+    private static final MethodHandle mh_ji = mh_i(long.class   );
+    private static final MethodHandle mh_fi = mh_i(float.class  );
+    private static final MethodHandle mh_di = mh_i(double.class );
 
     private static void int2prim(int x) throws Throwable {
         assertEquals((int)     x, (int)     mh_ii.invokeExact(x));  // int -> int
@@ -345,14 +345,14 @@ public class Test6998541 {
 
     private static MethodHandle mh_j(Class ret) { return mh(ret, long.class); }
 
-    private final static MethodHandle mh_zj = mh_j(boolean.class);
-    private final static MethodHandle mh_bj = mh_j(byte.class   );
-    private final static MethodHandle mh_cj = mh_j(char.class   );
-    private final static MethodHandle mh_sj = mh_j(short.class  );
-    private final static MethodHandle mh_ij = mh_j(int.class    );
-    private final static MethodHandle mh_jj = mh_j(long.class   );
-    private final static MethodHandle mh_fj = mh_j(float.class  );
-    private final static MethodHandle mh_dj = mh_j(double.class );
+    private static final MethodHandle mh_zj = mh_j(boolean.class);
+    private static final MethodHandle mh_bj = mh_j(byte.class   );
+    private static final MethodHandle mh_cj = mh_j(char.class   );
+    private static final MethodHandle mh_sj = mh_j(short.class  );
+    private static final MethodHandle mh_ij = mh_j(int.class    );
+    private static final MethodHandle mh_jj = mh_j(long.class   );
+    private static final MethodHandle mh_fj = mh_j(float.class  );
+    private static final MethodHandle mh_dj = mh_j(double.class );
 
     private static void long2prim(long x) throws Throwable {
         assertEquals((long)   x, (long)    mh_jj.invokeExact(x));  // long -> long
@@ -377,14 +377,14 @@ public class Test6998541 {
 
     private static MethodHandle mh_f(Class ret) { return mh(ret, float.class); }
 
-    private final static MethodHandle mh_zf = mh_f(boolean.class);
-    private final static MethodHandle mh_bf = mh_f(byte.class   );
-    private final static MethodHandle mh_cf = mh_f(char.class   );
-    private final static MethodHandle mh_sf = mh_f(short.class  );
-    private final static MethodHandle mh_if = mh_f(int.class    );
-    private final static MethodHandle mh_jf = mh_f(long.class   );
-    private final static MethodHandle mh_ff = mh_f(float.class  );
-    private final static MethodHandle mh_df = mh_f(double.class );
+    private static final MethodHandle mh_zf = mh_f(boolean.class);
+    private static final MethodHandle mh_bf = mh_f(byte.class   );
+    private static final MethodHandle mh_cf = mh_f(char.class   );
+    private static final MethodHandle mh_sf = mh_f(short.class  );
+    private static final MethodHandle mh_if = mh_f(int.class    );
+    private static final MethodHandle mh_jf = mh_f(long.class   );
+    private static final MethodHandle mh_ff = mh_f(float.class  );
+    private static final MethodHandle mh_df = mh_f(double.class );
 
     private static void float2prim(float x) throws Throwable {
         assertEquals((float)   x, (float)   mh_ff.invokeExact(x));  // float -> float
@@ -410,14 +410,14 @@ public class Test6998541 {
 
     private static MethodHandle mh_d(Class ret) { return mh(ret, double.class); }
 
-    private final static MethodHandle mh_zd = mh_d(boolean.class);
-    private final static MethodHandle mh_bd = mh_d(byte.class   );
-    private final static MethodHandle mh_cd = mh_d(char.class   );
-    private final static MethodHandle mh_sd = mh_d(short.class  );
-    private final static MethodHandle mh_id = mh_d(int.class    );
-    private final static MethodHandle mh_jd = mh_d(long.class   );
-    private final static MethodHandle mh_fd = mh_d(float.class  );
-    private final static MethodHandle mh_dd = mh_d(double.class );
+    private static final MethodHandle mh_zd = mh_d(boolean.class);
+    private static final MethodHandle mh_bd = mh_d(byte.class   );
+    private static final MethodHandle mh_cd = mh_d(char.class   );
+    private static final MethodHandle mh_sd = mh_d(short.class  );
+    private static final MethodHandle mh_id = mh_d(int.class    );
+    private static final MethodHandle mh_jd = mh_d(long.class   );
+    private static final MethodHandle mh_fd = mh_d(float.class  );
+    private static final MethodHandle mh_dd = mh_d(double.class );
 
     private static void double2prim(double x) throws Throwable {
         assertEquals((double) x, (double)  mh_dd.invokeExact(x));  // double -> double
@@ -442,14 +442,14 @@ public class Test6998541 {
         try { float   y = (float)   mh_fd.invokeExact(x); fail(); } catch (ClassCastException expected) {}  // double -> float
     }
 
-    private final static MethodHandle mh_zv = mh(boolean.class);
-    private final static MethodHandle mh_bv = mh(byte.class   );
-    private final static MethodHandle mh_cv = mh(char.class   );
-    private final static MethodHandle mh_sv = mh(short.class  );
-    private final static MethodHandle mh_iv = mh(int.class    );
-    private final static MethodHandle mh_jv = mh(long.class   );
-    private final static MethodHandle mh_fv = mh(float.class  );
-    private final static MethodHandle mh_dv = mh(double.class );
+    private static final MethodHandle mh_zv = mh(boolean.class);
+    private static final MethodHandle mh_bv = mh(byte.class   );
+    private static final MethodHandle mh_cv = mh(char.class   );
+    private static final MethodHandle mh_sv = mh(short.class  );
+    private static final MethodHandle mh_iv = mh(int.class    );
+    private static final MethodHandle mh_jv = mh(long.class   );
+    private static final MethodHandle mh_fv = mh(float.class  );
+    private static final MethodHandle mh_dv = mh(double.class );
 
     private static void void2prim(int i) throws Throwable {
         assertEquals(        false, (boolean) mh_zv.invokeExact());  // void -> boolean
@@ -468,14 +468,14 @@ public class Test6998541 {
 
     private static MethodHandle mh_v(Class arg) { return mh(void.class, arg); }
 
-    private final static MethodHandle mh_vz = mh_v(boolean.class);
-    private final static MethodHandle mh_vb = mh_v(byte.class   );
-    private final static MethodHandle mh_vc = mh_v(char.class   );
-    private final static MethodHandle mh_vs = mh_v(short.class  );
-    private final static MethodHandle mh_vi = mh_v(int.class    );
-    private final static MethodHandle mh_vj = mh_v(long.class   );
-    private final static MethodHandle mh_vf = mh_v(float.class  );
-    private final static MethodHandle mh_vd = mh_v(double.class );
+    private static final MethodHandle mh_vz = mh_v(boolean.class);
+    private static final MethodHandle mh_vb = mh_v(byte.class   );
+    private static final MethodHandle mh_vc = mh_v(char.class   );
+    private static final MethodHandle mh_vs = mh_v(short.class  );
+    private static final MethodHandle mh_vi = mh_v(int.class    );
+    private static final MethodHandle mh_vj = mh_v(long.class   );
+    private static final MethodHandle mh_vf = mh_v(float.class  );
+    private static final MethodHandle mh_vd = mh_v(double.class );
 
     private static void prim2void(int x) throws Throwable {
         boolean z = ((x & 1) != 0);
diff --git a/jdk/test/java/lang/invoke/7157574/Test7157574.java b/jdk/test/java/lang/invoke/7157574/Test7157574.java
index f7f2a2482fe..acf9ef48a04 100644
--- a/jdk/test/java/lang/invoke/7157574/Test7157574.java
+++ b/jdk/test/java/lang/invoke/7157574/Test7157574.java
@@ -50,8 +50,8 @@ import static java.lang.invoke.MethodHandles.*;
 import static java.lang.invoke.MethodType.*;
 public class Test7157574 {
     interface Intf { void ig1(); void ig2(); void ig3(); void ig4(); void m1(); }
-    static abstract class Super implements Intf { public abstract void m2(); public int f2; }
-    static abstract class Sub extends Super { }
+    abstract static class Super implements Intf { public abstract void m2(); public int f2; }
+    abstract static class Sub extends Super { }
     public static void main(String... av) throws Throwable {
         MethodHandle m1 = lookup().findVirtual(Sub.class, "m1", methodType(void.class));
         System.out.println(m1);
diff --git a/jdk/test/java/lang/invoke/7196190/ClassForNameTest.java b/jdk/test/java/lang/invoke/7196190/ClassForNameTest.java
index 48ccb2a6463..4730efafb6c 100644
--- a/jdk/test/java/lang/invoke/7196190/ClassForNameTest.java
+++ b/jdk/test/java/lang/invoke/7196190/ClassForNameTest.java
@@ -35,7 +35,7 @@ import java.lang.reflect.Method;
 import java.util.Arrays;
 
 public class ClassForNameTest {
-    final static String NAME = ClassForNameTest.class.getName();
+    static final String NAME = ClassForNameTest.class.getName();
 
     public static void main(String[] args) throws Throwable {
         {
diff --git a/jdk/test/java/lang/invoke/7196190/GetUnsafeTest.java b/jdk/test/java/lang/invoke/7196190/GetUnsafeTest.java
index 0fd3cbd8d0f..24a9512ffaf 100644
--- a/jdk/test/java/lang/invoke/7196190/GetUnsafeTest.java
+++ b/jdk/test/java/lang/invoke/7196190/GetUnsafeTest.java
@@ -35,7 +35,7 @@ import java.lang.reflect.Method;
 import java.util.Arrays;
 
 public class GetUnsafeTest {
-    final static String NAME = "sun.misc.Unsafe";
+    static final String NAME = "sun.misc.Unsafe";
 
     private static boolean isTestFailed = false;
 
diff --git a/jdk/test/java/lang/invoke/AccessControlTest.java b/jdk/test/java/lang/invoke/AccessControlTest.java
index 891710fd814..e6c38804867 100644
--- a/jdk/test/java/lang/invoke/AccessControlTest.java
+++ b/jdk/test/java/lang/invoke/AccessControlTest.java
@@ -459,29 +459,29 @@ public class AccessControlTest {
     static Lookup lookup_in_self() {
         return MethodHandles.lookup();
     }
-    static public      void pub_in_self() { }
-    static protected   void pro_in_self() { }
+    public static      void pub_in_self() { }
+    protected static   void pro_in_self() { }
     static /*package*/ void pkg_in_self() { }
-    static private     void pri_in_self() { }
+    private static     void pri_in_self() { }
 
     static class Inner_nestmate {
         static Lookup lookup_in_nestmate() {
             return MethodHandles.lookup();
         }
-        static public      void pub_in_nestmate() { }
-        static protected   void pro_in_nestmate() { }
+        public static      void pub_in_nestmate() { }
+        protected static   void pro_in_nestmate() { }
         static /*package*/ void pkg_in_nestmate() { }
-        static private     void pri_in_nestmate() { }
+        private static     void pri_in_nestmate() { }
     }
 }
 class AccessControlTest_sibling {
     static Lookup lookup_in_sibling() {
         return MethodHandles.lookup();
     }
-    static public      void pub_in_sibling() { }
-    static protected   void pro_in_sibling() { }
+    public static      void pub_in_sibling() { }
+    protected static   void pro_in_sibling() { }
     static /*package*/ void pkg_in_sibling() { }
-    static private     void pri_in_sibling() { }
+    private static     void pri_in_sibling() { }
 }
 
 // This guy tests access from outside the package:
diff --git a/jdk/test/java/lang/invoke/AccessControlTest_subpkg/Acquaintance_remote.java b/jdk/test/java/lang/invoke/AccessControlTest_subpkg/Acquaintance_remote.java
index 5bbfcb50c0d..e86bb3421ef 100644
--- a/jdk/test/java/lang/invoke/AccessControlTest_subpkg/Acquaintance_remote.java
+++ b/jdk/test/java/lang/invoke/AccessControlTest_subpkg/Acquaintance_remote.java
@@ -16,27 +16,27 @@ public class Acquaintance_remote {
     public static Lookup lookup_in_remote() {
         return MethodHandles.lookup();
     }
-    static public      void pub_in_remote() { }
-    static protected   void pro_in_remote() { }
+    public static      void pub_in_remote() { }
+    protected static   void pro_in_remote() { }
     static /*package*/ void pkg_in_remote() { }
-    static private     void pri_in_remote() { }
+    private static     void pri_in_remote() { }
 
-    static public class Remote_subclass extends AccessControlTest {
+    public static class Remote_subclass extends AccessControlTest {
         static Lookup lookup_in_subclass() {
             return MethodHandles.lookup();
         }
-        static public      void pub_in_subclass() { }
-        static protected   void pro_in_subclass() { }
+        public static      void pub_in_subclass() { }
+        protected static   void pro_in_subclass() { }
         static /*package*/ void pkg_in_subclass() { }
-        static private     void pri_in_subclass() { }
+        private static     void pri_in_subclass() { }
     }
     static /*package*/ class Remote_hidden {
         static Lookup lookup_in_hidden() {
             return MethodHandles.lookup();
         }
-        static public      void pub_in_hidden() { }
-        static protected   void pro_in_hidden() { }
+        public static      void pub_in_hidden() { }
+        protected static   void pro_in_hidden() { }
         static /*package*/ void pkg_in_hidden() { }
-        static private     void pri_in_hidden() { }
+        private static     void pri_in_hidden() { }
     }
 }
diff --git a/jdk/test/java/lang/invoke/CallSiteTest.java b/jdk/test/java/lang/invoke/CallSiteTest.java
index fe2702c8219..48b0d7b6d9a 100644
--- a/jdk/test/java/lang/invoke/CallSiteTest.java
+++ b/jdk/test/java/lang/invoke/CallSiteTest.java
@@ -43,7 +43,7 @@ import static java.lang.invoke.MethodHandles.*;
 import static java.lang.invoke.MethodType.*;
 
 public class CallSiteTest {
-    private final static Class CLASS = CallSiteTest.class;
+    private static final Class CLASS = CallSiteTest.class;
 
     private static CallSite mcs;
     private static CallSite vcs;
@@ -66,9 +66,9 @@ public class CallSiteTest {
         testVolatileCallSite();
     }
 
-    private final static int N = Integer.MAX_VALUE / 100;
-    private final static int RESULT1 = 762786192;
-    private final static int RESULT2 = -21474836;
+    private static final int N = Integer.MAX_VALUE / 100;
+    private static final int RESULT1 = 762786192;
+    private static final int RESULT2 = -21474836;
 
     private static void assertEquals(int expected, int actual) {
         if (expected != actual)
diff --git a/jdk/test/java/lang/invoke/JavaDocExamplesTest.java b/jdk/test/java/lang/invoke/JavaDocExamplesTest.java
index 594e4ece5e1..b94f2f04ea8 100644
--- a/jdk/test/java/lang/invoke/JavaDocExamplesTest.java
+++ b/jdk/test/java/lang/invoke/JavaDocExamplesTest.java
@@ -75,14 +75,14 @@ public class JavaDocExamplesTest {
 
 
 {}
-static final private Lookup LOOKUP = lookup();
+private static final Lookup LOOKUP = lookup();
 // static final private MethodHandle CONCAT_1 = LOOKUP.findVirtual(String.class,
 //     "concat", methodType(String.class, String.class));
 // static final private MethodHandle HASHCODE_1 = LOOKUP.findVirtual(Object.class,
 //     "hashCode", methodType(int.class));
 
 // form required if ReflectiveOperationException is intercepted:
-    static final private MethodHandle CONCAT_2, HASHCODE_2, ADD_2, SUB_2;
+    private static final MethodHandle CONCAT_2, HASHCODE_2, ADD_2, SUB_2;
 static {
   try {
     Class THIS_CLASS = LOOKUP.lookupClass();
diff --git a/jdk/test/java/lang/invoke/LFCaching/LambdaFormTestCase.java b/jdk/test/java/lang/invoke/LFCaching/LambdaFormTestCase.java
index f945883807a..34fe4b1a7bb 100644
--- a/jdk/test/java/lang/invoke/LFCaching/LambdaFormTestCase.java
+++ b/jdk/test/java/lang/invoke/LFCaching/LambdaFormTestCase.java
@@ -50,9 +50,9 @@ public abstract class LambdaFormTestCase {
      * Reflection link to {@code j.l.i.MethodHandle.internalForm} method. It is
      * used to get a lambda form from a method handle.
      */
-    protected final static Method INTERNAL_FORM;
-    protected final static Field DEBUG_NAME;
-    protected final static Field REF_FIELD;
+    protected static final Method INTERNAL_FORM;
+    protected static final Field DEBUG_NAME;
+    protected static final Field REF_FIELD;
     private static final List gcInfo;
 
     private static long gcCount() {
diff --git a/jdk/test/java/lang/invoke/MethodHandles/TestCatchException.java b/jdk/test/java/lang/invoke/MethodHandles/TestCatchException.java
index 8197129b870..442241cb507 100644
--- a/jdk/test/java/lang/invoke/MethodHandles/TestCatchException.java
+++ b/jdk/test/java/lang/invoke/MethodHandles/TestCatchException.java
@@ -35,8 +35,8 @@ import org.junit.*;
 import static org.junit.Assert.*;
 
 public class TestCatchException {
-    final static MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
-    final static MethodType M_TYPE = MethodType.methodType(int.class, Object.class, Object.class, int.class, int.class, int.class, int.class, int.class, int.class, int.class);
+    static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
+    static final MethodType M_TYPE = MethodType.methodType(int.class, Object.class, Object.class, int.class, int.class, int.class, int.class, int.class, int.class, int.class);
 
     private static int noThrow(Object o1, Object o2, int i1, int i2, int i3, int i4, int i5, int i6, int i7) {
         return 42;
@@ -72,8 +72,8 @@ public class TestCatchException {
         assertEquals(x, 17);
     }
 
-    final static Object masterParam = new Object();
-    final static Object[] masterTail = new Object[] { "str" };
+    static final Object masterParam = new Object();
+    static final Object[] masterTail = new Object[] { "str" };
     static Exception masterEx = new Exception();
 
     public static Object m1(Object o1, Object o2, Object o3, Object o4, Object o5,
diff --git a/jdk/test/java/lang/invoke/MethodHandlesTest.java b/jdk/test/java/lang/invoke/MethodHandlesTest.java
index 48aad9112eb..90137024be4 100644
--- a/jdk/test/java/lang/invoke/MethodHandlesTest.java
+++ b/jdk/test/java/lang/invoke/MethodHandlesTest.java
@@ -497,7 +497,7 @@ public class MethodHandlesTest {
     }
 
     /** Is findVirtual (etc.) of "<init<" supposed to elicit a NoSuchMethodException? */
-    final static boolean INIT_REF_CAUSES_NSME = true;
+    static final boolean INIT_REF_CAUSES_NSME = true;
 
     @Test
     public void testFindStatic() throws Throwable {
diff --git a/jdk/test/java/lang/invoke/indify/Indify.java b/jdk/test/java/lang/invoke/indify/Indify.java
index caa082037fd..f0bf58cb4a0 100644
--- a/jdk/test/java/lang/invoke/indify/Indify.java
+++ b/jdk/test/java/lang/invoke/indify/Indify.java
@@ -1220,7 +1220,7 @@ public class Indify {
         for (Object x : data)  writeOutput(out, x);
     }
 
-    public static abstract class Outer {
+    public abstract static class Outer {
         public abstract List inners();
         protected void linkInners() {
             for (Inner i : inners()) {
@@ -1250,7 +1250,7 @@ public class Indify {
         }
     }
     public interface Inner { Outer outer(); void linkOuter(Outer o); }
-    public static abstract class InnerOuter extends Outer implements Inner {
+    public abstract static class InnerOuter extends Outer implements Inner {
         public Outer outer;
         public Outer outer() { return outer; }
         public void linkOuter(Outer o) { assert(outer == null); outer = o; }
diff --git a/jdk/test/java/lang/management/MemoryMXBean/GetMBeanInfo.java b/jdk/test/java/lang/management/MemoryMXBean/GetMBeanInfo.java
index 288c10d0ef0..a1ae359410c 100644
--- a/jdk/test/java/lang/management/MemoryMXBean/GetMBeanInfo.java
+++ b/jdk/test/java/lang/management/MemoryMXBean/GetMBeanInfo.java
@@ -35,7 +35,7 @@ import java.lang.management.*;
 import javax.management.*;
 
 public class GetMBeanInfo {
-    private final static int EXPECTED_NOTIF_TYPES = 2;
+    private static final int EXPECTED_NOTIF_TYPES = 2;
     private static int count = 0;
 
     public static void main(String argv[]) throws Exception {
diff --git a/jdk/test/java/lang/management/MemoryMXBean/Pending.java b/jdk/test/java/lang/management/MemoryMXBean/Pending.java
index 31b8f634011..728ff15a5b9 100644
--- a/jdk/test/java/lang/management/MemoryMXBean/Pending.java
+++ b/jdk/test/java/lang/management/MemoryMXBean/Pending.java
@@ -39,9 +39,9 @@
 import java.lang.management.*;
 
 public class Pending {
-    final static int NO_REF_COUNT = 600;
-    final static int REF_COUNT = 500;
-    final static int TOTAL_FINALIZABLE = (NO_REF_COUNT + REF_COUNT);
+    static final int NO_REF_COUNT = 600;
+    static final int REF_COUNT = 500;
+    static final int TOTAL_FINALIZABLE = (NO_REF_COUNT + REF_COUNT);
     private static int finalized = 0;
     private static MemoryMXBean mbean
         = ManagementFactory.getMemoryMXBean();
diff --git a/jdk/test/java/lang/management/RuntimeMXBean/UpTime.java b/jdk/test/java/lang/management/RuntimeMXBean/UpTime.java
index e068ad17413..aa529c98976 100644
--- a/jdk/test/java/lang/management/RuntimeMXBean/UpTime.java
+++ b/jdk/test/java/lang/management/RuntimeMXBean/UpTime.java
@@ -32,9 +32,9 @@
 import java.lang.management.*;
 
 public class UpTime {
-    final static long DELAY = 5; // Seconds
-    final static long TIMEOUT = 30; // Minutes
-    final static long MULTIPLIER = 1000; // millisecond ticks
+    static final long DELAY = 5; // Seconds
+    static final long TIMEOUT = 30; // Minutes
+    static final long MULTIPLIER = 1000; // millisecond ticks
 
     private static final RuntimeMXBean metrics
         = ManagementFactory.getRuntimeMXBean();
diff --git a/jdk/test/java/lang/management/ThreadMXBean/AllThreadIds.java b/jdk/test/java/lang/management/ThreadMXBean/AllThreadIds.java
index 8bb229e50d1..167469b1412 100644
--- a/jdk/test/java/lang/management/ThreadMXBean/AllThreadIds.java
+++ b/jdk/test/java/lang/management/ThreadMXBean/AllThreadIds.java
@@ -57,9 +57,9 @@ public class AllThreadIds {
         }
     }
 
-    final static int DAEMON_THREADS = 20;
-    final static int USER_THREADS = 5;
-    final static int ALL_THREADS = DAEMON_THREADS + USER_THREADS;
+    static final int DAEMON_THREADS = 20;
+    static final int USER_THREADS = 5;
+    static final int ALL_THREADS = DAEMON_THREADS + USER_THREADS;
     private static final boolean live[] = new boolean[ALL_THREADS];
     private static final Thread allThreads[] = new Thread[ALL_THREADS];
     private static final ThreadMXBean mbean = ManagementFactory.getThreadMXBean();
diff --git a/jdk/test/java/lang/management/ThreadMXBean/ThreadBlockedCount.java b/jdk/test/java/lang/management/ThreadMXBean/ThreadBlockedCount.java
index 7777d5d5227..55c171cea74 100644
--- a/jdk/test/java/lang/management/ThreadMXBean/ThreadBlockedCount.java
+++ b/jdk/test/java/lang/management/ThreadMXBean/ThreadBlockedCount.java
@@ -35,8 +35,8 @@ import java.lang.management.*;
 import java.util.concurrent.Phaser;
 
 public class ThreadBlockedCount {
-        final static long EXPECTED_BLOCKED_COUNT = 3;
-    final static int  DEPTH = 10;
+        static final long EXPECTED_BLOCKED_COUNT = 3;
+    static final int  DEPTH = 10;
     private static final ThreadMXBean mbean
         = ManagementFactory.getThreadMXBean();
 
diff --git a/jdk/test/java/lang/management/ThreadMXBean/ThreadCounts.java b/jdk/test/java/lang/management/ThreadMXBean/ThreadCounts.java
index c905a889d0d..094144a86d7 100644
--- a/jdk/test/java/lang/management/ThreadMXBean/ThreadCounts.java
+++ b/jdk/test/java/lang/management/ThreadMXBean/ThreadCounts.java
@@ -37,11 +37,11 @@
 import java.lang.management.*;
 
 public class ThreadCounts {
-    final static int DAEMON_THREADS = 21;
-    final static int USER_THREADS_1 = 11;
-    final static int USER_THREADS_2 = 9;
-    final static int USER_THREADS = USER_THREADS_1 + USER_THREADS_2;
-    final static int ALL_THREADS = DAEMON_THREADS + USER_THREADS;
+    static final int DAEMON_THREADS = 21;
+    static final int USER_THREADS_1 = 11;
+    static final int USER_THREADS_2 = 9;
+    static final int USER_THREADS = USER_THREADS_1 + USER_THREADS_2;
+    static final int ALL_THREADS = DAEMON_THREADS + USER_THREADS;
     private static volatile boolean live[] = new boolean[ALL_THREADS];
     private ThreadMXBean mbean = ManagementFactory.getThreadMXBean();
     private static boolean testFailed = false;
diff --git a/jdk/test/java/lang/ref/ReferenceEnqueuePending.java b/jdk/test/java/lang/ref/ReferenceEnqueuePending.java
index 1007e84c01e..19e960edac0 100644
--- a/jdk/test/java/lang/ref/ReferenceEnqueuePending.java
+++ b/jdk/test/java/lang/ref/ReferenceEnqueuePending.java
@@ -38,9 +38,9 @@ public class ReferenceEnqueuePending {
         }
     }
 
-    final static boolean debug = System.getProperty("test.debug") != null;
-    final static int iterations = 1000;
-    final static int gc_trigger = 99;
+    static final boolean debug = System.getProperty("test.debug") != null;
+    static final int iterations = 1000;
+    static final int gc_trigger = 99;
     static int[] a = new int[2 * iterations];
     // Keep all weak references alive with the following array.
     static NumberedWeakReference[] b = new NumberedWeakReference[iterations];
diff --git a/jdk/test/java/lang/ref/SoftReference/Bash.java b/jdk/test/java/lang/ref/SoftReference/Bash.java
index cd80a24acc3..e48266c00af 100644
--- a/jdk/test/java/lang/ref/SoftReference/Bash.java
+++ b/jdk/test/java/lang/ref/SoftReference/Bash.java
@@ -49,8 +49,8 @@ public class Bash {
     }
 
 
-    final static int NUM_BLOCKS = 2048;
-    final static int BLOCK_SIZE = 32768;
+    static final int NUM_BLOCKS = 2048;
+    static final int BLOCK_SIZE = 32768;
 
 
     public static void main(String[] args) throws Exception {
diff --git a/jdk/test/java/lang/ref/SoftReference/Pin.java b/jdk/test/java/lang/ref/SoftReference/Pin.java
index 38cd56da242..5416b0f575a 100644
--- a/jdk/test/java/lang/ref/SoftReference/Pin.java
+++ b/jdk/test/java/lang/ref/SoftReference/Pin.java
@@ -34,8 +34,8 @@ import java.lang.ref.SoftReference;
 
 public class Pin {
 
-    final static int NUM_BLOCKS = 128;
-    final static int BLOCK_SIZE = 32768;
+    static final int NUM_BLOCKS = 128;
+    static final int BLOCK_SIZE = 32768;
 
     public static void main(String[] args) throws Exception {
 
diff --git a/jdk/test/java/lang/reflect/Field/GenericStringTest.java b/jdk/test/java/lang/reflect/Field/GenericStringTest.java
index 1679558f923..3c93472e1d4 100644
--- a/jdk/test/java/lang/reflect/Field/GenericStringTest.java
+++ b/jdk/test/java/lang/reflect/Field/GenericStringTest.java
@@ -64,7 +64,7 @@ class TestClass1 {
         int field1;
 
     @ExpectedString("private static java.lang.String TestClass1.field2")
-        static private String field2;
+        private static String field2;
 }
 
 class TestClass2 {
diff --git a/jdk/test/java/lang/reflect/Method/defaultMethodModeling/DefaultMethodModeling.java b/jdk/test/java/lang/reflect/Method/defaultMethodModeling/DefaultMethodModeling.java
index 83a3d0bd546..30eca409cea 100644
--- a/jdk/test/java/lang/reflect/Method/defaultMethodModeling/DefaultMethodModeling.java
+++ b/jdk/test/java/lang/reflect/Method/defaultMethodModeling/DefaultMethodModeling.java
@@ -145,7 +145,7 @@ class SuperIwithDefaultChild implements SuperIwithDefault {
 
 abstract class Base {
     @ExpectedModel(modifiers=PUBLIC|ABSTRACT, declaringClass=Base.class)
-    abstract public void baz();
+    public abstract void baz();
 
     @ExpectedModel(declaringClass=Base.class)
     public void quux() {;}
diff --git a/jdk/test/java/lang/reflect/Proxy/nonPublicProxy/NonPublicProxyClass.java b/jdk/test/java/lang/reflect/Proxy/nonPublicProxy/NonPublicProxyClass.java
index 62d1fde39f0..71ea1872401 100644
--- a/jdk/test/java/lang/reflect/Proxy/nonPublicProxy/NonPublicProxyClass.java
+++ b/jdk/test/java/lang/reflect/Proxy/nonPublicProxy/NonPublicProxyClass.java
@@ -127,7 +127,7 @@ public class NonPublicProxyClass {
         return policy.grant;
     }
 
-    private final static String NEW_PROXY_IN_PKG = "newProxyInPackage.";
+    private static final String NEW_PROXY_IN_PKG = "newProxyInPackage.";
     private void newProxyInstance() {
         // expect newProxyInstance to succeed if it's in the same runtime package
         int i = proxyClass.getName().lastIndexOf('.');
diff --git a/jdk/test/java/util/Arrays/ParallelPrefix.java b/jdk/test/java/util/Arrays/ParallelPrefix.java
index f69d71a0293..1a68329b245 100644
--- a/jdk/test/java/util/Arrays/ParallelPrefix.java
+++ b/jdk/test/java/util/Arrays/ParallelPrefix.java
@@ -43,18 +43,18 @@ import org.testng.annotations.Test;
 
 public class ParallelPrefix {
     //Array size less than MIN_PARTITION
-    private final static int SMALL_ARRAY_SIZE = 1 << 3;
+    private static final int SMALL_ARRAY_SIZE = 1 << 3;
 
     //Array size equals MIN_PARTITION
-    private final static int THRESHOLD_ARRAY_SIZE = 1 << 4;
+    private static final int THRESHOLD_ARRAY_SIZE = 1 << 4;
 
     //Array size greater than MIN_PARTITION
-    private final static int MEDIUM_ARRAY_SIZE = 1 << 8;
+    private static final int MEDIUM_ARRAY_SIZE = 1 << 8;
 
     //Array size much greater than MIN_PARTITION
-    private final static int LARGE_ARRAY_SIZE = 1 << 14;
+    private static final int LARGE_ARRAY_SIZE = 1 << 14;
 
-    private final static int[] ARRAY_SIZE_COLLECTION  = new int[]{
+    private static final int[] ARRAY_SIZE_COLLECTION  = new int[]{
         SMALL_ARRAY_SIZE,
         THRESHOLD_ARRAY_SIZE,
         MEDIUM_ARRAY_SIZE,
diff --git a/jdk/test/java/util/Calendar/Bug8007038.java b/jdk/test/java/util/Calendar/Bug8007038.java
index b8ef498d904..80313e53f8b 100644
--- a/jdk/test/java/util/Calendar/Bug8007038.java
+++ b/jdk/test/java/util/Calendar/Bug8007038.java
@@ -36,14 +36,14 @@ import static java.util.Calendar.*;
 import sun.util.locale.provider.CalendarDataUtility;
 
 public class Bug8007038 {
-    private final static String[] calTypes = {
+    private static final String[] calTypes = {
         "gregory",
         "buddhist",
         "japanese",
         "roc",
         "islamic",
     };
-    private final static int[][] eraMinMax = {
+    private static final int[][] eraMinMax = {
         {GregorianCalendar.BC, GregorianCalendar.AD},
         {0, 1},
         {0, 4},
@@ -51,7 +51,7 @@ public class Bug8007038 {
         {0, 1},
         {0, 1},
     };
-    private final static Locale[] testLocs = {
+    private static final Locale[] testLocs = {
         Locale.ROOT,
         Locale.forLanguageTag("ja-JP-u-ca-japanese"),
         Locale.forLanguageTag("th-TH"),
diff --git a/jdk/test/java/util/Collection/BiggernYours.java b/jdk/test/java/util/Collection/BiggernYours.java
index 37bbe072c7a..fec530cc1f8 100644
--- a/jdk/test/java/util/Collection/BiggernYours.java
+++ b/jdk/test/java/util/Collection/BiggernYours.java
@@ -82,9 +82,9 @@ public class BiggernYours {
                            s2.tailSet(Integer.MIN_VALUE));
     }
 
-    static abstract class MapFrobber { abstract void frob(Map m); }
-    static abstract class SetFrobber { abstract void frob(Set s); }
-    static abstract class ColFrobber { abstract void frob(Collection c); }
+    abstract static class MapFrobber { abstract void frob(Map m); }
+    abstract static class SetFrobber { abstract void frob(Set s); }
+    abstract static class ColFrobber { abstract void frob(Collection c); }
 
     static ColFrobber adder(final int i) {
         return new ColFrobber() {void frob(Collection c) { c.add(i); }};
@@ -236,7 +236,7 @@ public class BiggernYours {
         try {realMain(args);} catch (Throwable t) {unexpected(t);}
         System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed);
         if (failed > 0) throw new AssertionError("Some tests failed");}
-    private static abstract class CheckedThread extends Thread {
+    private abstract static class CheckedThread extends Thread {
         abstract void realRun() throws Throwable;
         public void run() {
             try {realRun();} catch (Throwable t) {unexpected(t);}}}
diff --git a/jdk/test/java/util/Collection/HotPotatoes.java b/jdk/test/java/util/Collection/HotPotatoes.java
index bb7d2bb6b0d..8dcbe3494e3 100644
--- a/jdk/test/java/util/Collection/HotPotatoes.java
+++ b/jdk/test/java/util/Collection/HotPotatoes.java
@@ -99,7 +99,7 @@ public class HotPotatoes {
         try {realMain(args);} catch (Throwable t) {unexpected(t);}
         System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed);
         if (failed > 0) throw new AssertionError("Some tests failed");}
-    private static abstract class CheckedThread extends Thread {
+    private abstract static class CheckedThread extends Thread {
         public abstract void realRun() throws Throwable;
         public void run() {
             try { realRun(); } catch (Throwable t) { unexpected(t); }}}
diff --git a/jdk/test/java/util/Collections/AddAll.java b/jdk/test/java/util/Collections/AddAll.java
index 0f8e6d9d527..254e3d16b51 100644
--- a/jdk/test/java/util/Collections/AddAll.java
+++ b/jdk/test/java/util/Collections/AddAll.java
@@ -32,7 +32,7 @@
 import java.util.*;
 
 public class AddAll {
-    final static int N = 100;
+    static final int N = 100;
     public static void main(String args[]) {
         test(new ArrayList());
         test(new LinkedList());
diff --git a/jdk/test/java/util/Collections/Disjoint.java b/jdk/test/java/util/Collections/Disjoint.java
index e13241efbb7..fcf93b2c203 100644
--- a/jdk/test/java/util/Collections/Disjoint.java
+++ b/jdk/test/java/util/Collections/Disjoint.java
@@ -32,7 +32,7 @@
 import java.util.*;
 
 public class Disjoint {
-    final static int N = 20;
+    static final int N = 20;
 
     public static void main(String args[]) {
         // Make an array of lists each of which shares a single element
diff --git a/jdk/test/java/util/Collections/Frequency.java b/jdk/test/java/util/Collections/Frequency.java
index 06e989234c8..715bfdfff88 100644
--- a/jdk/test/java/util/Collections/Frequency.java
+++ b/jdk/test/java/util/Collections/Frequency.java
@@ -31,7 +31,7 @@
 import java.util.*;
 
 public class Frequency {
-    final static int N = 100;
+    static final int N = 100;
     public static void main(String args[]) {
         test(new ArrayList());
         test(new LinkedList());
diff --git a/jdk/test/java/util/Collections/RacingCollections.java b/jdk/test/java/util/Collections/RacingCollections.java
index 5cff67fd66a..b1fbfa47bfc 100644
--- a/jdk/test/java/util/Collections/RacingCollections.java
+++ b/jdk/test/java/util/Collections/RacingCollections.java
@@ -38,15 +38,15 @@ public class RacingCollections {
      * Turn this up to some higher value like 1000 for stress testing:
      * java -Dmillis=1000 RacingCollections
      */
-    final static long defaultWorkTimeMillis = Long.getLong("millis", 10L);
+    static final long defaultWorkTimeMillis = Long.getLong("millis", 10L);
 
     /**
      * Whether to print debug information.
      */
-    final static boolean debug = Boolean.getBoolean("debug");
+    static final boolean debug = Boolean.getBoolean("debug");
 
-    final static Integer one = 1;
-    final static Integer two = 2;
+    static final Integer one = 1;
+    static final Integer two = 2;
 
     /**
      * A thread that mutates an object forever, alternating between
@@ -340,7 +340,7 @@ public class RacingCollections {
         try {realMain(args);} catch (Throwable t) {unexpected(t);}
         System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed);
         if (failed > 0) throw new AssertionError("Some tests failed");}
-    private static abstract class CheckedThread extends Thread {
+    private abstract static class CheckedThread extends Thread {
         abstract void realRun() throws Throwable;
         public void run() {
             try { realRun(); } catch (Throwable t) { unexpected(t); }}}
diff --git a/jdk/test/java/util/Collections/ReverseOrder2.java b/jdk/test/java/util/Collections/ReverseOrder2.java
index 9ad2d5c5d78..8dde0027531 100644
--- a/jdk/test/java/util/Collections/ReverseOrder2.java
+++ b/jdk/test/java/util/Collections/ReverseOrder2.java
@@ -32,7 +32,7 @@ import java.util.*;
 import java.io.*;
 
 public class ReverseOrder2 {
-    final static int N = 100;
+    static final int N = 100;
 
     static void realMain(String[] args) throws Throwable {
         check(Collections.reverseOrder()
@@ -75,7 +75,7 @@ public class ReverseOrder2 {
         }
     };
 
-    private final static List golden = new ArrayList(N);
+    private static final List golden = new ArrayList(N);
     static {
         for (int i = N-1; i >= 0; i--)
             golden.add(String.valueOf(i));
@@ -89,7 +89,7 @@ public class ReverseOrder2 {
         equal(list, golden2);
     }
 
-    private final static List golden2 = new ArrayList(N);
+    private static final List golden2 = new ArrayList(N);
     static {
         for (int i = N-1; i >= 0; i--)
             golden2.add(i);
diff --git a/jdk/test/java/util/Deque/ChorusLine.java b/jdk/test/java/util/Deque/ChorusLine.java
index 4cce6bd98c6..2a09c65ef50 100644
--- a/jdk/test/java/util/Deque/ChorusLine.java
+++ b/jdk/test/java/util/Deque/ChorusLine.java
@@ -36,7 +36,7 @@ public class ChorusLine {
         void run(Deque deq);
     }
 
-    private final static Tweaker[] tweakers = {
+    private static final Tweaker[] tweakers = {
         new Tweaker() { public void run(Deque deq) {
             for (int i = 0; i < 7; i++)
                 deq.addLast(i);
diff --git a/jdk/test/java/util/LinkedHashMap/Basic.java b/jdk/test/java/util/LinkedHashMap/Basic.java
index 7234d6c3984..574c5ed4d8a 100644
--- a/jdk/test/java/util/LinkedHashMap/Basic.java
+++ b/jdk/test/java/util/LinkedHashMap/Basic.java
@@ -32,8 +32,8 @@ import java.util.function.*;
 import java.io.*;
 
 public class Basic {
-    final static Random rnd = new Random(666);
-    final static Integer nil = new Integer(0);
+    static final Random rnd = new Random(666);
+    static final Integer nil = new Integer(0);
 
     public static void main(String[] args)  throws Exception {
         int numItr =  500;
diff --git a/jdk/test/java/util/Locale/tools/EquivMapsGenerator.java b/jdk/test/java/util/Locale/tools/EquivMapsGenerator.java
index 15e5fa92483..85463b26c58 100644
--- a/jdk/test/java/util/Locale/tools/EquivMapsGenerator.java
+++ b/jdk/test/java/util/Locale/tools/EquivMapsGenerator.java
@@ -205,7 +205,7 @@ public class EquivMapsGenerator {
         System.out.println();
     }
 
-    private final static String headerText =
+    private static final String headerText =
         "final class LocaleEquivalentMaps {\n\n"
         + "    static final Map singleEquivMap;\n"
         + "    static final Map multiEquivsMap;\n"
@@ -216,7 +216,7 @@ public class EquivMapsGenerator {
         + "        regionVariantEquivMap = new HashMap<>();\n\n"
         + "        // This is an auto-generated file and should not be manually edited.\n";
 
-    private final static String footerText =
+    private static final String footerText =
         "    }\n\n"
         + "}";
 
diff --git a/jdk/test/java/util/Map/Collisions.java b/jdk/test/java/util/Map/Collisions.java
index 43ae17cd6a1..7b825fc9537 100644
--- a/jdk/test/java/util/Map/Collisions.java
+++ b/jdk/test/java/util/Map/Collisions.java
@@ -39,7 +39,7 @@ public class Collisions {
      */
     private static final int TEST_SIZE = 5000;
 
-    final static class HashableInteger implements Comparable {
+    static final class HashableInteger implements Comparable {
 
         final int value;
         final int hashmask; //yes duplication
diff --git a/jdk/test/java/util/Map/FunctionalCMEs.java b/jdk/test/java/util/Map/FunctionalCMEs.java
index 499261bbf08..6f92b018185 100644
--- a/jdk/test/java/util/Map/FunctionalCMEs.java
+++ b/jdk/test/java/util/Map/FunctionalCMEs.java
@@ -43,7 +43,7 @@ import org.testng.annotations.DataProvider;
  * @run testng FunctionalCMEs
  */
 public class FunctionalCMEs {
-    final static String KEY = "key";
+    static final String KEY = "key";
 
     @DataProvider(name = "Maps", parallel = true)
     private static Iterator makeMaps() {
diff --git a/jdk/test/java/util/Map/InPlaceOpsCollisions.java b/jdk/test/java/util/Map/InPlaceOpsCollisions.java
index e24ba6ac508..c368d83af13 100644
--- a/jdk/test/java/util/Map/InPlaceOpsCollisions.java
+++ b/jdk/test/java/util/Map/InPlaceOpsCollisions.java
@@ -38,7 +38,7 @@ public class InPlaceOpsCollisions {
      */
     private static final int TEST_SIZE = 5000;
 
-    final static class HashableInteger implements Comparable {
+    static final class HashableInteger implements Comparable {
 
         final int value;
         final int hashmask; //yes duplication
diff --git a/jdk/test/java/util/Map/MapBinToFromTreeTest.java b/jdk/test/java/util/Map/MapBinToFromTreeTest.java
index 0b40a4ef16e..e7991cc4ee1 100644
--- a/jdk/test/java/util/Map/MapBinToFromTreeTest.java
+++ b/jdk/test/java/util/Map/MapBinToFromTreeTest.java
@@ -186,7 +186,7 @@ public class MapBinToFromTreeTest {
         }
     }
 
-    final static class HashCodeInteger implements Comparable {
+    static final class HashCodeInteger implements Comparable {
         final int value;
 
         final int hashcode;
diff --git a/jdk/test/java/util/NavigableMap/LockStep.java b/jdk/test/java/util/NavigableMap/LockStep.java
index 94f2cb1c93e..bdec994d08c 100644
--- a/jdk/test/java/util/NavigableMap/LockStep.java
+++ b/jdk/test/java/util/NavigableMap/LockStep.java
@@ -534,8 +534,8 @@ public class LockStep {
         }
     }
 
-    static abstract class MapFrobber { abstract void frob(NavigableMap m); }
-    static abstract class SetFrobber { abstract void frob(NavigableSet m); }
+    abstract static class MapFrobber { abstract void frob(NavigableMap m); }
+    abstract static class SetFrobber { abstract void frob(NavigableSet m); }
 
     static MapFrobber randomAdder(NavigableMap m) {
         final Integer k = unusedKey(m);
diff --git a/jdk/test/java/util/ResourceBundle/Bug6190861.java b/jdk/test/java/util/ResourceBundle/Bug6190861.java
index 48dd9209922..d756c2089a7 100644
--- a/jdk/test/java/util/ResourceBundle/Bug6190861.java
+++ b/jdk/test/java/util/ResourceBundle/Bug6190861.java
@@ -31,7 +31,7 @@ import java.util.*;
 
 public class Bug6190861 {
 
-    static public void main(String[] args) {
+    public static void main(String[] args) {
         Locale reservedLocale = Locale.getDefault();
         try {
             Locale.setDefault(new Locale("en", "US"));
diff --git a/jdk/test/java/util/ResourceBundle/Bug6204853.java b/jdk/test/java/util/ResourceBundle/Bug6204853.java
index 2bd0ce8575d..710162cf02b 100644
--- a/jdk/test/java/util/ResourceBundle/Bug6204853.java
+++ b/jdk/test/java/util/ResourceBundle/Bug6204853.java
@@ -79,7 +79,7 @@ public final class Bug6204853 {
         return keyValueArray;
     }
 
-    public final static void main(String[] args) {
+    public static final void main(String[] args) {
         new Bug6204853();
     }
 }
diff --git a/jdk/test/java/util/ResourceBundle/Bug6355009.java b/jdk/test/java/util/ResourceBundle/Bug6355009.java
index 03d36d98c2c..10723bb247c 100644
--- a/jdk/test/java/util/ResourceBundle/Bug6355009.java
+++ b/jdk/test/java/util/ResourceBundle/Bug6355009.java
@@ -32,7 +32,7 @@ import java.util.MissingResourceException;
 public final strictfp class Bug6355009 {
     private final ResourceBundle bundle = ResourceBundle.getBundle(Bug6355009.class.getName());
 
-    public final static void main(String[] args) {
+    public static final void main(String[] args) {
         try {
             new Bug6355009();
         } catch (MissingResourceException e) {
diff --git a/jdk/test/java/util/ResourceBundle/Bug6356571.java b/jdk/test/java/util/ResourceBundle/Bug6356571.java
index b3462aca1e5..57453088300 100644
--- a/jdk/test/java/util/ResourceBundle/Bug6356571.java
+++ b/jdk/test/java/util/ResourceBundle/Bug6356571.java
@@ -41,7 +41,7 @@ public class Bug6356571 {
         }
     }
 
-    public final static void main(String[] args) {
+    public static final void main(String[] args) {
         new Bug6356571().check();
     }
 }
diff --git a/jdk/test/java/util/ResourceBundle/Control/StressTest.java b/jdk/test/java/util/ResourceBundle/Control/StressTest.java
index 9766606fba9..0a41146148d 100644
--- a/jdk/test/java/util/ResourceBundle/Control/StressTest.java
+++ b/jdk/test/java/util/ResourceBundle/Control/StressTest.java
@@ -51,7 +51,7 @@ public class StressTest {
         "U.S.A.", // StressOut_en_CA.properties is empty.
         "Korea"
     };
-    final static long startTime = System.currentTimeMillis();
+    static final long startTime = System.currentTimeMillis();
 
     // increment each element when one getBundle call is done.
     static AtomicIntegerArray counters;
diff --git a/jdk/test/java/util/ResourceBundle/Test4300693.java b/jdk/test/java/util/ResourceBundle/Test4300693.java
index e3571891d27..13875a8e89a 100644
--- a/jdk/test/java/util/ResourceBundle/Test4300693.java
+++ b/jdk/test/java/util/ResourceBundle/Test4300693.java
@@ -37,9 +37,9 @@ import java.util.ResourceBundle;
 
 public class Test4300693 {
 
-   static private ResourceBundle rb = ResourceBundle.getBundle("Test4300693RB");
+   private static ResourceBundle rb = ResourceBundle.getBundle("Test4300693RB");
 
-   static public void main(String[] args) {
+   public static void main(String[] args) {
        System.out.println(rb.getString("test result"));
    }
 
diff --git a/jdk/test/java/util/ResourceBundle/getBaseBundleName/TestGetBaseBundleName.java b/jdk/test/java/util/ResourceBundle/getBaseBundleName/TestGetBaseBundleName.java
index ae59518d7d3..48909853ca6 100644
--- a/jdk/test/java/util/ResourceBundle/getBaseBundleName/TestGetBaseBundleName.java
+++ b/jdk/test/java/util/ResourceBundle/getBaseBundleName/TestGetBaseBundleName.java
@@ -37,8 +37,8 @@ import java.util.ResourceBundle;
  */
 public class TestGetBaseBundleName {
 
-    final static String PROPERTY_BUNDLE_NAME = "resources/PropertyBundle";
-    final static String LIST_BUNDLE_NAME = "resources.ListBundle";
+    static final String PROPERTY_BUNDLE_NAME = "resources/PropertyBundle";
+    static final String LIST_BUNDLE_NAME = "resources.ListBundle";
 
     public static String getBaseName(ResourceBundle bundle) {
         return bundle == null ? null : bundle.getBaseBundleName();
diff --git a/jdk/test/java/util/ServiceLoader/Basic.java b/jdk/test/java/util/ServiceLoader/Basic.java
index 9677db7ccbe..0d3cc2c2131 100644
--- a/jdk/test/java/util/ServiceLoader/Basic.java
+++ b/jdk/test/java/util/ServiceLoader/Basic.java
@@ -44,7 +44,7 @@ public class Basic {
                                                      eq, s1, s2));
     }
 
-    static abstract class TestLoader {
+    abstract static class TestLoader {
         String name;
 
         TestLoader(String name) { this.name = name; }
diff --git a/jdk/test/java/util/ServiceLoader/NPE.java b/jdk/test/java/util/ServiceLoader/NPE.java
index e2e767b2d74..757211a5715 100644
--- a/jdk/test/java/util/ServiceLoader/NPE.java
+++ b/jdk/test/java/util/ServiceLoader/NPE.java
@@ -30,7 +30,7 @@ import java.util.ServiceLoader;
 import java.util.Arrays;
 
 public final class NPE {
-    static abstract class Test {
+    abstract static class Test {
         String name;
 
         Test(String name) { this.name = name; }
diff --git a/jdk/test/java/util/Spliterator/SpliteratorCollisions.java b/jdk/test/java/util/Spliterator/SpliteratorCollisions.java
index a8e5583c997..733dff4b21c 100644
--- a/jdk/test/java/util/Spliterator/SpliteratorCollisions.java
+++ b/jdk/test/java/util/Spliterator/SpliteratorCollisions.java
@@ -165,7 +165,7 @@ public class SpliteratorCollisions {
         return spliteratorDataProviderWithNull = data.toArray(new Object[0][]);
     }
 
-    final static class HashableInteger implements Comparable {
+    static final class HashableInteger implements Comparable {
 
         final int value;
         final int hashmask; //yes duplication
diff --git a/jdk/test/java/util/StringJoiner/MergeTest.java b/jdk/test/java/util/StringJoiner/MergeTest.java
index 63085b160e3..396c3686d38 100644
--- a/jdk/test/java/util/StringJoiner/MergeTest.java
+++ b/jdk/test/java/util/StringJoiner/MergeTest.java
@@ -36,8 +36,8 @@ import static org.testng.Assert.fail;
 
 @Test
 public class MergeTest {
-    private final static String[] PREFIXES = {"", "{", "@#$%"};
-    private final static String[] SUFFIXES = {"", "}", "*&%$"};
+    private static final String[] PREFIXES = {"", "{", "@#$%"};
+    private static final String[] SUFFIXES = {"", "}", "*&%$"};
 
     private static class Fixes {
         public String pre0, suf0;
diff --git a/jdk/test/java/util/TreeMap/ContainsValue.java b/jdk/test/java/util/TreeMap/ContainsValue.java
index 53f687e014f..e1e86ca84cc 100644
--- a/jdk/test/java/util/TreeMap/ContainsValue.java
+++ b/jdk/test/java/util/TreeMap/ContainsValue.java
@@ -30,7 +30,7 @@
 import java.util.*;
 
 public class ContainsValue {
-    static public void main (String[] args) {
+    public static void main (String[] args) {
         Map map = new TreeMap();
 
         if (map.containsValue ("gemutlichkeit"))
diff --git a/jdk/test/java/util/concurrent/BlockingQueue/OfferDrainToLoops.java b/jdk/test/java/util/concurrent/BlockingQueue/OfferDrainToLoops.java
index bba0512ac6a..049bf293b37 100644
--- a/jdk/test/java/util/concurrent/BlockingQueue/OfferDrainToLoops.java
+++ b/jdk/test/java/util/concurrent/BlockingQueue/OfferDrainToLoops.java
@@ -93,7 +93,7 @@ public class OfferDrainToLoops {
             protected boolean quittingTime(long i) {
                 return (i % 1024) == 0 && quittingTime();
             }
-            abstract protected void realRun();
+            protected abstract void realRun();
             public void run() {
                 try { realRun(); } catch (Throwable t) { unexpected(t); }
             }
diff --git a/jdk/test/java/util/concurrent/ConcurrentQueues/OfferRemoveLoops.java b/jdk/test/java/util/concurrent/ConcurrentQueues/OfferRemoveLoops.java
index 56aeadc7cb2..9648a1556e0 100644
--- a/jdk/test/java/util/concurrent/ConcurrentQueues/OfferRemoveLoops.java
+++ b/jdk/test/java/util/concurrent/ConcurrentQueues/OfferRemoveLoops.java
@@ -89,7 +89,7 @@ public class OfferRemoveLoops {
             protected boolean quittingTime(long i) {
                 return (i % 1024) == 0 && quittingTime();
             }
-            abstract protected void realRun();
+            protected abstract void realRun();
             public void run() {
                 try { realRun(); } catch (Throwable t) { unexpected(t); }
             }
diff --git a/jdk/test/java/util/concurrent/FutureTask/DoneTimedGetLoops.java b/jdk/test/java/util/concurrent/FutureTask/DoneTimedGetLoops.java
index c96c43b5bf0..09cdb642d59 100644
--- a/jdk/test/java/util/concurrent/FutureTask/DoneTimedGetLoops.java
+++ b/jdk/test/java/util/concurrent/FutureTask/DoneTimedGetLoops.java
@@ -44,7 +44,7 @@ public class DoneTimedGetLoops {
     final long testDurationMillis;
 
     static class PublicFutureTask extends FutureTask {
-        final static Runnable noop = new Runnable() { public void run() {} };
+        static final Runnable noop = new Runnable() { public void run() {} };
         PublicFutureTask() { super(noop, null); }
         public void set(Boolean v) { super.set(v); }
         public void setException(Throwable t) { super.setException(t); }
@@ -81,7 +81,7 @@ public class DoneTimedGetLoops {
             protected boolean quittingTime(long i) {
                 return (i % 1024) == 0 && quittingTime();
             }
-            abstract protected void realRun() throws Exception;
+            protected abstract void realRun() throws Exception;
             public void run() {
                 try { realRun(); } catch (Throwable t) { unexpected(t); }
             }
diff --git a/jdk/test/java/util/concurrent/Phaser/Basic.java b/jdk/test/java/util/concurrent/Phaser/Basic.java
index ec9f01cfe30..f5e20eff3ae 100644
--- a/jdk/test/java/util/concurrent/Phaser/Basic.java
+++ b/jdk/test/java/util/concurrent/Phaser/Basic.java
@@ -111,7 +111,7 @@ public class Basic {
     // Convenience methods for creating threads that call arrive,
     // awaitAdvance, arriveAndAwaitAdvance, awaitAdvanceInterruptibly
     //----------------------------------------------------------------
-    private static abstract class Arriver extends Thread {
+    private abstract static class Arriver extends Thread {
         static AtomicInteger count = new AtomicInteger(1);
 
         Arriver() {
@@ -131,7 +131,7 @@ public class Basic {
         public int phase() { return this.phase; }
     }
 
-    private static abstract class Awaiter extends Arriver {
+    private abstract static class Awaiter extends Arriver {
         Awaiter() { super("Awaiter"); }
         Awaiter(String name) { super(name); }
     }
diff --git a/jdk/test/java/util/concurrent/locks/StampedLock/Basic.java b/jdk/test/java/util/concurrent/locks/StampedLock/Basic.java
index 8c9f236d2d3..47eaa3326d4 100644
--- a/jdk/test/java/util/concurrent/locks/StampedLock/Basic.java
+++ b/jdk/test/java/util/concurrent/locks/StampedLock/Basic.java
@@ -75,7 +75,7 @@ public class Basic {
         }
     }
 
-    static abstract class Locker extends Thread {
+    abstract static class Locker extends Thread {
         static AtomicInteger count = new AtomicInteger(1);
         private volatile Throwable thrown;
         private volatile long stamp;;
@@ -94,7 +94,7 @@ public class Basic {
         }
     }
 
-    static abstract class Reader extends Locker {
+    abstract static class Reader extends Locker {
         Reader() { super("Reader"); }
         Reader(String name) { super(name); }
     }
@@ -173,7 +173,7 @@ public class Basic {
                     : interruptibleReader(sl, timeout, unit, gate);
     }
 
-    static abstract class Writer extends Locker {
+    abstract static class Writer extends Locker {
         Writer() { super("Writer"); }
         Writer(String name) { super(name); }
     }
diff --git a/jdk/test/java/util/jar/JarEntry/GetMethodsReturnClones.java b/jdk/test/java/util/jar/JarEntry/GetMethodsReturnClones.java
index 80ec16e1473..3c4f06dd6f0 100644
--- a/jdk/test/java/util/jar/JarEntry/GetMethodsReturnClones.java
+++ b/jdk/test/java/util/jar/JarEntry/GetMethodsReturnClones.java
@@ -36,7 +36,7 @@ import java.util.jar.*;
 
 public class GetMethodsReturnClones {
 
-    private final static String BASE = System.getProperty("test.src", ".") +
+    private static final String BASE = System.getProperty("test.src", ".") +
         System.getProperty("file.separator");
 
     public static void main(String[] args) throws Exception {
diff --git a/jdk/test/java/util/jar/TestExtra.java b/jdk/test/java/util/jar/TestExtra.java
index e72e3e3c69e..fa6408ba570 100644
--- a/jdk/test/java/util/jar/TestExtra.java
+++ b/jdk/test/java/util/jar/TestExtra.java
@@ -42,13 +42,13 @@ import java.util.zip.*;
  * TestJarExtra checks JAR files.
  */
 public class TestExtra {
-    final static int JAR_MAGIC = 0xcafe; // private IN JarOutputStream.java
-    final static int TEST_HEADER = 0xbabe;
+    static final int JAR_MAGIC = 0xcafe; // private IN JarOutputStream.java
+    static final int TEST_HEADER = 0xbabe;
 
-    final static Charset ascii = Charset.forName("ASCII");
+    static final Charset ascii = Charset.forName("ASCII");
 
     // ZipEntry extra data
-    final static byte[][] extra = new byte[][] {
+    static final byte[][] extra = new byte[][] {
         ascii.encode("hello, world").array(),
         ascii.encode("foo bar").array()
     };
diff --git a/jdk/test/java/util/logging/AnonymousLogger/TestAnonymousLogger.java b/jdk/test/java/util/logging/AnonymousLogger/TestAnonymousLogger.java
index accb2b30bc7..8d4e528fd33 100644
--- a/jdk/test/java/util/logging/AnonymousLogger/TestAnonymousLogger.java
+++ b/jdk/test/java/util/logging/AnonymousLogger/TestAnonymousLogger.java
@@ -43,7 +43,7 @@ import java.util.logging.SimpleFormatter;
  */
 public class TestAnonymousLogger {
 
-    final public static class TestHandler extends Handler {
+    public static final class TestHandler extends Handler {
         @Override
         public void publish(LogRecord record) {
             System.out.println(new SimpleFormatter().format(record));
@@ -58,14 +58,14 @@ public class TestAnonymousLogger {
         }
     }
 
-    final public static class TestFilter implements Filter {
+    public static final class TestFilter implements Filter {
         @Override
         public boolean isLoggable(LogRecord record) {
             return true;
         }
     }
 
-    final public static class TestBundle extends ResourceBundle {
+    public static final class TestBundle extends ResourceBundle {
         Set keys = Collections.synchronizedSet(new LinkedHashSet<>());
         @Override
         protected Object handleGetObject(String key) {
diff --git a/jdk/test/java/util/logging/DrainFindDeadlockTest.java b/jdk/test/java/util/logging/DrainFindDeadlockTest.java
index 6d0bd084346..5e769bb5d92 100644
--- a/jdk/test/java/util/logging/DrainFindDeadlockTest.java
+++ b/jdk/test/java/util/logging/DrainFindDeadlockTest.java
@@ -47,14 +47,14 @@ import java.util.Map;
  */
 public class DrainFindDeadlockTest {
     private LogManager mgr = LogManager.getLogManager();
-    private final static int MAX_ITERATIONS = 100;
+    private static final int MAX_ITERATIONS = 100;
 
     // Get a ThreadMXBean so we can check for deadlock.  N.B. this may
     // not be supported on all platforms, which means we will have to
     // resort to the traditional test timeout method. However, if
     // we have the support we'll get the deadlock details if one
     // is detected.
-    private final static ThreadMXBean threadMXBean =
+    private static final ThreadMXBean threadMXBean =
             ManagementFactory.getThreadMXBean();
     private final boolean threadMXBeanDeadlockSupported =
             threadMXBean.isSynchronizerUsageSupported();
diff --git a/jdk/test/java/util/logging/FileHandlerLongLimit.java b/jdk/test/java/util/logging/FileHandlerLongLimit.java
index 0aa2fc04641..d081af50aaf 100644
--- a/jdk/test/java/util/logging/FileHandlerLongLimit.java
+++ b/jdk/test/java/util/logging/FileHandlerLongLimit.java
@@ -441,7 +441,7 @@ public class FileHandlerLongLimit {
     }
 
 
-    final static class PermissionsBuilder {
+    static final class PermissionsBuilder {
         final Permissions perms;
         public PermissionsBuilder() {
             this(new Permissions());
diff --git a/jdk/test/java/util/logging/FileHandlerPath.java b/jdk/test/java/util/logging/FileHandlerPath.java
index 602d4cf9c7d..9a7e8daec4d 100644
--- a/jdk/test/java/util/logging/FileHandlerPath.java
+++ b/jdk/test/java/util/logging/FileHandlerPath.java
@@ -77,11 +77,11 @@ public class FileHandlerPath {
 
 
     // Use a random name provided by UUID to avoid collision with other tests
-    final static String logFile = FileHandlerPath.class.getSimpleName() + "_"
+    static final String logFile = FileHandlerPath.class.getSimpleName() + "_"
                 + UUID.randomUUID().toString() + ".log";
-    final static String tmpLogFile;
-    final static String userDir = System.getProperty("user.dir");
-    final static String tmpDir = System.getProperty("java.io.tmpdir");
+    static final String tmpLogFile;
+    static final String userDir = System.getProperty("user.dir");
+    static final String tmpDir = System.getProperty("java.io.tmpdir");
     private static final List properties;
     static {
         tmpLogFile = new File(tmpDir, logFile).toString();
@@ -241,7 +241,7 @@ public class FileHandlerPath {
     }
 
 
-    final static class PermissionsBuilder {
+    static final class PermissionsBuilder {
         final Permissions perms;
         public PermissionsBuilder() {
             this(new Permissions());
diff --git a/jdk/test/java/util/logging/FileHandlerPatternExceptions.java b/jdk/test/java/util/logging/FileHandlerPatternExceptions.java
index fdcafa04c57..7209562edb5 100644
--- a/jdk/test/java/util/logging/FileHandlerPatternExceptions.java
+++ b/jdk/test/java/util/logging/FileHandlerPatternExceptions.java
@@ -265,7 +265,7 @@ public class FileHandlerPatternExceptions {
     }
 
 
-    final static class PermissionsBuilder {
+    static final class PermissionsBuilder {
         final Permissions perms;
         public PermissionsBuilder() {
             this(new Permissions());
diff --git a/jdk/test/java/util/logging/HigherResolutionTimeStamps/SerializeLogRecord.java b/jdk/test/java/util/logging/HigherResolutionTimeStamps/SerializeLogRecord.java
index 69f6cdd8aab..99119929439 100644
--- a/jdk/test/java/util/logging/HigherResolutionTimeStamps/SerializeLogRecord.java
+++ b/jdk/test/java/util/logging/HigherResolutionTimeStamps/SerializeLogRecord.java
@@ -137,7 +137,7 @@ public class SerializeLogRecord {
      * different java version can be deserialized in the current java version.
      * (see Jdk8SerializedLog and Jdk9SerializedLog below)
      */
-    public static abstract class SerializedLog {
+    public abstract static class SerializedLog {
         public abstract String getBase64();
         public abstract String getString();
 
diff --git a/jdk/test/java/util/logging/HigherResolutionTimeStamps/XmlFormatterNanos.java b/jdk/test/java/util/logging/HigherResolutionTimeStamps/XmlFormatterNanos.java
index 9fce9482361..56186d117c7 100644
--- a/jdk/test/java/util/logging/HigherResolutionTimeStamps/XmlFormatterNanos.java
+++ b/jdk/test/java/util/logging/HigherResolutionTimeStamps/XmlFormatterNanos.java
@@ -121,7 +121,7 @@ public class XmlFormatterNanos {
         }
     }
 
-    final static List properties;
+    static final List properties;
     static {
         Properties props1 = new Properties();
         props1.setProperty("test.name", "with XML nano element (default)");
diff --git a/jdk/test/java/util/logging/LogManager/Configuration/ParentLoggerWithHandlerGC.java b/jdk/test/java/util/logging/LogManager/Configuration/ParentLoggerWithHandlerGC.java
index 38a6c56cbd5..e70928599e8 100644
--- a/jdk/test/java/util/logging/LogManager/Configuration/ParentLoggerWithHandlerGC.java
+++ b/jdk/test/java/util/logging/LogManager/Configuration/ParentLoggerWithHandlerGC.java
@@ -451,7 +451,7 @@ public class ParentLoggerWithHandlerGC {
     }
 
 
-    final static class PermissionsBuilder {
+    static final class PermissionsBuilder {
         final Permissions perms;
         public PermissionsBuilder() {
             this(new Permissions());
diff --git a/jdk/test/java/util/logging/LogManager/Configuration/TestConfigurationLock.java b/jdk/test/java/util/logging/LogManager/Configuration/TestConfigurationLock.java
index 47e812cc012..7799b631f51 100644
--- a/jdk/test/java/util/logging/LogManager/Configuration/TestConfigurationLock.java
+++ b/jdk/test/java/util/logging/LogManager/Configuration/TestConfigurationLock.java
@@ -197,7 +197,7 @@ public class TestConfigurationLock {
         }
     }
 
-    final static class ResetConf extends Thread {
+    static final class ResetConf extends Thread {
 
         public ResetConf() {
             setDaemon(true);
@@ -228,7 +228,7 @@ public class TestConfigurationLock {
         }
     }
 
-    final static class ReadConf extends Thread {
+    static final class ReadConf extends Thread {
 
         public ReadConf() {
             setDaemon(true);
@@ -259,7 +259,7 @@ public class TestConfigurationLock {
         }
     }
 
-    final static class AddLogger extends Thread {
+    static final class AddLogger extends Thread {
 
         public AddLogger() {
             setDaemon(true);
@@ -293,7 +293,7 @@ public class TestConfigurationLock {
         }
     }
 
-    final static class DeadlockDetector extends Thread {
+    static final class DeadlockDetector extends Thread {
 
         @Override
         public void run() {
diff --git a/jdk/test/java/util/logging/LogManagerAppContextDeadlock.java b/jdk/test/java/util/logging/LogManagerAppContextDeadlock.java
index 4b7c7a41bfe..38e47e6124c 100644
--- a/jdk/test/java/util/logging/LogManagerAppContextDeadlock.java
+++ b/jdk/test/java/util/logging/LogManagerAppContextDeadlock.java
@@ -63,7 +63,7 @@ public class LogManagerAppContextDeadlock {
     // Emulate AppContext
     static class FakeAppContext {
 
-        final static AtomicInteger numAppContexts = new AtomicInteger(0);
+        static final AtomicInteger numAppContexts = new AtomicInteger(0);
         static final class FakeAppContextLock {}
         static final FakeAppContextLock lock = new FakeAppContextLock();
         static volatile FakeAppContext appContext;
@@ -220,7 +220,7 @@ public class LogManagerAppContextDeadlock {
     }
 
     // A thread that detect deadlocks.
-    final static class DeadlockDetector extends Thread {
+    static final class DeadlockDetector extends Thread {
 
         public DeadlockDetector() {
             this.setDaemon(true);
@@ -302,7 +302,7 @@ public class LogManagerAppContextDeadlock {
     }
 
     // A Helper class to build a set of permissions.
-    final static class PermissionsBuilder {
+    static final class PermissionsBuilder {
         final Permissions perms;
         public PermissionsBuilder() {
             this(new Permissions());
diff --git a/jdk/test/java/util/logging/Logger/entering/LoggerEnteringWithParams.java b/jdk/test/java/util/logging/Logger/entering/LoggerEnteringWithParams.java
index 0fea08bdc3a..d63e619830a 100644
--- a/jdk/test/java/util/logging/Logger/entering/LoggerEnteringWithParams.java
+++ b/jdk/test/java/util/logging/Logger/entering/LoggerEnteringWithParams.java
@@ -43,7 +43,7 @@ import java.util.logging.StreamHandler;
  */
 public class LoggerEnteringWithParams {
 
-    final static Object[] data = {
+    static final Object[] data = {
         "one", "two", "three", "four", "five", "six", "seven", "eight"
     };
 
diff --git a/jdk/test/java/util/logging/Logger/getGlobal/TestGetGlobal.java b/jdk/test/java/util/logging/Logger/getGlobal/TestGetGlobal.java
index e87e15f81fc..907f70ab809 100644
--- a/jdk/test/java/util/logging/Logger/getGlobal/TestGetGlobal.java
+++ b/jdk/test/java/util/logging/Logger/getGlobal/TestGetGlobal.java
@@ -45,7 +45,7 @@ import java.util.logging.Logger;
  */
 public class TestGetGlobal {
 
-    final static String[] messages = {
+    static final String[] messages = {
         "1. This message should not appear on the console.",
         "2. This message should appear on the console.",
         "3. This message should now appear on the console too."
diff --git a/jdk/test/java/util/logging/Logger/getGlobal/TestGetGlobalByName.java b/jdk/test/java/util/logging/Logger/getGlobal/TestGetGlobalByName.java
index 91968db400b..fe54a56f9a2 100644
--- a/jdk/test/java/util/logging/Logger/getGlobal/TestGetGlobalByName.java
+++ b/jdk/test/java/util/logging/Logger/getGlobal/TestGetGlobalByName.java
@@ -45,7 +45,7 @@ import java.util.logging.Logger;
  */
 public class TestGetGlobalByName {
 
-    final static String[] messages = {
+    static final String[] messages = {
         "1. This message should not appear on the console.",
         "2. This message should appear on the console.",
         "3. This message should now appear on the console too."
diff --git a/jdk/test/java/util/logging/Logger/getGlobal/TestGetGlobalConcurrent.java b/jdk/test/java/util/logging/Logger/getGlobal/TestGetGlobalConcurrent.java
index 23688e1bca5..2a6e8725a96 100644
--- a/jdk/test/java/util/logging/Logger/getGlobal/TestGetGlobalConcurrent.java
+++ b/jdk/test/java/util/logging/Logger/getGlobal/TestGetGlobalConcurrent.java
@@ -46,7 +46,7 @@ import java.util.logging.Logger;
  */
 public class TestGetGlobalConcurrent {
 
-    final static String[] messages = {
+    static final String[] messages = {
         "1. This message should not appear on the console.",
         "2. This message should appear on the console.",
         "3. This message should now appear on the console too.",
@@ -135,16 +135,16 @@ public class TestGetGlobalConcurrent {
           }
     }
 
-    final static class Run1 implements Runnable {
+    static final class Run1 implements Runnable {
         public void run() { test1(); }
     }
-    final static class Run2 implements Runnable {
+    static final class Run2 implements Runnable {
         public void run() { test2(); }
     }
-    final static class Run3 implements Runnable {
+    static final class Run3 implements Runnable {
         public void run() { test3(); }
     }
-    final static class Run4 implements Runnable {
+    static final class Run4 implements Runnable {
         public void run() { test4(); }
     }
 
diff --git a/jdk/test/java/util/logging/Logger/getGlobal/testgetglobal/HandlerImpl.java b/jdk/test/java/util/logging/Logger/getGlobal/testgetglobal/HandlerImpl.java
index f8737acb25f..71cdd513a25 100644
--- a/jdk/test/java/util/logging/Logger/getGlobal/testgetglobal/HandlerImpl.java
+++ b/jdk/test/java/util/logging/Logger/getGlobal/testgetglobal/HandlerImpl.java
@@ -33,7 +33,7 @@ import java.util.logging.LogRecord;
  */
 public class HandlerImpl extends ConsoleHandler {
 
-    public final static List received = new CopyOnWriteArrayList<>();
+    public static final List received = new CopyOnWriteArrayList<>();
 
     public HandlerImpl() {
     }
diff --git a/jdk/test/java/util/logging/Logger/logrb/TestLogrbResourceBundle.java b/jdk/test/java/util/logging/Logger/logrb/TestLogrbResourceBundle.java
index f47219492f2..cef20cf9551 100644
--- a/jdk/test/java/util/logging/Logger/logrb/TestLogrbResourceBundle.java
+++ b/jdk/test/java/util/logging/Logger/logrb/TestLogrbResourceBundle.java
@@ -40,8 +40,8 @@ import resources.ListBundle;
  */
 public class TestLogrbResourceBundle {
 
-    final static String LIST_BUNDLE_NAME = "resources.ListBundle";
-    final static String PROPERTY_BUNDLE_NAME = "resources.PropertyBundle";
+    static final String LIST_BUNDLE_NAME = "resources.ListBundle";
+    static final String PROPERTY_BUNDLE_NAME = "resources.PropertyBundle";
 
     /**
      * A dummy handler class that we can use to check the bundle/bundle name
diff --git a/jdk/test/java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java b/jdk/test/java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java
index fbdb6116190..abe279ffb3b 100644
--- a/jdk/test/java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java
+++ b/jdk/test/java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java
@@ -49,8 +49,8 @@ import resources.ListBundle;
  */
 public class TestSetResourceBundle {
 
-    final static String LIST_BUNDLE_NAME = "resources.ListBundle";
-    final static String PROPERTY_BUNDLE_NAME = "resources.PropertyBundle";
+    static final String LIST_BUNDLE_NAME = "resources.ListBundle";
+    static final String PROPERTY_BUNDLE_NAME = "resources.PropertyBundle";
 
     /**
      * A dummy handler class that we can use to check the bundle/bundle name
diff --git a/jdk/test/java/util/logging/LoggerResourceBundleRace.java b/jdk/test/java/util/logging/LoggerResourceBundleRace.java
index f9acc874162..71686e62583 100644
--- a/jdk/test/java/util/logging/LoggerResourceBundleRace.java
+++ b/jdk/test/java/util/logging/LoggerResourceBundleRace.java
@@ -38,17 +38,17 @@ import java.util.logging.Logger;
 
 
 public class LoggerResourceBundleRace extends RacingThreadsTest {
-    private final static int N_LOOPS   = 500000;   // # of race loops
-    private final static int N_SECS    = 15;       // # of secs to run test
+    private static final int N_LOOPS   = 500000;   // # of race loops
+    private static final int N_SECS    = 15;       // # of secs to run test
     // # of parallel threads; must match number of MyResources inner classes
-    private final static int N_THREADS = 3;
+    private static final int N_THREADS = 3;
 
-    private final static String LOGGER_PREFIX = "myLogger-";
-    private final static String RESOURCE_PREFIX
+    private static final String LOGGER_PREFIX = "myLogger-";
+    private static final String RESOURCE_PREFIX
         = "LoggerResourceBundleRace$MyResources";
     // these counters are AtomicInteger since any worker thread can increment
-    private final static AtomicInteger iaeCnt = new AtomicInteger();
-    private final static AtomicInteger worksCnt = new AtomicInteger();
+    private static final AtomicInteger iaeCnt = new AtomicInteger();
+    private static final AtomicInteger worksCnt = new AtomicInteger();
 
     Logger dummy;   // dummy Logger
 
@@ -156,7 +156,7 @@ public class LoggerResourceBundleRace extends RacingThreadsTest {
     // N_THREADS above must match number of MyResources inner classes
     //
     public static class MyResources0 extends ListResourceBundle {
-        final static Object[][] contents = {
+        static final Object[][] contents = {
             {"sample1", "translation #1 for sample1"},
             {"sample2", "translation #1 for sample2"},
         };
@@ -167,7 +167,7 @@ public class LoggerResourceBundleRace extends RacingThreadsTest {
     }
 
     public static class MyResources1 extends ListResourceBundle {
-        final static Object[][] contents = {
+        static final Object[][] contents = {
             {"sample1", "translation #2 for sample1"},
             {"sample2", "translation #2 for sample2"},
         };
@@ -178,7 +178,7 @@ public class LoggerResourceBundleRace extends RacingThreadsTest {
     }
 
     public static class MyResources2 extends ListResourceBundle {
-        final static Object[][] contents = {
+        static final Object[][] contents = {
             {"sample1", "translation #3 for sample1"},
             {"sample2", "translation #3 for sample2"},
         };
diff --git a/jdk/test/java/util/logging/RootLogger/RootLevelInConfigFile.java b/jdk/test/java/util/logging/RootLogger/RootLevelInConfigFile.java
index 0a78f8d6911..6e4f584d84e 100644
--- a/jdk/test/java/util/logging/RootLogger/RootLevelInConfigFile.java
+++ b/jdk/test/java/util/logging/RootLogger/RootLevelInConfigFile.java
@@ -49,7 +49,7 @@ import sun.misc.SharedSecrets;
  */
 public class RootLevelInConfigFile {
 
-    public final static String CONFIG_FILE_KEY = "java.util.logging.config.file";
+    public static final String CONFIG_FILE_KEY = "java.util.logging.config.file";
 
     public static void main(String[] args) throws IOException {
         System.setProperty(CONFIG_FILE_KEY,
diff --git a/jdk/test/java/util/logging/TestAppletLoggerContext.java b/jdk/test/java/util/logging/TestAppletLoggerContext.java
index f534d370745..4bb3a59e9b0 100644
--- a/jdk/test/java/util/logging/TestAppletLoggerContext.java
+++ b/jdk/test/java/util/logging/TestAppletLoggerContext.java
@@ -116,7 +116,7 @@ public class TestAppletLoggerContext {
             public Object getAppletContext() { return active ? exc : null; }
         }
 
-        final static JavaAWTAccessStub javaAwtAccess = new JavaAWTAccessStub();
+        static final JavaAWTAccessStub javaAwtAccess = new JavaAWTAccessStub();
         public static void init() {
             SharedSecrets.setJavaAWTAccess(javaAwtAccess);
             if (System.getProperty("test.security", "on").equals("on")) {
diff --git a/jdk/test/java/util/logging/TestConfigurationListeners.java b/jdk/test/java/util/logging/TestConfigurationListeners.java
index 375019e8656..03c7a7f7b89 100644
--- a/jdk/test/java/util/logging/TestConfigurationListeners.java
+++ b/jdk/test/java/util/logging/TestConfigurationListeners.java
@@ -429,7 +429,7 @@ public class TestConfigurationListeners {
     }
 
 
-    final static class PermissionsBuilder {
+    static final class PermissionsBuilder {
         final Permissions perms;
         public PermissionsBuilder() {
             this(new Permissions());
diff --git a/jdk/test/java/util/logging/TestLogConfigurationDeadLock.java b/jdk/test/java/util/logging/TestLogConfigurationDeadLock.java
index 70badde17f5..880fa1a9eb4 100644
--- a/jdk/test/java/util/logging/TestLogConfigurationDeadLock.java
+++ b/jdk/test/java/util/logging/TestLogConfigurationDeadLock.java
@@ -148,7 +148,7 @@ public class TestLogConfigurationDeadLock {
     }
 
 
-    final static class ReadConf extends Thread {
+    static final class ReadConf extends Thread {
         @Override
         public void run() {
             while (goOn) {
@@ -163,7 +163,7 @@ public class TestLogConfigurationDeadLock {
         }
     }
 
-    final static class AddLogger extends Thread {
+    static final class AddLogger extends Thread {
         @Override
         public void run() {
             try {
@@ -184,7 +184,7 @@ public class TestLogConfigurationDeadLock {
         }
     }
 
-    final static class DeadlockDetector extends Thread {
+    static final class DeadlockDetector extends Thread {
 
         @Override
         public void run() {
diff --git a/jdk/test/java/util/logging/TestLogConfigurationDeadLockWithConf.java b/jdk/test/java/util/logging/TestLogConfigurationDeadLockWithConf.java
index af8651d38b3..2aa89bc4401 100644
--- a/jdk/test/java/util/logging/TestLogConfigurationDeadLockWithConf.java
+++ b/jdk/test/java/util/logging/TestLogConfigurationDeadLockWithConf.java
@@ -219,7 +219,7 @@ public class TestLogConfigurationDeadLockWithConf {
         }
     }
 
-    final static class ReadConf extends DaemonThread {
+    static final class ReadConf extends DaemonThread {
         @Override
         public void run() {
             while (goOn) {
@@ -234,7 +234,7 @@ public class TestLogConfigurationDeadLockWithConf {
         }
     }
 
-    final static class AddLogger extends DaemonThread {
+    static final class AddLogger extends DaemonThread {
         @Override
         public void run() {
             try {
@@ -254,7 +254,7 @@ public class TestLogConfigurationDeadLockWithConf {
         }
     }
 
-    final static class DeadlockDetector extends Thread {
+    static final class DeadlockDetector extends Thread {
 
         final Set deadlocked = Collections.synchronizedSet(new HashSet());
 
diff --git a/jdk/test/java/util/logging/TestLoggerBundleSync.java b/jdk/test/java/util/logging/TestLoggerBundleSync.java
index 7f5e51470eb..a4f73c1f5a3 100644
--- a/jdk/test/java/util/logging/TestLoggerBundleSync.java
+++ b/jdk/test/java/util/logging/TestLoggerBundleSync.java
@@ -192,7 +192,7 @@ public class TestLoggerBundleSync {
 
     }
 
-    final static class GetRB extends Thread {
+    static final class GetRB extends Thread {
         final class MyHandler extends Handler {
             volatile ResourceBundle rb;
             volatile String rbName;
@@ -327,10 +327,10 @@ public class TestLoggerBundleSync {
         }
     }
 
-    final static class SetRB extends Thread {
+    static final class SetRB extends Thread {
         final Class type;
-        final static ExecutorService executor = Executors.newSingleThreadExecutor();
-        final static class CheckRBTask implements Callable {
+        static final ExecutorService executor = Executors.newSingleThreadExecutor();
+        static final class CheckRBTask implements Callable {
             final Logger logger;
             volatile String rbName;
             volatile ResourceBundle rb;
@@ -431,11 +431,11 @@ public class TestLoggerBundleSync {
         }
     }
 
-    final static class SetRBName extends Thread {
+    static final class SetRBName extends Thread {
         int nexti = 0;
         final Class type;
-        final static ExecutorService executor = Executors.newSingleThreadExecutor();
-        final static class CheckRBNameTask implements Callable {
+        static final ExecutorService executor = Executors.newSingleThreadExecutor();
+        static final class CheckRBNameTask implements Callable {
             final Logger logger;
             volatile String rbName;
 
@@ -535,7 +535,7 @@ public class TestLoggerBundleSync {
         }
     }
 
-    final static class DeadlockDetector extends Thread {
+    static final class DeadlockDetector extends Thread {
 
         @Override
         public void run() {
diff --git a/jdk/test/java/util/logging/bundlesearch/IndirectlyLoadABundle.java b/jdk/test/java/util/logging/bundlesearch/IndirectlyLoadABundle.java
index e81edaab3f4..6ed739000f1 100644
--- a/jdk/test/java/util/logging/bundlesearch/IndirectlyLoadABundle.java
+++ b/jdk/test/java/util/logging/bundlesearch/IndirectlyLoadABundle.java
@@ -38,7 +38,7 @@ import java.util.logging.Logger;
  */
 public class IndirectlyLoadABundle {
 
-    private final static String rbName = "CallerSearchableResource";
+    private static final String rbName = "CallerSearchableResource";
 
     public boolean loadAndTest() throws Throwable {
         // Make sure we can find it via the URLClassLoader
diff --git a/jdk/test/java/util/logging/bundlesearch/LoadItUp2.java b/jdk/test/java/util/logging/bundlesearch/LoadItUp2.java
index 25cde2d787a..8665bc58f7c 100644
--- a/jdk/test/java/util/logging/bundlesearch/LoadItUp2.java
+++ b/jdk/test/java/util/logging/bundlesearch/LoadItUp2.java
@@ -34,7 +34,7 @@ import java.util.logging.Logger;
  */
 public class LoadItUp2 {
 
-    private final static boolean DEBUG = false;
+    private static final boolean DEBUG = false;
 
     public Boolean test(String rbName) throws Exception {
         // we should not be able to find the resource in this directory via
diff --git a/jdk/test/java/util/logging/bundlesearch/ResourceBundleSearchTest.java b/jdk/test/java/util/logging/bundlesearch/ResourceBundleSearchTest.java
index 9cc22f4f2f2..6e3167cfa0a 100644
--- a/jdk/test/java/util/logging/bundlesearch/ResourceBundleSearchTest.java
+++ b/jdk/test/java/util/logging/bundlesearch/ResourceBundleSearchTest.java
@@ -47,11 +47,11 @@ import java.util.logging.Logger;
  */
 public class ResourceBundleSearchTest {
 
-    private final static boolean DEBUG = false;
-    private final static String LOGGER_PREFIX = "myLogger.";
+    private static final boolean DEBUG = false;
+    private static final String LOGGER_PREFIX = "myLogger.";
     private static int loggerNum = 0;
-    private final static String PROP_RB_NAME = "ClassPathTestBundle";
-    private final static String TCCL_TEST_BUNDLE = "ContextClassLoaderTestBundle";
+    private static final String PROP_RB_NAME = "ClassPathTestBundle";
+    private static final String TCCL_TEST_BUNDLE = "ContextClassLoaderTestBundle";
 
     private static int numPass = 0;
     private static int numFail = 0;
diff --git a/jdk/test/java/util/logging/bundlesearch/TwiceIndirectlyLoadABundle.java b/jdk/test/java/util/logging/bundlesearch/TwiceIndirectlyLoadABundle.java
index e3dbc5595b4..eba47d203fa 100644
--- a/jdk/test/java/util/logging/bundlesearch/TwiceIndirectlyLoadABundle.java
+++ b/jdk/test/java/util/logging/bundlesearch/TwiceIndirectlyLoadABundle.java
@@ -37,7 +37,7 @@ import java.nio.file.Paths;
  */
 public class TwiceIndirectlyLoadABundle {
 
-    private final static String rbName = "StackSearchableResource";
+    private static final String rbName = "StackSearchableResource";
 
     public boolean loadAndTest() throws Throwable {
         // Find out where we are running from so we can setup the URLClassLoader URLs
diff --git a/jdk/test/java/util/regex/POSIX_Unicode.java b/jdk/test/java/util/regex/POSIX_Unicode.java
index ea5ee39ecd5..8657daaec0c 100644
--- a/jdk/test/java/util/regex/POSIX_Unicode.java
+++ b/jdk/test/java/util/regex/POSIX_Unicode.java
@@ -24,7 +24,7 @@
 import java.util.HashMap;
 import java.util.Locale;
 
-final public class POSIX_Unicode {
+public final class POSIX_Unicode {
 
     public static boolean isAlpha(int ch) {
         return Character.isAlphabetic(ch);
diff --git a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/CollectorsTest.java b/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/CollectorsTest.java
index 08d731dc96e..07fa5bcb5cf 100644
--- a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/CollectorsTest.java
+++ b/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/CollectorsTest.java
@@ -77,7 +77,7 @@ import static java.util.stream.LambdaTestHelpers.mDoubler;
  */
 public class CollectorsTest extends OpTestCase {
 
-    private static abstract class CollectorAssertion {
+    private abstract static class CollectorAssertion {
         abstract void assertValue(U value,
                                   Supplier> source,
                                   boolean ordered) throws ReflectiveOperationException;
diff --git a/jdk/test/java/util/zip/ChecksumBase.java b/jdk/test/java/util/zip/ChecksumBase.java
index 5804be7151b..6c4f1edf45c 100644
--- a/jdk/test/java/util/zip/ChecksumBase.java
+++ b/jdk/test/java/util/zip/ChecksumBase.java
@@ -31,7 +31,7 @@ import java.util.zip.Checksum;
 
 public class ChecksumBase {
 
-    private final static byte[] BYTES_123456789 = "123456789".getBytes(StandardCharsets.US_ASCII);
+    private static final byte[] BYTES_123456789 = "123456789".getBytes(StandardCharsets.US_ASCII);
 
     public static void testAll(Checksum checksum, long expected) {
         testBytes(checksum, expected);
diff --git a/jdk/test/java/util/zip/FlaterCriticalArray.java b/jdk/test/java/util/zip/FlaterCriticalArray.java
index 3d90195dea2..19d5a67251e 100644
--- a/jdk/test/java/util/zip/FlaterCriticalArray.java
+++ b/jdk/test/java/util/zip/FlaterCriticalArray.java
@@ -71,7 +71,7 @@ public class FlaterCriticalArray {
     /*
      * Base class for individual test cases
      */
-    abstract static private class TestCase {
+    private abstract static class TestCase {
         protected String name;  // For information in debug messages
         protected byte data[];  // Data to be deflated and subsequently inflated
         protected int level;    // Compression level for deflater
@@ -110,9 +110,9 @@ public class FlaterCriticalArray {
             debug(name, inOut, duration, length);
         }
 
-        abstract protected byte[] deflate(byte data[], int level) throws Throwable;
+        protected abstract byte[] deflate(byte data[], int level) throws Throwable;
 
-        abstract protected byte[] inflate(byte deflated[]) throws Throwable;
+        protected abstract byte[] inflate(byte deflated[]) throws Throwable;
     }
 
     /*
diff --git a/jdk/test/java/util/zip/FlaterTest.java b/jdk/test/java/util/zip/FlaterTest.java
index ff11ab0bd1c..7245440d033 100644
--- a/jdk/test/java/util/zip/FlaterTest.java
+++ b/jdk/test/java/util/zip/FlaterTest.java
@@ -92,7 +92,7 @@ public class FlaterTest extends Thread {
         new FlaterTest().go(numThreads);
     }
 
-    synchronized private void go(int numThreads) throws Throwable {
+    private synchronized void go(int numThreads) throws Throwable {
         int deflatedLength = getDeflatedLength();
 
         long time = System.currentTimeMillis();
diff --git a/jdk/test/java/util/zip/ZipFile/FinalizeZipFile.java b/jdk/test/java/util/zip/ZipFile/FinalizeZipFile.java
index 06dd4bc3bd6..a5bd536a2d8 100644
--- a/jdk/test/java/util/zip/ZipFile/FinalizeZipFile.java
+++ b/jdk/test/java/util/zip/ZipFile/FinalizeZipFile.java
@@ -34,7 +34,7 @@ import java.util.concurrent.CountDownLatch;
 
 public class FinalizeZipFile {
 
-    private final static CountDownLatch finalizersDone = new CountDownLatch(3);
+    private static final CountDownLatch finalizersDone = new CountDownLatch(3);
 
     private static class InstrumentedZipFile extends ZipFile {
 

From 7bb1b6ad7c56b3f22e599bf2b3f075e878e013b1 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie 
Date: Wed, 16 Sep 2015 09:49:36 +0200
Subject: [PATCH 79/94] 8136378: Build test libs using properly integrated
 makefile

Use 'make build-test-lib' in top repo instead

Reviewed-by: erikj
---
 make/Main.gmk              |  7 +++-
 make/test/BuildTestLib.gmk | 67 ++++++++++++++++++++++++++++++++
 test/lib/Makefile          | 79 --------------------------------------
 3 files changed, 72 insertions(+), 81 deletions(-)
 create mode 100644 make/test/BuildTestLib.gmk
 delete mode 100644 test/lib/Makefile

diff --git a/make/Main.gmk b/make/Main.gmk
index c25856f5e3a..3f30e9b7fe4 100644
--- a/make/Main.gmk
+++ b/make/Main.gmk
@@ -285,9 +285,12 @@ test-image-jdk-jtreg-native:
 	+($(CD) $(JDK_TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f JtregNative.gmk \
 	    test-image-jdk-jtreg-native)
 
+build-test-lib:
+	+($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f BuildTestLib.gmk)
+
 ALL_TARGETS += prepare-test-image build-test-hotspot-jtreg-native \
     test-image-hotspot-jtreg-native build-test-jdk-jtreg-native \
-    test-image-jdk-jtreg-native
+    test-image-jdk-jtreg-native build-test-lib
 
 ################################################################################
 # Run tests
@@ -553,7 +556,7 @@ ALL_TARGETS += default jdk images docs all
 CLEAN_DIRS += hotspot jdk bootcycle-build test buildtools support \
     images make-support test-make bundles
 CLEAN_DIR_TARGETS := $(addprefix clean-, $(CLEAN_DIRS))
-CLEAN_TESTS += hotspot-jtreg-native jdk-jtreg-native
+CLEAN_TESTS += hotspot-jtreg-native jdk-jtreg-native lib
 CLEAN_TEST_TARGETS += $(addprefix clean-test-, $(CLEAN_TESTS))
 CLEAN_PHASES := gensrc java native include docs
 CLEAN_PHASE_TARGETS := $(addprefix clean-, $(CLEAN_PHASES))
diff --git a/make/test/BuildTestLib.gmk b/make/test/BuildTestLib.gmk
new file mode 100644
index 00000000000..70c9da3c783
--- /dev/null
+++ b/make/test/BuildTestLib.gmk
@@ -0,0 +1,67 @@
+#
+# Copyright (c) 2015, 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.
+#
+
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+include JavaCompilation.gmk
+include SetupJavaCompilers.gmk
+
+TARGETS :=
+
+TEST_LIB_SOURCE_DIR := $(TOPDIR)/test/lib
+TEST_LIB_SUPPORT := $(SUPPORT_OUTPUTDIR)/test/lib
+
+# Unfortunately, test-lib.jar does not compile properly without warnings.
+$(eval $(call SetupJavaCompiler, BOOT_JAVAC_NOWARNINGS, \
+    JAVAC := $(JAVAC), \
+    FLAGS := -XDignore.symbol.file=true -g, \
+))
+
+$(eval $(call SetupJavaCompilation, BUILD_WB_JAR, \
+    SETUP := BOOT_JAVAC, \
+    SRC := $(TEST_LIB_SOURCE_DIR)/sun, \
+    BIN := $(TEST_LIB_SUPPORT), \
+    JAR := $(TEST_LIB_SUPPORT)/wb.jar, \
+))
+
+TARGETS += $(BUILD_WB_JAR)
+
+# test-lib.jar will contain only hprof classes until JDK-8081381 is resolved
+$(eval $(call SetupJavaCompilation, BUILD_TEST_LIB_JAR, \
+    SETUP := BOOT_JAVAC_NOWARNINGS, \
+    SRC := $(TEST_LIB_SOURCE_DIR)/share/classes/jdk/test/lib/hprof, \
+    BIN := $(TEST_LIB_SUPPORT), \
+    JAR := $(TEST_LIB_SUPPORT)/test-lib.jar, \
+))
+
+TARGETS += $(BUILD_TEST_LIB_JAR)
+
+##########################################################################################
+
+all: $(TARGETS)
+
+.PHONY: default all
diff --git a/test/lib/Makefile b/test/lib/Makefile
deleted file mode 100644
index 4bb734a5ee3..00000000000
--- a/test/lib/Makefile
+++ /dev/null
@@ -1,79 +0,0 @@
-#
-# Copyright (c) 2013, 2015, 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.
-#
-
-# Utility Makefile that creates wb.jar, which is used to simplify using 
-# the Whitebox API outside the jtreg-testbase.
-
-ifneq "x$(ALT_BOOTDIR)" "x"
-	BOOTDIR := $(ALT_BOOTDIR)
-endif
-
-ifeq "x$(BOOTDIR)" "x"
-	JDK_HOME := $(shell dirname $(shell which java))/..
-else
-	JDK_HOME := $(BOOTDIR)
-endif
-
-SRC_DIR = ./
-BUILD_DIR = build
-OUTPUT_DIR = $(BUILD_DIR)/classes
-
-JAVAC = $(JDK_HOME)/bin/javac
-JAR = $(JDK_HOME)/bin/jar
-
-WB_SRC_FILES = $(shell find $(SRC_DIR)/sun/hotspot -name '*.java')
-# test-lib.jar will contain only hprof classes until JDK-8081381 is resolved
-SHARE_SRC_FILES = $(shell find $(SRC_DIR)/share/classes/jdk/test/lib/hprof -name '*.java')
-
-.PHONY: wb.filelist share.filelist clean cleantmp
-
-all: wb.jar test-lib.jar cleantmp
-
-wb.jar: wb.filelist
-	@mkdir -p $(OUTPUT_DIR)
-	$(JAVAC) -sourcepath $(SRC_DIR) -d $(OUTPUT_DIR) -cp $(OUTPUT_DIR) @wb.filelist
-	$(JAR) cf wb.jar -C $(OUTPUT_DIR) .
-	@rm -rf $(OUTPUT_DIR)
-
-wb.filelist: $(WB_SRC_FILES)
-	@rm -f $@
-	@echo $(WB_SRC_FILES) > $@
-
-test-lib.jar: share.filelist
-	@mkdir -p $(OUTPUT_DIR)
-	$(JAVAC) -sourcepath $(SRC_DIR) -d $(OUTPUT_DIR) -cp $(OUTPUT_DIR) @share.filelist
-	$(JAR) cf test-lib.jar -C $(OUTPUT_DIR) .
-	@rm -rf $(OUTPUT_DIR)
-
-share.filelist: $(SHARE_SRC_FILES)
-	@rm -f $@
-	@echo $(SHARE_SRC_FILES) > $@
-
-clean: cleantmp
-	@rm -rf wb.jar
-	@rm -rf test-list.jar
-
-cleantmp:
-	@rm -rf wb.filelist
-	@rm -rf share.filelist
-	@rm -rf $(BUILD_DIR)

From fd8fa9290ca8c711f3ba4fd64ae973347d84c792 Mon Sep 17 00:00:00 2001
From: Attila Szegedi 
Date: Wed, 16 Sep 2015 16:54:22 +0200
Subject: [PATCH 80/94] 8135251: Use Unsafe.defineAnonymousClass for loading
 Nashorn script code

Reviewed-by: alanb, lagergren, sundar
---
 modules.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules.xml b/modules.xml
index 2f8ecea1bd3..401b5b0b432 100644
--- a/modules.xml
+++ b/modules.xml
@@ -277,6 +277,7 @@
       jdk.jvmstat
       jdk.management.resource
       jdk.pack200
+      jdk.scripting.nashorn
       jdk.security.auth
       jdk.security.jgss
       jdk.snmp

From 343e882e7f2b533249f61ba1abe08bf8b8306032 Mon Sep 17 00:00:00 2001
From: Stuart Marks 
Date: Wed, 16 Sep 2015 16:24:35 -0700
Subject: [PATCH 81/94] 8072722: add stream support to Scanner

Reviewed-by: psandoz, chegar, sherman
---
 .../share/classes/java/util/Scanner.java      | 316 ++++++++++--
 jdk/test/java/util/Scanner/ScanTest.java      | 459 +++++++++++-------
 .../java/util/Scanner/ScannerStreamTest.java  | 125 +++++
 3 files changed, 676 insertions(+), 224 deletions(-)
 create mode 100644 jdk/test/java/util/Scanner/ScannerStreamTest.java

diff --git a/jdk/src/java.base/share/classes/java/util/Scanner.java b/jdk/src/java.base/share/classes/java/util/Scanner.java
index 6577cabe582..1fb17bc65bf 100644
--- a/jdk/src/java.base/share/classes/java/util/Scanner.java
+++ b/jdk/src/java.base/share/classes/java/util/Scanner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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,16 +25,18 @@
 
 package java.util;
 
-import java.nio.file.Path;
-import java.nio.file.Files;
-import java.util.regex.*;
 import java.io.*;
 import java.math.*;
 import java.nio.*;
 import java.nio.channels.*;
 import java.nio.charset.*;
+import java.nio.file.Path;
+import java.nio.file.Files;
 import java.text.*;
-import java.util.Locale;
+import java.util.function.Consumer;
+import java.util.regex.*;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
 
 import sun.misc.LRUCache;
 
@@ -96,22 +98,25 @@ import sun.misc.LRUCache;
  * }
  *
  * 
    The default whitespace delimiter used
- * by a scanner is as recognized by {@link java.lang.Character}.{@link
- * java.lang.Character#isWhitespace(char) isWhitespace}. The {@link #reset}
+ * by a scanner is as recognized by {@link Character#isWhitespace(char)
+ * Character.isWhitespace()}. The {@link #reset reset()}
  * method will reset the value of the scanner's delimiter to the default
  * whitespace delimiter regardless of whether it was previously changed.
  *
  * 
    A scanning operation may block waiting for input.
  *
  * 
    The {@link #next} and {@link #hasNext} methods and their
- * primitive-type companion methods (such as {@link #nextInt} and
+ * companion methods (such as {@link #nextInt} and
  * {@link #hasNextInt}) first skip any input that matches the delimiter
- * pattern, and then attempt to return the next token. Both {@code hasNext}
- * and {@code next} methods may block waiting for further input.  Whether a
- * {@code hasNext} method blocks has no connection to whether or not its
- * associated {@code next} method will block.
+ * pattern, and then attempt to return the next token. Both {@code hasNext()}
+ * and {@code next()} methods may block waiting for further input.  Whether a
+ * {@code hasNext()} method blocks has no connection to whether or not its
+ * associated {@code next()} method will block. The {@link #tokens} method
+ * may also block waiting for input.
  *
- * 
     The {@link #findInLine}, {@link #findWithinHorizon}, and {@link #skip}
+ * 
    The {@link #findInLine findInLine()},
+ * {@link #findWithinHorizon findWithinHorizon()},
+ * {@link #skip skip()}, and {@link #findAll findAll()}
  * methods operate independently of the delimiter pattern. These methods will
  * attempt to match the specified pattern with no regard to delimiters in the
  * input and thus can be used in special circumstances where delimiters are
@@ -129,7 +134,7 @@ import sun.misc.LRUCache;
  *
  * 
     A scanner can read text from any object which implements the {@link
  * java.lang.Readable} interface.  If an invocation of the underlying
- * readable's {@link java.lang.Readable#read} method throws an {@link
+ * readable's {@link java.lang.Readable#read read()} method throws an {@link
  * java.io.IOException} then the scanner assumes that the end of the input
  * has been reached.  The most recent {@code IOException} thrown by the
  * underlying readable can be retrieved via the {@link #ioException} method.
@@ -156,7 +161,7 @@ import sun.misc.LRUCache;
  * initial locale is the value returned by the {@link
  * java.util.Locale#getDefault(Locale.Category)
  * Locale.getDefault(Locale.Category.FORMAT)} method; it may be changed via the {@link
- * #useLocale} method. The {@link #reset} method will reset the value of the
+ * #useLocale useLocale()} method. The {@link #reset} method will reset the value of the
  * scanner's locale to the initial locale regardless of whether it was
  * previously changed.
  *
@@ -374,6 +379,11 @@ public final class Scanner implements Iterator, Closeable {
     // A holder of the last IOException encountered
     private IOException lastException;
 
+    // Number of times this scanner's state has been modified.
+    // Generally incremented on most public APIs and checked
+    // within spliterator implementations.
+    int modCount;
+
     // A pattern for java whitespace
     private static Pattern WHITESPACE_PATTERN = Pattern.compile(
                                                 "\\p{javaWhitespace}+");
@@ -995,8 +1005,9 @@ public final class Scanner implements Iterator, Closeable {
     }
 
     // Finds the specified pattern in the buffer up to horizon.
-    // Returns a match for the specified input pattern.
-    private String findPatternInBuffer(Pattern pattern, int horizon) {
+    // Returns true if the specified input pattern was matched,
+    // and leaves the matcher field with the current match state.
+    private boolean findPatternInBuffer(Pattern pattern, int horizon) {
         matchValid = false;
         matcher.usePattern(pattern);
         int bufferLimit = buf.limit();
@@ -1014,7 +1025,7 @@ public final class Scanner implements Iterator, Closeable {
                 if (searchLimit != horizonLimit) {
                      // Hit an artificial end; try to extend the match
                     needInput = true;
-                    return null;
+                    return false;
                 }
                 // The match could go away depending on what is next
                 if ((searchLimit == horizonLimit) && matcher.requireEnd()) {
@@ -1022,27 +1033,28 @@ public final class Scanner implements Iterator, Closeable {
                     // that it is at the horizon and the end of input is
                     // required for the match.
                     needInput = true;
-                    return null;
+                    return false;
                 }
             }
             // Did not hit end, or hit real end, or hit horizon
             position = matcher.end();
-            return matcher.group();
+            return true;
         }
 
         if (sourceClosed)
-            return null;
+            return false;
 
         // If there is no specified horizon, or if we have not searched
         // to the specified horizon yet, get more input
         if ((horizon == 0) || (searchLimit != horizonLimit))
             needInput = true;
-        return null;
+        return false;
     }
 
-    // Returns a match for the specified input pattern anchored at
-    // the current position
-    private String matchPatternInBuffer(Pattern pattern) {
+    // Attempts to match a pattern anchored at the current position.
+    // Returns true if the specified input pattern was matched,
+    // and leaves the matcher field with the current match state.
+    private boolean matchPatternInBuffer(Pattern pattern) {
         matchValid = false;
         matcher.usePattern(pattern);
         matcher.region(position, buf.limit());
@@ -1050,18 +1062,18 @@ public final class Scanner implements Iterator, Closeable {
             if (matcher.hitEnd() && (!sourceClosed)) {
                 // Get more input and try again
                 needInput = true;
-                return null;
+                return false;
             }
             position = matcher.end();
-            return matcher.group();
+            return true;
         }
 
         if (sourceClosed)
-            return null;
+            return false;
 
         // Read more to find pattern
         needInput = true;
-        return null;
+        return false;
     }
 
     // Throws if the scanner is closed
@@ -1128,6 +1140,7 @@ public final class Scanner implements Iterator, Closeable {
      * @return this scanner
      */
     public Scanner useDelimiter(Pattern pattern) {
+        modCount++;
         delimPattern = pattern;
         return this;
     }
@@ -1147,6 +1160,7 @@ public final class Scanner implements Iterator, Closeable {
      * @return this scanner
      */
     public Scanner useDelimiter(String pattern) {
+        modCount++;
         delimPattern = patternCache.forName(pattern);
         return this;
     }
@@ -1181,6 +1195,7 @@ public final class Scanner implements Iterator, Closeable {
         if (locale.equals(this.locale))
             return this;
 
+        modCount++;
         this.locale = locale;
         DecimalFormat df =
             (DecimalFormat)NumberFormat.getNumberInstance(locale);
@@ -1236,8 +1251,8 @@ public final class Scanner implements Iterator, Closeable {
      * number matching regular expressions; see
      * localized numbers above.
      *
-     * 
    If the radix is less than {@code Character.MIN_RADIX}
-     * or greater than {@code Character.MAX_RADIX}, then an
+     * 
    If the radix is less than {@link Character#MIN_RADIX Character.MIN_RADIX}
+     * or greater than {@link Character#MAX_RADIX Character.MAX_RADIX}, then an
      * {@code IllegalArgumentException} is thrown.
      *
      * 
    Invoking the {@link #reset} method will set the scanner's radix to
@@ -1253,6 +1268,7 @@ public final class Scanner implements Iterator, Closeable {
 
         if (this.defaultRadix == radix)
             return this;
+        modCount++;
         this.defaultRadix = radix;
         // Force rebuilding and recompilation of radix dependent patterns
         integerPattern = null;
@@ -1275,15 +1291,15 @@ public final class Scanner implements Iterator, Closeable {
      * if no match has been performed, or if the last match was
      * not successful.
      *
-     * 
    The various {@code next}methods of {@code Scanner}
+     * 
    The various {@code next} methods of {@code Scanner}
      * make a match result available if they complete without throwing an
      * exception. For instance, after an invocation of the {@link #nextInt}
      * method that returned an int, this method returns a
      * {@code MatchResult} for the search of the
      * Integer regular expression
-     * defined above. Similarly the {@link #findInLine},
-     * {@link #findWithinHorizon}, and {@link #skip} methods will make a
-     * match available if they succeed.
+     * defined above. Similarly the {@link #findInLine findInLine()},
+     * {@link #findWithinHorizon findWithinHorizon()}, and {@link #skip skip()}
+     * methods will make a match available if they succeed.
      *
      * @return a match result for the last match operation
      * @throws IllegalStateException  If no match result is available
@@ -1333,6 +1349,7 @@ public final class Scanner implements Iterator, Closeable {
     public boolean hasNext() {
         ensureOpen();
         saveState();
+        modCount++;
         while (!sourceClosed) {
             if (hasTokenInBuffer())
                 return revertState(true);
@@ -1357,6 +1374,7 @@ public final class Scanner implements Iterator, Closeable {
     public String next() {
         ensureOpen();
         clearCaches();
+        modCount++;
 
         while (true) {
             String token = getCompleteTokenInBuffer(null);
@@ -1435,6 +1453,7 @@ public final class Scanner implements Iterator, Closeable {
             throw new NullPointerException();
         hasNextPattern = null;
         saveState();
+        modCount++;
 
         while (true) {
             if (getCompleteTokenInBuffer(pattern) != null) {
@@ -1466,6 +1485,7 @@ public final class Scanner implements Iterator, Closeable {
         if (pattern == null)
             throw new NullPointerException();
 
+        modCount++;
         // Did we already find this pattern?
         if (hasNextPattern == pattern)
             return getCachedResult();
@@ -1497,6 +1517,7 @@ public final class Scanner implements Iterator, Closeable {
     public boolean hasNextLine() {
         saveState();
 
+        modCount++;
         String result = findWithinHorizon(linePattern(), 0);
         if (result != null) {
             MatchResult mr = this.match();
@@ -1531,6 +1552,7 @@ public final class Scanner implements Iterator, Closeable {
      * @throws IllegalStateException if this scanner is closed
      */
     public String nextLine() {
+        modCount++;
         if (hasNextPattern == linePattern())
             return getCachedResult();
         clearCaches();
@@ -1589,12 +1611,12 @@ public final class Scanner implements Iterator, Closeable {
         if (pattern == null)
             throw new NullPointerException();
         clearCaches();
+        modCount++;
         // Expand buffer to include the next newline or end of input
         int endPosition = 0;
         saveState();
         while (true) {
-            String token = findPatternInBuffer(separatorPattern(), 0);
-            if (token != null) {
+            if (findPatternInBuffer(separatorPattern(), 0)) {
                 endPosition = matcher.start();
                 break; // up to next newline
             }
@@ -1623,7 +1645,7 @@ public final class Scanner implements Iterator, Closeable {
      * 
    An invocation of this method of the form
      * {@code findWithinHorizon(pattern)} behaves in exactly the same way as
      * the invocation
-     * {@code findWithinHorizon(Pattern.compile(pattern, horizon))}.
+     * {@code findWithinHorizon(Pattern.compile(pattern), horizon)}.
      *
      * @param pattern a string specifying the pattern to search for
      * @param horizon the search horizon
@@ -1673,13 +1695,13 @@ public final class Scanner implements Iterator, Closeable {
         if (horizon < 0)
             throw new IllegalArgumentException("horizon < 0");
         clearCaches();
+        modCount++;
 
         // Search for the pattern
         while (true) {
-            String token = findPatternInBuffer(pattern, horizon);
-            if (token != null) {
+            if (findPatternInBuffer(pattern, horizon)) {
                 matchValid = true;
-                return token;
+                return matcher.group();
             }
             if (needInput)
                 readInput();
@@ -1717,11 +1739,11 @@ public final class Scanner implements Iterator, Closeable {
         if (pattern == null)
             throw new NullPointerException();
         clearCaches();
+        modCount++;
 
         // Search for the pattern
         while (true) {
-            String token = matchPatternInBuffer(pattern);
-            if (token != null) {
+            if (matchPatternInBuffer(pattern)) {
                 matchValid = true;
                 position = matcher.end();
                 return this;
@@ -1932,7 +1954,7 @@ public final class Scanner implements Iterator, Closeable {
      *
      * 
     An invocation of this method of the form
      * {@code nextShort()} behaves in exactly the same way as the
-     * invocation {@code nextShort(radix)}, where {@code radix}
+     * invocation {@link #nextShort(int) nextShort(radix)}, where {@code radix}
      * is the default radix of this scanner.
      *
      * @return the {@code short} scanned from the input
@@ -2590,8 +2612,10 @@ public final class Scanner implements Iterator, Closeable {
      * Resets this scanner.
      *
      * 
     Resetting a scanner discards all of its explicit state
-     * information which may have been changed by invocations of {@link
-     * #useDelimiter}, {@link #useLocale}, or {@link #useRadix}.
+     * information which may have been changed by invocations of
+     * {@link #useDelimiter useDelimiter()},
+     * {@link #useLocale useLocale()}, or
+     * {@link #useRadix useRadix()}.
      *
      * 
     An invocation of this method of the form
      * {@code scanner.reset()} behaves in exactly the same way as the
@@ -2612,6 +2636,206 @@ public final class Scanner implements Iterator, Closeable {
         useLocale(Locale.getDefault(Locale.Category.FORMAT));
         useRadix(10);
         clearCaches();
+        modCount++;
         return this;
     }
+
+    /**
+     * Returns a stream of delimiter-separated tokens from this scanner. The
+     * stream contains the same tokens that would be returned, starting from
+     * this scanner's current state, by calling the {@link #next} method
+     * repeatedly until the {@link #hasNext} method returns false.
+     *
+     * 
    The resulting stream is sequential and ordered. All stream elements are
+     * non-null.
+     *
+     * 
    Scanning starts upon initiation of the terminal stream operation, using the
+     * current state of this scanner. Subsequent calls to any methods on this scanner
+     * other than {@link #close} and {@link #ioException} may return undefined results
+     * or may cause undefined effects on the returned stream. The returned stream's source
+     * {@code Spliterator} is fail-fast and will, on a best-effort basis, throw a
+     * {@link java.util.ConcurrentModificationException} if any such calls are detected
+     * during stream pipeline execution.
+     *
+     * 
    After stream pipeline execution completes, this scanner is left in an indeterminate
+     * state and cannot be reused.
+     *
+     * 
    If this scanner contains a resource that must be released, this scanner
+     * should be closed, either by calling its {@link #close} method, or by
+     * closing the returned stream. Closing the stream will close the underlying scanner.
+     * {@code IllegalStateException} is thrown if the scanner has been closed when this
+     * method is called, or if this scanner is closed during stream pipeline execution.
+     *
+     * 
    This method might block waiting for more input.
+     *
+     * @apiNote
+     * For example, the following code will create a list of
+     * comma-delimited tokens from a string:
+     *
+     * 
    {@code
+     * List result = new Scanner("abc,def,,ghi")
+     *     .useDelimiter(",")
+     *     .tokens()
+     *     .collect(Collectors.toList());
+     * }
    
+     *
+     * 
    The resulting list would contain {@code "abc"}, {@code "def"},
+     * the empty string, and {@code "ghi"}.
+     *
+     * @return a sequential stream of token strings
+     * @throws IllegalStateException if this scanner is closed
+     * @since 1.9
+     */
+    public Stream tokens() {
+        ensureOpen();
+        Stream stream = StreamSupport.stream(new TokenSpliterator(), false);
+        return stream.onClose(this::close);
+    }
+
+    class TokenSpliterator extends Spliterators.AbstractSpliterator {
+        int expectedCount = -1;
+
+        TokenSpliterator() {
+            super(Long.MAX_VALUE,
+                  Spliterator.IMMUTABLE | Spliterator.NONNULL | Spliterator.ORDERED);
+        }
+
+        @Override
+        public boolean tryAdvance(Consumer cons) {
+            if (expectedCount >= 0 && expectedCount != modCount) {
+                throw new ConcurrentModificationException();
+            }
+
+            if (hasNext()) {
+                String token = next();
+                expectedCount = modCount;
+                cons.accept(token);
+                if (expectedCount != modCount) {
+                    throw new ConcurrentModificationException();
+                }
+                return true;
+            } else {
+                expectedCount = modCount;
+                return false;
+            }
+        }
+    }
+
+    /**
+     * Returns a stream of match results from this scanner. The stream
+     * contains the same results in the same order that would be returned by
+     * calling {@code findWithinHorizon(pattern, 0)} and then {@link #match}
+     * successively as long as {@link #findWithinHorizon findWithinHorizon()}
+     * finds matches.
+     *
+     * 
    The resulting stream is sequential and ordered. All stream elements are
+     * non-null.
+     *
+     * 
    Scanning starts upon initiation of the terminal stream operation, using the
+     * current state of this scanner. Subsequent calls to any methods on this scanner
+     * other than {@link #close} and {@link #ioException} may return undefined results
+     * or may cause undefined effects on the returned stream. The returned stream's source
+     * {@code Spliterator} is fail-fast and will, on a best-effort basis, throw a
+     * {@link java.util.ConcurrentModificationException} if any such calls are detected
+     * during stream pipeline execution.
+     *
+     * 
    After stream pipeline execution completes, this scanner is left in an indeterminate
+     * state and cannot be reused.
+     *
+     * 
    If this scanner contains a resource that must be released, this scanner
+     * should be closed, either by calling its {@link #close} method, or by
+     * closing the returned stream. Closing the stream will close the underlying scanner.
+     * {@code IllegalStateException} is thrown if the scanner has been closed when this
+     * method is called, or if this scanner is closed during stream pipeline execution.
+     *
+     * 
    As with the {@link #findWithinHorizon findWithinHorizon()} methods, this method
+     * might block waiting for additional input, and it might buffer an unbounded amount of
+     * input searching for a match.
+     *
+     * @apiNote
+     * For example, the following code will read a file and return a list
+     * of all sequences of characters consisting of seven or more Latin capital
+     * letters:
+     *
+     * 
    {@code
+     * try (Scanner sc = new Scanner(Paths.get("input.txt"))) {
+     *     Pattern pat = Pattern.compile("[A-Z]{7,}");
+     *     List capWords = sc.findAll(pat)
+     *                               .map(MatchResult::group)
+     *                               .collect(Collectors.toList());
+     * }
+     * }
    
+     *
+     * @param pattern the pattern to be matched
+     * @return a sequential stream of match results
+     * @throws NullPointerException if pattern is null
+     * @throws IllegalStateException if this scanner is closed
+     * @since 1.9
+     */
+    public Stream findAll(Pattern pattern) {
+        Objects.requireNonNull(pattern);
+        ensureOpen();
+        Stream stream = StreamSupport.stream(new FindSpliterator(pattern), false);
+        return stream.onClose(this::close);
+    }
+
+    /**
+     * Returns a stream of match results that match the provided pattern string.
+     * The effect is equivalent to the following code:
+     *
+     * 
    {@code
+     *     scanner.findAll(Pattern.compile(patString))
+     * }
    
+     *
+     * @param patString the pattern string
+     * @return a sequential stream of match results
+     * @throws NullPointerException if patString is null
+     * @throws IllegalStateException if this scanner is closed
+     * @throws PatternSyntaxException if the regular expression's syntax is invalid
+     * @since 1.9
+     * @see java.util.regex.Pattern
+     */
+    public Stream findAll(String patString) {
+        Objects.requireNonNull(patString);
+        ensureOpen();
+        return findAll(patternCache.forName(patString));
+    }
+
+    class FindSpliterator extends Spliterators.AbstractSpliterator {
+        final Pattern pattern;
+        int expectedCount = -1;
+
+        FindSpliterator(Pattern pattern) {
+            super(Long.MAX_VALUE,
+                  Spliterator.IMMUTABLE | Spliterator.NONNULL | Spliterator.ORDERED);
+            this.pattern = pattern;
+        }
+
+        @Override
+        public boolean tryAdvance(Consumer cons) {
+            ensureOpen();
+            if (expectedCount >= 0) {
+                if (expectedCount != modCount) {
+                    throw new ConcurrentModificationException();
+                }
+            } else {
+                expectedCount = modCount;
+            }
+
+            while (true) {
+                // assert expectedCount == modCount
+                if (findPatternInBuffer(pattern, 0)) { // doesn't increment modCount
+                    cons.accept(matcher.toMatchResult());
+                    if (expectedCount != modCount) {
+                        throw new ConcurrentModificationException();
+                    }
+                    return true;
+                }
+                if (needInput)
+                    readInput(); // doesn't increment modCount
+                else
+                    return false; // reached end of input
+            }
+        }
+    }
 }
diff --git a/jdk/test/java/util/Scanner/ScanTest.java b/jdk/test/java/util/Scanner/ScanTest.java
index 388bac0103b..9f9103d382e 100644
--- a/jdk/test/java/util/Scanner/ScanTest.java
+++ b/jdk/test/java/util/Scanner/ScanTest.java
@@ -24,25 +24,30 @@
 /**
  * @test
  * @bug 4313885 4926319 4927634 5032610 5032622 5049968 5059533 6223711 6277261 6269946 6288823
+ *      8072722
  * @summary Basic tests of java.util.Scanner methods
  * @key randomness
  * @run main/othervm ScanTest
  */
 
-import java.util.*;
-import java.text.*;
 import java.io.*;
-import java.nio.*;
-import java.util.regex.*;
 import java.math.*;
+import java.nio.*;
+import java.text.*;
+import java.util.*;
+import java.util.function.Consumer;
+import java.util.regex.*;
+import java.util.stream.*;
 
 public class ScanTest {
 
     private static boolean failure = false;
     private static int failCount = 0;
     private static int NUM_SOURCE_TYPES = 2;
+    private static File inputFile = new File(System.getProperty("test.src", "."), "input.txt");
 
     public static void main(String[] args) throws Exception {
+
         Locale reservedLocale = Locale.getDefault();
         String lang = reservedLocale.getLanguage();
         try {
@@ -70,8 +75,10 @@ public class ScanTest {
             cacheTest2();
             nonASCIITest();
             resetTest();
+            streamCloseTest();
+            streamComodTest();
 
-            for (int j=0; j\n]+");
-            sc.next();
-            String textOfRef = sc.next();
-            if (!textOfRef.equals(expected[i]))
+        try (Scanner sc = new Scanner(inputFile)) {
+            String testDataTag = sc.findWithinHorizon("usage case 4\n", 0);
+            if (!testDataTag.equals("usage case 4\n"))
                 failCount++;
-        }
-        // Read some html tags using < and > as delimiters
-        if (!sc.next().equals("/a"))
-            failCount++;
-        if (!sc.next().equals("b"))
-            failCount++;
 
-        // Scan some html tags using skip and next
-        Pattern nonTagStart = Pattern.compile("[^<]+");
-        Pattern tag = Pattern.compile("<[^>]+?>");
-        Pattern spotAfterTag = Pattern.compile("(?<=>)");
-        String[] expected2 = { "", "
    ", "