Merge pull request #799 from ngmr/refactor/use-empty-array-singletons

refactor: use empty array singletons

Author: joe-chacko

testify-iiop/src/main/java/testify/iiop/Skellington.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 IBM Corporation and others.
+ * Copyright 2026 IBM Corporation and others.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,7 +43,6 @@
 import java.util.Arrays;
 import java.util.Set;
 import java.util.TreeSet;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 public abstract class Skellington extends Servant implements Tie, Remote {
@@ -53,8 +52,7 @@ public Skellington() {
         final ValueHandler vh = Util.createValueHandler();
         this.ids = findRemoteInterfaces(this.getClass())
                 .map(vh::getRMIRepositoryID)
-                .collect(Collectors.toList())
-                .toArray(new String[0]);
+                .toArray(String[]::new);
     }
 
     private static Stream<Class<? extends Remote>> findRemoteInterfaces(final Class<?> forClass) {

testify-iiop/src/main/java/testify/iiop/annotation/ConfigureOrb.java

@@ -24,6 +24,8 @@
 import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
+
+import static org.apache.yoko.util.Arrays.NO_STRINGS;
 import java.util.Optional;
 
 import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
@@ -46,7 +48,7 @@ enum NameService {
         private final String initializerClassName;
 
         NameService() {
-            this.args = new String[0];
+            this.args = NO_STRINGS;
             this.initializerClassName = null;
         }
 

testify-iiop/src/main/java/testify/iiop/annotation/ServerSteward.java

@@ -55,6 +55,7 @@
 import static java.util.stream.Collectors.joining;
 import static java.util.stream.Collectors.toSet;
 import static javax.rmi.PortableRemoteObject.narrow;
+import static org.apache.yoko.util.Arrays.NO_STRINGS;
 import static org.hamcrest.CoreMatchers.anyOf;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -276,8 +277,7 @@ private String[] buildJvmArgs() {
             args.add("--add-opens");
             args.add("java.base/java.util=ALL-UNNAMED");
         }
-
-        return args.toArray(new String[0]);
+        return args.toArray(NO_STRINGS);
     }
 
     private String buildClasspathForVersion(String version) {

yoko-core/src/main/java/org/apache/yoko/orb/CORBA/Delegate.java

@@ -40,6 +40,8 @@
 import org.omg.CORBA.NO_RESPONSE;
 import org.omg.CORBA.OBJECT_NOT_EXIST;
 import org.omg.CORBA.Policy;
+
+import static org.apache.yoko.util.Arrays.emptyArray;
 import org.omg.CORBA.PolicyListHolder;
 import org.omg.CORBA.REBIND;
 import org.omg.CORBA.SetOverrideType;
@@ -75,7 +77,7 @@
 
 public final class Delegate extends org.omg.CORBA_2_4.portable.Delegate {
     private static final Logger logger = Logger.getLogger(Delegate.class.getName());
-    private static final Policy[] EMPTY_POLICY_ARRAY = new Policy[0];
+
     private final ORBInstance orbInstance;
     private IOR ior;
     private IOR origIor;
@@ -448,7 +450,7 @@ public org.omg.CORBA.Object set_policy_override(org.omg.CORBA.Object self, Polic
             // now overwrite/add the new policies
             for (Policy p : np) policiesByType.put(p.policy_type(), p);
             // copy the policies that survived into a new array
-            newPolicies = policiesByType.values().toArray(EMPTY_POLICY_ARRAY);
+            newPolicies = policiesByType.values().toArray(emptyArray(Policy.class));
         }
 
         final Delegate p = new Delegate(orbInstance, ior, origIor, newPolicies);
@@ -554,7 +556,7 @@ public Policy[] get_policy_overrides(org.omg.CORBA.Object self, int[] types) {
             }
         }
 
-        return list.toArray(EMPTY_POLICY_ARRAY);
+        return list.toArray(emptyArray(Policy.class));
     }
 
     public Policy get_client_policy(org.omg.CORBA.Object self, int type) {

yoko-core/src/main/java/org/apache/yoko/orb/CORBA/PolicyMap.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 IBM Corporation and others.
+ * Copyright 2026 IBM Corporation and others.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,23 +19,25 @@
 
 import org.omg.CORBA.Policy;
 
+import static org.apache.yoko.util.Arrays.emptyArray;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.TreeMap;
 
 public class PolicyMap extends TreeMap<Integer, Policy> {
-    private static final Policy[] ZERO_POLICIES_ARRAY = new Policy[0];
+
 
     public PolicyMap(PolicyMap m) { super(m); }
     public PolicyMap(Policy...policies) { for (Policy p: policies) add(p); }
 
     public void add(Policy p) { put(p.policy_type(), p); }
 
-    public Policy[] getAllPolicies() { return values().toArray(ZERO_POLICIES_ARRAY); }
+    public Policy[] getAllPolicies() { return values().toArray(emptyArray(Policy.class)); }
 
     public Policy[] getSomePolicies(int[] types) {
         List<Policy> list = new ArrayList<>();
         for (int type: types) if (containsKey(type)) list.add(get(type));
-        return list.toArray(ZERO_POLICIES_ARRAY);
+        return list.toArray(emptyArray(Policy.class));
     }
 }

yoko-core/src/main/java/org/apache/yoko/orb/CORBA/StubForObject.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 IBM Corporation and others.
+ * Copyright 2026 IBM Corporation and others.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,13 +20,15 @@
 import org.omg.CORBA.portable.IDLEntity;
 import org.omg.CORBA_2_4.portable.ObjectImpl;
 
+import static org.apache.yoko.util.Arrays.NO_STRINGS;
+
 final public class StubForObject extends ObjectImpl
         implements IDLEntity {
     // ------------------------------------------------------------------
     // Standard IDL to Java Mapping
     // ------------------------------------------------------------------
 
     public String[] _ids() {
-        return new String[0];
+        return NO_STRINGS;
     }
 }

yoko-core/src/main/java/org/apache/yoko/orb/CORBA/StubForRemote.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 IBM Corporation and others.
+ * Copyright 2026 IBM Corporation and others.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,13 +17,13 @@
  */
 package org.apache.yoko.orb.CORBA;
 
+import javax.rmi.CORBA.Stub;
 import java.rmi.Remote;
 
-import javax.rmi.CORBA.Stub;
+import static org.apache.yoko.util.Arrays.NO_STRINGS;
 
 public class StubForRemote extends Stub implements Remote {
-	public String[] _ids() {
-		return new String[0];
-	}
-	
+    public String[] _ids() {
+        return NO_STRINGS;
+    }
 }

yoko-core/src/main/java/org/apache/yoko/orb/CORBA/YokoOutputStream.java

@@ -50,6 +50,8 @@
 import org.omg.IOP.IORHelper;
 import org.omg.IOP.TaggedProfile;
 
+import static org.apache.yoko.util.Arrays.emptyArray;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Enumeration;
@@ -666,7 +668,7 @@ public void write_Object(org.omg.CORBA.Object value) {
             MARSHAL_OUT_LOG.finest(() -> "Writing a null CORBA object value");
             IOR ior = new IOR();
             ior.type_id = "";
-            ior.profiles = new TaggedProfile[0];
+            ior.profiles = emptyArray(TaggedProfile.class);
             IORHelper.write(this, ior);
         } else {
             if (value instanceof LocalObject)

yoko-core/src/main/java/org/apache/yoko/orb/CosNaming/NamingContextBase.java

@@ -49,6 +49,7 @@
 import static java.util.Objects.requireNonNull;
 import static java.util.logging.Level.WARNING;
 import static java.util.stream.Collectors.joining;
+import static org.apache.yoko.util.Arrays.emptyArray;
 import static org.apache.yoko.logging.VerboseLogging.NAMING_LOG;
 import static org.apache.yoko.util.MinorCodes.MinorObjectIsNull;
 import static org.omg.CORBA.CompletionStatus.COMPLETED_NO;
@@ -457,7 +458,7 @@ else if (ch == '/') {
         components.add(new NameComponent(id, kind));
 
         // and turn this into a component array
-        return components.toArray(new NameComponent[0]);
+        return components.toArray(emptyArray(NameComponent.class));
     }
 
     /**

yoko-core/src/main/java/org/apache/yoko/orb/CosNaming/tnaming/TransientNamingContext.java

@@ -38,6 +38,8 @@
 import org.omg.CosNaming.BindingIteratorPOA;
 import org.omg.CosNaming.BindingListHolder;
 import org.omg.CosNaming.NameComponent;
+
+import static org.apache.yoko.util.Arrays.emptyArray;
 import org.omg.CosNaming.NamingContextHelper;
 import org.omg.CosNaming.NamingContext;
 
@@ -397,7 +399,7 @@ public boolean next_one(BindingHolder b) {
             }
             else {
                 // return an empty element
-                b.value = new Binding(new NameComponent[0], BindingType.nobject);
+                b.value = new Binding(emptyArray(NameComponent.class), BindingType.nobject);
                 return false;
             }
         }