feat: 1. update Dockerfile 2. fix single quote issue 3. currentUser add ip 4. use old refresh token

lvhuichao · lvhuichao · commit d41cdc839c58 · 2022-11-16T19:53:04.000+08:00
diff --git a/deploy/docker/Dockerfile b/deploy/docker/Dockerfile
@@ -65,7 +65,7 @@ COPY --from=jre-build /build/jre /app
 ARG JAR_FILE=/openblocks-server/openblocks-server/target/openblocks-server-1.0-SNAPSHOT.jar
 ARG PLUGIN_JARS=/openblocks-server/openblocks-plugins/*/target/*.jar
 
-RUN mkdir -p /openblocks /openblocks/plugins /var/www/openblocks
+RUN mkdir -p /openblocks /openblocks/plugins /var/www/openblocks /env2
 
 COPY --from=build-server ${JAR_FILE} /openblocks/server.jar
 COPY --from=build-server ${PLUGIN_JARS} /openblocks/plugins/
@@ -87,7 +87,7 @@ COPY ./deploy/docker/templates/supervisord/*  /etc/supervisor/conf.d/
 
 # copy application.yml
 COPY ./server/openblocks-server/src/main/resources/selfhost/ce/application.yml /env/
-COPY ./server/openblocks-server/src/main/resources/selfhost/ce/application-selfhost.yml /env/
+COPY ./server/openblocks-server/src/main/resources/selfhost/ce/application-selfhost.yml /env2/
 
 # Add bootstrapfile
 # COPY ./entrypoint.sh /
diff --git a/deploy/docker/entrypoint.sh b/deploy/docker/entrypoint.sh
@@ -15,7 +15,7 @@ init_configuration() {
     if ! [ -e "$YML_PATH" ]; then
         echo "yml configuration not exist"
         mkdir -p "$CONFIG_PATH"
-        cp /env/application-selfhost.yml $CONFIG_PATH/
+        cp /env2/application-selfhost.yml $CONFIG_PATH/
     fi
 }
 
diff --git a/deploy/docker/templates/supervisord/backend.conf b/deploy/docker/templates/supervisord/backend.conf
@@ -1,7 +1,7 @@
 [program:backend]
 directory=/openblocks
 # Ref -Dlog4j2.formatMsgNoLookups=true https://spring.io/blog/2021/12/10/log4j2-vulnerability-and-spring-boot
-command=/app/bin/java -Djava.security.egd="file:/dev/./urandom" -Dlog4j2.formatMsgNoLookups=true -Dspring.config.location="file:///openblocks-stacks/configuration/application-selfhost.yml,file:///env/application.yml" -jar /openblocks/server.jar
+command=/app/bin/java -Djava.security.egd="file:/dev/./urandom" -Dlog4j2.formatMsgNoLookups=true -Dspring.config.location="file:///env/application.yml,file:///openblocks-stacks/configuration/application-selfhost.yml" -jar /openblocks/server.jar
 
 priority=15
 autostart=true
diff --git a/server/openblocks-domain/src/main/java/com/openblocks/domain/user/model/Connection.java b/server/openblocks-domain/src/main/java/com/openblocks/domain/user/model/Connection.java
@@ -15,6 +15,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty.Access;
 
 import lombok.Builder;
 import lombok.Getter;
@@ -41,6 +42,7 @@ public class Connection {
     private Set<String> orgIds;
 
     @Nullable
+    @JsonProperty(access = Access.WRITE_ONLY)
     private ConnectionAuthToken authConnectionAuthToken;
 
     private Map<String, Object> rawUserInfo;
diff --git a/server/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/commands/Aggregate.java b/server/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/commands/Aggregate.java
@@ -64,9 +64,9 @@ public Aggregate(Map<String, Object> formData) {
     }
 
     @Override
-    public Boolean isValid() {
+    public boolean isValid() {
         if (!super.isValid()) {
-            return Boolean.FALSE;
+            return false;
         }
 
         if (StringUtils.isNullOrEmpty(pipeline)) {
diff --git a/server/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/commands/Delete.java b/server/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/commands/Delete.java
@@ -57,18 +57,18 @@ public Delete(Map<String, Object> formData) {
     }
 
     @Override
-    public Boolean isValid() {
+    public boolean isValid() {
         if (!super.isValid()) {
-            return Boolean.FALSE;
+            return false;
         }
 
         if (StringUtils.isNotBlank(query)) {
-            return Boolean.TRUE;
+            return true;
         }
 
         // Not adding smart defaults for query due to data impact
         fieldNamesWithNoConfiguration.add("Query");
-        return Boolean.FALSE;
+        return false;
     }
 
     @Override
diff --git a/server/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/commands/Distinct.java b/server/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/commands/Distinct.java
@@ -50,18 +50,18 @@ public Distinct(Map<String, Object> formData) {
     }
 
     @Override
-    public Boolean isValid() {
+    public boolean isValid() {
         if (!super.isValid()) {
-            return Boolean.FALSE;
+            return false;
         }
 
         if (StringUtils.isNotBlank(key)) {
-            return Boolean.TRUE;
+            return true;
         }
 
         fieldNamesWithNoConfiguration.add("Key/Field");
 
-        return Boolean.FALSE;
+        return false;
     }
 
     @Override
diff --git a/server/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/commands/Insert.java b/server/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/commands/Insert.java
@@ -51,17 +51,17 @@ public Insert(Map<String, Object> formData) {
     }
 
     @Override
-    public Boolean isValid() {
+    public boolean isValid() {
         if (!super.isValid()) {
-            return Boolean.FALSE;
+            return false;
         }
 
         if (StringUtils.isNotBlank(documents)) {
-            return Boolean.TRUE;
+            return true;
         }
 
         fieldNamesWithNoConfiguration.add("Documents");
-        return Boolean.FALSE;
+        return false;
     }
 
     @Override
diff --git a/server/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/commands/MongoCommand.java b/server/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/commands/MongoCommand.java
@@ -66,12 +66,12 @@ public MongoCommand(Map<String, Object> formData) {
         timeoutMs = MapUtils.getInteger(formData, "timeout", DEFAULT_VALUE);
     }
 
-    public Boolean isValid() {
+    public boolean isValid() {
         if (StringUtils.isBlank(this.collection)) {
             fieldNamesWithNoConfiguration.add(COLLECTION);
-            return Boolean.FALSE;
+            return false;
         }
-        return Boolean.TRUE;
+        return true;
     }
 
     public Document parseCommand() {
diff --git a/server/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/commands/UpdateMany.java b/server/openblocks-plugins/mongoPlugin/src/main/java/com/openblocks/plugin/mongo/commands/UpdateMany.java
@@ -64,13 +64,13 @@ public UpdateMany(Map<String, Object> formData) {
     }
 
     @Override
-    public Boolean isValid() {
+    public boolean isValid() {
         if (!super.isValid()) {
-            return Boolean.FALSE;
+            return false;
         }
 
         if (StringUtils.isNotBlank(query) && StringUtils.isNotBlank(update)) {
-            return Boolean.TRUE;
+            return true;
         }
 
         // Not adding smart defaults for query due to data impact
@@ -81,7 +81,7 @@ public Boolean isValid() {
         if (StringUtils.isBlank(update)) {
             fieldNamesWithNoConfiguration.add("Update");
         }
-        return Boolean.FALSE;
+        return false;
     }
 
     @Override
diff --git a/server/openblocks-plugins/mysqlPlugin/pom.xml b/server/openblocks-plugins/mysqlPlugin/pom.xml
@@ -33,7 +33,6 @@
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
             <version>8.0.29</version>
-            <!--            <scope>test</scope>-->
         </dependency>
         <dependency>
             <groupId>com.zaxxer</groupId>
diff --git a/server/openblocks-plugins/postgresPlugin/src/main/java/com/openblocks/plugin/postgres/PostgresExecutor.java b/server/openblocks-plugins/postgresPlugin/src/main/java/com/openblocks/plugin/postgres/PostgresExecutor.java
@@ -73,6 +73,8 @@ public PostgresQueryContext buildQueryExecutionContext(PostgresDatasourceConfig
         return PostgresQueryContext.builder()
                 .query(postgresQueryConfig.getSql())
                 .requestParams(requestParams)
+                .disablePreparedStatement(datasourceConfig.isEnableTurnOffPreparedStatement() &&
+                        postgresQueryConfig.isDisablePreparedStatement())
                 .build();
     }
 
@@ -358,6 +360,8 @@ private static void bindPreparedStatement(int index, Object value, PreparedState
                 }
             }
             case STRING -> preparedStatement.setString(index, String.valueOf(value));
+            default -> {
+            }
         }
     }
 
diff --git a/server/openblocks-plugins/postgresPlugin/src/main/java/com/openblocks/plugin/postgres/model/PostgresDatasourceConfig.java b/server/openblocks-plugins/postgresPlugin/src/main/java/com/openblocks/plugin/postgres/model/PostgresDatasourceConfig.java
@@ -40,17 +40,19 @@ public class PostgresDatasourceConfig implements DatasourceConnectionConfig {
     private final Long port;
     private final boolean usingSsl;
     private final boolean readonly;
+    private final boolean enableTurnOffPreparedStatement;
 
     @JsonCreator
     private PostgresDatasourceConfig(String database, String username, String password, String host, Long port,
-            boolean usingSsl, boolean readonly) {
+            boolean usingSsl, boolean readonly, boolean enableTurnOffPreparedStatement) {
         this.database = database;
         this.username = username;
         this.password = password;
         this.usingSsl = usingSsl;
         this.host = host;
         this.port = port;
         this.readonly = readonly;
+        this.enableTurnOffPreparedStatement = enableTurnOffPreparedStatement;
     }
 
     public static PostgresDatasourceConfig buildFrom(Map<String, Object> requestMap) {
@@ -77,6 +79,10 @@ public String getHost() {
         return StringUtils.trimToEmpty(host);
     }
 
+    public boolean isEnableTurnOffPreparedStatement() {
+        return enableTurnOffPreparedStatement;
+    }
+
     @VisibleForTesting
     public PostgresDatasourceConfigBuilder toBuilder() {
         return builder()
@@ -86,7 +92,8 @@ public PostgresDatasourceConfigBuilder toBuilder() {
                 .usingSsl(usingSsl)
                 .host(host)
                 .port(port)
-                .readonly(readonly);
+                .readonly(readonly)
+                .enableTurnOffPreparedStatement(enableTurnOffPreparedStatement);
     }
 
     @Override
@@ -101,7 +108,8 @@ public DatasourceConnectionConfig mergeWithUpdatedConfig(DatasourceConnectionCon
                 updatedPostgresConfig.getHost(),
                 updatedPostgresConfig.getPort(),
                 updatedPostgresConfig.isUsingSsl(),
-                updatedPostgresConfig.isReadonly());
+                updatedPostgresConfig.isReadonly(),
+                updatedPostgresConfig.isEnableTurnOffPreparedStatement());
     }
 
     @Override
diff --git a/server/openblocks-sdk/src/main/resources/locale_en.properties b/server/openblocks-sdk/src/main/resources/locale_en.properties
@@ -1,6 +1,6 @@
 ## general
 INTERNAL_SERVER_ERROR=Oops! Service is busy, please try again later.
-NOT_AUTHORIZED=Sorry, it appears you don't have the permission.
+NOT_AUTHORIZED=Sorry, it appears you don''t have the permission.
 INVALID_PARAMETER=Invalid parameter found: {0}, please check and try again.
 INFRA_REDIS_TIMEOUT=Connect timed out, please try again later.
 INFRA_MONGODB_TIMEOUT=Connect timed out, please try again later.
@@ -22,7 +22,7 @@ INVALID_INVITATION_CODE=Invitation code not found.
 ALREADY_IN_ORGANIZATION=You are already in this workspace.
 INVITED_ORG_DELETED=Oops! The invited workspace has already been deleted.
 APPLICATION_NOT_FOUND=Application {0} cannot be found.
-ILLEGAL_APPLICATION_PERMISSION_ID=Sorry, it appears you don't have the permission.
+ILLEGAL_APPLICATION_PERMISSION_ID=Sorry, it appears you don''t have the permission.
 FETCH_HISTORY_SNAPSHOT_FAILURE=Failed to fetch application history snapshot, please try again later.
 FETCH_HISTORY_SNAPSHOT_COUNT_FAILURE=Failed to fetch the count of history snapshots of the application, please try again later.
 INVALID_HISTORY_SNAPSHOT=History snapshot {0} cannot be found.
@@ -57,17 +57,17 @@ EXCEED_QUERY_RESPONSE_SIZE=Sorry, it exceeds query response limit size, please c
 LIBRARY_QUERY_AND_ORG_NOT_MATCH=Query library does not match the workspace.
 LIBRARY_QUERY_NOT_FOUND=Sorry, query library has no such query, please check again.
 INVALID_USER_STATUS=Sorry, the user status is illegal: {0}.
-FOLDER_DELETE_NO_PERMISSION=Oops! It appears you don't have the permission to delete the folder.
+FOLDER_DELETE_NO_PERMISSION=Oops! It appears you don''t have the permission to delete the folder.
 FOLDER_NOT_EXIST=The folder does not exist, please check again.
 FOLDER_NAME_CONFLICT=Sorry, there is already a folder with the same name as the folder name you specified, please use a different name.
 INVALID_PARAMETER_PLZ_CHECK=Sorry, an invalid parameter was passed, please check: {0}.
 DATASOURCE_CONFIG_ERROR=Illegal data source configuration: data source parameter configuration error.
 CAS_SSO_TICKET_ERROR=orry, cas sso login exception: ticket validation error.
 FILE_NOT_EXIST=Invalid parameter: the file does not exist.
 FOLDER_NAME_EMPTY=Invalid parameter: the folder name is empty.
-NO_PERMISSION_TO_MOVE=Sorry, it appears you don't have the permission, moving apps or modules requires administrative privileges.
+NO_PERMISSION_TO_MOVE=Sorry, it appears you don''t have the permission, moving apps or modules requires administrative privileges.
 PERMISSION_NOT_EXIST=Invalid permission, it does not exist.
-NO_PERMISSION_TO_OPERATE_FOLDER=Sorry, it appears you don't have the permission to operate this folder.
+NO_PERMISSION_TO_OPERATE_FOLDER=Sorry, it appears you don''t have the permission to operate this folder.
 FILE_ORG_NOT_MATCH=Illegal Request: the file does not belong to current workspace.
 EXCEEDS_FILE_SIZE_LIMIT=Illegal Request: file size cannot exceed {0}.
 EXCEEDS_ORG_SIZE_LIMIT=Illegal Request: exceeds total workspace limit size {0}.
@@ -92,8 +92,8 @@ INVALID_USER_ID=Invalid parameter: the user ID is invalid.
 INVALID_USER_ROLE=Invalid parameter: the user role is invalid.
 PASSWORD_EMPTY=Invalid parameter: the password is empty.
 INSUFFICIENT_PERMISSION=Insufficient permissions: you are not in the workspace, please contact admin of this workspace.
-NO_PERMISSION_TO_EDIT=It appears you don't have the permission to edit, please contact the app owners {0}.
-NO_PERMISSION_TO_VIEW=It appears you don't have the permission to view, please contact the app owners {0}.
+NO_PERMISSION_TO_EDIT=It appears you don''t have the permission to edit, please contact the app owners {0}.
+NO_PERMISSION_TO_VIEW=It appears you don''t have the permission to view, please contact the app owners {0}.
 INVALID_QUERY_ID=Invalid query ID.
 INVALID_ES_CONFIG=Illegal elasticsearch data source configuration.
 INVALID_CONNECTION_STRING=Fail to parse connectionString.
@@ -122,7 +122,7 @@ DATASOURCE_TEST_TIMEOUT_ERROR=Test data source connection timed out, please chec
 JSON_PARSE_ERROR=Sorry, failed to parse JSON, data: {0}, exception information: {1}.
 SQL_IN_OPERATOR_PARSE_ERROR=Sorry, failed to parse SQL, data: {0}, please contact admin.
 PREPARED_STATEMENT_BIND_PARAMETERS_ERROR=PreparedStatement bind parameter error: {0}.
-EXCEED_MAX_QUERY_TIMEOUT=Sorry, query's maximum timeout cannot exceed {0}s.
+EXCEED_MAX_QUERY_TIMEOUT=Sorry, query''s maximum timeout cannot exceed {0}s.
 CONNECTION_ERROR=Connection error: {0}.
 MONGODB_COMMAND_ERROR=Illegal MongoDB query: {0}
 REST_API_EXECUTION_ERROR=REST API execution error: {0}.
@@ -147,7 +147,7 @@ INVALID_MONGODB_BSON_ARRAY_FORMAT=Invalid query configuration: not a valid Mongo
 INVALID_JSON_ARRAY_FORMAT=Invalid query configuration: not a valid JSON Array format.
 INVALID_JSON_FORMAT=Invalid query configuration: not a valid JSON {0}.
 INVALID_MONGODB_REQUEST=Invalid MongoDB request {0}.
-INVALID_PARAM_CONFIG_PLZ_CHECK=Invalid query configuration, please check these parameters' configuration: {0}.
+INVALID_PARAM_CONFIG_PLZ_CHECK=Invalid query configuration, please check these parameters'' configuration: {0}.
 GUI_COMMAND_TYPE_EMPTY=Sorry, the query configuration is invalid: the GUI command type is empty.
 INVALID_GUI_PARAM=Invalid GUI parameters.
 INVALID_GUI_COMMAND_TYPE=Invalid GUI command type {0}.
@@ -170,7 +170,7 @@ INVALID_PG_QUERY_CONFIG_EMPTY=PostgreSQL query configuration is empty.
 INVALID_PG=Failed to parse PostgreSQL query configuration.
 INVALID_RESTAPI=Failed to parse REST API query configuration.
 GET_MONGODB_STRUCTURE_ERROR=Failed to get MongoDB structure.
-MONGODB_URI_EMPTY=MongoDB's connection URI is empty.
+MONGODB_URI_EMPTY=MongoDB''s connection URI is empty.
 MONGODB_URI_EXTRACT_ERROR=Failed to resolve MongoDB connection URI.
 CONTENT_PARSE_ERROR=Fail to resolve multipart data, requiring array or object type.
 PS_BIND_ERROR=PreparedStatement binding exception: {0}, parameter type {1}.
@@ -212,7 +212,7 @@ AUTH_ERROR=Authentication error, please contact system administrator.
 NO_USER_FOUND=User not found.
 SYSTEM_GROUP_ALL_USER=All Users
 SYSTEM_GROUP_DEV=Developers
-USER_ORG_SUFFIX='s workspace
+USER_ORG_SUFFIX=''s workspace
 DEFAULT_REST_DATASOURCE_NAME=REST Query
 DEFAULT_OPENBLOCKS_DATASOURCE_NAME=Openblocks API
 ## EVENT
@@ -243,7 +243,7 @@ EXCEED_MAX_ORG_MEMBER_COUNT=Sorry, this workspace has reached the maximum count
 EXCEED_MAX_GROUP_COUNT=Sorry, this workspace has reached the maximum count of groups.
 EXCEED_MAX_APP_COUNT=Sorry, you have reached maximum count of applications in current workspace.
 ## PLUGIN
-DUPLICATE_COLUMN=Duplicated columns found: {0}, use keyword 'as' to rename duplicated columns.
+DUPLICATE_COLUMN=Duplicated columns found: {0}, use keyword ''as'' to rename duplicated columns.
 INVALID_JSON_FROM_RESPONSE=Response data is not a valid JSON, please check your Content-Type header.
 REACH_REDIRECT_LIMIT=Reach maximum HTTP redirects: {0}.
 GOOGLESHEETS_QUERY_PARAM_EMPTY=Google Sheets query parameter is empty.
diff --git a/server/openblocks-server/src/main/java/com/openblocks/api/application/ApplicationApiService.java b/server/openblocks-server/src/main/java/com/openblocks/api/application/ApplicationApiService.java
@@ -74,6 +74,10 @@
 @Slf4j
 public class ApplicationApiService {
 
+    private static final String LIBRARY_QUERY_DATASOURCE_TYPE = "libraryQuery";
+    private static final String JS_DATASOURCE_TYPE = "js";
+    private static final String VIEW_DATASOURCE_TYPE = "view";
+
     @Autowired
     private ApplicationService applicationService;
 
@@ -517,6 +521,11 @@ private Map<String, Object> doSanitizeQuery(Object query) {
         if (!(compType instanceof String datasourceType)) {
             return queryMap;
         }
+        if (LIBRARY_QUERY_DATASOURCE_TYPE.equalsIgnoreCase(datasourceType) ||
+                JS_DATASOURCE_TYPE.equalsIgnoreCase(datasourceType) ||
+                VIEW_DATASOURCE_TYPE.equalsIgnoreCase(datasourceType)) {
+            return queryMap;
+        }
         var queryExecutor = datasourceMetaInfoService.getQueryExecutor(datasourceType);
         Object comp = queryMap.get("comp");
         if (!(comp instanceof Map<?, ?> queryConfig)) {
diff --git a/server/openblocks-server/src/main/java/com/openblocks/api/home/UserHomeApiService.java b/server/openblocks-server/src/main/java/com/openblocks/api/home/UserHomeApiService.java
@@ -11,9 +11,11 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
+import org.springframework.web.server.ServerWebExchange;
+
 public interface UserHomeApiService {
 
-    Mono<UserProfileView> buildUserProfileView(User user);
+    Mono<UserProfileView> buildUserProfileView(User user, ServerWebExchange exchange);
 
     Mono<Boolean> markNewUserGuidanceShown(String userId);
 
diff --git a/server/openblocks-server/src/main/java/com/openblocks/api/home/UserHomeApiServiceImpl.java b/server/openblocks-server/src/main/java/com/openblocks/api/home/UserHomeApiServiceImpl.java
diff --git a/server/openblocks-server/src/main/java/com/openblocks/api/material/PicProxyController.java b/server/openblocks-server/src/main/java/com/openblocks/api/material/PicProxyController.java
diff --git a/server/openblocks-server/src/main/java/com/openblocks/api/query/ApplicationQueryApiService.java b/server/openblocks-server/src/main/java/com/openblocks/api/query/ApplicationQueryApiService.java
diff --git a/server/openblocks-server/src/main/java/com/openblocks/api/query/LibraryQueryApiService.java b/server/openblocks-server/src/main/java/com/openblocks/api/query/LibraryQueryApiService.java
diff --git a/server/openblocks-server/src/main/java/com/openblocks/api/usermanagement/UserController.java b/server/openblocks-server/src/main/java/com/openblocks/api/usermanagement/UserController.java
diff --git a/server/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/UserProfileView.java b/server/openblocks-server/src/main/java/com/openblocks/api/usermanagement/view/UserProfileView.java
diff --git a/server/openblocks-server/src/main/resources/application-openblocks.yml b/server/openblocks-server/src/main/resources/application-openblocks.yml
diff --git a/server/openblocks-server/src/main/resources/selfhost/ce/application.yml b/server/openblocks-server/src/main/resources/selfhost/ce/application.yml

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ init_configuration() {`
`15`	`15`	`if ! [ -e "$YML_PATH" ]; then`
`16`	`16`	`echo "yml configuration not exist"`
`17`	`17`	`mkdir -p "$CONFIG_PATH"`
`18`		`- cp /env/application-selfhost.yml $CONFIG_PATH/`
	`18`	`+ cp /env2/application-selfhost.yml $CONFIG_PATH/`
`19`	`19`	`fi`
`20`	`20`	`}`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -64,9 +64,9 @@ public Aggregate(Map<String, Object> formData) {`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`@Override`
`67`		`- public Boolean isValid() {`
	`67`	`+ public boolean isValid() {`
`68`	`68`	`if (!super.isValid()) {`
`69`		`- return Boolean.FALSE;`
	`69`	`+ return false;`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`if (StringUtils.isNullOrEmpty(pipeline)) {`
Original file line number	Diff line number	Diff line change
`@@ -57,18 +57,18 @@ public Delete(Map<String, Object> formData) {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`@Override`
`60`		`- public Boolean isValid() {`
	`60`	`+ public boolean isValid() {`
`61`	`61`	`if (!super.isValid()) {`
`62`		`- return Boolean.FALSE;`
	`62`	`+ return false;`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`if (StringUtils.isNotBlank(query)) {`
`66`		`- return Boolean.TRUE;`
	`66`	`+ return true;`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`// Not adding smart defaults for query due to data impact`
`70`	`70`	`fieldNamesWithNoConfiguration.add("Query");`
`71`		`- return Boolean.FALSE;`
	`71`	`+ return false;`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -50,18 +50,18 @@ public Distinct(Map<String, Object> formData) {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`@Override`
`53`		`- public Boolean isValid() {`
	`53`	`+ public boolean isValid() {`
`54`	`54`	`if (!super.isValid()) {`
`55`		`- return Boolean.FALSE;`
	`55`	`+ return false;`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`if (StringUtils.isNotBlank(key)) {`
`59`		`- return Boolean.TRUE;`
	`59`	`+ return true;`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`fieldNamesWithNoConfiguration.add("Key/Field");`
`63`	`63`
`64`		`- return Boolean.FALSE;`
	`64`	`+ return false;`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -51,17 +51,17 @@ public Insert(Map<String, Object> formData) {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`@Override`
`54`		`- public Boolean isValid() {`
	`54`	`+ public boolean isValid() {`
`55`	`55`	`if (!super.isValid()) {`
`56`		`- return Boolean.FALSE;`
	`56`	`+ return false;`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`if (StringUtils.isNotBlank(documents)) {`
`60`		`- return Boolean.TRUE;`
	`60`	`+ return true;`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`fieldNamesWithNoConfiguration.add("Documents");`
`64`		`- return Boolean.FALSE;`
	`64`	`+ return false;`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -66,12 +66,12 @@ public MongoCommand(Map<String, Object> formData) {`
`66`	`66`	`timeoutMs = MapUtils.getInteger(formData, "timeout", DEFAULT_VALUE);`
`67`	`67`	`}`
`68`	`68`
`69`		`- public Boolean isValid() {`
	`69`	`+ public boolean isValid() {`
`70`	`70`	`if (StringUtils.isBlank(this.collection)) {`
`71`	`71`	`fieldNamesWithNoConfiguration.add(COLLECTION);`
`72`		`- return Boolean.FALSE;`
	`72`	`+ return false;`
`73`	`73`	`}`
`74`		`- return Boolean.TRUE;`
	`74`	`+ return true;`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`public Document parseCommand() {`
Original file line number	Diff line number	Diff line change
`@@ -64,13 +64,13 @@ public UpdateMany(Map<String, Object> formData) {`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`@Override`
`67`		`- public Boolean isValid() {`
	`67`	`+ public boolean isValid() {`
`68`	`68`	`if (!super.isValid()) {`
`69`		`- return Boolean.FALSE;`
	`69`	`+ return false;`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`if (StringUtils.isNotBlank(query) && StringUtils.isNotBlank(update)) {`
`73`		`- return Boolean.TRUE;`
	`73`	`+ return true;`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`// Not adding smart defaults for query due to data impact`
`@@ -81,7 +81,7 @@ public Boolean isValid() {`
`81`	`81`	`if (StringUtils.isBlank(update)) {`
`82`	`82`	`fieldNamesWithNoConfiguration.add("Update");`
`83`	`83`	`}`
`84`		`- return Boolean.FALSE;`
	`84`	`+ return false;`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`@Override`