fix "policies.imports-limit" configuration which had wrong config key…

… in code and was not applied * remove obsolete (no longer used) config keys as well Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
eclipse-ditto · Jun 29, 2023 · e3015a0 · e3015a0
1 parent bc8e6a2
commit e3015a0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 17 deletions.
diff --git a/...rvice/src/main/java/org/eclipse/ditto/base/service/config/limits/DefaultLimitsConfig.java b/...rvice/src/main/java/org/eclipse/ditto/base/service/config/limits/DefaultLimitsConfig.java
@@ -69,6 +69,11 @@ public long getPoliciesMaxSize() {
         return policiesMaxSize;
     }
 
+    @Override
+    public int getPolicyImportsLimit() {
+        return policyImportsLimit;
+    }
+
     @Override
     public long getMessagesMaxSize() {
         return messagesMaxSize;
@@ -92,11 +97,6 @@ public String getConfigPath() {
         return CONFIG_PATH;
     }
 
-    @Override
-    public int getPolicyImportsLimit() {
-        return policyImportsLimit;
-    }
-
     @Override
     public boolean equals(@Nullable final Object o) {
         if (this == o) {

diff --git a/base/service/src/main/java/org/eclipse/ditto/base/service/config/limits/LimitsConfig.java b/base/service/src/main/java/org/eclipse/ditto/base/service/config/limits/LimitsConfig.java
@@ -80,6 +80,11 @@ enum LimitsConfigValue implements KnownConfigValue {
          */
         POLICIES_MAX_SIZE("policies.max-size", Constants.DEFAULT_ENTITY_MAX_SIZE),
 
+        /**
+         * The number of imports that a policy may contain.
+         */
+        POLICY_IMPORTS_LIMIT("policies.imports-limit", 10),
+
         /**
          * The maximum possible size of "Messages" entities in bytes.
          */
@@ -93,12 +98,7 @@ enum LimitsConfigValue implements KnownConfigValue {
         /**
          * The maximum pagination size to apply when searching for "Things" via "things-search".
          */
-        THINGS_SEARCH_MAX_PAGE_SIZE(Constants.THINGS_SEARCH_PATH + "." + "max-page-size", 200),
-
-        /**
-         * The number of imports that a policy may contain.
-         */
-        POLICY_IMPORTS_LIMIT("imports-limit", 10);
+        THINGS_SEARCH_MAX_PAGE_SIZE(Constants.THINGS_SEARCH_PATH + "." + "max-page-size", 200);
 
         private final String path;
         private final Object defaultValue;

diff --git a/internal/utils/config/src/main/resources/ditto-limits.conf b/internal/utils/config/src/main/resources/ditto-limits.conf
@@ -19,12 +19,6 @@ ditto.limits {
   messages {
     max-size = 250k
     max-size = ${?LIMITS_MESSAGES_MAX_SIZE}
-
-    headers-size = 5k
-    headers-size = ${?LIMITS_MESSAGES_HEADERS_SIZE}
-
-    auth-subjects-count = 100
-    auth-subjects-count = ${?LIMITS_MESSAGES_AUTH_SUBJECTS_COUNT}
   }
 
   # limiations for the "things-search" service