Skip to content

Commit 5c27194

Browse files
authored
Remove more @ExcludeFromJacocoGeneratedReport (#3278)
This removes the annotation from the Hollow* and NoOp* classes that were previously annotated. Since AbstractMetadataOperationsFactory and AbstractQueryFactory are only used by tests I moved them there. This is a continuation of #3269
1 parent 270aabb commit 5c27194

File tree

7 files changed

+4
-24
lines changed

7 files changed

+4
-24
lines changed

fdb-relational-core/src/main/java/com/apple/foundationdb/relational/api/ddl/NoOpQueryFactory.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,9 @@
2222

2323
import com.apple.foundationdb.annotation.API;
2424

25-
import com.apple.foundationdb.relational.util.ExcludeFromJacocoGeneratedReport;
26-
2725
import javax.annotation.Nonnull;
2826
import java.net.URI;
2927

30-
@ExcludeFromJacocoGeneratedReport //nothing to test
3128
@API(API.Status.EXPERIMENTAL)
3229
public class NoOpQueryFactory implements DdlQueryFactory {
3330
public static final DdlQueryFactory INSTANCE = new NoOpQueryFactory();

fdb-relational-core/src/main/java/com/apple/foundationdb/relational/recordlayer/HollowTransactionManager.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,14 @@
2121
package com.apple.foundationdb.relational.recordlayer;
2222

2323
import com.apple.foundationdb.annotation.API;
24-
2524
import com.apple.foundationdb.relational.api.Options;
2625
import com.apple.foundationdb.relational.api.Transaction;
2726
import com.apple.foundationdb.relational.api.TransactionManager;
2827
import com.apple.foundationdb.relational.api.exceptions.OperationUnsupportedException;
2928
import com.apple.foundationdb.relational.api.exceptions.RelationalException;
30-
import com.apple.foundationdb.relational.util.ExcludeFromJacocoGeneratedReport;
3129

3230
import javax.annotation.Nonnull;
3331

34-
@ExcludeFromJacocoGeneratedReport
3532
@API(API.Status.EXPERIMENTAL)
3633
public class HollowTransactionManager implements TransactionManager {
3734
public static final HollowTransactionManager INSTANCE = new HollowTransactionManager();

fdb-relational-core/src/main/java/com/apple/foundationdb/relational/recordlayer/ddl/NoOpMetadataOperationsFactory.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,16 @@
2121
package com.apple.foundationdb.relational.recordlayer.ddl;
2222

2323
import com.apple.foundationdb.annotation.API;
24-
2524
import com.apple.foundationdb.relational.api.Options;
2625
import com.apple.foundationdb.relational.api.Transaction;
2726
import com.apple.foundationdb.relational.api.ddl.ConstantAction;
2827
import com.apple.foundationdb.relational.api.ddl.MetadataOperationsFactory;
2928
import com.apple.foundationdb.relational.api.exceptions.RelationalException;
3029
import com.apple.foundationdb.relational.api.metadata.SchemaTemplate;
31-
import com.apple.foundationdb.relational.util.ExcludeFromJacocoGeneratedReport;
3230

3331
import javax.annotation.Nonnull;
3432
import java.net.URI;
3533

36-
@ExcludeFromJacocoGeneratedReport //nothing to test
3734
@API(API.Status.EXPERIMENTAL)
3835
public final class NoOpMetadataOperationsFactory implements MetadataOperationsFactory {
3936
public static final NoOpMetadataOperationsFactory INSTANCE = new NoOpMetadataOperationsFactory();

fdb-relational-core/src/main/java/com/apple/foundationdb/relational/transactionbound/catalog/HollowSchemaTemplateCatalog.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,15 @@
2121
package com.apple.foundationdb.relational.transactionbound.catalog;
2222

2323
import com.apple.foundationdb.annotation.API;
24-
25-
import com.apple.foundationdb.relational.api.Transaction;
2624
import com.apple.foundationdb.relational.api.RelationalResultSet;
25+
import com.apple.foundationdb.relational.api.Transaction;
2726
import com.apple.foundationdb.relational.api.catalog.SchemaTemplateCatalog;
2827
import com.apple.foundationdb.relational.api.exceptions.OperationUnsupportedException;
2928
import com.apple.foundationdb.relational.api.exceptions.RelationalException;
3029
import com.apple.foundationdb.relational.api.metadata.SchemaTemplate;
31-
import com.apple.foundationdb.relational.util.ExcludeFromJacocoGeneratedReport;
3230

3331
import javax.annotation.Nonnull;
3432

35-
@ExcludeFromJacocoGeneratedReport
3633
@API(API.Status.EXPERIMENTAL)
3734
public class HollowSchemaTemplateCatalog implements SchemaTemplateCatalog {
3835

fdb-relational-core/src/main/java/com/apple/foundationdb/relational/transactionbound/catalog/HollowStoreCatalog.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,19 @@
2121
package com.apple.foundationdb.relational.transactionbound.catalog;
2222

2323
import com.apple.foundationdb.annotation.API;
24-
2524
import com.apple.foundationdb.relational.api.Continuation;
26-
import com.apple.foundationdb.relational.api.Transaction;
2725
import com.apple.foundationdb.relational.api.RelationalResultSet;
26+
import com.apple.foundationdb.relational.api.Transaction;
2827
import com.apple.foundationdb.relational.api.catalog.SchemaTemplateCatalog;
2928
import com.apple.foundationdb.relational.api.catalog.StoreCatalog;
3029
import com.apple.foundationdb.relational.api.exceptions.OperationUnsupportedException;
3130
import com.apple.foundationdb.relational.api.exceptions.RelationalException;
3231
import com.apple.foundationdb.relational.api.metadata.Schema;
3332
import com.apple.foundationdb.relational.api.metadata.SchemaTemplate;
34-
import com.apple.foundationdb.relational.util.ExcludeFromJacocoGeneratedReport;
3533

3634
import javax.annotation.Nonnull;
3735
import java.net.URI;
3836

39-
@ExcludeFromJacocoGeneratedReport
4037
@API(API.Status.EXPERIMENTAL)
4138
public class HollowStoreCatalog implements StoreCatalog {
4239

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* This source file is part of the FoundationDB open source project
55
*
6-
* Copyright 2021-2024 Apple Inc. and the FoundationDB project authors
6+
* Copyright 2015-2025 Apple Inc. and the FoundationDB project authors
77
*
88
* Licensed under the Apache License, Version 2.0 (the "License");
99
* you may not use this file except in compliance with the License.
@@ -23,15 +23,13 @@
2323
import com.apple.foundationdb.relational.api.Options;
2424
import com.apple.foundationdb.relational.api.metadata.SchemaTemplate;
2525
import com.apple.foundationdb.relational.recordlayer.ddl.NoOpMetadataOperationsFactory;
26-
import com.apple.foundationdb.relational.util.ExcludeFromJacocoGeneratedReport;
2726

2827
import javax.annotation.Nonnull;
2928
import java.net.URI;
3029

3130
/**
3231
* Skeleton implementation of a ConstantActionFactory.
3332
*/
34-
@ExcludeFromJacocoGeneratedReport //excluded because it doesn't do anything by default, so there's nothing to test
3533
public abstract class AbstractMetadataOperationsFactory implements MetadataOperationsFactory {
3634
@Nonnull
3735
@Override
Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* This source file is part of the FoundationDB open source project
55
*
6-
* Copyright 2021-2024 Apple Inc. and the FoundationDB project authors
6+
* Copyright 2015-2025 Apple Inc. and the FoundationDB project authors
77
*
88
* Licensed under the Apache License, Version 2.0 (the "License");
99
* you may not use this file except in compliance with the License.
@@ -20,12 +20,9 @@
2020

2121
package com.apple.foundationdb.relational.api.ddl;
2222

23-
import com.apple.foundationdb.relational.util.ExcludeFromJacocoGeneratedReport;
24-
2523
import javax.annotation.Nonnull;
2624
import java.net.URI;
2725

28-
@ExcludeFromJacocoGeneratedReport //nothing to test
2926
public abstract class AbstractQueryFactory implements DdlQueryFactory {
3027
@Override
3128
public DdlQuery getListDatabasesQueryAction(@Nonnull URI prefixPath) {

0 commit comments

Comments
 (0)