From 922170da43129451ada1bfd1d26aaa161d19bdfa Mon Sep 17 00:00:00 2001 From: YuCheng Hu Date: Wed, 21 Apr 2021 12:23:04 -0400 Subject: [PATCH 1/2] Change to load pom from central maven --- toolkits/discourse/pom.xml | 2 +- toolkits/pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/toolkits/discourse/pom.xml b/toolkits/discourse/pom.xml index 029e363b0d..8d5ecd2fac 100644 --- a/toolkits/discourse/pom.xml +++ b/toolkits/discourse/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.ossez discourse - 0.1.0-SNAPSHOT + 0.0.1 discourse jar diff --git a/toolkits/pom.xml b/toolkits/pom.xml index d0d92c38b4..d7e45798d1 100644 --- a/toolkits/pom.xml +++ b/toolkits/pom.xml @@ -9,11 +9,11 @@ com.ossez parent-modules - 1.0.0 + 0.0.1 + codebank discourse - From 8c7f86395bd0fd060d06ddf5491025084a796af7 Mon Sep 17 00:00:00 2001 From: YuCheng Hu Date: Wed, 21 Apr 2021 12:55:12 -0400 Subject: [PATCH 2/2] Init sub-module for codebank --- toolkits/.idea/.gitignore | 8 -- toolkits/.idea/codeStyles/Project.xml | 7 - toolkits/.idea/codeStyles/codeStyleConfig.xml | 5 - toolkits/.idea/compiler.xml | 6 +- toolkits/.idea/encodings.xml | 1 + .../model/entity/BBSOssezForumAttach.java | 2 +- .../model/entity/BBSOssezForumPost.java | 2 +- .../common/model/request/TopicRequest.java | 2 +- .../common/model/response/MyFileResponse.java | 2 +- .../common/model/response/SearchResponse.java | 2 +- .../discourse/DiscourseTopicsImportTest.java | 133 ++++++++++++++++++ .../test/resources/data/azure_storage.json | 15 ++ .../codebank/src/test/resources/log4j.xml | 16 +++ toolkits/discourse/pom.xml | 2 +- .../model/entity/BBSOssezForumAttach.java | 55 ++++++++ .../model/entity/BBSOssezForumPost.java | 87 ++++++++++++ .../common/model/request/TopicRequest.java | 82 +++++++++++ .../common/model/response/MyFileResponse.java | 130 +++++++++++++++++ .../common/model/response/SearchResponse.java | 37 +++++ .../discourse/DiscourseTopicsImportTest.java | 8 +- toolkits/pom.xml | 6 - 21 files changed, 569 insertions(+), 39 deletions(-) delete mode 100644 toolkits/.idea/.gitignore delete mode 100644 toolkits/.idea/codeStyles/Project.xml delete mode 100644 toolkits/.idea/codeStyles/codeStyleConfig.xml rename toolkits/{discourse/src/main/java/com/ossez/toolkits/discourse => codebank/src/main/java/com/ossez/toolkits/codebak}/common/model/entity/BBSOssezForumAttach.java (94%) rename toolkits/{discourse/src/main/java/com/ossez/toolkits/discourse => codebank/src/main/java/com/ossez/toolkits/codebak}/common/model/entity/BBSOssezForumPost.java (96%) rename toolkits/{discourse/src/main/java/com/ossez/toolkits/discourse => codebank/src/main/java/com/ossez/toolkits/codebak}/common/model/request/TopicRequest.java (96%) rename toolkits/{discourse/src/main/java/com/ossez/toolkits/discourse => codebank/src/main/java/com/ossez/toolkits/codebak}/common/model/response/MyFileResponse.java (98%) rename toolkits/{discourse/src/main/java/com/ossez/toolkits/discourse => codebank/src/main/java/com/ossez/toolkits/codebak}/common/model/response/SearchResponse.java (92%) create mode 100644 toolkits/codebank/src/test/java/com/ossez/toolkits/discourse/DiscourseTopicsImportTest.java create mode 100644 toolkits/codebank/src/test/resources/data/azure_storage.json create mode 100644 toolkits/codebank/src/test/resources/log4j.xml create mode 100644 toolkits/discourse/src/main/java/com/ossez/toolkits/codebak/common/model/entity/BBSOssezForumAttach.java create mode 100644 toolkits/discourse/src/main/java/com/ossez/toolkits/codebak/common/model/entity/BBSOssezForumPost.java create mode 100644 toolkits/discourse/src/main/java/com/ossez/toolkits/codebak/common/model/request/TopicRequest.java create mode 100644 toolkits/discourse/src/main/java/com/ossez/toolkits/codebak/common/model/response/MyFileResponse.java create mode 100644 toolkits/discourse/src/main/java/com/ossez/toolkits/codebak/common/model/response/SearchResponse.java diff --git a/toolkits/.idea/.gitignore b/toolkits/.idea/.gitignore deleted file mode 100644 index cf75470660..0000000000 --- a/toolkits/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Datasource local storage ignored files -/../../../../../../../:\WorkDir\GitHub\cwiki-us-docs\java-tutorials\toolkits\.idea/dataSources/ -/dataSources.local.xml -# Editor-based HTTP Client requests -/httpRequests/ diff --git a/toolkits/.idea/codeStyles/Project.xml b/toolkits/.idea/codeStyles/Project.xml deleted file mode 100644 index 919ce1f1f7..0000000000 --- a/toolkits/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/toolkits/.idea/codeStyles/codeStyleConfig.xml b/toolkits/.idea/codeStyles/codeStyleConfig.xml deleted file mode 100644 index a55e7a179b..0000000000 --- a/toolkits/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/toolkits/.idea/compiler.xml b/toolkits/.idea/compiler.xml index 45d2ba3bd2..6c6e9b735f 100644 --- a/toolkits/.idea/compiler.xml +++ b/toolkits/.idea/compiler.xml @@ -6,12 +6,14 @@ + - - + + + \ No newline at end of file diff --git a/toolkits/.idea/encodings.xml b/toolkits/.idea/encodings.xml index 44b56b318b..a0529939e8 100644 --- a/toolkits/.idea/encodings.xml +++ b/toolkits/.idea/encodings.xml @@ -1,6 +1,7 @@ + \ No newline at end of file diff --git a/toolkits/discourse/src/main/java/com/ossez/toolkits/discourse/common/model/entity/BBSOssezForumAttach.java b/toolkits/codebank/src/main/java/com/ossez/toolkits/codebak/common/model/entity/BBSOssezForumAttach.java similarity index 94% rename from toolkits/discourse/src/main/java/com/ossez/toolkits/discourse/common/model/entity/BBSOssezForumAttach.java rename to toolkits/codebank/src/main/java/com/ossez/toolkits/codebak/common/model/entity/BBSOssezForumAttach.java index 9f478fb32f..aa983fa094 100644 --- a/toolkits/discourse/src/main/java/com/ossez/toolkits/discourse/common/model/entity/BBSOssezForumAttach.java +++ b/toolkits/codebank/src/main/java/com/ossez/toolkits/codebak/common/model/entity/BBSOssezForumAttach.java @@ -1,4 +1,4 @@ -package com.ossez.toolkits.discourse.common.model.entity; +package com.ossez.toolkits.codebak.common.model.entity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/toolkits/discourse/src/main/java/com/ossez/toolkits/discourse/common/model/entity/BBSOssezForumPost.java b/toolkits/codebank/src/main/java/com/ossez/toolkits/codebak/common/model/entity/BBSOssezForumPost.java similarity index 96% rename from toolkits/discourse/src/main/java/com/ossez/toolkits/discourse/common/model/entity/BBSOssezForumPost.java rename to toolkits/codebank/src/main/java/com/ossez/toolkits/codebak/common/model/entity/BBSOssezForumPost.java index 153e6136ad..01b7b74fd8 100644 --- a/toolkits/discourse/src/main/java/com/ossez/toolkits/discourse/common/model/entity/BBSOssezForumPost.java +++ b/toolkits/codebank/src/main/java/com/ossez/toolkits/codebak/common/model/entity/BBSOssezForumPost.java @@ -1,4 +1,4 @@ -package com.ossez.toolkits.discourse.common.model.entity; +package com.ossez.toolkits.codebak.common.model.entity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/toolkits/discourse/src/main/java/com/ossez/toolkits/discourse/common/model/request/TopicRequest.java b/toolkits/codebank/src/main/java/com/ossez/toolkits/codebak/common/model/request/TopicRequest.java similarity index 96% rename from toolkits/discourse/src/main/java/com/ossez/toolkits/discourse/common/model/request/TopicRequest.java rename to toolkits/codebank/src/main/java/com/ossez/toolkits/codebak/common/model/request/TopicRequest.java index 4922afe57f..d1fdae3112 100644 --- a/toolkits/discourse/src/main/java/com/ossez/toolkits/discourse/common/model/request/TopicRequest.java +++ b/toolkits/codebank/src/main/java/com/ossez/toolkits/codebak/common/model/request/TopicRequest.java @@ -1,4 +1,4 @@ -package com.ossez.toolkits.discourse.common.model.request; +package com.ossez.toolkits.codebak.common.model.request; import java.io.Serializable; diff --git a/toolkits/discourse/src/main/java/com/ossez/toolkits/discourse/common/model/response/MyFileResponse.java b/toolkits/codebank/src/main/java/com/ossez/toolkits/codebak/common/model/response/MyFileResponse.java similarity index 98% rename from toolkits/discourse/src/main/java/com/ossez/toolkits/discourse/common/model/response/MyFileResponse.java rename to toolkits/codebank/src/main/java/com/ossez/toolkits/codebak/common/model/response/MyFileResponse.java index 86b519589f..6fb32dec9d 100644 --- a/toolkits/discourse/src/main/java/com/ossez/toolkits/discourse/common/model/response/MyFileResponse.java +++ b/toolkits/codebank/src/main/java/com/ossez/toolkits/codebak/common/model/response/MyFileResponse.java @@ -1,4 +1,4 @@ -package discourse.common.model.response; +package com.ossez.toolkits.codebak.common.model.response; import java.io.Serializable; diff --git a/toolkits/discourse/src/main/java/com/ossez/toolkits/discourse/common/model/response/SearchResponse.java b/toolkits/codebank/src/main/java/com/ossez/toolkits/codebak/common/model/response/SearchResponse.java similarity index 92% rename from toolkits/discourse/src/main/java/com/ossez/toolkits/discourse/common/model/response/SearchResponse.java rename to toolkits/codebank/src/main/java/com/ossez/toolkits/codebak/common/model/response/SearchResponse.java index a990ac0f70..8dcaeb5e99 100644 --- a/toolkits/discourse/src/main/java/com/ossez/toolkits/discourse/common/model/response/SearchResponse.java +++ b/toolkits/codebank/src/main/java/com/ossez/toolkits/codebak/common/model/response/SearchResponse.java @@ -1,4 +1,4 @@ -package discourse.common.model.response; +package com.ossez.toolkits.codebak.common.model.response; import java.io.Serializable; import java.util.Date; diff --git a/toolkits/codebank/src/test/java/com/ossez/toolkits/discourse/DiscourseTopicsImportTest.java b/toolkits/codebank/src/test/java/com/ossez/toolkits/discourse/DiscourseTopicsImportTest.java new file mode 100644 index 0000000000..74756c0231 --- /dev/null +++ b/toolkits/codebank/src/test/java/com/ossez/toolkits/discourse/DiscourseTopicsImportTest.java @@ -0,0 +1,133 @@ +package com.ossez.toolkits.discourse; + +import com.google.gson.Gson; +import com.ossez.toolkits.codebak.common.model.entity.BBSOssezForumPost; +import com.ossez.toolkits.codebak.common.model.request.TopicRequest; +import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.math.NumberUtils; +import org.apache.http.HttpHeaders; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.StringEntity; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClients; +import org.apache.http.util.EntityUtils; +import org.joda.time.DateTime; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestInstance; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.File; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.List; + +import static org.junit.jupiter.api.Assertions.assertNotNull; + +/** + * Test Logger and function + * + * @author YuCheng Hu + */ +@TestInstance(TestInstance.Lifecycle.PER_CLASS) +public class DiscourseTopicsImportTest { + private static Logger logger = LoggerFactory.getLogger(DiscourseTopicsImportTest.class); + + + @BeforeAll + protected void setUp() throws Exception { + } + + @AfterAll + protected void tearDown() throws Exception { + } + + /** + * Tests search functionality for the customer object. + */ + @Test + public void testPost() throws IOException, InterruptedException { + List idList = FileUtils.readLines(new File("C:\\Users\\yhu\\Pictures\\Pics\\2021-01\\1.txt")); + for (String id : idList) { + processPost(NumberUtils.toLong(id)); + Thread.sleep(6000); +// break; + + } + + + // make sure the customer was found +// assertNotNull(bbsOssezForumPost); + } + + @Test + public void testDateTime() throws IOException { + DateTime dateTime = new DateTime(1256834117 * 1000L); + System.out.println(dateTime.toString()); + + } + + private void processPost(Long tid) throws IOException { + String postCtx = StringUtils.EMPTY; + +// BBSOssezForumPost bbsOssezForumPost = PostFactory.getBBSOssezForumPostTid(tid); + BBSOssezForumPost bbsOssezForumPost = new BBSOssezForumPost(); +// if (bbsOssezForumPost == null) +// return; +// +// logger.debug("Questions Content - {}", bbsOssezForumPost.getSubject()); +// +// String postCtx = bbsOssezForumPost.getMessage(); +//// logger.debug(">>>>{}", postCtx); +// +// +// String pattern = "\\[attach\\]((\\d)*?)\\[\\/attach\\]"; +// +// // Create a Pattern object +// Pattern r = Pattern.compile(pattern); +// +// // Now create matcher object. +// Matcher m = r.matcher(postCtx); +// +// while (m.find()) { +// String attachId = StringUtils.substringBetween(m.group(0), "[attach]", "[/attach]"); +// logger.debug("{}", attachId); +// BBSOssezForumAttach bbsOssezForumAttach = PostFactory.getBBSOssezForumAttach(NumberUtils.toLong(attachId)); +// if (bbsOssezForumAttach!= null) { +// String fullURL = "![](https://cdn.ossez.com/com-ossez-www/data/attachment/forum/" + bbsOssezForumAttach.getAttachment() + ")"; +// postCtx = StringUtils.replace(postCtx, m.group(0), fullURL); +// } +// } + + logger.debug("{}", postCtx); + + + CloseableHttpClient client = HttpClients.createDefault(); + + HttpPost httpPost = new HttpPost("https://www.ossez.com/posts.json"); + httpPost.setHeader(HttpHeaders.CONTENT_TYPE, "application/json; charset=UTF-8"); + httpPost.setHeader("Api-Key", "XXXX"); + httpPost.setHeader("Api-Username", "XXXX"); + + TopicRequest topicRequest = new TopicRequest(); + topicRequest.setTitle(bbsOssezForumPost.getSubject()); + topicRequest.setRaw(postCtx); + topicRequest.setCreated_at(new DateTime(bbsOssezForumPost.getDateline() * 1000L).toString() ); + topicRequest.setCategory(30); + + StringEntity postingString = new StringEntity(new Gson().toJson(topicRequest), StandardCharsets.UTF_8); + + httpPost.setEntity(postingString); + + + CloseableHttpResponse response = client.execute(httpPost); + + logger.info("{}", EntityUtils.toString(response.getEntity()), StandardCharsets.UTF_8); + client.close(); + } + +} diff --git a/toolkits/codebank/src/test/resources/data/azure_storage.json b/toolkits/codebank/src/test/resources/data/azure_storage.json new file mode 100644 index 0000000000..eb20d14fae --- /dev/null +++ b/toolkits/codebank/src/test/resources/data/azure_storage.json @@ -0,0 +1,15 @@ +{ + "id": 16, + "uuid": "35057495-bec8-4288-beec-568c552c88e4", + "dateModified": "2020-10-29T11:56:06.630+00:00", + "userId": "24548d05-5274-4ea0-82aa-f1693cb82045", + "userName": "Hu, Yucheng", + "userEmail": "Yucheng.Hu@insight.com", + "customerName": "license (1).txt", + "inputFileName": "license (1).txt", + "fileRowCount": null, + "fileMatchCount": null, + "fileStatus": null, + "fileSHA3": "069f7222e83cecec5663c47b0e2736709c425448b47962d1827ca958", + "createDate": "2020-10-29T11:56:06.630+00:00" +} \ No newline at end of file diff --git a/toolkits/codebank/src/test/resources/log4j.xml b/toolkits/codebank/src/test/resources/log4j.xml new file mode 100644 index 0000000000..4c1a066f00 --- /dev/null +++ b/toolkits/codebank/src/test/resources/log4j.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/toolkits/discourse/pom.xml b/toolkits/discourse/pom.xml index 8d5ecd2fac..ecc3e6f9bc 100644 --- a/toolkits/discourse/pom.xml +++ b/toolkits/discourse/pom.xml @@ -30,7 +30,7 @@ joda-time joda-time - 2.10.10 + 2.10.6 diff --git a/toolkits/discourse/src/main/java/com/ossez/toolkits/codebak/common/model/entity/BBSOssezForumAttach.java b/toolkits/discourse/src/main/java/com/ossez/toolkits/codebak/common/model/entity/BBSOssezForumAttach.java new file mode 100644 index 0000000000..aa983fa094 --- /dev/null +++ b/toolkits/discourse/src/main/java/com/ossez/toolkits/codebak/common/model/entity/BBSOssezForumAttach.java @@ -0,0 +1,55 @@ +package com.ossez.toolkits.codebak.common.model.entity; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.persistence.*; +import java.io.Serializable; + + +@Entity +@Table(catalog = "ossez_bbs", name = "bbsossez_forum_attach") +public class BBSOssezForumAttach implements Serializable { + private static final long serialVersionUID = 5530454436970805656L; + + private static Logger logger = LoggerFactory.getLogger(BBSOssezForumAttach.class); + + + @Id + @Column(name = "aid") + @GeneratedValue(strategy = GenerationType.IDENTITY) + private long id = 0; + + @Column(name = "attachment") + private String attachment; + + + + /** + * Constructor + */ + public BBSOssezForumAttach() { + + } + + public static long getSerialVersionUID() { + return serialVersionUID; + } + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + + public String getAttachment() { + return attachment; + } + + public void setAttachment(String attachment) { + this.attachment = attachment; + } +} \ No newline at end of file diff --git a/toolkits/discourse/src/main/java/com/ossez/toolkits/codebak/common/model/entity/BBSOssezForumPost.java b/toolkits/discourse/src/main/java/com/ossez/toolkits/codebak/common/model/entity/BBSOssezForumPost.java new file mode 100644 index 0000000000..01b7b74fd8 --- /dev/null +++ b/toolkits/discourse/src/main/java/com/ossez/toolkits/codebak/common/model/entity/BBSOssezForumPost.java @@ -0,0 +1,87 @@ +package com.ossez.toolkits.codebak.common.model.entity; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.persistence.*; +import java.io.Serializable; + + +@Entity +@Table(catalog = "ossez_bbs", name = "bbsossez_forum_post") +public class BBSOssezForumPost implements Serializable { + private static final long serialVersionUID = 5530454436970805656L; + + private static Logger logger = LoggerFactory.getLogger(BBSOssezForumPost.class); + + + @Id + @Column(name = "pid") + @GeneratedValue(strategy = GenerationType.IDENTITY) + private long id = 0; + + @Column(name = "subject") + private String subject; + + @Column(name = "message") + private String message; + + @Column(name = "tid") + private Long tid; + + @Column(name = "dateline") + private Long dateline; + + + + /** + * Constructor + */ + public BBSOssezForumPost() { + + } + + public static long getSerialVersionUID() { + return serialVersionUID; + } + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + public String getSubject() { + return subject; + } + + public void setSubject(String subject) { + this.subject = subject; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public Long getTid() { + return tid; + } + + public void setTid(Long tid) { + this.tid = tid; + } + + public Long getDateline() { + return dateline; + } + + public void setDateline(Long dateline) { + this.dateline = dateline; + } +} \ No newline at end of file diff --git a/toolkits/discourse/src/main/java/com/ossez/toolkits/codebak/common/model/request/TopicRequest.java b/toolkits/discourse/src/main/java/com/ossez/toolkits/codebak/common/model/request/TopicRequest.java new file mode 100644 index 0000000000..d1fdae3112 --- /dev/null +++ b/toolkits/discourse/src/main/java/com/ossez/toolkits/codebak/common/model/request/TopicRequest.java @@ -0,0 +1,82 @@ +package com.ossez.toolkits.codebak.common.model.request; + +import java.io.Serializable; + + +/** + * SearchRequest Object, UI can send search String and related pagination + * + * @author YuCheng Hu + */ +public class TopicRequest implements Serializable { + private static final long serialVersionUID = 6474765081240948885L; + + + private String title; + private Integer topic_id; + private String raw; + private Integer category; + private String target_recipients; + private String archetype; + private String created_at; + + public static long getSerialVersionUID() { + return serialVersionUID; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public Integer getTopic_id() { + return topic_id; + } + + public void setTopic_id(Integer topic_id) { + this.topic_id = topic_id; + } + + public String getRaw() { + return raw; + } + + public void setRaw(String raw) { + this.raw = raw; + } + + public Integer getCategory() { + return category; + } + + public void setCategory(Integer category) { + this.category = category; + } + + public String getTarget_recipients() { + return target_recipients; + } + + public void setTarget_recipients(String target_recipients) { + this.target_recipients = target_recipients; + } + + public String getArchetype() { + return archetype; + } + + public void setArchetype(String archetype) { + this.archetype = archetype; + } + + public String getCreated_at() { + return created_at; + } + + public void setCreated_at(String created_at) { + this.created_at = created_at; + } +} diff --git a/toolkits/discourse/src/main/java/com/ossez/toolkits/codebak/common/model/response/MyFileResponse.java b/toolkits/discourse/src/main/java/com/ossez/toolkits/codebak/common/model/response/MyFileResponse.java new file mode 100644 index 0000000000..6fb32dec9d --- /dev/null +++ b/toolkits/discourse/src/main/java/com/ossez/toolkits/codebak/common/model/response/MyFileResponse.java @@ -0,0 +1,130 @@ +package com.ossez.toolkits.codebak.common.model.response; + +import java.io.Serializable; + +/** + * MyFileResponse for API my file response + * + * @author YuCheng Hu + */ +public class MyFileResponse implements Serializable { + private static final long serialVersionUID = -5103349220463423614L; + + private Long id; + private String azureInputFileUUID; + private String azureInputFileETag; + private String azureOutputFileUUID; + private String azureOutputFileETag; + private String customerName; + private String inputFileName; + private Integer fileCountRow; + private Integer fileCountAliasMatch; + private Integer fileCountDirectMatch; + private Integer fileCountNoMatch; + private String dateCreated; + private String uuid; + + public String getAzureInputFileUUID() { + return azureInputFileUUID; + } + + public void setAzureInputFileUUID(String azureInputFileUUID) { + this.azureInputFileUUID = azureInputFileUUID; + } + + public String getAzureInputFileETag() { + return azureInputFileETag; + } + + public void setAzureInputFileETag(String azureInputFileETag) { + this.azureInputFileETag = azureInputFileETag; + } + + public String getAzureOutputFileUUID() { + return azureOutputFileUUID; + } + + public void setAzureOutputFileUUID(String azureOutputFileUUID) { + this.azureOutputFileUUID = azureOutputFileUUID; + } + + public String getAzureOutputFileETag() { + return azureOutputFileETag; + } + + public void setAzureOutputFileETag(String azureOutputFileETag) { + this.azureOutputFileETag = azureOutputFileETag; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getInputFileName() { + return inputFileName; + } + + public void setInputFileName(String inputFileName) { + this.inputFileName = inputFileName; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Integer getFileCountRow() { + return fileCountRow; + } + + public void setFileCountRow(Integer fileCountRow) { + this.fileCountRow = fileCountRow; + } + + public Integer getFileCountAliasMatch() { + return fileCountAliasMatch; + } + + public void setFileCountAliasMatch(Integer fileCountAliasMatch) { + this.fileCountAliasMatch = fileCountAliasMatch; + } + + public Integer getFileCountDirectMatch() { + return fileCountDirectMatch; + } + + public void setFileCountDirectMatch(Integer fileCountDirectMatch) { + this.fileCountDirectMatch = fileCountDirectMatch; + } + + public Integer getFileCountNoMatch() { + return fileCountNoMatch; + } + + public void setFileCountNoMatch(Integer fileCountNoMatch) { + this.fileCountNoMatch = fileCountNoMatch; + } + + public String getDateCreated() { + return dateCreated; + } + + public void setDateCreated(String dateCreated) { + this.dateCreated = dateCreated; + } + + public String getUuid() { + return uuid; + } + + public void setUuid(String uuid) { + this.uuid = uuid; + } +} diff --git a/toolkits/discourse/src/main/java/com/ossez/toolkits/codebak/common/model/response/SearchResponse.java b/toolkits/discourse/src/main/java/com/ossez/toolkits/codebak/common/model/response/SearchResponse.java new file mode 100644 index 0000000000..8dcaeb5e99 --- /dev/null +++ b/toolkits/discourse/src/main/java/com/ossez/toolkits/codebak/common/model/response/SearchResponse.java @@ -0,0 +1,37 @@ +package com.ossez.toolkits.codebak.common.model.response; + +import java.io.Serializable; +import java.util.Date; + +/** + * SearchResponse from Remote Source + * + * @author YuCheng Hu + */ +public class SearchResponse implements Serializable { + private static final long serialVersionUID = -2014480627591149391L; + + + private String uuid; + private Date currentDate; + + public static long getSerialVersionUID() { + return serialVersionUID; + } + + public String getUuid() { + return uuid; + } + + public void setUuid(String uuid) { + this.uuid = uuid; + } + + public Date getCurrentDate() { + return currentDate; + } + + public void setCurrentDate(Date currentDate) { + this.currentDate = currentDate; + } +} diff --git a/toolkits/discourse/src/test/java/com/ossez/toolkits/discourse/DiscourseTopicsImportTest.java b/toolkits/discourse/src/test/java/com/ossez/toolkits/discourse/DiscourseTopicsImportTest.java index a31671b8e1..3f955858de 100644 --- a/toolkits/discourse/src/test/java/com/ossez/toolkits/discourse/DiscourseTopicsImportTest.java +++ b/toolkits/discourse/src/test/java/com/ossez/toolkits/discourse/DiscourseTopicsImportTest.java @@ -1,9 +1,8 @@ package com.ossez.toolkits.discourse; import com.google.gson.Gson; -import com.ossez.toolkits.discourse.common.model.entity.BBSOssezForumAttach; -import com.ossez.toolkits.discourse.common.model.entity.BBSOssezForumPost; -import com.ossez.toolkits.discourse.common.model.request.TopicRequest; +import com.ossez.toolkits.codebak.common.model.entity.BBSOssezForumPost; +import com.ossez.toolkits.codebak.common.model.request.TopicRequest; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; @@ -26,8 +25,6 @@ import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -77,6 +74,7 @@ public class DiscourseTopicsImportTest { private void processPost(Long tid) throws IOException { String postCtx = StringUtils.EMPTY; + BBSOssezForumPost bbsOssezForumPost = new BBSOssezForumPost(); // BBSOssezForumPost bbsOssezForumPost = PostFactory.getBBSOssezForumPostTid(tid); // if (bbsOssezForumPost == null) // return; diff --git a/toolkits/pom.xml b/toolkits/pom.xml index d7e45798d1..e3860756da 100644 --- a/toolkits/pom.xml +++ b/toolkits/pom.xml @@ -6,12 +6,6 @@ toolkits pom - - com.ossez - parent-modules - 0.0.1 - - codebank discourse