From 03aad8d22d9760729982402be421b77e36922db6 Mon Sep 17 00:00:00 2001 From: Patrick Richards Date: Wed, 8 Jan 2025 16:26:25 -0500 Subject: [PATCH] removed auto service from the project --- collection/src/main/java/module-info.java | 4 +- common/pom.xml | 12 +- .../tinkar/common/service/PrimitiveData.java | 9 +- .../common/service/PrimitiveDataService.java | 34 +- .../common/service/ServiceProperties.java | 3 - .../tinkar/common/service/TinkExecutor.java | 4 - common/src/main/java/module-info.java | 13 +- .../coordinate/edit/EditCoordinateRecord.java | 10 +- .../LanguageCalculatorWithCache.java | 46 ++- .../calculator/LogicCalculatorWithCache.java | 13 +- .../NavigationCalculatorWithCache.java | 30 +- .../coordinate/stamp/StampPathImmutable.java | 30 +- .../stamp/calculator/PathProvider.java | 13 +- .../calculator/StampCalculatorWithCache.java | 58 ++- .../calculator/ViewCalculatorWithCache.java | 6 +- .../export/ExportEntitiesController.java | 2 - .../load/LoadEntitiesFromFileController.java | 2 - integration/pom.xml | 1 - language-extensions/owl-extension/pom.xml | 8 +- pom.xml | 120 +++--- provider/changeset-writer-provider/pom.xml | 7 +- .../ProviderEphemeralNewController.java | 15 +- .../mvstore/MvStoreNewController.java | 11 +- .../mvstore/MvStoreOpenController.java | 3 - .../spinedarray/SpinedArrayNewController.java | 11 +- .../SpinedArrayOpenController.java | 3 - .../src/main/java/module-info.java | 1 - .../client/WebsocketServiceController.java | 20 +- .../src/main/java/module-info.java | 4 +- ...efaultDescriptionForNidServiceFactory.java | 1 - .../provider/entity/EntityProvider.java | 35 +- .../provider/entity/EntityServiceFactory.java | 4 - .../entity/PublicIdServiceFactory.java | 2 - .../tinkar/provider/entity/StampProvider.java | 12 +- .../provider/executor/AlertLogSubscriber.java | 5 - .../executor/ExecutorProviderController.java | 6 +- .../src/main/java/module-info.java | 2 - .../src/main/java/module-info.java | 1 - reasoner/pom.xml | 347 +++++++++--------- terms/src/main/java/module-info.java | 1 - 40 files changed, 442 insertions(+), 467 deletions(-) diff --git a/collection/src/main/java/module-info.java b/collection/src/main/java/module-info.java index 425c5bbe..3a7b66cc 100644 --- a/collection/src/main/java/module-info.java +++ b/collection/src/main/java/module-info.java @@ -19,13 +19,13 @@ * and open the template in the editor. */ -@SuppressWarnings("module") // 7 in HL7 is not a version reference +@SuppressWarnings("module") + // 7 in HL7 is not a version reference module dev.ikm.tinkar.collection { requires transitive dev.ikm.tinkar.common; requires dev.ikm.jpms.eclipse.collections.api; requires dev.ikm.jpms.eclipse.collections; requires org.slf4j; - requires transitive static dev.ikm.jpms.auto.service; exports dev.ikm.tinkar.collection; opens dev.ikm.tinkar.collection to org.eclipse.collections.api, org.eclipse.collections; diff --git a/common/pom.xml b/common/pom.xml index 3f520fa0..6ecff061 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -18,10 +18,6 @@ - - ${tinkar-jpms-deps.groupId} - auto-service - ${tinkar-jpms-deps.groupId} @@ -30,6 +26,12 @@ ${tinkar-jpms-deps.groupId} activej-bytebuf + + + dev.ikm.jpms + auto-service + + ${tinkar-jpms-deps.groupId} @@ -45,6 +47,6 @@ ${tinkar-jpms-deps.groupId} eclipse-collections-api - + diff --git a/common/src/main/java/dev/ikm/tinkar/common/service/PrimitiveData.java b/common/src/main/java/dev/ikm/tinkar/common/service/PrimitiveData.java index e74b7018..beda7cb7 100644 --- a/common/src/main/java/dev/ikm/tinkar/common/service/PrimitiveData.java +++ b/common/src/main/java/dev/ikm/tinkar/common/service/PrimitiveData.java @@ -15,7 +15,6 @@ */ package dev.ikm.tinkar.common.service; -import com.google.auto.service.AutoService; import dev.ikm.tinkar.common.alert.AlertObject; import dev.ikm.tinkar.common.alert.AlertStreams; import dev.ikm.tinkar.common.id.IntIdCollection; @@ -28,7 +27,6 @@ import java.time.Instant; import java.util.List; import java.util.Optional; - import java.util.ServiceLoader; import java.util.UUID; import java.util.concurrent.CopyOnWriteArrayList; @@ -47,7 +45,7 @@ public class PrimitiveData { private static DefaultDescriptionForNidService defaultDescriptionForNidServiceSingleton; private static PublicIdService publicIdServiceSingleton; private static PrimitiveData singleton; - private static CopyOnWriteArrayList statesToSave = new CopyOnWriteArrayList<>(); + private static final CopyOnWriteArrayList statesToSave = new CopyOnWriteArrayList<>(); static { try { @@ -56,7 +54,8 @@ public class PrimitiveData { //TODO: Understand why. //throwable.printStackTrace(); //We don't want to swallow exceptions... - throwable.printStackTrace(); } + throwable.printStackTrace(); + } } private PrimitiveData() { @@ -238,8 +237,6 @@ public static int nid(UUID... uuids) { return get().nidForUuids(uuids); } - - @AutoService(CachingService.class) public static class CacheProvider implements CachingService { @Override diff --git a/common/src/main/java/dev/ikm/tinkar/common/service/PrimitiveDataService.java b/common/src/main/java/dev/ikm/tinkar/common/service/PrimitiveDataService.java index d91a9aeb..2af6947c 100644 --- a/common/src/main/java/dev/ikm/tinkar/common/service/PrimitiveDataService.java +++ b/common/src/main/java/dev/ikm/tinkar/common/service/PrimitiveDataService.java @@ -15,7 +15,6 @@ */ package dev.ikm.tinkar.common.service; -import com.google.auto.service.AutoService; import dev.ikm.tinkar.common.id.PublicId; import dev.ikm.tinkar.common.sets.ConcurrentHashSet; import dev.ikm.tinkar.common.util.uuid.UuidUtil; @@ -89,12 +88,11 @@ static int valueOrGenerateForList(ListIterable sortedUuidList, foundValue = nid; } else { if (foundValue != nid) { - StringBuilder sb = new StringBuilder(); - sb.append("Multiple nids for: "); - sb.append(sortedUuidList); - sb.append(" first value: ").append(foundValue); - sb.append(" second value: ").append(nid); - throw new IllegalStateException(sb.toString()); + String sb = "Multiple nids for: " + + sortedUuidList + + " first value: " + foundValue + + " second value: " + nid; + throw new IllegalStateException(sb); } } } @@ -173,7 +171,7 @@ static byte[] merge(byte[] oldBytes, byte[] newBytes) { SEMANTIC_CHRONOLOGY((byte) 3, SemanticChronology.class), STAMP(STAMP_DATA_TYPE, Stamp.class) */ - case 1, 2, 3, STAMP_DATA_TYPE-> chronologyByteLists.add(versionBytes); + case 1, 2, 3, STAMP_DATA_TYPE -> chronologyByteLists.add(versionBytes); /* CONCEPT_VERSION((byte) 4, ConceptVersion.class), @@ -377,7 +375,7 @@ default int nidForPublicId(PublicId publicId) { * This method may be of use when combining multiple mapped values for a nid. * For example, merging multiple versions of an entity, where each version is represented as a * byte[]. - * + *

* Defaults to an activity of DataActivity.SYNCHRONIZABLE_EDIT. * * @param nid native identifier (an int) with which the resulting value is to be associated @@ -402,17 +400,17 @@ default byte[] merge(int nid, int patternNid, int referencedComponentNid, byte[] * null. This method may be of use when combining multiple mapped values for a nid. For example, merging multiple * versions of an entity, where each version is represented as a byte[]. * - * @param nid Native identifier (an int) with which the resulting value is to be associated. - * @param patternNid Pattern native identifier. + * @param nid Native identifier (an int) with which the resulting value is to be associated. + * @param patternNid Pattern native identifier. * @param referencedComponentNid If the bytes are for a semantic, the referenced component nid, * otherwise Integer.MAX_VALUE. - * @param value The non-null value to be merged with the existing value - * associated with the nid or, if no existing value or a null value - * is associated with the nid, to be associated with the nid. - * @param sourceObject Object that is the source of the bytes to merge. - * @param activity The data activity performed, classifying the type of database (and therefore change set) write. + * @param value The non-null value to be merged with the existing value + * associated with the nid or, if no existing value or a null value + * is associated with the nid, to be associated with the nid. + * @param sourceObject Object that is the source of the bytes to merge. + * @param activity The data activity performed, classifying the type of database (and therefore change set) write. * @return The new value associated with the specified nid, or null if no - * value is associated with the nid. + * value is associated with the nid. */ byte[] merge(int nid, int patternNid, int referencedComponentNid, byte[] value, Object sourceObject, DataActivity activity); @@ -488,8 +486,6 @@ public static RemoteOperations fromToken(byte token) { } } - - @AutoService(CachingService.class) class CacheProvider implements CachingService { @Override diff --git a/common/src/main/java/dev/ikm/tinkar/common/service/ServiceProperties.java b/common/src/main/java/dev/ikm/tinkar/common/service/ServiceProperties.java index ad224e87..ea24ae22 100644 --- a/common/src/main/java/dev/ikm/tinkar/common/service/ServiceProperties.java +++ b/common/src/main/java/dev/ikm/tinkar/common/service/ServiceProperties.java @@ -15,7 +15,6 @@ */ package dev.ikm.tinkar.common.service; -import com.google.auto.service.AutoService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -67,8 +66,6 @@ public static final Optional get(Enum enumKey) { return Optional.ofNullable((T) propertyMap.get(enumKey)); } - - @AutoService(CachingService.class) public static class CacheProvider implements CachingService { @Override diff --git a/common/src/main/java/dev/ikm/tinkar/common/service/TinkExecutor.java b/common/src/main/java/dev/ikm/tinkar/common/service/TinkExecutor.java index 0ab6c2bc..68918a94 100644 --- a/common/src/main/java/dev/ikm/tinkar/common/service/TinkExecutor.java +++ b/common/src/main/java/dev/ikm/tinkar/common/service/TinkExecutor.java @@ -15,13 +15,11 @@ */ package dev.ikm.tinkar.common.service; -import com.google.auto.service.AutoService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.List; import java.util.ServiceConfigurationError; - import java.util.ServiceLoader; import java.util.concurrent.ForkJoinPool; import java.util.concurrent.ScheduledExecutorService; @@ -105,8 +103,6 @@ public static ScheduledExecutorService scheduled() { return executorSingleton.scheduled(); } - - @AutoService(CachingService.class) public static class CacheProvider implements CachingService { @Override diff --git a/common/src/main/java/module-info.java b/common/src/main/java/module-info.java index ea09e14b..7d21a1ae 100644 --- a/common/src/main/java/module-info.java +++ b/common/src/main/java/module-info.java @@ -20,7 +20,16 @@ */ import dev.ikm.tinkar.common.alert.AlertReportingService; -import dev.ikm.tinkar.common.service.*; +import dev.ikm.tinkar.common.service.CachingService; +import dev.ikm.tinkar.common.service.DataServiceController; +import dev.ikm.tinkar.common.service.DefaultDescriptionForNidService; +import dev.ikm.tinkar.common.service.ExecutorController; +import dev.ikm.tinkar.common.service.PluginServiceLoader; +import dev.ikm.tinkar.common.service.PrimitiveData; +import dev.ikm.tinkar.common.service.PrimitiveDataService; +import dev.ikm.tinkar.common.service.PublicIdService; +import dev.ikm.tinkar.common.service.ServiceProperties; +import dev.ikm.tinkar.common.service.TinkExecutor; @SuppressWarnings("module") // 7 in HL7 is not a version reference @@ -32,8 +41,6 @@ requires dev.ikm.jpms.eclipse.collections.api; requires dev.ikm.jpms.roaringbitmap; requires org.slf4j; - requires static dev.ikm.jpms.auto.service; - exports dev.ikm.tinkar.common.alert; exports dev.ikm.tinkar.common.binary; diff --git a/coordinate/src/main/java/dev/ikm/tinkar/coordinate/edit/EditCoordinateRecord.java b/coordinate/src/main/java/dev/ikm/tinkar/coordinate/edit/EditCoordinateRecord.java index 4660fb48..105de498 100644 --- a/coordinate/src/main/java/dev/ikm/tinkar/coordinate/edit/EditCoordinateRecord.java +++ b/coordinate/src/main/java/dev/ikm/tinkar/coordinate/edit/EditCoordinateRecord.java @@ -15,11 +15,14 @@ */ package dev.ikm.tinkar.coordinate.edit; -import com.google.auto.service.AutoService; -import dev.ikm.tinkar.common.binary.*; -import dev.ikm.tinkar.coordinate.ImmutableCoordinate; import dev.ikm.tinkar.collection.ConcurrentReferenceHashMap; +import dev.ikm.tinkar.common.binary.Decoder; +import dev.ikm.tinkar.common.binary.DecoderInput; +import dev.ikm.tinkar.common.binary.Encodable; +import dev.ikm.tinkar.common.binary.Encoder; +import dev.ikm.tinkar.common.binary.EncoderOutput; import dev.ikm.tinkar.common.service.CachingService; +import dev.ikm.tinkar.coordinate.ImmutableCoordinate; import dev.ikm.tinkar.entity.Entity; import dev.ikm.tinkar.terms.ConceptFacade; @@ -141,7 +144,6 @@ public EditCoordinateRecord toEditCoordinateRecord() { return this; } - @AutoService(CachingService.class) public static class CacheProvider implements CachingService { // TODO: this has implicit assumption that no one will hold on to a calculator... Should we be defensive? @Override diff --git a/coordinate/src/main/java/dev/ikm/tinkar/coordinate/language/calculator/LanguageCalculatorWithCache.java b/coordinate/src/main/java/dev/ikm/tinkar/coordinate/language/calculator/LanguageCalculatorWithCache.java index fb559120..adaeab3a 100644 --- a/coordinate/src/main/java/dev/ikm/tinkar/coordinate/language/calculator/LanguageCalculatorWithCache.java +++ b/coordinate/src/main/java/dev/ikm/tinkar/coordinate/language/calculator/LanguageCalculatorWithCache.java @@ -18,23 +18,31 @@ import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; -import com.google.auto.service.AutoService; +import dev.ikm.tinkar.collection.ConcurrentReferenceHashMap; +import dev.ikm.tinkar.common.id.IntIdList; +import dev.ikm.tinkar.common.service.CachingService; +import dev.ikm.tinkar.common.service.PrimitiveData; +import dev.ikm.tinkar.coordinate.language.LanguageCoordinate; import dev.ikm.tinkar.coordinate.language.LanguageCoordinateRecord; import dev.ikm.tinkar.coordinate.stamp.StampCoordinateRecord; import dev.ikm.tinkar.coordinate.stamp.calculator.Latest; import dev.ikm.tinkar.coordinate.stamp.calculator.StampCalculator; import dev.ikm.tinkar.coordinate.stamp.calculator.StampCalculatorWithCache; +import dev.ikm.tinkar.entity.CacheInvalidationSubscriber; +import dev.ikm.tinkar.entity.Entity; +import dev.ikm.tinkar.entity.EntityService; +import dev.ikm.tinkar.entity.EntityVersion; +import dev.ikm.tinkar.entity.Field; +import dev.ikm.tinkar.entity.PatternEntity; +import dev.ikm.tinkar.entity.PatternEntityVersion; +import dev.ikm.tinkar.entity.SemanticEntity; +import dev.ikm.tinkar.entity.SemanticEntityVersion; +import dev.ikm.tinkar.entity.SemanticVersionRecord; +import dev.ikm.tinkar.terms.EntityFacade; +import dev.ikm.tinkar.terms.TinkarTerm; import org.eclipse.collections.api.factory.Lists; import org.eclipse.collections.api.list.ImmutableList; import org.eclipse.collections.api.list.MutableList; -import dev.ikm.tinkar.collection.ConcurrentReferenceHashMap; -import dev.ikm.tinkar.common.id.IntIdList; -import dev.ikm.tinkar.common.service.CachingService; -import dev.ikm.tinkar.common.service.PrimitiveData; -import dev.ikm.tinkar.coordinate.language.LanguageCoordinate; -import dev.ikm.tinkar.entity.*; -import dev.ikm.tinkar.terms.EntityFacade; -import dev.ikm.tinkar.terms.TinkarTerm; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -86,11 +94,10 @@ private Latest getPattern(int patternNid) { return stampCalculator.latestPatternEntityVersion(patternNid); } - private static record StampLangRecord(StampCoordinateRecord stampFilter, - ImmutableList languageCoordinateList) { + private record StampLangRecord(StampCoordinateRecord stampFilter, + ImmutableList languageCoordinateList) { } - @AutoService(CachingService.class) public static class CacheProvider implements CachingService { @Override public void reset() { @@ -394,14 +401,13 @@ public Optional getSemanticText(int nid) { Latest latestPatternVersion = stampCalculator.latestPatternEntityVersion(semanticEntity.patternNid()); if (latestPatternVersion.isPresent()) { PatternEntityVersion patternVersion = latestPatternVersion.get(); - StringBuilder sb = new StringBuilder("["); - sb.append(getPreferredDescriptionTextWithFallbackOrNid(patternVersion.semanticMeaningNid())); - sb.append("] of <"); - sb.append(getPreferredDescriptionTextWithFallbackOrNid(semanticEntity.referencedComponentNid())); - sb.append("> for ["); - sb.append(getPreferredDescriptionTextWithFallbackOrNid(patternVersion.semanticPurposeNid())); - sb.append("]"); - return Optional.of(sb.toString()); + String sb = "[" + getPreferredDescriptionTextWithFallbackOrNid(patternVersion.semanticMeaningNid()) + + "] of <" + + getPreferredDescriptionTextWithFallbackOrNid(semanticEntity.referencedComponentNid()) + + "> for [" + + getPreferredDescriptionTextWithFallbackOrNid(patternVersion.semanticPurposeNid()) + + "]"; + return Optional.of(sb); } } diff --git a/coordinate/src/main/java/dev/ikm/tinkar/coordinate/logic/calculator/LogicCalculatorWithCache.java b/coordinate/src/main/java/dev/ikm/tinkar/coordinate/logic/calculator/LogicCalculatorWithCache.java index 508cb704..dce2d0e2 100644 --- a/coordinate/src/main/java/dev/ikm/tinkar/coordinate/logic/calculator/LogicCalculatorWithCache.java +++ b/coordinate/src/main/java/dev/ikm/tinkar/coordinate/logic/calculator/LogicCalculatorWithCache.java @@ -15,16 +15,15 @@ */ package dev.ikm.tinkar.coordinate.logic.calculator; -import com.google.auto.service.AutoService; +import dev.ikm.tinkar.collection.ConcurrentReferenceHashMap; +import dev.ikm.tinkar.common.service.CachingService; +import dev.ikm.tinkar.common.service.PrimitiveData; import dev.ikm.tinkar.common.service.PrimitiveDataRepair; import dev.ikm.tinkar.coordinate.logic.LogicCoordinate; import dev.ikm.tinkar.coordinate.logic.LogicCoordinateRecord; import dev.ikm.tinkar.coordinate.logic.PremiseType; -import dev.ikm.tinkar.coordinate.stamp.StampCoordinateRecord; -import dev.ikm.tinkar.collection.ConcurrentReferenceHashMap; -import dev.ikm.tinkar.common.service.CachingService; -import dev.ikm.tinkar.common.service.PrimitiveData; import dev.ikm.tinkar.coordinate.stamp.StampCoordinate; +import dev.ikm.tinkar.coordinate.stamp.StampCoordinateRecord; import dev.ikm.tinkar.coordinate.stamp.calculator.Latest; import dev.ikm.tinkar.coordinate.stamp.calculator.StampCalculator; import dev.ikm.tinkar.coordinate.stamp.calculator.StampCalculatorWithCache; @@ -45,7 +44,6 @@ public class LogicCalculatorWithCache implements LogicCalculator { new ConcurrentReferenceHashMap<>(ConcurrentReferenceHashMap.ReferenceType.WEAK, ConcurrentReferenceHashMap.ReferenceType.WEAK); - ; private final LogicCoordinateRecord logicCoordinateRecord; private final StampCoordinateRecord stampCoordinateRecord; private final StampCalculator stampCalculator; @@ -72,7 +70,6 @@ public static LogicCalculatorWithCache getCalculator(LogicCoordinate logicCoordi record LogicAndStampCoordinate(LogicCoordinateRecord logicCoordinate, StampCoordinateRecord stampCoordinate) { } - @AutoService(CachingService.class) public static class CacheProvider implements CachingService { @Override public void reset() { @@ -117,7 +114,7 @@ public boolean hasSufficientSet(int nid) { if (PrimitiveData.get() instanceof PrimitiveDataRepair primitiveDataRepair) { primitiveDataRepair.mergeThenErase(semanticNids[0], semanticNids[1]); return hasSufficientSet(nid); - }; + } } // TODO Raise an alert... throw new IllegalStateException("More than one set of axioms for concept: " + Entity.getFast(nid)); diff --git a/coordinate/src/main/java/dev/ikm/tinkar/coordinate/navigation/calculator/NavigationCalculatorWithCache.java b/coordinate/src/main/java/dev/ikm/tinkar/coordinate/navigation/calculator/NavigationCalculatorWithCache.java index ebb6280c..66457c68 100644 --- a/coordinate/src/main/java/dev/ikm/tinkar/coordinate/navigation/calculator/NavigationCalculatorWithCache.java +++ b/coordinate/src/main/java/dev/ikm/tinkar/coordinate/navigation/calculator/NavigationCalculatorWithCache.java @@ -15,7 +15,12 @@ */ package dev.ikm.tinkar.coordinate.navigation.calculator; -import com.google.auto.service.AutoService; +import dev.ikm.tinkar.collection.ConcurrentReferenceHashMap; +import dev.ikm.tinkar.common.id.IntIdList; +import dev.ikm.tinkar.common.id.IntIdSet; +import dev.ikm.tinkar.common.id.IntIds; +import dev.ikm.tinkar.common.service.CachingService; +import dev.ikm.tinkar.common.service.PrimitiveData; import dev.ikm.tinkar.coordinate.language.LanguageCoordinateRecord; import dev.ikm.tinkar.coordinate.language.calculator.LanguageCalculator; import dev.ikm.tinkar.coordinate.language.calculator.LanguageCalculatorWithCache; @@ -26,22 +31,16 @@ import dev.ikm.tinkar.coordinate.stamp.calculator.StampCalculator; import dev.ikm.tinkar.coordinate.stamp.calculator.StampCalculatorWithCache; import dev.ikm.tinkar.coordinate.view.VertexSortNaturalOrder; +import dev.ikm.tinkar.entity.PatternEntityVersion; +import dev.ikm.tinkar.entity.SemanticEntityVersion; +import dev.ikm.tinkar.terms.EntityProxy; +import dev.ikm.tinkar.terms.TinkarTerm; import org.eclipse.collections.api.factory.Lists; import org.eclipse.collections.api.list.ImmutableList; import org.eclipse.collections.api.map.primitive.MutableIntObjectMap; import org.eclipse.collections.api.set.primitive.MutableIntSet; import org.eclipse.collections.impl.factory.primitive.IntObjectMaps; import org.eclipse.collections.impl.factory.primitive.IntSets; -import dev.ikm.tinkar.collection.ConcurrentReferenceHashMap; -import dev.ikm.tinkar.common.id.IntIdList; -import dev.ikm.tinkar.common.id.IntIdSet; -import dev.ikm.tinkar.common.id.IntIds; -import dev.ikm.tinkar.common.service.CachingService; -import dev.ikm.tinkar.common.service.PrimitiveData; -import dev.ikm.tinkar.entity.PatternEntityVersion; -import dev.ikm.tinkar.entity.SemanticEntityVersion; -import dev.ikm.tinkar.terms.EntityProxy; -import dev.ikm.tinkar.terms.TinkarTerm; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -189,10 +188,12 @@ public IntIdList sortedChildrenOf(int conceptNid) { public IntIdList unsortedChildrenOf(int conceptNid) { return getIntIdListForMeaning(conceptNid, TinkarTerm.RELATIONSHIP_DESTINATION); } + @Override public IntIdList unsortedUnversionedChildrenOf(int conceptNid) { return getIntIdListForMeaningUnversioned(conceptNid, TinkarTerm.RELATIONSHIP_DESTINATION); } + @Override public IntIdList unsortedUnversionedParentsOf(int conceptNid) { return getIntIdListForMeaningUnversioned(conceptNid, TinkarTerm.RELATIONSHIP_ORIGIN); @@ -292,7 +293,6 @@ public StampCalculator stampCalculator() { return stampCalculator; } - @AutoService(CachingService.class) public static class CacheProvider implements CachingService { // TODO: this has implicit assumption that no one will hold on to a calculator... Should we be defensive? @Override @@ -301,9 +301,9 @@ public void reset() { } } - private static record StampLangNavRecord(StampCoordinateRecord stampFilter, - ImmutableList languageCoordinateList, - NavigationCoordinateRecord navigationCoordinate) { + private record StampLangNavRecord(StampCoordinateRecord stampFilter, + ImmutableList languageCoordinateList, + NavigationCoordinateRecord navigationCoordinate) { } record MutableEdge(MutableIntSet types, int destinationNid, LanguageCalculator languageCalculator) { diff --git a/coordinate/src/main/java/dev/ikm/tinkar/coordinate/stamp/StampPathImmutable.java b/coordinate/src/main/java/dev/ikm/tinkar/coordinate/stamp/StampPathImmutable.java index b4c84f51..e71f12e6 100644 --- a/coordinate/src/main/java/dev/ikm/tinkar/coordinate/stamp/StampPathImmutable.java +++ b/coordinate/src/main/java/dev/ikm/tinkar/coordinate/stamp/StampPathImmutable.java @@ -15,19 +15,23 @@ */ package dev.ikm.tinkar.coordinate.stamp; -import com.google.auto.service.AutoService; -import dev.ikm.tinkar.common.binary.*; -import dev.ikm.tinkar.coordinate.ImmutableCoordinate; -import dev.ikm.tinkar.coordinate.PathService; -import org.eclipse.collections.api.factory.Sets; -import org.eclipse.collections.api.set.ImmutableSet; -import org.eclipse.collections.api.set.MutableSet; + import dev.ikm.tinkar.collection.ConcurrentReferenceHashMap; +import dev.ikm.tinkar.common.binary.Decoder; +import dev.ikm.tinkar.common.binary.DecoderInput; +import dev.ikm.tinkar.common.binary.Encodable; +import dev.ikm.tinkar.common.binary.Encoder; +import dev.ikm.tinkar.common.binary.EncoderOutput; import dev.ikm.tinkar.common.id.IntIds; import dev.ikm.tinkar.common.service.CachingService; import dev.ikm.tinkar.common.service.PrimitiveData; +import dev.ikm.tinkar.coordinate.ImmutableCoordinate; +import dev.ikm.tinkar.coordinate.PathService; import dev.ikm.tinkar.terms.ConceptFacade; import dev.ikm.tinkar.terms.TinkarTerm; +import org.eclipse.collections.api.factory.Sets; +import org.eclipse.collections.api.set.ImmutableSet; +import org.eclipse.collections.api.set.MutableSet; import java.util.Objects; @@ -114,7 +118,7 @@ public StampPathImmutable toStampPathImmutable() { return this; } - public static final StampCoordinateRecord getStampFilter(StampPath stampPath) { + public static StampCoordinateRecord getStampFilter(StampPath stampPath) { return StampCoordinateRecord.make(StateSet.ACTIVE_AND_INACTIVE, StampPositionRecord.make(Long.MAX_VALUE, stampPath.pathConceptNid()), IntIds.set.empty()); @@ -145,14 +149,12 @@ public boolean equals(Object o) { @Override public String toString() { - final StringBuilder sb = new StringBuilder(); - sb.append("StampPathImmutable:{"); - sb.append(PrimitiveData.text(this.pathConceptNid)); - sb.append(" Origins: ").append(this.pathOrigins).append("}"); - return sb.toString(); + String sb = "StampPathImmutable:{" + + PrimitiveData.text(this.pathConceptNid) + + " Origins: " + this.pathOrigins + "}"; + return sb; } - @AutoService(CachingService.class) public static class CachingProvider implements CachingService { @Override diff --git a/coordinate/src/main/java/dev/ikm/tinkar/coordinate/stamp/calculator/PathProvider.java b/coordinate/src/main/java/dev/ikm/tinkar/coordinate/stamp/calculator/PathProvider.java index 5efdf01a..68630590 100644 --- a/coordinate/src/main/java/dev/ikm/tinkar/coordinate/stamp/calculator/PathProvider.java +++ b/coordinate/src/main/java/dev/ikm/tinkar/coordinate/stamp/calculator/PathProvider.java @@ -15,17 +15,11 @@ */ package dev.ikm.tinkar.coordinate.stamp.calculator; - -import com.google.auto.service.AutoService; +import dev.ikm.tinkar.common.util.time.DateTimeUtil; import dev.ikm.tinkar.coordinate.PathService; import dev.ikm.tinkar.coordinate.stamp.StampBranchRecord; import dev.ikm.tinkar.coordinate.stamp.StampPathImmutable; import dev.ikm.tinkar.coordinate.stamp.StampPositionRecord; -import org.eclipse.collections.api.factory.Sets; -import org.eclipse.collections.api.list.ImmutableList; -import org.eclipse.collections.api.set.ImmutableSet; -import org.eclipse.collections.api.set.MutableSet; -import dev.ikm.tinkar.common.util.time.DateTimeUtil; import dev.ikm.tinkar.entity.Entity; import dev.ikm.tinkar.entity.EntityService; import dev.ikm.tinkar.entity.SemanticEntity; @@ -34,10 +28,13 @@ import dev.ikm.tinkar.terms.EntityFacade; import dev.ikm.tinkar.terms.EntityProxy; import dev.ikm.tinkar.terms.TinkarTerm; +import org.eclipse.collections.api.factory.Sets; +import org.eclipse.collections.api.list.ImmutableList; +import org.eclipse.collections.api.set.ImmutableSet; +import org.eclipse.collections.api.set.MutableSet; import java.time.Instant; -@AutoService(PathService.class) public class PathProvider implements PathService { public ImmutableSet getPathBranches(int pathNid) { MutableSet branchSet = Sets.mutable.empty(); diff --git a/coordinate/src/main/java/dev/ikm/tinkar/coordinate/stamp/calculator/StampCalculatorWithCache.java b/coordinate/src/main/java/dev/ikm/tinkar/coordinate/stamp/calculator/StampCalculatorWithCache.java index a38b78be..f397b7c0 100644 --- a/coordinate/src/main/java/dev/ikm/tinkar/coordinate/stamp/calculator/StampCalculatorWithCache.java +++ b/coordinate/src/main/java/dev/ikm/tinkar/coordinate/stamp/calculator/StampCalculatorWithCache.java @@ -53,34 +53,55 @@ import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; -import com.google.auto.service.AutoService; -import dev.ikm.tinkar.coordinate.PathService; -import dev.ikm.tinkar.coordinate.stamp.*; -import org.eclipse.collections.api.list.ImmutableList; -import org.eclipse.collections.api.list.primitive.ImmutableIntList; -import org.eclipse.collections.api.set.ImmutableSet; -import org.eclipse.collections.api.set.primitive.ImmutableIntSet; -import org.eclipse.collections.api.set.primitive.MutableIntSet; -import org.eclipse.collections.impl.factory.primitive.IntLists; -import org.eclipse.collections.impl.factory.primitive.IntSets; import dev.ikm.tinkar.collection.ConcurrentReferenceHashMap; import dev.ikm.tinkar.common.service.CachingService; import dev.ikm.tinkar.common.service.PrimitiveData; import dev.ikm.tinkar.common.util.functional.TriConsumer; import dev.ikm.tinkar.common.util.ints2long.IntsInLong; -import dev.ikm.tinkar.component.graph.DiTree; -import dev.ikm.tinkar.coordinate.stamp.*; -import dev.ikm.tinkar.entity.*; -import dev.ikm.tinkar.entity.graph.DiTreeEntity; +import dev.ikm.tinkar.coordinate.PathService; +import dev.ikm.tinkar.coordinate.stamp.StampBranchRecord; +import dev.ikm.tinkar.coordinate.stamp.StampCoordinateRecord; +import dev.ikm.tinkar.coordinate.stamp.StampPath; +import dev.ikm.tinkar.coordinate.stamp.StampPathImmutable; +import dev.ikm.tinkar.coordinate.stamp.StampPosition; +import dev.ikm.tinkar.coordinate.stamp.StampPositionRecord; +import dev.ikm.tinkar.coordinate.stamp.StateSet; +import dev.ikm.tinkar.entity.CacheInvalidationSubscriber; +import dev.ikm.tinkar.entity.Entity; +import dev.ikm.tinkar.entity.EntityFactory; +import dev.ikm.tinkar.entity.EntityService; +import dev.ikm.tinkar.entity.EntityVersion; +import dev.ikm.tinkar.entity.Field; +import dev.ikm.tinkar.entity.FieldDefinitionRecord; +import dev.ikm.tinkar.entity.FieldRecord; +import dev.ikm.tinkar.entity.PatternEntityVersion; +import dev.ikm.tinkar.entity.SemanticEntity; +import dev.ikm.tinkar.entity.SemanticEntityVersion; +import dev.ikm.tinkar.entity.StampEntity; import dev.ikm.tinkar.entity.graph.DiTreeVersion; import dev.ikm.tinkar.entity.graph.VersionVertex; import dev.ikm.tinkar.terms.State; import dev.ikm.tinkar.terms.TinkarTerm; +import org.eclipse.collections.api.list.ImmutableList; +import org.eclipse.collections.api.list.primitive.ImmutableIntList; +import org.eclipse.collections.api.set.ImmutableSet; +import org.eclipse.collections.api.set.primitive.ImmutableIntSet; +import org.eclipse.collections.api.set.primitive.MutableIntSet; +import org.eclipse.collections.impl.factory.primitive.IntLists; +import org.eclipse.collections.impl.factory.primitive.IntSets; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.math.BigInteger; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Optional; +import java.util.OptionalInt; +import java.util.Set; +import java.util.SortedSet; +import java.util.TreeSet; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentSkipListSet; import java.util.concurrent.atomic.AtomicInteger; @@ -89,8 +110,6 @@ /** * The Class RelativePositionCalculator. - * - * */ public class StampCalculatorWithCache implements StampCalculator { /** @@ -276,7 +295,7 @@ public Latest latest(Entity chronicle) { (newVersionToTest) -> { if (latestVersionSet.isEmpty()) { if (allowedStates.contains(newVersionToTest.state())) { - latestVersionSet.add((V) newVersionToTest); + latestVersionSet.add(newVersionToTest); } } else { handlePart(latestVersionSet, newVersionToTest); @@ -385,7 +404,7 @@ public void forEachSemanticVersionWithFieldsForComponent(int componentNid, (semanticEntityVersion, entityVersion) -> { Latest latestPatternEntityVersion = latestPatternEntityVersion(semanticEntityVersion.patternNid()); latestPatternEntityVersion.ifPresent(patternEntityVersion -> { - procedure.accept(semanticEntityVersion, semanticEntityVersion.fields((PatternVersionRecord) patternEntityVersion), entityVersion); + procedure.accept(semanticEntityVersion, semanticEntityVersion.fields(patternEntityVersion), entityVersion); }); }); } @@ -1023,7 +1042,6 @@ public Latest latestIfPattern(int nid, int patternN return Latest.empty(); } - @AutoService(CachingService.class) public static class CacheProvider implements CachingService { // TODO: this has implicit assumption that no one will hold on to a calculator... Should we be defensive? @Override diff --git a/coordinate/src/main/java/dev/ikm/tinkar/coordinate/view/calculator/ViewCalculatorWithCache.java b/coordinate/src/main/java/dev/ikm/tinkar/coordinate/view/calculator/ViewCalculatorWithCache.java index 3a0de386..da4ab499 100644 --- a/coordinate/src/main/java/dev/ikm/tinkar/coordinate/view/calculator/ViewCalculatorWithCache.java +++ b/coordinate/src/main/java/dev/ikm/tinkar/coordinate/view/calculator/ViewCalculatorWithCache.java @@ -15,9 +15,6 @@ */ package dev.ikm.tinkar.coordinate.view.calculator; -import com.google.auto.service.AutoService; -import dev.ikm.tinkar.coordinate.view.ViewCoordinateRecord; -import org.eclipse.collections.api.list.ImmutableList; import dev.ikm.tinkar.collection.ConcurrentReferenceHashMap; import dev.ikm.tinkar.common.service.CachingService; import dev.ikm.tinkar.coordinate.language.LanguageCoordinateRecord; @@ -33,6 +30,8 @@ import dev.ikm.tinkar.coordinate.stamp.calculator.StampCalculator; import dev.ikm.tinkar.coordinate.stamp.calculator.StampCalculatorDelegate; import dev.ikm.tinkar.coordinate.stamp.calculator.StampCalculatorWithCache; +import dev.ikm.tinkar.coordinate.view.ViewCoordinateRecord; +import org.eclipse.collections.api.list.ImmutableList; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -98,7 +97,6 @@ public LanguageCalculator languageCalculator() { return languageCalculator; } - @AutoService(CachingService.class) public static class CacheProvider implements CachingService { @Override public void reset() { diff --git a/entity/src/main/java/dev/ikm/tinkar/entity/export/ExportEntitiesController.java b/entity/src/main/java/dev/ikm/tinkar/entity/export/ExportEntitiesController.java index 11d7cb95..ff3f571b 100644 --- a/entity/src/main/java/dev/ikm/tinkar/entity/export/ExportEntitiesController.java +++ b/entity/src/main/java/dev/ikm/tinkar/entity/export/ExportEntitiesController.java @@ -15,7 +15,6 @@ */ package dev.ikm.tinkar.entity.export; -import com.google.auto.service.AutoService; import dev.ikm.tinkar.common.service.TinkExecutor; import java.io.File; @@ -23,7 +22,6 @@ import static dev.ikm.tinkar.entity.Entity.LOG; -@AutoService(ExportEntitiesController.class) public class ExportEntitiesController { public Future export(File pbFile) { if (pbFile.getName().toLowerCase().contains("tinkar-export")) { diff --git a/entity/src/main/java/dev/ikm/tinkar/entity/load/LoadEntitiesFromFileController.java b/entity/src/main/java/dev/ikm/tinkar/entity/load/LoadEntitiesFromFileController.java index fb58a6d7..1cd23d94 100644 --- a/entity/src/main/java/dev/ikm/tinkar/entity/load/LoadEntitiesFromFileController.java +++ b/entity/src/main/java/dev/ikm/tinkar/entity/load/LoadEntitiesFromFileController.java @@ -15,14 +15,12 @@ */ package dev.ikm.tinkar.entity.load; -import com.google.auto.service.AutoService; import dev.ikm.tinkar.common.service.LoadDataFromFileController; import dev.ikm.tinkar.common.service.TinkExecutor; import java.io.File; import java.util.concurrent.Future; -@AutoService(LoadDataFromFileController.class) public class LoadEntitiesFromFileController implements LoadDataFromFileController { @Override public Future load(File file) { diff --git a/integration/pom.xml b/integration/pom.xml index 7f0bdedc..b8a51a4b 100644 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -66,7 +66,6 @@ ${project.groupId} composer - diff --git a/language-extensions/owl-extension/pom.xml b/language-extensions/owl-extension/pom.xml index 447200f2..7d845f83 100644 --- a/language-extensions/owl-extension/pom.xml +++ b/language-extensions/owl-extension/pom.xml @@ -1,7 +1,5 @@ - + 4.0.0 @@ -133,7 +131,3 @@ - - - - diff --git a/pom.xml b/pom.xml index f8ab4a3c..8e3dd833 100644 --- a/pom.xml +++ b/pom.xml @@ -110,21 +110,20 @@ dev.ikm.jpms 33.3.0-jre-r3 - 1.0.1-r7 - 36-r7 - 11.1.0-r13 - 11.1.0-r11 - 0.14-r6 - 0.9.31-r8 - - 0.36.0 - 4.7.6 + 36-r7 + 11.1.0-r13 + 11.1.0-r11 + 0.14-r6 + 0.9.31-r8 + + 0.36.0 + 4.7.6 - + - + dev.ikm.tinkar collection @@ -223,19 +222,14 @@ ${project.version} - + ${project.groupId} tinkar-schema ${tinkar-schema.version} - - - ${tinkar-jpms-deps.groupId} - auto-service - ${jpms-auto-service.version} - + ${tinkar-jpms-deps.groupId} @@ -253,6 +247,12 @@ ${tinkar-jpms-deps.groupId} activej-bytebuf ${activej-bytebuf.version} + + + dev.ikm.jpms + auto-service + + @@ -303,7 +303,7 @@ ${guava.version} - + org.jsonschema2pojo jsonschema2pojo-core @@ -376,7 +376,7 @@ ${mockito.version} - + org.apache.lucene lucene-queryparser @@ -406,45 +406,45 @@ lucene-suggest ${lucene-suggest.version} - - - dev.ikm.owlapi - owlapi-api - ${owlapi.version} - - - dev.ikm.owlapi - owlapi-apibinding - ${owlapi.version} - - - dev.ikm.owlapi - owlapi-impl - ${owlapi.version} - - - dev.ikm.owlapi - owlapi-parsers - ${owlapi.version} - - - dev.ikm.elk - elk-snomed - ${ikm-reasoner.version} - - - dev.ikm.elk - elk-snomed-owl - ${ikm-reasoner.version} - - - dev.ikm.elk - elk-snomed-owl-el - ${ikm-reasoner.version} - + + + dev.ikm.owlapi + owlapi-api + ${owlapi.version} + + + dev.ikm.owlapi + owlapi-apibinding + ${owlapi.version} + + + dev.ikm.owlapi + owlapi-impl + ${owlapi.version} + + + dev.ikm.owlapi + owlapi-parsers + ${owlapi.version} + + + dev.ikm.elk + elk-snomed + ${ikm-reasoner.version} + + + dev.ikm.elk + elk-snomed-owl + ${ikm-reasoner.version} + + + dev.ikm.elk + elk-snomed-owl-el + ${ikm-reasoner.version} + - + org.slf4j @@ -455,10 +455,6 @@ log4j-slf4j2-impl test - - ${tinkar-jpms-deps.groupId} - auto-service - org.junit.jupiter @@ -502,7 +498,7 @@ - + diff --git a/provider/changeset-writer-provider/pom.xml b/provider/changeset-writer-provider/pom.xml index a90ce9ae..a35e8e8c 100644 --- a/provider/changeset-writer-provider/pom.xml +++ b/provider/changeset-writer-provider/pom.xml @@ -1,6 +1,7 @@ - + + 4.0.0 + dev.ikm.tinkar provider @@ -19,7 +20,7 @@ dev.ikm.tinkar - entity-provider + entity-provider diff --git a/provider/data-ephemeral-provider/src/main/java/dev/ikm/tinkar/provider/ephemeral/ProviderEphemeralNewController.java b/provider/data-ephemeral-provider/src/main/java/dev/ikm/tinkar/provider/ephemeral/ProviderEphemeralNewController.java index 5157cfd7..ab422915 100644 --- a/provider/data-ephemeral-provider/src/main/java/dev/ikm/tinkar/provider/ephemeral/ProviderEphemeralNewController.java +++ b/provider/data-ephemeral-provider/src/main/java/dev/ikm/tinkar/provider/ephemeral/ProviderEphemeralNewController.java @@ -15,8 +15,11 @@ */ package dev.ikm.tinkar.provider.ephemeral; -import com.google.auto.service.AutoService; -import dev.ikm.tinkar.common.service.*; +import dev.ikm.tinkar.common.service.DataServiceController; +import dev.ikm.tinkar.common.service.DataUriOption; +import dev.ikm.tinkar.common.service.LoadDataFromFileController; +import dev.ikm.tinkar.common.service.PluggableService; +import dev.ikm.tinkar.common.service.PrimitiveDataService; import dev.ikm.tinkar.entity.EntityCountSummary; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,11 +31,10 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -@AutoService(DataServiceController.class) public class ProviderEphemeralNewController implements DataServiceController { public static String CONTROLLER_NAME = "Load Ephemeral Store"; - private static Logger LOG = LoggerFactory.getLogger(ProviderEphemeralNewController.class); + private static final Logger LOG = LoggerFactory.getLogger(ProviderEphemeralNewController.class); private DataUriOption dataUriOption; public List providerOptions() { @@ -70,10 +72,7 @@ public Class serviceClass() { } public boolean running() { - if (ProviderEphemeral.singleton == null) { - return false; - } - return true; + return ProviderEphemeral.singleton != null; } @Override diff --git a/provider/data-mvstore-provider/src/main/java/dev/ikm/tinkar/provider/mvstore/MvStoreNewController.java b/provider/data-mvstore-provider/src/main/java/dev/ikm/tinkar/provider/mvstore/MvStoreNewController.java index ad903ae8..94d2b438 100644 --- a/provider/data-mvstore-provider/src/main/java/dev/ikm/tinkar/provider/mvstore/MvStoreNewController.java +++ b/provider/data-mvstore-provider/src/main/java/dev/ikm/tinkar/provider/mvstore/MvStoreNewController.java @@ -15,8 +15,12 @@ */ package dev.ikm.tinkar.provider.mvstore; -import com.google.auto.service.AutoService; -import dev.ikm.tinkar.common.service.*; +import dev.ikm.tinkar.common.service.DataServiceProperty; +import dev.ikm.tinkar.common.service.DataUriOption; +import dev.ikm.tinkar.common.service.LoadDataFromFileController; +import dev.ikm.tinkar.common.service.PluggableService; +import dev.ikm.tinkar.common.service.ServiceKeys; +import dev.ikm.tinkar.common.service.ServiceProperties; import dev.ikm.tinkar.common.validation.ValidationRecord; import dev.ikm.tinkar.common.validation.ValidationSeverity; import dev.ikm.tinkar.entity.EntityCountSummary; @@ -31,13 +35,10 @@ import java.net.MalformedURLException; import java.util.ArrayList; import java.util.List; -import dev.ikm.tinkar.common.service.PluggableService; - import java.util.ServiceLoader; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -@AutoService(DataServiceController.class) public class MvStoreNewController extends MvStoreController { public static String CONTROLLER_NAME = "New MV Store"; String importDataFileString; diff --git a/provider/data-mvstore-provider/src/main/java/dev/ikm/tinkar/provider/mvstore/MvStoreOpenController.java b/provider/data-mvstore-provider/src/main/java/dev/ikm/tinkar/provider/mvstore/MvStoreOpenController.java index d307cfd2..6dba2608 100644 --- a/provider/data-mvstore-provider/src/main/java/dev/ikm/tinkar/provider/mvstore/MvStoreOpenController.java +++ b/provider/data-mvstore-provider/src/main/java/dev/ikm/tinkar/provider/mvstore/MvStoreOpenController.java @@ -15,15 +15,12 @@ */ package dev.ikm.tinkar.provider.mvstore; -import com.google.auto.service.AutoService; -import dev.ikm.tinkar.common.service.DataServiceController; import dev.ikm.tinkar.common.service.DataUriOption; import dev.ikm.tinkar.common.service.ServiceKeys; import dev.ikm.tinkar.common.service.ServiceProperties; import java.io.IOException; -@AutoService(DataServiceController.class) public class MvStoreOpenController extends MvStoreController { public static String CONTROLLER_NAME = "Open MV Store"; diff --git a/provider/data-spinedarray-provider/src/main/java/dev/ikm/tinkar/provider/spinedarray/SpinedArrayNewController.java b/provider/data-spinedarray-provider/src/main/java/dev/ikm/tinkar/provider/spinedarray/SpinedArrayNewController.java index 454be355..98de3bf4 100644 --- a/provider/data-spinedarray-provider/src/main/java/dev/ikm/tinkar/provider/spinedarray/SpinedArrayNewController.java +++ b/provider/data-spinedarray-provider/src/main/java/dev/ikm/tinkar/provider/spinedarray/SpinedArrayNewController.java @@ -15,8 +15,12 @@ */ package dev.ikm.tinkar.provider.spinedarray; -import com.google.auto.service.AutoService; -import dev.ikm.tinkar.common.service.*; +import dev.ikm.tinkar.common.service.DataServiceProperty; +import dev.ikm.tinkar.common.service.DataUriOption; +import dev.ikm.tinkar.common.service.LoadDataFromFileController; +import dev.ikm.tinkar.common.service.PluggableService; +import dev.ikm.tinkar.common.service.ServiceKeys; +import dev.ikm.tinkar.common.service.ServiceProperties; import dev.ikm.tinkar.common.validation.ValidationRecord; import dev.ikm.tinkar.common.validation.ValidationSeverity; import dev.ikm.tinkar.entity.EntityCountSummary; @@ -31,13 +35,10 @@ import java.net.MalformedURLException; import java.util.ArrayList; import java.util.List; -import dev.ikm.tinkar.common.service.PluggableService; - import java.util.ServiceLoader; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -@AutoService(DataServiceController.class) public class SpinedArrayNewController extends SpinedArrayController { public static boolean loading = false; diff --git a/provider/data-spinedarray-provider/src/main/java/dev/ikm/tinkar/provider/spinedarray/SpinedArrayOpenController.java b/provider/data-spinedarray-provider/src/main/java/dev/ikm/tinkar/provider/spinedarray/SpinedArrayOpenController.java index e054defd..7176a6da 100644 --- a/provider/data-spinedarray-provider/src/main/java/dev/ikm/tinkar/provider/spinedarray/SpinedArrayOpenController.java +++ b/provider/data-spinedarray-provider/src/main/java/dev/ikm/tinkar/provider/spinedarray/SpinedArrayOpenController.java @@ -15,13 +15,10 @@ */ package dev.ikm.tinkar.provider.spinedarray; -import com.google.auto.service.AutoService; -import dev.ikm.tinkar.common.service.DataServiceController; import dev.ikm.tinkar.common.service.DataUriOption; import dev.ikm.tinkar.common.service.ServiceKeys; import dev.ikm.tinkar.common.service.ServiceProperties; -@AutoService(DataServiceController.class) public class SpinedArrayOpenController extends SpinedArrayController { public static String CONTROLLER_NAME = "Open SpinedArrayStore"; diff --git a/provider/data-spinedarray-provider/src/main/java/module-info.java b/provider/data-spinedarray-provider/src/main/java/module-info.java index ace6fae8..653efa13 100644 --- a/provider/data-spinedarray-provider/src/main/java/module-info.java +++ b/provider/data-spinedarray-provider/src/main/java/module-info.java @@ -35,7 +35,6 @@ requires dev.ikm.tinkar.component; requires dev.ikm.tinkar.entity; requires dev.ikm.tinkar.provider.search; - requires static dev.ikm.jpms.auto.service; requires dev.ikm.jpms.eclipse.collections.api; requires dev.ikm.jpms.eclipse.collections; requires dev.ikm.jpms.activej.bytebuf; diff --git a/provider/data-websocket-client-provider/src/main/java/dev/ikm/tinkar/provider/websocket/client/WebsocketServiceController.java b/provider/data-websocket-client-provider/src/main/java/dev/ikm/tinkar/provider/websocket/client/WebsocketServiceController.java index 6cde42c0..dad23418 100644 --- a/provider/data-websocket-client-provider/src/main/java/dev/ikm/tinkar/provider/websocket/client/WebsocketServiceController.java +++ b/provider/data-websocket-client-provider/src/main/java/dev/ikm/tinkar/provider/websocket/client/WebsocketServiceController.java @@ -15,7 +15,7 @@ */ package dev.ikm.tinkar.provider.websocket.client; -import com.google.auto.service.AutoService; + import dev.ikm.tinkar.common.service.DataServiceController; import dev.ikm.tinkar.common.service.DataServiceProperty; import dev.ikm.tinkar.common.service.DataUriOption; @@ -31,11 +31,11 @@ import java.util.List; import java.util.Locale; -@AutoService(DataServiceController.class) public class WebsocketServiceController implements DataServiceController { public static final String CONTROLLER_NAME = "Websocket"; private static final DataServiceProperty passwordProperty = new DataServiceProperty("password", true, true); MutableMap providerProperties = Maps.mutable.empty(); + { providerProperties.put(new DataServiceProperty("username", false, false), null); providerProperties.put(passwordProperty, null); @@ -46,36 +46,38 @@ public List providerOptions() { try { return List.of(new DataUriOption("localhost websocket", new URI("ws://127.0.0.1:8080/"))); } catch (URISyntaxException e) { - throw new RuntimeException(e); + throw new RuntimeException(e); } } @Override public ValidationRecord[] validate(DataServiceProperty dataServiceProperty, Object value, Object target) { if (passwordProperty.equals(dataServiceProperty)) { - if (value instanceof String password) { + if (value instanceof String password) { if (password.isBlank()) { - return new ValidationRecord[] { new ValidationRecord(ValidationSeverity.ERROR, + return new ValidationRecord[]{new ValidationRecord(ValidationSeverity.ERROR, "Password cannot be blank", target)}; - } else if (password.length() < 5) { - return new ValidationRecord[] { new ValidationRecord(ValidationSeverity.ERROR, + } else if (password.length() < 5) { + return new ValidationRecord[]{new ValidationRecord(ValidationSeverity.ERROR, "Password cannot be less than 5 characters", target)}; } else if (password.length() < 8) { - return new ValidationRecord[] { new ValidationRecord(ValidationSeverity.WARNING, + return new ValidationRecord[]{new ValidationRecord(ValidationSeverity.WARNING, "Password recommended to be 8 or more characters", target), new ValidationRecord(ValidationSeverity.INFO, "Password is " + password.length() + " characters long", target), }; } else { - return new ValidationRecord[] { new ValidationRecord(ValidationSeverity.OK, + return new ValidationRecord[]{new ValidationRecord(ValidationSeverity.OK, "Password OK", target)}; } } } return new ValidationRecord[]{}; } + DataUriOption dataUriOption; + @Override public String controllerName() { return CONTROLLER_NAME; diff --git a/provider/data-websocket-client-provider/src/main/java/module-info.java b/provider/data-websocket-client-provider/src/main/java/module-info.java index ce23dcdc..1d6aafbe 100644 --- a/provider/data-websocket-client-provider/src/main/java/module-info.java +++ b/provider/data-websocket-client-provider/src/main/java/module-info.java @@ -23,7 +23,8 @@ import dev.ikm.tinkar.entity.EntityService; import dev.ikm.tinkar.provider.websocket.client.WebsocketServiceController; -@SuppressWarnings("module") // 7 in HL7 is not a version reference +@SuppressWarnings("module") + // 7 in HL7 is not a version reference module dev.ikm.tinkar.provider.websocket.client { requires org.slf4j; requires dev.ikm.jpms.activej.bytebuf; @@ -39,7 +40,6 @@ requires dev.ikm.tinkar.component; requires java.net.http; requires dev.ikm.tinkar.entity; - requires static transitive dev.ikm.jpms.auto.service; provides DataServiceController with WebsocketServiceController; diff --git a/provider/entity-provider/src/main/java/dev/ikm/tinkar/provider/entity/DefaultDescriptionForNidServiceFactory.java b/provider/entity-provider/src/main/java/dev/ikm/tinkar/provider/entity/DefaultDescriptionForNidServiceFactory.java index af841f5b..0ab4a49d 100644 --- a/provider/entity-provider/src/main/java/dev/ikm/tinkar/provider/entity/DefaultDescriptionForNidServiceFactory.java +++ b/provider/entity-provider/src/main/java/dev/ikm/tinkar/provider/entity/DefaultDescriptionForNidServiceFactory.java @@ -15,7 +15,6 @@ */ package dev.ikm.tinkar.provider.entity; -import com.google.auto.service.AutoService; import dev.ikm.tinkar.common.service.DefaultDescriptionForNidService; //@AutoService({DefaultDescriptionForNidService.class}) diff --git a/provider/entity-provider/src/main/java/dev/ikm/tinkar/provider/entity/EntityProvider.java b/provider/entity-provider/src/main/java/dev/ikm/tinkar/provider/entity/EntityProvider.java index cb1ae82e..de0e0045 100644 --- a/provider/entity-provider/src/main/java/dev/ikm/tinkar/provider/entity/EntityProvider.java +++ b/provider/entity-provider/src/main/java/dev/ikm/tinkar/provider/entity/EntityProvider.java @@ -17,11 +17,16 @@ import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; -import com.google.auto.service.AutoService; import dev.ikm.tinkar.common.alert.AlertObject; import dev.ikm.tinkar.common.alert.AlertStreams; import dev.ikm.tinkar.common.id.PublicId; -import dev.ikm.tinkar.common.service.*; +import dev.ikm.tinkar.common.service.CachingService; +import dev.ikm.tinkar.common.service.DataActivity; +import dev.ikm.tinkar.common.service.DefaultDescriptionForNidService; +import dev.ikm.tinkar.common.service.PrimitiveData; +import dev.ikm.tinkar.common.service.PrimitiveDataRepair; +import dev.ikm.tinkar.common.service.PublicIdService; +import dev.ikm.tinkar.common.service.TinkExecutor; import dev.ikm.tinkar.common.util.broadcast.Broadcaster; import dev.ikm.tinkar.common.util.broadcast.SimpleBroadcaster; import dev.ikm.tinkar.common.util.broadcast.Subscriber; @@ -249,7 +254,7 @@ private void putEntity(Entity entity, DataActivity activity, boolean dispatch) { default -> throw new IllegalStateException("Unexpected value: " + entity); }; - ENTITY_CACHE.put(entity.nid(), EntityRecordFactory.make(mergedEntityBytes)); + ENTITY_CACHE.put(entity.nid(), EntityRecordFactory.make(mergedEntityBytes)); if (dispatch) { processor.dispatch(entity.nid()); if (entity instanceof SemanticEntity semanticEntity) { @@ -384,7 +389,6 @@ public , V extends Version> void putChronology(T chronol } } - @AutoService(CachingService.class) public static class CacheProvider implements CachingService { @Override @@ -473,13 +477,14 @@ private static Future mergeEntities(Entity entityToMergeInto, Entity< } // At this point, all stamps represent distinct time, module, and path. We can just merge the versions. return switch (entityToMergeInto) { - case ConceptRecord conceptOneRecord when entityToMergeFrom instanceof ConceptRecord conceptTwoRecord - -> mergeAllConceptVersions(conceptOneRecord, conceptTwoRecord); - case PatternRecord patternOneRecord when entityToMergeFrom instanceof PatternRecord patternTwoRecord - -> mergeAllPatternVersions(patternOneRecord, patternTwoRecord); - case SemanticRecord semanticOneRecord when entityToMergeFrom instanceof SemanticRecord semanticTwoRecord - -> mergeAllSemanticVersions(semanticOneRecord, semanticTwoRecord); - default -> throw new IllegalStateException("Can't merge:\n" + entityToMergeInto + "\nand:\n" + entityToMergeFrom); + case ConceptRecord conceptOneRecord when entityToMergeFrom instanceof ConceptRecord conceptTwoRecord -> + mergeAllConceptVersions(conceptOneRecord, conceptTwoRecord); + case PatternRecord patternOneRecord when entityToMergeFrom instanceof PatternRecord patternTwoRecord -> + mergeAllPatternVersions(patternOneRecord, patternTwoRecord); + case SemanticRecord semanticOneRecord when entityToMergeFrom instanceof SemanticRecord semanticTwoRecord -> + mergeAllSemanticVersions(semanticOneRecord, semanticTwoRecord); + default -> + throw new IllegalStateException("Can't merge:\n" + entityToMergeInto + "\nand:\n" + entityToMergeFrom); }; } @@ -493,7 +498,7 @@ private static Future mergeAllPatternVersions(PatternRecord patternOneRe additionalUuids.remove(new UUID(patternOneRecord.mostSignificantBits(), patternOneRecord.leastSignificantBits())); long[] additionalUuidLongs = null; if (additionalUuids.notEmpty()) { - additionalUuidLongs = UuidUtil.asArray(additionalUuids.toArray(new UUID[additionalUuids.size()] )); + additionalUuidLongs = UuidUtil.asArray(additionalUuids.toArray(new UUID[additionalUuids.size()])); } PatternRecordBuilder builder = patternOneRecord.with().versions(versionList).additionalUuidLongs(additionalUuidLongs); return new FutureTask<>(() -> builder.build()); @@ -509,9 +514,9 @@ private static Future mergeAllSemanticVersions(SemanticRecord semanticOn additionalUuids.remove(new UUID(semanticOneRecord.mostSignificantBits(), semanticOneRecord.leastSignificantBits())); long[] additionalUuidLongs = null; if (additionalUuids.notEmpty()) { - additionalUuidLongs = UuidUtil.asArray(additionalUuids.toArray(new UUID[additionalUuids.size()] )); + additionalUuidLongs = UuidUtil.asArray(additionalUuids.toArray(new UUID[additionalUuids.size()])); } - SemanticRecordBuilder builder = semanticOneRecord.with().versions(versionList).additionalUuidLongs(additionalUuidLongs); + SemanticRecordBuilder builder = semanticOneRecord.with().versions(versionList).additionalUuidLongs(additionalUuidLongs); return new FutureTask<>(() -> builder.build()); } @@ -525,7 +530,7 @@ private static FutureTask mergeAllConceptVersions(ConceptRecord conceptO additionalUuids.remove(new UUID(conceptOneRecord.mostSignificantBits(), conceptOneRecord.leastSignificantBits())); long[] additionalUuidLongs = null; if (additionalUuids.notEmpty()) { - additionalUuidLongs = UuidUtil.asArray(additionalUuids.toArray(new UUID[additionalUuids.size()] )); + additionalUuidLongs = UuidUtil.asArray(additionalUuids.toArray(new UUID[additionalUuids.size()])); } ConceptRecordBuilder builder = conceptOneRecord.with().versions(versionList).additionalUuidLongs(additionalUuidLongs); return new FutureTask<>(() -> builder.build()); diff --git a/provider/entity-provider/src/main/java/dev/ikm/tinkar/provider/entity/EntityServiceFactory.java b/provider/entity-provider/src/main/java/dev/ikm/tinkar/provider/entity/EntityServiceFactory.java index b1a6769f..1472ff7e 100644 --- a/provider/entity-provider/src/main/java/dev/ikm/tinkar/provider/entity/EntityServiceFactory.java +++ b/provider/entity-provider/src/main/java/dev/ikm/tinkar/provider/entity/EntityServiceFactory.java @@ -15,12 +15,8 @@ */ package dev.ikm.tinkar.provider.entity; -import com.google.auto.service.AutoService; -import dev.ikm.tinkar.entity.EntityService; - import java.util.concurrent.atomic.AtomicReference; -//@AutoService({EntityService.class}) public class EntityServiceFactory { protected static final AtomicReference provider = new AtomicReference<>(); diff --git a/provider/entity-provider/src/main/java/dev/ikm/tinkar/provider/entity/PublicIdServiceFactory.java b/provider/entity-provider/src/main/java/dev/ikm/tinkar/provider/entity/PublicIdServiceFactory.java index 0dad57e4..ff19d904 100644 --- a/provider/entity-provider/src/main/java/dev/ikm/tinkar/provider/entity/PublicIdServiceFactory.java +++ b/provider/entity-provider/src/main/java/dev/ikm/tinkar/provider/entity/PublicIdServiceFactory.java @@ -15,10 +15,8 @@ */ package dev.ikm.tinkar.provider.entity; -import com.google.auto.service.AutoService; import dev.ikm.tinkar.common.service.PublicIdService; -//@AutoService({PublicIdService.class}) public class PublicIdServiceFactory { public static PublicIdService provider() { return EntityServiceFactory.provider(); diff --git a/provider/entity-provider/src/main/java/dev/ikm/tinkar/provider/entity/StampProvider.java b/provider/entity-provider/src/main/java/dev/ikm/tinkar/provider/entity/StampProvider.java index 7b28af4b..163dc22b 100644 --- a/provider/entity-provider/src/main/java/dev/ikm/tinkar/provider/entity/StampProvider.java +++ b/provider/entity-provider/src/main/java/dev/ikm/tinkar/provider/entity/StampProvider.java @@ -15,13 +15,16 @@ */ package dev.ikm.tinkar.provider.entity; -import com.google.auto.service.AutoService; import dev.ikm.tinkar.common.id.IntIdSet; import dev.ikm.tinkar.common.id.IntIds; import dev.ikm.tinkar.common.service.PrimitiveData; import dev.ikm.tinkar.common.util.broadcast.Subscriber; import dev.ikm.tinkar.component.FieldDataType; -import dev.ikm.tinkar.entity.*; +import dev.ikm.tinkar.entity.Entity; +import dev.ikm.tinkar.entity.EntityRecordFactory; +import dev.ikm.tinkar.entity.EntityService; +import dev.ikm.tinkar.entity.StampEntity; +import dev.ikm.tinkar.entity.StampService; import dev.ikm.tinkar.entity.util.EntityProcessor; import org.eclipse.collections.api.list.primitive.ImmutableLongList; import org.eclipse.collections.impl.factory.primitive.LongLists; @@ -46,8 +49,6 @@ * at java.base/jdk.internal.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:78) * at java.base/jdk.internal.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) */ - -@AutoService({StampService.class}) public class StampProvider extends EntityProcessor implements StampService, Subscriber { private static final Logger LOG = LoggerFactory.getLogger(StampProvider.class); @@ -77,7 +78,7 @@ public void processBytesForType(FieldDataType componentType, byte[] bytes) { } public IntIdSet stampNids() { - return IntIds.set.of(stampNids.stream().mapToInt(wrappedPath -> (int) wrappedPath).toArray()); + return IntIds.set.of(stampNids.stream().mapToInt(wrappedPath -> wrappedPath).toArray()); } public ImmutableLongList timesInUse() { @@ -105,7 +106,6 @@ public ImmutableLongList getTimesInUse() { } - @Override public void onNext(Integer nid) { Entity entity = Entity.provider().getEntityFast(nid); diff --git a/provider/executor-provider/src/main/java/dev/ikm/tinkar/provider/executor/AlertLogSubscriber.java b/provider/executor-provider/src/main/java/dev/ikm/tinkar/provider/executor/AlertLogSubscriber.java index 7d1d9874..668569c7 100644 --- a/provider/executor-provider/src/main/java/dev/ikm/tinkar/provider/executor/AlertLogSubscriber.java +++ b/provider/executor-provider/src/main/java/dev/ikm/tinkar/provider/executor/AlertLogSubscriber.java @@ -15,19 +15,14 @@ */ package dev.ikm.tinkar.provider.executor; -import com.google.auto.service.AutoService; import dev.ikm.tinkar.common.alert.AlertObject; import dev.ikm.tinkar.common.alert.AlertReportingService; import dev.ikm.tinkar.common.alert.AlertStreams; import dev.ikm.tinkar.common.id.PublicIdStringKey; import dev.ikm.tinkar.common.util.broadcast.Broadcaster; -import dev.ikm.tinkar.common.alert.AlertReportingService; -import dev.ikm.tinkar.common.alert.AlertObject; -import dev.ikm.tinkar.common.alert.AlertStreams; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@AutoService(AlertReportingService.class) public class AlertLogSubscriber implements AlertReportingService { private static final Logger LOG = LoggerFactory.getLogger(AlertLogSubscriber.class); diff --git a/provider/executor-provider/src/main/java/dev/ikm/tinkar/provider/executor/ExecutorProviderController.java b/provider/executor-provider/src/main/java/dev/ikm/tinkar/provider/executor/ExecutorProviderController.java index 5ec2670f..59c3e782 100644 --- a/provider/executor-provider/src/main/java/dev/ikm/tinkar/provider/executor/ExecutorProviderController.java +++ b/provider/executor-provider/src/main/java/dev/ikm/tinkar/provider/executor/ExecutorProviderController.java @@ -15,7 +15,6 @@ */ package dev.ikm.tinkar.provider.executor; -import com.google.auto.service.AutoService; import dev.ikm.tinkar.common.service.CachingService; import dev.ikm.tinkar.common.service.ExecutorController; import org.slf4j.Logger; @@ -23,10 +22,9 @@ import java.util.concurrent.atomic.AtomicReference; -@AutoService({ExecutorController.class}) public class ExecutorProviderController implements ExecutorController { private static final Logger LOG = LoggerFactory.getLogger(ExecutorProviderController.class); - private static AtomicReference providerReference = new AtomicReference<>(); + private static final AtomicReference providerReference = new AtomicReference<>(); @Override public ExecutorProvider create() { @@ -52,8 +50,6 @@ public void stop() { }); } - - @AutoService(CachingService.class) public static class CacheProvider implements CachingService { @Override public void reset() { diff --git a/provider/executor-provider/src/main/java/module-info.java b/provider/executor-provider/src/main/java/module-info.java index 5a3f3622..f57cf821 100644 --- a/provider/executor-provider/src/main/java/module-info.java +++ b/provider/executor-provider/src/main/java/module-info.java @@ -29,8 +29,6 @@ // 7 in HL7 is not a version reference module dev.ikm.tinkar.provider.executor { requires org.slf4j; - requires static transitive dev.ikm.jpms.auto.service; - provides AlertReportingService with AlertLogSubscriber; provides CachingService with ExecutorProviderController.CacheProvider; provides ExecutorController with ExecutorProviderController; diff --git a/provider/search-provider/src/main/java/module-info.java b/provider/search-provider/src/main/java/module-info.java index 55a84c6f..9ca77580 100644 --- a/provider/search-provider/src/main/java/module-info.java +++ b/provider/search-provider/src/main/java/module-info.java @@ -21,7 +21,6 @@ requires org.apache.lucene.queries; requires org.apache.lucene.highlighter; requires org.apache.lucene.core; - requires static transitive dev.ikm.jpms.auto.service; requires dev.ikm.tinkar.coordinate; requires dev.ikm.jpms.eclipse.collections; requires org.apache.lucene.suggest; diff --git a/reasoner/pom.xml b/reasoner/pom.xml index 5992c9e8..d0a05c78 100644 --- a/reasoner/pom.xml +++ b/reasoner/pom.xml @@ -1,187 +1,180 @@ - 4.0.0 + 4.0.0 - - dev.ikm.tinkar - tinkar-core - 1.81.0-SNAPSHOT - + + dev.ikm.tinkar + tinkar-core + 1.81.0-SNAPSHOT + - reasoner - pom + reasoner + pom - TINKAR Reasoner Service and Implementations + TINKAR Reasoner Service and Implementations - - reasoner-elk-owl - reasoner-elk-snomed - reasoner-hybrid - reasoner-service - + + reasoner-elk-owl + reasoner-elk-snomed + reasoner-hybrid + reasoner-service + - - 1.0.3 - dev.ikm.reasoner-test-data - true - dev.ikm.snomed - 0.1.0 - - 1.3.0 - 2.15.0 - + + 1.0.3 + dev.ikm.reasoner-test-data + true + dev.ikm.snomed + 0.1.0 + + 1.3.0 + 2.15.0 + - - - - dev.ikm.hybrid-reasoner - hybrid-reasoner-snomed - ${hybrid-reasoner.version} - - - ${project.groupId} - reasoner-elk-snomed - ${project.version} - - - dev.ikm.tinkar - reasoner-service - ${project.version} - - - - - - org.apache.logging.log4j - log4j-slf4j2-impl - test - - + + + + dev.ikm.hybrid-reasoner + hybrid-reasoner-snomed + ${hybrid-reasoner.version} + + + ${project.groupId} + reasoner-elk-snomed + ${project.version} + + + dev.ikm.tinkar + reasoner-service + ${project.version} + + + - - - - - org.apache.maven.plugins - maven-assembly-plugin - ${maven-assembly-plugin.version} - - - - org.codehaus.mojo - tidy-maven-plugin - ${tidy-maven-plugin.version} - - - org.codehaus.mojo - versions-maven-plugin - ${versions-maven-plugin.version} - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-maven - - enforce - - - - - 3.8 - - - ${java.version} - - - true - - - - - - org.codehaus.mojo - tidy-maven-plugin - - - validate - validate - - check - - - - - - org.codehaus.mojo - versions-maven-plugin - - - analyze - validate - - display-dependency-updates - display-plugin-updates - - - - - - regex - .+(alpha|beta).* - - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - analyze - - analyze-only - - - true - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - true - 1 - false - - - - org.apache.maven.plugins - maven-failsafe-plugin - - ${skipITs} - true - 1 - false - - - - - integration-test - verify - - - - - - + + + + + org.apache.maven.plugins + maven-assembly-plugin + ${maven-assembly-plugin.version} + + + + org.codehaus.mojo + tidy-maven-plugin + ${tidy-maven-plugin.version} + + + org.codehaus.mojo + versions-maven-plugin + ${versions-maven-plugin.version} + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-maven + + enforce + + + + + 3.8 + + + ${java.version} + + + true + + + + + + org.codehaus.mojo + tidy-maven-plugin + + + validate + validate + + check + + + + + + org.codehaus.mojo + versions-maven-plugin + + + analyze + validate + + display-dependency-updates + display-plugin-updates + + + + + + regex + .+(alpha|beta).* + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + analyze + + analyze-only + + + true + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + 1 + false + + + + org.apache.maven.plugins + maven-failsafe-plugin + + ${skipITs} + true + 1 + false + + + + + integration-test + verify + + + + + + diff --git a/terms/src/main/java/module-info.java b/terms/src/main/java/module-info.java index 1f0164b0..9ee710b0 100644 --- a/terms/src/main/java/module-info.java +++ b/terms/src/main/java/module-info.java @@ -25,6 +25,5 @@ requires dev.ikm.jpms.eclipse.collections.api; requires dev.ikm.jpms.eclipse.collections; requires org.slf4j; - requires transitive static dev.ikm.jpms.auto.service; exports dev.ikm.tinkar.terms; }