Skip to content

Commit c081ca3

Browse files
cm-alexpcm-alexp
committed
json patch now generates ExpressionSpec for DynamoDB UpdateItem
1 parent 71b57cc commit c081ca3

22 files changed

+989
-11
lines changed

‎.gitignore

+8-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@
22
target
33
.idea
44
META-INF
5-
out
6-
build
5+
/out
6+
/classes
7+
/build
78
.gradle
8-
9+
.classpath
10+
.project
11+
.settings
12+
/bin/
13+
/test-output

‎build.gradle

+23
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,16 @@ dependencies {
5757
version: "2.0.1");
5858
compile(group: "com.github.fge", name: "jackson-coreutils",
5959
version: "1.6");
60+
compile(group: "com.amazonaws", name:"aws-java-sdk-dynamodb", version:"1.11.27");
6061
testCompile(group: "org.testng", name: "testng", version: "6.8.7") {
6162
exclude(group: "junit", module: "junit");
6263
exclude(group: "org.beanshell", module: "bsh");
6364
exclude(group: "org.yaml", module: "snakeyaml");
6465
};
6566
testCompile(group: "org.mockito", name: "mockito-core", version: "1.9.5");
6667
testCompile(group: "org.assertj", name: "assertj-core", version: "1.7.0");
68+
testCompile(group:"com.jayway.jsonpath", name:"json-path-assert", version:"2.2.0");
69+
testCompile(group: "com.amazonaws", name:"DynamoDBLocal", version:"1.11.0.1");
6770
}
6871

6972
javadoc.options.links("http://docs.oracle.com/javase/6/docs/api/");
@@ -80,6 +83,26 @@ javadoc.options.links("http://fge.github.io/jackson-coreutils/");
8083
*/
8184
repositories {
8285
mavenCentral();
86+
maven {
87+
url 'http://dynamodb-local.s3-website-us-west-2.amazonaws.com/release'
88+
}
89+
90+
}
91+
92+
task copyNativeDeps(type: Copy) {
93+
from (configurations.testCompile) {
94+
include "*.dylib"
95+
include "*.so"
96+
include "*.dll"
97+
}
98+
into 'build/libs'
99+
}
100+
101+
test.dependsOn copyNativeDeps
102+
test.doFirst {
103+
systemProperty "java.library.path", 'build/libs'
104+
environment "DYLD_LIBRARY_PATH", './build/libs'
105+
environment "LD_LIBRARY_PATH", './build/libs'
83106
}
84107

85108
/*

‎src/main/java/com/amazonaws/services/dynamodbv2/xspec/NULLComparable.java

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
/*
2+
* Copyright 2015-2016 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package com.amazonaws.services.dynamodbv2.xspec;
17+
18+
import com.amazonaws.services.dynamodbv2.xspec.NULL;
19+
20+
/**
21+
* TODO for daisuke
22+
*
23+
* @since 0.13
24+
* @version $Id$
25+
* @author Alexander Patrikalakis
26+
*/
27+
public class NULLComparable extends NULL {
28+
public NULLComparable(String path) {
29+
super(path);
30+
}
31+
public ComparatorCondition eq(Operand that) {
32+
return new ComparatorCondition("=", this, that);
33+
}
34+
public static final LiteralOperand generateNull() {
35+
return new LiteralOperand((Object) null);
36+
}
37+
}

‎src/main/java/com/amazonaws/services/dynamodbv2/xspec/PathSetAction.java

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/*
2+
* Copyright 2015-2016 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package com.amazonaws.services.dynamodbv2.xspec;
17+
18+
/**
19+
* TODO for daisuke
20+
*
21+
* @since 0.13
22+
* @version $Id$
23+
* @author Alexander Patrikalakis
24+
*/
25+
public class PathSetAction extends UpdateAction {
26+
public PathSetAction(PathOperand attr, PathOperand value) {
27+
super("SET", attr, value);
28+
}
29+
}

‎src/main/java/com/github/fge/jsonpatch/AddOperation.java

+16-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
/*
22
* Copyright (c) 2014, Francis Galiegue ([email protected])
3+
* Copyright (c) 2016, Alexander Patrikalakis ([email protected])
4+
* Copyright (c) 2015, Daisuke Miyamoto ([email protected])
35
*
46
* This software is dual-licensed under:
57
*
@@ -19,6 +21,7 @@
1921

2022
package com.github.fge.jsonpatch;
2123

24+
import com.amazonaws.services.dynamodbv2.xspec.ExpressionSpecBuilder;
2225
import com.fasterxml.jackson.annotation.JsonCreator;
2326
import com.fasterxml.jackson.annotation.JsonProperty;
2427
import com.fasterxml.jackson.databind.JsonNode;
@@ -28,6 +31,7 @@
2831
import com.github.fge.jackson.jsonpointer.ReferenceToken;
2932
import com.github.fge.jackson.jsonpointer.TokenResolver;
3033
import com.google.common.collect.Iterables;
34+
import com.google.common.collect.Iterators;
3135

3236

3337
/**
@@ -99,6 +103,17 @@ public JsonNode apply(final JsonNode node)
99103
? addToArray(path, node)
100104
: addToObject(path, node);
101105
}
106+
107+
@Override
108+
public void applyToBuilder(ExpressionSpecBuilder builder) {
109+
final TokenResolver<JsonNode> node = Iterators.getLast(path.iterator(), null /*default*/);
110+
if(null == node || "-".equals(node.getToken().getRaw())) {
111+
//list_append
112+
throw new UnsupportedOperationException("list_append not supported yet");
113+
} else {
114+
super.applyToBuilder(builder);
115+
}
116+
}
102117

103118
private JsonNode addToArray(final JsonPointer path, final JsonNode node)
104119
throws JsonPatchException
@@ -133,7 +148,7 @@ private JsonNode addToObject(final JsonPointer path, final JsonNode node)
133148
{
134149
final JsonNode ret = node.deepCopy();
135150
final ObjectNode target = (ObjectNode) path.parent().get(ret);
136-
target.put(Iterables.getLast(path).getToken().getRaw(), value);
151+
target.set(Iterables.getLast(path).getToken().getRaw(), value);
137152
return ret;
138153
}
139154
}

‎src/main/java/com/github/fge/jsonpatch/CopyOperation.java

+13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
/*
22
* Copyright (c) 2014, Francis Galiegue ([email protected])
3+
* Copyright (c) 2016, Alexander Patrikalakis ([email protected])
4+
* Copyright (c) 2015, Daisuke Miyamoto ([email protected])
35
*
46
* This software is dual-licensed under:
57
*
@@ -19,6 +21,8 @@
1921

2022
package com.github.fge.jsonpatch;
2123

24+
import com.amazonaws.services.dynamodbv2.xspec.ExpressionSpecBuilder;
25+
import com.amazonaws.services.dynamodbv2.xspec.PathSetAction;
2226
import com.fasterxml.jackson.annotation.JsonCreator;
2327
import com.fasterxml.jackson.annotation.JsonProperty;
2428
import com.fasterxml.jackson.databind.JsonNode;
@@ -60,4 +64,13 @@ public JsonNode apply(final JsonNode node)
6064
"jsonPatch.noSuchPath"));
6165
return new AddOperation(path, dupData).apply(node);
6266
}
67+
68+
@Override
69+
public void applyToBuilder(ExpressionSpecBuilder builder) {
70+
String copyPath = pathGenerator.apply(from);
71+
String setPath = pathGenerator.apply(path);
72+
//set the attribute in the path location
73+
builder.addUpdate(new PathSetAction(ExpressionSpecBuilder.attribute(setPath),
74+
ExpressionSpecBuilder.attribute(copyPath)));
75+
}
6376
}

‎src/main/java/com/github/fge/jsonpatch/JsonPatch.java

+21-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
/*
22
* Copyright (c) 2014, Francis Galiegue ([email protected])
3+
* Copyright (c) 2016, Alexander Patrikalakis ([email protected])
4+
* Copyright (c) 2015, Daisuke Miyamoto ([email protected])
35
*
46
* This software is dual-licensed under:
57
*
@@ -19,6 +21,7 @@
1921

2022
package com.github.fge.jsonpatch;
2123

24+
import com.amazonaws.services.dynamodbv2.xspec.ExpressionSpecBuilder;
2225
import com.fasterxml.jackson.annotation.JsonCreator;
2326
import com.fasterxml.jackson.core.JsonGenerator;
2427
import com.fasterxml.jackson.databind.JsonNode;
@@ -28,6 +31,7 @@
2831
import com.github.fge.jackson.JacksonUtils;
2932
import com.github.fge.msgsimple.bundle.MessageBundle;
3033
import com.github.fge.msgsimple.load.MessageBundles;
34+
import com.google.common.base.Supplier;
3135
import com.google.common.collect.ImmutableList;
3236

3337
import java.io.IOException;
@@ -89,16 +93,16 @@
8993
* <p><b>IMPORTANT NOTE:</b> the JSON Patch is supposed to be VALID when the
9094
* constructor for this class ({@link JsonPatch#fromJson(JsonNode)} is used.</p>
9195
*/
92-
public final class JsonPatch
93-
implements JsonSerializable
96+
public class JsonPatch
97+
implements JsonSerializable, Supplier<ExpressionSpecBuilder>
9498
{
9599
private static final MessageBundle BUNDLE
96100
= MessageBundles.getBundle(JsonPatchMessages.class);
97101

98102
/**
99103
* List of operations
100104
*/
101-
private final List<JsonPatchOperation> operations;
105+
protected final List<JsonPatchOperation> operations;
102106

103107
/**
104108
* Constructor
@@ -126,7 +130,7 @@ public static JsonPatch fromJson(final JsonNode node)
126130
throws IOException
127131
{
128132
BUNDLE.checkNotNull(node, "jsonPatch.nullInput");
129-
return JacksonUtils.getReader().withType(JsonPatch.class)
133+
return JacksonUtils.getReader().forType(JsonPatch.class)
130134
.readValue(node);
131135
}
132136

@@ -148,6 +152,19 @@ public JsonNode apply(final JsonNode node)
148152

149153
return ret;
150154
}
155+
156+
/**
157+
* Converts this JsonPatch into an ExpressionSpecBuilder
158+
* @return an expression spec builder that contains the updates contained in this
159+
* patch
160+
*/
161+
public ExpressionSpecBuilder get() {
162+
ExpressionSpecBuilder builder = new ExpressionSpecBuilder();
163+
for(JsonPatchOperation operation : operations) {
164+
operation.applyToBuilder(builder);
165+
}
166+
return builder;
167+
}
151168

152169
@Override
153170
public String toString()

‎src/main/java/com/github/fge/jsonpatch/JsonPatchException.java

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
22
* Copyright (c) 2014, Francis Galiegue ([email protected])
3+
* Copyright (c) 2016, Alexander Patrikalakis ([email protected])
34
*
45
* This software is dual-licensed under:
56
*
@@ -19,6 +20,7 @@
1920

2021
package com.github.fge.jsonpatch;
2122

23+
@SuppressWarnings("serial")
2224
public final class JsonPatchException
2325
extends Exception
2426
{

‎src/main/java/com/github/fge/jsonpatch/JsonPatchOperation.java

+13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
/*
22
* Copyright (c) 2014, Francis Galiegue ([email protected])
3+
* Copyright (c) 2016, Alexander Patrikalakis ([email protected])
4+
* Copyright (c) 2015, Daisuke Miyamoto ([email protected])
35
*
46
* This software is dual-licensed under:
57
*
@@ -27,10 +29,13 @@
2729
import com.github.fge.jackson.jsonpointer.JsonPointer;
2830
import com.github.fge.msgsimple.bundle.MessageBundle;
2931
import com.github.fge.msgsimple.load.MessageBundles;
32+
import com.google.common.base.Function;
3033

3134
import static com.fasterxml.jackson.annotation.JsonSubTypes.*;
3235
import static com.fasterxml.jackson.annotation.JsonTypeInfo.*;
3336

37+
import com.amazonaws.services.dynamodbv2.xspec.ExpressionSpecBuilder;
38+
3439
@JsonTypeInfo(use = Id.NAME, include = As.PROPERTY, property = "op")
3540

3641
@JsonSubTypes({
@@ -61,6 +66,8 @@ public abstract class JsonPatchOperation
6166
{
6267
protected static final MessageBundle BUNDLE
6368
= MessageBundles.getBundle(JsonPatchMessages.class);
69+
70+
Function<JsonPointer, String> pathGenerator = new JsonPathToAttributePath();
6471

6572
protected final String op;
6673

@@ -94,6 +101,12 @@ protected JsonPatchOperation(final String op, final JsonPointer path)
94101
public abstract JsonNode apply(final JsonNode node)
95102
throws JsonPatchException;
96103

104+
/**
105+
* Apply the current patch operation to an update expression builder
106+
* @param builder the builder to apply this expression to
107+
*/
108+
public abstract void applyToBuilder(ExpressionSpecBuilder builder);
109+
97110
@Override
98111
public abstract String toString();
99112
}

‎src/main/java/com/github/fge/jsonpatch/JsonPathToAttributePath.java

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
/*
2+
* Copyright (c) 2016, Alexander Patrikalakis ([email protected])
3+
* Copyright (c) 2015, Daisuke Miyamoto ([email protected])
4+
*
5+
* This software is dual-licensed under:
6+
*
7+
* - the Lesser General Public License (LGPL) version 3.0 or, at your option, any
8+
* later version;
9+
* - the Apache Software License (ASL) version 2.0.
10+
*
11+
* The text of this file and of both licenses is available at the root of this
12+
* project or, if you have the jar distribution, in directory META-INF/, under
13+
* the names LGPL-3.0.txt and ASL-2.0.txt respectively.
14+
*
15+
* Direct link to the sources:
16+
*
17+
* - LGPL 3.0: https://www.gnu.org/licenses/lgpl-3.0.txt
18+
* - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt
19+
*/
20+
package com.github.fge.jsonpatch;
21+
22+
import java.util.ArrayList;
23+
import java.util.List;
24+
import java.util.regex.Pattern;
25+
26+
import com.fasterxml.jackson.databind.JsonNode;
27+
import com.github.fge.jackson.jsonpointer.JsonPointer;
28+
import com.github.fge.jackson.jsonpointer.TokenResolver;
29+
import com.google.common.base.Function;
30+
import com.google.common.base.Joiner;
31+
32+
public class JsonPathToAttributePath implements Function<JsonPointer, String> {
33+
34+
private static Pattern ARRAY_PATTERN = Pattern.compile("(0|[1-9][0-9]+)");
35+
36+
37+
@Override
38+
public String apply(JsonPointer pointer) {
39+
List<String> elements = new ArrayList<String>();
40+
for (TokenResolver<JsonNode> tokenResolver : pointer) {
41+
String token = tokenResolver.getToken().getRaw();
42+
if (ARRAY_PATTERN.matcher(token).matches()) {
43+
String last = elements.get(elements.size() - 1);
44+
elements.set(elements.size() - 1, String.format("%s[%s]", last, token));
45+
} else {
46+
elements.add(token);
47+
}
48+
}
49+
50+
return Joiner.on(".").join(elements);
51+
}
52+
}

0 commit comments

Comments
 (0)