Skip to content

TIKA-4594: Make PipesServer share ConfigStore with TikaGrpcServerImpl #2487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
nddipiazza wants to merge 1 commit into from
+22 −4
Closed

TIKA-4594: Make PipesServer share ConfigStore with TikaGrpcServerImpl #2487

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 22 additions & 4 deletions tika-pipes/tika-pipes-core/src/main/java/org/apache/tika/pipes/core/server/PipesServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@
import org.apache.tika.pipes.core.EmitStrategyConfig;
import org.apache.tika.pipes.core.PipesClient;
import org.apache.tika.pipes.core.PipesConfig;
import org.apache.tika.pipes.core.config.ConfigStore;
import org.apache.tika.pipes.core.config.ConfigStoreFactory;
import org.apache.tika.pipes.core.emitter.EmitterManager;
import org.apache.tika.pipes.core.fetcher.FetcherManager;
import org.apache.tika.plugins.TikaPluginManager;
Expand Down Expand Up @@ -454,10 +456,14 @@ protected void initializeResources() throws TikaException, IOException, SAXExcep
TikaJsonConfig tikaJsonConfig = tikaLoader.getConfig();
TikaPluginManager tikaPluginManager = TikaPluginManager.load(tikaJsonConfig);

//TODO allowed named configurations in tika config
this.fetcherManager = FetcherManager.load(tikaPluginManager, tikaJsonConfig);
// Always initialize emitters to support runtime overrides via ParseContext
this.emitterManager = EmitterManager.load(tikaPluginManager, tikaJsonConfig);
// Create ConfigStore using the same configuration as TikaGrpcServerImpl
// This allows fetchers saved via gRPC to be available to PipesServer
ConfigStore configStore = createConfigStore(pipesConfig, tikaPluginManager);

// Load FetcherManager with ConfigStore to enable runtime modifications
this.fetcherManager = FetcherManager.load(tikaPluginManager, tikaJsonConfig, true, configStore);
// Always initialize emitters to support runtime overrides via ParseContext
this.emitterManager = EmitterManager.load(tikaPluginManager, tikaJsonConfig, true, configStore);
this.autoDetectParser = (AutoDetectParser) tikaLoader.loadAutoDetectParser();
// Get the digester for pre-parse digesting of container documents.
// If user configured skipContainerDocumentDigest=false (the default), PipesServer
Expand All @@ -484,6 +490,18 @@ protected void initializeResources() throws TikaException, IOException, SAXExcep
this.rMetaParser = new RecursiveParserWrapper(autoDetectParser);
}

private ConfigStore createConfigStore(PipesConfig pipesConfig, TikaPluginManager tikaPluginManager) throws TikaException {
if (pipesConfig.getConfigStore() != null) {
ConfigStoreFactory factory = tikaPluginManager.getPluginManager()
.getExtensions(ConfigStoreFactory.class).stream()
.filter(f -> f.getClass().getName().equals(pipesConfig.getConfigStore().getFactoryClass()))
.findFirst()
.orElseThrow(() -> new TikaException("Could not find ConfigStoreFactory: " +
pipesConfig.getConfigStore().getFactoryClass()));
return factory.build(pipesConfig.getConfigStore().getParams());
}
return null;
}

private void write(PROCESSING_STATUS processingStatus, PipesResult pipesResult) {
try {
Expand Down
Loading