You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2022/04/12 17:41:50 UTC
[isis] 12/12: ISIS-2999: removes mappings/jaxrsclient
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit e3e96a6fb1670422917e41556ef32ededc6a93bc
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Apr 12 18:41:02 2022 +0100
ISIS-2999: removes mappings/jaxrsclient
---
mappings/jaxrsclient/adoc/antora.yml | 19 ---
.../jaxrsclient/adoc/modules/jaxrsclient/nav.adoc | 5 -
.../adoc/modules/jaxrsclient/pages/about.adoc | 11 --
.../modules/jaxrsclient/partials/module-nav.adoc | 6 -
mappings/jaxrsclient/applib/pom.xml | 46 ------
.../applib/IsisModuleExtJaxRsClientApplib.java | 37 -----
.../jaxrsclient/applib/client/JaxRsClient.java | 45 ------
.../jaxrsclient/applib/client/JaxRsResponse.java | 30 ----
mappings/jaxrsclient/impl/pom.xml | 59 --------
.../impl/IsisModuleExtJaxRsClientImpl.java | 33 ----
.../impl/client/JaxRsClientDefault.java | 160 --------------------
.../impl/client/JaxRsResponseDefault.java | 42 ------
mappings/jaxrsclient/pom.xml | 33 ----
mappings/jaxrsclient/testlib/pom.xml | 38 -----
.../impl/IsisModuleExtJaxRsClientImpl.java | 28 ----
.../jaxrsclient/impl/JaxRsClientDefault.java | 166 ---------------------
.../extensions/jaxrsclient/impl/JaxRsResponse.java | 72 ---------
17 files changed, 830 deletions(-)
diff --git a/mappings/jaxrsclient/adoc/antora.yml b/mappings/jaxrsclient/adoc/antora.yml
deleted file mode 100644
index ed780ecb0b..0000000000
--- a/mappings/jaxrsclient/adoc/antora.yml
+++ /dev/null
@@ -1,19 +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.
-
-name: mappings
-version: latest
diff --git a/mappings/jaxrsclient/adoc/modules/jaxrsclient/nav.adoc b/mappings/jaxrsclient/adoc/modules/jaxrsclient/nav.adoc
deleted file mode 100644
index adfee28657..0000000000
--- a/mappings/jaxrsclient/adoc/modules/jaxrsclient/nav.adoc
+++ /dev/null
@@ -1,5 +0,0 @@
-
-:Notice: 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 ag [...]
-
-include::extensions:ROOT:partial$component-nav.adoc[]
-
diff --git a/mappings/jaxrsclient/adoc/modules/jaxrsclient/pages/about.adoc b/mappings/jaxrsclient/adoc/modules/jaxrsclient/pages/about.adoc
deleted file mode 100644
index 891ea36b19..0000000000
--- a/mappings/jaxrsclient/adoc/modules/jaxrsclient/pages/about.adoc
+++ /dev/null
@@ -1,11 +0,0 @@
-= JAX-RS Client Library
-
-:Notice: 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 ag [...]
-
-
-Consider the use case where an Apache Isis app emits "thin" events to an ESB, for example using the xref:mappings:outbox-publisher:about.adoc[Outbox Publisher].
-The ESB then queries back to the Apache Isis app to get extra info in a canonical DTO form in order to continue processing.
-
-TIP: for more on this use case, try searching on "link:https://www.google.com/search?q=fat+vs+thin+events[fat vs thin events]".
-
-This library, then, provides a bit of code to construct the correct `Accept-Type` headers, in a format that is then interpreted by an application-specific implementation of xref:refguide:applib:index/services/conmap/ContentMappingService.adoc[ContentMappingService].
diff --git a/mappings/jaxrsclient/adoc/modules/jaxrsclient/partials/module-nav.adoc b/mappings/jaxrsclient/adoc/modules/jaxrsclient/partials/module-nav.adoc
deleted file mode 100644
index 0bec05cd04..0000000000
--- a/mappings/jaxrsclient/adoc/modules/jaxrsclient/partials/module-nav.adoc
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-* xref:mappings:jaxrsclient:about.adoc[JAX-RS Client Library]
-
-
diff --git a/mappings/jaxrsclient/applib/pom.xml b/mappings/jaxrsclient/applib/pom.xml
deleted file mode 100644
index 6d36d6de48..0000000000
--- a/mappings/jaxrsclient/applib/pom.xml
+++ /dev/null
@@ -1,46 +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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.isis.mappings</groupId>
- <artifactId>isis-mappings-jaxrsclient</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>isis-mappings-jaxrsclient-applib</artifactId>
- <name>Apache Isis Map - JaxRS Client (applib)</name>
-
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.mappings.jaxrsclient.api</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/mappings/jaxrsclient/api</git-plugin.propertiesDir>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-jdk-supplemental</artifactId>
- <type>pom</type>
- </dependency>
-
- </dependencies>
-
-</project>
diff --git a/mappings/jaxrsclient/applib/src/main/java/org/apache/isis/extensions/jaxrsclient/applib/IsisModuleExtJaxRsClientApplib.java b/mappings/jaxrsclient/applib/src/main/java/org/apache/isis/extensions/jaxrsclient/applib/IsisModuleExtJaxRsClientApplib.java
deleted file mode 100644
index 99719503e7..0000000000
--- a/mappings/jaxrsclient/applib/src/main/java/org/apache/isis/extensions/jaxrsclient/applib/IsisModuleExtJaxRsClientApplib.java
+++ /dev/null
@@ -1,37 +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.isis.extensions.jaxrsclient.applib;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
-/**
- * @since 2.0 {@index}
- */
-@Configuration
-@Import({
- // modules
- IsisModuleExtJaxRsClientApplib.class
-
- // @Service's
-
-})
-public class IsisModuleExtJaxRsClientApplib {
-
-}
diff --git a/mappings/jaxrsclient/applib/src/main/java/org/apache/isis/extensions/jaxrsclient/applib/client/JaxRsClient.java b/mappings/jaxrsclient/applib/src/main/java/org/apache/isis/extensions/jaxrsclient/applib/client/JaxRsClient.java
deleted file mode 100644
index ed36eebd37..0000000000
--- a/mappings/jaxrsclient/applib/src/main/java/org/apache/isis/extensions/jaxrsclient/applib/client/JaxRsClient.java
+++ /dev/null
@@ -1,45 +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.isis.extensions.jaxrsclient.applib.client;
-
-import java.net.URI;
-
-import lombok.Getter;
-
-/**
- * @since 2.0 {@index}
- */
-public interface JaxRsClient {
-
- public enum ReprType {
- OBJECT("object"),
- ACTION_RESULT("action-result");
- @Getter
- private final String suffix;
- ReprType(final String suffix) {
- this.suffix = suffix;
- }
- }
-
- JaxRsResponse get(URI uri, Class<?> dtoClass, ReprType reprType, String username, String password);
-
- JaxRsResponse post(URI uri, String bodyJson, String username, String password);
-
-}
-
diff --git a/mappings/jaxrsclient/applib/src/main/java/org/apache/isis/extensions/jaxrsclient/applib/client/JaxRsResponse.java b/mappings/jaxrsclient/applib/src/main/java/org/apache/isis/extensions/jaxrsclient/applib/client/JaxRsResponse.java
deleted file mode 100644
index 428d44a134..0000000000
--- a/mappings/jaxrsclient/applib/src/main/java/org/apache/isis/extensions/jaxrsclient/applib/client/JaxRsResponse.java
+++ /dev/null
@@ -1,30 +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.isis.extensions.jaxrsclient.applib.client;
-
-/**
- * @since 2.0 {@index}
- */
-public interface JaxRsResponse {
-
- int getStatus();
-
- <T> T readEntity(final Class<T> entityType);
-
-}
diff --git a/mappings/jaxrsclient/impl/pom.xml b/mappings/jaxrsclient/impl/pom.xml
deleted file mode 100644
index a8ba5561c0..0000000000
--- a/mappings/jaxrsclient/impl/pom.xml
+++ /dev/null
@@ -1,59 +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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.isis.mappings</groupId>
- <artifactId>isis-mappings-jaxrsclient</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>isis-mappings-jaxrsclient-impl</artifactId>
- <name>Apache Isis Map - JaxRS Client (impl)</name>
-
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.mappings.jaxrsclient.impl</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/mappings/jaxrsclient/impl</git-plugin.propertiesDir>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.isis.mappings</groupId>
- <artifactId>isis-mappings-jaxrsclient-applib</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-rs-client</artifactId>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.woodstox</groupId>
- <artifactId>woodstox-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
- </exclusion>
- <exclusion>
- <!-- version clash -->
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- </dependencies>
-
-</project>
diff --git a/mappings/jaxrsclient/impl/src/main/java/org/apache/isis/extensions/jaxrsclient/impl/IsisModuleExtJaxRsClientImpl.java b/mappings/jaxrsclient/impl/src/main/java/org/apache/isis/extensions/jaxrsclient/impl/IsisModuleExtJaxRsClientImpl.java
deleted file mode 100644
index 9a98a7eeeb..0000000000
--- a/mappings/jaxrsclient/impl/src/main/java/org/apache/isis/extensions/jaxrsclient/impl/IsisModuleExtJaxRsClientImpl.java
+++ /dev/null
@@ -1,33 +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.isis.extensions.jaxrsclient.impl;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
-/**
- * @since 2.0 {@index}
- */
-@Configuration
-@Import({
-
-})
-public class IsisModuleExtJaxRsClientImpl {
-
-}
diff --git a/mappings/jaxrsclient/impl/src/main/java/org/apache/isis/extensions/jaxrsclient/impl/client/JaxRsClientDefault.java b/mappings/jaxrsclient/impl/src/main/java/org/apache/isis/extensions/jaxrsclient/impl/client/JaxRsClientDefault.java
deleted file mode 100644
index 2a341ec8ed..0000000000
--- a/mappings/jaxrsclient/impl/src/main/java/org/apache/isis/extensions/jaxrsclient/impl/client/JaxRsClientDefault.java
+++ /dev/null
@@ -1,160 +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.isis.extensions.jaxrsclient.impl.client;
-
-import java.net.URI;
-import java.util.HashMap;
-
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.apache.isis.extensions.jaxrsclient.applib.client.JaxRsClient;
-import org.apache.isis.extensions.jaxrsclient.applib.client.JaxRsResponse;
-
-import lombok.val;
-
-public class JaxRsClientDefault implements JaxRsClient {
-
- protected final ClientBuilder clientBuilder;
-
- public JaxRsClientDefault() {
- clientBuilder = ClientBuilder.newBuilder();
- }
-
- /**
- * @param uri - the URI returning an representation type in line with the reprType parameter.
- * @param dtoClass - used to build the Accept header
- * @param reprType - used to build the Accept header
- * @param username
- * @param password
- */
- @Override
- public JaxRsResponse get(
- final URI uri,
- final Class<?> dtoClass,
- final ReprType reprType,
- final String username,
- final String password) {
- final Client client = this.clientBuilder.build();
-
- try {
- final WebTarget webTarget = client.target(uri);
- configureInvocationBuilder(webTarget);
-
- final Invocation.Builder invocationBuilder = webTarget.request();
- invocationBuilder.accept(mediaTypeFor(dtoClass, reprType));
- addBasicAuth(username, password, invocationBuilder);
-
- final Invocation invocation = invocationBuilder.buildGet();
-
- final Response response = invocation.invoke();
- return new JaxRsResponseDefault(response);
- } finally {
- closeQuietly(client);
- }
- }
-
- @Override
- public JaxRsResponse post(
- final URI uri,
- final String bodyJson,
- final String username,
- final String password) {
-
- final Client client = this.clientBuilder.build();
-
- try {
- final WebTarget webTarget = client.target(uri);
-
- final Invocation.Builder invocationBuilder = webTarget.request();
- configureInvocationBuilder(invocationBuilder);
- addBasicAuth(username, password, invocationBuilder);
-
- final Entity<String> entity = Entity.entity(bodyJson, MediaType.APPLICATION_JSON_TYPE);
-
- final Invocation invocation = invocationBuilder.buildPost(entity);
-
- final Response response = invocation.invoke();
- return new JaxRsResponseDefault(response);
- } finally {
- closeQuietly(client);
- }
- }
-
- private Invocation.Builder addBasicAuth(
- final String username,
- final String password,
- final Invocation.Builder invocationBuilder) {
- return invocationBuilder.header("Authorization", "Basic " + encode(username, password));
- }
-
- /**
- * Optional hook, eg allow timeouts to be set:
- *
- * <p>
- * for example:
- * </p>
- * <pre>
- * HTTPConduit conduit = WebClient.getConfig(webTarget).getHttpConduit();
- * conduit.getClient().setConnectionTimeout(1000 * 3);
- * conduit.getClient().setReceiveTimeout(1000 * 3);
- * conduit.getClient().setAllowChunking(false);
- * </pre>
- */
- protected void configureInvocationBuilder(final Object invocationBuilder) {
- }
-
- private MediaType mediaTypeFor(final Class<?> dtoClass, final ReprType reprType) {
- return mediaTypeFor(dtoClass, reprType.getSuffix());
- }
-
- private MediaType mediaTypeFor(final Class<?> dtoClass, final String reprType) {
-
- // application/xml;profile="urn~org.restfulobjects~repr-types/action-result";x-ro-domain-type="org.apache.isis.schema.cmd.v1.CommandsDto"
- val parameters = new HashMap<String,String>();
- parameters.put("profile", "urn:org.restfulobjects:repr-types/" + reprType);
- parameters.put("x-ro-domain-type", dtoClass.getName());
-
- return new MediaType("application", "xml", parameters);
- }
-
- private static String encode(final String username, final String password) {
- return org.apache.cxf.common.util.Base64Utility.encode(asBytes(username, password));
- }
-
- private static byte[] asBytes(final String username, final String password) {
- return String.format("%s:%s", username, password).getBytes();
- }
-
- private static void closeQuietly(final Client client) {
- if (client == null) {
- return;
- }
- try {
- client.close();
- } catch (Exception ex) {
- // ignore so as to avoid overriding any pending exceptions in calling 'finally' block.
- }
- }
-}
diff --git a/mappings/jaxrsclient/impl/src/main/java/org/apache/isis/extensions/jaxrsclient/impl/client/JaxRsResponseDefault.java b/mappings/jaxrsclient/impl/src/main/java/org/apache/isis/extensions/jaxrsclient/impl/client/JaxRsResponseDefault.java
deleted file mode 100644
index 20a0eb3a44..0000000000
--- a/mappings/jaxrsclient/impl/src/main/java/org/apache/isis/extensions/jaxrsclient/impl/client/JaxRsResponseDefault.java
+++ /dev/null
@@ -1,42 +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.isis.extensions.jaxrsclient.impl.client;
-
-import javax.ws.rs.core.Response;
-
-import org.apache.isis.extensions.jaxrsclient.applib.client.JaxRsResponse;
-
-class JaxRsResponseDefault implements JaxRsResponse {
-
- private final Response response;
-
- public JaxRsResponseDefault(final Response response) {
- this.response = response;
- }
-
- @Override
- public int getStatus() {
- return response.getStatus();
- }
-
- @Override
- public <T> T readEntity(final Class<T> entityType) {
- return response.readEntity(entityType);
- }
-}
diff --git a/mappings/jaxrsclient/pom.xml b/mappings/jaxrsclient/pom.xml
deleted file mode 100644
index 375c0e8ad3..0000000000
--- a/mappings/jaxrsclient/pom.xml
+++ /dev/null
@@ -1,33 +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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.isis.mappings</groupId>
- <artifactId>isis-mappings</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>isis-mappings-jaxrsclient</artifactId>
- <name>Apache Isis Map - JaxRS Client (parent)</name>
- <description>Integrates JaxRS Client Library</description>
- <packaging>pom</packaging>
-
- <modules>
- <module>applib</module>
- <module>impl</module>
- </modules>
-
-</project>
diff --git a/mappings/jaxrsclient/testlib/pom.xml b/mappings/jaxrsclient/testlib/pom.xml
deleted file mode 100644
index 031f0e028a..0000000000
--- a/mappings/jaxrsclient/testlib/pom.xml
+++ /dev/null
@@ -1,38 +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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.isis.mappings</groupId>
- <artifactId>isis-mappings-jaxrsclient</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>isis-mappings-jaxrsclient-impl</artifactId>
- <name>Apache Isis Map - JaxRS Client (impl)</name>
-
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.mappings.jaxrsclient.impl</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/mappings/jaxrsclient/impl</git-plugin.propertiesDir>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.isis.mappings</groupId>
- <artifactId>isis-mappings-jaxrsclient-applib</artifactId>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/mappings/jaxrsclient/testlib/src/main/java/org/apache/isis/extensions/jaxrsclient/impl/IsisModuleExtJaxRsClientImpl.java b/mappings/jaxrsclient/testlib/src/main/java/org/apache/isis/extensions/jaxrsclient/impl/IsisModuleExtJaxRsClientImpl.java
deleted file mode 100644
index af8a5079e9..0000000000
--- a/mappings/jaxrsclient/testlib/src/main/java/org/apache/isis/extensions/jaxrsclient/impl/IsisModuleExtJaxRsClientImpl.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.isis.extensions.jaxrsclient.impl;
-
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@ComponentScan
-public class IsisModuleExtJaxRsClientImpl {
-
-}
diff --git a/mappings/jaxrsclient/testlib/src/main/java/org/apache/isis/extensions/jaxrsclient/impl/JaxRsClientDefault.java b/mappings/jaxrsclient/testlib/src/main/java/org/apache/isis/extensions/jaxrsclient/impl/JaxRsClientDefault.java
deleted file mode 100644
index 6be5b66c4b..0000000000
--- a/mappings/jaxrsclient/testlib/src/main/java/org/apache/isis/extensions/jaxrsclient/impl/JaxRsClientDefault.java
+++ /dev/null
@@ -1,166 +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.isis.extensions.jaxrsclient.impl;
-
-import java.net.URI;
-
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.apache.isis.extensions.jaxrsclient.applib.JaxRsClient;
-
-public class JaxRsClientDefault implements JaxRsClient {
-
- protected final ClientBuilder clientBuilder;
-
- public JaxRsClientDefault() {
- clientBuilder = ClientBuilder.newBuilder();
- }
-
- /**
- * @param uri - the URI returning an 'object' representation type.
- * @param dtoClass - used to build the Accept header
- * @param username
- * @param password
- * @deprecated - use{@link #get(URI, Class, ReprType, String, String)} with reprType of {@link ReprType#OBJECT}.
- */
- @Deprecated
- @Override
- public JaxRsResponse invoke(
- final URI uri,
- final Class<?> dtoClass,
- final String username,
- final String password) {
-
- return get(uri, dtoClass, ReprType.OBJECT, username, password);
- }
-
- /**
- * @param uri - the URI returning an representation type in line with the reprType parameter.
- * @param dtoClass - used to build the Accept header
- * @param reprType - used to build the Accept header
- * @param username
- * @param password
- */
- @Override
- public JaxRsResponse get(
- final URI uri,
- final Class<?> dtoClass,
- final ReprType reprType,
- final String username,
- final String password) {
- final Client client = this.clientBuilder.build();
-
- try {
- final WebTarget webTarget = client.target(uri);
- configureInvocationBuilder(webTarget);
-
- final Invocation.Builder invocationBuilder = webTarget.request();
- invocationBuilder.accept(mediaTypeFor(dtoClass, reprType));
- addBasicAuth(username, password, invocationBuilder);
-
- final Invocation invocation = invocationBuilder.buildGet();
-
- final Response response = invocation.invoke();
- return new JaxRsResponse.Default(response);
- } finally {
- closeQuietly(client);
- }
- }
-
- @Override
- public JaxRsResponse post(final URI uri, final String bodyJson, final String username, final String password) {
-
- final Client client = this.clientBuilder.build();
-
- try {
- final WebTarget webTarget = client.target(uri);
-
- final Invocation.Builder invocationBuilder = webTarget.request();
- configureInvocationBuilder(invocationBuilder);
- addBasicAuth(username, password, invocationBuilder);
-
- final Entity<String> entity = Entity.entity(bodyJson, MediaType.APPLICATION_JSON_TYPE);
-
- final Invocation invocation = invocationBuilder.buildPost(entity);
-
- final Response response = invocation.invoke();
- return new JaxRsResponse.Default(response);
- } finally {
- closeQuietly(client);
- }
- }
-
- private Invocation.Builder addBasicAuth(
- final String username,
- final String password,
- final Invocation.Builder invocationBuilder) {
- return invocationBuilder.header("Authorization", "Basic " + encode(username, password));
- }
-
- /**
- * Optional hook, eg allow timeouts to be set:
- *
- * <pre>
- * HTTPConduit conduit = WebClient.getConfig(webTarget).getHttpConduit();
- * conduit.getClient().setConnectionTimeout(1000 * 3);
- * conduit.getClient().setReceiveTimeout(1000 * 3);
- * conduit.getClient().setAllowChunking(false);
- * </pre>
- */
- protected void configureInvocationBuilder(final Object invocationBuilder) {
- }
-
- private static MediaType mediaTypeFor(final Class<?> dtoClass, final ReprType reprType) {
- return mediaTypeFor(dtoClass, reprType.suffix);
- }
-
- private static MediaType mediaTypeFor(final Class<?> dtoClass, final String reprType) {
- // application/xml;profile="urn:org.restfulobjects:repr-types/action-result";x-ro-domain-type="org.apache.isis.schema.cmd.v1.CommandsDto"
- return new MediaType("application", "xml",
- ImmutableMap.of(
- "profile", "urn:org.restfulobjects:repr-types/" + reprType,
- "x-ro-domain-type", dtoClass.getName()));
- }
-
-
- private static String encode(final String username, final String password) {
- return org.apache.cxf.common.util.Base64Utility.encode(asBytes(username, password));
- }
-
- private static byte[] asBytes(final String username, final String password) {
- return String.format("%s:%s", username, password).getBytes();
- }
-
- private static void closeQuietly(final Client client) {
- if (client == null) {
- return;
- }
- try {
- client.close();
- } catch (Exception ex) {
- // ignore so as to avoid overriding any pending exceptions in calling 'finally' block.
- }
- }
-}
diff --git a/mappings/jaxrsclient/testlib/src/main/java/org/apache/isis/extensions/jaxrsclient/impl/JaxRsResponse.java b/mappings/jaxrsclient/testlib/src/main/java/org/apache/isis/extensions/jaxrsclient/impl/JaxRsResponse.java
deleted file mode 100644
index e0f7642a4f..0000000000
--- a/mappings/jaxrsclient/testlib/src/main/java/org/apache/isis/extensions/jaxrsclient/impl/JaxRsResponse.java
+++ /dev/null
@@ -1,72 +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.isis.extensions.jaxrsclient.impl;
-
-import javax.ws.rs.core.Response;
-
-/**
- * Created by dan on 12/02/2017.
- */
-public interface JaxRsResponse {
-
- int getStatus();
-
- <T> T readEntity(final Class<T> entityType);
-
- class Default implements JaxRsResponse {
-
- private final Response response;
-
- public Default(final Response response) {
- this.response = response;
- }
-
- @Override
- public int getStatus() {
- return response.getStatus();
- }
-
- @Override
- public <T> T readEntity(final Class<T> entityType) {
- return response.readEntity(entityType);
- }
- }
-
- class ForTesting implements JaxRsResponse {
-
- private final int status;
- private final Object entity;
-
- public ForTesting(final int status, final Object entity) {
- this.status = status;
- this.entity = entity;
- }
-
- @Override
- public int getStatus() {
- return status;
- }
-
- @Override
- public <T> T readEntity(final Class<T> entityType) {
- return (T) entity;
- }
- }
-
-}