Refactor: Rename Akubra repository interface and the implementation c…

…lass
ceskaexpedice · Dec 13, 2024 · 62d197a · 62d197a
1 parent 85e522a
commit 62d197a
Show file tree

Hide file tree

Showing 24 changed files with 92 additions and 232 deletions.
diff --git a/bridge/src/main/java/cz/incad/kramerius/fedora/impl/FedoraAccessProxyAkubraImpl.java b/bridge/src/main/java/cz/incad/kramerius/fedora/impl/FedoraAccessProxyAkubraImpl.java
@@ -8,10 +8,9 @@
 import cz.incad.kramerius.SolrAccess;
 import cz.incad.kramerius.StreamHeadersObserver;
 import cz.incad.kramerius.fedora.AbstractFedoraAccess;
-import cz.incad.kramerius.fedora.om.Repository;
+import cz.incad.kramerius.fedora.om.AkubraRepository;
 import cz.incad.kramerius.fedora.om.RepositoryException;
 import cz.incad.kramerius.statistics.accesslogs.AggregatedAccessLogs;
-import cz.incad.kramerius.utils.conf.KConfiguration;
 import cz.incad.kramerius.utils.pid.LexerException;
 import cz.incad.kramerius.virtualcollections.CollectionException;
 import org.w3c.dom.Document;
@@ -344,12 +343,12 @@ public boolean isContentAccessible(String pid) throws IOException {
     }
 
     @Override
-    public Repository getInternalAPI() throws RepositoryException {
+    public AkubraRepository getInternalAPI() throws RepositoryException {
         return this.akubra.getInternalAPI();
     }
 
     @Override
-    public Repository getTransactionAwareInternalAPI() throws RepositoryException {
+    public AkubraRepository getTransactionAwareInternalAPI() throws RepositoryException {
         return this.akubra.getTransactionAwareInternalAPI();
     }
 

diff --git a/bridge/src/main/java/cz/incad/kramerius/fedora/impl/IngestingThread.java b/bridge/src/main/java/cz/incad/kramerius/fedora/impl/IngestingThread.java
@@ -4,7 +4,7 @@
 import com.sun.jersey.api.client.UniformInterfaceException;
 import com.sun.jersey.api.client.WebResource;
 import cz.incad.kramerius.SolrAccess;
-import cz.incad.kramerius.fedora.om.Repository;
+import cz.incad.kramerius.fedora.om.AkubraRepository;
 import cz.incad.kramerius.fedora.om.RepositoryException;
 import cz.incad.kramerius.fedora.utils.CDKUtils;
 import cz.incad.kramerius.utils.BasicAuthenticationClientFilter;
@@ -28,7 +28,6 @@
 import java.util.concurrent.CyclicBarrier;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import java.util.stream.Collectors;
 
 
 public class IngestingThread extends Thread {
@@ -37,15 +36,15 @@ public class IngestingThread extends Thread {
 
     private static Logger LOGGER = Logger.getLogger(IngestingThread.class.getName());
 
-    private Repository internalAPI;
+    private AkubraRepository internalAPI;
     private SolrAccess solrAccess;
     private CollectionsManager collectionsManager;
     private Client client;
     private String pid;
 
     private CyclicBarrier barrier;
 
-    public IngestingThread(Repository internalAPI, SolrAccess solrAccess, CollectionsManager collectionsManager, Client client, String pid, CyclicBarrier barrier) {
+    public IngestingThread(AkubraRepository internalAPI, SolrAccess solrAccess, CollectionsManager collectionsManager, Client client, String pid, CyclicBarrier barrier) {
         this.internalAPI = internalAPI;
         this.solrAccess = solrAccess;
         this.collectionsManager = collectionsManager;

diff --git a/bridge/src/main/java/cz/incad/kramerius/fedora/impl/KrameriusRepositoryApiProxyImpl.java b/bridge/src/main/java/cz/incad/kramerius/fedora/impl/KrameriusRepositoryApiProxyImpl.java
@@ -1,15 +1,12 @@
 package cz.incad.kramerius.fedora.impl;
 
-import com.google.inject.name.Named;
 import cz.incad.kramerius.SolrAccess;
-import cz.incad.kramerius.fedora.om.Repository;
+import cz.incad.kramerius.fedora.om.AkubraRepository;
 import cz.incad.kramerius.fedora.om.RepositoryException;
 import cz.incad.kramerius.repository.KrameriusRepositoryApiImpl;
 import cz.incad.kramerius.repository.RepositoryApi;
-import cz.incad.kramerius.repository.RepositoryApiImpl;
 import cz.incad.kramerius.service.MigrateSolrIndexException;
 import cz.incad.kramerius.services.cdk.K7SearchIndexChildrenSupport;
-import cz.incad.kramerius.statistics.accesslogs.AggregatedAccessLogs;
 import cz.incad.kramerius.utils.java.Pair;
 import cz.incad.kramerius.utils.pid.LexerException;
 import cz.incad.kramerius.virtualcollections.CollectionException;
@@ -34,7 +31,7 @@ public class KrameriusRepositoryApiProxyImpl extends KrameriusRepositoryApiImpl
     private OnDemandIngest onDemandIngest;
 
     @Inject
-    private Repository akubra;
+    private AkubraRepository akubra;
     @Inject
     private SolrAccess solrAccess;
 

diff --git a/bridge/src/main/java/cz/incad/kramerius/fedora/impl/OnDemandIngest.java b/bridge/src/main/java/cz/incad/kramerius/fedora/impl/OnDemandIngest.java
@@ -7,10 +7,9 @@
 import com.sun.jersey.api.client.WebResource;
 import cz.incad.kramerius.ObjectPidsPath;
 import cz.incad.kramerius.SolrAccess;
-import cz.incad.kramerius.fedora.om.Repository;
+import cz.incad.kramerius.fedora.om.AkubraRepository;
 import cz.incad.kramerius.fedora.om.RepositoryException;
 import cz.incad.kramerius.fedora.utils.CDKUtils;
-import cz.incad.kramerius.repository.RepositoryApi;
 import cz.incad.kramerius.utils.BasicAuthenticationClientFilter;
 import cz.incad.kramerius.utils.StringUtils;
 import cz.incad.kramerius.utils.XMLUtils;
@@ -47,7 +46,7 @@ public OnDemandIngest( @Named("new-index") SolrAccess solrAccess) throws IOExcep
         this.client = Client.create();
     }
         // on demand request
-    void onDemandIngest(String pid, Repository internalAPI) throws CollectionException, LexerException, IOException, RepositoryException, JAXBException, TransformerException {
+    void onDemandIngest(String pid, AkubraRepository internalAPI) throws CollectionException, LexerException, IOException, RepositoryException, JAXBException, TransformerException {
         FedoraAccessProxyAkubraImpl.LOGGER.info(String.format("Requesting info %s", pid));
         try {
             long start = System.currentTimeMillis();
@@ -93,7 +92,7 @@ void onDemandIngest(String pid, Repository internalAPI) throws CollectionExcepti
         }
     }
 
-    public void ingestWholePathNecessary(Repository internalAPI, String pid) throws RepositoryException, IOException, CollectionException, LexerException, JAXBException, TransformerException, XPathExpressionException {
+    public void ingestWholePathNecessary(AkubraRepository internalAPI, String pid) throws RepositoryException, IOException, CollectionException, LexerException, JAXBException, TransformerException, XPathExpressionException {
         if (!pid.startsWith(PIDParser.VC_PREFIX)) {
             ObjectPidsPath[] pidPaths = this.solrAccess.getPidPaths(pid);
             for (ObjectPidsPath path : pidPaths) {
@@ -103,13 +102,13 @@ public void ingestWholePathNecessary(Repository internalAPI, String pid) throws
         }
     }
 
-    public void ingestIfNecessary(Repository internalAPI, String... pids) throws RepositoryException, IOException, CollectionException, LexerException, JAXBException, TransformerException, XPathExpressionException {
+    public void ingestIfNecessary(AkubraRepository internalAPI, String... pids) throws RepositoryException, IOException, CollectionException, LexerException, JAXBException, TransformerException, XPathExpressionException {
         for (String pid : pids) {
             ingestIfNecessary(internalAPI, pid);
         }
     }
 
-    public void ingestIfNecessary(Repository internalAPI, String pid) throws RepositoryException, IOException, CollectionException, LexerException, JAXBException, TransformerException, XPathExpressionException {
+    public void ingestIfNecessary(AkubraRepository internalAPI, String pid) throws RepositoryException, IOException, CollectionException, LexerException, JAXBException, TransformerException, XPathExpressionException {
         if (!pid.startsWith(PIDParser.VC_PREFIX)) {
             //Repository internalAPI = fedoraAccessProxyAkubra.getInternalAPI();
             if (!internalAPI.objectExists(pid)) {

diff --git a/bridge/src/main/java/cz/incad/kramerius/fedora/om/SynchronizedRepository.java b/bridge/src/main/java/cz/incad/kramerius/fedora/om/SynchronizedRepository.java
diff --git a/processes/import/src/main/java/org/kramerius/Import.java b/processes/import/src/main/java/org/kramerius/Import.java
@@ -10,10 +10,9 @@
 import com.sun.jersey.api.client.WebResource;
 
 import cz.incad.kramerius.FedoraAccess;
-import cz.incad.kramerius.FedoraNamespaceContext;
 import cz.incad.kramerius.FedoraNamespaces;
 import cz.incad.kramerius.fedora.RepoModule;
-import cz.incad.kramerius.fedora.om.Repository;
+import cz.incad.kramerius.fedora.om.AkubraRepository;
 import cz.incad.kramerius.fedora.om.RepositoryDatastream;
 import cz.incad.kramerius.fedora.om.RepositoryException;
 import cz.incad.kramerius.fedora.om.RepositoryObject;
@@ -30,13 +29,10 @@
 import cz.incad.kramerius.utils.IOUtils;
 import cz.incad.kramerius.utils.XMLUtils;
 import cz.incad.kramerius.utils.conf.KConfiguration;
-import cz.incad.kramerius.utils.jersey.BasicAuthenticationFilter;
 import cz.incad.kramerius.utils.pid.LexerException;
-import cz.incad.kramerius.utils.pid.PIDParser;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.solr.client.solrj.SolrServerException;
-import org.fcrepo.common.rdf.FedoraNamespace;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.w3c.dom.Element;
@@ -555,7 +551,7 @@ private static void parseUpdateList(File listFile) {
         }
     }
 
-    public static void ingest(Repository repo, InputStream is, String filename, Set<String> sortRelations, Set<TitlePidTuple> roots, boolean updateExisting) throws IOException, RepositoryException, JAXBException, LexerException, TransformerException {
+    public static void ingest(AkubraRepository repo, InputStream is, String filename, Set<String> sortRelations, Set<TitlePidTuple> roots, boolean updateExisting) throws IOException, RepositoryException, JAXBException, LexerException, TransformerException {
         long start = System.currentTimeMillis();
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
         IOUtils.copyStreams(is, bos);
@@ -625,7 +621,7 @@ public static void ingest(Repository repo, InputStream is, String filename, Set<
         log.info("Ingested:" + pid + " in " + (System.currentTimeMillis() - start) + "ms, count:" + counter);
     }
 
-    public static void ingest(Repository repo, File file, Set<String> sortRelations, Set<TitlePidTuple> roots, boolean updateExisting) {
+    public static void ingest(AkubraRepository repo, File file, Set<String> sortRelations, Set<TitlePidTuple> roots, boolean updateExisting) {
         try (FileInputStream is = new FileInputStream(file)) {
             ingest(repo, is, file.getName(),sortRelations, roots, updateExisting);
         } catch (Exception ex) {
@@ -634,7 +630,7 @@ public static void ingest(Repository repo, File file, Set<String> sortRelations,
         }
     }
 
-    private static boolean merge(Repository repo, byte[] ingestedBytes) throws RepositoryException {
+    private static boolean merge(AkubraRepository repo, byte[] ingestedBytes) throws RepositoryException {
         List<RDFTuple> ingested = readRDF(ingestedBytes);
         if (ingested.isEmpty()) {
             return false;
@@ -920,7 +916,7 @@ public boolean acceptElement(Element element) {
      * @param pid requested PID
      * @return true if given object exists
      */
-    public static boolean objectExists(Repository repo, String pid) throws RepositoryException {
+    public static boolean objectExists(AkubraRepository repo, String pid) throws RepositoryException {
         return repo.objectExists(pid);
     }
 }

diff --git a/search-index/src/main/java/cz/kramerius/adapters/impl/RepositoryAccessImplAbstract.java b/search-index/src/main/java/cz/kramerius/adapters/impl/RepositoryAccessImplAbstract.java
@@ -4,7 +4,7 @@
 import cz.incad.kramerius.ProcessSubtreeException;
 import cz.incad.kramerius.StreamHeadersObserver;
 import cz.incad.kramerius.TreeNodeProcessor;
-import cz.incad.kramerius.fedora.om.Repository;
+import cz.incad.kramerius.fedora.om.AkubraRepository;
 import cz.incad.kramerius.fedora.om.RepositoryException;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -149,12 +149,12 @@ public boolean isContentAccessible(String pid) throws IOException {
     }
 
     @Override
-    public Repository getInternalAPI() throws RepositoryException {
+    public AkubraRepository getInternalAPI() throws RepositoryException {
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public Repository getTransactionAwareInternalAPI() throws RepositoryException {
+    public AkubraRepository getTransactionAwareInternalAPI() throws RepositoryException {
         throw new UnsupportedOperationException();
     }
 

diff --git a/search-index/src/main/java/cz/kramerius/searchIndex/Main.java b/search-index/src/main/java/cz/kramerius/searchIndex/Main.java
@@ -5,11 +5,8 @@
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.Key;
-import com.google.inject.name.Names;
 
 import cz.incad.kramerius.fedora.RepoModule;
-import cz.incad.kramerius.fedora.om.Repository;
-import cz.incad.kramerius.fedora.om.RepositoryException;
 import cz.incad.kramerius.repository.KrameriusRepositoryApi;
 import cz.incad.kramerius.repository.KrameriusRepositoryApiImpl;
 import cz.incad.kramerius.resourceindex.ResourceIndexModule;

diff --git a/shared/common/src/main/java/cz/incad/kramerius/FedoraAccess.java b/shared/common/src/main/java/cz/incad/kramerius/FedoraAccess.java
@@ -16,7 +16,7 @@
  */
 package cz.incad.kramerius;
 
-import cz.incad.kramerius.fedora.om.Repository;
+import cz.incad.kramerius.fedora.om.AkubraRepository;
 import cz.incad.kramerius.fedora.om.RepositoryException;
 import cz.incad.kramerius.security.SecuredFedoraAccessImpl;
 
@@ -331,9 +331,9 @@ public interface FedoraAccess {
     public boolean isContentAccessible(String pid) throws IOException;
 
 
-    public Repository getInternalAPI() throws RepositoryException;
+    public AkubraRepository getInternalAPI() throws RepositoryException;
 
-    public Repository getTransactionAwareInternalAPI() throws RepositoryException;
+    public AkubraRepository getTransactionAwareInternalAPI() throws RepositoryException;
 
 
     /**