Move permission data store class

ngageoint · Sep 25, 2023 · 482d200 · 482d200
1 parent a91a513
commit 482d200
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/.../src/main/java/mil/nga/giat/mage/compat/server5/observation/edit/FormViewModel_server5.kt b/.../src/main/java/mil/nga/giat/mage/compat/server5/observation/edit/FormViewModel_server5.kt
@@ -20,7 +20,7 @@ import mil.nga.giat.mage.form.field.FieldValue
 import mil.nga.giat.mage.form.field.GeometryFieldState
 import mil.nga.giat.mage.observation.*
 import mil.nga.giat.mage.observation.edit.MediaAction
-import mil.nga.giat.mage.database.model.permission.Permission
+import mil.nga.giat.mage.sdk.datastore.user.Permission
 import mil.nga.giat.mage.database.model.user.User
 import mil.nga.giat.mage.data.datasource.user.UserLocalDataSource
 import mil.nga.giat.mage.sdk.exceptions.UserException

diff --git a/mage/src/main/java/mil/nga/giat/mage/database/model/permission/Role.java b/mage/src/main/java/mil/nga/giat/mage/database/model/permission/Role.java
@@ -7,11 +7,11 @@
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import mil.nga.giat.mage.sdk.datastore.user.Permissions;
+
 @DatabaseTable(tableName = "roles")
 public class Role {
 
-	public static final String ADMIN_ROLE_NAME = "ADMIN_ROLE";
-
 	@DatabaseField(generatedId = true)
 	private Long _id;
 

diff --git a/mage/src/main/java/mil/nga/giat/mage/form/FormViewModel.kt b/mage/src/main/java/mil/nga/giat/mage/form/FormViewModel.kt
@@ -18,7 +18,7 @@ import mil.nga.giat.mage.data.datasource.observation.ObservationLocalDataSource
 import mil.nga.giat.mage.database.model.observation.ObservationImportant
 import mil.nga.giat.mage.database.model.observation.ObservationProperty
 import mil.nga.giat.mage.database.model.observation.State
-import mil.nga.giat.mage.database.model.permission.Permission
+import mil.nga.giat.mage.sdk.datastore.user.Permission
 import mil.nga.giat.mage.database.model.user.User
 import mil.nga.giat.mage.data.datasource.user.UserLocalDataSource
 import mil.nga.giat.mage.form.Form.Companion.fromJson

diff --git a/mage/src/main/java/mil/nga/giat/mage/network/role/RolesDeserializer.kt b/mage/src/main/java/mil/nga/giat/mage/network/role/RolesDeserializer.kt
@@ -5,9 +5,9 @@ import com.google.gson.JsonDeserializationContext
 import com.google.gson.JsonDeserializer
 import com.google.gson.JsonElement
 import com.google.gson.JsonParseException
-import mil.nga.giat.mage.database.model.permission.Permission
-import mil.nga.giat.mage.database.model.permission.Permissions
+import mil.nga.giat.mage.sdk.datastore.user.Permission
 import mil.nga.giat.mage.database.model.permission.Role
+import mil.nga.giat.mage.sdk.datastore.user.Permissions
 import java.lang.reflect.Type
 
 class RolesDeserializer : JsonDeserializer<List<Role>> {

diff --git a/mage/src/main/java/mil/nga/giat/mage/network/user/UserWithRoleTypeAdapter.kt b/mage/src/main/java/mil/nga/giat/mage/network/user/UserWithRoleTypeAdapter.kt
@@ -5,12 +5,12 @@ import com.google.gson.TypeAdapter
 import com.google.gson.stream.JsonReader
 import com.google.gson.stream.JsonToken
 import com.google.gson.stream.JsonWriter
-import mil.nga.giat.mage.database.model.permission.Permission
-import mil.nga.giat.mage.database.model.permission.Permissions
+import mil.nga.giat.mage.sdk.datastore.user.Permission
 import mil.nga.giat.mage.database.model.permission.Role
 import mil.nga.giat.mage.database.model.user.Phone
 import mil.nga.giat.mage.database.model.user.User
 import mil.nga.giat.mage.network.gson.nextStringOrNull
+import mil.nga.giat.mage.sdk.datastore.user.Permissions
 import mil.nga.giat.mage.sdk.utils.ISO8601DateFormatFactory
 import org.apache.commons.lang3.StringUtils
 import java.io.IOException

diff --git a/mage/src/main/java/mil/nga/giat/mage/observation/view/ObservationViewActivity.kt b/mage/src/main/java/mil/nga/giat/mage/observation/view/ObservationViewActivity.kt
@@ -25,7 +25,7 @@ import mil.nga.giat.mage.observation.attachment.AttachmentViewActivity
 import mil.nga.giat.mage.observation.edit.ObservationEditActivity
 import mil.nga.giat.mage.people.PeopleActivity
 import mil.nga.giat.mage.database.model.observation.Attachment
-import mil.nga.giat.mage.database.model.permission.Permission
+import mil.nga.giat.mage.sdk.datastore.user.Permission
 import mil.nga.giat.mage.database.model.user.User
 import mil.nga.giat.mage.data.datasource.user.UserLocalDataSource
 import mil.nga.giat.mage.utils.googleMapsUri

diff --git a/...database/model/permission/Permission.java → ...t/mage/sdk/datastore/user/Permission.java b/...database/model/permission/Permission.java → ...t/mage/sdk/datastore/user/Permission.java
@@ -1,4 +1,4 @@
-package mil.nga.giat.mage.database.model.permission;
+package mil.nga.giat.mage.sdk.datastore.user;
 
 import java.io.Serializable;
 

diff --git a/.../database/model/permission/Permissions.kt → ...at/mage/sdk/datastore/user/Permissions.kt b/.../database/model/permission/Permissions.kt → ...at/mage/sdk/datastore/user/Permissions.kt
@@ -1,4 +1,4 @@
-package mil.nga.giat.mage.database.model.permission
+package mil.nga.giat.mage.sdk.datastore.user
 
 import java.io.Serializable