Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deploy default artifacts #1915

Merged
merged 3 commits into from
Feb 25, 2019
Merged

Deploy default artifacts #1915

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc69600
Get resource as stream to work in both jar file and via IDE
akshaysonvane Feb 25, 2019
ce5be13
Add LoadHubArtifactsCommand to deploy default steps and flows
akshaysonvane Feb 25, 2019
e6d54f4
Adds capability to iterate over all dirs under flows and steps
akshaysonvane Feb 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 37 additions & 72 deletions ...gic-data-hub/src/main/java/com/marklogic/hub/deploy/commands/LoadHubArtifactsCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,27 +22,20 @@
import com.marklogic.client.DatabaseClient;
import com.marklogic.client.document.DocumentWriteSet;
import com.marklogic.client.document.JSONDocumentManager;
import com.marklogic.client.ext.modulesloader.Modules;
import com.marklogic.client.ext.modulesloader.impl.FlowDefModulesFinder;
import com.marklogic.client.ext.modulesloader.impl.PropertiesModuleManager;
import com.marklogic.client.ext.modulesloader.impl.StepDefModulesFinder;
import com.marklogic.client.ext.util.DefaultDocumentPermissionsParser;
import com.marklogic.client.ext.util.DocumentPermissionsParser;
import com.marklogic.client.io.DocumentMetadataHandle;
import com.marklogic.client.io.StringHandle;
import com.marklogic.hub.HubConfig;
import org.apache.commons.io.IOUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.Resource;
import org.springframework.stereotype.Component;

import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.*;
import java.nio.file.attribute.BasicFileAttributes;
import java.util.Date;
import java.util.Objects;

/**
* Loads user artifacts like mappings and entities. This will be deployed after triggers
Expand Down Expand Up @@ -93,12 +86,6 @@ public void execute(CommandContext context) {
DatabaseClient stagingClient = hubConfig.newStagingClient();
DatabaseClient finalClient = hubConfig.newFinalClient();

String baseDir = Objects.requireNonNull(getClass().getClassLoader().getResource("hub-internal-artifacts"))
.getFile();
Path basePath = Paths.get(baseDir);
Path flowPath = basePath.resolve("flows");
Path stepPath = basePath.resolve("steps");

JSONDocumentManager finalDocMgr = finalClient.newJSONDocumentManager();
JSONDocumentManager stagingDocMgr = stagingClient.newJSONDocumentManager();

Expand All @@ -110,75 +97,53 @@ public void execute(CommandContext context) {

PropertiesModuleManager propertiesModuleManager = getModulesManager();

try {
File defaultFlowFile = new File("/flows/default-flow.flow.json");
File defaultStepIngestFile = new File("/steps/ingest/marklogic/default-ingest.step.json");
File defaultStepMappingFile = new File("/steps/mapping/marklogic/default-mapping.step.json");

// let's do steps
if (stepPath.toFile().exists()) {
Files.walkFileTree(stepPath, new SimpleFileVisitor<Path>() {
@Override
public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
Modules modules = new StepDefModulesFinder().findModules(dir.toString());
DocumentMetadataHandle meta = new DocumentMetadataHandle();
meta.getCollections().add("http://marklogic.com/data-hub/step");
documentPermissionsParser.parsePermissions(hubConfig.getModulePermissions(), meta.getPermissions());
for (Resource r : modules.getAssets()) {
if (forceLoad || propertiesModuleManager.hasFileBeenModifiedSinceLastLoaded(r.getFile())) {
InputStream inputStream = r.getInputStream();
StringHandle handle = new StringHandle(IOUtils.toString(inputStream));
inputStream.close();
stagingStepDocumentWriteSet.add("/steps/" + r.getFile().getParentFile().getParentFile().getName() + "/" + r.getFile().getParentFile().getName() + "/" + r.getFilename(), meta, handle);
finalStepDocumentWriteSet.add("/steps/" + r.getFile().getParentFile().getParentFile().getName() + "/" + r.getFile().getParentFile().getName() + "/" + r.getFilename(), meta, handle);
propertiesModuleManager.saveLastLoadedTimestamp(r.getFile(), new Date());
}
}
return FileVisitResult.CONTINUE;
}
});
}
// let's do flows
InputStream inputStream = getClass().getResourceAsStream("/hub-internal-artifacts/flows/default-flow.flow.json");
addToWriteSet(inputStream, "http://marklogic.com/data-hub/flow", defaultFlowFile, stagingFlowDocumentWriteSet, finalFlowDocumentWriteSet, propertiesModuleManager);

// let's do steps
inputStream = getClass().getResourceAsStream("/hub-internal-artifacts/steps/ingest/marklogic/default-ingest.step.json");
addToWriteSet(inputStream, "http://marklogic.com/data-hub/step", defaultStepIngestFile, stagingStepDocumentWriteSet, finalStepDocumentWriteSet, propertiesModuleManager);

// let's do flows
if (flowPath.toFile().exists()) {
Files.walkFileTree(flowPath, new SimpleFileVisitor<Path>() {
@Override
public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
Modules modules = new FlowDefModulesFinder().findModules(dir.toString());
DocumentMetadataHandle meta = new DocumentMetadataHandle();
meta.getCollections().add("http://marklogic.com/data-hub/flow");
documentPermissionsParser.parsePermissions(hubConfig.getModulePermissions(), meta.getPermissions());
for (Resource r : modules.getAssets()) {
if (forceLoad || propertiesModuleManager.hasFileBeenModifiedSinceLastLoaded(r.getFile())) {
InputStream inputStream = r.getInputStream();
StringHandle handle = new StringHandle(IOUtils.toString(inputStream));
inputStream.close();
stagingFlowDocumentWriteSet.add("/flows/" + r.getFilename(), meta, handle);
finalFlowDocumentWriteSet.add("/flows/" + r.getFilename(), meta, handle);
propertiesModuleManager.saveLastLoadedTimestamp(r.getFile(), new Date());
}
}
return FileVisitResult.CONTINUE;
}
});
}

if (stagingStepDocumentWriteSet.size() > 0) {
stagingDocMgr.write(stagingStepDocumentWriteSet);
finalDocMgr.write(stagingStepDocumentWriteSet);
}
if (stagingFlowDocumentWriteSet.size() > 0) {
stagingDocMgr.write(stagingFlowDocumentWriteSet);
finalDocMgr.write(stagingFlowDocumentWriteSet);
}
inputStream = getClass().getResourceAsStream("/hub-internal-artifacts/steps/mapping/marklogic/default-mapping.step.json");
addToWriteSet(inputStream, "http://marklogic.com/data-hub/step", defaultStepMappingFile, stagingStepDocumentWriteSet, finalStepDocumentWriteSet, propertiesModuleManager);

if (stagingStepDocumentWriteSet.size() > 0) {
stagingDocMgr.write(stagingStepDocumentWriteSet);
finalDocMgr.write(stagingStepDocumentWriteSet);
}
catch (IOException e) {
e.printStackTrace();
//throw new RuntimeException(e);
if (stagingFlowDocumentWriteSet.size() > 0) {
stagingDocMgr.write(stagingFlowDocumentWriteSet);
finalDocMgr.write(stagingFlowDocumentWriteSet);
}

}

public void setHubConfig(HubConfig hubConfig) {
this.hubConfig = hubConfig;
}


private void addToWriteSet(InputStream inputStream, String docCollection, File file, DocumentWriteSet stagingDocumentWriteSet, DocumentWriteSet finalDocumentWriteSet, PropertiesModuleManager propertiesModuleManager) {
try {
StringHandle handle = new StringHandle(IOUtils.toString(inputStream));
inputStream.close();

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we put the close() to finally block?

DocumentMetadataHandle meta = new DocumentMetadataHandle();
meta.getCollections().add(docCollection);

if (forceLoad || propertiesModuleManager.hasFileBeenModifiedSinceLastLoaded(file)) {
stagingDocumentWriteSet.add(file.getPath(), meta, handle);
finalDocumentWriteSet.add(file.getPath(), meta, handle);
propertiesModuleManager.saveLastLoadedTimestamp(file, new Date());
}
}
catch (IOException e) {
e.printStackTrace();
}
}
}