Skip to content

Commit

Permalink
Refactor I modified code
Browse files Browse the repository at this point in the history 
Signed-off-by: kaido207 <kaido.hiroki@fujitsu.com>
  • Loading branch information
@kaido207
kaido207 committed Feb 21, 2023
1 parent fa3d22e commit c0cb8b0
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 69 deletions.
36 changes: 14 additions & 22 deletions ...er/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/GlassFishORBManager.java
View file
Expand Up @@ -41,6 +41,7 @@
import java.util.Properties;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Collectors;

import org.glassfish.api.admin.ProcessEnvironment;
import org.glassfish.api.admin.ProcessEnvironment.ProcessType;
Expand Down Expand Up @@ -609,35 +610,26 @@ private String checkORBServerHost(Properties props) {
return serverHost;
}


private void validateIiopListeners() {
if (iiopListeners == null) {
return;
}
int lazyCount = 0;
for (IiopListener ilb : iiopListeners) {
boolean securityEnabled = Boolean.valueOf(ilb.getSecurityEnabled());
boolean isLazy = Boolean.valueOf(ilb.getLazyInit());
if (isLazy) {
lazyCount++;
}
var lazyListeners = iiopListeners.stream()
.filter(ilb -> Boolean.valueOf(ilb.getLazyInit())).collect(Collectors.toList());

if (lazyCount > 1) {
throw new IllegalStateException("Invalid iiop-listener " + ilb.getId()
+ ". Only one iiop-listener can be configured with lazy-init=true");
}
if (lazyListeners.size() > 1) {
throw new IllegalStateException(
"Only one iiop-listener can be configured with lazy-init=true. "
+ lazyListeners.stream().map(ilb -> ilb.getId()).collect(Collectors.toList()));
}

if (!securityEnabled || ilb.getSsl() == null) {
// no-op
} else {
if (isLazy) {
throw new IllegalStateException("Invalid iiop-listener " + ilb.getId()
+ ". Lazy-init not supported for SSL iiop-listeners");
}
var lazySslListeners = lazyListeners.stream()
.filter(ilb -> Boolean.valueOf(ilb.getSecurityEnabled()) && ilb.getSsl() != null).collect(Collectors.toList());

Ssl sslBean = ilb.getSsl();
assert sslBean != null;
}
if (lazySslListeners.size() > 0) {
throw new IllegalStateException(
"Lazy-init not supported for SSL iiop-listeners. "
+ lazySslListeners.stream().map(ilb -> ilb.getId()).collect(Collectors.toList()));
}
}

Expand Down
90 changes: 43 additions & 47 deletions ...rver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/PEORBConfigurator.java
View file
Expand Up @@ -55,6 +55,8 @@
import java.util.Set;
import java.util.HashSet;
import java.util.Arrays;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import java.nio.channels.SelectableChannel;
import org.glassfish.enterprise.iiop.util.ThreadPoolStats;
import org.glassfish.enterprise.iiop.util.ThreadPoolStatsImpl;
Expand All @@ -76,8 +78,6 @@ public class PEORBConfigurator implements ORBConfigurator {
private static ThreadPoolManager threadpoolMgr = null;
private static boolean txServiceInitialized = false;

private Acceptor lazyAcceptor = null;

static {
// TODO tsIdent = new TSIdentificationImpl();
}
Expand Down Expand Up @@ -234,59 +234,55 @@ private String handleAddrAny( String hostAddr ) {
}
}

private void createORBListeners( IIOPUtils iiopUtils,
IiopListener[] iiopListenerBeans, org.omg.CORBA.ORB orb ) {

if (iiopListenerBeans != null) {
int lazyCount = 0 ;
for (IiopListener ilb : iiopListenerBeans) {
boolean securityEnabled = Boolean.valueOf( ilb.getSecurityEnabled() ) ;
private void createORBListeners(IIOPUtils iiopUtils,
IiopListener[] iiopListenerBeans, org.omg.CORBA.ORB orb) {

boolean isLazy = Boolean.valueOf( ilb.getLazyInit() ) ;
if( isLazy ) {
lazyCount++;
}
if (iiopListenerBeans == null) {
return;
}

if (lazyCount > 1) {
throw new IllegalStateException( "Invalid iiop-listener "
+ ilb.getId()
+ ". Only one iiop-listener can be configured "
+ "with lazy-init=true");
}
var lazyListeners = Stream.of(iiopListenerBeans)
.filter(ilb -> Boolean.valueOf(ilb.getLazyInit())).collect(Collectors.toList());

int port = Integer.parseInt( ilb.getPort() ) ;
String host = handleAddrAny( ilb.getAddress() ) ;
if (lazyListeners.size() > 1) {
throw new IllegalStateException(
"Only one iiop-listener can be configured with lazy-init=true. "
+ lazyListeners.stream().map(ilb -> ilb.getId()).collect(Collectors.toList()));
}

if (!securityEnabled || ilb.getSsl() == null) {
if (Boolean.parseBoolean(ilb.getEnabled())) {
Acceptor acceptor = addAcceptor( orb, isLazy, host,
IIOP_CLEAR_TEXT_CONNECTION, port ) ;
if( isLazy ) {
lazyAcceptor = acceptor;
}
}
} else {
if (isLazy) {
throw new IllegalStateException( "Invalid iiop-listener "
+ ilb.getId()
+ ". Lazy-init not supported for SSL iiop-listeners");
}
var lazySslListeners = lazyListeners.stream()
.filter(ilb -> Boolean.valueOf(ilb.getSecurityEnabled()) && ilb.getSsl() != null)
.collect(Collectors.toList());

if (Boolean.parseBoolean(ilb.getEnabled())) {
Ssl sslBean = ilb.getSsl() ;
assert sslBean != null ;
if (lazySslListeners.size() > 0) {
throw new IllegalStateException(
"Lazy-init not supported for SSL iiop-listeners. "
+ lazySslListeners.stream().map(ilb -> ilb.getId()).collect(Collectors.toList()));
}

boolean clientAuth = Boolean.valueOf(
sslBean.getClientAuthEnabled() ) ;
String type = clientAuth ? SSL_MUTUALAUTH : SSL ;
addAcceptor( orb, isLazy, host, type, port ) ;
}
}
for (IiopListener ilb : iiopListenerBeans) {
if (!Boolean.parseBoolean(ilb.getEnabled())) {
continue;
}

if( (lazyCount == 1) && (lazyAcceptor != null) ) {
getHelper().setSelectableChannelDelegate(new AcceptorDelegateImpl(
lazyAcceptor));
boolean isLazy = Boolean.valueOf(ilb.getLazyInit());
int port = Integer.parseInt(ilb.getPort());
String host = handleAddrAny(ilb.getAddress());

boolean isSslListener = Boolean.valueOf(ilb.getSecurityEnabled()) && ilb.getSsl() != null;
if (isSslListener) {
Ssl sslBean = ilb.getSsl();
boolean clientAuth = Boolean.valueOf(
sslBean.getClientAuthEnabled());
String type = clientAuth ? SSL_MUTUALAUTH : SSL;
addAcceptor(orb, isLazy, host, type, port);
} else {
Acceptor acceptor = addAcceptor(orb, isLazy, host,
IIOP_CLEAR_TEXT_CONNECTION, port);
if (isLazy) {
getHelper().setSelectableChannelDelegate(new AcceptorDelegateImpl(
acceptor));
}
}
}
}
Expand Down

0 comments on commit c0cb8b0

Please sign in to comment.