Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions app/server/appsmith-interfaces/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,12 @@
<artifactId>pf4j</artifactId>
<version>${org.pf4j.version}</version>
</dependency>
<dependency>
<groupId>org.pf4j</groupId>
<artifactId>pf4j-spring</artifactId>
<version>0.8.0</version>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>org.springframework.data</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import com.appsmith.util.SerializationUtils;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.pf4j.Plugin;
import org.pf4j.PluginWrapper;
import org.pf4j.spring.SpringPlugin;

public abstract class BasePlugin extends Plugin {
public abstract class BasePlugin extends SpringPlugin {
Comment thread
nidhi-nair marked this conversation as resolved.

protected static final ObjectMapper objectMapper =
SerializationUtils.getObjectMapperWithSourceInLocationAndMaxStringLengthEnabled();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,24 +1,105 @@
package com.appsmith.server.configurations;

import jakarta.annotation.PostConstruct;
import org.pf4j.ExtensionFactory;
import org.pf4j.PropertiesPluginDescriptorFinder;
import org.pf4j.spring.ExtensionsInjector;
import org.pf4j.spring.SpringExtensionFactory;
import org.pf4j.spring.SpringPlugin;
import org.pf4j.spring.SpringPluginManager;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

@Configuration
public class PluginConfiguration {

@Bean
public SpringPluginManager pluginManager() {
return new CustomPluginManager();
public SpringPluginManager pluginManager(ApplicationContext applicationContext) {
return new CustomPluginManager(applicationContext);
}

private static class CustomPluginManager extends SpringPluginManager {
public CustomPluginManager() {

private ApplicationContext applicationContext;

private CustomSpringExtensionFactory ef;

public CustomPluginManager(ApplicationContext applicationContext) {
super();
this.applicationContext = applicationContext;
this.ef = new CustomSpringExtensionFactory(this);
Comment on lines +31 to +34

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Eliminate redundant initialization of ef

The CustomSpringExtensionFactory instance ef is initialized both in the constructor and in createExtensionFactory(). This duplication is unnecessary.

Apply this diff to remove the redundant initialization:

- this.ef = new CustomSpringExtensionFactory(this);

Also applies to: 41-44

pluginDescriptorFinder = "development".equals(System.getProperty("pf4j.mode"))
? new PropertiesPluginDescriptorFinder("target/classes/plugin.properties")
: new PropertiesPluginDescriptorFinder();
}

@Override
protected ExtensionFactory createExtensionFactory() {
ef = new CustomSpringExtensionFactory(this);
return ef;
}

@Override
public ExtensionFactory getExtensionFactory() {
return ef;
}

@Override
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
this.applicationContext = applicationContext;
ef.setApplicationContext(applicationContext);
}

public ApplicationContext getApplicationContext() {
return applicationContext;
}

/**
* This method load, start plugins and inject extensions in Spring
*/
@PostConstruct
public void init() {
loadPlugins();
startPlugins();

AbstractAutowireCapableBeanFactory beanFactory =
(AbstractAutowireCapableBeanFactory) applicationContext.getAutowireCapableBeanFactory();
ExtensionsInjector extensionsInjector = new ExtensionsInjector(this, beanFactory);

ef.setApplicationContext(this.applicationContext);
extensionsInjector.injectExtensions();
}
}

static class CustomSpringExtensionFactory extends SpringExtensionFactory {

private ApplicationContext applicationContext;

public CustomSpringExtensionFactory(SpringPluginManager pluginManager) {
this(pluginManager, true);
}

public CustomSpringExtensionFactory(SpringPluginManager pluginManager, boolean autowire) {
super(pluginManager, autowire);
}

@Override
public <T> T create(Class<T> extensionClass) {
T extension = createWithSpring(extensionClass, this.applicationContext);
if (extension instanceof SpringPlugin sp) {
ConfigurableApplicationContext pluginContext =
(ConfigurableApplicationContext) sp.getApplicationContext();
pluginContext.setParent(applicationContext);
}
return extension;
}

public void setApplicationContext(ApplicationContext applicationContext) {
this.applicationContext = applicationContext;
}
}
}