Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TS Clean-up - Move Classes and Rename Packages #660

Merged
merged 3 commits into from
May 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.http.graphql;
package io.quarkus.ts.http.graphql.telemetry;

public class Person {
private final String name;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.http.graphql;
package io.quarkus.ts.http.graphql.telemetry;

import java.util.NoSuchElementException;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.http.graphql;
package io.quarkus.ts.http.graphql.telemetry;

import io.quarkus.test.scenarios.OpenShiftScenario;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.quarkus.ts.http.graphql;
package io.quarkus.ts.http.graphql.telemetry;

import static io.quarkus.ts.http.graphql.Utils.createQuery;
import static io.quarkus.ts.http.graphql.Utils.sendQuery;
import static io.quarkus.ts.http.graphql.telemetry.Utils.createQuery;
import static io.quarkus.ts.http.graphql.telemetry.Utils.sendQuery;
import static io.restassured.RestAssured.given;
import static org.awaitility.Awaitility.await;

Expand Down Expand Up @@ -39,7 +39,7 @@ void verifyTelemetry() {
Assertions.assertEquals("Plato", reactive.jsonPath().getString("data.friend_r.name"));

await().atMost(1, TimeUnit.MINUTES).pollInterval(Duration.ofSeconds(10)).untilAsserted(() -> {
String operation = "graphql";
String operation = "/graphql";
Response traces = given().when()
.queryParam("operation", operation)
.queryParam("lookback", "1h")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.http.graphql;
package io.quarkus.ts.http.graphql.telemetry;

import static io.restassured.RestAssured.given;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.jaxrs.reactive;
package io.quarkus.ts.http.jaxrs.reactive;

import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.jaxrs.reactive;
package io.quarkus.ts.http.jaxrs.reactive;

import javax.ws.rs.GET;
import javax.ws.rs.Path;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.jaxrs.reactive;
package io.quarkus.ts.http.jaxrs.reactive;

import java.io.File;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.jaxrs.reactive;
package io.quarkus.ts.http.jaxrs.reactive;

import java.io.IOException;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.jaxrs.reactive.client;
package io.quarkus.ts.http.jaxrs.reactive.client;

import javax.ws.rs.core.MediaType;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.jaxrs.reactive.client;
package io.quarkus.ts.http.jaxrs.reactive.client;

import javax.inject.Inject;
import javax.ws.rs.POST;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.jaxrs.reactive.client;
package io.quarkus.ts.http.jaxrs.reactive.client;

import javax.ws.rs.Consumes;
import javax.ws.rs.POST;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.jaxrs.reactive.client;
package io.quarkus.ts.http.jaxrs.reactive.client;

import io.quarkus.runtime.annotations.RegisterForReflection;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.jaxrs.reactive.json;
package io.quarkus.ts.http.jaxrs.reactive.json;

import javax.ws.rs.GET;
import javax.ws.rs.Path;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.jaxrs.reactive.json;
package io.quarkus.ts.http.jaxrs.reactive.json;

import java.lang.reflect.Type;
import java.util.function.BiFunction;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.jaxrs.reactive.json;
package io.quarkus.ts.http.jaxrs.reactive.json;

import com.fasterxml.jackson.annotation.JsonView;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.jaxrs.reactive.json;
package io.quarkus.ts.http.jaxrs.reactive.json;

public class Views {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Disable sticky session in order to be able to test HTTP cache features in OpenShiftHttpCachingResourceIT
# See https://access.redhat.comsolutions/4820731.
quarkus.openshift.route.annotations."haproxy.router.openshift.io/disable_cookies"=true
io.quarkus.ts.jaxrs.reactive.client.MultipartService/mp-rest/url=http://localhost:${quarkus.http.port}
io.quarkus.ts.http.jaxrs.reactive.client.MultipartService/mp-rest/url=http://localhost:${quarkus.http.port}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.jaxrs.reactive;
package io.quarkus.ts.http.jaxrs.reactive;

import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.not;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.jaxrs.reactive;
package io.quarkus.ts.http.jaxrs.reactive;

import static org.hamcrest.CoreMatchers.equalTo;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.jaxrs.reactive;
package io.quarkus.ts.http.jaxrs.reactive;

import static io.restassured.RestAssured.given;
import static org.hamcrest.CoreMatchers.allOf;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.jaxrs.reactive;
package io.quarkus.ts.http.jaxrs.reactive;

import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.equalTo;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.jaxrs.reactive;
package io.quarkus.ts.http.jaxrs.reactive;

import io.quarkus.test.scenarios.OpenShiftScenario;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.jaxrs.reactive;
package io.quarkus.ts.http.jaxrs.reactive;

import org.junit.jupiter.api.Tag;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.jaxrs.reactive;
package io.quarkus.ts.http.jaxrs.reactive;

import io.quarkus.test.scenarios.OpenShiftScenario;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.jaxrs.reactive.client;
package io.quarkus.ts.http.jaxrs.reactive.client;

import static io.restassured.RestAssured.given;
import static org.hamcrest.Matchers.containsStringIgnoringCase;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.jaxrs.reactive.json;
package io.quarkus.ts.http.jaxrs.reactive.json;

import static io.restassured.RestAssured.given;
import static org.junit.jupiter.api.Assertions.assertEquals;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.jaxrs.reactive.json;
package io.quarkus.ts.http.jaxrs.reactive.json;

import io.quarkus.test.scenarios.OpenShiftScenario;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.security.core;
package io.quarkus.ts.http.jaxrs;

import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.security.core;
package io.quarkus.ts.http.jaxrs;

import java.io.InputStream;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.security.core;
package io.quarkus.ts.http.jaxrs;

import java.io.IOException;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.security.core;
package io.quarkus.ts.http.jaxrs;

import java.util.ArrayList;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.security.core;
package io.quarkus.ts.http.jaxrs;

import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.not;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.security.core;
package io.quarkus.ts.http.jaxrs;

import static io.restassured.RestAssured.given;
import static org.hamcrest.CoreMatchers.is;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.security.core;
package io.quarkus.ts.http.jaxrs;

import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.equalTo;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.security.core;
package io.quarkus.ts.http.jaxrs;

import io.quarkus.test.scenarios.OpenShiftScenario;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.security.core;
package io.quarkus.ts.http.jaxrs;

import static io.restassured.RestAssured.given;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts;
package io.quarkus.ts.http.reactiveroutes;

import io.quarkus.vertx.web.Param;
import io.quarkus.vertx.web.Route;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts;
package io.quarkus.ts.http.reactiveroutes;

import io.quarkus.vertx.web.Route;
import io.quarkus.vertx.web.RouteBase;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package io.quarkus.ts.validation;
package io.quarkus.ts.http.reactiveroutes.validation;

import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;

import io.quarkus.ts.validation.annotations.Uppercase;
import io.quarkus.ts.http.reactiveroutes.validation.annotations.Uppercase;

public class Request {
@Size(min = 3, max = 3, message = "First code must have 3 characters")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package io.quarkus.ts.validation;
package io.quarkus.ts.http.reactiveroutes.validation;

import javax.validation.constraints.NotNull;

import io.quarkus.ts.validation.annotations.Uppercase;
import io.quarkus.ts.http.reactiveroutes.validation.annotations.Uppercase;

public class Response {
@NotNull(message = "id can't be null")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.validation;
package io.quarkus.ts.http.reactiveroutes.validation;

import javax.validation.Valid;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package io.quarkus.ts.validation;
package io.quarkus.ts.http.reactiveroutes.validation;

import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;

import io.quarkus.ts.validation.annotations.Uppercase;
import io.quarkus.ts.http.reactiveroutes.validation.annotations.Uppercase;
import io.quarkus.vertx.web.Param;
import io.quarkus.vertx.web.Route;
import io.quarkus.vertx.web.Route.HttpMethod;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.validation;
package io.quarkus.ts.http.reactiveroutes.validation;

import javax.validation.Valid;
import javax.validation.constraints.Size;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.validation.annotations;
package io.quarkus.ts.http.reactiveroutes.validation.annotations;

import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
import static java.lang.annotation.ElementType.CONSTRUCTOR;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.validation.annotations;
package io.quarkus.ts.http.reactiveroutes.validation.annotations;

import javax.enterprise.context.ApplicationScoped;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts.validation.annotations;
package io.quarkus.ts.http.reactiveroutes.validation.annotations;

import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.quarkus.ts;
package io.quarkus.ts.http.reactiveroutes;

import static io.restassured.RestAssured.given;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package io.quarkus.ts.validation;
package io.quarkus.ts.http.reactiveroutes.validation;

import static io.quarkus.ts.validation.utils.ValidationAssertions.assertValidationErrorDetails;
import static io.quarkus.ts.validation.utils.ValidationAssertions.assertValidationErrorField;
import static io.quarkus.ts.validation.utils.ValidationAssertions.assertValidationErrorStatus;
import static io.quarkus.ts.validation.utils.ValidationAssertions.assertValidationErrorTitle;
import static io.quarkus.ts.http.reactiveroutes.validation.utils.ValidationAssertions.assertValidationErrorDetails;
import static io.quarkus.ts.http.reactiveroutes.validation.utils.ValidationAssertions.assertValidationErrorField;
import static io.quarkus.ts.http.reactiveroutes.validation.utils.ValidationAssertions.assertValidationErrorStatus;
import static io.quarkus.ts.http.reactiveroutes.validation.utils.ValidationAssertions.assertValidationErrorTitle;
import static io.restassured.RestAssured.given;

import org.apache.http.HttpStatus;
import org.junit.jupiter.api.Test;

import io.quarkus.test.scenarios.QuarkusScenario;
import io.quarkus.ts.validation.utils.ValidationErrorResponse;
import io.quarkus.ts.http.reactiveroutes.validation.utils.ValidationErrorResponse;
import io.vertx.core.json.Json;

@QuarkusScenario
Expand All @@ -32,7 +32,8 @@ public void shouldGetValidationErrorWhenRequestFirstCodeIsWrong() {
assertValidationErrorTitle(response);
assertValidationErrorDetails(response);
assertValidationErrorStatus(response, HttpStatus.SC_BAD_REQUEST);
assertValidationErrorField(response, "validateRequestBody.param.firstCode", "First code must have 3 characters");
assertValidationErrorField(response, "validateRequestBody.param.firstCode",
"First code must have 3 characters");
}

@Test
Expand All @@ -51,8 +52,10 @@ public void shouldGetValidationErrorsWhenFirstAndSecondCodesAreWrong() {
assertValidationErrorTitle(response);
assertValidationErrorDetails(response);
assertValidationErrorStatus(response, HttpStatus.SC_BAD_REQUEST);
assertValidationErrorField(response, "validateRequestBody.param.firstCode", "First code must have 3 characters");
assertValidationErrorField(response, "validateRequestBody.param.secondCode", "Second second must match pattern");
assertValidationErrorField(response, "validateRequestBody.param.firstCode",
"First code must have 3 characters");
assertValidationErrorField(response, "validateRequestBody.param.secondCode",
"Second second must match pattern");
}

@Test
Expand All @@ -73,7 +76,8 @@ public void shouldGetValidationErrorWhenSingleParamIsLowercase() {
assertValidationErrorTitle(response);
assertValidationErrorDetails(response);
assertValidationErrorStatus(response, HttpStatus.SC_BAD_REQUEST);
assertValidationErrorField(response, "validateRequestBody.param.custom", "Value must be uppercase");
assertValidationErrorField(response, "validateRequestBody.param.custom",
"Value must be uppercase");
}

@Test
Expand Down
Loading