[Comsuite-svn] SF.net SVN: comsuite: [178] trunk/code/CSMiddleware/src/org/commsuite/sap/ SAPComm.java

[<zd...@us...>]

Revision: 178
          http://svn.sourceforge.net/comsuite/?rev=178&view=rev
Author:   zduniak
Date:     2006-10-01 13:18:40 -0700 (Sun, 01 Oct 2006)

Log Message:
-----------
Code clean up

Modified Paths:
--------------
    trunk/code/CSMiddleware/src/org/commsuite/sap/SAPComm.java

Modified: trunk/code/CSMiddleware/src/org/commsuite/sap/SAPComm.java
===================================================================
--- trunk/code/CSMiddleware/src/org/commsuite/sap/SAPComm.java	2006-10-01 18:45:04 UTC (rev 177)
+++ trunk/code/CSMiddleware/src/org/commsuite/sap/SAPComm.java	2006-10-01 20:18:40 UTC (rev 178)
@@ -108,6 +108,9 @@
 
 		private final String PARTNER_CHARSET;
 
+		/**
+		 * TODO: JavaDoc
+		 */
 		/* package scope */JCOServer() {
 			super(SAPComm.this.getLogonProperties(), SAPComm.this.repository);
 			logger.info("Server registering properties: "
@@ -122,34 +125,33 @@
 					final boolean isBackendUnicode = attributes
 							.getPartnerCodepage().equals("4102")
 							|| attributes.getPartnerCodepage().equals("4103");
-					logger
-							.info("SAP JCo isBackendUnicode: "
-									+ isBackendUnicode);
+					logger.info("IsBackendUnicode: " + isBackendUnicode);
+					logger.info("PartnerBytesPerChar: "
+							+ attributes.getPartnerBytesPerChar());
+					logger.info("PartnerCharset: "
+							+ attributes.getPartnerCharset());
+					logger.info("PartnerCodepage: "
+							+ attributes.getPartnerCodepage());
+					logger.info("PartnerEncoding: "
+							+ attributes.getPartnerEncoding());
+					logger.info("PartnerHost: " + attributes.getPartnerHost());
+					logger.info("PartnerRelease: "
+							+ attributes.getPartnerRelease());
+					logger.info("PartnerType: " + attributes.getPartnerType());
 				}
 			} finally {
 				if (null != client) {
 					releaseJCOClient(client);
 				}
 			}
-			logger.info("JCO.Server created");
+			logger.debug("JCO.Server created");
 		}
 
+		/**
+		 * TODO: JavaDoc
+		 */
 		@Override
 		protected void handleRequest(final JCO.Function function) {
-
-			// SERIALIZATION:
-			// try {
-			// FileOutputStream fos;
-			// fos = new FileOutputStream("c:\\temp\\" +
-			// System.currentTimeMillis());
-			// ObjectOutputStream oos = new ObjectOutputStream(fos);
-			// oos.writeObject(function);
-			// oos.close();
-			// } catch (Exception e) {
-			// logger.error("", e);
-			// }
-			// END OF SERIALIZATION
-
 			handlingRequest = true;
 			// TODO: rozwazyc czy nie lepiej obslugiwac zgloszenie od klientow w
 			// osobnych watkach.
@@ -170,12 +172,18 @@
 			handlingRequest = false;
 		}
 
+		/**
+		 * TODO: JavaDoc
+		 */
 		public void serverExceptionOccurred(JCO.Server server, Exception ex) {
 			logger.fatal("Exception in server: "
 					+ SAPComm.this.instanceDef.getName() + "[ProgID: "
 					+ server.getProgID() + "]", ex);
 		}
 
+		/**
+		 * TODO: JavaDoc
+		 */
 		public void serverStateChangeOccurred(JCO.Server server, int oldState,
 				int newState) {
 			if (logger.isInfoEnabled()) {
@@ -215,6 +223,9 @@
 			}
 		}
 
+		/**
+		 * TODO: JavaDoc
+		 */
 		public void serverErrorOccurred(JCO.Server server, Error error) {
 			logger.fatal("Error in server: "
 					+ SAPComm.this.instanceDef.getName() + "[ProgID: "
@@ -224,6 +235,9 @@
 			// stopServer();
 		}
 
+		/**
+		 * TODO: JavaDoc
+		 */
 		public void uncaughtException(Thread t, Throwable e) {
 			logger.fatal("UncaughtException in server: "
 					+ SAPComm.this.instanceDef.getName(), e);
@@ -233,10 +247,16 @@
 		}
 	}
 
+	/**
+	 * TODO: JavaDoc
+	 */
 	public IJCOServer getServer() {
 		return server;
 	}
 
+	/**
+	 * TODO: JavaDoc
+	 */
 	public void handleJCORequest(final JCO.Function function, String charset) {
 		try {
 			logger.info("Handling request for function: " + function.getName());
@@ -245,11 +265,6 @@
 				final Message[] messages = JCoFunctionTranslator
 						.getMessagesFromJCOFunction(function, charset);
 
-				logger.debug("1");
-				logger.debug("messages: " + messages);
-				logger.debug("messages.length: "
-						+ (null != messages ? "" + messages.length : "NIC"));
-
 				if (null != messages && messages.length > 0
 						&& 0 == messages[0].getSentContents().size()) {
 					final String errMsg = "Message without any content is not supported";
@@ -261,33 +276,17 @@
 					msgManager = SpringMiddlewareContext.getMessageManager();
 				}
 
-				logger.debug("msgManager: " + msgManager);
-
 				if (null == jmsManager) {
 					jmsManager = SpringMiddlewareContext.getJMSManager();
 				}
 
-				logger.debug("jmsManager: " + jmsManager);
-
 				final Date currentDate = new Date();
-				logger.debug("2");
 				for (Message msg : messages) {
-					logger.debug("3: " + msg);
 					msg.setSAPInstanceDefOwner(instanceDef);
 					if (null == msg.getSendDate()) {
 						msg.setSendDate(currentDate);
 					}
-					logger.debug("4");
-					logger.debug("msg.getSentContents().size(): " + msg.getSentContents().size());
 
-					if (msg.getSentContents().get(0).getContent().MIME_TYPE_TEXT_PLAIN
-							.equals(msg.getSentContents().get(0).getContent()
-									.getMimeType())) {
-						logger.debug("Content1: "
-								+ new String(msg.getSentContents().get(0)
-										.getContent().getData()));
-					}
-
 					msg = msgManager.saveMessage(msg);
 					jmsManager
 							.sendMessage(
@@ -327,13 +326,10 @@
 	}
 
 	/**
-	 * REVIEW: public ? what for ? i dont think that this method is necessary at
-	 * all.
-	 * 
 	 * @param server
 	 *            The server to set.
 	 */
-	public void setServer(IJCOServer server) {
+	/* package scope */void setServer(IJCOServer server) {
 		this.server = server;
 	}
 
@@ -393,11 +389,16 @@
 		initiated = true;
 	}
 
+	/**
+	 * TODO: JavaDoc
+	 */
 	private void initRepository() {
 		repository = JCO.createRepository(getRepositoryName(), getPoolName());
-		logger.debug("Repository: " + repository);
 	}
 
+	/**
+	 * TODO: JavaDoc
+	 */
 	private void initSAPConnections() {
 		releaseSAPConnections();
 
@@ -410,6 +411,9 @@
 		pool.setTrace(TRACE_ENABLED);
 	}
 
+	/**
+	 * TODO: JavaDoc
+	 */
 	/* package scope */Properties getLogonProperties() {
 		final String JCO_CLIENT_PREFIX = "jco.client.";
 		final String JCO_SERVER_PREFIX = "jco.server.";
@@ -448,13 +452,16 @@
 		props.put(JCO_SERVER_PREFIX + "unicode", instanceDef.isUnicode() ? "1"
 				: "0");
 
-		// TODO: is this correct ?
+		// TODO: is this correct and necessary ?
 		props.put(JCO_CLIENT_PREFIX + "unicode", instanceDef.isUnicode() ? "1"
 				: "0");
 
 		return props;
 	}
 
+	/**
+	 * TODO: JavaDoc
+	 */
 	private void releaseSAPConnections() {
 		// testing whether connection pool already exists:
 		final JCO.Pool pool = JCO.getClientPoolManager().getPool(getPoolName());
@@ -464,22 +471,37 @@
 		}
 	}
 
+	/**
+	 * TODO: JavaDoc
+	 */
 	private String getPoolName() {
 		return JCO_CONNECTIONS_POOL_PREFIX + instanceDef.getName();
 	}
 
+	/**
+	 * TODO: JavaDoc
+	 */
 	private String getRepositoryName() {
 		return JCO_REPOSITORY_PREFIX + instanceDef.getName();
 	}
 
+	/**
+	 * TODO: JavaDoc
+	 */
 	/* package scope */JCO.Client getJCOClient() {
 		return JCO.getClient(getPoolName());
 	}
 
+	/**
+	 * TODO: JavaDoc
+	 */
 	private void releaseJCOClient(JCO.Client client) {
 		JCO.releaseClient(client);
 	}
 
+	/**
+	 * TODO: JavaDoc
+	 */
 	public void destroy() {
 		stopServer();
 		releaseSAPConnections();
@@ -487,20 +509,23 @@
 		initiated = false;
 	}
 
+	/**
+	 * TODO: JavaDoc
+	 */
 	public void stopServer() {
 		if (null != server && server.isAlive()) {
-			logger.debug("Stopping SAP server");
+			logger.info("Stopping SAP server");
 			server.stop();
 			server.abort("Connection aborted by administrator.");
 		} else {
-			logger.debug("SAP server already stopped");
+			logger.info("SAP server already stopped");
 		}
 		server = null;
-		logger.debug("SAP server STOPPED");
+		logger.info("SAP server STOPPED");
 	}
 
 	/**
-	 * this method was created only to be override in tests
+	 * This method was created only to be override in tests.
 	 * 
 	 * @return new {@link SAPComm.JCOServer} instance
 	 */
@@ -508,9 +533,12 @@
 		return this.new JCOServer();
 	}
 
+	/**
+	 * TODO: JavaDoc
+	 */
 	public void startServer() {
 		if (null != isRemoteSystemWorking()) {
-			logger.error("Remote system is not working: " + getName());
+			logger.fatal("Remote system is not working: " + getName());
 			return;
 		}
 		stopServer();
@@ -526,7 +554,9 @@
 	 * @return true if message was sent, false if sending failed
 	 */
 	public boolean sendMessage(Message message) {
-		logger.debug("Sending message: " + message.toString());
+		if (logger.isInfoEnabled()) {
+			logger.info("Sending message: " + message.toString());
+		}
 
 		JCO.Client client = null;
 		try {
@@ -541,8 +571,8 @@
 			client.execute(f);
 			// }
 			final boolean send = checkFunctionReturn(f);
-			if (logger.isDebugEnabled()) {
-				logger.debug("Message to [" + message.getReceiver()
+			if (logger.isInfoEnabled()) {
+				logger.info("Message to [" + message.getReceiver()
 						+ "] sent status: " + send);
 			}
 			return send;
@@ -557,6 +587,9 @@
 		}
 	}
 
+	/**
+	 * TODO: JavaDoc
+	 */
 	private boolean checkFunctionReturn(final Function f) {
 		// testing return state:
 		final JCO.Table receivers = f.getTableParameterList().getTable(
@@ -579,6 +612,9 @@
 		return SAPStatusCodeConstants.DELIVERED_SUCCESSFULLY_701.equals(code);
 	}
 
+	/**
+	 * TODO: JavaDoc
+	 */
 	public boolean sendNotification(Notification notification) {
 		logger.debug("Sending notification: " + notification.toString());
 
@@ -612,6 +648,9 @@
 		}
 	}
 
+	/**
+	 * TODO: JavaDoc
+	 */
 	public String isRemoteSystemWorking() {
 		// TODO: [MZ] i'm not sure whether this implementation is correct
 		JCO.Client client = null;
@@ -626,12 +665,6 @@
 			// Send a ping to the server
 			client.ping();
 
-			// TODO: testing:
-			// final JCO.Function f = repository.getFunctionTemplate(
-			// "SX_OBJECT_RECEIVE").getFunction();
-			// logger.debug("FUNCTION: " + f);
-			// TODO: end of testing
-
 			// final JCO.Attributes attr = client.getAttributes();
 			// final String partnerRelease = attr.getPartnerRelease();
 			// logger.debug("Partner release: " + partnerRelease);
@@ -648,14 +681,23 @@
 		}
 	}
 
+	/**
+	 * TODO: JavaDoc
+	 */
 	public boolean isDefault() {
 		return instanceDef.isDefaultInstance();
 	}
 
+	/**
+	 * TODO: JavaDoc
+	 */
 	public String getName() {
 		return instanceDef.getName();
 	}
 
+	/**
+	 * TODO: JavaDoc
+	 */
 	@Override
 	public boolean equals(final Object o) {
 		// REVIEW: is this correct ?
@@ -673,6 +715,9 @@
 		return s.getName().equals(this.getName());
 	}
 
+	/**
+	 * TODO: JavaDoc
+	 */
 	@Override
 	public int hashCode() {
 		return getName().hashCode();
@@ -680,7 +725,7 @@
 	}
 
 	/**
-	 * @see java.lang.Object#toString()
+	 * TODO: JavaDoc
 	 */
 	@Override
 	public String toString() {
@@ -696,10 +741,16 @@
 				this.errorsWhileHandlingFunctions).toString();
 	}
 
+	/**
+	 * TODO: JavaDoc
+	 */
 	public boolean isHandlingRequest() {
 		return handlingRequest;
 	}
 
+	/**
+	 * TODO: JavaDoc
+	 */
 	public boolean isActiveInstance() {
 		return this.instanceDef.isActiveInstance();
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.