fix(core): OSGi/Felix - Discard fragment JARs after upload #26518 (#2…

…8025) * #26518 now we remove fragments instead of moving to the updeploy folder * #26518 adding sonarq feedback --------- Co-authored-by: Freddy Montes <[email protected]>
dotCMS · Apr 16, 2024 · 26affeb · 26affeb
1 parent 4898cb1
commit 26affeb
Showing 1 changed file with 49 additions and 32 deletions.
diff --git a/dotCMS/src/main/java/org/apache/felix/framework/OSGIUtil.java b/dotCMS/src/main/java/org/apache/felix/framework/OSGIUtil.java
@@ -394,8 +394,6 @@ private void checkUploadFolder(final File uploadFolderFile, final ClusterLockMan
             Logger.debug(this, ()-> "***** Checking the upload folder for jars");
             if (this.anyJarOnUploadFolder(uploadFolderFile)) {
 
-
-
                 Logger.debug(this, ()-> "****** Has found jars on upload, folder, acquiring the lock and reloading the OSGI restart *****");
 
                 try {
@@ -412,10 +410,7 @@ private void checkUploadFolder(final File uploadFolderFile, final ClusterLockMan
 
                 Logger.debug(this, ()-> "No jars on upload folder");
                 // if not jars we want to wait for the next read of the upload folder
-
-
             }
-
     }
 
     private boolean anyJarOnUploadFolder(final File uploadFolderFile) {
@@ -561,40 +556,16 @@ public void moveNewBundlesToFelixLoadFolder(final String[] pathnames) {
     private void moveNewBundlesToFelixLoadFolder(final File uploadFolderFile, final String[] pathnames) {
 
         final File deployDirectory   = new File(this.getFelixDeployPath());
-        final File undeployDirectory = new File(this.getFelixUndeployPath());
         try {
 
             if (deployDirectory.exists() && deployDirectory.canWrite()) {
 
                 for (final String pathname : pathnames) {
 
-                    final File bundle      = new File(uploadFolderFile, pathname);
-                    File bundleDestination = new File(deployDirectory, bundle.getName());
-                    if (ResourceCollectorUtil.isFragmentJar(bundle)) {
-
-                        bundleDestination = new File(undeployDirectory, bundle.getName());
-                    }
-
-                    Logger.debug(this, "Moving the bundle: " + bundle + " to " + deployDirectory);
-
-                    if (FileUtil.move(bundle, bundleDestination)) {
-
-                        Try.run(()->APILocator.getSystemEventsAPI()					    // CLUSTER WIDE
-                                .push(SystemEventType.OSGI_BUNDLES_LOADED, new Payload(pathnames)))
-                                .onFailure(e -> Logger.error(OSGIUtil.this, e.getMessage()));
-
-                        Logger.debug(this, "Moved the bundle: " + bundle + " to " + deployDirectory);
-                    } else {
-                        Logger.debug(this, "Could not move the bundle: " + bundle + " to " + deployDirectory);
-                    }
+                    moveBundle(uploadFolderFile, pathnames, deployDirectory, pathname);
                 }
-
-                final String messageKey      = pathnames.length > 1? "new-osgi-plugins-installed":"new-osgi-plugin-installed";
-                final String successMessage  = Try.of(()->LanguageUtil.get(APILocator.getCompanyAPI()
-                        .getDefaultCompany().getLocale(), messageKey)).getOrElse(()-> "New OSGi Plugin(s) have been installed");
-                SystemMessageEventUtil.getInstance().pushMessage("OSGI_BUNDLES_LOADED",new SystemMessageBuilder().setMessage(successMessage)
-                        .setLife(DateUtil.FIVE_SECOND_MILLIS)
-                        .setSeverity(MessageSeverity.SUCCESS).create(), null);
+
+                sendOSGIBundlesLoadedMessage(pathnames);
             } else {
 
                 Logger.warn(this, "The directory: " + this.getFelixDeployPath()
@@ -606,6 +577,52 @@ private void moveNewBundlesToFelixLoadFolder(final File uploadFolderFile, final
         }
     }
 
+    private void moveBundle(final File uploadFolderFile,
+                            final String[] pathnames,
+                            final File deployDirectory,
+                            final String pathname) throws IOException {
+
+        final File bundle      = new File(uploadFolderFile, pathname);
+        final File bundleDestination = new File(deployDirectory, bundle.getName());
+        if (ResourceCollectorUtil.isFragmentJar(bundle)) { // now we delete the bundle if it is a fragment since we already have the exported packages covered
+
+            Files.delete(bundle.toPath());
+            Logger.debug(this, "Deleted the fragment bundle: " + bundle);
+            return;
+        }
+
+        Logger.debug(this, "Moving the bundle: " + bundle + " to " + deployDirectory);
+
+        move(pathnames, deployDirectory, bundle, bundleDestination);
+    }
+
+    private void move(final String[] pathnames,
+                      final File deployDirectory,
+                      final File bundle,
+                      final File bundleDestination) throws IOException {
+
+        if (FileUtil.move(bundle, bundleDestination)) {
+
+            Try.run(()->APILocator.getSystemEventsAPI()					    // CLUSTER WIDE
+                    .push(SystemEventType.OSGI_BUNDLES_LOADED, new Payload(pathnames)))
+                    .onFailure(e -> Logger.error(OSGIUtil.this, e.getMessage()));
+
+            Logger.debug(this, "Moved the bundle: " + bundle + " to " + deployDirectory);
+        } else {
+            Logger.debug(this, "Could not move the bundle: " + bundle + " to " + deployDirectory);
+        }
+    }
+
+    private static void sendOSGIBundlesLoadedMessage(final String[] pathnames) {
+
+        final String messageKey      = pathnames.length > 1? "new-osgi-plugins-installed":"new-osgi-plugin-installed";
+        final String successMessage  = Try.of(()->LanguageUtil.get(APILocator.getCompanyAPI()
+                .getDefaultCompany().getLocale(), messageKey)).getOrElse(()-> "New OSGi Plugin(s) have been installed");
+        SystemMessageEventUtil.getInstance().pushMessage("OSGI_BUNDLES_LOADED",new SystemMessageBuilder().setMessage(successMessage)
+                .setLife(DateUtil.FIVE_SECOND_MILLIS)
+                .setSeverity(MessageSeverity.SUCCESS).create(), null);
+    }
+
     /**
      * Stops the OSGi framework
      */