QPID-2001 : Added missing MessageStoreLogSubject and corresponding test

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@800357 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 103 insertions, 0 deletions

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/MessagesStoreLogSubject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/MessagesStoreLogSubject.java
new file mode 100644
index 0000000000..8a8708eb25
--- /dev/null
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/MessagesStoreLogSubject.java
@@ -0,0 +1,44 @@
+/*
+ *
+ * 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.logging.subjects;
+
+import org.apache.qpid.server.virtualhost.VirtualHost;
+
+public class MessagesStoreLogSubject extends AbstractLogSubject
+{
+
+    /**
+     * LOG FORMAT for the MessagesStoreLogSubject,
+     * Uses a MessageFormat call to insert the requried values according to
+     * these indicies:
+     *
+     * 0 - Virtualhost Name
+     * 1 - Message Store Type
+     */
+    protected static String BINDING_FORMAT = "vh(/{0})/ms({1})";
+
+    /** Create an ExchangeLogSubject that Logs in the following format. */
+    public MessagesStoreLogSubject(VirtualHost vhost)
+    {
+        setLogStringWithFormat(BINDING_FORMAT, vhost.getName(),
+                               vhost.getMessageStore().getClass().getSimpleName());
+    }
+}
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java
new file mode 100644
index 0000000000..05e86b9554
--- /dev/null
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java
@@ -0,0 +1,59 @@
+/*
+ *
+ * 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.logging.subjects;
+
+import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.qpid.server.registry.ApplicationRegistry;
+
+public class MessageStoreLogSubjectTest extends AbstractTestLogSubject
+{
+    VirtualHost _testVhost;
+
+    public void setUp() throws Exception
+    {
+        super.setUp();
+
+        _testVhost = ApplicationRegistry.getInstance().getVirtualHostRegistry().
+                getVirtualHost("test");
+
+        _subject = new MessagesStoreLogSubject(_testVhost);
+    }
+
+    /**
+     * Validate that the logged Subject  message is as expected:
+     * MESSAGE [Blank][vh(/test)/ms(MemoryMessageStore)] <Log Message>
+     * @param message the message whos format needs validation
+     */
+    @Override
+    protected void validateLogStatement(String message)
+    {
+        verifyVirtualHost(message, _testVhost);
+
+        String msSlice = getSlice("ms", message);
+
+        assertNotNull("MessageStore not found:" + message, msSlice);
+
+        assertEquals("MessageStore not correct",
+                     _testVhost.getMessageStore().getClass().getSimpleName(),
+                     msSlice);
+    }
+
+}