Skip to content

Commit

Permalink
Removed deprecated dead methods from ConnectorDescriptor
Browse files Browse the repository at this point in the history 
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
  • Loading branch information
@dmatej
dmatej committed Sep 18, 2022
1 parent 2de560d commit 74360a4
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 294 deletions.
3 changes: 0 additions & 3 deletions ...ntime/src/main/java/com/sun/enterprise/resource/allocator/AbstractConnectorAllocator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,6 @@ public void fillInResourceObjects(ResourceHandle resourceHandle)
throw new UnsupportedOperationException();
}

public boolean supportsReauthentication() {
return this.desc.supportsReauthentication();
}

public boolean isTransactional() {
return true;
Expand Down
1 change: 0 additions & 1 deletion ...ectors-runtime/src/main/java/com/sun/enterprise/resource/allocator/ResourceAllocator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ public void destroyResource(ResourceHandle resource)

public boolean matchConnection(ResourceHandle h);

public boolean supportsReauthentication();

public boolean isTransactional();

Expand Down
281 changes: 12 additions & 269 deletions ...erver/deployment/dol/src/main/java/com/sun/enterprise/deployment/ConnectorDescriptor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,30 +64,24 @@ public class ConnectorDescriptor extends CommonResourceBundleDescriptor {
// connector1.5 begin
private String resourceAdapterClass = "";
private OutboundResourceAdapter outboundRA;
private InboundResourceAdapter inboundRA;
private InboundResourceAdapter inboundRA;
private final Set<AdminObject> adminObjects;

private SunConnector sunConnector;

// following are all the get and set methods for the
// various variables listed above
private final Set<String> requiredWorkContexts;

/*Set variables indicates that a particular attribute is set by DD processing so that
annotation processing need not (must not) set the values from annotation */
private final boolean specVersionSet = false;

/*
private boolean moduleNameSet = false;
*/

// book keeping annotations that cannot be processed up-front. These will be processed
// during validation phase of the descriptor
private transient Set<AnnotationInfo> connectorAnnotations;

private boolean validConnectorAnnotationProcessed ;
private boolean validConnectorAnnotationProcessed;

private transient Map<String, Set<AnnotationInfo>> configPropertyAnnotations ;
private transient Map<String, Set<AnnotationInfo>> configPropertyAnnotations;

//default resource names for this resource-adpater
// default resource names for this resource-adpater
private final Set<String> defaultResourceNames;

private transient Set<String> configPropertyProcessedClasses;
Expand Down Expand Up @@ -125,180 +119,6 @@ public String getDefaultSpecVersion() {
return ConnectorNode.SPEC_VERSION;
}

////////////////////////////////////////////////////////////////////
// The following are access methods for connector1.0's
// resourceadapter element.
// We no longer support them.
////////////////////////////////////////////////////////////////////

//QQ. FIXME. After verifier stops using this interface,
//this REALLY needs to be removed. (for 1.0 cases only)

// The methods for connection and connection factories have now shifted
//to OutboundResourceAdapter to maintain backward compatibility
//Sheetal. These methods should be removed from here once we start
//using new DOL

/**
* @deprecated
*/
@Deprecated
public String getConnectionFactoryInterface() {
throw new UnsupportedOperationException();
}

/**
* @deprecated
*/
@Deprecated
public void setConnectionFactoryInterface(String connectionFactoryInterface) {
throw new UnsupportedOperationException();
}

/**
* @deprecated
*/
@Deprecated
public String getConnectionFactoryImpl() {
throw new UnsupportedOperationException();
}

/**
* @deprecated
*/
@Deprecated
public void setConnectionFactoryImpl(String connectionFactoryImpl) {
throw new UnsupportedOperationException();
}

/**
* @deprecated
*/
@Deprecated
public String getConnectionInterface() {
throw new UnsupportedOperationException();
}

/**
* @deprecated
*/
@Deprecated
public void setConnectionInterface(String connectionInterface) {
throw new UnsupportedOperationException();
}

/**
* @deprecated
*/
@Deprecated
public String getConnectionImpl() {
throw new UnsupportedOperationException();
}

/**
* @deprecated
*/
@Deprecated
public void setConnectionImpl(String connectionImpl) {
throw new UnsupportedOperationException();
}

/**
* @deprecated
*/
@Deprecated
public String getManagedConnectionFactoryImpl() {
throw new UnsupportedOperationException();
}

/**
* @deprecated
*/
@Deprecated
public void setManagedConnectionFactoryImpl(String managedConnectionFactoryImpl) {
throw new UnsupportedOperationException();
}

/**
* @deprecated
*/
@Deprecated
public boolean supportsReauthentication() {
throw new UnsupportedOperationException();
}

/**
* @deprecated
*/
@Deprecated
public String getReauthenticationSupport() {
throw new UnsupportedOperationException();
}

/**
* @deprecated
*/
@Deprecated
public void setReauthenticationSupport(boolean reauthenticationSupport) {
throw new UnsupportedOperationException();
}

/**
* @deprecated
*/
@Deprecated
public void setReauthenticationSupport(String reauthSupport) {
throw new UnsupportedOperationException();
}

/**
* @deprecated
*/
@Deprecated
public String getTransSupport() {
throw new UnsupportedOperationException();
}

/**
* @deprecated
*/
@Deprecated
public int getTransactionSupport() {
throw new UnsupportedOperationException();
}

/**
* @deprecated
*/
@Deprecated
public void setTransactionSupport(int transactionSupport) {
throw new UnsupportedOperationException();
}

/**
* @deprecated
*/
@Deprecated
public void setTransactionSupport(String support) {
throw new UnsupportedOperationException();
}

/**
* @deprecated
*/
@Deprecated
public Set getAuthMechanisms() {
throw new UnsupportedOperationException();
}

/**
* @return a set of service-ref from this bundle or null
* if none
*/
public Set<?> getServiceReferenceDescriptors() {
return new OrderedSet<>();
}

/**
* Set of SecurityPermission objects
*/
Expand All @@ -309,38 +129,6 @@ public Set<SecurityPermission> getSecurityPermissions() {
return securityPermissions;
}

/**
* @deprecated
*/
@Deprecated
public boolean addAuthMechanism(AuthMechanism mech) {
throw new UnsupportedOperationException();
}

/**
* @deprecated
*/
@Deprecated
public boolean removeAuthMechanism(AuthMechanism mech) {
throw new UnsupportedOperationException();
}

/**
* @deprecated
*/
@Deprecated
public boolean addAuthMechanism(int mech) {
throw new UnsupportedOperationException();
}

/**
* @deprecated
*/
@Deprecated
public boolean removeAuthMechanism(int mech) {
throw new UnsupportedOperationException();
}

/**
* Add a SecurityPermission object to the set
*/
Expand Down Expand Up @@ -437,21 +225,6 @@ public void addAdminObject(AdminObject admin) {
}
}

/*
private boolean hasAdminObject(String intfClass, String implClass, Set adminObjects) {
boolean found = false;
Iterator adminObjectsIterator = adminObjects.iterator();
while(adminObjectsIterator.hasNext()){
AdminObject ao = (AdminObject)adminObjectsIterator.next();
if(ao.getAdminObjectClass().equals(implClass) &&
ao.getAdminObjectInterface().equals(intfClass)){
found = true;
break;
}
}
return found;
}
*/

public void removeAdminObject(AdminObject admin) {
adminObjects.remove(admin);
Expand Down Expand Up @@ -528,26 +301,24 @@ public void setEisType(String eisType) {
*/
public String getVersion() {
return version;
// throw new UnsupportedOperationException();
}

/**
* set value for version
*/
public void setVersion(String version) {
//TODO V3 validate version ?
this.version = version;
//TODO V3 need to have "set" variable ?
// versionSet = true;
//throw new UnsupportedOperationException();
}

/** get value for resourceadapter version (1.5 schema
*/

/**
* get value for resourceadapter version (1.5 schema
*/
public String getResourceAdapterVersion() {
return resourceAdapterVersion;
}


/** set value for resourceadater version (1.5 schema)
*/
public void setResourceAdapterVersion(String resourceAdapterVersion) {
Expand Down Expand Up @@ -604,9 +375,8 @@ public ConnectionDefDescriptor getConnectionDefinitionByCFType(String type, bool
if (type == null) {
if (useDefault && this.outboundRA.getConnectionDefs().size() == 1) {
return desc;
} else {
return null;
}
return null;
}

if (desc.getConnectionFactoryIntf().equals(type)) {
Expand Down Expand Up @@ -825,14 +595,6 @@ public MessageListener getSupportedMessageListener(String type) {
return null;
}

/**
* @deprecated
*/
@Deprecated
public boolean isMessageListenerSupported(String type) {
throw new UnsupportedOperationException();
}


@Override
public boolean isEmpty() {
Expand All @@ -846,8 +608,6 @@ public boolean isEmpty() {
* Methods: setSunDescriptor, getSunDescriptor
***********************************************************************************************/

private SunConnector sunConnector = null;

/**
* This returns the extra ejb sun specific info not in the RI DID.
*
Expand All @@ -866,23 +626,6 @@ public void setSunDescriptor(SunConnector connector){
this.sunConnector = connector;
}

/*******************************************************************************************
* END
* Deployment Consolidation to Suppport Multiple Deployment API Clients
*******************************************************************************************/
public boolean isSpecVersionSet() {
return specVersionSet;
}

/*
public boolean isModuleNameSet(){
return moduleNameSet;
}
public void setModuleNameSet(boolean value){
moduleNameSet = value;
}
*/

public void addConnectorAnnotation(AnnotationInfo c){
connectorAnnotations.add(c);
Expand Down

0 comments on commit 74360a4

Please sign in to comment.