Skip to content

Commit 0b140f4

Browse files
stas-panasiukstas-panasiuk
committed
Codestyle updates after main merge
1 parent 3078158 commit 0b140f4

File tree

28 files changed

+772
-694
lines changed

28 files changed

+772
-694
lines changed

‎flink-cyber/cyber-jobs/src/main/assemblies/cloudera.xml‎

Lines changed: 166 additions & 166 deletions
Original file line numberDiff line numberDiff line change
@@ -20,170 +20,170 @@
2020
<!-- Do not depend on the output of the bin.xml as assemblies are executed during the same maven
2121
lifecycle phase it is safer to create independently. This also enables us to filter unnecessary files.
2222
-->
23-
<id>cloudera</id>
24-
<formats>
25-
<format>tar.gz</format>
26-
</formats>
27-
28-
<includeBaseDirectory>true</includeBaseDirectory>
29-
<baseDirectory>${cloudera.tar.name}</baseDirectory>
30-
31-
<dependencySets>
32-
<dependencySet>
33-
<outputDirectory>lib</outputDirectory>
34-
<unpack>false</unpack>
35-
<useProjectArtifact>false</useProjectArtifact>
36-
<useProjectAttachments>false</useProjectAttachments>
37-
<useTransitiveDependencies>true</useTransitiveDependencies>
38-
<useTransitiveFiltering>true</useTransitiveFiltering>
39-
<includes>
40-
<include>org.slf4j:slf4j-api</include>
41-
<include>org.apache.logging.log4j:log4j-api</include>
42-
<include>org.apache.logging.log4j:log4j-core</include>
43-
<include>org.apache.logging.log4j:log4j-slf4j-impl</include>
44-
</includes>
45-
</dependencySet>
46-
</dependencySets>
47-
48-
<files>
49-
<file>
50-
<source>../caracal-generator/target/caracal-generator-${project.version}.jar</source>
51-
<outputDirectory>jobs/</outputDirectory>
52-
<destName>caracal-generator-${cybersec.full.version}.jar</destName>
53-
<fileMode>0644</fileMode>
54-
</file>
55-
56-
<file>
57-
<source>../flink-enrichment/flink-enrichment-combined/target/flink-enrichment-combined-${project.version}.jar</source>
58-
<outputDirectory>jobs/</outputDirectory>
59-
<destName>flink-enrichment-combined-${cybersec.full.version}.jar</destName>
60-
<fileMode>0644</fileMode>
61-
</file>
62-
63-
<file>
64-
<source>../flink-enrichment/flink-enrichment-load/target/flink-enrichment-loading-${project.version}.jar</source>
65-
<outputDirectory>jobs/</outputDirectory>
66-
<destName>flink-enrichment-loading-${cybersec.full.version}.jar</destName>
67-
<fileMode>0644</fileMode>
68-
</file>
69-
70-
<file>
71-
<source>../flink-profiler-java/target/flink-profiler-java-${project.version}.jar</source>
72-
<outputDirectory>jobs/</outputDirectory>
73-
<destName>flink-profiler-java-${cybersec.full.version}.jar</destName>
74-
<fileMode>0644</fileMode>
75-
</file>
76-
<file>
77-
<source>../parser-chains-flink/target/parser-chains-flink-${project.version}.jar</source>
78-
<outputDirectory>jobs/</outputDirectory>
79-
<destName>parser-chains-flink-${cybersec.full.version}.jar</destName>
80-
<fileMode>0644</fileMode>
81-
</file>
82-
83-
<file>
84-
<source>../flink-indexing/flink-indexing-hive/target/flink-indexing-hive-${project.version}.jar</source>
85-
<outputDirectory>jobs/</outputDirectory>
86-
<destName>flink-indexing-hive-${cybersec.full.version}.jar</destName>
87-
<fileMode>0644</fileMode>
88-
</file>
89-
90-
<file>
91-
<source>../cyber-services/cyber-worker-service/target/cyber-worker-service-${project.version}.jar</source>
92-
<outputDirectory>tools/</outputDirectory>
93-
<destName>cyber-worker-service-${cybersec.full.version}.jar</destName>
94-
<fileMode>0644</fileMode>
95-
</file>
96-
97-
<file>
98-
<source>../flink-commands/scoring-commands/target/scoring-commands-${project.version}.jar</source>
99-
<outputDirectory>tools/</outputDirectory>
100-
<destName>scoring-commands-${cybersec.full.version}.jar</destName>
101-
<fileMode>0644</fileMode>
102-
</file>
103-
104-
<file>
105-
<source>../flink-commands/scoring-commands/README.md</source>
106-
<outputDirectory>tools/</outputDirectory>
107-
<destName>scoring-commands-README.md</destName>
108-
<fileMode>0644</fileMode>
109-
</file>
110-
111-
<file>
112-
<source>../flink-commands/kafka-commands/target/kafka-commands-${project.version}.jar</source>
113-
<outputDirectory>tools/</outputDirectory>
114-
<destName>kafka-commands-${cybersec.full.version}.jar</destName>
115-
<fileMode>0644</fileMode>
116-
</file>
117-
118-
<file>
119-
<source>../flink-commands/json-commands/target/json-commands-${project.version}.jar</source>
120-
<outputDirectory>tools/</outputDirectory>
121-
<destName>json-commands-${cybersec.full.version}.jar</destName>
122-
<fileMode>0644</fileMode>
123-
</file>
124-
125-
<file>
126-
<source>../metron-parser-chain/parser-chains-config-service/target/parser-chains-config-service-${project.version}.jar</source>
127-
<outputDirectory>tools/</outputDirectory>
128-
<destName>parser-chains-config-service-${project.version}.jar</destName>
129-
<fileMode>0644</fileMode>
130-
</file>
131-
132-
</files>
133-
134-
<fileSets>
135-
<fileSet>
136-
<directory>src/main/resources/conf</directory>
137-
<outputDirectory>conf</outputDirectory>
138-
<fileMode>0644</fileMode>
139-
<excludes>
140-
<exclude>*.json</exclude>
141-
<exclude>log4j.properties</exclude>
142-
</excludes>
143-
</fileSet>
144-
<fileSet>
145-
<directory>src/main/resources/conf/templates</directory>
146-
<outputDirectory>conf/templates</outputDirectory>
147-
<fileMode>0644</fileMode>
148-
</fileSet>
149-
<fileSet>
150-
<directory>src/main/resources/conf/templates/generate</directory>
151-
<outputDirectory>conf/templates/generate</outputDirectory>
152-
<fileMode>0644</fileMode>
153-
</fileSet>
154-
<fileSet>
155-
<directory>src/main/resources/conf/templates/index</directory>
156-
<outputDirectory>conf/templates/index</outputDirectory>
157-
<fileMode>0644</fileMode>
158-
</fileSet>
159-
<fileSet>
160-
<directory>src/main/resources/conf/templates/parse</directory>
161-
<outputDirectory>conf/templates/parse</outputDirectory>
162-
<fileMode>0644</fileMode>
163-
</fileSet>
164-
<fileSet>
165-
<directory>src/main/resources/conf/templates/profile</directory>
166-
<outputDirectory>conf/templates/profile</outputDirectory>
167-
<fileMode>0644</fileMode>
168-
</fileSet>
169-
<fileSet>
170-
<directory>src/main/resources/conf/templates/triage</directory>
171-
<outputDirectory>conf/templates/triage</outputDirectory>
172-
<fileMode>0644</fileMode>
173-
</fileSet>
174-
<fileSet>
175-
<directory>target/classes/scripts</directory>
176-
<outputDirectory>bin</outputDirectory>
177-
<fileMode>0755</fileMode>
178-
</fileSet>
179-
<fileSet>
180-
<directory>src/main/resources/conf</directory>
181-
<outputDirectory>tools</outputDirectory>
182-
<fileMode>0644</fileMode>
183-
<includes>
184-
<include>sample-rule.json</include>
185-
<include>log4j.properties</include>
186-
</includes>
187-
</fileSet>
188-
</fileSets>
23+
<id>cloudera</id>
24+
<formats>
25+
<format>tar.gz</format>
26+
</formats>
27+
28+
<includeBaseDirectory>true</includeBaseDirectory>
29+
<baseDirectory>${cloudera.tar.name}</baseDirectory>
30+
31+
<dependencySets>
32+
<dependencySet>
33+
<outputDirectory>lib</outputDirectory>
34+
<unpack>false</unpack>
35+
<useProjectArtifact>false</useProjectArtifact>
36+
<useProjectAttachments>false</useProjectAttachments>
37+
<useTransitiveDependencies>true</useTransitiveDependencies>
38+
<useTransitiveFiltering>true</useTransitiveFiltering>
39+
<includes>
40+
<include>org.slf4j:slf4j-api</include>
41+
<include>org.apache.logging.log4j:log4j-api</include>
42+
<include>org.apache.logging.log4j:log4j-core</include>
43+
<include>org.apache.logging.log4j:log4j-slf4j-impl</include>
44+
</includes>
45+
</dependencySet>
46+
</dependencySets>
47+
48+
<files>
49+
<file>
50+
<source>../caracal-generator/target/caracal-generator-${project.version}.jar</source>
51+
<outputDirectory>jobs/</outputDirectory>
52+
<destName>caracal-generator-${cybersec.full.version}.jar</destName>
53+
<fileMode>0644</fileMode>
54+
</file>
55+
56+
<file>
57+
<source>../flink-enrichment/flink-enrichment-combined/target/flink-enrichment-combined-${project.version}.jar</source>
58+
<outputDirectory>jobs/</outputDirectory>
59+
<destName>flink-enrichment-combined-${cybersec.full.version}.jar</destName>
60+
<fileMode>0644</fileMode>
61+
</file>
62+
63+
<file>
64+
<source>../flink-enrichment/flink-enrichment-load/target/flink-enrichment-loading-${project.version}.jar</source>
65+
<outputDirectory>jobs/</outputDirectory>
66+
<destName>flink-enrichment-loading-${cybersec.full.version}.jar</destName>
67+
<fileMode>0644</fileMode>
68+
</file>
69+
70+
<file>
71+
<source>../flink-profiler-java/target/flink-profiler-java-${project.version}.jar</source>
72+
<outputDirectory>jobs/</outputDirectory>
73+
<destName>flink-profiler-java-${cybersec.full.version}.jar</destName>
74+
<fileMode>0644</fileMode>
75+
</file>
76+
<file>
77+
<source>../parser-chains-flink/target/parser-chains-flink-${project.version}.jar</source>
78+
<outputDirectory>jobs/</outputDirectory>
79+
<destName>parser-chains-flink-${cybersec.full.version}.jar</destName>
80+
<fileMode>0644</fileMode>
81+
</file>
82+
83+
<file>
84+
<source>../flink-indexing/flink-indexing-hive/target/flink-indexing-hive-${project.version}.jar</source>
85+
<outputDirectory>jobs/</outputDirectory>
86+
<destName>flink-indexing-hive-${cybersec.full.version}.jar</destName>
87+
<fileMode>0644</fileMode>
88+
</file>
89+
90+
<file>
91+
<source>../cyber-services/cyber-worker-service/target/cyber-worker-service-${project.version}.jar</source>
92+
<outputDirectory>tools/</outputDirectory>
93+
<destName>cyber-worker-service-${cybersec.full.version}.jar</destName>
94+
<fileMode>0644</fileMode>
95+
</file>
96+
97+
<file>
98+
<source>../flink-commands/scoring-commands/target/scoring-commands-${project.version}.jar</source>
99+
<outputDirectory>tools/</outputDirectory>
100+
<destName>scoring-commands-${cybersec.full.version}.jar</destName>
101+
<fileMode>0644</fileMode>
102+
</file>
103+
104+
<file>
105+
<source>../flink-commands/scoring-commands/README.md</source>
106+
<outputDirectory>tools/</outputDirectory>
107+
<destName>scoring-commands-README.md</destName>
108+
<fileMode>0644</fileMode>
109+
</file>
110+
111+
<file>
112+
<source>../flink-commands/kafka-commands/target/kafka-commands-${project.version}.jar</source>
113+
<outputDirectory>tools/</outputDirectory>
114+
<destName>kafka-commands-${cybersec.full.version}.jar</destName>
115+
<fileMode>0644</fileMode>
116+
</file>
117+
118+
<file>
119+
<source>../flink-commands/json-commands/target/json-commands-${project.version}.jar</source>
120+
<outputDirectory>tools/</outputDirectory>
121+
<destName>json-commands-${cybersec.full.version}.jar</destName>
122+
<fileMode>0644</fileMode>
123+
</file>
124+
125+
<file>
126+
<source>../metron-parser-chain/parser-chains-config-service/target/parser-chains-config-service-${project.version}.jar</source>
127+
<outputDirectory>tools/</outputDirectory>
128+
<destName>parser-chains-config-service-${project.version}.jar</destName>
129+
<fileMode>0644</fileMode>
130+
</file>
131+
132+
</files>
133+
134+
<fileSets>
135+
<fileSet>
136+
<directory>src/main/resources/conf</directory>
137+
<outputDirectory>conf</outputDirectory>
138+
<fileMode>0644</fileMode>
139+
<excludes>
140+
<exclude>*.json</exclude>
141+
<exclude>log4j.properties</exclude>
142+
</excludes>
143+
</fileSet>
144+
<fileSet>
145+
<directory>src/main/resources/conf/templates</directory>
146+
<outputDirectory>conf/templates</outputDirectory>
147+
<fileMode>0644</fileMode>
148+
</fileSet>
149+
<fileSet>
150+
<directory>src/main/resources/conf/templates/generate</directory>
151+
<outputDirectory>conf/templates/generate</outputDirectory>
152+
<fileMode>0644</fileMode>
153+
</fileSet>
154+
<fileSet>
155+
<directory>src/main/resources/conf/templates/index</directory>
156+
<outputDirectory>conf/templates/index</outputDirectory>
157+
<fileMode>0644</fileMode>
158+
</fileSet>
159+
<fileSet>
160+
<directory>src/main/resources/conf/templates/parse</directory>
161+
<outputDirectory>conf/templates/parse</outputDirectory>
162+
<fileMode>0644</fileMode>
163+
</fileSet>
164+
<fileSet>
165+
<directory>src/main/resources/conf/templates/profile</directory>
166+
<outputDirectory>conf/templates/profile</outputDirectory>
167+
<fileMode>0644</fileMode>
168+
</fileSet>
169+
<fileSet>
170+
<directory>src/main/resources/conf/templates/triage</directory>
171+
<outputDirectory>conf/templates/triage</outputDirectory>
172+
<fileMode>0644</fileMode>
173+
</fileSet>
174+
<fileSet>
175+
<directory>target/classes/scripts</directory>
176+
<outputDirectory>bin</outputDirectory>
177+
<fileMode>0755</fileMode>
178+
</fileSet>
179+
<fileSet>
180+
<directory>src/main/resources/conf</directory>
181+
<outputDirectory>tools</outputDirectory>
182+
<fileMode>0644</fileMode>
183+
<includes>
184+
<include>sample-rule.json</include>
185+
<include>log4j.properties</include>
186+
</includes>
187+
</fileSet>
188+
</fileSets>
189189
</assembly>

‎flink-cyber/cyber-services/cyber-service-common/src/main/java/com/cloudera/service/common/request/RequestBody.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
package com.cloudera.service.common.request;
22

3+
import java.util.List;
34
import lombok.AllArgsConstructor;
45
import lombok.Builder;
56
import lombok.Data;
67
import lombok.NoArgsConstructor;
78

8-
import java.util.List;
9-
109
@Data
1110
@Builder
1211
@NoArgsConstructor

‎flink-cyber/cyber-services/cyber-service-common/src/main/java/com/cloudera/service/common/request/RequestType.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
package com.cloudera.service.common.request;
22

33
public enum RequestType {
4-
GET_ALL_CLUSTERS_SERVICE_REQUEST, GET_CLUSTER_SERVICE_REQUEST, START_JOB_REQUEST, RESTART_JOB_REQUEST, STOP_JOB_REQUEST, GET_JOB_CONFIG_REQUEST, CREATE_EMPTY_PIPELINE, START_ARCHIVE_PIPELINE, UPDATE_JOB_CONFIG_REQUEST
4+
GET_ALL_CLUSTERS_SERVICE_REQUEST,
5+
GET_CLUSTER_SERVICE_REQUEST,
6+
START_JOB_REQUEST,
7+
RESTART_JOB_REQUEST,
8+
STOP_JOB_REQUEST,
9+
GET_JOB_CONFIG_REQUEST,
10+
CREATE_EMPTY_PIPELINE,
11+
START_ARCHIVE_PIPELINE,
12+
UPDATE_JOB_CONFIG_REQUEST
513
}

‎flink-cyber/cyber-services/cyber-service-common/src/main/java/com/cloudera/service/common/response/ResponseType.java‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
package com.cloudera.service.common.response;
22

33
public enum ResponseType {
4-
GET_ALL_CLUSTERS_SERVICE_RESPONSE, GET_CLUSTER_SERVICE_RESPONSE, START_JOB_RESPONSE, RESTART_JOB_RESPONSE, STOP_JOB_RESPONSE, GET_JOB_CONFIG_RESPONSE, UPDATE_JOB_CONFIG_RESPONSE, CREATE_EMPTY_PIPELINE_RESPONSE, START_ARCHIVE_PIPELINE_RESPONSE, ERROR_RESPONSE
4+
GET_ALL_CLUSTERS_SERVICE_RESPONSE,
5+
GET_CLUSTER_SERVICE_RESPONSE,
6+
START_JOB_RESPONSE,
7+
RESTART_JOB_RESPONSE,
8+
STOP_JOB_RESPONSE,
9+
GET_JOB_CONFIG_RESPONSE,
10+
UPDATE_JOB_CONFIG_RESPONSE,
11+
CREATE_EMPTY_PIPELINE_RESPONSE,
12+
START_ARCHIVE_PIPELINE_RESPONSE,
13+
ERROR_RESPONSE
514
}

0 commit comments

Comments
 (0)