You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/09/17 21:10:50 UTC
[isis] branch master updated: ISIS-2871: housekeeping
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new f42cbe4 ISIS-2871: housekeeping
f42cbe4 is described below
commit f42cbe4144b52d2962f6651ba5ed171a16712313
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Sep 17 23:10:38 2021 +0200
ISIS-2871: housekeeping
---
.../apache/isis/applib/annotation/Property.java | 2 +-
.../property/PropertyAnnotationFacetFactory.java | 4 +-
.../dom/_infra/LibraryPreloadingService.java | 4 +-
.../valuetypes/asciidoc/applib/value/AsciiDoc.java | 6 ++
.../semantics/AsciiDocValueSemantics.java | 4 -
.../asciidoc/metamodel/semantics/Converter.java | 96 ----------------------
6 files changed, 11 insertions(+), 105 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotation/Property.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Property.java
index d1abcbf..78c4ab0 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotation/Property.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Property.java
@@ -303,7 +303,7 @@ public @interface Property {
* @see Action#valueSemantics()
* @see Collection#valueSemantics()
* @apiNote the selection (qualifier inclusion/exclusion) mechanics is not yet finalized,
- * currently we qualifiers declared here must exactly match that of the targeted bean
+ * currently a single qualifier declared here must exactly match that of the targeted bean
*/
String valueSemantics()
default "";
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
index 3d24b6c..d9b4028 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
@@ -374,7 +374,7 @@ extends FacetFactoryAbstract {
void processFileAccept(final ProcessMethodContext processMethodContext, final Optional<Property> propertyIfAny) {
val holder = processMethodContext.getFacetHolder();
- // else search for @Property(maxLength=...)
+ // check for @Property(maxLength=...)
addFacetIfPresent(
FileAcceptFacetForPropertyAnnotation
.create(propertyIfAny, holder));
@@ -383,7 +383,7 @@ extends FacetFactoryAbstract {
void processValueSemantics(final ProcessMethodContext processMethodContext, final Optional<Property> propertyIfAny) {
val holder = processMethodContext.getFacetHolder();
- // else search for @Property(maxLength=...)
+ // check for @Property(valueSemantics=...)
addFacetIfPresent(
ValueSemanticsSelectingFacetForPropertyAnnotation
.create(propertyIfAny, holder));
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/_infra/LibraryPreloadingService.java b/examples/demo/domain/src/main/java/demoapp/dom/_infra/LibraryPreloadingService.java
index ab94058..4a8059f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/_infra/LibraryPreloadingService.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/_infra/LibraryPreloadingService.java
@@ -25,7 +25,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.commons.internal.concurrent._ConcurrentContext;
import org.apache.isis.commons.internal.concurrent._ConcurrentTaskList;
-import org.apache.isis.valuetypes.asciidoc.metamodel.semantics.AsciiDocValueSemantics;
+import org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc;
import lombok.val;
@@ -36,7 +36,7 @@ public class LibraryPreloadingService {
@PostConstruct
public void preloadLibraries() {
val tasks = _ConcurrentTaskList.named("LibraryPreloading")
- .addRunnable("Preload JRuby for AsciiDoc", AsciiDocValueSemantics::loadJRuby);
+ .addRunnable("Preload JRuby for AsciiDoc", AsciiDoc::loadJRuby);
tasks.submit(_ConcurrentContext.forkJoin());
}
diff --git a/valuetypes/asciidoc/applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/value/AsciiDoc.java b/valuetypes/asciidoc/applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/value/AsciiDoc.java
index ddaa9de..f6ee1d1 100644
--- a/valuetypes/asciidoc/applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/value/AsciiDoc.java
+++ b/valuetypes/asciidoc/applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/value/AsciiDoc.java
@@ -78,4 +78,10 @@ public final class AsciiDoc implements HasHtml, Serializable {
return "AsciiDoc[length=" + adoc.length() + "]";
}
+ // -- UTILITY
+
+ public static void loadJRuby() {
+ Converter.getAsciidoctor();
+ }
+
}
diff --git a/valuetypes/asciidoc/metamodel/src/main/java/org/apache/isis/valuetypes/asciidoc/metamodel/semantics/AsciiDocValueSemantics.java b/valuetypes/asciidoc/metamodel/src/main/java/org/apache/isis/valuetypes/asciidoc/metamodel/semantics/AsciiDocValueSemantics.java
index c775999..47f81d0 100644
--- a/valuetypes/asciidoc/metamodel/src/main/java/org/apache/isis/valuetypes/asciidoc/metamodel/semantics/AsciiDocValueSemantics.java
+++ b/valuetypes/asciidoc/metamodel/src/main/java/org/apache/isis/valuetypes/asciidoc/metamodel/semantics/AsciiDocValueSemantics.java
@@ -60,8 +60,4 @@ implements
return 0;
}
- public static void loadJRuby() {
- Converter.getAsciidoctor();
- }
-
}
diff --git a/valuetypes/asciidoc/metamodel/src/main/java/org/apache/isis/valuetypes/asciidoc/metamodel/semantics/Converter.java b/valuetypes/asciidoc/metamodel/src/main/java/org/apache/isis/valuetypes/asciidoc/metamodel/semantics/Converter.java
deleted file mode 100644
index 6e048cb..0000000
--- a/valuetypes/asciidoc/metamodel/src/main/java/org/apache/isis/valuetypes/asciidoc/metamodel/semantics/Converter.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * 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 org.apache.isis.valuetypes.asciidoc.metamodel.semantics;
-
-import java.util.Optional;
-
-import org.asciidoctor.Asciidoctor;
-import org.asciidoctor.Attributes;
-import org.asciidoctor.Options;
-import org.asciidoctor.SafeMode;
-import org.springframework.lang.Nullable;
-
-import org.apache.isis.commons.internal.base._Strings;
-
-import lombok.Getter;
-
-final class Converter {
-
- /**
- * For syntax highlighting to work, the client/browser needs to load specific
- * java-script and css.
- * <p>
- * 1) In your web-app's {@code scripts/application.js} include the bundled
- * {@code src/main/resources/prism1.14.js}.
- * <pre>
- * function includeJs(jsFilePath) {
- * var js = document.createElement("script");
- * js.type = "text/javascript";
- * js.src = jsFilePath;
- * document.body.appendChild(js);
- * }
- *
- * includeJs("/scripts/prism1.14.js");
- * </pre>
- * <p>
- * 2) In your web-app's {@code css/application.css} include the bundled
- * {@code src/main/resources/prism.css}.
- * <pre>
- * {@code @import "prism.css"}.
- * </pre>
- *
- * @param adoc - formatted input to be converted to HTML
- * @param options - if {@code null} uses built-in default options
- */
- public static String adocToHtml(final @Nullable String adoc, final @Nullable Options options) {
- return _Strings.isEmpty(adoc)
- ? ""
- : convert(adoc,
- Optional
- .ofNullable(options)
- .orElseGet(Converter::getDefaultOptions));
- }
-
- /**
- * Shortcut to {@link #adocToHtml(String, Options)} using default options.
- */
- public static String adocToHtml(final String adoc) {
- return adocToHtml(adoc, null);
- }
-
- // -- HELPER
-
- private static String convert(final String content, final Options options) {
- return getAsciidoctor()
- .convert(content, options);
- }
-
- @Getter(lazy = true)
- private final static Asciidoctor asciidoctor = Asciidoctor.Factory.create();
-
- @Getter(lazy = true)
- private final static Options defaultOptions = Options.builder()
- .safe(SafeMode.UNSAFE)
- .toFile(false)
- .attributes(Attributes.builder()
- .sourceHighlighter("prism")
- .build())
- .build();
-
-}