Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/edu/kit/datamanager/pit/Application.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import edu.kit.datamanager.pit.cli.PidSource;
import edu.kit.datamanager.pit.common.InvalidConfigException;
import edu.kit.datamanager.pit.configuration.ApplicationProperties;
import edu.kit.datamanager.pit.domain.PIDRecord;
import edu.kit.datamanager.pit.domain.PidRecord;
import edu.kit.datamanager.pit.pidsystem.IIdentifierSystem;
import edu.kit.datamanager.pit.pitservice.ITypingService;
import edu.kit.datamanager.pit.pitservice.impl.TypingService;
Expand Down Expand Up @@ -164,7 +164,7 @@ public KeycloakJwtProperties properties() {
}

@Bean
public HttpMessageConverter<PIDRecord> simplePidRecordConverter() {
public HttpMessageConverter<PidRecord> simplePidRecordConverter() {
return new SimplePidRecordConverter();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import edu.kit.datamanager.pit.common.InvalidConfigException;
import edu.kit.datamanager.pit.common.PidNotFoundException;
import edu.kit.datamanager.pit.configuration.ApplicationProperties;
import edu.kit.datamanager.pit.domain.PIDRecord;
import edu.kit.datamanager.pit.domain.PidRecord;
import edu.kit.datamanager.pit.elasticsearch.PidRecordElasticRepository;
import edu.kit.datamanager.pit.elasticsearch.PidRecordElasticWrapper;
import edu.kit.datamanager.pit.pidlog.KnownPid;
Expand Down Expand Up @@ -77,7 +77,7 @@ public boolean process() throws IOException, InvalidConfigException {
// store in Elasticsearch
elastic.ifPresent(elastic -> {
try {
PIDRecord rec = typingService.queryPid(known.getPid());
PidRecord rec = typingService.queryPid(known.getPid());
LOG.info("Store PID {} in Elasticsearch.", known.getPid());
PidRecordElasticWrapper wrapper = new PidRecordElasticWrapper(rec, typingService.getOperations());
elastic.save(wrapper);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package edu.kit.datamanager.pit.common;

import edu.kit.datamanager.pit.domain.PIDRecord;
import edu.kit.datamanager.pit.domain.PidRecord;
import org.springframework.http.HttpStatus;
import org.springframework.web.server.ResponseStatusException;

Expand All @@ -31,24 +31,24 @@ public class RecordValidationException extends ResponseStatusException {
private static final HttpStatus HTTP_STATUS = HttpStatus.BAD_REQUEST;

// For cases in which the PID record should be appended to the error response.
private final transient PIDRecord pidRecord;
private final transient PidRecord pidRecord;

public RecordValidationException(PIDRecord pidRecord) {
public RecordValidationException(PidRecord pidRecord) {
super(HTTP_STATUS, VALIDATION_OF_RECORD + pidRecord.getPid() + " failed.");
this.pidRecord = pidRecord;
}

public RecordValidationException(PIDRecord pidRecord, String reason) {
public RecordValidationException(PidRecord pidRecord, String reason) {
super(HTTP_STATUS, VALIDATION_OF_RECORD + pidRecord.getPid() + " failed. Reason: " + reason);
this.pidRecord = pidRecord;
}

public RecordValidationException(PIDRecord pidRecord, String reason, Exception e) {
public RecordValidationException(PidRecord pidRecord, String reason, Exception e) {
super(HTTP_STATUS, VALIDATION_OF_RECORD + pidRecord.getPid() + " failed. Reason: " + reason, e);
this.pidRecord = pidRecord;
}

public PIDRecord getPidRecord() {
public PidRecord getPidRecord() {
return pidRecord;
}
}
4 changes: 2 additions & 2 deletions src/main/java/edu/kit/datamanager/pit/domain/Operations.java
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public Operations(ITypeRegistry typeRegistry, IIdentifierSystem identifierSystem
* @return the date, if it could have been extracted.
* @throws IOException on IO errors regarding resolving types.
*/
public Optional<Date> findDateCreated(PIDRecord pidRecord) throws IOException {
public Optional<Date> findDateCreated(PidRecord pidRecord) throws IOException {
/* try known types */
List<String> knownDateTypes = Arrays.asList(Operations.KNOWN_DATE_CREATED);
Optional<Date> date = knownDateTypes
Expand Down Expand Up @@ -117,7 +117,7 @@ public Optional<Date> findDateCreated(PIDRecord pidRecord) throws IOException {
* @return the date, if it could have been extracted.
* @throws IOException on IO errors regarding resolving types.
*/
public Optional<Date> findDateModified(PIDRecord pidRecord) throws IOException {
public Optional<Date> findDateModified(PidRecord pidRecord) throws IOException {
/* try known types */
List<String> knownDateTypes = Arrays.asList(Operations.KNOWN_DATE_MODIFIED);
Optional<Date> date = knownDateTypes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,12 @@
package edu.kit.datamanager.pit.domain;

import lombok.Data;
import lombok.EqualsAndHashCode;

@Data
public class PIDRecordEntry implements Cloneable {
private String key;
@EqualsAndHashCode.Exclude
private String name;
private String value;

Expand Down
25 changes: 25 additions & 0 deletions src/main/java/edu/kit/datamanager/pit/domain/PidNode.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package edu.kit.datamanager.pit.domain;

import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.*;

// We assume that two PidNode are equal if their PidRecord parts are equal.
// The "exists" field is not making a difference for content equality.
// Therefore, just keep the "equal"-implementation from PidRecord.
@Getter
@Setter
@RequiredArgsConstructor
@ToString
public class PidNode extends PidRecord {
@JsonProperty("placeholder_pid")
private String placeholderPid;

public

@Override
public PidNode clone() {
PidNode clone = (PidNode) super.clone();
clone.placeholderPid = this.placeholderPid;
return clone;
}
}
Loading
Loading