diff --git a/rules/rules-reviewed/technology-usage/embedded-framework-technology-usage.windup.xml b/rules/rules-reviewed/technology-usage/embedded-framework-technology-usage.windup.xml index 2fd4044f9..4bf61b13a 100644 --- a/rules/rules-reviewed/technology-usage/embedded-framework-technology-usage.windup.xml +++ b/rules/rules-reviewed/technology-usage/embedded-framework-technology-usage.windup.xml @@ -560,20 +560,6 @@ - - - - CDI - - - - - - - - - - diff --git a/rules/rules-reviewed/technology-usage/javaee-technology-usage.windup.xml b/rules/rules-reviewed/technology-usage/javaee-technology-usage.windup.xml index a8fc12cb5..a0b697da6 100644 --- a/rules/rules-reviewed/technology-usage/javaee-technology-usage.windup.xml +++ b/rules/rules-reviewed/technology-usage/javaee-technology-usage.windup.xml @@ -63,7 +63,7 @@ - + @@ -74,6 +74,17 @@ CDI + + + + + + + + + CDI + + @@ -83,7 +94,7 @@ - + diff --git a/rules/rules-reviewed/technology-usage/tests/data/javaee/JsonControllerJakarta.java b/rules/rules-reviewed/technology-usage/tests/data/javaee/JsonControllerJakarta.java new file mode 100644 index 000000000..36d64c230 --- /dev/null +++ b/rules/rules-reviewed/technology-usage/tests/data/javaee/JsonControllerJakarta.java @@ -0,0 +1,99 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2015, Red Hat, Inc. and/or its affiliates, and individual + * contributors by the @authors tag. See the copyright.txt in the + * distribution for a full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * 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.jboss.as.quickstarts.jsonp; + +import java.io.StringReader; + +import jakarta.enterprise.inject.Model; +import jakarta.faces.application.FacesMessage; +import jakarta.faces.context.FacesContext; +import jakarta.inject.Inject; +import jakarta.json.Json; +import jakarta.json.JsonException; +import jakarta.json.stream.JsonParser; +import jakarta.json.stream.JsonParser.Event; + +@Model +public class JsonControllerJakarta { + + @Inject + private Person person; + + private String jsonString; + + private String parsedResult; + + public void generateJson() { + jsonString = Json.createObjectBuilder() + .add("name", person.getName()) + .add("age", person.getAge()) + .add("enabled", person.getEnabled()) + .add("phones", Json.createArrayBuilder() + .add(person.getPhone1()) + .add(person.getPhone2()) + ) + .add("addrees", Json.createObjectBuilder() + .add("street", person.getAddressStreet()) + .add("apt", person.getAddressApt()) + .add("city", person.getAddressCity()) + .add("zip", person.getAddressZip()) + ) + .build().toString(); + } + + public void parseJsonStream() { + StringBuilder sb = new StringBuilder(); + String json = getJsonString(); + try { + JsonParser parser = Json.createParser(new StringReader(json)); + while (parser.hasNext()) { + Event event = parser.next(); + if (event.equals(Event.KEY_NAME)) { + sb.append(" - - - - > Key: " + parser.getString() + " < - - - - - \n"); + } + if (event.equals(Event.VALUE_STRING)) { + sb.append("Value as String: " + parser.getString() + "\n"); + } + if (event.equals(Event.VALUE_NUMBER)) { + sb.append("Value as Number: " + parser.getInt() + "\n"); + } + if (event.equals(Event.VALUE_TRUE)) { + sb.append("Value as Boolean: true\n"); + } + if (event.equals(Event.VALUE_FALSE)) { + sb.append("Value as Boolean: false \n"); + } + } + } catch (JsonException e) { + FacesContext.getCurrentInstance().addMessage("form:parsed", new FacesMessage(e.getMessage())); + } + parsedResult = sb.toString(); + } + + public void setJsonString(String jsonString) { + this.jsonString = jsonString; + } + + public String getJsonString() { + return jsonString; + } + + public String getParsedResult() { + return parsedResult; + } + +} diff --git a/rules/rules-reviewed/technology-usage/tests/embedded-framework-technology-usage.windup.test.xml b/rules/rules-reviewed/technology-usage/tests/embedded-framework-technology-usage.windup.test.xml index 03e543c57..f3f6b68e4 100644 --- a/rules/rules-reviewed/technology-usage/tests/embedded-framework-technology-usage.windup.test.xml +++ b/rules/rules-reviewed/technology-usage/tests/embedded-framework-technology-usage.windup.test.xml @@ -560,20 +560,6 @@ - - - - - - - - - - - - - - diff --git a/rules/rules-reviewed/technology-usage/tests/javaee-technology-usage.windup.test.xml b/rules/rules-reviewed/technology-usage/tests/javaee-technology-usage.windup.test.xml index 0a638c93a..2e2c47de5 100644 --- a/rules/rules-reviewed/technology-usage/tests/javaee-technology-usage.windup.test.xml +++ b/rules/rules-reviewed/technology-usage/tests/javaee-technology-usage.windup.test.xml @@ -37,7 +37,7 @@ - +