Skip to content

Commit 62d197a

Browse files
petrpodsedpetrpodsed
committed
Refactor: Rename Akubra repository interface and the implementation class
1 parent 85e522a commit 62d197a

File tree

24 files changed

+92
-232
lines changed

24 files changed

+92
-232
lines changed

‎bridge/src/main/java/cz/incad/kramerius/fedora/impl/FedoraAccessProxyAkubraImpl.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@
88
import cz.incad.kramerius.SolrAccess;
99
import cz.incad.kramerius.StreamHeadersObserver;
1010
import cz.incad.kramerius.fedora.AbstractFedoraAccess;
11-
import cz.incad.kramerius.fedora.om.Repository;
11+
import cz.incad.kramerius.fedora.om.AkubraRepository;
1212
import cz.incad.kramerius.fedora.om.RepositoryException;
1313
import cz.incad.kramerius.statistics.accesslogs.AggregatedAccessLogs;
14-
import cz.incad.kramerius.utils.conf.KConfiguration;
1514
import cz.incad.kramerius.utils.pid.LexerException;
1615
import cz.incad.kramerius.virtualcollections.CollectionException;
1716
import org.w3c.dom.Document;
@@ -344,12 +343,12 @@ public boolean isContentAccessible(String pid) throws IOException {
344343
}
345344

346345
@Override
347-
public Repository getInternalAPI() throws RepositoryException {
346+
public AkubraRepository getInternalAPI() throws RepositoryException {
348347
return this.akubra.getInternalAPI();
349348
}
350349

351350
@Override
352-
public Repository getTransactionAwareInternalAPI() throws RepositoryException {
351+
public AkubraRepository getTransactionAwareInternalAPI() throws RepositoryException {
353352
return this.akubra.getTransactionAwareInternalAPI();
354353
}
355354

‎bridge/src/main/java/cz/incad/kramerius/fedora/impl/IngestingThread.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.sun.jersey.api.client.UniformInterfaceException;
55
import com.sun.jersey.api.client.WebResource;
66
import cz.incad.kramerius.SolrAccess;
7-
import cz.incad.kramerius.fedora.om.Repository;
7+
import cz.incad.kramerius.fedora.om.AkubraRepository;
88
import cz.incad.kramerius.fedora.om.RepositoryException;
99
import cz.incad.kramerius.fedora.utils.CDKUtils;
1010
import cz.incad.kramerius.utils.BasicAuthenticationClientFilter;
@@ -28,7 +28,6 @@
2828
import java.util.concurrent.CyclicBarrier;
2929
import java.util.logging.Level;
3030
import java.util.logging.Logger;
31-
import java.util.stream.Collectors;
3231

3332

3433
public class IngestingThread extends Thread {
@@ -37,15 +36,15 @@ public class IngestingThread extends Thread {
3736

3837
private static Logger LOGGER = Logger.getLogger(IngestingThread.class.getName());
3938

40-
private Repository internalAPI;
39+
private AkubraRepository internalAPI;
4140
private SolrAccess solrAccess;
4241
private CollectionsManager collectionsManager;
4342
private Client client;
4443
private String pid;
4544

4645
private CyclicBarrier barrier;
4746

48-
public IngestingThread(Repository internalAPI, SolrAccess solrAccess, CollectionsManager collectionsManager, Client client, String pid, CyclicBarrier barrier) {
47+
public IngestingThread(AkubraRepository internalAPI, SolrAccess solrAccess, CollectionsManager collectionsManager, Client client, String pid, CyclicBarrier barrier) {
4948
this.internalAPI = internalAPI;
5049
this.solrAccess = solrAccess;
5150
this.collectionsManager = collectionsManager;

‎bridge/src/main/java/cz/incad/kramerius/fedora/impl/KrameriusRepositoryApiProxyImpl.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
package cz.incad.kramerius.fedora.impl;
22

3-
import com.google.inject.name.Named;
43
import cz.incad.kramerius.SolrAccess;
5-
import cz.incad.kramerius.fedora.om.Repository;
4+
import cz.incad.kramerius.fedora.om.AkubraRepository;
65
import cz.incad.kramerius.fedora.om.RepositoryException;
76
import cz.incad.kramerius.repository.KrameriusRepositoryApiImpl;
87
import cz.incad.kramerius.repository.RepositoryApi;
9-
import cz.incad.kramerius.repository.RepositoryApiImpl;
108
import cz.incad.kramerius.service.MigrateSolrIndexException;
119
import cz.incad.kramerius.services.cdk.K7SearchIndexChildrenSupport;
12-
import cz.incad.kramerius.statistics.accesslogs.AggregatedAccessLogs;
1310
import cz.incad.kramerius.utils.java.Pair;
1411
import cz.incad.kramerius.utils.pid.LexerException;
1512
import cz.incad.kramerius.virtualcollections.CollectionException;
@@ -34,7 +31,7 @@ public class KrameriusRepositoryApiProxyImpl extends KrameriusRepositoryApiImpl
3431
private OnDemandIngest onDemandIngest;
3532

3633
@Inject
37-
private Repository akubra;
34+
private AkubraRepository akubra;
3835
@Inject
3936
private SolrAccess solrAccess;
4037

‎bridge/src/main/java/cz/incad/kramerius/fedora/impl/OnDemandIngest.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@
77
import com.sun.jersey.api.client.WebResource;
88
import cz.incad.kramerius.ObjectPidsPath;
99
import cz.incad.kramerius.SolrAccess;
10-
import cz.incad.kramerius.fedora.om.Repository;
10+
import cz.incad.kramerius.fedora.om.AkubraRepository;
1111
import cz.incad.kramerius.fedora.om.RepositoryException;
1212
import cz.incad.kramerius.fedora.utils.CDKUtils;
13-
import cz.incad.kramerius.repository.RepositoryApi;
1413
import cz.incad.kramerius.utils.BasicAuthenticationClientFilter;
1514
import cz.incad.kramerius.utils.StringUtils;
1615
import cz.incad.kramerius.utils.XMLUtils;
@@ -47,7 +46,7 @@ public OnDemandIngest( @Named("new-index") SolrAccess solrAccess) throws IOExcep
4746
this.client = Client.create();
4847
}
4948
// on demand request
50-
void onDemandIngest(String pid, Repository internalAPI) throws CollectionException, LexerException, IOException, RepositoryException, JAXBException, TransformerException {
49+
void onDemandIngest(String pid, AkubraRepository internalAPI) throws CollectionException, LexerException, IOException, RepositoryException, JAXBException, TransformerException {
5150
FedoraAccessProxyAkubraImpl.LOGGER.info(String.format("Requesting info %s", pid));
5251
try {
5352
long start = System.currentTimeMillis();
@@ -93,7 +92,7 @@ void onDemandIngest(String pid, Repository internalAPI) throws CollectionExcepti
9392
}
9493
}
9594

96-
public void ingestWholePathNecessary(Repository internalAPI, String pid) throws RepositoryException, IOException, CollectionException, LexerException, JAXBException, TransformerException, XPathExpressionException {
95+
public void ingestWholePathNecessary(AkubraRepository internalAPI, String pid) throws RepositoryException, IOException, CollectionException, LexerException, JAXBException, TransformerException, XPathExpressionException {
9796
if (!pid.startsWith(PIDParser.VC_PREFIX)) {
9897
ObjectPidsPath[] pidPaths = this.solrAccess.getPidPaths(pid);
9998
for (ObjectPidsPath path : pidPaths) {
@@ -103,13 +102,13 @@ public void ingestWholePathNecessary(Repository internalAPI, String pid) throws
103102
}
104103
}
105104

106-
public void ingestIfNecessary(Repository internalAPI, String... pids) throws RepositoryException, IOException, CollectionException, LexerException, JAXBException, TransformerException, XPathExpressionException {
105+
public void ingestIfNecessary(AkubraRepository internalAPI, String... pids) throws RepositoryException, IOException, CollectionException, LexerException, JAXBException, TransformerException, XPathExpressionException {
107106
for (String pid : pids) {
108107
ingestIfNecessary(internalAPI, pid);
109108
}
110109
}
111110

112-
public void ingestIfNecessary(Repository internalAPI, String pid) throws RepositoryException, IOException, CollectionException, LexerException, JAXBException, TransformerException, XPathExpressionException {
111+
public void ingestIfNecessary(AkubraRepository internalAPI, String pid) throws RepositoryException, IOException, CollectionException, LexerException, JAXBException, TransformerException, XPathExpressionException {
113112
if (!pid.startsWith(PIDParser.VC_PREFIX)) {
114113
//Repository internalAPI = fedoraAccessProxyAkubra.getInternalAPI();
115114
if (!internalAPI.objectExists(pid)) {

‎bridge/src/main/java/cz/incad/kramerius/fedora/om/SynchronizedRepository.java

Lines changed: 0 additions & 91 deletions
This file was deleted.

‎processes/import/src/main/java/org/kramerius/Import.java

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@
1010
import com.sun.jersey.api.client.WebResource;
1111

1212
import cz.incad.kramerius.FedoraAccess;
13-
import cz.incad.kramerius.FedoraNamespaceContext;
1413
import cz.incad.kramerius.FedoraNamespaces;
1514
import cz.incad.kramerius.fedora.RepoModule;
16-
import cz.incad.kramerius.fedora.om.Repository;
15+
import cz.incad.kramerius.fedora.om.AkubraRepository;
1716
import cz.incad.kramerius.fedora.om.RepositoryDatastream;
1817
import cz.incad.kramerius.fedora.om.RepositoryException;
1918
import cz.incad.kramerius.fedora.om.RepositoryObject;
@@ -30,13 +29,10 @@
3029
import cz.incad.kramerius.utils.IOUtils;
3130
import cz.incad.kramerius.utils.XMLUtils;
3231
import cz.incad.kramerius.utils.conf.KConfiguration;
33-
import cz.incad.kramerius.utils.jersey.BasicAuthenticationFilter;
3432
import cz.incad.kramerius.utils.pid.LexerException;
35-
import cz.incad.kramerius.utils.pid.PIDParser;
3633

3734
import org.apache.commons.io.FileUtils;
3835
import org.apache.solr.client.solrj.SolrServerException;
39-
import org.fcrepo.common.rdf.FedoraNamespace;
4036
import org.json.JSONArray;
4137
import org.json.JSONObject;
4238
import org.w3c.dom.Element;
@@ -555,7 +551,7 @@ private static void parseUpdateList(File listFile) {
555551
}
556552
}
557553

558-
public static void ingest(Repository repo, InputStream is, String filename, Set<String> sortRelations, Set<TitlePidTuple> roots, boolean updateExisting) throws IOException, RepositoryException, JAXBException, LexerException, TransformerException {
554+
public static void ingest(AkubraRepository repo, InputStream is, String filename, Set<String> sortRelations, Set<TitlePidTuple> roots, boolean updateExisting) throws IOException, RepositoryException, JAXBException, LexerException, TransformerException {
559555
long start = System.currentTimeMillis();
560556
ByteArrayOutputStream bos = new ByteArrayOutputStream();
561557
IOUtils.copyStreams(is, bos);
@@ -625,7 +621,7 @@ public static void ingest(Repository repo, InputStream is, String filename, Set<
625621
log.info("Ingested:" + pid + " in " + (System.currentTimeMillis() - start) + "ms, count:" + counter);
626622
}
627623

628-
public static void ingest(Repository repo, File file, Set<String> sortRelations, Set<TitlePidTuple> roots, boolean updateExisting) {
624+
public static void ingest(AkubraRepository repo, File file, Set<String> sortRelations, Set<TitlePidTuple> roots, boolean updateExisting) {
629625
try (FileInputStream is = new FileInputStream(file)) {
630626
ingest(repo, is, file.getName(),sortRelations, roots, updateExisting);
631627
} catch (Exception ex) {
@@ -634,7 +630,7 @@ public static void ingest(Repository repo, File file, Set<String> sortRelations,
634630
}
635631
}
636632

637-
private static boolean merge(Repository repo, byte[] ingestedBytes) throws RepositoryException {
633+
private static boolean merge(AkubraRepository repo, byte[] ingestedBytes) throws RepositoryException {
638634
List<RDFTuple> ingested = readRDF(ingestedBytes);
639635
if (ingested.isEmpty()) {
640636
return false;
@@ -920,7 +916,7 @@ public boolean acceptElement(Element element) {
920916
* @param pid requested PID
921917
* @return true if given object exists
922918
*/
923-
public static boolean objectExists(Repository repo, String pid) throws RepositoryException {
919+
public static boolean objectExists(AkubraRepository repo, String pid) throws RepositoryException {
924920
return repo.objectExists(pid);
925921
}
926922
}

‎search-index/src/main/java/cz/kramerius/adapters/impl/RepositoryAccessImplAbstract.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import cz.incad.kramerius.ProcessSubtreeException;
55
import cz.incad.kramerius.StreamHeadersObserver;
66
import cz.incad.kramerius.TreeNodeProcessor;
7-
import cz.incad.kramerius.fedora.om.Repository;
7+
import cz.incad.kramerius.fedora.om.AkubraRepository;
88
import cz.incad.kramerius.fedora.om.RepositoryException;
99
import org.w3c.dom.Document;
1010
import org.w3c.dom.Element;
@@ -149,12 +149,12 @@ public boolean isContentAccessible(String pid) throws IOException {
149149
}
150150

151151
@Override
152-
public Repository getInternalAPI() throws RepositoryException {
152+
public AkubraRepository getInternalAPI() throws RepositoryException {
153153
throw new UnsupportedOperationException();
154154
}
155155

156156
@Override
157-
public Repository getTransactionAwareInternalAPI() throws RepositoryException {
157+
public AkubraRepository getTransactionAwareInternalAPI() throws RepositoryException {
158158
throw new UnsupportedOperationException();
159159
}
160160

‎search-index/src/main/java/cz/kramerius/searchIndex/Main.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,8 @@
55
import com.google.inject.Guice;
66
import com.google.inject.Injector;
77
import com.google.inject.Key;
8-
import com.google.inject.name.Names;
98

109
import cz.incad.kramerius.fedora.RepoModule;
11-
import cz.incad.kramerius.fedora.om.Repository;
12-
import cz.incad.kramerius.fedora.om.RepositoryException;
1310
import cz.incad.kramerius.repository.KrameriusRepositoryApi;
1411
import cz.incad.kramerius.repository.KrameriusRepositoryApiImpl;
1512
import cz.incad.kramerius.resourceindex.ResourceIndexModule;

‎shared/common/src/main/java/cz/incad/kramerius/FedoraAccess.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
package cz.incad.kramerius;
1818

19-
import cz.incad.kramerius.fedora.om.Repository;
19+
import cz.incad.kramerius.fedora.om.AkubraRepository;
2020
import cz.incad.kramerius.fedora.om.RepositoryException;
2121
import cz.incad.kramerius.security.SecuredFedoraAccessImpl;
2222

@@ -331,9 +331,9 @@ public interface FedoraAccess {
331331
public boolean isContentAccessible(String pid) throws IOException;
332332

333333

334-
public Repository getInternalAPI() throws RepositoryException;
334+
public AkubraRepository getInternalAPI() throws RepositoryException;
335335

336-
public Repository getTransactionAwareInternalAPI() throws RepositoryException;
336+
public AkubraRepository getTransactionAwareInternalAPI() throws RepositoryException;
337337

338338

339339
/**

0 commit comments

Comments
 (0)