Replace Java 1.4 era 'for' loops #955

Juiceman · 2024-03-18T01:44:49Z

Use Enhanced 'for' loops

This upgrade enables using the Gradle Linux Packaging Plugin (ospackage) in order to easily generate RPM and DEB packages for the Freenet REference Daemon on Linux OS.

We are looking for empty strings, so use .isEmpty()

Use Enhanced 'for' loops

Bombe · 2024-03-18T11:13:16Z

While the enhanced for loops are nice, I would suggest to actually go one step further and use the Stream API, e.g.

buckets.stream().forEach(Bucket::free);

Of course that’s only possible in places where the method being called does not throw exceptions…

bertm · 2024-03-18T22:44:46Z

If you're following Bombe's suggestion, please consider leaving out the .stream() (just using Iterable's forEach(Consumer)):

buckets.forEach(Bucket::free);

…nto size-zero-to-isEmpty

I was a little delete happy

hernic · 2024-05-06T11:27:18Z

@Bombe could you review this one ?

…:ArneBab/fred-staging-1 into next

thank you for the review!

Hashes of libs distributed in dependencies.properties manually checked against the verification-metadata.xml

baseName → archiveBaseName archiveName → archiveFileName destinationDir → destinationDirectory

Import from transifex

When using the gradle-daemon to build a project, the working directory the script is executed in is the local directory of the gradle-daemon running the script. By explicitely specifying the directory to execute Git in, this will now work with and without gradle-daemon.

The default “jar” task a pre-defined input with compileJava’s output, which includes the original, non-replaced Version.class. I have not found a way to disable the pre-defined input, or modify it in a way that would still allow me to add a Version.class from a different task’s output. What’s happening now is that there is a new task, “buildJar.” It is an almost verbatim copy of what the “jar” task previously contained with an added input (compileVersion’s output). This jar task does not have a pre-defined input and as such only includes what is being specified. The original jar task has been disabled and has been given the buildJar task as dependency. That way the jar task can still be run from the command line where it doesn’t do anything (because it’s disabled) but it will require the buildJar task to be run which then does the actual work.

…fred into next

…Bombe/fred into next

Use Enhanced 'for' loops

# Conflicts: # src/freenet/clients/http/WelcomeToadlet.java # src/freenet/config/StringArrOption.java # src/freenet/support/PrioritizedSerialExecutor.java

Bombe · 2024-09-23T09:39:50Z

Can you get this up to speed with current next, @Juiceman?

Juiceman · 2024-09-23T17:30:56Z

Try it now please @Bombe

Bombe · 2024-09-24T07:28:39Z

Ugh, why is Github showing all this cruft? If I diff locally, I get your changes only, which is what would I expect Github to do as well. This is really annyoing but I guess I’ll manage. I’ll take a look at it later today.

Bombe

Okay, I hope I got everything… something in this branch seems to confuse Github to no end. Could you (after making a couple of changes) try to clean up this branch by rebasing it on current next? It would make further processing easier; but if it’s a problem, we still have the command line… 😄

Bombe · 2024-09-24T17:36:37Z

src/freenet/client/async/BinaryBlobWriter.java

-			for (int i=0,n=_buckets.size(); i<n;i++) {
-				_buckets.get(i).free();
+			for (Bucket bucket : _buckets) {
+				bucket.free();


In a case like this, _buckets.forEach(Bucket::free); is preferable, because it better communicates the intent.

Bombe · 2024-09-24T17:39:29Z

src/freenet/client/async/SplitFileFetcherKeyListener.java

+				if (segmentFilter.checkFilter(salted)) {
+					return true;
+				}
+			}


This whole thing can be replaced with

if (segmentFilters.any(filter -> filter.checkFilter(salted))) { return true; }

Again, this makes the intent clearer, because it does not require the reader to parse for- and if-constructs.

Bombe · 2024-09-24T17:42:16Z

src/freenet/client/events/SimpleEventProducer.java

@@ -30,8 +30,7 @@ public SimpleEventProducer() {
    /** Create a new SimpleEventProducer with the given listeners. */
    public SimpleEventProducer(ClientEventListener[] cela) {
        this();
-        for (int i = 0; i < cela.length; i++)
-            addEventListener(cela[i]);
+		for (ClientEventListener clientEventListener : cela) addEventListener(clientEventListener);


Even if the original statement did not have braces, new statements will, please. 🙂

Bombe · 2024-09-24T17:42:42Z

src/freenet/client/events/SimpleEventProducer.java

@@ -83,8 +82,7 @@ public synchronized ClientEventListener[] getEventListeners() {

    /** Adds all listeners in the given array. */
    public synchronized void addEventListeners(ClientEventListener[] cela) {
-        for (int i = 0; i < cela.length; i++)
-            addEventListener(cela[i]);
+		for (ClientEventListener clientEventListener : cela) addEventListener(clientEventListener);


Same here; braces, please.

Bombe · 2024-09-24T17:43:41Z

src/freenet/client/filter/HTMLFilter.java

@@ -841,8 +841,8 @@ public String toString() {
 			sb.append(element);
 			if (unparsedAttrs != null) {
 				int n = unparsedAttrs.length;


I think n is now unused and can be removed.

Bombe · 2024-09-24T19:47:17Z

test/freenet/support/SimpleFieldSetTest.java

@@ -622,8 +620,7 @@ public void testPutAppend() {
 								+"bar"+SimpleFieldSet.MULTI_VALUE_CHAR
 								+"zoo";
 		SimpleFieldSet methodSFS = new SimpleFieldSet(true);
-		for (int i = 0 ; i < methodValues.length; i++)
-			methodSFS.putAppend(methodKey,methodValues[i]);
+		for (String methodValue : methodValues) methodSFS.putAppend(methodKey, methodValue);


Braces, please.

Bombe · 2024-09-24T19:47:23Z

test/freenet/support/SimpleFieldSetTest.java

@@ -635,8 +632,7 @@ public void testGetAll() {
 		String methodKey = "foo.bar";
 		String[] methodValues = {"boo","bar","zoo"};
 		SimpleFieldSet methodSFS = new SimpleFieldSet(true);
-		for (int i = 0 ; i < methodValues.length; i++)
-			methodSFS.putAppend(methodKey,methodValues[i]);
+		for (String methodValue : methodValues) methodSFS.putAppend(methodKey, methodValue);


Braces, please.

Bombe · 2024-09-24T19:47:28Z

test/freenet/support/SimpleFieldSetTest.java

@@ -708,8 +704,8 @@ public void testRemoveSubset() {
 	 * @return true if there is the key
 	 */
 	private boolean isAKey(String[][] aStringPairsArray, String aPrefix, String aKey) {
-		for (int i=0; i<aStringPairsArray.length; i++)
-			if (aKey.equals(aPrefix+aStringPairsArray[i][0])) 
+		for (String[] strings : aStringPairsArray)


Braces, please.

Bombe · 2024-09-24T19:48:00Z

test/freenet/support/io/TempBucketTest.java

@@ -141,8 +141,7 @@ public void testConversionWhileReading() throws IOException {
 			bucket.migrateToDisk();
 			byte[] readTo = new byte[16];
 			assertTrue(is.read(readTo, 0, 16) == 16);
-			for(int i=0;i<readTo.length;i++)
-				assertTrue(readTo[i] == 0);
+			for (byte b : readTo) assertTrue(b == 0);


Braces, please.

Bombe · 2024-09-24T19:48:46Z

src/freenet/clients/http/HTTPRequestImpl.java

@@ -444,9 +444,9 @@ public int[] getMultipleIntParam(String name) {

 		// try parsing all values and put the valid Integers in a new list
 		List<Integer> intValueList = new ArrayList<Integer>();
-		for (int i = 0; i < valueList.size(); i++) {
+		for (String s : valueList) {


A more descriptive variable name than s would be appreciated. 🙂

Christophe and others added 3 commits February 8, 2023 15:48

Upgrade to Gradle 7.6

8991303

This upgrade enables using the Gradle Linux Packaging Plugin (ospackage) in order to easily generate RPM and DEB packages for the Freenet REference Daemon on Linux OS.

Simplify string length checks

3c83d3f

We are looking for empty strings, so use .isEmpty()

Replace Java 1.4 era 'for' loops

b44597f

Use Enhanced 'for' loops

Bombe self-requested a review March 18, 2024 11:13

Juiceman and others added 16 commits March 20, 2024 22:13

Merge branch 'next' into size-zero-to-isEmpty

20b27b2

Remove extra parenthesis

ed98d8c

Merge remote-tracking branch 'Juiceman-origin/size-zero-to-isEmpty' i…

c7c3caa

…nto size-zero-to-isEmpty

Revert negation of ternary operators

5564298

Revert negation of ternary operator

7525573

Restore parenthesis

47525eb

I was a little delete happy

Update NEWS for 1498

2873fc1

organize NEWS by topic

0a8d971

NEWS: add section high impact tasks

3acf4e8

add note

0350536

polish

8318eff

NEWS: polish and note viewport

6077de2

removed superfluous -

d6d3bd8

Added user-facing changelog to NEWS.md

f3899a0

Add missing links

92fc225

NEWS: added more whitespace for structuring

8a4311c

torusrxxx and others added 7 commits May 10, 2024 20:42

Support abridged IPv6 address

9f42891

Merge branch 'next' into for-loops

d05005c

Merge branch 'next' into size-zero-to-isEmpty

ed0cc12

Add lossy WebP filter

4072fb1

Add more tests and fix boundary checks

392ce46

Fixed processing of unexpected data after valid WebP image

e1fadf5

Add test for lossy WebP image with alpha

f875d4b

ArneBab and others added 25 commits July 25, 2024 12:20

Merge branch 'resilience-against-plugin-list-exception' of github.com…

4ebce69

…:ArneBab/fred-staging-1 into next

Replace Java 10 Set copy with Java 8 compatible creation

4c3ffb1

thank you for the review!

added sha256 for dependencies

3f0625f

Merge branch 'chris-ch-next-upgrade-gradle-7.6' into next

4029f51

Hashes of libs distributed in dependencies.properties manually checked against the verification-metadata.xml

Resolve Gradle Deprecation Warnings

1c9e07c

baseName → archiveBaseName archiveName → archiveFileName destinationDir → destinationDirectory

Gradle merge regression: update hamcrest and junit again

4b8566c

update Japanese translation

f5689d6

Import from transifex

🚸 Prevent duplicate files in the JAR file

716196a

🚸 Prevent hashing of files generated by disabled tasks

034caf0

Update Gradle to 8.9

8d29fcc

update junit and hamcrest — thanks to Bombe!

66815c2

Update junit to 4.13.2

4288fe9

upgraded dependencies

a9f8b2b

reordered keys

373ddd6

clean-up

f8483d2

Merge branch 'l10n-ja' of github.com:qupo1/fred into next

c962f9e

Merge branch 'fix/build-info-with-gradle-daemon' of github.com:Bombe/…

c2a0431

…fred into next

Merge branch 'patch-1' of github.com:torusrxxx/fred into next

6d58bed

Merge branch 'gradle-update-to-8.9' into next

f6972f1

Restore verification data for hamcrest 1.3

5cd3f78

Merge branch 'fix/include-correct-version-in-jar-file' of github.com:…

523d84b

…Bombe/fred into next

Replace Java 1.4 era 'for' loops

6c07706

Use Enhanced 'for' loops

Merge remote-tracking branch 'Juiceman-origin/for-loops' into for-loops

ee34184

# Conflicts: # src/freenet/clients/http/WelcomeToadlet.java # src/freenet/config/StringArrOption.java # src/freenet/support/PrioritizedSerialExecutor.java

Bombe requested changes Sep 24, 2024

View reviewed changes

torusrxxx mentioned this pull request Nov 11, 2024

Support more HTML elements and CSS attributes and fix CSS filter crashes #990

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Replace Java 1.4 era 'for' loops #955

Replace Java 1.4 era 'for' loops #955

Juiceman commented Mar 18, 2024

Bombe commented Mar 18, 2024

bertm commented Mar 18, 2024

hernic commented May 6, 2024

Bombe commented Sep 23, 2024

Juiceman commented Sep 23, 2024

Bombe commented Sep 24, 2024

Bombe left a comment

Bombe Sep 24, 2024

Bombe Sep 24, 2024

Bombe Sep 24, 2024

Bombe Sep 24, 2024

Bombe Sep 24, 2024

Bombe Sep 24, 2024

Bombe Sep 24, 2024

Bombe Sep 24, 2024

Bombe Sep 24, 2024

Bombe Sep 24, 2024

Replace Java 1.4 era 'for' loops #955

Are you sure you want to change the base?

Replace Java 1.4 era 'for' loops #955

Conversation

Juiceman commented Mar 18, 2024

Bombe commented Mar 18, 2024

bertm commented Mar 18, 2024

hernic commented May 6, 2024

Bombe commented Sep 23, 2024

Juiceman commented Sep 23, 2024

Bombe commented Sep 24, 2024

Bombe left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment