Skip to content

Use immutable collections instead of creating unnecessary collection objects #4003

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

Closed
wants to merge 2 commits into from
Closed

Use immutable collections instead of creating unnecessary collection objects #4003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03d56f6
Assign a static collection to a local variable in StepContext#getPart…
sjh836 Sep 14, 2021
34f20fe
Change from arrayList to immutableList in OrderedComposite#iterator
sjh836 Sep 14, 2021
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
4 changes: 2 additions & 2 deletions ...ng-batch-core/src/main/java/org/springframework/batch/core/listener/OrderedComposite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2006-2007 the original author or authors.
* Copyright 2006-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -84,7 +84,7 @@ else if (!unordered.contains(item)) {
* @return an iterator over the list of items
*/
public Iterator<S> iterator() {
return new ArrayList<>(list).iterator();
return Collections.unmodifiableList(list).iterator();
}

/**
Expand Down
4 changes: 2 additions & 2 deletions ...ng-batch-core/src/main/java/org/springframework/batch/core/scope/context/StepContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2006-2019 the original author or authors.
* Copyright 2006-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -160,7 +160,7 @@ public Map<String, Object> getJobParameters() {

@SuppressWarnings({"rawtypes", "unchecked"})
public Map<String, Object> getPartitionPlan() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This method was removed in e5c752b, I will omit this change and its related test on merge.

Map<String, Object> partitionPlanProperties = new HashMap<>();
Map<String, Object> partitionPlanProperties = Collections.emptyMap();

if(propertyContext != null) {
Map partitionProperties = propertyContext.getStepProperties(getStepName());
Expand Down
10 changes: 9 additions & 1 deletion ...tch-core/src/test/java/org/springframework/batch/core/scope/context/StepContextTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2006-2019 the original author or authors.
* Copyright 2006-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -81,6 +81,14 @@ public void testGetPartitionPlan() {
assertEquals("value1", plan.get("key1"));
}

@Test
public void testGetPartitionPlanWhenPropertyContextIsNull() {
context = new StepContext(stepExecution, null);

Map<String, Object> plan = context.getPartitionPlan();
assertEquals(0, plan.size());
}

@Test
public void testEqualsSelf() {
assertEquals(context, context);
Expand Down