From 1047691c64d85e006ac03c1e4216f135b15241ba Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Fri, 27 Jun 2014 15:26:44 +0000
Subject: [PATCH] SAM: Make all classes package private except the SAMBridge
entry point
---
apps/sam/java/src/net/i2p/sam/SAMBridge.java | 1 +
apps/sam/java/src/net/i2p/sam/SAMDatagramReceiver.java | 2 +-
apps/sam/java/src/net/i2p/sam/SAMDatagramSession.java | 2 +-
apps/sam/java/src/net/i2p/sam/SAMException.java | 2 +-
apps/sam/java/src/net/i2p/sam/SAMHandlerFactory.java | 2 +-
apps/sam/java/src/net/i2p/sam/SAMInvalidDirectionException.java | 2 +-
apps/sam/java/src/net/i2p/sam/SAMMessageSession.java | 2 +-
apps/sam/java/src/net/i2p/sam/SAMRawReceiver.java | 2 +-
apps/sam/java/src/net/i2p/sam/SAMRawSession.java | 2 +-
apps/sam/java/src/net/i2p/sam/SAMStreamReceiver.java | 2 +-
apps/sam/java/src/net/i2p/sam/SAMStreamSession.java | 2 +-
apps/sam/java/src/net/i2p/sam/SAMUtils.java | 2 +-
apps/sam/java/src/net/i2p/sam/SAMv1Handler.java | 2 +-
apps/sam/java/src/net/i2p/sam/SAMv2Handler.java | 2 +-
apps/sam/java/src/net/i2p/sam/SAMv2StreamSession.java | 2 +-
apps/sam/java/src/net/i2p/sam/SAMv3DatagramSession.java | 2 +-
apps/sam/java/src/net/i2p/sam/SAMv3Handler.java | 2 +-
apps/sam/java/src/net/i2p/sam/SAMv3RawSession.java | 2 +-
apps/sam/java/src/net/i2p/sam/SAMv3StreamSession.java | 2 +-
19 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/apps/sam/java/src/net/i2p/sam/SAMBridge.java b/apps/sam/java/src/net/i2p/sam/SAMBridge.java
index 580f5e88ed..bc99762f1a 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMBridge.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMBridge.java
@@ -33,6 +33,7 @@ import net.i2p.util.Log;
/**
* SAM bridge implementation.
+ * This is the main entry point for SAM.
*
* @author human
*/
diff --git a/apps/sam/java/src/net/i2p/sam/SAMDatagramReceiver.java b/apps/sam/java/src/net/i2p/sam/SAMDatagramReceiver.java
index 53d0b65948..68971af31a 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMDatagramReceiver.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMDatagramReceiver.java
@@ -15,7 +15,7 @@ import net.i2p.data.Destination;
/**
* Interface for sending raw data to a SAM client
*/
-public interface SAMDatagramReceiver {
+interface SAMDatagramReceiver {
/**
* Send a byte array to a SAM client.
diff --git a/apps/sam/java/src/net/i2p/sam/SAMDatagramSession.java b/apps/sam/java/src/net/i2p/sam/SAMDatagramSession.java
index 499f88dd36..b9367e24db 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMDatagramSession.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMDatagramSession.java
@@ -25,7 +25,7 @@ import net.i2p.util.Log;
*
* @author human
*/
-public class SAMDatagramSession extends SAMMessageSession {
+class SAMDatagramSession extends SAMMessageSession {
public static final int DGRAM_SIZE_MAX = 31*1024;
diff --git a/apps/sam/java/src/net/i2p/sam/SAMException.java b/apps/sam/java/src/net/i2p/sam/SAMException.java
index ae965a4c8c..def5709ea5 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMException.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMException.java
@@ -13,7 +13,7 @@ package net.i2p.sam;
*
* @author human
*/
-public class SAMException extends Exception {
+class SAMException extends Exception {
static final long serialVersionUID = 1 ;
diff --git a/apps/sam/java/src/net/i2p/sam/SAMHandlerFactory.java b/apps/sam/java/src/net/i2p/sam/SAMHandlerFactory.java
index c6f27c1336..194e3c2713 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMHandlerFactory.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMHandlerFactory.java
@@ -21,7 +21,7 @@ import net.i2p.util.Log;
/**
* SAM handler factory class.
*/
-public class SAMHandlerFactory {
+class SAMHandlerFactory {
/**
diff --git a/apps/sam/java/src/net/i2p/sam/SAMInvalidDirectionException.java b/apps/sam/java/src/net/i2p/sam/SAMInvalidDirectionException.java
index cd1c6b1a57..44e93f21cb 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMInvalidDirectionException.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMInvalidDirectionException.java
@@ -14,7 +14,7 @@ package net.i2p.sam;
*
* @author human
*/
-public class SAMInvalidDirectionException extends Exception {
+class SAMInvalidDirectionException extends Exception {
static final long serialVersionUID = 1 ;
public SAMInvalidDirectionException() {
diff --git a/apps/sam/java/src/net/i2p/sam/SAMMessageSession.java b/apps/sam/java/src/net/i2p/sam/SAMMessageSession.java
index 64895c9c63..3a0d033d3d 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMMessageSession.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMMessageSession.java
@@ -155,7 +155,7 @@ public abstract class SAMMessageSession {
*
* @author human
*/
- public class SAMMessageSessionHandler implements Runnable, I2PSessionListener {
+ class SAMMessageSessionHandler implements Runnable, I2PSessionListener {
private final Object runningLock = new Object();
private volatile boolean stillRunning = true;
diff --git a/apps/sam/java/src/net/i2p/sam/SAMRawReceiver.java b/apps/sam/java/src/net/i2p/sam/SAMRawReceiver.java
index 3d7c1ef31f..96ebe45d08 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMRawReceiver.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMRawReceiver.java
@@ -13,7 +13,7 @@ import java.io.IOException;
/**
* Interface for sending raw data to a SAM client
*/
-public interface SAMRawReceiver {
+interface SAMRawReceiver {
/**
* Send a byte array to a SAM client, without informations
diff --git a/apps/sam/java/src/net/i2p/sam/SAMRawSession.java b/apps/sam/java/src/net/i2p/sam/SAMRawSession.java
index b811e64030..4361af5e5c 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMRawSession.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMRawSession.java
@@ -21,7 +21,7 @@ import net.i2p.util.Log;
*
* @author human
*/
-public class SAMRawSession extends SAMMessageSession {
+class SAMRawSession extends SAMMessageSession {
public static final int RAW_SIZE_MAX = 32*1024;
diff --git a/apps/sam/java/src/net/i2p/sam/SAMStreamReceiver.java b/apps/sam/java/src/net/i2p/sam/SAMStreamReceiver.java
index a57ddd6811..a6e47ad7a3 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMStreamReceiver.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMStreamReceiver.java
@@ -17,7 +17,7 @@ import net.i2p.data.Destination;
* Interface for sending streaming data to a SAM client
*/
-public interface SAMStreamReceiver {
+interface SAMStreamReceiver {
/**
* Sends the result of a stream send operation
* @param id Stream ID
diff --git a/apps/sam/java/src/net/i2p/sam/SAMStreamSession.java b/apps/sam/java/src/net/i2p/sam/SAMStreamSession.java
index 41163e8f2d..cfa8da66eb 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMStreamSession.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMStreamSession.java
@@ -46,7 +46,7 @@ import net.i2p.util.Log;
*
* @author human
*/
-public class SAMStreamSession {
+class SAMStreamSession {
protected final Log _log;
diff --git a/apps/sam/java/src/net/i2p/sam/SAMUtils.java b/apps/sam/java/src/net/i2p/sam/SAMUtils.java
index 12bdb858a9..6e04cadfb5 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMUtils.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMUtils.java
@@ -32,7 +32,7 @@ import net.i2p.util.Log;
*
* @author human
*/
-public class SAMUtils {
+class SAMUtils {
//private final static Log _log = new Log(SAMUtils.class);
diff --git a/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java b/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java
index ea36e573c5..581eef75cb 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java
@@ -35,7 +35,7 @@ import net.i2p.util.Log;
*
* @author human
*/
-public class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatagramReceiver, SAMStreamReceiver {
+class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatagramReceiver, SAMStreamReceiver {
protected SAMRawSession rawSession;
protected SAMDatagramSession datagramSession;
diff --git a/apps/sam/java/src/net/i2p/sam/SAMv2Handler.java b/apps/sam/java/src/net/i2p/sam/SAMv2Handler.java
index 7ac4ba691e..54fda314ed 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMv2Handler.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMv2Handler.java
@@ -21,7 +21,7 @@ import net.i2p.util.Log;
* @author mkvore
*/
-public class SAMv2Handler extends SAMv1Handler implements SAMRawReceiver, SAMDatagramReceiver, SAMStreamReceiver
+class SAMv2Handler extends SAMv1Handler implements SAMRawReceiver, SAMDatagramReceiver, SAMStreamReceiver
{
diff --git a/apps/sam/java/src/net/i2p/sam/SAMv2StreamSession.java b/apps/sam/java/src/net/i2p/sam/SAMv2StreamSession.java
index edbd80dbaf..08b3b31057 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMv2StreamSession.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMv2StreamSession.java
@@ -37,7 +37,7 @@ import net.i2p.util.Log;
* @author mkvore
*/
-public class SAMv2StreamSession extends SAMStreamSession
+class SAMv2StreamSession extends SAMStreamSession
{
/**
diff --git a/apps/sam/java/src/net/i2p/sam/SAMv3DatagramSession.java b/apps/sam/java/src/net/i2p/sam/SAMv3DatagramSession.java
index 37d335cad2..b3386e9721 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMv3DatagramSession.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMv3DatagramSession.java
@@ -17,7 +17,7 @@ import java.net.InetSocketAddress;
import java.net.SocketAddress ;
import java.nio.ByteBuffer;
-public class SAMv3DatagramSession extends SAMDatagramSession implements SAMv3Handler.Session, SAMDatagramReceiver {
+class SAMv3DatagramSession extends SAMDatagramSession implements SAMv3Handler.Session, SAMDatagramReceiver {
private final SAMv3Handler handler;
private final SAMv3Handler.DatagramServer server;
diff --git a/apps/sam/java/src/net/i2p/sam/SAMv3Handler.java b/apps/sam/java/src/net/i2p/sam/SAMv3Handler.java
index 201aee9283..44ec91d18d 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMv3Handler.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMv3Handler.java
@@ -41,7 +41,7 @@ import net.i2p.util.I2PAppThread;
* @author mkvore
*/
-public class SAMv3Handler extends SAMv1Handler
+class SAMv3Handler extends SAMv1Handler
{
private Session session;
diff --git a/apps/sam/java/src/net/i2p/sam/SAMv3RawSession.java b/apps/sam/java/src/net/i2p/sam/SAMv3RawSession.java
index dd5c79fc55..9d9da0aee4 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMv3RawSession.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMv3RawSession.java
@@ -18,7 +18,7 @@ import net.i2p.util.Log;
* @author MKVore
*
*/
-public class SAMv3RawSession extends SAMRawSession implements SAMv3Handler.Session, SAMRawReceiver {
+class SAMv3RawSession extends SAMRawSession implements SAMv3Handler.Session, SAMRawReceiver {
private final String nick;
private final SAMv3Handler handler;
diff --git a/apps/sam/java/src/net/i2p/sam/SAMv3StreamSession.java b/apps/sam/java/src/net/i2p/sam/SAMv3StreamSession.java
index 8354d64045..18bb40cd0e 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMv3StreamSession.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMv3StreamSession.java
@@ -34,7 +34,7 @@ import java.nio.channels.SocketChannel;
* @author mkvore
*/
-public class SAMv3StreamSession extends SAMStreamSession implements SAMv3Handler.Session
+class SAMv3StreamSession extends SAMStreamSession implements SAMv3Handler.Session
{
private static final int BUFFER_SIZE = 1024 ;
--
GitLab