You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2020/11/09 09:44:37 UTC
[sling-org-apache-sling-adapter-annotations-it] branch master
updated: SLING-2938 - deprecate this module,
tests moved to adapter-annotations module
This is an automated email from the ASF dual-hosted git repository.
bdelacretaz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-adapter-annotations-it.git
The following commit(s) were added to refs/heads/master by this push:
new 5566689 SLING-2938 - deprecate this module, tests moved to adapter-annotations module
5566689 is described below
commit 55666891579d8376cd56743fd46d23bf84b7655a
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Mon Nov 9 10:36:33 2020 +0100
SLING-2938 - deprecate this module, tests moved to adapter-annotations module
---
.asf.yaml | 5 +-
CODE_OF_CONDUCT.md | 22 --
CONTRIBUTING.md | 24 ---
Jenkinsfile | 20 --
README.md | 11 +-
bnd.bnd | 1 -
pom.xml | 234 ---------------------
.../adapters/AbstractNoOpAdapterFactory.java | 29 ---
.../testing/adapters/DeprecatedAdapterFactory.java | 35 ---
.../IntegerAndShortToLongAdapterFactory.java | 29 ---
.../adapters/InvalidEmptyAdapterFactory.java | 28 ---
.../InvalidNoAdaptablesAdapterFactory.java | 28 ---
.../adapters/InvalidNoAdaptersAdapterFactory.java | 28 ---
.../LongToIntegerIfFitsAdapterFactory.java | 32 ---
.../ShortToIntegerAndLongAdapterFactory.java | 26 ---
.../adapters/TextLengthIfFitsAdapterFactory.java | 34 ---
.../adapter/annotations/AdapterAnnotationsIT.java | 40 ----
.../adapter/annotations/AdapterRegistrationIT.java | 128 -----------
.../sling/adapter/annotations/AdapterStatusIT.java | 104 ---------
.../adapter/annotations/ServicePropertiesIT.java | 180 ----------------
.../adapter/annotations/util/AppConstants.java | 26 ---
.../adapter/annotations/util/AppSlingClient.java | 48 -----
.../sling/adapter/annotations/util/Util.java | 68 ------
src/test/provisioning/it-model.txt | 25 ---
24 files changed, 10 insertions(+), 1195 deletions(-)
diff --git a/.asf.yaml b/.asf.yaml
index ae54e4b..75aba4b 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -1,8 +1,9 @@
github:
- description: "Apache Sling Adapter Annotations Integration Tests"
+ description: "Apache Sling Adapter Annotations Integration Tests (deprecated)"
homepage: "https://sling.apache.org/"
labels:
- sling
- java
- annotations
- - adapters
\ No newline at end of file
+ - adapters
+ - deprecated
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
deleted file mode 100644
index 4c8ab2c..0000000
--- a/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
-Apache Software Foundation Code of Conduct
-====
-
-Being an Apache project, Apache Sling adheres to the Apache Software Foundation's [Code of Conduct](https://www.apache.org/foundation/policies/conduct.html).
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index 1003c04..0000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/-->
-Contributing
-====
-
-Thanks for choosing to contribute!
-
-You will find all the necessary details about how you can do this at https://sling.apache.org/contributing.html.
\ No newline at end of file
diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index b20ef4f..0000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-slingOsgiBundleBuild()
\ No newline at end of file
diff --git a/README.md b/README.md
index aa17a01..d722757 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,12 @@
[](https://sling.apache.org)
- [](https://ci-builds.apache.org/job/Sling/job/modules/job/sling-org-apache-sling-adapter-annotations-it/job/master/) [](https://ci-builds.apache.org/job/Sling/job/modul [...]
-
-# Apache Sling Adapter Annotations IT
+# Apache Sling Adapter Annotations IT (deprecated)
This module is part of the [Apache Sling](https://sling.apache.org) project.
-Integration tests for OSGi DS 1.4 [component property type annotations](https://github.com/apache/sling-org-apache-sling-adapter-annotations) for Sling Adapters
\ No newline at end of file
+It is now deprecated, the integration tests have been moved inside the
+[sling-adapter-annotations](https://github.com/apache/sling-org-apache-sling-adapter-annotations)
+module.
+
+This modules's code has been saved to the `maintenance` branch before deprecation.
+
diff --git a/bnd.bnd b/bnd.bnd
deleted file mode 100644
index 8b13789..0000000
--- a/bnd.bnd
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index 960252f..0000000
--- a/pom.xml
+++ /dev/null
@@ -1,234 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>34</version>
- <relativePath/>
- </parent>
-
- <artifactId>org.apache.sling.adapter.annotations.it</artifactId>
- <version>1.0.0-SNAPSHOT</version>
-
- <name>Apache Sling Adapter Annotations IT</name>
- <description>
- Integration tests for OSGi DS 1.4 component property type annotations for Sling adapters
- </description>
-
- <scm>
- <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-adapter-annotations-it.git</connection>
- <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-adapter-annotations-it.git</developerConnection>
- <url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-adapter-annotations-it.git</url>
- <tag>HEAD</tag>
- </scm>
-
- <properties>
- <sling.java.version>8</sling.java.version>
- <http.host>localhost</http.host>
- <!-- start with -DkeepITServerRunning=true to allow to rerun ITs or inspect the server after the ITs have been executed there -->
- <keepITServerRunning>false</keepITServerRunning>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- <version>5.0.0</version>
- </plugin>
- <plugin>
- <!-- Find free ports to run our server -->
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>reserve-server-port</id>
- <goals>
- <goal>reserve-network-port</goal>
- </goals>
- <phase>pre-integration-test</phase>
- <configuration>
- <portNames>
- <!-- used port name must be stored in property because it must be used for the base url -->
- <portName>http.port</portName>
- </portNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <!-- the Sling instance is provisioned from the model in src/main/provisioning/it-model.txt -->
- <groupId>org.apache.sling</groupId>
- <artifactId>slingstart-maven-plugin</artifactId>
- <!-- for https://issues.apache.org/jira/browse/SLING-7662 -->
- <version>1.8.2</version>
- <extensions>true</extensions>
- <executions>
- <execution>
- <id>customise-starter</id>
- <goals>
- <goal>prepare-package</goal>
- </goals>
- <configuration>
- <modelDirectory>${project.basedir}/src/test/provisioning</modelDirectory>
- <usePomDependencies>true</usePomDependencies>
- </configuration>
- </execution>
- <execution>
- <id>package-starter</id>
- <goals>
- <goal>package</goal>
- </goals>
- <configuration>
- <attachArtifact>false</attachArtifact>
- <modelDirectory>${project.basedir}/src/test/provisioning</modelDirectory>
- <usePomDependencies>true</usePomDependencies>
- </configuration>
- </execution>
- <execution>
- <id>start-container-before-IT</id>
- <goals>
- <goal>start</goal>
- </goals>
- </execution>
- <execution>
- <id>stop-container-after-IT</id>
- <goals>
- <goal>stop</goal>
- </goals>
- <configuration>
- <shouldBlockUntilKeyIsPressed>${keepITServerRunning}</shouldBlockUntilKeyIsPressed>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <servers>
- <!-- this configuration applies to both 'start' and 'stop' -->
- <server>
- <id>singleinstance</id>
- <port>${http.port}</port>
- <vmOpts>${sling.vm.options}</vmOpts>
- <stdOutFile>sling/logs/stdout.log</stdOutFile>
- </server>
- </servers>
- <!-- this configuration only applies to 'prepare-package' and 'package' -->
- <disableExtendingMavenClasspath>true</disableExtendingMavenClasspath>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <systemPropertyVariables>
- <baseUrl>http://${http.host}:${http.port}/</baseUrl>
- <bundleFile>${project.build.directory}/${project.build.finalName}.jar</bundleFile>
- <bundleSymbolicName>${project.artifactId}</bundleSymbolicName>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <!-- dependency under test -->
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.adapter.annotations</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.component.annotations</artifactId>
- <version>1.3.0</version><!-- to be compliant with DS 1.3 -->
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.api</artifactId>
- <version>2.20.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.adapter</artifactId>
- <version>2.1.10</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- testing dependencies -->
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.servlets.resolver</artifactId>
- <version>2.5.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.testing.clients</artifactId>
- <version>2.0.6</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.testing.rules</artifactId>
- <version>2.0.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
diff --git a/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/AbstractNoOpAdapterFactory.java b/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/AbstractNoOpAdapterFactory.java
deleted file mode 100644
index 9c82cdd..0000000
--- a/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/AbstractNoOpAdapterFactory.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sling.adapter.annotations.testing.adapters;
-
-import org.apache.sling.api.adapter.AdapterFactory;
-
-public abstract class AbstractNoOpAdapterFactory implements AdapterFactory {
- public static final String INVALID_CONFIGURATION_MESSAGE = "Configuration is invalid";
-
- @Override
- @SuppressWarnings("squid:S00119")
- public <AdapterType> AdapterType getAdapter(final Object adaptable, final Class<AdapterType> type) {
- return null;
- }
-}
diff --git a/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/DeprecatedAdapterFactory.java b/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/DeprecatedAdapterFactory.java
deleted file mode 100644
index 07dfec4..0000000
--- a/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/DeprecatedAdapterFactory.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sling.adapter.annotations.testing.adapters;
-
-import org.apache.sling.adapter.annotations.AdapterDeprecated;
-import org.apache.sling.adapter.annotations.SlingAdapter;
-import org.apache.sling.api.SlingHttpServletRequest;
-import org.apache.sling.api.adapter.AdapterFactory;
-import org.apache.sling.api.resource.Resource;
-import org.osgi.service.component.annotations.Component;
-
-@Component(service = AdapterFactory.class)
-@SlingAdapter(adaptables = SlingHttpServletRequest.class, adapters = Resource.class)
-@AdapterDeprecated // Just use request.getResource()
-public class DeprecatedAdapterFactory implements AdapterFactory {
- @Override
- @SuppressWarnings({"squid:S00119", "unchecked"})
- public <AdapterType> AdapterType getAdapter(final Object adaptable, final Class<AdapterType> type) {
- return (AdapterType)((SlingHttpServletRequest)adaptable).getResource();
- }
-}
diff --git a/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/IntegerAndShortToLongAdapterFactory.java b/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/IntegerAndShortToLongAdapterFactory.java
deleted file mode 100644
index b848b53..0000000
--- a/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/IntegerAndShortToLongAdapterFactory.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sling.adapter.annotations.testing.adapters;
-
-import org.apache.sling.adapter.annotations.SlingAdapter;
-import org.apache.sling.api.adapter.AdapterFactory;
-import org.osgi.service.component.annotations.Component;
-
-@Component(service = AdapterFactory.class)
-@SlingAdapter(
- adaptables = {Integer.class, Short.class},
- adapters = Long.class
-)
-public class IntegerAndShortToLongAdapterFactory extends AbstractNoOpAdapterFactory {
-}
diff --git a/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/InvalidEmptyAdapterFactory.java b/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/InvalidEmptyAdapterFactory.java
deleted file mode 100644
index 3135e71..0000000
--- a/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/InvalidEmptyAdapterFactory.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sling.adapter.annotations.testing.adapters;
-
-import org.apache.sling.adapter.annotations.AdapterCondition;
-import org.apache.sling.adapter.annotations.SlingAdapter;
-import org.apache.sling.api.adapter.AdapterFactory;
-import org.osgi.service.component.annotations.Component;
-
-@Component(service = AdapterFactory.class)
-@SlingAdapter(adaptables = {}, adapters = {})
-@AdapterCondition(AbstractNoOpAdapterFactory.INVALID_CONFIGURATION_MESSAGE)
-public class InvalidEmptyAdapterFactory extends AbstractNoOpAdapterFactory {
-}
diff --git a/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/InvalidNoAdaptablesAdapterFactory.java b/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/InvalidNoAdaptablesAdapterFactory.java
deleted file mode 100644
index 0c98d90..0000000
--- a/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/InvalidNoAdaptablesAdapterFactory.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sling.adapter.annotations.testing.adapters;
-
-import org.apache.sling.adapter.annotations.AdapterCondition;
-import org.apache.sling.adapter.annotations.SlingAdapter;
-import org.apache.sling.api.adapter.AdapterFactory;
-import org.osgi.service.component.annotations.Component;
-
-@Component(service = AdapterFactory.class)
-@SlingAdapter(adaptables = {}, adapters = Void.class)
-@AdapterCondition(AbstractNoOpAdapterFactory.INVALID_CONFIGURATION_MESSAGE)
-public class InvalidNoAdaptablesAdapterFactory extends AbstractNoOpAdapterFactory {
-}
diff --git a/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/InvalidNoAdaptersAdapterFactory.java b/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/InvalidNoAdaptersAdapterFactory.java
deleted file mode 100644
index d7cb8ca..0000000
--- a/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/InvalidNoAdaptersAdapterFactory.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sling.adapter.annotations.testing.adapters;
-
-import org.apache.sling.adapter.annotations.AdapterCondition;
-import org.apache.sling.adapter.annotations.SlingAdapter;
-import org.apache.sling.api.adapter.AdapterFactory;
-import org.osgi.service.component.annotations.Component;
-
-@Component(service = AdapterFactory.class)
-@SlingAdapter(adaptables = Void.class, adapters = {})
-@AdapterCondition(AbstractNoOpAdapterFactory.INVALID_CONFIGURATION_MESSAGE)
-public class InvalidNoAdaptersAdapterFactory extends AbstractNoOpAdapterFactory {
-}
diff --git a/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/LongToIntegerIfFitsAdapterFactory.java b/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/LongToIntegerIfFitsAdapterFactory.java
deleted file mode 100644
index f134243..0000000
--- a/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/LongToIntegerIfFitsAdapterFactory.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sling.adapter.annotations.testing.adapters;
-
-import org.apache.sling.adapter.annotations.AdapterCondition;
-import org.apache.sling.adapter.annotations.SlingAdapter;
-import org.apache.sling.api.adapter.AdapterFactory;
-import org.osgi.service.component.annotations.Component;
-
-@Component(service = AdapterFactory.class)
-@SlingAdapter(
- adaptables = Long.class,
- adapters = Integer.class
-)
-@AdapterCondition(LongToIntegerIfFitsAdapterFactory.CONDITION)
-public class LongToIntegerIfFitsAdapterFactory extends AbstractNoOpAdapterFactory {
- public static final String CONDITION = "If the value is small enough to fit in an integer.";
-}
diff --git a/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/ShortToIntegerAndLongAdapterFactory.java b/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/ShortToIntegerAndLongAdapterFactory.java
deleted file mode 100644
index 74d77e1..0000000
--- a/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/ShortToIntegerAndLongAdapterFactory.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sling.adapter.annotations.testing.adapters;
-
-import org.apache.sling.adapter.annotations.SlingAdapter;
-import org.apache.sling.api.adapter.AdapterFactory;
-import org.osgi.service.component.annotations.Component;
-
-@Component(service = AdapterFactory.class)
-@SlingAdapter(adaptables = Short.class, adapters = {Integer.class, Long.class})
-public class ShortToIntegerAndLongAdapterFactory extends AbstractNoOpAdapterFactory {
-}
diff --git a/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/TextLengthIfFitsAdapterFactory.java b/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/TextLengthIfFitsAdapterFactory.java
deleted file mode 100644
index 0af1e61..0000000
--- a/src/main/java/org/apache/sling/adapter/annotations/testing/adapters/TextLengthIfFitsAdapterFactory.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sling.adapter.annotations.testing.adapters;
-
-import org.apache.sling.adapter.annotations.AdapterCondition;
-import org.apache.sling.adapter.annotations.SlingAdapter;
-import org.apache.sling.api.adapter.AdapterFactory;
-import org.osgi.service.component.annotations.Component;
-
-import java.math.BigInteger;
-
-@Component(service = AdapterFactory.class)
-@SlingAdapter(
- adaptables = {CharSequence.class, String.class},
- adapters = {Short.class, Integer.class, Long.class, BigInteger.class}
-)
-@AdapterCondition(TextLengthIfFitsAdapterFactory.CONDITION)
-public class TextLengthIfFitsAdapterFactory extends AbstractNoOpAdapterFactory {
- public static final String CONDITION = "If the text length fits in the requested type.";
-}
diff --git a/src/test/java/org/apache/sling/adapter/annotations/AdapterAnnotationsIT.java b/src/test/java/org/apache/sling/adapter/annotations/AdapterAnnotationsIT.java
deleted file mode 100644
index a24da5b..0000000
--- a/src/test/java/org/apache/sling/adapter/annotations/AdapterAnnotationsIT.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sling.adapter.annotations;
-
-import org.apache.sling.testing.clients.ClientException;
-import org.junit.Test;
-
-public interface AdapterAnnotationsIT {
- @Test
- void testLongToIntegerIfFitsAdapterFactory() throws ClientException;
-
- @Test
- void testTextLengthIfFitsAdapterFactory() throws ClientException;
-
- @Test
- void testShortToIntegerAndLongAdapterFactory() throws ClientException;
-
- @Test
- void testIntegerAndShortToLongAdapterFactory() throws ClientException;
-
- @Test
- void testDeprecatedAdapterFactory() throws ClientException;
-
- @Test
- void testInvalidAdapterFactories() throws ClientException;
-}
diff --git a/src/test/java/org/apache/sling/adapter/annotations/AdapterRegistrationIT.java b/src/test/java/org/apache/sling/adapter/annotations/AdapterRegistrationIT.java
deleted file mode 100644
index 1b60716..0000000
--- a/src/test/java/org/apache/sling/adapter/annotations/AdapterRegistrationIT.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sling.adapter.annotations;
-
-import com.google.common.collect.ImmutableMap;
-import org.apache.sling.adapter.Adaption;
-import org.apache.sling.adapter.annotations.util.AppSlingClient;
-import org.apache.sling.adapter.annotations.util.Util;
-import org.apache.sling.api.SlingHttpServletRequest;
-import org.apache.sling.api.adapter.AdapterFactory;
-import org.apache.sling.api.resource.Resource;
-import org.apache.sling.testing.clients.ClientException;
-import org.apache.sling.testing.clients.osgi.OsgiConsoleClient;
-import org.apache.sling.testing.clients.osgi.ServiceInfo;
-import org.apache.sling.testing.clients.osgi.ServicesInfo;
-import org.apache.sling.testing.clients.util.JsonUtils;
-import org.codehaus.jackson.JsonNode;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.osgi.framework.Constants;
-
-import java.io.IOException;
-import java.math.BigInteger;
-import java.net.URISyntaxException;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeoutException;
-import java.util.function.UnaryOperator;
-
-import static org.hamcrest.CoreMatchers.hasItem;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
-
-public class AdapterRegistrationIT implements AdapterAnnotationsIT {
- private static Set<Map<String, Object>> registeredAdaptions;
-
- @BeforeClass
- public static void setUpAdaptions() throws ClientException, InterruptedException, TimeoutException, URISyntaxException, IOException {
- try (final OsgiConsoleClient client = AppSlingClient.newSlingClient().adaptTo(OsgiConsoleClient.class)) {
- registeredAdaptions = new HashSet<>();
- final String servicesJsonString = client.doGet("/system/console/services.json").getContent();
- final ServicesInfo services = new ServicesInfo(JsonUtils.getJsonNodeFromString(servicesJsonString));
- for (final ServiceInfo serviceInfo : services.forType(Adaption.class.getName())) {
- final String serviceJsonString = client.doGet("/system/console/services/" + serviceInfo.getId() + ".json").getContent();
- try {
- final JsonNode serviceJson = JsonUtils.getJsonNodeFromString(serviceJsonString);
- registeredAdaptions.add(Util.getNonDynamicPropertiesForService(serviceJson));
- } catch (final ClientException e) {
- System.err.println("Unable to find proper JSON content for " + serviceJsonString + " - skipping.");
- e.printStackTrace(System.err);
- }
- }
- }
- }
-
- @Override
- @Test
- public void testLongToIntegerIfFitsAdapterFactory() {
- assertAdaption(properties -> properties
- .put(AdapterFactory.ADAPTABLE_CLASSES, Collections.singletonList(Long.class.getName()))
- .put(AdapterFactory.ADAPTER_CLASSES, Collections.singletonList(Integer.class.getName())));
- }
-
- @Override
- @Test
- public void testTextLengthIfFitsAdapterFactory() {
- assertAdaption(properties -> properties
- .put(AdapterFactory.ADAPTABLE_CLASSES, Arrays.asList(CharSequence.class.getName(), String.class.getName()))
- .put(AdapterFactory.ADAPTER_CLASSES, Arrays.asList(
- Short.class.getName(),
- Integer.class.getName(),
- Long.class.getName(),
- BigInteger.class.getName())));
- }
-
- @Override
- @Test
- public void testShortToIntegerAndLongAdapterFactory() {
- assertAdaption(properties -> properties
- .put(AdapterFactory.ADAPTABLE_CLASSES, Collections.singletonList(Short.class.getName()))
- .put(AdapterFactory.ADAPTER_CLASSES, Arrays.asList(Integer.class.getName(), Long.class.getName())));
- }
-
- @Override
- @Test
- public void testIntegerAndShortToLongAdapterFactory() {
- assertAdaption(properties -> properties
- .put(AdapterFactory.ADAPTABLE_CLASSES, Arrays.asList(Integer.class.getName(), Short.class.getName()))
- .put(AdapterFactory.ADAPTER_CLASSES, Collections.singletonList(Long.class.getName())));
- }
-
- @Override
- @Test
- public void testDeprecatedAdapterFactory() {
- assertAdaption(properties -> properties
- .put(AdapterFactory.ADAPTABLE_CLASSES, Collections.singletonList(SlingHttpServletRequest.class.getName()))
- .put(AdapterFactory.ADAPTER_CLASSES, Collections.singletonList(Resource.class.getName())));
- }
-
- @Override
- @Test
- public void testInvalidAdapterFactories() {
- assertFalse(registeredAdaptions.stream().anyMatch(properties -> properties.containsValue(Collections.singletonList(Void.class.getName()))));
- }
-
- private static void assertAdaption(final UnaryOperator<ImmutableMap.Builder<String, Object>> properties) {
- assertThat(registeredAdaptions, hasItem(properties.apply(ImmutableMap.<String, Object>builder()
- .put(Constants.SERVICE_SCOPE, Constants.SCOPE_SINGLETON)
- ).build()));
- }
-}
diff --git a/src/test/java/org/apache/sling/adapter/annotations/AdapterStatusIT.java b/src/test/java/org/apache/sling/adapter/annotations/AdapterStatusIT.java
deleted file mode 100644
index 4760138..0000000
--- a/src/test/java/org/apache/sling/adapter/annotations/AdapterStatusIT.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sling.adapter.annotations;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.sling.adapter.annotations.testing.adapters.AbstractNoOpAdapterFactory;
-import org.apache.sling.adapter.annotations.testing.adapters.LongToIntegerIfFitsAdapterFactory;
-import org.apache.sling.adapter.annotations.testing.adapters.TextLengthIfFitsAdapterFactory;
-import org.apache.sling.adapter.annotations.util.AppConstants;
-import org.apache.sling.adapter.annotations.util.AppSlingClient;
-import org.apache.sling.api.SlingHttpServletRequest;
-import org.apache.sling.api.resource.Resource;
-import org.apache.sling.testing.clients.ClientException;
-import org.apache.sling.testing.clients.osgi.OsgiConsoleClient;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.math.BigInteger;
-import java.net.URISyntaxException;
-import java.util.concurrent.TimeoutException;
-
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
-
-public class AdapterStatusIT implements AdapterAnnotationsIT {
- private static String adaptersStatus;
-
- @BeforeClass
- public static void setUpAdaptersStatus() throws ClientException, InterruptedException, TimeoutException, URISyntaxException, IOException {
- try (final OsgiConsoleClient client = AppSlingClient.newSlingClient().adaptTo(OsgiConsoleClient.class)) {
- adaptersStatus = client.doGet("/system/console/status-adapters.txt").getContent();
- adaptersStatus = StringUtils.replace(adaptersStatus, "\r", StringUtils.EMPTY); // Prevent platform-specific issues
- }
- }
-
- @Override
- @Test
- public void testLongToIntegerIfFitsAdapterFactory() {
- assertAdapterDescriptor(Long.class, LongToIntegerIfFitsAdapterFactory.CONDITION, Integer.class);
- }
-
- @Override
- @Test
- public void testShortToIntegerAndLongAdapterFactory() {
- assertAdapterDescriptor(Short.class, null, Integer.class, Long.class);
- }
-
- @Override
- @Test
- public void testIntegerAndShortToLongAdapterFactory() {
- assertAdapterDescriptor(Integer.class, null, Long.class);
- assertAdapterDescriptor(Short.class, null, Long.class);
- }
-
- @Override
- @Test
- public void testTextLengthIfFitsAdapterFactory() {
- assertAdapterDescriptor(CharSequence.class, TextLengthIfFitsAdapterFactory.CONDITION, Short.class, Integer.class, Long.class, BigInteger.class);
- assertAdapterDescriptor(String.class, TextLengthIfFitsAdapterFactory.CONDITION, Short.class, Integer.class, Long.class, BigInteger.class);
- }
-
- @Override
- @Test
- public void testDeprecatedAdapterFactory() {
- // Deprecated status is not dumped on the status page
- assertAdapterDescriptor(SlingHttpServletRequest.class, null, Resource.class);
- }
-
- @Override
- @Test
- public void testInvalidAdapterFactories() {
- assertThat(adaptersStatus, not(containsString("\nCondition: " + AbstractNoOpAdapterFactory.INVALID_CONFIGURATION_MESSAGE + "\n")));
- }
-
- private static void assertAdapterDescriptor(final Class<?> adaptable, final String condition, final Class<?>... adapters) {
- final StringBuilder descriptor = new StringBuilder("\nAdaptable: ").append(adaptable.getName()).append("\n");
- if (condition != null) {
- descriptor.append("Condition: ").append(condition).append("\n");
- }
- descriptor.append("Providing Bundle: ").append(AppConstants.BUNDLE_SYMBOLIC_NAME).append("\n");
- descriptor.append("Available Adapters:\n");
- for (final Class<?> adapter : adapters) {
- descriptor.append(" * ").append(adapter.getName()).append("\n");
- }
- descriptor.append("\n");
- assertThat(adaptersStatus, containsString(descriptor.toString()));
- }
-}
diff --git a/src/test/java/org/apache/sling/adapter/annotations/ServicePropertiesIT.java b/src/test/java/org/apache/sling/adapter/annotations/ServicePropertiesIT.java
deleted file mode 100644
index 2d896d4..0000000
--- a/src/test/java/org/apache/sling/adapter/annotations/ServicePropertiesIT.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sling.adapter.annotations;
-
-import com.google.common.collect.ImmutableMap;
-import org.apache.sling.adapter.annotations.testing.adapters.AbstractNoOpAdapterFactory;
-import org.apache.sling.adapter.annotations.testing.adapters.DeprecatedAdapterFactory;
-import org.apache.sling.adapter.annotations.testing.adapters.InvalidNoAdaptablesAdapterFactory;
-import org.apache.sling.adapter.annotations.testing.adapters.InvalidEmptyAdapterFactory;
-import org.apache.sling.adapter.annotations.testing.adapters.InvalidNoAdaptersAdapterFactory;
-import org.apache.sling.adapter.annotations.testing.adapters.ShortToIntegerAndLongAdapterFactory;
-import org.apache.sling.adapter.annotations.testing.adapters.LongToIntegerIfFitsAdapterFactory;
-import org.apache.sling.adapter.annotations.testing.adapters.IntegerAndShortToLongAdapterFactory;
-import org.apache.sling.adapter.annotations.testing.adapters.TextLengthIfFitsAdapterFactory;
-import org.apache.sling.adapter.annotations.util.AppSlingClient;
-import org.apache.sling.adapter.annotations.util.Util;
-import org.apache.sling.api.SlingHttpServletRequest;
-import org.apache.sling.api.adapter.AdapterFactory;
-import org.apache.sling.api.resource.Resource;
-import org.apache.sling.testing.clients.ClientException;
-import org.apache.sling.testing.clients.osgi.OsgiConsoleClient;
-import org.apache.sling.testing.clients.util.JsonUtils;
-import org.codehaus.jackson.JsonNode;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.osgi.framework.Constants;
-import org.osgi.service.component.ComponentConstants;
-
-import java.io.IOException;
-import java.math.BigInteger;
-import java.net.URISyntaxException;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Map;
-import java.util.concurrent.TimeoutException;
-import java.util.function.UnaryOperator;
-
-import static org.junit.Assert.assertEquals;
-
-public class ServicePropertiesIT implements AdapterAnnotationsIT {
- private static final String ADAPTER_CONDITION = "adapter.condition";
- private static final String ADAPTER_DEPRECATED = "adapter.deprecated";
-
- private static OsgiConsoleClient client;
-
- @BeforeClass
- public static void setUpOnce() throws InterruptedException, TimeoutException, ClientException, URISyntaxException {
- client = AppSlingClient.newSlingClient().adaptTo(OsgiConsoleClient.class);
- }
-
- @AfterClass
- public static void tearDown() throws IOException {
- if (client != null) {
- client.close();
- }
- }
-
- @Override
- @Test
- public void testLongToIntegerIfFitsAdapterFactory() throws ClientException {
- assertProperties(LongToIntegerIfFitsAdapterFactory.class.getName(), properties -> properties
- .put(AdapterFactory.ADAPTABLE_CLASSES, Collections.singletonList(Long.class.getName()))
- .put(AdapterFactory.ADAPTER_CLASSES, Collections.singletonList(Integer.class.getName()))
- .put(ADAPTER_CONDITION, LongToIntegerIfFitsAdapterFactory.CONDITION));
- }
-
- @Override
- @Test
- public void testTextLengthIfFitsAdapterFactory() throws ClientException {
- assertProperties(TextLengthIfFitsAdapterFactory.class.getName(), properties -> properties
- .put(AdapterFactory.ADAPTABLE_CLASSES, Arrays.asList(CharSequence.class.getName(), String.class.getName()))
- .put(AdapterFactory.ADAPTER_CLASSES, Arrays.asList(
- Short.class.getName(),
- Integer.class.getName(),
- Long.class.getName(),
- BigInteger.class.getName()
- ))
- .put(ADAPTER_CONDITION, TextLengthIfFitsAdapterFactory.CONDITION));
- }
-
- @Override
- @Test
- public void testShortToIntegerAndLongAdapterFactory() throws ClientException {
- assertProperties(ShortToIntegerAndLongAdapterFactory.class.getName(), properties -> properties
- .put(AdapterFactory.ADAPTABLE_CLASSES, Collections.singletonList(Short.class.getName()))
- .put(AdapterFactory.ADAPTER_CLASSES, Arrays.asList(Integer.class.getName(), Long.class.getName())));
- }
-
- @Override
- @Test
- public void testIntegerAndShortToLongAdapterFactory() throws ClientException {
- assertProperties(IntegerAndShortToLongAdapterFactory.class.getName(), properties -> properties
- .put(AdapterFactory.ADAPTABLE_CLASSES, Arrays.asList(Integer.class.getName(), Short.class.getName()))
- .put(AdapterFactory.ADAPTER_CLASSES, Collections.singletonList(Long.class.getName())));
- }
-
- @Test
- public void testInvalidMissingAdaptablesAndAdaptersAdapter() throws ClientException {
- assertProperties(InvalidEmptyAdapterFactory.class.getName(), properties -> properties
- .put(ADAPTER_CONDITION, AbstractNoOpAdapterFactory.INVALID_CONFIGURATION_MESSAGE));
- }
-
- @Test
- public void testInvalidMissingAdaptablesAdapter() throws ClientException {
- assertProperties(InvalidNoAdaptablesAdapterFactory.class.getName(), properties -> properties
- .put(ADAPTER_CONDITION, AbstractNoOpAdapterFactory.INVALID_CONFIGURATION_MESSAGE)
- .put(AdapterFactory.ADAPTER_CLASSES, Collections.singletonList(Void.class.getName())));
- }
-
- @Test
- public void testInvalidMissingAdaptersAdapter() throws ClientException {
- assertProperties(InvalidNoAdaptersAdapterFactory.class.getName(), properties -> properties
- .put(ADAPTER_CONDITION, AbstractNoOpAdapterFactory.INVALID_CONFIGURATION_MESSAGE)
- .put(AdapterFactory.ADAPTABLE_CLASSES, Collections.singletonList(Void.class.getName())));
- }
-
- @Override
- @Test
- public void testDeprecatedAdapterFactory() throws ClientException {
- assertProperties(DeprecatedAdapterFactory.class.getName(), properties -> properties
- .put(ADAPTER_DEPRECATED, true)
- .put(AdapterFactory.ADAPTABLE_CLASSES, Collections.singletonList(SlingHttpServletRequest.class.getName()))
- .put(AdapterFactory.ADAPTER_CLASSES, Collections.singletonList(Resource.class.getName())));
- }
-
- @Override
- @Test
- public void testInvalidAdapterFactories() throws ClientException {
- assertProperties(InvalidEmptyAdapterFactory.class.getName(), properties -> properties
- .put(ADAPTER_CONDITION, AbstractNoOpAdapterFactory.INVALID_CONFIGURATION_MESSAGE));
- assertProperties(InvalidNoAdaptablesAdapterFactory.class.getName(), properties -> properties
- .put(ADAPTER_CONDITION, AbstractNoOpAdapterFactory.INVALID_CONFIGURATION_MESSAGE)
- .put(AdapterFactory.ADAPTER_CLASSES, Collections.singletonList(Void.class.getName())));
- assertProperties(InvalidNoAdaptersAdapterFactory.class.getName(), properties -> properties
- .put(ADAPTER_CONDITION, AbstractNoOpAdapterFactory.INVALID_CONFIGURATION_MESSAGE)
- .put(AdapterFactory.ADAPTABLE_CLASSES, Collections.singletonList(Void.class.getName())));
- }
-
- private static void assertProperties(final String componentName,
- final UnaryOperator<ImmutableMap.Builder<String, Object>> properties) throws ClientException {
- final Map<String, Object> expected = properties.apply(ImmutableMap.<String, Object>builder()
- .put(ComponentConstants.COMPONENT_NAME, componentName)
- .put(Constants.SERVICE_SCOPE, Constants.SCOPE_BUNDLE))
- .build();
- assertEquals(expected, getNonDynamicPropertiesOfComponentService(componentName));
- }
-
- private static Map<String, Object> getNonDynamicPropertiesOfComponentService(final String nameOrId) throws ClientException {
- final JsonNode componentJson = JsonUtils.getJsonNodeFromString(
- client.doGet("/system/console/components/" + nameOrId + ".json").getContent());
- final JsonNode serviceJson = JsonUtils.getJsonNodeFromString(
- client.doGet("/system/console/services/" + getServiceIdFromComponentJson(componentJson) + ".json").getContent());
- return Util.getNonDynamicPropertiesForService(serviceJson);
- }
-
- private static int getServiceIdFromComponentJson(final JsonNode componentJson) {
- final JsonNode props = componentJson.get("data").get(0).get("props");
- for (final JsonNode prop : props) {
- if ("serviceId".equals(prop.get("key").getValueAsText())) {
- return Integer.parseInt(prop.get("value").getValueAsText());
- }
- }
- throw new AssertionError("No service ID found");
- }
-}
diff --git a/src/test/java/org/apache/sling/adapter/annotations/util/AppConstants.java b/src/test/java/org/apache/sling/adapter/annotations/util/AppConstants.java
deleted file mode 100644
index 9e987f6..0000000
--- a/src/test/java/org/apache/sling/adapter/annotations/util/AppConstants.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sling.adapter.annotations.util;
-
-public class AppConstants {
- public AppConstants() {
- // Constants class
- }
-
- public static final String BUNDLE_SYMBOLIC_NAME = System.getProperty("bundleSymbolicName");
- public static final String BUNDLE_FILE = System.getProperty("bundleFile");
-}
diff --git a/src/test/java/org/apache/sling/adapter/annotations/util/AppSlingClient.java b/src/test/java/org/apache/sling/adapter/annotations/util/AppSlingClient.java
deleted file mode 100644
index 63c058e..0000000
--- a/src/test/java/org/apache/sling/adapter/annotations/util/AppSlingClient.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sling.adapter.annotations.util;
-
-import org.apache.sling.testing.clients.ClientException;
-import org.apache.sling.testing.clients.SlingClient;
-import org.apache.sling.testing.clients.osgi.OsgiConsoleClient;
-import org.apache.sling.testing.clients.util.poller.Polling;
-
-import java.io.File;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.concurrent.TimeoutException;
-
-public class AppSlingClient {
- private static boolean bundleInstalledAndStarted;
-
- @SuppressWarnings("squid:S2095") // Caller will close the client
- public static SlingClient newSlingClient() throws URISyntaxException, ClientException, TimeoutException, InterruptedException {
- final SlingClient client = new SlingClient(new URI(System.getProperty("baseUrl")), "admin", "admin");
-
- // client.waitExists() adds ".json" to the path, which is not desired, since that requests the Sling Default GET Servlet instead of Sling Starter HTML
- new Polling(() -> client.doGet("/starter/index.html").getStatusLine().getStatusCode() == 200)
- .poll(60_000, 500);
-
- if (!bundleInstalledAndStarted) {
- final OsgiConsoleClient osgiConsoleClient = client.adaptTo(OsgiConsoleClient.class);
- osgiConsoleClient.waitInstallBundle(new File(AppConstants.BUNDLE_FILE), true, -1, 10_000, 500);
- osgiConsoleClient.waitBundleStarted(AppConstants.BUNDLE_SYMBOLIC_NAME, 10_000, 500);
- bundleInstalledAndStarted = true;
- }
- return client;
- }
-}
diff --git a/src/test/java/org/apache/sling/adapter/annotations/util/Util.java b/src/test/java/org/apache/sling/adapter/annotations/util/Util.java
deleted file mode 100644
index 960a2af..0000000
--- a/src/test/java/org/apache/sling/adapter/annotations/util/Util.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sling.adapter.annotations.util;
-
-import org.codehaus.jackson.JsonNode;
-import org.osgi.framework.Constants;
-import org.osgi.service.component.ComponentConstants;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-public class Util {
- private static final Set<String> DYNAMIC_PROPERTIES = new HashSet<>(Arrays.asList(
- ComponentConstants.COMPONENT_ID,
- Constants.SERVICE_BUNDLEID
- ));
-
- public static Map<String, Object> getNonDynamicPropertiesForService(final JsonNode json) {
- final JsonNode props = json.get("data").get(0).get("props");
- final Map<String, Object> properties = new LinkedHashMap<>();
- for (final JsonNode prop : props) {
- final String name = prop.get("key").getTextValue();
- if (!DYNAMIC_PROPERTIES.contains(name)) {
- properties.put(name, getPropertyValue(prop.get("value")));
- }
- }
- return properties;
- }
-
- private static Object getPropertyValue(final JsonNode value) {
- if (value.isBoolean()) {
- return value.getBooleanValue();
- }
- if (value.isNumber()) {
- return value.getNumberValue();
- }
- if (value.isTextual()) {
- return value.getTextValue();
- }
- if (value.isArray()) {
- final List<String> items = new ArrayList<>();
- for (final JsonNode item : value) {
- items.add(item.getTextValue());
- }
- return items;
- }
- return null;
- }
-}
diff --git a/src/test/provisioning/it-model.txt b/src/test/provisioning/it-model.txt
deleted file mode 100644
index 5d3780e..0000000
--- a/src/test/provisioning/it-model.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-[feature name=adapter-annotations-it]
-
-# Dependencies
-[artifacts]
- org.apache.sling/org.apache.sling.starter/11/slingstart
- org.apache.sling/org.apache.sling.api
- org.apache.sling/org.apache.sling.servlets.resolver
\ No newline at end of file