Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dlink
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhaowei
dlink
Commits
4eb1afc1
Unverified
Commit
4eb1afc1
authored
Aug 15, 2022
by
Kerwin
Committed by
GitHub
Aug 15, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added dlink-common module code style. (#892)
parent
7fec6c37
Changes
29
Hide whitespace changes
Inline
Side-by-side
Showing
29 changed files
with
61 additions
and
89 deletions
+61
-89
Asserts.java
dlink-common/src/main/java/com/dlink/assertion/Asserts.java
+0
-3
CommonConstant.java
...mmon/src/main/java/com/dlink/constant/CommonConstant.java
+0
-1
NetConstant.java
...-common/src/main/java/com/dlink/constant/NetConstant.java
+0
-1
JobException.java
...ommon/src/main/java/com/dlink/exception/JobException.java
+0
-2
MetaDataException.java
.../src/main/java/com/dlink/exception/MetaDataException.java
+0
-2
RunTimeException.java
...n/src/main/java/com/dlink/exception/RunTimeException.java
+0
-2
SqlException.java
...ommon/src/main/java/com/dlink/exception/SqlException.java
+0
-1
Catalog.java
dlink-common/src/main/java/com/dlink/model/Catalog.java
+3
-4
Column.java
dlink-common/src/main/java/com/dlink/model/Column.java
+2
-3
ColumnType.java
dlink-common/src/main/java/com/dlink/model/ColumnType.java
+0
-1
FlinkColumn.java
dlink-common/src/main/java/com/dlink/model/FlinkColumn.java
+2
-3
JobLifeCycle.java
dlink-common/src/main/java/com/dlink/model/JobLifeCycle.java
+0
-2
JobStatus.java
dlink-common/src/main/java/com/dlink/model/JobStatus.java
+0
-1
Schema.java
dlink-common/src/main/java/com/dlink/model/Schema.java
+0
-1
SystemConfiguration.java
...on/src/main/java/com/dlink/model/SystemConfiguration.java
+8
-8
Table.java
dlink-common/src/main/java/com/dlink/model/Table.java
+3
-4
TaskOperatingSavepointSelect.java
...in/java/com/dlink/model/TaskOperatingSavepointSelect.java
+0
-3
TaskOperatingStatus.java
...on/src/main/java/com/dlink/model/TaskOperatingStatus.java
+0
-3
AbstractPool.java
dlink-common/src/main/java/com/dlink/pool/AbstractPool.java
+2
-6
ClassEntity.java
dlink-common/src/main/java/com/dlink/pool/ClassEntity.java
+1
-1
ClassPool.java
dlink-common/src/main/java/com/dlink/pool/ClassPool.java
+0
-1
AbstractResult.java
...common/src/main/java/com/dlink/result/AbstractResult.java
+0
-1
ExplainResult.java
...-common/src/main/java/com/dlink/result/ExplainResult.java
+0
-1
IResult.java
dlink-common/src/main/java/com/dlink/result/IResult.java
+0
-1
SqlExplainResult.java
...mmon/src/main/java/com/dlink/result/SqlExplainResult.java
+11
-12
JSONUtil.java
dlink-common/src/main/java/com/dlink/utils/JSONUtil.java
+24
-11
LogUtil.java
dlink-common/src/main/java/com/dlink/utils/LogUtil.java
+3
-6
RunTimeUtil.java
dlink-common/src/main/java/com/dlink/utils/RunTimeUtil.java
+0
-1
SqlUtil.java
dlink-common/src/main/java/com/dlink/utils/SqlUtil.java
+2
-3
No files found.
dlink-common/src/main/java/com/dlink/assertion/Asserts.java
View file @
4eb1afc1
...
...
@@ -17,7 +17,6 @@
*
*/
package
com
.
dlink
.
assertion
;
import
com.dlink.exception.RunTimeException
;
...
...
@@ -55,7 +54,6 @@ public class Asserts {
return
isNull
;
}
public
static
boolean
isNotNullString
(
String
str
)
{
return
!
isNullString
(
str
);
}
...
...
@@ -70,7 +68,6 @@ public class Asserts {
return
isNotNull
;
}
public
static
boolean
isEquals
(
String
str1
,
String
str2
)
{
if
(
isNull
(
str1
)
&&
isNull
(
str2
))
{
return
true
;
...
...
dlink-common/src/main/java/com/dlink/constant/CommonConstant.java
View file @
4eb1afc1
...
...
@@ -17,7 +17,6 @@
*
*/
package
com
.
dlink
.
constant
;
/**
...
...
dlink-common/src/main/java/com/dlink/constant/NetConstant.java
View file @
4eb1afc1
...
...
@@ -17,7 +17,6 @@
*
*/
package
com
.
dlink
.
constant
;
public
interface
NetConstant
{
...
...
dlink-common/src/main/java/com/dlink/exception/JobException.java
View file @
4eb1afc1
...
...
@@ -17,10 +17,8 @@
*
*/
package
com
.
dlink
.
exception
;
/**
* JobException
*
...
...
dlink-common/src/main/java/com/dlink/exception/MetaDataException.java
View file @
4eb1afc1
...
...
@@ -17,10 +17,8 @@
*
*/
package
com
.
dlink
.
exception
;
/**
* JobException
*
...
...
dlink-common/src/main/java/com/dlink/exception/RunTimeException.java
View file @
4eb1afc1
...
...
@@ -17,10 +17,8 @@
*
*/
package
com
.
dlink
.
exception
;
/**
* RunTimeException
*
...
...
dlink-common/src/main/java/com/dlink/exception/SqlException.java
View file @
4eb1afc1
...
...
@@ -17,7 +17,6 @@
*
*/
package
com
.
dlink
.
exception
;
/**
...
...
dlink-common/src/main/java/com/dlink/model/Catalog.java
View file @
4eb1afc1
...
...
@@ -17,16 +17,15 @@
*
*/
package
com
.
dlink
.
model
;
import
lombok.Getter
;
import
lombok.Setter
;
import
java.io.Serializable
;
import
java.util.ArrayList
;
import
java.util.List
;
import
lombok.Getter
;
import
lombok.Setter
;
/**
* Catalog
*
...
...
dlink-common/src/main/java/com/dlink/model/Column.java
View file @
4eb1afc1
...
...
@@ -17,14 +17,13 @@
*
*/
package
com
.
dlink
.
model
;
import
java.io.Serializable
;
import
lombok.Getter
;
import
lombok.Setter
;
import
java.io.Serializable
;
/**
* Column
*
...
...
dlink-common/src/main/java/com/dlink/model/ColumnType.java
View file @
4eb1afc1
...
...
@@ -17,7 +17,6 @@
*
*/
package
com
.
dlink
.
model
;
/**
...
...
dlink-common/src/main/java/com/dlink/model/FlinkColumn.java
View file @
4eb1afc1
...
...
@@ -17,14 +17,13 @@
*
*/
package
com
.
dlink
.
model
;
import
java.io.Serializable
;
import
lombok.Getter
;
import
lombok.Setter
;
import
java.io.Serializable
;
/**
* FlinkColumn
*
...
...
dlink-common/src/main/java/com/dlink/model/JobLifeCycle.java
View file @
4eb1afc1
...
...
@@ -17,7 +17,6 @@
*
*/
package
com
.
dlink
.
model
;
/**
...
...
@@ -51,7 +50,6 @@ public enum JobLifeCycle {
return
label
;
}
public
static
JobLifeCycle
get
(
Integer
value
)
{
for
(
JobLifeCycle
item
:
JobLifeCycle
.
values
())
{
if
(
item
.
getValue
().
equals
(
value
))
{
...
...
dlink-common/src/main/java/com/dlink/model/JobStatus.java
View file @
4eb1afc1
...
...
@@ -17,7 +17,6 @@
*
*/
package
com
.
dlink
.
model
;
import
com.dlink.assertion.Asserts
;
...
...
dlink-common/src/main/java/com/dlink/model/Schema.java
View file @
4eb1afc1
...
...
@@ -17,7 +17,6 @@
*
*/
package
com
.
dlink
.
model
;
import
java.io.Serializable
;
...
...
dlink-common/src/main/java/com/dlink/model/SystemConfiguration.java
View file @
4eb1afc1
...
...
@@ -17,14 +17,14 @@
*
*/
package
com
.
dlink
.
model
;
import
com.dlink.assertion.Asserts
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.Map
;
import
com.dlink.assertion.Asserts
;
import
com.fasterxml.jackson.databind.JsonNode
;
/**
...
...
@@ -42,12 +42,12 @@ public class SystemConfiguration {
}
private
static
final
List
<
Configuration
>
CONFIGURATION_LIST
=
new
ArrayList
<
Configuration
>()
{{
add
(
systemConfiguration
.
sqlSubmitJarPath
);
add
(
systemConfiguration
.
sqlSubmitJarParas
);
add
(
systemConfiguration
.
sqlSubmitJarMainAppClass
);
add
(
systemConfiguration
.
useRestAPI
);
add
(
systemConfiguration
.
sqlSeparator
);
}};
add
(
systemConfiguration
.
sqlSubmitJarPath
);
add
(
systemConfiguration
.
sqlSubmitJarParas
);
add
(
systemConfiguration
.
sqlSubmitJarMainAppClass
);
add
(
systemConfiguration
.
useRestAPI
);
add
(
systemConfiguration
.
sqlSeparator
);
}};
private
Configuration
sqlSubmitJarPath
=
new
Configuration
(
"sqlSubmitJarPath"
,
...
...
dlink-common/src/main/java/com/dlink/model/Table.java
View file @
4eb1afc1
...
...
@@ -17,17 +17,16 @@
*
*/
package
com
.
dlink
.
model
;
import
com.dlink.assertion.Asserts
;
import
com.dlink.utils.SqlUtil
;
import
java.io.Serializable
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.List
;
import
com.dlink.assertion.Asserts
;
import
com.dlink.utils.SqlUtil
;
import
lombok.Getter
;
import
lombok.Setter
;
...
...
dlink-common/src/main/java/com/dlink/model/TaskOperatingSavepointSelect.java
View file @
4eb1afc1
...
...
@@ -22,7 +22,6 @@ package com.dlink.model;
/**
* @author csz
* @version 1.0
* @date 2022/7/19 15:21
**/
public
enum
TaskOperatingSavepointSelect
{
...
...
@@ -56,7 +55,6 @@ public enum TaskOperatingSavepointSelect {
return
message
;
}
public
static
TaskOperatingSavepointSelect
valueByCode
(
Integer
code
)
{
for
(
TaskOperatingSavepointSelect
savepointSelect
:
TaskOperatingSavepointSelect
.
values
())
{
if
(
savepointSelect
.
getCode
().
equals
(
code
))
{
...
...
@@ -66,5 +64,4 @@ public enum TaskOperatingSavepointSelect {
return
null
;
}
}
dlink-common/src/main/java/com/dlink/model/TaskOperatingStatus.java
View file @
4eb1afc1
...
...
@@ -22,7 +22,6 @@ package com.dlink.model;
/**
* @author mydq
* @version 1.0
* @date 2022/7/16 21:13
**/
public
enum
TaskOperatingStatus
{
...
...
@@ -45,7 +44,6 @@ public enum TaskOperatingStatus {
private
String
message
;
TaskOperatingStatus
(
Integer
code
,
String
name
,
String
message
)
{
this
.
code
=
code
;
this
.
name
=
name
;
...
...
@@ -64,5 +62,4 @@ public enum TaskOperatingStatus {
return
message
;
}
}
dlink-common/src/main/java/com/dlink/pool/AbstractPool.java
View file @
4eb1afc1
...
...
@@ -17,7 +17,6 @@
*
*/
package
com
.
dlink
.
pool
;
import
java.util.Map
;
...
...
@@ -28,15 +27,12 @@ import java.util.Map;
* @author wenmo
* @since 2022/5/28 19:40
*/
public
abstract
class
AbstractPool
<
T
>{
public
abstract
class
AbstractPool
<
T
>
{
public
abstract
Map
<
String
,
T
>
getMap
();
public
boolean
exist
(
String
key
)
{
if
(
getMap
().
containsKey
(
key
))
{
return
true
;
}
return
false
;
return
getMap
().
containsKey
(
key
);
}
public
int
push
(
String
key
,
T
entity
)
{
...
...
dlink-common/src/main/java/com/dlink/pool/ClassEntity.java
View file @
4eb1afc1
...
...
@@ -17,10 +17,10 @@
*
*/
package
com
.
dlink
.
pool
;
import
com.dlink.assertion.Asserts
;
import
lombok.Getter
;
import
lombok.Setter
;
...
...
dlink-common/src/main/java/com/dlink/pool/ClassPool.java
View file @
4eb1afc1
...
...
@@ -17,7 +17,6 @@
*
*/
package
com
.
dlink
.
pool
;
import
java.util.List
;
...
...
dlink-common/src/main/java/com/dlink/result/AbstractResult.java
View file @
4eb1afc1
...
...
@@ -17,7 +17,6 @@
*
*/
package
com
.
dlink
.
result
;
import
java.time.Duration
;
...
...
dlink-common/src/main/java/com/dlink/result/ExplainResult.java
View file @
4eb1afc1
...
...
@@ -17,7 +17,6 @@
*
*/
package
com
.
dlink
.
result
;
import
java.util.List
;
...
...
dlink-common/src/main/java/com/dlink/result/IResult.java
View file @
4eb1afc1
...
...
@@ -17,7 +17,6 @@
*
*/
package
com
.
dlink
.
result
;
import
java.time.LocalDateTime
;
...
...
dlink-common/src/main/java/com/dlink/result/SqlExplainResult.java
View file @
4eb1afc1
...
...
@@ -17,7 +17,6 @@
*
*/
package
com
.
dlink
.
result
;
import
java.time.LocalDateTime
;
...
...
@@ -136,16 +135,16 @@ public class SqlExplainResult {
@Override
public
String
toString
()
{
return
"SqlExplainRecord{"
+
"index="
+
index
+
", type='"
+
type
+
'\''
+
", sql='"
+
sql
+
'\''
+
", parse='"
+
parse
+
'\''
+
", explain='"
+
explain
+
'\''
+
", error='"
+
error
+
'\''
+
", parseTrue="
+
parseTrue
+
", explainTrue="
+
explainTrue
+
", explainTime="
+
explainTime
+
'}'
;
return
"SqlExplainRecord{"
+
"index="
+
index
+
", type='"
+
type
+
'\''
+
", sql='"
+
sql
+
'\''
+
", parse='"
+
parse
+
'\''
+
", explain='"
+
explain
+
'\''
+
", error='"
+
error
+
'\''
+
", parseTrue="
+
parseTrue
+
", explainTrue="
+
explainTrue
+
", explainTime="
+
explainTime
+
'}'
;
}
}
dlink-common/src/main/java/com/dlink/utils/JSONUtil.java
View file @
4eb1afc1
...
...
@@ -17,26 +17,39 @@
*
*/
package
com
.
dlink
.
utils
;
import
static
java
.
nio
.
charset
.
StandardCharsets
.
UTF_8
;
import
static
com
.
fasterxml
.
jackson
.
databind
.
DeserializationFeature
.
ACCEPT_EMPTY_ARRAY_AS_NULL_OBJECT
;
import
static
com
.
fasterxml
.
jackson
.
databind
.
DeserializationFeature
.
FAIL_ON_UNKNOWN_PROPERTIES
;
import
static
com
.
fasterxml
.
jackson
.
databind
.
DeserializationFeature
.
READ_UNKNOWN_ENUM_VALUES_AS_NULL
;
import
static
com
.
fasterxml
.
jackson
.
databind
.
MapperFeature
.
REQUIRE_SETTERS_FOR_GETTERS
;
import
com.dlink.assertion.Asserts
;
import
java.io.IOException
;
import
java.util.ArrayList
;
import
java.util.Collections
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.TimeZone
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
com.fasterxml.jackson.core.JsonParser
;
import
com.fasterxml.jackson.core.type.TypeReference
;
import
com.fasterxml.jackson.databind.*
;
import
com.fasterxml.jackson.databind.DeserializationContext
;
import
com.fasterxml.jackson.databind.JsonDeserializer
;
import
com.fasterxml.jackson.databind.JsonNode
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.fasterxml.jackson.databind.ObjectWriter
;
import
com.fasterxml.jackson.databind.SerializationFeature
;
import
com.fasterxml.jackson.databind.node.ArrayNode
;
import
com.fasterxml.jackson.databind.node.ObjectNode
;
import
com.fasterxml.jackson.databind.node.TextNode
;
import
com.fasterxml.jackson.databind.type.CollectionType
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
java.io.IOException
;
import
java.util.*
;
import
static
com
.
fasterxml
.
jackson
.
databind
.
DeserializationFeature
.*;
import
static
com
.
fasterxml
.
jackson
.
databind
.
MapperFeature
.
REQUIRE_SETTERS_FOR_GETTERS
;
import
static
java
.
nio
.
charset
.
StandardCharsets
.
UTF_8
;
/**
* JSONUtil
...
...
dlink-common/src/main/java/com/dlink/utils/LogUtil.java
View file @
4eb1afc1
...
...
@@ -17,17 +17,16 @@
*
*/
package
com
.
dlink
.
utils
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
java.io.IOException
;
import
java.io.PrintWriter
;
import
java.io.StringWriter
;
import
java.time.LocalDateTime
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
/**
* LogUtil
*
...
...
@@ -39,7 +38,6 @@ public class LogUtil {
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
LogUtil
.
class
);
public
static
String
getError
(
Exception
e
)
{
// e.printStackTrace();
String
error
=
null
;
try
(
StringWriter
sw
=
new
StringWriter
();
PrintWriter
pw
=
new
PrintWriter
(
sw
))
{
...
...
@@ -54,7 +52,6 @@ public class LogUtil {
}
public
static
String
getError
(
String
msg
,
Exception
e
)
{
// e.printStackTrace();
String
error
=
null
;
try
(
StringWriter
sw
=
new
StringWriter
();
PrintWriter
pw
=
new
PrintWriter
(
sw
))
{
...
...
dlink-common/src/main/java/com/dlink/utils/RunTimeUtil.java
View file @
4eb1afc1
...
...
@@ -17,7 +17,6 @@
*
*/
package
com
.
dlink
.
utils
;
/**
...
...
dlink-common/src/main/java/com/dlink/utils/SqlUtil.java
View file @
4eb1afc1
...
...
@@ -17,7 +17,6 @@
*
*/
package
com
.
dlink
.
utils
;
import
com.dlink.assertion.Asserts
;
...
...
@@ -39,8 +38,8 @@ public class SqlUtil {
String
[]
splits
=
sql
.
replaceAll
(
";\r\n"
,
";\n"
).
split
(
sqlSeparator
);
String
lastStatement
=
splits
[
splits
.
length
-
1
].
trim
();
if
(
lastStatement
.
endsWith
(
SEMICOLON
)){
splits
[
splits
.
length
-
1
]
=
lastStatement
.
substring
(
0
,
lastStatement
.
length
()-
1
);
if
(
lastStatement
.
endsWith
(
SEMICOLON
))
{
splits
[
splits
.
length
-
1
]
=
lastStatement
.
substring
(
0
,
lastStatement
.
length
()
-
1
);
}
return
splits
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment