diff options
| -rw-r--r-- | documentapi/src/main/java/com/yahoo/documentapi/DocumentAccess.java | 6 | ||||
| -rw-r--r-- | jdisc_http_service/src/main/java/com/yahoo/jdisc/http/HttpRequest.java | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/DocumentAccess.java b/documentapi/src/main/java/com/yahoo/documentapi/DocumentAccess.java index d6c3d3ce92f..308eafcd596 100644 --- a/documentapi/src/main/java/com/yahoo/documentapi/DocumentAccess.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/DocumentAccess.java @@ -55,8 +55,11 @@ public abstract class DocumentAccess { * while attempting to create such an object, this method will throw an * exception. * + * @deprecated Inject a DocumentManagerConfig and create a MessageBusDocumentAccess from this instead. + * * @return a running document access object with all default configuration */ + @Deprecated(since = "7") public static DocumentAccess createDefault() { return new com.yahoo.documentapi.messagebus.MessageBusDocumentAccess(); } @@ -67,12 +70,11 @@ public abstract class DocumentAccess { * @param params the parameters to use for setup */ protected DocumentAccess(DocumentAccessParams params) { - super(); if (params.documentmanagerConfig().isPresent()) { // our config has been injected into the creator documentTypeManager = new DocumentTypeManager(params.documentmanagerConfig().get()); documentTypeConfigSubscriber = null; } - else { // fallback to old style subscription + else { // fallback to old style subscription — this should be avoided documentTypeManager = new DocumentTypeManager(); documentTypeConfigSubscriber = DocumentTypeManagerConfigurer.configure(documentTypeManager, params.getDocumentManagerConfigId()); } diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/HttpRequest.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/HttpRequest.java index 21e492fe57e..118c34245c0 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/HttpRequest.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/HttpRequest.java @@ -138,7 +138,7 @@ public class HttpRequest extends Request implements ServletOrJdiscHttpRequest { return version; } - /** Returns the remove address, or null if unresolved */ + /** Returns the remote address, or null if unresolved */ @Override public String getRemoteHostAddress() { if (remoteAddress instanceof InetSocketAddress) { |