Use stricter visibilities for classes & methods

polypheny · TobiasHafner · Apr 24, 2024 · Apr 24, 2024 · Apr 24, 2024 · Apr 24, 2024
commit 8d5bc93b64f23e489089562d1f6d6aeccb739a43
diff --git a/plugins/json-adapter/src/main/java/org/polypheny/db/adapter/json/JsonCollection.java b/plugins/json-adapter/src/main/java/org/polypheny/db/adapter/json/JsonCollection.java
@@ -34,7 +34,7 @@
 import org.polypheny.db.schema.types.TranslatableEntity;
 import org.polypheny.db.type.entity.PolyValue;
 
-public class JsonCollection extends PhysicalCollection implements ScannableEntity, TranslatableEntity {
+final class JsonCollection extends PhysicalCollection implements ScannableEntity, TranslatableEntity {
 
     private final URL url;
     private final Adapter<DocAdapterCatalog> adapter;

diff --git a/plugins/json-adapter/src/main/java/org/polypheny/db/adapter/json/JsonEnumerator.java b/plugins/json-adapter/src/main/java/org/polypheny/db/adapter/json/JsonEnumerator.java
@@ -11,7 +11,7 @@
 import org.polypheny.db.catalog.exceptions.GenericRuntimeException;
 import org.polypheny.db.type.entity.PolyValue;
 
-public class JsonEnumerator implements Enumerator<PolyValue[]> {
+final class JsonEnumerator implements Enumerator<PolyValue[]> {
 
     private final static ObjectMapper MAPPER = new ObjectMapper();
     private final static JsonToPolyConverter CONVERTER = new JsonToPolyConverter();
@@ -22,7 +22,7 @@ public class JsonEnumerator implements Enumerator<PolyValue[]> {
     private boolean isCollection;
 
 
-    public JsonEnumerator( URL url ) {
+    JsonEnumerator( URL url ) {
         this.url = url;
     }
 

diff --git a/plugins/json-adapter/src/main/java/org/polypheny/db/adapter/json/JsonMetaRetriever.java b/plugins/json-adapter/src/main/java/org/polypheny/db/adapter/json/JsonMetaRetriever.java
@@ -37,9 +37,9 @@
 import org.polypheny.db.util.Source;
 import org.polypheny.db.util.Sources;
 
-public class JsonMetaRetriever {
+final class JsonMetaRetriever {
 
-    public static List<ExportedDocument> getDocuments( URL jsonFiles ) throws IOException {
+    static List<ExportedDocument> getDocuments( URL jsonFiles ) throws IOException {
         List<ExportedDocument> exportedDocuments = new LinkedList<>();
         Set<String> fileNames = getFileNames( jsonFiles );
         ObjectMapper objectMapper = new ObjectMapper();
@@ -62,7 +62,7 @@ public static List<ExportedDocument> getDocuments( URL jsonFiles ) throws IOExce
     }
 
 
-    public static URL findDocumentUrl( URL jsonFiles, String name ) throws MalformedURLException, NoSuchFileException {
+    static URL findDocumentUrl( URL jsonFiles, String name ) throws MalformedURLException, NoSuchFileException {
         String[] extensions = { ".json", ".json.gz" };
         String path = jsonFiles.getPath();
 

diff --git a/plugins/json-adapter/src/main/java/org/polypheny/db/adapter/json/JsonNamespace.java b/plugins/json-adapter/src/main/java/org/polypheny/db/adapter/json/JsonNamespace.java
@@ -24,9 +24,9 @@
 import org.polypheny.db.schema.Namespace;
 
 @Getter
-public class JsonNamespace extends Namespace {
+final class JsonNamespace extends Namespace {
 
-    String name;
+    private final String name;
 
 
     public JsonNamespace( String name, long id, long adapterId ) {

diff --git a/plugins/json-adapter/src/main/java/org/polypheny/db/adapter/json/JsonProjectScanRule.java b/plugins/json-adapter/src/main/java/org/polypheny/db/adapter/json/JsonProjectScanRule.java
@@ -22,12 +22,12 @@
 import org.polypheny.db.plan.AlgOptRuleCall;
 import org.polypheny.db.tools.AlgBuilderFactory;
 
-public class JsonProjectScanRule extends AlgOptRule {
+final class JsonProjectScanRule extends AlgOptRule {
 
-    public static final JsonProjectScanRule INSTANCE = new JsonProjectScanRule( AlgFactories.LOGICAL_BUILDER );
+    static final JsonProjectScanRule INSTANCE = new JsonProjectScanRule( AlgFactories.LOGICAL_BUILDER );
 
 
-    public JsonProjectScanRule( AlgBuilderFactory algBuilderFactory ) {
+    private JsonProjectScanRule( AlgBuilderFactory algBuilderFactory ) {
         super(
                 operand( LogicalDocumentScan.class, none() ),
                 algBuilderFactory,
@@ -40,7 +40,6 @@ public JsonProjectScanRule( AlgBuilderFactory algBuilderFactory ) {
     public void onMatch( AlgOptRuleCall call ) {
         final LogicalDocumentScan scan = call.alg( 0 );
         call.transformTo( new JsonScan( scan.getCluster(), scan.getEntity().unwrapOrThrow( JsonCollection.class ), new int[]{ 0 } ) );
-
     }
 
 }
diff --git a/plugins/json-adapter/src/main/java/org/polypheny/db/adapter/json/JsonScan.java b/plugins/json-adapter/src/main/java/org/polypheny/db/adapter/json/JsonScan.java
@@ -39,14 +39,14 @@
 import org.polypheny.db.plan.AlgPlanner;
 import org.polypheny.db.plan.AlgTraitSet;
 
-public class JsonScan extends DocumentScan<JsonCollection> implements EnumerableAlg {
+public final class JsonScan extends DocumentScan<JsonCollection> implements EnumerableAlg {
 
     @Getter
     private final JsonCollection collection;
     private final int[] fields;
 
 
-    protected JsonScan( AlgCluster cluster, @NotNull JsonCollection collection, int[] fields ) {
+    JsonScan( AlgCluster cluster, @NotNull JsonCollection collection, int[] fields ) {
         super( cluster, cluster.traitSetOf( EnumerableConvention.INSTANCE ), collection );
         this.collection = collection;
         this.fields = fields;

diff --git a/plugins/json-adapter/src/main/java/org/polypheny/db/adapter/json/JsonToPolyConverter.java b/plugins/json-adapter/src/main/java/org/polypheny/db/adapter/json/JsonToPolyConverter.java
@@ -31,14 +31,14 @@
 import org.polypheny.db.type.entity.numerical.PolyLong;
 import org.polypheny.db.type.entity.relational.PolyMap;
 
-public class JsonToPolyConverter {
+public final class JsonToPolyConverter {
 
     public PolyDocument nodeToPolyDocument( JsonNode node ) {
         return new PolyDocument( nodeToPolyMap( node ) );
     }
 
 
-    public PolyMap<PolyString, PolyValue> nodeToPolyMap( JsonNode node ) {
+    private PolyMap<PolyString, PolyValue> nodeToPolyMap( JsonNode node ) {
         Map<PolyString, PolyValue> map = new HashMap<>();
         node.fields().forEachRemaining( entry -> {
             PolyString key = new PolyString( entry.getKey() );
@@ -62,15 +62,15 @@ public PolyValue nodeToPolyValue( JsonNode node ) {
     }
 
 
-    public PolyNumber nodeToPolyNumber( JsonNode node ) {
+    private PolyNumber nodeToPolyNumber( JsonNode node ) {
         if ( node.isIntegralNumber() ) {
             return new PolyLong( node.asLong() );
         }
         return new PolyDouble( node.asDouble() );
     }
 
 
-    public PolyValue nodeToPolyList( JsonNode node ) {
+    private PolyValue nodeToPolyList( JsonNode node ) {
         return PolyList.of( StreamSupport.stream( node.spliterator(), false )
                 .map( this::nodeToPolyValue )
                 .toList() );

diff --git a/plugins/xml-adapter/src/main/java/org/polypheny/db/adapter/xml/XmlCollection.java b/plugins/xml-adapter/src/main/java/org/polypheny/db/adapter/xml/XmlCollection.java
@@ -34,7 +34,7 @@
 import org.polypheny.db.schema.types.TranslatableEntity;
 import org.polypheny.db.type.entity.PolyValue;
 
-public class XmlCollection extends PhysicalCollection implements ScannableEntity, TranslatableEntity {
+final class XmlCollection extends PhysicalCollection implements ScannableEntity, TranslatableEntity {
 
     private final URL url;
     private final Adapter<DocAdapterCatalog> adapter;

diff --git a/plugins/xml-adapter/src/main/java/org/polypheny/db/adapter/xml/XmlEnumerator.java b/plugins/xml-adapter/src/main/java/org/polypheny/db/adapter/xml/XmlEnumerator.java
@@ -12,7 +12,7 @@
 import org.polypheny.db.catalog.exceptions.GenericRuntimeException;
 import org.polypheny.db.type.entity.PolyValue;
 
-public class XmlEnumerator implements Enumerator<PolyValue[]> {
+final class XmlEnumerator implements Enumerator<PolyValue[]> {
 
     private final static XmlToPolyConverter CONVERTER = new XmlToPolyConverter();
 
@@ -22,7 +22,7 @@ public class XmlEnumerator implements Enumerator<PolyValue[]> {
     private PolyValue[] current;
 
 
-    public XmlEnumerator( URL url ) {
+    XmlEnumerator( URL url ) {
         this.url = url;
         initializeReader();
     }

diff --git a/plugins/xml-adapter/src/main/java/org/polypheny/db/adapter/xml/XmlMetaRetriever.java b/plugins/xml-adapter/src/main/java/org/polypheny/db/adapter/xml/XmlMetaRetriever.java
@@ -32,9 +32,9 @@
 import org.polypheny.db.util.Source;
 import org.polypheny.db.util.Sources;
 
-public class XmlMetaRetriever {
+final class XmlMetaRetriever {
 
-    public static List<ExportedDocument> getDocuments( URL xmlFiles ) throws IOException {
+    static List<ExportedDocument> getDocuments( URL xmlFiles ) throws IOException {
         List<ExportedDocument> exportedDocuments = new LinkedList<>();
         Set<String> fileNames = getFileNames( xmlFiles );
 
@@ -51,7 +51,7 @@ public static List<ExportedDocument> getDocuments( URL xmlFiles ) throws IOExcep
     }
 
 
-    public static URL findDocumentUrl( URL xmlFiles, String name ) throws MalformedURLException, NoSuchFileException {
+    static URL findDocumentUrl( URL xmlFiles, String name ) throws MalformedURLException, NoSuchFileException {
         String[] extensions = { ".xml", ".xml.gz" };
         String path = xmlFiles.getPath();
 

diff --git a/plugins/xml-adapter/src/main/java/org/polypheny/db/adapter/xml/XmlNamespace.java b/plugins/xml-adapter/src/main/java/org/polypheny/db/adapter/xml/XmlNamespace.java
@@ -24,12 +24,12 @@
 import org.polypheny.db.schema.Namespace;
 
 @Getter
-public class XmlNamespace extends Namespace {
+final class XmlNamespace extends Namespace {
 
-    String name;
+    private final String name;
 
 
-    public XmlNamespace( String name, long id, long adapterId ) {
+    XmlNamespace( String name, long id, long adapterId ) {
         super( id, adapterId );
         this.name = name;
     }

diff --git a/plugins/xml-adapter/src/main/java/org/polypheny/db/adapter/xml/XmlProjectScanRule.java b/plugins/xml-adapter/src/main/java/org/polypheny/db/adapter/xml/XmlProjectScanRule.java
@@ -22,12 +22,12 @@
 import org.polypheny.db.plan.AlgOptRuleCall;
 import org.polypheny.db.tools.AlgBuilderFactory;
 
-public class XmlProjectScanRule extends AlgOptRule {
+final class XmlProjectScanRule extends AlgOptRule {
 
-    public static final XmlProjectScanRule INSTANCE = new XmlProjectScanRule( AlgFactories.LOGICAL_BUILDER );
+    static final XmlProjectScanRule INSTANCE = new XmlProjectScanRule( AlgFactories.LOGICAL_BUILDER );
 
 
-    public XmlProjectScanRule( AlgBuilderFactory algBuilderFactory ) {
+    private XmlProjectScanRule( AlgBuilderFactory algBuilderFactory ) {
         super(
                 operand( LogicalDocumentScan.class, none() ),
                 algBuilderFactory,

diff --git a/plugins/xml-adapter/src/main/java/org/polypheny/db/adapter/xml/XmlScan.java b/plugins/xml-adapter/src/main/java/org/polypheny/db/adapter/xml/XmlScan.java
@@ -39,14 +39,14 @@
 import org.polypheny.db.plan.AlgPlanner;
 import org.polypheny.db.plan.AlgTraitSet;
 
-public class XmlScan extends DocumentScan<XmlCollection> implements EnumerableAlg {
+public final class XmlScan extends DocumentScan<XmlCollection> implements EnumerableAlg {
 
     @Getter
     private final XmlCollection collection;
     private final int[] fields;
 
 
-    protected XmlScan( AlgCluster cluster, @NotNull XmlCollection collection, int[] fields ) {
+    XmlScan( AlgCluster cluster, @NotNull XmlCollection collection, int[] fields ) {
         super( cluster, cluster.traitSetOf( EnumerableConvention.INSTANCE ), collection );
         this.collection = collection;
         this.fields = fields;
@@ -83,6 +83,7 @@ public void register( @NotNull AlgPlanner planner ) {
     }
 
 
+    @Override
     public AlgOptCost computeSelfCost( AlgPlanner planner, AlgMetadataQuery mq ) {
         // copied over from the csv project scan rule
         return super.computeSelfCost( planner, mq ).multiplyBy( ((double) fields.length + 2D) / ((double) entity.getTupleType().getFieldCount() + 2D) );

diff --git a/plugins/xml-adapter/src/main/java/org/polypheny/db/adapter/xml/XmlToPolyConverter.java b/plugins/xml-adapter/src/main/java/org/polypheny/db/adapter/xml/XmlToPolyConverter.java
@@ -32,7 +32,7 @@
 import org.polypheny.db.type.entity.temporal.PolyTime;
 import org.polypheny.db.type.entity.temporal.PolyTimestamp;
 
-public class XmlToPolyConverter {
+public final class XmlToPolyConverter {
 
     public PolyDocument toPolyDocument( XMLStreamReader reader, String elementOuterName ) throws XMLStreamException, DecoderException {
         return new PolyDocument( toPolyMap( reader, elementOuterName ) );
@@ -62,7 +62,7 @@ private PolyMap<PolyString, PolyValue> toPolyMap( XMLStreamReader reader, String
     }
 
 
-    public PolyValue toPolyValue( XMLStreamReader reader ) throws XMLStreamException, DecoderException {
+    private PolyValue toPolyValue( XMLStreamReader reader ) throws XMLStreamException, DecoderException {
         String currentElementName = reader.getLocalName();
         String typeName = reader.getAttributeValue( null, "type" );
         if ( typeName == null ) {