[jira] [Resolved] (STREAMS-683) upgrade jsonschema2pojo usage to modern version
[ https://issues.apache.org/jira/browse/STREAMS-683?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Steve Blackmon resolved STREAMS-683. Resolution: Fixed > upgrade jsonschema2pojo usage to modern version > --- > > Key: STREAMS-683 > URL: https://issues.apache.org/jira/browse/STREAMS-683 > Project: Streams > Issue Type: Task > Components: Plugins >Reporter: Steve Blackmon >Assignee: Steve Blackmon >Priority: Minor > > The version of jsonschema2pojo-maven-plugin we wrap is very dated and lacking > some useful new features -- This message was sent by Atlassian Jira (v8.20.10#820010)
[streams] branch dependabot/maven/streams-plugins/streams-plugin-scala/src/test/resources/streams-plugin-scala/junit-junit-4.13.1 created (now 1d0f88e4c5)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/streams-plugins/streams-plugin-scala/src/test/resources/streams-plugin-scala/junit-junit-4.13.1 in repository https://gitbox.apache.org/repos/asf/streams.git at 1d0f88e4c5 Bump junit No new revisions were added by this update.
[streams] 01/02: resolves STREAMS-683: upgrade jsonschema2pojo usage to modern version
This is an automated email from the ASF dual-hosted git repository.
sblackmon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/streams.git
commit 91667b1a59f26fc0bb017b2246e14c3867781805
Author: sblackmon
AuthorDate: Sun Aug 28 13:27:25 2022 -0500
resolves STREAMS-683: upgrade jsonschema2pojo usage to modern version
because there were syntax changes in the new version, had to tweak a lot of
json schema files and some utility classes
---
pom.xml| 2 +-
.../ActivityConverterProcessorConfiguration.json | 4 +-
...ivityObjectConverterProcessorConfiguration.json | 4 +-
.../ElasticsearchReaderConfiguration.json | 2 +-
.../streams/graph/GraphReaderConfiguration.json| 4 +-
.../serializer/util/InstagramActivityUtil.java | 39 +---
.../streams/instagram/api/CommentsResponse.json| 4 +-
.../streams/instagram/api/MediaResponse.json | 4 +-
.../streams/instagram/api/RecentMediaResponse.json | 4 +-
.../streams/instagram/api/SearchMediaResponse.json | 4 +-
.../streams/instagram/api/SearchUsersResponse.json | 4 +-
.../streams/instagram/api/UserInfoResponse.json| 4 +-
.../streams/instagram/api/UsersInfoResponse.json | 4 +-
.../org/apache/streams/instagram/pojo/Media.json | 24 ++--
.../apache/streams/instagram/pojo/MediaItem.json | 23 +++
streams-contrib/streams-provider-linkedin/pom.xml | 30 --
.../jsonschema/ElasticsearchHdfsConfiguration.json | 12 +++-
.../jsonschema/HdfsElasticsearchConfiguration.json | 12 +++-
.../ElasticsearchReindexConfiguration.json | 12 +++-
.../MongoElasticsearchSyncConfiguration.json | 12 +++-
.../TwitterFollowNeo4jConfiguration.json | 12 +++-
.../TwitterHistoryElasticsearchConfiguration.json | 12 +++-
...witterUserstreamElasticsearchConfiguration.json | 12 +++-
.../plugins/StreamsPojoGenerationConfig.java | 8 +--
.../streams/plugins/StreamsPojoRuleLogger.java | 70 ++
.../plugins/StreamsPojoSourceGenerator.java| 22 ---
.../plugins/StreamsPojoSourceGeneratorMojo.java| 3 +-
.../test/StreamsPojoSourceGeneratorTest.java | 2 +-
.../java/org/apache/streams/util/PropertyUtil.java | 2 +-
.../streams/util/schema/SchemaStoreImpl.java | 5 +-
30 files changed, 234 insertions(+), 122 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4cb83da891..f70b1b942f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -380,7 +380,7 @@
2.4.0
0.1.10
7.2.1
-0.4.10
+1.1.2
0.14.0
0.11.1
1.3.0
diff --git
a/streams-components/streams-converters/src/main/jsonschema/org/apache/streams/converter/ActivityConverterProcessorConfiguration.json
b/streams-components/streams-converters/src/main/jsonschema/org/apache/streams/converter/ActivityConverterProcessorConfiguration.json
index f535b5ab3e..feb1b130cd 100644
---
a/streams-components/streams-converters/src/main/jsonschema/org/apache/streams/converter/ActivityConverterProcessorConfiguration.json
+++
b/streams-components/streams-converters/src/main/jsonschema/org/apache/streams/converter/ActivityConverterProcessorConfiguration.json
@@ -11,14 +11,14 @@
"classifiers": {
"type": "array",
"items": {
-"javaType": "org.apache.streams.data.DocumentClassifier",
+"existingJavaType":
"org.apache.streams.data.DocumentClassifier",
"type": "object"
}
},
"converters": {
"type": "array",
"items": {
-"javaType": "org.apache.streams.data.ActivityConverter",
+"existingJavaType":
"org.apache.streams.data.ActivityConverter",
"type": "object"
}
}
diff --git
a/streams-components/streams-converters/src/main/jsonschema/org/apache/streams/converter/ActivityObjectConverterProcessorConfiguration.json
b/streams-components/streams-converters/src/main/jsonschema/org/apache/streams/converter/ActivityObjectConverterProcessorConfiguration.json
index 7eacacbd2d..cd4dddbbd3 100644
---
a/streams-components/streams-converters/src/main/jsonschema/org/apache/streams/converter/ActivityObjectConverterProcessorConfiguration.json
+++
b/streams-components/streams-converters/src/main/jsonschema/org/apache/streams/converter/ActivityObjectConverterProcessorConfiguration.json
@@ -12,14 +12,14 @@
"type": "array",
"items": {
"type": "object",
-"javaType": "org.apache.streams.data.DocumentClassifier"
+"existingJavaType":
"org.apache.streams.data.DocumentClassifier"
}
},
"converters": {
"type": "array",
"items": {
"type": "object",
-"javaType": "org.apache.streams.data.ActivityObjectConverter"
+
[streams] 02/02: incorporate peer-review feedback
This is an automated email from the ASF dual-hosted git repository.
sblackmon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/streams.git
commit 1a9f10b7d50e0595008a7e3ea2e725322b9f87d8
Author: sblackmon
AuthorDate: Wed Sep 14 10:21:03 2022 -0500
incorporate peer-review feedback
---
.../instagram/serializer/util/InstagramActivityUtil.java | 9 -
.../apache/streams/plugins/StreamsPojoGenerationConfig.java| 10 --
2 files changed, 8 insertions(+), 11 deletions(-)
diff --git
a/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/util/InstagramActivityUtil.java
b/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/util/InstagramActivityUtil.java
index 7320648d01..2b950d917f 100644
---
a/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/util/InstagramActivityUtil.java
+++
b/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/util/InstagramActivityUtil.java
@@ -21,7 +21,14 @@ package org.apache.streams.instagram.serializer.util;
import org.apache.streams.exceptions.ActivityConversionException;
import org.apache.streams.exceptions.ActivitySerializerException;
-import org.apache.streams.instagram.pojo.*;
+import org.apache.streams.instagram.pojo.Comment;
+import org.apache.streams.instagram.pojo.Comments;
+import org.apache.streams.instagram.pojo.Images;
+import org.apache.streams.instagram.pojo.Media;
+import org.apache.streams.instagram.pojo.MediaItem;
+import org.apache.streams.instagram.pojo.UserInfo;
+import org.apache.streams.instagram.pojo.UserInfoCounts;
+import org.apache.streams.instagram.pojo.Videos;
import org.apache.streams.pojo.extensions.ExtensionUtil;
import org.apache.streams.pojo.json.Activity;
import org.apache.streams.pojo.json.ActivityObject;
diff --git
a/streams-plugins/streams-plugin-pojo/src/main/java/org/apache/streams/plugins/StreamsPojoGenerationConfig.java
b/streams-plugins/streams-plugin-pojo/src/main/java/org/apache/streams/plugins/StreamsPojoGenerationConfig.java
index ab5cbbb9ea..a1682de192 100644
---
a/streams-plugins/streams-plugin-pojo/src/main/java/org/apache/streams/plugins/StreamsPojoGenerationConfig.java
+++
b/streams-plugins/streams-plugin-pojo/src/main/java/org/apache/streams/plugins/StreamsPojoGenerationConfig.java
@@ -106,16 +106,6 @@ public class StreamsPojoGenerationConfig extends
DefaultGenerationConfig {
return true;
}
-// @Override
-// public boolean isUseCommonsLang3() {
-//return true;
-// }
-
- //@Override
- //public boolean isIncludeAdditionalProperties() {
- //return true;
- //}
-
@Override
public Class getCustomAnnotator() {
return JuneauPojoAnnotator.class;
[streams] branch master updated (4feff372e8 -> 1a9f10b7d5)
This is an automated email from the ASF dual-hosted git repository.
sblackmon pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/streams.git
from 4feff372e8 STREAMS-681: add support for using fromDate and toDate in
ThirtyDaySearchProvider
new 91667b1a59 resolves STREAMS-683: upgrade jsonschema2pojo usage to
modern version
new 1a9f10b7d5 incorporate peer-review feedback
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml| 2 +-
.../ActivityConverterProcessorConfiguration.json | 4 +-
...ivityObjectConverterProcessorConfiguration.json | 4 +-
.../ElasticsearchReaderConfiguration.json | 2 +-
.../streams/graph/GraphReaderConfiguration.json| 4 +-
.../serializer/util/InstagramActivityUtil.java | 32 +-
.../streams/instagram/api/CommentsResponse.json| 4 +-
.../streams/instagram/api/MediaResponse.json | 4 +-
.../streams/instagram/api/RecentMediaResponse.json | 4 +-
.../streams/instagram/api/SearchMediaResponse.json | 4 +-
.../streams/instagram/api/SearchUsersResponse.json | 4 +-
.../streams/instagram/api/UserInfoResponse.json| 4 +-
.../streams/instagram/api/UsersInfoResponse.json | 4 +-
.../org/apache/streams/instagram/pojo/Media.json | 24 ++--
.../{api/Meta.json => pojo/MediaItem.json} | 12 ++--
streams-contrib/streams-provider-linkedin/pom.xml | 30 --
.../jsonschema/ElasticsearchHdfsConfiguration.json | 12 +++-
.../jsonschema/HdfsElasticsearchConfiguration.json | 12 +++-
.../ElasticsearchReindexConfiguration.json | 12 +++-
.../MongoElasticsearchSyncConfiguration.json | 12 +++-
.../TwitterFollowNeo4jConfiguration.json | 12 +++-
.../TwitterHistoryElasticsearchConfiguration.json | 12 +++-
...witterUserstreamElasticsearchConfiguration.json | 12 +++-
.../plugins/StreamsPojoGenerationConfig.java | 10
.../streams/plugins/StreamsPojoRuleLogger.java | 70 ++
.../plugins/StreamsPojoSourceGenerator.java| 22 ---
.../plugins/StreamsPojoSourceGeneratorMojo.java| 3 +-
.../test/StreamsPojoSourceGeneratorTest.java | 2 +-
.../java/org/apache/streams/util/PropertyUtil.java | 2 +-
.../streams/util/schema/SchemaStoreImpl.java | 5 +-
30 files changed, 213 insertions(+), 127 deletions(-)
copy
streams-contrib/streams-provider-instagram/src/main/jsonschema/org/apache/streams/instagram/{api/Meta.json
=> pojo/MediaItem.json} (63%)
create mode 100644
streams-plugins/streams-plugin-pojo/src/main/java/org/apache/streams/plugins/StreamsPojoRuleLogger.java
[streams] branch STREAMS-683 updated (ec9c4b2846 -> acaf92c761)
This is an automated email from the ASF dual-hosted git repository. sblackmon pushed a change to branch STREAMS-683 in repository https://gitbox.apache.org/repos/asf/streams.git from ec9c4b2846 resolves STREAMS-683: upgrade jsonschema2pojo usage to modern version add acaf92c761 incorporate peer-review feedback No new revisions were added by this update. Summary of changes: .../instagram/serializer/util/InstagramActivityUtil.java | 9 - .../apache/streams/plugins/StreamsPojoGenerationConfig.java| 10 -- 2 files changed, 8 insertions(+), 11 deletions(-)
