Skip to content

Commit

Permalink
fixing issue #833 (#834)
Browse files Browse the repository at this point in the history
  • Loading branch information
paxtonhare authored Mar 22, 2018
1 parent 5dd8ea6 commit 056a964
Show file tree
Hide file tree
Showing 6 changed files with 305 additions and 10 deletions.
3 changes: 0 additions & 3 deletions quick-start/e2e/page-objects/auth/authenticated.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import { pages } from '../../page-objects/page';
import loginPage from '../../page-objects/auth/login';
import logoutPage from '../../page-objects/auth/logout';
import mDashboard from '../../page-objects/monitor/dashboard'
import layoutPage from '../../page-objects/layoutPage';

export default function() {
}
2 changes: 1 addition & 1 deletion quick-start/e2e/specs/auth/authenticated.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export default function(tmpDir) {
expect(loginPage.stagingAppserverNameLabel.isPresent()).toBe(true);
expect(loginPage.stagingAppserverName.getAttribute('value')).toEqual('data-hub-STAGING');
expect(loginPage.modulesDbName.getAttribute('value')).toEqual('data-hub-MODULES');
expect(loginPage.dataHubName.getAttribute('value')).toEqual('');
expect(loginPage.dataHubName.getAttribute('value')).toEqual('data-hub');
browser.driver.sleep(3000);
expect(loginPage.projectDirTab.isDisplayed()).toBe(false);
expect(loginPage.initIfNeededTab.isDisplayed()).toBe(true);
Expand Down
2 changes: 1 addition & 1 deletion quick-start/e2e/specs/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const request = require('request').defaults({ strictSSL: false })
const tmp = require('tmp');
const fs = require('fs-extra');
const path = require('path');
let tmpobj = tmp.dirSync();
let tmpobj = tmp.dirSync({ unsafeCleanup: true });
fs.copySync('../examples/online-store/input', path.join(tmpobj.name, 'input'));
console.log('DIR: ' + tmpobj.name);

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,296 @@
package com.marklogic.quickstart.model;

import com.marklogic.hub.DatabaseKind;
import com.marklogic.hub.HubConfig;

/**
* A transport object that matches up with the Hubsettings typescript model
*/
public class HubSettings {

public static HubSettings fromHubConfig(HubConfig config) {
HubSettings settings = new HubSettings();
settings.host = config.getHost();
settings.stagingDbName = config.getDbName(DatabaseKind.STAGING);
settings.stagingHttpName = config.getHttpName(DatabaseKind.STAGING);
settings.stagingForestsPerHost = config.getForestsPerHost(DatabaseKind.STAGING);
settings.stagingPort = config.getPort(DatabaseKind.STAGING);
settings.stagingAuthMethod = config.getAuthMethod(DatabaseKind.STAGING);

settings.finalDbName = config.getDbName(DatabaseKind.FINAL);
settings.finalHttpName = config.getHttpName(DatabaseKind.FINAL);
settings.finalForestsPerHost = config.getForestsPerHost(DatabaseKind.FINAL);
settings.finalPort = config.getPort(DatabaseKind.FINAL);
settings.finalAuthMethod = config.getAuthMethod(DatabaseKind.FINAL);

settings.traceDbName = config.getDbName(DatabaseKind.TRACE);
settings.traceHttpName = config.getHttpName(DatabaseKind.TRACE);
settings.traceForestsPerHost = config.getForestsPerHost(DatabaseKind.TRACE);
settings.tracePort = config.getPort(DatabaseKind.TRACE);
settings.traceAuthMethod = config.getAuthMethod(DatabaseKind.TRACE);

settings.jobDbName = config.getDbName(DatabaseKind.JOB);
settings.jobHttpName = config.getHttpName(DatabaseKind.JOB);
settings.jobForestsPerHost = config.getForestsPerHost(DatabaseKind.JOB);
settings.jobPort = config.getPort(DatabaseKind.JOB);
settings.jobAuthMethod = config.getAuthMethod(DatabaseKind.JOB);

settings.modulesDbName = config.getDbName(DatabaseKind.MODULES);
settings.triggersDbName = config.getDbName(DatabaseKind.TRIGGERS);
settings.schemasDbName = config.getDbName(DatabaseKind.SCHEMAS);

settings.username = config.getHubUserName();
settings.projectDir = config.getProjectDir();
return settings;
}

public String getHost() {
return host;
}

public void setHost(String host) {
this.host = host;
}

public String getName() {
return name;
}

public void setName(String name) {
this.name = name;
}

public String getStagingDbName() {
return stagingDbName;
}

public void setStagingDbName(String stagingDbName) {
this.stagingDbName = stagingDbName;
}

public String getStagingHttpName() {
return stagingHttpName;
}

public void setStagingHttpName(String stagingHttpName) {
this.stagingHttpName = stagingHttpName;
}

public Integer getStagingForestsPerHost() {
return stagingForestsPerHost;
}

public void setStagingForestsPerHost(Integer stagingForestsPerHost) {
this.stagingForestsPerHost = stagingForestsPerHost;
}

public Integer getStagingPort() {
return stagingPort;
}

public void setStagingPort(Integer stagingPort) {
this.stagingPort = stagingPort;
}

public String getStagingAuthMethod() {
return stagingAuthMethod;
}

public void setStagingAuthMethod(String stagingAuthMethod) {
this.stagingAuthMethod = stagingAuthMethod;
}

public String getFinalDbName() {
return finalDbName;
}

public void setFinalDbName(String finalDbName) {
this.finalDbName = finalDbName;
}

public String getFinalHttpName() {
return finalHttpName;
}

public void setFinalHttpName(String finalHttpName) {
this.finalHttpName = finalHttpName;
}

public Integer getFinalForestsPerHost() {
return finalForestsPerHost;
}

public void setFinalForestsPerHost(Integer finalForestsPerHost) {
this.finalForestsPerHost = finalForestsPerHost;
}

public Integer getFinalPort() {
return finalPort;
}

public void setFinalPort(Integer finalPort) {
this.finalPort = finalPort;
}

public String getFinalAuthMethod() {
return finalAuthMethod;
}

public void setFinalAuthMethod(String finalAuthMethod) {
this.finalAuthMethod = finalAuthMethod;
}

public String getTraceDbName() {
return traceDbName;
}

public void setTraceDbName(String traceDbName) {
this.traceDbName = traceDbName;
}

public String getTraceHttpName() {
return traceHttpName;
}

public void setTraceHttpName(String traceHttpName) {
this.traceHttpName = traceHttpName;
}

public Integer getTraceForestsPerHost() {
return traceForestsPerHost;
}

public void setTraceForestsPerHost(Integer traceForestsPerHost) {
this.traceForestsPerHost = traceForestsPerHost;
}

public Integer getTracePort() {
return tracePort;
}

public void setTracePort(Integer tracePort) {
this.tracePort = tracePort;
}

public String getTraceAuthMethod() {
return traceAuthMethod;
}

public void setTraceAuthMethod(String traceAuthMethod) {
this.traceAuthMethod = traceAuthMethod;
}

public String getJobDbName() {
return jobDbName;
}

public void setJobDbName(String jobDbName) {
this.jobDbName = jobDbName;
}

public String getJobHttpName() {
return jobHttpName;
}

public void setJobHttpName(String jobHttpName) {
this.jobHttpName = jobHttpName;
}

public Integer getJobForestsPerHost() {
return jobForestsPerHost;
}

public void setJobForestsPerHost(Integer jobForestsPerHost) {
this.jobForestsPerHost = jobForestsPerHost;
}

public Integer getJobPort() {
return jobPort;
}

public void setJobPort(Integer jobPort) {
this.jobPort = jobPort;
}

public String getJobAuthMethod() {
return jobAuthMethod;
}

public void setJobAuthMethod(String jobAuthMethod) {
this.jobAuthMethod = jobAuthMethod;
}

public String getModulesDbName() {
return modulesDbName;
}

public void setModulesDbName(String modulesDbName) {
this.modulesDbName = modulesDbName;
}

public String getTriggersDbName() {
return triggersDbName;
}

public void setTriggersDbName(String triggersDbName) {
this.triggersDbName = triggersDbName;
}

public String getSchemasDbName() {
return schemasDbName;
}

public void setSchemasDbName(String schemasDbName) {
this.schemasDbName = schemasDbName;
}

public String getUsername() {
return username;
}

public void setUsername(String username) {
this.username = username;
}

public String getProjectDir() {
return projectDir;
}

public void setProjectDir(String projectDir) {
this.projectDir = projectDir;
}

String host = null;
String name = "data-hub";

String stagingDbName = null;
String stagingHttpName = null;
Integer stagingForestsPerHost = null;
Integer stagingPort = null;
String stagingAuthMethod = null;

String finalDbName = null;
String finalHttpName = null;
Integer finalForestsPerHost = null;
Integer finalPort = null;
String finalAuthMethod = null;

String traceDbName = null;
String traceHttpName = null;
Integer traceForestsPerHost = null;
Integer tracePort = null;
String traceAuthMethod = null;

String jobDbName = null;
String jobHttpName = null;
Integer jobForestsPerHost = null;
Integer jobPort = null;
String jobAuthMethod = null;

String modulesDbName = null;
String triggersDbName = null;
String schemasDbName = null;

String username = null;
String projectDir = null;
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.marklogic.hub.HubConfig;
import com.marklogic.hub.HubConfigBuilder;
import com.marklogic.quickstart.model.HubSettings;
import com.marklogic.quickstart.model.Project;
import com.marklogic.quickstart.service.ProjectManagerService;
import org.springframework.beans.factory.annotation.Autowired;
Expand Down Expand Up @@ -99,10 +100,10 @@ public Project initializeProject(@PathVariable int projectId, @RequestBody JsonN

@RequestMapping(value = "/{projectId}/defaults", method = RequestMethod.GET)
@ResponseBody
public HubConfig getDefaults(@PathVariable int projectId) {
public HubSettings getDefaults(@PathVariable int projectId) {
Project project = pm.getProject(projectId);
return HubConfigBuilder.newHubConfigBuilder(project.path)
return HubSettings.fromHubConfig(HubConfigBuilder.newHubConfigBuilder(project.path)
.withPropertiesFromEnvironment()
.build();
.build());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import com.fasterxml.jackson.databind.ObjectMapper;
import com.marklogic.hub.HubConfig;
import com.marklogic.quickstart.model.HubSettings;
import com.marklogic.quickstart.model.Project;
import com.marklogic.quickstart.model.ProjectInfo;
import com.marklogic.quickstart.service.ProjectManagerService;
Expand Down Expand Up @@ -130,8 +131,8 @@ public void getDefaults() {
pc.addProject(projectPath);
assertEquals(1, ((Collection<ProjectInfo>)pc.getProjects().get("projects")).size());

HubConfig hubConfig = pc.getDefaults(1);
assertEquals(projectPath, hubConfig.getProjectDir());
HubSettings hubSettings = pc.getDefaults(1);
assertEquals(projectPath, hubSettings.getProjectDir());
}

}

0 comments on commit 056a964

Please sign in to comment.