You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by lq...@apache.org on 2016/07/11 14:48:52 UTC
svn commit: r1752167 - in /qpid/java/trunk:
broker-core/src/main/java/org/apache/qpid/server/model/
broker-core/src/main/java/org/apache/qpid/server/model/adapter/
broker-core/src/main/java/org/apache/qpid/server/store/preferences/
broker-core/src/main...
Author: lquack
Date: Mon Jul 11 14:48:52 2016
New Revision: 1752167
URL: http://svn.apache.org/viewvc?rev=1752167&view=rev
Log:
QPID-7333: [Java Broker] Avoid preference recovery for children having own preference store
Added:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/preferences/PreferenceStoreProvider.java
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostNode.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/preferences/PreferencesRecoverer.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestUserPreferenceHandler.java
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java?rev=1752167&r1=1752166&r2=1752167&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java Mon Jul 11 14:48:52 2016
@@ -25,9 +25,10 @@ import org.apache.qpid.server.logging.Ev
import org.apache.qpid.server.store.DurableConfigurationStore;
import org.apache.qpid.server.store.preferences.PreferenceStore;
import org.apache.qpid.server.store.preferences.PreferenceStoreAttributes;
+import org.apache.qpid.server.store.preferences.PreferenceStoreProvider;
@ManagedObject (creatable = false)
-public interface SystemConfig<X extends SystemConfig<X>> extends ConfiguredObject<X>, ModelRoot
+public interface SystemConfig<X extends SystemConfig<X>> extends ConfiguredObject<X>, ModelRoot, PreferenceStoreProvider
{
String MANAGEMENT_MODE = "managementMode";
@@ -70,7 +71,4 @@ public interface SystemConfig<X extends
Broker getBroker();
DurableConfigurationStore getConfigurationStore();
-
- PreferenceStore createPreferenceStore();
-
}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostNode.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostNode.java?rev=1752167&r1=1752166&r2=1752167&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostNode.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHostNode.java Mon Jul 11 14:48:52 2016
@@ -25,9 +25,10 @@ import java.util.Collection;
import org.apache.qpid.server.store.DurableConfigurationStore;
import org.apache.qpid.server.store.preferences.PreferenceStore;
import org.apache.qpid.server.store.preferences.PreferenceStoreAttributes;
+import org.apache.qpid.server.store.preferences.PreferenceStoreProvider;
@ManagedObject(category=true, managesChildren=true)
-public interface VirtualHostNode<X extends VirtualHostNode<X>> extends ConfiguredObject<X>
+public interface VirtualHostNode<X extends VirtualHostNode<X>> extends ConfiguredObject<X>, PreferenceStoreProvider
{
String QPID_INITIAL_CONFIG_VIRTUALHOST_CONFIG_VAR = "qpid.initial_config_virtualhost_config";
@ManagedContextDefault(name = QPID_INITIAL_CONFIG_VIRTUALHOST_CONFIG_VAR)
@@ -63,5 +64,4 @@ public interface VirtualHostNode<X exten
void start();
- PreferenceStore createPreferenceStore();
}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java?rev=1752167&r1=1752166&r2=1752167&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java Mon Jul 11 14:48:52 2016
@@ -70,6 +70,7 @@ import org.apache.qpid.server.security.S
import org.apache.qpid.server.security.access.Operation;
import org.apache.qpid.server.store.preferences.PreferenceRecord;
import org.apache.qpid.server.store.preferences.PreferenceStore;
+import org.apache.qpid.server.store.preferences.PreferenceStoreProvider;
import org.apache.qpid.server.store.preferences.PreferenceStoreUpdaterImpl;
import org.apache.qpid.server.store.preferences.PreferencesRecoverer;
import org.apache.qpid.server.util.HousekeepingExecutor;
@@ -667,8 +668,8 @@ public class BrokerAdapter extends Abstr
{
super.onOpen();
- SystemConfig<?> systemConfig = getParent(SystemConfig.class);
- _preferenceStore = systemConfig.createPreferenceStore();
+ PreferenceStoreProvider preferenceStoreProvider = getParent(SystemConfig.class);
+ _preferenceStore = preferenceStoreProvider.createPreferenceStore();
getEventLogger().message(BrokerMessages.STARTUP(CommonProperties.getReleaseVersion(),
CommonProperties.getBuildVersion()));
Added: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/preferences/PreferenceStoreProvider.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/preferences/PreferenceStoreProvider.java?rev=1752167&view=auto
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/preferences/PreferenceStoreProvider.java (added)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/preferences/PreferenceStoreProvider.java Mon Jul 11 14:48:52 2016
@@ -0,0 +1,25 @@
+/*
+ * 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.qpid.server.store.preferences;
+
+public interface PreferenceStoreProvider
+{
+ PreferenceStore createPreferenceStore();
+}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/preferences/PreferencesRecoverer.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/preferences/PreferencesRecoverer.java?rev=1752167&r1=1752166&r2=1752167&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/preferences/PreferencesRecoverer.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/preferences/PreferencesRecoverer.java Mon Jul 11 14:48:52 2016
@@ -113,15 +113,18 @@ public class PreferencesRecoverer
}
}
associatedObject.setUserPreferences(new UserPreferencesImpl(preferenceStore, recoveredPreferences));
- Model model = associatedObject.getModel();
- Collection<Class<? extends ConfiguredObject>> childrenCategories =
- model.getChildTypes(associatedObject.getCategoryClass());
- for (Class<? extends ConfiguredObject> childCategory : childrenCategories)
+
+ if (!(associatedObject instanceof PreferenceStoreProvider))
{
- Collection<? extends ConfiguredObject> children = associatedObject.getChildren(childCategory);
- for (ConfiguredObject<?> child : children)
+ Collection<Class<? extends ConfiguredObject>> childrenCategories =
+ associatedObject.getModel().getChildTypes(associatedObject.getCategoryClass());
+ for (Class<? extends ConfiguredObject> childCategory : childrenCategories)
{
- setUserPreferences(child, objectToRecordMap, preferenceStore, corruptedRecords);
+ Collection<? extends ConfiguredObject> children = associatedObject.getChildren(childCategory);
+ for (ConfiguredObject<?> child : children)
+ {
+ setUserPreferences(child, objectToRecordMap, preferenceStore, corruptedRecords);
+ }
}
}
}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java?rev=1752167&r1=1752166&r2=1752167&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java Mon Jul 11 14:48:52 2016
@@ -92,6 +92,7 @@ import org.apache.qpid.server.store.Stor
import org.apache.qpid.server.store.handler.ConfiguredObjectRecordHandler;
import org.apache.qpid.server.store.preferences.PreferenceRecord;
import org.apache.qpid.server.store.preferences.PreferenceStore;
+import org.apache.qpid.server.store.preferences.PreferenceStoreProvider;
import org.apache.qpid.server.store.preferences.PreferenceStoreUpdater;
import org.apache.qpid.server.store.preferences.PreferenceStoreUpdaterImpl;
import org.apache.qpid.server.store.preferences.PreferencesRecoverer;
@@ -467,8 +468,8 @@ public abstract class AbstractVirtualHos
}
- VirtualHostNode<?> parent = getParent(VirtualHostNode.class);
- _preferenceStore = parent.createPreferenceStore();
+ PreferenceStoreProvider preferenceStoreProvider = getParent(VirtualHostNode.class);
+ _preferenceStore = preferenceStoreProvider.createPreferenceStore();
}
private void checkVHostStateIsActive()
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java?rev=1752167&r1=1752166&r2=1752167&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java Mon Jul 11 14:48:52 2016
@@ -1187,6 +1187,15 @@ public class RestServlet extends Abstrac
}
case USER_PREFERENCES:
{
+ //TODO: define format how to report the results for bulk delete, i.e. how to report individual errors and success statuses
+ if (allObjects.size() > 1)
+ {
+ sendJsonErrorResponse(request,
+ response,
+ HttpServletResponse.SC_BAD_REQUEST,
+ "Deletion of user preferences using wildcards is unsupported");
+ return;
+ }
for (ConfiguredObject o : allObjects)
{
new RestUserPreferenceHandler().handleDELETE(o.getUserPreferences(), requestInfo);
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestUserPreferenceHandler.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestUserPreferenceHandler.java?rev=1752167&r1=1752166&r2=1752167&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestUserPreferenceHandler.java (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestUserPreferenceHandler.java Mon Jul 11 14:48:52 2016
@@ -45,6 +45,11 @@ public class RestUserPreferenceHandler
{
public void handleDELETE(final UserPreferences userPreferences, final RequestInfo requestInfo)
{
+ if (userPreferences == null)
+ {
+ throw new NotFoundException("User preferences are not available");
+ }
+
final List<String> preferencesParts = requestInfo.getPreferencesParts();
final Map<String, List<String>> queryParameters = requestInfo.getQueryParameters();
String id = getIdFromQueryParameters(queryParameters);
@@ -102,6 +107,11 @@ public class RestUserPreferenceHandler
ActionTaken handlePUT(ConfiguredObject<?> target, RequestInfo requestInfo, Object providedObject)
{
UserPreferences userPreferences = target.getUserPreferences();
+ if (userPreferences == null)
+ {
+ throw new NotFoundException("User preferences are not available");
+ }
+
final List<String> preferencesParts = requestInfo.getPreferencesParts();
if (!(providedObject instanceof Map))
@@ -138,6 +148,11 @@ public class RestUserPreferenceHandler
void handlePOST(ConfiguredObject<?> target, RequestInfo requestInfo, Object providedObject)
{
UserPreferences userPreferences = target.getUserPreferences();
+ if (userPreferences == null)
+ {
+ throw new NotFoundException("User preferences are not available");
+ }
+
final List<String> preferencesParts = requestInfo.getPreferencesParts();
if (preferencesParts.size() == 1)
@@ -217,6 +232,11 @@ public class RestUserPreferenceHandler
Object handleGET(UserPreferences userPreferences, RequestInfo requestInfo)
{
+ if (userPreferences == null)
+ {
+ throw new NotFoundException("User preferences are not available");
+ }
+
final List<String> preferencesParts = requestInfo.getPreferencesParts();
final Map<String, List<String>> queryParameters = requestInfo.getQueryParameters();
String id = getIdFromQueryParameters(queryParameters);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org