with current DRL rules files syntax.
Issue-ID: POLICY-4857
Change-Id: If4b385bdef865d07114b8ea0e69abb4589f3a97b
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>
import java.io.ByteArrayOutputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import java.io.Serial;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.PreparedStatement;
protected DistributedLock makeLock(LockState state, String resourceId, String ownerKey, int holdSec,
LockCallback callback) {
return new DistributedLock(state, resourceId, ownerKey, holdSec, callback, feature) {
- @Serial
private static final long serialVersionUID = 1L;
@Override
protected DistributedLock makeLock(LockState state, String resourceId, String ownerKey, int holdSec,
LockCallback callback) {
return new DistributedLock(state, resourceId, ownerKey, holdSec, callback, feature) {
- @Serial
private static final long serialVersionUID = 1L;
private int ntimes = 0;
LockCallback callback) {
return new DistributedLock(state, resourceId, ownerKey, holdSec, callback, feature) {
- @Serial
private static final long serialVersionUID = 1L;
private boolean checked = false;
ONAP
================================================================================
Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved.
- Modifications Copyright (C) 2023 Nordix Foundation.
+ Modifications Copyright (C) 2023-2024 Nordix Foundation.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</dependency>
-
</dependencies>
</project>
policyTypesMap.values().stream()
.filter(PolicyTypeDroolsController.class::isInstance)
.map(PolicyTypeDroolsController.class::cast)
- .filter(opController -> opController.getControllers().containsKey(controller.getName())).toList();
+ .filter(opController -> opController.getControllers().containsKey(controller.getName()))
+ .collect(Collectors.toList());
for (PolicyTypeDroolsController opController : opControllers) {
opController.remove(controller);
package org.onap.policy.drools.pooling;
-import java.io.Serial;
-
/**
* Exception thrown by the pooling feature.
*/
public class PoolingFeatureException extends Exception {
- @Serial
private static final long serialVersionUID = 1L;
public PoolingFeatureException() {
package org.onap.policy.drools.pooling;
-import java.io.Serial;
-
/**
* A runtime exception thrown by the pooling feature.
*/
public class PoolingFeatureRtException extends RuntimeException {
- @Serial
private static final long serialVersionUID = 1L;
public PoolingFeatureRtException() {
================================================================================
Copyright (C) 2017-2021, 2023 AT&T Intellectual Property. All rights reserved.
Modifications Copyright (C) 2019 Bell Canada.
- Modifications Copyright (C) 2020,2022-2023 Nordix Foundation.
+ Modifications Copyright (C) 2020,2022-2024 Nordix Foundation.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.13</version>
+ <version>1.10.14</version>
</dependency>
<dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-xjc</artifactId>
- <version>4.0.3</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
- <version>4.0.3</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>4.0.3</version>
</dependency>
<dependency>
<groupId>jakarta.activation</groupId>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.glassfish.hk2.external</groupId>
+ <artifactId>javax.inject</artifactId>
+ </dependency>
</dependencies>
</project>
package org.onap.policy.drools.core.lock;
-import java.io.Serial;
import lombok.NoArgsConstructor;
/**
*/
@NoArgsConstructor
public class AlwaysFailLock extends LockImpl {
- @Serial
private static final long serialVersionUID = 1L;
/**
package org.onap.policy.drools.core.lock;
-import java.io.Serial;
import lombok.NonNull;
/**
* Lock implementation whose operations always succeed.
*/
public class AlwaysSuccessLock extends LockImpl {
- @Serial
private static final long serialVersionUID = 1L;
/**
package org.onap.policy.drools.domain.models.controller;
-import java.io.Serial;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
@SuperBuilder
@EqualsAndHashCode(callSuper = true)
public class ControllerPolicy extends DroolsPolicy implements Serializable {
-
- @Serial
private static final long serialVersionUID = -8171337852833516581L;
private ControllerProperties properties;
package org.onap.policy.drools.domain.models.controller;
-import java.io.Serial;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
@Data
@Builder
public class ControllerProperties implements Serializable {
- @Serial
private static final long serialVersionUID = 1259434187110418986L;
private String controllerName;
package org.onap.policy.drools.domain.models.controller;
-import java.io.Serial;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
@SuperBuilder
@EqualsAndHashCode(callSuper = true)
public class ControllerSinkTopic extends ControllerTopic implements Serializable {
- @Serial
private static final long serialVersionUID = 8770353732981476267L;
@Override
package org.onap.policy.drools.domain.models.controller;
-import java.io.Serial;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
@SuperBuilder
@EqualsAndHashCode(callSuper = true)
public class ControllerSourceTopic extends ControllerTopic implements Serializable {
- @Serial
private static final long serialVersionUID = -1732598566914643612L;
@Override
import com.openpojo.validation.ValidatorBuilder;
import com.openpojo.validation.test.impl.GetterTester;
import com.openpojo.validation.test.impl.SetterTester;
-import java.io.Serial;
import java.io.Serializable;
import java.util.List;
import lombok.Data;
@NoArgsConstructor
@EqualsAndHashCode(callSuper = true)
public static class DerivedDomainPolicy extends DroolsPolicy implements Serializable {
- @Serial
private static final long serialVersionUID = -1027974819756498893L;
}
}
protected boolean declaredProperty(String name, Object value) {
- return switch (name) {
- case "requestID" -> {
+ switch (name) {
+ case "requestID":
callSetRequestId(value);
- yield true;
- }
- case "entity" -> {
+ return true;
+ case "entity":
callSetEntity(value);
- yield true;
- }
- case "controllers" -> {
+ return true;
+ case "controllers":
callSetControllers(value);
- yield true;
- }
- default -> false;
- };
+ return true;
+ default:
+ return false;
+ }
}
protected Object declaredPropertyOrNotFound(String name, Object notFoundValue) {
- return switch (name) {
- case "requestID" -> getRequestId();
- case "entity" -> getEntity();
- case "controllers" -> getControllers();
- default -> notFoundValue;
- };
+ switch (name) {
+ case "requestID":
+ return getRequestId();
+ case "entity":
+ return getEntity();
+ case "controllers":
+ return getControllers();
+ default:
+ return notFoundValue;
+ }
}
/**
@Path("engine/tools/loggers")
public Response loggers() {
final List<String> names = new ArrayList<>();
- if (!(LoggerFactory.getILoggerFactory() instanceof LoggerContext context)) {
+ if (!(LoggerFactory.getILoggerFactory() instanceof LoggerContext)) {
logger.warn("The SLF4J logger factory is not configured for logback");
return Response.status(Status.INTERNAL_SERVER_ERROR).entity(names).build();
}
+ final LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory();
for (final Logger lgr : context.getLoggerList()) {
names.add(lgr.getName());
}
@Path("engine/tools/loggers/{logger}")
@Produces(MediaType.TEXT_PLAIN)
public Response loggerName1(@PathParam("logger") String loggerName) {
- if (!(LoggerFactory.getILoggerFactory() instanceof LoggerContext context)) {
+ if (!(LoggerFactory.getILoggerFactory() instanceof LoggerContext)) {
logger.warn("The SLF4J logger factory is not configured for logback");
return Response.status(Status.INTERNAL_SERVER_ERROR).build();
}
+ final LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory();
var lgr = context.getLogger(loggerName);
if (lgr == null) {
return Response.status(Status.NOT_FOUND).build();
import java.io.ByteArrayOutputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import java.io.Serial;
import java.util.concurrent.ScheduledExecutorService;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
PolicySession session = mock(PolicySession.class);
MyLock lock = new MyLock(LockState.WAITING, RESOURCE, OWNER_KEY, HOLD_SEC, callback) {
- @Serial
private static final long serialVersionUID = 1L;
@Override
* Lock that inherits the normal getSession() method.
*/
public static class MyLockStdSession extends FeatureLockImpl {
- @Serial
private static final long serialVersionUID = 1L;
protected int nupdates = 0;
}
public static class MyLock extends MyLockStdSession {
- @Serial
private static final long serialVersionUID = 1L;
public MyLock() {
}
public static class MyLockNoFeature extends MyLock {
- @Serial
private static final long serialVersionUID = 1L;
public MyLockNoFeature() {
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import java.io.Serial;
import java.util.concurrent.ScheduledExecutorService;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
}
private class MyLock extends FeatureLockImpl {
- @Serial
private static final long serialVersionUID = 1L;
public MyLock(LockState waiting, String resourceId, String ownerKey, int holdSec, LockCallback callback) {
import java.io.ByteArrayOutputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import java.io.Serial;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
protected SimpleLock makeLock(LockState waiting, String resourceId, String ownerKey, int holdSec,
LockCallback callback) {
return new SimpleLock(waiting, resourceId, ownerKey, holdSec, callback, feature) {
- @Serial
private static final long serialVersionUID = 1L;
@Override
madeLock = true;
return new SimpleLock(waiting, resourceId, ownerKey, holdSec, callback, feature) {
- @Serial
private static final long serialVersionUID = 1L;
@Override
package org.onap.policy.drools.models.domains.a;
import com.google.gson.annotations.SerializedName;
-import java.io.Serial;
import java.io.Serializable;
import lombok.Builder;
import lombok.Data;
@Data
@Builder
public class Metadata implements Serializable {
- @Serial
private static final long serialVersionUID = 476541531265304644L;
@SerializedName("policy-id")
package org.onap.policy.drools.models.domains.a;
import com.google.gson.annotations.SerializedName;
-import java.io.Serial;
import java.io.Serializable;
import lombok.Builder;
import lombok.Data;
@Data
@Builder
public class Nested implements Serializable {
- @Serial
private static final long serialVersionUID = -1203143214137354429L;
@SerializedName("nested1")
package org.onap.policy.drools.models.domains.a;
import com.google.gson.annotations.SerializedName;
-import java.io.Serial;
import java.io.Serializable;
import lombok.Builder;
import lombok.Data;
@Data
@Builder
public class Properties implements Serializable {
- @Serial
private static final long serialVersionUID = 8476625479607243095L;
@SerializedName("nested")
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <release>${java.version}</release>
+ <release>11</release>
</configuration>
</plugin>
<plugin>
Code Review / policy / drools-pdp.git / commitdiff