Skip to content
This repository was archived by the owner on Sep 24, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
f25169b
Merge pull request #665 from naver/release/3.5.2
songeunwoo Sep 29, 2020
094e019
Fix case unintended reset of followers at login
donggyu04 Oct 8, 2020
c565dbc
Move cache of recently used agents to distribution map
donggyu04 Oct 8, 2020
63b6711
Rename cache
donggyu04 Oct 13, 2020
d21e1e6
Make the modified file distribution handler to be loaded first
donggyu04 Oct 15, 2020
319feb4
Add .gitattributes
donggyu04 Oct 16, 2020
6f96eb6
Merge pull request #673 from naver/feature/add-gitattributes
songeunwoo Oct 16, 2020
4d37b16
Make the H2 console optionally available
donggyu04 Oct 16, 2020
ae9715c
Merge pull request #672 from naver/feature/move-file-dist-handler-to-…
songeunwoo Oct 19, 2020
b95687b
Merge pull request #668 from naver/feature/move-recent-agent-cache-to…
songeunwoo Oct 19, 2020
0a95a77
Merge pull request #675 from naver/feature/make-h2-console-optionally…
songeunwoo Oct 19, 2020
5ef4511
Prevent lazy initialize exception in spring security authentication o…
donggyu04 Oct 8, 2020
cae2f52
Fix failed unit test
donggyu04 Oct 22, 2020
aba46f5
Merge pull request #669 from naver/bugfix/prevent-lazy-initialize-exc…
imbyungjun Oct 27, 2020
92109fb
Support UTC
donggyu04 Oct 19, 2020
d9926d3
Rename column
donggyu04 Oct 22, 2020
0e50ccd
Use vuejs-datepicker
donggyu04 Oct 27, 2020
2618488
Prevent NEP if start console is failed
donggyu04 Oct 28, 2020
fd40a3c
Escape response body in result console
donggyu04 Oct 28, 2020
67c0250
Merge pull request #682 from naver/bugfix/escape-response-body-in-res…
songeunwoo Oct 28, 2020
9eb50e5
Merge pull request #676 from naver/feature/make-to-use-utc
songeunwoo Oct 29, 2020
b1e7ccf
Reduce range of global css
donggyu04 Oct 29, 2020
b2ed870
Merge pull request #683 from naver/feature/reduce-range-of-global-css
imbyungjun Oct 29, 2020
1f41a99
Add abnormal testing status category
donggyu04 Oct 30, 2020
5bda279
Prevent test start button flickering
donggyu04 Oct 29, 2020
4adea12
Fix unstoppable abnormal test
donggyu04 Oct 30, 2020
cd9a664
Merge pull request #685 from naver/feature/prevent-test-start-button-…
songeunwoo Nov 4, 2020
3af9ea8
Merge pull request #684 from naver/bugfix/unstoppable-abnormal-test
songeunwoo Nov 4, 2020
2268bf7
Add identity information to perftest related log
donggyu04 Nov 2, 2020
a5a3a4a
Merge pull request #686 from naver/feature/enhance-logging
songeunwoo Nov 5, 2020
4396235
Remove @Index from entity
donggyu04 Oct 22, 2020
0a68ea2
Use try-with-resource
donggyu04 Oct 22, 2020
6bfcd86
Change deprecated method
donggyu04 Oct 22, 2020
454dbaa
Remove unnecessary code
donggyu04 Oct 22, 2020
64e4444
Use lambda expression
donggyu04 Oct 23, 2020
8a9419d
Use constructor based dependency injection
donggyu04 Oct 23, 2020
81b8c17
Fix ambiguous code
donggyu04 Oct 23, 2020
64614de
Use double quotes in build.gradle
donggyu04 Oct 28, 2020
b7fff69
Append final keyword to unmodifiable variables
donggyu04 Nov 2, 2020
a12cb2f
Attach @SuppressWarnings
donggyu04 Nov 3, 2020
986c0ec
Remove pre-sized array
donggyu04 Nov 4, 2020
8153da1
Simplify code
donggyu04 Nov 4, 2020
8a07f3d
Merge pull request #679 from naver/feature/clean-up-code
songeunwoo Nov 5, 2020
143bac6
Fix agent updating doesn't work
donggyu04 Nov 10, 2020
2828889
Merge pull request #688 from naver/bugfix/fix-agent-updating-does-not…
imbyungjun Nov 11, 2020
6078bb6
Add bintray gradle configuration
donggyu04 Nov 4, 2020
20a3798
Merge pull request #687 from naver/feature/publish-to-bintray
songeunwoo Nov 20, 2020
ab7fbe8
Check property existence in bintray gradle configuration
donggyu04 Nov 23, 2020
b881228
Merge pull request #691 from naver/feature/fix-bintray-gradle-configu…
songeunwoo Nov 23, 2020
83efc62
Remove embedded maven
donggyu04 Nov 11, 2020
73c935a
Support groovy gradle project script
donggyu04 Nov 16, 2020
4161f3c
Update docker file to install Maven and Gradle
donggyu04 Nov 24, 2020
37c7147
Merge pull request #689 from naver/feature/support-gradle-groovy
songeunwoo Nov 27, 2020
a8823d4
Bump version up to 3.5.3
donggyu04 Nov 27, 2020
9ebf7d8
Update RELEASE-NOTE.md
donggyu04 Nov 27, 2020
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
Prev Previous commit
Next Next commit
  • Loading branch information
donggyu04 committed Nov 5, 2020
commit a12cb2f807329a53a4ed5f0a6351985b05455ff0
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
/**
* @since 3.5.0
*/
@SuppressWarnings("unused")
@RestController
@RequestMapping("/agent/api")
@PreAuthorize("hasAnyRole('A', 'S')")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
*
* @since 3.1
*/
@SuppressWarnings("unused")
@Controller
@RequestMapping("/agent")
@GlobalControllerModel
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ public void download(@PathVariable String fileName, HttpServletResponse response
/**
* Download monitor.
*/
@SuppressWarnings("SpringMVCViewInspection")
@GetMapping("")
public String download(ModelMap model) {
try {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import javax.persistence.Entity;
import javax.persistence.Table;

@SuppressWarnings("JpaDataSourceORMInspection")
@Getter
@Setter
@ToString
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ public void update(Map<AgentIdentity, AgentProcessControlImplementation.AgentSta

for (AgentProcessControlImplementation.AgentStatus status : agentMap.values()) {
AgentControllerIdentityImplementation agentIdentity = (AgentControllerIdentityImplementation) status.getAgentIdentity();
AgentInfo agentInfo = agentInfoStore.getAgentInfo(createKey(agentIdentity));
AgentInfo agentInfo = agentInfoStore.getAgentInfo(createKey(requireNonNull(agentIdentity)));
// check new agent
if (agentInfo == null) {
agentInfo = new AgentInfo();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*
* @since 3.0
*/
@SuppressWarnings("unused")
public interface ControllerConstants {

String DEFAULT_PACKAGE_NAME = "org.ngrinder";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*
* @since 3.0
*/
@SuppressWarnings("unused")
public interface WebConstants {

String JSON_SUCCESS = "success";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
Expand All @@ -9,7 +9,7 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* limitations under the License.
*/
package org.ngrinder.common.model;

Expand All @@ -29,6 +29,7 @@
import java.io.StringReader;
import java.util.Properties;

import static java.util.Objects.requireNonNull;
import static org.ngrinder.common.util.ExceptionUtils.processException;
import static org.ngrinder.common.util.Preconditions.checkNotNull;

Expand Down Expand Up @@ -105,7 +106,7 @@ public File getDirectory() {
public void copyFrom(Resource[] resources) {
try {
for (Resource resource : resources) {
File resourceFile = new File(directory, resource.getFilename());
File resourceFile = new File(directory, requireNonNull(resource.getFilename()));
if (!resourceFile.exists()) {
FileUtils.copyInputStreamToFile(resource.getInputStream(), new File(directory, resource.getFilename()));
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand All @@ -25,7 +25,7 @@
/**
* Check every now and then that a certain file has not changed. If it has, then
* call the {@link #doOnChange} method.
*
*
* @since 3.1.1
*/
public abstract class FileWatchdog extends Thread {
Expand Down Expand Up @@ -59,7 +59,7 @@ protected FileWatchdog(String filename) {

/**
* Set the delay to observe between each check of the file changes.
*
*
* @param delay
* the frequency of file watch.
*/
Expand Down Expand Up @@ -100,6 +100,7 @@ protected void checkAndConfigure() {
}
}

@SuppressWarnings("BusyWait")
@Override
public void run() {
while (!interrupted && !isInterrupted()) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
Expand All @@ -9,7 +9,7 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* limitations under the License.
*/
package org.ngrinder.common.util;

Expand All @@ -21,6 +21,7 @@

import javax.servlet.http.HttpServletRequest;

import static java.util.Objects.requireNonNull;
import static org.ngrinder.common.constant.ControllerConstants.PROP_CONTROLLER_URL;
import static org.ngrinder.common.util.TypeConvertUtils.cast;

Expand Down Expand Up @@ -58,7 +59,7 @@ public String getCurrentContextUrlFromUserRequest() {

// if empty
HttpServletRequest request = cast(RequestContextHolder.currentRequestAttributes().resolveReference("request"));
int serverPort = request.getServerPort();
int serverPort = requireNonNull(request).getServerPort();
// If it's http default port it will ignore the port part.
// However, if ngrinder is provided in HTTPS.. it can be a problem.
// FIXME : Later fix above.
Expand All @@ -74,6 +75,6 @@ public String getCurrentContextUrlFromUserRequest() {
public boolean isUnixUser() {
SecurityContextHolderAwareRequestWrapper request = cast(RequestContextHolder.currentRequestAttributes()
.resolveReference("request"));
return !StringUtils.containsIgnoreCase(request.getHeader("User-Agent"), "Win");
return !StringUtils.containsIgnoreCase(requireNonNull(request).getHeader("User-Agent"), "Win");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
*
* @since 3.0
*/
@SuppressWarnings("SpringMVCViewInspection")
@Slf4j
@Controller
@GlobalControllerModel
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
Expand All @@ -9,7 +9,7 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* limitations under the License.
*/

package org.ngrinder.infra.config;
Expand All @@ -18,15 +18,16 @@
import org.ngrinder.common.model.Home;
import org.springframework.context.ApplicationListener;
import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.lang.NonNull;
import org.springframework.stereotype.Service;

import lombok.RequiredArgsConstructor;

/**
* Application life-cycle event listener.
*
*
* This class is used to clean up the several locks.
*
*
* @since 3.1
*/
@Service
Expand All @@ -35,6 +36,7 @@ public class ApplicationListenerBean implements ApplicationListener<ContextRefre

private final Config config;

@SuppressWarnings("NullableProblems")
@Override
public void onApplicationEvent(ContextRefreshedEvent event) {
Home exHome = config.getExHome();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ public int getMonitorPort() {
*
* @return true if enabled.
*/
@SuppressWarnings("unused")
public boolean isUsageReportEnabled() {
return getControllerProperties().getPropertyBoolean(PROP_CONTROLLER_USAGE_REPORT);
}
Expand Down Expand Up @@ -295,6 +296,7 @@ public static String getUserHome() {
CoreLogger.LOGGER.warn(" '" + userHomeFromProperty + "' is accepted.");
}
String userHome = StringUtils.defaultIfEmpty(userHomeFromProperty, userHomeFromEnv);

if (isEmpty(userHome)) {
userHome = System.getProperty("user.home") + File.separator + NGRINDER_DEFAULT_FOLDER;
} else if (StringUtils.startsWith(userHome, "~" + File.separator)) {
Expand Down Expand Up @@ -650,12 +652,12 @@ public String getCurrentIP() {
}
}


/**
* Check if the current ngrinder instance is hidden instance from the cluster.
*
* @return true if hidden.
*/
@SuppressWarnings("unused")
public boolean isInvisibleRegion() {
return getClusterProperties().getPropertyBoolean(PROP_CLUSTER_HIDDEN_REGION);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ void addDistMap(String cacheName, int timeout) {
hazelcastCacheConfigs.put(cacheName, mapConfig);
}

@SuppressWarnings("SameParameterValue")
void addDistCache(String cacheName, int timeout, int count) {
MapConfig mapConfig = createDistMapConfig(cacheName, timeout);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ private Map<String, String> getMessageMap(String locale) {
.collect(Collectors.toMap(entry -> entry.getKey().code, entry -> entry.getValue().toPattern()));
}

@SuppressWarnings("NullableProblems")
@Override
protected MessageFormat resolveCode(String code, Locale locale) {
MessageFormat resolved = langMessageMap.get(new LocaleAndCode(locale.getLanguage(), code));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ public class DefaultSuccessJsonInterceptor implements HandlerInterceptor, WebCon
@Autowired
private ObjectMapper objectMapper;

@SuppressWarnings("NullableProblems")
@Override
public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception {
if (modelAndView == null && !response.isCommitted() &&
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ public int getOrder() {
* javax.servlet.http.HttpServletResponse, java.lang.Object,
* java.lang.Exception)
*/
@SuppressWarnings("NullableProblems")
@Override
public ModelAndView resolveException(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) {
if (!(handler instanceof HandlerMethod)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
import org.springframework.web.method.support.HandlerMethodArgumentResolver;
import org.springframework.web.method.support.ModelAndViewContainer;

import static java.util.Objects.requireNonNull;

/**
* Custom argument resolver to catch the unresolved remaining path.
*
Expand Down Expand Up @@ -69,7 +71,7 @@ public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer m
AntPathMatcher pathMatcher = new AntPathMatcher();
RequestMapping requestMappingOnMethod = parameter.getMethodAnnotation(RequestMapping.class);
RequestMapping requestMappingOnClass = getDeclaringClassRequestMapping(parameter);
String combine = pathMatcher.combine(requestMappingOnClass.value()[0], requestMappingOnMethod.value()[0]);
String combine = pathMatcher.combine(requestMappingOnClass.value()[0], requireNonNull(requestMappingOnMethod).value()[0]);
String path = ((ServletWebRequest) webRequest).getRequest().getRequestURI().substring(webRequest.getContextPath().length());
return PathUtils.removePrependedSlash(pathMatcher.extractPathWithinPattern(combine, EncodingUtils.decodePathWithUTF8(path)));
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
Expand All @@ -9,7 +9,7 @@
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* limitations under the License.
*/
package org.ngrinder.infra.spring;

Expand Down Expand Up @@ -40,6 +40,7 @@ public boolean isAuthenticationContext() {
* @return always false.
* @see MockSpringContext
*/
@SuppressWarnings("JavadocReference")
public boolean isUnitTestContext() {
return false;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ public boolean supportsParameter(MethodParameter parameter) {
return parameter.getParameterIndex() == 0 && parameter.getParameterType().equals(User.class);
}

@SuppressWarnings("NullableProblems")
@Override
public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer,
NativeWebRequest webRequest, WebDataBinderFactory binderFactory) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
* */
public class ApplicationPreparedListener implements ApplicationListener<ApplicationPreparedEvent> {

@SuppressWarnings("NullableProblems")
@Override
public void onApplicationEvent(ApplicationPreparedEvent event) {
removeCacheProviderExceptCaffeineCacheProvider();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
*
* @since 3.5.2
*/
@SuppressWarnings("JpaDataSourceORMInspection")
@Getter
@Setter
@Entity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
*
* @since 3.5.2
*/
@SuppressWarnings("JpaDataSourceORMInspection")
@Getter
@Setter
@Entity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
*/
public interface WebhookActivationRepository extends JpaRepository<WebhookActivation, Long>, JpaSpecificationExecutor<WebhookActivation> {

@SuppressWarnings("NullableProblems")
@Override
Page<WebhookActivation> findAll(Specification<WebhookActivation> spec, Pageable pageable);
}
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ public class NGrinderWebhookClient {

private final WebClient webClient;

@SuppressWarnings("BlockingMethodInNonBlockingContext")
Mono<ResponseEntity<String>> post(String url,
MediaType mediaType,
Map<String, Object> payLoad) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
@PreAuthorize("hasAnyRole('A', 'S')")
public class AnnouncementController {

@SuppressWarnings("SpringMVCViewInspection")
@GetMapping("")
public String open() {
return "app";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
@PreAuthorize("hasAnyRole('A')")
public class ScriptConsoleController {

@SuppressWarnings("SpringMVCViewInspection")
@GetMapping({"", "/"})
public String scriptConsole() {
return "app";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
@PreAuthorize("hasAnyRole('A')")
public class SystemConfigController {

@SuppressWarnings("SpringMVCViewInspection")
@GetMapping("")
public String systemConfig() {
return "app";
Expand Down
Loading