Refactor: Leave just 2 repository interfaces, delete others

ceskaexpedice · Dec 13, 2024 · 3cbad29 · 3cbad29
1 parent 62d197a
commit 3cbad29
Show file tree

Hide file tree

Showing 172 changed files with 2,880 additions and 3,498 deletions.
diff --git a/bridge/src/main/java/cz/incad/kramerius/fedora/impl/CDKRepoModule.java b/bridge/src/main/java/cz/incad/kramerius/fedora/impl/CDKRepoModule.java
@@ -3,15 +3,14 @@
 import com.google.inject.AbstractModule;
 import com.google.inject.Scopes;
 import com.google.inject.name.Names;
-import cz.incad.kramerius.FedoraAccess;
-import cz.incad.kramerius.repository.KrameriusRepositoryApi;
+import cz.incad.kramerius.RepositoryAccess;
 
 public class CDKRepoModule extends AbstractModule {
 
     @Override
     protected void configure() {
         // namapovani fedora access
-        this.bind(FedoraAccess.class).annotatedWith(Names.named("rawFedoraAccess")).to(FedoraAccessProxyAkubraImpl.class).in(Scopes.SINGLETON);
+        this.bind(RepositoryAccess.class).annotatedWith(Names.named("rawFedoraAccess")).to(FedoraAccessProxyAkubraImpl.class).in(Scopes.SINGLETON);
         bind(KrameriusRepositoryApi.class).to(KrameriusRepositoryApiProxyImpl.class);
     }
 }
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
@@ -4,10 +4,10 @@
 import com.google.inject.Provider;
 import com.google.inject.name.Named;
 import com.sun.jersey.api.client.Client;
-import cz.incad.kramerius.FedoraAccess;
+import cz.incad.kramerius.RepositoryAccess;
 import cz.incad.kramerius.SolrAccess;
 import cz.incad.kramerius.StreamHeadersObserver;
-import cz.incad.kramerius.fedora.AbstractFedoraAccess;
+import cz.incad.kramerius.fedora.AbstractRepositoryAccess;
 import cz.incad.kramerius.fedora.om.AkubraRepository;
 import cz.incad.kramerius.fedora.om.RepositoryException;
 import cz.incad.kramerius.statistics.accesslogs.AggregatedAccessLogs;
@@ -25,20 +25,20 @@
 import java.util.*;
 import java.util.logging.Logger;
 
-public class FedoraAccessProxyAkubraImpl extends AbstractFedoraAccess {
+public class FedoraAccessProxyAkubraImpl extends AbstractRepositoryAccess {
 
 
     public static final Logger LOGGER = Logger.getLogger(FedoraAccessProxyAkubraImpl.class.getName());
 
-    private FedoraAccess akubra;
+    private RepositoryAccess akubra;
     private SolrAccess solrAccess;
     private Client client;
     OnDemandIngest onDemandIngest;
 
 
 
     @Inject
-    public FedoraAccessProxyAkubraImpl(@Nullable AggregatedAccessLogs accessLog, @Named("akubraFedoraAccess")FedoraAccess acc, @Named("new-index")SolrAccess solrAccess, Provider<HttpServletRequest> provider, OnDemandIngest onDemIng) throws IOException {
+    public FedoraAccessProxyAkubraImpl(@Nullable AggregatedAccessLogs accessLog, @Named("akubraFedoraAccess") RepositoryAccess acc, @Named("new-index")SolrAccess solrAccess, Provider<HttpServletRequest> provider, OnDemandIngest onDemIng) throws IOException {
         super( accessLog);
         this.akubra = acc;
         this.solrAccess = solrAccess;

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
@@ -3,8 +3,6 @@
 import cz.incad.kramerius.SolrAccess;
 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.service.MigrateSolrIndexException;
 import cz.incad.kramerius.services.cdk.K7SearchIndexChildrenSupport;
 import cz.incad.kramerius.utils.java.Pair;

diff --git a/.../collections-backup/src/main/java/cz/inovatika/collections/migrations/FromK5Instance.java b/.../collections-backup/src/main/java/cz/inovatika/collections/migrations/FromK5Instance.java
@@ -21,7 +21,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringReader;
-import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.security.SecureRandom;
 import java.time.LocalDateTime;
@@ -56,10 +55,9 @@
 import com.google.inject.Key;
 import com.google.inject.name.Names;
 import com.sun.jersey.api.client.Client;
-import com.sun.jersey.api.client.ClientResponse;
 import com.sun.jersey.api.client.WebResource;
 
-import cz.incad.kramerius.FedoraAccess;
+import cz.incad.kramerius.RepositoryAccess;
 import cz.incad.kramerius.FedoraNamespaces;
 import cz.incad.kramerius.fedora.RepoModule;
 import cz.incad.kramerius.resourceindex.ProcessingIndexFeeder;
@@ -74,8 +72,6 @@
 import cz.incad.kramerius.utils.conf.KConfiguration;
 import cz.inovatika.collections.Restore;
 
-import static cz.incad.kramerius.utils.IterationUtils.*;
-
 public class FromK5Instance {
 
 
@@ -448,7 +444,7 @@ public boolean acceptElement(Element element) {
 
     public static void importTmpDir(String exportRoot, boolean startIndexer, String authToken) throws JAXBException, IOException, InterruptedException, SAXException, SolrServerException {
         Injector injector = Guice.createInjector(new SolrModule(), new ResourceIndexModule(), new RepoModule(), new NullStatisticsModule(), new ImportModule());
-        FedoraAccess fa = injector.getInstance(Key.get(FedoraAccess.class, Names.named("rawFedoraAccess")));
+        RepositoryAccess fa = injector.getInstance(Key.get(RepositoryAccess.class, Names.named("rawFedoraAccess")));
         SortingService sortingServiceLocal = injector.getInstance(SortingService.class);
         ProcessingIndexFeeder feeder = injector.getInstance(ProcessingIndexFeeder.class);
 

diff --git a/processes/dnntflag/src/main/java/cz/incad/kramerius/DeleteTreeProcess.java b/processes/dnntflag/src/main/java/cz/incad/kramerius/DeleteTreeProcess.java
@@ -13,8 +13,6 @@
 import cz.incad.kramerius.processes.WarningException;
 import cz.incad.kramerius.processes.starter.ProcessStarter;
 import cz.incad.kramerius.processes.utils.ProcessUtils;
-import cz.incad.kramerius.repository.KrameriusRepositoryApi;
-import cz.incad.kramerius.repository.KrameriusRepositoryApiImpl;
 import cz.incad.kramerius.resourceindex.ResourceIndexException;
 import cz.incad.kramerius.utils.Dom4jUtils;
 import cz.incad.kramerius.utils.RelsExtHelper;
@@ -97,7 +95,7 @@ public static void main(String[] args) throws IOException, SolrServerException,
 
 
         Injector injector = Guice.createInjector(new SolrModule(), new ResourceIndexModule(), new RepoModule(), new NullStatisticsModule(), new ResourceIndexModule());
-        FedoraAccess fa = injector.getInstance(Key.get(FedoraAccess.class, Names.named("rawFedoraAccess")));
+        RepositoryAccess fa = injector.getInstance(Key.get(RepositoryAccess.class, Names.named("rawFedoraAccess")));
         KrameriusRepositoryApi repository = injector.getInstance(Key.get(KrameriusRepositoryApiImpl.class)); //FIXME: hardcoded implementation
 
         KrameriusRepositoryApi krameriusApiRepository = injector.getInstance(Key.get(KrameriusRepositoryApiImpl.class)); 
@@ -120,7 +118,7 @@ public static void main(String[] args) throws IOException, SolrServerException,
         }
     }
 
-    public static boolean deleteTree(String pid, boolean deletionRoot, KrameriusRepositoryApi repository, ProcessingIndex processingIndex, SolrIndexAccess indexerAccess, SolrAccess searchIndex, FedoraAccess fa, boolean ignoreIncosistencies) throws ResourceIndexException, RepositoryException, IOException, SolrServerException {
+    public static boolean deleteTree(String pid, boolean deletionRoot, KrameriusRepositoryApi repository, ProcessingIndex processingIndex, SolrIndexAccess indexerAccess, SolrAccess searchIndex, RepositoryAccess fa, boolean ignoreIncosistencies) throws ResourceIndexException, RepositoryException, IOException, SolrServerException {
         LOGGER.info(String.format("deleting own tree of %s", pid));
         boolean someProblem = false;
         //
@@ -222,7 +220,7 @@ private static void removeItemsFromCollectionBeforeDeletingCollection(String col
         }
     }
 
-    private static void deleteObject(String pid, boolean isCollection, KrameriusRepositoryApi repository, SolrIndexAccess indexerAccess, FedoraAccess fa) throws RepositoryException, IOException, SolrServerException {
+    private static void deleteObject(String pid, boolean isCollection, KrameriusRepositoryApi repository, SolrIndexAccess indexerAccess, RepositoryAccess fa) throws RepositoryException, IOException, SolrServerException {
         LOGGER.info(String.format("deleting object %s", pid));
         LOGGER.info(String.format("deleting %s from repository", pid));
         if (!DRY_RUN) {

diff --git a/processes/dnntflag/src/main/java/cz/incad/kramerius/LicenseHelper.java b/processes/dnntflag/src/main/java/cz/incad/kramerius/LicenseHelper.java
@@ -2,7 +2,6 @@
 
 import cz.incad.kramerius.fedora.om.RepositoryException;
 import cz.incad.kramerius.fedora.om.impl.AkubraDOManager;
-import cz.incad.kramerius.repository.KrameriusRepositoryApi;
 import cz.incad.kramerius.resourceindex.ResourceIndexException;
 import cz.incad.kramerius.utils.Dom4jUtils;
 import cz.kramerius.adapters.ProcessingIndex;

diff --git a/processes/dnntflag/src/main/java/cz/incad/kramerius/SetLicenseProcess.java b/processes/dnntflag/src/main/java/cz/incad/kramerius/SetLicenseProcess.java
@@ -11,9 +11,6 @@
 import cz.incad.kramerius.processes.new_api.ProcessScheduler;
 import cz.incad.kramerius.processes.starter.ProcessStarter;
 import cz.incad.kramerius.processes.utils.ProcessUtils;
-import cz.incad.kramerius.repository.KrameriusRepositoryApi;
-import cz.incad.kramerius.repository.KrameriusRepositoryApiImpl;
-import cz.incad.kramerius.resourceindex.IResourceIndex;
 import cz.incad.kramerius.resourceindex.ResourceIndexException;
 import cz.incad.kramerius.resourceindex.ResourceIndexModule;
 import cz.incad.kramerius.solr.SolrModule;
@@ -32,7 +29,6 @@
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.util.*;

diff --git a/processes/import-mets/src/main/java/org/kramerius/importmets/MetsConvertor.java b/processes/import-mets/src/main/java/org/kramerius/importmets/MetsConvertor.java
@@ -5,7 +5,7 @@
 import com.google.inject.Key;
 import com.google.inject.name.Names;
 import com.qbizm.kramerius.imp.jaxb.DigitalObject;
-import cz.incad.kramerius.FedoraAccess;
+import cz.incad.kramerius.RepositoryAccess;
 import cz.incad.kramerius.fedora.RepoModule;
 import cz.incad.kramerius.fedora.om.RepositoryException;
 import cz.incad.kramerius.processes.starter.ProcessStarter;
@@ -45,7 +45,6 @@
 
 import java.io.*;
 import java.util.Arrays;
-import java.util.logging.Level;
 
 
 /**
@@ -163,7 +162,7 @@ private void run(String importRoot, String exportRoot, boolean policyPublic, boo
             throw new RuntimeException("No valid PSP found.");
         }
         Injector injector = Guice.createInjector(new SolrModule(), new ResourceIndexModule(), new RepoModule(), new NullStatisticsModule(), new ImportModule());
-        FedoraAccess fa = injector.getInstance(Key.get(FedoraAccess.class, Names.named("rawFedoraAccess")));
+        RepositoryAccess fa = injector.getInstance(Key.get(RepositoryAccess.class, Names.named("rawFedoraAccess")));
         SortingService sortingServiceLocal = injector.getInstance(SortingService.class);
         ProcessingIndexFeeder feeder = injector.getInstance(ProcessingIndexFeeder.class);
         FOXMLAppendLicenseService foxmlService = injector.getInstance(FOXMLAppendLicenseService.class);

diff --git a/processes/import/src/main/java/org/kramerius/Convert.java b/processes/import/src/main/java/org/kramerius/Convert.java
@@ -9,7 +9,7 @@
 import com.google.inject.Injector;
 import com.google.inject.Key;
 import com.google.inject.name.Names;
-import cz.incad.kramerius.FedoraAccess;
+import cz.incad.kramerius.RepositoryAccess;
 import cz.incad.kramerius.fedora.RepoModule;
 import cz.incad.kramerius.fedora.om.RepositoryException;
 import cz.incad.kramerius.resourceindex.ProcessingIndexFeeder;
@@ -43,7 +43,7 @@ public static void main(String[] args) throws InterruptedException, JAXBExceptio
         String uuid = Main.convert(convertDirectory, convertTargetDirectory, false, visible, null);
 
         Injector injector = Guice.createInjector(new SolrModule(), new ResourceIndexModule(), new RepoModule(), new NullStatisticsModule(),new ImportModule());
-        FedoraAccess fa = injector.getInstance(Key.get(FedoraAccess.class, Names.named("rawFedoraAccess")));
+        RepositoryAccess fa = injector.getInstance(Key.get(RepositoryAccess.class, Names.named("rawFedoraAccess")));
         SortingService sortingServiceLocal = injector.getInstance(SortingService.class);
         ProcessingIndexFeeder feeder = injector.getInstance(ProcessingIndexFeeder.class);
         Import.run(fa, feeder, sortingServiceLocal, KConfiguration.getInstance().getProperty("ingest.url"), KConfiguration.getInstance().getProperty("ingest.user"), KConfiguration.getInstance().getProperty("ingest.password"), convertTargetDirectory);

diff --git a/processes/import/src/main/java/org/kramerius/Download.java b/processes/import/src/main/java/org/kramerius/Download.java
@@ -7,7 +7,7 @@
 import com.qbizm.kramerius.imptool.poc.Main;
 import com.qbizm.kramerius.imptool.poc.valueobj.ServiceException;
 
-import cz.incad.kramerius.FedoraAccess;
+import cz.incad.kramerius.RepositoryAccess;
 import cz.incad.kramerius.fedora.RepoModule;
 import cz.incad.kramerius.resourceindex.ProcessingIndexFeeder;
 import cz.incad.kramerius.resourceindex.ResourceIndexModule;
@@ -116,7 +116,7 @@ private static void processReplication(Download download, Replication rep, Strin
             String uuid = Main.convert(migrationDirectory, targetDirectory, true, visible, rep.getID());
 
             Injector injector = Guice.createInjector(new SolrModule(), new ResourceIndexModule(), new RepoModule(), new NullStatisticsModule(),new ImportModule());
-            FedoraAccess fa = injector.getInstance(Key.get(FedoraAccess.class, Names.named("rawFedoraAccess")));
+            RepositoryAccess fa = injector.getInstance(Key.get(RepositoryAccess.class, Names.named("rawFedoraAccess")));
             SortingService sortingServiceLocal = injector.getInstance(SortingService.class);
             ProcessingIndexFeeder feeder = injector.getInstance(ProcessingIndexFeeder.class);
             Import.run(fa,feeder, sortingServiceLocal, KConfiguration.getInstance().getProperty("ingest.url"), KConfiguration.getInstance().getProperty("ingest.user"), KConfiguration.getInstance().getProperty("ingest.password"), targetDirectory);

diff --git a/processes/import/src/main/java/org/kramerius/Import.java b/processes/import/src/main/java/org/kramerius/Import.java
@@ -9,7 +9,7 @@
 import com.sun.jersey.api.client.ClientResponse;
 import com.sun.jersey.api.client.WebResource;
 
-import cz.incad.kramerius.FedoraAccess;
+import cz.incad.kramerius.RepositoryAccess;
 import cz.incad.kramerius.FedoraNamespaces;
 import cz.incad.kramerius.fedora.RepoModule;
 import cz.incad.kramerius.fedora.om.AkubraRepository;
@@ -137,7 +137,7 @@ public static void main(String[] args) throws IOException, RepositoryException,
 
 
         Injector injector = Guice.createInjector(new SolrModule(), new ResourceIndexModule(), new RepoModule(), new NullStatisticsModule(), new ImportModule());
-        FedoraAccess fa = injector.getInstance(Key.get(FedoraAccess.class, Names.named("rawFedoraAccess")));
+        RepositoryAccess fa = injector.getInstance(Key.get(RepositoryAccess.class, Names.named("rawFedoraAccess")));
         SortingService sortingServiceLocal = injector.getInstance(SortingService.class);
         FOXMLAppendLicenseService foxmlService = injector.getInstance(FOXMLAppendLicenseService.class);
 
@@ -198,11 +198,11 @@ public static void main(String[] args) throws IOException, RepositoryException,
         }
     }
 
-    public static void run(FedoraAccess fa, ProcessingIndexFeeder feeder, SortingService sortingServiceParam, final String url, final String user, final String pwd, String importRoot) throws IOException, SolrServerException {
+    public static void run(RepositoryAccess fa, ProcessingIndexFeeder feeder, SortingService sortingServiceParam, final String url, final String user, final String pwd, String importRoot) throws IOException, SolrServerException {
         run(fa, feeder, sortingServiceParam, url, user, pwd, importRoot, true, null, null);
     }
 
-    public static void run(FedoraAccess fa, ProcessingIndexFeeder feeder, SortingService sortingServiceParam, final String url, final String user, final String pwd, String importRoot, boolean startIndexer, String authToken, String addcollections) throws IOException, SolrServerException {
+    public static void run(RepositoryAccess fa, ProcessingIndexFeeder feeder, SortingService sortingServiceParam, final String url, final String user, final String pwd, String importRoot, boolean startIndexer, String authToken, String addcollections) throws IOException, SolrServerException {
         log.info("INGEST - url:" + url + " user:" + user + " importRoot:" + importRoot);
         sortingService = sortingServiceParam;
         // system property 
@@ -391,11 +391,11 @@ protected PasswordAuthentication getPasswordAuthentication() {
         of = new ObjectFactory();
     }
 
-    private static void visitAllDirsAndFiles(FedoraAccess fa, File importFile, Set<TitlePidTuple> classicRoots, 
-            Set<TitlePidTuple> convolutes, 
-            Set<TitlePidTuple> collections, 
-            
-            Set<String> sortRelations, boolean updateExisting) {
+    private static void visitAllDirsAndFiles(RepositoryAccess fa, File importFile, Set<TitlePidTuple> classicRoots,
+                                             Set<TitlePidTuple> convolutes,
+                                             Set<TitlePidTuple> collections,
+
+                                             Set<String> sortRelations, boolean updateExisting) {
         if (importFile == null) {
             return;
         }
@@ -778,7 +778,7 @@ private static void checkModelIsClassicRoot(DigitalObject dobj, Set<TitlePidTupl
         }
     }
 
-    private static void addCollection(FedoraAccess fa, String collectionPid,Set<TitlePidTuple> classicRoots, Set<TitlePidTuple> collectionsToReindex, String authToken) {
+    private static void addCollection(RepositoryAccess fa, String collectionPid, Set<TitlePidTuple> classicRoots, Set<TitlePidTuple> collectionsToReindex, String authToken) {
         Client c = Client.create();
 
         List<String> rootPids = new ArrayList<>();

diff --git a/processes/import/src/main/java/org/kramerius/ImportDuplicator.java b/processes/import/src/main/java/org/kramerius/ImportDuplicator.java
@@ -45,13 +45,13 @@
 import com.qbizm.kramerius.imp.jaxb.DigitalObject;
 import com.qbizm.kramerius.imp.jaxb.XmlContentType;
 
-import cz.incad.kramerius.FedoraAccess;
+import cz.incad.kramerius.RepositoryAccess;
 import cz.incad.kramerius.utils.conf.KConfiguration;
 
 //FIXME: looks like duplicate of org.kramerius.Import, is it still used or can we remove it? Also not correctly indexing Convolutes
 public class ImportDuplicator {
 
-    static FedoraAccess fedoraAccess;
+    static RepositoryAccess fedoraAccess;
     static ProcessingIndexFeeder feeder;
     static int counter = 0;
 
@@ -110,7 +110,7 @@ protected PasswordAuthentication getPasswordAuthentication() {
 
 
         Injector injector = Guice.createInjector(new SolrModule(), new ResourceIndexModule(), new RepoModule(), new NullStatisticsModule(),new ImportModule());
-        fedoraAccess = injector.getInstance(Key.get(FedoraAccess.class, Names.named("rawFedoraAccess")));
+        fedoraAccess = injector.getInstance(Key.get(RepositoryAccess.class, Names.named("rawFedoraAccess")));
         feeder = injector.getInstance(ProcessingIndexFeeder.class);
 
 

diff --git a/processes/import/src/main/java/org/kramerius/ImportModule.java b/processes/import/src/main/java/org/kramerius/ImportModule.java
@@ -2,17 +2,12 @@
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Scopes;
-import com.google.inject.name.Names;
-import cz.incad.kramerius.FedoraAccess;
-import cz.incad.kramerius.imaging.lp.guice.GenerateDeepZoomCacheModule;
 import cz.incad.kramerius.relation.RelationService;
 import cz.incad.kramerius.relation.impl.RelationServiceImpl;
 import cz.incad.kramerius.service.FOXMLAppendLicenseService;
 import cz.incad.kramerius.service.SortingService;
 import cz.incad.kramerius.service.impl.FOXMLAppendLicenseImpl;
 import cz.incad.kramerius.service.impl.SortingServiceImpl;
-import cz.incad.kramerius.statistics.StatisticsAccessLog;
-import cz.incad.kramerius.statistics.accesslogs.AggregatedAccessLogs;
 
 public class ImportModule extends AbstractModule {