You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2021/12/02 09:35:54 UTC
[sling-org-apache-sling-validation-test-services] branch master updated: SLING-10963 Upgrade to parent 46 (#1)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-test-services.git
The following commit(s) were added to refs/heads/master by this push:
new 613ca06 SLING-10963 Upgrade to parent 46 (#1)
613ca06 is described below
commit 613ca061d0e3f6e274489f29867855ec0ba7ecc8
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Thu Dec 2 10:35:49 2021 +0100
SLING-10963 Upgrade to parent 46 (#1)
improve robustness
---
bnd.bnd | 2 ++
pom.xml | 35 ++++------------------
.../internal/ValidationPostOperation.java | 6 ++--
.../internal/ValidationPostResponseCreator.java | 3 ++
4 files changed, 15 insertions(+), 31 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..c954f8f
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,2 @@
+Sling-Initial-Content:SLING-CONTENT/apps/sling/validation;overwrite:=true;path:=/apps/sling/validation
+-conditionalpackage:org.apache.felix.utils.json
diff --git a/pom.xml b/pom.xml
index e7fbaa4..830ddcb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,14 +21,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>32</version>
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>46</version>
<relativePath />
</parent>
<artifactId>org.apache.sling.validation.test-services</artifactId>
<version>1.0.5-SNAPSHOT</version>
- <packaging>bundle</packaging>
<name>Apache Sling Validation Framework Testing Services</name>
@@ -41,46 +40,24 @@
<properties>
<sling.java.version>8</sling.java.version>
+ <project.build.outputTimestamp>2020-01-22T15:10:38Z</project.build.outputTimestamp>
</properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Sling-Initial-Content>SLING-CONTENT/apps/sling/validation;overwrite:=true;path:=/apps/sling/validation</Sling-Initial-Content>
- <Embed-Dependency>
- org.apache.felix.utils;inline=org/apache/felix/utils/json/JSONWriter.class
- </Embed-Dependency>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
- <version>16.0.2</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/src/main/java/org/apache/sling/validation/testservices/internal/ValidationPostOperation.java b/src/main/java/org/apache/sling/validation/testservices/internal/ValidationPostOperation.java
index a829340..b2d02a6 100644
--- a/src/main/java/org/apache/sling/validation/testservices/internal/ValidationPostOperation.java
+++ b/src/main/java/org/apache/sling/validation/testservices/internal/ValidationPostOperation.java
@@ -24,6 +24,7 @@ import java.util.List;
import java.util.Map;
import org.apache.sling.api.SlingHttpServletRequest;
+import org.apache.sling.api.request.RequestParameter;
import org.apache.sling.api.wrappers.ValueMapDecorator;
import org.apache.sling.servlets.post.AbstractPostOperation;
import org.apache.sling.servlets.post.Modification;
@@ -61,8 +62,9 @@ public class ValidationPostOperation extends AbstractPostOperation {
valueMap.put(name, request.getRequestParameter(name).getString());
}
- final String resourceType = request.getRequestParameter("sling:resourceType").getString();
- if (resourceType != null && !"".equals(resourceType)) {
+ RequestParameter parameter = request.getRequestParameter("sling:resourceType");
+ if (parameter != null && !"".equals(parameter.getString())) {
+ final String resourceType = parameter.getString();
final String resourcePath = request.getRequestPathInfo().getResourcePath();
final ValidationModel validationModel = validationService.getValidationModel(resourceType, resourcePath, false);
if (validationModel != null) {
diff --git a/src/main/java/org/apache/sling/validation/testservices/internal/ValidationPostResponseCreator.java b/src/main/java/org/apache/sling/validation/testservices/internal/ValidationPostResponseCreator.java
index 7446b42..8c56217 100644
--- a/src/main/java/org/apache/sling/validation/testservices/internal/ValidationPostResponseCreator.java
+++ b/src/main/java/org/apache/sling/validation/testservices/internal/ValidationPostResponseCreator.java
@@ -41,6 +41,9 @@ public class ValidationPostResponseCreator implements PostResponseCreator {
String operation = request.getParameter(SlingPostConstants.RP_OPERATION);
if (operation != null && "validation".equals(operation)) {
final ResourceBundle resourceBundle = request.getResourceBundle(Locale.US);
+ if (resourceBundle == null) {
+ throw new IllegalStateException("Could not get resource bundle for locale " + Locale.US);
+ }
logger.debug("resource bundle: {}", resourceBundle);
return new ValidationPostResponse(resourceBundle);
}