Merge pull request #89 from hazendaz/master

hazendaz · web-flow · commit 9bd7b1097ef5 · 2022-08-21T22:19:21.000-04:00
Use secure licence header
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
@@ -7,7 +7,7 @@
        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
+          https://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,
diff --git a/.mvn/settings.xml b/.mvn/settings.xml
@@ -7,7 +7,7 @@
        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
+          https://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,
diff --git a/LICENSE_HEADER b/LICENSE_HEADER
@@ -4,7 +4,7 @@
    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
+      https://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,
diff --git a/format.xml b/format.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2012-2017 the original author or authors.
+       Copyright 2012-2022 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.
        You may obtain a copy of the License at
 
-          http://www.apache.org/licenses/LICENSE-2.0
+          https://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,
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
        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
+          https://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,
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2012-2016 the original author or authors.
+       Copyright 2012-2022 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.
        You may obtain a copy of the License at
 
-          http://www.apache.org/licenses/LICENSE-2.0
+          https://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,
diff --git a/src/main/java/org/mybatis/caches/memcached/AbstractPropertySetter.java b/src/main/java/org/mybatis/caches/memcached/AbstractPropertySetter.java
@@ -1,11 +1,11 @@
 /*
- *    Copyright 2012-2021 the original author or authors.
+ *    Copyright 2012-2022 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.
  *    You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *       https://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,
@@ -124,7 +124,9 @@ public final void set(Properties config, MemcachedConfiguration memcachedConfigu
    *
    * @param value
    *          the value has to be converted.
+   *
    * @return the converted value.
+   *
    * @throws Exception
    *           if any error occurs.
    */
diff --git a/src/main/java/org/mybatis/caches/memcached/BooleanPropertySetter.java b/src/main/java/org/mybatis/caches/memcached/BooleanPropertySetter.java
@@ -1,11 +1,11 @@
 /*
- *    Copyright 2012-2021 the original author or authors.
+ *    Copyright 2012-2022 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.
  *    You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *       https://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,
diff --git a/src/main/java/org/mybatis/caches/memcached/CompressorTranscoder.java b/src/main/java/org/mybatis/caches/memcached/CompressorTranscoder.java
@@ -1,11 +1,11 @@
 /*
- *    Copyright 2012-2021 the original author or authors.
+ *    Copyright 2012-2022 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.
  *    You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *       https://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,
diff --git a/src/main/java/org/mybatis/caches/memcached/ConnectionFactorySetter.java b/src/main/java/org/mybatis/caches/memcached/ConnectionFactorySetter.java
@@ -1,11 +1,11 @@
 /*
- *    Copyright 2012-2021 the original author or authors.
+ *    Copyright 2012-2022 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.
  *    You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *       https://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,
diff --git a/src/main/java/org/mybatis/caches/memcached/DummyReadWriteLock.java b/src/main/java/org/mybatis/caches/memcached/DummyReadWriteLock.java
@@ -1,11 +1,11 @@
 /*
- *    Copyright 2012-2021 the original author or authors.
+ *    Copyright 2012-2022 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.
  *    You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *       https://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,
diff --git a/src/main/java/org/mybatis/caches/memcached/InetSocketAddressListPropertySetter.java b/src/main/java/org/mybatis/caches/memcached/InetSocketAddressListPropertySetter.java
@@ -1,11 +1,11 @@
 /*
- *    Copyright 2012-2021 the original author or authors.
+ *    Copyright 2012-2022 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.
  *    You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *       https://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,
diff --git a/src/main/java/org/mybatis/caches/memcached/IntegerPropertySetter.java b/src/main/java/org/mybatis/caches/memcached/IntegerPropertySetter.java
@@ -1,11 +1,11 @@
 /*
- *    Copyright 2012-2021 the original author or authors.
+ *    Copyright 2012-2022 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.
  *    You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *       https://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,
diff --git a/src/main/java/org/mybatis/caches/memcached/LoggingMemcachedCache.java b/src/main/java/org/mybatis/caches/memcached/LoggingMemcachedCache.java
@@ -1,11 +1,11 @@
 /*
- *    Copyright 2012-2021 the original author or authors.
+ *    Copyright 2012-2022 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.
  *    You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *       https://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,
diff --git a/src/main/java/org/mybatis/caches/memcached/MemcachedCache.java b/src/main/java/org/mybatis/caches/memcached/MemcachedCache.java
@@ -1,11 +1,11 @@
 /*
- *    Copyright 2012-2021 the original author or authors.
+ *    Copyright 2012-2022 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.
  *    You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *       https://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,
diff --git a/src/main/java/org/mybatis/caches/memcached/MemcachedClientWrapper.java b/src/main/java/org/mybatis/caches/memcached/MemcachedClientWrapper.java
@@ -1,11 +1,11 @@
 /*
- *    Copyright 2012-2021 the original author or authors.
+ *    Copyright 2012-2022 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.
  *    You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *       https://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,
@@ -109,6 +109,7 @@ public MemcachedClientWrapper() {
    *
    * @param key
    *          the MyBatis object key.
+   *
    * @return the proper string representation.
    */
   private String toKeyString(final Object key) {
@@ -121,8 +122,8 @@ private String toKeyString(final Object key) {
   }
 
   /**
-   *
    * @param key
+   *
    * @return
    */
   public Object getObject(Object key) {
@@ -141,6 +142,7 @@ public Object getObject(Object key) {
    *
    * @param groupKey
    *          the group key.
+   *
    * @return the group if was previously stored, null otherwise.
    */
   private ObjectWithCas getGroup(String groupKey) {
@@ -170,10 +172,10 @@ private ObjectWithCas getGroup(String groupKey) {
   }
 
   /**
-   *
-   *
    * @param keyString
+   *
    * @return
+   *
    * @throws Exception
    */
   private Object retrieve(final String keyString) {
@@ -208,7 +210,9 @@ private Object retrieve(final String keyString) {
    * Retrieves an object along with its cas using the given key
    *
    * @param keyString
+   *
    * @return
+   *
    * @throws Exception
    */
   private ObjectWithCas retrieveWithCas(final String keyString) {
@@ -302,12 +306,13 @@ private void storeInMemcached(String keyString, Object value) {
   }
 
   /**
-   * Tries to update an object value in memcached considering the cas validation
-   *
+   * Tries to update an object value in memcached considering the cas validation.
+   * <p>
    * Returns true if the object passed the cas validation and was modified.
    *
    * @param keyString
    * @param value
+   *
    * @return
    */
   private boolean storeInMemcached(String keyString, ObjectWithCas value) {
@@ -330,11 +335,12 @@ private boolean storeInMemcached(String keyString, ObjectWithCas value) {
 
   /**
    * Tries to store an object identified by a key in Memcached.
-   *
+   * <p>
    * Will fail if the object already exists.
    *
    * @param keyString
    * @param value
+   *
    * @return
    */
   private boolean tryToAdd(String keyString, Object value) {
diff --git a/src/main/java/org/mybatis/caches/memcached/MemcachedConfiguration.java b/src/main/java/org/mybatis/caches/memcached/MemcachedConfiguration.java
@@ -1,11 +1,11 @@
 /*
- *    Copyright 2012-2021 the original author or authors.
+ *    Copyright 2012-2022 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.
  *    You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *       https://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,
@@ -268,6 +268,7 @@ public int hashCode() {
    *          a non-zero, odd number used as the multiplier.
    * @param objs
    *          the objects to compute hash code.
+   *
    * @return the computed hashCode.
    */
   public static int hash(int initialNonZeroOddNumber, int multiplierNonZeroOddNumber, Object... objs) {
@@ -305,6 +306,7 @@ && eq(usingAsyncGet, other.usingAsyncGet) && eq(usingSASL, other.usingSASL) && e
    *          the first argument to compare
    * @param o2
    *          the second argument to compare
+   *
    * @return true, if the input arguments are equal, false otherwise.
    */
   private static <O> boolean eq(O o1, O o2) {
diff --git a/src/main/java/org/mybatis/caches/memcached/MemcachedConfigurationBuilder.java b/src/main/java/org/mybatis/caches/memcached/MemcachedConfigurationBuilder.java
@@ -1,11 +1,11 @@
 /*
- *    Copyright 2012-2021 the original author or authors.
+ *    Copyright 2012-2022 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.
  *    You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *       https://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,
@@ -94,6 +94,7 @@ public MemcachedConfiguration parseConfiguration() {
    *
    * @param the
    *          {@link ClassLoader} used to load the {@code memcached.properties} file in classpath.
+   *
    * @return the converted {@link MemcachedConfiguration}.
    */
   public MemcachedConfiguration parseConfiguration(ClassLoader classLoader) {
diff --git a/src/main/java/org/mybatis/caches/memcached/StringPropertySetter.java b/src/main/java/org/mybatis/caches/memcached/StringPropertySetter.java
@@ -1,11 +1,11 @@
 /*
- *    Copyright 2012-2021 the original author or authors.
+ *    Copyright 2012-2022 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.
  *    You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *       https://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,
diff --git a/src/main/java/org/mybatis/caches/memcached/StringUtils.java b/src/main/java/org/mybatis/caches/memcached/StringUtils.java
@@ -1,11 +1,11 @@
 /*
- *    Copyright 2012-2021 the original author or authors.
+ *    Copyright 2012-2022 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.
  *    You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *       https://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,
diff --git a/src/main/java/org/mybatis/caches/memcached/TimeUnitSetter.java b/src/main/java/org/mybatis/caches/memcached/TimeUnitSetter.java
@@ -1,11 +1,11 @@
 /*
- *    Copyright 2012-2021 the original author or authors.
+ *    Copyright 2012-2022 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.
  *    You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *       https://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,
diff --git a/src/main/java/org/mybatis/caches/memcached/package-info.java b/src/main/java/org/mybatis/caches/memcached/package-info.java
diff --git a/src/site/site.xml b/src/site/site.xml
diff --git a/src/site/xdoc/index.xml.vm b/src/site/xdoc/index.xml.vm
diff --git a/src/test/java/org/mybatis/caches/memcached/GroupTestThread.java b/src/test/java/org/mybatis/caches/memcached/GroupTestThread.java
diff --git a/src/test/java/org/mybatis/caches/memcached/MemcachedTestCase.java b/src/test/java/org/mybatis/caches/memcached/MemcachedTestCase.java

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2012-2021 the original author or authors.`
	`2`	`+ * Copyright 2012-2022 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`6`	`6`	`* You may obtain a copy of the License at`
`7`	`7`	`*`
`8`		`- * http://www.apache.org/licenses/LICENSE-2.0`
	`8`	`+ * https://www.apache.org/licenses/LICENSE-2.0`
`9`	`9`	`*`
`10`	`10`	`* Unless required by applicable law or agreed to in writing, software`
`11`	`11`	`* distributed under the License is distributed on an "AS IS" BASIS,`
`@@ -124,7 +124,9 @@ public final void set(Properties config, MemcachedConfiguration memcachedConfigu`
`124`	`124`	`*`
`125`	`125`	`* @param value`
`126`	`126`	`* the value has to be converted.`
	`127`	`+ *`
`127`	`128`	`* @return the converted value.`
	`129`	`+ *`
`128`	`130`	`* @throws Exception`
`129`	`131`	`* if any error occurs.`
`130`	`132`	`*/`