[ci] Formatting and small adjustments to cleanup

hazendaz · Mar 18, 2024 · a90480a · a90480a
1 parent 62b0850
commit a90480a
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 29 deletions.
diff --git a/...le-demo/waffle-spring-boot-filter2/src/main/java/waffle/spring/boot/demo/Application.java b/...le-demo/waffle-spring-boot-filter2/src/main/java/waffle/spring/boot/demo/Application.java
@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2010-2022 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
+ * Copyright (c) 2010-2024 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/...demo/waffle-spring-boot-filter2/src/main/java/waffle/spring/boot/demo/DemoController.java b/...demo/waffle-spring-boot-filter2/src/main/java/waffle/spring/boot/demo/DemoController.java
@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2010-2022 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
+ * Copyright (c) 2010-2024 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/...le-demo/waffle-spring-boot-filter3/src/main/java/waffle/spring/boot/demo/Application.java b/...le-demo/waffle-spring-boot-filter3/src/main/java/waffle/spring/boot/demo/Application.java
@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2010-2023 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
+ * Copyright (c) 2010-2024 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/...demo/waffle-spring-boot-filter3/src/main/java/waffle/spring/boot/demo/DemoController.java b/...demo/waffle-spring-boot-filter3/src/main/java/waffle/spring/boot/demo/DemoController.java
@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2010-2023 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
+ * Copyright (c) 2010-2024 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/Source/JNA/waffle-jna-jakarta/src/main/java/waffle/util/CorsPreFlightCheck.java b/Source/JNA/waffle-jna-jakarta/src/main/java/waffle/util/CorsPreFlightCheck.java
@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2010-2022 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
+ * Copyright (c) 2010-2024 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/Source/JNA/waffle-jna-jakarta/src/test/java/waffle/util/SPNegoMessageTest.java b/Source/JNA/waffle-jna-jakarta/src/test/java/waffle/util/SPNegoMessageTest.java
@@ -41,10 +41,10 @@ class SPNegoMessageTest {
     private static final byte[] NEG_TOKEN_INIT_TOO_SHORT = { 0x60, 0x76, 0x06, 0x06, 0x2B, 0x06, 0x01, 0x05, 0x05 };
 
     /** The Constant NEG_TOKEN_ARG_OK. */
-    private static final byte[] NEG_TOKEN_ARG_OK = { (byte) 0xA1, 0x33, 0x30, 0x31, 0x0, 0x03, 0x0A, 0x01, 0x01, 0x0, 0x2A,
-            0x04, 0x28, 0x4E, 0x54, 0x4C, 0x4D, 0x53, 0x53, 0x50, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0, 0x0, 0x08, 0x0,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x01,
-            0x0, 0x1D, 0x00, 0x00, 0x00, 0x0F };
+    private static final byte[] NEG_TOKEN_ARG_OK = { (byte) 0xA1, 0x33, 0x30, 0x31, 0x0, 0x03, 0x0A, 0x01, 0x01, 0x0,
+            0x2A, 0x04, 0x28, 0x4E, 0x54, 0x4C, 0x4D, 0x53, 0x53, 0x50, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0, 0x0, 0x08,
+            0x0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06,
+            0x01, 0x0, 0x1D, 0x00, 0x00, 0x00, 0x0F };
 
     /** The Constant NEG_TOKEN_ARG_TOO_SHORT. */
     private static final byte[] NEG_TOKEN_ARG_TOO_SHORT = { (byte) 0xA1, 0x33, 0x30, 0x31, 0x0, 0x03 };

diff --git a/...e/JNA/waffle-shiro/src/main/java/waffle/shiro/negotiate/NegotiateAuthenticationRealm.java b/...e/JNA/waffle-shiro/src/main/java/waffle/shiro/negotiate/NegotiateAuthenticationRealm.java
@@ -41,15 +41,8 @@
 import waffle.windows.auth.impl.WindowsAuthProviderImpl;
 
 /**
- * The Class NegotiateAuthenticationRealm.
- *
- * Derived from net.skorgenes.security.jsecurity.negotiate.NegotiateAuthenticationFilter. see:
- *
- * https://bitbucket.org/lothor
- *
- * /shiro-negotiate/src/7b25efde130b/src/main/java/net/skorgenes/security/jsecurity/negotiate
- *
- * /NegotiateAuthenticationRealm.java?at=default
+ * The Class NegotiateAuthenticationRealm. Derived from
+ * net.skorgenes.security.jsecurity.negotiate.NegotiateAuthenticationFilter.
  */
 public class NegotiateAuthenticationRealm extends AuthenticatingRealm {
 

diff --git a/Source/JNA/waffle-shiro/src/test/java/waffle/shiro/negotiate/MockServletResponse.java b/Source/JNA/waffle-shiro/src/test/java/waffle/shiro/negotiate/MockServletResponse.java
@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2010-2020 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
+ * Copyright (c) 2010-2024 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -36,19 +36,19 @@
 public abstract class MockServletResponse implements HttpServletResponse {
 
     /** The is flushed. */
-    private boolean isFlushed;
+    protected boolean isFlushed;
 
     /** The error code. */
-    private int errorCode;
+    protected int errorCode;
 
     /** The headers. */
-    private Map<String, String> headers;
+    protected Map<String, String> headers;
 
     /** The headers added. */
-    private Map<String, List<String>> headersAdded;
+    protected Map<String, List<String>> headersAdded;
 
     /** The sc. */
-    private int sc;
+    protected int sc;
 
     @Override
     public void addHeader(final String name, final String value) {

diff --git a/.../waffle-shiro/src/test/java/waffle/shiro/negotiate/NegotiateAuthenticationFilterTest.java b/.../waffle-shiro/src/test/java/waffle/shiro/negotiate/NegotiateAuthenticationFilterTest.java
@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2010-2023 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
+ * Copyright (c) 2010-2024 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/...e-spring-security5/src/test/java/waffle/spring/DelegatingNegotiateSecurityFilterTest.java b/...e-spring-security5/src/test/java/waffle/spring/DelegatingNegotiateSecurityFilterTest.java
@@ -191,8 +191,9 @@ class CustomAuthenticationSuccessHandler implements AuthenticationSuccessHandler
     private Authentication authentication;
 
     @Override
-    public void onAuthenticationSuccess(final HttpServletRequest httpServletRequest, final HttpServletResponse httpServletResponse,
-            final Authentication authentication) throws IOException, ServletException {
+    public void onAuthenticationSuccess(final HttpServletRequest httpServletRequest,
+            final HttpServletResponse httpServletResponse, final Authentication authentication)
+            throws IOException, ServletException {
         this.authentication = authentication;
     }
 

diff --git a/...e-spring-security6/src/test/java/waffle/spring/DelegatingNegotiateSecurityFilterTest.java b/...e-spring-security6/src/test/java/waffle/spring/DelegatingNegotiateSecurityFilterTest.java
@@ -191,8 +191,9 @@ class CustomAuthenticationSuccessHandler implements AuthenticationSuccessHandler
     private Authentication authentication;
 
     @Override
-    public void onAuthenticationSuccess(final HttpServletRequest httpServletRequest, final HttpServletResponse httpServletResponse,
-            final Authentication authentication) throws IOException, ServletException {
+    public void onAuthenticationSuccess(final HttpServletRequest httpServletRequest,
+            final HttpServletResponse httpServletResponse, final Authentication authentication)
+            throws IOException, ServletException {
         this.authentication = authentication;
     }