This is an automated email from the ASF dual-hosted git repository. sblackmon pushed a commit to branch feat-3-nodeinfo in repository https://gitbox.apache.org/repos/asf/streams-activitypub.git
commit 95b46c831a2921c153b50025b210e9ebdf0cc152 Author: Steve Blackmon <sblack...@apache.org> AuthorDate: Mon Feb 19 14:48:37 2024 -0600 small changes Signed-off-by: Steve Blackmon <sblack...@apache.org> --- .../api/test/WebfingerApiTestImpl.scala | 15 --------- streams-activitypub-dist/pom.xml | 2 +- .../util/AcctPrefixResourceToResourceURISwap.scala | 39 ---------------------- streams-activitypub-webapp/pom.xml | 21 ------------ 4 files changed, 1 insertion(+), 76 deletions(-) diff --git a/streams-activitypub-api/src/test/scala/org/apache/streams/activitypub/api/test/WebfingerApiTestImpl.scala b/streams-activitypub-api/src/test/scala/org/apache/streams/activitypub/api/test/WebfingerApiTestImpl.scala deleted file mode 100755 index a01db5a..0000000 --- a/streams-activitypub-api/src/test/scala/org/apache/streams/activitypub/api/test/WebfingerApiTestImpl.scala +++ /dev/null @@ -1,15 +0,0 @@ -package org.apache.streams.activitypub.api.test - -import org.apache.streams.activitypub.api.WebfingerApi -import org.apache.streams.activitypub.api.pojo.WebfingerQueryRequest -import org.apache.streams.activitypub.api.pojo.WebfingerQueryResponse - -class WebfingerApiTestImpl extends WebfingerApi { - - def webfingerQuery(request: WebfingerQueryRequest): WebfingerQueryResponse = { - - new WebfingerQueryResponse().withSubject(request.getResource) - - } - -} diff --git a/streams-activitypub-dist/pom.xml b/streams-activitypub-dist/pom.xml index 60fc0ec..be6cb27 100755 --- a/streams-activitypub-dist/pom.xml +++ b/streams-activitypub-dist/pom.xml @@ -59,7 +59,7 @@ under the License. <executions> <execution> <id>copy</id> - <phase>package</phase> + <phase>prepare-package</phase> <goals> <goal>copy</goal> </goals> diff --git a/streams-activitypub-utils/src/main/scala/org/apache/streams/activitypub/util/AcctPrefixResourceToResourceURISwap.scala b/streams-activitypub-utils/src/main/scala/org/apache/streams/activitypub/util/AcctPrefixResourceToResourceURISwap.scala deleted file mode 100644 index 4c30cce..0000000 --- a/streams-activitypub-utils/src/main/scala/org/apache/streams/activitypub/util/AcctPrefixResourceToResourceURISwap.scala +++ /dev/null @@ -1,39 +0,0 @@ -package org.apache.streams.activitypub.util - -import org.apache.http.client.utils.URIBuilder -import org.apache.juneau.BeanSession -import org.apache.juneau.ClassMeta -import org.apache.juneau.swap.StringSwap - -import java.net.URI - -object AcctPrefixResourceToResourceURISwap { - def doSwap(uri: URI): String = { - val domain = uri.getHost - val preferredName = uri.getPath.split("/").last - s"acct:${preferredName}@${domain}" - } - def doUnswap(string: String): URI = { - val preferredName = string.split("@")(0) - val domain = string.split("@")(1) - val uriBuilder = new URIBuilder() - .setScheme("https") - .setHost(domain) - .setPath(s"/users/${preferredName}") - uriBuilder.build() - } -} - -class AcctPrefixResourceToResourceURISwap extends StringSwap[URI] { - - //@throws(classOf[Exception]) - override def swap(session: BeanSession, uri: URI) : String = { - AcctPrefixResourceToResourceURISwap.doSwap(uri) - } - - //@throws(classOf[Exception]) - override def unswap(session: BeanSession, in: String, hint: ClassMeta[Any]): URI = { - AcctPrefixResourceToResourceURISwap.doUnswap(in); - } - -} diff --git a/streams-activitypub-webapp/pom.xml b/streams-activitypub-webapp/pom.xml index b35228c..e9d466d 100755 --- a/streams-activitypub-webapp/pom.xml +++ b/streams-activitypub-webapp/pom.xml @@ -134,27 +134,6 @@ <type>jar</type> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.jena</groupId> - <artifactId>jena-fuseki-main</artifactId> - <version>${jena.version}</version> - <type>jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.jena</groupId> - <artifactId>jena-arq</artifactId> - <version>${jena.version}</version> - <type>jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.jena</groupId> - <artifactId>jena-rdfconnection</artifactId> - <version>${jena.version}</version> - <type>jar</type> - <scope>test</scope> - </dependency> </dependencies> <build> <finalName>streams-activitypub-webapp</finalName>