geographicBoundingBoxes;
+
+ /**
+ * Returns a copy if the internally stored Date
+ * @return
+ */
+ public Date getProductionDate () {
+ if(productionDate != null){
+ return new Date(productionDate.getTime());
+ } else {
+ return null;
+ }
+ }
+
+ /**
+ * Sets this object's date as a copy of the parameter Date.
+ * @param date
+ */
+ public void setProductionDate(final Date date) {
+ productionDate = new Date(date.getTime());
+ }
+
+ /**
+ * For testing
+ */
+ DatasetFacade() {
+ // TODO Auto-generated constructor stub
+ }
}
diff --git a/src/main/java/com/researchspace/dataverse/entities/facade/DatasetGeographicBoundingBox.java b/src/main/java/com/researchspace/dataverse/entities/facade/DatasetGeographicBoundingBox.java
new file mode 100644
index 0000000..f55d9bb
--- /dev/null
+++ b/src/main/java/com/researchspace/dataverse/entities/facade/DatasetGeographicBoundingBox.java
@@ -0,0 +1,54 @@
+/**
+Copyright 2016 ResearchSpace
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
*/
+package com.researchspace.dataverse.entities.facade;
+
+import lombok.Builder;
+import lombok.Data;
+import lombok.NonNull;
+
+/**
+ * Dataset geographic limits for 'geographicBoundingBox' field.
+ * @author ltromel
+ */
+@Data
+@Builder
+public class DatasetGeographicBoundingBox {
+
+ // Note : North and south latitude are named "Longitude" because dataverse expect this in the .json.
+ // It's obviously an error, in the meantime, they'll be named like this waiting for a patch.
+
+ /**
+ * Expected decimal degrees, at least two decimals.
+ */
+ private @NonNull Double westLongitude;
+
+ /**
+ * Expected decimal degrees, at least two decimals.
+ */
+ private @NonNull Double eastLongitude;
+
+ /**
+ * Expected decimal degrees, at least two decimals.
+ */
+ private @NonNull Double northLongitude;
+
+ /**
+ * Expected decimal degrees, at least two decimals.
+ */
+ private @NonNull Double southLongitude;
+
+
+}
diff --git a/src/main/java/com/researchspace/dataverse/entities/facade/DatasetKeyword.java b/src/main/java/com/researchspace/dataverse/entities/facade/DatasetKeyword.java
index d402f31..2f66785 100644
--- a/src/main/java/com/researchspace/dataverse/entities/facade/DatasetKeyword.java
+++ b/src/main/java/com/researchspace/dataverse/entities/facade/DatasetKeyword.java
@@ -1,14 +1,3 @@
-/*
- *
- */
-package com.researchspace.dataverse.entities.facade;
-
-import java.net.URI;
-
-import lombok.Builder;
-import lombok.Data;
-import lombok.NonNull;
-
/**
Copyright 2016 ResearchSpace
@@ -23,15 +12,25 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-
-*/
+ */
+package com.researchspace.dataverse.entities.facade;
+
+import java.net.URI;
+
+import lombok.Builder;
+import lombok.Data;
+import lombok.NonNull;
+
+/**
+ * Dataset keyword.
+ */
@Builder
@Data
public class DatasetKeyword {
-
- private @NonNull String value;
- private String vocabulary;
- private URI vocabularyURI;
-
+
+ private @NonNull String value;
+ private String vocabulary;
+ private URI vocabularyURI;
+
}
diff --git a/src/main/java/com/researchspace/dataverse/entities/facade/DatasetProducer.java b/src/main/java/com/researchspace/dataverse/entities/facade/DatasetProducer.java
index 9654d3f..58aa354 100644
--- a/src/main/java/com/researchspace/dataverse/entities/facade/DatasetProducer.java
+++ b/src/main/java/com/researchspace/dataverse/entities/facade/DatasetProducer.java
@@ -1,12 +1,3 @@
-/*
- *
- */
-package com.researchspace.dataverse.entities.facade;
-
-import java.net.URL;
-
-import lombok.Builder;
-import lombok.Data;
/**
Copyright 2016 ResearchSpace
@@ -21,13 +12,22 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-
-*/
+ */
+package com.researchspace.dataverse.entities.facade;
+
+import java.net.URL;
+
+import lombok.Builder;
+import lombok.Data;
+
+/**
+ * Dataset producer.
+ */
@Data
@Builder
public class DatasetProducer {
-
- private String name, affiliation, abbreviation;
- private URL url, logoURL;
+
+ private String name, affiliation, abbreviation;
+ private URL url, logoURL;
}
diff --git a/src/main/java/com/researchspace/dataverse/entities/facade/DatasetPublication.java b/src/main/java/com/researchspace/dataverse/entities/facade/DatasetPublication.java
index cb49545..54c5bb0 100644
--- a/src/main/java/com/researchspace/dataverse/entities/facade/DatasetPublication.java
+++ b/src/main/java/com/researchspace/dataverse/entities/facade/DatasetPublication.java
@@ -1,12 +1,3 @@
-/*
- *
- */
-package com.researchspace.dataverse.entities.facade;
-
-import java.net.URL;
-
-import lombok.Builder;
-import lombok.Data;
/**
Copyright 2016 ResearchSpace
@@ -21,14 +12,22 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-
-*/
+ */
+package com.researchspace.dataverse.entities.facade;
+
+import java.net.URL;
+
+import lombok.Builder;
+import lombok.Data;
+/**
+ * Dataset publication
+ */
@Data
@Builder
public class DatasetPublication {
-
- private String publicationCitation, publicationIdNumber;
- private PublicationIDType publicationIDType;
- private URL publicationURL;
+
+ private String publicationCitation, publicationIdNumber;
+ private PublicationIDType publicationIDType;
+ private URL publicationURL;
}
diff --git a/src/main/java/com/researchspace/dataverse/entities/Citation.java b/src/main/java/com/researchspace/dataverse/entities/facade/DatasetTimePeriodCovered.java
similarity index 64%
rename from src/main/java/com/researchspace/dataverse/entities/Citation.java
rename to src/main/java/com/researchspace/dataverse/entities/facade/DatasetTimePeriodCovered.java
index e613d1a..de969b8 100644
--- a/src/main/java/com/researchspace/dataverse/entities/Citation.java
+++ b/src/main/java/com/researchspace/dataverse/entities/facade/DatasetTimePeriodCovered.java
@@ -1,11 +1,3 @@
-/*
- *
- */
-package com.researchspace.dataverse.entities;
-
-import java.util.List;
-
-import lombok.Data;
/**
Copyright 2016 ResearchSpace
@@ -20,10 +12,23 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-
-*/
+ */
+package com.researchspace.dataverse.entities.facade;
+
+import java.util.Date;
+
+import lombok.Builder;
+import lombok.Data;
+import lombok.NonNull;
+
+/**
+ * Dataset time bounds for 'timePeriodCovered' field.
+ * @author ltromel
+ */
@Data
-public class Citation {
- private String displayName = "Citation Metadata";
- private List fields;
+@Builder
+public class DatasetTimePeriodCovered {
+
+ private @NonNull Date timePeriodCoveredStart, timePeriodCoveredEnd;
+
}
diff --git a/src/main/java/com/researchspace/dataverse/entities/facade/DatasetTopicClassification.java b/src/main/java/com/researchspace/dataverse/entities/facade/DatasetTopicClassification.java
index f546489..8531124 100644
--- a/src/main/java/com/researchspace/dataverse/entities/facade/DatasetTopicClassification.java
+++ b/src/main/java/com/researchspace/dataverse/entities/facade/DatasetTopicClassification.java
@@ -1,12 +1,3 @@
-/*
- *
- */
-package com.researchspace.dataverse.entities.facade;
-
-import java.net.URI;
-
-import lombok.Builder;
-import lombok.Data;
/**
Copyright 2016 ResearchSpace
@@ -21,13 +12,23 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-
-*/
+ */
+package com.researchspace.dataverse.entities.facade;
+
+import java.net.URI;
+
+import lombok.Builder;
+import lombok.Data;
+
+/**
+ * Representation of one Dataset's topic classification for 'topicClassification' field.
+ * @author ltromel
+ */
@Data
@Builder
public class DatasetTopicClassification {
-
- private String topicClassValue, topicClassVocab;
- private URI topicClassVocabURI;
+
+ private String topicClassValue, topicClassVocab;
+ private URI topicClassVocabURI;
}
diff --git a/src/main/java/com/researchspace/dataverse/entities/facade/PublicationIDType.java b/src/main/java/com/researchspace/dataverse/entities/facade/PublicationIDType.java
index 4338775..0218a27 100644
--- a/src/main/java/com/researchspace/dataverse/entities/facade/PublicationIDType.java
+++ b/src/main/java/com/researchspace/dataverse/entities/facade/PublicationIDType.java
@@ -1,8 +1,3 @@
-/*
- *
- */
-package com.researchspace.dataverse.entities.facade;
-
/**
Copyright 2016 ResearchSpace
@@ -17,10 +12,14 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-
-*/
+ */
+package com.researchspace.dataverse.entities.facade;
+
+/**
+ * Accepted types list for 'publicationIDType' field.
+ */
public enum PublicationIDType {
-
- ark, arXiv, bibcode, doi, ean13, eissn, handle, isbn, issn, istc, lissn, lsid, pmid, purl, upc, url, urn
+
+ ark, arXiv, bibcode, doi, ean13, eissn, handle, isbn, issn, istc, lissn, lsid, pmid, purl, upc, url, urn
}
diff --git a/src/main/java/com/researchspace/dataverse/http/AbstractOpsImplV1.java b/src/main/java/com/researchspace/dataverse/http/AbstractOpsImplV1.java
index f0710e4..50b9d48 100644
--- a/src/main/java/com/researchspace/dataverse/http/AbstractOpsImplV1.java
+++ b/src/main/java/com/researchspace/dataverse/http/AbstractOpsImplV1.java
@@ -1,22 +1,3 @@
-/*
- *
- */
-package com.researchspace.dataverse.http;
-
-import com.researchspace.dataverse.api.v1.DataverseConfig;
-import com.researchspace.dataverse.entities.DataverseResponse;
-import com.researchspace.springrest.ext.LoggingResponseErrorHandler;
-import com.researchspace.springrest.ext.RestUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.client.RestClientException;
-import org.springframework.web.client.RestTemplate;
-
-import java.util.Arrays;
-
/**
Copyright 2016 ResearchSpace
@@ -31,80 +12,122 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-
-*/
+ */
+package com.researchspace.dataverse.http;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang.StringUtils;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.http.client.ClientHttpResponse;
+import org.springframework.web.client.ResponseErrorHandler;
+import org.springframework.web.client.RestTemplate;
+
+import com.researchspace.dataverse.api.v1.DataverseConfig;
+import com.researchspace.dataverse.entities.DataverseResponse;
+import com.researchspace.springrest.ext.RestClientException;
+import com.researchspace.springrest.ext.RestUtil;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * Abstract extension class for v1 operation classes.
+ */
@Slf4j
public abstract class AbstractOpsImplV1 {
-
- String apiKey = "";
- String serverURL = "";
- String serverAPIURL = serverURL +"/api";
- String serverAPIv1URL = serverAPIURL +"/v1";
- protected RestTemplate template;
-
- public AbstractOpsImplV1() {
- super();
- this.template = createTemplate();
- }
-
- protected void setTemplate(RestTemplate template) {
- this.template = template;
- }
-
- public final static String apiHeader = "X-Dataverse-key";
- public void setApiKey(String apiKey) {
- this.apiKey = apiKey;
- }
-
- public void setServerURL(String serverURL) {
- this.serverURL = serverURL;
- this.serverAPIURL = serverURL + "/api";
- this.serverAPIv1URL = this.serverAPIURL +"/v1";
- }
-
- public void configure(DataverseConfig config) {
- setApiKey(config.getApiKey());
- setServerURL(config.getServerURL().toString());
- }
-
- 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(),
- resp.getBody().getMessage());
- log.error(msg);
- throw new RestClientException(msg);
- }
- }
-
- RestTemplate createTemplate() {
- RestTemplate template = new RestTemplate();
- template.setErrorHandler(new LoggingResponseErrorHandler());
- return template;
- }
-
- String createV1Url(String ... pathComponents) {
- String url = serverAPIv1URL + "/" + StringUtils.join(pathComponents, "/") ;
- log.info("URL is {}", url);
- return url;
- }
-
- String createAdminUrl(String ... pathComponents) {
- String url = serverAPIURL + "/" + StringUtils.join(pathComponents, "/") ;
- log.info("URL is {}", url);
- return url;
- }
-
+
+ String apiKey = "";
+ String serverURL = "";
+ String serverAPIURL = serverURL +"/api";
+ String serverAPIv1URL = serverAPIURL +"/v1";
+ protected RestTemplate template;
+
+ protected AbstractOpsImplV1() {
+ createTemplate();
+ }
+
+ public class CustomErrorHandler implements ResponseErrorHandler {
+
+ @Override
+ public boolean hasError(final ClientHttpResponse response) throws IOException {
+ return RestUtil.isError(response.getStatusCode());
+ }
+
+ @Override
+ public void handleError(final ClientHttpResponse response) throws IOException, RestClientException {
+ final BufferedReader in = new BufferedReader(new InputStreamReader(response.getBody()));
+ final String body = in.lines().collect(Collectors.joining("\n"));
+ log.error("Error code returned {} with message {}",
+ response.getStatusCode().value(),
+ body);
+ throw new RestClientException(response.getStatusCode().value(), body);
+ }
+ }
+
+ protected void setTemplate(final RestTemplate template) {
+ this.template = template;
+ }
+
+ public static final String API_HEADER = "X-Dataverse-key";
+
+ public void setApiKey(final String apiKey) {
+ this.apiKey = apiKey;
+ }
+
+ public void setServerURL(final String serverURL) {
+ this.serverURL = serverURL;
+ serverAPIURL = serverURL + "/api";
+ serverAPIv1URL = serverAPIURL +"/v1";
+ }
+
+ public void configure(final DataverseConfig config) {
+ setApiKey(config.getApiKey());
+ setServerURL(config.getServerURL().toString());
+ }
+
+ void handleError(final ResponseEntity> resp) throws RestClientException {
+ log.debug(resp.getBody().toString());
+ if (RestUtil.isError(resp.getStatusCode())) {
+ log.info(resp.getBody().toString());
+ log.error(String.format("Error code returned %d with message [%s]", resp.getStatusCodeValue(),
+ resp.getBody().getMessage()));
+ throw new RestClientException(resp.getStatusCodeValue(), resp.getBody().getMessage());
+ }
+ }
+
+ void createTemplate() {
+ template = new RestTemplate();
+ template.setErrorHandler(new CustomErrorHandler());
+ }
+
+ String createV1Url(final String ... pathComponents) {
+ final String url = serverAPIv1URL + "/" + StringUtils.join(pathComponents, "/") ;
+ log.debug("URL is {}", url);
+ return url;
+ }
+
+ String createAdminUrl(final String ... pathComponents) {
+ final String url = serverAPIURL + "/" + StringUtils.join(pathComponents, "/") ;
+ log.debug("URL is {}", url);
+ return url;
+ }
+
HttpHeaders addAPIKeyToHeader() {
- HttpHeaders headers = new HttpHeaders();
- headers.setContentType(MediaType.APPLICATION_JSON);
- headers.setAccept(Arrays.asList(MediaType.APPLICATION_JSON));
- addApiKey(headers);
- return headers;
- }
-
- void addApiKey(HttpHeaders headers) {
- headers.add(apiHeader, apiKey);
- }
+ final HttpHeaders headers = new HttpHeaders();
+ headers.setContentType(MediaType.APPLICATION_JSON);
+ headers.setAccept(Arrays.asList(MediaType.APPLICATION_JSON));
+ addApiKey(headers);
+ return headers;
+ }
+
+ void addApiKey(final HttpHeaders headers) {
+ headers.add(API_HEADER, apiKey);
+ }
}
diff --git a/src/main/java/com/researchspace/dataverse/http/DataverseAPIImpl.java b/src/main/java/com/researchspace/dataverse/http/DataverseAPIImpl.java
index 8a9b700..367cb10 100644
--- a/src/main/java/com/researchspace/dataverse/http/DataverseAPIImpl.java
+++ b/src/main/java/com/researchspace/dataverse/http/DataverseAPIImpl.java
@@ -1,6 +1,18 @@
-/*
- *
- */
+/**
+Copyright 2016 ResearchSpace
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
*/
package com.researchspace.dataverse.http;
import com.researchspace.dataverse.api.v1.DatasetOperations;
@@ -10,53 +22,50 @@
import com.researchspace.dataverse.api.v1.InfoOperations;
import com.researchspace.dataverse.api.v1.MetadataOperations;
import com.researchspace.dataverse.api.v1.SearchOperations;
-/** Copyright 2016 ResearchSpace
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-*/
-public class DataverseAPIImpl implements DataverseAPI {
- private DataverseOperationsImplV1 dvOperationsImpl = new DataverseOperationsImplV1();
- private SearchOperationsImplV1 searchOperationsImpl = new SearchOperationsImplV1();
-
- @Override
- public DatasetOperations getDatasetOperations() {
- return dvOperationsImpl;
- }
-
- @Override
- public MetadataOperations getMetadataOperations() {
- return dvOperationsImpl;
- }
-
- @Override
- public DataverseOperations getDataverseOperations() {
- return dvOperationsImpl;
- }
-
- @Override
- public void configure(DataverseConfig config) {
- dvOperationsImpl.configure(config);
- searchOperationsImpl.configure(config);
- }
-
- @Override
- public InfoOperations getInfoOperations() {
- return dvOperationsImpl;
- }
-
- @Override
- public SearchOperations getSearchOperations() {
- return searchOperationsImpl;
- }
+import com.researchspace.dataverse.api.v1.UsersOperations;
+
+/**
+ * Dataverse API v1 implementation.
+ */
+public class DataverseAPIImpl implements DataverseAPI {
+
+ private final DataverseOperationsImplV1 dvOperationsImpl = new DataverseOperationsImplV1();
+
+ private final SearchOperationsImplV1 searchOperationsImpl = new SearchOperationsImplV1();
+
+ @Override
+ public DatasetOperations getDatasetOperations() {
+ return dvOperationsImpl;
+ }
+
+ @Override
+ public MetadataOperations getMetadataOperations() {
+ return dvOperationsImpl;
+ }
+
+ @Override
+ public DataverseOperations getDataverseOperations() {
+ return dvOperationsImpl;
+ }
+
+ @Override
+ public void configure(final DataverseConfig config) {
+ dvOperationsImpl.configure(config);
+ searchOperationsImpl.configure(config);
+ }
+
+ @Override
+ public InfoOperations getInfoOperations() {
+ return dvOperationsImpl;
+ }
+
+ @Override
+ public SearchOperations getSearchOperations() {
+ return searchOperationsImpl;
+ }
+
+ @Override
+ public UsersOperations getUsersOperations() {
+ return dvOperationsImpl;
+ }
}
diff --git a/src/main/java/com/researchspace/dataverse/http/DataverseOperationsImplV1.java b/src/main/java/com/researchspace/dataverse/http/DataverseOperationsImplV1.java
index a5fd29e..59ca9ac 100644
--- a/src/main/java/com/researchspace/dataverse/http/DataverseOperationsImplV1.java
+++ b/src/main/java/com/researchspace/dataverse/http/DataverseOperationsImplV1.java
@@ -1,20 +1,37 @@
-/*
- *
- */
+/**
+Copyright 2016 ResearchSpace
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
*/
package com.researchspace.dataverse.http;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.researchspace.dataverse.api.v1.DatasetOperations;
-import com.researchspace.dataverse.api.v1.DataverseOperations;
-import com.researchspace.dataverse.api.v1.InfoOperations;
-import com.researchspace.dataverse.api.v1.MetadataOperations;
-import com.researchspace.dataverse.entities.*;
-import com.researchspace.dataverse.entities.facade.DatasetBuilder;
-import com.researchspace.dataverse.entities.facade.DatasetFacade;
-import com.researchspace.dataverse.sword.FileUploader;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
+import static org.apache.commons.lang3.StringUtils.isEmpty;
+import static org.apache.commons.lang3.Validate.isTrue;
+import static org.apache.commons.lang3.Validate.noNullElements;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.text.ParseException;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.abdera.model.Entry;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.core.io.AbstractResource;
import org.springframework.core.io.ByteArrayResource;
@@ -24,393 +41,508 @@
import org.springframework.http.HttpMethod;
import org.springframework.http.ResponseEntity;
import org.springframework.util.MultiValueMap;
-import org.springframework.web.client.RestClientException;
+import org.swordapp.client.CollectionEntries;
import org.swordapp.client.ProtocolViolationException;
import org.swordapp.client.SWORDClientException;
import org.swordapp.client.SWORDError;
-import java.io.*;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.List;
-
-import static org.apache.commons.lang3.StringUtils.isEmpty;
-import static org.apache.commons.lang3.Validate.isTrue;
-import static org.apache.commons.lang3.Validate.noNullElements;
-/** Copyright 2016 ResearchSpace
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.researchspace.dataverse.api.v1.DatasetOperations;
+import com.researchspace.dataverse.api.v1.DataverseOperations;
+import com.researchspace.dataverse.api.v1.InfoOperations;
+import com.researchspace.dataverse.api.v1.MetadataOperations;
+import com.researchspace.dataverse.api.v1.UsersOperations;
+import com.researchspace.dataverse.entities.Dataset;
+import com.researchspace.dataverse.entities.DatasetFileList;
+import com.researchspace.dataverse.entities.DatasetVersion;
+import com.researchspace.dataverse.entities.DataverseGet;
+import com.researchspace.dataverse.entities.DataverseObject;
+import com.researchspace.dataverse.entities.DataversePost;
+import com.researchspace.dataverse.entities.DataverseResponse;
+import com.researchspace.dataverse.entities.DvMessage;
+import com.researchspace.dataverse.entities.Identifier;
+import com.researchspace.dataverse.entities.MetadataBlock;
+import com.researchspace.dataverse.entities.PublishedDataset;
+import com.researchspace.dataverse.entities.Version;
+import com.researchspace.dataverse.entities.facade.DatasetBuilder;
+import com.researchspace.dataverse.entities.facade.DatasetFacade;
+import com.researchspace.dataverse.sword.SwordAPI;
+import com.researchspace.springrest.ext.RestClientException;
+import com.researchspace.springrest.ext.SWORDException;
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+import lombok.extern.slf4j.Slf4j;
-*/
+/**
+ * Operation classes implementation.
+ */
@Slf4j
-public class DataverseOperationsImplV1 extends AbstractOpsImplV1 implements DatasetOperations, MetadataOperations, InfoOperations, DataverseOperations {
-
-
-
-
- /* (non-Javadoc)
- * @see com.researchspace.dataverse.http.DataverseAPI#getDataverseById(java.lang.String)
- */
- @Override
- public DataverseGet getDataverseById(String dataverseAlias) {
- String url = createV1Url("dataverses" , dataverseAlias);
- log.debug(url);
-
- HttpEntity entity = createHttpEntity("");
- ParameterizedTypeReference> type = new ParameterizedTypeReference>() {
- };
- ParameterizedTypeReference type2 = new ParameterizedTypeReference() {
- };
- ResponseEntity resp2 = template.exchange(url, HttpMethod.GET, entity, type2);
- String what = resp2.getBody();
- ResponseEntity> resp = template.exchange(url, HttpMethod.GET, entity, type);
- log.debug(resp.getBody().toString());
- return resp.getBody().getData();
- }
-
- @Override
- public DataverseResponse deleteDataverse(String dataverseAlias) {
- String url = createV1Url("dataverses", dataverseAlias);
- log.debug(url);
-
- HttpEntity entity = createHttpEntity("");
- ParameterizedTypeReference> type =
- new ParameterizedTypeReference>() {};
- ResponseEntity> resp = template.exchange(url, HttpMethod.DELETE, entity, type);
- log.debug(resp.getBody().toString());
- return resp.getBody();
-
- }
-
- @Override
- public DataverseResponse createNewDataverse(String parentDv, DataversePost toCreate) {
- isTrue(!isEmpty(toCreate.getAlias()), "Alias must be specified");
- isTrue(!isEmpty(toCreate.getName()), "Name must be specified");
- noNullElements(toCreate.getDataverseContacts(), "At least 1 email contact must be provided");
- isTrue(!isEmpty(toCreate.getAlias()), "Alias must be specified");
- String url = createV1Url("dataverses", parentDv);
-
-
- String json = marshalDataset(toCreate);
- HttpEntity entity = createHttpEntity(json);
- ParameterizedTypeReference> type = new ParameterizedTypeReference>() {
- };
- ResponseEntity> resp = template.exchange(url, HttpMethod.POST, entity, type);
- log.debug(resp.getBody().toString());
- handleError(resp);
- return resp.getBody();
-
- }
-
- /* (non-Javadoc)
- * @see com.researchspace.dataverse.http.DataverseAPI#createDataset(com.researchspace.dataverse.entities.facade.DatasetFacade, java.lang.String)
- */
- @Override
- public Identifier createDataset(DatasetFacade facade, String dataverseAlias) {
- String url = createV1Url("dataverses", dataverseAlias,"datasets");
-
- String json = getJsonFromFacade(facade);
- HttpEntity entity = createHttpEntity(json);
- ParameterizedTypeReference> type = new ParameterizedTypeReference>() {
- };
-
- ResponseEntity> resp = template.exchange(url, HttpMethod.POST, entity, type);
- handleError(resp);
- return resp.getBody().getData();
- }
-
- @Override
- public Identifier createDataset(String dataSetJson, String dataverseAlias) {
- String url = createV1Url("dataverses", dataverseAlias,"datasets");
- HttpEntity entity = createHttpEntity(dataSetJson);
- ParameterizedTypeReference> type = new ParameterizedTypeReference>() {
- };
-
- ResponseEntity> resp = template.exchange(url, HttpMethod.POST, entity, type);
- handleError(resp);
- return resp.getBody().getData();
- }
-
-
- /* (non-Javadoc)
- * @see com.researchspace.dataverse.http.DataverseAPI#updateDataset(com.researchspace.dataverse.entities.facade.DatasetFacade, com.researchspace.dataverse.entities.Identifier)
- */
- @Override
- public DatasetVersion updateDataset(DatasetFacade facade, Identifier id) {
- String url = createV1Url("datasets", id.getId() +"", "versions",":draft");
-
- Dataset ds = new DatasetBuilder().build(facade);
- String json = marshalDataset(ds.getDatasetVersion());
-
-
- HttpEntity entity = createHttpEntity(json);
- ParameterizedTypeReference> type = new ParameterizedTypeReference>() {
- };
- ResponseEntity> resp = template.exchange(url, HttpMethod.PUT, entity,type);
-
- handleError(resp);
- return resp.getBody().getData();
-
- }
-
- /* (non-Javadoc)
- * @see com.researchspace.dataverse.http.DataverseAPI#getDataset(com.researchspace.dataverse.entities.Identifier)
- */
- @Override
- public Dataset getDataset(Identifier dsIdentifier) {
- String url = createV1Url("datasets", dsIdentifier.getId() +"");
-
- HttpEntity entity = createHttpEntity("");
- ParameterizedTypeReference> type = new ParameterizedTypeReference>() {
- };
- ResponseEntity> resp = template.exchange(url, HttpMethod.GET, entity, type);
- handleError(resp);
- return resp.getBody().getData();
- }
-
- /* (non-Javadoc)
- * @see com.researchspace.dataverse.http.DataverseAPI#getDatasetVersions(com.researchspace.dataverse.entities.Identifier)
- */
- @Override
- public List getDatasetVersions (Identifier dsIdentifier) {
- String url = createV1Url("datasets", dsIdentifier.getId() +"", "versions");
-
- HttpEntity entity = createHttpEntity("");
- ParameterizedTypeReference>> type = new ParameterizedTypeReference>>() {
- };
- ResponseEntity>> resp = template.exchange(url, HttpMethod.GET, entity, type);
- log.debug("{}", resp.getBody());
- handleError(resp);
- return resp.getBody().getData();
- }
-
- @Override
- public DatasetFileList uploadNativeFile( byte[] data, FileUploadMetadata metadata, Identifier dsIdentifier, String fileName){
- ByteArrayResource resource = new ByteArrayResource(data){
- @Override
- public String getFilename(){
- return fileName;
- }
- };
- return getDatasetFileList(metadata, dsIdentifier, resource);
- }
- @Override
- public DatasetFileList uploadNativeFile(InputStream data, long contentLength, FileUploadMetadata metadata, Identifier dsIdentifier, String fileName) {
- InputStreamResource resource = new InputStreamResource(data) {
- @Override
- public String getFilename(){
- return fileName;
- }
-
- @Override
- public long contentLength() throws IOException {
- return contentLength;
- }
- };
- return getDatasetFileList(metadata, dsIdentifier, resource);
-
- }
-
- private DatasetFileList getDatasetFileList(FileUploadMetadata metadata, Identifier dsIdentifier, AbstractResource resource) {
- String url = createV1Url("datasets", ":persistentId", "add") + "?persistentId=" + dsIdentifier.getPersistentId();
- ParameterizedTypeReference> type =
- new ParameterizedTypeReference>() {};
- HttpEntity> entity = new NativeFileUploader().createFileUploadEntity(metadata, apiKey, resource);
- ResponseEntity> resp = template.exchange(url, HttpMethod.POST, entity, type);
- log.debug("{}", resp.getBody());
- handleError(resp);
- return resp.getBody().getData();
- }
-
- /* (non-Javadoc)
- * @see com.researchspace.dataverse.http.DataverseAPI#uploadFile(java.lang.String, java.io.File)
- */
- @Override
- public void uploadFile (String doi, File file) {
- try {
- this.uploadFile(doi, new FileInputStream(file), file.getName());
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- }
- }
-
- @Override
- public void uploadFile(String doi, InputStream file, String filename) {
- FileUploader uploader = new FileUploader();
- try {
- uploader.deposit(file, filename, apiKey, new URI(serverURL), doi);
- } catch (IOException | SWORDClientException | ProtocolViolationException | URISyntaxException e) {
- log.error("Couldn't upload file {} with doi {} : {}", filename, doi.toString(), e.getMessage());
- throw new RestClientException(e.getMessage());
- } catch (SWORDError error) {
- if (!StringUtils.isEmpty(error.getErrorBody())) {
- log.error("SwordError: {}", error.getErrorBody());
- throw new RestClientException(error.getErrorBody());
- }
- }
-
- }
-
- /* (non-Javadoc)
- * @see com.researchspace.dataverse.http.DataverseAPI#deleteDataset(com.researchspace.dataverse.entities.Identifier)
- */
- @Override
- public DvMessage deleteDataset(Identifier dsIdentifier) {
- String url = createV1Url("datasets", dsIdentifier.getId() +"" );
-
- HttpEntity entity = createHttpEntity("");
- ParameterizedTypeReference> type = new ParameterizedTypeReference>() {
- };
- ResponseEntity> resp = template.exchange(url, HttpMethod.DELETE, entity, type);
- handleError(resp);
- return resp.getBody().getData();
- }
-
- private HttpEntity createHttpEntity(String body) {
- HttpHeaders headers = addAPIKeyToHeader();
- HttpEntity entity = new HttpEntity(body, headers);
- return entity;
- }
-
- private String getJsonFromFacade(DatasetFacade facade) {
- Dataset dataset = new DatasetBuilder().build(facade);
- return marshalDataset(dataset);
- }
-
- private String marshalDataset(Object object) {
- ObjectMapper mapper = new ObjectMapper();
- String json = "";
- try {
- json = mapper.writeValueAsString(object);
- } catch (JsonProcessingException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- return json;
- }
-
- /* (non-Javadoc)
- * @see com.researchspace.dataverse.http.DataverseAPI#getDataverseContents(java.lang.String)
- */
- @Override
- public List getDataverseContents(String dataverseAlias) {
- String url = createV1Url("dataverses", dataverseAlias, "contents" );
-
- HttpEntity entity = createHttpEntity("");
- ParameterizedTypeReference>> type = new ParameterizedTypeReference>>() {
- };
- ParameterizedTypeReference type2 = new ParameterizedTypeReference() {
- };
- ResponseEntity resp2 = template.exchange(url, HttpMethod.GET, entity,
- type2);
- String respB = resp2.getBody();
- ResponseEntity>> resp = template.exchange(url, HttpMethod.GET, entity,
- type);
- handleError(resp);
- DataverseResponse> dv = resp.getBody();
- log.debug("Response is status {} with number elements {}", resp.getBody().getStatus(),
- resp.getBody().getData().size());
- if (!dv.getData().isEmpty()) {
- log.debug("First entry is {}", dv.getData().get(0));
- }
- return dv.getData();
- }
-
- /* (non-Javadoc)
- * @see com.researchspace.dataverse.http.DataverseAPI#getMetadataBLockInfo()
- */
- @Override
- public List getMetadataBlockInfo() {
- String url = createV1Url("metadatablocks" );
-
- HttpHeaders headers = addAPIKeyToHeader();
- HttpEntity entity = new HttpEntity("parameters", headers);
- ParameterizedTypeReference>> type = new ParameterizedTypeReference>>() {
- };
- ResponseEntity>> resp = template.exchange(url, HttpMethod.GET, entity,
- type);
- handleError(resp);
- return resp.getBody().getData();
- }
-
- /* (non-Javadoc)
- * @see com.researchspace.dataverse.http.DataverseAPI#getMetadataById(java.lang.String)
- */
- @Override
- public MetadataBlock getMetadataById(String name) {
- String url = createV1Url("metadatablocks", name );
-
- HttpHeaders headers = addAPIKeyToHeader();
- HttpEntity entity = new HttpEntity("parameters", headers);
- ParameterizedTypeReference> type = new ParameterizedTypeReference>() {
- };
- ResponseEntity> resp = template.exchange(url, HttpMethod.GET, entity, type);
- handleError(resp);
-
- return resp.getBody().getData();
- }
-
-
-
- /* (non-Javadoc)
- * @see com.researchspace.dataverse.http.DataverseAPI#publishDataset(com.researchspace.dataverse.entities.Identifier, com.researchspace.dataverse.entities.Version)
- */
- @Override
- public DataverseResponse