#26706 include in 23.01.11

dotCMS · Jan 18, 2024 · fb6b8b2 · fb6b8b2
1 parent fb10033
commit fb6b8b2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/dotCMS/src/main/java/com/dotcms/dotpubsub/DotPubSubProviderLocator.java b/dotCMS/src/main/java/com/dotcms/dotpubsub/DotPubSubProviderLocator.java
@@ -10,7 +10,7 @@ public class DotPubSubProviderLocator {
     public final static String DOT_PUBSUB_PROVIDER_OVERRIDE = "DOT_PUBSUB_PROVIDER_OVERRIDE";
     public final static String DOT_PUBSUB_USE_QUEUE = "DOT_PUBSUB_USE_QUEUE";
     /**
-     * Default provider is postgres, can be overriden by setting config: DOT_PUBSUB_PROVIDER_OVERRIDE
+     * Default provider is JDBCPubSubImpl, can be overriden by setting config: DOT_PUBSUB_PROVIDER_OVERRIDE
      * DOT_PUBSUB_USE_QUEUE is a boolean, and will wrap the Pubsub in a queue
      */
     public static Lazy<DotPubSubProvider> provider = Lazy.of(() -> {
@@ -22,7 +22,7 @@ public class DotPubSubProviderLocator {
         final String pubsubClazz = System.getProperty(DOT_PUBSUB_PROVIDER_OVERRIDE) != null
                         ? System.getProperty(DOT_PUBSUB_PROVIDER_OVERRIDE)
                         : Config.getStringProperty(DOT_PUBSUB_PROVIDER_OVERRIDE,
-                                        PostgresPubSubImpl.class.getCanonicalName());
+                                        JDBCPubSubImpl.class.getCanonicalName());
 
         DotPubSubProvider provider = (DotPubSubProvider) Try.of(() -> Class.forName(pubsubClazz).newInstance())
                         .getOrElseThrow(e -> new DotRuntimeException(e));

diff --git a/dotCMS/src/main/resources/dotmarketing-config.properties b/dotCMS/src/main/resources/dotmarketing-config.properties
@@ -368,8 +368,8 @@ PULLPERSONALIZED_PERSONA_WEIGHT=100
 
 ##################### dotCMS PUB/SUB #####################
 ## If you want to use a custom DOT_PUBSUB_PROVIDER, you can set the the DOT_PUBSUB_PROVIDER_OVERRIDE
-## to the class you would like to use.  By default we use the com.dotcms.dotpubsub.PostgresPubSubImpl
-#DOT_PUBSUB_PROVIDER_OVERRIDE=com.dotcms.dotpubsub.PostgresPubSubImpl
+## to the class you would like to use.  By default we use the com.dotcms.dotpubsub.JDBCPubSubImpl
+#DOT_PUBSUB_PROVIDER_OVERRIDE=com.dotcms.dotpubsub.JDBCPubSubImpl
 
 ## Setting this to true will send all PUB/SUB messages async, through an async queuing mechanism
 ## Setting this to false will send all PUB/SUB messages sync through the pub/sub system of your choice

diff --git a/hotfix_tracking.md b/hotfix_tracking.md
@@ -189,3 +189,4 @@ This maintenance release includes the following code fixes:
 153. https://github.com/dotCMS/core/issues/24082 : Language Keys API throws 400 when a duplicate key exists #24082
 154. https://github.com/dotCMS/core/issues/26439 : Relationship fields not respecting the order identifiers are sent via the workflow API #26439
 155. https://github.com/dotCMS/core/issues/25233 : sysPublishDate no longer appears to be part of the ElasticSearch object we create for indexing #25233
+156. https://github.com/dotCMS/core/issues/26706 : Change Default PUBSUB Provider #26706