Skip to content

Commit 2f72bc5

Browse files
authored
Rename Hilla package and update deps (#244)
1 parent a209536 commit 2f72bc5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+10797
-3627
lines changed

lerna.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
"npmClient": "npm",
66
"useWorkspaces": true,
77
"useNx": true,
8-
"version": "2.2.1"
8+
"version": "3.0.0"
99
}

observability-kit-agent/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<scope>provided</scope>
3737
</dependency>
3838
<dependency>
39-
<groupId>dev.hilla</groupId>
39+
<groupId>com.vaadin.hilla</groupId>
4040
<artifactId>endpoint</artifactId>
4141
<version>${hilla.version}</version>
4242
<scope>provided</scope>

observability-kit-agent/src/main/java/com/vaadin/extension/VaadinObservabilityInstrumentationModule.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ private Stream<TypeInstrumentation> clientInstrumentation() {
154154
}
155155

156156
private Stream<TypeInstrumentation> hillaInstrumentation() {
157-
if (classExists("dev.hilla.Endpoint")) {
157+
if (classExists("com.vaadin.hilla.Endpoint")) {
158158
return Stream.of(new PushMessageHandlerInstrumentation(),
159159
new EndpointInvokerInstrumentation(),
160160
new EndpointRegistryInstrumentation());

observability-kit-agent/src/main/java/com/vaadin/extension/instrumentation/client/HillaClientInstrumentation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import net.bytebuddy.matcher.ElementMatcher;
2525

2626
public class HillaClientInstrumentation implements TypeInstrumentation {
27-
private static final String targetClassName = "dev.hilla.observability.ObservabilityEndpoint";
27+
private static final String targetClassName = "com.vaadin.hilla.observability.ObservabilityEndpoint";
2828

2929
@Override
3030
public ElementMatcher<ClassLoader> classLoaderOptimization() {

observability-kit-agent/src/main/java/com/vaadin/extension/instrumentation/hilla/EndpointInvokerInstrumentation.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929
public class EndpointInvokerInstrumentation implements TypeInstrumentation {
3030
@Override
3131
public ElementMatcher<ClassLoader> classLoaderOptimization() {
32-
return hasClassesNamed("dev.hilla.EndpointInvoker");
32+
return hasClassesNamed("com.vaadin.hilla.EndpointInvoker");
3333
}
3434

3535
@Override
3636
public ElementMatcher<TypeDescription> typeMatcher() {
37-
return named("dev.hilla.EndpointInvoker");
37+
return named("com.vaadin.hilla.EndpointInvoker");
3838
}
3939

4040
@Override

observability-kit-agent/src/main/java/com/vaadin/extension/instrumentation/hilla/EndpointRegistryInstrumentation.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929
public class EndpointRegistryInstrumentation implements TypeInstrumentation {
3030
@Override
3131
public ElementMatcher<ClassLoader> classLoaderOptimization() {
32-
return hasClassesNamed("dev.hilla.EndpointRegistry");
32+
return hasClassesNamed("com.vaadin.hilla.EndpointRegistry");
3333
}
3434

3535
@Override
3636
public ElementMatcher<TypeDescription> typeMatcher() {
37-
return named("dev.hilla.EndpointRegistry");
37+
return named("com.vaadin.hilla.EndpointRegistry");
3838
}
3939

4040
@Override

observability-kit-agent/src/main/java/com/vaadin/extension/instrumentation/hilla/PushMessageHandlerInstrumentation.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
*/
1010
package com.vaadin.extension.instrumentation.hilla;
1111

12-
import dev.hilla.push.messages.fromclient.SubscribeMessage;
1312
import io.opentelemetry.api.trace.Span;
1413
import io.opentelemetry.context.Context;
1514
import io.opentelemetry.context.Scope;
@@ -22,6 +21,7 @@
2221
import com.vaadin.extension.InstrumentationHelper;
2322
import com.vaadin.extension.conf.Configuration;
2423
import com.vaadin.extension.conf.TraceLevel;
24+
import com.vaadin.hilla.push.messages.fromclient.SubscribeMessage;
2525

2626
import static io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge.currentContext;
2727
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
@@ -30,12 +30,12 @@
3030
public class PushMessageHandlerInstrumentation implements TypeInstrumentation {
3131
@Override
3232
public ElementMatcher<ClassLoader> classLoaderOptimization() {
33-
return hasClassesNamed("dev.hilla.push.PushMessageHandler");
33+
return hasClassesNamed("com.vaadin.hilla.push.PushMessageHandler");
3434
}
3535

3636
@Override
3737
public ElementMatcher<TypeDescription> typeMatcher() {
38-
return named("dev.hilla.push.PushMessageHandler");
38+
return named("com.vaadin.hilla.push.PushMessageHandler");
3939
}
4040

4141
@Override

observability-kit-agent/src/test/java/com/vaadin/extension/instrumentation/client/HillaClientInstrumentationTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
public class HillaClientInstrumentationTest
1818
extends AbstractTypeInstrumentationTest {
19-
private static final String targetClassName = "dev.hilla.observability.ObservabilityEndpoint";
19+
private static final String targetClassName = "com.vaadin.hilla.observability.ObservabilityEndpoint";
2020
private HillaClientInstrumentation instrumentation;
2121

2222
@BeforeEach

observability-kit-agent/src/test/java/com/vaadin/extension/instrumentation/hilla/EndpointInvokerInstrumentationTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import static org.mockito.Mockito.verify;
1515

1616
public class EndpointInvokerInstrumentationTest extends AbstractTypeInstrumentationTest {
17-
private static final String patchedClassName = "dev.hilla.EndpointInvoker";
17+
private static final String patchedClassName = "com.vaadin.hilla.EndpointInvoker";
1818
private static final String patchedMethodName = "invokeVaadinEndpointMethod";
1919
private EndpointInvokerInstrumentation instrumentation;
2020

observability-kit-agent/src/test/java/com/vaadin/extension/instrumentation/hilla/EndpointRegistryInstrumentationTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import static org.mockito.Mockito.verify;
1515

1616
public class EndpointRegistryInstrumentationTest extends AbstractTypeInstrumentationTest {
17-
private static final String patchedClassName = "dev.hilla.EndpointRegistry";
17+
private static final String patchedClassName = "com.vaadin.hilla.EndpointRegistry";
1818
private static final String patchedMethodName = "registerEndpoint";
1919
private EndpointRegistryInstrumentation instrumentation;
2020

observability-kit-agent/src/test/java/com/vaadin/extension/instrumentation/hilla/PushMethodHandlerInstrumentationTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import static org.mockito.Mockito.verify;
1515

1616
public class PushMethodHandlerInstrumentationTest extends AbstractTypeInstrumentationTest {
17-
private static final String patchedClassName = "dev.hilla.push.PushMessageHandler";
17+
private static final String patchedClassName = "com.vaadin.hilla.push.PushMessageHandler";
1818
private static final String patchedMethodName = "handleBrowserSubscribe";
1919
private PushMessageHandlerInstrumentation instrumentation;
2020

observability-kit-demo-hilla/frontend/components/auth-button.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { html, type TemplateResult } from 'lit';
22
import { customElement, property } from 'lit/decorators.js';
3-
import styles from './auth-button.css';
4-
import { Layout } from 'Frontend/views/view.js';
3+
import styles from './auth-button.css?inline';
4+
import { Layout } from 'Frontend/views/view';
55

66
@customElement('auth-button')
77
export default class AuthButton extends Layout {

observability-kit-demo-hilla/frontend/connect-client.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { type MiddlewareContext, type MiddlewareNext, ConnectClient } from '@hilla/frontend';
2-
import { logout } from 'Frontend/stores/login-store.js';
1+
import { type MiddlewareContext, type MiddlewareNext, ConnectClient } from '@vaadin/hilla-frontend';
2+
import { logout } from 'Frontend/stores/login-store';
33

44
const client = new ConnectClient({
55
middlewares: [

observability-kit-demo-hilla/frontend/index.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { Router } from '@vaadin/router';
2-
import { ObservabilityEndpoint } from 'Frontend/generated/endpoints.js';
3-
import { routes } from './routes.js';
4-
import { appName, location, setLocation } from './stores/location-store.js';
5-
import { initTelemetry } from 'Frontend/utils/telemetry.js';
2+
import { ObservabilityEndpoint } from 'Frontend/generated/endpoints';
3+
import { routes } from './routes';
4+
import { appName, location, setLocation } from './stores/location-store';
5+
import { init as initTelemetry } from '@vaadin/observability-kit-client';
66

77
initTelemetry(ObservabilityEndpoint.export, {
88
serviceName: 'hilla',

observability-kit-demo-hilla/frontend/routes.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import type { Route, Router } from '@vaadin/router';
2-
import './views/helloworld/hello-world-view.js';
3-
import './views/main-layout.js';
4-
import './views/login-view.ts';
5-
import './views/image-list/image-list-view.js';
6-
import { user, login, logout, doesUserHaveRole } from 'Frontend/stores/login-store.js';
2+
import './views/helloworld/hello-world-view';
3+
import './views/main-layout';
4+
import './views/login-view';
5+
import './views/image-list/image-list-view';
6+
import { user, logout, doesUserHaveRole } from 'Frontend/stores/login-store';
77

88
export type ViewRoute = Route & {
99
children?: ViewRoute[];

observability-kit-demo-hilla/frontend/stores/location-store.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { signal } from '@preact/signals-core';
22
import type { RouterLocation } from '@vaadin/router';
3-
import type { ViewRoute } from 'Frontend/routes.js';
3+
import type { ViewRoute } from 'Frontend/routes';
44

55
export const appName = 'observability-kit-hilla-demo';
66

observability-kit-demo-hilla/frontend/stores/login-store.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { login as serverLogin, logout as serverLogout } from '@hilla/frontend';
1+
import { login as serverLogin, logout as serverLogout } from '@vaadin/hilla-frontend';
22
import { effect, signal } from '@preact/signals-core';
33
import { Router } from '@vaadin/router';
4-
import { UserEndpoint } from 'Frontend/generated/endpoints.js';
5-
import type UserDetails from 'Frontend/generated/org/springframework/security/core/userdetails/UserDetails.js';
4+
import { UserEndpoint } from 'Frontend/generated/endpoints';
5+
import type UserDetails from 'Frontend/generated/org/springframework/security/core/userdetails/UserDetails';
66

77
export const user = signal<UserDetails | undefined>(undefined);
88

observability-kit-demo-hilla/frontend/utils/FrontendErrorInstrumentation.ts

-89
This file was deleted.

observability-kit-demo-hilla/frontend/utils/HillaEndpointExporter.ts

-64
This file was deleted.

0 commit comments

Comments
 (0)