diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2020-10-02 15:39:34 +0200 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2020-10-02 15:39:34 +0200 |
commit | f20fd185d7eb0aa6611967a02c678e56a0e137f4 (patch) | |
tree | 06572e1f020829115d772092d05963ed6f6096b4 /document/src/main | |
parent | 23cb6ef2bdbef00d32d836072bfc47ff8f5682de (diff) |
Move un-exported enum to exported package
Diffstat (limited to 'document/src/main')
6 files changed, 23 insertions, 25 deletions
diff --git a/document/src/main/java/com/yahoo/document/json/DocumentOperationType.java b/document/src/main/java/com/yahoo/document/json/DocumentOperationType.java new file mode 100644 index 00000000000..6d53e1948c9 --- /dev/null +++ b/document/src/main/java/com/yahoo/document/json/DocumentOperationType.java @@ -0,0 +1,9 @@ +// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.document.json; + +/** + * @author Haakon Dybdahl + */ +public enum DocumentOperationType { + PUT, UPDATE, REMOVE +} diff --git a/document/src/main/java/com/yahoo/document/json/JsonReader.java b/document/src/main/java/com/yahoo/document/json/JsonReader.java index 3e011fc858f..3162056db66 100644 --- a/document/src/main/java/com/yahoo/document/json/JsonReader.java +++ b/document/src/main/java/com/yahoo/document/json/JsonReader.java @@ -60,7 +60,7 @@ public class JsonReader { * @param docIdString document ID. * @return the document */ - public DocumentOperation readSingleDocument(DocumentParser.SupportedOperation operationType, String docIdString) { + public DocumentOperation readSingleDocument(DocumentOperationType operationType, String docIdString) { DocumentId docId = new DocumentId(docIdString); DocumentParseInfo documentParseInfo; try { diff --git a/document/src/main/java/com/yahoo/document/json/SingleDocumentParser.java b/document/src/main/java/com/yahoo/document/json/SingleDocumentParser.java index b57b55c9d73..67508c61b23 100644 --- a/document/src/main/java/com/yahoo/document/json/SingleDocumentParser.java +++ b/document/src/main/java/com/yahoo/document/json/SingleDocumentParser.java @@ -6,7 +6,6 @@ import com.yahoo.document.DocumentOperation; import com.yahoo.document.DocumentPut; import com.yahoo.document.DocumentTypeManager; import com.yahoo.document.DocumentUpdate; -import com.yahoo.document.json.document.DocumentParser; import com.yahoo.vespaxmlparser.DocumentFeedOperation; import com.yahoo.vespaxmlparser.DocumentUpdateFeedOperation; import com.yahoo.vespaxmlparser.FeedOperation; @@ -29,22 +28,22 @@ public class SingleDocumentParser { } public FeedOperation parsePut(InputStream inputStream, String docId) { - return parse(inputStream, docId, DocumentParser.SupportedOperation.PUT); + return parse(inputStream, docId, DocumentOperationType.PUT); } public FeedOperation parseUpdate(InputStream inputStream, String docId) { - return parse(inputStream, docId, DocumentParser.SupportedOperation.UPDATE); + return parse(inputStream, docId, DocumentOperationType.UPDATE); } - private FeedOperation parse(InputStream inputStream, String docId, DocumentParser.SupportedOperation supportedOperation) { + private FeedOperation parse(InputStream inputStream, String docId, DocumentOperationType documentOperationType) { JsonReader reader = new JsonReader(docMan, inputStream, jsonFactory); - DocumentOperation documentOperation = reader.readSingleDocument(supportedOperation, docId); + DocumentOperation documentOperation = reader.readSingleDocument(documentOperationType, docId); try { inputStream.close(); } catch (IOException e) { throw new IllegalStateException(e); } - if (supportedOperation == DocumentParser.SupportedOperation.PUT) { + if (documentOperationType == DocumentOperationType.PUT) { return new DocumentFeedOperation(((DocumentPut) documentOperation).getDocument(), documentOperation.getCondition()); } else { return new DocumentUpdateFeedOperation((DocumentUpdate) documentOperation, documentOperation.getCondition()); diff --git a/document/src/main/java/com/yahoo/document/json/document/DocumentParser.java b/document/src/main/java/com/yahoo/document/json/document/DocumentParser.java index 3fc2c941b99..a8fdb186bd7 100644 --- a/document/src/main/java/com/yahoo/document/json/document/DocumentParser.java +++ b/document/src/main/java/com/yahoo/document/json/document/DocumentParser.java @@ -4,6 +4,7 @@ package com.yahoo.document.json.document; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import com.yahoo.document.DocumentId; +import com.yahoo.document.json.DocumentOperationType; import com.yahoo.document.json.readers.DocumentParseInfo; import java.io.IOException; @@ -12,13 +13,10 @@ import java.util.Optional; /** * Parses a document operation. * - * @author dybis + * @author Haakon Dybdahl */ public class DocumentParser { - public enum SupportedOperation { - PUT, UPDATE, REMOVE - } private static final String UPDATE = "update"; private static final String PUT = "put"; private static final String ID = "id"; @@ -134,15 +132,15 @@ public class DocumentParser { } } - private static SupportedOperation operationNameToOperationType(String operationName) { + private static DocumentOperationType operationNameToOperationType(String operationName) { switch (operationName) { case PUT: case ID: - return SupportedOperation.PUT; + return DocumentOperationType.PUT; case REMOVE: - return SupportedOperation.REMOVE; + return DocumentOperationType.REMOVE; case UPDATE: - return SupportedOperation.UPDATE; + return DocumentOperationType.UPDATE; default: throw new IllegalArgumentException( "Got " + operationName + " as document operation, only \"put\", " + diff --git a/document/src/main/java/com/yahoo/document/json/document/package-info.java b/document/src/main/java/com/yahoo/document/json/document/package-info.java deleted file mode 100644 index df4c12216af..00000000000 --- a/document/src/main/java/com/yahoo/document/json/document/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2020 Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * Infrastructure for building Vespa documents and feed operations from JSON. - */ -@ExportPackage -package com.yahoo.document.json.document; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/document/src/main/java/com/yahoo/document/json/readers/DocumentParseInfo.java b/document/src/main/java/com/yahoo/document/json/readers/DocumentParseInfo.java index da7f18b1a7e..878324d0d1e 100644 --- a/document/src/main/java/com/yahoo/document/json/readers/DocumentParseInfo.java +++ b/document/src/main/java/com/yahoo/document/json/readers/DocumentParseInfo.java @@ -2,8 +2,8 @@ package com.yahoo.document.json.readers; import com.yahoo.document.DocumentId; +import com.yahoo.document.json.DocumentOperationType; import com.yahoo.document.json.TokenBuffer; -import com.yahoo.document.json.document.DocumentParser; import java.util.Optional; @@ -11,6 +11,6 @@ public class DocumentParseInfo { public DocumentId documentId; public Optional<Boolean> create = Optional.empty(); public Optional<String> condition = Optional.empty(); - public DocumentParser.SupportedOperation operationType = null; + public DocumentOperationType operationType = null; public TokenBuffer fieldsBuffer = new TokenBuffer(); } |