Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmisinco2013-11-20 20:00:16 +0000
committerGerrit Code Review @ Eclipse.org2013-12-03 15:29:58 +0000
commitc8164a62042005eb1c1c3313bf9c9f6bde2e494e (patch)
tree8b3c152c3eac998a2ef5053eb41a973a474e8a56 /plugins/org.eclipse.osee.framework.access
parent6ff162945d3f4ddfa1dd7bab80e1b4321eda1cb9 (diff)
downloadorg.eclipse.osee-c8164a62042005eb1c1c3313bf9c9f6bde2e494e.tar.gz
org.eclipse.osee-c8164a62042005eb1c1c3313bf9c9f6bde2e494e.tar.xz
org.eclipse.osee-c8164a62042005eb1c1c3313bf9c9f6bde2e494e.zip
refactor[ats_ZFB9T]: Remove identity service
Diffstat (limited to 'plugins/org.eclipse.osee.framework.access')
-rw-r--r--plugins/org.eclipse.osee.framework.access/OSGI-INF/access.control.service.xml1
-rw-r--r--plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java8
-rw-r--r--plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlServiceProxy.java8
3 files changed, 3 insertions, 14 deletions
diff --git a/plugins/org.eclipse.osee.framework.access/OSGI-INF/access.control.service.xml b/plugins/org.eclipse.osee.framework.access/OSGI-INF/access.control.service.xml
index 75dc5aedf5..ee31194aaf 100644
--- a/plugins/org.eclipse.osee.framework.access/OSGI-INF/access.control.service.xml
+++ b/plugins/org.eclipse.osee.framework.access/OSGI-INF/access.control.service.xml
@@ -6,7 +6,6 @@
</service>
<reference bind="setDbService" cardinality="1..1" interface="org.eclipse.osee.framework.database.IOseeDatabaseService" name="IOseeDatabaseService" policy="static"/>
<reference bind="setCachingService" cardinality="1..1" interface="org.eclipse.osee.framework.core.services.IOseeCachingService" name="IOseeCachingService" policy="static"/>
- <reference bind="setIdentityService" cardinality="1..1" interface="org.eclipse.osee.framework.core.services.IdentityService" name="IdentityService" policy="static"/>
<reference bind="setEventService" cardinality="1..1" interface="org.eclipse.osee.framework.skynet.core.event.OseeEventService" name="OseeEventService" policy="static"/>
<reference bind="setLifecycleService" cardinality="1..1" interface="org.eclipse.osee.framework.lifecycle.ILifecycleService" name="ILifecycleService" policy="static"/>
<reference bind="addAccessProvider" cardinality="1..n" interface="org.eclipse.osee.framework.access.IAccessProvider" name="IAccessProvider" policy="dynamic" unbind="removeAccessProvider"/>
diff --git a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java
index 276a9d769e..e3c05b068a 100644
--- a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java
+++ b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java
@@ -49,7 +49,6 @@ import org.eclipse.osee.framework.core.model.type.ArtifactType;
import org.eclipse.osee.framework.core.operation.Operations;
import org.eclipse.osee.framework.core.services.IAccessControlService;
import org.eclipse.osee.framework.core.services.IOseeCachingService;
-import org.eclipse.osee.framework.core.services.IdentityService;
import org.eclipse.osee.framework.core.util.Conditions;
import org.eclipse.osee.framework.database.IOseeDatabaseService;
import org.eclipse.osee.framework.database.core.IOseeStatement;
@@ -131,19 +130,17 @@ public class AccessControlService implements IAccessControlService {
private final IOseeCachingService cachingService;
private final IOseeDatabaseService databaseService;
- private final IdentityService identityService;
private final OseeEventService eventService;
private IArtifactEventListener listener1;
private IArtifactEventListener listener2;
private final AtomicBoolean ensurePopulated = new AtomicBoolean(false);
+ public AccessControlService(IOseeDatabaseService databaseService, IOseeCachingService cachingService, OseeEventService eventService) {
- public AccessControlService(IOseeDatabaseService databaseService, IOseeCachingService cachingService, IdentityService identityService, OseeEventService eventService) {
super();
this.databaseService = databaseService;
this.cachingService = cachingService;
- this.identityService = identityService;
this.eventService = eventService;
}
@@ -268,8 +265,7 @@ public class AccessControlService implements IAccessControlService {
IOseeStatement chStmt = getDatabaseService().getStatement();
try {
- chStmt.runPreparedQuery(USER_GROUP_MEMBERS, groupId,
- identityService.getLocalId(CoreRelationTypes.Users_User));
+ chStmt.runPreparedQuery(USER_GROUP_MEMBERS, groupId, CoreRelationTypes.Users_User.getGuid());
// get group members and populate subjectToGroupCache
while (chStmt.next()) {
diff --git a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlServiceProxy.java b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlServiceProxy.java
index 3915f7a723..ac1672bfa6 100644
--- a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlServiceProxy.java
+++ b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlServiceProxy.java
@@ -21,7 +21,6 @@ import org.eclipse.osee.framework.core.model.IBasicArtifact;
import org.eclipse.osee.framework.core.model.access.AccessDataQuery;
import org.eclipse.osee.framework.core.services.IAccessControlService;
import org.eclipse.osee.framework.core.services.IOseeCachingService;
-import org.eclipse.osee.framework.core.services.IdentityService;
import org.eclipse.osee.framework.core.util.Conditions;
import org.eclipse.osee.framework.database.IOseeDatabaseService;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
@@ -43,7 +42,6 @@ public final class AccessControlServiceProxy implements IAccessControlService {
private IOseeDatabaseService dbService;
private IOseeCachingService cachingService;
- private IdentityService identityService;
private OseeEventService eventService;
private ILifecycleService lifecycleService;
@@ -59,10 +57,6 @@ public final class AccessControlServiceProxy implements IAccessControlService {
this.cachingService = cachingService;
}
- public void setIdentityService(IdentityService identityService) {
- this.identityService = identityService;
- }
-
public void setEventService(OseeEventService eventService) {
this.eventService = eventService;
}
@@ -140,7 +134,7 @@ public final class AccessControlServiceProxy implements IAccessControlService {
}
public void start() {
- accessService = new AccessControlService(dbService, cachingService, identityService, eventService);
+ accessService = new AccessControlService(dbService, cachingService, eventService);
accessEventListener = new AccessEventListener(accessService, new AccessControlCacheHandler());
eventService.addListener(EventQosType.PRIORITY, accessEventListener);

Back to the top