eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-21 21:25:38 +00:00
Code Activity

adjusted all MongoDB 4.3.1 incompatibilities from a compilation perspective; see what Hudson says...

Browse Source
This commit is contained in:
Axel Uhl
2021-08-25 22:08:32 +02:00
parent 0bd21957a8
commit c311bc8ba2
16 changed files with 59 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/impl/MongoObjectFactoryImpl.java
+9 -9
View File
@@ -15,7 +15,7 @@ import com.mongodb.WriteConcern;
import com.mongodb.client.MongoCollection;
import com.mongodb.client.MongoDatabase;
import com.mongodb.client.model.IndexOptions;
import com.mongodb.client.model.UpdateOptions;
import com.mongodb.client.model.ReplaceOptions;
import com.sap.sse.security.interfaces.Social;
import com.sap.sse.security.shared.AccessControlListAnnotation;
import com.sap.sse.security.shared.Account;
@@ -85,7 +85,7 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory {
permissionMap.add(permissionMapEntry);
}
dbACL.put(FieldNames.AccessControlList.PERMISSION_MAP.name(), permissionMap);
aclCollection.withWriteConcern(WriteConcern.ACKNOWLEDGED).replaceOne(query, dbACL, new UpdateOptions().upsert(true));
aclCollection.withWriteConcern(WriteConcern.ACKNOWLEDGED).replaceOne(query, dbACL, new ReplaceOptions().upsert(true));
}
@Override
@@ -113,7 +113,7 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory {
dbOwnership.put(FieldNames.Ownership.OWNER_USERNAME.name(), owner.getAnnotation().getUserOwner()==null?null:owner.getAnnotation().getUserOwner().getName());
dbOwnership.put(FieldNames.Ownership.TENANT_OWNER_ID.name(), owner.getAnnotation().getTenantOwner()==null?null:owner.getAnnotation().getTenantOwner().getId());
dbOwnership.put(FieldNames.Ownership.OBJECT_DISPLAY_NAME.name(), owner.getDisplayNameOfAnnotatedObject());
ownershipCollection.withWriteConcern(WriteConcern.ACKNOWLEDGED).replaceOne(query, dbOwnership, new UpdateOptions().upsert(true));
ownershipCollection.withWriteConcern(WriteConcern.ACKNOWLEDGED).replaceOne(query, dbOwnership, new ReplaceOptions().upsert(true));
}
@Override
@@ -144,7 +144,7 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory {
stringPermissions.add(permission.toString());
}
dbRole.put(FieldNames.Role.PERMISSIONS.name(), stringPermissions);
roleCollection.withWriteConcern(WriteConcern.ACKNOWLEDGED).replaceOne(query, dbRole, new UpdateOptions().upsert(true));
roleCollection.withWriteConcern(WriteConcern.ACKNOWLEDGED).replaceOne(query, dbRole, new ReplaceOptions().upsert(true));
}
@Override
@@ -187,7 +187,7 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory {
dbRoleDefinitionMap.add(dbRoleDef);
}
dbUserGroup.put(FieldNames.UserGroup.ROLE_DEFINITION_MAP.name(), dbRoleDefinitionMap);
userGroupCollection.withWriteConcern(WriteConcern.ACKNOWLEDGED).replaceOne(query, dbUserGroup, new UpdateOptions().upsert(true));
userGroupCollection.withWriteConcern(WriteConcern.ACKNOWLEDGED).replaceOne(query, dbUserGroup, new ReplaceOptions().upsert(true));
}
@Override
@@ -232,7 +232,7 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory {
}
dbUser.put(FieldNames.User.DEFAULT_TENANT_IDS.name(), defaultTennants);
dbUser.put(FieldNames.User.SUBSCRIPTIONS.name(), createSubscriptions(user.getSubscriptions()));
usersCollection.withWriteConcern(WriteConcern.ACKNOWLEDGED).replaceOne(query, dbUser, new UpdateOptions().upsert(true));
usersCollection.withWriteConcern(WriteConcern.ACKNOWLEDGED).replaceOne(query, dbUser, new ReplaceOptions().upsert(true));
}
@Override
@@ -276,7 +276,7 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory {
Document query = new Document(FieldNames.Settings.NAME.name(), FieldNames.Settings.VALUES.name());
dbSettings.put(FieldNames.Settings.NAME.name(), FieldNames.Settings.VALUES.name());
dbSettings.put(FieldNames.Settings.MAP.name(), createSettingsMapObject(settings));
settingCollection.withWriteConcern(WriteConcern.ACKNOWLEDGED).replaceOne(query, dbSettings, new UpdateOptions().upsert(true));
settingCollection.withWriteConcern(WriteConcern.ACKNOWLEDGED).replaceOne(query, dbSettings, new ReplaceOptions().upsert(true));
}
@Override
@@ -298,7 +298,7 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory {
Document query = new Document(FieldNames.Preferences.USERNAME.name(), username);
Document update = new Document(FieldNames.Preferences.KEYS_AND_VALUES.name(), dbSettings);
update.put(FieldNames.Preferences.USERNAME.name(), username);
settingCollection.withWriteConcern(WriteConcern.ACKNOWLEDGED).replaceOne(query, update, new UpdateOptions().upsert(true));
settingCollection.withWriteConcern(WriteConcern.ACKNOWLEDGED).replaceOne(query, update, new ReplaceOptions().upsert(true));
}
@Override
@@ -316,7 +316,7 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory {
Document query = new Document(FieldNames.Settings.NAME.name(), FieldNames.Settings.TYPES.name());
dbSettingTypes.put(FieldNames.Settings.NAME.name(), FieldNames.Settings.TYPES.name());
dbSettingTypes.put(FieldNames.Settings.MAP.name(), createSettingTypesMapObject(settingTypes));
settingCollection.withWriteConcern(WriteConcern.ACKNOWLEDGED).replaceOne(query, dbSettingTypes, new UpdateOptions().upsert(true));
settingCollection.withWriteConcern(WriteConcern.ACKNOWLEDGED).replaceOne(query, dbSettingTypes, new ReplaceOptions().upsert(true));
}
private Document createSettingsMapObject(Map<String, Object> settings) {