You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/01/06 14:48:49 UTC
[isis] branch master updated: ISIS-2158: cleaning up
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 00f2a98 ISIS-2158: cleaning up
00f2a98 is described below
commit 00f2a985cd8edb716d467733850ab56cb1e163c2
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Jan 6 15:37:20 2020 +0100
ISIS-2158: cleaning up
---
.../restfulobjects/applib/RestfulHttpMethod.java | 11 ++++-------
.../resources/DomainObjectResourceServerside.java | 10 +++++-----
.../viewer/resources/MenuBarsResourceServerside.java | 4 ++--
.../legacy/restclient/lib/ClientRequestConfigurer.java | 10 +++++-----
...ulHttpMethod2.java => RestfulHttpMethodHelper.java} | 18 ++++++------------
.../restclient/lib/RestfulHttpMethodTest_setUp.java | 14 +++++++-------
6 files changed, 29 insertions(+), 38 deletions(-)
diff --git a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulHttpMethod.java b/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulHttpMethod.java
index 5235185..e7445d9 100644
--- a/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulHttpMethod.java
+++ b/core/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulHttpMethod.java
@@ -18,16 +18,13 @@
*/
package org.apache.isis.viewer.restfulobjects.applib;
-import lombok.Getter;
import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor
public enum RestfulHttpMethod {
- GET(javax.ws.rs.HttpMethod.GET),
- PUT(javax.ws.rs.HttpMethod.PUT),
- DELETE(javax.ws.rs.HttpMethod.DELETE),
- POST(javax.ws.rs.HttpMethod.POST);
-
- @Getter private final String javaxRsMethod;
+ GET,
+ PUT,
+ DELETE,
+ POST,
}
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java
index c023407..19b05b7 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java
@@ -26,6 +26,7 @@ import javax.inject.Inject;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
import javax.ws.rs.GET;
+import javax.ws.rs.HttpMethod;
import javax.ws.rs.POST;
import javax.ws.rs.PUT;
import javax.ws.rs.Path;
@@ -61,7 +62,6 @@ import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
-import org.apache.isis.viewer.restfulobjects.applib.RestfulHttpMethod;
import org.apache.isis.viewer.restfulobjects.applib.RestfulMediaType;
import org.apache.isis.viewer.restfulobjects.applib.RestfulResponse;
import org.apache.isis.viewer.restfulobjects.applib.RestfulResponse.HttpStatusCode;
@@ -336,7 +336,7 @@ public class DomainObjectResourceServerside extends ResourceAbstract implements
public void visit(final DomainObjectLayoutData domainObjectLayoutData) {
Link link = new Link(
Rel.ELEMENT.getName(),
- RestfulHttpMethod.GET.getJavaxRsMethod(),
+ HttpMethod.GET,
getResourceContext().urlFor(
"objects/" + domainType + "/" + instanceId
),
@@ -348,7 +348,7 @@ public class DomainObjectResourceServerside extends ResourceAbstract implements
public void visit(final ActionLayoutData actionLayoutData) {
Link link = new Link(
Rel.ACTION.getName(),
- RestfulHttpMethod.GET.getJavaxRsMethod(),
+ HttpMethod.GET,
getResourceContext().urlFor(
"objects/" + domainType + "/" + instanceId + "/actions/" + actionLayoutData.getId()
),
@@ -360,7 +360,7 @@ public class DomainObjectResourceServerside extends ResourceAbstract implements
public void visit(final PropertyLayoutData propertyLayoutData) {
Link link = new Link(
Rel.PROPERTY.getName(),
- RestfulHttpMethod.GET.getJavaxRsMethod(),
+ HttpMethod.GET,
getResourceContext().urlFor(
"objects/" + domainType + "/" + instanceId + "/properties/" + propertyLayoutData.getId()
),
@@ -372,7 +372,7 @@ public class DomainObjectResourceServerside extends ResourceAbstract implements
public void visit(final CollectionLayoutData collectionLayoutData) {
Link link = new Link(
Rel.COLLECTION.getName(),
- RestfulHttpMethod.GET.getJavaxRsMethod(),
+ HttpMethod.GET,
getResourceContext().urlFor(
"objects/" + domainType + "/" + instanceId + "/collections/" + collectionLayoutData.getId()
),
diff --git a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/MenuBarsResourceServerside.java b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/MenuBarsResourceServerside.java
index f881db2..b38802e 100644
--- a/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/MenuBarsResourceServerside.java
+++ b/core/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/MenuBarsResourceServerside.java
@@ -19,6 +19,7 @@
package org.apache.isis.viewer.restfulobjects.viewer.resources;
import javax.inject.Inject;
+import javax.ws.rs.HttpMethod;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
@@ -34,7 +35,6 @@ import org.apache.isis.config.ConfigurationConstants;
import org.apache.isis.metamodel.context.MetaModelContext;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
-import org.apache.isis.viewer.restfulobjects.applib.RestfulHttpMethod;
import org.apache.isis.viewer.restfulobjects.applib.RestfulMediaType;
import org.apache.isis.viewer.restfulobjects.applib.RestfulResponse;
import org.apache.isis.viewer.restfulobjects.applib.menubars.MenuBarsResource;
@@ -86,7 +86,7 @@ public class MenuBarsResourceServerside extends ResourceAbstract implements Menu
objectType, ConfigurationConstants.SERVICE_IDENTIFIER, actionLayoutData.getId());
Link link = new Link(
Rel.ACTION.getName(),
- RestfulHttpMethod.GET.getJavaxRsMethod(),
+ HttpMethod.GET,
getResourceContext().urlFor(relativeUrl),
RepresentationType.OBJECT_ACTION.getJsonMediaType().toString());
actionLayoutData.setLink(link);
diff --git a/legacy/vro/restclient/src/main/java/org/apache/isis/legacy/restclient/lib/ClientRequestConfigurer.java b/legacy/vro/restclient/src/main/java/org/apache/isis/legacy/restclient/lib/ClientRequestConfigurer.java
index 5453c9c..d9a3433 100644
--- a/legacy/vro/restclient/src/main/java/org/apache/isis/legacy/restclient/lib/ClientRequestConfigurer.java
+++ b/legacy/vro/restclient/src/main/java/org/apache/isis/legacy/restclient/lib/ClientRequestConfigurer.java
@@ -76,12 +76,12 @@ public class ClientRequestConfigurer {
* {@link #configureArgs(Map)}.
*/
public ClientRequestConfigurer setHttpMethod(final RestfulHttpMethod httpMethod) {
- clientRequest.setHttpMethod(httpMethod.getJavaxRsMethod());
+ clientRequest.setHttpMethod(httpMethod.name());
return this;
}
- public ClientRequestConfigurer setHttpMethod(final RestfulHttpMethod2 httpMethod) {
- clientRequest.setHttpMethod(httpMethod.getJavaxRsMethod());
+ public ClientRequestConfigurer setHttpMethod(final RestfulHttpMethodHelper httpMethod) {
+ clientRequest.setHttpMethod(httpMethod.name());
return this;
}
@@ -167,9 +167,9 @@ public class ClientRequestConfigurer {
return this;
}
- RestfulHttpMethod2 getHttpMethod() {
+ RestfulHttpMethodHelper getHttpMethod() {
final String httpMethod = clientRequest.getHttpMethod();
- return RestfulHttpMethod2.valueOf(httpMethod);
+ return RestfulHttpMethodHelper.valueOf(httpMethod);
}
}
diff --git a/legacy/vro/restclient/src/main/java/org/apache/isis/legacy/restclient/lib/RestfulHttpMethod2.java b/legacy/vro/restclient/src/main/java/org/apache/isis/legacy/restclient/lib/RestfulHttpMethodHelper.java
similarity index 82%
rename from legacy/vro/restclient/src/main/java/org/apache/isis/legacy/restclient/lib/RestfulHttpMethod2.java
rename to legacy/vro/restclient/src/main/java/org/apache/isis/legacy/restclient/lib/RestfulHttpMethodHelper.java
index aac03b8..7220916 100644
--- a/legacy/vro/restclient/src/main/java/org/apache/isis/legacy/restclient/lib/RestfulHttpMethod2.java
+++ b/legacy/vro/restclient/src/main/java/org/apache/isis/legacy/restclient/lib/RestfulHttpMethodHelper.java
@@ -18,17 +18,13 @@
*/
package org.apache.isis.legacy.restclient.lib;
-import org.apache.isis.legacy.restclient.lib.ClientRequest;
-import org.apache.isis.legacy.restclient.lib.ClientRequestConfigurer;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
-import lombok.Getter;
-
-public enum RestfulHttpMethod2 {
- GET(javax.ws.rs.HttpMethod.GET, ArgStrategy.QUERY_STRING),
- PUT(javax.ws.rs.HttpMethod.PUT, ArgStrategy.BODY),
- DELETE(javax.ws.rs.HttpMethod.DELETE, ArgStrategy.QUERY_STRING),
- POST(javax.ws.rs.HttpMethod.POST, ArgStrategy.BODY);
+enum RestfulHttpMethodHelper {
+ GET(ArgStrategy.QUERY_STRING),
+ PUT(ArgStrategy.BODY),
+ DELETE(ArgStrategy.QUERY_STRING),
+ POST(ArgStrategy.BODY);
private enum ArgStrategy {
/**
@@ -58,11 +54,9 @@ public enum RestfulHttpMethod2 {
abstract void setUpArgs(ClientRequestConfigurer clientRequestConfigurer, JsonRepresentation requestArgs);
}
- @Getter private final String javaxRsMethod;
private final ArgStrategy argStrategy;
- private RestfulHttpMethod2(final String javaxRsMethod, final ArgStrategy argStrategy) {
- this.javaxRsMethod = javaxRsMethod;
+ private RestfulHttpMethodHelper(final ArgStrategy argStrategy) {
this.argStrategy = argStrategy;
}
diff --git a/legacy/vro/restclient/src/test/java/org/apache/isis/legacy/restclient/lib/RestfulHttpMethodTest_setUp.java b/legacy/vro/restclient/src/test/java/org/apache/isis/legacy/restclient/lib/RestfulHttpMethodTest_setUp.java
index b2dd2b1..bb13e41 100644
--- a/legacy/vro/restclient/src/test/java/org/apache/isis/legacy/restclient/lib/RestfulHttpMethodTest_setUp.java
+++ b/legacy/vro/restclient/src/test/java/org/apache/isis/legacy/restclient/lib/RestfulHttpMethodTest_setUp.java
@@ -27,7 +27,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.apache.isis.legacy.restclient.lib.ClientRequestConfigurer;
-import org.apache.isis.legacy.restclient.lib.RestfulHttpMethod2;
+import org.apache.isis.legacy.restclient.lib.RestfulHttpMethodHelper;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
@@ -54,25 +54,25 @@ public class RestfulHttpMethodTest_setUp {
@Test
public void get() throws Exception {
- setsUpQueryString(RestfulHttpMethod2.GET);
+ setsUpQueryString(RestfulHttpMethodHelper.GET);
}
@Test
public void delete() throws Exception {
- setsUpQueryString(RestfulHttpMethod2.DELETE);
+ setsUpQueryString(RestfulHttpMethodHelper.DELETE);
}
@Test
public void post() throws Exception {
- setsUpBody(RestfulHttpMethod2.POST);
+ setsUpBody(RestfulHttpMethodHelper.POST);
}
@Test
public void put() throws Exception {
- setsUpBody(RestfulHttpMethod2.PUT);
+ setsUpBody(RestfulHttpMethodHelper.PUT);
}
- private void setsUpQueryString(final RestfulHttpMethod2 httpMethod) throws UnsupportedEncodingException {
+ private void setsUpQueryString(final RestfulHttpMethodHelper httpMethod) throws UnsupportedEncodingException {
context.checking(new Expectations() {
{
oneOf(requestConfigurer).setHttpMethod(httpMethod);
@@ -83,7 +83,7 @@ public class RestfulHttpMethodTest_setUp {
httpMethod.setUpArgs(requestConfigurer, repr);
}
- private void setsUpBody(final RestfulHttpMethod2 httpMethod) throws UnsupportedEncodingException {
+ private void setsUpBody(final RestfulHttpMethodHelper httpMethod) throws UnsupportedEncodingException {
context.checking(new Expectations() {
{
oneOf(requestConfigurer).setHttpMethod(httpMethod);