Merge c0b986e into bd1f813

square · Aug 1, 2022 · 8e023f6 · 8e023f6
2 parents bd1f813 + c0b986e
commit 8e023f6
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 19 deletions.
diff --git a/...ysAllowDelegatingPermissionCheckTest.java → ...ysAllowDelegatingPermissionCheckTest.java b/...ysAllowDelegatingPermissionCheckTest.java → ...ysAllowDelegatingPermissionCheckTest.java
@@ -1,10 +1,7 @@
-package keywhiz.service.permission;
+package keywhiz.service.permissions;
 
 import com.codahale.metrics.MetricRegistry;
 import java.util.Objects;
-import keywhiz.service.permissions.Action;
-import keywhiz.service.permissions.AlwaysAllowDelegatingPermissionCheck;
-import keywhiz.service.permissions.PermissionCheck;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;

diff --git a/...ission/AlwaysFailPermissionCheckTest.java → ...ssions/AlwaysFailPermissionCheckTest.java b/...ission/AlwaysFailPermissionCheckTest.java → ...ssions/AlwaysFailPermissionCheckTest.java
@@ -1,9 +1,7 @@
-package keywhiz.service.permission;
+package keywhiz.service.permissions;
 
 import com.codahale.metrics.MetricRegistry;
 import java.util.Objects;
-import keywhiz.service.permissions.Action;
-import keywhiz.service.permissions.AlwaysFailPermissionCheck;
 import org.junit.Before;
 import org.junit.Test;
 

diff --git a/...ce/permission/AnyPermissionCheckTest.java → ...e/permissions/AnyPermissionCheckTest.java b/...ce/permission/AnyPermissionCheckTest.java → ...e/permissions/AnyPermissionCheckTest.java
@@ -1,11 +1,8 @@
-package keywhiz.service.permission;
+package keywhiz.service.permissions;
 
 import com.codahale.metrics.MetricRegistry;
 import java.util.Collections;
 import java.util.List;
-import keywhiz.service.permissions.Action;
-import keywhiz.service.permissions.AnyPermissionCheck;
-import keywhiz.service.permissions.PermissionCheck;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;

diff --git a/.../AutomationClientPermissionCheckTest.java → .../AutomationClientPermissionCheckTest.java b/.../AutomationClientPermissionCheckTest.java → .../AutomationClientPermissionCheckTest.java
@@ -1,11 +1,9 @@
-package keywhiz.service.permission;
+package keywhiz.service.permissions;
 
 import com.codahale.metrics.MetricRegistry;
 import java.util.Objects;
 import keywhiz.auth.User;
 import keywhiz.api.model.Client;
-import keywhiz.service.permissions.Action;
-import keywhiz.service.permissions.AutomationClientPermissionCheck;
 import org.junit.Before;
 import org.junit.Test;
 

diff --git a/...mission/OwnershipPermissionCheckTest.java → ...issions/OwnershipPermissionCheckTest.java b/...mission/OwnershipPermissionCheckTest.java → ...issions/OwnershipPermissionCheckTest.java
@@ -1,4 +1,4 @@
-package keywhiz.service.permission;
+package keywhiz.service.permissions;
 
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.collect.ImmutableMap;
@@ -13,8 +13,6 @@
 import keywhiz.api.model.SecretSeriesAndContent;
 import keywhiz.auth.User;
 import keywhiz.service.daos.AclDAO;
-import keywhiz.service.permissions.Action;
-import keywhiz.service.permissions.OwnershipPermissionCheck;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;

diff --git a/...permission/PermissionCheckModuleTest.java → ...ermissions/PermissionCheckModuleTest.java b/...permission/PermissionCheckModuleTest.java → ...ermissions/PermissionCheckModuleTest.java
@@ -1,7 +1,6 @@
-package keywhiz.service.permission;
+package keywhiz.service.permissions;
 
 import javax.inject.Inject;
-import keywhiz.service.permissions.PermissionCheck;
 import org.junit.Test;
 
 import static keywhiz.test.KeywhizTests.createInjector;