business-calendar

jbpm/jbpm-flow/src/main/java/org/jbpm/process/core/timer/BusinessCalendar.java → api/kogito-api/src/main/java/org/kie/kogito/calendar/BusinessCalendar.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jbpm.process.core.timer;
+package org.kie.kogito.calendar;
 
 import java.util.Date;
 

api/kogito-api/src/main/java/org/kie/kogito/process/ProcessConfig.java

@@ -20,6 +20,7 @@
 
 import org.kie.kogito.KogitoConfig;
 import org.kie.kogito.auth.IdentityProvider;
+import org.kie.kogito.calendar.BusinessCalendar;
 import org.kie.kogito.jobs.JobsService;
 import org.kie.kogito.signal.SignalManagerHub;
 import org.kie.kogito.uow.UnitOfWorkManager;
@@ -38,4 +39,6 @@ public interface ProcessConfig extends KogitoConfig {
  ProcessVersionResolver versionResolver();
 
  IdentityProvider identityProvider();
+
+ BusinessCalendar getBusinessCalendar();
 }

jbpm/jbpm-flow/src/main/java/org/jbpm/process/core/constants/CalendarConstants.java

@@ -0,0 +1,6 @@
+package org.jbpm.process.core.constants;
+
+public class CalendarConstants {
+ public static final String BUSINESS_CALENDAR_PATH = "calendar.properties";
+ public static final String BUSINESS_CALENDAR_ENVIRONMENT_KEY = "jbpm.business.calendar";
+}

jbpm/jbpm-flow/src/main/java/org/jbpm/process/core/timer/BusinessCalendarImpl.java

@@ -35,10 +35,13 @@
 import java.util.regex.Matcher;
 
 import org.jbpm.util.PatternConstants;
+import org.kie.kogito.calendar.BusinessCalendar;
 import org.kie.kogito.timer.SessionClock;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.jbpm.process.core.constants.CalendarConstants.BUSINESS_CALENDAR_PATH;
+
 /**
  * Default implementation of BusinessCalendar interface that is configured with properties.
  * Following are supported properties:
@@ -72,7 +75,7 @@ public class BusinessCalendarImpl implements BusinessCalendar {
 
  private static final Logger logger = LoggerFactory.getLogger(BusinessCalendarImpl.class);
 
- private Properties businessCalendarConfiguration;
+ private final Properties businessCalendarConfiguration;
 
  private static final long HOUR_IN_MILLIS = 60 * 60 * 1000;
 
@@ -103,38 +106,26 @@ public class BusinessCalendarImpl implements BusinessCalendar {
  public static final String WEEKEND_DAYS = "business.weekend.days";
  public static final String TIMEZONE = "business.cal.timezone";
 
- private static final String DEFAULT_PROPERTIES_NAME = "/jbpm.business.calendar.properties";
-
  public BusinessCalendarImpl() {
- String propertiesLocation = System.getProperty("jbpm.business.calendar.properties");
-
- if (propertiesLocation == null) {
- propertiesLocation = DEFAULT_PROPERTIES_NAME;
- }
- businessCalendarConfiguration = new Properties();
-
- InputStream in = this.getClass().getResourceAsStream(propertiesLocation);
- if (in != null) {
-
- try {
- businessCalendarConfiguration.load(in);
- } catch (IOException e) {
- logger.error("Error while loading properties for business calendar", e);
-
- }
- }
- init();
-
+ this(null);
  }
 
  public BusinessCalendarImpl(Properties configuration) {
- this.businessCalendarConfiguration = configuration;
- init();
+ this(configuration, null);
  }
 
  public BusinessCalendarImpl(Properties configuration, SessionClock clock) {
- this.businessCalendarConfiguration = configuration;
  this.clock = clock;
+ if (configuration == null) {
+ businessCalendarConfiguration = new Properties();
+ try (InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(BUSINESS_CALENDAR_PATH)) {
+ businessCalendarConfiguration.load(is);
+ } catch (IOException e) {
+ logger.error("Error while loading properties for business calendar", e);
+ }
+ } else {
+ this.businessCalendarConfiguration = configuration;
+ }
  init();
  }
 

jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/DummyKnowledgeRuntime.java

@@ -21,6 +21,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
+import java.util.Objects;
 
 import org.drools.core.common.EndOperationListener;
 import org.drools.core.common.InternalAgenda;
@@ -53,11 +54,15 @@
 import org.kie.api.runtime.rule.ViewChangedEventListener;
 import org.kie.api.time.SessionClock;
 import org.kie.kogito.Application;
+import org.kie.kogito.calendar.BusinessCalendar;
 import org.kie.kogito.internal.process.event.KogitoProcessEventSupport;
 import org.kie.kogito.internal.process.runtime.KogitoProcessInstance;
 import org.kie.kogito.internal.process.runtime.KogitoProcessRuntime;
 import org.kie.kogito.internal.process.workitem.KogitoWorkItemManager;
 import org.kie.kogito.jobs.JobsService;
+import org.kie.kogito.process.ProcessConfig;
+
+import static org.jbpm.process.core.constants.CalendarConstants.BUSINESS_CALENDAR_ENVIRONMENT_KEY;
 
 /**
  * A severely limited implementation of the WorkingMemory interface.
@@ -72,6 +77,10 @@ class DummyKnowledgeRuntime implements InternalKnowledgeRuntime, KogitoProcessRu
  this.processRuntime = processRuntime;
  this.environment = new EnvironmentImpl();
  // register codegen-based node instances factories
+ BusinessCalendar calendar = processRuntime.getApplication().config().get(ProcessConfig.class).getBusinessCalendar();
+ if (Objects.nonNull(calendar)) {
+ environment.set(BUSINESS_CALENDAR_ENVIRONMENT_KEY, calendar);
+ }
  environment.set("NodeInstanceFactoryRegistry", new CodegenNodeInstanceFactoryRegistry());
  }
 

jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/LightProcessRuntime.java

@@ -31,7 +31,6 @@
 import org.drools.core.phreak.PropagationEntry;
 import org.jbpm.process.core.event.EventFilter;
 import org.jbpm.process.core.event.EventTypeFilter;
-import org.jbpm.process.core.timer.BusinessCalendar;
 import org.jbpm.process.core.timer.DateTimeUtils;
 import org.jbpm.process.core.timer.Timer;
 import org.jbpm.ruleflow.core.RuleFlowProcess;
@@ -52,6 +51,7 @@
 import org.kie.internal.process.CorrelationKey;
 import org.kie.internal.runtime.StatefulKnowledgeSession;
 import org.kie.kogito.Application;
+import org.kie.kogito.calendar.BusinessCalendar;
 import org.kie.kogito.internal.process.runtime.KogitoProcessInstance;
 import org.kie.kogito.internal.process.workitem.KogitoWorkItemManager;
 import org.kie.kogito.jobs.DurationExpirationTime;

jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/ProcessRuntimeImpl.java

@@ -35,7 +35,6 @@
 import org.drools.core.time.impl.ThreadSafeTrackableTimeJobFactoryManager;
 import org.jbpm.process.core.event.EventFilter;
 import org.jbpm.process.core.event.EventTypeFilter;
-import org.jbpm.process.core.timer.BusinessCalendar;
 import org.jbpm.process.core.timer.DateTimeUtils;
 import org.jbpm.process.core.timer.Timer;
 import org.jbpm.process.instance.event.DefaultSignalManagerFactory;
@@ -64,6 +63,7 @@
 import org.kie.internal.process.CorrelationKey;
 import org.kie.internal.runtime.StatefulKnowledgeSession;
 import org.kie.kogito.Application;
+import org.kie.kogito.calendar.BusinessCalendar;
 import org.kie.kogito.internal.process.runtime.KogitoProcessInstance;
 import org.kie.kogito.internal.process.runtime.KogitoProcessRuntime;
 import org.kie.kogito.jobs.DurationExpirationTime;

jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/impl/WorkflowProcessInstanceImpl.java

@@ -44,7 +44,6 @@
 import org.jbpm.process.core.ContextResolver;
 import org.jbpm.process.core.context.variable.Variable;
 import org.jbpm.process.core.context.variable.VariableScope;
-import org.jbpm.process.core.timer.BusinessCalendar;
 import org.jbpm.process.core.timer.DateTimeUtils;
 import org.jbpm.process.core.timer.Timer;
 import org.jbpm.process.instance.ContextInstance;
@@ -81,6 +80,7 @@
 import org.kie.api.definition.process.WorkflowElementIdentifier;
 import org.kie.api.runtime.rule.AgendaFilter;
 import org.kie.internal.process.CorrelationKey;
+import org.kie.kogito.calendar.BusinessCalendar;
 import org.kie.kogito.internal.process.event.KogitoEventListener;
 import org.kie.kogito.internal.process.runtime.KogitoNodeInstance;
 import org.kie.kogito.internal.process.runtime.KogitoNodeInstanceContainer;

jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/node/StateBasedNodeInstance.java

@@ -29,7 +29,6 @@
 import org.drools.core.common.InternalAgenda;
 import org.drools.core.common.ReteEvaluator;
 import org.drools.core.rule.consequence.InternalMatch;
-import org.jbpm.process.core.timer.BusinessCalendar;
 import org.jbpm.process.core.timer.DateTimeUtils;
 import org.jbpm.process.core.timer.Timer;
 import org.jbpm.process.instance.InternalProcessRuntime;
@@ -44,6 +43,7 @@
 import org.jbpm.workflow.instance.impl.WorkflowProcessInstanceImpl;
 import org.kie.api.event.rule.MatchCreatedEvent;
 import org.kie.api.runtime.KieRuntime;
+import org.kie.kogito.calendar.BusinessCalendar;
 import org.kie.kogito.internal.process.event.KogitoEventListener;
 import org.kie.kogito.internal.process.runtime.KogitoNodeInstance;
 import org.kie.kogito.internal.process.runtime.KogitoProcessContext;

jbpm/jbpm-flow/src/main/java/org/kie/kogito/process/impl/AbstractProcessConfig.java

@@ -28,6 +28,7 @@
 import org.kie.api.event.process.ProcessEventListener;
 import org.kie.kogito.Addons;
 import org.kie.kogito.auth.IdentityProvider;
+import org.kie.kogito.calendar.BusinessCalendar;
 import org.kie.kogito.event.EventPublisher;
 import org.kie.kogito.jobs.JobsService;
 import org.kie.kogito.process.ProcessConfig;
@@ -51,6 +52,7 @@ public abstract class AbstractProcessConfig implements ProcessConfig {
  private final JobsService jobsService;
  private final ProcessVersionResolver versionResolver;
  private final IdentityProvider identityProvider;
+ private final BusinessCalendar businessCalendar;
 
  protected AbstractProcessConfig(
  Iterable<WorkItemHandlerConfig> workItemHandlerConfig,
@@ -62,7 +64,8 @@ protected AbstractProcessConfig(
  String kogitoService,
  Iterable<UnitOfWorkEventListener> unitOfWorkListeners,
  Iterable<ProcessVersionResolver> versionResolver,
- Iterable<IdentityProvider> identityProvider) {
+ Iterable<IdentityProvider> identityProvider,
+ Iterable<BusinessCalendar> businessCalendar) {
 
  this.workItemHandlerConfig = mergeWorkItemHandler(workItemHandlerConfig, DefaultWorkItemHandlerConfig::new);
  this.processEventListenerConfig = merge(processEventListenerConfigs, processEventListeners);
@@ -72,6 +75,7 @@ protected AbstractProcessConfig(
  this.jobsService = orDefault(jobsService, () -> null);
  this.versionResolver = orDefault(versionResolver, () -> null);
  this.identityProvider = orDefault(identityProvider, NoOpIdentityProvider::new);
+ this.businessCalendar = orDefault(businessCalendar, () -> null);
 
  eventPublishers.forEach(publisher -> unitOfWorkManager().eventManager().addPublisher(publisher));
  unitOfWorkListeners.forEach(listener -> unitOfWorkManager().register(listener));
@@ -124,6 +128,11 @@ public IdentityProvider identityProvider() {
  return identityProvider;
  }
 
+ @Override
+ public BusinessCalendar getBusinessCalendar() {
+ return this.businessCalendar;
+ }
+
  public org.kie.kogito.Addons addons() {
  return Addons.EMTPY;
  }

jbpm/jbpm-flow/src/main/java/org/kie/kogito/process/impl/StaticProcessConfig.java

@@ -19,6 +19,7 @@
 package org.kie.kogito.process.impl;
 
 import org.kie.kogito.auth.IdentityProvider;
+import org.kie.kogito.calendar.BusinessCalendar;
 import org.kie.kogito.jobs.JobsService;
 import org.kie.kogito.process.ProcessConfig;
 import org.kie.kogito.process.ProcessEventListenerConfig;
@@ -41,12 +42,13 @@ public class StaticProcessConfig implements ProcessConfig {
  private final ProcessVersionResolver versionResolver;
 
  private final IdentityProvider identityProvider;
+ private final BusinessCalendar businessCalendar;
 
  public StaticProcessConfig(
  WorkItemHandlerConfig workItemHandlerConfig,
  ProcessEventListenerConfig processEventListenerConfig,
  UnitOfWorkManager unitOfWorkManager) {
- this(workItemHandlerConfig, processEventListenerConfig, unitOfWorkManager, null, null, new NoOpIdentityProvider());
+ this(workItemHandlerConfig, processEventListenerConfig, unitOfWorkManager, null, null, new NoOpIdentityProvider(), null);
  }
 
  public StaticProcessConfig(
@@ -55,14 +57,16 @@ public StaticProcessConfig(
  UnitOfWorkManager unitOfWorkManager,
  JobsService jobsService,
  ProcessVersionResolver versionResolver,
- IdentityProvider identityProvider) {
+ IdentityProvider identityProvider,
+ BusinessCalendar calendar) {
  this.unitOfWorkManager = unitOfWorkManager;
  this.workItemHandlerConfig = workItemHandlerConfig;
  this.processEventListenerConfig = processEventListenerConfig;
  this.signalManager = new DefaultSignalManagerHub();
  this.jobsService = jobsService;
  this.versionResolver = versionResolver;
  this.identityProvider = identityProvider;
+ this.businessCalendar = calendar;
  }
 
  public StaticProcessConfig() {
@@ -71,7 +75,8 @@ public StaticProcessConfig() {
  new DefaultUnitOfWorkManager(new CollectingUnitOfWorkFactory()),
  null,
  null,
- new NoOpIdentityProvider());
+ new NoOpIdentityProvider(),
+ null);
  }
 
  @Override
@@ -108,4 +113,9 @@ public ProcessVersionResolver versionResolver() {
  public IdentityProvider identityProvider() {
  return identityProvider;
  }
+
+ @Override
+ public BusinessCalendar getBusinessCalendar() {
+ return this.businessCalendar;
+ }
 }

jbpm/jbpm-flow/src/test/java/org/jbpm/ruleflow/instance/RuleFlowProcessInstanceTest.java

@@ -27,7 +27,8 @@
 import org.kie.kogito.internal.process.runtime.KogitoProcessRuntime;
 import org.slf4j.LoggerFactory;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class RuleFlowProcessInstanceTest extends AbstractBaseTest {
 

jbpm/jbpm-flow/src/test/java/org/kie/kogito/process/impl/AbstractProcessConfigTest.java

@@ -34,7 +34,7 @@ public class AbstractProcessConfigTest {
  private static class MockProcessConfig extends AbstractProcessConfig {
  protected MockProcessConfig(Iterable<WorkItemHandlerConfig> workItemHandlerConfig) {
  super(workItemHandlerConfig, Collections.emptyList(), Collections.emptyList(), Collections.emptyList(), Collections.emptyList(),
- Collections.emptyList(), null, Collections.emptyList(), Collections.emptyList(), Collections.emptyList());
+ Collections.emptyList(), null, Collections.emptyList(), Collections.emptyList(), Collections.emptyList(), Collections.emptyList());
  }
  }