Skip to content

Commit

Permalink
feat!: rename Java packages (#1909)
Browse files Browse the repository at this point in the history
* First successful build with new Java packages

* Java formatting

* upgrade to flow 24.4.0.alpha1

* fix order import in test snap files

* fix relative paths

* fix relative paths

* fix imports

* fix imports

* fix imports

---------

Co-authored-by: taefi <[email protected]>
  • Loading branch information
cromoteca and taefi authored Jan 2, 2024
1 parent 3ef265f commit 22f88e3
Show file tree
Hide file tree
Showing 858 changed files with 2,483 additions and 2,481 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ packages/ts/*/types/**
scripts/generator/results/
packages/java/hilla/*.json
packages/java/hilla-react/*.json
packages/java/hilla/src/main/java/dev/hilla/theme/
packages/java/hilla-react/src/main/java/dev/hilla/theme/
packages/java/hilla/src/main/java/com/vaadin/hilla/theme/
packages/java/hilla-react/src/main/java/com/vaadin/hilla/theme/

# npm pack
packages/ts/*/*.tgz
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Hilla helps you access the backend easily with type-safe endpoints.

```ts
// Type info is automatically generated based on Java
import Person from 'Frontend/generated/dev/hilla/demo/entity/Person';
import Person from 'Frontend/generated/com/vaadin/hilla/demo/entity/Person';
import { PersonEndpoint } from 'Frontend/generated/endpoints';

async function getPeopleWithPhoneNumber() {
Expand Down
8 changes: 4 additions & 4 deletions packages/java/endpoint/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>dev.hilla</groupId>
<groupId>com.vaadin.hilla</groupId>
<artifactId>hilla-project</artifactId>
<version>24.4-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
Expand Down Expand Up @@ -40,7 +40,7 @@
<version>${flow.version}</version>
</dependency>
<dependency>
<groupId>dev.hilla</groupId>
<groupId>com.vaadin.hilla</groupId>
<artifactId>engine-core</artifactId>
<version>${project.version}</version>
</dependency>
Expand Down Expand Up @@ -209,12 +209,12 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>dev.hilla</groupId>
<groupId>com.vaadin.hilla</groupId>
<artifactId>parser-jvm-utils</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>dev.hilla</groupId>
<groupId>com.vaadin.hilla</groupId>
<artifactId>runtime-plugin-transfertypes</artifactId>
<version>${project.version}</version>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.hilla;
package com.vaadin.hilla;

import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.hilla;
package com.vaadin.hilla;

import java.util.function.Function;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
package dev.hilla;
package com.vaadin.hilla;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.hilla;
package com.vaadin.hilla;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
package dev.hilla;
package com.vaadin.hilla;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
package dev.hilla;
package com.vaadin.hilla;

import java.io.IOException;
import java.nio.file.Path;
import java.util.Set;

import dev.hilla.engine.EngineConfiguration;
import dev.hilla.engine.GeneratorProcessor;
import dev.hilla.engine.ParserProcessor;
import com.vaadin.hilla.engine.EngineConfiguration;
import com.vaadin.hilla.engine.GeneratorProcessor;
import com.vaadin.hilla.engine.ParserProcessor;
import org.springframework.stereotype.Component;

import com.vaadin.flow.server.VaadinContext;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
package dev.hilla;
package com.vaadin.hilla;

import java.io.IOException;
import java.util.Map;
Expand Down Expand Up @@ -45,14 +45,14 @@
import com.vaadin.flow.server.VaadinServletRequest;
import com.vaadin.flow.server.VaadinServletService;

import dev.hilla.EndpointInvocationException.EndpointAccessDeniedException;
import dev.hilla.EndpointInvocationException.EndpointBadRequestException;
import dev.hilla.EndpointInvocationException.EndpointInternalException;
import dev.hilla.EndpointInvocationException.EndpointNotFoundException;
import dev.hilla.auth.CsrfChecker;
import dev.hilla.auth.EndpointAccessChecker;
import dev.hilla.engine.EngineConfiguration;
import dev.hilla.exception.EndpointException;
import com.vaadin.hilla.EndpointInvocationException.EndpointAccessDeniedException;
import com.vaadin.hilla.EndpointInvocationException.EndpointBadRequestException;
import com.vaadin.hilla.EndpointInvocationException.EndpointInternalException;
import com.vaadin.hilla.EndpointInvocationException.EndpointNotFoundException;
import com.vaadin.hilla.auth.CsrfChecker;
import com.vaadin.hilla.auth.EndpointAccessChecker;
import com.vaadin.hilla.engine.EngineConfiguration;
import com.vaadin.hilla.exception.EndpointException;

import jakarta.annotation.PostConstruct;
import jakarta.servlet.http.HttpServletRequest;
Expand Down Expand Up @@ -123,7 +123,7 @@ public EndpointController(ApplicationContext context,
/**
* Sets the name of the OpenAPI definition resource.
* <p>
* The default value is {@code /dev/hilla/openapi.json}.
* The default value is {@code /com/vaadin/hilla/openapi.json}.
*
* @param openApiResourceName
* the name of the OpenAPI definition resource
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* the License.
*/

package dev.hilla;
package com.vaadin.hilla;

import java.lang.reflect.Method;

Expand All @@ -32,9 +32,9 @@
import com.vaadin.flow.server.VaadinServletContext;
import com.vaadin.flow.server.auth.AccessAnnotationChecker;

import dev.hilla.auth.CsrfChecker;
import dev.hilla.auth.EndpointAccessChecker;
import dev.hilla.parser.jackson.JacksonObjectMapperFactory;
import com.vaadin.hilla.auth.CsrfChecker;
import com.vaadin.hilla.auth.EndpointAccessChecker;
import com.vaadin.hilla.parser.jackson.JacksonObjectMapperFactory;

import jakarta.servlet.ServletContext;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
package dev.hilla;
package com.vaadin.hilla;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.hilla;
package com.vaadin.hilla;

import java.util.HashSet;
import java.util.Set;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.hilla;
package com.vaadin.hilla;

/**
* Exception thrown by EndpointInvoker when invocation fails.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,25 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
package dev.hilla;
package com.vaadin.hilla;

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.googlecode.gentyref.GenericTypeReflector;
import com.vaadin.flow.server.VaadinServletContext;
import dev.hilla.EndpointInvocationException.EndpointAccessDeniedException;
import dev.hilla.EndpointInvocationException.EndpointBadRequestException;
import dev.hilla.EndpointInvocationException.EndpointInternalException;
import dev.hilla.EndpointInvocationException.EndpointNotFoundException;
import dev.hilla.EndpointRegistry.VaadinEndpointData;
import dev.hilla.auth.EndpointAccessChecker;
import dev.hilla.endpointransfermapper.EndpointTransferMapper;
import dev.hilla.exception.EndpointException;
import dev.hilla.exception.EndpointValidationException;
import dev.hilla.exception.EndpointValidationException.ValidationErrorData;
import dev.hilla.parser.jackson.JacksonObjectMapperFactory;
import com.vaadin.hilla.EndpointInvocationException.EndpointAccessDeniedException;
import com.vaadin.hilla.EndpointInvocationException.EndpointBadRequestException;
import com.vaadin.hilla.EndpointInvocationException.EndpointInternalException;
import com.vaadin.hilla.EndpointInvocationException.EndpointNotFoundException;
import com.vaadin.hilla.EndpointRegistry.VaadinEndpointData;
import com.vaadin.hilla.auth.EndpointAccessChecker;
import com.vaadin.hilla.endpointransfermapper.EndpointTransferMapper;
import com.vaadin.hilla.exception.EndpointException;
import com.vaadin.hilla.exception.EndpointValidationException;
import com.vaadin.hilla.exception.EndpointValidationException.ValidationErrorData;
import com.vaadin.hilla.parser.jackson.JacksonObjectMapperFactory;
import jakarta.servlet.ServletContext;
import jakarta.validation.ConstraintViolation;
import jakarta.validation.Validation;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* the License.
*/

package dev.hilla;
package com.vaadin.hilla;

import java.util.Arrays;
import java.util.Collections;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
package dev.hilla;
package com.vaadin.hilla;

import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.context.properties.ConfigurationProperties;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
package dev.hilla;
package com.vaadin.hilla;

import java.lang.reflect.AccessibleObject;
import java.lang.reflect.Method;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.hilla;
package com.vaadin.hilla;

import reactor.core.publisher.Flux;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
package dev.hilla;
package com.vaadin.hilla;

import jakarta.servlet.http.HttpServletRequest;
import java.lang.reflect.Method;
import java.util.Map;
import java.util.Optional;

import com.vaadin.flow.internal.hilla.EndpointRequestUtil;
import dev.hilla.auth.EndpointAccessChecker;
import com.vaadin.hilla.auth.EndpointAccessChecker;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.server.PathContainer;
import org.springframework.http.server.RequestPath;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* the License.
*/

package dev.hilla;
package com.vaadin.hilla;

import java.lang.annotation.Annotation;
import java.lang.reflect.AnnotatedElement;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* the License.
*/

package dev.hilla;
package com.vaadin.hilla;

import java.beans.IntrospectionException;
import java.beans.Introspector;
Expand All @@ -38,7 +38,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import static dev.hilla.ExplicitNullableTypeChecker.isRequired;
import static com.vaadin.hilla.ExplicitNullableTypeChecker.isRequired;

/**
* A helper class for ExplicitNullableTypeChecker.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.hilla;
package com.vaadin.hilla;

import java.io.IOException;
import java.io.InputStream;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
package dev.hilla;
package com.vaadin.hilla;

import com.vaadin.flow.internal.UsageStatistics;
import com.vaadin.flow.server.Platform;
Expand All @@ -34,7 +34,7 @@ class HillaStats {
private static Optional<String> getHillaReactVersion() {
try (final InputStream pomProperties = Thread.currentThread()
.getContextClassLoader().getResourceAsStream(
"META-INF/maven/dev.hilla/hilla-react/pom.properties")) {
"META-INF/maven/com.vaadin.hilla/hilla-react/pom.properties")) {
if (pomProperties != null) {
final Properties properties = new Properties();
properties.load(pomProperties);
Expand All @@ -43,7 +43,8 @@ private static Optional<String> getHillaReactVersion() {
return Optional.empty();
}
} catch (Exception e) {
LOGGER.error("Unable to determine dev.hilla/hilla-react version",
LOGGER.error(
"Unable to determine com.vaadin.hilla/hilla-react version",
e);
}
return Optional.of("?");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.hilla;
package com.vaadin.hilla;

import java.io.IOException;
import java.util.List;
Expand Down Expand Up @@ -64,8 +64,8 @@ private static boolean isIgnoredClass(String changedClass) {
|| changedClass.startsWith("javax.")
|| changedClass.startsWith("sun.")
|| changedClass.startsWith("com.sun.")
|| changedClass.startsWith("dev.hilla.parser.")
|| changedClass.startsWith("dev.hilla.engine.")
|| changedClass.startsWith("com.vaadin.hilla.parser.")
|| changedClass.startsWith("com.vaadin.hilla.engine.")
|| changedClass.startsWith("com.vaadin.flow.")
|| changedClass.startsWith("com.vaadin.base.")
|| changedClass.startsWith("org.jsoup.")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
package dev.hilla;
package com.vaadin.hilla;

import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
package dev.hilla;
package com.vaadin.hilla;

import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.hilla;
package com.vaadin.hilla;

import java.io.IOException;
import java.nio.file.Files;
Expand All @@ -11,8 +11,8 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import dev.hilla.engine.EngineConfiguration;
import dev.hilla.engine.ParserProcessor;
import com.vaadin.hilla.engine.EngineConfiguration;
import com.vaadin.hilla.engine.ParserProcessor;

/**
* Utilities for interacting with the generated openapi.json.
Expand Down
Loading

0 comments on commit 22f88e3

Please sign in to comment.