Revert "Merge pull request #6664 from jGauravGupta/FISH-8309"

This reverts commit 1e0a33e, reversing changes made to 3afdc5b.
payara · May 27, 2024 · bc8da9c · bc8da9c
1 parent 6f6b138
commit bc8da9c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 64 deletions.
diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/BundleDescriptor.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/BundleDescriptor.java
@@ -37,7 +37,7 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
-// Portions Copyright [2016-2024] [Payara Foundation and/or its affiliates]
+// Portions Copyright [2016-2021] [Payara Foundation and/or its affiliates]
 
 package com.sun.enterprise.deployment;
 
@@ -603,14 +603,6 @@ public void print(StringBuilder toStringBuilder) {
      */
     @Override
     public abstract ArchiveType getModuleType();
-
-    /**
-     * Processes the bundle descriptor.
-     * This method should be overridden in subclasses to provide specific processing logic
-     * for the bundle descriptor.
-     */
-    public void processBundleDescriptor() {
-    }
 
     /**
      * @return the visitor for this bundle descriptor

diff --git a/...erver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/Archivist.java b/...erver/deployment/dol/src/main/java/com/sun/enterprise/deployment/archivist/Archivist.java
@@ -37,7 +37,7 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
-// Portions Copyright [2020-2024] [Payara Foundation and/or its affiliates.]
+// Portions Copyright [2020-2021] [Payara Foundation and/or its affiliates.]
 
 package com.sun.enterprise.deployment.archivist;
 
@@ -375,7 +375,6 @@ public void postRuntimeDDsRead(T descriptor,
      */
     protected void postOpen(T descriptor, ReadableArchive archive)
             throws IOException {
-        descriptor.processBundleDescriptor();
     }
 
     /**

diff --git a/...tainer/src/main/java/org/glassfish/ejb/deployment/descriptor/EjbBundleDescriptorImpl.java b/...tainer/src/main/java/org/glassfish/ejb/deployment/descriptor/EjbBundleDescriptorImpl.java
@@ -37,7 +37,7 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
-// Portions Copyright [2016-2024] [Payara Foundation and/or its affiliates]
+// Portions Copyright [2016-2019] [Payara Foundation and/or its affiliates]
 
 package org.glassfish.ejb.deployment.descriptor;
 
@@ -355,16 +355,6 @@ public Collection<Long> getDescriptorIds() {
         return ejbIDs;
     }
 
-    /**
-     * Processes the bundle descriptor by invoking the processing of each EjbDescriptor.
-     * It is assumed that the ejbs collection is already populated with EjbDescriptor instances.
-     */
-    public void processBundleDescriptor() {
-        for (EjbDescriptor ejbDescriptor : ejbs) {
-            ejbDescriptor.processDescriptor();
-        }
-    }
-
     public void addEjb(EjbDescriptor ejbDescriptor) {
         ejbDescriptor.setEjbBundleDescriptor(this);
         ejbs.add(ejbDescriptor);

diff --git a/...jb/ejb-container/src/main/java/org/glassfish/ejb/deployment/descriptor/EjbDescriptor.java b/...jb/ejb-container/src/main/java/org/glassfish/ejb/deployment/descriptor/EjbDescriptor.java
@@ -37,7 +37,7 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
-// Portions Copyright [2019-2024] [Payara Foundation and/or its affiliates]
+// Portions Copyright [2019-2021] [Payara Foundation and/or its affiliates]
 
 package org.glassfish.ejb.deployment.descriptor;
 
@@ -2373,47 +2373,6 @@ public void setEjbBundleDescriptor(EjbBundleDescriptorImpl bundleDescriptor) {
         this.bundleDescriptor = bundleDescriptor;
     }
 
-    /**
-     * Processes the descriptor by adding various descriptors and properties
-     * from the root bundle descriptor.
-     * It is expected that the bundle descriptor is already set before calling this method.
-     */
-    public void processDescriptor() {
-        if (this.bundleDescriptor != null) {
-            for (Object ejbRefObj : this.bundleDescriptor.getEjbReferenceDescriptors()) {
-                addEjbReferenceDescriptor((EjbReference) ejbRefObj);
-            }
-
-            for (Object msgDestRefObj : this.bundleDescriptor.getMessageDestinationReferenceDescriptors()) {
-                addMessageDestinationReferenceDescriptor((MessageDestinationReferenceDescriptor) msgDestRefObj);
-            }
-
-            for (Object envPropObj : this.bundleDescriptor.getEnvironmentProperties()) {
-                addOrMergeEnvironmentProperty((EnvironmentProperty) envPropObj);
-            }
-
-            for (Object servRefObj : this.bundleDescriptor.getServiceReferenceDescriptors()) {
-                addServiceReferenceDescriptor((ServiceReferenceDescriptor) servRefObj);
-            }
-
-            for (Object resRefObj : this.bundleDescriptor.getResourceReferenceDescriptors()) {
-                addResourceReferenceDescriptor((ResourceReferenceDescriptor) resRefObj);
-            }
-
-            for (Object resourceEnvRefObj : this.bundleDescriptor.getResourceEnvReferenceDescriptors()) {
-                addResourceEnvReferenceDescriptor((ResourceEnvReferenceDescriptor) resourceEnvRefObj);
-            }
-
-            for (EntityManagerFactoryReferenceDescriptor entMgrFacRef : this.bundleDescriptor.getEntityManagerFactoryReferenceDescriptors()) {
-                addEntityManagerFactoryReferenceDescriptor(entMgrFacRef);
-            }
-
-            for (EntityManagerReferenceDescriptor entMgrRef : this.bundleDescriptor.getEntityManagerReferenceDescriptors()) {
-                addEntityManagerReferenceDescriptor(entMgrRef);
-            }
-        }
-    }
-
     /**
      * Called by WebArchivist to notify this EjbDescriptor that it has been associated with a web bundle.
      *