Commit e8459704 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Pre-merge code cleanup and header fixing.

parent 11672795

src/policy/src/main/docker/Dockerfile.multistage.jvm

+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ RUN microdnf install curl ca-certificates ${JAVA_PACKAGE} \ 
    && chmod 540 /deployments/run-java.sh \

    && echo "securerandom.source=file:/dev/urandom" >> /etc/alternatives/jre/conf/security/java.security



ENV QUARKUS_LAUNCH_DEVMODE="true"

# Configure the JAVA_OPTIONS, you can add -XshowSettings:vm to also display the heap size.

ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"

# We make four distinct layers so if there are application changes the library layers can be re-used

src/policy/src/main/java/eu/teraflow/policy/PolicyServiceImpl.java

+0 −3
Original line number Diff line number Diff line
@@ -157,7 +157,6 @@ public class PolicyServiceImpl implements PolicyService { 


            return Uni.createFrom().item(policyRuleState);

        }

        LOGGER.infof("Passed 1st");



        final var policyRuleBasic = policyRuleService.getPolicyRuleBasic();

        if (!policyRuleBasic.areArgumentsValid()) {
@@ -167,7 +166,6 @@ public class PolicyServiceImpl implements PolicyService { 
                            PolicyRuleStateEnum.POLICY_FAILED, policyRuleBasic.getExeceptionMessage());

            return Uni.createFrom().item(policyRuleState);

        }

        LOGGER.infof("Passed 2nd");



        final var serviceId = policyRuleService.getServiceId();

        final var deviceIds = policyRuleService.getDeviceIds();
@@ -592,7 +590,6 @@ public class PolicyServiceImpl implements PolicyService { 
    }



    private void applyActionService(String alarmId) {

        LOGGER.info("Inside applyActionService");

        PolicyRuleService policyRuleService = alarmPolicyRuleServiceMap.get(alarmId);

        PolicyRuleAction policyRuleAction =

                policyRuleService.getPolicyRuleBasic().getPolicyRuleActions().get(0);

src/policy/src/main/resources/application.yml

+1 −6
Original line number Diff line number Diff line
@@ -13,11 +13,6 @@ 
# limitations under the License.



quarkus:

  package:

    type: mutable-jar

  live-reload:

    password: 1234

    url: http://0.0.0.0:8080

  banner:

    path: teraflow-policy-banner.txt

  grpc:
@@ -39,7 +34,7 @@ quarkus: 
    port: 8080



  container-image:

    group: teraflow-h2020

    group: tfs

    name: controller/policy

    registry: labs.etsi.org:5050

    tag: 0.1.0