Skip to content

[ADH-4562] Rename sorting field parameters to correspond to entity fields #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iamlapa merged 1 commit into from
Jun 17, 2024
Merged

[ADH-4562] Rename sorting field parameters to correspond to entity fields #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 17 additions & 16 deletions smart-web-server/src/main/java/org/smartdata/server/generated/model/ActionSortDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;

import javax.annotation.Generated;

/**
Expand All @@ -27,28 +28,28 @@

@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
public enum ActionSortDto {

ID("id"),

EXECHOST("execHost"),
CREATETIME("createTime"),
FINISHTIME("finishTime"),
STATUS("status"),

SUBMISSIONTIME("submissionTime"),

COMPLETIONTIME("completionTime"),

STATE("state"),

SOURCE("source"),

_ID("-id"),

_EXECHOST("-execHost"),
_CREATETIME("-createTime"),
_FINISHTIME("-finishTime"),
_STATUS("-status"),

_SUBMISSIONTIME("-submissionTime"),

_COMPLETIONTIME("-completionTime"),

_STATE("-state"),

_SOURCE("-source");

Expand Down
29 changes: 15 additions & 14 deletions smart-web-server/src/main/java/org/smartdata/server/generated/model/AuditSortDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;

import javax.annotation.Generated;

/**
Expand All @@ -27,33 +28,33 @@

@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
public enum AuditSortDto {

ID("id"),

USERNAME("username"),

TIMESTAMP("timestamp"),

OBJECTTYPE("objectType"),

OBJECTID("objectId"),

OPERATION("operation"),

RESULT("result"),

_ID("-id"),

_USERNAME("-username"),

_TIMESTAMP("-timestamp"),

_OBJECTTYPE("-objectType"),

_OBJECTID("-objectId"),

_OPERATION("-operation"),

_RESULT("-result");

private String value;
Expand Down
25 changes: 13 additions & 12 deletions smart-web-server/src/main/java/org/smartdata/server/generated/model/CachedFileSortDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;

import javax.annotation.Generated;

/**
Expand All @@ -27,25 +28,25 @@

@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
public enum CachedFileSortDto {
FID("fid"),

ID("id"),

PATH("path"),

ACCESSCOUNT("accessCount"),

CACHEDTIME("cachedTime"),

LASTACCESSTIME("lastAccessTime"),
_FID("-fid"),

_ID("-id"),

_PATH("-path"),

_ACCESSCOUNT("-accessCount"),

_CACHEDTIME("-cachedTime"),

_LASTACCESSTIME("-lastAccessTime");

private String value;
Expand Down
21 changes: 11 additions & 10 deletions smart-web-server/src/main/java/org/smartdata/server/generated/model/ClusterSortDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;

import javax.annotation.Generated;

/**
Expand All @@ -27,21 +28,21 @@

@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
public enum ClusterSortDto {

ID("id"),

REGISTRATIONTIME("registrationTime"),
EXECUTORS("executors"),

EXECUTORSCOUNT("executorsCount"),

STATUS("status"),

_ID("-id"),

_REGISTRATIONTIME("-registrationTime"),
_EXECUTORS("-executors"),

_EXECUTORSCOUNT("-executorsCount"),

_STATUS("-status");

private String value;
Expand Down
25 changes: 13 additions & 12 deletions smart-web-server/src/main/java/org/smartdata/server/generated/model/CmdletSortDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;

import javax.annotation.Generated;

/**
Expand All @@ -27,25 +28,25 @@

@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
public enum CmdletSortDto {

ID("id"),

RULEID("ruleId"),

STATE("state"),
GENERATETIME("generateTime"),

SUBMISSIONTIME("submissionTime"),

STATECHANGEDTIME("stateChangedTime"),

_ID("-id"),

_RULEID("-ruleId"),

_STATE("-state"),
_GENERATETIME("-generateTime"),

_SUBMISSIONTIME("-submissionTime"),

_STATECHANGEDTIME("-stateChangedTime");

private String value;
Expand Down
25 changes: 15 additions & 10 deletions smart-web-server/src/main/java/org/smartdata/server/generated/model/HotFileSortDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;

import javax.annotation.Generated;

/**
Expand All @@ -27,18 +28,22 @@

@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
public enum HotFileSortDto {
FID("fid"),

ID("id"),

PATH("path"),

ACCESS_COUNT("access_count"),

_FID("-fid"),


ACCESSCOUNT("accessCount"),

LASTACCESSTIME("lastAccessTime"),

_ID("-id"),

_PATH("-path"),

_ACCESS_COUNT("-access_count");

_ACCESSCOUNT("-accessCount"),

_LASTACCESSTIME("-lastAccessTime");

private String value;

Expand Down
41 changes: 21 additions & 20 deletions smart-web-server/src/main/java/org/smartdata/server/generated/model/RuleSortDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;

import javax.annotation.Generated;

/**
Expand All @@ -27,30 +28,30 @@

@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
public enum RuleSortDto {

ID("id"),

SUBMITTIME("submitTime"),
LASTCHECKTIME("lastCheckTime"),
CHECKEDCOUNT("checkedCount"),
GENERATEDCMDLETS("generatedCmdlets"),
STATUS("status"),

LASTACTIVATIONTIME("lastActivationTime"),

ACTIVATIONCOUNT("activationCount"),

CMDLETSGENERATED("cmdletsGenerated"),

STATE("state"),

_ID("-id"),

_SUBMITTIME("-submitTime"),
_LASTCHECKTIME("-lastCheckTime"),
_CHECKEDCOUNT("-checkedCount"),
_GENERATEDCMDLETS("-generatedCmdlets"),
_STATUS("-status");

_LASTACTIVATIONTIME("-lastActivationTime"),

_ACTIVATIONCOUNT("-activationCount"),

_CMDLETSGENERATED("-cmdletsGenerated"),

_STATE("-state");

private String value;

Expand Down
11 changes: 6 additions & 5 deletions ...server/src/main/java/org/smartdata/server/mappers/pagination/ActionPageRequestMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,14 @@ public interface ActionPageRequestMapper
extends BasePageRequestMapper<ActionSortDto, ActionSortField> {

@ValueMapping(source = "EXECHOST", target = "EXEC_HOST")
@ValueMapping(source = "CREATETIME", target = "CREATE_TIME")
@ValueMapping(source = "FINISHTIME", target = "FINISH_TIME")
@ValueMapping(source = "SUBMISSIONTIME", target = "CREATE_TIME")
@ValueMapping(source = "COMPLETIONTIME", target = "FINISH_TIME")
@ValueMapping(source = "STATE", target = "STATUS")
@ValueMapping(source = "_ID", target = "ID")
@ValueMapping(source = "_EXECHOST", target = "EXEC_HOST")
@ValueMapping(source = "_CREATETIME", target = "CREATE_TIME")
@ValueMapping(source = "_FINISHTIME", target = "FINISH_TIME")
@ValueMapping(source = "_STATUS", target = "STATUS")
@ValueMapping(source = "_SUBMISSIONTIME", target = "CREATE_TIME")
@ValueMapping(source = "_COMPLETIONTIME", target = "FINISH_TIME")
@ValueMapping(source = "_STATE", target = "STATUS")
@ValueMapping(source = "_SOURCE", target = "SOURCE")
ActionSortField toSortField(ActionSortDto sortColumn);
}
3 changes: 2 additions & 1 deletion ...r/src/main/java/org/smartdata/server/mappers/pagination/ClusterNodePageRequestMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,10 @@ public interface ClusterNodePageRequestMapper
extends BasePageRequestMapper<ClusterSortDto, ClusterNodeSortField> {

@ValueMapping(source = "REGISTRATIONTIME", target = "REGISTRATION_TIME")
@ValueMapping(source = "EXECUTORSCOUNT", target = "EXECUTORS")
@ValueMapping(source = "_ID", target = "ID")
@ValueMapping(source = "_REGISTRATIONTIME", target = "REGISTRATION_TIME")
@ValueMapping(source = "_EXECUTORS", target = "EXECUTORS")
@ValueMapping(source = "_EXECUTORSCOUNT", target = "EXECUTORS")
@ValueMapping(source = "STATUS", target = MappingConstants.THROW_EXCEPTION)
@ValueMapping(source = "_STATUS", target = MappingConstants.THROW_EXCEPTION)
ClusterNodeSortField toSortField(ClusterSortDto sortColumn);
Expand Down
4 changes: 2 additions & 2 deletions ...erver/src/main/java/org/smartdata/server/mappers/pagination/CmdletsPageRequestMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
public interface CmdletsPageRequestMapper
extends BasePageRequestMapper<CmdletSortDto, CmdletSortField> {
@ValueMapping(source = "RULEID", target = "RULE_ID")
@ValueMapping(source = "GENERATETIME", target = "GENERATE_TIME")
@ValueMapping(source = "SUBMISSIONTIME", target = "GENERATE_TIME")
@ValueMapping(source = "STATECHANGEDTIME", target = "STATE_CHANGED_TIME")
@ValueMapping(source = "_ID", target = "ID")
@ValueMapping(source = "_RULEID", target = "RULE_ID")
@ValueMapping(source = "_STATE", target = "STATE")
@ValueMapping(source = "_GENERATETIME", target = "GENERATE_TIME")
@ValueMapping(source = "_SUBMISSIONTIME", target = "GENERATE_TIME")
@ValueMapping(source = "_STATECHANGEDTIME", target = "STATE_CHANGED_TIME")
CmdletSortField toSortField(CmdletSortDto sortColumn);
}
Loading