diff --git a/src/main/java/com/researchspace/dataverse/entities/facade/DatasetBuilder.java b/src/main/java/com/researchspace/dataverse/entities/facade/DatasetBuilder.java index 52d6ae5..54dc3de 100644 --- a/src/main/java/com/researchspace/dataverse/entities/facade/DatasetBuilder.java +++ b/src/main/java/com/researchspace/dataverse/entities/facade/DatasetBuilder.java @@ -87,7 +87,7 @@ public Dataset build(DatasetFacade facade) { return toSubmit; } - private List createFields(DatasetFacade facade, Citation citation) { + protected List createFields(DatasetFacade facade, Citation citation) { List fields = new ArrayList<>(); //mandatory fields addTitle(facade, fields); @@ -117,14 +117,14 @@ private List createFields(DatasetFacade facade, Citation citation - private void addProductionDate(DatasetFacade facade, List fields) { + protected void addProductionDate(DatasetFacade facade, List fields) { if( facade.getProductionDate() != null) { CitationField prodDate = createPrimitiveSingleField("productionDate", isoDate(facade.getProductionDate())); fields.add(prodDate); } } - private void addProductionPlace(DatasetFacade facade, List fields) { + protected void addProductionPlace(DatasetFacade facade, List fields) { if(!isEmpty(facade.getProductionPlace())){ CitationField prodPlace = createPrimitiveSingleField("productionPlace", facade.getProductionPlace()); fields.add(prodPlace); @@ -132,47 +132,47 @@ private void addProductionPlace(DatasetFacade facade, List fields } - private void addLanguages(DatasetFacade facade, List fields) { + protected void addLanguages(DatasetFacade facade, List fields) { if (!facade.getLanguages().isEmpty()) { CitationField field = createControlledVocabField("language", true, facade.getLanguages()); fields.add(field); } } - private void addNotes(DatasetFacade facade, List fields) { + protected void addNotes(DatasetFacade facade, List fields) { if(!isEmpty(facade.getNote())){ CitationField altUrl = createPrimitiveSingleField("notesText", facade.getNote()); fields.add(altUrl); } } - private void addAlternativeURL(DatasetFacade facade, List fields) { + protected void addAlternativeURL(DatasetFacade facade, List fields) { if (facade.getAlternativeURL() != null) { CitationField altUrl = createPrimitiveSingleField("alternativeURL", facade.getAlternativeURL().toString()); fields.add(altUrl); } } - private void addAlternativeTitle(DatasetFacade facade, List fields) { + protected void addAlternativeTitle(DatasetFacade facade, List fields) { if (!isEmpty(facade.getAlternativeTitle())) { CitationField title = createPrimitiveSingleField("alternativeTitle", facade.getAlternativeTitle()); fields.add(title); } } - private void addSubTitle(DatasetFacade facade, List fields) { + protected void addSubTitle(DatasetFacade facade, List fields) { if (!isEmpty(facade.getSubtitle())) { CitationField subtitle = createPrimitiveSingleField("subtitle", facade.getSubtitle()); fields.add(subtitle); } } - private void addSubject(DatasetFacade facade, List fields) { + protected void addSubject(DatasetFacade facade, List fields) { CitationField subject = createControlledVocabField("subject", true, Arrays.asList(facade.getSubject())); fields.add(subject); } - private void addDescription(DatasetFacade facade, List fields) { + protected void addDescription(DatasetFacade facade, List fields) { List descs = facade.getDescriptions(); List> descList = new ArrayList<>(); for (DatasetDescription desc: descs) { @@ -190,7 +190,7 @@ private void addDescription(DatasetFacade facade, List fields) { fields.add(desc); } - private void addTopicClassifications(DatasetFacade facade, List fields) { + protected void addTopicClassifications(DatasetFacade facade, List fields) { List topics = facade.getTopicClassifications(); List> topicsList = new ArrayList<>(); for (DatasetTopicClassification topic: topics) { @@ -204,7 +204,7 @@ private void addTopicClassifications(DatasetFacade facade, List f fields.add(topicClassifn); } - private void addProducers(DatasetFacade facade, List fields) { + protected void addProducers(DatasetFacade facade, List fields) { List topics = facade.getProducers(); List> topicsList = new ArrayList<>(); for (DatasetProducer topic: topics) { @@ -220,7 +220,7 @@ private void addProducers(DatasetFacade facade, List fields) { fields.add(topicClassifn); } - private void addContributor(DatasetFacade facade, List fields) { + protected void addContributor(DatasetFacade facade, List fields) { List contribs = facade.getContributors(); List> contribList = new ArrayList<>(); for (DatasetContributor contrib: contribs) { @@ -237,7 +237,7 @@ private void addContributor(DatasetFacade facade, List fields) { fields.add(topicClassifn); } - private void addPublications(DatasetFacade facade, List fields) { + protected void addPublications(DatasetFacade facade, List fields) { List publications = facade.getPublications(); List> list = new ArrayList<>(); for (DatasetPublication publication: publications) { @@ -256,7 +256,7 @@ private void addPublications(DatasetFacade facade, List fields) { fields.add(publication); } - private void addKeywords(DatasetFacade facade, List fields) { + protected void addKeywords(DatasetFacade facade, List fields) { List keywords = facade.getKeywords(); List> keysList = new ArrayList<>(); for (DatasetKeyword keyword: keywords) { @@ -273,11 +273,11 @@ private void addKeywords(DatasetFacade facade, List fields) { } - private String isoDate(Date date) { + protected String isoDate(Date date) { return String.format("%tF", date); } - private void addContacts (DatasetFacade facade, List fields) { + protected void addContacts (DatasetFacade facade, List fields) { List contacts = facade.getContacts(); List> contactsList = new ArrayList<>(); for (DatasetContact contact : contacts) { @@ -292,7 +292,7 @@ private void addContacts (DatasetFacade facade, List fields) { fields.add(contact); } - private void addAuthors (DatasetFacade facade, List fields) { + protected void addAuthors (DatasetFacade facade, List fields) { List authors = facade.getAuthors(); List> authorsMap = new ArrayList<>(); for (DatasetAuthor author : authors) { @@ -313,19 +313,19 @@ private void addAuthors (DatasetFacade facade, List fields) { fields.add(toAdd); } - private void addOptionalPrimitiveField(String value, Map map, String field) { + protected void addOptionalPrimitiveField(String value, Map map, String field) { if (!isEmpty(value)) { CitationField affil = createPrimitiveSingleField(field, value); map.put(field, affil); } } - private void addTitle(DatasetFacade facade, List fields) { + protected void addTitle(DatasetFacade facade, List fields) { CitationField title = createPrimitiveSingleField("title", facade.getTitle()); fields.add(title); } - private void addDepositor(DatasetFacade facade, List fields) { + protected void addDepositor(DatasetFacade facade, List fields) { CitationField deposit = createPrimitiveSingleField("depositor", facade.getDepositor()); fields.add(deposit); } diff --git a/src/main/java/com/researchspace/dataverse/http/AbstractOpsImplV1.java b/src/main/java/com/researchspace/dataverse/http/AbstractOpsImplV1.java index f0710e4..d58038e 100644 --- a/src/main/java/com/researchspace/dataverse/http/AbstractOpsImplV1.java +++ b/src/main/java/com/researchspace/dataverse/http/AbstractOpsImplV1.java @@ -67,7 +67,7 @@ public void configure(DataverseConfig config) { setServerURL(config.getServerURL().toString()); } - void handleError(ResponseEntity> resp) { + protected void handleError(ResponseEntity> resp) { log.debug("{}", resp.getBody()); if (RestUtil.isError(resp.getStatusCode())) { String msg = String.format("Error code returned %d with message [%s]", resp.getStatusCodeValue(), @@ -83,7 +83,7 @@ RestTemplate createTemplate() { return template; } - String createV1Url(String ... pathComponents) { + protected String createV1Url(String ... pathComponents) { String url = serverAPIv1URL + "/" + StringUtils.join(pathComponents, "/") ; log.info("URL is {}", url); return url; diff --git a/src/main/java/com/researchspace/dataverse/http/DataverseOperationsImplV1.java b/src/main/java/com/researchspace/dataverse/http/DataverseOperationsImplV1.java index a5fd29e..7eadf55 100644 --- a/src/main/java/com/researchspace/dataverse/http/DataverseOperationsImplV1.java +++ b/src/main/java/com/researchspace/dataverse/http/DataverseOperationsImplV1.java @@ -276,18 +276,18 @@ public DvMessage deleteDataset(Identifier dsIdentifier) { return resp.getBody().getData(); } - private HttpEntity createHttpEntity(String body) { + protected HttpEntity createHttpEntity(String body) { HttpHeaders headers = addAPIKeyToHeader(); HttpEntity entity = new HttpEntity(body, headers); return entity; } - private String getJsonFromFacade(DatasetFacade facade) { + protected String getJsonFromFacade(DatasetFacade facade) { Dataset dataset = new DatasetBuilder().build(facade); return marshalDataset(dataset); } - private String marshalDataset(Object object) { + protected String marshalDataset(Object object) { ObjectMapper mapper = new ObjectMapper(); String json = ""; try {