Adjusting to package name changes in upstream repositories.

api/src/main/java/io/mifos/rhythm/api/v1/client/RhythmManager.java

@@ -18,17 +18,16 @@
  */
 package io.mifos.rhythm.api.v1.client;
 
-import io.mifos.core.api.util.CustomFeignClientsConfiguration;
 import io.mifos.rhythm.api.v1.domain.Beat;
 import io.mifos.rhythm.api.v1.domain.ClockOffset;
+import java.util.List;
+import org.apache.fineract.cn.api.util.CustomFeignClientsConfiguration;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import java.util.List;
-
 /**
  * @author Myrle Krantz
  */

api/src/main/java/io/mifos/rhythm/api/v1/domain/Beat.java

@@ -18,7 +18,7 @@
  */
 package io.mifos.rhythm.api.v1.domain;
 
-import io.mifos.core.lang.validation.constraints.ValidIdentifier;
+import org.apache.fineract.cn.lang.validation.constraints.ValidIdentifier;
 import org.hibernate.validator.constraints.Range;
 
 /**

api/src/test/java/io/mifos/rhythm/api/v1/domain/BeatTest.java

@@ -18,12 +18,11 @@
  */
 package io.mifos.rhythm.api.v1.domain;
 
-import io.mifos.core.test.domain.ValidationTest;
-import io.mifos.core.test.domain.ValidationTestCase;
-import org.junit.runners.Parameterized;
-
 import java.util.ArrayList;
 import java.util.Collection;
+import org.apache.fineract.cn.test.domain.ValidationTest;
+import org.apache.fineract.cn.test.domain.ValidationTestCase;
+import org.junit.runners.Parameterized;
 
 /**
  * @author Myrle Krantz

api/src/test/java/io/mifos/rhythm/api/v1/domain/ClockOffsetTest.java

@@ -18,12 +18,11 @@
  */
 package io.mifos.rhythm.api.v1.domain;
 
-import io.mifos.core.test.domain.ValidationTest;
-import io.mifos.core.test.domain.ValidationTestCase;
-import org.junit.runners.Parameterized;
-
 import java.util.ArrayList;
 import java.util.Collection;
+import org.apache.fineract.cn.test.domain.ValidationTest;
+import org.apache.fineract.cn.test.domain.ValidationTestCase;
+import org.junit.runners.Parameterized;
 
 /**
  * @author Myrle Krantz

component-test/src/main/java/io/mifos/rhythm/AbstractRhythmTest.java

@@ -18,14 +18,6 @@
  */
 package io.mifos.rhythm;
 
-import io.mifos.anubis.test.v1.TenantApplicationSecurityEnvironmentTestRule;
-import io.mifos.core.api.context.AutoUserContext;
-import io.mifos.core.test.env.TestEnvironment;
-import io.mifos.core.test.fixture.TenantDataStoreContextTestRule;
-import io.mifos.core.test.fixture.cassandra.CassandraInitializer;
-import io.mifos.core.test.fixture.mariadb.MariaDBInitializer;
-import io.mifos.core.test.listener.EnableEventRecording;
-import io.mifos.core.test.listener.EventRecorder;
 import io.mifos.rhythm.api.v1.client.RhythmManager;
 import io.mifos.rhythm.api.v1.domain.Beat;
 import io.mifos.rhythm.api.v1.domain.ClockOffset;
@@ -34,7 +26,25 @@
 import io.mifos.rhythm.service.config.RhythmConfiguration;
 import io.mifos.rhythm.service.internal.service.BeatPublisherService;
 import io.mifos.rhythm.spi.v1.PermittableGroupIds;
-import org.junit.*;
+import java.security.interfaces.RSAPrivateKey;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.temporal.ChronoUnit;
+import java.util.Optional;
+import java.util.concurrent.TimeUnit;
+import org.apache.fineract.cn.anubis.test.v1.TenantApplicationSecurityEnvironmentTestRule;
+import org.apache.fineract.cn.api.context.AutoUserContext;
+import org.apache.fineract.cn.test.env.TestEnvironment;
+import org.apache.fineract.cn.test.fixture.TenantDataStoreContextTestRule;
+import org.apache.fineract.cn.test.fixture.cassandra.CassandraInitializer;
+import org.apache.fineract.cn.test.fixture.mariadb.MariaDBInitializer;
+import org.apache.fineract.cn.test.listener.EnableEventRecording;
+import org.apache.fineract.cn.test.listener.EventRecorder;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Rule;
 import org.junit.rules.RuleChain;
 import org.junit.rules.TestRule;
 import org.junit.runner.RunWith;
@@ -58,13 +68,6 @@
 import org.springframework.context.annotation.Import;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import java.security.interfaces.RSAPrivateKey;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.temporal.ChronoUnit;
-import java.util.Optional;
-import java.util.concurrent.TimeUnit;
-
 /**
  * @author Myrle Krantz
  */

component-test/src/main/java/io/mifos/rhythm/TestBeats.java

@@ -18,21 +18,12 @@
  */
 package io.mifos.rhythm;
 
-import io.mifos.core.api.util.NotFoundException;
 import io.mifos.rhythm.api.v1.domain.Beat;
 import io.mifos.rhythm.api.v1.domain.ClockOffset;
 import io.mifos.rhythm.api.v1.events.BeatEvent;
 import io.mifos.rhythm.api.v1.events.EventConstants;
 import io.mifos.rhythm.service.internal.repository.BeatEntity;
 import io.mifos.rhythm.service.internal.repository.BeatRepository;
-import org.junit.Assert;
-import org.junit.Test;
-import org.mockito.Matchers;
-import org.mockito.Mockito;
-import org.mockito.internal.stubbing.answers.Returns;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import javax.transaction.Transactional;
 import java.time.Clock;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -41,6 +32,14 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
+import javax.transaction.Transactional;
+import org.apache.fineract.cn.api.util.NotFoundException;
+import org.junit.Assert;
+import org.junit.Test;
+import org.mockito.Matchers;
+import org.mockito.Mockito;
+import org.mockito.internal.stubbing.answers.Returns;
+import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * @author Myrle Krantz

component-test/src/main/java/io/mifos/rhythm/listener/ApplicationEventListener.java

@@ -18,9 +18,9 @@
  */
 package io.mifos.rhythm.listener;
 
-import io.mifos.core.lang.config.TenantHeaderFilter;
-import io.mifos.core.test.listener.EventRecorder;
 import io.mifos.rhythm.api.v1.events.EventConstants;
+import org.apache.fineract.cn.lang.config.TenantHeaderFilter;
+import org.apache.fineract.cn.test.listener.EventRecorder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jms.annotation.JmsListener;
 import org.springframework.messaging.handler.annotation.Header;

component-test/src/main/java/io/mifos/rhythm/listener/BeatEventListener.java

@@ -18,10 +18,10 @@
  */
 package io.mifos.rhythm.listener;
 
-import io.mifos.core.lang.config.TenantHeaderFilter;
-import io.mifos.core.test.listener.EventRecorder;
 import io.mifos.rhythm.api.v1.events.BeatEvent;
 import io.mifos.rhythm.api.v1.events.EventConstants;
+import org.apache.fineract.cn.lang.config.TenantHeaderFilter;
+import org.apache.fineract.cn.test.listener.EventRecorder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jms.annotation.JmsListener;
 import org.springframework.messaging.handler.annotation.Header;

component-test/src/main/java/io/mifos/rhythm/listener/ClockOffsetEventListener.java

@@ -18,10 +18,10 @@
  */
 package io.mifos.rhythm.listener;
 
-import io.mifos.core.lang.config.TenantHeaderFilter;
-import io.mifos.core.test.listener.EventRecorder;
 import io.mifos.rhythm.api.v1.domain.ClockOffset;
 import io.mifos.rhythm.api.v1.events.EventConstants;
+import org.apache.fineract.cn.lang.config.TenantHeaderFilter;
+import org.apache.fineract.cn.test.listener.EventRecorder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jms.annotation.JmsListener;
 import org.springframework.messaging.handler.annotation.Header;

component-test/src/main/java/io/mifos/rhythm/listener/MigrationEventListener.java

@@ -18,9 +18,9 @@
  */
 package io.mifos.rhythm.listener;
 
-import io.mifos.core.lang.config.TenantHeaderFilter;
-import io.mifos.core.test.listener.EventRecorder;
 import io.mifos.rhythm.api.v1.events.EventConstants;
+import org.apache.fineract.cn.lang.config.TenantHeaderFilter;
+import org.apache.fineract.cn.test.listener.EventRecorder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jms.annotation.JmsListener;
 import org.springframework.messaging.handler.annotation.Header;

service/src/main/java/io/mifos/rhythm/service/config/RhythmConfiguration.java

@@ -18,18 +18,18 @@
  */
 package io.mifos.rhythm.service.config;
 
-import io.mifos.anubis.config.EnableAnubis;
-import io.mifos.core.api.config.EnableApiFactory;
-import io.mifos.core.async.config.EnableAsync;
-import io.mifos.core.cassandra.config.EnableCassandra;
-import io.mifos.core.command.config.EnableCommandProcessing;
-import io.mifos.core.lang.config.EnableApplicationName;
-import io.mifos.core.lang.config.EnableServiceException;
-import io.mifos.core.lang.config.EnableTenantContext;
-import io.mifos.core.mariadb.config.EnableMariaDB;
-import io.mifos.permittedfeignclient.config.EnablePermissionRequestingFeignClient;
 import io.mifos.rhythm.service.ServiceConstants;
 import io.mifos.rhythm.service.internal.identity.ApplicationPermissionRequestCreator;
+import org.apache.fineract.cn.anubis.config.EnableAnubis;
+import org.apache.fineract.cn.api.config.EnableApiFactory;
+import org.apache.fineract.cn.async.config.EnableAsync;
+import org.apache.fineract.cn.cassandra.config.EnableCassandra;
+import org.apache.fineract.cn.command.config.EnableCommandProcessing;
+import org.apache.fineract.cn.lang.config.EnableApplicationName;
+import org.apache.fineract.cn.lang.config.EnableServiceException;
+import org.apache.fineract.cn.lang.config.EnableTenantContext;
+import org.apache.fineract.cn.mariadb.config.EnableMariaDB;
+import org.apache.fineract.cn.permittedfeignclient.config.EnablePermissionRequestingFeignClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;

service/src/main/java/io/mifos/rhythm/service/config/RhythmProperties.java

@@ -18,14 +18,13 @@
  */
 package io.mifos.rhythm.service.config;
 
-import io.mifos.core.lang.validation.constraints.ValidIdentifier;
+import java.util.concurrent.TimeUnit;
+import org.apache.fineract.cn.lang.validation.constraints.ValidIdentifier;
 import org.hibernate.validator.constraints.Range;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 import org.springframework.validation.annotation.Validated;
 
-import java.util.concurrent.TimeUnit;
-
 /**
  * @author Myrle Krantz
  */

service/src/main/java/io/mifos/rhythm/service/internal/command/handler/ApplicationCommandHandler.java

@@ -18,13 +18,13 @@
  */
 package io.mifos.rhythm.service.internal.command.handler;
 
-import io.mifos.core.command.annotation.Aggregate;
-import io.mifos.core.command.annotation.CommandHandler;
-import io.mifos.core.command.annotation.CommandLogLevel;
 import io.mifos.rhythm.api.v1.events.EventConstants;
 import io.mifos.rhythm.service.internal.command.DeleteApplicationCommand;
 import io.mifos.rhythm.service.internal.repository.ApplicationRepository;
 import io.mifos.rhythm.service.internal.repository.BeatRepository;
+import org.apache.fineract.cn.command.annotation.Aggregate;
+import org.apache.fineract.cn.command.annotation.CommandHandler;
+import org.apache.fineract.cn.command.annotation.CommandLogLevel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 

service/src/main/java/io/mifos/rhythm/service/internal/command/handler/BeatCommandHandler.java

@@ -18,9 +18,6 @@
  */
 package io.mifos.rhythm.service.internal.command.handler;
 
-import io.mifos.core.command.annotation.Aggregate;
-import io.mifos.core.command.annotation.CommandHandler;
-import io.mifos.core.command.annotation.CommandLogLevel;
 import io.mifos.rhythm.api.v1.domain.ClockOffset;
 import io.mifos.rhythm.api.v1.events.BeatEvent;
 import io.mifos.rhythm.api.v1.events.EventConstants;
@@ -32,6 +29,9 @@
 import io.mifos.rhythm.service.internal.repository.BeatRepository;
 import io.mifos.rhythm.service.internal.service.ClockOffsetService;
 import io.mifos.rhythm.service.internal.service.IdentityPermittableGroupService;
+import org.apache.fineract.cn.command.annotation.Aggregate;
+import org.apache.fineract.cn.command.annotation.CommandHandler;
+import org.apache.fineract.cn.command.annotation.CommandLogLevel;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;

service/src/main/java/io/mifos/rhythm/service/internal/command/handler/ClockOffsetCommandHandler.java

@@ -18,23 +18,22 @@
  */
 package io.mifos.rhythm.service.internal.command.handler;
 
-import io.mifos.core.command.annotation.Aggregate;
-import io.mifos.core.command.annotation.CommandHandler;
-import io.mifos.core.command.annotation.CommandLogLevel;
 import io.mifos.rhythm.api.v1.events.EventConstants;
 import io.mifos.rhythm.service.ServiceConstants;
 import io.mifos.rhythm.service.internal.command.ChangeClockOffsetCommand;
 import io.mifos.rhythm.service.internal.mapper.ClockOffsetMapper;
 import io.mifos.rhythm.service.internal.repository.ClockOffsetEntity;
 import io.mifos.rhythm.service.internal.repository.ClockOffsetRepository;
 import io.mifos.rhythm.service.internal.service.Drummer;
+import java.util.Optional;
+import javax.transaction.Transactional;
+import org.apache.fineract.cn.command.annotation.Aggregate;
+import org.apache.fineract.cn.command.annotation.CommandHandler;
+import org.apache.fineract.cn.command.annotation.CommandLogLevel;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 
-import javax.transaction.Transactional;
-import java.util.Optional;
-
 /**
  * @author Myrle Krantz
  */

service/src/main/java/io/mifos/rhythm/service/internal/command/handler/EventHelper.java

@@ -19,9 +19,9 @@
 package io.mifos.rhythm.service.internal.command.handler;
 
 import com.google.gson.Gson;
-import io.mifos.core.command.util.CommandConstants;
-import io.mifos.core.lang.config.TenantHeaderFilter;
 import io.mifos.rhythm.api.v1.events.EventConstants;
+import org.apache.fineract.cn.command.util.CommandConstants;
+import org.apache.fineract.cn.lang.config.TenantHeaderFilter;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.jms.core.JmsTemplate;
 import org.springframework.stereotype.Component;

service/src/main/java/io/mifos/rhythm/service/internal/command/handler/InitializeCommandHandler.java

@@ -18,18 +18,17 @@
  */
 package io.mifos.rhythm.service.internal.command.handler;
 
-import io.mifos.core.command.annotation.Aggregate;
-import io.mifos.core.command.annotation.CommandHandler;
-import io.mifos.core.command.annotation.CommandLogLevel;
-import io.mifos.core.command.annotation.EventEmitter;
-import io.mifos.core.mariadb.domain.FlywayFactoryBean;
 import io.mifos.rhythm.api.v1.events.EventConstants;
 import io.mifos.rhythm.service.internal.command.InitializeServiceCommand;
+import javax.sql.DataSource;
+import org.apache.fineract.cn.command.annotation.Aggregate;
+import org.apache.fineract.cn.command.annotation.CommandHandler;
+import org.apache.fineract.cn.command.annotation.CommandLogLevel;
+import org.apache.fineract.cn.command.annotation.EventEmitter;
+import org.apache.fineract.cn.mariadb.domain.FlywayFactoryBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.sql.DataSource;
-
 /**
  * @author Myrle Krantz
  */

service/src/main/java/io/mifos/rhythm/service/internal/identity/ApplicationPermissionRequestCreator.java

@@ -18,12 +18,13 @@
  */
 package io.mifos.rhythm.service.internal.identity;
 
-import io.mifos.anubis.annotation.Permittable;
-import io.mifos.core.api.annotation.ThrowsException;
-import io.mifos.identity.api.v1.client.ApplicationPermissionAlreadyExistsException;
-import io.mifos.identity.api.v1.domain.Permission;
-import io.mifos.permittedfeignclient.annotation.EndpointSet;
-import io.mifos.permittedfeignclient.annotation.PermittedFeignClientsConfiguration;
+import javax.validation.Valid;
+import org.apache.fineract.cn.anubis.annotation.Permittable;
+import org.apache.fineract.cn.api.annotation.ThrowsException;
+import org.apache.fineract.cn.identity.api.v1.client.ApplicationPermissionAlreadyExistsException;
+import org.apache.fineract.cn.identity.api.v1.domain.Permission;
+import org.apache.fineract.cn.permittedfeignclient.annotation.EndpointSet;
+import org.apache.fineract.cn.permittedfeignclient.annotation.PermittedFeignClientsConfiguration;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -32,8 +33,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import javax.validation.Valid;
-
 /**
  * @author Myrle Krantz
  */
@@ -45,7 +44,7 @@ public interface ApplicationPermissionRequestCreator {
           consumes = {MediaType.APPLICATION_JSON_VALUE},
           produces = {MediaType.ALL_VALUE})
   @ThrowsException(status = HttpStatus.CONFLICT, exception = ApplicationPermissionAlreadyExistsException.class)
-  @Permittable(groupId = io.mifos.identity.api.v1.PermittableGroupIds.APPLICATION_SELF_MANAGEMENT)
+  @Permittable(groupId = org.apache.fineract.cn.identity.api.v1.PermittableGroupIds.APPLICATION_SELF_MANAGEMENT)
   void createApplicationPermission(@PathVariable("applicationidentifier") String applicationIdentifier,
                                    @RequestBody @Valid Permission permission);
 }