https://github.com/metadatacenter/cedar-project/issues/1198

metadatacenter · Nov 8, 2023 · 0b2352e · 0b2352e
1 parent 6267489
commit 0b2352e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 15 deletions.
diff --git a/src/main/java/org/metadatacenter/admin/task/AbstractKeycloakReadingTask.java b/src/main/java/org/metadatacenter/admin/task/AbstractKeycloakReadingTask.java
@@ -11,8 +11,6 @@
 import org.metadatacenter.server.security.KeycloakUtilInfo;
 import org.metadatacenter.server.security.KeycloakUtils;
 
-import java.security.KeyStore;
-import java.security.KeyStoreException;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;

diff --git a/src/main/java/org/metadatacenter/admin/task/AbstractNeo4JAccessTask.java b/src/main/java/org/metadatacenter/admin/task/AbstractNeo4JAccessTask.java
@@ -2,22 +2,18 @@
 
 import org.keycloak.representations.idm.UserRepresentation;
 import org.metadatacenter.bridge.CedarDataServices;
-import org.metadatacenter.config.BlueprintUserProfile;
 import org.metadatacenter.config.CedarConfig;
 import org.metadatacenter.exception.security.CedarAccessException;
 import org.metadatacenter.rest.context.CedarRequestContext;
 import org.metadatacenter.rest.context.CedarRequestContextFactory;
 import org.metadatacenter.server.*;
 import org.metadatacenter.server.security.model.user.CedarSuperRole;
 import org.metadatacenter.server.security.model.user.CedarUser;
-import org.metadatacenter.server.security.model.user.CedarUserApiKey;
 import org.metadatacenter.server.security.util.CedarUserUtil;
 import org.metadatacenter.server.service.UserService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.time.Instant;
-import java.time.LocalDateTime;
 import java.util.List;
 
 public abstract class AbstractNeo4JAccessTask extends AbstractKeycloakReadingTask {

diff --git a/src/main/java/org/metadatacenter/admin/task/ImpexExportAll.java b/src/main/java/org/metadatacenter/admin/task/ImpexExportAll.java
@@ -129,18 +129,19 @@ public int execute() {
 
 
     out.info("Exporting users");
-    Path userExportPath = Paths.get(exportDir).resolve("users");
+    Path exportPath = Paths.get(exportDir);
+    Path userExportPath = exportPath.resolve("users");
     serializeUsers(userExportPath);
 
     out.info("Exporting groups");
-    Path groupExportPath = Paths.get(exportDir).resolve("groups");
+    Path groupExportPath = exportPath.resolve("groups");
     serializeGroups(groupExportPath);
 
     String rootPath = neo4jFolderSession.getRootPath();
     FolderServerFolder rootFolder = neo4jFolderSession.findFolderByPath(rootPath);
 
     out.info("Exporting resources");
-    Path resourceExportPath = Paths.get(exportDir).resolve("resources");
+    Path resourceExportPath = exportPath.resolve("resources");
     walkFolder(resourceExportPath, rootFolder, 0);
 
     return 0;
@@ -149,8 +150,7 @@ public int execute() {
 
   private int walkFolder(Path path, FileSystemResource node, int idx) {
     idx++;
-    if (node instanceof FolderServerFolder) {
-      FolderServerFolder folder = (FolderServerFolder) node;
+    if (node instanceof FolderServerFolder folder) {
       Path candidateFolder = serializeFolder(path, folder, idx);
       List<FileSystemResource> folderContents = neo4jFolderSession.findFolderContentsFiltered(folder.getResourceId(), resourceTypeList,
           ResourceVersionFilter.ALL, ResourcePublicationStatusFilter.ALL, EXPORT_MAX_COUNT, 0, sortList);

diff --git a/src/main/java/org/metadatacenter/admin/task/ImpexImportAll.java b/src/main/java/org/metadatacenter/admin/task/ImpexImportAll.java
@@ -14,7 +14,6 @@
 import org.metadatacenter.admin.task.importexport.ImportExportConstants;
 import org.metadatacenter.bridge.CedarDataServices;
 import org.metadatacenter.config.MongoConfig;
-import org.metadatacenter.id.CedarResourceId;
 import org.metadatacenter.id.CedarUntypedResourceId;
 import org.metadatacenter.model.CedarResourceType;
 import org.metadatacenter.model.RelationLabel;
@@ -116,7 +115,8 @@ public int execute() {
     deleteAllMongoData();
 
     out.info("Importing users into Mongo");
-    Path userImportPath = Paths.get(importDir).resolve("users");
+    Path importPath = Paths.get(importDir);
+    Path userImportPath = importPath.resolve("users");
     processFolder(userImportPath, this::importUserIntoMongo);
 
     out.info("Deleting everything from Neo4J");
@@ -128,11 +128,11 @@ public int execute() {
     processFolder(userImportPath, this::importUserIntoNeo);
 
     out.info("Importing groups");
-    Path groupImportPath = Paths.get(importDir).resolve("groups");
+    Path groupImportPath = importPath.resolve("groups");
     processFolder(groupImportPath, this::importGroup);
 
     out.info("Importing resources");
-    Path resourceImportPath = Paths.get(importDir).resolve("resources");
+    Path resourceImportPath = importPath.resolve("resources");
     processFolder(resourceImportPath, this::importResource);
 
     return 0;