Commit ca247f80 authored by Michael Ritter's avatar Michael Ritter
Browse files

Rename package to no longer include 'kot' now that entities are replaced

parent c7af2ac8
package db.migration;
import org.chronopolis.rest.kot.models.enums.DataType;
import org.chronopolis.rest.models.enums.DataType;
import org.flywaydb.core.api.migration.jdbc.JdbcMigration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -13,8 +13,6 @@ import java.sql.ResultSet;
* Migration to create a default storage region for bags and tokens
* in the ingest server
*
* todo: the updated path for DataType might break previous migrations, need to test
*
* Created by shake on 7/12/17.
*/
public class V1_6_01__Default_storage_regions implements JdbcMigration {
......
......@@ -29,7 +29,7 @@ import org.springframework.context.annotation.ComponentScan;
IngestConfig.class,
ReplicationService.class
})
@EntityScan(basePackages = "org.chronopolis.rest.kot.entities",
@EntityScan(basePackages = "org.chronopolis.rest.entities",
basePackageClasses = Authority.class)
@EnableAutoConfiguration
public class Application implements CommandLineRunner {
......
......@@ -7,9 +7,9 @@ import org.chronopolis.ingest.repository.criteria.BagSearchCriteria;
import org.chronopolis.ingest.repository.dao.BagService;
import org.chronopolis.ingest.support.BagCreateResult;
import org.chronopolis.ingest.support.Loggers;
import org.chronopolis.rest.kot.entities.Bag;
import org.chronopolis.rest.kot.models.create.BagCreate;
import org.chronopolis.rest.kot.models.enums.BagStatus;
import org.chronopolis.rest.entities.Bag;
import org.chronopolis.rest.models.create.BagCreate;
import org.chronopolis.rest.models.enums.BagStatus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
......
......@@ -3,11 +3,11 @@ package org.chronopolis.ingest.api;
import com.google.common.collect.ImmutableSet;
import org.chronopolis.ingest.repository.dao.StagingService;
import org.chronopolis.ingest.support.Loggers;
import org.chronopolis.rest.kot.entities.QBag;
import org.chronopolis.rest.kot.entities.storage.Fixity;
import org.chronopolis.rest.kot.entities.storage.StagingStorage;
import org.chronopolis.rest.kot.models.create.FixityCreate;
import org.chronopolis.rest.kot.models.update.ActiveToggle;
import org.chronopolis.rest.entities.QBag;
import org.chronopolis.rest.entities.storage.Fixity;
import org.chronopolis.rest.entities.storage.StagingStorage;
import org.chronopolis.rest.models.create.FixityCreate;
import org.chronopolis.rest.models.update.ActiveToggle;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
......
......@@ -5,11 +5,11 @@ import org.chronopolis.ingest.IngestController;
import org.chronopolis.ingest.models.filter.AceTokenFilter;
import org.chronopolis.ingest.repository.dao.PagedDAO;
import org.chronopolis.ingest.support.Loggers;
import org.chronopolis.rest.kot.entities.AceToken;
import org.chronopolis.rest.kot.entities.Bag;
import org.chronopolis.rest.kot.entities.QAceToken;
import org.chronopolis.rest.kot.entities.QBag;
import org.chronopolis.rest.kot.models.create.AceTokenCreate;
import org.chronopolis.rest.entities.AceToken;
import org.chronopolis.rest.entities.Bag;
import org.chronopolis.rest.entities.QAceToken;
import org.chronopolis.rest.entities.QBag;
import org.chronopolis.rest.models.create.AceTokenCreate;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
......
......@@ -5,17 +5,17 @@ import org.chronopolis.ingest.models.filter.BagFilter;
import org.chronopolis.ingest.models.filter.DepositorFilter;
import org.chronopolis.ingest.repository.dao.PagedDAO;
import org.chronopolis.ingest.support.Loggers;
import org.chronopolis.rest.kot.entities.Bag;
import org.chronopolis.rest.kot.entities.Node;
import org.chronopolis.rest.kot.entities.QBag;
import org.chronopolis.rest.kot.entities.QNode;
import org.chronopolis.rest.kot.entities.depositor.Depositor;
import org.chronopolis.rest.kot.entities.depositor.DepositorContact;
import org.chronopolis.rest.kot.entities.depositor.QDepositor;
import org.chronopolis.rest.kot.entities.depositor.QDepositorContact;
import org.chronopolis.rest.kot.models.create.DepositorContactCreate;
import org.chronopolis.rest.kot.models.create.DepositorCreate;
import org.chronopolis.rest.kot.models.delete.DepositorContactDelete;
import org.chronopolis.rest.entities.Bag;
import org.chronopolis.rest.entities.Node;
import org.chronopolis.rest.entities.QBag;
import org.chronopolis.rest.entities.QNode;
import org.chronopolis.rest.entities.depositor.Depositor;
import org.chronopolis.rest.entities.depositor.DepositorContact;
import org.chronopolis.rest.entities.depositor.QDepositor;
import org.chronopolis.rest.entities.depositor.QDepositorContact;
import org.chronopolis.rest.models.create.DepositorContactCreate;
import org.chronopolis.rest.models.create.DepositorCreate;
import org.chronopolis.rest.models.delete.DepositorContactDelete;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
......
......@@ -12,15 +12,15 @@ import org.chronopolis.ingest.repository.criteria.RepairSearchCriteria;
import org.chronopolis.ingest.repository.dao.BagService;
import org.chronopolis.ingest.repository.dao.SearchService;
import org.chronopolis.ingest.support.Loggers;
import org.chronopolis.rest.kot.entities.Bag;
import org.chronopolis.rest.kot.entities.Node;
import org.chronopolis.rest.kot.entities.repair.Repair;
import org.chronopolis.rest.kot.entities.repair.Strategy;
import org.chronopolis.rest.kot.entities.serializers.ExtensionsKt;
import org.chronopolis.rest.kot.models.FulfillmentStrategy;
import org.chronopolis.rest.kot.models.create.RepairCreate;
import org.chronopolis.rest.kot.models.enums.AuditStatus;
import org.chronopolis.rest.kot.models.enums.RepairStatus;
import org.chronopolis.rest.entities.Bag;
import org.chronopolis.rest.entities.Node;
import org.chronopolis.rest.entities.repair.Repair;
import org.chronopolis.rest.entities.repair.Strategy;
import org.chronopolis.rest.entities.serializers.ExtensionsKt;
import org.chronopolis.rest.models.FulfillmentStrategy;
import org.chronopolis.rest.models.create.RepairCreate;
import org.chronopolis.rest.models.enums.AuditStatus;
import org.chronopolis.rest.models.enums.RepairStatus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
......
......@@ -7,15 +7,15 @@ import org.chronopolis.ingest.repository.criteria.ReplicationSearchCriteria;
import org.chronopolis.ingest.repository.dao.ReplicationService;
import org.chronopolis.ingest.repository.dao.StagingService;
import org.chronopolis.ingest.support.Loggers;
import org.chronopolis.rest.kot.entities.Bag;
import org.chronopolis.rest.kot.entities.QBag;
import org.chronopolis.rest.kot.entities.Replication;
import org.chronopolis.rest.kot.entities.storage.Fixity;
import org.chronopolis.rest.kot.entities.storage.StagingStorage;
import org.chronopolis.rest.kot.models.create.ReplicationCreate;
import org.chronopolis.rest.kot.models.enums.ReplicationStatus;
import org.chronopolis.rest.kot.models.update.FixityUpdate;
import org.chronopolis.rest.kot.models.update.ReplicationStatusUpdate;
import org.chronopolis.rest.entities.Bag;
import org.chronopolis.rest.entities.QBag;
import org.chronopolis.rest.entities.Replication;
import org.chronopolis.rest.entities.storage.Fixity;
import org.chronopolis.rest.entities.storage.StagingStorage;
import org.chronopolis.rest.models.create.ReplicationCreate;
import org.chronopolis.rest.models.enums.ReplicationStatus;
import org.chronopolis.rest.models.update.FixityUpdate;
import org.chronopolis.rest.models.update.ReplicationStatusUpdate;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
......
......@@ -4,7 +4,7 @@ import org.chronopolis.ingest.IngestController;
import org.chronopolis.ingest.exception.NotFoundException;
import org.chronopolis.ingest.repository.NodeRepository;
import org.chronopolis.ingest.repository.RestoreRepository;
import org.chronopolis.rest.kot.entities.Restoration;
import org.chronopolis.rest.entities.Restoration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
......
......@@ -7,10 +7,10 @@ import org.chronopolis.ingest.repository.NodeRepository;
import org.chronopolis.ingest.repository.criteria.StorageRegionSearchCriteria;
import org.chronopolis.ingest.repository.dao.StorageRegionService;
import org.chronopolis.ingest.support.Loggers;
import org.chronopolis.rest.kot.entities.Node;
import org.chronopolis.rest.kot.entities.storage.ReplicationConfig;
import org.chronopolis.rest.kot.entities.storage.StorageRegion;
import org.chronopolis.rest.kot.models.create.RegionCreate;
import org.chronopolis.rest.entities.Node;
import org.chronopolis.rest.entities.storage.ReplicationConfig;
import org.chronopolis.rest.entities.storage.StorageRegion;
import org.chronopolis.rest.models.create.RegionCreate;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
......
......@@ -5,7 +5,7 @@ import org.chronopolis.ingest.repository.TokenRepository;
import org.chronopolis.ingest.repository.criteria.AceTokenSearchCriteria;
import org.chronopolis.ingest.repository.dao.SearchService;
import org.chronopolis.ingest.support.Loggers;
import org.chronopolis.rest.kot.entities.AceToken;
import org.chronopolis.rest.entities.AceToken;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
......
package org.chronopolis.ingest.api;
import org.chronopolis.ingest.support.Loggers;
import org.chronopolis.rest.kot.models.update.PasswordUpdate;
import org.chronopolis.rest.models.update.PasswordUpdate;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
......
......@@ -16,24 +16,24 @@ import org.chronopolis.ingest.repository.dao.PagedDAO;
import org.chronopolis.ingest.repository.dao.SearchService;
import org.chronopolis.ingest.repository.dao.StagingService;
import org.chronopolis.ingest.repository.dao.StorageRegionService;
import org.chronopolis.rest.kot.entities.AceToken;
import org.chronopolis.rest.kot.entities.Bag;
import org.chronopolis.rest.kot.entities.Replication;
import org.chronopolis.rest.kot.entities.depositor.Depositor;
import org.chronopolis.rest.kot.entities.depositor.DepositorContact;
import org.chronopolis.rest.kot.entities.repair.Repair;
import org.chronopolis.rest.kot.entities.serializers.AceTokenSerializer;
import org.chronopolis.rest.kot.entities.serializers.BagSerializer;
import org.chronopolis.rest.kot.entities.serializers.DepositorContactSerializer;
import org.chronopolis.rest.kot.entities.serializers.DepositorSerializer;
import org.chronopolis.rest.kot.entities.serializers.RepairSerializer;
import org.chronopolis.rest.kot.entities.serializers.ReplicationSerializer;
import org.chronopolis.rest.kot.entities.serializers.StagingStorageSerializer;
import org.chronopolis.rest.kot.entities.serializers.StorageRegionSerializer;
import org.chronopolis.rest.kot.entities.storage.StagingStorage;
import org.chronopolis.rest.kot.entities.storage.StorageRegion;
import org.chronopolis.rest.kot.models.serializers.ZonedDateTimeDeserializer;
import org.chronopolis.rest.kot.models.serializers.ZonedDateTimeSerializer;
import org.chronopolis.rest.entities.AceToken;
import org.chronopolis.rest.entities.Bag;
import org.chronopolis.rest.entities.Replication;
import org.chronopolis.rest.entities.depositor.Depositor;
import org.chronopolis.rest.entities.depositor.DepositorContact;
import org.chronopolis.rest.entities.repair.Repair;
import org.chronopolis.rest.entities.serializers.AceTokenSerializer;
import org.chronopolis.rest.entities.serializers.BagSerializer;
import org.chronopolis.rest.entities.serializers.DepositorContactSerializer;
import org.chronopolis.rest.entities.serializers.DepositorSerializer;
import org.chronopolis.rest.entities.serializers.RepairSerializer;
import org.chronopolis.rest.entities.serializers.ReplicationSerializer;
import org.chronopolis.rest.entities.serializers.StagingStorageSerializer;
import org.chronopolis.rest.entities.serializers.StorageRegionSerializer;
import org.chronopolis.rest.entities.storage.StagingStorage;
import org.chronopolis.rest.entities.storage.StorageRegion;
import org.chronopolis.rest.models.serializers.ZonedDateTimeDeserializer;
import org.chronopolis.rest.models.serializers.ZonedDateTimeSerializer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.context.embedded.EmbeddedServletContainerFactory;
......
......@@ -8,7 +8,7 @@ import org.chronopolis.common.storage.BagStagingPropertiesValidator;
import org.chronopolis.ingest.repository.dao.PagedDAO;
import org.chronopolis.ingest.tokens.DatabasePredicate;
import org.chronopolis.ingest.tokens.IngestTokenRegistrar;
import org.chronopolis.rest.kot.entities.Bag;
import org.chronopolis.rest.entities.Bag;
import org.chronopolis.tokenize.ManifestEntry;
import org.chronopolis.tokenize.batch.ChronopolisTokenRequestBatch;
import org.chronopolis.tokenize.filter.ProcessingFilter;
......
......@@ -23,19 +23,19 @@ import org.chronopolis.ingest.support.BagCreateResult;
import org.chronopolis.ingest.support.FileSizeFormatter;
import org.chronopolis.ingest.support.Loggers;
import org.chronopolis.ingest.support.ReplicationCreateResult;
import org.chronopolis.rest.kot.entities.Bag;
import org.chronopolis.rest.kot.entities.Node;
import org.chronopolis.rest.kot.entities.QBag;
import org.chronopolis.rest.kot.entities.Replication;
import org.chronopolis.rest.kot.entities.storage.Fixity;
import org.chronopolis.rest.kot.entities.storage.StagingStorage;
import org.chronopolis.rest.kot.entities.storage.StorageRegion;
import org.chronopolis.rest.kot.models.create.BagCreate;
import org.chronopolis.rest.kot.models.create.FixityCreate;
import org.chronopolis.rest.kot.models.create.StagingCreate;
import org.chronopolis.rest.kot.models.enums.BagStatus;
import org.chronopolis.rest.kot.models.enums.ReplicationStatus;
import org.chronopolis.rest.kot.models.enums.StorageUnit;
import org.chronopolis.rest.entities.Bag;
import org.chronopolis.rest.entities.Node;
import org.chronopolis.rest.entities.QBag;
import org.chronopolis.rest.entities.Replication;
import org.chronopolis.rest.entities.storage.Fixity;
import org.chronopolis.rest.entities.storage.StagingStorage;
import org.chronopolis.rest.entities.storage.StorageRegion;
import org.chronopolis.rest.models.create.BagCreate;
import org.chronopolis.rest.models.create.FixityCreate;
import org.chronopolis.rest.models.create.StagingCreate;
import org.chronopolis.rest.models.enums.BagStatus;
import org.chronopolis.rest.models.enums.ReplicationStatus;
import org.chronopolis.rest.models.enums.StorageUnit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -615,7 +615,7 @@ public class BagUIController extends IngestController {
*/
@RequestMapping(value = "/replications/add", method = RequestMethod.POST)
public String addReplication(Principal principal,
org.chronopolis.rest.kot.models.create.ReplicationCreate request) {
org.chronopolis.rest.models.create.ReplicationCreate request) {
access.info("[POST /replications/add] - {}", principal.getName());
ReplicationCreateResult result = replicationService.create(request);
......
......@@ -21,16 +21,16 @@ import org.chronopolis.ingest.models.filter.DepositorFilter;
import org.chronopolis.ingest.repository.dao.PagedDAO;
import org.chronopolis.ingest.support.FileSizeFormatter;
import org.chronopolis.ingest.support.Loggers;
import org.chronopolis.rest.kot.entities.Node;
import org.chronopolis.rest.kot.entities.QBag;
import org.chronopolis.rest.kot.entities.QNode;
import org.chronopolis.rest.kot.entities.depositor.Depositor;
import org.chronopolis.rest.kot.entities.depositor.DepositorContact;
import org.chronopolis.rest.kot.entities.depositor.QDepositor;
import org.chronopolis.rest.kot.entities.depositor.QDepositorContact;
import org.chronopolis.rest.kot.models.create.DepositorContactCreate;
import org.chronopolis.rest.kot.models.create.DepositorCreate;
import org.chronopolis.rest.kot.models.update.DepositorUpdate;
import org.chronopolis.rest.entities.Node;
import org.chronopolis.rest.entities.QBag;
import org.chronopolis.rest.entities.QNode;
import org.chronopolis.rest.entities.depositor.Depositor;
import org.chronopolis.rest.entities.depositor.DepositorContact;
import org.chronopolis.rest.entities.depositor.QDepositor;
import org.chronopolis.rest.entities.depositor.QDepositorContact;
import org.chronopolis.rest.models.create.DepositorContactCreate;
import org.chronopolis.rest.models.create.DepositorCreate;
import org.chronopolis.rest.models.update.DepositorUpdate;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
......
......@@ -20,13 +20,13 @@ import org.chronopolis.ingest.repository.criteria.RepairSearchCriteria;
import org.chronopolis.ingest.repository.dao.BagService;
import org.chronopolis.ingest.repository.dao.SearchService;
import org.chronopolis.ingest.support.Loggers;
import org.chronopolis.rest.kot.api.OkBasicInterceptor;
import org.chronopolis.rest.kot.entities.Bag;
import org.chronopolis.rest.kot.entities.Node;
import org.chronopolis.rest.kot.entities.repair.Repair;
import org.chronopolis.rest.kot.models.create.RepairCreate;
import org.chronopolis.rest.kot.models.enums.AuditStatus;
import org.chronopolis.rest.kot.models.enums.RepairStatus;
import org.chronopolis.rest.api.OkBasicInterceptor;
import org.chronopolis.rest.entities.Bag;
import org.chronopolis.rest.entities.Node;
import org.chronopolis.rest.entities.repair.Repair;
import org.chronopolis.rest.models.create.RepairCreate;
import org.chronopolis.rest.models.enums.AuditStatus;
import org.chronopolis.rest.models.enums.RepairStatus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
......
......@@ -15,14 +15,14 @@ import org.chronopolis.ingest.repository.Authority;
import org.chronopolis.ingest.repository.dao.UserService;
import org.chronopolis.ingest.support.FileSizeFormatter;
import org.chronopolis.ingest.support.Loggers;
import org.chronopolis.rest.kot.entities.Bag;
import org.chronopolis.rest.kot.entities.BagDistributionStatus;
import org.chronopolis.rest.kot.entities.QBag;
import org.chronopolis.rest.kot.entities.QBagDistribution;
import org.chronopolis.rest.kot.entities.QReplication;
import org.chronopolis.rest.kot.models.enums.BagStatus;
import org.chronopolis.rest.kot.models.update.PasswordUpdate;
import org.chronopolis.rest.kot.models.enums.ReplicationStatus;
import org.chronopolis.rest.entities.Bag;
import org.chronopolis.rest.entities.BagDistributionStatus;
import org.chronopolis.rest.entities.QBag;
import org.chronopolis.rest.entities.QBagDistribution;
import org.chronopolis.rest.entities.QReplication;
import org.chronopolis.rest.models.enums.BagStatus;
import org.chronopolis.rest.models.update.PasswordUpdate;
import org.chronopolis.rest.models.enums.ReplicationStatus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
......
......@@ -10,14 +10,14 @@ import org.chronopolis.ingest.repository.criteria.StorageRegionSearchCriteria;
import org.chronopolis.ingest.repository.dao.StorageRegionService;
import org.chronopolis.ingest.support.FileSizeFormatter;
import org.chronopolis.ingest.support.Loggers;
import org.chronopolis.rest.kot.entities.Node;
import org.chronopolis.rest.kot.entities.storage.ReplicationConfig;
import org.chronopolis.rest.kot.entities.storage.StorageRegion;
import org.chronopolis.rest.kot.models.create.RegionCreate;
import org.chronopolis.rest.kot.models.enums.DataType;
import org.chronopolis.rest.kot.models.enums.StorageType;
import org.chronopolis.rest.kot.models.enums.StorageUnit;
import org.chronopolis.rest.kot.models.update.RegionUpdate;
import org.chronopolis.rest.entities.Node;
import org.chronopolis.rest.entities.storage.ReplicationConfig;
import org.chronopolis.rest.entities.storage.StorageRegion;
import org.chronopolis.rest.models.create.RegionCreate;
import org.chronopolis.rest.models.enums.DataType;
import org.chronopolis.rest.models.enums.StorageType;
import org.chronopolis.rest.models.enums.StorageUnit;
import org.chronopolis.rest.models.update.RegionUpdate;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
......
package org.chronopolis.ingest.models;
import org.chronopolis.ingest.support.FileSizeFormatter;
import org.chronopolis.rest.kot.models.enums.BagStatus;
import org.chronopolis.rest.models.enums.BagStatus;
import java.math.BigDecimal;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment