You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by dr...@apache.org on 2016/07/11 15:26:15 UTC
incubator-unomi git commit: UNOMI-39 : anonymous browsing : send
error when profile does nt exist,
deleteProfileData anonymize first before deleting profile
Repository: incubator-unomi
Updated Branches:
refs/heads/master cb52fef3e -> 4368dcb33
UNOMI-39 : anonymous browsing : send error when profile does nt exist, deleteProfileData anonymize first before deleting profile
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/4368dcb3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/4368dcb3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/4368dcb3
Branch: refs/heads/master
Commit: 4368dcb33f460f6e743084e7e1e1cf1371f06368
Parents: cb52fef
Author: Thomas Draier <dr...@apache.org>
Authored: Mon Jul 11 17:26:11 2016 +0200
Committer: Thomas Draier <dr...@apache.org>
Committed: Mon Jul 11 17:26:11 2016 +0200
----------------------------------------------------------------------
.../privacy/rest/PrivacyServiceEndPoint.java | 19 ++++++-------------
.../privacy/internal/PrivacyServiceImpl.java | 13 +------------
2 files changed, 7 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/4368dcb3/extensions/privacy-extension/rest/src/main/java/org/apache/unomi/privacy/rest/PrivacyServiceEndPoint.java
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/rest/src/main/java/org/apache/unomi/privacy/rest/PrivacyServiceEndPoint.java b/extensions/privacy-extension/rest/src/main/java/org/apache/unomi/privacy/rest/PrivacyServiceEndPoint.java
index 8310863..6895305 100644
--- a/extensions/privacy-extension/rest/src/main/java/org/apache/unomi/privacy/rest/PrivacyServiceEndPoint.java
+++ b/extensions/privacy-extension/rest/src/main/java/org/apache/unomi/privacy/rest/PrivacyServiceEndPoint.java
@@ -66,15 +66,8 @@ public class PrivacyServiceEndPoint {
@POST
@Path("/profiles/{profileId}/anonymize")
- public Response anonymizeBrowsingData(@PathParam("profileId") String profileId) {
- String newProfileId = privacyService.anonymizeBrowsingData(profileId);
- if (!profileId.equals(newProfileId)) {
- return Response.ok()
- .cookie(new NewCookie("context-profile-id", newProfileId, "/", null, null, NewCookie.DEFAULT_MAX_AGE, false))
- .entity(newProfileId)
- .build();
- }
- return Response.serverError().build();
+ public void anonymizeBrowsingData(@PathParam("profileId") String profileId) {
+ privacyService.anonymizeBrowsingData(profileId);
}
@GET
@@ -86,15 +79,15 @@ public class PrivacyServiceEndPoint {
@POST
@Path("/profiles/{profileId}/anonymous")
public Response activateAnonymousSurfing(@PathParam("profileId") String profileId) {
- privacyService.setRequireAnonymousBrowsing(profileId, true);
- return Response.ok().build();
+ Boolean r = privacyService.setRequireAnonymousBrowsing(profileId, true);
+ return r ? Response.ok().build() : Response.serverError().build();
}
@DELETE
@Path("/profiles/{profileId}/anonymous")
public Response deactivateAnonymousSurfing(@PathParam("profileId") String profileId) {
- privacyService.setRequireAnonymousBrowsing(profileId, false);
- return Response.ok().build();
+ Boolean r = privacyService.setRequireAnonymousBrowsing(profileId, false);
+ return r ? Response.ok().build() : Response.serverError().build();
}
@GET
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/4368dcb3/extensions/privacy-extension/services/src/main/java/org/apache/unomi/privacy/internal/PrivacyServiceImpl.java
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/services/src/main/java/org/apache/unomi/privacy/internal/PrivacyServiceImpl.java b/extensions/privacy-extension/services/src/main/java/org/apache/unomi/privacy/internal/PrivacyServiceImpl.java
index bd73131..e05d245 100644
--- a/extensions/privacy-extension/services/src/main/java/org/apache/unomi/privacy/internal/PrivacyServiceImpl.java
+++ b/extensions/privacy-extension/services/src/main/java/org/apache/unomi/privacy/internal/PrivacyServiceImpl.java
@@ -110,18 +110,7 @@ public class PrivacyServiceImpl implements PrivacyService {
@Override
public Boolean deleteProfileData(String profileId) {
- Condition eventPropertyCondition = new Condition(definitionsService.getConditionType("eventPropertyCondition"));
- eventPropertyCondition.setParameter("propertyName", "profileId");
- eventPropertyCondition.setParameter("propertyValue", profileId);
- eventPropertyCondition.setParameter("comparisonOperator", "equals");
- persistenceService.removeByQuery(eventPropertyCondition, Event.class);
-
- Condition sessionPropertyCondition = new Condition(definitionsService.getConditionType("sessionPropertyCondition"));
- sessionPropertyCondition.setParameter("propertyName", "profileId");
- sessionPropertyCondition.setParameter("propertyValue", profileId);
- sessionPropertyCondition.setParameter("comparisonOperator", "equals");
- persistenceService.removeByQuery(sessionPropertyCondition, Session.class);
-
+ anonymizeBrowsingData(profileId);
profileService.delete(profileId, false);
return true;
}