aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTatu Saloranta <tatu.saloranta@iki.fi>2020-06-27 20:16:14 -0700
committerTatu Saloranta <tatu.saloranta@iki.fi>2020-06-27 20:16:14 -0700
commit9148aa852284c0094413b28bb4122a486821649d (patch)
treeb723e5ff069a28eff9696cede853612b907b9765 /src
parent37835d2cbd134005bc9fc93ce88127b7b29e55f2 (diff)
downloadjackson-databind-9148aa852284c0094413b28bb4122a486821649d.tar.gz
Minor javadoc fix
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/fasterxml/jackson/databind/cfg/BaseSettings.java6
-rw-r--r--src/main/java/com/fasterxml/jackson/databind/deser/DefaultDeserializationContext.java4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/com/fasterxml/jackson/databind/cfg/BaseSettings.java b/src/main/java/com/fasterxml/jackson/databind/cfg/BaseSettings.java
index a1b934083..f0a25ea78 100644
--- a/src/main/java/com/fasterxml/jackson/databind/cfg/BaseSettings.java
+++ b/src/main/java/com/fasterxml/jackson/databind/cfg/BaseSettings.java
@@ -15,13 +15,13 @@ import com.fasterxml.jackson.databind.util.StdDateFormat;
/**
* Immutable container class used to store simple configuration
- * settings. Since instances are fully immutable, instances can
+ * settings for both serialization and deserialization.
+ * Since instances are fully immutable, instances can
* be freely shared and used without synchronization.
*/
public final class BaseSettings
implements java.io.Serializable
{
- // for 2.6
private static final long serialVersionUID = 1L;
/**
@@ -91,7 +91,7 @@ public final class BaseSettings
*/
/**
- * Custom date format to use for de-serialization. If specified, will be
+ * Custom date format to use for deserialization. If specified, will be
* used instead of {@link com.fasterxml.jackson.databind.util.StdDateFormat}.
*<p>
* Note that the configured format object will be cloned once per
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/DefaultDeserializationContext.java b/src/main/java/com/fasterxml/jackson/databind/deser/DefaultDeserializationContext.java
index 074ef28c6..46f59d8e6 100644
--- a/src/main/java/com/fasterxml/jackson/databind/deser/DefaultDeserializationContext.java
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/DefaultDeserializationContext.java
@@ -333,7 +333,7 @@ public abstract class DefaultDeserializationContext
}
private Impl(Impl src) { super(src); }
-
+
private Impl(Impl src, DeserializerFactory factory) {
super(src, factory);
}
@@ -363,6 +363,6 @@ public abstract class DefaultDeserializationContext
@Override
public DefaultDeserializationContext with(DeserializerFactory factory) {
return new Impl(this, factory);
- }
+ }
}
}