Skip to content

Commit

Permalink
Revert "SOLR-17302: Convert /cluster filestore APIs to JAX-RS (#2470)"
Browse files Browse the repository at this point in the history
This reverts commit 8c5ae1b.
  • Loading branch information
gerlowskija committed May 30, 2024
1 parent b16e961 commit 8814481
Show file tree
Hide file tree
Showing 15 changed files with 264 additions and 541 deletions.

This file was deleted.

This file was deleted.

20 changes: 2 additions & 18 deletions solr/core/src/java/org/apache/solr/core/CoreContainer.java
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,6 @@
import org.apache.solr.core.DirectoryFactory.DirContext;
import org.apache.solr.core.backup.repository.BackupRepository;
import org.apache.solr.core.backup.repository.BackupRepositoryFactory;
import org.apache.solr.filestore.ClusterFileStore;
import org.apache.solr.filestore.DistribFileStore;
import org.apache.solr.filestore.FileStore;
import org.apache.solr.filestore.FileStoreAPI;
import org.apache.solr.handler.ClusterAPI;
import org.apache.solr.handler.RequestHandlerBase;
Expand Down Expand Up @@ -297,9 +294,7 @@ && getZkController().getOverseer() != null
private volatile ClusterEventProducer clusterEventProducer;
private DelegatingPlacementPluginFactory placementPluginFactory;

private DistribFileStore fileStore;
private FileStoreAPI fileStoreAPI;
private ClusterFileStore clusterFileStoreAPI;
private SolrPackageLoader packageLoader;

private final Set<Path> allowPaths;
Expand Down Expand Up @@ -728,8 +723,8 @@ public SolrPackageLoader getPackageLoader() {
return packageLoader;
}

public FileStore getFileStore() {
return fileStore;
public FileStoreAPI getFileStoreAPI() {
return fileStoreAPI;
}

public SolrCache<?, ?> getCache(String name) {
Expand Down Expand Up @@ -861,11 +856,9 @@ private void loadInternal() {
(PublicKeyHandler) containerHandlers.get(PublicKeyHandler.PATH));
pkiAuthenticationSecurityBuilder.initializeMetrics(solrMetricsContext, "/authentication/pki");

fileStore = new DistribFileStore(this);
fileStoreAPI = new FileStoreAPI(this);
registerV2ApiIfEnabled(fileStoreAPI.readAPI);
registerV2ApiIfEnabled(fileStoreAPI.writeAPI);
registerV2ApiIfEnabled(ClusterFileStore.class);

packageLoader = new SolrPackageLoader(this);
registerV2ApiIfEnabled(packageLoader.getPackageAPI().editAPI);
Expand Down Expand Up @@ -1157,15 +1150,6 @@ protected void configure() {
.in(Singleton.class);
}
})
.register(
new AbstractBinder() {
@Override
protected void configure() {
bindFactory(new InjectionFactories.SingletonFactory<>(fileStore))
.to(DistribFileStore.class)
.in(Singleton.class);
}
})
.register(
new AbstractBinder() {
@Override
Expand Down
257 changes: 0 additions & 257 deletions solr/core/src/java/org/apache/solr/filestore/ClusterFileStore.java

This file was deleted.

Loading

0 comments on commit 8814481

Please sign in to comment.