diff options
author | Jon Bratseth <bratseth@gmail.com> | 2022-10-06 23:55:41 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2022-10-06 23:55:41 +0200 |
commit | 8fcec55c82a1035dd17a59eb7bd1b1b65fb16f17 (patch) | |
tree | 4ea47e490d61b657601e338d70dbeb8977c2cdb8 /documentapi | |
parent | 24c70d22397fad2c2d5d2e8b45d7da664283fd85 (diff) |
Return X-Vespa-Ignored-Fields if fields were ignored
Diffstat (limited to 'documentapi')
6 files changed, 12 insertions, 8 deletions
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/ProgressToken.java b/documentapi/src/main/java/com/yahoo/documentapi/ProgressToken.java index 4a77d30ec92..682bcc54a56 100644 --- a/documentapi/src/main/java/com/yahoo/documentapi/ProgressToken.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/ProgressToken.java @@ -22,6 +22,7 @@ import com.yahoo.vespa.objects.BufferSerializer; public class ProgressToken { private static final Logger log = Logger.getLogger(ProgressToken.class.getName()); + /** * Any bucket kept track of by a <code>ProgressToken</code> instance may * be in one of two states: pending or active. <em>Pending</em> means that @@ -848,4 +849,5 @@ public class ProgressToken { pendingBucketCount = 0; activeBucketCount = 0; } + } diff --git a/documentapi/src/main/java/com/yahoo/documentapi/Response.java b/documentapi/src/main/java/com/yahoo/documentapi/Response.java index 3778189e272..133c3586276 100644 --- a/documentapi/src/main/java/com/yahoo/documentapi/Response.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/Response.java @@ -9,10 +9,8 @@ import static com.yahoo.documentapi.Response.Outcome.ERROR; import static com.yahoo.documentapi.Response.Outcome.SUCCESS; /** - * <p>An asynchronous response from the document api. - * Subclasses of this provide additional response information for particular operations.</p> - * - * <p>This is a <i>value object</i>.</p> + * An asynchronous response from the document api. + * Subclasses of this provide additional response information for particular operations. * * @author bratseth */ diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/MapVisitorMessage.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/MapVisitorMessage.java index 15e971329e6..eb9640a38b8 100644 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/MapVisitorMessage.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/MapVisitorMessage.java @@ -44,4 +44,5 @@ public class MapVisitorMessage extends VisitorMessage { public String toString() { return "MapVisitorMessage(" + data.toString() + ")"; } + } diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories60.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories60.java index c4d4fb216be..099839672a2 100644 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories60.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories60.java @@ -202,10 +202,10 @@ public abstract class RoutableFactories60 { buf.putInt(null, msg.getBuckets().size()); for (BucketId id : msg.getBuckets()) { long rawid = id.getRawId(); - long reversed = ((rawid >>> 56) & 0x00000000000000FFl) | ((rawid >>> 40) & 0x000000000000FF00l) | - ((rawid >>> 24) & 0x0000000000FF0000l) | ((rawid >>> 8) & 0x00000000FF000000l) | - ((rawid << 8) & 0x000000FF00000000l) | ((rawid << 24) & 0x0000FF0000000000l) | - ((rawid << 40) & 0x00FF000000000000l) | ((rawid << 56) & 0xFF00000000000000l); + long reversed = ((rawid >>> 56) & 0x00000000000000FFL) | ((rawid >>> 40) & 0x000000000000FF00L) | + ((rawid >>> 24) & 0x0000000000FF0000L) | ((rawid >>> 8) & 0x00000000FF000000L) | + ((rawid << 8) & 0x000000FF00000000L) | ((rawid << 24) & 0x0000FF0000000000L) | + ((rawid << 40) & 0x00FF000000000000L) | ((rawid << 56) & 0xFF00000000000000L); buf.putLong(null, reversed); } diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSessionTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSessionTestCase.java index 6b191b50a57..04f4800231f 100755 --- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSessionTestCase.java +++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSessionTestCase.java @@ -56,6 +56,7 @@ import static org.junit.Assert.fail; // TODO replace explicit pre-mockito mock classes with proper mockito mocks wherever possible public class MessageBusVisitorSessionTestCase { + private class MockSender implements MessageBusVisitorSession.Sender { private int maxPending = 1000; private int pendingCount = 0; @@ -2520,4 +2521,5 @@ public class MessageBusVisitorSessionTestCase { // TODO: consider refactoring locking granularity // TODO: figure out if we risk a re-run of the "too many tasks" issue + } diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/ErrorCodesTest.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/ErrorCodesTest.java index 3b4fac60fcd..ba4ae381057 100644 --- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/ErrorCodesTest.java +++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/ErrorCodesTest.java @@ -18,6 +18,7 @@ import static org.junit.Assert.assertEquals; * @author vekterli */ public class ErrorCodesTest { + private class NamedErrorCodes { private final TreeMap<String, Integer> nameAndCode = new TreeMap<>(); |