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 2019/02/09 14:03:17 UTC
[isis] branch 2033-IoC updated: ISIS-2033: refactoring
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch 2033-IoC
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/2033-IoC by this push:
new e64fdff ISIS-2033: refactoring
e64fdff is described below
commit e64fdffadf6d52d1c3470dde52d384520b75caea
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat Feb 9 14:02:24 2019 +0100
ISIS-2033: refactoring
reduce scope of some OidUtils (make package private)
Task-Url: https://issues.apache.org/jira/browse/ISIS-2033
---
.../persistence/PersistenceSessionFactory.java | 2 +-
.../viewer/restfulobjects/rendering}/OidUtils.java | 9 ++-
.../restfulobjects/rendering/RendererContext.java | 31 +++++++++++
.../rendering/ReprRendererAbstract.java | 2 +-
.../restfulobjects/rendering}/UrlDecoderUtils.java | 2 +-
.../domainobjects/DomainObjectLinkTo.java | 1 -
.../domainobjects/DomainObjectReprRenderer.java | 7 +--
.../{util => domainobjects}/OidUtils.java | 4 +-
...entNegotiationServiceForRestfulObjectsV1_0.java | 2 +-
.../resources/DomainObjectResourceServerside.java | 4 +-
.../server/resources/HomePageReprRenderer.java | 2 +-
.../server/resources/JsonParserHelper.java | 3 +-
.../server/resources/ResourceAbstract.java | 5 +-
.../server/util/NOTUSED_InputStreamUtil.java | 65 ----------------------
.../server/util/NOTUSED_PathUtils.java | 40 -------------
15 files changed, 52 insertions(+), 127 deletions(-)
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java
index 4c1d70d..f65c199 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java
@@ -26,7 +26,7 @@ public interface PersistenceSessionFactory {
public boolean isInitialized();
public PersistenceSession createPersistenceSession(
- ServiceInjector servicesInjector,
+ ServiceInjector serviceInjector,
AuthenticationSession authenticationSession);
public void catalogNamedQueries(final SpecificationLoader specificationLoader);
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/OidUtils.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/OidUtils.java
similarity index 96%
rename from core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/OidUtils.java
rename to core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/OidUtils.java
index a07e9ed..a48df9a 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/OidUtils.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/OidUtils.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.util;
+package org.apache.isis.viewer.restfulobjects.rendering;
import org.apache.isis.core.metamodel.MetaModelContext;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -33,7 +33,7 @@ import org.apache.isis.viewer.restfulobjects.rendering.RendererContext;
import static org.apache.isis.commons.internal.base._With.mapIfPresentElse;
-public final class OidUtils {
+final class OidUtils {
private OidUtils() {
}
@@ -43,7 +43,9 @@ public final class OidUtils {
*/
public static ObjectAdapter getObjectAdapterElseNull(
final RendererContext rendererContext,
- final String domainType, final String instanceIdEncoded) {
+ final String domainType,
+ final String instanceIdEncoded) {
+
final String instanceIdUnencoded = UrlDecoderUtils.urlDecode(instanceIdEncoded);
String oidStrUnencoded = Oid.marshaller().joinAsOid(domainType, instanceIdUnencoded);
return getObjectAdapter(rendererContext, oidStrUnencoded);
@@ -55,6 +57,7 @@ public final class OidUtils {
public static ObjectAdapter getObjectAdapterElseNull(
final RendererContext rendererContext,
final String oidStrEncoded) {
+
String oidStrUnencoded = UrlDecoderUtils.urlDecode(oidStrEncoded);
return getObjectAdapter(rendererContext, oidStrUnencoded);
}
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext.java
index fe23309..4a5c28d 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext.java
@@ -19,6 +19,7 @@
package org.apache.isis.viewer.restfulobjects.rendering;
import java.util.List;
+import java.util.stream.Stream;
import javax.ws.rs.core.MediaType;
@@ -27,6 +28,7 @@ import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.security.authentication.AuthenticationSession;
@@ -39,7 +41,10 @@ public interface RendererContext {
AuthenticationSession getAuthenticationSession();
IsisConfiguration getConfiguration();
+
+ @Deprecated //TODO [2033]
PersistenceSession getPersistenceSession();
+
List<MediaType> getAcceptableMediaTypes();
SpecificationLoader getSpecificationLoader();
@@ -78,4 +83,30 @@ public interface RendererContext {
*/
RepresentationService.Intent getIntent();
+ // -- TEMPORARY FOR REFACTORING
+
+ default Stream<ObjectAdapter> streamServices() {
+ return getPersistenceSession().streamServices();
+ }
+
+ default ObjectAdapter adapterFor(Object pojo) {
+ return getPersistenceSession().adapterFor(pojo);
+ }
+
+ default ObjectAdapter getObjectAdapterElseNull(String oidFromHref) {
+ return OidUtils.getObjectAdapterElseNull(this, oidFromHref);
+ }
+
+ default ObjectAdapter getObjectAdapterElseNull(String domainType, String instanceIdEncoded) {
+ return OidUtils.getObjectAdapterElseNull(this, domainType, instanceIdEncoded);
+ }
+
+ default ObjectAdapter newTransientInstance(ObjectSpecification domainTypeSpec) {
+ return getPersistenceSession().newTransientInstance(domainTypeSpec);
+ }
+
+ default void makePersistentInTransaction(ObjectAdapter objectAdapter) {
+ getPersistenceSession().makePersistentInTransaction(objectAdapter);
+ }
+
}
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRendererAbstract.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRendererAbstract.java
index a7e11f9..c07138f 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRendererAbstract.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRendererAbstract.java
@@ -203,7 +203,7 @@ public abstract class ReprRendererAbstract<R extends ReprRendererAbstract<R, T>,
}
protected Stream<ObjectAdapter> streamServiceAdapters() {
- return rendererContext.getPersistenceSession().streamServices();
+ return rendererContext.streamServices();
}
}
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/UrlDecoderUtils.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/UrlDecoderUtils.java
similarity index 95%
rename from core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/UrlDecoderUtils.java
rename to core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/UrlDecoderUtils.java
index cc1ecbd..f37ce13 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/UrlDecoderUtils.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/UrlDecoderUtils.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.server.util;
+package org.apache.isis.viewer.restfulobjects.rendering;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectLinkTo.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectLinkTo.java
index ae5b920..7d3b24a 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectLinkTo.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectLinkTo.java
@@ -22,7 +22,6 @@ import org.apache.isis.viewer.restfulobjects.applib.Rel;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.rendering.LinkBuilder;
import org.apache.isis.viewer.restfulobjects.rendering.RendererContext;
-import org.apache.isis.viewer.restfulobjects.rendering.util.OidUtils;
public class DomainObjectLinkTo implements ObjectAdapterLinkTo {
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
index e6c32e2..33312ef 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
@@ -41,7 +41,6 @@ import org.apache.isis.viewer.restfulobjects.rendering.LinkFollowSpecs;
import org.apache.isis.viewer.restfulobjects.rendering.RendererContext;
import org.apache.isis.viewer.restfulobjects.rendering.ReprRendererAbstract;
import org.apache.isis.viewer.restfulobjects.rendering.domaintypes.DomainTypeReprRenderer;
-import org.apache.isis.viewer.restfulobjects.rendering.util.OidUtils;
public class DomainObjectReprRenderer extends ReprRendererAbstract<DomainObjectReprRenderer, ObjectAdapter> {
@@ -260,15 +259,15 @@ public class DomainObjectReprRenderer extends ReprRendererAbstract<DomainObjectR
}
private String getDomainType() {
- return org.apache.isis.viewer.restfulobjects.rendering.util.OidUtils.getDomainType(objectAdapter);
+ return org.apache.isis.viewer.restfulobjects.rendering.domainobjects.OidUtils.getDomainType(objectAdapter);
}
private String getInstanceId() {
- return org.apache.isis.viewer.restfulobjects.rendering.util.OidUtils.getInstanceId(objectAdapter);
+ return org.apache.isis.viewer.restfulobjects.rendering.domainobjects.OidUtils.getInstanceId(objectAdapter);
}
private String getOidStr() {
- return org.apache.isis.viewer.restfulobjects.rendering.util.OidUtils.getOidStr(objectAdapter);
+ return org.apache.isis.viewer.restfulobjects.rendering.domainobjects.OidUtils.getOidStr(objectAdapter);
}
private DomainObjectReprRenderer withMembers(final ObjectAdapter objectAdapter) {
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/OidUtils.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/OidUtils.java
similarity index 95%
rename from core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/OidUtils.java
rename to core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/OidUtils.java
index 0a785ca..e4295e7 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/OidUtils.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/OidUtils.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.restfulobjects.rendering.util;
+package org.apache.isis.viewer.restfulobjects.rendering.domainobjects;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
-public final class OidUtils {
+final class OidUtils {
private OidUtils() {
}
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
index 80e151a..90ac67a 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
@@ -225,7 +225,7 @@ public class ContentNegotiationServiceForRestfulObjectsV1_0 implements ContentNe
final String actionArguments = actionArgumentsFrom(objectAndActionInvocation);
final DomainObjectList list = domainObjectListFrom(collectionAdapters, elementSpec, actionOwningType, actionId, actionArguments);
- adapter = rendererContext.getPersistenceSession().adapterFor(list);
+ adapter = rendererContext.adapterFor(list);
} else {
adapter = objectAndActionInvocation.getReturnedAdapter();
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainObjectResourceServerside.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainObjectResourceServerside.java
index b2e7d04..2b6f39b 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainObjectResourceServerside.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainObjectResourceServerside.java
@@ -106,7 +106,7 @@ public class DomainObjectResourceServerside extends ResourceAbstract implements
throw RestfulObjectsApplicationException.createWithMessage(HttpStatusCode.BAD_REQUEST, "Could not determine type of domain object to persist (no class with domainType Id of '%s')", domainType);
}
- final ObjectAdapter objectAdapter = getResourceContext().getPersistenceSession().newTransientInstance(domainTypeSpec);
+ final ObjectAdapter objectAdapter = getResourceContext().newTransientInstance(domainTypeSpec);
final ObjectAdapterUpdateHelper updateHelper = new ObjectAdapterUpdateHelper(getResourceContext(), objectAdapter);
@@ -123,7 +123,7 @@ public class DomainObjectResourceServerside extends ResourceAbstract implements
if (validity.isVetoed()) {
throw RestfulObjectsApplicationException.createWithBody(HttpStatusCode.BAD_REQUEST, objectRepr, validity.getReason());
}
- getResourceContext().getPersistenceSession().makePersistentInTransaction(objectAdapter);
+ getResourceContext().makePersistentInTransaction(objectAdapter);
return newDomainResourceHelper(objectAdapter).objectRepresentation(RepresentationService.Intent.JUST_CREATED);
}
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HomePageReprRenderer.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HomePageReprRenderer.java
index 319b406..54ae015 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HomePageReprRenderer.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/HomePageReprRenderer.java
@@ -57,7 +57,7 @@ public class HomePageReprRenderer extends ReprRendererAbstract<HomePageReprRende
addLinkToUser(getRendererContext().getAuthenticationSession());
addLinkToMenuBars();
- addLinkToServices(getRendererContext().getPersistenceSession().streamServices());
+ addLinkToServices(getRendererContext().streamServices());
addLinkToVersion();
addLinkToDomainTypes(((ResourceContext)getRendererContext()).getSpecificationLoader().allSpecifications());
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/JsonParserHelper.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/JsonParserHelper.java
index 2991b93..158240f 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/JsonParserHelper.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/JsonParserHelper.java
@@ -28,7 +28,6 @@ import org.apache.isis.viewer.restfulobjects.rendering.RendererContext;
import org.apache.isis.viewer.restfulobjects.rendering.RestfulObjectsApplicationException;
import org.apache.isis.viewer.restfulobjects.rendering.domainobjects.JsonValueEncoder;
import org.apache.isis.viewer.restfulobjects.rendering.util.Util;
-import org.apache.isis.viewer.restfulobjects.server.util.OidUtils;
/**
* Utility class that encapsulates the logic for parsing some content (JSON, or a simple string that is JSON)
@@ -128,7 +127,7 @@ public class JsonParserHelper {
throw new IllegalArgumentException(reason);
}
- final ObjectAdapter objectAdapter = OidUtils.getObjectAdapterElseNull(rendererContext, oidFromHref);
+ final ObjectAdapter objectAdapter = rendererContext.getObjectAdapterElseNull(oidFromHref);
if (objectAdapter == null) {
final String reason = "'href' does not reference a known entity";
argRepr.mapPut("invalidReason", reason);
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
index 71e7797..ece61dd 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
@@ -49,7 +49,6 @@ import org.apache.isis.viewer.restfulobjects.rendering.RestfulObjectsApplication
import org.apache.isis.viewer.restfulobjects.rendering.service.RepresentationService;
import org.apache.isis.viewer.restfulobjects.rendering.util.Util;
import org.apache.isis.viewer.restfulobjects.server.ResourceContext;
-import org.apache.isis.viewer.restfulobjects.server.util.OidUtils;
public abstract class ResourceAbstract {
@@ -139,14 +138,14 @@ public abstract class ResourceAbstract {
ObjectAdapter objectAdapter = getObjectAdapterElseNull(domainType, instanceId);
if (objectAdapter == null) {
- final String instanceIdUnencoded = org.apache.isis.viewer.restfulobjects.server.util.UrlDecoderUtils.urlDecode(instanceId);
+ final String instanceIdUnencoded = org.apache.isis.viewer.restfulobjects.rendering.UrlDecoderUtils.urlDecode(instanceId);
throw RestfulObjectsApplicationException.createWithMessage(HttpStatusCode.NOT_FOUND, "could not determine adapter for OID: '%s:%s'", domainType, instanceIdUnencoded);
}
return objectAdapter;
}
protected ObjectAdapter getObjectAdapterElseNull(String domainType, final String instanceId) {
- return OidUtils.getObjectAdapterElseNull(resourceContext, domainType, instanceId);
+ return resourceContext.getObjectAdapterElseNull(domainType, instanceId);
}
protected ObjectAdapter getServiceAdapter(final String serviceId) {
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/NOTUSED_InputStreamUtil.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/NOTUSED_InputStreamUtil.java
deleted file mode 100644
index 7c9d049..0000000
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/NOTUSED_InputStreamUtil.java
+++ /dev/null
@@ -1,65 +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.viewer.restfulobjects.server.util;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
-final class NOTUSED_InputStreamUtil {
-
- private NOTUSED_InputStreamUtil() {
- }
-
- @SuppressWarnings("unused")
- private static List<String> getArgs(final InputStream body) {
- // will be sorted by arg
- final Map<String, String> args = new TreeMap<String, String>();
- if (body == null) {
- return listOfValues(args);
- }
- try {
- final InputStreamReader inputStreamReader = new InputStreamReader(body);
- final BufferedReader bufferedReader = new BufferedReader(inputStreamReader);
- String readLine = bufferedReader.readLine();
- while (readLine != null) {
- final String[] keyValuePairs = readLine.split("&");
- for (final String keyValuePair : keyValuePairs) {
- final String[] keyThenValue = keyValuePair.split("=");
- args.put(keyThenValue[0], keyThenValue[1]);
- }
- readLine = bufferedReader.readLine();
- }
- return listOfValues(args);
- } catch (final IOException ex) {
- throw new RuntimeException(ex);
- }
- }
-
- private static ArrayList<String> listOfValues(final Map<String, String> args) {
- // returns the values in the order of the keys
- return new ArrayList<String>(args.values());
- }
-
-}
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/NOTUSED_PathUtils.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/NOTUSED_PathUtils.java
deleted file mode 100644
index cf7d080..0000000
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/NOTUSED_PathUtils.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.isis.viewer.restfulobjects.server.util;
-
-import javax.servlet.http.HttpServletRequest;
-
-
-public final class NOTUSED_PathUtils {
-
- private NOTUSED_PathUtils() {
- }
-
- public static String combine(final HttpServletRequest request, final String... pathElements) {
- final StringBuilder buf = new StringBuilder(request.getContextPath());
- for (final String pathElement : pathElements) {
- if (!pathElement.startsWith("/")) {
- buf.append("/");
- }
- buf.append(pathElement);
- }
- return buf.toString();
- }
-
-}