From 80df2848be08ed577bdf164f9af400fdd4569bee Mon Sep 17 00:00:00 2001 From: Michael Vorburger Date: Mon, 15 Apr 2024 22:48:21 +0200 Subject: [PATCH] =?UTF-8?q?fix=20(build):=20Big=20=F0=9F=8E=82=20Birthday?= =?UTF-8?q?=20Move,=20part=20II?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .pre-commit-config.yaml | 12 +- .../test/resources/enola.dev-properties.ttl | 1 - common/protobuf/BUILD | 94 -------------- .../protobuf/AbstractProtoTestBase.java | 39 ------ common/thing/src/test/resources/picasso.ttl | 1 - connectors/demo/BUILD | 19 ++- core/impl/BUILD | 99 --------------- core/impl/src/test/resources/picasso.ttl | 1 - docs/dev/implementation.md | 6 +- enola | 2 +- java/dev/enola/BUILD | 2 +- java/dev/enola/Main.java | 25 ++++ {cli => java/dev/enola/cli}/BUILD | 62 ++++----- .../main/java => java}/dev/enola/cli/CLI.java | 0 .../dev/enola/cli/CheckedRunnable.java | 0 .../ClasspathHellDuplicatesCheckerTest.java | 0 .../dev/enola/cli/CommandLineSubject.java | 0 .../dev/enola/cli/CommandWithEntityID.java | 0 .../dev/enola/cli/CommandWithModel.java | 0 .../enola/cli/CommandWithModelAndOutput.java | 0 .../dev/enola/cli/DetectCommand.java | 0 .../java => java}/dev/enola/cli/DocGen.java | 0 .../java => java}/dev/enola/cli/EnolaCLI.java | 0 .../dev/enola/cli/EnolaCLITest.java | 6 +- .../dev/enola/cli/EnolaLoggingTest.java | 0 .../dev/enola/cli/ExecMdCommand.java | 0 .../dev/enola/cli/ExtensionsInfoCommand.java | 0 .../java => java}/dev/enola/cli/Format.java | 0 .../main/java => java}/dev/enola/cli/Get.java | 0 .../dev/enola/cli/InfoCommand.java | 0 .../java => java}/dev/enola/cli/List.java | 0 .../enola/cli/LoggingColorConsoleHandler.java | 0 .../dev/enola/cli/LoggingMixin.java | 0 .../dev/enola/cli/LoggingTestCommand.java | 0 .../dev/enola/cli/RosettaCommand.java | 0 .../dev/enola/cli/ServerCommand.java | 0 .../dev/enola/cli/SystemOutErrCapture.java | 0 .../enola/cli/SystemOutErrCaptureTest.java | 0 .../dev/enola/cli/VersionProvider.java | 0 java/dev/enola/common/BUILD | 2 +- java/dev/enola/common/concurrent/BUILD | 2 +- java/dev/enola/common/convert/BUILD | 2 +- java/dev/enola/common/function/BUILD | 2 +- java/dev/enola/common/io/BUILD | 4 +- .../iri/NamespaceRepositoryEnolaDefaults.java | 2 +- .../common/io/resource/ResourceProviders.java | 1 + .../dev/enola/common/markdown/exec}/BUILD | 24 ++-- .../enola/common/markdown/exec/ExecMD.java | 0 .../common/markdown/exec/ExecMDTest.java | 0 .../exec/MarkdownProcessingException.java | 0 .../enola/common/markdown/exec/Runner.java | 0 .../common/markdown/exec/RunnerTest.java | 0 .../markdown/exec/VorburgerExecRunner.java | 0 java/dev/enola/common/protobuf/BUILD | 44 ++++++- .../common/protobuf/DescriptorProvider.java | 0 .../protobuf/MessageResourceConverter.java | 0 .../common/protobuf/MessageValidator.java | 0 .../common/protobuf/MessageValidatorTest.java | 0 .../common/protobuf/MessageValidators.java | 0 .../dev/enola/common/protobuf/Messages.java | 0 .../enola/common/protobuf/MessagesTest.java | 0 .../dev/enola/common/protobuf/ProtoIO.java | 0 .../enola/common/protobuf/ProtoIOTest.java | 11 +- .../enola/common/protobuf/Timestamps2.java | 0 .../TypeRegistryDescriptorProvider.java | 0 .../common/protobuf/TypeRegistryWrapper.java | 0 .../protobuf/TypeRegistryWrapperTest.java | 0 .../common/protobuf/ValidationException.java | 0 .../dev/enola/common/protobuf/Wany.java | 0 .../protobuf/YamlJsonResourceConverter.java | 0 .../dev/enola/common}/protobuf/test.proto | 2 +- .../enola/common/protobuf}/validation.proto | 0 .../dev/enola/common}/yamljson/BUILD | 23 ++-- .../dev/enola/common/yamljson/JSON.java | 0 .../dev/enola/common/yamljson/YAML.java | 0 .../dev/enola/common/yamljson/YamlJson.java | 0 .../enola/common/yamljson/YamlJsonTest.java | 0 {core/lib => java/dev/enola/core}/BUILD | 119 ++++++++++-------- .../java => java}/dev/enola/core/ERI.java | 0 .../java => java}/dev/enola/core/ERITest.java | 0 .../dev/enola/core/EnolaException.java | 0 .../dev/enola/core/EnolaService.java | 0 .../dev/enola/core/EnolaServiceProvider.java | 0 .../dev/enola/core/EnolaServiceRegistry.java | 0 .../dev/enola/core/EntityAspect.java | 0 .../dev/enola/core/EntityAspectRepeater.java | 0 .../dev/enola/core/EntityAspectService.java | 0 .../enola/core/EntityServiceProviderTest.java | 0 .../dev/enola/core/EntityTest.java | 0 .../java => java}/dev/enola/core/IDs.java | 0 .../java => java}/dev/enola/core/IDsTest.java | 0 .../enola/core/ValidationFailureAspect.java | 0 .../enola/core/aspects/ErrorTestAspect.java | 0 .../aspects/FilestoreRepositoryAspect.java | 0 .../dev/enola/core/aspects/GrpcAspect.java | 0 .../enola/core/aspects/TimestampAspect.java | 0 .../enola/core/aspects/UriTemplateAspect.java | 0 .../enola/core/aspects/ValidationAspect.java | 0 .../core/connector/enola_connector.proto | 2 +- .../dev/enola/core/enola_core.proto | 2 +- .../dev/enola/core/enola_ext.proto | 0 .../enola/core/entity/IDValueConverter.java | 0 .../core/grpc/EnolaGrpcClientProvider.java | 0 .../enola/core/grpc/EnolaGrpcInProcess.java | 0 .../dev/enola/core/grpc/EnolaGrpcServer.java | 0 .../enola/core/grpc/EnolaGrpcServerTest.java | 0 .../dev/enola/core/grpc/EnolaGrpcService.java | 0 .../dev/enola/core/grpc/ServiceProvider.java | 0 .../core/iri/URITemplateMatcherChain.java | 0 .../core/iri/URITemplateMatcherChainTest.java | 0 .../enola/core/iri/URITemplateSplitter.java | 0 .../core/iri/URITemplateSplitterTest.java | 0 .../dev/enola/core/iri/URITemplateTest.java | 0 .../ProtoEnumValueToThingConnector.java | 0 .../ProtoEnumValueToThingConnectorTest.java | 0 .../message/ProtoFieldToThingConnector.java | 0 .../message/ProtoMessageToThingConnector.java | 0 .../core/message/ProtoToThingConnector.java | 0 .../core/meta/EntityAspectWithRepository.java | 0 .../dev/enola/core/meta/EntityKindAspect.java | 0 .../enola/core/meta/EntityKindRepository.java | 2 +- .../core/meta/EntityKindRepositoryTest.java | 0 .../core/meta/EntityKindValidations.java | 0 .../core/meta/EntityKindValidationsTest.java | 0 .../dev/enola/core/meta/SchemaAspect.java | 0 .../dev/enola/core/meta/SchemaAspectTest.java | 0 .../enola/core/meta/TypeRepositoryTest.java | 0 .../core/meta/docgen/GraphvizGenerator.java | 0 .../meta/docgen/MarkdownDocGenerator.java | 0 .../meta/docgen/MarkdownDocGeneratorTest.java | 0 .../core/meta/docgen/MermaidGenerator.java | 0 .../dev/enola/core/meta/docgen/Options.java | 0 .../enola/core/meta/docgen/StringUtil.java | 0 .../core/meta/docgen/StringUtilTest.java | 0 .../dev/enola/core/meta/enola_meta.proto | 4 +- .../core/resource/ResourceEnolaService.java | 0 .../RdfResourceIntoProtoThingConverter.java | 0 .../RdfResourceIntoThingConverter.java | 0 .../ResourceIntoThingResourceConverter.java | 0 .../dev/enola/core/rosetta/Rosetta.java | 0 .../dev/enola/core/rosetta/RosettaTest.java | 0 .../core/thing/EmptyThingRepository.java | 0 .../enola/core/thing/ListThingService.java | 0 .../dev/enola/core/thing/ThingConnector.java | 0 .../core/thing/ThingConnectorService.java | 0 .../core/thing/ThingConnectorsProvider.java | 0 .../thing/ThingRepositoryThingService.java | 0 .../dev/enola/core/thing/ThingService.java | 0 .../core/type/TypeRepositoryBuilder.java | 0 .../dev/enola/core/util/enola_util.proto | 0 .../dev/enola/core/view/EnolaMessages.java | 0 java/dev/enola/data/BUILD | 2 +- java/dev/enola/model/BUILD | 2 +- {common => java/dev/enola}/rdf/BUILD | 51 ++++---- .../dev/enola/rdf/LearnRdf4jTest.java | 0 .../dev/enola/rdf/ModelSubject.java | 0 .../dev/enola/rdf/RdfMediaTypeTest.java | 0 .../dev/enola/rdf/RdfMediaTypeYamlLd.java | 0 .../dev/enola/rdf/RdfMediaTypes.java | 0 .../dev/enola/rdf/RdfReaderConverter.java | 0 .../dev/enola/rdf/RdfReaderConverterInto.java | 0 .../dev/enola/rdf/RdfReaderWriterTest.java | 0 .../dev/enola/rdf/RdfResourceConverter.java | 0 .../dev/enola/rdf/RdfThingConverter.java | 0 .../dev/enola/rdf/RdfThingConverterTest.java | 0 .../dev/enola/rdf/RdfWriterConverter.java | 0 .../dev/enola/rdf/ResourceSubject.java | 0 .../dev/enola/rdf/ThingRdfConverter.java | 0 .../dev/enola/rdf/WellKnownIRIsTest.java | 0 {common => java/dev/enola}/thing/BUILD | 36 +++--- .../dev/enola/thing/ImmutableThing.java | 0 .../dev/enola/thing/ImmutableThingTest.java | 0 .../java => java}/dev/enola/thing/KIRI.java | 0 .../dev/enola/thing/LangString.java | 0 .../java => java}/dev/enola/thing/Link.java | 0 .../dev/enola/thing/Literal.java | 0 .../java => java}/dev/enola/thing/Thing.java | 0 .../dev/enola/thing/ThingConverterInto.java | 0 .../dev/enola/thing/ThingMediaTypes.java | 0 .../dev/enola/thing/ThingMediaTypesTest.java | 0 .../thing/ThingMemoryRepositoryROBuilder.java | 0 .../enola/thing/ThingMemoryRepositoryRW.java | 0 .../enola/thing/ThingMetadataProvider.java | 0 .../thing/ThingMetadataProviderTest.java | 0 .../dev/enola/thing/ThingProvider.java | 0 .../enola/thing/ThingRepositoriesTest.java | 0 .../dev/enola/thing/ThingRepository.java | 0 .../dev/enola/thing/gen/DocGenConstants.java | 0 .../dev/enola/thing/gen/Relativizer.java | 0 .../dev/enola/thing/gen/RelativizerTest.java | 0 .../gen/markdown/MarkdownSiteGenerator.java | 0 .../markdown}/MarkdownSiteGeneratorTest.java | 4 +- .../gen/markdown/MarkdownThingGenerator.java | 0 .../dev/enola/thing/io/Loader.java | 0 .../thing/io/ResourceIntoThingConverter.java | 0 .../JavaThingToProtoThingConverter.java | 0 .../message/MessageToThingConverter.java | 0 .../message/MessageToThingConverterTest.java | 0 .../enola/thing/message/MessageWithIRI.java | 0 .../thing/message/ObjectToValueConverter.java | 0 ...otoThingIntoJavaThingBuilderConverter.java | 0 .../thing/message/ProtoThingProvider.java | 0 .../thing/message/ProtoThingRepository.java | 0 .../dev/enola/thing/message/ProtoTypes.java | 0 .../dev/enola/thing/message/ThingAdapter.java | 0 .../thing/message/ThingConvertersTest.java | 0 .../dev/enola/thing/message/ThingExt.java | 0 .../thing/message/ThingProviderAdapter.java | 0 .../dev/enola/thing/message/package-info.java | 0 .../dev/enola/thing/spi/AbstractThing.java | 0 {common => java/dev/enola}/thing/thing.proto | 0 java/dev/enola/web/BUILD | 61 +++++++++ .../dev/enola/web/StaticWebHandler.java | 0 .../dev/enola/web/WebHandler.java | 0 .../dev/enola/web/WebServer.java | 0 .../dev/enola/web}/resources/static/404.html | 0 .../dev/enola/web}/resources/static/hello.txt | 0 .../dev/enola/web}/resources/static/main.css | 0 .../enola/web}/resources/templates/index.html | 0 .../dev/enola/web/rest/RestAPI.java | 0 .../dev/enola/web/rest/RestTest.java | 0 .../dev/enola/web/sun/SunServer.java | 0 .../dev/enola/web/sun}/SunServerTest.java | 3 +- .../dev/enola/web/ui/EnolaThingProvider.java | 0 .../dev/enola/web/ui/NewThingUI.java | 0 .../java => java}/dev/enola/web/ui/UI.java | 0 .../dev/enola/web/ui/UiTest.java | 0 models/BUILD | 14 +++ .../enola.dev}/schema.textproto | 0 test/BUILD | 11 ++ .../resources => test}/bar-abc-def.textproto | 0 .../test/resources => test}/bar-abc-def.yaml | 0 .../cli-test-model.textproto | 0 .../test/resources => test}/dali.thing.yaml | 0 .../resources => test}/demo-model-docgen.md | 0 .../src/test/resources => test}/demo-model.md | 0 .../resources => test}/demo-model.textproto | 0 .../test/resources => test}/demo-model.yaml | 0 .../common/io/test_resources => test}/empty | 0 .../io/test_resources => test}/empty.png | 0 .../resources => test}/expected-book.html | 0 .../test/resources => test}/foo-abc.textproto | 0 .../src/test/resources => test}/nok.textproto | 0 .../src/test/resources => test}/ok.textproto | 0 .../test/resources => test}/picasso.jsonld | 0 .../resources => test}/picasso.thing.yaml | 0 .../src/test/resources => test}/picasso.ttl | 0 .../resources => test}/picasso.written.ttl | 0 .../src/test/resources => test}/picasso.yaml | 0 .../test/resources => test}/picasso.yamlld | 0 .../rdf/src/test/resources => test}/proto.ttl | 0 .../io/test_resources => test}/test-emoji.txt | 0 .../test_resources => test}/test-french.txt | 0 .../test-hello-ascii.txt | 0 .../test-random-binary | 0 .../test/resources => test}/test-types.yaml | 0 .../io/test_resources => test}/test.json | 0 .../common/io/test_resources => test}/test.md | 0 .../io/test_resources => test}/test.png | Bin .../io/test_resources => test}/test.proto | 0 .../io/test_resources => test}/test.textproto | 0 tools/bazel/junit.bzl | 14 ++- web/api/BUILD | 30 ----- web/rest/BUILD | 61 --------- web/sun/BUILD | 49 -------- web/ui/BUILD | 72 ----------- 266 files changed, 369 insertions(+), 658 deletions(-) delete mode 120000 cli/src/test/resources/enola.dev-properties.ttl delete mode 100644 common/protobuf/BUILD delete mode 100644 common/protobuf/src/test/java/dev/enola/common/protobuf/AbstractProtoTestBase.java delete mode 120000 common/thing/src/test/resources/picasso.ttl delete mode 100644 core/impl/BUILD delete mode 120000 core/impl/src/test/resources/picasso.ttl create mode 100644 java/dev/enola/Main.java rename {cli => java/dev/enola/cli}/BUILD (59%) rename {cli/src/main/java => java}/dev/enola/cli/CLI.java (100%) rename {cli/src/main/java => java}/dev/enola/cli/CheckedRunnable.java (100%) rename {cli/src/test/java => java}/dev/enola/cli/ClasspathHellDuplicatesCheckerTest.java (100%) rename {cli/src/test/java => java}/dev/enola/cli/CommandLineSubject.java (100%) rename {cli/src/main/java => java}/dev/enola/cli/CommandWithEntityID.java (100%) rename {cli/src/main/java => java}/dev/enola/cli/CommandWithModel.java (100%) rename {cli/src/main/java => java}/dev/enola/cli/CommandWithModelAndOutput.java (100%) rename {cli/src/main/java => java}/dev/enola/cli/DetectCommand.java (100%) rename {cli/src/main/java => java}/dev/enola/cli/DocGen.java (100%) rename {cli/src/main/java => java}/dev/enola/cli/EnolaCLI.java (100%) rename {cli/src/test/java => java}/dev/enola/cli/EnolaCLITest.java (98%) rename {cli/src/test/java => java}/dev/enola/cli/EnolaLoggingTest.java (100%) rename {cli/src/main/java => java}/dev/enola/cli/ExecMdCommand.java (100%) rename {cli/src/main/java => java}/dev/enola/cli/ExtensionsInfoCommand.java (100%) rename {cli/src/main/java => java}/dev/enola/cli/Format.java (100%) rename {cli/src/main/java => java}/dev/enola/cli/Get.java (100%) rename {cli/src/main/java => java}/dev/enola/cli/InfoCommand.java (100%) rename {cli/src/main/java => java}/dev/enola/cli/List.java (100%) rename {cli/src/main/java => java}/dev/enola/cli/LoggingColorConsoleHandler.java (100%) rename {cli/src/main/java => java}/dev/enola/cli/LoggingMixin.java (100%) rename {cli/src/main/java => java}/dev/enola/cli/LoggingTestCommand.java (100%) rename {cli/src/main/java => java}/dev/enola/cli/RosettaCommand.java (100%) rename {cli/src/main/java => java}/dev/enola/cli/ServerCommand.java (100%) rename {cli/src/test/java => java}/dev/enola/cli/SystemOutErrCapture.java (100%) rename {cli/src/test/java => java}/dev/enola/cli/SystemOutErrCaptureTest.java (100%) rename {cli/src/main/java => java}/dev/enola/cli/VersionProvider.java (100%) rename {common/markdown => java/dev/enola/common/markdown/exec}/BUILD (68%) rename {common/markdown/src/main/java => java}/dev/enola/common/markdown/exec/ExecMD.java (100%) rename {common/markdown/src/test/java => java}/dev/enola/common/markdown/exec/ExecMDTest.java (100%) rename {common/markdown/src/main/java => java}/dev/enola/common/markdown/exec/MarkdownProcessingException.java (100%) rename {common/markdown/src/main/java => java}/dev/enola/common/markdown/exec/Runner.java (100%) rename {common/markdown/src/test/java => java}/dev/enola/common/markdown/exec/RunnerTest.java (100%) rename {common/markdown/src/main/java => java}/dev/enola/common/markdown/exec/VorburgerExecRunner.java (100%) rename {common/protobuf/src/main/java => java}/dev/enola/common/protobuf/DescriptorProvider.java (100%) rename {common/protobuf/src/main/java => java}/dev/enola/common/protobuf/MessageResourceConverter.java (100%) rename {common/protobuf/src/main/java => java}/dev/enola/common/protobuf/MessageValidator.java (100%) rename {common/protobuf/src/test/java => java}/dev/enola/common/protobuf/MessageValidatorTest.java (100%) rename {common/protobuf/src/main/java => java}/dev/enola/common/protobuf/MessageValidators.java (100%) rename {common/protobuf/src/main/java => java}/dev/enola/common/protobuf/Messages.java (100%) rename {common/protobuf/src/test/java => java}/dev/enola/common/protobuf/MessagesTest.java (100%) rename {common/protobuf/src/main/java => java}/dev/enola/common/protobuf/ProtoIO.java (100%) rename {common/protobuf/src/test/java => java}/dev/enola/common/protobuf/ProtoIOTest.java (95%) rename {common/protobuf/src/main/java => java}/dev/enola/common/protobuf/Timestamps2.java (100%) rename {common/protobuf/src/main/java => java}/dev/enola/common/protobuf/TypeRegistryDescriptorProvider.java (100%) rename {common/protobuf/src/main/java => java}/dev/enola/common/protobuf/TypeRegistryWrapper.java (100%) rename {common/protobuf/src/test/java => java}/dev/enola/common/protobuf/TypeRegistryWrapperTest.java (100%) rename {common/protobuf/src/main/java => java}/dev/enola/common/protobuf/ValidationException.java (100%) rename {common/protobuf/src/main/java => java}/dev/enola/common/protobuf/Wany.java (100%) rename {common/protobuf/src/main/java => java}/dev/enola/common/protobuf/YamlJsonResourceConverter.java (100%) rename {common => java/dev/enola/common}/protobuf/test.proto (97%) rename {common/protobuf/src/main/proto => java/dev/enola/common/protobuf}/validation.proto (100%) rename {common => java/dev/enola/common}/yamljson/BUILD (67%) rename {common/yamljson/src/main/java => java}/dev/enola/common/yamljson/JSON.java (100%) rename {common/yamljson/src/main/java => java}/dev/enola/common/yamljson/YAML.java (100%) rename {common/yamljson/src/main/java => java}/dev/enola/common/yamljson/YamlJson.java (100%) rename {common/yamljson/src/test/java => java}/dev/enola/common/yamljson/YamlJsonTest.java (100%) rename {core/lib => java/dev/enola/core}/BUILD (62%) rename {core/lib/src/main/java => java}/dev/enola/core/ERI.java (100%) rename {core/lib/src/test/java => java}/dev/enola/core/ERITest.java (100%) rename {core/lib/src/main/java => java}/dev/enola/core/EnolaException.java (100%) rename {core/lib/src/main/java => java}/dev/enola/core/EnolaService.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/EnolaServiceProvider.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/EnolaServiceRegistry.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/EntityAspect.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/EntityAspectRepeater.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/EntityAspectService.java (100%) rename {core/impl/src/test/java => java}/dev/enola/core/EntityServiceProviderTest.java (100%) rename {core/impl/src/test/java => java}/dev/enola/core/EntityTest.java (100%) rename {core/lib/src/main/java => java}/dev/enola/core/IDs.java (100%) rename {core/lib/src/test/java => java}/dev/enola/core/IDsTest.java (100%) rename {core/impl/src/test/java => java}/dev/enola/core/ValidationFailureAspect.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/aspects/ErrorTestAspect.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/aspects/FilestoreRepositoryAspect.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/aspects/GrpcAspect.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/aspects/TimestampAspect.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/aspects/UriTemplateAspect.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/aspects/ValidationAspect.java (100%) rename {core/lib/src/main/java => java}/dev/enola/core/connector/enola_connector.proto (97%) rename {core/lib/src/main/java => java}/dev/enola/core/enola_core.proto (98%) rename {core/lib/src/main/java => java}/dev/enola/core/enola_ext.proto (100%) rename {core/impl/src/main/java => java}/dev/enola/core/entity/IDValueConverter.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/grpc/EnolaGrpcClientProvider.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/grpc/EnolaGrpcInProcess.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/grpc/EnolaGrpcServer.java (100%) rename {core/impl/src/test/java => java}/dev/enola/core/grpc/EnolaGrpcServerTest.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/grpc/EnolaGrpcService.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/grpc/ServiceProvider.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/iri/URITemplateMatcherChain.java (100%) rename {core/impl/src/test/java => java}/dev/enola/core/iri/URITemplateMatcherChainTest.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/iri/URITemplateSplitter.java (100%) rename {core/impl/src/test/java => java}/dev/enola/core/iri/URITemplateSplitterTest.java (100%) rename {core/impl/src/test/java => java}/dev/enola/core/iri/URITemplateTest.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/message/ProtoEnumValueToThingConnector.java (100%) rename {core/impl/src/test/java => java}/dev/enola/core/message/ProtoEnumValueToThingConnectorTest.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/message/ProtoFieldToThingConnector.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/message/ProtoMessageToThingConnector.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/message/ProtoToThingConnector.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/meta/EntityAspectWithRepository.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/meta/EntityKindAspect.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/meta/EntityKindRepository.java (99%) rename {core/impl/src/test/java => java}/dev/enola/core/meta/EntityKindRepositoryTest.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/meta/EntityKindValidations.java (100%) rename {core/impl/src/test/java => java}/dev/enola/core/meta/EntityKindValidationsTest.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/meta/SchemaAspect.java (100%) rename {core/impl/src/test/java => java}/dev/enola/core/meta/SchemaAspectTest.java (100%) rename {core/impl/src/test/java => java}/dev/enola/core/meta/TypeRepositoryTest.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/meta/docgen/GraphvizGenerator.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/meta/docgen/MarkdownDocGenerator.java (100%) rename {core/impl/src/test/java => java}/dev/enola/core/meta/docgen/MarkdownDocGeneratorTest.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/meta/docgen/MermaidGenerator.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/meta/docgen/Options.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/meta/docgen/StringUtil.java (100%) rename {core/impl/src/test/java => java}/dev/enola/core/meta/docgen/StringUtilTest.java (100%) rename {core/lib/src/main/java => java}/dev/enola/core/meta/enola_meta.proto (98%) rename {core/impl/src/main/java => java}/dev/enola/core/resource/ResourceEnolaService.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/rosetta/RdfResourceIntoProtoThingConverter.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/rosetta/RdfResourceIntoThingConverter.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/rosetta/ResourceIntoThingResourceConverter.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/rosetta/Rosetta.java (100%) rename {core/impl/src/test/java => java}/dev/enola/core/rosetta/RosettaTest.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/thing/EmptyThingRepository.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/thing/ListThingService.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/thing/ThingConnector.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/thing/ThingConnectorService.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/thing/ThingConnectorsProvider.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/thing/ThingRepositoryThingService.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/thing/ThingService.java (100%) rename {core/impl/src/main/java => java}/dev/enola/core/type/TypeRepositoryBuilder.java (100%) rename {core/lib/src/main/java => java}/dev/enola/core/util/enola_util.proto (100%) rename {core/lib/src/main/java => java}/dev/enola/core/view/EnolaMessages.java (100%) rename {common => java/dev/enola}/rdf/BUILD (64%) rename {common/rdf/src/test/java => java}/dev/enola/rdf/LearnRdf4jTest.java (100%) rename {common/rdf/src/test/java => java}/dev/enola/rdf/ModelSubject.java (100%) rename {common/rdf/src/test/java => java}/dev/enola/rdf/RdfMediaTypeTest.java (100%) rename {common/rdf/src/main/java => java}/dev/enola/rdf/RdfMediaTypeYamlLd.java (100%) rename {common/rdf/src/main/java => java}/dev/enola/rdf/RdfMediaTypes.java (100%) rename {common/rdf/src/main/java => java}/dev/enola/rdf/RdfReaderConverter.java (100%) rename {common/rdf/src/main/java => java}/dev/enola/rdf/RdfReaderConverterInto.java (100%) rename {common/rdf/src/test/java => java}/dev/enola/rdf/RdfReaderWriterTest.java (100%) rename {common/rdf/src/main/java => java}/dev/enola/rdf/RdfResourceConverter.java (100%) rename {common/rdf/src/main/java => java}/dev/enola/rdf/RdfThingConverter.java (100%) rename {common/rdf/src/test/java => java}/dev/enola/rdf/RdfThingConverterTest.java (100%) rename {common/rdf/src/main/java => java}/dev/enola/rdf/RdfWriterConverter.java (100%) rename {common/rdf/src/test/java => java}/dev/enola/rdf/ResourceSubject.java (100%) rename {common/rdf/src/main/java => java}/dev/enola/rdf/ThingRdfConverter.java (100%) rename {common/rdf/src/test/java => java}/dev/enola/rdf/WellKnownIRIsTest.java (100%) rename {common => java/dev/enola}/thing/BUILD (77%) rename {common/thing/src/main/java => java}/dev/enola/thing/ImmutableThing.java (100%) rename {common/thing/src/test/java => java}/dev/enola/thing/ImmutableThingTest.java (100%) rename {common/thing/src/main/java => java}/dev/enola/thing/KIRI.java (100%) rename {common/thing/src/main/java => java}/dev/enola/thing/LangString.java (100%) rename {common/thing/src/main/java => java}/dev/enola/thing/Link.java (100%) rename {common/thing/src/main/java => java}/dev/enola/thing/Literal.java (100%) rename {common/thing/src/main/java => java}/dev/enola/thing/Thing.java (100%) rename {common/thing/src/main/java => java}/dev/enola/thing/ThingConverterInto.java (100%) rename {common/thing/src/main/java => java}/dev/enola/thing/ThingMediaTypes.java (100%) rename {common/thing/src/test/java => java}/dev/enola/thing/ThingMediaTypesTest.java (100%) rename {common/thing/src/main/java => java}/dev/enola/thing/ThingMemoryRepositoryROBuilder.java (100%) rename {common/thing/src/main/java => java}/dev/enola/thing/ThingMemoryRepositoryRW.java (100%) rename {common/thing/src/main/java => java}/dev/enola/thing/ThingMetadataProvider.java (100%) rename {common/thing/src/test/java => java}/dev/enola/thing/ThingMetadataProviderTest.java (100%) rename {common/thing/src/main/java => java}/dev/enola/thing/ThingProvider.java (100%) rename {common/thing/src/test/java => java}/dev/enola/thing/ThingRepositoriesTest.java (100%) rename {common/thing/src/main/java => java}/dev/enola/thing/ThingRepository.java (100%) rename {common/thing/src/main/java => java}/dev/enola/thing/gen/DocGenConstants.java (100%) rename {common/thing/src/main/java => java}/dev/enola/thing/gen/Relativizer.java (100%) rename {common/thing/src/test/java => java}/dev/enola/thing/gen/RelativizerTest.java (100%) rename {common/thing/src/main/java => java}/dev/enola/thing/gen/markdown/MarkdownSiteGenerator.java (100%) rename {common/thing/src/test/java/dev/enola/thing/gen => java/dev/enola/thing/gen/markdown}/MarkdownSiteGeneratorTest.java (95%) rename {common/thing/src/main/java => java}/dev/enola/thing/gen/markdown/MarkdownThingGenerator.java (100%) rename {common/thing/src/main/java => java}/dev/enola/thing/io/Loader.java (100%) rename {common/thing/src/main/java => java}/dev/enola/thing/io/ResourceIntoThingConverter.java (100%) rename {common/thing/src/main/java => java}/dev/enola/thing/message/JavaThingToProtoThingConverter.java (100%) rename {common/thing/src/main/java => java}/dev/enola/thing/message/MessageToThingConverter.java (100%) rename {common/thing/src/test/java => java}/dev/enola/thing/message/MessageToThingConverterTest.java (100%) rename {common/thing/src/main/java => java}/dev/enola/thing/message/MessageWithIRI.java (100%) rename {common/thing/src/main/java => java}/dev/enola/thing/message/ObjectToValueConverter.java (100%) rename {common/thing/src/main/java => java}/dev/enola/thing/message/ProtoThingIntoJavaThingBuilderConverter.java (100%) rename {common/thing/src/main/java => java}/dev/enola/thing/message/ProtoThingProvider.java (100%) rename {common/thing/src/main/java => java}/dev/enola/thing/message/ProtoThingRepository.java (100%) rename {common/thing/src/main/java => java}/dev/enola/thing/message/ProtoTypes.java (100%) rename {common/thing/src/main/java => java}/dev/enola/thing/message/ThingAdapter.java (100%) rename {common/thing/src/test/java => java}/dev/enola/thing/message/ThingConvertersTest.java (100%) rename {common/thing/src/main/java => java}/dev/enola/thing/message/ThingExt.java (100%) rename {common/thing/src/main/java => java}/dev/enola/thing/message/ThingProviderAdapter.java (100%) rename {common/thing/src/main/java => java}/dev/enola/thing/message/package-info.java (100%) rename {common/thing/src/main/java => java}/dev/enola/thing/spi/AbstractThing.java (100%) rename {common => java/dev/enola}/thing/thing.proto (100%) create mode 100644 java/dev/enola/web/BUILD rename {web/api/src/main/java => java}/dev/enola/web/StaticWebHandler.java (100%) rename {web/api/src/main/java => java}/dev/enola/web/WebHandler.java (100%) rename {web/api/src/main/java => java}/dev/enola/web/WebServer.java (100%) rename {web/ui/src/main => java/dev/enola/web}/resources/static/404.html (100%) rename {web/sun/src/test => java/dev/enola/web}/resources/static/hello.txt (100%) rename {web/ui/src/main => java/dev/enola/web}/resources/static/main.css (100%) rename {web/ui/src/main => java/dev/enola/web}/resources/templates/index.html (100%) rename {web/rest/src/main/java => java}/dev/enola/web/rest/RestAPI.java (100%) rename {web/rest/src/test/java => java}/dev/enola/web/rest/RestTest.java (100%) rename {web/sun/src/main/java => java}/dev/enola/web/sun/SunServer.java (100%) rename {web/sun/src/test/java/dev/enola/web/sun/test => java/dev/enola/web/sun}/SunServerTest.java (97%) rename {web/ui/src/main/java => java}/dev/enola/web/ui/EnolaThingProvider.java (100%) rename {web/ui/src/main/java => java}/dev/enola/web/ui/NewThingUI.java (100%) rename {web/ui/src/main/java => java}/dev/enola/web/ui/UI.java (100%) rename {web/ui/src/test/java => java}/dev/enola/web/ui/UiTest.java (100%) create mode 100644 models/BUILD rename {core/impl/src/main/resources => models/enola.dev}/schema.textproto (100%) create mode 100644 test/BUILD rename {core/impl/src/test/resources => test}/bar-abc-def.textproto (100%) rename {core/impl/src/test/resources => test}/bar-abc-def.yaml (100%) rename {cli/src/test/resources => test}/cli-test-model.textproto (100%) rename {common/rdf/src/test/resources => test}/dali.thing.yaml (100%) rename {core/impl/src/test/resources => test}/demo-model-docgen.md (100%) rename {core/impl/src/test/resources => test}/demo-model.md (100%) rename {core/impl/src/test/resources => test}/demo-model.textproto (100%) rename {core/impl/src/test/resources => test}/demo-model.yaml (100%) rename {java/dev/enola/common/io/test_resources => test}/empty (100%) rename {java/dev/enola/common/io/test_resources => test}/empty.png (100%) rename {web/ui/src/test/resources => test}/expected-book.html (100%) rename {core/impl/src/test/resources => test}/foo-abc.textproto (100%) rename {common/protobuf/src/test/resources => test}/nok.textproto (100%) rename {common/protobuf/src/test/resources => test}/ok.textproto (100%) rename {common/rdf/src/test/resources => test}/picasso.jsonld (100%) rename {common/rdf/src/test/resources => test}/picasso.thing.yaml (100%) rename {common/rdf/src/test/resources => test}/picasso.ttl (100%) rename {common/rdf/src/test/resources => test}/picasso.written.ttl (100%) rename {common/rdf/src/test/resources => test}/picasso.yaml (100%) rename {common/rdf/src/test/resources => test}/picasso.yamlld (100%) rename {common/rdf/src/test/resources => test}/proto.ttl (100%) rename {java/dev/enola/common/io/test_resources => test}/test-emoji.txt (100%) rename {java/dev/enola/common/io/test_resources => test}/test-french.txt (100%) rename {java/dev/enola/common/io/test_resources => test}/test-hello-ascii.txt (100%) rename {java/dev/enola/common/io/test_resources => test}/test-random-binary (100%) rename {core/impl/src/test/resources => test}/test-types.yaml (100%) rename {java/dev/enola/common/io/test_resources => test}/test.json (100%) rename {java/dev/enola/common/io/test_resources => test}/test.md (100%) rename {java/dev/enola/common/io/test_resources => test}/test.png (100%) rename {java/dev/enola/common/io/test_resources => test}/test.proto (100%) rename {java/dev/enola/common/io/test_resources => test}/test.textproto (100%) delete mode 100644 web/api/BUILD delete mode 100644 web/rest/BUILD delete mode 100644 web/sun/BUILD delete mode 100644 web/ui/BUILD diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 137816694..7cda36695 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -66,7 +66,7 @@ repos: - --use-current-year - id: insert-license files: \.(bash|bazel|textproto|yaml)$ - exclude: ^docs/use|core/impl/src/test/resources|.*test_resources.* + exclude: ^docs/use|test/ args: - --comment-style - "#" @@ -76,7 +76,7 @@ repos: - --use-current-year - id: insert-license files: \.(md|html)$ - exclude: ^.github|src/test/resources/|docs/blog/posts/|docs/use/execmd/demo.md|.*test_resources.* + exclude: ^.github|test/|docs/blog/posts/|docs/use/execmd/demo.md args: - --comment-style - "" @@ -95,7 +95,7 @@ repos: # and https://github.com/pre-commit/mirrors-clang-format/pull/22. # In the mean-time, it's possible to manually clang-format -i the.textproto files: \.(proto|textproto)$ - exclude: ^core/impl/src/test/resources/bar-abc-def.textproto + exclude: ^test - repo: https://github.com/yoheimuta/protolint # This version must be kept in the sync with the one in tools/protolint/install.bash @@ -118,14 +118,14 @@ repos: rev: v0.12.1 hooks: - id: markdownlint-cli2 - exclude: (^.github/|src/test/resources/|docs/use/docgen/docgen.md) + exclude: (^.github/|test/|docs/use/docgen/docgen.md) # Until https://github.com/DavidAnson/markdownlint/issues/121 - repo: https://github.com/tcort/markdown-link-check rev: v3.12.1 hooks: - id: markdown-link-check - exclude: (src/test/resources/|docs/use/docgen/docgen.md|docs/use/server/index.md) + exclude: (test/|docs/use/docgen/docgen.md|docs/use/server/index.md) args: [--quiet, --config, .markdown-link-check.json] # Alternative: https://github.com/bazelbuild/buildtools/blob/master/buildifier/README.md @@ -144,7 +144,7 @@ repos: - id: prettier # NOT markdown, because we use markdownlint for that types_or: [css, html, javascript, json, json5, scss, ts, tsx, yaml] - exclude: ^docs/use|core/impl/src/test/resources|.devcontainer/devcontainer.json + exclude: ^docs/use|test/|.devcontainer/devcontainer.json additional_dependencies: - prettier@3.2.4 diff --git a/cli/src/test/resources/enola.dev-properties.ttl b/cli/src/test/resources/enola.dev-properties.ttl deleted file mode 120000 index ce2754903..000000000 --- a/cli/src/test/resources/enola.dev-properties.ttl +++ /dev/null @@ -1 +0,0 @@ -../../../../models/enola.dev/properties.ttl \ No newline at end of file diff --git a/common/protobuf/BUILD b/common/protobuf/BUILD deleted file mode 100644 index 76a8ccfba..000000000 --- a/common/protobuf/BUILD +++ /dev/null @@ -1,94 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 -# -# Copyright 2023 The Enola 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 -# -# 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, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -load("@rules_java//java:defs.bzl", "java_library", "java_proto_library", "java_test") -load("@rules_proto//proto:defs.bzl", "proto_library") - -proto_library( - name = "validation_proto", - srcs = ["src/main/proto/validation.proto"], - deps = [ - "@com_google_protobuf//:any_proto", - ], -) - -java_proto_library( - name = "validation_proto_java_library", - visibility = [ - "//core:__subpackages__", - ], - deps = [ - "validation_proto", - ], -) - -proto_library( - name = "test_proto", - srcs = ["test.proto"], - deps = [ - "@com_google_protobuf//:any_proto", - "@com_google_protobuf//:descriptor_proto", - "@com_google_protobuf//:struct_proto", - "@com_google_protobuf//:timestamp_proto", - ], -) - -java_proto_library( - name = "test_java_proto", - visibility = ["//:__subpackages__"], - deps = ["test_proto"], -) - -java_library( - name = "protobuf", - srcs = glob(["src/main/java/**/*.java"]), - resources = glob(["src/main/resources/**/*"]), - visibility = [ - "//:__subpackages__", - ], - deps = [ - ":validation_proto_java_library", - "//common/yamljson", - "//java/dev/enola/common", - "//java/dev/enola/common/convert", - "//java/dev/enola/common/io", - "//java/dev/enola/common/protobuf", - "@maven//:com_google_errorprone_error_prone_annotations", - "@maven//:com_google_guava_guava", - "@maven//:com_google_protobuf_protobuf_java", - "@maven//:com_google_protobuf_protobuf_java_util", - ], -) - -[java_test( - name = name[:-len(".java")], - size = "small", - srcs = glob(["src/test/java/**/*.java"]), - resources = glob(["src/test/resources/**/*"]), - deps = [ - ":protobuf", - ":test_java_proto", - "//java/dev/enola/common/io", - "//java/dev/enola/common/protobuf", - "@maven//:com_google_guava_guava", - "@maven//:com_google_protobuf_protobuf_java", - "@maven//:com_google_truth_extensions_truth_proto_extension", - "@maven//:com_google_truth_truth", - "@maven//:junit_junit", - ], -) for name in glob([ - "src/test/java/**/*Test.java", -])] diff --git a/common/protobuf/src/test/java/dev/enola/common/protobuf/AbstractProtoTestBase.java b/common/protobuf/src/test/java/dev/enola/common/protobuf/AbstractProtoTestBase.java deleted file mode 100644 index a8a122396..000000000 --- a/common/protobuf/src/test/java/dev/enola/common/protobuf/AbstractProtoTestBase.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * SPDX-License-Identifier: Apache-2.0 - * - * Copyright 2023-2024 The Enola 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 - * - * 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, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package dev.enola.common.protobuf; - -import com.google.protobuf.Message; - -import org.junit.Test; - -import java.io.IOException; - -public abstract class AbstractProtoTestBase { - private final String pathToResourceOnClasspath; - private final Message.Builder builder; - - protected AbstractProtoTestBase(String pathToResourceOnClasspath, Message.Builder builder) { - this.pathToResourceOnClasspath = pathToResourceOnClasspath; - this.builder = builder; - } - - @Test - public void testProto() throws IOException { - ProtoIO.check(pathToResourceOnClasspath, builder); - } -} diff --git a/common/thing/src/test/resources/picasso.ttl b/common/thing/src/test/resources/picasso.ttl deleted file mode 120000 index 5950f71d5..000000000 --- a/common/thing/src/test/resources/picasso.ttl +++ /dev/null @@ -1 +0,0 @@ -../../../../rdf/src/test/resources/picasso.ttl \ No newline at end of file diff --git a/connectors/demo/BUILD b/connectors/demo/BUILD index cde74c37c..b7dfb8d25 100644 --- a/connectors/demo/BUILD +++ b/connectors/demo/BUILD @@ -28,7 +28,7 @@ proto_library( java_proto_library( name = "demo_java_proto", # ONLY for tests: - visibility = ["//core/impl:__subpackages__"], + visibility = ["//:__subpackages__"], deps = [ "demo_proto", ], @@ -40,14 +40,14 @@ java_binary( main_class = "dev.enola.demo.Server", resources = glob(["src/main/resources/**/*"]), # ONLY for tests: - visibility = ["//core/impl:__subpackages__"], + visibility = ["//:__subpackages__"], runtime_deps = [ "@maven//:io_grpc_grpc_netty", ], deps = [ ":demo_java_proto", - "//core/lib:connector_java_grpc", - "//core/lib:core_java_proto", + "//java/dev/enola/core:connector_java_grpc", + "//java/dev/enola/core:core_java_proto", "@maven//:com_google_protobuf_protobuf_java", "@maven//:com_google_protobuf_protobuf_java_util", "@maven//:io_grpc_grpc_api", @@ -67,14 +67,13 @@ java_binary( deps = [ ":demo", ":demo_java_proto", - "//common/protobuf", - "//core/impl", # ONLY for test, NEVER for non-test Demo (or any other) Connector binary! - "//core/lib:connector_java_grpc", - "//core/lib:core_java_grpc", - "//core/lib:core_java_proto", - "//core/lib:lib_java", + # "//core/impl", # ONLY for test, NEVER for non-test Demo (or any other) Connector binary! "//java/dev/enola/common/io", "//java/dev/enola/common/protobuf", + "//java/dev/enola/core:connector_java_grpc", + "//java/dev/enola/core:core_java_grpc", + "//java/dev/enola/core:core_java_proto", + "//java/dev/enola/core", "@maven//:com_google_guava_guava", "@maven//:com_google_protobuf_protobuf_java", "@maven//:com_google_protobuf_protobuf_java_util", diff --git a/core/impl/BUILD b/core/impl/BUILD deleted file mode 100644 index cc3c3b95b..000000000 --- a/core/impl/BUILD +++ /dev/null @@ -1,99 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 -# -# Copyright 2023 The Enola 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 -# -# 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, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -load("@rules_java//java:defs.bzl", "java_library", "java_test") - -java_library( - name = "impl", - srcs = glob(["src/main/java/**/*.java"]), - resources = glob(["src/main/resources/**/*"]), - visibility = [ - "//cli:__subpackages__", - "//connectors:__subpackages__", # ONLY for test, NEVER for non-test Demo (or any other) Connector binary! - # TODO Move package dev.enola.core.grpc from impl to lib_java, and remove this: - "//web/rest:__pkg__", - "//web/ui:__pkg__", - ], - runtime_deps = [ - "@maven//:io_grpc_grpc_netty", - ], - deps = [ - "//common/protobuf", - "//common/protobuf:validation_proto_java_library", - "//common/rdf", - "//common/thing:thing_java", - "//common/thing:thing_java_proto", - "//common/yamljson", - "//core/lib:connector_java_grpc", - "//core/lib:core_java_grpc", - "//core/lib:core_java_proto", - "//core/lib:lib_java", - "//java/dev/enola/common", - "//java/dev/enola/common/concurrent", - "//java/dev/enola/common/convert", - "//java/dev/enola/common/io", - "//java/dev/enola/data", - "//java/dev/enola/datatype", - "@maven//:com_github_java_json_tools_uri_template", - "@maven//:com_google_errorprone_error_prone_annotations", - "@maven//:com_google_guava_guava", - "@maven//:com_google_protobuf_protobuf_java", - "@maven//:io_grpc_grpc_api", - "@maven//:io_grpc_grpc_core", - "@maven//:io_grpc_grpc_inprocess", - "@maven//:io_grpc_grpc_stub", - "@maven//:org_slf4j_slf4j_api", - ], -) - -[java_test( - name = name[:-len(".java")], - size = "small", - srcs = glob(["src/test/java/**/*.java"]), - resources = glob(["src/test/resources/**/*"]), - runtime_deps = [ - "@maven//:io_grpc_grpc_netty", - "@maven//:org_slf4j_slf4j_simple", - ], - deps = [ - ":impl", - "//common/protobuf", - "//common/rdf", - "//common/thing:thing_java", - "//common/thing:thing_java_proto", - "//common/yamljson", # TODO Remove this once dependencies are cleaned up - "//connectors/demo", - "//connectors/demo:demo_java_proto", - "//core/lib:connector_java_grpc", - "//core/lib:core_java_grpc", - "//core/lib:core_java_proto", - "//core/lib:lib_java", - "//java/dev/enola/common/concurrent", - "//java/dev/enola/common/convert", - "//java/dev/enola/common/io", - "//java/dev/enola/common/protobuf", - "//java/dev/enola/data", - "@maven//:com_github_java_json_tools_uri_template", - "@maven//:com_google_guava_guava", - "@maven//:com_google_protobuf_protobuf_java", - "@maven//:com_google_truth_extensions_truth_java8_extension", - "@maven//:com_google_truth_truth", - "@maven//:io_grpc_grpc_api", - "@maven//:junit_junit", - ], -) for name in glob([ - "src/test/java/**/*Test.java", -])] diff --git a/core/impl/src/test/resources/picasso.ttl b/core/impl/src/test/resources/picasso.ttl deleted file mode 120000 index e5e49f67b..000000000 --- a/core/impl/src/test/resources/picasso.ttl +++ /dev/null @@ -1 +0,0 @@ -../../../../../common/rdf/src/test/resources/picasso.ttl \ No newline at end of file diff --git a/docs/dev/implementation.md b/docs/dev/implementation.md index 515d65937..72ba1288c 100644 --- a/docs/dev/implementation.md +++ b/docs/dev/implementation.md @@ -40,7 +40,7 @@ The Java `Thing` API is an _interface_ which has several available implementatio #### Proto Thing -* Defined in: [`common/thing/thing.proto`](../../common/thing/thing.proto), see [Proto doc](proto/thing.md#dev-enola-thing-thing) +* Defined in: [`common/thing/thing.proto`](../../java/dev/enola/thing/thing.proto), see [Proto doc](proto/thing.md#dev-enola-thing-thing) * Java Type: `dev.enola.thing.proto.Thing` #### Proto Message @@ -61,7 +61,7 @@ Any [Protocol Buffer](https://protobuf.dev) can be [converted](#conversions) to * Filename extension: `.ttl` * Wikipedia: [Turtle Syntax](https://en.wikipedia.org/wiki/Turtle_(syntax)) * W3C Spec: [w3.org/TR/turtle](https://www.w3.org/TR/turtle/) -* Example: [picasso.ttl](../../common/rdf/src/test/resources/picasso.ttl) +* Example: [picasso.ttl](../../test/picasso.ttl) @@ -75,7 +75,7 @@ Any [Protocol Buffer](https://protobuf.dev) can be [converted](#conversions) to * Media Type: `text/enola.dev#thing+yaml` (from `dev.enola.thing.ThingMediaTypes`) * Filename extension: `.thing.yaml` -* Example: [picasso.thing.yaml](../../common/rdf/src/test/resources/picasso.thing.yaml) +* Example: [picasso.thing.yaml](../../test/picasso.thing.yaml) #### Proto Thing Text diff --git a/enola b/enola index 9a27aba9f..93eafb566 100755 --- a/enola +++ b/enola @@ -40,7 +40,7 @@ JAVA=$(java_binary) cd "$ROOT" LOG=$(mktemp) -if "$BZL" build --color=yes //cli:enola_deploy.jar >"$LOG" 2>&1 ; then +if "$BZL" build --color=yes //java/dev/enola/cli:enola_deploy.jar >"$LOG" 2>&1 ; then rm "$LOG" # TODO Integrate this with (use) tools/distro/build.sh instead of launching it like this cd "$CWD" && $JAVA --enable-preview -jar "$ROOT"/bazel-bin/cli/enola_deploy.jar "$@" diff --git a/java/dev/enola/BUILD b/java/dev/enola/BUILD index fbcee7a06..9343452d7 100644 --- a/java/dev/enola/BUILD +++ b/java/dev/enola/BUILD @@ -24,9 +24,9 @@ java_library( ), visibility = ["//:__subpackages__"], deps = [ - "//common/thing:thing_java", "//java/dev/enola/common", "//java/dev/enola/common/io", + "//java/dev/enola/thing:thing_java", "@maven//:com_google_errorprone_error_prone_annotations", "@maven//:com_google_guava_guava", "@maven//:org_slf4j_slf4j_api", diff --git a/java/dev/enola/Main.java b/java/dev/enola/Main.java new file mode 100644 index 000000000..d98d0344f --- /dev/null +++ b/java/dev/enola/Main.java @@ -0,0 +1,25 @@ +/* + * SPDX-License-Identifier: Apache-2.0 + * + * Copyright 2024 The Enola 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 + * + * 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, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package dev.enola; + +public class Main { + + public static void main(String[] args) { + System.out.println("Hello World!"); + } +} diff --git a/cli/BUILD b/java/dev/enola/cli/BUILD similarity index 59% rename from cli/BUILD rename to java/dev/enola/cli/BUILD index 38b28d756..1319ff49c 100644 --- a/cli/BUILD +++ b/java/dev/enola/cli/BUILD @@ -14,29 +14,32 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@rules_java//java:defs.bzl", "java_binary", "java_test") +load("@rules_java//java:defs.bzl", "java_binary") +load("//tools/bazel:junit.bzl", "junit_tests") java_binary( name = "enola", - srcs = glob(["src/main/java/**/*.java"]), + srcs = glob( + ["*.java"], + exclude = [ + "*Test.java", + "CommandLineSubject.java", + "SystemOutErrCapture.java", + ], + ), main_class = "dev.enola.cli.EnolaCLI", deps = [ - "//common/markdown", - "//common/protobuf", - "//common/thing:thing_java", - "//common/thing:thing_java_proto", - "//core/impl", # TODO Ideally really shouldn't be required... - "//core/lib:core_java_grpc", - "//core/lib:core_java_proto", - "//core/lib:lib_java", "//java/dev/enola/common/io", + "//java/dev/enola/common/markdown/exec:markdown", "//java/dev/enola/common/protobuf", + "//java/dev/enola/core", + "//java/dev/enola/core:core_java_grpc", + "//java/dev/enola/core:core_java_proto", "//java/dev/enola/data", "//java/dev/enola/datatype", - "//web/api", - "//web/rest", - "//web/sun", - "//web/ui", + "//java/dev/enola/thing:thing_java", + "//java/dev/enola/thing:thing_java_proto", + "//java/dev/enola/web", "@maven//:com_google_guava_guava", "@maven//:com_google_protobuf_protobuf_java", "@maven//:info_picocli_picocli", @@ -45,28 +48,27 @@ java_binary( ], ) -[java_test( - name = name[:-len(".java")], - size = "small", - srcs = glob(["src/test/java/**/*.java"]), +junit_tests( + name = "tests", + srcs = glob( + ["*Test.java"], + ), jvm_flags = ["--enable-preview"], - resources = glob(["src/test/resources/**/*"]), + srcs_utils = [ + "CommandLineSubject.java", + "SystemOutErrCapture.java", + ], deps = [ ":enola", - "//common/markdown", - "//common/thing:thing_java", "//java/dev/enola/common/io", + "//java/dev/enola/common/markdown/exec:markdown", "//java/dev/enola/common/protobuf", - "//web/rest", - "//web/sun", - "//web/ui", - "@maven//:com_google_guava_guava", - "@maven//:com_google_truth_truth", + "//java/dev/enola/thing:thing_java", + "//java/dev/enola/web", + "//models", + "//test", "@maven//:info_picocli_picocli", "@maven//:io_github_classgraph_classgraph", - "@maven//:junit_junit", "@maven//:org_slf4j_slf4j_jdk14", ], -) for name in glob([ - "src/test/java/**/*Test.java", -])] +) diff --git a/cli/src/main/java/dev/enola/cli/CLI.java b/java/dev/enola/cli/CLI.java similarity index 100% rename from cli/src/main/java/dev/enola/cli/CLI.java rename to java/dev/enola/cli/CLI.java diff --git a/cli/src/main/java/dev/enola/cli/CheckedRunnable.java b/java/dev/enola/cli/CheckedRunnable.java similarity index 100% rename from cli/src/main/java/dev/enola/cli/CheckedRunnable.java rename to java/dev/enola/cli/CheckedRunnable.java diff --git a/cli/src/test/java/dev/enola/cli/ClasspathHellDuplicatesCheckerTest.java b/java/dev/enola/cli/ClasspathHellDuplicatesCheckerTest.java similarity index 100% rename from cli/src/test/java/dev/enola/cli/ClasspathHellDuplicatesCheckerTest.java rename to java/dev/enola/cli/ClasspathHellDuplicatesCheckerTest.java diff --git a/cli/src/test/java/dev/enola/cli/CommandLineSubject.java b/java/dev/enola/cli/CommandLineSubject.java similarity index 100% rename from cli/src/test/java/dev/enola/cli/CommandLineSubject.java rename to java/dev/enola/cli/CommandLineSubject.java diff --git a/cli/src/main/java/dev/enola/cli/CommandWithEntityID.java b/java/dev/enola/cli/CommandWithEntityID.java similarity index 100% rename from cli/src/main/java/dev/enola/cli/CommandWithEntityID.java rename to java/dev/enola/cli/CommandWithEntityID.java diff --git a/cli/src/main/java/dev/enola/cli/CommandWithModel.java b/java/dev/enola/cli/CommandWithModel.java similarity index 100% rename from cli/src/main/java/dev/enola/cli/CommandWithModel.java rename to java/dev/enola/cli/CommandWithModel.java diff --git a/cli/src/main/java/dev/enola/cli/CommandWithModelAndOutput.java b/java/dev/enola/cli/CommandWithModelAndOutput.java similarity index 100% rename from cli/src/main/java/dev/enola/cli/CommandWithModelAndOutput.java rename to java/dev/enola/cli/CommandWithModelAndOutput.java diff --git a/cli/src/main/java/dev/enola/cli/DetectCommand.java b/java/dev/enola/cli/DetectCommand.java similarity index 100% rename from cli/src/main/java/dev/enola/cli/DetectCommand.java rename to java/dev/enola/cli/DetectCommand.java diff --git a/cli/src/main/java/dev/enola/cli/DocGen.java b/java/dev/enola/cli/DocGen.java similarity index 100% rename from cli/src/main/java/dev/enola/cli/DocGen.java rename to java/dev/enola/cli/DocGen.java diff --git a/cli/src/main/java/dev/enola/cli/EnolaCLI.java b/java/dev/enola/cli/EnolaCLI.java similarity index 100% rename from cli/src/main/java/dev/enola/cli/EnolaCLI.java rename to java/dev/enola/cli/EnolaCLI.java diff --git a/cli/src/test/java/dev/enola/cli/EnolaCLITest.java b/java/dev/enola/cli/EnolaCLITest.java similarity index 98% rename from cli/src/test/java/dev/enola/cli/EnolaCLITest.java rename to java/dev/enola/cli/EnolaCLITest.java index dfccd7c57..136795961 100644 --- a/cli/src/test/java/dev/enola/cli/EnolaCLITest.java +++ b/java/dev/enola/cli/EnolaCLITest.java @@ -96,7 +96,7 @@ public void docGenEmojiThing() throws IOException { "-vvv", "docgen", "--load", - "classpath:enola.dev-properties.ttl", + "classpath:enola.dev/properties.ttl", "--output", dir.toUri().toString()); @@ -187,7 +187,7 @@ public void getLoadedThing() { "-vvv", "get", "--load", - "classpath:enola.dev-properties.ttl", + "classpath:enola.dev/properties.ttl", "https://enola.dev/emoji"); assertThat(exec).err().isEmpty(); assertThat(exec).hasExitCode(0); @@ -195,7 +195,7 @@ public void getLoadedThing() { @Test public void getList() { - var exec = cli("-vvv", "get", "--load", "classpath:enola.dev-properties.ttl", "enola:/"); + var exec = cli("-vvv", "get", "--load", "classpath:enola.dev/properties.ttl", "enola:/"); assertThat(exec).err().isEmpty(); assertThat(exec).hasExitCode(0).out().contains("https://enola.dev/emoji"); } diff --git a/cli/src/test/java/dev/enola/cli/EnolaLoggingTest.java b/java/dev/enola/cli/EnolaLoggingTest.java similarity index 100% rename from cli/src/test/java/dev/enola/cli/EnolaLoggingTest.java rename to java/dev/enola/cli/EnolaLoggingTest.java diff --git a/cli/src/main/java/dev/enola/cli/ExecMdCommand.java b/java/dev/enola/cli/ExecMdCommand.java similarity index 100% rename from cli/src/main/java/dev/enola/cli/ExecMdCommand.java rename to java/dev/enola/cli/ExecMdCommand.java diff --git a/cli/src/main/java/dev/enola/cli/ExtensionsInfoCommand.java b/java/dev/enola/cli/ExtensionsInfoCommand.java similarity index 100% rename from cli/src/main/java/dev/enola/cli/ExtensionsInfoCommand.java rename to java/dev/enola/cli/ExtensionsInfoCommand.java diff --git a/cli/src/main/java/dev/enola/cli/Format.java b/java/dev/enola/cli/Format.java similarity index 100% rename from cli/src/main/java/dev/enola/cli/Format.java rename to java/dev/enola/cli/Format.java diff --git a/cli/src/main/java/dev/enola/cli/Get.java b/java/dev/enola/cli/Get.java similarity index 100% rename from cli/src/main/java/dev/enola/cli/Get.java rename to java/dev/enola/cli/Get.java diff --git a/cli/src/main/java/dev/enola/cli/InfoCommand.java b/java/dev/enola/cli/InfoCommand.java similarity index 100% rename from cli/src/main/java/dev/enola/cli/InfoCommand.java rename to java/dev/enola/cli/InfoCommand.java diff --git a/cli/src/main/java/dev/enola/cli/List.java b/java/dev/enola/cli/List.java similarity index 100% rename from cli/src/main/java/dev/enola/cli/List.java rename to java/dev/enola/cli/List.java diff --git a/cli/src/main/java/dev/enola/cli/LoggingColorConsoleHandler.java b/java/dev/enola/cli/LoggingColorConsoleHandler.java similarity index 100% rename from cli/src/main/java/dev/enola/cli/LoggingColorConsoleHandler.java rename to java/dev/enola/cli/LoggingColorConsoleHandler.java diff --git a/cli/src/main/java/dev/enola/cli/LoggingMixin.java b/java/dev/enola/cli/LoggingMixin.java similarity index 100% rename from cli/src/main/java/dev/enola/cli/LoggingMixin.java rename to java/dev/enola/cli/LoggingMixin.java diff --git a/cli/src/main/java/dev/enola/cli/LoggingTestCommand.java b/java/dev/enola/cli/LoggingTestCommand.java similarity index 100% rename from cli/src/main/java/dev/enola/cli/LoggingTestCommand.java rename to java/dev/enola/cli/LoggingTestCommand.java diff --git a/cli/src/main/java/dev/enola/cli/RosettaCommand.java b/java/dev/enola/cli/RosettaCommand.java similarity index 100% rename from cli/src/main/java/dev/enola/cli/RosettaCommand.java rename to java/dev/enola/cli/RosettaCommand.java diff --git a/cli/src/main/java/dev/enola/cli/ServerCommand.java b/java/dev/enola/cli/ServerCommand.java similarity index 100% rename from cli/src/main/java/dev/enola/cli/ServerCommand.java rename to java/dev/enola/cli/ServerCommand.java diff --git a/cli/src/test/java/dev/enola/cli/SystemOutErrCapture.java b/java/dev/enola/cli/SystemOutErrCapture.java similarity index 100% rename from cli/src/test/java/dev/enola/cli/SystemOutErrCapture.java rename to java/dev/enola/cli/SystemOutErrCapture.java diff --git a/cli/src/test/java/dev/enola/cli/SystemOutErrCaptureTest.java b/java/dev/enola/cli/SystemOutErrCaptureTest.java similarity index 100% rename from cli/src/test/java/dev/enola/cli/SystemOutErrCaptureTest.java rename to java/dev/enola/cli/SystemOutErrCaptureTest.java diff --git a/cli/src/main/java/dev/enola/cli/VersionProvider.java b/java/dev/enola/cli/VersionProvider.java similarity index 100% rename from cli/src/main/java/dev/enola/cli/VersionProvider.java rename to java/dev/enola/cli/VersionProvider.java diff --git a/java/dev/enola/common/BUILD b/java/dev/enola/common/BUILD index ff4b4d6a6..204c961c7 100644 --- a/java/dev/enola/common/BUILD +++ b/java/dev/enola/common/BUILD @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@rules_java//java:defs.bzl", "java_library", "java_test") +load("@rules_java//java:defs.bzl", "java_library") java_library( name = "common", diff --git a/java/dev/enola/common/concurrent/BUILD b/java/dev/enola/common/concurrent/BUILD index 4bdc2ca00..b0b9fe549 100644 --- a/java/dev/enola/common/concurrent/BUILD +++ b/java/dev/enola/common/concurrent/BUILD @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@rules_java//java:defs.bzl", "java_library", "java_test") +load("@rules_java//java:defs.bzl", "java_library") java_library( name = "concurrent", diff --git a/java/dev/enola/common/convert/BUILD b/java/dev/enola/common/convert/BUILD index 2575c0431..54f13fa2f 100644 --- a/java/dev/enola/common/convert/BUILD +++ b/java/dev/enola/common/convert/BUILD @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@rules_java//java:defs.bzl", "java_library", "java_test") +load("@rules_java//java:defs.bzl", "java_library") java_library( name = "convert", diff --git a/java/dev/enola/common/function/BUILD b/java/dev/enola/common/function/BUILD index a76f85dc1..d8abcc5b1 100644 --- a/java/dev/enola/common/function/BUILD +++ b/java/dev/enola/common/function/BUILD @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@rules_java//java:defs.bzl", "java_library", "java_test") +load("@rules_java//java:defs.bzl", "java_library") java_library( name = "function", diff --git a/java/dev/enola/common/io/BUILD b/java/dev/enola/common/io/BUILD index 8455b9c24..d93a1d556 100644 --- a/java/dev/enola/common/io/BUILD +++ b/java/dev/enola/common/io/BUILD @@ -39,12 +39,10 @@ junit_tests( name = "tests", srcs = glob(["**/*Test.java"]), plugins = ["//tools/bazel/java_plugin:autoservice"], - # TODO Add support for resources with resource_strip_prefix to junit_tests... - resource_strip_prefix = "java/dev/enola/common/io/test_resources", - resources = glob(["test_resources/*"]), deps = [ ":io", "//java/dev/enola/common/protobuf", + "//test", "@maven//:com_google_auto_service_auto_service_annotations", ], ) diff --git a/java/dev/enola/common/io/iri/NamespaceRepositoryEnolaDefaults.java b/java/dev/enola/common/io/iri/NamespaceRepositoryEnolaDefaults.java index 9d0168c2a..937bdba4c 100644 --- a/java/dev/enola/common/io/iri/NamespaceRepositoryEnolaDefaults.java +++ b/java/dev/enola/common/io/iri/NamespaceRepositoryEnolaDefaults.java @@ -26,7 +26,7 @@ public class NamespaceRepositoryEnolaDefaults { .store("enola", "https://enola.dev/") .store("xsd", "http://www.w3.org/2001/XMLSchema#") .store("schema", "https://schema.org/") - .store("rdf", "http://www.w3.org/1999/02/22-rdf-syntax-ns#") + .store("dev/enola/rdf", "http://www.w3.org/1999/02/22-rdf-syntax-ns#") .store("rdfs", "http://www.w3.org/2000/01/rdf-schema#") .store("foaf", "http://xmlns.com/foaf/0.1/") .build(); diff --git a/java/dev/enola/common/io/resource/ResourceProviders.java b/java/dev/enola/common/io/resource/ResourceProviders.java index c4ef25b6c..ded6f6744 100644 --- a/java/dev/enola/common/io/resource/ResourceProviders.java +++ b/java/dev/enola/common/io/resource/ResourceProviders.java @@ -39,6 +39,7 @@ public ResourceProviders(ResourceProvider... resourceProviders) { * more fine-grained control over allowed URI schemes to support in your application (if any at * all). */ + @Deprecated // Replace all users with more explicit choices... public ResourceProviders() { this( new FileResource.Provider(), diff --git a/common/markdown/BUILD b/java/dev/enola/common/markdown/exec/BUILD similarity index 68% rename from common/markdown/BUILD rename to java/dev/enola/common/markdown/exec/BUILD index e5e30295e..364957b98 100644 --- a/common/markdown/BUILD +++ b/java/dev/enola/common/markdown/exec/BUILD @@ -14,11 +14,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@rules_java//java:defs.bzl", "java_library", "java_test") +load("@rules_java//java:defs.bzl", "java_library") +load("//tools/bazel:junit.bzl", "junit_tests") java_library( name = "markdown", - srcs = glob(["src/main/java/**/*.java"]), + srcs = glob( + ["*.java"], + exclude = ["*Test.java"], + ), visibility = ["//:__subpackages__"], deps = [ "@maven//:ch_vorburger_exec_exec", @@ -27,18 +31,10 @@ java_library( ], ) -[java_test( - name = name[:-len(".java")], - size = "small", - srcs = glob(["src/test/java/**/*.java"]), - runtime_deps = [ - "@maven//:org_slf4j_slf4j_simple", - ], +junit_tests( + name = "tests", + srcs = glob(["**/*Test.java"]), deps = [ ":markdown", - "@maven//:com_google_truth_truth", - "@maven//:junit_junit", ], -) for name in glob([ - "src/test/java/**/*Test.java", -])] +) diff --git a/common/markdown/src/main/java/dev/enola/common/markdown/exec/ExecMD.java b/java/dev/enola/common/markdown/exec/ExecMD.java similarity index 100% rename from common/markdown/src/main/java/dev/enola/common/markdown/exec/ExecMD.java rename to java/dev/enola/common/markdown/exec/ExecMD.java diff --git a/common/markdown/src/test/java/dev/enola/common/markdown/exec/ExecMDTest.java b/java/dev/enola/common/markdown/exec/ExecMDTest.java similarity index 100% rename from common/markdown/src/test/java/dev/enola/common/markdown/exec/ExecMDTest.java rename to java/dev/enola/common/markdown/exec/ExecMDTest.java diff --git a/common/markdown/src/main/java/dev/enola/common/markdown/exec/MarkdownProcessingException.java b/java/dev/enola/common/markdown/exec/MarkdownProcessingException.java similarity index 100% rename from common/markdown/src/main/java/dev/enola/common/markdown/exec/MarkdownProcessingException.java rename to java/dev/enola/common/markdown/exec/MarkdownProcessingException.java diff --git a/common/markdown/src/main/java/dev/enola/common/markdown/exec/Runner.java b/java/dev/enola/common/markdown/exec/Runner.java similarity index 100% rename from common/markdown/src/main/java/dev/enola/common/markdown/exec/Runner.java rename to java/dev/enola/common/markdown/exec/Runner.java diff --git a/common/markdown/src/test/java/dev/enola/common/markdown/exec/RunnerTest.java b/java/dev/enola/common/markdown/exec/RunnerTest.java similarity index 100% rename from common/markdown/src/test/java/dev/enola/common/markdown/exec/RunnerTest.java rename to java/dev/enola/common/markdown/exec/RunnerTest.java diff --git a/common/markdown/src/main/java/dev/enola/common/markdown/exec/VorburgerExecRunner.java b/java/dev/enola/common/markdown/exec/VorburgerExecRunner.java similarity index 100% rename from common/markdown/src/main/java/dev/enola/common/markdown/exec/VorburgerExecRunner.java rename to java/dev/enola/common/markdown/exec/VorburgerExecRunner.java diff --git a/java/dev/enola/common/protobuf/BUILD b/java/dev/enola/common/protobuf/BUILD index e74065d07..3d6c37d76 100644 --- a/java/dev/enola/common/protobuf/BUILD +++ b/java/dev/enola/common/protobuf/BUILD @@ -14,9 +14,43 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@rules_java//java:defs.bzl", "java_library") +load("@rules_java//java:defs.bzl", "java_library", "java_proto_library") +load("@rules_proto//proto:defs.bzl", "proto_library") load("//tools/bazel:junit.bzl", "junit_tests") +proto_library( + name = "validation_proto", + srcs = ["validation.proto"], + deps = [ + "@com_google_protobuf//:any_proto", + ], +) + +java_proto_library( + name = "validation_proto_java_library", + visibility = ["//:__subpackages__"], + deps = [ + "validation_proto", + ], +) + +proto_library( + name = "test_proto", + srcs = ["test.proto"], + deps = [ + "@com_google_protobuf//:any_proto", + "@com_google_protobuf//:descriptor_proto", + "@com_google_protobuf//:struct_proto", + "@com_google_protobuf//:timestamp_proto", + ], +) + +java_proto_library( + name = "test_java_proto", + visibility = ["//:__subpackages__"], + deps = ["test_proto"], +) + java_library( name = "protobuf", srcs = glob( @@ -26,10 +60,16 @@ java_library( plugins = ["//tools/bazel/java_plugin:autoservice"], visibility = ["//:__subpackages__"], deps = [ + ":validation_proto_java_library", + "//java/dev/enola/common", + "//java/dev/enola/common/convert", "//java/dev/enola/common/io", + "//java/dev/enola/common/yamljson", "@maven//:com_google_auto_service_auto_service_annotations", "@maven//:com_google_errorprone_error_prone_annotations", "@maven//:com_google_guava_guava", + "@maven//:com_google_protobuf_protobuf_java", + "@maven//:com_google_protobuf_protobuf_java_util", "@maven//:org_slf4j_slf4j_api", ], ) @@ -39,6 +79,8 @@ junit_tests( srcs = glob(["**/*Test.java"]), deps = [ ":protobuf", + ":test_java_proto", "//java/dev/enola/common/io", + "//test", ], ) diff --git a/common/protobuf/src/main/java/dev/enola/common/protobuf/DescriptorProvider.java b/java/dev/enola/common/protobuf/DescriptorProvider.java similarity index 100% rename from common/protobuf/src/main/java/dev/enola/common/protobuf/DescriptorProvider.java rename to java/dev/enola/common/protobuf/DescriptorProvider.java diff --git a/common/protobuf/src/main/java/dev/enola/common/protobuf/MessageResourceConverter.java b/java/dev/enola/common/protobuf/MessageResourceConverter.java similarity index 100% rename from common/protobuf/src/main/java/dev/enola/common/protobuf/MessageResourceConverter.java rename to java/dev/enola/common/protobuf/MessageResourceConverter.java diff --git a/common/protobuf/src/main/java/dev/enola/common/protobuf/MessageValidator.java b/java/dev/enola/common/protobuf/MessageValidator.java similarity index 100% rename from common/protobuf/src/main/java/dev/enola/common/protobuf/MessageValidator.java rename to java/dev/enola/common/protobuf/MessageValidator.java diff --git a/common/protobuf/src/test/java/dev/enola/common/protobuf/MessageValidatorTest.java b/java/dev/enola/common/protobuf/MessageValidatorTest.java similarity index 100% rename from common/protobuf/src/test/java/dev/enola/common/protobuf/MessageValidatorTest.java rename to java/dev/enola/common/protobuf/MessageValidatorTest.java diff --git a/common/protobuf/src/main/java/dev/enola/common/protobuf/MessageValidators.java b/java/dev/enola/common/protobuf/MessageValidators.java similarity index 100% rename from common/protobuf/src/main/java/dev/enola/common/protobuf/MessageValidators.java rename to java/dev/enola/common/protobuf/MessageValidators.java diff --git a/common/protobuf/src/main/java/dev/enola/common/protobuf/Messages.java b/java/dev/enola/common/protobuf/Messages.java similarity index 100% rename from common/protobuf/src/main/java/dev/enola/common/protobuf/Messages.java rename to java/dev/enola/common/protobuf/Messages.java diff --git a/common/protobuf/src/test/java/dev/enola/common/protobuf/MessagesTest.java b/java/dev/enola/common/protobuf/MessagesTest.java similarity index 100% rename from common/protobuf/src/test/java/dev/enola/common/protobuf/MessagesTest.java rename to java/dev/enola/common/protobuf/MessagesTest.java diff --git a/common/protobuf/src/main/java/dev/enola/common/protobuf/ProtoIO.java b/java/dev/enola/common/protobuf/ProtoIO.java similarity index 100% rename from common/protobuf/src/main/java/dev/enola/common/protobuf/ProtoIO.java rename to java/dev/enola/common/protobuf/ProtoIO.java diff --git a/common/protobuf/src/test/java/dev/enola/common/protobuf/ProtoIOTest.java b/java/dev/enola/common/protobuf/ProtoIOTest.java similarity index 95% rename from common/protobuf/src/test/java/dev/enola/common/protobuf/ProtoIOTest.java rename to java/dev/enola/common/protobuf/ProtoIOTest.java index be974c193..afb4ef0b5 100644 --- a/common/protobuf/src/test/java/dev/enola/common/protobuf/ProtoIOTest.java +++ b/java/dev/enola/common/protobuf/ProtoIOTest.java @@ -23,6 +23,7 @@ import com.google.common.net.MediaType; import com.google.protobuf.Any; +import com.google.protobuf.Message; import com.google.protobuf.Timestamp; import com.google.protobuf.TypeRegistry; @@ -35,13 +36,17 @@ import java.io.IOException; -public class ProtoIOTest extends AbstractProtoTestBase { +public class ProtoIOTest { public static final Timestamp TIMESTAMP = Timestamp.newBuilder().setSeconds(123).setNanos(456).build(); - public ProtoIOTest() { - super("ok.textproto", Timestamp.newBuilder()); + private final String pathToResourceOnClasspath = "ok.textproto"; + private final Message.Builder builder = Timestamp.newBuilder(); + + @Test + public void testProto() throws IOException { + ProtoIO.check(pathToResourceOnClasspath, builder); } private Timestamp readTimestamp(ReadableResource resource) throws IOException { diff --git a/common/protobuf/src/main/java/dev/enola/common/protobuf/Timestamps2.java b/java/dev/enola/common/protobuf/Timestamps2.java similarity index 100% rename from common/protobuf/src/main/java/dev/enola/common/protobuf/Timestamps2.java rename to java/dev/enola/common/protobuf/Timestamps2.java diff --git a/common/protobuf/src/main/java/dev/enola/common/protobuf/TypeRegistryDescriptorProvider.java b/java/dev/enola/common/protobuf/TypeRegistryDescriptorProvider.java similarity index 100% rename from common/protobuf/src/main/java/dev/enola/common/protobuf/TypeRegistryDescriptorProvider.java rename to java/dev/enola/common/protobuf/TypeRegistryDescriptorProvider.java diff --git a/common/protobuf/src/main/java/dev/enola/common/protobuf/TypeRegistryWrapper.java b/java/dev/enola/common/protobuf/TypeRegistryWrapper.java similarity index 100% rename from common/protobuf/src/main/java/dev/enola/common/protobuf/TypeRegistryWrapper.java rename to java/dev/enola/common/protobuf/TypeRegistryWrapper.java diff --git a/common/protobuf/src/test/java/dev/enola/common/protobuf/TypeRegistryWrapperTest.java b/java/dev/enola/common/protobuf/TypeRegistryWrapperTest.java similarity index 100% rename from common/protobuf/src/test/java/dev/enola/common/protobuf/TypeRegistryWrapperTest.java rename to java/dev/enola/common/protobuf/TypeRegistryWrapperTest.java diff --git a/common/protobuf/src/main/java/dev/enola/common/protobuf/ValidationException.java b/java/dev/enola/common/protobuf/ValidationException.java similarity index 100% rename from common/protobuf/src/main/java/dev/enola/common/protobuf/ValidationException.java rename to java/dev/enola/common/protobuf/ValidationException.java diff --git a/common/protobuf/src/main/java/dev/enola/common/protobuf/Wany.java b/java/dev/enola/common/protobuf/Wany.java similarity index 100% rename from common/protobuf/src/main/java/dev/enola/common/protobuf/Wany.java rename to java/dev/enola/common/protobuf/Wany.java diff --git a/common/protobuf/src/main/java/dev/enola/common/protobuf/YamlJsonResourceConverter.java b/java/dev/enola/common/protobuf/YamlJsonResourceConverter.java similarity index 100% rename from common/protobuf/src/main/java/dev/enola/common/protobuf/YamlJsonResourceConverter.java rename to java/dev/enola/common/protobuf/YamlJsonResourceConverter.java diff --git a/common/protobuf/test.proto b/java/dev/enola/common/protobuf/test.proto similarity index 97% rename from common/protobuf/test.proto rename to java/dev/enola/common/protobuf/test.proto index 72bb53a4a..0f22054b8 100644 --- a/common/protobuf/test.proto +++ b/java/dev/enola/common/protobuf/test.proto @@ -18,7 +18,7 @@ syntax = "proto3"; package dev.enola.protobuf.test; -import "google/protobuf/any.proto"; +// import "google/protobuf/any.proto"; import "google/protobuf/descriptor.proto"; import "google/protobuf/timestamp.proto"; diff --git a/common/protobuf/src/main/proto/validation.proto b/java/dev/enola/common/protobuf/validation.proto similarity index 100% rename from common/protobuf/src/main/proto/validation.proto rename to java/dev/enola/common/protobuf/validation.proto diff --git a/common/yamljson/BUILD b/java/dev/enola/common/yamljson/BUILD similarity index 67% rename from common/yamljson/BUILD rename to java/dev/enola/common/yamljson/BUILD index cd821306f..973c102cd 100644 --- a/common/yamljson/BUILD +++ b/java/dev/enola/common/yamljson/BUILD @@ -14,12 +14,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@rules_java//java:defs.bzl", "java_library", "java_test") +load("@rules_java//java:defs.bzl", "java_library") +load("//tools/bazel:junit.bzl", "junit_tests") java_library( name = "yamljson", - srcs = glob(["src/main/java/**/*.java"]), - resources = glob(["src/main/resources/**/*"]), + srcs = glob( + ["*.java"], + exclude = ["*Test.java"], + ), visibility = ["//:__subpackages__"], deps = [ "//java/dev/enola/common/io", @@ -29,16 +32,10 @@ java_library( ], ) -[java_test( - name = name[:-len(".java")], - size = "small", - srcs = glob(["src/test/java/**/*.java"]), - resources = glob(["src/test/resources/**/*"]), +junit_tests( + name = "tests", + srcs = glob(["**/*Test.java"]), deps = [ ":yamljson", - "@maven//:com_google_truth_truth", - "@maven//:junit_junit", ], -) for name in glob([ - "src/test/java/**/*Test.java", -])] +) diff --git a/common/yamljson/src/main/java/dev/enola/common/yamljson/JSON.java b/java/dev/enola/common/yamljson/JSON.java similarity index 100% rename from common/yamljson/src/main/java/dev/enola/common/yamljson/JSON.java rename to java/dev/enola/common/yamljson/JSON.java diff --git a/common/yamljson/src/main/java/dev/enola/common/yamljson/YAML.java b/java/dev/enola/common/yamljson/YAML.java similarity index 100% rename from common/yamljson/src/main/java/dev/enola/common/yamljson/YAML.java rename to java/dev/enola/common/yamljson/YAML.java diff --git a/common/yamljson/src/main/java/dev/enola/common/yamljson/YamlJson.java b/java/dev/enola/common/yamljson/YamlJson.java similarity index 100% rename from common/yamljson/src/main/java/dev/enola/common/yamljson/YamlJson.java rename to java/dev/enola/common/yamljson/YamlJson.java diff --git a/common/yamljson/src/test/java/dev/enola/common/yamljson/YamlJsonTest.java b/java/dev/enola/common/yamljson/YamlJsonTest.java similarity index 100% rename from common/yamljson/src/test/java/dev/enola/common/yamljson/YamlJsonTest.java rename to java/dev/enola/common/yamljson/YamlJsonTest.java diff --git a/core/lib/BUILD b/java/dev/enola/core/BUILD similarity index 62% rename from core/lib/BUILD rename to java/dev/enola/core/BUILD index 94bb8cbe4..261797d88 100644 --- a/core/lib/BUILD +++ b/java/dev/enola/core/BUILD @@ -18,11 +18,12 @@ # https://github.com/grpc/grpc-java/issues/10215 load("@io_grpc_grpc_java//:java_grpc_library.bzl", "java_grpc_library") +load("//tools/bazel:junit.bzl", "junit_tests") # https://github.com/bazelbuild/rules_go/blob/master/proto/core.rst#go_proto_library load("@rules_go//proto:def.bzl", "go_proto_library") -load("@rules_java//java:defs.bzl", "java_library", "java_proto_library", "java_test") +load("@rules_java//java:defs.bzl", "java_library", "java_proto_library") load("@rules_proto//proto:defs.bzl", "proto_library") # https://rules-proto-grpc.com/en/latest/lang/buf.html#buf-proto-lint-test @@ -37,7 +38,7 @@ load("@rules_proto_grpc//doc:defs.bzl", "doc_markdown_compile") proto_library( name = "ext_proto", - srcs = ["src/main/java/dev/enola/core/enola_ext.proto"], + srcs = ["enola_ext.proto"], deps = [ "@com_google_protobuf//:descriptor_proto", ], @@ -45,7 +46,7 @@ proto_library( proto_library( name = "core_proto", - srcs = ["src/main/java/dev/enola/core/enola_core.proto"], + srcs = ["enola_core.proto"], deps = [ ":ext_proto", "@com_google_protobuf//:any_proto", @@ -57,7 +58,7 @@ proto_library( proto_library( name = "connector_proto", - srcs = ["src/main/java/dev/enola/core/connector/enola_connector.proto"], + srcs = ["connector/enola_connector.proto"], deps = [ ":core_proto", "@com_google_protobuf//:descriptor_proto", @@ -66,7 +67,7 @@ proto_library( proto_library( name = "meta_proto", - srcs = ["src/main/java/dev/enola/core/meta/enola_meta.proto"], + srcs = ["meta/enola_meta.proto"], deps = [ ":core_proto", ":ext_proto", @@ -76,7 +77,7 @@ proto_library( proto_library( name = "util_proto", - srcs = ["src/main/java/dev/enola/core/util/enola_util.proto"], + srcs = ["util/enola_util.proto"], deps = [ "@com_google_protobuf//:timestamp_proto", ], @@ -84,13 +85,7 @@ proto_library( java_proto_library( name = "core_java_proto", - visibility = [ - "//cli:__subpackages__", - "//connectors:__subpackages__", - "//core:__subpackages__", - "//web/rest:__pkg__", - "//web/ui:__pkg__", - ], + visibility = ["//:__subpackages__"], deps = [ "connector_proto", "core_proto", @@ -105,13 +100,7 @@ java_grpc_library( srcs = [ "core_proto", ], - visibility = [ - "//cli:__subpackages__", - "//connectors:__subpackages__", - "//core:__subpackages__", - "//web/rest:__pkg__", - "//web/ui:__pkg__", - ], + visibility = ["//:__subpackages__"], deps = [":core_java_proto"], ) @@ -120,11 +109,7 @@ java_grpc_library( srcs = [ "connector_proto", ], - visibility = [ - "//connectors:__subpackages__", - "//core:__subpackages__", - "//web/ui:__pkg__", - ], + visibility = ["//:__subpackages__"], deps = [":core_java_proto"], ) @@ -160,42 +145,74 @@ buf_proto_lint_test( ) java_library( - name = "lib_java", - srcs = glob(["src/main/java/**/*.java"]), - visibility = [ - "//cli:__subpackages__", - "//connectors:__subpackages__", - "//core:__subpackages__", - "//web/rest:__pkg__", - "//web/ui:__pkg__", + name = "core", + srcs = glob( + ["**/*.java"], + exclude = [ + "**/*Test.java", + ], + ), + visibility = ["//:__subpackages__"], + runtime_deps = [ + "@maven//:io_grpc_grpc_netty", ], deps = [ - ":core_java_proto", - "//common/protobuf", - "//common/thing:thing_java_proto", + "//java/dev/enola/common", + "//java/dev/enola/common/concurrent", + "//java/dev/enola/common/convert", + "//java/dev/enola/common/io", + "//java/dev/enola/common/protobuf", + "//java/dev/enola/common/protobuf:validation_proto_java_library", + "//java/dev/enola/common/yamljson", + "//java/dev/enola/core:connector_java_grpc", + "//java/dev/enola/core:core_java_grpc", + "//java/dev/enola/core:core_java_proto", + "//java/dev/enola/data", + "//java/dev/enola/datatype", + "//java/dev/enola/rdf", + "//java/dev/enola/thing:thing_java", + "//java/dev/enola/thing:thing_java_proto", + "//models", + "@maven//:com_github_java_json_tools_uri_template", + "@maven//:com_google_errorprone_error_prone_annotations", "@maven//:com_google_guava_guava", "@maven//:com_google_protobuf_protobuf_java", "@maven//:com_google_protobuf_protobuf_java_util", + "@maven//:io_grpc_grpc_api", + "@maven//:io_grpc_grpc_core", + "@maven//:io_grpc_grpc_inprocess", + "@maven//:io_grpc_grpc_stub", + "@maven//:org_slf4j_slf4j_api", ], ) -[java_test( - name = name[:-len(".java")], - size = "small", - srcs = glob(["src/test/java/**/*.java"]), - resources = glob(["src/test/resources/**/*"]), +junit_tests( + name = "tests", + srcs = glob(["**/*Test.java"]), + runtime_deps = [ + "@maven//:io_grpc_grpc_netty", + "@maven//:org_slf4j_slf4j_simple", + ], deps = [ - ":core_java_proto", - ":lib_java", - "@maven//:com_google_guava_guava", - "@maven//:com_google_protobuf_protobuf_java", - "@maven//:com_google_truth_extensions_truth_proto_extension", - "@maven//:com_google_truth_truth", - "@maven//:junit_junit", + "//connectors/demo", + "//connectors/demo:demo_java_proto", + "//java/dev/enola/common/concurrent", + "//java/dev/enola/common/convert", + "//java/dev/enola/common/io", + "//java/dev/enola/common/protobuf", + "//java/dev/enola/common/yamljson", # TODO Remove this once dependencies are cleaned up + "//java/dev/enola/core", + "//java/dev/enola/core:connector_java_grpc", + "//java/dev/enola/core:core_java_grpc", + "//java/dev/enola/core:core_java_proto", + "//java/dev/enola/data", + "//java/dev/enola/rdf", + "//java/dev/enola/thing:thing_java", + "//java/dev/enola/thing:thing_java_proto", + "//test", + "@maven//:com_github_java_json_tools_uri_template", ], -) for name in glob([ - "src/test/java/**/*Test.java", -])] +) go_proto_library( name = "ext_go_proto", diff --git a/core/lib/src/main/java/dev/enola/core/ERI.java b/java/dev/enola/core/ERI.java similarity index 100% rename from core/lib/src/main/java/dev/enola/core/ERI.java rename to java/dev/enola/core/ERI.java diff --git a/core/lib/src/test/java/dev/enola/core/ERITest.java b/java/dev/enola/core/ERITest.java similarity index 100% rename from core/lib/src/test/java/dev/enola/core/ERITest.java rename to java/dev/enola/core/ERITest.java diff --git a/core/lib/src/main/java/dev/enola/core/EnolaException.java b/java/dev/enola/core/EnolaException.java similarity index 100% rename from core/lib/src/main/java/dev/enola/core/EnolaException.java rename to java/dev/enola/core/EnolaException.java diff --git a/core/lib/src/main/java/dev/enola/core/EnolaService.java b/java/dev/enola/core/EnolaService.java similarity index 100% rename from core/lib/src/main/java/dev/enola/core/EnolaService.java rename to java/dev/enola/core/EnolaService.java diff --git a/core/impl/src/main/java/dev/enola/core/EnolaServiceProvider.java b/java/dev/enola/core/EnolaServiceProvider.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/EnolaServiceProvider.java rename to java/dev/enola/core/EnolaServiceProvider.java diff --git a/core/impl/src/main/java/dev/enola/core/EnolaServiceRegistry.java b/java/dev/enola/core/EnolaServiceRegistry.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/EnolaServiceRegistry.java rename to java/dev/enola/core/EnolaServiceRegistry.java diff --git a/core/impl/src/main/java/dev/enola/core/EntityAspect.java b/java/dev/enola/core/EntityAspect.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/EntityAspect.java rename to java/dev/enola/core/EntityAspect.java diff --git a/core/impl/src/main/java/dev/enola/core/EntityAspectRepeater.java b/java/dev/enola/core/EntityAspectRepeater.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/EntityAspectRepeater.java rename to java/dev/enola/core/EntityAspectRepeater.java diff --git a/core/impl/src/main/java/dev/enola/core/EntityAspectService.java b/java/dev/enola/core/EntityAspectService.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/EntityAspectService.java rename to java/dev/enola/core/EntityAspectService.java diff --git a/core/impl/src/test/java/dev/enola/core/EntityServiceProviderTest.java b/java/dev/enola/core/EntityServiceProviderTest.java similarity index 100% rename from core/impl/src/test/java/dev/enola/core/EntityServiceProviderTest.java rename to java/dev/enola/core/EntityServiceProviderTest.java diff --git a/core/impl/src/test/java/dev/enola/core/EntityTest.java b/java/dev/enola/core/EntityTest.java similarity index 100% rename from core/impl/src/test/java/dev/enola/core/EntityTest.java rename to java/dev/enola/core/EntityTest.java diff --git a/core/lib/src/main/java/dev/enola/core/IDs.java b/java/dev/enola/core/IDs.java similarity index 100% rename from core/lib/src/main/java/dev/enola/core/IDs.java rename to java/dev/enola/core/IDs.java diff --git a/core/lib/src/test/java/dev/enola/core/IDsTest.java b/java/dev/enola/core/IDsTest.java similarity index 100% rename from core/lib/src/test/java/dev/enola/core/IDsTest.java rename to java/dev/enola/core/IDsTest.java diff --git a/core/impl/src/test/java/dev/enola/core/ValidationFailureAspect.java b/java/dev/enola/core/ValidationFailureAspect.java similarity index 100% rename from core/impl/src/test/java/dev/enola/core/ValidationFailureAspect.java rename to java/dev/enola/core/ValidationFailureAspect.java diff --git a/core/impl/src/main/java/dev/enola/core/aspects/ErrorTestAspect.java b/java/dev/enola/core/aspects/ErrorTestAspect.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/aspects/ErrorTestAspect.java rename to java/dev/enola/core/aspects/ErrorTestAspect.java diff --git a/core/impl/src/main/java/dev/enola/core/aspects/FilestoreRepositoryAspect.java b/java/dev/enola/core/aspects/FilestoreRepositoryAspect.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/aspects/FilestoreRepositoryAspect.java rename to java/dev/enola/core/aspects/FilestoreRepositoryAspect.java diff --git a/core/impl/src/main/java/dev/enola/core/aspects/GrpcAspect.java b/java/dev/enola/core/aspects/GrpcAspect.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/aspects/GrpcAspect.java rename to java/dev/enola/core/aspects/GrpcAspect.java diff --git a/core/impl/src/main/java/dev/enola/core/aspects/TimestampAspect.java b/java/dev/enola/core/aspects/TimestampAspect.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/aspects/TimestampAspect.java rename to java/dev/enola/core/aspects/TimestampAspect.java diff --git a/core/impl/src/main/java/dev/enola/core/aspects/UriTemplateAspect.java b/java/dev/enola/core/aspects/UriTemplateAspect.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/aspects/UriTemplateAspect.java rename to java/dev/enola/core/aspects/UriTemplateAspect.java diff --git a/core/impl/src/main/java/dev/enola/core/aspects/ValidationAspect.java b/java/dev/enola/core/aspects/ValidationAspect.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/aspects/ValidationAspect.java rename to java/dev/enola/core/aspects/ValidationAspect.java diff --git a/core/lib/src/main/java/dev/enola/core/connector/enola_connector.proto b/java/dev/enola/core/connector/enola_connector.proto similarity index 97% rename from core/lib/src/main/java/dev/enola/core/connector/enola_connector.proto rename to java/dev/enola/core/connector/enola_connector.proto index 9fd32ad2a..1c212dcc7 100644 --- a/core/lib/src/main/java/dev/enola/core/connector/enola_connector.proto +++ b/java/dev/enola/core/connector/enola_connector.proto @@ -18,8 +18,8 @@ syntax = "proto3"; package dev.enola.core.connector; -import "core/lib/src/main/java/dev/enola/core/enola_core.proto"; import "google/protobuf/descriptor.proto"; +import "java/dev/enola/core/enola_core.proto"; option java_string_check_utf8 = true; option java_package = "dev.enola.core.connector.proto"; diff --git a/core/lib/src/main/java/dev/enola/core/enola_core.proto b/java/dev/enola/core/enola_core.proto similarity index 98% rename from core/lib/src/main/java/dev/enola/core/enola_core.proto rename to java/dev/enola/core/enola_core.proto index 5eff9e949..835ea13c9 100644 --- a/core/lib/src/main/java/dev/enola/core/enola_core.proto +++ b/java/dev/enola/core/enola_core.proto @@ -18,10 +18,10 @@ syntax = "proto3"; package dev.enola.core; -import "core/lib/src/main/java/dev/enola/core/enola_ext.proto"; import "google/protobuf/any.proto"; import "google/protobuf/descriptor.proto"; import "google/protobuf/timestamp.proto"; +import "java/dev/enola/core/enola_ext.proto"; option java_string_check_utf8 = true; option java_package = "dev.enola.core.proto"; diff --git a/core/lib/src/main/java/dev/enola/core/enola_ext.proto b/java/dev/enola/core/enola_ext.proto similarity index 100% rename from core/lib/src/main/java/dev/enola/core/enola_ext.proto rename to java/dev/enola/core/enola_ext.proto diff --git a/core/impl/src/main/java/dev/enola/core/entity/IDValueConverter.java b/java/dev/enola/core/entity/IDValueConverter.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/entity/IDValueConverter.java rename to java/dev/enola/core/entity/IDValueConverter.java diff --git a/core/impl/src/main/java/dev/enola/core/grpc/EnolaGrpcClientProvider.java b/java/dev/enola/core/grpc/EnolaGrpcClientProvider.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/grpc/EnolaGrpcClientProvider.java rename to java/dev/enola/core/grpc/EnolaGrpcClientProvider.java diff --git a/core/impl/src/main/java/dev/enola/core/grpc/EnolaGrpcInProcess.java b/java/dev/enola/core/grpc/EnolaGrpcInProcess.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/grpc/EnolaGrpcInProcess.java rename to java/dev/enola/core/grpc/EnolaGrpcInProcess.java diff --git a/core/impl/src/main/java/dev/enola/core/grpc/EnolaGrpcServer.java b/java/dev/enola/core/grpc/EnolaGrpcServer.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/grpc/EnolaGrpcServer.java rename to java/dev/enola/core/grpc/EnolaGrpcServer.java diff --git a/core/impl/src/test/java/dev/enola/core/grpc/EnolaGrpcServerTest.java b/java/dev/enola/core/grpc/EnolaGrpcServerTest.java similarity index 100% rename from core/impl/src/test/java/dev/enola/core/grpc/EnolaGrpcServerTest.java rename to java/dev/enola/core/grpc/EnolaGrpcServerTest.java diff --git a/core/impl/src/main/java/dev/enola/core/grpc/EnolaGrpcService.java b/java/dev/enola/core/grpc/EnolaGrpcService.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/grpc/EnolaGrpcService.java rename to java/dev/enola/core/grpc/EnolaGrpcService.java diff --git a/core/impl/src/main/java/dev/enola/core/grpc/ServiceProvider.java b/java/dev/enola/core/grpc/ServiceProvider.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/grpc/ServiceProvider.java rename to java/dev/enola/core/grpc/ServiceProvider.java diff --git a/core/impl/src/main/java/dev/enola/core/iri/URITemplateMatcherChain.java b/java/dev/enola/core/iri/URITemplateMatcherChain.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/iri/URITemplateMatcherChain.java rename to java/dev/enola/core/iri/URITemplateMatcherChain.java diff --git a/core/impl/src/test/java/dev/enola/core/iri/URITemplateMatcherChainTest.java b/java/dev/enola/core/iri/URITemplateMatcherChainTest.java similarity index 100% rename from core/impl/src/test/java/dev/enola/core/iri/URITemplateMatcherChainTest.java rename to java/dev/enola/core/iri/URITemplateMatcherChainTest.java diff --git a/core/impl/src/main/java/dev/enola/core/iri/URITemplateSplitter.java b/java/dev/enola/core/iri/URITemplateSplitter.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/iri/URITemplateSplitter.java rename to java/dev/enola/core/iri/URITemplateSplitter.java diff --git a/core/impl/src/test/java/dev/enola/core/iri/URITemplateSplitterTest.java b/java/dev/enola/core/iri/URITemplateSplitterTest.java similarity index 100% rename from core/impl/src/test/java/dev/enola/core/iri/URITemplateSplitterTest.java rename to java/dev/enola/core/iri/URITemplateSplitterTest.java diff --git a/core/impl/src/test/java/dev/enola/core/iri/URITemplateTest.java b/java/dev/enola/core/iri/URITemplateTest.java similarity index 100% rename from core/impl/src/test/java/dev/enola/core/iri/URITemplateTest.java rename to java/dev/enola/core/iri/URITemplateTest.java diff --git a/core/impl/src/main/java/dev/enola/core/message/ProtoEnumValueToThingConnector.java b/java/dev/enola/core/message/ProtoEnumValueToThingConnector.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/message/ProtoEnumValueToThingConnector.java rename to java/dev/enola/core/message/ProtoEnumValueToThingConnector.java diff --git a/core/impl/src/test/java/dev/enola/core/message/ProtoEnumValueToThingConnectorTest.java b/java/dev/enola/core/message/ProtoEnumValueToThingConnectorTest.java similarity index 100% rename from core/impl/src/test/java/dev/enola/core/message/ProtoEnumValueToThingConnectorTest.java rename to java/dev/enola/core/message/ProtoEnumValueToThingConnectorTest.java diff --git a/core/impl/src/main/java/dev/enola/core/message/ProtoFieldToThingConnector.java b/java/dev/enola/core/message/ProtoFieldToThingConnector.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/message/ProtoFieldToThingConnector.java rename to java/dev/enola/core/message/ProtoFieldToThingConnector.java diff --git a/core/impl/src/main/java/dev/enola/core/message/ProtoMessageToThingConnector.java b/java/dev/enola/core/message/ProtoMessageToThingConnector.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/message/ProtoMessageToThingConnector.java rename to java/dev/enola/core/message/ProtoMessageToThingConnector.java diff --git a/core/impl/src/main/java/dev/enola/core/message/ProtoToThingConnector.java b/java/dev/enola/core/message/ProtoToThingConnector.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/message/ProtoToThingConnector.java rename to java/dev/enola/core/message/ProtoToThingConnector.java diff --git a/core/impl/src/main/java/dev/enola/core/meta/EntityAspectWithRepository.java b/java/dev/enola/core/meta/EntityAspectWithRepository.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/meta/EntityAspectWithRepository.java rename to java/dev/enola/core/meta/EntityAspectWithRepository.java diff --git a/core/impl/src/main/java/dev/enola/core/meta/EntityKindAspect.java b/java/dev/enola/core/meta/EntityKindAspect.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/meta/EntityKindAspect.java rename to java/dev/enola/core/meta/EntityKindAspect.java diff --git a/core/impl/src/main/java/dev/enola/core/meta/EntityKindRepository.java b/java/dev/enola/core/meta/EntityKindRepository.java similarity index 99% rename from core/impl/src/main/java/dev/enola/core/meta/EntityKindRepository.java rename to java/dev/enola/core/meta/EntityKindRepository.java index c0124d0b6..2412d627c 100644 --- a/core/impl/src/main/java/dev/enola/core/meta/EntityKindRepository.java +++ b/java/dev/enola/core/meta/EntityKindRepository.java @@ -45,7 +45,7 @@ public EntityKindRepository() { try { put(EntityKindAspect.ENTITY_KIND_ENTITY_KIND); try { - load(new ClasspathResource("schema.textproto")); + load(new ClasspathResource("enola.dev/schema.textproto")); } catch (IOException e) { throw new IllegalStateException("Built-in ClasspathResource missing?!", e); } diff --git a/core/impl/src/test/java/dev/enola/core/meta/EntityKindRepositoryTest.java b/java/dev/enola/core/meta/EntityKindRepositoryTest.java similarity index 100% rename from core/impl/src/test/java/dev/enola/core/meta/EntityKindRepositoryTest.java rename to java/dev/enola/core/meta/EntityKindRepositoryTest.java diff --git a/core/impl/src/main/java/dev/enola/core/meta/EntityKindValidations.java b/java/dev/enola/core/meta/EntityKindValidations.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/meta/EntityKindValidations.java rename to java/dev/enola/core/meta/EntityKindValidations.java diff --git a/core/impl/src/test/java/dev/enola/core/meta/EntityKindValidationsTest.java b/java/dev/enola/core/meta/EntityKindValidationsTest.java similarity index 100% rename from core/impl/src/test/java/dev/enola/core/meta/EntityKindValidationsTest.java rename to java/dev/enola/core/meta/EntityKindValidationsTest.java diff --git a/core/impl/src/main/java/dev/enola/core/meta/SchemaAspect.java b/java/dev/enola/core/meta/SchemaAspect.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/meta/SchemaAspect.java rename to java/dev/enola/core/meta/SchemaAspect.java diff --git a/core/impl/src/test/java/dev/enola/core/meta/SchemaAspectTest.java b/java/dev/enola/core/meta/SchemaAspectTest.java similarity index 100% rename from core/impl/src/test/java/dev/enola/core/meta/SchemaAspectTest.java rename to java/dev/enola/core/meta/SchemaAspectTest.java diff --git a/core/impl/src/test/java/dev/enola/core/meta/TypeRepositoryTest.java b/java/dev/enola/core/meta/TypeRepositoryTest.java similarity index 100% rename from core/impl/src/test/java/dev/enola/core/meta/TypeRepositoryTest.java rename to java/dev/enola/core/meta/TypeRepositoryTest.java diff --git a/core/impl/src/main/java/dev/enola/core/meta/docgen/GraphvizGenerator.java b/java/dev/enola/core/meta/docgen/GraphvizGenerator.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/meta/docgen/GraphvizGenerator.java rename to java/dev/enola/core/meta/docgen/GraphvizGenerator.java diff --git a/core/impl/src/main/java/dev/enola/core/meta/docgen/MarkdownDocGenerator.java b/java/dev/enola/core/meta/docgen/MarkdownDocGenerator.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/meta/docgen/MarkdownDocGenerator.java rename to java/dev/enola/core/meta/docgen/MarkdownDocGenerator.java diff --git a/core/impl/src/test/java/dev/enola/core/meta/docgen/MarkdownDocGeneratorTest.java b/java/dev/enola/core/meta/docgen/MarkdownDocGeneratorTest.java similarity index 100% rename from core/impl/src/test/java/dev/enola/core/meta/docgen/MarkdownDocGeneratorTest.java rename to java/dev/enola/core/meta/docgen/MarkdownDocGeneratorTest.java diff --git a/core/impl/src/main/java/dev/enola/core/meta/docgen/MermaidGenerator.java b/java/dev/enola/core/meta/docgen/MermaidGenerator.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/meta/docgen/MermaidGenerator.java rename to java/dev/enola/core/meta/docgen/MermaidGenerator.java diff --git a/core/impl/src/main/java/dev/enola/core/meta/docgen/Options.java b/java/dev/enola/core/meta/docgen/Options.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/meta/docgen/Options.java rename to java/dev/enola/core/meta/docgen/Options.java diff --git a/core/impl/src/main/java/dev/enola/core/meta/docgen/StringUtil.java b/java/dev/enola/core/meta/docgen/StringUtil.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/meta/docgen/StringUtil.java rename to java/dev/enola/core/meta/docgen/StringUtil.java diff --git a/core/impl/src/test/java/dev/enola/core/meta/docgen/StringUtilTest.java b/java/dev/enola/core/meta/docgen/StringUtilTest.java similarity index 100% rename from core/impl/src/test/java/dev/enola/core/meta/docgen/StringUtilTest.java rename to java/dev/enola/core/meta/docgen/StringUtilTest.java diff --git a/core/lib/src/main/java/dev/enola/core/meta/enola_meta.proto b/java/dev/enola/core/meta/enola_meta.proto similarity index 98% rename from core/lib/src/main/java/dev/enola/core/meta/enola_meta.proto rename to java/dev/enola/core/meta/enola_meta.proto index d2f9805d9..b52302870 100644 --- a/core/lib/src/main/java/dev/enola/core/meta/enola_meta.proto +++ b/java/dev/enola/core/meta/enola_meta.proto @@ -18,9 +18,9 @@ syntax = "proto3"; package dev.enola.core.meta; -import "core/lib/src/main/java/dev/enola/core/enola_core.proto"; -import "core/lib/src/main/java/dev/enola/core/enola_ext.proto"; import "google/protobuf/empty.proto"; +import "java/dev/enola/core/enola_core.proto"; +import "java/dev/enola/core/enola_ext.proto"; option java_string_check_utf8 = true; option java_package = "dev.enola.core.meta.proto"; diff --git a/core/impl/src/main/java/dev/enola/core/resource/ResourceEnolaService.java b/java/dev/enola/core/resource/ResourceEnolaService.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/resource/ResourceEnolaService.java rename to java/dev/enola/core/resource/ResourceEnolaService.java diff --git a/core/impl/src/main/java/dev/enola/core/rosetta/RdfResourceIntoProtoThingConverter.java b/java/dev/enola/core/rosetta/RdfResourceIntoProtoThingConverter.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/rosetta/RdfResourceIntoProtoThingConverter.java rename to java/dev/enola/core/rosetta/RdfResourceIntoProtoThingConverter.java diff --git a/core/impl/src/main/java/dev/enola/core/rosetta/RdfResourceIntoThingConverter.java b/java/dev/enola/core/rosetta/RdfResourceIntoThingConverter.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/rosetta/RdfResourceIntoThingConverter.java rename to java/dev/enola/core/rosetta/RdfResourceIntoThingConverter.java diff --git a/core/impl/src/main/java/dev/enola/core/rosetta/ResourceIntoThingResourceConverter.java b/java/dev/enola/core/rosetta/ResourceIntoThingResourceConverter.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/rosetta/ResourceIntoThingResourceConverter.java rename to java/dev/enola/core/rosetta/ResourceIntoThingResourceConverter.java diff --git a/core/impl/src/main/java/dev/enola/core/rosetta/Rosetta.java b/java/dev/enola/core/rosetta/Rosetta.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/rosetta/Rosetta.java rename to java/dev/enola/core/rosetta/Rosetta.java diff --git a/core/impl/src/test/java/dev/enola/core/rosetta/RosettaTest.java b/java/dev/enola/core/rosetta/RosettaTest.java similarity index 100% rename from core/impl/src/test/java/dev/enola/core/rosetta/RosettaTest.java rename to java/dev/enola/core/rosetta/RosettaTest.java diff --git a/core/impl/src/main/java/dev/enola/core/thing/EmptyThingRepository.java b/java/dev/enola/core/thing/EmptyThingRepository.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/thing/EmptyThingRepository.java rename to java/dev/enola/core/thing/EmptyThingRepository.java diff --git a/core/impl/src/main/java/dev/enola/core/thing/ListThingService.java b/java/dev/enola/core/thing/ListThingService.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/thing/ListThingService.java rename to java/dev/enola/core/thing/ListThingService.java diff --git a/core/impl/src/main/java/dev/enola/core/thing/ThingConnector.java b/java/dev/enola/core/thing/ThingConnector.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/thing/ThingConnector.java rename to java/dev/enola/core/thing/ThingConnector.java diff --git a/core/impl/src/main/java/dev/enola/core/thing/ThingConnectorService.java b/java/dev/enola/core/thing/ThingConnectorService.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/thing/ThingConnectorService.java rename to java/dev/enola/core/thing/ThingConnectorService.java diff --git a/core/impl/src/main/java/dev/enola/core/thing/ThingConnectorsProvider.java b/java/dev/enola/core/thing/ThingConnectorsProvider.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/thing/ThingConnectorsProvider.java rename to java/dev/enola/core/thing/ThingConnectorsProvider.java diff --git a/core/impl/src/main/java/dev/enola/core/thing/ThingRepositoryThingService.java b/java/dev/enola/core/thing/ThingRepositoryThingService.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/thing/ThingRepositoryThingService.java rename to java/dev/enola/core/thing/ThingRepositoryThingService.java diff --git a/core/impl/src/main/java/dev/enola/core/thing/ThingService.java b/java/dev/enola/core/thing/ThingService.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/thing/ThingService.java rename to java/dev/enola/core/thing/ThingService.java diff --git a/core/impl/src/main/java/dev/enola/core/type/TypeRepositoryBuilder.java b/java/dev/enola/core/type/TypeRepositoryBuilder.java similarity index 100% rename from core/impl/src/main/java/dev/enola/core/type/TypeRepositoryBuilder.java rename to java/dev/enola/core/type/TypeRepositoryBuilder.java diff --git a/core/lib/src/main/java/dev/enola/core/util/enola_util.proto b/java/dev/enola/core/util/enola_util.proto similarity index 100% rename from core/lib/src/main/java/dev/enola/core/util/enola_util.proto rename to java/dev/enola/core/util/enola_util.proto diff --git a/core/lib/src/main/java/dev/enola/core/view/EnolaMessages.java b/java/dev/enola/core/view/EnolaMessages.java similarity index 100% rename from core/lib/src/main/java/dev/enola/core/view/EnolaMessages.java rename to java/dev/enola/core/view/EnolaMessages.java diff --git a/java/dev/enola/data/BUILD b/java/dev/enola/data/BUILD index db55a3e4c..06a417d45 100644 --- a/java/dev/enola/data/BUILD +++ b/java/dev/enola/data/BUILD @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@rules_java//java:defs.bzl", "java_library", "java_test") +load("@rules_java//java:defs.bzl", "java_library") java_library( name = "data", diff --git a/java/dev/enola/model/BUILD b/java/dev/enola/model/BUILD index d22a78881..d1871697e 100644 --- a/java/dev/enola/model/BUILD +++ b/java/dev/enola/model/BUILD @@ -24,9 +24,9 @@ java_library( ), visibility = ["//:__subpackages__"], deps = [ - "//common/thing:thing_java", "//java/dev/enola/common/convert", "//java/dev/enola/datatype", + "//java/dev/enola/thing:thing_java", "@maven//:com_google_errorprone_error_prone_annotations", "@maven//:com_google_guava_guava", "@maven//:org_slf4j_slf4j_api", diff --git a/common/rdf/BUILD b/java/dev/enola/rdf/BUILD similarity index 64% rename from common/rdf/BUILD rename to java/dev/enola/rdf/BUILD index ad58b2ce1..e41171652 100644 --- a/common/rdf/BUILD +++ b/java/dev/enola/rdf/BUILD @@ -14,20 +14,27 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@rules_java//java:defs.bzl", "java_library", "java_test") +load("@rules_java//java:defs.bzl", "java_library") +load("//tools/bazel:junit.bzl", "junit_tests") java_library( name = "rdf", - srcs = glob(["src/main/java/**/*.java"]), + srcs = glob( + ["*.java"], + exclude = [ + "*Test.java", + "*Subject.java", + ], + ), plugins = ["//tools/bazel/java_plugin:autoservice"], visibility = ["//:__subpackages__"], deps = [ - "//common/protobuf", - "//common/thing:thing_java", - "//common/thing:thing_java_proto", - "//common/yamljson", "//java/dev/enola/common/convert", "//java/dev/enola/common/io", + "//java/dev/enola/common/protobuf", + "//java/dev/enola/common/yamljson", + "//java/dev/enola/thing:thing_java", + "//java/dev/enola/thing:thing_java_proto", "@maven//:com_fasterxml_jackson_core_jackson_databind", "@maven//:com_google_auto_service_auto_service_annotations", "@maven//:com_google_guava_guava", @@ -42,32 +49,22 @@ java_library( ], ) -[java_test( - name = name[:-len(".java")], - size = "small", - srcs = glob(["src/test/java/**/*.java"]), - resources = glob(["src/test/resources/**/*"]), - runtime_deps = [ - "@maven//:org_slf4j_slf4j_simple", - ], +junit_tests( + name = "tests", + srcs = glob(["*Test.java"]), + srcs_utils = glob(["*Subject.java"]), deps = [ ":rdf", - "//common/protobuf", - "//common/protobuf:test_java_proto", - "//common/thing:thing_java", - "//common/thing:thing_java_proto", - "//common/yamljson", "//java/dev/enola/common/convert", "//java/dev/enola/common/io", - "@maven//:com_google_guava_guava", - "@maven//:com_google_protobuf_protobuf_java", - "@maven//:com_google_truth_extensions_truth_proto_extension", - "@maven//:com_google_truth_truth", - "@maven//:junit_junit", + "//java/dev/enola/common/protobuf", + "//java/dev/enola/common/protobuf:test_java_proto", + "//java/dev/enola/common/yamljson", + "//java/dev/enola/thing:thing_java", + "//java/dev/enola/thing:thing_java_proto", + "//test", "@maven//:org_eclipse_rdf4j_rdf4j_model", "@maven//:org_eclipse_rdf4j_rdf4j_model_api", "@maven//:org_eclipse_rdf4j_rdf4j_model_vocabulary", ], -) for name in glob([ - "src/test/java/**/*Test.java", -])] +) diff --git a/common/rdf/src/test/java/dev/enola/rdf/LearnRdf4jTest.java b/java/dev/enola/rdf/LearnRdf4jTest.java similarity index 100% rename from common/rdf/src/test/java/dev/enola/rdf/LearnRdf4jTest.java rename to java/dev/enola/rdf/LearnRdf4jTest.java diff --git a/common/rdf/src/test/java/dev/enola/rdf/ModelSubject.java b/java/dev/enola/rdf/ModelSubject.java similarity index 100% rename from common/rdf/src/test/java/dev/enola/rdf/ModelSubject.java rename to java/dev/enola/rdf/ModelSubject.java diff --git a/common/rdf/src/test/java/dev/enola/rdf/RdfMediaTypeTest.java b/java/dev/enola/rdf/RdfMediaTypeTest.java similarity index 100% rename from common/rdf/src/test/java/dev/enola/rdf/RdfMediaTypeTest.java rename to java/dev/enola/rdf/RdfMediaTypeTest.java diff --git a/common/rdf/src/main/java/dev/enola/rdf/RdfMediaTypeYamlLd.java b/java/dev/enola/rdf/RdfMediaTypeYamlLd.java similarity index 100% rename from common/rdf/src/main/java/dev/enola/rdf/RdfMediaTypeYamlLd.java rename to java/dev/enola/rdf/RdfMediaTypeYamlLd.java diff --git a/common/rdf/src/main/java/dev/enola/rdf/RdfMediaTypes.java b/java/dev/enola/rdf/RdfMediaTypes.java similarity index 100% rename from common/rdf/src/main/java/dev/enola/rdf/RdfMediaTypes.java rename to java/dev/enola/rdf/RdfMediaTypes.java diff --git a/common/rdf/src/main/java/dev/enola/rdf/RdfReaderConverter.java b/java/dev/enola/rdf/RdfReaderConverter.java similarity index 100% rename from common/rdf/src/main/java/dev/enola/rdf/RdfReaderConverter.java rename to java/dev/enola/rdf/RdfReaderConverter.java diff --git a/common/rdf/src/main/java/dev/enola/rdf/RdfReaderConverterInto.java b/java/dev/enola/rdf/RdfReaderConverterInto.java similarity index 100% rename from common/rdf/src/main/java/dev/enola/rdf/RdfReaderConverterInto.java rename to java/dev/enola/rdf/RdfReaderConverterInto.java diff --git a/common/rdf/src/test/java/dev/enola/rdf/RdfReaderWriterTest.java b/java/dev/enola/rdf/RdfReaderWriterTest.java similarity index 100% rename from common/rdf/src/test/java/dev/enola/rdf/RdfReaderWriterTest.java rename to java/dev/enola/rdf/RdfReaderWriterTest.java diff --git a/common/rdf/src/main/java/dev/enola/rdf/RdfResourceConverter.java b/java/dev/enola/rdf/RdfResourceConverter.java similarity index 100% rename from common/rdf/src/main/java/dev/enola/rdf/RdfResourceConverter.java rename to java/dev/enola/rdf/RdfResourceConverter.java diff --git a/common/rdf/src/main/java/dev/enola/rdf/RdfThingConverter.java b/java/dev/enola/rdf/RdfThingConverter.java similarity index 100% rename from common/rdf/src/main/java/dev/enola/rdf/RdfThingConverter.java rename to java/dev/enola/rdf/RdfThingConverter.java diff --git a/common/rdf/src/test/java/dev/enola/rdf/RdfThingConverterTest.java b/java/dev/enola/rdf/RdfThingConverterTest.java similarity index 100% rename from common/rdf/src/test/java/dev/enola/rdf/RdfThingConverterTest.java rename to java/dev/enola/rdf/RdfThingConverterTest.java diff --git a/common/rdf/src/main/java/dev/enola/rdf/RdfWriterConverter.java b/java/dev/enola/rdf/RdfWriterConverter.java similarity index 100% rename from common/rdf/src/main/java/dev/enola/rdf/RdfWriterConverter.java rename to java/dev/enola/rdf/RdfWriterConverter.java diff --git a/common/rdf/src/test/java/dev/enola/rdf/ResourceSubject.java b/java/dev/enola/rdf/ResourceSubject.java similarity index 100% rename from common/rdf/src/test/java/dev/enola/rdf/ResourceSubject.java rename to java/dev/enola/rdf/ResourceSubject.java diff --git a/common/rdf/src/main/java/dev/enola/rdf/ThingRdfConverter.java b/java/dev/enola/rdf/ThingRdfConverter.java similarity index 100% rename from common/rdf/src/main/java/dev/enola/rdf/ThingRdfConverter.java rename to java/dev/enola/rdf/ThingRdfConverter.java diff --git a/common/rdf/src/test/java/dev/enola/rdf/WellKnownIRIsTest.java b/java/dev/enola/rdf/WellKnownIRIsTest.java similarity index 100% rename from common/rdf/src/test/java/dev/enola/rdf/WellKnownIRIsTest.java rename to java/dev/enola/rdf/WellKnownIRIsTest.java diff --git a/common/thing/BUILD b/java/dev/enola/thing/BUILD similarity index 77% rename from common/thing/BUILD rename to java/dev/enola/thing/BUILD index 1d4bc376c..027e8c14d 100644 --- a/common/thing/BUILD +++ b/java/dev/enola/thing/BUILD @@ -14,10 +14,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@rules_java//java:defs.bzl", "java_library", "java_proto_library", "java_test") +load("@rules_java//java:defs.bzl", "java_library", "java_proto_library") load("@rules_proto//proto:defs.bzl", "proto_library") load("@rules_proto_grpc//buf:defs.bzl", "buf_proto_lint_test") load("@rules_proto_grpc//doc:defs.bzl", "doc_markdown_compile") +load("//tools/bazel:junit.bzl", "junit_tests") proto_library( name = "thing_proto", @@ -58,7 +59,10 @@ java_proto_library( java_library( name = "thing_java", - srcs = glob(["src/main/java/**/*.java"]), + srcs = glob( + ["**/*.java"], + exclude = ["**/*Test.java"], + ), plugins = ["//tools/bazel/java_plugin:autoservice"], visibility = ["//:__subpackages__"], deps = [ @@ -79,33 +83,21 @@ java_library( ], ) -[java_test( - name = name[:-len(".java")], - size = "small", - srcs = glob(["src/test/java/**/*.java"]), - resources = glob(["src/test/resources/**/*"]), - runtime_deps = [ - "@maven//:org_slf4j_slf4j_simple", - ], +junit_tests( + name = "tests", + srcs = glob(["**/*Test.java"]), deps = [ ":thing_java", ":thing_java_proto", - "//common/protobuf", - "//common/protobuf:test_java_proto", - "//common/rdf", "//java/dev/enola/common/convert", "//java/dev/enola/common/function", "//java/dev/enola/common/io", + "//java/dev/enola/common/protobuf", + "//java/dev/enola/common/protobuf:test_java_proto", "//java/dev/enola/data", "//java/dev/enola/datatype", "//java/dev/enola/model", - "@maven//:com_google_guava_guava", - "@maven//:com_google_protobuf_protobuf_java", - "@maven//:com_google_protobuf_protobuf_java_util", - "@maven//:com_google_truth_extensions_truth_proto_extension", - "@maven//:com_google_truth_truth", - "@maven//:junit_junit", + "//java/dev/enola/rdf", + "//test", ], -) for name in glob([ - "src/test/java/**/*Test.java", -])] +) diff --git a/common/thing/src/main/java/dev/enola/thing/ImmutableThing.java b/java/dev/enola/thing/ImmutableThing.java similarity index 100% rename from common/thing/src/main/java/dev/enola/thing/ImmutableThing.java rename to java/dev/enola/thing/ImmutableThing.java diff --git a/common/thing/src/test/java/dev/enola/thing/ImmutableThingTest.java b/java/dev/enola/thing/ImmutableThingTest.java similarity index 100% rename from common/thing/src/test/java/dev/enola/thing/ImmutableThingTest.java rename to java/dev/enola/thing/ImmutableThingTest.java diff --git a/common/thing/src/main/java/dev/enola/thing/KIRI.java b/java/dev/enola/thing/KIRI.java similarity index 100% rename from common/thing/src/main/java/dev/enola/thing/KIRI.java rename to java/dev/enola/thing/KIRI.java diff --git a/common/thing/src/main/java/dev/enola/thing/LangString.java b/java/dev/enola/thing/LangString.java similarity index 100% rename from common/thing/src/main/java/dev/enola/thing/LangString.java rename to java/dev/enola/thing/LangString.java diff --git a/common/thing/src/main/java/dev/enola/thing/Link.java b/java/dev/enola/thing/Link.java similarity index 100% rename from common/thing/src/main/java/dev/enola/thing/Link.java rename to java/dev/enola/thing/Link.java diff --git a/common/thing/src/main/java/dev/enola/thing/Literal.java b/java/dev/enola/thing/Literal.java similarity index 100% rename from common/thing/src/main/java/dev/enola/thing/Literal.java rename to java/dev/enola/thing/Literal.java diff --git a/common/thing/src/main/java/dev/enola/thing/Thing.java b/java/dev/enola/thing/Thing.java similarity index 100% rename from common/thing/src/main/java/dev/enola/thing/Thing.java rename to java/dev/enola/thing/Thing.java diff --git a/common/thing/src/main/java/dev/enola/thing/ThingConverterInto.java b/java/dev/enola/thing/ThingConverterInto.java similarity index 100% rename from common/thing/src/main/java/dev/enola/thing/ThingConverterInto.java rename to java/dev/enola/thing/ThingConverterInto.java diff --git a/common/thing/src/main/java/dev/enola/thing/ThingMediaTypes.java b/java/dev/enola/thing/ThingMediaTypes.java similarity index 100% rename from common/thing/src/main/java/dev/enola/thing/ThingMediaTypes.java rename to java/dev/enola/thing/ThingMediaTypes.java diff --git a/common/thing/src/test/java/dev/enola/thing/ThingMediaTypesTest.java b/java/dev/enola/thing/ThingMediaTypesTest.java similarity index 100% rename from common/thing/src/test/java/dev/enola/thing/ThingMediaTypesTest.java rename to java/dev/enola/thing/ThingMediaTypesTest.java diff --git a/common/thing/src/main/java/dev/enola/thing/ThingMemoryRepositoryROBuilder.java b/java/dev/enola/thing/ThingMemoryRepositoryROBuilder.java similarity index 100% rename from common/thing/src/main/java/dev/enola/thing/ThingMemoryRepositoryROBuilder.java rename to java/dev/enola/thing/ThingMemoryRepositoryROBuilder.java diff --git a/common/thing/src/main/java/dev/enola/thing/ThingMemoryRepositoryRW.java b/java/dev/enola/thing/ThingMemoryRepositoryRW.java similarity index 100% rename from common/thing/src/main/java/dev/enola/thing/ThingMemoryRepositoryRW.java rename to java/dev/enola/thing/ThingMemoryRepositoryRW.java diff --git a/common/thing/src/main/java/dev/enola/thing/ThingMetadataProvider.java b/java/dev/enola/thing/ThingMetadataProvider.java similarity index 100% rename from common/thing/src/main/java/dev/enola/thing/ThingMetadataProvider.java rename to java/dev/enola/thing/ThingMetadataProvider.java diff --git a/common/thing/src/test/java/dev/enola/thing/ThingMetadataProviderTest.java b/java/dev/enola/thing/ThingMetadataProviderTest.java similarity index 100% rename from common/thing/src/test/java/dev/enola/thing/ThingMetadataProviderTest.java rename to java/dev/enola/thing/ThingMetadataProviderTest.java diff --git a/common/thing/src/main/java/dev/enola/thing/ThingProvider.java b/java/dev/enola/thing/ThingProvider.java similarity index 100% rename from common/thing/src/main/java/dev/enola/thing/ThingProvider.java rename to java/dev/enola/thing/ThingProvider.java diff --git a/common/thing/src/test/java/dev/enola/thing/ThingRepositoriesTest.java b/java/dev/enola/thing/ThingRepositoriesTest.java similarity index 100% rename from common/thing/src/test/java/dev/enola/thing/ThingRepositoriesTest.java rename to java/dev/enola/thing/ThingRepositoriesTest.java diff --git a/common/thing/src/main/java/dev/enola/thing/ThingRepository.java b/java/dev/enola/thing/ThingRepository.java similarity index 100% rename from common/thing/src/main/java/dev/enola/thing/ThingRepository.java rename to java/dev/enola/thing/ThingRepository.java diff --git a/common/thing/src/main/java/dev/enola/thing/gen/DocGenConstants.java b/java/dev/enola/thing/gen/DocGenConstants.java similarity index 100% rename from common/thing/src/main/java/dev/enola/thing/gen/DocGenConstants.java rename to java/dev/enola/thing/gen/DocGenConstants.java diff --git a/common/thing/src/main/java/dev/enola/thing/gen/Relativizer.java b/java/dev/enola/thing/gen/Relativizer.java similarity index 100% rename from common/thing/src/main/java/dev/enola/thing/gen/Relativizer.java rename to java/dev/enola/thing/gen/Relativizer.java diff --git a/common/thing/src/test/java/dev/enola/thing/gen/RelativizerTest.java b/java/dev/enola/thing/gen/RelativizerTest.java similarity index 100% rename from common/thing/src/test/java/dev/enola/thing/gen/RelativizerTest.java rename to java/dev/enola/thing/gen/RelativizerTest.java diff --git a/common/thing/src/main/java/dev/enola/thing/gen/markdown/MarkdownSiteGenerator.java b/java/dev/enola/thing/gen/markdown/MarkdownSiteGenerator.java similarity index 100% rename from common/thing/src/main/java/dev/enola/thing/gen/markdown/MarkdownSiteGenerator.java rename to java/dev/enola/thing/gen/markdown/MarkdownSiteGenerator.java diff --git a/common/thing/src/test/java/dev/enola/thing/gen/MarkdownSiteGeneratorTest.java b/java/dev/enola/thing/gen/markdown/MarkdownSiteGeneratorTest.java similarity index 95% rename from common/thing/src/test/java/dev/enola/thing/gen/MarkdownSiteGeneratorTest.java rename to java/dev/enola/thing/gen/markdown/MarkdownSiteGeneratorTest.java index 5663add91..39778c6a2 100644 --- a/common/thing/src/test/java/dev/enola/thing/gen/MarkdownSiteGeneratorTest.java +++ b/java/dev/enola/thing/gen/markdown/MarkdownSiteGeneratorTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package dev.enola.thing.gen; +package dev.enola.thing.gen.markdown; import static com.google.common.truth.Truth.assertThat; @@ -25,7 +25,7 @@ import dev.enola.common.io.resource.ResourceProviders; import dev.enola.rdf.RdfReaderConverter; import dev.enola.rdf.RdfThingConverter; -import dev.enola.thing.gen.markdown.MarkdownSiteGenerator; +import dev.enola.thing.gen.DocGenConstants; import org.junit.Test; diff --git a/common/thing/src/main/java/dev/enola/thing/gen/markdown/MarkdownThingGenerator.java b/java/dev/enola/thing/gen/markdown/MarkdownThingGenerator.java similarity index 100% rename from common/thing/src/main/java/dev/enola/thing/gen/markdown/MarkdownThingGenerator.java rename to java/dev/enola/thing/gen/markdown/MarkdownThingGenerator.java diff --git a/common/thing/src/main/java/dev/enola/thing/io/Loader.java b/java/dev/enola/thing/io/Loader.java similarity index 100% rename from common/thing/src/main/java/dev/enola/thing/io/Loader.java rename to java/dev/enola/thing/io/Loader.java diff --git a/common/thing/src/main/java/dev/enola/thing/io/ResourceIntoThingConverter.java b/java/dev/enola/thing/io/ResourceIntoThingConverter.java similarity index 100% rename from common/thing/src/main/java/dev/enola/thing/io/ResourceIntoThingConverter.java rename to java/dev/enola/thing/io/ResourceIntoThingConverter.java diff --git a/common/thing/src/main/java/dev/enola/thing/message/JavaThingToProtoThingConverter.java b/java/dev/enola/thing/message/JavaThingToProtoThingConverter.java similarity index 100% rename from common/thing/src/main/java/dev/enola/thing/message/JavaThingToProtoThingConverter.java rename to java/dev/enola/thing/message/JavaThingToProtoThingConverter.java diff --git a/common/thing/src/main/java/dev/enola/thing/message/MessageToThingConverter.java b/java/dev/enola/thing/message/MessageToThingConverter.java similarity index 100% rename from common/thing/src/main/java/dev/enola/thing/message/MessageToThingConverter.java rename to java/dev/enola/thing/message/MessageToThingConverter.java diff --git a/common/thing/src/test/java/dev/enola/thing/message/MessageToThingConverterTest.java b/java/dev/enola/thing/message/MessageToThingConverterTest.java similarity index 100% rename from common/thing/src/test/java/dev/enola/thing/message/MessageToThingConverterTest.java rename to java/dev/enola/thing/message/MessageToThingConverterTest.java diff --git a/common/thing/src/main/java/dev/enola/thing/message/MessageWithIRI.java b/java/dev/enola/thing/message/MessageWithIRI.java similarity index 100% rename from common/thing/src/main/java/dev/enola/thing/message/MessageWithIRI.java rename to java/dev/enola/thing/message/MessageWithIRI.java diff --git a/common/thing/src/main/java/dev/enola/thing/message/ObjectToValueConverter.java b/java/dev/enola/thing/message/ObjectToValueConverter.java similarity index 100% rename from common/thing/src/main/java/dev/enola/thing/message/ObjectToValueConverter.java rename to java/dev/enola/thing/message/ObjectToValueConverter.java diff --git a/common/thing/src/main/java/dev/enola/thing/message/ProtoThingIntoJavaThingBuilderConverter.java b/java/dev/enola/thing/message/ProtoThingIntoJavaThingBuilderConverter.java similarity index 100% rename from common/thing/src/main/java/dev/enola/thing/message/ProtoThingIntoJavaThingBuilderConverter.java rename to java/dev/enola/thing/message/ProtoThingIntoJavaThingBuilderConverter.java diff --git a/common/thing/src/main/java/dev/enola/thing/message/ProtoThingProvider.java b/java/dev/enola/thing/message/ProtoThingProvider.java similarity index 100% rename from common/thing/src/main/java/dev/enola/thing/message/ProtoThingProvider.java rename to java/dev/enola/thing/message/ProtoThingProvider.java diff --git a/common/thing/src/main/java/dev/enola/thing/message/ProtoThingRepository.java b/java/dev/enola/thing/message/ProtoThingRepository.java similarity index 100% rename from common/thing/src/main/java/dev/enola/thing/message/ProtoThingRepository.java rename to java/dev/enola/thing/message/ProtoThingRepository.java diff --git a/common/thing/src/main/java/dev/enola/thing/message/ProtoTypes.java b/java/dev/enola/thing/message/ProtoTypes.java similarity index 100% rename from common/thing/src/main/java/dev/enola/thing/message/ProtoTypes.java rename to java/dev/enola/thing/message/ProtoTypes.java diff --git a/common/thing/src/main/java/dev/enola/thing/message/ThingAdapter.java b/java/dev/enola/thing/message/ThingAdapter.java similarity index 100% rename from common/thing/src/main/java/dev/enola/thing/message/ThingAdapter.java rename to java/dev/enola/thing/message/ThingAdapter.java diff --git a/common/thing/src/test/java/dev/enola/thing/message/ThingConvertersTest.java b/java/dev/enola/thing/message/ThingConvertersTest.java similarity index 100% rename from common/thing/src/test/java/dev/enola/thing/message/ThingConvertersTest.java rename to java/dev/enola/thing/message/ThingConvertersTest.java diff --git a/common/thing/src/main/java/dev/enola/thing/message/ThingExt.java b/java/dev/enola/thing/message/ThingExt.java similarity index 100% rename from common/thing/src/main/java/dev/enola/thing/message/ThingExt.java rename to java/dev/enola/thing/message/ThingExt.java diff --git a/common/thing/src/main/java/dev/enola/thing/message/ThingProviderAdapter.java b/java/dev/enola/thing/message/ThingProviderAdapter.java similarity index 100% rename from common/thing/src/main/java/dev/enola/thing/message/ThingProviderAdapter.java rename to java/dev/enola/thing/message/ThingProviderAdapter.java diff --git a/common/thing/src/main/java/dev/enola/thing/message/package-info.java b/java/dev/enola/thing/message/package-info.java similarity index 100% rename from common/thing/src/main/java/dev/enola/thing/message/package-info.java rename to java/dev/enola/thing/message/package-info.java diff --git a/common/thing/src/main/java/dev/enola/thing/spi/AbstractThing.java b/java/dev/enola/thing/spi/AbstractThing.java similarity index 100% rename from common/thing/src/main/java/dev/enola/thing/spi/AbstractThing.java rename to java/dev/enola/thing/spi/AbstractThing.java diff --git a/common/thing/thing.proto b/java/dev/enola/thing/thing.proto similarity index 100% rename from common/thing/thing.proto rename to java/dev/enola/thing/thing.proto diff --git a/java/dev/enola/web/BUILD b/java/dev/enola/web/BUILD new file mode 100644 index 000000000..759352f96 --- /dev/null +++ b/java/dev/enola/web/BUILD @@ -0,0 +1,61 @@ +# SPDX-License-Identifier: Apache-2.0 +# +# Copyright 2023 The Enola 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 +# +# 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, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +load("@rules_java//java:defs.bzl", "java_library") +load("//tools/bazel:junit.bzl", "junit_tests") + +java_library( + name = "web", + srcs = glob( + ["**/*.java"], + exclude = ["**/*Test.java"], + ), + javacopts = ["--enable-preview"], + resource_strip_prefix = "java/dev/enola/web/resources/", + resources = glob(["resources/**/*"]), + visibility = ["//:__subpackages__"], + deps = [ + "//java/dev/enola/common/convert", + "//java/dev/enola/common/io", + "//java/dev/enola/common/protobuf", + "//java/dev/enola/core", + "//java/dev/enola/core:core_java_grpc", + "//java/dev/enola/core:core_java_proto", + "//java/dev/enola/data", + "//java/dev/enola/datatype", + "//java/dev/enola/thing:thing_java", + "//java/dev/enola/thing:thing_java_proto", + "@maven//:com_google_guava_guava", + "@maven//:com_google_protobuf_protobuf_java", + "@maven//:org_slf4j_slf4j_api", + ], +) + +junit_tests( + name = "tests", + srcs = glob(["**/*Test.java"]), + jvm_flags = ["--enable-preview"], + runtime_deps = [ + "@maven//:org_slf4j_slf4j_simple", + ], + deps = [ + ":web", + "//java/dev/enola/common/io", + "//java/dev/enola/common/protobuf", + "//java/dev/enola/core", + "//java/dev/enola/core:core_java_proto", + ], +) diff --git a/web/api/src/main/java/dev/enola/web/StaticWebHandler.java b/java/dev/enola/web/StaticWebHandler.java similarity index 100% rename from web/api/src/main/java/dev/enola/web/StaticWebHandler.java rename to java/dev/enola/web/StaticWebHandler.java diff --git a/web/api/src/main/java/dev/enola/web/WebHandler.java b/java/dev/enola/web/WebHandler.java similarity index 100% rename from web/api/src/main/java/dev/enola/web/WebHandler.java rename to java/dev/enola/web/WebHandler.java diff --git a/web/api/src/main/java/dev/enola/web/WebServer.java b/java/dev/enola/web/WebServer.java similarity index 100% rename from web/api/src/main/java/dev/enola/web/WebServer.java rename to java/dev/enola/web/WebServer.java diff --git a/web/ui/src/main/resources/static/404.html b/java/dev/enola/web/resources/static/404.html similarity index 100% rename from web/ui/src/main/resources/static/404.html rename to java/dev/enola/web/resources/static/404.html diff --git a/web/sun/src/test/resources/static/hello.txt b/java/dev/enola/web/resources/static/hello.txt similarity index 100% rename from web/sun/src/test/resources/static/hello.txt rename to java/dev/enola/web/resources/static/hello.txt diff --git a/web/ui/src/main/resources/static/main.css b/java/dev/enola/web/resources/static/main.css similarity index 100% rename from web/ui/src/main/resources/static/main.css rename to java/dev/enola/web/resources/static/main.css diff --git a/web/ui/src/main/resources/templates/index.html b/java/dev/enola/web/resources/templates/index.html similarity index 100% rename from web/ui/src/main/resources/templates/index.html rename to java/dev/enola/web/resources/templates/index.html diff --git a/web/rest/src/main/java/dev/enola/web/rest/RestAPI.java b/java/dev/enola/web/rest/RestAPI.java similarity index 100% rename from web/rest/src/main/java/dev/enola/web/rest/RestAPI.java rename to java/dev/enola/web/rest/RestAPI.java diff --git a/web/rest/src/test/java/dev/enola/web/rest/RestTest.java b/java/dev/enola/web/rest/RestTest.java similarity index 100% rename from web/rest/src/test/java/dev/enola/web/rest/RestTest.java rename to java/dev/enola/web/rest/RestTest.java diff --git a/web/sun/src/main/java/dev/enola/web/sun/SunServer.java b/java/dev/enola/web/sun/SunServer.java similarity index 100% rename from web/sun/src/main/java/dev/enola/web/sun/SunServer.java rename to java/dev/enola/web/sun/SunServer.java diff --git a/web/sun/src/test/java/dev/enola/web/sun/test/SunServerTest.java b/java/dev/enola/web/sun/SunServerTest.java similarity index 97% rename from web/sun/src/test/java/dev/enola/web/sun/test/SunServerTest.java rename to java/dev/enola/web/sun/SunServerTest.java index c23d0c85d..cac9fd8c9 100644 --- a/web/sun/src/test/java/dev/enola/web/sun/test/SunServerTest.java +++ b/java/dev/enola/web/sun/SunServerTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package dev.enola.web.sun.test; +package dev.enola.web.sun; import static com.google.common.truth.Truth.assertThat; import static com.google.common.util.concurrent.Futures.immediateFailedFuture; @@ -26,7 +26,6 @@ import dev.enola.common.io.resource.ResourceProviders; import dev.enola.common.io.resource.StringResource; import dev.enola.web.StaticWebHandler; -import dev.enola.web.sun.SunServer; import org.junit.Assert; import org.junit.Test; diff --git a/web/ui/src/main/java/dev/enola/web/ui/EnolaThingProvider.java b/java/dev/enola/web/ui/EnolaThingProvider.java similarity index 100% rename from web/ui/src/main/java/dev/enola/web/ui/EnolaThingProvider.java rename to java/dev/enola/web/ui/EnolaThingProvider.java diff --git a/web/ui/src/main/java/dev/enola/web/ui/NewThingUI.java b/java/dev/enola/web/ui/NewThingUI.java similarity index 100% rename from web/ui/src/main/java/dev/enola/web/ui/NewThingUI.java rename to java/dev/enola/web/ui/NewThingUI.java diff --git a/web/ui/src/main/java/dev/enola/web/ui/UI.java b/java/dev/enola/web/ui/UI.java similarity index 100% rename from web/ui/src/main/java/dev/enola/web/ui/UI.java rename to java/dev/enola/web/ui/UI.java diff --git a/web/ui/src/test/java/dev/enola/web/ui/UiTest.java b/java/dev/enola/web/ui/UiTest.java similarity index 100% rename from web/ui/src/test/java/dev/enola/web/ui/UiTest.java rename to java/dev/enola/web/ui/UiTest.java diff --git a/models/BUILD b/models/BUILD new file mode 100644 index 000000000..7b1b50f7a --- /dev/null +++ b/models/BUILD @@ -0,0 +1,14 @@ +load("@rules_java//java:defs.bzl", "java_library") + +java_library( + name = "models", + resource_strip_prefix = "models", + resources = glob( + ["**/*"], + exclude = [ + "BUILD", + "build.bash", + ], + ), + visibility = ["//:__subpackages__"], +) diff --git a/core/impl/src/main/resources/schema.textproto b/models/enola.dev/schema.textproto similarity index 100% rename from core/impl/src/main/resources/schema.textproto rename to models/enola.dev/schema.textproto diff --git a/test/BUILD b/test/BUILD new file mode 100644 index 000000000..9c4ac2eca --- /dev/null +++ b/test/BUILD @@ -0,0 +1,11 @@ +load("@rules_java//java:defs.bzl", "java_library") + +java_library( + name = "test", + resource_strip_prefix = "test", + resources = glob( + ["*"], + exclude = ["BUILD"], + ), + visibility = ["//:__subpackages__"], +) diff --git a/core/impl/src/test/resources/bar-abc-def.textproto b/test/bar-abc-def.textproto similarity index 100% rename from core/impl/src/test/resources/bar-abc-def.textproto rename to test/bar-abc-def.textproto diff --git a/core/impl/src/test/resources/bar-abc-def.yaml b/test/bar-abc-def.yaml similarity index 100% rename from core/impl/src/test/resources/bar-abc-def.yaml rename to test/bar-abc-def.yaml diff --git a/cli/src/test/resources/cli-test-model.textproto b/test/cli-test-model.textproto similarity index 100% rename from cli/src/test/resources/cli-test-model.textproto rename to test/cli-test-model.textproto diff --git a/common/rdf/src/test/resources/dali.thing.yaml b/test/dali.thing.yaml similarity index 100% rename from common/rdf/src/test/resources/dali.thing.yaml rename to test/dali.thing.yaml diff --git a/core/impl/src/test/resources/demo-model-docgen.md b/test/demo-model-docgen.md similarity index 100% rename from core/impl/src/test/resources/demo-model-docgen.md rename to test/demo-model-docgen.md diff --git a/core/impl/src/test/resources/demo-model.md b/test/demo-model.md similarity index 100% rename from core/impl/src/test/resources/demo-model.md rename to test/demo-model.md diff --git a/core/impl/src/test/resources/demo-model.textproto b/test/demo-model.textproto similarity index 100% rename from core/impl/src/test/resources/demo-model.textproto rename to test/demo-model.textproto diff --git a/core/impl/src/test/resources/demo-model.yaml b/test/demo-model.yaml similarity index 100% rename from core/impl/src/test/resources/demo-model.yaml rename to test/demo-model.yaml diff --git a/java/dev/enola/common/io/test_resources/empty b/test/empty similarity index 100% rename from java/dev/enola/common/io/test_resources/empty rename to test/empty diff --git a/java/dev/enola/common/io/test_resources/empty.png b/test/empty.png similarity index 100% rename from java/dev/enola/common/io/test_resources/empty.png rename to test/empty.png diff --git a/web/ui/src/test/resources/expected-book.html b/test/expected-book.html similarity index 100% rename from web/ui/src/test/resources/expected-book.html rename to test/expected-book.html diff --git a/core/impl/src/test/resources/foo-abc.textproto b/test/foo-abc.textproto similarity index 100% rename from core/impl/src/test/resources/foo-abc.textproto rename to test/foo-abc.textproto diff --git a/common/protobuf/src/test/resources/nok.textproto b/test/nok.textproto similarity index 100% rename from common/protobuf/src/test/resources/nok.textproto rename to test/nok.textproto diff --git a/common/protobuf/src/test/resources/ok.textproto b/test/ok.textproto similarity index 100% rename from common/protobuf/src/test/resources/ok.textproto rename to test/ok.textproto diff --git a/common/rdf/src/test/resources/picasso.jsonld b/test/picasso.jsonld similarity index 100% rename from common/rdf/src/test/resources/picasso.jsonld rename to test/picasso.jsonld diff --git a/common/rdf/src/test/resources/picasso.thing.yaml b/test/picasso.thing.yaml similarity index 100% rename from common/rdf/src/test/resources/picasso.thing.yaml rename to test/picasso.thing.yaml diff --git a/common/rdf/src/test/resources/picasso.ttl b/test/picasso.ttl similarity index 100% rename from common/rdf/src/test/resources/picasso.ttl rename to test/picasso.ttl diff --git a/common/rdf/src/test/resources/picasso.written.ttl b/test/picasso.written.ttl similarity index 100% rename from common/rdf/src/test/resources/picasso.written.ttl rename to test/picasso.written.ttl diff --git a/common/rdf/src/test/resources/picasso.yaml b/test/picasso.yaml similarity index 100% rename from common/rdf/src/test/resources/picasso.yaml rename to test/picasso.yaml diff --git a/common/rdf/src/test/resources/picasso.yamlld b/test/picasso.yamlld similarity index 100% rename from common/rdf/src/test/resources/picasso.yamlld rename to test/picasso.yamlld diff --git a/common/rdf/src/test/resources/proto.ttl b/test/proto.ttl similarity index 100% rename from common/rdf/src/test/resources/proto.ttl rename to test/proto.ttl diff --git a/java/dev/enola/common/io/test_resources/test-emoji.txt b/test/test-emoji.txt similarity index 100% rename from java/dev/enola/common/io/test_resources/test-emoji.txt rename to test/test-emoji.txt diff --git a/java/dev/enola/common/io/test_resources/test-french.txt b/test/test-french.txt similarity index 100% rename from java/dev/enola/common/io/test_resources/test-french.txt rename to test/test-french.txt diff --git a/java/dev/enola/common/io/test_resources/test-hello-ascii.txt b/test/test-hello-ascii.txt similarity index 100% rename from java/dev/enola/common/io/test_resources/test-hello-ascii.txt rename to test/test-hello-ascii.txt diff --git a/java/dev/enola/common/io/test_resources/test-random-binary b/test/test-random-binary similarity index 100% rename from java/dev/enola/common/io/test_resources/test-random-binary rename to test/test-random-binary diff --git a/core/impl/src/test/resources/test-types.yaml b/test/test-types.yaml similarity index 100% rename from core/impl/src/test/resources/test-types.yaml rename to test/test-types.yaml diff --git a/java/dev/enola/common/io/test_resources/test.json b/test/test.json similarity index 100% rename from java/dev/enola/common/io/test_resources/test.json rename to test/test.json diff --git a/java/dev/enola/common/io/test_resources/test.md b/test/test.md similarity index 100% rename from java/dev/enola/common/io/test_resources/test.md rename to test/test.md diff --git a/java/dev/enola/common/io/test_resources/test.png b/test/test.png similarity index 100% rename from java/dev/enola/common/io/test_resources/test.png rename to test/test.png diff --git a/java/dev/enola/common/io/test_resources/test.proto b/test/test.proto similarity index 100% rename from java/dev/enola/common/io/test_resources/test.proto rename to test/test.proto diff --git a/java/dev/enola/common/io/test_resources/test.textproto b/test/test.textproto similarity index 100% rename from java/dev/enola/common/io/test_resources/test.textproto rename to test/test.textproto diff --git a/tools/bazel/junit.bzl b/tools/bazel/junit.bzl index 941d176d8..8c4e22e10 100644 --- a/tools/bazel/junit.bzl +++ b/tools/bazel/junit.bzl @@ -64,17 +64,19 @@ _gen_suite = rule( "deps": attr.label_list(allow_files = False), "outname": attr.string(), "srcs": attr.label_list(allow_files = True), + "srcs_utils": attr.label_list(allow_files = True, default = []), }, outputs = {"out": "%{name}.java"}, implementation = _impl, ) -def junit_tests(name, srcs, deps, **kwargs): +def junit_tests(name, srcs, deps, srcs_utils = [], **kwargs): """Implementation. Args: name: Rule Name - srcs: Java Test Sources + srcs: All Tests to actually run + srcs_utils: Utility classes to build but not run tests, if any deps: Dependencies of Test **kwargs: KW Args """ @@ -91,15 +93,15 @@ def junit_tests(name, srcs, deps, **kwargs): name = name, size = "small", test_class = s_name, - srcs = srcs + [":" + s_name], - runtime_deps = [ - "@maven//:org_slf4j_slf4j_simple", - ], + srcs = [":" + s_name] + srcs + srcs_utils, deps = deps + [ "@maven//:com_google_guava_guava", "@maven//:com_google_jimfs_jimfs", + "@maven//:com_google_protobuf_protobuf_java", + "@maven//:com_google_protobuf_protobuf_java_util", "@maven//:com_google_truth_extensions_truth_java8_extension", "@maven//:com_google_truth_truth", + "@maven//:com_google_truth_extensions_truth_proto_extension", "@maven//:junit_junit", ], **dict(kwargs, jvm_flags = jvm_flags) diff --git a/web/api/BUILD b/web/api/BUILD deleted file mode 100644 index d4ff3fb61..000000000 --- a/web/api/BUILD +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 -# -# Copyright 2023 The Enola 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 -# -# 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, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -load("@rules_java//java:defs.bzl", "java_library") - -java_library( - name = "api", - srcs = glob(["src/main/java/**/*.java"]), - visibility = [ - "//cli:__subpackages__", - "//web:__subpackages__", - ], - deps = [ - "//java/dev/enola/common/io", - "@maven//:com_google_guava_guava", - ], -) diff --git a/web/rest/BUILD b/web/rest/BUILD deleted file mode 100644 index 8a370ef25..000000000 --- a/web/rest/BUILD +++ /dev/null @@ -1,61 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 -# -# Copyright 2023 The Enola 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 -# -# 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, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -load("@rules_java//java:defs.bzl", "java_library", "java_test") - -java_library( - name = "rest", - srcs = glob(["src/main/java/**/*.java"]), - resources = glob(["src/main/resources/**/*"]), - visibility = [ - "//cli:__subpackages__", - ], - deps = [ - "//common/protobuf", - "//core/impl", # TODO Ideally shouldn't be required... - "//core/lib:core_java_grpc", - "//core/lib:core_java_proto", - "//core/lib:lib_java", - "//java/dev/enola/common/io", - "//web/api", - "@maven//:com_google_guava_guava", - "@maven//:com_google_protobuf_protobuf_java", - ], -) - -[java_test( - name = name[:-len(".java")], - size = "small", - srcs = glob(["src/test/java/**/*.java"]), - resources = glob(["src/test/resources/**/*"]), - deps = [ - ":rest", - "//common/protobuf", - "//core/impl", # TODO Move package dev.enola.core.grpc from impl to lib_java, and remove this - "//core/lib:core_java_grpc", - "//core/lib:core_java_proto", - "//core/lib:lib_java", - "//java/dev/enola/common/io", - "//web/api", - "//web/sun", - "@maven//:com_google_guava_guava", - "@maven//:com_google_protobuf_protobuf_java", - "@maven//:com_google_truth_truth", - "@maven//:junit_junit", - ], -) for name in glob([ - "src/test/java/**/*Test.java", -])] diff --git a/web/sun/BUILD b/web/sun/BUILD deleted file mode 100644 index c230ff0b2..000000000 --- a/web/sun/BUILD +++ /dev/null @@ -1,49 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 -# -# Copyright 2023 The Enola 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 -# -# 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, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -load("@rules_java//java:defs.bzl", "java_library", "java_test") - -java_library( - name = "sun", - srcs = glob(["src/main/java/**/*.java"]), - visibility = [ - "//cli:__subpackages__", - "//web:__subpackages__", - ], - deps = [ - "//java/dev/enola/common/io", - "//web/api", - "@maven//:com_google_guava_guava", - "@maven//:org_slf4j_slf4j_api", - ], -) - -[java_test( - name = name[:-len(".java")], - size = "small", - srcs = glob(["src/test/java/**/*.java"]), - resources = glob(["src/test/resources/**/*"]), - deps = [ - ":sun", - "//java/dev/enola/common/io", - "//web/api", - "@maven//:com_google_guava_guava", - "@maven//:com_google_truth_truth", - "@maven//:junit_junit", - ], -) for name in glob([ - "src/test/java/**/*Test.java", -])] diff --git a/web/ui/BUILD b/web/ui/BUILD deleted file mode 100644 index 98a3b785b..000000000 --- a/web/ui/BUILD +++ /dev/null @@ -1,72 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 -# -# Copyright 2023 The Enola 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 -# -# 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, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -load("@rules_java//java:defs.bzl", "java_library", "java_test") - -java_library( - name = "ui", - srcs = glob(["src/main/java/**/*.java"]), - # for String Templates in Java 21 - # TODO Why can this not be removed, now that there is a tools/java_toolchain/BUILD with "--enable_preview"? - javacopts = ["--enable-preview"], - resources = glob(["src/main/resources/**/*"]), - visibility = [ - "//cli:__subpackages__", - ], - deps = [ - "//common/protobuf", - "//common/thing:thing_java", - "//common/thing:thing_java_proto", - "//core/impl", # TODO Ideally shouldn't be required... - "//core/lib:core_java_grpc", - "//core/lib:core_java_proto", - "//core/lib:lib_java", - "//java/dev/enola/common/convert", - "//java/dev/enola/common/io", - "//java/dev/enola/common/protobuf", - "//java/dev/enola/data", - "//java/dev/enola/datatype", - "//web/api", - "@maven//:com_google_guava_guava", - "@maven//:com_google_protobuf_protobuf_java", - ], -) - -[java_test( - name = name[:-len(".java")], - size = "small", - srcs = glob(["src/test/java/**/*.java"]), - jvm_flags = ["--enable-preview"], - resources = glob(["src/test/resources/**/*"]), - deps = [ - ":ui", - "//common/protobuf", - "//common/thing:thing_java", - "//core/impl", # TODO Move package dev.enola.core.grpc from impl to lib_java, and remove this - "//core/lib:core_java_grpc", - "//core/lib:core_java_proto", - "//core/lib:lib_java", - "//java/dev/enola/common/io", - "//web/api", - "//web/sun", - "@maven//:com_google_guava_guava", - "@maven//:com_google_protobuf_protobuf_java", - "@maven//:com_google_truth_truth", - "@maven//:junit_junit", - ], -) for name in glob([ - "src/test/java/**/*Test.java", -])]