You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ra...@apache.org on 2020/09/22 22:40:28 UTC
[sling-org-apache-sling-graphql-core] branch master updated: minor
code cleanup
This is an automated email from the ASF dual-hosted git repository.
radu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-graphql-core.git
The following commit(s) were added to refs/heads/master by this push:
new 11c7e38 minor code cleanup
11c7e38 is described below
commit 11c7e389c2d3129f0432997446901e4fd36dac34
Author: Radu Cotescu <co...@adobe.com>
AuthorDate: Wed Sep 23 00:40:14 2020 +0200
minor code cleanup
---
pom.xml | 4 ----
.../apache/sling/graphql/core/json/JsonSerializer.java | 16 +++++++++-------
.../sling/graphql/core/scalars/SlingCoercingWrapper.java | 8 ++++----
.../sling/graphql/core/scalars/SlingScalarsProvider.java | 5 ++---
.../graphql/core/scripting/GraphQLScriptEngine.java | 2 +-
.../sling/graphql/core/servlet/GraphQLServlet.java | 5 ++---
.../apache/sling/graphql/core/servlet/QueryParser.java | 4 ++--
.../apache/sling/graphql/core/it/GraphQLServletIT.java | 3 ++-
.../sling/graphql/core/it/GraphQLServletNoConfigIT.java | 9 +++++++--
.../sling/graphql/core/json/JsonSerializerTest.java | 2 +-
10 files changed, 30 insertions(+), 28 deletions(-)
diff --git a/pom.xml b/pom.xml
index cef9a88..bf09f59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,10 +61,6 @@
<plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-baseline-maven-plugin</artifactId>
- <configuration>
- <!-- TODO remove this once we have a release of this module -->
- <failOnMissing>false</failOnMissing>
- </configuration>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
diff --git a/src/main/java/org/apache/sling/graphql/core/json/JsonSerializer.java b/src/main/java/org/apache/sling/graphql/core/json/JsonSerializer.java
index 973afd4..46e8ad2 100644
--- a/src/main/java/org/apache/sling/graphql/core/json/JsonSerializer.java
+++ b/src/main/java/org/apache/sling/graphql/core/json/JsonSerializer.java
@@ -23,6 +23,7 @@ package org.apache.sling.graphql.core.json;
import java.io.IOException;
import java.io.InputStream;
import java.io.Writer;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -38,12 +39,13 @@ import graphql.ExecutionResult;
* the underlying converter library later */
public class JsonSerializer {
- public static final Map<String, Object> WRITER_OPTIONS = new HashMap<String, Object>() {
- private static final long serialVersionUID = 1L;
- {
- put(JsonWriter.TYPE, false);
- }
- };
+ public static final Map<String, Object> WRITER_OPTIONS;
+
+ static {
+ HashMap<String, Object> writerOptions = new HashMap<>();
+ writerOptions.put(JsonWriter.TYPE, false);
+ WRITER_OPTIONS = Collections.unmodifiableMap(writerOptions);
+ }
public void sendJSON(Writer out, ExecutionResult result) throws IOException {
final Object data = result.toSpecification();
@@ -60,7 +62,7 @@ public class JsonSerializer {
}
@SuppressWarnings("unchecked")
- public Map<String, Object> JSONtoMaps(InputStream input) {
+ public Map<String, Object> jsonToMaps(InputStream input) {
return JsonReader.jsonToMaps(input, null);
}
}
diff --git a/src/main/java/org/apache/sling/graphql/core/scalars/SlingCoercingWrapper.java b/src/main/java/org/apache/sling/graphql/core/scalars/SlingCoercingWrapper.java
index 4ff19dd..38645cc 100644
--- a/src/main/java/org/apache/sling/graphql/core/scalars/SlingCoercingWrapper.java
+++ b/src/main/java/org/apache/sling/graphql/core/scalars/SlingCoercingWrapper.java
@@ -38,7 +38,7 @@ class SlingCoercingWrapper implements Coercing<Object, Object> {
}
@Override
- public Object serialize(Object dataFetcherResult) throws CoercingSerializeException {
+ public Object serialize(Object dataFetcherResult) {
try {
return converter.serialize(dataFetcherResult);
} catch(ScalarConversionException sce) {
@@ -47,7 +47,7 @@ class SlingCoercingWrapper implements Coercing<Object, Object> {
}
@Override
- public Object parseValue(Object input) throws CoercingParseValueException {
+ public Object parseValue(Object input) {
try {
return converter.parseValue(input);
} catch(ScalarConversionException sce) {
@@ -56,7 +56,7 @@ class SlingCoercingWrapper implements Coercing<Object, Object> {
}
@Override
- public Object parseLiteral(Object input) throws CoercingParseLiteralException {
+ public Object parseLiteral(Object input) {
// This is called when parsing objects from the GraphQL Abstract Syntax Tree
// So far we handle StringValue only and unfortunately there's no common
// interface for the getValue() method.
@@ -71,4 +71,4 @@ class SlingCoercingWrapper implements Coercing<Object, Object> {
}
}
- }
\ No newline at end of file
+ }
diff --git a/src/main/java/org/apache/sling/graphql/core/scalars/SlingScalarsProvider.java b/src/main/java/org/apache/sling/graphql/core/scalars/SlingScalarsProvider.java
index a6771c6..a78fff4 100644
--- a/src/main/java/org/apache/sling/graphql/core/scalars/SlingScalarsProvider.java
+++ b/src/main/java/org/apache/sling/graphql/core/scalars/SlingScalarsProvider.java
@@ -21,10 +21,9 @@
package org.apache.sling.graphql.core.scalars;
import java.util.Map;
+import java.util.Objects;
import java.util.stream.Collectors;
-import javax.script.ScriptException;
-
import org.apache.sling.graphql.api.SlingScalarConverter;
import org.apache.sling.graphql.core.engine.SlingGraphQLException;
import org.osgi.framework.BundleContext;
@@ -93,7 +92,7 @@ public class SlingScalarsProvider {
// Using just the names for now, not sure why we'd need the ScalarTypeDefinitions
return schemaScalars.keySet().stream()
.map(this::getScalar)
- .filter(it -> it != null)
+ .filter(Objects::nonNull)
.collect(Collectors.toList());
}
diff --git a/src/main/java/org/apache/sling/graphql/core/scripting/GraphQLScriptEngine.java b/src/main/java/org/apache/sling/graphql/core/scripting/GraphQLScriptEngine.java
index b569260..85681a4 100644
--- a/src/main/java/org/apache/sling/graphql/core/scripting/GraphQLScriptEngine.java
+++ b/src/main/java/org/apache/sling/graphql/core/scripting/GraphQLScriptEngine.java
@@ -96,7 +96,7 @@ public class GraphQLScriptEngine extends AbstractScriptEngine {
final String pathInfo = r.getResourceMetadata().getResolutionPathInfo();
if(pathInfo != null && pathInfo.startsWith(".")) {
final String [] parts = pathInfo.split("\\.");
- Arrays.stream(parts).limit(parts.length - 1).forEach(it -> result.add(it));
+ Arrays.stream(parts).limit(parts.length - 1).forEach(result::add);
}
}
return result.toArray(new String[] {});
diff --git a/src/main/java/org/apache/sling/graphql/core/servlet/GraphQLServlet.java b/src/main/java/org/apache/sling/graphql/core/servlet/GraphQLServlet.java
index f38c29f..3d2daca 100644
--- a/src/main/java/org/apache/sling/graphql/core/servlet/GraphQLServlet.java
+++ b/src/main/java/org/apache/sling/graphql/core/servlet/GraphQLServlet.java
@@ -152,7 +152,6 @@ public class GraphQLServlet extends SlingAllMethodsServlet {
private Timer requestTimer;
private static final String METRIC_NS = GraphQLServlet.class.getName();
- private String servletRegistrationProperties;
private String gaugeCacheHitRate;
@Activate
@@ -197,13 +196,13 @@ public class GraphQLServlet extends SlingAllMethodsServlet {
Arrays.sort(extensions);
sb.append(".e:").append(String.join("_", extensions));
}
- servletRegistrationProperties = sb.toString();
+ String servletRegistrationProperties = sb.toString();
cacheHits = metricsService.counter(METRIC_NS + "." + servletRegistrationProperties + ".cache_hits");
cacheMisses = metricsService.counter(METRIC_NS + "." + servletRegistrationProperties + ".cache_misses");
requestsServed = metricsService.counter(METRIC_NS + "." + servletRegistrationProperties + ".requests_total");
gaugeCacheHitRate = METRIC_NS + "." + servletRegistrationProperties + ".cache_hit_rate";
metricRegistry.register(gaugeCacheHitRate,
- (Gauge<Float>) () -> (float) (cacheHits.getCount() / (float) (cacheHits.getCount() + cacheMisses.getCount())));
+ (Gauge<Float>) () -> (cacheHits.getCount() / (float) (cacheHits.getCount() + cacheMisses.getCount())));
requestTimer = metricsService.timer(METRIC_NS + "." + servletRegistrationProperties + ".requests_timer");
}
diff --git a/src/main/java/org/apache/sling/graphql/core/servlet/QueryParser.java b/src/main/java/org/apache/sling/graphql/core/servlet/QueryParser.java
index d6b868e..d5482bf 100644
--- a/src/main/java/org/apache/sling/graphql/core/servlet/QueryParser.java
+++ b/src/main/java/org/apache/sling/graphql/core/servlet/QueryParser.java
@@ -88,7 +88,7 @@ public class QueryParser {
}
public static Result fromJSON(String json) throws IOException {
- Map<String, Object> jsonMap = jsonSerializer.JSONtoMaps(IOUtils.toInputStream(json, StandardCharsets.UTF_8));
+ Map<String, Object> jsonMap = jsonSerializer.jsonToMaps(IOUtils.toInputStream(json, StandardCharsets.UTF_8));
String query = (String) jsonMap.get(JSON_KEY_QUERY);
if (query != null) {
Map<String, Object> variables = (Map<String, Object>) jsonMap.get(JSON_KEY_VARIABLES);
@@ -102,7 +102,7 @@ public class QueryParser {
}
private static Map<String, Object> getInputJson(SlingHttpServletRequest req) throws IOException {
- return jsonSerializer.JSONtoMaps(new ReaderInputStream(req.getReader()));
+ return jsonSerializer.jsonToMaps(new ReaderInputStream(req.getReader()));
}
}
diff --git a/src/test/java/org/apache/sling/graphql/core/it/GraphQLServletIT.java b/src/test/java/org/apache/sling/graphql/core/it/GraphQLServletIT.java
index 2eb1b6a..c685c88 100644
--- a/src/test/java/org/apache/sling/graphql/core/it/GraphQLServletIT.java
+++ b/src/test/java/org/apache/sling/graphql/core/it/GraphQLServletIT.java
@@ -237,7 +237,8 @@ public class GraphQLServletIT extends GraphQLCoreTestSupport {
@Test
public void testMissingQuery() throws Exception {
- executeRequest("GET", "/graphql/two.gql", null, null, null, 400);
+ MockSlingHttpServletResponse response = executeRequest("GET", "/graphql/two.gql", null, null, null, -1);
+ assertEquals(400, response.getStatus());
}
@Test
diff --git a/src/test/java/org/apache/sling/graphql/core/it/GraphQLServletNoConfigIT.java b/src/test/java/org/apache/sling/graphql/core/it/GraphQLServletNoConfigIT.java
index 6e00eb0..680fbc3 100644
--- a/src/test/java/org/apache/sling/graphql/core/it/GraphQLServletNoConfigIT.java
+++ b/src/test/java/org/apache/sling/graphql/core/it/GraphQLServletNoConfigIT.java
@@ -21,6 +21,7 @@ package org.apache.sling.graphql.core.it;
import javax.inject.Inject;
import org.apache.sling.resource.presence.ResourcePresence;
+import org.apache.sling.servlethelpers.MockSlingHttpServletResponse;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
@@ -30,6 +31,7 @@ import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
import org.ops4j.pax.exam.spi.reactors.PerClass;
import org.ops4j.pax.exam.util.Filter;
+import static org.junit.Assert.assertEquals;
import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.factoryConfiguration;
@RunWith(PaxExam.class)
@@ -53,7 +55,10 @@ public class GraphQLServletNoConfigIT extends GraphQLCoreTestSupport {
@Test
public void testServletDisabledByDefault() throws Exception {
final String path = "/graphql/one";
- executeRequest("GET", path + ".json", null, null, null, 200);
- executeRequest("GET", path + ".gql", null, null, null, 404);
+ MockSlingHttpServletResponse response = executeRequest("GET", path + ".json", null, null, null, -1);
+ assertEquals(200, response.getStatus());
+
+ response = executeRequest("GET", path + ".gql", null, null, null, -1);
+ assertEquals(404, response.getStatus());
}
}
diff --git a/src/test/java/org/apache/sling/graphql/core/json/JsonSerializerTest.java b/src/test/java/org/apache/sling/graphql/core/json/JsonSerializerTest.java
index 44433e1..c2b9d5b 100644
--- a/src/test/java/org/apache/sling/graphql/core/json/JsonSerializerTest.java
+++ b/src/test/java/org/apache/sling/graphql/core/json/JsonSerializerTest.java
@@ -76,7 +76,7 @@ public class JsonSerializerTest {
@Test
public void testToMap() throws UnsupportedEncodingException {
final String json = serializer.toJSON(TEST_MAP);
- final Map<String, Object> map = serializer.JSONtoMaps(new ByteArrayInputStream(json.getBytes("UTF-8")));
+ final Map<String, Object> map = serializer.jsonToMaps(new ByteArrayInputStream(json.getBytes("UTF-8")));
assertThat(map.get("A"), is("bc"));
assertThat(map.get("farenheit"), is(451L));
assertThat(map.get("really"), is(true));