Skip to content
This repository was archived by the owner on Jan 9, 2025. It is now read-only.

Commit 2b8aba4

Browse files
zdenek-jonaszdenek-jonas
committed
Merge branch 'master' into release/7x
2 parents 8c37ecc + 3ab8bb5 commit 2b8aba4

79 files changed

Lines changed: 540 additions & 534 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎base/src/main/java/one/microstream/reference/LazyReferenceManager.java‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -563,6 +563,7 @@ public final synchronized boolean removeController(
563563
// adding logic ensures there can be at the most one entry, so one match suffices to end the loop.
564564
this.headController = this.headController.next;
565565
this.controllerCount--;
566+
this.stopIfNoControllers();
566567
return true;
567568
}
568569

@@ -584,14 +585,27 @@ public final synchronized boolean removeController(
584585
this.controllerCount--;
585586

586587
// adding logic ensures there can be at the most one entry, so one match suffices to end the loop.
588+
this.stopIfNoControllers();
587589
return true;
588590
}
589591
}
590592

591593
// passed controller not found
592594
return false;
593595
}
594-
596+
597+
/**
598+
* When there are no controllers attached to this object, stop the LazyReferenceManager so that no
599+
* daemon threads running anymore and program can exit normally.
600+
*/
601+
private void stopIfNoControllers()
602+
{
603+
if (this.controllerCount == 0)
604+
{
605+
this.stop();
606+
}
607+
}
608+
595609
@Override
596610
public <P extends Consumer<? super LazyReferenceManager.Controller>> P iterateControllers(
597611
final P iterator

‎base/src/module-info.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
exports one.microstream.equality;
4141
exports one.microstream.entity;
4242
exports one.microstream.util.similarity;
43+
exports one.microstream.util.logging;
4344
exports one.microstream.util.iterables;
4445
exports one.microstream.collections.types;
4546
exports one.microstream.util.traversing;
@@ -60,4 +61,5 @@
6061
requires java.desktop;
6162
requires java.management;
6263
requires jdk.unsupported;
64+
requires org.slf4j;
6365
}

‎cache/cache/src/main/java/one/microstream/cache/exceptions/CacheConfigurationException.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
/**
2626
*
27-
* @deprecated will be removed in a future release
27+
* @deprecated will be removed in version 8
2828
*/
2929
@Deprecated
3030
public class CacheConfigurationException extends CacheException

‎cache/cache/src/main/java/one/microstream/cache/exceptions/CacheConfigurationIoException.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
/**
2424
*
25-
* @deprecated will be removed in a future release
25+
* @deprecated will be removed in version 8
2626
*/
2727
@Deprecated
2828
public class CacheConfigurationIoException extends CacheConfigurationException

‎cache/cache/src/main/java/one/microstream/cache/exceptions/CacheConfigurationNotFoundException.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
/**
2424
*
25-
* @deprecated will be removed in a future release
25+
* @deprecated will be removed in version 8
2626
*/
2727
@Deprecated
2828
public class CacheConfigurationNotFoundException extends CacheConfigurationIoException

‎cache/cache/src/main/java/one/microstream/cache/types/CacheConfiguration.java‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public static String DefaultResourceName()
9696
}
9797

9898
/**
99-
* @deprecated replaced by {@link #load()}, will be removed in a future release
99+
* @deprecated replaced by {@link #load()}, will be removed in version 8
100100
*
101101
* @return the loaded configuration or <code>null</code> if none was found
102102
*/
@@ -134,7 +134,7 @@ public static String DefaultResourceName()
134134
* @param charset the charset used to load the configuration
135135
* @return the loaded configuration or <code>null</code> if none was found
136136
*
137-
* @deprecated replaced by {@link #load(Charset)}, will be removed in a future release
137+
* @deprecated replaced by {@link #load(Charset)}, will be removed in version 8
138138
*/
139139
@Deprecated
140140
public static CacheConfiguration<?, ?> Load(
@@ -209,7 +209,7 @@ public static String DefaultResourceName()
209209
* @param valueType the class for value type
210210
* @return the loaded configuration or <code>null</code> if none was found
211211
*
212-
* @deprecated replaced by {@link #load(Class,Class)}, will be removed in a future release
212+
* @deprecated replaced by {@link #load(Class,Class)}, will be removed in version 8
213213
*/
214214
@Deprecated
215215
public static <K, V> CacheConfiguration<K, V> Load(
@@ -263,7 +263,7 @@ public static <K, V> CacheConfiguration<K, V> load(
263263
* @param valueType the class for value type
264264
* @return the loaded configuration or <code>null</code> if none was found
265265
*
266-
* @deprecated replaced by {@link #load(Charset,Class,Class)}, will be removed in a future release
266+
* @deprecated replaced by {@link #load(Charset,Class,Class)}, will be removed in version 8
267267
*/
268268
@Deprecated
269269
public static <K, V> CacheConfiguration<K, V> Load(
@@ -343,7 +343,7 @@ public static <K, V> CacheConfiguration<K, V> load(
343343
* @param path a classpath resource, a file path or an URL
344344
* @return the configuration or <code>null</code> if none was found
345345
*
346-
* @deprecated replaced by {@link #load(String)}, will be removed in a future release
346+
* @deprecated replaced by {@link #load(String)}, will be removed in version 8
347347
*/
348348
@Deprecated
349349
public static CacheConfiguration<?, ?> Load(
@@ -381,7 +381,7 @@ public static <K, V> CacheConfiguration<K, V> load(
381381
* @param charset the charset used to load the configuration
382382
* @return the configuration or <code>null</code> if none was found
383383
*
384-
* @deprecated replaced by {@link #load(String,Charset)}, will be removed in a future release
384+
* @deprecated replaced by {@link #load(String,Charset)}, will be removed in version 8
385385
*/
386386
@Deprecated
387387
public static CacheConfiguration<?, ?> Load(
@@ -426,7 +426,7 @@ public static <K, V> CacheConfiguration<K, V> load(
426426
* @param valueType the class of the value type
427427
* @return the configuration or <code>null</code> if none was found
428428
*
429-
* @deprecated replaced by {@link #load(String,Class,Class)}, will be removed in a future release
429+
* @deprecated replaced by {@link #load(String,Class,Class)}, will be removed in version 8
430430
*/
431431
@Deprecated
432432
public static <K, V> CacheConfiguration<K, V> Load(
@@ -478,7 +478,7 @@ public static <K, V> CacheConfiguration<K, V> load(
478478
* @param valueType the class of the value type
479479
* @return the configuration or <code>null</code> if none was found
480480
*
481-
* @deprecated replaced by {@link #load(String,Charset,Class,Class)}, will be removed in a future release
481+
* @deprecated replaced by {@link #load(String,Charset,Class,Class)}, will be removed in version 8
482482
*/
483483
@Deprecated
484484
public static <K, V> CacheConfiguration<K, V> Load(
@@ -546,7 +546,7 @@ public static <K, V> CacheConfiguration<K, V> load(
546546
* @param path file system path
547547
* @return the configuration
548548
*
549-
* @deprecated replaced by {@link #load(Path)}, will be removed in a future release
549+
* @deprecated replaced by {@link #load(Path)}, will be removed in version 8
550550
*/
551551
@Deprecated
552552
public static CacheConfiguration<?, ?> Load(
@@ -578,7 +578,7 @@ public static <K, V> CacheConfiguration<K, V> load(
578578
* @param charset the charset used to load the configuration
579579
* @return the configuration
580580
*
581-
* @deprecated replaced by {@link #load(Path,Charset)}, will be removed in a future release
581+
* @deprecated replaced by {@link #load(Path,Charset)}, will be removed in version 8
582582
*/
583583
@Deprecated
584584
public static CacheConfiguration<?, ?> Load(
@@ -613,7 +613,7 @@ public static <K, V> CacheConfiguration<K, V> load(
613613
* @param file file path
614614
* @return the configuration
615615
*
616-
* @deprecated replaced by {@link #load(File)}, will be removed in a future release
616+
* @deprecated replaced by {@link #load(File)}, will be removed in version 8
617617
*/
618618
@Deprecated
619619
public static CacheConfiguration<?, ?> Load(
@@ -645,7 +645,7 @@ public static <K, V> CacheConfiguration<K, V> load(
645645
* @param charset the charset used to load the configuration
646646
* @return the configuration
647647
*
648-
* @deprecated replaced by {@link #load(File,Charset)}, will be removed in a future release
648+
* @deprecated replaced by {@link #load(File,Charset)}, will be removed in version 8
649649
*/
650650
@Deprecated
651651
public static CacheConfiguration<?, ?> Load(
@@ -680,7 +680,7 @@ public static <K, V> CacheConfiguration<K, V> load(
680680
* @param url URL path
681681
* @return the configuration
682682
*
683-
* @deprecated replaced by {@link #load(URL)}, will be removed in a future release
683+
* @deprecated replaced by {@link #load(URL)}, will be removed in version 8
684684
*/
685685
@Deprecated
686686
public static CacheConfiguration<?, ?> Load(
@@ -712,7 +712,7 @@ public static <K, V> CacheConfiguration<K, V> load(
712712
* @param charset the charset used to load the configuration
713713
* @return the configuration
714714
*
715-
* @deprecated replaced by {@link #load(URL,Charset)}, will be removed in a future release
715+
* @deprecated replaced by {@link #load(URL,Charset)}, will be removed in version 8
716716
*/
717717
@Deprecated
718718
public static CacheConfiguration<?, ?> Load(
@@ -747,7 +747,7 @@ public static <K, V> CacheConfiguration<K, V> load(
747747
* @param inputStream the stream to read from
748748
* @return the configuration
749749
*
750-
* @deprecated replaced by {@link #load(InputStream)}, will be removed in a future release
750+
* @deprecated replaced by {@link #load(InputStream)}, will be removed in version 8
751751
*/
752752
@Deprecated
753753
public static CacheConfiguration<?, ?> Load(
@@ -779,7 +779,7 @@ public static <K, V> CacheConfiguration<K, V> load(
779779
* @param charset the charset used to load the configuration
780780
* @return the configuration
781781
*
782-
* @deprecated replaced by {@link #load(InputStream,Charset)}, will be removed in a future release
782+
* @deprecated replaced by {@link #load(InputStream,Charset)}, will be removed in version 8
783783
*/
784784
@Deprecated
785785
public static CacheConfiguration<?, ?> Load(
@@ -818,7 +818,7 @@ public static <K, V> CacheConfiguration<K, V> load(
818818
* @param valueType the class for value type
819819
* @return the configuration
820820
*
821-
* @deprecated replaced by {@link #load(Path,Class,Class)}, will be removed in a future release
821+
* @deprecated replaced by {@link #load(Path,Class,Class)}, will be removed in version 8
822822
*/
823823
@Deprecated
824824
public static <K,V> CacheConfiguration<K, V> Load(
@@ -864,7 +864,7 @@ public static <K,V> CacheConfiguration<K, V> load(
864864
* @param valueType the class for value type
865865
* @return the configuration
866866
*
867-
* @deprecated replaced by {@link #load(Path,Charset,Class,Class)}, will be removed in a future release
867+
* @deprecated replaced by {@link #load(Path,Charset,Class,Class)}, will be removed in version 8
868868
*/
869869
@Deprecated
870870
public static <K,V> CacheConfiguration<K, V> Load(
@@ -911,7 +911,7 @@ public static <K,V> CacheConfiguration<K, V> load(
911911
* @param valueType the class for value type
912912
* @return the configuration
913913
*
914-
* @deprecated replaced by {@link #load(File,Class,Class)}, will be removed in a future release
914+
* @deprecated replaced by {@link #load(File,Class,Class)}, will be removed in version 8
915915
*/
916916
@Deprecated
917917
public static <K,V> CacheConfiguration<K, V> Load(
@@ -957,7 +957,7 @@ public static <K,V> CacheConfiguration<K, V> load(
957957
* @param valueType the class for value type
958958
* @return the configuration
959959
*
960-
* @deprecated replaced by {@link #load(File,Charset,Class,Class)}, will be removed in a future release
960+
* @deprecated replaced by {@link #load(File,Charset,Class,Class)}, will be removed in version 8
961961
*/
962962
@Deprecated
963963
public static <K,V> CacheConfiguration<K, V> Load(
@@ -1004,7 +1004,7 @@ public static <K,V> CacheConfiguration<K, V> load(
10041004
* @param valueType the class for value type
10051005
* @return the configuration
10061006
*
1007-
* @deprecated replaced by {@link #load(URL,Class,Class)}, will be removed in a future release
1007+
* @deprecated replaced by {@link #load(URL,Class,Class)}, will be removed in version 8
10081008
*/
10091009
@Deprecated
10101010
public static <K,V> CacheConfiguration<K, V> Load(
@@ -1050,7 +1050,7 @@ public static <K,V> CacheConfiguration<K, V> load(
10501050
* @param valueType the class for value type
10511051
* @return the configuration
10521052
*
1053-
* @deprecated replaced by {@link #load(URL,Charset,Class,Class)}, will be removed in a future release
1053+
* @deprecated replaced by {@link #load(URL,Charset,Class,Class)}, will be removed in version 8
10541054
*/
10551055
@Deprecated
10561056
public static <K,V> CacheConfiguration<K, V> Load(
@@ -1097,7 +1097,7 @@ public static <K,V> CacheConfiguration<K, V> load(
10971097
* @param valueType the class for value type
10981098
* @return the configuration
10991099
*
1100-
* @deprecated replaced by {@link #load(InputStream,Class,Class)}, will be removed in a future release
1100+
* @deprecated replaced by {@link #load(InputStream,Class,Class)}, will be removed in version 8
11011101
*/
11021102
@Deprecated
11031103
public static <K,V> CacheConfiguration<K, V> Load(
@@ -1143,7 +1143,7 @@ public static <K,V> CacheConfiguration<K, V> load(
11431143
* @param valueType the class for value type
11441144
* @return the configuration
11451145
*
1146-
* @deprecated replaced by {@link #load(InputStream,Charset,Class,Class)}, will be removed in a future release
1146+
* @deprecated replaced by {@link #load(InputStream,Charset,Class,Class)}, will be removed in version 8
11471147
*/
11481148
@Deprecated
11491149
public static <K,V> CacheConfiguration<K, V> Load(

‎cache/cache/src/main/java/one/microstream/cache/types/CacheConfigurationLoader.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
/**
4343
*
44-
* @deprecated replaced by generic {@link one.microstream.configuration.types.ConfigurationLoader}, will be removed in a future release
44+
* @deprecated replaced by generic {@link one.microstream.configuration.types.ConfigurationLoader}, will be removed in version 8
4545
*/
4646
@Deprecated
4747
@FunctionalInterface

‎cache/cache/src/main/java/one/microstream/cache/types/CacheConfigurationParser.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
/**
3232
*
33-
* @deprecated replaced by generic {@link one.microstream.configuration.types.ConfigurationParser}, will be removed in a future release
33+
* @deprecated replaced by generic {@link one.microstream.configuration.types.ConfigurationParser}, will be removed in version 8
3434
*/
3535
@Deprecated
3636
public interface CacheConfigurationParser

‎cache/cache/src/main/java/one/microstream/cache/types/CacheConfigurationPropertyParser.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import one.microstream.storage.configuration.ConfigurationPropertyParser;
3434

3535
/**
36-
* @deprecated replaced by {@link CacheConfigurationBuilderConfigurationBased}, will be removed in a future release
36+
* @deprecated replaced by {@link CacheConfigurationBuilderConfigurationBased}, will be removed in version 8
3737
*/
3838
@Deprecated
3939
public interface CacheConfigurationPropertyParser

‎cache/cache/src/main/java/one/microstream/cache/types/CacheLoaderWriterFactories.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
/**
3232
*
33-
* @deprecated will be removed in a future release
33+
* @deprecated will be removed in version 8
3434
*/
3535
@Deprecated
3636
public interface CacheLoaderWriterFactories<K, V>

0 commit comments

Comments
 (0)