Skip to content

Commit 1c06d55

Browse files
author
Charles Greer
committed
Clean imports in test directory
1 parent f56d6e6 commit 1c06d55

20 files changed

+144
-216
lines changed

‎marklogic-data-hub/src/main/java/com/marklogic/hub/impl/MappingManagerImpl.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import com.fasterxml.jackson.databind.JsonNode;
2020
import com.fasterxml.jackson.databind.ObjectMapper;
2121
import com.fasterxml.jackson.databind.SerializationFeature;
22-
import com.fasterxml.jackson.databind.node.ObjectNode;
2322
import com.marklogic.client.ext.helper.LoggingObject;
2423
import com.marklogic.hub.HubConfig;
2524
import com.marklogic.hub.MappingManager;
@@ -35,8 +34,6 @@
3534
import java.io.FileInputStream;
3635
import java.io.FileOutputStream;
3736
import java.io.IOException;
38-
import java.nio.charset.StandardCharsets;
39-
import java.nio.file.Files;
4037
import java.nio.file.Path;
4138
import java.nio.file.Paths;
4239
import java.util.ArrayList;

‎marklogic-data-hub/src/test/java/com/marklogic/hub/HubTestBase.java‎

Lines changed: 37 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -15,59 +15,14 @@
1515
*/
1616
package com.marklogic.hub;
1717

18-
import static com.marklogic.client.io.DocumentMetadataHandle.Capability.READ;
19-
import static com.marklogic.client.io.DocumentMetadataHandle.Capability.UPDATE;
20-
21-
import java.io.*;
22-
import java.nio.file.Files;
23-
import java.nio.file.Path;
24-
import java.nio.file.Paths;
25-
import java.security.KeyStore;
26-
import java.security.KeyStoreException;
27-
import java.security.NoSuchAlgorithmException;
28-
import java.security.cert.CertificateException;
29-
import java.security.cert.CertificateFactory;
30-
import java.security.cert.X509Certificate;
31-
import java.util.ArrayList;
32-
import java.util.HashMap;
33-
import java.util.List;
34-
import java.util.Map;
35-
import java.util.Properties;
36-
37-
import javax.net.ssl.KeyManager;
38-
import javax.net.ssl.KeyManagerFactory;
39-
import javax.net.ssl.SSLContext;
40-
import javax.net.ssl.TrustManagerFactory;
41-
import javax.net.ssl.X509TrustManager;
42-
import javax.xml.parsers.DocumentBuilder;
43-
import javax.xml.parsers.DocumentBuilderFactory;
44-
import javax.xml.parsers.ParserConfigurationException;
45-
import javax.xml.transform.OutputKeys;
46-
import javax.xml.transform.Transformer;
47-
import javax.xml.transform.TransformerException;
48-
import javax.xml.transform.TransformerFactory;
49-
import javax.xml.transform.dom.DOMSource;
50-
import javax.xml.transform.stream.StreamResult;
51-
52-
import com.marklogic.appdeployer.command.modules.LoadModulesCommand;
53-
import org.apache.commons.io.FileUtils;
54-
import org.apache.commons.io.FilenameUtils;
55-
import org.apache.commons.io.IOUtils;
56-
import org.custommonkey.xmlunit.XMLUnit;
57-
import org.json.JSONException;
58-
import org.skyscreamer.jsonassert.JSONAssert;
59-
import org.slf4j.Logger;
60-
import org.slf4j.LoggerFactory;
61-
import org.w3c.dom.Document;
62-
import org.xml.sax.SAXException;
63-
6418
import com.fasterxml.jackson.core.JsonProcessingException;
6519
import com.fasterxml.jackson.databind.JsonNode;
6620
import com.fasterxml.jackson.databind.ObjectMapper;
6721
import com.fasterxml.jackson.databind.node.ArrayNode;
6822
import com.fasterxml.jackson.databind.node.ObjectNode;
6923
import com.marklogic.appdeployer.AppConfig;
7024
import com.marklogic.appdeployer.command.Command;
25+
import com.marklogic.appdeployer.command.modules.LoadModulesCommand;
7126
import com.marklogic.appdeployer.impl.SimpleAppDeployer;
7227
import com.marklogic.client.DatabaseClient;
7328
import com.marklogic.client.DatabaseClientFactory;
@@ -82,12 +37,7 @@
8237
import com.marklogic.client.eval.ServerEvaluationCall;
8338
import com.marklogic.client.ext.SecurityContextType;
8439
import com.marklogic.client.ext.modulesloader.ssl.SimpleX509TrustManager;
85-
import com.marklogic.client.io.DOMHandle;
86-
import com.marklogic.client.io.DocumentMetadataHandle;
87-
import com.marklogic.client.io.FileHandle;
88-
import com.marklogic.client.io.Format;
89-
import com.marklogic.client.io.InputStreamHandle;
90-
import com.marklogic.client.io.StringHandle;
40+
import com.marklogic.client.io.*;
9141
import com.marklogic.hub.deploy.commands.LoadHubModulesCommand;
9242
import com.marklogic.hub.deploy.commands.LoadUserStagingModulesCommand;
9343
import com.marklogic.hub.error.DataHubConfigurationException;
@@ -105,6 +55,41 @@
10555
import com.marklogic.mgmt.resource.security.CertificateAuthorityManager;
10656
import com.marklogic.mgmt.util.ObjectMapperFactory;
10757
import com.marklogic.rest.util.JsonNodeUtil;
58+
import org.apache.commons.io.FileUtils;
59+
import org.apache.commons.io.FilenameUtils;
60+
import org.apache.commons.io.IOUtils;
61+
import org.custommonkey.xmlunit.XMLUnit;
62+
import org.json.JSONException;
63+
import org.skyscreamer.jsonassert.JSONAssert;
64+
import org.slf4j.Logger;
65+
import org.slf4j.LoggerFactory;
66+
import org.w3c.dom.Document;
67+
import org.xml.sax.SAXException;
68+
69+
import javax.net.ssl.*;
70+
import javax.xml.parsers.DocumentBuilder;
71+
import javax.xml.parsers.DocumentBuilderFactory;
72+
import javax.xml.parsers.ParserConfigurationException;
73+
import javax.xml.transform.OutputKeys;
74+
import javax.xml.transform.Transformer;
75+
import javax.xml.transform.TransformerException;
76+
import javax.xml.transform.TransformerFactory;
77+
import javax.xml.transform.dom.DOMSource;
78+
import javax.xml.transform.stream.StreamResult;
79+
import java.io.*;
80+
import java.nio.file.Files;
81+
import java.nio.file.Path;
82+
import java.nio.file.Paths;
83+
import java.security.KeyStore;
84+
import java.security.KeyStoreException;
85+
import java.security.NoSuchAlgorithmException;
86+
import java.security.cert.CertificateException;
87+
import java.security.cert.CertificateFactory;
88+
import java.security.cert.X509Certificate;
89+
import java.util.*;
90+
91+
import static com.marklogic.client.io.DocumentMetadataHandle.Capability.READ;
92+
import static com.marklogic.client.io.DocumentMetadataHandle.Capability.UPDATE;
10893

10994

11095
// FIXME remove deprecated methods

‎marklogic-data-hub/src/test/java/com/marklogic/hub/MappingE2E.java‎

Lines changed: 38 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -15,36 +15,6 @@
1515
*/
1616
package com.marklogic.hub;
1717

18-
import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
19-
import static org.junit.jupiter.api.Assertions.assertEquals;
20-
import static org.junit.jupiter.api.Assertions.assertFalse;
21-
import static org.junit.jupiter.api.Assertions.assertNotEquals;
22-
import static org.junit.jupiter.api.Assertions.assertTrue;
23-
24-
import java.io.IOException;
25-
import java.nio.file.Files;
26-
import java.nio.file.Path;
27-
import java.nio.file.Paths;
28-
import java.util.ArrayList;
29-
import java.util.Arrays;
30-
import java.util.HashMap;
31-
import java.util.Iterator;
32-
import java.util.List;
33-
import java.util.Map;
34-
import java.util.Map.Entry;
35-
import java.util.Vector;
36-
import java.util.concurrent.TimeUnit;
37-
38-
import org.custommonkey.xmlunit.XMLUnit;
39-
import org.junit.jupiter.api.AfterAll;
40-
import org.junit.jupiter.api.BeforeAll;
41-
import org.junit.jupiter.api.BeforeEach;
42-
import org.junit.jupiter.api.DynamicTest;
43-
import org.junit.jupiter.api.TestFactory;
44-
import org.junit.platform.runner.JUnitPlatform;
45-
import org.junit.runner.RunWith;
46-
import org.w3c.dom.Document;
47-
4818
import com.fasterxml.jackson.core.JsonProcessingException;
4919
import com.fasterxml.jackson.databind.JsonNode;
5020
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -58,15 +28,27 @@
5828
import com.marklogic.client.io.DocumentMetadataHandle;
5929
import com.marklogic.client.io.JacksonHandle;
6030
import com.marklogic.client.io.StringHandle;
61-
import com.marklogic.hub.flow.CodeFormat;
62-
import com.marklogic.hub.flow.DataFormat;
63-
import com.marklogic.hub.flow.Flow;
64-
import com.marklogic.hub.flow.FlowRunner;
65-
import com.marklogic.hub.flow.FlowType;
31+
import com.marklogic.hub.flow.*;
6632
import com.marklogic.hub.mapping.Mapping;
6733
import com.marklogic.hub.scaffold.Scaffolding;
6834
import com.marklogic.hub.util.FileUtil;
6935
import com.marklogic.hub.util.Installer;
36+
import org.custommonkey.xmlunit.XMLUnit;
37+
import org.junit.jupiter.api.*;
38+
import org.junit.platform.runner.JUnitPlatform;
39+
import org.junit.runner.RunWith;
40+
import org.w3c.dom.Document;
41+
42+
import java.io.IOException;
43+
import java.nio.file.Files;
44+
import java.nio.file.Path;
45+
import java.nio.file.Paths;
46+
import java.util.*;
47+
import java.util.Map.Entry;
48+
import java.util.concurrent.TimeUnit;
49+
50+
import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
51+
import static org.junit.jupiter.api.Assertions.*;
7052

7153

7254
@RunWith(JUnitPlatform.class)
@@ -83,7 +65,7 @@ public class MappingE2E extends HubTestBase {
8365
private String installDocError;
8466
private List<String> modelProperties;
8567
private Scaffolding scaffolding;
86-
68+
8769
@BeforeAll
8870
public static void setup() {
8971
XMLUnit.setIgnoreWhitespace(true);
@@ -167,7 +149,7 @@ public List<DynamicTest> generateTests() {
167149
}));
168150
}
169151
});
170-
152+
171153
for(String mapping: getMappings()) {
172154
allCombos((codeFormat, dataFormat, flowType, useEs) -> {
173155
if(useEs && flowType.equals(FlowType.HARMONIZE)) {
@@ -187,35 +169,35 @@ public List<DynamicTest> generateTests() {
187169
testHarmonizeFlow(prefix, codeFormat, dataFormat, useEs, options, flowRunnerClient, HubConfig.DEFAULT_FINAL_NAME, finalCounts, true, mapping, 1);
188170
}
189171
testHarmonizeFlow(prefix, codeFormat, dataFormat, useEs, options, flowRunnerClient, HubConfig.DEFAULT_FINAL_NAME, finalCounts, true, mapping, version);
190-
191-
}));
172+
173+
}));
192174
}
193175
});
194176
}
195177
return tests;
196178
}
197-
179+
198180
private List<String> getMappings() {
199181
Path mappingDir = getHubAdminConfig().getHubMappingsDir();
200182
List<String> allMappings = new ArrayList<>();
201183
try {
202-
Files.walk(mappingDir).filter(f->Files.isDirectory(f)).forEach(f -> allMappings.add(f.getFileName().toString()));
203-
184+
Files.walk(mappingDir).filter(f->Files.isDirectory(f)).forEach(f -> allMappings.add(f.getFileName().toString()));
185+
204186
} catch (IOException e) {
205187
throw new RuntimeException(e);
206188
}
207189
//remove "mappings" form the list
208190
allMappings.remove(0);
209191
return allMappings;
210192
}
211-
193+
212194
private String getFlowName(String prefix, CodeFormat codeFormat, DataFormat dataFormat, FlowType flowType, String mapping, int version) {
213195
return prefix + "-" + flowType.toString() + "-" + codeFormat.toString() + "-" + dataFormat.toString() + "-" + mapping+"-"+version ;
214196
}
215197

216198
private void createFlow(String prefix, CodeFormat codeFormat, DataFormat dataFormat, FlowType flowType, boolean useEs, String mapping, int version, CreateFlowListener listener) {
217199
if(useEs && flowType.equals(FlowType.HARMONIZE)) {
218-
String flowName = getFlowName(prefix, codeFormat, dataFormat, flowType, mapping, version);
200+
String flowName = getFlowName(prefix, codeFormat, dataFormat, flowType, mapping, version);
219201
Path entityDir = projectDir.resolve("plugins").resolve("entities").resolve(ENTITY);
220202
Path flowDir = entityDir.resolve(flowType.toString()).resolve(flowName);
221203

@@ -243,7 +225,7 @@ private void createMappings() {
243225
//properties.put("twoProp","empid,fullname");
244226
properties.put("threeProp","empid,fullname,monthlysalary");
245227
properties.put("nonExistingProp", "fakeprop1");
246-
228+
247229

248230
for (Entry<String,String> sourceContext : sourceContexts.entrySet()) {
249231
for (Entry<String,String> property : properties.entrySet()) {
@@ -256,17 +238,17 @@ private void createMappings() {
256238
createMapping("nonExistentPath", "//test1/validtest/","http://marklogic.com/example/Schema-0.0.1/e2eentity", "empid,fullname,monthlysalary".split(","));
257239
createMapping("inCorrectPath", "//invalidtestns/","http://marklogic.com/example/Schema-0.0.1/e2eentity", "empid,fullname,monthlysalary".split(","));
258240
createMapping("empty-sourceContext", null,"http://marklogic.com/example/Schema-0.0.1/e2eentity", "empid,fullname,monthlysalary".split(","));
259-
241+
260242
createMapping("default-without-sourcedFrom", "/","http://marklogic.com/example/Schema-0.0.1/e2eentity", "empid,fullname,monthlysalary".split(","));
261243
createMapping("default-no-properties", "//*:validtest/*:","http://marklogic.com/example/Schema-0.0.1/e2eentity", new String[1]);
262244
createMapping("default-diffCanonicalProp", "//*:validtest/*:","http://marklogic.com/example/Schema-0.0.1/e2eentity","empid,fullname,monthlysalary".split(","));
263-
245+
264246
createMapping("diff-entity-validPath", "//*:validtest/*:","http://marklogic.com/example/Schema-0.0.1/fakeentity", "empid,fullname,monthlysalary".split(","));
265247
//Create another version of existing mapping
266248
createMapping("validPath1-threeProp", "//*:validtest/*:","http://marklogic.com/example/Schema-0.0.1/e2eentity", true, "empid,fullname,monthlysalary".split(","));
267249
allMappings.addAll(Arrays.asList("nonExistentPath,inCorrectPath,empty-sourceContext,default-without-sourcedFrom,default-no-properties,default-diffCanonicalProp,diff-entity-validPath".split(",")));
268-
269-
installUserModules(getHubAdminConfig(), true);
250+
251+
installUserModules(getHubAdminConfig(), true);
270252
}
271253

272254
private void createMapping(String name, String sourceContext, String targetEntityType, String ... properties) {
@@ -310,7 +292,7 @@ else if(name.contains("without-sourcedFrom")) {
310292
testMap.setProperties(mappingProperties);
311293
}
312294
mappingManager.saveMapping(testMap, incrementVersion);
313-
}
295+
}
314296

315297
private void copyFile(String srcDir, Path dstDir) {
316298
FileUtil.copy(getResourceStream(srcDir), dstDir.toFile());
@@ -358,7 +340,7 @@ private void installDocs(String flowName, DataFormat dataFormat, String collecti
358340
assertEquals(0, getStagingDocCount(collection));
359341
}
360342
}
361-
343+
362344
private Tuple<FlowRunner, JobTicket> runHarmonizeFlow(
363345
String flowName, DataFormat dataFormat,
364346
Vector<String> completed, Vector<String> failed,
@@ -438,9 +420,9 @@ private void testHarmonizeFlow(
438420
if (destDb.equals(HubConfig.DEFAULT_STAGING_NAME)) {
439421
mgr = stagingDocMgr;
440422
}
441-
423+
442424
String filename = null;
443-
425+
444426
if(flowName.contains("validPath")) {
445427
filename = "mapping/final-es";
446428
if(flowName.contains("extranodes")) {
@@ -453,7 +435,7 @@ private void testHarmonizeFlow(
453435
else {
454436
filename = "mapping/final-es-empty";
455437
}
456-
438+
457439
if(flowName.contains("nonExistingProp")) {
458440
filename = "mapping/final-es-empty";
459441
}
@@ -487,6 +469,6 @@ private void testHarmonizeFlow(
487469
else {
488470
assertNotEquals(TEST_SIZE, getFinalDocCount());
489471
tuple.x.awaitCompletion();
490-
}
472+
}
491473
}
492-
}
474+
}

‎marklogic-data-hub/src/test/java/com/marklogic/hub/PiiE2E.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
import com.marklogic.appdeployer.command.Command;
77
import com.marklogic.appdeployer.command.security.DeployProtectedPathsCommand;
88
import com.marklogic.appdeployer.command.security.DeployQueryRolesetsCommand;
9-
import com.marklogic.appdeployer.command.security.DeployRolesCommand;
10-
import com.marklogic.appdeployer.command.security.DeployUsersCommand;
119
import com.marklogic.appdeployer.impl.SimpleAppDeployer;
1210
import com.marklogic.client.DatabaseClient;
1311
import com.marklogic.client.DatabaseClientFactory;
@@ -17,7 +15,10 @@
1715
import com.marklogic.client.document.ServerTransform;
1816
import com.marklogic.client.io.DocumentMetadataHandle;
1917
import com.marklogic.client.io.FileHandle;
20-
import com.marklogic.hub.deploy.commands.*;
18+
import com.marklogic.hub.deploy.commands.DeployHubRolesCommand;
19+
import com.marklogic.hub.deploy.commands.DeployHubUsersCommand;
20+
import com.marklogic.hub.deploy.commands.DeployUserRolesCommand;
21+
import com.marklogic.hub.deploy.commands.DeployUserUsersCommand;
2122
import com.marklogic.hub.flow.Flow;
2223
import com.marklogic.hub.flow.FlowRunner;
2324
import com.marklogic.hub.flow.FlowType;

‎marklogic-data-hub/src/test/java/com/marklogic/hub/ScaffoldingE2E.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
package com.marklogic.hub;
1717

18-
import com.marklogic.hub.HubTestBase;
1918
import com.marklogic.hub.flow.CodeFormat;
2019
import com.marklogic.hub.flow.DataFormat;
2120
import com.marklogic.hub.flow.FlowType;

‎marklogic-data-hub/src/test/java/com/marklogic/hub/collector/EmptyCollectorTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import com.fasterxml.jackson.databind.JsonNode;
1919
import com.marklogic.client.datamovement.JobTicket;
2020
import com.marklogic.client.io.JacksonHandle;
21-
import com.marklogic.hub.DataHub;
2221
import com.marklogic.hub.FlowManager;
2322
import com.marklogic.hub.HubConfig;
2423
import com.marklogic.hub.HubTestBase;

‎marklogic-data-hub/src/test/java/com/marklogic/hub/collector/StreamCollectorTest.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,7 @@
4040
import java.util.ArrayList;
4141
import java.util.HashMap;
4242

43-
import static org.junit.Assert.assertFalse;
44-
import static org.junit.Assert.assertTrue;
45-
import static org.junit.Assert.assertEquals;
43+
import static org.junit.Assert.*;
4644

4745
public class StreamCollectorTest extends HubTestBase {
4846

0 commit comments

Comments
 (0)