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 2020/08/22 23:50:39 UTC
[qpid-broker-j] 02/05: QPID-8368: [Broker-J] Move ManagedObject
annotations from interfaces to implementations
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit 4f6de183f3cede807814d865cc9a19072d0206e1
Author: Alex Rudyy <or...@apache.org>
AuthorDate: Sat Aug 22 22:01:44 2020 +0100
QPID-8368: [Broker-J] Move ManagedObject annotations from interfaces to implementations
---
.../apache/qpid/server/logging/logback/BrokerGraylogLogger.java | 4 ----
.../qpid/server/logging/logback/BrokerGraylogLoggerImpl.java | 8 +++++++-
.../qpid/server/logging/logback/VirtualHostGraylogLogger.java | 5 -----
.../server/logging/logback/VirtualHostGraylogLoggerImpl.java | 9 ++++++++-
4 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerGraylogLogger.java b/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerGraylogLogger.java
index 4617672..0a24c32 100644
--- a/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerGraylogLogger.java
+++ b/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerGraylogLogger.java
@@ -21,11 +21,7 @@
package org.apache.qpid.server.logging.logback;
import org.apache.qpid.server.model.BrokerLogger;
-import org.apache.qpid.server.model.ManagedObject;
-@ManagedObject(category = false, type = GraylogLogger.TYPE,
- description = "Logger implementation that writes log events to a remote graylog server",
- validChildTypes = "org.apache.qpid.server.logging.logback.AbstractLogger#getSupportedBrokerLoggerChildTypes()")
public interface BrokerGraylogLogger<X extends BrokerGraylogLogger<X>> extends BrokerLogger<X>, GraylogLogger<X>
{
}
diff --git a/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerGraylogLoggerImpl.java b/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerGraylogLoggerImpl.java
index 26e4e26..420d979 100644
--- a/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerGraylogLoggerImpl.java
+++ b/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerGraylogLoggerImpl.java
@@ -24,16 +24,22 @@ import ch.qos.logback.classic.AsyncAppender;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.Appender;
import ch.qos.logback.core.Context;
+
import org.apache.qpid.server.logging.logback.validator.GelfConfigurationValidator;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.ManagedAttributeField;
+import org.apache.qpid.server.model.ManagedObject;
import org.apache.qpid.server.model.ManagedObjectFactoryConstructor;
import java.util.Collections;
import java.util.Map;
import java.util.Set;
-public class BrokerGraylogLoggerImpl extends AbstractBrokerLogger<BrokerGraylogLoggerImpl> implements BrokerGraylogLogger<BrokerGraylogLoggerImpl>
+@ManagedObject(category = false, type = GraylogLogger.TYPE,
+ description = "Logger implementation that writes log events to a remote graylog server",
+ validChildTypes = "org.apache.qpid.server.logging.logback.AbstractLogger#getSupportedBrokerLoggerChildTypes()")
+public class BrokerGraylogLoggerImpl extends AbstractBrokerLogger<BrokerGraylogLoggerImpl>
+ implements BrokerGraylogLogger<BrokerGraylogLoggerImpl>
{
@ManagedObjectFactoryConstructor
public BrokerGraylogLoggerImpl(Map<String, Object> attributes, Broker<?> broker)
diff --git a/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostGraylogLogger.java b/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostGraylogLogger.java
index 8582cde..47c2143 100644
--- a/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostGraylogLogger.java
+++ b/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostGraylogLogger.java
@@ -20,13 +20,8 @@
*/
package org.apache.qpid.server.logging.logback;
-import org.apache.qpid.server.model.ManagedObject;
import org.apache.qpid.server.model.VirtualHostLogger;
-@ManagedObject(category = false,
- type = GraylogLogger.TYPE,
- validChildTypes = "org.apache.qpid.server.logging.logback.AbstractLogger#getSupportedVirtualHostLoggerChildTypes()",
- amqpName = "org.apache.qpid.VirtualHostGraylogLogger")
public interface VirtualHostGraylogLogger<X extends VirtualHostGraylogLogger<X>> extends VirtualHostLogger<X>, GraylogLogger<X>
{
}
diff --git a/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostGraylogLoggerImpl.java b/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostGraylogLoggerImpl.java
index 2c07913..de95e63 100644
--- a/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostGraylogLoggerImpl.java
+++ b/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostGraylogLoggerImpl.java
@@ -24,8 +24,10 @@ import ch.qos.logback.classic.AsyncAppender;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.Appender;
import ch.qos.logback.core.Context;
+
import org.apache.qpid.server.logging.logback.validator.GelfConfigurationValidator;
import org.apache.qpid.server.model.ManagedAttributeField;
+import org.apache.qpid.server.model.ManagedObject;
import org.apache.qpid.server.model.ManagedObjectFactoryConstructor;
import org.apache.qpid.server.model.VirtualHost;
@@ -33,7 +35,12 @@ import java.util.Collections;
import java.util.Map;
import java.util.Set;
-public class VirtualHostGraylogLoggerImpl extends AbstractVirtualHostLogger<VirtualHostGraylogLoggerImpl> implements VirtualHostGraylogLogger<VirtualHostGraylogLoggerImpl>
+@ManagedObject(category = false,
+ type = GraylogLogger.TYPE,
+ validChildTypes = "org.apache.qpid.server.logging.logback.AbstractLogger#getSupportedVirtualHostLoggerChildTypes()",
+ amqpName = "org.apache.qpid.VirtualHostGraylogLogger")
+public class VirtualHostGraylogLoggerImpl extends AbstractVirtualHostLogger<VirtualHostGraylogLoggerImpl>
+ implements VirtualHostGraylogLogger<VirtualHostGraylogLoggerImpl>
{
@ManagedAttributeField
private String _remoteHost;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org