summaryrefslogtreecommitdiffstats
path: root/auth/auth-core
diff options
context:
space:
mode:
authorInstrumental <jonathan.gathman@att.com>2019-04-03 12:12:19 -0500
committerInstrumental <jonathan.gathman@att.com>2019-04-03 12:17:00 -0500
commit08755cae37030d74d8fcadf38f9919c9d9fd21c0 (patch)
tree61464abc3be767f55c69b98ec471158a855f8e2a /auth/auth-core
parentbd7def7ee2098af56ce66752f59c062d7923fb69 (diff)
Add OneWeekCred notice
Issue-ID: AAF-789 Change-Id: Ib52310e9376f057d04a7158995db53b7df3224c6 Signed-off-by: Instrumental <jonathan.gathman@att.com>
Diffstat (limited to 'auth/auth-core')
-rw-r--r--auth/auth-core/src/main/java/org/onap/aaf/auth/org/Organization.java10
-rw-r--r--auth/auth-core/src/main/java/org/onap/aaf/auth/server/AbsServiceStarter.java2
2 files changed, 5 insertions, 7 deletions
diff --git a/auth/auth-core/src/main/java/org/onap/aaf/auth/org/Organization.java b/auth/auth-core/src/main/java/org/onap/aaf/auth/org/Organization.java
index 597f2696..539b9369 100644
--- a/auth/auth-core/src/main/java/org/onap/aaf/auth/org/Organization.java
+++ b/auth/auth-core/src/main/java/org/onap/aaf/auth/org/Organization.java
@@ -106,18 +106,16 @@ public interface Organization {
public Identity getIdentity(AuthzTrans trans, String id) throws OrganizationException;
/**
- * May AutoDelete
+ * Is Revoked
*
* Deletion of an Identity that has been removed from an Organization can be dangerous. Mistakes may have been made
* in the Organization side, a Feed might be corrupted, an API might not be quite right.
*
- * The implementation of this method can use a double check of some sort, such as comparsion of missing ID in Organization
+ * The implementation of this method can use a double check of some sort, such as comparison of missing ID in Organization
* feed with a "Deleted ID" feed.
*
- * The failure to be in Organization will still be reported, if returned "false", but if true, it is taken as an
- * ok to proceed with deletion.
*/
- public boolean mayAutoDelete(AuthzTrans trans, String id);
+ public boolean isRevoked(AuthzTrans trans, String id);
/**
@@ -562,7 +560,7 @@ public interface Organization {
}
@Override
- public boolean mayAutoDelete(AuthzTrans trans, String id) {
+ public boolean isRevoked(AuthzTrans trans, String id) {
// provide a corresponding feed that indicates that an ID has been intentionally removed from identities.dat table.
return false;
}
diff --git a/auth/auth-core/src/main/java/org/onap/aaf/auth/server/AbsServiceStarter.java b/auth/auth-core/src/main/java/org/onap/aaf/auth/server/AbsServiceStarter.java
index ee92540b..b3e2883d 100644
--- a/auth/auth-core/src/main/java/org/onap/aaf/auth/server/AbsServiceStarter.java
+++ b/auth/auth-core/src/main/java/org/onap/aaf/auth/server/AbsServiceStarter.java
@@ -148,7 +148,7 @@ public abstract class AbsServiceStarter<ENV extends RosettaEnv, TRANS extends Tr
}
status = new File(status, fname);
if(status.exists()) {
- status.delete();
+ deleted=status.delete();
}
}
if(deleted) {