diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml new file mode 100644 index 00000000..739a9fbc --- /dev/null +++ b/.github/workflows/auto-merge.yml @@ -0,0 +1,28 @@ +name: Automatic Branch Merging + +on: + pull_request: + types: + - closed + +permissions: + contents: write + pull-requests: write + issues: write + +jobs: + merge: + name: Cascading Auto Merge + runs-on: ubuntu-latest + + if: | + github.event.pull_request.merged == true && + startsWith(github.base_ref, 'release/') + + steps: + - name: Automatic Merge + uses: ActionsDesk/cascading-downstream-merge@v3 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + prefixes: release/ + ref_branch: develop \ No newline at end of file diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 09182902..488bea4d 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -5,9 +5,9 @@ name: Build on: push: - branches: [ develop ] + branches: [ release/2.14 ] pull_request: - branches: [ develop ] + branches: [ release/2.14 ] jobs: build: @@ -15,12 +15,12 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - name: Set up JDK 21 - uses: actions/setup-java@v3 + - uses: actions/checkout@v6 + - name: Set up JDK 25 + uses: actions/setup-java@v5 with: distribution: 'temurin' - java-version: '21' + java-version: '25' - name: Build run: | mvn install --batch-mode --no-transfer-progress \ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 427a64f3..75384a61 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,16 +1,18 @@ name: Release +run-name: Release ${{ inputs.releaseVersion }}.${{ inputs.releaseBuild }} by @${{ github.actor }} + on: workflow_dispatch: inputs: releaseVersion: description: 'Release version' required: true - default: '2.9' + default: '2.14' releaseBuild: - description: 'Release build' + description: 'Release build (e.g. 8)' required: true - default: '' + default: '0' jobs: release: @@ -18,15 +20,15 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v6 - - name: Set up JDK 21 - uses: actions/setup-java@v3 + - name: Set up JDK 25 + uses: actions/setup-java@v5 with: distribution: 'temurin' - java-version: '21' - server-id: ossrh - server-username: MAVEN_USERNAME + java-version: '25' + server-id: central + server-username: MAVEN_CENTRAL_USERNAME server-password: MAVEN_CENTRAL_TOKEN gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} gpg-passphrase: MAVEN_GPG_PASSPHRASE @@ -49,11 +51,9 @@ jobs: TAG: release/${{ github.event.inputs.releaseVersion }}/${{ github.event.inputs.releaseVersion }}.${{ github.event.inputs.releaseBuild }} # Suppress logging during release prep/perform LOGGING: org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} - MAVEN_CENTRAL_TOKEN: ${{ secrets.OSSRH_TOKEN }} + MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} + MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }} MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} - # This is to work around https://issues.sonatype.org/browse/NEXUS-27902 on JDK17 - JDK_JAVA_OPTIONS: "--add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED" run: | echo "::group::Prepare" mvn --batch-mode --no-transfer-progress release:prepare -DreleaseVersion=${{ env.RELEASE }} \ diff --git a/odata_api/pom.xml b/odata_api/pom.xml index 36262501..26b93e57 100644 --- a/odata_api/pom.xml +++ b/odata_api/pom.xml @@ -1,7 +1,7 @@ - - - odata - com.sdl - 2.14-SNAPSHOT - - 4.0.0 - - odata_client_tracing - OData Tracing - Tridion OData Tracing module contains EndpointCaller implementation with brave tracing into zipkin - - jar - - - ${project.basedir}/../src/license/sdl_license/header.txt - - - - - - com.sdl - odata_client_api - - - com.sdl - odata_client - test-jar - test - - - - - org.apache.httpcomponents - httpclient - - - io.zipkin.brave - brave-apache-http-interceptors - - - io.zipkin.brave - brave-spancollector-http - - - io.zipkin.reporter - zipkin-sender-urlconnection - - - - - org.springframework.boot - spring-boot - test - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.boot - spring-boot-starter-tomcat - test - - - org.springframework.boot - spring-boot-autoconfigure - test - - - org.springframework - spring-webmvc - test - - - diff --git a/odata_client_tracing/src/main/java/com/sdl/odata/client/caller/TracingEndpointCaller.java b/odata_client_tracing/src/main/java/com/sdl/odata/client/caller/TracingEndpointCaller.java deleted file mode 100644 index 8c00324c..00000000 --- a/odata_client_tracing/src/main/java/com/sdl/odata/client/caller/TracingEndpointCaller.java +++ /dev/null @@ -1,228 +0,0 @@ -/** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. - * - * 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 com.sdl.odata.client.caller; - -import com.github.kristofa.brave.Brave; -import com.github.kristofa.brave.Sampler; -import com.github.kristofa.brave.httpclient.BraveHttpRequestInterceptor; -import com.github.kristofa.brave.httpclient.BraveHttpResponseInterceptor; -import com.sdl.odata.api.service.HeaderNames; -import com.sdl.odata.api.service.MediaType; -import com.sdl.odata.api.service.ODataRequest; -import com.sdl.odata.client.api.caller.EndpointCaller; -import com.sdl.odata.client.api.exception.ODataClientException; -import com.sdl.odata.client.api.exception.ODataClientRuntimeException; -import org.apache.http.HttpHost; -import org.apache.http.client.config.RequestConfig; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.RequestBuilder; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; -import org.apache.http.util.EntityUtils; -import org.slf4j.Logger; -import zipkin.reporter.AsyncReporter; -import zipkin.reporter.urlconnection.URLConnectionSender; - - -import java.io.IOException; -import java.io.InputStream; -import java.net.URISyntaxException; -import java.net.URL; -import java.util.Map; -import java.util.Properties; - -import static com.sdl.odata.api.service.MediaType.ATOM_XML; -import static com.sdl.odata.api.service.MediaType.XML; -import static com.sdl.odata.client.ODataClientConstants.DefaultValues.CLIENT_PROXY_PORT_DEFAULT; -import static com.sdl.odata.client.ODataClientConstants.DefaultValues.CLIENT_TIMEOUT_DEFAULT; -import static com.sdl.odata.client.ODataClientConstants.WebService.CLIENT_CONNECTION_TIMEOUT; -import static com.sdl.odata.client.ODataClientConstants.WebService.CLIENT_SERVICE_PROXY_HOST_NAME; -import static com.sdl.odata.client.ODataClientConstants.WebService.CLIENT_SERVICE_PROXY_PORT; -import static com.sdl.odata.client.property.PropertyUtils.getIntegerProperty; -import static com.sdl.odata.client.property.PropertyUtils.getStringProperty; -import static com.sdl.odata.client.util.ODataClientUtils.buildException; -import static com.sdl.odata.client.util.ODataClientUtils.closeIfNecessary; -import static com.sdl.odata.client.util.ODataClientUtils.populateRequestProperties; -import static java.net.HttpURLConnection.HTTP_BAD_REQUEST; -import static org.apache.http.util.TextUtils.isBlank; -import static org.slf4j.LoggerFactory.getLogger; - -/** - * Tracing implementation of {@link com.sdl.odata.client.api.caller.EndpointCaller}. - * Using brave to generate and send spans into zipkin. - */ -public class TracingEndpointCaller implements EndpointCaller { - - private static final Logger LOG = getLogger(TracingEndpointCaller.class); - - private static final String WRONG_URL_MESSAGE = "The URL syntax is wrong"; - private static final String REQUEST_FAILED_MESSAGE = "Cannot make a request to URL: "; - private static final String APPLICATION_PROPERTIES_FILE_NAME = "/config/application.properties"; - private static final String DEFAULT_ZIPKIN_HOSTNAME = "http://localhost:9411"; - - private CloseableHttpClient closeableHttpClient; - - public TracingEndpointCaller(Properties properties) { - Integer timeout = getIntegerProperty(properties, CLIENT_CONNECTION_TIMEOUT, CLIENT_TIMEOUT_DEFAULT); - - String proxyServerHostName = getStringProperty(properties, CLIENT_SERVICE_PROXY_HOST_NAME); - Integer proxyPort = getIntegerProperty(properties, CLIENT_SERVICE_PROXY_PORT); - Integer proxyServerPort = proxyPort == null ? CLIENT_PROXY_PORT_DEFAULT : proxyPort; - - RequestConfig config = RequestConfig.custom() - .setConnectTimeout(timeout) - .setConnectionRequestTimeout(timeout) - .setSocketTimeout(timeout) - .build(); - - HttpClientBuilder httpClientBuilder = HttpClients.custom() - .setConnectionManager(new PoolingHttpClientConnectionManager()) - .setDefaultRequestConfig(config); - if (!isBlank(proxyServerHostName) && proxyServerPort > 0) { - httpClientBuilder.setProxy(new HttpHost(proxyServerHostName, proxyServerPort)); - } - - // load application.properties to know zipkin host, service name and how often to collect spans - Properties applicationProperties = new Properties(); - try (InputStream stream = this.getClass().getResourceAsStream(APPLICATION_PROPERTIES_FILE_NAME)) { - if (stream != null) { - applicationProperties.load(stream); - } - } catch (IOException e) { - LOG.warn("'{}' file is not available in the classpath", APPLICATION_PROPERTIES_FILE_NAME); - } - - Brave brave = new Brave.Builder(applicationProperties.getProperty("spring.application.name", "cil-call")) - .traceSampler(Sampler.create( - Float.valueOf(applicationProperties.getProperty("spring.sleuth.sampler.percentage", "1.0")))) - .reporter(AsyncReporter.builder(URLConnectionSender.builder().endpoint( - applicationProperties.getProperty("spring.zipkin.baseUrl", DEFAULT_ZIPKIN_HOSTNAME)).build()) - .build()).build(); - - closeableHttpClient = httpClientBuilder - .addInterceptorFirst(BraveHttpRequestInterceptor.builder(brave).build()) - //new BraveHttpRequestInterceptor(brave.clientRequestInterceptor(), - //new DefaultSpanNameProvider())) - .addInterceptorFirst(BraveHttpResponseInterceptor.builder(brave).build()) - //new BraveHttpResponseInterceptor(brave.clientResponseInterceptor())) - .build(); - } - - @Override - public String callEndpoint(Map requestProperties, URL url) throws ODataClientException { - LOG.debug("Preparing the call endpoint for given url: {}", url); - - CloseableHttpResponse closeableResponse = null; - try { - RequestBuilder requestBuilder = RequestBuilder.get() - .setUri(url.toURI()); - getRequestHeaders(requestProperties, -1, null, XML).entrySet().stream() - .forEach(entry -> requestBuilder.addHeader(entry.getKey(), entry.getValue())); - closeableResponse = closeableHttpClient.execute(requestBuilder.build()); - String response = EntityUtils.toString(closeableResponse.getEntity(), "UTF-8"); - - if (closeableResponse.getStatusLine().getStatusCode() >= HTTP_BAD_REQUEST) { - throw buildException(response, closeableResponse.getStatusLine().getStatusCode()); - } - return response; - } catch (URISyntaxException e) { - throw new ODataClientException(WRONG_URL_MESSAGE, e); - } catch (IOException e) { - throw new ODataClientRuntimeException(REQUEST_FAILED_MESSAGE + url, e); - } finally { - closeIfNecessary(closeableResponse); - } - } - - @Override - public InputStream getInputStream(Map requestProperties, URL url) throws ODataClientException { - LOG.debug("Preparing for getting an input stream by calling endpoint for given url: {}", url); - - try { - RequestBuilder requestBuilder = RequestBuilder.get().setUri(url.toURI()); - requestProperties.entrySet().stream() - .forEach(entry -> requestBuilder.addHeader(entry.getKey(), entry.getValue())); - CloseableHttpResponse closeableResponse = closeableHttpClient.execute(requestBuilder.build()); - - if (closeableResponse.getStatusLine().getStatusCode() >= HTTP_BAD_REQUEST) { - throw buildException(EntityUtils.toString(closeableResponse.getEntity(), "UTF-8"), - closeableResponse.getStatusLine().getStatusCode()); - } - return closeableResponse.getEntity().getContent(); - } catch (URISyntaxException e) { - throw new ODataClientException(WRONG_URL_MESSAGE + url, e); - } catch (IOException e) { - throw new ODataClientRuntimeException(REQUEST_FAILED_MESSAGE + url, e); - } - } - - @Override - public String doPostEntity(Map requestProperties, URL url, String body, - MediaType contentType, MediaType acceptType) throws ODataClientException { - return sendRequest(getRequestHeaders(requestProperties, body.length(), contentType, acceptType), - url, body, ODataRequest.Method.POST.name()); - } - - @Override - public String doPutEntity(Map requestProperties, URL url, String body, MediaType type) - throws ODataClientException { - return sendRequest(getRequestHeaders(requestProperties, body.length(), type, type), - url, body, ODataRequest.Method.PUT.name()); - } - - @Override - public void doDeleteEntity(Map requestProperties, URL url) throws ODataClientException { - sendRequest(getRequestHeaders(requestProperties, 0, ATOM_XML, ATOM_XML), url, "", - ODataRequest.Method.DELETE.name()); - } - - private Map getRequestHeaders( - Map requestProperties, int bodyLength, MediaType contentType, MediaType acceptType) { - Map headers = populateRequestProperties(requestProperties, bodyLength, contentType, acceptType); - headers.remove(HeaderNames.CONTENT_LENGTH); - return headers; - } - - private String sendRequest(Map properties, URL url, String body, String requestMethod) - throws ODataClientException { - LOG.debug("Preparing to make a {} request for given url: {}", requestMethod, url); - - CloseableHttpResponse closeableResponse = null; - try { - RequestBuilder requestBuilder = RequestBuilder.create(requestMethod) - .setUri(url.toURI()) - .setEntity(new StringEntity(body)); - properties.entrySet().stream() - .forEach(entry -> requestBuilder.addHeader(entry.getKey(), entry.getValue())); - closeableResponse = closeableHttpClient.execute(requestBuilder.build()); - String response = EntityUtils.toString(closeableResponse.getEntity(), "UTF-8"); - - if (closeableResponse.getStatusLine().getStatusCode() >= HTTP_BAD_REQUEST) { - throw buildException(response, closeableResponse.getStatusLine().getStatusCode()); - } - return response; - } catch (URISyntaxException e) { - throw new ODataClientException(WRONG_URL_MESSAGE + url, e); - } catch (IOException e) { - throw new ODataClientRuntimeException(REQUEST_FAILED_MESSAGE + url, e); - } finally { - closeIfNecessary(closeableResponse); - } - } -} diff --git a/odata_client_tracing/src/test/java/com/sdl/odata/client/caller/TracingEndpointCallerTest.java b/odata_client_tracing/src/test/java/com/sdl/odata/client/caller/TracingEndpointCallerTest.java deleted file mode 100644 index b2b14b9c..00000000 --- a/odata_client_tracing/src/test/java/com/sdl/odata/client/caller/TracingEndpointCallerTest.java +++ /dev/null @@ -1,238 +0,0 @@ -/** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. - * - * 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 com.sdl.odata.client.caller; - -import com.sdl.odata.client.URLTestUtils; -import com.sdl.odata.client.api.caller.EndpointCaller; -import com.sdl.odata.client.api.exception.ODataClientException; -import com.sdl.odata.client.api.exception.ODataClientHttpError; -import com.sdl.odata.client.api.exception.ODataClientNotAuthorized; -import com.sdl.odata.client.api.exception.ODataClientRuntimeException; -import com.sdl.odata.client.api.exception.ODataClientTimeout; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.annotation.DirtiesContext; -import org.springframework.test.context.junit.jupiter.SpringExtension; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Properties; - -import static com.sdl.odata.api.service.MediaType.JSON; -import static com.sdl.odata.client.ODataClientConstants.WebService.CLIENT_SERVICE_PROXY_HOST_NAME; -import static com.sdl.odata.client.ODataClientConstants.WebService.CLIENT_SERVICE_PROXY_PORT; -import static java.net.HttpURLConnection.HTTP_CLIENT_TIMEOUT; -import static java.net.HttpURLConnection.HTTP_FORBIDDEN; -import static java.net.HttpURLConnection.HTTP_UNAUTHORIZED; -import static java.util.Collections.emptyMap; -import static java.util.Collections.singletonMap; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; - -/** - * Integration test for {@link TracingEndpointCaller}. - */ -@Disabled -@ExtendWith(SpringExtension.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = TestConfiguration.class) -@DirtiesContext -public class TracingEndpointCallerTest { - - private static final String RESPONSE = "/response.xml"; - - private final EndpointCaller caller = new TracingEndpointCaller(new Properties()); - - @Value("${local.server.port}") - private int port; - - private String basePath; - - @BeforeEach - public void init() { - basePath = "http://127.0.0.1:" + port; - } - - @Test - public void callEndpoint() throws ODataClientException, MalformedURLException { - String response = caller.callEndpoint(singletonMap("Accept", APPLICATION_JSON_VALUE), - new URL(basePath + RESPONSE)); - String expected = URLTestUtils.loadTextFile(RESPONSE); - response = response.replace("\n", "").replace("\r", ""); - expected = expected.replace("\n", "").replace("\r", ""); - assertEquals(expected, response); - } - - @Test - public void callEndpointWithoutResponse() { - assertThrows(ODataClientHttpError.class, () -> - caller.callEndpoint(singletonMap("Accept", APPLICATION_JSON_VALUE), new URL(basePath)) - ); - } - - @Test - public void getInputStream() throws ODataClientException, IOException { - InputStream stream = caller.getInputStream( - singletonMap("Accept", APPLICATION_JSON_VALUE), new URL(basePath + RESPONSE)); - StringBuilder sb = new StringBuilder(); - try (BufferedReader reader = new BufferedReader(new InputStreamReader(stream))) { - String line; - while ((line = reader.readLine()) != null) { - sb.append(line).append(System.lineSeparator()); - } - } - assertEquals(URLTestUtils.loadTextFile(RESPONSE), sb.toString()); - } - - @Test - public void testEmptyProxyPortNumber() throws ODataClientException, MalformedURLException { - Properties properties = new Properties(); - properties.setProperty(CLIENT_SERVICE_PROXY_PORT, ""); - - EndpointCaller proxifiedCaller = new TracingEndpointCaller(properties); - String response = proxifiedCaller.callEndpoint(emptyMap(), new URL(basePath + RESPONSE)); - String result = URLTestUtils.loadTextFile(RESPONSE); - - response = response.replace("\n", "").replace("\r", ""); - result = result.replace("\n", "").replace("\r", ""); - assertEquals(result, response); - } - - @Test - public void unauthorizedPostEntity() { - assertThrows(ODataClientNotAuthorized.class, () -> - caller.doPostEntity(emptyMap(), buildUrlToCall(HTTP_FORBIDDEN), "", JSON, JSON) - ); - } - - @Test - public void forbiddenPostEntity() { - assertThrows(ODataClientHttpError.class, () -> - caller.doPostEntity(emptyMap(), buildUrlToCall(HTTP_FORBIDDEN), "", JSON, JSON) - ); - } - - @Test - public void timeoutPostEntity() { - assertThrows(ODataClientTimeout.class, () -> - caller.doPostEntity(emptyMap(), buildUrlToCall(HTTP_CLIENT_TIMEOUT), "", JSON, JSON) - ); - } - - @Test - public void okPutEntity() throws MalformedURLException, ODataClientException { - String body = URLTestUtils.loadTextFile(RESPONSE); - String result = caller.doPutEntity(emptyMap(), new URL(basePath + RESPONSE), body, JSON); - body = body.replace("\n", "").replace("\r", ""); - result = result.replace("\n", "").replace("\r", ""); - assertEquals(result, body); - } - - @Test - public void unauthorizedPutEntity() { - assertThrows(ODataClientNotAuthorized.class, () -> - caller.doPutEntity(emptyMap(), buildUrlToCall(HTTP_UNAUTHORIZED), "", JSON) - ); - } - - @Test - public void forbiddenPutEntity() { - assertThrows(ODataClientHttpError.class, () -> - caller.doPutEntity(emptyMap(), buildUrlToCall(HTTP_FORBIDDEN), "", JSON) - ); - } - - @Test - public void timeoutPutEntity() { - assertThrows(ODataClientTimeout.class, () -> - caller.doPutEntity(emptyMap(), buildUrlToCall(HTTP_CLIENT_TIMEOUT), "", JSON) - ); - } - - @Test - public void unauthorizedDeleteEntity() { - assertThrows(ODataClientNotAuthorized.class, () -> - caller.doDeleteEntity(emptyMap(), buildUrlToCall(HTTP_UNAUTHORIZED)) - ); - } - - @Test - public void forbiddenDeleteEntity() { - assertThrows(ODataClientHttpError.class, () -> - caller.doDeleteEntity(emptyMap(), buildUrlToCall(HTTP_FORBIDDEN)) - ); - } - - @Test - public void timeoutDeleteEntity() { - assertThrows(ODataClientTimeout.class, () -> - caller.doDeleteEntity(emptyMap(), buildUrlToCall(HTTP_CLIENT_TIMEOUT)) - ); - } - - @Test - public void unauthorizedGet() { - assertThrows(ODataClientNotAuthorized.class, () -> - caller.callEndpoint(emptyMap(), buildUrlToCall(HTTP_UNAUTHORIZED)) - ); - } - - @Test - public void forbiddenGet() { - assertThrows(ODataClientHttpError.class, () -> - caller.callEndpoint(emptyMap(), buildUrlToCall(HTTP_FORBIDDEN)) - ); - } - - @Test - public void timeoutGet() { - assertThrows(ODataClientTimeout.class, () -> - caller.callEndpoint(emptyMap(), buildUrlToCall(HTTP_CLIENT_TIMEOUT)) - ); - } - - @Test - public void timeoutInputStream() { - assertThrows(ODataClientTimeout.class, () -> - caller.getInputStream(emptyMap(), buildUrlToCall(HTTP_CLIENT_TIMEOUT)) - ); - } - - @Test - public void testIOExceptionOnOpenConnection() throws IOException { - URL ioExceptionOnConnectUrl = URLTestUtils.getIOExceptionThrowingUrl(true); - Properties properties = new Properties(); - properties.setProperty(CLIENT_SERVICE_PROXY_HOST_NAME, "localhost"); - properties.setProperty(CLIENT_SERVICE_PROXY_PORT, "9999"); - EndpointCaller proxifiedCaller = new TracingEndpointCaller(properties); - - assertThrows(ODataClientRuntimeException.class, () -> - proxifiedCaller.callEndpoint(emptyMap(), ioExceptionOnConnectUrl) - ); - } - - private URL buildUrlToCall(int code) throws MalformedURLException { - return new URL(basePath + "/" + code); - } -} diff --git a/odata_client_tracing/src/test/resources/application.properties b/odata_client_tracing/src/test/resources/application.properties deleted file mode 100644 index 37edf157..00000000 --- a/odata_client_tracing/src/test/resources/application.properties +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (c) 2014-2021 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. -# -# 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. -# - -spring.zipkin.baseUrl=http://localhost:9411 -spring.sleuth.sampler.percentage=1.0 -spring.application.name=your-service-name diff --git a/odata_client_tracing/src/test/resources/response.xml b/odata_client_tracing/src/test/resources/response.xml deleted file mode 100644 index 307569af..00000000 --- a/odata_client_tracing/src/test/resources/response.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - http://localhost:8080/odata.svc/$metadata#Article('artid') - - <summary/> - <updated>2014-08-11T10:00:00Z</updated> - <author> - <name/> - </author> - <link rel="edit" title="Article" href="Articles('artid')"/> - <category term="#SDL.Article" - scheme="http://docs.oasis-open.org/odata/ns/scheme"/> - <content type="application/xml"> - <m:properties> - <d:id>artid</d:id> - <d:Name>article1_name</d:Name> - </m:properties> - </content> -</entry> \ No newline at end of file diff --git a/odata_common/pom.xml b/odata_common/pom.xml index 0fff3621..6901dd31 100644 --- a/odata_common/pom.xml +++ b/odata_common/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/odata_common/src/main/java/com/sdl/odata/controller/AbstractODataController.java b/odata_common/src/main/java/com/sdl/odata/controller/AbstractODataController.java index 285f5308..b667ab0a 100644 --- a/odata_common/src/main/java/com/sdl/odata/controller/AbstractODataController.java +++ b/odata_common/src/main/java/com/sdl/odata/controller/AbstractODataController.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_controller/pom.xml b/odata_controller/pom.xml index 18458c5f..13b18ac2 100644 --- a/odata_controller/pom.xml +++ b/odata_controller/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/odata_controller/src/main/java/com/sdl/odata/controller/ODataController.java b/odata_controller/src/main/java/com/sdl/odata/controller/ODataController.java index 4340dca5..bd29e88a 100644 --- a/odata_controller/src/main/java/com/sdl/odata/controller/ODataController.java +++ b/odata_controller/src/main/java/com/sdl/odata/controller/ODataController.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_controller/src/main/java/com/sdl/odata/controller/ODataControllerConfiguration.java b/odata_controller/src/main/java/com/sdl/odata/controller/ODataControllerConfiguration.java index b57555ec..7ff1daa3 100644 --- a/odata_controller/src/main/java/com/sdl/odata/controller/ODataControllerConfiguration.java +++ b/odata_controller/src/main/java/com/sdl/odata/controller/ODataControllerConfiguration.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/pom.xml b/odata_edm/pom.xml index de81b900..6a58d9a8 100644 --- a/odata_edm/pom.xml +++ b/odata_edm/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/odata_edm/src/main/java/com/sdl/odata/edm/EdmConfiguration.java b/odata_edm/src/main/java/com/sdl/odata/edm/EdmConfiguration.java index 962433f8..cd380eba 100644 --- a/odata_edm/src/main/java/com/sdl/odata/edm/EdmConfiguration.java +++ b/odata_edm/src/main/java/com/sdl/odata/edm/EdmConfiguration.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationActionFactory.java b/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationActionFactory.java index d073ef83..f0d65a3c 100644 --- a/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationActionFactory.java +++ b/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationActionFactory.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationActionImportFactory.java b/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationActionImportFactory.java index ad3c39c2..3454cb20 100644 --- a/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationActionImportFactory.java +++ b/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationActionImportFactory.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationComplexTypeFactory.java b/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationComplexTypeFactory.java index 30294042..a6d6e3e3 100644 --- a/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationComplexTypeFactory.java +++ b/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationComplexTypeFactory.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationEntityDataModelFactory.java b/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationEntityDataModelFactory.java index 45badcae..0317abac 100644 --- a/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationEntityDataModelFactory.java +++ b/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationEntityDataModelFactory.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -238,7 +238,7 @@ public StructuredType getStructuredType(String fullyQualifiedTypeName) { Schema schema = schemas.get(namespace); if (schema != null) { Type type = schema.getType(simpleTypeName); - return type instanceof StructuredType ? (StructuredType) type : null; + return type instanceof StructuredType st ? st : null; } else { return null; } diff --git a/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationEntitySetFactory.java b/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationEntitySetFactory.java index ad56e390..17ac72f7 100644 --- a/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationEntitySetFactory.java +++ b/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationEntitySetFactory.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationEntityTypeFactory.java b/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationEntityTypeFactory.java index 096c8cbe..03765ae3 100644 --- a/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationEntityTypeFactory.java +++ b/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationEntityTypeFactory.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationEnumTypeFactory.java b/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationEnumTypeFactory.java index 3d22ce72..f6f7464b 100644 --- a/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationEnumTypeFactory.java +++ b/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationEnumTypeFactory.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationFunctionFactory.java b/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationFunctionFactory.java index ff160bb7..e37e893c 100644 --- a/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationFunctionFactory.java +++ b/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationFunctionFactory.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationFunctionImportFactory.java b/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationFunctionImportFactory.java index 25903590..1671de4a 100644 --- a/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationFunctionImportFactory.java +++ b/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationFunctionImportFactory.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationNavigationPropertyBindingFactory.java b/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationNavigationPropertyBindingFactory.java index 66f79f25..d89d8f80 100644 --- a/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationNavigationPropertyBindingFactory.java +++ b/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationNavigationPropertyBindingFactory.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationSingletonFactory.java b/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationSingletonFactory.java index b591d281..7f9a8c52 100644 --- a/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationSingletonFactory.java +++ b/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationSingletonFactory.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationStructuredTypeFactory.java b/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationStructuredTypeFactory.java index 94484b21..4a91f843 100644 --- a/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationStructuredTypeFactory.java +++ b/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/AnnotationStructuredTypeFactory.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/FactoryLookup.java b/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/FactoryLookup.java index b5042142..88ecb895 100644 --- a/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/FactoryLookup.java +++ b/odata_edm/src/main/java/com/sdl/odata/edm/factory/annotations/FactoryLookup.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/main/java/com/sdl/odata/edm/model/ActionImpl.java b/odata_edm/src/main/java/com/sdl/odata/edm/model/ActionImpl.java index b998e1b5..3015efcd 100644 --- a/odata_edm/src/main/java/com/sdl/odata/edm/model/ActionImpl.java +++ b/odata_edm/src/main/java/com/sdl/odata/edm/model/ActionImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/main/java/com/sdl/odata/edm/model/ActionImportImpl.java b/odata_edm/src/main/java/com/sdl/odata/edm/model/ActionImportImpl.java index 9103cd41..d0a3662f 100644 --- a/odata_edm/src/main/java/com/sdl/odata/edm/model/ActionImportImpl.java +++ b/odata_edm/src/main/java/com/sdl/odata/edm/model/ActionImportImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/main/java/com/sdl/odata/edm/model/ComplexTypeImpl.java b/odata_edm/src/main/java/com/sdl/odata/edm/model/ComplexTypeImpl.java index d840ec17..d04501f8 100644 --- a/odata_edm/src/main/java/com/sdl/odata/edm/model/ComplexTypeImpl.java +++ b/odata_edm/src/main/java/com/sdl/odata/edm/model/ComplexTypeImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/main/java/com/sdl/odata/edm/model/DerivableTypeImpl.java b/odata_edm/src/main/java/com/sdl/odata/edm/model/DerivableTypeImpl.java index 159f57ca..29fa7654 100644 --- a/odata_edm/src/main/java/com/sdl/odata/edm/model/DerivableTypeImpl.java +++ b/odata_edm/src/main/java/com/sdl/odata/edm/model/DerivableTypeImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/main/java/com/sdl/odata/edm/model/EntityContainerImpl.java b/odata_edm/src/main/java/com/sdl/odata/edm/model/EntityContainerImpl.java index 271445b8..5863cc5d 100644 --- a/odata_edm/src/main/java/com/sdl/odata/edm/model/EntityContainerImpl.java +++ b/odata_edm/src/main/java/com/sdl/odata/edm/model/EntityContainerImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/main/java/com/sdl/odata/edm/model/EntityDataModelImpl.java b/odata_edm/src/main/java/com/sdl/odata/edm/model/EntityDataModelImpl.java index 30e5c2be..92ed3905 100644 --- a/odata_edm/src/main/java/com/sdl/odata/edm/model/EntityDataModelImpl.java +++ b/odata_edm/src/main/java/com/sdl/odata/edm/model/EntityDataModelImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/main/java/com/sdl/odata/edm/model/EntitySetImpl.java b/odata_edm/src/main/java/com/sdl/odata/edm/model/EntitySetImpl.java index 79134f61..2e39d2ea 100644 --- a/odata_edm/src/main/java/com/sdl/odata/edm/model/EntitySetImpl.java +++ b/odata_edm/src/main/java/com/sdl/odata/edm/model/EntitySetImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/main/java/com/sdl/odata/edm/model/EntityTypeImpl.java b/odata_edm/src/main/java/com/sdl/odata/edm/model/EntityTypeImpl.java index b2168ff3..429427fb 100644 --- a/odata_edm/src/main/java/com/sdl/odata/edm/model/EntityTypeImpl.java +++ b/odata_edm/src/main/java/com/sdl/odata/edm/model/EntityTypeImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/main/java/com/sdl/odata/edm/model/EnumMemberImpl.java b/odata_edm/src/main/java/com/sdl/odata/edm/model/EnumMemberImpl.java index 874ec3b2..4ce0431c 100644 --- a/odata_edm/src/main/java/com/sdl/odata/edm/model/EnumMemberImpl.java +++ b/odata_edm/src/main/java/com/sdl/odata/edm/model/EnumMemberImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/main/java/com/sdl/odata/edm/model/EnumTypeImpl.java b/odata_edm/src/main/java/com/sdl/odata/edm/model/EnumTypeImpl.java index 147d2c50..820041a1 100644 --- a/odata_edm/src/main/java/com/sdl/odata/edm/model/EnumTypeImpl.java +++ b/odata_edm/src/main/java/com/sdl/odata/edm/model/EnumTypeImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/main/java/com/sdl/odata/edm/model/FunctionImpl.java b/odata_edm/src/main/java/com/sdl/odata/edm/model/FunctionImpl.java index da4a8d7a..94eba3cc 100644 --- a/odata_edm/src/main/java/com/sdl/odata/edm/model/FunctionImpl.java +++ b/odata_edm/src/main/java/com/sdl/odata/edm/model/FunctionImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/main/java/com/sdl/odata/edm/model/FunctionImportImpl.java b/odata_edm/src/main/java/com/sdl/odata/edm/model/FunctionImportImpl.java index 40fc6130..20fe1f50 100644 --- a/odata_edm/src/main/java/com/sdl/odata/edm/model/FunctionImportImpl.java +++ b/odata_edm/src/main/java/com/sdl/odata/edm/model/FunctionImportImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/main/java/com/sdl/odata/edm/model/KeyImpl.java b/odata_edm/src/main/java/com/sdl/odata/edm/model/KeyImpl.java index 1c62eaf2..d7ccfc3c 100644 --- a/odata_edm/src/main/java/com/sdl/odata/edm/model/KeyImpl.java +++ b/odata_edm/src/main/java/com/sdl/odata/edm/model/KeyImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/main/java/com/sdl/odata/edm/model/NavigationPropertyBindingImpl.java b/odata_edm/src/main/java/com/sdl/odata/edm/model/NavigationPropertyBindingImpl.java index b5aee432..67a1a35d 100644 --- a/odata_edm/src/main/java/com/sdl/odata/edm/model/NavigationPropertyBindingImpl.java +++ b/odata_edm/src/main/java/com/sdl/odata/edm/model/NavigationPropertyBindingImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/main/java/com/sdl/odata/edm/model/NavigationPropertyImpl.java b/odata_edm/src/main/java/com/sdl/odata/edm/model/NavigationPropertyImpl.java index a23cd724..37e98b95 100644 --- a/odata_edm/src/main/java/com/sdl/odata/edm/model/NavigationPropertyImpl.java +++ b/odata_edm/src/main/java/com/sdl/odata/edm/model/NavigationPropertyImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/main/java/com/sdl/odata/edm/model/ParameterImpl.java b/odata_edm/src/main/java/com/sdl/odata/edm/model/ParameterImpl.java index 7737ec83..d75df379 100644 --- a/odata_edm/src/main/java/com/sdl/odata/edm/model/ParameterImpl.java +++ b/odata_edm/src/main/java/com/sdl/odata/edm/model/ParameterImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/main/java/com/sdl/odata/edm/model/PrimitiveTypeNameResolver.java b/odata_edm/src/main/java/com/sdl/odata/edm/model/PrimitiveTypeNameResolver.java index 34ac4f35..fecbe4ec 100644 --- a/odata_edm/src/main/java/com/sdl/odata/edm/model/PrimitiveTypeNameResolver.java +++ b/odata_edm/src/main/java/com/sdl/odata/edm/model/PrimitiveTypeNameResolver.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/main/java/com/sdl/odata/edm/model/PropertyImpl.java b/odata_edm/src/main/java/com/sdl/odata/edm/model/PropertyImpl.java index 65f2ad24..b8e25165 100644 --- a/odata_edm/src/main/java/com/sdl/odata/edm/model/PropertyImpl.java +++ b/odata_edm/src/main/java/com/sdl/odata/edm/model/PropertyImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/main/java/com/sdl/odata/edm/model/PropertyRefImpl.java b/odata_edm/src/main/java/com/sdl/odata/edm/model/PropertyRefImpl.java index 6e65fa29..61df0991 100644 --- a/odata_edm/src/main/java/com/sdl/odata/edm/model/PropertyRefImpl.java +++ b/odata_edm/src/main/java/com/sdl/odata/edm/model/PropertyRefImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/main/java/com/sdl/odata/edm/model/ReferentialConstraintImpl.java b/odata_edm/src/main/java/com/sdl/odata/edm/model/ReferentialConstraintImpl.java index 8afddf07..885f105e 100644 --- a/odata_edm/src/main/java/com/sdl/odata/edm/model/ReferentialConstraintImpl.java +++ b/odata_edm/src/main/java/com/sdl/odata/edm/model/ReferentialConstraintImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/main/java/com/sdl/odata/edm/model/SchemaImpl.java b/odata_edm/src/main/java/com/sdl/odata/edm/model/SchemaImpl.java index 5d3b8faa..753190ee 100644 --- a/odata_edm/src/main/java/com/sdl/odata/edm/model/SchemaImpl.java +++ b/odata_edm/src/main/java/com/sdl/odata/edm/model/SchemaImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/main/java/com/sdl/odata/edm/model/SingletonImpl.java b/odata_edm/src/main/java/com/sdl/odata/edm/model/SingletonImpl.java index 0dffe3af..9d4f5f76 100644 --- a/odata_edm/src/main/java/com/sdl/odata/edm/model/SingletonImpl.java +++ b/odata_edm/src/main/java/com/sdl/odata/edm/model/SingletonImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/main/java/com/sdl/odata/edm/model/StructuralPropertyImpl.java b/odata_edm/src/main/java/com/sdl/odata/edm/model/StructuralPropertyImpl.java index 291cb537..807e3158 100644 --- a/odata_edm/src/main/java/com/sdl/odata/edm/model/StructuralPropertyImpl.java +++ b/odata_edm/src/main/java/com/sdl/odata/edm/model/StructuralPropertyImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -98,11 +98,11 @@ public B setTypeFromJavaField(Field field, TypeNameResolver resolver) { private Class<?> getCollectionElementType(Field field) { // Reflection magic to determine the element type of a collection type java.lang.reflect.Type genericType = field.getGenericType(); - if (genericType instanceof ParameterizedType) { + if (genericType instanceof ParameterizedType type) { java.lang.reflect.Type[] actualTypeArguments = - ((ParameterizedType) genericType).getActualTypeArguments(); - if (actualTypeArguments.length > 0 && actualTypeArguments[0] instanceof Class) { - return (Class<?>) actualTypeArguments[0]; + type.getActualTypeArguments(); + if (actualTypeArguments.length > 0 && actualTypeArguments[0] instanceof Class<?> class1) { + return class1; } } diff --git a/odata_edm/src/main/java/com/sdl/odata/edm/model/StructuredTypeImpl.java b/odata_edm/src/main/java/com/sdl/odata/edm/model/StructuredTypeImpl.java index 7321aadf..a2d44361 100644 --- a/odata_edm/src/main/java/com/sdl/odata/edm/model/StructuredTypeImpl.java +++ b/odata_edm/src/main/java/com/sdl/odata/edm/model/StructuredTypeImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/main/java/com/sdl/odata/edm/model/TypeDefinitionImpl.java b/odata_edm/src/main/java/com/sdl/odata/edm/model/TypeDefinitionImpl.java index dc9643b5..062d3e16 100644 --- a/odata_edm/src/main/java/com/sdl/odata/edm/model/TypeDefinitionImpl.java +++ b/odata_edm/src/main/java/com/sdl/odata/edm/model/TypeDefinitionImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/main/java/com/sdl/odata/edm/model/TypeImpl.java b/odata_edm/src/main/java/com/sdl/odata/edm/model/TypeImpl.java index e4621ab3..38c9ec7a 100644 --- a/odata_edm/src/main/java/com/sdl/odata/edm/model/TypeImpl.java +++ b/odata_edm/src/main/java/com/sdl/odata/edm/model/TypeImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/main/java/com/sdl/odata/edm/model/TypeNameResolver.java b/odata_edm/src/main/java/com/sdl/odata/edm/model/TypeNameResolver.java index f9746f38..a07be391 100644 --- a/odata_edm/src/main/java/com/sdl/odata/edm/model/TypeNameResolver.java +++ b/odata_edm/src/main/java/com/sdl/odata/edm/model/TypeNameResolver.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/main/java/com/sdl/odata/edm/registry/ODataEdmRegistryImpl.java b/odata_edm/src/main/java/com/sdl/odata/edm/registry/ODataEdmRegistryImpl.java index 047de99d..d253b5ae 100644 --- a/odata_edm/src/main/java/com/sdl/odata/edm/registry/ODataEdmRegistryImpl.java +++ b/odata_edm/src/main/java/com/sdl/odata/edm/registry/ODataEdmRegistryImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/test/java/com/sdl/odata/edm/factory/annotations/AnnotationActionFactoryTest.java b/odata_edm/src/test/java/com/sdl/odata/edm/factory/annotations/AnnotationActionFactoryTest.java index af3b1d45..d535077f 100644 --- a/odata_edm/src/test/java/com/sdl/odata/edm/factory/annotations/AnnotationActionFactoryTest.java +++ b/odata_edm/src/test/java/com/sdl/odata/edm/factory/annotations/AnnotationActionFactoryTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/test/java/com/sdl/odata/edm/factory/annotations/AnnotationActionImportFactoryTest.java b/odata_edm/src/test/java/com/sdl/odata/edm/factory/annotations/AnnotationActionImportFactoryTest.java index a8d46195..4e05e8c9 100644 --- a/odata_edm/src/test/java/com/sdl/odata/edm/factory/annotations/AnnotationActionImportFactoryTest.java +++ b/odata_edm/src/test/java/com/sdl/odata/edm/factory/annotations/AnnotationActionImportFactoryTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/test/java/com/sdl/odata/edm/factory/annotations/AnnotationEntityDataModelFactoryTest.java b/odata_edm/src/test/java/com/sdl/odata/edm/factory/annotations/AnnotationEntityDataModelFactoryTest.java index eea2f8f7..8defe178 100644 --- a/odata_edm/src/test/java/com/sdl/odata/edm/factory/annotations/AnnotationEntityDataModelFactoryTest.java +++ b/odata_edm/src/test/java/com/sdl/odata/edm/factory/annotations/AnnotationEntityDataModelFactoryTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/test/java/com/sdl/odata/edm/factory/annotations/AnnotationEnumTypeFactoryTest.java b/odata_edm/src/test/java/com/sdl/odata/edm/factory/annotations/AnnotationEnumTypeFactoryTest.java index 33fad71e..0e19a08d 100644 --- a/odata_edm/src/test/java/com/sdl/odata/edm/factory/annotations/AnnotationEnumTypeFactoryTest.java +++ b/odata_edm/src/test/java/com/sdl/odata/edm/factory/annotations/AnnotationEnumTypeFactoryTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/test/java/com/sdl/odata/edm/factory/annotations/AnnotationFunctionFactoryTest.java b/odata_edm/src/test/java/com/sdl/odata/edm/factory/annotations/AnnotationFunctionFactoryTest.java index 85795c3c..a0423a28 100644 --- a/odata_edm/src/test/java/com/sdl/odata/edm/factory/annotations/AnnotationFunctionFactoryTest.java +++ b/odata_edm/src/test/java/com/sdl/odata/edm/factory/annotations/AnnotationFunctionFactoryTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/test/java/com/sdl/odata/edm/factory/annotations/AnnotationFunctionImportFactoryTest.java b/odata_edm/src/test/java/com/sdl/odata/edm/factory/annotations/AnnotationFunctionImportFactoryTest.java index feaad2da..82763e33 100644 --- a/odata_edm/src/test/java/com/sdl/odata/edm/factory/annotations/AnnotationFunctionImportFactoryTest.java +++ b/odata_edm/src/test/java/com/sdl/odata/edm/factory/annotations/AnnotationFunctionImportFactoryTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/test/java/com/sdl/odata/edm/model/ActionImplTest.java b/odata_edm/src/test/java/com/sdl/odata/edm/model/ActionImplTest.java index 14e0fad6..17b14642 100644 --- a/odata_edm/src/test/java/com/sdl/odata/edm/model/ActionImplTest.java +++ b/odata_edm/src/test/java/com/sdl/odata/edm/model/ActionImplTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/test/java/com/sdl/odata/edm/model/ActionImportImplTest.java b/odata_edm/src/test/java/com/sdl/odata/edm/model/ActionImportImplTest.java index 1b143d25..6eece4bc 100644 --- a/odata_edm/src/test/java/com/sdl/odata/edm/model/ActionImportImplTest.java +++ b/odata_edm/src/test/java/com/sdl/odata/edm/model/ActionImportImplTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/test/java/com/sdl/odata/edm/model/EntityContainerImplTest.java b/odata_edm/src/test/java/com/sdl/odata/edm/model/EntityContainerImplTest.java index 02a63d0e..a80adcae 100644 --- a/odata_edm/src/test/java/com/sdl/odata/edm/model/EntityContainerImplTest.java +++ b/odata_edm/src/test/java/com/sdl/odata/edm/model/EntityContainerImplTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/test/java/com/sdl/odata/edm/model/EntitySetImplTest.java b/odata_edm/src/test/java/com/sdl/odata/edm/model/EntitySetImplTest.java index b6977719..5c1b1ee9 100644 --- a/odata_edm/src/test/java/com/sdl/odata/edm/model/EntitySetImplTest.java +++ b/odata_edm/src/test/java/com/sdl/odata/edm/model/EntitySetImplTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/test/java/com/sdl/odata/edm/model/EntityTypeImplTest.java b/odata_edm/src/test/java/com/sdl/odata/edm/model/EntityTypeImplTest.java index 7946fe12..f6fb71d1 100644 --- a/odata_edm/src/test/java/com/sdl/odata/edm/model/EntityTypeImplTest.java +++ b/odata_edm/src/test/java/com/sdl/odata/edm/model/EntityTypeImplTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/test/java/com/sdl/odata/edm/model/FunctionImplTest.java b/odata_edm/src/test/java/com/sdl/odata/edm/model/FunctionImplTest.java index 9a2dd323..eefc90be 100644 --- a/odata_edm/src/test/java/com/sdl/odata/edm/model/FunctionImplTest.java +++ b/odata_edm/src/test/java/com/sdl/odata/edm/model/FunctionImplTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/test/java/com/sdl/odata/edm/model/FunctionImportImplTest.java b/odata_edm/src/test/java/com/sdl/odata/edm/model/FunctionImportImplTest.java index 1ff6da50..7b4555bf 100644 --- a/odata_edm/src/test/java/com/sdl/odata/edm/model/FunctionImportImplTest.java +++ b/odata_edm/src/test/java/com/sdl/odata/edm/model/FunctionImportImplTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/test/java/com/sdl/odata/edm/model/ParameterImplTest.java b/odata_edm/src/test/java/com/sdl/odata/edm/model/ParameterImplTest.java index 5f0761c2..9f3b1a6c 100644 --- a/odata_edm/src/test/java/com/sdl/odata/edm/model/ParameterImplTest.java +++ b/odata_edm/src/test/java/com/sdl/odata/edm/model/ParameterImplTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/test/java/com/sdl/odata/edm/model/PropertyImplTest.java b/odata_edm/src/test/java/com/sdl/odata/edm/model/PropertyImplTest.java index db044146..0c298cca 100644 --- a/odata_edm/src/test/java/com/sdl/odata/edm/model/PropertyImplTest.java +++ b/odata_edm/src/test/java/com/sdl/odata/edm/model/PropertyImplTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/test/java/com/sdl/odata/edm/model/PropertyRefImplTest.java b/odata_edm/src/test/java/com/sdl/odata/edm/model/PropertyRefImplTest.java index e659b8e0..b565554f 100644 --- a/odata_edm/src/test/java/com/sdl/odata/edm/model/PropertyRefImplTest.java +++ b/odata_edm/src/test/java/com/sdl/odata/edm/model/PropertyRefImplTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/test/java/com/sdl/odata/edm/model/ReferentialConstraintImplTest.java b/odata_edm/src/test/java/com/sdl/odata/edm/model/ReferentialConstraintImplTest.java index 18a243ed..bfb6cc07 100644 --- a/odata_edm/src/test/java/com/sdl/odata/edm/model/ReferentialConstraintImplTest.java +++ b/odata_edm/src/test/java/com/sdl/odata/edm/model/ReferentialConstraintImplTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/test/java/com/sdl/odata/edm/model/SingletonImplTest.java b/odata_edm/src/test/java/com/sdl/odata/edm/model/SingletonImplTest.java index 7b2b7a5e..c0939b8d 100644 --- a/odata_edm/src/test/java/com/sdl/odata/edm/model/SingletonImplTest.java +++ b/odata_edm/src/test/java/com/sdl/odata/edm/model/SingletonImplTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/test/java/com/sdl/odata/edm/model/TypeDefinitionImplTest.java b/odata_edm/src/test/java/com/sdl/odata/edm/model/TypeDefinitionImplTest.java index a01f1a36..f42b33d2 100644 --- a/odata_edm/src/test/java/com/sdl/odata/edm/model/TypeDefinitionImplTest.java +++ b/odata_edm/src/test/java/com/sdl/odata/edm/model/TypeDefinitionImplTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_edm/src/test/java/com/sdl/odata/edm/registry/ODataEdmRegistryImplTest.java b/odata_edm/src/test/java/com/sdl/odata/edm/registry/ODataEdmRegistryImplTest.java index c7b40111..1f18886f 100644 --- a/odata_edm/src/test/java/com/sdl/odata/edm/registry/ODataEdmRegistryImplTest.java +++ b/odata_edm/src/test/java/com/sdl/odata/edm/registry/ODataEdmRegistryImplTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_parser/pom.xml b/odata_parser/pom.xml index 2a7c3c70..812de03a 100644 --- a/odata_parser/pom.xml +++ b/odata_parser/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/odata_parser/src/main/java/com/sdl/odata/parser/ODataParserImpl.java b/odata_parser/src/main/java/com/sdl/odata/parser/ODataParserImpl.java index 68c479c9..22bb50a3 100644 --- a/odata_parser/src/main/java/com/sdl/odata/parser/ODataParserImpl.java +++ b/odata_parser/src/main/java/com/sdl/odata/parser/ODataParserImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_parser/src/main/java/com/sdl/odata/parser/ParserConfiguration.java b/odata_parser/src/main/java/com/sdl/odata/parser/ParserConfiguration.java index 08473901..9ddf6493 100644 --- a/odata_parser/src/main/java/com/sdl/odata/parser/ParserConfiguration.java +++ b/odata_parser/src/main/java/com/sdl/odata/parser/ParserConfiguration.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_parser/src/main/scala/com/sdl/odata/parser/ContextFragmentParser.scala b/odata_parser/src/main/scala/com/sdl/odata/parser/ContextFragmentParser.scala index 40de3aee..a5c96e4d 100644 --- a/odata_parser/src/main/scala/com/sdl/odata/parser/ContextFragmentParser.scala +++ b/odata_parser/src/main/scala/com/sdl/odata/parser/ContextFragmentParser.scala @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_parser/src/main/scala/com/sdl/odata/parser/EntityDataModelHelpers.scala b/odata_parser/src/main/scala/com/sdl/odata/parser/EntityDataModelHelpers.scala index 79a1c9e4..b23435ef 100644 --- a/odata_parser/src/main/scala/com/sdl/odata/parser/EntityDataModelHelpers.scala +++ b/odata_parser/src/main/scala/com/sdl/odata/parser/EntityDataModelHelpers.scala @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_parser/src/main/scala/com/sdl/odata/parser/ExpressionsParser.scala b/odata_parser/src/main/scala/com/sdl/odata/parser/ExpressionsParser.scala index cfc7f0c6..7f812bb6 100644 --- a/odata_parser/src/main/scala/com/sdl/odata/parser/ExpressionsParser.scala +++ b/odata_parser/src/main/scala/com/sdl/odata/parser/ExpressionsParser.scala @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_parser/src/main/scala/com/sdl/odata/parser/LiteralsParser.scala b/odata_parser/src/main/scala/com/sdl/odata/parser/LiteralsParser.scala index 3f906b26..b79f46e6 100644 --- a/odata_parser/src/main/scala/com/sdl/odata/parser/LiteralsParser.scala +++ b/odata_parser/src/main/scala/com/sdl/odata/parser/LiteralsParser.scala @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_parser/src/main/scala/com/sdl/odata/parser/NamesAndIdentifiersParser.scala b/odata_parser/src/main/scala/com/sdl/odata/parser/NamesAndIdentifiersParser.scala index a7bf9d8e..253dc45c 100644 --- a/odata_parser/src/main/scala/com/sdl/odata/parser/NamesAndIdentifiersParser.scala +++ b/odata_parser/src/main/scala/com/sdl/odata/parser/NamesAndIdentifiersParser.scala @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_parser/src/main/scala/com/sdl/odata/parser/ODataBatchRequestContent.scala b/odata_parser/src/main/scala/com/sdl/odata/parser/ODataBatchRequestContent.scala index e6fbb424..84f04b9e 100644 --- a/odata_parser/src/main/scala/com/sdl/odata/parser/ODataBatchRequestContent.scala +++ b/odata_parser/src/main/scala/com/sdl/odata/parser/ODataBatchRequestContent.scala @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_parser/src/main/scala/com/sdl/odata/parser/ODataBatchRequestParser.scala b/odata_parser/src/main/scala/com/sdl/odata/parser/ODataBatchRequestParser.scala index ce6b61c0..a95aaf12 100644 --- a/odata_parser/src/main/scala/com/sdl/odata/parser/ODataBatchRequestParser.scala +++ b/odata_parser/src/main/scala/com/sdl/odata/parser/ODataBatchRequestParser.scala @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_parser/src/main/scala/com/sdl/odata/parser/ODataUriParser.scala b/odata_parser/src/main/scala/com/sdl/odata/parser/ODataUriParser.scala index 854a3a58..8255b599 100644 --- a/odata_parser/src/main/scala/com/sdl/odata/parser/ODataUriParser.scala +++ b/odata_parser/src/main/scala/com/sdl/odata/parser/ODataUriParser.scala @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_parser/src/main/scala/com/sdl/odata/parser/QueryOptionsParser.scala b/odata_parser/src/main/scala/com/sdl/odata/parser/QueryOptionsParser.scala index 887022df..ca1e10b6 100644 --- a/odata_parser/src/main/scala/com/sdl/odata/parser/QueryOptionsParser.scala +++ b/odata_parser/src/main/scala/com/sdl/odata/parser/QueryOptionsParser.scala @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_parser/src/main/scala/com/sdl/odata/parser/ResourcePathParser.scala b/odata_parser/src/main/scala/com/sdl/odata/parser/ResourcePathParser.scala index 4315fe04..87fccbd4 100644 --- a/odata_parser/src/main/scala/com/sdl/odata/parser/ResourcePathParser.scala +++ b/odata_parser/src/main/scala/com/sdl/odata/parser/ResourcePathParser.scala @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_parser/src/test/java/com/sdl/odata/parser/ParserArithmeticTest.java b/odata_parser/src/test/java/com/sdl/odata/parser/ParserArithmeticTest.java index 06083d50..0b9b5626 100644 --- a/odata_parser/src/test/java/com/sdl/odata/parser/ParserArithmeticTest.java +++ b/odata_parser/src/test/java/com/sdl/odata/parser/ParserArithmeticTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_parser/src/test/java/com/sdl/odata/parser/ParserComparisonTest.java b/odata_parser/src/test/java/com/sdl/odata/parser/ParserComparisonTest.java index 1513dd95..14a2d965 100644 --- a/odata_parser/src/test/java/com/sdl/odata/parser/ParserComparisonTest.java +++ b/odata_parser/src/test/java/com/sdl/odata/parser/ParserComparisonTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_parser/src/test/java/com/sdl/odata/parser/ParserLogicalTest.java b/odata_parser/src/test/java/com/sdl/odata/parser/ParserLogicalTest.java index af7b43fc..835a1396 100644 --- a/odata_parser/src/test/java/com/sdl/odata/parser/ParserLogicalTest.java +++ b/odata_parser/src/test/java/com/sdl/odata/parser/ParserLogicalTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -57,7 +57,7 @@ public void testLogicalNegation() throws ODataException { @Test public void testLogicalAnd() throws ODataException { - ODataUri uri = parser.parseUri(SERVICE_ROOT + String.format(URI, "and"), model); + ODataUri uri = parser.parseUri(SERVICE_ROOT + URI.formatted("and"), model); FilterOption option = getSingleOption(uri); assertTrue(option.expression() instanceof AndExpr); AndExpr expr = (AndExpr) option.expression(); @@ -67,7 +67,7 @@ public void testLogicalAnd() throws ODataException { @Test public void testLogicalOr() throws ODataException { - ODataUri uri = parser.parseUri(SERVICE_ROOT + String.format(URI, "or"), model); + ODataUri uri = parser.parseUri(SERVICE_ROOT + URI.formatted("or"), model); FilterOption option = getSingleOption(uri); assertTrue(option.expression() instanceof OrExpr); @@ -76,7 +76,7 @@ public void testLogicalOr() throws ODataException { } private void testWithStringFunctions(String boolMethod) throws ODataException { - ODataUri uri = parser.parseUri(SERVICE_ROOT + String.format(QUERY_URI, boolMethod), model); + ODataUri uri = parser.parseUri(SERVICE_ROOT + QUERY_URI.formatted(boolMethod), model); processQueryFunction(getSingleOption(uri), boolMethod); } @@ -87,13 +87,11 @@ private void processQueryFunction(FilterOption option, String boolMethod) { Iterator iterator = args.iterator(); while (iterator.hasNext()) { Object cursor = iterator.next(); - if (cursor instanceof EntityPathExpr) { - EntityPathExpr pathExpr = (EntityPathExpr) cursor; + if (cursor instanceof EntityPathExpr pathExpr) { PropertyPathExpr path = (PropertyPathExpr) pathExpr.subPath().get(); assertEquals(boolMethod, methodCall.methodName()); assertEquals("name", path.propertyName()); - } else if (cursor instanceof LiteralExpr) { - LiteralExpr literalExpr = (LiteralExpr) cursor; + } else if (cursor instanceof LiteralExpr literalExpr) { StringLiteral stringLiteral = (StringLiteral) literalExpr.value(); assertEquals("John", stringLiteral.value()); } diff --git a/odata_parser/src/test/java/com/sdl/odata/parser/ParserMetadataTest.java b/odata_parser/src/test/java/com/sdl/odata/parser/ParserMetadataTest.java index 59420225..c41283ab 100644 --- a/odata_parser/src/test/java/com/sdl/odata/parser/ParserMetadataTest.java +++ b/odata_parser/src/test/java/com/sdl/odata/parser/ParserMetadataTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_parser/src/test/java/com/sdl/odata/parser/ParserOperationTest.java b/odata_parser/src/test/java/com/sdl/odata/parser/ParserOperationTest.java index b5786020..fb91107a 100644 --- a/odata_parser/src/test/java/com/sdl/odata/parser/ParserOperationTest.java +++ b/odata_parser/src/test/java/com/sdl/odata/parser/ParserOperationTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_parser/src/test/java/com/sdl/odata/parser/ParserOrderTest.java b/odata_parser/src/test/java/com/sdl/odata/parser/ParserOrderTest.java index 67013542..ae0d3ca0 100644 --- a/odata_parser/src/test/java/com/sdl/odata/parser/ParserOrderTest.java +++ b/odata_parser/src/test/java/com/sdl/odata/parser/ParserOrderTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_parser/src/test/java/com/sdl/odata/parser/ParserQueryFunctionsTest.java b/odata_parser/src/test/java/com/sdl/odata/parser/ParserQueryFunctionsTest.java index cb8d586f..dd4f9d04 100644 --- a/odata_parser/src/test/java/com/sdl/odata/parser/ParserQueryFunctionsTest.java +++ b/odata_parser/src/test/java/com/sdl/odata/parser/ParserQueryFunctionsTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -57,8 +57,7 @@ private void testQueryFunction(String operator) throws ODataException { Iterator iter = args.iterator(); while (iter.hasNext()) { Object obj = iter.next(); - if (obj instanceof EntityPathExpr) { - EntityPathExpr entityPathExpr = (EntityPathExpr) obj; + if (obj instanceof EntityPathExpr entityPathExpr) { PropertyPathExpr propertyPath = (PropertyPathExpr) entityPathExpr.subPath().get(); assertEquals("name", propertyPath.propertyName()); } diff --git a/odata_parser/src/test/java/com/sdl/odata/parser/ParserTestSuite.java b/odata_parser/src/test/java/com/sdl/odata/parser/ParserTestSuite.java index 9e960c34..016964d4 100644 --- a/odata_parser/src/test/java/com/sdl/odata/parser/ParserTestSuite.java +++ b/odata_parser/src/test/java/com/sdl/odata/parser/ParserTestSuite.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_parser/src/test/java/com/sdl/odata/parser/extra/EntityDataModelHelpersTest.java b/odata_parser/src/test/java/com/sdl/odata/parser/extra/EntityDataModelHelpersTest.java index d5875f4b..12c383d4 100644 --- a/odata_parser/src/test/java/com/sdl/odata/parser/extra/EntityDataModelHelpersTest.java +++ b/odata_parser/src/test/java/com/sdl/odata/parser/extra/EntityDataModelHelpersTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_parser/src/test/java/com/sdl/odata/parser/extra/ExpressionParserTest.java b/odata_parser/src/test/java/com/sdl/odata/parser/extra/ExpressionParserTest.java index a85d93dd..ea54dcf4 100644 --- a/odata_parser/src/test/java/com/sdl/odata/parser/extra/ExpressionParserTest.java +++ b/odata_parser/src/test/java/com/sdl/odata/parser/extra/ExpressionParserTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -57,8 +57,7 @@ public void testEntitySetRootElement() { while (iter.hasNext()) { Object obj = iter.next(); - if (obj instanceof FilterOption) { - FilterOption option = (FilterOption) obj; + if (obj instanceof FilterOption option) { EqExpr expr = (EqExpr) option.expression(); EntityPathExpr pathExpr = (EntityPathExpr) expr.left(); diff --git a/odata_parser/src/test/scala/com/sdl/odata/parser/ExpressionsParsersTest.scala b/odata_parser/src/test/scala/com/sdl/odata/parser/ExpressionsParsersTest.scala index a2da2351..fb5f0188 100644 --- a/odata_parser/src/test/scala/com/sdl/odata/parser/ExpressionsParsersTest.scala +++ b/odata_parser/src/test/scala/com/sdl/odata/parser/ExpressionsParsersTest.scala @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_parser/src/test/scala/com/sdl/odata/parser/LiteralParsersTest.scala b/odata_parser/src/test/scala/com/sdl/odata/parser/LiteralParsersTest.scala index c5034c45..8fbcf449 100644 --- a/odata_parser/src/test/scala/com/sdl/odata/parser/LiteralParsersTest.scala +++ b/odata_parser/src/test/scala/com/sdl/odata/parser/LiteralParsersTest.scala @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_parser/src/test/scala/com/sdl/odata/parser/NamesAndIdentifiersParsersTest.scala b/odata_parser/src/test/scala/com/sdl/odata/parser/NamesAndIdentifiersParsersTest.scala index 4cb5d0a4..cba579f8 100644 --- a/odata_parser/src/test/scala/com/sdl/odata/parser/NamesAndIdentifiersParsersTest.scala +++ b/odata_parser/src/test/scala/com/sdl/odata/parser/NamesAndIdentifiersParsersTest.scala @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_parser/src/test/scala/com/sdl/odata/parser/ODataBatchRequestParserTest.scala b/odata_parser/src/test/scala/com/sdl/odata/parser/ODataBatchRequestParserTest.scala index d49f8a93..7483f4dc 100644 --- a/odata_parser/src/test/scala/com/sdl/odata/parser/ODataBatchRequestParserTest.scala +++ b/odata_parser/src/test/scala/com/sdl/odata/parser/ODataBatchRequestParserTest.scala @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_parser/src/test/scala/com/sdl/odata/parser/ODataUriParsersTest.scala b/odata_parser/src/test/scala/com/sdl/odata/parser/ODataUriParsersTest.scala index 1bd8dfa4..e356fb73 100644 --- a/odata_parser/src/test/scala/com/sdl/odata/parser/ODataUriParsersTest.scala +++ b/odata_parser/src/test/scala/com/sdl/odata/parser/ODataUriParsersTest.scala @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_parser/src/test/scala/com/sdl/odata/parser/ODataUriUtilTest.scala b/odata_parser/src/test/scala/com/sdl/odata/parser/ODataUriUtilTest.scala index 09613c05..405c1cbb 100644 --- a/odata_parser/src/test/scala/com/sdl/odata/parser/ODataUriUtilTest.scala +++ b/odata_parser/src/test/scala/com/sdl/odata/parser/ODataUriUtilTest.scala @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_parser/src/test/scala/com/sdl/odata/parser/ParserTestHelpers.scala b/odata_parser/src/test/scala/com/sdl/odata/parser/ParserTestHelpers.scala index fa55202f..4f970e8d 100644 --- a/odata_parser/src/test/scala/com/sdl/odata/parser/ParserTestHelpers.scala +++ b/odata_parser/src/test/scala/com/sdl/odata/parser/ParserTestHelpers.scala @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_parser/src/test/scala/com/sdl/odata/parser/QueryOptionsParsersTest.scala b/odata_parser/src/test/scala/com/sdl/odata/parser/QueryOptionsParsersTest.scala index 2713e1a0..1c003529 100644 --- a/odata_parser/src/test/scala/com/sdl/odata/parser/QueryOptionsParsersTest.scala +++ b/odata_parser/src/test/scala/com/sdl/odata/parser/QueryOptionsParsersTest.scala @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_parser/src/test/scala/com/sdl/odata/parser/ResourcePathParsersTest.scala b/odata_parser/src/test/scala/com/sdl/odata/parser/ResourcePathParsersTest.scala index 7c983230..9753c4e2 100644 --- a/odata_parser/src/test/scala/com/sdl/odata/parser/ResourcePathParsersTest.scala +++ b/odata_parser/src/test/scala/com/sdl/odata/parser/ResourcePathParsersTest.scala @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_processor/pom.xml b/odata_processor/pom.xml index 0a86c24e..5585fdb8 100644 --- a/odata_processor/pom.xml +++ b/odata_processor/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/odata_processor/src/main/java/com/sdl/odata/processor/ODataFunctionProcessorImpl.java b/odata_processor/src/main/java/com/sdl/odata/processor/ODataFunctionProcessorImpl.java index 43fe3fde..bcf27f40 100644 --- a/odata_processor/src/main/java/com/sdl/odata/processor/ODataFunctionProcessorImpl.java +++ b/odata_processor/src/main/java/com/sdl/odata/processor/ODataFunctionProcessorImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_processor/src/main/java/com/sdl/odata/processor/ODataQueryProcessorImpl.java b/odata_processor/src/main/java/com/sdl/odata/processor/ODataQueryProcessorImpl.java index 5d2f6852..65eb397a 100644 --- a/odata_processor/src/main/java/com/sdl/odata/processor/ODataQueryProcessorImpl.java +++ b/odata_processor/src/main/java/com/sdl/odata/processor/ODataQueryProcessorImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_processor/src/main/java/com/sdl/odata/processor/ODataWriteProcessorImpl.java b/odata_processor/src/main/java/com/sdl/odata/processor/ODataWriteProcessorImpl.java index 0ad29ac0..772b8fa0 100644 --- a/odata_processor/src/main/java/com/sdl/odata/processor/ODataWriteProcessorImpl.java +++ b/odata_processor/src/main/java/com/sdl/odata/processor/ODataWriteProcessorImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_processor/src/main/java/com/sdl/odata/processor/ProcessorConfiguration.java b/odata_processor/src/main/java/com/sdl/odata/processor/ProcessorConfiguration.java index 8301237a..32aeb498 100644 --- a/odata_processor/src/main/java/com/sdl/odata/processor/ProcessorConfiguration.java +++ b/odata_processor/src/main/java/com/sdl/odata/processor/ProcessorConfiguration.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_processor/src/main/java/com/sdl/odata/processor/datasource/factory/DataSourceFactoryImpl.java b/odata_processor/src/main/java/com/sdl/odata/processor/datasource/factory/DataSourceFactoryImpl.java index 8857de92..9274b57b 100644 --- a/odata_processor/src/main/java/com/sdl/odata/processor/datasource/factory/DataSourceFactoryImpl.java +++ b/odata_processor/src/main/java/com/sdl/odata/processor/datasource/factory/DataSourceFactoryImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_processor/src/main/java/com/sdl/odata/processor/write/ActionPostMethodHandler.java b/odata_processor/src/main/java/com/sdl/odata/processor/write/ActionPostMethodHandler.java index d8d89d13..6b5b24e0 100644 --- a/odata_processor/src/main/java/com/sdl/odata/processor/write/ActionPostMethodHandler.java +++ b/odata_processor/src/main/java/com/sdl/odata/processor/write/ActionPostMethodHandler.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -49,8 +49,8 @@ public ActionPostMethodHandler(ODataRequestContext requestContext, DataSourceFac @Override public ProcessorResult handleWrite(Object action) throws ODataException { Operation operation; - if (action instanceof Operation) { - operation = (Operation) action; + if (action instanceof Operation operation1) { + operation = operation1; Object data = operation.doOperation(getODataRequestContext(), getDataSourceFactory()); if (data == null) { return new ProcessorResult(ODataResponse.Status.NO_CONTENT); diff --git a/odata_processor/src/main/java/com/sdl/odata/processor/write/BatchMethodHandler.java b/odata_processor/src/main/java/com/sdl/odata/processor/write/BatchMethodHandler.java index f89e17aa..9005b34f 100644 --- a/odata_processor/src/main/java/com/sdl/odata/processor/write/BatchMethodHandler.java +++ b/odata_processor/src/main/java/com/sdl/odata/processor/write/BatchMethodHandler.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_processor/src/main/java/com/sdl/odata/processor/write/DeleteMethodHandler.java b/odata_processor/src/main/java/com/sdl/odata/processor/write/DeleteMethodHandler.java index b972728a..16942c76 100644 --- a/odata_processor/src/main/java/com/sdl/odata/processor/write/DeleteMethodHandler.java +++ b/odata_processor/src/main/java/com/sdl/odata/processor/write/DeleteMethodHandler.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_processor/src/main/java/com/sdl/odata/processor/write/PatchMethodHandler.java b/odata_processor/src/main/java/com/sdl/odata/processor/write/PatchMethodHandler.java index 67bb28dd..289d4262 100644 --- a/odata_processor/src/main/java/com/sdl/odata/processor/write/PatchMethodHandler.java +++ b/odata_processor/src/main/java/com/sdl/odata/processor/write/PatchMethodHandler.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_processor/src/main/java/com/sdl/odata/processor/write/PostMethodHandler.java b/odata_processor/src/main/java/com/sdl/odata/processor/write/PostMethodHandler.java index fb1492c4..744aabb9 100644 --- a/odata_processor/src/main/java/com/sdl/odata/processor/write/PostMethodHandler.java +++ b/odata_processor/src/main/java/com/sdl/odata/processor/write/PostMethodHandler.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -46,8 +46,8 @@ public PostMethodHandler(ODataRequestContext requestContext, DataSourceFactory d @Override public ProcessorResult handleWrite(Object entity) throws ODataException { - if (entity instanceof ODataLink) { - return processLink((ODataLink) entity); + if (entity instanceof ODataLink link) { + return processLink(link); } else { if (entity == null) { throw new ODataBadRequestException("The body of a POST request must contain a valid entity."); diff --git a/odata_processor/src/main/java/com/sdl/odata/processor/write/PutMethodHandler.java b/odata_processor/src/main/java/com/sdl/odata/processor/write/PutMethodHandler.java index 2f247f35..3b092e2a 100644 --- a/odata_processor/src/main/java/com/sdl/odata/processor/write/PutMethodHandler.java +++ b/odata_processor/src/main/java/com/sdl/odata/processor/write/PutMethodHandler.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -47,8 +47,8 @@ public PutMethodHandler(ODataRequestContext requestContext, DataSourceFactory da @Override public ProcessorResult handleWrite(Object entity) throws ODataException { - if (entity instanceof ODataLink) { - return processLink((ODataLink) entity); + if (entity instanceof ODataLink link) { + return processLink(link); } else { if (entity == null) { throw new ODataBadRequestException("The body of a PUT request must contain a valid entity."); diff --git a/odata_processor/src/main/java/com/sdl/odata/processor/write/WriteMethodHandler.java b/odata_processor/src/main/java/com/sdl/odata/processor/write/WriteMethodHandler.java index 35f136eb..6bd8f70d 100644 --- a/odata_processor/src/main/java/com/sdl/odata/processor/write/WriteMethodHandler.java +++ b/odata_processor/src/main/java/com/sdl/odata/processor/write/WriteMethodHandler.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -107,7 +107,7 @@ protected boolean isMinimalReturnPreferred() { protected Map<String, String> getResponseHeaders(Object entity) throws ODataEdmException { final Map<String, String> headers = new HashMap<>(); - headers.put(LOCATION, String.format("%s/%s(%s)", getoDataUri().serviceRoot(), + headers.put(LOCATION, "%s/%s(%s)".formatted(getoDataUri().serviceRoot(), getEntitySetByEntity(getEntityDataModel(), entity).getName(), formatEntityKey(getEntityDataModel(), entity))); return headers; @@ -159,17 +159,17 @@ private Map<String, Object> getKeyValues(Object entity, EntityType entityType) t private Object normalize(Object value) { - if (value instanceof Long) { - return new BigDecimal((Long) value); - } else if (value instanceof Integer) { - return new BigDecimal((Integer) value); - } else if (value instanceof Short) { - return new BigDecimal((Short) value); - } else if (value instanceof Byte) { - return new BigDecimal((Byte) value); - } else if (value instanceof scala.math.BigDecimal) { + if (value instanceof Long long1) { + return new BigDecimal(long1); + } else if (value instanceof Integer integer) { + return new BigDecimal(integer); + } else if (value instanceof Short short1) { + return new BigDecimal(short1); + } else if (value instanceof Byte byte1) { + return new BigDecimal(byte1); + } else if (value instanceof scala.math.BigDecimal decimal) { // Convert it to a Java BigDecimal - return ((scala.math.BigDecimal) value).bigDecimal(); + return decimal.bigDecimal(); } return value; diff --git a/odata_processor/src/main/java/com/sdl/odata/processor/write/util/WriteMethodUtil.java b/odata_processor/src/main/java/com/sdl/odata/processor/write/util/WriteMethodUtil.java index 5707c561..667c3dcb 100644 --- a/odata_processor/src/main/java/com/sdl/odata/processor/write/util/WriteMethodUtil.java +++ b/odata_processor/src/main/java/com/sdl/odata/processor/write/util/WriteMethodUtil.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -99,7 +99,7 @@ public static Map<String, String> getResponseHeaders(Object entity, ODataUri oDa EntityDataModel entityDataModel) throws ODataEdmException { final Map<String, String> headers = new HashMap<>(); - headers.put(LOCATION, String.format("%s/%s(%s)", oDataUri.serviceRoot(), + headers.put(LOCATION, "%s/%s(%s)".formatted(oDataUri.serviceRoot(), getEntitySetByEntity(entityDataModel, entity).getName(), formatEntityKey(entityDataModel, entity))); return headers; @@ -152,17 +152,17 @@ private static Map<String, Object> getKeyValues(Object entity, EntityType entity private static Object normalize(Object value) { - if (value instanceof Long) { - return new BigDecimal((Long) value); - } else if (value instanceof Integer) { - return new BigDecimal((Integer) value); - } else if (value instanceof Short) { - return new BigDecimal((Short) value); - } else if (value instanceof Byte) { - return new BigDecimal((Byte) value); - } else if (value instanceof scala.math.BigDecimal) { + if (value instanceof Long long1) { + return new BigDecimal(long1); + } else if (value instanceof Integer integer) { + return new BigDecimal(integer); + } else if (value instanceof Short short1) { + return new BigDecimal(short1); + } else if (value instanceof Byte byte1) { + return new BigDecimal(byte1); + } else if (value instanceof scala.math.BigDecimal decimal) { // Convert it to a Java BigDecimal - return ((scala.math.BigDecimal) value).bigDecimal(); + return decimal.bigDecimal(); } return value; diff --git a/odata_processor/src/main/scala/com/sdl/odata/processor/QueryModelBuilder.scala b/odata_processor/src/main/scala/com/sdl/odata/processor/QueryModelBuilder.scala index 934eeae1..fbaab0fc 100644 --- a/odata_processor/src/main/scala/com/sdl/odata/processor/QueryModelBuilder.scala +++ b/odata_processor/src/main/scala/com/sdl/odata/processor/QueryModelBuilder.scala @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_processor/src/test/java/com/sdl/odata/processor/ODataFunctionProcessorImplTest.java b/odata_processor/src/test/java/com/sdl/odata/processor/ODataFunctionProcessorImplTest.java index 082bb21b..266c5477 100644 --- a/odata_processor/src/test/java/com/sdl/odata/processor/ODataFunctionProcessorImplTest.java +++ b/odata_processor/src/test/java/com/sdl/odata/processor/ODataFunctionProcessorImplTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_processor/src/test/java/com/sdl/odata/processor/ODataWriteProcessorImplTest.java b/odata_processor/src/test/java/com/sdl/odata/processor/ODataWriteProcessorImplTest.java index 4e05db13..8c9aa3f5 100644 --- a/odata_processor/src/test/java/com/sdl/odata/processor/ODataWriteProcessorImplTest.java +++ b/odata_processor/src/test/java/com/sdl/odata/processor/ODataWriteProcessorImplTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_processor/src/test/java/com/sdl/odata/processor/datasource/factory/DataSourceFactoryImplTest.java b/odata_processor/src/test/java/com/sdl/odata/processor/datasource/factory/DataSourceFactoryImplTest.java index 232bfb02..0392e092 100644 --- a/odata_processor/src/test/java/com/sdl/odata/processor/datasource/factory/DataSourceFactoryImplTest.java +++ b/odata_processor/src/test/java/com/sdl/odata/processor/datasource/factory/DataSourceFactoryImplTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_processor/src/test/java/com/sdl/odata/processor/model/ODataAddress.java b/odata_processor/src/test/java/com/sdl/odata/processor/model/ODataAddress.java index f268f7c2..4de56ba3 100644 --- a/odata_processor/src/test/java/com/sdl/odata/processor/model/ODataAddress.java +++ b/odata_processor/src/test/java/com/sdl/odata/processor/model/ODataAddress.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_processor/src/test/java/com/sdl/odata/processor/model/ODataMobilePhone.java b/odata_processor/src/test/java/com/sdl/odata/processor/model/ODataMobilePhone.java index 6872a286..82db3bd7 100644 --- a/odata_processor/src/test/java/com/sdl/odata/processor/model/ODataMobilePhone.java +++ b/odata_processor/src/test/java/com/sdl/odata/processor/model/ODataMobilePhone.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_processor/src/test/java/com/sdl/odata/processor/model/ODataPerson.java b/odata_processor/src/test/java/com/sdl/odata/processor/model/ODataPerson.java index 46733563..5eece3bd 100644 --- a/odata_processor/src/test/java/com/sdl/odata/processor/model/ODataPerson.java +++ b/odata_processor/src/test/java/com/sdl/odata/processor/model/ODataPerson.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_processor/src/test/java/com/sdl/odata/processor/model/ODataPersonNamedKey.java b/odata_processor/src/test/java/com/sdl/odata/processor/model/ODataPersonNamedKey.java index fe1feeb0..aed4b2f8 100644 --- a/odata_processor/src/test/java/com/sdl/odata/processor/model/ODataPersonNamedKey.java +++ b/odata_processor/src/test/java/com/sdl/odata/processor/model/ODataPersonNamedKey.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_processor/src/test/java/com/sdl/odata/processor/model/ODataTestArea.java b/odata_processor/src/test/java/com/sdl/odata/processor/model/ODataTestArea.java index 5f431104..bd3149dc 100644 --- a/odata_processor/src/test/java/com/sdl/odata/processor/model/ODataTestArea.java +++ b/odata_processor/src/test/java/com/sdl/odata/processor/model/ODataTestArea.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_processor/src/test/java/com/sdl/odata/processor/model/ODataTestItem.java b/odata_processor/src/test/java/com/sdl/odata/processor/model/ODataTestItem.java index d92be1a7..55271e88 100644 --- a/odata_processor/src/test/java/com/sdl/odata/processor/model/ODataTestItem.java +++ b/odata_processor/src/test/java/com/sdl/odata/processor/model/ODataTestItem.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_processor/src/test/java/com/sdl/odata/processor/model/ODataTestValue.java b/odata_processor/src/test/java/com/sdl/odata/processor/model/ODataTestValue.java index 0b7f6488..cc047fe4 100644 --- a/odata_processor/src/test/java/com/sdl/odata/processor/model/ODataTestValue.java +++ b/odata_processor/src/test/java/com/sdl/odata/processor/model/ODataTestValue.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_processor/src/test/java/com/sdl/odata/processor/write/BatchMethodHandlerTest.java b/odata_processor/src/test/java/com/sdl/odata/processor/write/BatchMethodHandlerTest.java index 4d8c53b5..3a805345 100644 --- a/odata_processor/src/test/java/com/sdl/odata/processor/write/BatchMethodHandlerTest.java +++ b/odata_processor/src/test/java/com/sdl/odata/processor/write/BatchMethodHandlerTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_processor/src/test/java/com/sdl/odata/processor/write/DeleteMethodHandlerTest.java b/odata_processor/src/test/java/com/sdl/odata/processor/write/DeleteMethodHandlerTest.java index b5882f1c..a8554314 100644 --- a/odata_processor/src/test/java/com/sdl/odata/processor/write/DeleteMethodHandlerTest.java +++ b/odata_processor/src/test/java/com/sdl/odata/processor/write/DeleteMethodHandlerTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_processor/src/test/java/com/sdl/odata/processor/write/MethodHandlerTest.java b/odata_processor/src/test/java/com/sdl/odata/processor/write/MethodHandlerTest.java index 65b9a258..cfd7e880 100644 --- a/odata_processor/src/test/java/com/sdl/odata/processor/write/MethodHandlerTest.java +++ b/odata_processor/src/test/java/com/sdl/odata/processor/write/MethodHandlerTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_processor/src/test/java/com/sdl/odata/processor/write/PostMethodHandlerTest.java b/odata_processor/src/test/java/com/sdl/odata/processor/write/PostMethodHandlerTest.java index 15a6a5b9..557cf2da 100644 --- a/odata_processor/src/test/java/com/sdl/odata/processor/write/PostMethodHandlerTest.java +++ b/odata_processor/src/test/java/com/sdl/odata/processor/write/PostMethodHandlerTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_processor/src/test/java/com/sdl/odata/processor/write/PutMethodHandlerTest.java b/odata_processor/src/test/java/com/sdl/odata/processor/write/PutMethodHandlerTest.java index 5b29f0ac..fc485036 100644 --- a/odata_processor/src/test/java/com/sdl/odata/processor/write/PutMethodHandlerTest.java +++ b/odata_processor/src/test/java/com/sdl/odata/processor/write/PutMethodHandlerTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_processor/src/test/scala/com/sdl/odata/processor/QueryModelBuilderTest.scala b/odata_processor/src/test/scala/com/sdl/odata/processor/QueryModelBuilderTest.scala index d9e71041..b56dc4ae 100644 --- a/odata_processor/src/test/scala/com/sdl/odata/processor/QueryModelBuilderTest.scala +++ b/odata_processor/src/test/scala/com/sdl/odata/processor/QueryModelBuilderTest.scala @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/pom.xml b/odata_renderer/pom.xml index 681b97b6..dd3e1aba 100644 --- a/odata_renderer/pom.xml +++ b/odata_renderer/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/AtomConstants.java b/odata_renderer/src/main/java/com/sdl/odata/AtomConstants.java index 569d6d77..0fb4b3c5 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/AtomConstants.java +++ b/odata_renderer/src/main/java/com/sdl/odata/AtomConstants.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/ErrorRendererConstants.java b/odata_renderer/src/main/java/com/sdl/odata/ErrorRendererConstants.java index 36bf2375..fc902cf3 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/ErrorRendererConstants.java +++ b/odata_renderer/src/main/java/com/sdl/odata/ErrorRendererConstants.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/JsonConstants.java b/odata_renderer/src/main/java/com/sdl/odata/JsonConstants.java index 6b5c5b94..4662496c 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/JsonConstants.java +++ b/odata_renderer/src/main/java/com/sdl/odata/JsonConstants.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/MetadataDocumentConstants.java b/odata_renderer/src/main/java/com/sdl/odata/MetadataDocumentConstants.java index d1731edf..1ef32829 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/MetadataDocumentConstants.java +++ b/odata_renderer/src/main/java/com/sdl/odata/MetadataDocumentConstants.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/ODataRendererUtils.java b/odata_renderer/src/main/java/com/sdl/odata/ODataRendererUtils.java index 2d647701..e001af3d 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/ODataRendererUtils.java +++ b/odata_renderer/src/main/java/com/sdl/odata/ODataRendererUtils.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -121,7 +121,7 @@ public static <T> T checkNotNull(T reference) { */ public static <T> T checkNotNull(T reference, String message, Object... args) { if (reference == null) { - throw new IllegalArgumentException(String.format(message, args)); + throw new IllegalArgumentException(message.formatted(args)); } return reference; } diff --git a/odata_renderer/src/main/java/com/sdl/odata/renderer/AbstractAtomRenderer.java b/odata_renderer/src/main/java/com/sdl/odata/renderer/AbstractAtomRenderer.java index a8873698..f4e05e8b 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/renderer/AbstractAtomRenderer.java +++ b/odata_renderer/src/main/java/com/sdl/odata/renderer/AbstractAtomRenderer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/renderer/AbstractJsonRenderer.java b/odata_renderer/src/main/java/com/sdl/odata/renderer/AbstractJsonRenderer.java index 2d1b5e45..c36ed212 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/renderer/AbstractJsonRenderer.java +++ b/odata_renderer/src/main/java/com/sdl/odata/renderer/AbstractJsonRenderer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/renderer/AbstractPropertyWriter.java b/odata_renderer/src/main/java/com/sdl/odata/renderer/AbstractPropertyWriter.java index a4272619..23d44e3c 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/renderer/AbstractPropertyWriter.java +++ b/odata_renderer/src/main/java/com/sdl/odata/renderer/AbstractPropertyWriter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -279,7 +279,7 @@ protected EntityDataModel getEntityDataModel() { } protected void defaultHandling(Type type) throws ODataRenderException { - String msg = String.format("Unhandled object type %s", type); + String msg = "Unhandled object type %s".formatted(type); LOG.warn(msg); throw new ODataRenderException(msg); } diff --git a/odata_renderer/src/main/java/com/sdl/odata/renderer/AbstractRenderer.java b/odata_renderer/src/main/java/com/sdl/odata/renderer/AbstractRenderer.java index 35fc0050..427e1a2f 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/renderer/AbstractRenderer.java +++ b/odata_renderer/src/main/java/com/sdl/odata/renderer/AbstractRenderer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -231,7 +231,7 @@ protected void checkContextURL(ODataRequestContext requestContext, Option<String if (!contextURL.isDefined()) { throw new ODataRenderException( - String.format("Not possible to create context URL for request %s", requestContext)); + "Not possible to create context URL for request %s".formatted(requestContext)); } } diff --git a/odata_renderer/src/main/java/com/sdl/odata/renderer/PropertyStreamWriter.java b/odata_renderer/src/main/java/com/sdl/odata/renderer/PropertyStreamWriter.java index 3a9f2f6a..5eb2f50e 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/renderer/PropertyStreamWriter.java +++ b/odata_renderer/src/main/java/com/sdl/odata/renderer/PropertyStreamWriter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/renderer/RendererConfiguration.java b/odata_renderer/src/main/java/com/sdl/odata/renderer/RendererConfiguration.java index d914b4f7..f90207d9 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/renderer/RendererConfiguration.java +++ b/odata_renderer/src/main/java/com/sdl/odata/renderer/RendererConfiguration.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/renderer/RendererFactoryImpl.java b/odata_renderer/src/main/java/com/sdl/odata/renderer/RendererFactoryImpl.java index 27071b8c..c24f0d16 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/renderer/RendererFactoryImpl.java +++ b/odata_renderer/src/main/java/com/sdl/odata/renderer/RendererFactoryImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/renderer/atom/AtomRenderer.java b/odata_renderer/src/main/java/com/sdl/odata/renderer/atom/AtomRenderer.java index 5714afae..b3dde624 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/renderer/atom/AtomRenderer.java +++ b/odata_renderer/src/main/java/com/sdl/odata/renderer/atom/AtomRenderer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/renderer/atom/writer/AtomDataWriter.java b/odata_renderer/src/main/java/com/sdl/odata/renderer/atom/writer/AtomDataWriter.java index 1c307532..4987e340 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/renderer/atom/writer/AtomDataWriter.java +++ b/odata_renderer/src/main/java/com/sdl/odata/renderer/atom/writer/AtomDataWriter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/renderer/atom/writer/AtomMetadataWriter.java b/odata_renderer/src/main/java/com/sdl/odata/renderer/atom/writer/AtomMetadataWriter.java index 94c4ca28..88947d93 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/renderer/atom/writer/AtomMetadataWriter.java +++ b/odata_renderer/src/main/java/com/sdl/odata/renderer/atom/writer/AtomMetadataWriter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -205,7 +205,7 @@ void writeFeedId(Object entity, NavigationProperty property) throws XMLStreamExc xmlWriter.writeStartElement(ATOM_ID); if (entity != null) { - xmlWriter.writeCharacters(String.format("%s/%s/%s", oDataUri.serviceRoot(), + xmlWriter.writeCharacters("%s/%s/%s".formatted(oDataUri.serviceRoot(), getEntityWithKey(entity), property.getName())); } else { String id; @@ -255,7 +255,7 @@ void writeFeedLink(Object entity, NavigationProperty property) throws XMLStreamE } } else { xmlWriter.writeAttribute(TITLE, property.getName()); - xmlWriter.writeAttribute(HREF, String.format("%s/%s", getEntityWithKey(entity), property.getName())); + xmlWriter.writeAttribute(HREF, "%s/%s".formatted(getEntityWithKey(entity), property.getName())); } xmlWriter.writeEndElement(); @@ -293,24 +293,24 @@ void writeEntryCategory(Object entity) throws XMLStreamException { Type entityType = entityDataModel.getType(entity.getClass()); xmlWriter.writeStartElement(ATOM_CATEGORY); xmlWriter.writeAttribute(SCHEME, ODATA_SCHEME_NS); - xmlWriter.writeAttribute(TERM, String.format("%s%s.%s", HASH, entityType.getNamespace(), entityType.getName())); + xmlWriter.writeAttribute(TERM, "%s%s.%s".formatted(HASH, entityType.getNamespace(), entityType.getName())); xmlWriter.writeEndElement(); } private String getEntityWithKey(Object entity) throws ODataEdmException { if (isSingletonEntity(entityDataModel, entity)) { - return String.format("%s", getEntityName(entityDataModel, entity)); + return "%s".formatted(getEntityName(entityDataModel, entity)); } else { - return String.format("%s(%s)", getEntityName(entityDataModel, entity), + return "%s(%s)".formatted(getEntityName(entityDataModel, entity), formatEntityKey(entityDataModel, entity)); } } private String getEntryIdString(Object entity) throws ODataEdmException { if (isSingletonEntity(entityDataModel, entity)) { - return String.format("%s/%s", oDataUri.serviceRoot(), getEntityName(entityDataModel, entity)); + return "%s/%s".formatted(oDataUri.serviceRoot(), getEntityName(entityDataModel, entity)); } else { - return String.format("%s/%s(%s)", oDataUri.serviceRoot(), + return "%s/%s(%s)".formatted(oDataUri.serviceRoot(), getEntityName(entityDataModel, entity), formatEntityKey(entityDataModel, entity)); } } diff --git a/odata_renderer/src/main/java/com/sdl/odata/renderer/atom/writer/AtomNSConfigurationProvider.java b/odata_renderer/src/main/java/com/sdl/odata/renderer/atom/writer/AtomNSConfigurationProvider.java index 3b36c778..4434ceff 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/renderer/atom/writer/AtomNSConfigurationProvider.java +++ b/odata_renderer/src/main/java/com/sdl/odata/renderer/atom/writer/AtomNSConfigurationProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/renderer/atom/writer/AtomWriter.java b/odata_renderer/src/main/java/com/sdl/odata/renderer/atom/writer/AtomWriter.java index 8937409a..0e60fa43 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/renderer/atom/writer/AtomWriter.java +++ b/odata_renderer/src/main/java/com/sdl/odata/renderer/atom/writer/AtomWriter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -363,16 +363,14 @@ private void writeEntry(Object entity, boolean isFeedEntry) throws XMLStreamExce metadataWriter.writeEntryEntityLink(entity); for (StructuralProperty property : entityType.getStructuralProperties()) { - if (property instanceof NavigationProperty) { + if (property instanceof NavigationProperty navigationProperty) { // Nullable navigation properties that have null values should not be included in the output of writes if (isWriteOperation) { final Object value = getPropertyValue(property, entity); if (value != null) { - NavigationProperty navigationProperty = (NavigationProperty) property; writeEntryPropertyLink(entity, navigationProperty); } } else { - NavigationProperty navigationProperty = (NavigationProperty) property; writeEntryPropertyLink(entity, navigationProperty); } } @@ -421,7 +419,7 @@ private void writeEntryPropertyLink(Object entity, NavigationProperty property) // The navigation link startLink(); xmlWriter.writeAttribute(REL, ODATA_NAVIGATION_LINK_REL_NS_PREFIX + property.getName()); - xmlWriter.writeAttribute(TYPE, String.format(linkType, ATOM_XML.toString())); + xmlWriter.writeAttribute(TYPE, linkType.formatted(ATOM_XML.toString())); xmlWriter.writeAttribute(TITLE, property.getName()); // Deep inserts allow us to create referenced entities as part of a single create entity operation. See spec: @@ -450,16 +448,16 @@ private void writeEntryPropertyLink(Object entity, NavigationProperty property) final Object value = getPropertyValue(property, entity); if (property.isCollection()) { - xmlWriter.writeAttribute(HREF, String.format("%s(%s)/%s", getEntityName(entityDataModel, entity), + xmlWriter.writeAttribute(HREF, "%s(%s)/%s".formatted(getEntityName(entityDataModel, entity), formatEntityKey(entityDataModel, entity), property.getName())); if (((Collection<?>) value).size() > 0) { writeCollectionRefs(((Collection<?>) value)); } } else if (value != null) { if (isSingletonEntity(entityDataModel, getPropertyValue(property, entity))) { - xmlWriter.writeAttribute(HREF, String.format("%s", getEntityName(entityDataModel, value))); + xmlWriter.writeAttribute(HREF, "%s".formatted(getEntityName(entityDataModel, value))); } else { - xmlWriter.writeAttribute(HREF, String.format("%s(%s)", getEntityName(entityDataModel, value), + xmlWriter.writeAttribute(HREF, "%s(%s)".formatted(getEntityName(entityDataModel, value), formatEntityKey(entityDataModel, value))); } } @@ -489,10 +487,10 @@ private void writeEntryPropertyLink(Object entity, NavigationProperty property) xmlWriter.writeAttribute(TITLE, property.getName()); if (isSingletonEntity(entityDataModel, entity)) { - xmlWriter.writeAttribute(HREF, String.format("%s/%s/$ref", + xmlWriter.writeAttribute(HREF, "%s/%s/$ref".formatted( getEntityName(entityDataModel, entity), property.getName())); } else { - xmlWriter.writeAttribute(HREF, String.format("%s(%s)/%s/$ref", getEntityName(entityDataModel, entity), + xmlWriter.writeAttribute(HREF, "%s(%s)/%s/$ref".formatted(getEntityName(entityDataModel, entity), formatEntityKey(entityDataModel, entity), property.getName())); } @@ -511,7 +509,7 @@ private void writeCollectionRefs(Collection<?> collection) throws XMLStreamExcep private void writeMetadataRef(Object entity) throws XMLStreamException, ODataEdmException { xmlWriter.writeStartElement(METADATA, REF, ""); - xmlWriter.writeAttribute(ID, String.format("%s(%s)", getEntityName(entityDataModel, entity), + xmlWriter.writeAttribute(ID, "%s(%s)".formatted(getEntityName(entityDataModel, entity), formatEntityKey(entityDataModel, entity))); xmlWriter.writeEndElement(); } @@ -534,9 +532,9 @@ private void endLink() throws XMLStreamException { private String getHrefAttributeValue(Object entity, NavigationProperty property) throws ODataEdmException { if (isSingletonEntity(entityDataModel, entity)) { - return String.format("%s/%s", getEntityName(entityDataModel, entity), property.getName()); + return "%s/%s".formatted(getEntityName(entityDataModel, entity), property.getName()); } else { - return String.format("%s(%s)/%s", getEntityName(entityDataModel, entity), + return "%s(%s)/%s".formatted(getEntityName(entityDataModel, entity), formatEntityKey(entityDataModel, entity), property.getName()); } } diff --git a/odata_renderer/src/main/java/com/sdl/odata/renderer/atom/writer/ODataV4AtomNSConfigurationProvider.java b/odata_renderer/src/main/java/com/sdl/odata/renderer/atom/writer/ODataV4AtomNSConfigurationProvider.java index 82c05c0d..63f77a27 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/renderer/atom/writer/ODataV4AtomNSConfigurationProvider.java +++ b/odata_renderer/src/main/java/com/sdl/odata/renderer/atom/writer/ODataV4AtomNSConfigurationProvider.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/renderer/batch/ODataBatchRequestRenderer.java b/odata_renderer/src/main/java/com/sdl/odata/renderer/batch/ODataBatchRequestRenderer.java index bc4afd6c..f50ce780 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/renderer/batch/ODataBatchRequestRenderer.java +++ b/odata_renderer/src/main/java/com/sdl/odata/renderer/batch/ODataBatchRequestRenderer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/renderer/json/JsonErrorResponseRenderer.java b/odata_renderer/src/main/java/com/sdl/odata/renderer/json/JsonErrorResponseRenderer.java index 0d6eb15d..d9ff80d3 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/renderer/json/JsonErrorResponseRenderer.java +++ b/odata_renderer/src/main/java/com/sdl/odata/renderer/json/JsonErrorResponseRenderer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/renderer/json/JsonRenderer.java b/odata_renderer/src/main/java/com/sdl/odata/renderer/json/JsonRenderer.java index 410b0081..c9a73f30 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/renderer/json/JsonRenderer.java +++ b/odata_renderer/src/main/java/com/sdl/odata/renderer/json/JsonRenderer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/renderer/json/JsonServiceDocumentRenderer.java b/odata_renderer/src/main/java/com/sdl/odata/renderer/json/JsonServiceDocumentRenderer.java index 7784792a..0da4b634 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/renderer/json/JsonServiceDocumentRenderer.java +++ b/odata_renderer/src/main/java/com/sdl/odata/renderer/json/JsonServiceDocumentRenderer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/renderer/json/JsonValueRenderer.java b/odata_renderer/src/main/java/com/sdl/odata/renderer/json/JsonValueRenderer.java index 976fccc0..bc5d14d1 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/renderer/json/JsonValueRenderer.java +++ b/odata_renderer/src/main/java/com/sdl/odata/renderer/json/JsonValueRenderer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/renderer/json/util/JsonWriterUtil.java b/odata_renderer/src/main/java/com/sdl/odata/renderer/json/util/JsonWriterUtil.java index a5276f38..b5f05e9c 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/renderer/json/util/JsonWriterUtil.java +++ b/odata_renderer/src/main/java/com/sdl/odata/renderer/json/util/JsonWriterUtil.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/renderer/json/writer/JsonCodecMapper.java b/odata_renderer/src/main/java/com/sdl/odata/renderer/json/writer/JsonCodecMapper.java index c5dc711f..eabdd4eb 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/renderer/json/writer/JsonCodecMapper.java +++ b/odata_renderer/src/main/java/com/sdl/odata/renderer/json/writer/JsonCodecMapper.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/renderer/json/writer/JsonErrorResponseWriter.java b/odata_renderer/src/main/java/com/sdl/odata/renderer/json/writer/JsonErrorResponseWriter.java index bcfcfc3a..112f22a6 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/renderer/json/writer/JsonErrorResponseWriter.java +++ b/odata_renderer/src/main/java/com/sdl/odata/renderer/json/writer/JsonErrorResponseWriter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/renderer/json/writer/JsonPropertyWriter.java b/odata_renderer/src/main/java/com/sdl/odata/renderer/json/writer/JsonPropertyWriter.java index c8d0670a..e3d11d7b 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/renderer/json/writer/JsonPropertyWriter.java +++ b/odata_renderer/src/main/java/com/sdl/odata/renderer/json/writer/JsonPropertyWriter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -259,7 +259,7 @@ private void handleProperty(Object data, StructuralProperty property, JsonGenera LOG.trace("Property name is '{}' and its value is '{}'", property.getName(), value); Type type = getType(value); if (type == null) { - String msg = String.format("Field type %s is not found in entity data model", field.getType()); + String msg = "Field type %s is not found in entity data model".formatted(field.getType()); LOG.error(msg); throw new ODataRenderException(msg); } diff --git a/odata_renderer/src/main/java/com/sdl/odata/renderer/json/writer/JsonServiceDocumentWriter.java b/odata_renderer/src/main/java/com/sdl/odata/renderer/json/writer/JsonServiceDocumentWriter.java index 69b49d4c..6fa76587 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/renderer/json/writer/JsonServiceDocumentWriter.java +++ b/odata_renderer/src/main/java/com/sdl/odata/renderer/json/writer/JsonServiceDocumentWriter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -122,8 +122,8 @@ private void writeObject(JsonGenerator jsonGenerator, Object entity) throws IOEx */ private void writeName(JsonGenerator jsonGenerator, Object entity) throws IOException { jsonGenerator.writeFieldName(NAME); - if (entity instanceof EntitySet) { - jsonGenerator.writeObject(((EntitySet) entity).getName()); + if (entity instanceof EntitySet set) { + jsonGenerator.writeObject(set.getName()); } else { jsonGenerator.writeObject(((Singleton) entity).getName()); } @@ -154,8 +154,8 @@ private void writeKind(JsonGenerator jsonGenerator, Object entity) throws IOExce private void writeURL(JsonGenerator jsonGenerator, Object entity) throws IOException { // It is exactly the same as the 'name' property. jsonGenerator.writeFieldName(URL); - if (entity instanceof EntitySet) { - jsonGenerator.writeObject(((EntitySet) entity).getName()); + if (entity instanceof EntitySet set) { + jsonGenerator.writeObject(set.getName()); } else { jsonGenerator.writeObject(((Singleton) entity).getName()); } diff --git a/odata_renderer/src/main/java/com/sdl/odata/renderer/json/writer/JsonWriter.java b/odata_renderer/src/main/java/com/sdl/odata/renderer/json/writer/JsonWriter.java index f1db70b7..992da135 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/renderer/json/writer/JsonWriter.java +++ b/odata_renderer/src/main/java/com/sdl/odata/renderer/json/writer/JsonWriter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -174,7 +174,7 @@ private String writeJson(Object data, Map<String, Object> meta) throws IOExcepti jsonGenerator.writeStartObject(); // Write @odata constants - entitySet = (data instanceof List) ? getEntitySet((List<?>) data) : getEntitySet(data); + entitySet = (data instanceof List<?> l) ? getEntitySet(l) : getEntitySet(data); jsonGenerator.writeStringField(CONTEXT, contextURL); @@ -184,8 +184,8 @@ private String writeJson(Object data, Map<String, Object> meta) throws IOExcepti long count; Object countObj = meta.get("count"); - if (countObj instanceof Integer) { - count = ((Integer) countObj).longValue(); + if (countObj instanceof Integer integer) { + count = integer.longValue(); } else { count = (long) countObj; } @@ -194,16 +194,16 @@ private String writeJson(Object data, Map<String, Object> meta) throws IOExcepti if (!(data instanceof List)) { if (entitySet != null) { - jsonGenerator.writeStringField(ID, String.format("%s(%s)", getEntityName(entityDataModel, data), + jsonGenerator.writeStringField(ID, "%s(%s)".formatted(getEntityName(entityDataModel, data), formatEntityKey(entityDataModel, data))); } else { - jsonGenerator.writeStringField(ID, String.format("%s", getEntityName(entityDataModel, data))); + jsonGenerator.writeStringField(ID, "%s".formatted(getEntityName(entityDataModel, data))); } } // Write feed - if (data instanceof List) { - marshallEntities((List<?>) data); + if (data instanceof List<?> list) { + marshallEntities(list); } else { marshall(data, this.entityDataModel.getType(data.getClass())); } @@ -219,7 +219,7 @@ private void marshallEntities(List<?> entities) throws IOException, jsonGenerator.writeArrayFieldStart(VALUE); for (Object entity : entities) { jsonGenerator.writeStartObject(); - jsonGenerator.writeStringField(ID, String.format("%s(%s)", getEntityName(entityDataModel, entity), + jsonGenerator.writeStringField(ID, "%s(%s)".formatted(getEntityName(entityDataModel, entity), formatEntityKey(entityDataModel, entity))); marshall(entity, entityDataModel.getType(entity.getClass())); jsonGenerator.writeEndObject(); @@ -274,9 +274,8 @@ private void marshallStructured(final Object object, StructuredType structuredTy visitProperties(entityDataModel, structuredType, property -> { try { - if (property instanceof NavigationProperty) { + if (property instanceof NavigationProperty navProperty) { LOG.trace("Start marshalling navigation property: {}", property.getName()); - NavigationProperty navProperty = (NavigationProperty) property; if (forceExpand || isExpandedProperty(navProperty)) { final Object value = getValueFromProperty(object, navProperty); if (value != null) { @@ -324,7 +323,7 @@ private void writeODataType(StructuredType structuredType) throws IOException { String type = typeName.substring(typeName.lastIndexOf(".") + 1, typeName.length()); if (!type.equals(structuredType.getName())) { - jsonGenerator.writeStringField(TYPE, String.format("#%s.%s", + jsonGenerator.writeStringField(TYPE, "#%s.%s".formatted( structuredType.getNamespace(), structuredType.getName())); } else { LOG.trace("{} has root level. {} won't be written here", entitySet.getName(), TYPE); diff --git a/odata_renderer/src/main/java/com/sdl/odata/renderer/metadata/MetadataDocumentComplexTypeWriter.java b/odata_renderer/src/main/java/com/sdl/odata/renderer/metadata/MetadataDocumentComplexTypeWriter.java index 1f1dffc6..27c5aa9d 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/renderer/metadata/MetadataDocumentComplexTypeWriter.java +++ b/odata_renderer/src/main/java/com/sdl/odata/renderer/metadata/MetadataDocumentComplexTypeWriter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/renderer/metadata/MetadataDocumentEntitySetWriter.java b/odata_renderer/src/main/java/com/sdl/odata/renderer/metadata/MetadataDocumentEntitySetWriter.java index c79f8418..ebd6af09 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/renderer/metadata/MetadataDocumentEntitySetWriter.java +++ b/odata_renderer/src/main/java/com/sdl/odata/renderer/metadata/MetadataDocumentEntitySetWriter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/renderer/metadata/MetadataDocumentEntityTypeWriter.java b/odata_renderer/src/main/java/com/sdl/odata/renderer/metadata/MetadataDocumentEntityTypeWriter.java index 4bc090ea..ba1312f4 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/renderer/metadata/MetadataDocumentEntityTypeWriter.java +++ b/odata_renderer/src/main/java/com/sdl/odata/renderer/metadata/MetadataDocumentEntityTypeWriter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/renderer/metadata/MetadataDocumentEnumTypeWriter.java b/odata_renderer/src/main/java/com/sdl/odata/renderer/metadata/MetadataDocumentEnumTypeWriter.java index f7b1b4f8..575dfeaf 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/renderer/metadata/MetadataDocumentEnumTypeWriter.java +++ b/odata_renderer/src/main/java/com/sdl/odata/renderer/metadata/MetadataDocumentEnumTypeWriter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/renderer/metadata/MetadataDocumentPropertyWriter.java b/odata_renderer/src/main/java/com/sdl/odata/renderer/metadata/MetadataDocumentPropertyWriter.java index c6600253..d8f64eb0 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/renderer/metadata/MetadataDocumentPropertyWriter.java +++ b/odata_renderer/src/main/java/com/sdl/odata/renderer/metadata/MetadataDocumentPropertyWriter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -66,8 +66,7 @@ public void write(StructuralProperty property) throws XMLStreamException { LOG.debug("Writing property {} of type {}", property.getName(), property.getTypeName()); - if (property instanceof NavigationProperty) { - NavigationProperty navProperty = (NavigationProperty) property; + if (property instanceof NavigationProperty navProperty) { xmlWriter.writeStartElement(NAVIGATION_PROPERTY); writeCommonPropertyAttributes(property); if (!isNullOrEmpty(navProperty.getPartnerName())) { diff --git a/odata_renderer/src/main/java/com/sdl/odata/renderer/metadata/MetadataDocumentRenderer.java b/odata_renderer/src/main/java/com/sdl/odata/renderer/metadata/MetadataDocumentRenderer.java index 24631ce2..64a82c00 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/renderer/metadata/MetadataDocumentRenderer.java +++ b/odata_renderer/src/main/java/com/sdl/odata/renderer/metadata/MetadataDocumentRenderer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/renderer/metadata/MetadataDocumentSingletonWriter.java b/odata_renderer/src/main/java/com/sdl/odata/renderer/metadata/MetadataDocumentSingletonWriter.java index 63da3097..237c58e8 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/renderer/metadata/MetadataDocumentSingletonWriter.java +++ b/odata_renderer/src/main/java/com/sdl/odata/renderer/metadata/MetadataDocumentSingletonWriter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/renderer/metadata/MetadataDocumentWriter.java b/odata_renderer/src/main/java/com/sdl/odata/renderer/metadata/MetadataDocumentWriter.java index b723b4e0..5ae07aff 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/renderer/metadata/MetadataDocumentWriter.java +++ b/odata_renderer/src/main/java/com/sdl/odata/renderer/metadata/MetadataDocumentWriter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/renderer/metadata/ServiceDocumentRenderer.java b/odata_renderer/src/main/java/com/sdl/odata/renderer/metadata/ServiceDocumentRenderer.java index ac8bce57..23ff73c3 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/renderer/metadata/ServiceDocumentRenderer.java +++ b/odata_renderer/src/main/java/com/sdl/odata/renderer/metadata/ServiceDocumentRenderer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/renderer/primitive/PrimitiveRenderer.java b/odata_renderer/src/main/java/com/sdl/odata/renderer/primitive/PrimitiveRenderer.java index 773f6179..7b0b50eb 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/renderer/primitive/PrimitiveRenderer.java +++ b/odata_renderer/src/main/java/com/sdl/odata/renderer/primitive/PrimitiveRenderer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/renderer/primitive/writer/PrimitiveWriter.java b/odata_renderer/src/main/java/com/sdl/odata/renderer/primitive/writer/PrimitiveWriter.java index cf946da8..dfff14d6 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/renderer/primitive/writer/PrimitiveWriter.java +++ b/odata_renderer/src/main/java/com/sdl/odata/renderer/primitive/writer/PrimitiveWriter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/renderer/xml/XMLErrorResponseRenderer.java b/odata_renderer/src/main/java/com/sdl/odata/renderer/xml/XMLErrorResponseRenderer.java index b2cfbaf1..1fefd0b0 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/renderer/xml/XMLErrorResponseRenderer.java +++ b/odata_renderer/src/main/java/com/sdl/odata/renderer/xml/XMLErrorResponseRenderer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/renderer/xml/XMLServiceDocumentRenderer.java b/odata_renderer/src/main/java/com/sdl/odata/renderer/xml/XMLServiceDocumentRenderer.java index 3ec93b97..df718033 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/renderer/xml/XMLServiceDocumentRenderer.java +++ b/odata_renderer/src/main/java/com/sdl/odata/renderer/xml/XMLServiceDocumentRenderer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/renderer/xml/XMLValueRenderer.java b/odata_renderer/src/main/java/com/sdl/odata/renderer/xml/XMLValueRenderer.java index 9ddcc353..f94436f4 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/renderer/xml/XMLValueRenderer.java +++ b/odata_renderer/src/main/java/com/sdl/odata/renderer/xml/XMLValueRenderer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/renderer/xml/util/XMLWriterUtil.java b/odata_renderer/src/main/java/com/sdl/odata/renderer/xml/util/XMLWriterUtil.java index dce3c910..6c41d4bb 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/renderer/xml/util/XMLWriterUtil.java +++ b/odata_renderer/src/main/java/com/sdl/odata/renderer/xml/util/XMLWriterUtil.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -58,8 +58,8 @@ public static String getPropertyXmlForPrimitives(String rootName, Type type, Obj try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) { XMLStreamWriter writer = startElement(outputStream, rootName, type.getName(), context, false); // write values - if (data instanceof List<?>) { - writeMultipleElementsForPrimitives(writer, (List<?>) data); + if (data instanceof List<?> list) { + writeMultipleElementsForPrimitives(writer, list); } else { writer.writeCharacters(data.toString()); } @@ -86,8 +86,8 @@ public static void getPropertyXmlForPrimitivesBodyDocument( LOG.debug("PropertyXMLForPrimitivesBodyDocument invoked with {}, {}, {}", rootName, type, data); try { // write values - if (data instanceof List<?>) { - writeMultipleElementsForPrimitives(xmlStreamWriter, (List<?>) data); + if (data instanceof List<?> list) { + writeMultipleElementsForPrimitives(xmlStreamWriter, list); } else { xmlStreamWriter.writeCharacters(data.toString()); } diff --git a/odata_renderer/src/main/java/com/sdl/odata/renderer/xml/writer/XMLErrorResponseWriter.java b/odata_renderer/src/main/java/com/sdl/odata/renderer/xml/writer/XMLErrorResponseWriter.java index 67d31f12..2e3af333 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/renderer/xml/writer/XMLErrorResponseWriter.java +++ b/odata_renderer/src/main/java/com/sdl/odata/renderer/xml/writer/XMLErrorResponseWriter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/renderer/xml/writer/XMLPropertyWriter.java b/odata_renderer/src/main/java/com/sdl/odata/renderer/xml/writer/XMLPropertyWriter.java index 32fb7d49..ef451915 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/renderer/xml/writer/XMLPropertyWriter.java +++ b/odata_renderer/src/main/java/com/sdl/odata/renderer/xml/writer/XMLPropertyWriter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -192,7 +192,7 @@ private void handleProperty(Object entity, StructuralProperty property, XMLStrea LOG.trace("Property name is '{}' and its value is '{}'", property.getName(), value); Type type = getType(value); if (type == null) { - String msg = String.format("Field type %s is not found in entity data model", field.getType()); + String msg = "Field type %s is not found in entity data model".formatted(field.getType()); LOG.error(msg); throw new ODataRenderException(msg); } diff --git a/odata_renderer/src/main/java/com/sdl/odata/renderer/xml/writer/XMLServiceDocumentWriter.java b/odata_renderer/src/main/java/com/sdl/odata/renderer/xml/writer/XMLServiceDocumentWriter.java index 748e82a3..c7e4888b 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/renderer/xml/writer/XMLServiceDocumentWriter.java +++ b/odata_renderer/src/main/java/com/sdl/odata/renderer/xml/writer/XMLServiceDocumentWriter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/AbstractActionParser.java b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/AbstractActionParser.java index 9eaa26f2..e7f26269 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/AbstractActionParser.java +++ b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/AbstractActionParser.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/AbstractLinkUnmarshaller.java b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/AbstractLinkUnmarshaller.java index 0d26a55c..07b538b3 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/AbstractLinkUnmarshaller.java +++ b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/AbstractLinkUnmarshaller.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/AbstractParser.java b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/AbstractParser.java index 45c39a90..4bd20d42 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/AbstractParser.java +++ b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/AbstractParser.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/AbstractUnmarshaller.java b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/AbstractUnmarshaller.java index 9a77ecfd..06e651f3 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/AbstractUnmarshaller.java +++ b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/AbstractUnmarshaller.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/DeleteLinkUnmarshaller.java b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/DeleteLinkUnmarshaller.java index ffa717de..4f46d6ec 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/DeleteLinkUnmarshaller.java +++ b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/DeleteLinkUnmarshaller.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/NoEntityUnmarshaller.java b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/NoEntityUnmarshaller.java index 987c0836..978c9109 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/NoEntityUnmarshaller.java +++ b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/NoEntityUnmarshaller.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/PropertyType.java b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/PropertyType.java index 0287172f..f3a73850 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/PropertyType.java +++ b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/PropertyType.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/UnmarshallerConfiguration.java b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/UnmarshallerConfiguration.java index 9fd42293..491a93b4 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/UnmarshallerConfiguration.java +++ b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/UnmarshallerConfiguration.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/UnmarshallerFactoryImpl.java b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/UnmarshallerFactoryImpl.java index 8300dc27..8902cf8a 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/UnmarshallerFactoryImpl.java +++ b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/UnmarshallerFactoryImpl.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/atom/AtomActionUnmarshaller.java b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/atom/AtomActionUnmarshaller.java index ca28e9f8..1f506a53 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/atom/AtomActionUnmarshaller.java +++ b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/atom/AtomActionUnmarshaller.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/atom/AtomLinkUnmarshaller.java b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/atom/AtomLinkUnmarshaller.java index d52e3c01..b2ef6730 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/atom/AtomLinkUnmarshaller.java +++ b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/atom/AtomLinkUnmarshaller.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/atom/AtomUnmarshaller.java b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/atom/AtomUnmarshaller.java index a9bb8acc..18e83575 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/atom/AtomUnmarshaller.java +++ b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/atom/AtomUnmarshaller.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/atom/ODataAtomActionParser.java b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/atom/ODataAtomActionParser.java index efed01f8..29af4b2f 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/atom/ODataAtomActionParser.java +++ b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/atom/ODataAtomActionParser.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/atom/ODataAtomParser.java b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/atom/ODataAtomParser.java index 77ba98a3..471b0f5b 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/atom/ODataAtomParser.java +++ b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/atom/ODataAtomParser.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -231,8 +231,7 @@ private void setEntityProperties(Object entity, EntityType entityType, Element e NodeList childNodes = entryElement.getChildNodes(); for (int i = 0; i < childNodes.getLength(); i++) { Node node = childNodes.item(i); - if (node instanceof Element && node.getNodeName().equals(ODATA_CONTENT)) { - Element contentElement = (Element) node; + if (node instanceof Element contentElement && node.getNodeName().equals(ODATA_CONTENT)) { NodeList propertiesElements = contentElement.getElementsByTagNameNS(getODataMetadataNS(), ODATA_PROPERTIES); @@ -242,8 +241,8 @@ private void setEntityProperties(Object entity, EntityType entityType, Element e NodeList propertyNodes = propertiesElement.getChildNodes(); for (int k = 0; k < propertyNodes.getLength(); k++) { Node propertyNode = propertyNodes.item(k); - if (propertyNode instanceof Element) { - setStructProperty(entity, entityType, (Element) propertyNode); + if (propertyNode instanceof Element element) { + setStructProperty(entity, entityType, element); } } } @@ -433,8 +432,8 @@ private Object parsePropertyValueComplex(Element propertyElement, ComplexType co NodeList nodes = propertyElement.getChildNodes(); for (int i = 0; i < nodes.getLength(); i++) { Node node = nodes.item(i); - if (node instanceof Element) { - setStructProperty(instance, complexType, (Element) node); + if (node instanceof Element element) { + setStructProperty(instance, complexType, element); } } @@ -451,8 +450,7 @@ private void setEntityNavigationProperties(Object entity, EntityType entityType, NodeList childNodes = entryElement.getChildNodes(); for (int i = 0; i < childNodes.getLength(); i++) { Node node = childNodes.item(i); - if (node instanceof Element && node.getNodeName().equals(ATOM_LINK)) { - Element linkElement = (Element) node; + if (node instanceof Element linkElement && node.getNodeName().equals(ATOM_LINK)) { String relAttribute = (linkElement.getAttribute(REL) == null) ? "" : linkElement.getAttribute(REL); if (relAttribute.startsWith(getODataNavLinkRelationNSPrefix())) { foundNavigationProperties.add(processNavigationLink(entity, entityType, linkElement)); @@ -585,8 +583,8 @@ private List<Element> getFeedEntries(Element feedElement) { NodeList childNodes = feedElement.getChildNodes(); for (int i = 0; i < childNodes.getLength(); i++) { Node node = childNodes.item(i); - if (node instanceof Element && ATOM_ENTRY.equals(node.getLocalName())) { - feedEntries.add((Element) node); + if (node instanceof Element element && ATOM_ENTRY.equals(node.getLocalName())) { + feedEntries.add(element); } } return feedEntries; @@ -597,8 +595,8 @@ private List<Element> getFeedMetadataRefs(Element feedElement) { NodeList childNodes = feedElement.getChildNodes(); for (int i = 0; i < childNodes.getLength(); i++) { Node node = childNodes.item(i); - if (node instanceof Element && REF.equals(node.getLocalName())) { - feedEntries.add((Element) node); + if (node instanceof Element element && REF.equals(node.getLocalName())) { + feedEntries.add(element); } } return feedEntries; @@ -639,8 +637,8 @@ private Element getFirstChildElement(Element element) { NodeList childNodes = element.getChildNodes(); for (int i = 0; i < childNodes.getLength(); i++) { Node node = childNodes.item(i); - if (node instanceof Element) { - return (Element) node; + if (node instanceof Element element1) { + return element1; } } return null; diff --git a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/batch/BatchUnmarshaller.java b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/batch/BatchUnmarshaller.java index 416031a9..530cad48 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/batch/BatchUnmarshaller.java +++ b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/batch/BatchUnmarshaller.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/batch/ODataBatchParser.java b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/batch/ODataBatchParser.java index c42a7a9e..224eda2a 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/batch/ODataBatchParser.java +++ b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/batch/ODataBatchParser.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/json/JsonActionUnmarshaller.java b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/json/JsonActionUnmarshaller.java index 00e7a89b..beee6729 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/json/JsonActionUnmarshaller.java +++ b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/json/JsonActionUnmarshaller.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/json/JsonLinkUnmarshaller.java b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/json/JsonLinkUnmarshaller.java index 7af0a56e..98a00d67 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/json/JsonLinkUnmarshaller.java +++ b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/json/JsonLinkUnmarshaller.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/json/JsonUnmarshaller.java b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/json/JsonUnmarshaller.java index 4f19f12d..85110e51 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/json/JsonUnmarshaller.java +++ b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/json/JsonUnmarshaller.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/json/ODataJsonActionParser.java b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/json/ODataJsonActionParser.java index 5881488e..84495250 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/json/ODataJsonActionParser.java +++ b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/json/ODataJsonActionParser.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/json/ODataJsonParser.java b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/json/ODataJsonParser.java index be6b4430..f545f584 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/json/ODataJsonParser.java +++ b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/json/ODataJsonParser.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/json/core/JsonNullableValidator.java b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/json/core/JsonNullableValidator.java index 6654532e..24d5b0d0 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/json/core/JsonNullableValidator.java +++ b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/json/core/JsonNullableValidator.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/json/core/JsonParserUtils.java b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/json/core/JsonParserUtils.java index 1d328de7..75ee82f1 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/json/core/JsonParserUtils.java +++ b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/json/core/JsonParserUtils.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/json/core/JsonProcessor.java b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/json/core/JsonProcessor.java index 5efd0be6..f4219cf4 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/json/core/JsonProcessor.java +++ b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/json/core/JsonProcessor.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/json/core/JsonPropertyExpander.java b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/json/core/JsonPropertyExpander.java index ca57720d..3f9463af 100644 --- a/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/json/core/JsonPropertyExpander.java +++ b/odata_renderer/src/main/java/com/sdl/odata/unmarshaller/json/core/JsonPropertyExpander.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/test/java/com/sdl/odata/NoEntityUnmarshallerTest.java b/odata_renderer/src/test/java/com/sdl/odata/NoEntityUnmarshallerTest.java index 8bba43e1..d7e50018 100644 --- a/odata_renderer/src/test/java/com/sdl/odata/NoEntityUnmarshallerTest.java +++ b/odata_renderer/src/test/java/com/sdl/odata/NoEntityUnmarshallerTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/test/java/com/sdl/odata/ODataRendererUtilsTest.java b/odata_renderer/src/test/java/com/sdl/odata/ODataRendererUtilsTest.java index 7067d5d8..b4f0bdab 100644 --- a/odata_renderer/src/test/java/com/sdl/odata/ODataRendererUtilsTest.java +++ b/odata_renderer/src/test/java/com/sdl/odata/ODataRendererUtilsTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/test/java/com/sdl/odata/WriterUnmarshallerTest.java b/odata_renderer/src/test/java/com/sdl/odata/WriterUnmarshallerTest.java index 7c22ddc9..67caef02 100644 --- a/odata_renderer/src/test/java/com/sdl/odata/WriterUnmarshallerTest.java +++ b/odata_renderer/src/test/java/com/sdl/odata/WriterUnmarshallerTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/test/java/com/sdl/odata/renderer/AbstractRendererTest.java b/odata_renderer/src/test/java/com/sdl/odata/renderer/AbstractRendererTest.java index f09a0b11..8346e15f 100644 --- a/odata_renderer/src/test/java/com/sdl/odata/renderer/AbstractRendererTest.java +++ b/odata_renderer/src/test/java/com/sdl/odata/renderer/AbstractRendererTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/test/java/com/sdl/odata/renderer/RendererTest.java b/odata_renderer/src/test/java/com/sdl/odata/renderer/RendererTest.java index 506f88f5..c5f1e19e 100644 --- a/odata_renderer/src/test/java/com/sdl/odata/renderer/RendererTest.java +++ b/odata_renderer/src/test/java/com/sdl/odata/renderer/RendererTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/test/java/com/sdl/odata/renderer/WriterTest.java b/odata_renderer/src/test/java/com/sdl/odata/renderer/WriterTest.java index e6c739af..5ba801b8 100644 --- a/odata_renderer/src/test/java/com/sdl/odata/renderer/WriterTest.java +++ b/odata_renderer/src/test/java/com/sdl/odata/renderer/WriterTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/test/java/com/sdl/odata/renderer/atom/writer/AtomDataWriterTest.java b/odata_renderer/src/test/java/com/sdl/odata/renderer/atom/writer/AtomDataWriterTest.java index d71947db..2601813c 100644 --- a/odata_renderer/src/test/java/com/sdl/odata/renderer/atom/writer/AtomDataWriterTest.java +++ b/odata_renderer/src/test/java/com/sdl/odata/renderer/atom/writer/AtomDataWriterTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/test/java/com/sdl/odata/renderer/atom/writer/AtomMetadataWriterTest.java b/odata_renderer/src/test/java/com/sdl/odata/renderer/atom/writer/AtomMetadataWriterTest.java index 25cb0f2e..b7ad9ee1 100644 --- a/odata_renderer/src/test/java/com/sdl/odata/renderer/atom/writer/AtomMetadataWriterTest.java +++ b/odata_renderer/src/test/java/com/sdl/odata/renderer/atom/writer/AtomMetadataWriterTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/test/java/com/sdl/odata/renderer/atom/writer/AtomWriterTest.java b/odata_renderer/src/test/java/com/sdl/odata/renderer/atom/writer/AtomWriterTest.java index 1ae57aa8..367c95b5 100644 --- a/odata_renderer/src/test/java/com/sdl/odata/renderer/atom/writer/AtomWriterTest.java +++ b/odata_renderer/src/test/java/com/sdl/odata/renderer/atom/writer/AtomWriterTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -217,8 +217,8 @@ private void checkWrittenXmlStream(Object data, Map<String, Object> meta, String new ODataV4AtomNSConfigurationProvider(), isWriteOperation, false); writer.startDocument(); - if (data instanceof List) { - writer.writeFeed((List<?>) data, contextURL, meta); + if (data instanceof List<?> list) { + writer.writeFeed(list, contextURL, meta); } else { writer.writeEntry(data, contextURL); } diff --git a/odata_renderer/src/test/java/com/sdl/odata/renderer/json/JsonErrorResponseRendererTest.java b/odata_renderer/src/test/java/com/sdl/odata/renderer/json/JsonErrorResponseRendererTest.java index 074cc7a2..99e65ae2 100644 --- a/odata_renderer/src/test/java/com/sdl/odata/renderer/json/JsonErrorResponseRendererTest.java +++ b/odata_renderer/src/test/java/com/sdl/odata/renderer/json/JsonErrorResponseRendererTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/test/java/com/sdl/odata/renderer/json/JsonServiceDocumentRendererTest.java b/odata_renderer/src/test/java/com/sdl/odata/renderer/json/JsonServiceDocumentRendererTest.java index 80ec54f2..a8c0154a 100644 --- a/odata_renderer/src/test/java/com/sdl/odata/renderer/json/JsonServiceDocumentRendererTest.java +++ b/odata_renderer/src/test/java/com/sdl/odata/renderer/json/JsonServiceDocumentRendererTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/test/java/com/sdl/odata/renderer/json/JsonValueRendererTest.java b/odata_renderer/src/test/java/com/sdl/odata/renderer/json/JsonValueRendererTest.java index 1cf8b89a..9ce6523e 100644 --- a/odata_renderer/src/test/java/com/sdl/odata/renderer/json/JsonValueRendererTest.java +++ b/odata_renderer/src/test/java/com/sdl/odata/renderer/json/JsonValueRendererTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/test/java/com/sdl/odata/renderer/json/util/JsonWriterUtilTest.java b/odata_renderer/src/test/java/com/sdl/odata/renderer/json/util/JsonWriterUtilTest.java index 4a082f44..8b26754f 100644 --- a/odata_renderer/src/test/java/com/sdl/odata/renderer/json/util/JsonWriterUtilTest.java +++ b/odata_renderer/src/test/java/com/sdl/odata/renderer/json/util/JsonWriterUtilTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/test/java/com/sdl/odata/renderer/json/writer/JsonErrorResponseWriterTest.java b/odata_renderer/src/test/java/com/sdl/odata/renderer/json/writer/JsonErrorResponseWriterTest.java index c66c9aa1..875a5a02 100644 --- a/odata_renderer/src/test/java/com/sdl/odata/renderer/json/writer/JsonErrorResponseWriterTest.java +++ b/odata_renderer/src/test/java/com/sdl/odata/renderer/json/writer/JsonErrorResponseWriterTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/test/java/com/sdl/odata/renderer/json/writer/JsonPropertyWriterTest.java b/odata_renderer/src/test/java/com/sdl/odata/renderer/json/writer/JsonPropertyWriterTest.java index d2013fe8..925bc280 100644 --- a/odata_renderer/src/test/java/com/sdl/odata/renderer/json/writer/JsonPropertyWriterTest.java +++ b/odata_renderer/src/test/java/com/sdl/odata/renderer/json/writer/JsonPropertyWriterTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/test/java/com/sdl/odata/renderer/json/writer/JsonServiceDocumentWriterTest.java b/odata_renderer/src/test/java/com/sdl/odata/renderer/json/writer/JsonServiceDocumentWriterTest.java index 8418854d..d66a34ff 100644 --- a/odata_renderer/src/test/java/com/sdl/odata/renderer/json/writer/JsonServiceDocumentWriterTest.java +++ b/odata_renderer/src/test/java/com/sdl/odata/renderer/json/writer/JsonServiceDocumentWriterTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/test/java/com/sdl/odata/renderer/json/writer/JsonWriterTest.java b/odata_renderer/src/test/java/com/sdl/odata/renderer/json/writer/JsonWriterTest.java index abfd829c..9994dbe8 100644 --- a/odata_renderer/src/test/java/com/sdl/odata/renderer/json/writer/JsonWriterTest.java +++ b/odata_renderer/src/test/java/com/sdl/odata/renderer/json/writer/JsonWriterTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -185,8 +185,8 @@ private void checkWrittenJsonStream(Object data, Map<String, Object> meta, Strin JsonWriter writer = new JsonWriter(odataUri, entityDataModel); String jsonStream; - if (data instanceof List) { - jsonStream = writer.writeFeed((List<?>) data, contextURL, meta); + if (data instanceof List<?> list) { + jsonStream = writer.writeFeed(list, contextURL, meta); } else { jsonStream = writer.writeEntry(data, contextURL); } diff --git a/odata_renderer/src/test/java/com/sdl/odata/renderer/metadata/MetadataDocumentWriterTest.java b/odata_renderer/src/test/java/com/sdl/odata/renderer/metadata/MetadataDocumentWriterTest.java index 33170b01..ef40689f 100644 --- a/odata_renderer/src/test/java/com/sdl/odata/renderer/metadata/MetadataDocumentWriterTest.java +++ b/odata_renderer/src/test/java/com/sdl/odata/renderer/metadata/MetadataDocumentWriterTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/test/java/com/sdl/odata/renderer/primitive/PrimitiveRendererTest.java b/odata_renderer/src/test/java/com/sdl/odata/renderer/primitive/PrimitiveRendererTest.java index 1363b666..5ed4b539 100644 --- a/odata_renderer/src/test/java/com/sdl/odata/renderer/primitive/PrimitiveRendererTest.java +++ b/odata_renderer/src/test/java/com/sdl/odata/renderer/primitive/PrimitiveRendererTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/test/java/com/sdl/odata/renderer/util/PrettyPrinter.java b/odata_renderer/src/test/java/com/sdl/odata/renderer/util/PrettyPrinter.java index 9991a948..6345244e 100644 --- a/odata_renderer/src/test/java/com/sdl/odata/renderer/util/PrettyPrinter.java +++ b/odata_renderer/src/test/java/com/sdl/odata/renderer/util/PrettyPrinter.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/test/java/com/sdl/odata/renderer/xml/XMLErrorResponseRendererTest.java b/odata_renderer/src/test/java/com/sdl/odata/renderer/xml/XMLErrorResponseRendererTest.java index a9f05e64..ee911eb6 100644 --- a/odata_renderer/src/test/java/com/sdl/odata/renderer/xml/XMLErrorResponseRendererTest.java +++ b/odata_renderer/src/test/java/com/sdl/odata/renderer/xml/XMLErrorResponseRendererTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/test/java/com/sdl/odata/renderer/xml/XMLServiceDocumentRendererTest.java b/odata_renderer/src/test/java/com/sdl/odata/renderer/xml/XMLServiceDocumentRendererTest.java index f4e72afb..3826d0d0 100644 --- a/odata_renderer/src/test/java/com/sdl/odata/renderer/xml/XMLServiceDocumentRendererTest.java +++ b/odata_renderer/src/test/java/com/sdl/odata/renderer/xml/XMLServiceDocumentRendererTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/test/java/com/sdl/odata/renderer/xml/XmlValueRendererTest.java b/odata_renderer/src/test/java/com/sdl/odata/renderer/xml/XmlValueRendererTest.java index 98556d7d..643ed1c2 100644 --- a/odata_renderer/src/test/java/com/sdl/odata/renderer/xml/XmlValueRendererTest.java +++ b/odata_renderer/src/test/java/com/sdl/odata/renderer/xml/XmlValueRendererTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/test/java/com/sdl/odata/renderer/xml/util/XMLWriterUtilTest.java b/odata_renderer/src/test/java/com/sdl/odata/renderer/xml/util/XMLWriterUtilTest.java index 4320fb3e..00ee525d 100644 --- a/odata_renderer/src/test/java/com/sdl/odata/renderer/xml/util/XMLWriterUtilTest.java +++ b/odata_renderer/src/test/java/com/sdl/odata/renderer/xml/util/XMLWriterUtilTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/test/java/com/sdl/odata/renderer/xml/writer/XMLErrorResponseWriterTest.java b/odata_renderer/src/test/java/com/sdl/odata/renderer/xml/writer/XMLErrorResponseWriterTest.java index 245711c3..c3453dac 100644 --- a/odata_renderer/src/test/java/com/sdl/odata/renderer/xml/writer/XMLErrorResponseWriterTest.java +++ b/odata_renderer/src/test/java/com/sdl/odata/renderer/xml/writer/XMLErrorResponseWriterTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/test/java/com/sdl/odata/renderer/xml/writer/XMLPropertyWriterTest.java b/odata_renderer/src/test/java/com/sdl/odata/renderer/xml/writer/XMLPropertyWriterTest.java index 84436e28..9578301b 100644 --- a/odata_renderer/src/test/java/com/sdl/odata/renderer/xml/writer/XMLPropertyWriterTest.java +++ b/odata_renderer/src/test/java/com/sdl/odata/renderer/xml/writer/XMLPropertyWriterTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/test/java/com/sdl/odata/renderer/xml/writer/XMLServiceDocumentWriterTest.java b/odata_renderer/src/test/java/com/sdl/odata/renderer/xml/writer/XMLServiceDocumentWriterTest.java index 89315e65..3d611f9a 100644 --- a/odata_renderer/src/test/java/com/sdl/odata/renderer/xml/writer/XMLServiceDocumentWriterTest.java +++ b/odata_renderer/src/test/java/com/sdl/odata/renderer/xml/writer/XMLServiceDocumentWriterTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/ExampleUnmarshaller.java b/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/ExampleUnmarshaller.java index 51c68549..6cbe0ea4 100644 --- a/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/ExampleUnmarshaller.java +++ b/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/ExampleUnmarshaller.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/ParameterTypeUtilsTest.java b/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/ParameterTypeUtilsTest.java index 68b521c9..108092f0 100644 --- a/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/ParameterTypeUtilsTest.java +++ b/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/ParameterTypeUtilsTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/ParserUtilTest.java b/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/ParserUtilTest.java index 9e00ba57..3605c395 100644 --- a/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/ParserUtilTest.java +++ b/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/ParserUtilTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/UnmarshallerTest.java b/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/UnmarshallerTest.java index 29cb57f2..e3a703ab 100644 --- a/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/UnmarshallerTest.java +++ b/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/UnmarshallerTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/atom/AtomActionUnmarshallerTest.java b/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/atom/AtomActionUnmarshallerTest.java index 84986a49..03d10d36 100644 --- a/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/atom/AtomActionUnmarshallerTest.java +++ b/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/atom/AtomActionUnmarshallerTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/atom/AtomUnmarshallerTest.java b/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/atom/AtomUnmarshallerTest.java index cce79a7a..f7d90eaf 100644 --- a/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/atom/AtomUnmarshallerTest.java +++ b/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/atom/AtomUnmarshallerTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/atom/ODataAtomParserTest.java b/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/atom/ODataAtomParserTest.java index c2ba97f5..ec410949 100644 --- a/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/atom/ODataAtomParserTest.java +++ b/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/atom/ODataAtomParserTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/batch/BatchUnmarshallerTest.java b/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/batch/BatchUnmarshallerTest.java index 4eaa83dc..fe112af9 100644 --- a/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/batch/BatchUnmarshallerTest.java +++ b/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/batch/BatchUnmarshallerTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/batch/ODataBatchParserTest.java b/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/batch/ODataBatchParserTest.java index f46521e1..7c76d74a 100644 --- a/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/batch/ODataBatchParserTest.java +++ b/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/batch/ODataBatchParserTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/json/JsonActionUnmarshallerTest.java b/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/json/JsonActionUnmarshallerTest.java index af68bfb2..2870c0f2 100644 --- a/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/json/JsonActionUnmarshallerTest.java +++ b/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/json/JsonActionUnmarshallerTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/json/JsonUnmarshallerTest.java b/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/json/JsonUnmarshallerTest.java index c413ef98..a171b0a3 100644 --- a/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/json/JsonUnmarshallerTest.java +++ b/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/json/JsonUnmarshallerTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/json/ODataJsonActionParserTest.java b/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/json/ODataJsonActionParserTest.java index a2f90d22..106fc94a 100644 --- a/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/json/ODataJsonActionParserTest.java +++ b/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/json/ODataJsonActionParserTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/json/ODataJsonParserTest.java b/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/json/ODataJsonParserTest.java index 8e8dd21e..42aa2447 100644 --- a/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/json/ODataJsonParserTest.java +++ b/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/json/ODataJsonParserTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/json/core/JsonParserUtilsTest.java b/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/json/core/JsonParserUtilsTest.java index e1a947d4..e96170c1 100644 --- a/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/json/core/JsonParserUtilsTest.java +++ b/odata_renderer/src/test/java/com/sdl/odata/unmarshaller/json/core/JsonParserUtilsTest.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_service/pom.xml b/odata_service/pom.xml index 86b7fbe9..dfb3e18d 100644 --- a/odata_service/pom.xml +++ b/odata_service/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -54,6 +54,7 @@ <dependency> <groupId>jakarta.annotation</groupId> <artifactId>jakarta.annotation-api</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.pekko</groupId> diff --git a/odata_service/src/main/java/com/sdl/odata/service/ODataServiceConfiguration.java b/odata_service/src/main/java/com/sdl/odata/service/ODataServiceConfiguration.java index 4d1958e3..f4745885 100644 --- a/odata_service/src/main/java/com/sdl/odata/service/ODataServiceConfiguration.java +++ b/odata_service/src/main/java/com/sdl/odata/service/ODataServiceConfiguration.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_service/src/main/java/com/sdl/odata/service/spring/ActorProducer.java b/odata_service/src/main/java/com/sdl/odata/service/spring/ActorProducer.java index 5f064083..0059fdd4 100644 --- a/odata_service/src/main/java/com/sdl/odata/service/spring/ActorProducer.java +++ b/odata_service/src/main/java/com/sdl/odata/service/spring/ActorProducer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_service/src/main/java/com/sdl/odata/service/spring/PekkoConfiguration.java b/odata_service/src/main/java/com/sdl/odata/service/spring/PekkoConfiguration.java index 4c69a16a..c6732b22 100644 --- a/odata_service/src/main/java/com/sdl/odata/service/spring/PekkoConfiguration.java +++ b/odata_service/src/main/java/com/sdl/odata/service/spring/PekkoConfiguration.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_service/src/main/java/com/sdl/odata/service/spring/PekkoSpringActorProducer.java b/odata_service/src/main/java/com/sdl/odata/service/spring/PekkoSpringActorProducer.java index 2ccb3229..fc532001 100644 --- a/odata_service/src/main/java/com/sdl/odata/service/spring/PekkoSpringActorProducer.java +++ b/odata_service/src/main/java/com/sdl/odata/service/spring/PekkoSpringActorProducer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_service/src/main/java/com/sdl/odata/service/spring/PekkoSpringExtension.java b/odata_service/src/main/java/com/sdl/odata/service/spring/PekkoSpringExtension.java index 25bfdc2a..ce6382cb 100644 --- a/odata_service/src/main/java/com/sdl/odata/service/spring/PekkoSpringExtension.java +++ b/odata_service/src/main/java/com/sdl/odata/service/spring/PekkoSpringExtension.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_service/src/main/scala/com/sdl/odata/service/ODataServiceImpl.scala b/odata_service/src/main/scala/com/sdl/odata/service/ODataServiceImpl.scala index 4b56c1f4..8948be54 100644 --- a/odata_service/src/main/scala/com/sdl/odata/service/ODataServiceImpl.scala +++ b/odata_service/src/main/scala/com/sdl/odata/service/ODataServiceImpl.scala @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_service/src/main/scala/com/sdl/odata/service/actor/MessageHandlerRegistry.scala b/odata_service/src/main/scala/com/sdl/odata/service/actor/MessageHandlerRegistry.scala index cd3a6a61..d7171725 100644 --- a/odata_service/src/main/scala/com/sdl/odata/service/actor/MessageHandlerRegistry.scala +++ b/odata_service/src/main/scala/com/sdl/odata/service/actor/MessageHandlerRegistry.scala @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_service/src/main/scala/com/sdl/odata/service/actor/ODataActor.scala b/odata_service/src/main/scala/com/sdl/odata/service/actor/ODataActor.scala index 94364179..561bc737 100644 --- a/odata_service/src/main/scala/com/sdl/odata/service/actor/ODataActor.scala +++ b/odata_service/src/main/scala/com/sdl/odata/service/actor/ODataActor.scala @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_service/src/main/scala/com/sdl/odata/service/actor/ODataBatchProcessorActor.scala b/odata_service/src/main/scala/com/sdl/odata/service/actor/ODataBatchProcessorActor.scala index 0618f23a..6cdb4f86 100644 --- a/odata_service/src/main/scala/com/sdl/odata/service/actor/ODataBatchProcessorActor.scala +++ b/odata_service/src/main/scala/com/sdl/odata/service/actor/ODataBatchProcessorActor.scala @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_service/src/main/scala/com/sdl/odata/service/actor/ODataBatchRendererActor.scala b/odata_service/src/main/scala/com/sdl/odata/service/actor/ODataBatchRendererActor.scala index 7d605287..6f2fdd46 100644 --- a/odata_service/src/main/scala/com/sdl/odata/service/actor/ODataBatchRendererActor.scala +++ b/odata_service/src/main/scala/com/sdl/odata/service/actor/ODataBatchRendererActor.scala @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_service/src/main/scala/com/sdl/odata/service/actor/ODataMessageRouter.scala b/odata_service/src/main/scala/com/sdl/odata/service/actor/ODataMessageRouter.scala index 5c9a7ebb..32082b37 100644 --- a/odata_service/src/main/scala/com/sdl/odata/service/actor/ODataMessageRouter.scala +++ b/odata_service/src/main/scala/com/sdl/odata/service/actor/ODataMessageRouter.scala @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_service/src/main/scala/com/sdl/odata/service/actor/ODataParserActor.scala b/odata_service/src/main/scala/com/sdl/odata/service/actor/ODataParserActor.scala index e52744e7..8293ff43 100644 --- a/odata_service/src/main/scala/com/sdl/odata/service/actor/ODataParserActor.scala +++ b/odata_service/src/main/scala/com/sdl/odata/service/actor/ODataParserActor.scala @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_service/src/main/scala/com/sdl/odata/service/actor/ODataQueryProcessorActor.scala b/odata_service/src/main/scala/com/sdl/odata/service/actor/ODataQueryProcessorActor.scala index 8583175a..71b3aa94 100644 --- a/odata_service/src/main/scala/com/sdl/odata/service/actor/ODataQueryProcessorActor.scala +++ b/odata_service/src/main/scala/com/sdl/odata/service/actor/ODataQueryProcessorActor.scala @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_service/src/main/scala/com/sdl/odata/service/actor/ODataRendererActor.scala b/odata_service/src/main/scala/com/sdl/odata/service/actor/ODataRendererActor.scala index a7f90c87..5aba238b 100644 --- a/odata_service/src/main/scala/com/sdl/odata/service/actor/ODataRendererActor.scala +++ b/odata_service/src/main/scala/com/sdl/odata/service/actor/ODataRendererActor.scala @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_service/src/main/scala/com/sdl/odata/service/actor/ODataRequestProcessorActor.scala b/odata_service/src/main/scala/com/sdl/odata/service/actor/ODataRequestProcessorActor.scala index 7d4c7472..732a9abe 100644 --- a/odata_service/src/main/scala/com/sdl/odata/service/actor/ODataRequestProcessorActor.scala +++ b/odata_service/src/main/scala/com/sdl/odata/service/actor/ODataRequestProcessorActor.scala @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_service/src/main/scala/com/sdl/odata/service/actor/ODataUnmarshallerActor.scala b/odata_service/src/main/scala/com/sdl/odata/service/actor/ODataUnmarshallerActor.scala index 3df5d932..f9764627 100644 --- a/odata_service/src/main/scala/com/sdl/odata/service/actor/ODataUnmarshallerActor.scala +++ b/odata_service/src/main/scala/com/sdl/odata/service/actor/ODataUnmarshallerActor.scala @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_service/src/main/scala/com/sdl/odata/service/actor/ODataWriteProcessorActor.scala b/odata_service/src/main/scala/com/sdl/odata/service/actor/ODataWriteProcessorActor.scala index 652d06aa..c02add59 100644 --- a/odata_service/src/main/scala/com/sdl/odata/service/actor/ODataWriteProcessorActor.scala +++ b/odata_service/src/main/scala/com/sdl/odata/service/actor/ODataWriteProcessorActor.scala @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_service/src/main/scala/com/sdl/odata/service/protocol/ODataActorMessage.scala b/odata_service/src/main/scala/com/sdl/odata/service/protocol/ODataActorMessage.scala index 8c064396..5d0d12b2 100644 --- a/odata_service/src/main/scala/com/sdl/odata/service/protocol/ODataActorMessage.scala +++ b/odata_service/src/main/scala/com/sdl/odata/service/protocol/ODataActorMessage.scala @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_service/src/main/scala/com/sdl/odata/service/util/PekkoUtil.scala b/odata_service/src/main/scala/com/sdl/odata/service/util/PekkoUtil.scala index 1456c491..2e3feb09 100644 --- a/odata_service/src/main/scala/com/sdl/odata/service/util/PekkoUtil.scala +++ b/odata_service/src/main/scala/com/sdl/odata/service/util/PekkoUtil.scala @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_service/src/test/scala/com/sdl/odata/service/StopSystemAfterAll.scala b/odata_service/src/test/scala/com/sdl/odata/service/StopSystemAfterAll.scala index 56161dfa..dd9ef223 100644 --- a/odata_service/src/test/scala/com/sdl/odata/service/StopSystemAfterAll.scala +++ b/odata_service/src/test/scala/com/sdl/odata/service/StopSystemAfterAll.scala @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_test/pom.xml b/odata_test/pom.xml index a531c26a..ee29910c 100644 --- a/odata_test/pom.xml +++ b/odata_test/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/odata_test/src/main/java/com/sdl/odata/test/model/AbstractComplexTypeSample.java b/odata_test/src/main/java/com/sdl/odata/test/model/AbstractComplexTypeSample.java index 743c5bce..4d81a379 100644 --- a/odata_test/src/main/java/com/sdl/odata/test/model/AbstractComplexTypeSample.java +++ b/odata_test/src/main/java/com/sdl/odata/test/model/AbstractComplexTypeSample.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_test/src/main/java/com/sdl/odata/test/model/AbstractEntityTypeSample.java b/odata_test/src/main/java/com/sdl/odata/test/model/AbstractEntityTypeSample.java index 6b4573db..6203b682 100644 --- a/odata_test/src/main/java/com/sdl/odata/test/model/AbstractEntityTypeSample.java +++ b/odata_test/src/main/java/com/sdl/odata/test/model/AbstractEntityTypeSample.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_test/src/main/java/com/sdl/odata/test/model/ActionImportSample.java b/odata_test/src/main/java/com/sdl/odata/test/model/ActionImportSample.java index 13718bca..6aa5325e 100644 --- a/odata_test/src/main/java/com/sdl/odata/test/model/ActionImportSample.java +++ b/odata_test/src/main/java/com/sdl/odata/test/model/ActionImportSample.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_test/src/main/java/com/sdl/odata/test/model/ActionSample.java b/odata_test/src/main/java/com/sdl/odata/test/model/ActionSample.java index dfa35e15..33642943 100644 --- a/odata_test/src/main/java/com/sdl/odata/test/model/ActionSample.java +++ b/odata_test/src/main/java/com/sdl/odata/test/model/ActionSample.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_test/src/main/java/com/sdl/odata/test/model/Address.java b/odata_test/src/main/java/com/sdl/odata/test/model/Address.java index c125f350..ed927f36 100644 --- a/odata_test/src/main/java/com/sdl/odata/test/model/Address.java +++ b/odata_test/src/main/java/com/sdl/odata/test/model/Address.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_test/src/main/java/com/sdl/odata/test/model/BankAccount.java b/odata_test/src/main/java/com/sdl/odata/test/model/BankAccount.java index af27ca9a..c8631ed9 100644 --- a/odata_test/src/main/java/com/sdl/odata/test/model/BankAccount.java +++ b/odata_test/src/main/java/com/sdl/odata/test/model/BankAccount.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_test/src/main/java/com/sdl/odata/test/model/Category.java b/odata_test/src/main/java/com/sdl/odata/test/model/Category.java index 47a21b00..2a53b32e 100644 --- a/odata_test/src/main/java/com/sdl/odata/test/model/Category.java +++ b/odata_test/src/main/java/com/sdl/odata/test/model/Category.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_test/src/main/java/com/sdl/odata/test/model/CollectionsSample.java b/odata_test/src/main/java/com/sdl/odata/test/model/CollectionsSample.java index e42fa70f..4fb7a049 100644 --- a/odata_test/src/main/java/com/sdl/odata/test/model/CollectionsSample.java +++ b/odata_test/src/main/java/com/sdl/odata/test/model/CollectionsSample.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_test/src/main/java/com/sdl/odata/test/model/ComplexKeySample.java b/odata_test/src/main/java/com/sdl/odata/test/model/ComplexKeySample.java index bf6ffaa7..897270d1 100644 --- a/odata_test/src/main/java/com/sdl/odata/test/model/ComplexKeySample.java +++ b/odata_test/src/main/java/com/sdl/odata/test/model/ComplexKeySample.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_test/src/main/java/com/sdl/odata/test/model/ComplexTypeSample.java b/odata_test/src/main/java/com/sdl/odata/test/model/ComplexTypeSample.java index cc57be3c..26d99467 100644 --- a/odata_test/src/main/java/com/sdl/odata/test/model/ComplexTypeSample.java +++ b/odata_test/src/main/java/com/sdl/odata/test/model/ComplexTypeSample.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_test/src/main/java/com/sdl/odata/test/model/ComplexTypeSampleList.java b/odata_test/src/main/java/com/sdl/odata/test/model/ComplexTypeSampleList.java index 62e4306f..ba22e2e0 100644 --- a/odata_test/src/main/java/com/sdl/odata/test/model/ComplexTypeSampleList.java +++ b/odata_test/src/main/java/com/sdl/odata/test/model/ComplexTypeSampleList.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_test/src/main/java/com/sdl/odata/test/model/Customer.java b/odata_test/src/main/java/com/sdl/odata/test/model/Customer.java index 3b9fb19d..2ff0664d 100644 --- a/odata_test/src/main/java/com/sdl/odata/test/model/Customer.java +++ b/odata_test/src/main/java/com/sdl/odata/test/model/Customer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_test/src/main/java/com/sdl/odata/test/model/DefaultActionSample.java b/odata_test/src/main/java/com/sdl/odata/test/model/DefaultActionSample.java index b561b97b..eef1eecd 100644 --- a/odata_test/src/main/java/com/sdl/odata/test/model/DefaultActionSample.java +++ b/odata_test/src/main/java/com/sdl/odata/test/model/DefaultActionSample.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_test/src/main/java/com/sdl/odata/test/model/EntityTypeSample.java b/odata_test/src/main/java/com/sdl/odata/test/model/EntityTypeSample.java index 36cbbc77..a7d899f5 100644 --- a/odata_test/src/main/java/com/sdl/odata/test/model/EntityTypeSample.java +++ b/odata_test/src/main/java/com/sdl/odata/test/model/EntityTypeSample.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_test/src/main/java/com/sdl/odata/test/model/EntityWithNameSpaceSample.java b/odata_test/src/main/java/com/sdl/odata/test/model/EntityWithNameSpaceSample.java index 1f2809b5..27922ec3 100644 --- a/odata_test/src/main/java/com/sdl/odata/test/model/EntityWithNameSpaceSample.java +++ b/odata_test/src/main/java/com/sdl/odata/test/model/EntityWithNameSpaceSample.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_test/src/main/java/com/sdl/odata/test/model/EnumSample.java b/odata_test/src/main/java/com/sdl/odata/test/model/EnumSample.java index 2c20d3f2..652e607a 100644 --- a/odata_test/src/main/java/com/sdl/odata/test/model/EnumSample.java +++ b/odata_test/src/main/java/com/sdl/odata/test/model/EnumSample.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_test/src/main/java/com/sdl/odata/test/model/ExampleFlags.java b/odata_test/src/main/java/com/sdl/odata/test/model/ExampleFlags.java index b71c81dd..95d75ca9 100644 --- a/odata_test/src/main/java/com/sdl/odata/test/model/ExampleFlags.java +++ b/odata_test/src/main/java/com/sdl/odata/test/model/ExampleFlags.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_test/src/main/java/com/sdl/odata/test/model/ExpandedPropertiesSample.java b/odata_test/src/main/java/com/sdl/odata/test/model/ExpandedPropertiesSample.java index fee8783d..2ffc4627 100644 --- a/odata_test/src/main/java/com/sdl/odata/test/model/ExpandedPropertiesSample.java +++ b/odata_test/src/main/java/com/sdl/odata/test/model/ExpandedPropertiesSample.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_test/src/main/java/com/sdl/odata/test/model/FunctionImportSample.java b/odata_test/src/main/java/com/sdl/odata/test/model/FunctionImportSample.java index 49a68b4b..d83eb3e7 100644 --- a/odata_test/src/main/java/com/sdl/odata/test/model/FunctionImportSample.java +++ b/odata_test/src/main/java/com/sdl/odata/test/model/FunctionImportSample.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_test/src/main/java/com/sdl/odata/test/model/FunctionNotNullableImportSample.java b/odata_test/src/main/java/com/sdl/odata/test/model/FunctionNotNullableImportSample.java index 0652d247..e1e9043f 100644 --- a/odata_test/src/main/java/com/sdl/odata/test/model/FunctionNotNullableImportSample.java +++ b/odata_test/src/main/java/com/sdl/odata/test/model/FunctionNotNullableImportSample.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_test/src/main/java/com/sdl/odata/test/model/FunctionNotNullableSample.java b/odata_test/src/main/java/com/sdl/odata/test/model/FunctionNotNullableSample.java index c7a8c2ca..3219cab7 100644 --- a/odata_test/src/main/java/com/sdl/odata/test/model/FunctionNotNullableSample.java +++ b/odata_test/src/main/java/com/sdl/odata/test/model/FunctionNotNullableSample.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_test/src/main/java/com/sdl/odata/test/model/FunctionSample.java b/odata_test/src/main/java/com/sdl/odata/test/model/FunctionSample.java index 6ef88eca..9eb9dc29 100644 --- a/odata_test/src/main/java/com/sdl/odata/test/model/FunctionSample.java +++ b/odata_test/src/main/java/com/sdl/odata/test/model/FunctionSample.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_test/src/main/java/com/sdl/odata/test/model/IdNamePairComplex.java b/odata_test/src/main/java/com/sdl/odata/test/model/IdNamePairComplex.java index f3c0d059..7a5ab4b7 100644 --- a/odata_test/src/main/java/com/sdl/odata/test/model/IdNamePairComplex.java +++ b/odata_test/src/main/java/com/sdl/odata/test/model/IdNamePairComplex.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_test/src/main/java/com/sdl/odata/test/model/IdNamePairSample.java b/odata_test/src/main/java/com/sdl/odata/test/model/IdNamePairSample.java index 44dd5609..9b0233f5 100644 --- a/odata_test/src/main/java/com/sdl/odata/test/model/IdNamePairSample.java +++ b/odata_test/src/main/java/com/sdl/odata/test/model/IdNamePairSample.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_test/src/main/java/com/sdl/odata/test/model/NamedSingleton.java b/odata_test/src/main/java/com/sdl/odata/test/model/NamedSingleton.java index 0a224c7f..62c896d9 100644 --- a/odata_test/src/main/java/com/sdl/odata/test/model/NamedSingleton.java +++ b/odata_test/src/main/java/com/sdl/odata/test/model/NamedSingleton.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_test/src/main/java/com/sdl/odata/test/model/Order.java b/odata_test/src/main/java/com/sdl/odata/test/model/Order.java index a7ffd000..3c49eb7f 100644 --- a/odata_test/src/main/java/com/sdl/odata/test/model/Order.java +++ b/odata_test/src/main/java/com/sdl/odata/test/model/Order.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_test/src/main/java/com/sdl/odata/test/model/OrderLine.java b/odata_test/src/main/java/com/sdl/odata/test/model/OrderLine.java index 870c5be5..511c5b45 100644 --- a/odata_test/src/main/java/com/sdl/odata/test/model/OrderLine.java +++ b/odata_test/src/main/java/com/sdl/odata/test/model/OrderLine.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_test/src/main/java/com/sdl/odata/test/model/PrimitiveTypesSample.java b/odata_test/src/main/java/com/sdl/odata/test/model/PrimitiveTypesSample.java index 48bf28e8..4116f83a 100644 --- a/odata_test/src/main/java/com/sdl/odata/test/model/PrimitiveTypesSample.java +++ b/odata_test/src/main/java/com/sdl/odata/test/model/PrimitiveTypesSample.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_test/src/main/java/com/sdl/odata/test/model/Product.java b/odata_test/src/main/java/com/sdl/odata/test/model/Product.java index 52727d88..fe5ee349 100644 --- a/odata_test/src/main/java/com/sdl/odata/test/model/Product.java +++ b/odata_test/src/main/java/com/sdl/odata/test/model/Product.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_test/src/main/java/com/sdl/odata/test/model/SingletonSample.java b/odata_test/src/main/java/com/sdl/odata/test/model/SingletonSample.java index 29402e95..d3bf4166 100644 --- a/odata_test/src/main/java/com/sdl/odata/test/model/SingletonSample.java +++ b/odata_test/src/main/java/com/sdl/odata/test/model/SingletonSample.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_test/src/main/java/com/sdl/odata/test/model/UnboundActionSample.java b/odata_test/src/main/java/com/sdl/odata/test/model/UnboundActionSample.java index 2e60d098..42516987 100644 --- a/odata_test/src/main/java/com/sdl/odata/test/model/UnboundActionSample.java +++ b/odata_test/src/main/java/com/sdl/odata/test/model/UnboundActionSample.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_test/src/main/java/com/sdl/odata/test/model/UnboundFunctionSample.java b/odata_test/src/main/java/com/sdl/odata/test/model/UnboundFunctionSample.java index 89c1a5ac..73415a2a 100644 --- a/odata_test/src/main/java/com/sdl/odata/test/model/UnboundFunctionSample.java +++ b/odata_test/src/main/java/com/sdl/odata/test/model/UnboundFunctionSample.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_test/src/main/java/com/sdl/odata/test/model/VIPCustomer.java b/odata_test/src/main/java/com/sdl/odata/test/model/VIPCustomer.java index 98c5f529..6808c6f4 100644 --- a/odata_test/src/main/java/com/sdl/odata/test/model/VIPCustomer.java +++ b/odata_test/src/main/java/com/sdl/odata/test/model/VIPCustomer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_test/src/main/java/com/sdl/odata/test/model/complex/ODataDemoClassification.java b/odata_test/src/main/java/com/sdl/odata/test/model/complex/ODataDemoClassification.java index 9d27e268..e7fd0d64 100644 --- a/odata_test/src/main/java/com/sdl/odata/test/model/complex/ODataDemoClassification.java +++ b/odata_test/src/main/java/com/sdl/odata/test/model/complex/ODataDemoClassification.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_test/src/main/java/com/sdl/odata/test/model/complex/ODataDemoEntity.java b/odata_test/src/main/java/com/sdl/odata/test/model/complex/ODataDemoEntity.java index ee7e9ba4..9dfb6f31 100644 --- a/odata_test/src/main/java/com/sdl/odata/test/model/complex/ODataDemoEntity.java +++ b/odata_test/src/main/java/com/sdl/odata/test/model/complex/ODataDemoEntity.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_test/src/main/java/com/sdl/odata/test/model/complex/ODataDemoProperty.java b/odata_test/src/main/java/com/sdl/odata/test/model/complex/ODataDemoProperty.java index 5d180284..84815949 100644 --- a/odata_test/src/main/java/com/sdl/odata/test/model/complex/ODataDemoProperty.java +++ b/odata_test/src/main/java/com/sdl/odata/test/model/complex/ODataDemoProperty.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_test/src/main/java/com/sdl/odata/test/model/complex/ODataDemoPropertyType.java b/odata_test/src/main/java/com/sdl/odata/test/model/complex/ODataDemoPropertyType.java index f3173db6..639c8036 100644 --- a/odata_test/src/main/java/com/sdl/odata/test/model/complex/ODataDemoPropertyType.java +++ b/odata_test/src/main/java/com/sdl/odata/test/model/complex/ODataDemoPropertyType.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_test/src/main/java/com/sdl/odata/test/model/complex/ODataDemoPropertyValue.java b/odata_test/src/main/java/com/sdl/odata/test/model/complex/ODataDemoPropertyValue.java index f0a329fc..5106de55 100644 --- a/odata_test/src/main/java/com/sdl/odata/test/model/complex/ODataDemoPropertyValue.java +++ b/odata_test/src/main/java/com/sdl/odata/test/model/complex/ODataDemoPropertyValue.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_test/src/main/java/com/sdl/odata/test/model/complex/ODataVersion.java b/odata_test/src/main/java/com/sdl/odata/test/model/complex/ODataVersion.java index 169c1287..0ea38384 100644 --- a/odata_test/src/main/java/com/sdl/odata/test/model/complex/ODataVersion.java +++ b/odata_test/src/main/java/com/sdl/odata/test/model/complex/ODataVersion.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_test/src/main/java/com/sdl/odata/test/model/complex/ODataVersionPart.java b/odata_test/src/main/java/com/sdl/odata/test/model/complex/ODataVersionPart.java index 1ec3581d..4357b884 100644 --- a/odata_test/src/main/java/com/sdl/odata/test/model/complex/ODataVersionPart.java +++ b/odata_test/src/main/java/com/sdl/odata/test/model/complex/ODataVersionPart.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_test/src/main/java/com/sdl/odata/test/util/TestUtils.java b/odata_test/src/main/java/com/sdl/odata/test/util/TestUtils.java index b8ac5995..231eb346 100644 --- a/odata_test/src/main/java/com/sdl/odata/test/util/TestUtils.java +++ b/odata_test/src/main/java/com/sdl/odata/test/util/TestUtils.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_war/pom.xml b/odata_war/pom.xml index bc11ac35..4c6cc2d8 100644 --- a/odata_war/pom.xml +++ b/odata_war/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/odata_war/src/main/webapp/WEB-INF/web.xml b/odata_war/src/main/webapp/WEB-INF/web.xml index 455d60a3..962f37a3 100644 --- a/odata_war/src/main/webapp/WEB-INF/web.xml +++ b/odata_war/src/main/webapp/WEB-INF/web.xml @@ -16,10 +16,10 @@ --> <web-app metadata-complete="false" - xmlns="http://java.sun.com/xml/ns/javaee" + xmlns="https://jakarta.ee/xml/ns/jakartaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" - version="3.0"> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd" + version="6.0"> <display-name>OData v4 WAR module</display-name> diff --git a/odata_webservice/pom.xml b/odata_webservice/pom.xml index f6352959..00756ec0 100644 --- a/odata_webservice/pom.xml +++ b/odata_webservice/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/odata_webservice/src/main/java/com/sdl/odata/container/ODataServiceContainer.java b/odata_webservice/src/main/java/com/sdl/odata/container/ODataServiceContainer.java index b7372b6d..0c41045f 100644 --- a/odata_webservice/src/main/java/com/sdl/odata/container/ODataServiceContainer.java +++ b/odata_webservice/src/main/java/com/sdl/odata/container/ODataServiceContainer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/odata_webservice/src/main/java/com/sdl/odata/container/ODataWinServiceContainer.java b/odata_webservice/src/main/java/com/sdl/odata/container/ODataWinServiceContainer.java index e37f1407..9c154f28 100644 --- a/odata_webservice/src/main/java/com/sdl/odata/container/ODataWinServiceContainer.java +++ b/odata_webservice/src/main/java/com/sdl/odata/container/ODataWinServiceContainer.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + * Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/pom.xml b/pom.xml index cecc9e4c..9cbdb2ea 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2014-2025 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. + Copyright (c) 2014-2026 All Rights Reserved by the RWS Group for and on behalf of its affiliates and subsidiaries. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -45,7 +45,6 @@ <module>odata_controller</module> <module>odata_webservice</module> <module>odata_war</module> - <module>odata_client_tracing</module> </modules> <organization> @@ -86,31 +85,29 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <javadoc.source.dir>${project.basedir}/src/javadoc</javadoc.source.dir> - <java.version>21</java.version> + <java.version>25</java.version> <!-- Third party dependency versions, sorted alphabetically --> - <brave.version>4.13.6</brave.version> - <guava.version>33.2.0-jre</guava.version> - <httpcomponents.version>4.5.14</httpcomponents.version> + <guava.version>33.5.0-jre</guava.version> + <httpclient5.version>5.6</httpclient5.version> <jackson.version>2.17.3</jackson.version> - <jacoco.version>0.8.12</jacoco.version> + <jacoco.version>0.8.14</jacoco.version> <jakarta-annotation-api.version>3.0.0</jakarta-annotation-api.version> <jakarta.servlet-api.version>6.1.0</jakarta.servlet-api.version> <junit-jupiter.version>5.9.2</junit-jupiter.version> - <logback.version>1.5.17</logback.version> - <mockito-junit5.version>4.5.1</mockito-junit5.version> - <pekko.version>1.0.3</pekko.version> + <logback.version>1.5.32</logback.version> + <mockito-junit5.version>5.23.0</mockito-junit5.version> + <pekko.version>1.4.0</pekko.version> <scala-genjavadoc-plugin.version>0.19</scala-genjavadoc-plugin.version> <scala-parser-combinators.version>2.1.1</scala-parser-combinators.version> <scala.version>2.12.19</scala.version> <scalatest.version>3.1.4</scalatest.version> - <slf4j.version>2.0.13</slf4j.version> - <spring-boot.version>3.3.9</spring-boot.version> - <spring.version>6.1.18</spring.version> - <tomcat.version>10.1.39</tomcat.version> + <slf4j.version>2.0.17</slf4j.version> + <spring-boot.version>3.5.11</spring-boot.version> + <spring.version>6.2.17</spring.version> + <tomcat.version>10.1.52</tomcat.version> <typesafe-config.version>1.4.3</typesafe-config.version> <xerces.version>2.12.2</xerces.version> - <zipkin-sender.version>1.1.2</zipkin-sender.version> </properties> <!-- Dependency management --> @@ -167,9 +164,9 @@ <version>${xerces.version}</version> </dependency> <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <version>${httpcomponents.version}</version> + <groupId>org.apache.httpcomponents.client5</groupId> + <artifactId>httpclient5</artifactId> + <version>${httpclient5.version}</version> </dependency> <dependency> <groupId>jakarta.annotation</groupId> @@ -336,23 +333,6 @@ <version>${tomcat.version}</version> </dependency> - <!-- Tracing libraries for sending spans to zipkin --> - <dependency> - <groupId>io.zipkin.brave</groupId> - <artifactId>brave-apache-http-interceptors</artifactId> - <version>${brave.version}</version> - </dependency> - <dependency> - <groupId>io.zipkin.brave</groupId> - <artifactId>brave-spancollector-http</artifactId> - <version>${brave.version}</version> - </dependency> - <dependency> - <groupId>io.zipkin.reporter</groupId> - <artifactId>zipkin-sender-urlconnection</artifactId> - <version>${zipkin-sender.version}</version> - </dependency> - <!-- OData dependencies --> <dependency> <groupId>com.sdl</groupId> @@ -453,24 +433,24 @@ <plugin> <groupId>com.mycila</groupId> <artifactId>license-maven-plugin</artifactId> - <version>4.6</version> + <version>5.0.0</version> </plugin> <plugin> <groupId>net.alchim31.maven</groupId> <artifactId>scala-maven-plugin</artifactId> - <version>4.5.6</version> + <version>4.9.10</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> - <version>3.1.0</version> + <version>3.2.0</version> <dependencies> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.10.11</version> + <version>1.10.15</version> </dependency> </dependencies> </plugin> @@ -489,17 +469,17 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-clean-plugin</artifactId> - <version>3.4.1</version> + <version>3.5.0</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.14.0</version> + <version>3.15.0</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>3.8.1</version> + <version>3.10.0</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -509,12 +489,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> - <version>3.5.0</version> + <version>3.6.2</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-gpg-plugin</artifactId> - <version>3.2.7</version> + <version>3.2.8</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -524,7 +504,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>3.4.2</version> + <version>3.5.0</version> <configuration> <archive> <addMavenDescriptor>false</addMavenDescriptor> @@ -546,12 +526,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>3.11.2</version> + <version>3.12.0</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</artifactId> - <version>3.1.1</version> + <version>3.3.1</version> <configuration> <autoVersionSubmodules>true</autoVersionSubmodules> <releaseProfiles>release</releaseProfiles> @@ -560,12 +540,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>3.3.1</version> + <version>3.5.0</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> - <version>3.3.1</version> + <version>3.4.0</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -575,28 +555,28 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>3.5.2</version> + <version>3.5.5</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <version>3.4.0</version> + <version>3.5.1</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>3.6.0</version> + <version>3.6.1</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>flatten-maven-plugin</artifactId> - <version>1.7.0</version> + <version>1.7.3</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>versions-maven-plugin</artifactId> - <version>2.18.0</version> + <version>2.21.0</version> <configuration> <includes> <include>com.sdl:*</include> @@ -629,9 +609,9 @@ </plugin> <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <version>1.7.0</version> + <groupId>org.sonatype.central</groupId> + <artifactId>central-publishing-maven-plugin</artifactId> + <version>0.10.0</version> </plugin> </plugins> @@ -697,8 +677,7 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <source>${java.version}</source> - <target>${java.version}</target> + <release>${java.version}</release> </configuration> <executions> <execution> @@ -721,7 +700,7 @@ <configuration> <rules> <requireJavaVersion> - <version>[${java.version},22]</version> + <version>[${java.version},26]</version> </requireJavaVersion> <requireMavenVersion> <version>3.8.6</version> @@ -901,13 +880,13 @@ </executions> </plugin> <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> + <groupId>org.sonatype.central</groupId> + <artifactId>central-publishing-maven-plugin</artifactId> <extensions>true</extensions> <configuration> - <serverId>ossrh</serverId> - <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl> - <autoReleaseAfterClose>true</autoReleaseAfterClose> + <publishingServerId>central</publishingServerId> + <autoPublish>true</autoPublish> + <waitUntil>published</waitUntil> </configuration> </plugin> </plugins>