This is an automated email from the ASF dual-hosted git repository.
pzampino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git
The following commit(s) were added to refs/heads/master by this push:
new 70f4800 KNOX-2642. Incorrect message format indexes (#483)
70f4800 is described below
commit 70f4800f2ad3a405776ac59be813e1e6520e47d9
Author: Attila Magyar <[email protected]>
AuthorDate: Wed Aug 18 14:56:17 2021 +0200
KNOX-2642. Incorrect message format indexes (#483)
---
.../topology/discovery/ambari/AmbariServiceDiscoveryMessages.java | 4 ++--
.../apache/knox/gateway/shirorealm/impl/i18n/KnoxShiroMessages.java | 2 +-
.../src/main/java/org/apache/knox/gateway/GatewayMessages.java | 6 ------
.../knox/gateway/services/token/impl/TokenStateServiceMessages.java | 2 +-
.../knox/gateway/service/metadata/MetadataServiceMessages.java | 2 +-
.../advanced/AdvanceServiceDiscoveryConfigurationMessages.java | 2 +-
6 files changed, 6 insertions(+), 12 deletions(-)
diff --git
a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariServiceDiscoveryMessages.java
b/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariServiceDiscoveryMessages.java
index 88b8557..9a3f1fe 100644
---
a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariServiceDiscoveryMessages.java
+++
b/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariServiceDiscoveryMessages.java
@@ -45,11 +45,11 @@ public interface AmbariServiceDiscoveryMessages {
void errorAccessingConfigurationChangeMonitor(@StackTrace(level =
MessageLevel.DEBUG) Exception e);
@Message(level = MessageLevel.ERROR,
- text = "Failed to load service discovery URL definition
configuration: {1}")
+ text = "Failed to load service discovery URL definition
configuration: {0}")
void failedToLoadServiceDiscoveryURLDefConfiguration(@StackTrace(level =
MessageLevel.DEBUG) Exception e);
@Message(level = MessageLevel.ERROR,
- text = "Failed to load ZooKeeper configuration property mappings:
{1}")
+ text = "Failed to load ZooKeeper configuration property mappings:
{0}")
void failedToLoadZooKeeperConfigurationMapping(@StackTrace(level =
MessageLevel.DEBUG) Exception e);
@Message(level = MessageLevel.ERROR,
diff --git
a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/impl/i18n/KnoxShiroMessages.java
b/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/impl/i18n/KnoxShiroMessages.java
index f796972..e181a36 100644
---
a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/impl/i18n/KnoxShiroMessages.java
+++
b/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/impl/i18n/KnoxShiroMessages.java
@@ -35,7 +35,7 @@ public interface KnoxShiroMessages {
@Message(level = MessageLevel.INFO, text = "Could not login: {0}")
void failedLoginInfo(AuthenticationToken token);
- @Message( level = MessageLevel.DEBUG, text = "Failed to Authenticate with
LDAP server: {1}" )
+ @Message( level = MessageLevel.DEBUG, text = "Failed to Authenticate with
LDAP server: {0}" )
void failedLoginStackTrace( @StackTrace( level = MessageLevel.DEBUG )
Exception e );
@Message(level = MessageLevel.INFO, text = "Successfully logged in: {0},
{1}")
diff --git
a/gateway-server/src/main/java/org/apache/knox/gateway/GatewayMessages.java
b/gateway-server/src/main/java/org/apache/knox/gateway/GatewayMessages.java
index 8b4cf3f..da364bc 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/GatewayMessages.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/GatewayMessages.java
@@ -666,12 +666,6 @@ public interface GatewayMessages {
@Message( level = MessageLevel.ERROR, text = "The path to the keystore is
not accessible: {0}" )
void keystoreFileIsNotAccessible(String path);
- @Message( level = MessageLevel.ERROR, text = "Failed to add credential: {1}"
)
- void failedToAddCredential( @StackTrace( level = MessageLevel.DEBUG )
Exception e );
-
- @Message(level = MessageLevel.ERROR, text = "Failed to remove credential:
{1}")
- void failedToRemoveCredential(@StackTrace(level = MessageLevel.DEBUG)
Exception e);
-
@Message(level = MessageLevel.INFO, text = "Starting service: {0}")
void startingService(String serviceTypeName);
diff --git
a/gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/TokenStateServiceMessages.java
b/gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/TokenStateServiceMessages.java
index d754881..956ff9a 100644
---
a/gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/TokenStateServiceMessages.java
+++
b/gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/TokenStateServiceMessages.java
@@ -199,7 +199,7 @@ public interface TokenStateServiceMessages {
@Message(level = MessageLevel.DEBUG, text = "{0} expired tokens have been
removed from the database")
void removedTokensFromDatabase(int size);
- @Message(level = MessageLevel.ERROR, text = "An error occurred while
removing expired tokens from the database : {1}")
+ @Message(level = MessageLevel.ERROR, text = "An error occurred while
removing expired tokens from the database : {0}")
void errorRemovingTokensFromDatabase(String errorMessage, @StackTrace(level
= MessageLevel.DEBUG) Exception e);
@Message(level = MessageLevel.DEBUG, text = "Fetched issue time for {0} from
the database : {1}")
diff --git
a/gateway-service-metadata/src/main/java/org/apache/knox/gateway/service/metadata/MetadataServiceMessages.java
b/gateway-service-metadata/src/main/java/org/apache/knox/gateway/service/metadata/MetadataServiceMessages.java
index e8dc952..3d5e702 100644
---
a/gateway-service-metadata/src/main/java/org/apache/knox/gateway/service/metadata/MetadataServiceMessages.java
+++
b/gateway-service-metadata/src/main/java/org/apache/knox/gateway/service/metadata/MetadataServiceMessages.java
@@ -25,7 +25,7 @@ import org.apache.knox.gateway.i18n.messages.StackTrace;
@Messages(logger = "org.apache.knox.gateway.service.metadata")
public interface MetadataServiceMessages {
- @Message(level = MessageLevel.ERROR, text = "Failed to fetch public
certificate: {1}")
+ @Message(level = MessageLevel.ERROR, text = "Failed to fetch public
certificate: {0}")
void failedToFetchPublicCert(String errorMessage, @StackTrace(level =
MessageLevel.DEBUG) Exception e);
@Message(level = MessageLevel.ERROR, text = "Failed to generate public
certificate {0}: {1}")
diff --git
a/gateway-topology-hadoop-xml/src/main/java/org/apache/knox/gateway/topology/discovery/advanced/AdvanceServiceDiscoveryConfigurationMessages.java
b/gateway-topology-hadoop-xml/src/main/java/org/apache/knox/gateway/topology/discovery/advanced/AdvanceServiceDiscoveryConfigurationMessages.java
index 85e9b40..b2a4f63 100644
---
a/gateway-topology-hadoop-xml/src/main/java/org/apache/knox/gateway/topology/discovery/advanced/AdvanceServiceDiscoveryConfigurationMessages.java
+++
b/gateway-topology-hadoop-xml/src/main/java/org/apache/knox/gateway/topology/discovery/advanced/AdvanceServiceDiscoveryConfigurationMessages.java
@@ -30,7 +30,7 @@ public interface AdvanceServiceDiscoveryConfigurationMessages
{
@Message(level = MessageLevel.INFO, text = "Monitoring advanced service
discovery configuration changes is disabled.")
void disableMonitoring();
- @Message(level = MessageLevel.ERROR, text = "Error while monitoring CM
advanced configuration: {1}")
+ @Message(level = MessageLevel.ERROR, text = "Error while monitoring CM
advanced configuration: {0}")
void failedToMonitorClouderaManagerAdvancedConfiguration(String
errorMessage, @StackTrace(level = MessageLevel.DEBUG) Exception e);
@Message(level = MessageLevel.INFO, text = "Notifying listeners due to
advanced service discovery configuration changes in {0}...")
