ISPN-8870 Remove logger inheritance to reduce class metadata

infinispan · Feb 22, 2018 · fc54eb4 · fc54eb4
1 parent 0c26c33
commit fc54eb4
Show file tree

Hide file tree

Showing 36 changed files with 165 additions and 166 deletions.
diff --git a/cli/cli-interpreter/src/main/java/org/infinispan/cli/interpreter/logging/Log.java b/cli/cli-interpreter/src/main/java/org/infinispan/cli/interpreter/logging/Log.java
@@ -10,6 +10,7 @@
 import org.infinispan.cli.interpreter.codec.CodecException;
 import org.infinispan.cli.interpreter.result.StatementException;
 import org.infinispan.commons.CacheException;
+import org.jboss.logging.BasicLogger;
 import org.jboss.logging.annotations.Cause;
 import org.jboss.logging.annotations.LogMessage;
 import org.jboss.logging.annotations.Message;
@@ -23,7 +24,7 @@
  * @since 5.2
  */
 @MessageLogger(projectCode = "ISPN")
-public interface Log extends org.infinispan.util.logging.Log {
+public interface Log extends BasicLogger {
    @LogMessage(level = ERROR)
    @Message(value = "Could not register interpreter MBean", id = 19001)
    void jmxRegistrationFailed();

diff --git a/core/src/main/java/org/infinispan/util/logging/Log.java b/core/src/main/java/org/infinispan/util/logging/Log.java
@@ -299,9 +299,9 @@ public interface Log extends BasicLogger {
 //   @Message(value = "Problems creating the directory: %s", id = 64)
 //   void problemsCreatingDirectory(File dir);
 
-   @LogMessage(level = ERROR)
+//   @LogMessage(level = ERROR)
-   @Message(value = "Exception while marshalling object: %s", id = 65)
+//   @Message(value = "Exception while marshalling object: %s", id = 65)
-   void errorMarshallingObject(@Cause Throwable ioe, Object obj);
+//   void errorMarshallingObject(@Cause Throwable ioe, Object obj);
 
    @LogMessage(level = ERROR)
    @Message(value = "Unable to read version id from first two bytes of stream, barfing.", id = 66)
@@ -323,9 +323,9 @@ public interface Log extends BasicLogger {
    @Message(value = "Unexpected error while replicating", id = 73)
    void unexpectedErrorReplicating(@Cause Throwable t);
 
-   @LogMessage(level = ERROR)
+//   @LogMessage(level = ERROR)
-   @Message(value = "Message or message buffer is null or empty.", id = 77)
+//   @Message(value = "Message or message buffer is null or empty.", id = 77)
-   void msgOrMsgBufferEmpty();
+//   void msgOrMsgBufferEmpty();
 
    @LogMessage(level = INFO)
    @Message(value = "Starting JGroups channel %s", id = 78)
@@ -343,9 +343,9 @@ public interface Log extends BasicLogger {
    @Message(value = "Problem closing channel %s; setting it to null", id = 81)
    void problemClosingChannel(@Cause Exception e, String cluster);
 
-   @LogMessage(level = INFO)
+//   @LogMessage(level = INFO)
-   @Message(value = "Stopping the RpcDispatcher for channel %s", id = 82)
+//   @Message(value = "Stopping the RpcDispatcher for channel %s", id = 82)
-   void stoppingRpcDispatcher(String cluster);
+//   void stoppingRpcDispatcher(String cluster);
 
    @LogMessage(level = ERROR)
    @Message(value = "Class [%s] cannot be cast to JGroupsChannelLookup! Not using a channel lookup.", id = 83)
@@ -821,9 +821,9 @@ void preparedTxAlreadyExists(RecoveryAwareTransaction previous,
    @Message(value = "Shutdown while handling command %s", id = 219)
    void shutdownHandlingCommand(ReplicableCommand command);
 
-   @LogMessage(level = WARN)
+//   @LogMessage(level = WARN)
-   @Message(value = "Problems un-marshalling remote command from byte buffer", id = 220)
+//   @Message(value = "Problems un-marshalling remote command from byte buffer", id = 220)
-   void errorUnMarshallingCommand(@Cause Throwable throwable);
+//   void errorUnMarshallingCommand(@Cause Throwable throwable);
 
    //@LogMessage(level = WARN)
    //@Message(value = "Unknown response value [%s]. Expected [%s]", id = 221)
@@ -1170,8 +1170,8 @@ void preparedTxAlreadyExists(RecoveryAwareTransaction previous,
    @Message(value = "Unable to invoke method %s on Object instance %s ", id = 331)
    void unableToInvokeListenerMethod(Method m, Object target, @Cause Throwable e);
 
-   @Message(value = "Remote transaction %s rolled back because originator is no longer in the cluster", id = 332)
+//   @Message(value = "Remote transaction %s rolled back because originator is no longer in the cluster", id = 332)
-   CacheException orphanTransactionRolledBack(GlobalTransaction gtx);
+//   CacheException orphanTransactionRolledBack(GlobalTransaction gtx);
 
 //   @Message(value = "The site must be specified.", id = 333)
 //   CacheConfigurationException backupSiteNullName();
@@ -1371,8 +1371,8 @@ void preparedTxAlreadyExists(RecoveryAwareTransaction previous,
    @Message(value = "Received unsolicited state from node %s for segment %d of cache %s", id = 396)
    void ignoringUnsolicitedState(Address node, int segment, String cacheName);
 
-   @Message(value = "Could not migrate data for cache %s, check remote store config in the target cluster. Make sure only one remote store is present and is pointing to the source cluster", id = 397)
+//   @Message(value = "Could not migrate data for cache %s, check remote store config in the target cluster. Make sure only one remote store is present and is pointing to the source cluster", id = 397)
-   CacheException couldNotMigrateData(String name);
+//   CacheException couldNotMigrateData(String name);
 
    @Message(value = "CH Factory '%s' cannot restore a persisted CH of class '%s'", id = 398)
    IllegalStateException persistentConsistentHashMismatch(String hashFactory, String consistentHashClass);
@@ -1394,8 +1394,8 @@ TimeoutException coordinatorTimeoutWaitingForView(int expectedViewId, int curren
    @Message(value = "No indexable classes were defined for this indexed cache; switching to autodetection (support for autodetection will be removed in Infinispan 10.0).", id = 403)
    void noIndexableClassesDefined();
 
-   @Message(value = "The configured entity class %s is not indexable. Please remove it from the indexing configuration.", id = 404)
+//   @Message(value = "The configured entity class %s is not indexable. Please remove it from the indexing configuration.", id = 404)
-   CacheConfigurationException classNotIndexable(String className);
+//   CacheConfigurationException classNotIndexable(String className);
 
    @LogMessage(level = ERROR)
    @Message(value = "Caught exception while invoking a cache manager listener!", id = 405)
@@ -1594,8 +1594,8 @@ TimeoutException coordinatorTimeoutWaitingForView(int expectedViewId, int curren
    @Message(value = "The partition handling 'enable' attribute has been deprecated. Please update your configuration file to use the 'type' attribute instead", id = 464)
    void partitionHandlingConfigurationEnabledDeprecated();
 
-   @Message(value = "Keys '%s' are not available. No owners exist in this partition", id = 465)
+//   @Message(value = "Keys '%s' are not available. No owners exist in this partition", id = 465)
-   AvailabilityException degradedModeNoOwnersExist(Object key);
+//   AvailabilityException degradedModeNoOwnersExist(Object key);
 
    @LogMessage(level = WARN)
    @Message(value = "Exception encountered when trying to resolve conflict on Keys '%s': %s", id = 466)
@@ -1686,11 +1686,11 @@ TimeoutException coordinatorTimeoutWaitingForView(int expectedViewId, int curren
    @Message(value = "Cannot find transcoder between '%s' to '%s'", id = 492)
    EncodingException cannotFindTranscoder(MediaType mediaType, MediaType another);
 
-   @Message(value = "Invalid text format: '%s'", id = 493)
+//   @Message(value = "Invalid text format: '%s'", id = 493)
-   EncodingException invalidTextFormat(Object content);
+//   EncodingException invalidTextFormat(Object content);
 
-   @Message(value = "Invalid binary format: '%s'", id = 494)
+//   @Message(value = "Invalid binary format: '%s'", id = 494)
-   EncodingException invalidBinaryFormat(Object content);
+//   EncodingException invalidBinaryFormat(Object content);
 
    @Message(value = "Error transcoding content", id = 495)
    EncodingException errorTranscoding(@Cause Throwable cause);

diff --git a/counter/src/main/java/org/infinispan/counter/impl/strong/BoundedStrongCounter.java b/counter/src/main/java/org/infinispan/counter/impl/strong/BoundedStrongCounter.java
@@ -6,13 +6,13 @@
 import java.util.concurrent.CompletionException;
 
 import org.infinispan.AdvancedCache;
+import org.infinispan.commons.logging.Log;
 import org.infinispan.commons.logging.LogFactory;
 import org.infinispan.counter.api.CounterConfiguration;
 import org.infinispan.counter.api.CounterState;
 import org.infinispan.counter.exception.CounterOutOfBoundsException;
 import org.infinispan.counter.impl.entries.CounterValue;
 import org.infinispan.counter.impl.listener.CounterManagerNotificationManager;
-import org.infinispan.counter.logging.Log;
 
 /**
  * A bounded strong consistent counter.

diff --git a/counter/src/main/java/org/infinispan/counter/logging/Log.java b/counter/src/main/java/org/infinispan/counter/logging/Log.java
@@ -7,6 +7,7 @@
 import org.infinispan.counter.exception.CounterConfigurationException;
 import org.infinispan.counter.exception.CounterException;
 import org.infinispan.util.ByteString;
+import org.jboss.logging.BasicLogger;
 import org.jboss.logging.annotations.Cause;
 import org.jboss.logging.annotations.LogMessage;
 import org.jboss.logging.annotations.Message;
@@ -19,7 +20,7 @@
  * @since 9.0
  */
 @MessageLogger(projectCode = "ISPN")
-public interface Log extends org.infinispan.commons.logging.Log {
+public interface Log extends BasicLogger {
 
    //28001 is in commons log
 
@@ -63,12 +64,14 @@ public interface Log extends org.infinispan.commons.logging.Log {
    @Message(value = "Exception while waiting for counter manager caches.", id = 28013)
    void exceptionWhileWaitingForCached(@Cause Throwable cause);
 
-   //28014 is in commons log
+   @Message(value = "Invalid counter type. Expected=%s but got %s", id = 28014)
+   CounterException invalidCounterType(String expected, String actual);
 
    @Message(value = "Unable to fetch counter manager caches.", id = 28015)
    CounterException unableToFetchCaches();
 
-   //28016 is in commons log
+   @Message(value = "Counter '%s' is not defined.", id = 28016)
+   CounterException undefinedCounter(String name);
 
    @Message(value = "Duplicated counter name found. Counter '%s' already exists.", id = 28017)
    CounterConfigurationException duplicatedCounterName(String counter);

diff --git a/extended-statistics/src/main/java/org/infinispan/stats/logging/Log.java b/extended-statistics/src/main/java/org/infinispan/stats/logging/Log.java
@@ -5,6 +5,7 @@
 
 import org.infinispan.stats.container.ExtendedStatistic;
 import org.infinispan.stats.percentiles.PercentileStatistic;
+import org.jboss.logging.BasicLogger;
 import org.jboss.logging.annotations.Cause;
 import org.jboss.logging.annotations.LogMessage;
 import org.jboss.logging.annotations.Message;
@@ -18,7 +19,7 @@
  * @since 6.0
  */
 @MessageLogger(projectCode = "ISPN")
-public interface Log extends org.infinispan.util.logging.Log {
+public interface Log extends BasicLogger {
 
    @LogMessage(level = WARN)
    @Message(id = 25001, value = "Extended Statistic [%s] not found while tried to add a percentile sample.")

diff --git a/jcache/commons/src/main/java/org/infinispan/jcache/logging/Log.java b/jcache/commons/src/main/java/org/infinispan/jcache/logging/Log.java
@@ -11,6 +11,7 @@
 import javax.cache.configuration.Configuration;
 import javax.cache.processor.EntryProcessorException;
 
+import org.jboss.logging.BasicLogger;
 import org.jboss.logging.annotations.Cause;
 import org.jboss.logging.annotations.LogMessage;
 import org.jboss.logging.annotations.Message;
@@ -23,7 +24,7 @@
  * @since 5.3
  */
 @MessageLogger(projectCode = "ISPN")
-public interface Log extends org.infinispan.commons.logging.Log {
+public interface Log extends BasicLogger {
 
    @Message(value = "Allocation stack trace:", id = 21001)
    LeakDescription cacheManagerNotClosed();

diff --git a/lock/src/main/java/org/infinispan/lock/impl/log/Log.java b/lock/src/main/java/org/infinispan/lock/impl/log/Log.java
@@ -1,6 +1,7 @@
 package org.infinispan.lock.impl.log;
 
 import org.infinispan.lock.exception.ClusteredLockException;
+import org.jboss.logging.BasicLogger;
 import org.jboss.logging.annotations.Message;
 import org.jboss.logging.annotations.MessageLogger;
 
@@ -11,7 +12,7 @@
  * @since 9.2
  */
 @MessageLogger(projectCode = "ISPN")
-public interface Log extends org.infinispan.util.logging.Log {
+public interface Log extends BasicLogger {
    String LOCK_DELETE_MSG = "The lock was deleted.";
 
    @Message(value = LOCK_DELETE_MSG, id = 29001)

diff --git a/lucene/directory-provider/src/main/java/org/infinispan/hibernate/search/logging/Log.java b/lucene/directory-provider/src/main/java/org/infinispan/hibernate/search/logging/Log.java
@@ -6,6 +6,7 @@
 import javax.naming.NamingException;
 
 import org.hibernate.search.exception.SearchException;
+import org.jboss.logging.BasicLogger;
 import org.jboss.logging.annotations.Cause;
 import org.jboss.logging.annotations.LogMessage;
 import org.jboss.logging.annotations.Message;
@@ -19,7 +20,7 @@
  * @since 4.0
  */
 @MessageLogger(projectCode = "ISPN")
-public interface Log extends org.infinispan.commons.logging.Log {
+public interface Log extends BasicLogger {
 
    @LogMessage(level = ERROR)
    @Message(id = 26001, value = "Unable to retrieve CacheManager from JNDI [%s]")

diff --git a/lucene/lucene-directory/src/main/java/org/infinispan/lucene/logging/Log.java b/lucene/lucene-directory/src/main/java/org/infinispan/lucene/logging/Log.java
@@ -9,6 +9,7 @@
 import org.infinispan.commons.CacheException;
 import org.infinispan.configuration.cache.CacheMode;
 import org.infinispan.persistence.spi.PersistenceException;
+import org.jboss.logging.BasicLogger;
 import org.jboss.logging.annotations.Cause;
 import org.jboss.logging.annotations.LogMessage;
 import org.jboss.logging.annotations.Message;
@@ -23,7 +24,10 @@
  * @since 5.0
  */
 @MessageLogger(projectCode = "ISPN")
-public interface Log extends org.infinispan.util.logging.Log {
+public interface Log extends BasicLogger {
+   @LogMessage(level = ERROR)
+   @Message(value = "Error executing parallel store task", id = 252)
+   void errorExecutingParallelStoreTask(@Cause Throwable cause);
 
    @LogMessage(level = ERROR)
    @Message(value = "Error in suspending transaction", id = 15001)

diff --git a/persistence/jdbc/src/main/java/org/infinispan/persistence/jdbc/logging/Log.java b/persistence/jdbc/src/main/java/org/infinispan/persistence/jdbc/logging/Log.java
@@ -11,6 +11,7 @@
 
 import org.infinispan.commons.CacheConfigurationException;
 import org.infinispan.persistence.spi.PersistenceException;
+import org.jboss.logging.BasicLogger;
 import org.jboss.logging.annotations.Cause;
 import org.jboss.logging.annotations.LogMessage;
 import org.jboss.logging.annotations.Message;
@@ -24,7 +25,10 @@
  * @since 5.0
  */
 @MessageLogger(projectCode = "ISPN")
-public interface Log extends org.infinispan.util.logging.Log {
+public interface Log extends BasicLogger {
+   @LogMessage(level = ERROR)
+   @Message(value = "Exception while marshalling object: %s", id = 65)
+   void errorMarshallingObject(@Cause Throwable ioe, Object obj);
 
    @LogMessage(level = ERROR)
    @Message(value = "Failed clearing cache store", id = 8001)

diff --git a/persistence/remote/src/main/java/org/infinispan/persistence/remote/logging/Log.java b/persistence/remote/src/main/java/org/infinispan/persistence/remote/logging/Log.java
@@ -1,10 +1,11 @@
 package org.infinispan.persistence.remote.logging;
 
-import static org.jboss.logging.Logger.Level.ERROR;
+import static org.jboss.logging.Logger.Level.INFO;
+import static org.jboss.logging.Logger.Level.WARN;
 
 import org.infinispan.commons.CacheConfigurationException;
 import org.infinispan.commons.CacheException;
-import org.infinispan.persistence.spi.PersistenceException;
+import org.jboss.logging.BasicLogger;
 import org.jboss.logging.annotations.Cause;
 import org.jboss.logging.annotations.LogMessage;
 import org.jboss.logging.annotations.Message;
@@ -18,21 +19,24 @@
  * @since 5.0
  */
 @MessageLogger(projectCode = "ISPN")
-public interface Log extends org.infinispan.util.logging.Log {
+public interface Log extends BasicLogger {
+   @Message(value = "Could not find migration data in cache %s", id = 276)
+   CacheException missingMigrationData(String name);
 
-   @LogMessage(level = ERROR)
+   @LogMessage(level = WARN)
-   @Message(value = "RemoteStore can only run in shared mode! This method shouldn't be called in shared mode", id = 10001)
+   @Message(value = "Could not migrate key %s", id = 277)
-   void sharedModeOnlyAllowed();
+   void keyMigrationFailed(String key, @Cause Throwable cause);
 
-   @Message(value = "Wrapper cannot handle values of class %s", id = 10004)
+   @LogMessage(level = INFO)
-   PersistenceException unsupportedValueFormat(String name);
+   @Message(value = "Ignoring XML attribute %s, please remove from configuration file", id = 293)
+   void ignoreXmlAttribute(Object attribute);
+
+   @Message(value = "Could not migrate data for cache %s, check remote store config in the target cluster. Make sure only one remote store is present and is pointing to the source cluster", id = 397)
+   CacheException couldNotMigrateData(String name);
 
    @Message(value = "Cannot enable HotRod wrapping if a marshaller and/or an entryWrapper have already been set", id = 10005)
    CacheConfigurationException cannotEnableHotRodWrapping();
 
-   @Message(value = "Cannot load the HotRodEntryWrapper class (make sure the infinispan-server-hotrod classes are available)", id = 10006)
-   CacheConfigurationException cannotLoadHotRodEntryWrapper(@Cause Exception e);
-
    @Message(value = "The RemoteCacheStore for cache %s should be configured with hotRodWrapping enabled", id = 10007)
    CacheException remoteStoreNoHotRodWrapping(String cacheName);
 

diff --git a/...main/java/org/infinispan/persistence/rest/configuration/RestStoreConfigurationParser.java b/...main/java/org/infinispan/persistence/rest/configuration/RestStoreConfigurationParser.java
@@ -14,7 +14,7 @@
 import org.infinispan.configuration.parsing.ParseUtils;
 import org.infinispan.configuration.parsing.Parser;
 import org.infinispan.configuration.parsing.XMLExtendedStreamReader;
-import org.infinispan.persistence.rest.logging.Log;
+import org.infinispan.util.logging.Log;
 import org.infinispan.util.logging.LogFactory;
 import org.kohsuke.MetaInfServices;
 

diff --git a/persistence/rest/src/main/java/org/infinispan/persistence/rest/logging/Log.java b/persistence/rest/src/main/java/org/infinispan/persistence/rest/logging/Log.java
@@ -22,9 +22,13 @@
 
 package org.infinispan.persistence.rest.logging;
 
+import static org.jboss.logging.Logger.Level.ERROR;
+
 import org.infinispan.commons.CacheConfigurationException;
 import org.infinispan.persistence.spi.PersistenceException;
+import org.jboss.logging.BasicLogger;
 import org.jboss.logging.annotations.Cause;
+import org.jboss.logging.annotations.LogMessage;
 import org.jboss.logging.annotations.Message;
 import org.jboss.logging.annotations.MessageLogger;
 
@@ -36,9 +40,10 @@
  * @since 6.0
  */
 @MessageLogger(projectCode = "ISPN")
-public interface Log extends org.infinispan.util.logging.Log {
+public interface Log extends BasicLogger {
-   @Message(value = "The REST cache store needs to have at least one server configured", id = 22001)
+   @LogMessage(level = ERROR)
-   CacheConfigurationException noServersConfigured();
+   @Message(value = "Error executing parallel store task", id = 252)
+   void errorExecutingParallelStoreTask(@Cause Throwable cause);
 
    @Message(value = "HTTP error: %s", id = 22002)
    PersistenceException httpError(String status);

diff --git a/...stence/rest/src/main/java/org/infinispan/persistence/rest/upgrade/RestTargetMigrator.java b/...stence/rest/src/main/java/org/infinispan/persistence/rest/upgrade/RestTargetMigrator.java
@@ -13,9 +13,9 @@
 import org.infinispan.persistence.PersistenceUtil;
 import org.infinispan.persistence.manager.PersistenceManager;
 import org.infinispan.persistence.rest.RestStore;
-import org.infinispan.persistence.rest.logging.Log;
 import org.infinispan.persistence.spi.PersistenceException;
 import org.infinispan.upgrade.TargetMigrator;
+import org.infinispan.util.logging.Log;
 import org.infinispan.util.logging.LogFactory;
 import org.kohsuke.MetaInfServices;