You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/12/04 23:39:37 UTC
[6/7] incubator-usergrid git commit: Revert "[APIBAAS-1394]Re-adding
default constructor for location field" This was added twice during merge.
Revert "[APIBAAS-1394]Re-adding default constructor for location field"
This was added twice during merge.
This reverts commit 59fd12de976c9a9ac00b97a3777ea04652d91ee4.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/eeb22b52
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/eeb22b52
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/eeb22b52
Branch: refs/heads/two-dot-o
Commit: eeb22b52082a576a5939f580db843b9cffdaf1a6
Parents: 18818f5
Author: ryan bridges <rb...@apigee.com>
Authored: Thu Dec 4 14:28:01 2014 -0500
Committer: ryan bridges <rb...@apigee.com>
Committed: Thu Dec 4 14:28:01 2014 -0500
----------------------------------------------------------------------
.../usergrid/persistence/model/field/LocationField.java | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/eeb22b52/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/LocationField.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/LocationField.java b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/LocationField.java
index 72cfff1..4605e1b 100644
--- a/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/LocationField.java
+++ b/stack/corepersistence/model/src/main/java/org/apache/usergrid/persistence/model/field/LocationField.java
@@ -32,11 +32,6 @@ public class LocationField extends AbstractField<Location> {
super( name, value );
}
- /**
- * DO NOT DELETE! Jackson needs the default constructor for deserialization!
- */
- public LocationField() {
- }
/**
* Required for Jackson, DO NOT DELETE
@@ -47,7 +42,7 @@ public class LocationField extends AbstractField<Location> {
}
- @Override
+ @Override
public FieldTypeName getTypeName() {
return FieldTypeName.LOCATION;
}