Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add annotation to exclude from coverage and add coverage #527

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
7 changes: 7 additions & 0 deletions build.yaml
Original file line number Diff line number Diff line change
@@ -1 +1,8 @@
projectType: extension
additionalTestConfigs:
jdk11:
testJdkTool: OPEN-JDK11
mavenAdditionalArgs: -DruntimeVersion=4.4.0
jdk17:
testJdkTool: OPEN-JDK17
mavenAdditionalArgs: -DminVersion=4.6.0 -DruntimeVersion=4.6.0-rc2 -DruntimeProduct=MULE_EE
Binary file added jacoco-munit-with-getters.exec
Binary file not shown.
17 changes: 8 additions & 9 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,22 +27,23 @@
<guavaVersion>32.1.2-jre</guavaVersion>
<jacksonVersion>2.14.2</jacksonVersion>
<dockerClientVersion>8.16.0</dockerClientVersion>

<jacoco.version>0.8.10</jacoco.version>
<hawtbufVersion>1.11</hawtbufVersion>
<activemq-protobufVersion>1.1</activemq-protobufVersion>
<muleSpringModuleVersion>1.3.7</muleSpringModuleVersion>
<muleSpringModuleVersion>1.4.0-SNAPSHOT</muleSpringModuleVersion>

<formatterConfigPath>formatter.xml</formatterConfigPath>
<muleJmsClientVersion>1.14.0-SNAPSHOT</muleJmsClientVersion>
<mule.http.connector.version>1.7.3</mule.http.connector.version>
<muleSdkApiVersion>0.3.0</muleSdkApiVersion>
<mule.http.connector.version>1.9.0-SNAPSHOT</mule.http.connector.version>
<spring.core.version>4.3.30.RELEASE</spring.core.version>

<!-- Remove when a new parent version with MTF is available -->
<munit.input.directory>src/test/munit</munit.input.directory>
<munit.output.directory>${basedir}/target/test-mule/munit</munit.output.directory>
<munit.extensions.maven.plugin.version>1.1.3</munit.extensions.maven.plugin.version>
<munit.version>2.3.15</munit.version>
<mtf-tools.version>1.1.2</mtf-tools.version>
<munit.extensions.maven.plugin.version>1.2.0-SNAPSHOT</munit.extensions.maven.plugin.version>
<munit.version>3.1.0-SNAPSHOT</munit.version>
<mtf-tools.version>1.2.0-SNAPSHOT</mtf-tools.version>
<mavenResources.version>3.3.0</mavenResources.version>
<docker.maven.plugin.version>0.41.0</docker.maven.plugin.version>
<maven.helper.plugin.version>3.3.0</maven.helper.plugin.version>
Expand Down Expand Up @@ -370,9 +371,7 @@
</executions>
<configuration>
<argLines>
<argLine>
-javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco.version}/org.jacoco.agent-${jacoco.version}-runtime.jar=destfile=${session.executionRootDirectory}/target/jacoco.exec
</argLine>
<argLine>-javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco.version}/org.jacoco.agent-${jacoco.version}-runtime.jar=destfile=${session.executionRootDirectory}/target/jacoco-munit.exec</argLine>
</argLines>
<sharedLibraries>
<sharedLibrary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
*/
package org.mule.extensions.jms.api.ack;

import org.mule.extensions.jms.internal.ExcludeFromGeneratedCoverage;
import org.mule.jms.commons.internal.config.InternalAckMode;
import org.mule.jms.commons.internal.config.JmsAckMode;

Expand Down Expand Up @@ -40,6 +41,7 @@ public enum ConsumerAckMode implements JmsAckMode {
this.ackMode = ackMode;
}

@ExcludeFromGeneratedCoverage
@Override
public InternalAckMode getInternalAckMode() {
return ackMode;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import org.mule.extensions.jms.api.ack.AckMode;
import org.mule.extensions.jms.api.destination.ConsumerType;
import org.mule.extensions.jms.api.destination.QueueConsumer;
import org.mule.extensions.jms.internal.ExcludeFromGeneratedCoverage;
import org.mule.runtime.extension.api.annotation.Expression;
import org.mule.runtime.extension.api.annotation.dsl.xml.ParameterDsl;
import org.mule.runtime.extension.api.annotation.param.NullSafe;
Expand Down Expand Up @@ -70,40 +71,45 @@ public final class JmsConsumerConfig implements org.mule.jms.commons.api.config.
@Expression(NOT_SUPPORTED)
// TODO MULE-10958: duplicated in ActiveMQ for default factory creation
private int maxRedelivery;

@ExcludeFromGeneratedCoverage
public int getMaxRedelivery() {
return maxRedelivery;
}

@ExcludeFromGeneratedCoverage
public String getSelector() {
return selector;
}

@ExcludeFromGeneratedCoverage
public ConsumerType getConsumerType() {
return consumerType;
}

@ExcludeFromGeneratedCoverage
public AckMode getAckMode() {
return ackMode;
}


public void setMaxRedelivery(int maxRedelivery) {
@ExcludeFromGeneratedCoverage
public void setMaxRedelivery(int maxRedelivery) {
this.maxRedelivery = maxRedelivery;
}

public void setSelector(String selector) {
@ExcludeFromGeneratedCoverage
public void setSelector(String selector) {
this.selector = selector;
}

public void setConsumerType(ConsumerType consumerType) {
@ExcludeFromGeneratedCoverage
public void setConsumerType(ConsumerType consumerType) {
this.consumerType = consumerType;
}

public void setAckMode(AckMode ackMode) {
@ExcludeFromGeneratedCoverage
public void setAckMode(AckMode ackMode) {
this.ackMode = ackMode;
}

@ExcludeFromGeneratedCoverage
@Override
public boolean equals(Object o) {
if (this == o)
Expand All @@ -117,6 +123,7 @@ public boolean equals(Object o) {
Objects.equals(selector, that.selector);
}

@ExcludeFromGeneratedCoverage
@Override
public int hashCode() {
return Objects.hash(ackMode, consumerType, selector, maxRedelivery);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import static org.mule.runtime.api.meta.ExpressionSupport.NOT_SUPPORTED;

import org.mule.extensions.jms.api.connection.JmsSpecification;
import org.mule.extensions.jms.internal.ExcludeFromGeneratedCoverage;
import org.mule.runtime.extension.api.annotation.Expression;
import org.mule.runtime.extension.api.annotation.param.Optional;
import org.mule.runtime.extension.api.annotation.param.Parameter;
Expand Down Expand Up @@ -123,90 +124,104 @@ public final class JmsProducerConfig implements org.mule.jms.commons.api.config.
@Summary("The message type identifier to be set in the JMSType Header when a message is sent")
private String jmsType;

@ExcludeFromGeneratedCoverage
public boolean isPersistentDelivery() {
return persistentDelivery;
}

@ExcludeFromGeneratedCoverage
public boolean getPersistentDelivery() {
return persistentDelivery;
}

public void setPersistentDelivery(boolean persistentDelivery) {
@ExcludeFromGeneratedCoverage
public void setPersistentDelivery(boolean persistentDelivery) {
this.persistentDelivery = persistentDelivery;
}

@ExcludeFromGeneratedCoverage
public int getPriority() {
return priority;
}

public void setPriority(int priority) {
@ExcludeFromGeneratedCoverage
public void setPriority(int priority) {
this.priority = priority;
}

@ExcludeFromGeneratedCoverage
public long getTimeToLive() {
return timeToLive;
}

@ExcludeFromGeneratedCoverage
public void setTimeToLive(long timeToLive) {
this.timeToLive = timeToLive;
}

@ExcludeFromGeneratedCoverage
public TimeUnit getTimeToLiveUnit() {
return timeToLiveUnit;
}

public void setTimeToLiveUnit(TimeUnit timeToLiveUnit) {
@ExcludeFromGeneratedCoverage
public void setTimeToLiveUnit(TimeUnit timeToLiveUnit) {
this.timeToLiveUnit = timeToLiveUnit;
}

@ExcludeFromGeneratedCoverage
public boolean isDisableMessageId() {
return disableMessageId;
}

@ExcludeFromGeneratedCoverage
public boolean getDisableMessageId() {
return disableMessageId;
}

public void setDisableMessageId(boolean disableMessageId) {
@ExcludeFromGeneratedCoverage
public void setDisableMessageId(boolean disableMessageId) {
this.disableMessageId = disableMessageId;
}

@ExcludeFromGeneratedCoverage
public boolean isDisableMessageTimestamp() {
return disableMessageTimestamp;
}

@ExcludeFromGeneratedCoverage
public boolean getDisableMessageTimestamp() {
return disableMessageTimestamp;
}

public void setDisableMessageTimestamp(boolean disableMessageTimestamp) {
@ExcludeFromGeneratedCoverage
public void setDisableMessageTimestamp(boolean disableMessageTimestamp) {
this.disableMessageTimestamp = disableMessageTimestamp;
}

@ExcludeFromGeneratedCoverage
public Long getDeliveryDelay() {
return deliveryDelay;
}

public void setDeliveryDelay(Long deliveryDelay) {
@ExcludeFromGeneratedCoverage
public void setDeliveryDelay(Long deliveryDelay) {
this.deliveryDelay = deliveryDelay;
}

@ExcludeFromGeneratedCoverage
public TimeUnit getDeliveryDelayUnit() {
return deliveryDelayUnit;
}

public void setDeliveryDelayUnit(TimeUnit deliveryDelayUnit) {
@ExcludeFromGeneratedCoverage
public void setDeliveryDelayUnit(TimeUnit deliveryDelayUnit) {
this.deliveryDelayUnit = deliveryDelayUnit;
}

@ExcludeFromGeneratedCoverage
public String getJmsType() {
return jmsType;
}

public void setJmsType(String jmsType) {
@ExcludeFromGeneratedCoverage
public void setJmsType(String jmsType) {
this.jmsType = jmsType;
}

@ExcludeFromGeneratedCoverage
@Override
public boolean equals(Object o) {
if (this == o)
Expand All @@ -225,6 +240,7 @@ public boolean equals(Object o) {
Objects.equals(jmsType, that.jmsType);
}

@ExcludeFromGeneratedCoverage
@Override
public int hashCode() {
return Objects.hash(persistentDelivery, priority, timeToLive, timeToLiveUnit, disableMessageId, disableMessageTimestamp,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
*/
package org.mule.extensions.jms.api.connection.caching;

import org.mule.extensions.jms.internal.ExcludeFromGeneratedCoverage;
import org.mule.runtime.extension.api.annotation.Alias;

/**
Expand All @@ -18,11 +19,13 @@
public class DefaultCachingStrategy extends org.mule.jms.commons.api.connection.caching.DefaultCachingStrategy
implements CachingStrategy {

@ExcludeFromGeneratedCoverage
@Override
public int hashCode() {
return DefaultCachingStrategy.class.hashCode();
}

@ExcludeFromGeneratedCoverage
@Override
public boolean equals(Object obj) {
return obj != null && obj.getClass() == DefaultCachingStrategy.class;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
*/
package org.mule.extensions.jms.api.connection.caching;

import org.mule.extensions.jms.internal.ExcludeFromGeneratedCoverage;
import org.mule.runtime.extension.api.annotation.Alias;

/**
Expand All @@ -19,11 +20,13 @@
public class NoCachingConfiguration extends org.mule.jms.commons.api.connection.caching.NoCachingConfiguration
implements CachingStrategy {

@ExcludeFromGeneratedCoverage
@Override
public int hashCode() {
return NoCachingConfiguration.class.hashCode();
}

@ExcludeFromGeneratedCoverage
@Override
public boolean equals(Object obj) {
return obj != null && obj.getClass() == NoCachingConfiguration.class;
Expand Down
Loading