summaryrefslogtreecommitdiffstats
path: root/vespaclient-core
diff options
context:
space:
mode:
authorTor Brede Vekterli <vekterli@yahooinc.com>2022-04-04 17:12:45 +0200
committerTor Brede Vekterli <vekterli@yahooinc.com>2022-04-05 11:21:02 +0200
commit7bc757ef1e1aa47042c8f58f9fc9ad38126388c4 (patch)
tree360843ad186cfb3a87fecec03ff4f6d42730602f /vespaclient-core
parentde78c035b025b946b98039936ed134a9820b2ccd (diff)
Deprecate load types from Java APIs
Load types have not been used in practice for years, and supporting them in backend metrics etc. has long since been lacking. Prepare for removing these on Vespa 8. Most callsites are unchanged, aside from presumed safe changes such as constructors used by dependency injection. Have added new overloads without load types where these did not already exist to allow for an orderly transition.
Diffstat (limited to 'vespaclient-core')
-rwxr-xr-xvespaclient-core/src/main/java/com/yahoo/feedapi/MessageBusSessionFactory.java3
-rw-r--r--vespaclient-core/src/main/java/com/yahoo/feedapi/MessagePropertyProcessor.java20
2 files changed, 20 insertions, 3 deletions
diff --git a/vespaclient-core/src/main/java/com/yahoo/feedapi/MessageBusSessionFactory.java b/vespaclient-core/src/main/java/com/yahoo/feedapi/MessageBusSessionFactory.java
index 514669fe0ac..d9b1190aaed 100755
--- a/vespaclient-core/src/main/java/com/yahoo/feedapi/MessageBusSessionFactory.java
+++ b/vespaclient-core/src/main/java/com/yahoo/feedapi/MessageBusSessionFactory.java
@@ -18,7 +18,8 @@ public class MessageBusSessionFactory implements SessionFactory {
public MessageBusSessionFactory(MessagePropertyProcessor processor) {
this(processor, null, null);
}
-
+
+ @SuppressWarnings("removal") // TODO: Remove on Vespa 8
private MessageBusSessionFactory(MessagePropertyProcessor processor,
DocumentmanagerConfig documentmanagerConfig,
SlobroksConfig slobroksConfig) {
diff --git a/vespaclient-core/src/main/java/com/yahoo/feedapi/MessagePropertyProcessor.java b/vespaclient-core/src/main/java/com/yahoo/feedapi/MessagePropertyProcessor.java
index e5da51f0918..84fbe63a576 100644
--- a/vespaclient-core/src/main/java/com/yahoo/feedapi/MessagePropertyProcessor.java
+++ b/vespaclient-core/src/main/java/com/yahoo/feedapi/MessagePropertyProcessor.java
@@ -33,10 +33,18 @@ public class MessagePropertyProcessor implements ConfigSubscriber.SingleSubscrib
private String defaultDocprocChain = null;
private boolean defaultAbortOnDocumentError = true;
private boolean defaultAbortOnSendError = true;
- private final LoadTypeSet loadTypes;
+ private final LoadTypeSet loadTypes; // TODO remove on Vespa 8
private boolean configChanged = false;
+ public MessagePropertyProcessor(FeederConfig config) {
+ loadTypes = new LoadTypeSet();
+ configure(config);
+ }
+ /**
+ * @deprecated load types are deprecated. Use constructor without LoadTypeConfig instead.
+ */
+ @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8
public MessagePropertyProcessor(FeederConfig config, LoadTypeConfig loadTypeCfg) {
loadTypes = new LoadTypeSet();
configure(config, loadTypeCfg);
@@ -127,11 +135,19 @@ public class MessagePropertyProcessor implements ConfigSubscriber.SingleSubscrib
return feederOptions;
}
+ /**
+ * @deprecated load types are deprecated. configure without LoadTypeConfig instead.
+ */
+ @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8
public synchronized void configure(FeederConfig config, LoadTypeConfig loadTypeConfig) {
loadTypes.configure(loadTypeConfig);
configure(config);
}
+ /**
+ * @deprecated load types are deprecated
+ */
+ @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8
LoadTypeSet getLoadTypes() {
return loadTypes;
}
@@ -175,7 +191,7 @@ public class MessagePropertyProcessor implements ConfigSubscriber.SingleSubscrib
private boolean abortOnDocumentError;
private boolean abortOnFeedError;
private boolean createIfNonExistent;
- private LoadType loadType;
+ private LoadType loadType; // TODO remove on Vespa 8
private int traceLevel;
PropertySetter(Route route, long timeout, long totalTimeout, DocumentProtocol.Priority priority, LoadType loadType,