You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2017/10/18 13:52:52 UTC
[2/4] qpid-broker-j git commit: QPID-7799: [Java Broker] Remove
duplicate code
QPID-7799: [Java Broker] Remove duplicate code
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/06a30729
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/06a30729
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/06a30729
Branch: refs/heads/master
Commit: 06a30729357dce56da9c27c0aa252eed1b7388df
Parents: cec1954
Author: Alex Rudyy <or...@apache.org>
Authored: Wed Oct 18 10:54:42 2017 +0100
Committer: Alex Rudyy <or...@apache.org>
Committed: Wed Oct 18 14:52:42 2017 +0100
----------------------------------------------------------------------
.../org/apache/qpid/server/model/ConfiguredObjectFinder.java | 7 +------
.../server/management/plugin/servlet/rest/RestServlet.java | 7 +------
2 files changed, 2 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/06a30729/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFinder.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFinder.java b/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFinder.java
index 8792094..3e385b7 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFinder.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFinder.java
@@ -20,7 +20,7 @@
*/
package org.apache.qpid.server.model;
-import static org.apache.qpid.server.model.ConfiguredObjectTypeRegistry.getRawType;
+import static org.apache.qpid.server.model.ConfiguredObjectTypeRegistry.getCollectionMemberType;
import static org.apache.qpid.server.model.ConfiguredObjectTypeRegistry.returnsCollectionOfConfiguredObjects;
import java.lang.reflect.ParameterizedType;
@@ -452,11 +452,6 @@ public class ConfiguredObjectFinder
return hierarchyList;
}
- private Class getCollectionMemberType(ParameterizedType collectionType)
- {
- return getRawType((collectionType).getActualTypeArguments()[0]);
- }
-
public Collection<? extends ConfiguredObject> getAssociatedChildren(final Class<? extends ConfiguredObject> childClass)
{
final ConfiguredObjectOperation<ConfiguredObject<?>> op =
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/06a30729/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
index 319e8ea..8361886 100644
--- a/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
+++ b/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
@@ -22,6 +22,7 @@ package org.apache.qpid.server.management.plugin.servlet.rest;
import static org.apache.qpid.server.management.plugin.HttpManagementConfiguration.DEFAULT_PREFERENCE_OPERATION_TIMEOUT;
import static org.apache.qpid.server.management.plugin.HttpManagementConfiguration.PREFERENCE_OPERTAION_TIMEOUT_CONTEXT_NAME;
import static org.apache.qpid.server.management.plugin.HttpManagementUtil.ensureFilenameIsRfc2183;
+import static org.apache.qpid.server.model.ConfiguredObjectTypeRegistry.getCollectionMemberType;
import static org.apache.qpid.server.model.ConfiguredObjectTypeRegistry.returnsCollectionOfConfiguredObjects;
import java.io.IOException;
@@ -56,7 +57,6 @@ import org.apache.qpid.server.model.AbstractConfiguredObject;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.ConfiguredObjectFinder;
import org.apache.qpid.server.model.ConfiguredObjectOperation;
-import org.apache.qpid.server.model.ConfiguredObjectTypeRegistry;
import org.apache.qpid.server.model.Content;
import org.apache.qpid.server.model.IllegalStateTransitionException;
import org.apache.qpid.server.model.IntegrityViolationException;
@@ -700,11 +700,6 @@ public class RestServlet extends AbstractServlet
return target;
}
- private Class getCollectionMemberType(ParameterizedType collectionType)
- {
- return ConfiguredObjectTypeRegistry.getRawType((collectionType).getActualTypeArguments()[0]);
- }
-
private Map<String, Object> getOperationArgumentsAsMap(HttpServletRequest request)
{
Map<String, Object> providedObject;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org