aboutsummaryrefslogtreecommitdiffstats
path: root/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableRepository.java
diff options
context:
space:
mode:
authorTor Brede Vekterli <vekterli@yahooinc.com>2022-05-16 13:20:56 +0200
committergjoranv <gv@verizonmedia.com>2022-06-08 11:45:22 +0200
commit4639be4f03d58a0b8df7b1ecb573e7d344a53ed5 (patch)
tree236d8b271e2e51c5e15df08bc19c4c97860ca16a /documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableRepository.java
parent1e03a00cd6f69cf63d942885e97ff7582778c7f5 (diff)
Remove top-level <clients> element and LoadType concept
Load types have not been properly supported for some time, so remove the remaining API surfaces exposing them. Since load type config was the last remaining use of <clients> in services.xml, remove that one as well.
Diffstat (limited to 'documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableRepository.java')
-rwxr-xr-xdocumentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableRepository.java13
1 files changed, 1 insertions, 12 deletions
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableRepository.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableRepository.java
index 2360cbe8bc3..eb6caf5d0f7 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableRepository.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableRepository.java
@@ -9,7 +9,6 @@ import com.yahoo.document.serialization.DocumentDeserializer;
import com.yahoo.document.serialization.DocumentDeserializerFactory;
import com.yahoo.document.serialization.DocumentSerializer;
import com.yahoo.document.serialization.DocumentSerializerFactory;
-import com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet;
import com.yahoo.io.GrowableByteBuffer;
import java.util.logging.Level;
import com.yahoo.messagebus.Routable;
@@ -34,20 +33,10 @@ final class RoutableRepository {
private static final Logger log = Logger.getLogger(RoutableRepository.class.getName());
private final CopyOnWriteHashMap<Integer, VersionMap> factoryTypes = new CopyOnWriteHashMap<>();
private final CopyOnWriteHashMap<CacheKey, RoutableFactory> cache = new CopyOnWriteHashMap<>();
- private LoadTypeSet loadTypes; // TODO remove on Vespa 8
public RoutableRepository() {}
/**
- * @deprecated load types are deprecated. Use default constructor instead.
- */
- @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8
- @SuppressWarnings("removal") // TODO: Remove on Vespa 8
- public RoutableRepository(LoadTypeSet set) {
- loadTypes = set;
- }
-
- /**
* Decodes a {@link Routable} from the given byte array. This uses the content of the byte array to dispatch the
* decode request to the appropriate {@link RoutableFactory} that was previously registered.
*
@@ -75,7 +64,7 @@ final class RoutableRepository {
log.log(Level.SEVERE,"No routable factory found for routable type " + type + " (version " + version + ").");
return null;
}
- Routable ret = factory.decode(in, loadTypes);
+ Routable ret = factory.decode(in);
if (ret == null) {
log.log(Level.SEVERE,"Routable factory " + factory.getClass().getName() + " failed to deserialize " +
"routable of type " + type + " (version " + version + ").\nData = " + Arrays.toString(data));