From 7ff42f7444fcce7e20bed91455f57c123d3454cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Sat, 17 Aug 2024 23:34:51 +0200 Subject: [PATCH] Replaced deprecated methods and calls MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Factory renamed to ServantFactory - name based on javadoc - Factory caused compilation error because it is a keyword - CodegenProxyCreator.create removed - deprecated, because it called deprecated PFL methods which did not work on JDK17+ - IDLLeadingUnderscoresTest - removed test for _() method name - Forbidden in JDK21+ - See JEP 443 - TestCodegenProxyCreator, Sample - using different method than the deprecated one Signed-off-by: David Matějček --- .../src/test/idl/corba/poapolicies/Hello.idl | 3 +- .../poapolicies/BasicObjectFactoryImpl.java | 5 +- .../java/corba/poapolicies/HelloClient.java | 7 +- .../java/corba/poapolicies/HelloServer.java | 5 +- .../test/java/corba/poapolicies/Utility.java | 9 +- .../rmi/codegen/CodegenProxyCreator.java | 126 +++++------------- .../IDLLeadingUnderscoresTest.java | 18 ++- .../TestCodegenProxyCreator.java | 3 +- test/src/share/classes/corba/tbbc/Sample.java | 3 +- 9 files changed, 61 insertions(+), 118 deletions(-) diff --git a/functional-tests/src/test/idl/corba/poapolicies/Hello.idl b/functional-tests/src/test/idl/corba/poapolicies/Hello.idl index 894be05fc..efea66fe1 100644 --- a/functional-tests/src/test/idl/corba/poapolicies/Hello.idl +++ b/functional-tests/src/test/idl/corba/poapolicies/Hello.idl @@ -1,4 +1,5 @@ /* + * Copyright (c) 2024 Contributors to the Eclipse Foundation. * Copyright (c) 1997, 2020 Oracle and/or its affiliates. * * This program and the accompanying materials are made available under the @@ -37,7 +38,7 @@ module Util { // invocation path more extensively (example, ones that // throw exceptions etc) - interface Factory { + interface ServantFactory { Object create(in string intfName, in string implName, in CreationMethods how); void overAndOut(); }; diff --git a/functional-tests/src/test/java/corba/poapolicies/BasicObjectFactoryImpl.java b/functional-tests/src/test/java/corba/poapolicies/BasicObjectFactoryImpl.java index 55423284b..2ce955d5a 100644 --- a/functional-tests/src/test/java/corba/poapolicies/BasicObjectFactoryImpl.java +++ b/functional-tests/src/test/java/corba/poapolicies/BasicObjectFactoryImpl.java @@ -1,4 +1,5 @@ /* + * Copyright (c) 2024 Contributors to the Eclipse Foundation. * Copyright (c) 1997, 2020 Oracle and/or its affiliates. * * This program and the accompanying materials are made available under the @@ -20,11 +21,11 @@ package corba.poapolicies; import Util.CreationMethods; -import Util.FactoryPOA; +import Util.ServantFactoryPOA; import org.omg.PortableServer.POA; import org.omg.PortableServer.Servant; -public class BasicObjectFactoryImpl extends FactoryPOA +public class BasicObjectFactoryImpl extends ServantFactoryPOA { final boolean useServantToReference = true; diff --git a/functional-tests/src/test/java/corba/poapolicies/HelloClient.java b/functional-tests/src/test/java/corba/poapolicies/HelloClient.java index 8309ecbbc..307a131ba 100644 --- a/functional-tests/src/test/java/corba/poapolicies/HelloClient.java +++ b/functional-tests/src/test/java/corba/poapolicies/HelloClient.java @@ -1,4 +1,5 @@ /* + * Copyright (c) 2024 Contributors to the Eclipse Foundation. * Copyright (c) 1997, 2020 Oracle and/or its affiliates. * * This program and the accompanying materials are made available under the @@ -22,10 +23,10 @@ import HelloStuff.Hello; import HelloStuff.HelloHelper; import Util.CreationMethods; -import Util.Factory; +import Util.ServantFactory; public class HelloClient { - public static Hello createHello(CreationMethods c, Factory f) { + public static Hello createHello(CreationMethods c, ServantFactory f) { System.out.println("createHello"); String id = HelloHelper.id(); System.out.println("id: " + id); @@ -60,7 +61,7 @@ public static void main(String[] args) { System.out.println("Client starting"); Utility u = new Utility(args); - Factory f = u.readFactory(); + ServantFactory f = u.readFactory(); System.out.println("readFactory"); diff --git a/functional-tests/src/test/java/corba/poapolicies/HelloServer.java b/functional-tests/src/test/java/corba/poapolicies/HelloServer.java index d68768fab..ed9e8be19 100644 --- a/functional-tests/src/test/java/corba/poapolicies/HelloServer.java +++ b/functional-tests/src/test/java/corba/poapolicies/HelloServer.java @@ -1,4 +1,5 @@ /* + * Copyright (c) 2024 Contributors to the Eclipse Foundation. * Copyright (c) 1997, 2020 Oracle and/or its affiliates. * * This program and the accompanying materials are made available under the @@ -19,7 +20,7 @@ package corba.poapolicies; -import Util.FactoryHelper; +import Util.ServantFactoryHelper; import org.omg.PortableServer.POA; class Waiter extends Thread { @@ -82,7 +83,7 @@ public static void main(String[] args) { byte[] id = thePOA.activate_object(theFactory); - u.writeFactory(FactoryHelper.narrow(thePOA.servant_to_reference(theFactory))); + u.writeFactory(ServantFactoryHelper.narrow(thePOA.servant_to_reference(theFactory))); thePOA.the_POAManager().activate(); diff --git a/functional-tests/src/test/java/corba/poapolicies/Utility.java b/functional-tests/src/test/java/corba/poapolicies/Utility.java index f688a7185..26f164da9 100644 --- a/functional-tests/src/test/java/corba/poapolicies/Utility.java +++ b/functional-tests/src/test/java/corba/poapolicies/Utility.java @@ -1,4 +1,5 @@ /* + * Copyright (c) 2024 Contributors to the Eclipse Foundation. * Copyright (c) 1997, 2020 Oracle and/or its affiliates. * * This program and the accompanying materials are made available under the @@ -76,12 +77,12 @@ public org.omg.CORBA.Object readObjref(String file) { return null; } - public void writeFactory(Util.Factory ref) { - writeObjref(ref, "Factory"); + public void writeFactory(Util.ServantFactory ref) { + writeObjref(ref, "ServantFactory"); } - public Util.Factory readFactory() { - return Util.FactoryHelper.narrow(readObjref("Factory")); + public Util.ServantFactory readFactory() { + return Util.ServantFactoryHelper.narrow(readObjref("ServantFactory")); } } diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/codegen/CodegenProxyCreator.java b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/codegen/CodegenProxyCreator.java index fd04b0cc8..4b6338039 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/codegen/CodegenProxyCreator.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/codegen/CodegenProxyCreator.java @@ -1,4 +1,5 @@ /* + * Copyright (c) 2024 Contributors to the Eclipse Foundation * Copyright (c) 1997, 2020 Oracle and/or its affiliates. * * This program and the accompanying materials are made available under the @@ -19,6 +20,20 @@ package com.sun.corba.ee.impl.presentation.rmi.codegen; +import java.io.PrintStream; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; + +import org.glassfish.pfl.basic.contain.Pair; +import org.glassfish.pfl.dynamic.codegen.spi.Expression; +import org.glassfish.pfl.dynamic.codegen.spi.MethodInfo; +import org.glassfish.pfl.dynamic.codegen.spi.Primitives; +import org.glassfish.pfl.dynamic.codegen.spi.Type; +import org.glassfish.pfl.dynamic.codegen.spi.Utility; +import org.glassfish.pfl.dynamic.codegen.spi.Variable; + import static java.lang.reflect.Modifier.ABSTRACT; import static java.lang.reflect.Modifier.PRIVATE; import static java.lang.reflect.Modifier.PUBLIC; @@ -48,27 +63,13 @@ import static org.glassfish.pfl.dynamic.codegen.spi.Wrapper._void; import static org.glassfish.pfl.dynamic.codegen.spi.Wrapper.splitClassName; -import java.io.PrintStream; -import java.lang.reflect.Method; -import java.security.ProtectionDomain; -import java.util.ArrayList; -import java.util.List; -import java.util.Properties; -import org.glassfish.pfl.basic.contain.Pair; -import org.glassfish.pfl.dynamic.codegen.spi.Expression; -import org.glassfish.pfl.dynamic.codegen.spi.MethodInfo; -import org.glassfish.pfl.dynamic.codegen.spi.Primitives; -import org.glassfish.pfl.dynamic.codegen.spi.Type; -import org.glassfish.pfl.dynamic.codegen.spi.Utility; -import org.glassfish.pfl.dynamic.codegen.spi.Variable; - -/** Generate a proxy with a specified base class. +/** Generate a proxy with a specified base class. */ public class CodegenProxyCreator { - private String className ; - private Type superClass ; - private List interfaces ; - private List methods ; + private final String className ; + private final Type superClass ; + private final List interfaces ; + private final List methods ; private static final Properties debugProps = new Properties() ; private static final Properties emptyProps = new Properties() ; @@ -85,84 +86,19 @@ public CodegenProxyCreator( String className, Class sc, this.className = className ; this.superClass = Type.type( sc ) ; - this.interfaces = new ArrayList() ; + this.interfaces = new ArrayList<>() ; for (Class cls : interfaces) { this.interfaces.add( Type.type( cls ) ) ; } - this.methods = new ArrayList() ; + this.methods = new ArrayList<>() ; for (Method method : methods) { this.methods.add( Utility.getMethodInfo( method ) ) ; } } - /** Construct a generator for a proxy class - * that implements the given interfaces and extends superClass. - * superClass must satisfy the following requirements: - *
    - *
  1. It must have an accessible no args constructor
    2. - *
  2. It must have a method satisfying the signature - * Object invoke( int methodNumber, Object[] args ) throws Throwable - * - *
    3. - *
  3. The invoke method described above must be accessible - * to the generated class (generally either public or - * protected.
    4. - *
- *

- * Each method in methods is implemented by a method that: - *

    - *
  1. Creates an array sized to hold the args
    2. - *
  2. Wraps args of primitive type in the appropriate wrapper.
    3. - *
  3. Copies each arg or wrapper arg into the array.
    4. - *
  4. Calls invoke with a method number corresponding to the - * index of the method in methods. Note that the invoke implementation - * must use the same method array to figure out which method has been - * invoked.
    5. - *
  5. Return the result (if any), extracting values from wrappers - * as needed to handle a return value of a primitive type.
    6. - *
- *

- * Note that the generated methods ignore exceptions. - * It is assumed that the invoke method may throw any - * desired exception. - * @param pd the protection domain of the generated class - * @param cl the classloader in which to generate the class - * @param debug if true, generate debug messages - * @param ps a PrintStream to which the debug messages should be written - * @return Generator for class - * @deprecated use {@link #create(Class, boolean, PrintStream)} - */ - @Deprecated - public Class create( ProtectionDomain pd, ClassLoader cl, boolean debug, PrintStream ps ) { - - Pair nm = splitClassName( className ) ; - - _clear() ; - _setClassLoader( cl ) ; - _package( nm.first() ) ; - _class( PUBLIC, nm.second(), superClass, interfaces ) ; - - _constructor( PUBLIC ) ; - _body() ; - _expr(_super()); - _end() ; - - _method( PRIVATE, _Object(), "writeReplace" ) ; - _body() ; - _return(_call(_this(), "selfAsBaseClass" )) ; - _end() ; - - int ctr=0 ; - for (MethodInfo method : methods) - createMethod( ctr++, method ) ; - - _end() ; // of _class - - return _generate( cl, pd, debug ? debugProps : emptyProps, ps ) ; - } - - /** Construct a generator for a proxy class + /** + * Construct a generator for a proxy class * that implements the given interfaces and extends superClass. * superClass must satisfy the following requirements: *

    @@ -218,8 +154,9 @@ public Class create( Class anchorClass, boolean debug, PrintStream ps ) { _end() ; int ctr=0 ; - for (MethodInfo method : methods) + for (MethodInfo method : methods) { createMethod( ctr++, method ) ; + } _end() ; // of _class @@ -231,17 +168,18 @@ public Class create( Class anchorClass, boolean debug, PrintStream ps ) { private static void createMethod( int mnum, MethodInfo method ) { Type rtype = method.returnType() ; _method( method.modifiers() & ~ABSTRACT, rtype, method.name()) ; - - List args = new ArrayList() ; - for (Variable var : method.arguments() ) + + List args = new ArrayList<>() ; + for (Variable var : method.arguments() ) { args.add( _arg( var.type(), var.ident() ) ) ; + } _body() ; - List wrappedArgs = new ArrayList() ; + List wrappedArgs = new ArrayList<>() ; for (Expression arg : args) { wrappedArgs.add( Primitives.wrap( arg ) ) ; } - + Expression invokeArgs = _define( objectArrayType, "args", _new_array_init( _Object(), wrappedArgs ) ) ; diff --git a/orbmain/src/test/java/corba/dynamicrmiiiop/testclasses/IDLLeadingUnderscoresTest.java b/orbmain/src/test/java/corba/dynamicrmiiiop/testclasses/IDLLeadingUnderscoresTest.java index 3dfef58dd..ebc8e3eb5 100644 --- a/orbmain/src/test/java/corba/dynamicrmiiiop/testclasses/IDLLeadingUnderscoresTest.java +++ b/orbmain/src/test/java/corba/dynamicrmiiiop/testclasses/IDLLeadingUnderscoresTest.java @@ -1,4 +1,5 @@ /* + * Copyright (c) 2024 Contributors to the Eclipse Foundation * Copyright (c) 1997, 2020 Oracle and/or its affiliates. * * This program and the accompanying materials are made available under the @@ -23,11 +24,10 @@ public class IDLLeadingUnderscoresTest { // // Set of idl names corresponding to alphabetically sorted set of - // interface methods. See TestIDLNameTranslator for sorting details. + // interface methods. See TestIDLNameTranslator for sorting details. // - static final String[] IDL_NAMES = { - - "J_", + static final String[] IDL_NAMES = { + "J_0", "J_J_", "J__", @@ -36,15 +36,13 @@ public class IDLLeadingUnderscoresTest { "J_a", "J_jj" }; - + public static String[] getIDLNames() { return IDL_NAMES; } public interface IDLLeadingUnderscores extends java.rmi.Remote { - void _() throws java.rmi.RemoteException; - void _0() throws java.rmi.RemoteException; void _J_() throws java.rmi.RemoteException; @@ -55,10 +53,10 @@ public interface IDLLeadingUnderscores extends java.rmi.Remote { void __a() throws java.rmi.RemoteException; - void _a() throws java.rmi.RemoteException; + void _a() throws java.rmi.RemoteException; + + void _jj() throws java.rmi.RemoteException; - void _jj() throws java.rmi.RemoteException; - } } diff --git a/test/src/share/classes/corba/dynamicrmiiiop/TestCodegenProxyCreator.java b/test/src/share/classes/corba/dynamicrmiiiop/TestCodegenProxyCreator.java index 4063cb635..867ff8d2e 100644 --- a/test/src/share/classes/corba/dynamicrmiiiop/TestCodegenProxyCreator.java +++ b/test/src/share/classes/corba/dynamicrmiiiop/TestCodegenProxyCreator.java @@ -1,4 +1,5 @@ /* + * Copyright (c) 2023 Contributors to the Eclipse Foundation. * Copyright (c) 1997, 2020 Oracle and/or its affiliates. * * This program and the accompanying materials are made available under the @@ -427,7 +428,7 @@ private void init() "corba.dynamicrmiiiop.TestInterfaceProxy", baseClass, interfaces, methods ) ; - proxyClass = pc.create( pd, loader, DEBUG, System.out ) ; + proxyClass = pc.create(this.getClass(), DEBUG, System.out ) ; } try { diff --git a/test/src/share/classes/corba/tbbc/Sample.java b/test/src/share/classes/corba/tbbc/Sample.java index 46e326c56..3e6371005 100644 --- a/test/src/share/classes/corba/tbbc/Sample.java +++ b/test/src/share/classes/corba/tbbc/Sample.java @@ -1,4 +1,5 @@ /* + * Copyright (c) 2023 Contributors to the Eclipse Foundation. * Copyright (c) 1997, 2020 Oracle and/or its affiliates. * * This program and the accompanying materials are made available under the @@ -80,7 +81,7 @@ public static void main( String[] args ) { } Class genClass = Sample.class ; - Class cls = _generate( genClass.getClassLoader(), genClass.getProtectionDomain(), null ) ; + Class cls = _generate( genClass, null ) ; try { Method m = cls.getDeclaredMethod( "main", String[].class ) ;