Merge pull request #986 from hashmapinc/Tempus-949-Mail-service-devic…

…e-creation Tempus 949 mail service device creation
hashmapinc · Jan 16, 2019 · 738f3db · 738f3db
2 parents 501ba43 + b26e2bf
commit 738f3db
Show file tree

Hide file tree

Showing 53 changed files with 548 additions and 84 deletions.
diff --git a/application/src/it/java/com/hashmapinc/server/service/mail/TestMailService.java b/application/src/it/java/com/hashmapinc/server/service/mail/TestMailService.java
@@ -16,7 +16,8 @@
  */
 package com.hashmapinc.server.service.mail;
 
-import com.hashmapinc.server.exception.TempusException;
+import com.hashmapinc.server.common.data.exception.TempusException;
+import com.hashmapinc.server.dao.mail.MailService;
 import org.mockito.Mockito;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;

diff --git a/application/src/main/java/com/hashmapinc/server/config/WebSocketConfiguration.java b/application/src/main/java/com/hashmapinc/server/config/WebSocketConfiguration.java
@@ -19,8 +19,8 @@
 import java.util.Map;
 
 import com.hashmapinc.server.service.security.model.SecurityUser;
-import com.hashmapinc.server.exception.TempusErrorCode;
-import com.hashmapinc.server.exception.TempusException;
+import com.hashmapinc.server.common.data.exception.TempusErrorCode;
+import com.hashmapinc.server.common.data.exception.TempusException;
 import com.hashmapinc.server.controller.plugin.PluginWebSocketHandler;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Bean;

diff --git a/application/src/main/java/com/hashmapinc/server/controller/AlarmController.java b/application/src/main/java/com/hashmapinc/server/controller/AlarmController.java
@@ -23,12 +23,10 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import com.hashmapinc.server.common.data.alarm.*;
-import com.hashmapinc.server.common.data.id.*;
 import com.hashmapinc.server.common.data.page.TimePageData;
 import com.hashmapinc.server.common.data.page.TimePageLink;
-import com.hashmapinc.server.exception.TempusErrorCode;
-import com.hashmapinc.server.exception.TempusException;
+import com.hashmapinc.server.common.data.exception.TempusErrorCode;
+import com.hashmapinc.server.common.data.exception.TempusException;
 
 @RestController
 @RequestMapping("/api")

diff --git a/application/src/main/java/com/hashmapinc/server/controller/AssetController.java b/application/src/main/java/com/hashmapinc/server/controller/AssetController.java
@@ -36,7 +36,7 @@
 import com.hashmapinc.server.common.data.security.Authority;
 import com.hashmapinc.server.dao.exception.IncorrectParameterException;
 import com.hashmapinc.server.dao.model.ModelConstants;
-import com.hashmapinc.server.exception.TempusException;
+import com.hashmapinc.server.common.data.exception.TempusException;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/application/src/main/java/com/hashmapinc/server/controller/AuditLogController.java b/application/src/main/java/com/hashmapinc/server/controller/AuditLogController.java
@@ -25,7 +25,7 @@
 import com.hashmapinc.server.common.data.id.EntityIdFactory;
 import com.hashmapinc.server.common.data.id.UserId;
 import com.hashmapinc.server.common.data.page.TimePageData;
-import com.hashmapinc.server.exception.TempusException;
+import com.hashmapinc.server.common.data.exception.TempusException;
 
 import java.util.UUID;
 

diff --git a/application/src/main/java/com/hashmapinc/server/controller/AuthController.java b/application/src/main/java/com/hashmapinc/server/controller/AuthController.java
@@ -41,9 +41,9 @@
 import org.springframework.web.bind.annotation.*;
 import com.hashmapinc.server.common.data.User;
 import com.hashmapinc.server.common.data.security.UserCredentials;
-import com.hashmapinc.server.exception.TempusErrorCode;
-import com.hashmapinc.server.exception.TempusException;
-import com.hashmapinc.server.service.mail.MailService;
+import com.hashmapinc.server.common.data.exception.TempusErrorCode;
+import com.hashmapinc.server.common.data.exception.TempusException;
+import com.hashmapinc.server.dao.mail.MailService;
 import com.hashmapinc.server.service.security.model.SecurityUser;
 import org.springframework.web.client.RestTemplate;
 import javax.servlet.http.HttpServletRequest;

diff --git a/application/src/main/java/com/hashmapinc/server/controller/BaseController.java b/application/src/main/java/com/hashmapinc/server/controller/BaseController.java
@@ -59,9 +59,9 @@
 import com.hashmapinc.server.dao.user.UserService;
 import com.hashmapinc.server.dao.widget.WidgetTypeService;
 import com.hashmapinc.server.dao.widget.WidgetsBundleService;
-import com.hashmapinc.server.exception.TempusErrorCode;
+import com.hashmapinc.server.common.data.exception.TempusErrorCode;
 import com.hashmapinc.server.exception.TempusErrorResponseHandler;
-import com.hashmapinc.server.exception.TempusException;
+import com.hashmapinc.server.common.data.exception.TempusException;
 import com.hashmapinc.server.service.component.ComponentDiscoveryService;
 import com.hashmapinc.server.service.kubernetes.gateway.TempusGatewayKubernetesService;
 import com.hashmapinc.server.service.metadataingestion.MetadataConfigService;

diff --git a/...ication/src/main/java/com/hashmapinc/server/controller/ComponentDescriptorController.java b/...ication/src/main/java/com/hashmapinc/server/controller/ComponentDescriptorController.java
@@ -18,7 +18,7 @@
 
 import com.hashmapinc.server.common.data.plugin.ComponentDescriptor;
 import com.hashmapinc.server.common.data.plugin.ComponentType;
-import com.hashmapinc.server.exception.TempusException;
+import com.hashmapinc.server.common.data.exception.TempusException;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 

diff --git a/application/src/main/java/com/hashmapinc/server/controller/ComputationJobController.java b/application/src/main/java/com/hashmapinc/server/controller/ComputationJobController.java
@@ -22,15 +22,15 @@
 import com.hashmapinc.server.common.data.id.ComputationId;
 import com.hashmapinc.server.common.data.id.ComputationJobId;
 import com.hashmapinc.server.common.data.plugin.ComponentLifecycleEvent;
-import com.hashmapinc.server.exception.TempusException;
+import com.hashmapinc.server.common.data.exception.TempusException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
-import static com.hashmapinc.server.exception.TempusErrorCode.ITEM_NOT_FOUND;
+import static com.hashmapinc.server.common.data.exception.TempusErrorCode.ITEM_NOT_FOUND;
 
 @Slf4j
 @RestController

diff --git a/application/src/main/java/com/hashmapinc/server/controller/ComputationsController.java b/application/src/main/java/com/hashmapinc/server/controller/ComputationsController.java
@@ -30,8 +30,8 @@
 import com.hashmapinc.server.common.data.plugin.ComponentLifecycleEvent;
 import com.hashmapinc.server.common.data.security.Authority;
 import com.hashmapinc.server.dao.model.ModelConstants;
-import com.hashmapinc.server.exception.TempusErrorCode;
-import com.hashmapinc.server.exception.TempusException;
+import com.hashmapinc.server.common.data.exception.TempusErrorCode;
+import com.hashmapinc.server.common.data.exception.TempusException;
 import com.hashmapinc.server.service.computation.ComputationDiscoveryService;
 import com.hashmapinc.server.service.computation.ComputationFunctionService;
 import com.hashmapinc.server.service.computation.S3BucketService;
@@ -58,7 +58,7 @@
 import java.util.stream.Stream;
 
 import static com.hashmapinc.server.dao.service.Validator.validateId;
-import static com.hashmapinc.server.exception.TempusErrorCode.ITEM_NOT_FOUND;
+import static com.hashmapinc.server.common.data.exception.TempusErrorCode.ITEM_NOT_FOUND;
 
 @Slf4j
 @RestController

diff --git a/application/src/main/java/com/hashmapinc/server/controller/ConfigurationController.java b/application/src/main/java/com/hashmapinc/server/controller/ConfigurationController.java
@@ -22,7 +22,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.*;
-import com.hashmapinc.server.exception.TempusException;
+import com.hashmapinc.server.common.data.exception.TempusException;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/application/src/main/java/com/hashmapinc/server/controller/CustomerController.java b/application/src/main/java/com/hashmapinc/server/controller/CustomerController.java
@@ -25,7 +25,7 @@
 import com.hashmapinc.server.common.data.id.TenantId;
 import com.hashmapinc.server.common.data.page.TextPageData;
 import com.hashmapinc.server.common.data.page.TextPageLink;
-import com.hashmapinc.server.exception.TempusException;
+import com.hashmapinc.server.common.data.exception.TempusException;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

diff --git a/application/src/main/java/com/hashmapinc/server/controller/CustomerGroupController.java b/application/src/main/java/com/hashmapinc/server/controller/CustomerGroupController.java
@@ -30,10 +30,7 @@
 import com.hashmapinc.server.common.data.id.UserId;
 import com.hashmapinc.server.common.data.page.TextPageData;
 import com.hashmapinc.server.common.data.page.TextPageLink;
-import com.hashmapinc.server.common.data.security.Authority;
-import com.hashmapinc.server.exception.TempusErrorCode;
-import com.hashmapinc.server.exception.TempusException;
-import com.hashmapinc.server.service.security.model.SecurityUser;
+import com.hashmapinc.server.common.data.exception.TempusException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;

diff --git a/application/src/main/java/com/hashmapinc/server/controller/DashboardController.java b/application/src/main/java/com/hashmapinc/server/controller/DashboardController.java
@@ -16,7 +16,6 @@
  */
 package com.hashmapinc.server.controller;
 
-import com.datastax.driver.core.utils.UUIDs;
 import com.hashmapinc.server.common.data.*;
 import com.hashmapinc.server.common.data.audit.ActionType;
 import com.hashmapinc.server.common.data.id.CustomerId;
@@ -28,7 +27,7 @@
 import com.hashmapinc.server.common.data.page.TimePageData;
 import com.hashmapinc.server.common.data.page.TimePageLink;
 import com.hashmapinc.server.common.data.security.Authority;
-import com.hashmapinc.server.exception.TempusException;
+import com.hashmapinc.server.common.data.exception.TempusException;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

diff --git a/application/src/main/java/com/hashmapinc/server/controller/DataModelController.java b/application/src/main/java/com/hashmapinc/server/controller/DataModelController.java
@@ -23,7 +23,7 @@
 import com.hashmapinc.server.common.data.id.DataModelId;
 import com.hashmapinc.server.common.data.id.DataModelObjectId;
 import com.hashmapinc.server.dao.model.ModelConstants;
-import com.hashmapinc.server.exception.TempusException;
+import com.hashmapinc.server.common.data.exception.TempusException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

diff --git a/application/src/main/java/com/hashmapinc/server/controller/DeviceController.java b/application/src/main/java/com/hashmapinc/server/controller/DeviceController.java
@@ -29,8 +29,8 @@
 import com.hashmapinc.server.dao.exception.IncorrectParameterException;
 import com.hashmapinc.server.dao.model.ModelConstants;
 import com.hashmapinc.server.dao.timeseries.TimeseriesService;
-import com.hashmapinc.server.exception.TempusErrorCode;
-import com.hashmapinc.server.exception.TempusException;
+import com.hashmapinc.server.common.data.exception.TempusErrorCode;
+import com.hashmapinc.server.common.data.exception.TempusException;
 import com.hashmapinc.server.service.security.model.SecurityUser;
 import com.opencsv.CSVWriter;
 import lombok.extern.slf4j.Slf4j;

diff --git a/application/src/main/java/com/hashmapinc/server/controller/EntityRelationController.java b/application/src/main/java/com/hashmapinc/server/controller/EntityRelationController.java
@@ -22,8 +22,8 @@
 import com.hashmapinc.server.common.data.relation.EntityRelationInfo;
 import com.hashmapinc.server.common.data.relation.EntityRelationsQuery;
 import com.hashmapinc.server.common.data.relation.RelationTypeGroup;
-import com.hashmapinc.server.exception.TempusErrorCode;
-import com.hashmapinc.server.exception.TempusException;
+import com.hashmapinc.server.common.data.exception.TempusErrorCode;
+import com.hashmapinc.server.common.data.exception.TempusException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;

diff --git a/application/src/main/java/com/hashmapinc/server/controller/EventController.java b/application/src/main/java/com/hashmapinc/server/controller/EventController.java
@@ -23,8 +23,8 @@
 import com.hashmapinc.server.common.data.page.TimePageLink;
 import com.hashmapinc.server.dao.event.EventService;
 import com.hashmapinc.server.dao.model.ModelConstants;
-import com.hashmapinc.server.exception.TempusErrorCode;
-import com.hashmapinc.server.exception.TempusException;
+import com.hashmapinc.server.common.data.exception.TempusErrorCode;
+import com.hashmapinc.server.common.data.exception.TempusException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

diff --git a/application/src/main/java/com/hashmapinc/server/controller/LoginController.java b/application/src/main/java/com/hashmapinc/server/controller/LoginController.java
@@ -17,7 +17,7 @@
 package com.hashmapinc.server.controller;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.hashmapinc.server.exception.TempusException;
+import com.hashmapinc.server.common.data.exception.TempusException;
 import com.hashmapinc.server.service.security.auth.jwt.RefreshTokenRequest;
 import com.hashmapinc.server.service.security.auth.rest.LoginRequest;
 import com.hashmapinc.server.service.security.auth.rest.LoginResponseToken;

diff --git a/application/src/main/java/com/hashmapinc/server/controller/MetadataController.java b/application/src/main/java/com/hashmapinc/server/controller/MetadataController.java
@@ -32,8 +32,8 @@
 import com.hashmapinc.server.common.data.metadata.MetadataQueryId;
 import com.hashmapinc.server.common.data.page.TextPageData;
 import com.hashmapinc.server.common.data.page.TextPageLink;
-import com.hashmapinc.server.exception.TempusErrorCode;
-import com.hashmapinc.server.exception.TempusException;
+import com.hashmapinc.server.common.data.exception.TempusErrorCode;
+import com.hashmapinc.server.common.data.exception.TempusException;
 import com.hashmapinc.server.requests.IngestMetadataRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.joda.time.DateTime;

diff --git a/application/src/main/java/com/hashmapinc/server/controller/NodeMetricController.java b/application/src/main/java/com/hashmapinc/server/controller/NodeMetricController.java
@@ -17,7 +17,7 @@
 package com.hashmapinc.server.controller;
 
 import com.hashmapinc.server.common.data.cluster.NodeMetric;
-import com.hashmapinc.server.exception.TempusException;
+import com.hashmapinc.server.common.data.exception.TempusException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

diff --git a/application/src/main/java/com/hashmapinc/server/controller/PluginController.java b/application/src/main/java/com/hashmapinc/server/controller/PluginController.java
@@ -29,7 +29,7 @@
 import com.hashmapinc.server.common.data.plugin.PluginMetaData;
 import com.hashmapinc.server.common.data.security.Authority;
 import com.hashmapinc.server.dao.model.ModelConstants;
-import com.hashmapinc.server.exception.TempusException;
+import com.hashmapinc.server.common.data.exception.TempusException;
 
 import java.util.List;
 

diff --git a/application/src/main/java/com/hashmapinc/server/controller/RuleController.java b/application/src/main/java/com/hashmapinc/server/controller/RuleController.java
@@ -25,7 +25,7 @@
 import com.hashmapinc.server.common.data.plugin.ComponentLifecycleEvent;
 import com.hashmapinc.server.common.data.rule.RuleMetaData;
 import com.hashmapinc.server.common.data.security.Authority;
-import com.hashmapinc.server.exception.TempusException;
+import com.hashmapinc.server.common.data.exception.TempusException;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

diff --git a/.../src/main/java/com/hashmapinc/server/controller/TempusGatewayConfigurationController.java b/.../src/main/java/com/hashmapinc/server/controller/TempusGatewayConfigurationController.java
@@ -20,7 +20,7 @@
 import com.hashmapinc.server.common.data.id.TempusGatewayConfigurationId;
 import com.hashmapinc.server.common.data.id.TenantId;
 import com.hashmapinc.server.common.data.kubernetes.ReplicaSetStatus;
-import com.hashmapinc.server.exception.TempusException;
+import com.hashmapinc.server.common.data.exception.TempusException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

diff --git a/application/src/main/java/com/hashmapinc/server/controller/TenantController.java b/application/src/main/java/com/hashmapinc/server/controller/TenantController.java
@@ -25,7 +25,7 @@
 import com.hashmapinc.server.common.data.id.TenantId;
 import com.hashmapinc.server.common.data.page.TextPageData;
 import com.hashmapinc.server.dao.tenant.TenantService;
-import com.hashmapinc.server.exception.TempusException;
+import com.hashmapinc.server.common.data.exception.TempusException;
 
 @RestController
 @RequestMapping("/api")

diff --git a/application/src/main/java/com/hashmapinc/server/controller/UserController.java b/application/src/main/java/com/hashmapinc/server/controller/UserController.java
@@ -28,11 +28,11 @@
 import com.hashmapinc.server.common.data.security.Authority;
 import com.hashmapinc.server.common.data.security.UserCredentials;
 import com.hashmapinc.server.dao.model.ModelConstants;
-import com.hashmapinc.server.exception.TempusErrorCode;
-import com.hashmapinc.server.exception.TempusException;
+import com.hashmapinc.server.common.data.exception.TempusErrorCode;
+import com.hashmapinc.server.common.data.exception.TempusException;
 import com.hashmapinc.server.requests.CreateUserRequest;
 import com.hashmapinc.server.requests.IdentityUser;
-import com.hashmapinc.server.service.mail.MailService;
+import com.hashmapinc.server.dao.mail.MailService;
 import com.hashmapinc.server.service.security.model.SecurityUser;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/application/src/main/java/com/hashmapinc/server/controller/UserSettingsController.java b/application/src/main/java/com/hashmapinc/server/controller/UserSettingsController.java
@@ -19,13 +19,16 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.hashmapinc.server.common.data.*;
+import com.hashmapinc.server.common.data.Logo;
+import com.hashmapinc.server.common.data.Theme;
+import com.hashmapinc.server.common.data.UserSettings;
 import com.hashmapinc.server.common.data.id.UserId;
 import com.hashmapinc.server.common.data.security.Authority;
 import com.hashmapinc.server.dao.logo.LogoService;
 import com.hashmapinc.server.dao.settings.UserSettingsService;
 import com.hashmapinc.server.dao.theme.ThemeService;
-import com.hashmapinc.server.exception.TempusException;
-import com.hashmapinc.server.service.mail.MailService;
+import com.hashmapinc.server.common.data.exception.TempusException;
+import com.hashmapinc.server.dao.mail.MailService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;

diff --git a/application/src/main/java/com/hashmapinc/server/controller/WidgetTypeController.java b/application/src/main/java/com/hashmapinc/server/controller/WidgetTypeController.java
@@ -21,7 +21,7 @@
 import com.hashmapinc.server.common.data.security.Authority;
 import com.hashmapinc.server.common.data.widget.WidgetType;
 import com.hashmapinc.server.dao.model.ModelConstants;
-import com.hashmapinc.server.exception.TempusException;
+import com.hashmapinc.server.common.data.exception.TempusException;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

diff --git a/application/src/main/java/com/hashmapinc/server/controller/WidgetsBundleController.java b/application/src/main/java/com/hashmapinc/server/controller/WidgetsBundleController.java
@@ -23,7 +23,7 @@
 import com.hashmapinc.server.common.data.security.Authority;
 import com.hashmapinc.server.common.data.widget.WidgetsBundle;
 import com.hashmapinc.server.dao.model.ModelConstants;
-import com.hashmapinc.server.exception.TempusException;
+import com.hashmapinc.server.common.data.exception.TempusException;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

diff --git a/application/src/main/java/com/hashmapinc/server/controller/plugin/PluginApiController.java b/application/src/main/java/com/hashmapinc/server/controller/plugin/PluginApiController.java
@@ -23,7 +23,7 @@
 import com.hashmapinc.server.common.data.plugin.PluginMetaData;
 import com.hashmapinc.server.controller.BaseController;
 import com.hashmapinc.server.dao.model.ModelConstants;
-import com.hashmapinc.server.exception.TempusException;
+import com.hashmapinc.server.common.data.exception.TempusException;
 import com.hashmapinc.server.extensions.api.plugins.PluginApiCallSecurityContext;
 import com.hashmapinc.server.extensions.api.plugins.PluginConstants;
 import com.hashmapinc.server.extensions.api.plugins.rest.BasicPluginRestMsg;

diff --git a/application/src/main/java/com/hashmapinc/server/exception/TempusErrorResponse.java b/application/src/main/java/com/hashmapinc/server/exception/TempusErrorResponse.java
@@ -16,6 +16,7 @@
  */
 package com.hashmapinc.server.exception;
 
+import com.hashmapinc.server.common.data.exception.TempusErrorCode;
 import org.springframework.http.HttpStatus;
 
 import java.util.Date;

diff --git a/application/src/main/java/com/hashmapinc/server/exception/TempusErrorResponseHandler.java b/application/src/main/java/com/hashmapinc/server/exception/TempusErrorResponseHandler.java
@@ -17,6 +17,8 @@
 package com.hashmapinc.server.exception;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.hashmapinc.server.common.data.exception.TempusErrorCode;
+import com.hashmapinc.server.common.data.exception.TempusException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;

diff --git a/...inc/server/exception/TempusErrorCode.java → ...ommon/data/exception/TempusErrorCode.java b/...inc/server/exception/TempusErrorCode.java → ...ommon/data/exception/TempusErrorCode.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hashmapinc.server.exception;
+package com.hashmapinc.server.common.data.exception;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 

diff --git a/...inc/server/exception/TempusException.java → ...ommon/data/exception/TempusException.java b/...inc/server/exception/TempusException.java → ...ommon/data/exception/TempusException.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hashmapinc.server.exception;
+package com.hashmapinc.server.common.data.exception;
 
 public class TempusException extends Exception {